Changeset 81223 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Oct 11, 2019 12:06:49 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Renaming.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -115 +115 @@
     }
 
-    int rc2 = SharedClipboardTransferCtxTransferUnregister(pCtx, pTransfer->State.uID);
+    int rc2 = ShClTransferCtxTransferUnregister(pCtx, pTransfer->State.uID);
     AssertRC(rc2);
 
-    SharedClipboardTransferDestroy(pTransfer);
+    ShClTransferDestroy(pTransfer);
 
     RTMemFree(pTransfer);
@@ -145 +145 @@
     AssertPtr(pTransfer);
 
-    const SHCLTRANSFERDIR enmDir = SharedClipboardTransferGetDir(pTransfer);
-
-    LogFlowFunc(("pCtx=%p, idTransfer=%RU16, enmDir=%RU32\n", pCtx, SharedClipboardTransferGetID(pTransfer), enmDir));
+    const SHCLTRANSFERDIR enmDir = ShClTransferGetDir(pTransfer);
+
+    LogFlowFunc(("pCtx=%p, idTransfer=%RU16, enmDir=%RU32\n", pCtx, ShClTransferGetID(pTransfer), enmDir));
 
     int rc;
@@ -161 +161 @@
         /* The IDataObject *must* be created on the same thread as our (proxy) window, so post a message to it
          * to do the stuff for us. */
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pTransfer->Events);
-
-        rc = SharedClipboardEventRegister(&pTransfer->Events, uEvent);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pTransfer->Events);
+
+        rc = ShClEventRegister(&pTransfer->Events, uEvent);
         if (RT_SUCCESS(rc))
         {
@@ -170 +170 @@
 
             PSHCLEVENTPAYLOAD pPayload;
-            rc = SharedClipboardEventWait(&pTransfer->Events, uEvent, 30 * 1000 /* Timeout in ms */, &pPayload);
+            rc = ShClEventWait(&pTransfer->Events, uEvent, 30 * 1000 /* Timeout in ms */, &pPayload);
             if (RT_SUCCESS(rc))
             {
@@ -176 +176 @@
                 rc = *(int *)pPayload->pvData;
 
-                SharedClipboardPayloadFree(pPayload);
-            }
-
-            SharedClipboardEventUnregister(&pTransfer->Events, uEvent);
+                ShClPayloadFree(pPayload);
+            }
+
+            ShClEventUnregister(&pTransfer->Events, uEvent);
         }
     }
@@ -188 +188 @@
         LogRel(("Shared Clipboard: Starting transfer failed, rc=%Rrc\n", rc));
 
-    LogFlowFunc(("LEAVE: idTransfer=%RU16, rc=%Rrc\n", SharedClipboardTransferGetID(pTransfer), rc));
+    LogFlowFunc(("LEAVE: idTransfer=%RU16, rc=%Rrc\n", ShClTransferGetID(pTransfer), rc));
     return rc;
 }
@@ -649 +649 @@
             const SHCLEVENTID uEvent = (SHCLEVENTID)lParam;
 
-            Assert(SharedClipboardTransferGetSource(pTransfer) == SHCLSOURCE_REMOTE); /* Sanity. */
+            Assert(ShClTransferGetSource(pTransfer) == SHCLSOURCE_REMOTE); /* Sanity. */
 
             int rcTransfer = SharedClipboardWinTransferCreate(pWinCtx, pTransfer);
 
             PSHCLEVENTPAYLOAD pPayload = NULL;
-            int rc = SharedClipboardPayloadAlloc(uEvent, &rcTransfer, sizeof(rcTransfer), &pPayload);
+            int rc = ShClPayloadAlloc(uEvent, &rcTransfer, sizeof(rcTransfer), &pPayload);
             if (RT_SUCCESS(rc))
             {
-                rc = SharedClipboardEventSignal(&pTransfer->Events, uEvent, pPayload);
+                rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
                 if (RT_FAILURE(rc))
-                    SharedClipboardPayloadFree(pPayload);
+                    ShClPayloadFree(pPayload);
             }
 
@@ -910 +910 @@
         {
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-            rc = SharedClipboardTransferCtxInit(&pCtx->TransferCtx);
+            rc = ShClTransferCtxInit(&pCtx->TransferCtx);
 #endif
             if (RT_SUCCESS(rc))
@@ -1178 +1178 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    SharedClipboardTransferCtxDestroy(&pCtx->TransferCtx);
+    ShClTransferCtxDestroy(&pCtx->TransferCtx);
 #endif