Changeset 82846 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 24, 2020 9:36:52 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Renaming. bugref:9437

File:

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

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

@@ -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 = ShClEventIDGenerate(&pTransfer->Events);
-
-        rc = ShClEventRegister(&pTransfer->Events, uEvent);
+        const SHCLEVENTID idEvent = ShClEventIDGenerate(&pTransfer->Events);
+
+        rc = ShClEventRegister(&pTransfer->Events, idEvent);
         if (RT_SUCCESS(rc))
         {
             /* Don't want to rely on SendMessage (synchronous) here, so just post and wait the event getting signalled. */
-            ::PostMessage(pCtx->Win.hWnd, SHCL_WIN_WM_TRANSFER_START, (WPARAM)pTransfer, (LPARAM)uEvent);
+            ::PostMessage(pCtx->Win.hWnd, SHCL_WIN_WM_TRANSFER_START, (WPARAM)pTransfer, (LPARAM)idEvent);
 
             PSHCLEVENTPAYLOAD pPayload;
-            rc = ShClEventWait(&pTransfer->Events, uEvent, 30 * 1000 /* Timeout in ms */, &pPayload);
+            rc = ShClEventWait(&pTransfer->Events, idEvent, 30 * 1000 /* Timeout in ms */, &pPayload);
             if (RT_SUCCESS(rc))
             {
@@ -179 +179 @@
             }
 
-            ShClEventUnregister(&pTransfer->Events, uEvent);
+            ShClEventUnregister(&pTransfer->Events, idEvent);
         }
     }
@@ -671 +671 @@
             AssertPtr(pTransfer);
 
-            const SHCLEVENTID uEvent = (SHCLEVENTID)lParam;
+            const SHCLEVENTID idEvent = (SHCLEVENTID)lParam;
 
             Assert(ShClTransferGetSource(pTransfer) == SHCLSOURCE_REMOTE); /* Sanity. */
@@ -678 +678 @@
 
             PSHCLEVENTPAYLOAD pPayload = NULL;
-            int rc = ShClPayloadAlloc(uEvent, &rcTransfer, sizeof(rcTransfer), &pPayload);
+            int rc = ShClPayloadAlloc(idEvent, &rcTransfer, sizeof(rcTransfer), &pPayload);
             if (RT_SUCCESS(rc))
             {
-                rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
+                rc = ShClEventSignal(&pTransfer->Events, idEvent, pPayload);
                 if (RT_FAILURE(rc))
                     ShClPayloadFree(pPayload);