Changeset 82846 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

Shared Clipboard: Renaming. bugref:9437

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (4 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-darwin.cpp (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h (modified) (1 diff)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (46 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (3 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp (modified) (10 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (3 diffs)
• HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp (modified) (1 diff)

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);

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-darwin.cpp

@@ -208 +208 @@
 #endif
 
-    return ShClSvcDataReadRequest(pClient, pFormats->Formats, NULL /* puEvent */);
+    return ShClSvcDataReadRequest(pClient, pFormats->Formats, NULL /* pidEvent */);
 }
 

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -251 +251 @@
  * @{
  */
-int ShClSvcDataReadRequest(PSHCLCLIENT pClient, SHCLFORMAT fFormat, PSHCLEVENTID puEvent);
+int ShClSvcDataReadRequest(PSHCLCLIENT pClient, SHCLFORMAT fFormat, PSHCLEVENTID pidEvent);
 int ShClSvcDataReadSignal(PSHCLCLIENT pClient, PSHCLCLIENTCMDCTX pCmdCtx, PSHCLDATABLOCK pData);
 int ShClSvcHostReportFormats(PSHCLCLIENT pClient, SHCLFORMATS fFormats);

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp

@@ -125 +125 @@
     if (pMsgHdr)
     {
-        SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
+        SHCLEVENTID idEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU64(&pMsgHdr->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
-                                                                     pCtx->pTransfer->State.uID, uEvent));
+                                                                     pCtx->pTransfer->State.uID, idEvent));
         HGCMSvcSetU32(&pMsgHdr->paParms[1], 0 /* fRoots */);
 
@@ -134 +134 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, idEvent);
             AssertRC(rc2);
 
@@ -141 +141 @@
             {
                 PSHCLEVENTPAYLOAD pPayloadHdr;
-                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent,
+                rc = ShClEventWait(&pCtx->pTransfer->Events, idEvent,
                                               pCtx->pTransfer->uTimeoutMs, &pPayloadHdr);
                 if (RT_SUCCESS(rc))
@@ -165 +165 @@
                                                                                VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY_READ_REQ);
 
-                                    uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
+                                    idEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
                                     HGCMSvcSetU64(&pMsgEntry->paParms[0],
                                                   VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uClientID,
-                                                                                       pCtx->pTransfer->State.uID, uEvent));
+                                                                                       pCtx->pTransfer->State.uID, idEvent));
                                     HGCMSvcSetU32(&pMsgEntry->paParms[1], 0 /* fRoots */);
                                     HGCMSvcSetU32(&pMsgEntry->paParms[2], i /* uIndex */);
 
-                                    rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
+                                    rc2 = ShClEventRegister(&pCtx->pTransfer->Events, idEvent);
                                     AssertRC(rc2);
 
@@ -181 +181 @@
 
                                     PSHCLEVENTPAYLOAD pPayloadEntry;
-                                    rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent,
+                                    rc = ShClEventWait(&pCtx->pTransfer->Events, idEvent,
                                                        pCtx->pTransfer->uTimeoutMs, &pPayloadEntry);
                                     if (RT_FAILURE(rc))
@@ -193 +193 @@
                                     ShClPayloadFree(pPayloadEntry);
 
-                                    ShClEventUnregister(&pCtx->pTransfer->Events, uEvent);
+                                    ShClEventUnregister(&pCtx->pTransfer->Events, idEvent);
 
                                     if (RT_FAILURE(rc))
@@ -220 +220 @@
             }
 
-            ShClEventUnregister(&pCtx->pTransfer->Events, uEvent);
+            ShClEventUnregister(&pCtx->pTransfer->Events, idEvent);
         }
     }
@@ -244 +244 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID idEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         pMsg->Ctx.uContextID = VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID, pCtx->pTransfer->State.uID,
-                                                        uEvent);
+                                                        idEvent);
 
         rc = shClSvcTransferSetListOpen(pMsg->cParms, pMsg->paParms, &pMsg->Ctx, pOpenParms);
@@ -255 +255 @@
             if (RT_SUCCESS(rc))
             {
-                int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
+                int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, idEvent);
                 AssertRC(rc2);
 
@@ -262 +262 @@
                 {
                     PSHCLEVENTPAYLOAD pPayload;
-                    rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                    rc = ShClEventWait(&pCtx->pTransfer->Events, idEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                     if (RT_SUCCESS(rc))
                     {
@@ -280 +280 @@
                 }
 
-                ShClEventUnregister(&pCtx->pTransfer->Events, uEvent);
+                ShClEventUnregister(&pCtx->pTransfer->Events, idEvent);
             }
         }
@@ -304 +304 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID idEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         pMsg->Ctx.uContextID = VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID, pCtx->pTransfer->State.uID,
-                                                        uEvent);
+                                                        idEvent);
 
         rc = shClSvcTransferSetListClose(pMsg->cParms, pMsg->paParms, &pMsg->Ctx, hList);
@@ -315 +315 @@
             if (RT_SUCCESS(rc))
             {
-                int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
+                int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, idEvent);
                 AssertRC(rc2);
 
@@ -322 +322 @@
                 {
                     PSHCLEVENTPAYLOAD pPayload;
-                    rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                    rc = ShClEventWait(&pCtx->pTransfer->Events, idEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                     if (RT_SUCCESS(rc))
                         ShClPayloadFree(pPayload);
                 }
 
-                ShClEventUnregister(&pCtx->pTransfer->Events, uEvent);
+                ShClEventUnregister(&pCtx->pTransfer->Events, idEvent);
             }
         }
@@ -352 +352 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID idEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU64(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
-                                                                  pCtx->pTransfer->State.uID, uEvent));
+                                                                  pCtx->pTransfer->State.uID, idEvent));
         HGCMSvcSetU64(&pMsg->paParms[1], hList);
         HGCMSvcSetU32(&pMsg->paParms[2], 0 /* fFlags */);
@@ -362 +362 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, idEvent);
             AssertRC(rc2);
 
@@ -369 +369 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent,
+                rc = ShClEventWait(&pCtx->pTransfer->Events, idEvent,
                                    pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
@@ -413 +413 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID idEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU64(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
-                                                                  pCtx->pTransfer->State.uID, uEvent));
+                                                                  pCtx->pTransfer->State.uID, idEvent));
         HGCMSvcSetU64(&pMsg->paParms[1], hList);
         HGCMSvcSetU32(&pMsg->paParms[2], 0 /* fInfo */);
@@ -423 +423 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, idEvent);
             AssertRC(rc2);
 
@@ -430 +430 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, idEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -473 +473 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID idEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         LogFlowFunc(("pszPath=%s, fCreate=0x%x\n", pCreateParms->pszPath, pCreateParms->fCreate));
@@ -480 +480 @@
 
         HGCMSvcSetU64(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
-                                                                  pCtx->pTransfer->State.uID, uEvent));
+                                                                  pCtx->pTransfer->State.uID, idEvent));
         HGCMSvcSetU64(&pMsg->paParms[1], 0); /* uHandle */
         HGCMSvcSetU32(&pMsg->paParms[2], cbPath);
@@ -489 +489 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, idEvent);
             AssertRC(rc2);
 
@@ -496 +496 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, idEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -535 +535 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID idEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU64(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
-                                                                  pCtx->pTransfer->State.uID, uEvent));
+                                                                  pCtx->pTransfer->State.uID, idEvent));
         HGCMSvcSetU64(&pMsg->paParms[1], hObj);
 
@@ -544 +544 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, idEvent);
             AssertRC(rc2);
 
@@ -551 +551 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, idEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -591 +591 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID idEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU64(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
-                                                                  pCtx->pTransfer->State.uID, uEvent));
+                                                                  pCtx->pTransfer->State.uID, idEvent));
         HGCMSvcSetU64(&pMsg->paParms[1], hObj);
         HGCMSvcSetU32(&pMsg->paParms[2], cbData);
@@ -602 +602 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, idEvent);
             AssertRC(rc2);
 
@@ -609 +609 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, idEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -650 +650 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID idEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU64(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
-                                                                  pCtx->pTransfer->State.uID, uEvent));
+                                                                  pCtx->pTransfer->State.uID, idEvent));
         HGCMSvcSetU64(&pMsg->paParms[1], hObj);
         HGCMSvcSetU64(&pMsg->paParms[2], cbData);
@@ -661 +661 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, idEvent);
             AssertRC(rc2);
 
@@ -668 +668 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, idEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -1262 +1262 @@
                         if (RT_SUCCESS(rc))
                         {
-                            const SHCLEVENTID uEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
-
-                            LogFlowFunc(("uCID=%RU64 -> uEvent=%RU32\n", uCID, uEvent));
-
-                            rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
+                            const SHCLEVENTID idEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
+
+                            LogFlowFunc(("uCID=%RU64 -> idEvent=%RU32\n", uCID, idEvent));
+
+                            rc = ShClEventSignal(&pTransfer->Events, idEvent, pPayload);
                         }
                         break;
@@ -1430 +1430 @@
                 uint32_t cbData = sizeof(SHCLROOTLISTHDR);
 
-                const SHCLEVENTID uEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
+                const SHCLEVENTID idEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
 
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClPayloadAlloc(uEvent, pvData, cbData, &pPayload);
+                rc = ShClPayloadAlloc(idEvent, pvData, cbData, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
+                    rc = ShClEventSignal(&pTransfer->Events, idEvent, pPayload);
                     if (RT_FAILURE(rc))
                         ShClPayloadFree(pPayload);
@@ -1475 +1475 @@
                 uint32_t cbData = sizeof(SHCLROOTLISTENTRY);
 
-                const SHCLEVENTID uEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
+                const SHCLEVENTID idEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
 
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClPayloadAlloc(uEvent, pvData, cbData, &pPayload);
+                rc = ShClPayloadAlloc(idEvent, pvData, cbData, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
+                    rc = ShClEventSignal(&pTransfer->Events, idEvent, pPayload);
                     if (RT_FAILURE(rc))
                         ShClPayloadFree(pPayload);
@@ -1550 +1550 @@
                     uint32_t cbData = sizeof(SHCLLISTHDR);
 
-                    const SHCLEVENTID uEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
+                    const SHCLEVENTID idEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
 
                     PSHCLEVENTPAYLOAD pPayload;
-                    rc = ShClPayloadAlloc(uEvent, pvData, cbData, &pPayload);
+                    rc = ShClPayloadAlloc(idEvent, pvData, cbData, &pPayload);
                     if (RT_SUCCESS(rc))
                     {
-                        rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
+                        rc = ShClEventSignal(&pTransfer->Events, idEvent, pPayload);
                         if (RT_FAILURE(rc))
                             ShClPayloadFree(pPayload);
@@ -1599 +1599 @@
                     uint32_t cbData = sizeof(SHCLLISTENTRY);
 
-                    const SHCLEVENTID uEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
+                    const SHCLEVENTID idEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
 
                     PSHCLEVENTPAYLOAD pPayload;
-                    rc = ShClPayloadAlloc(uEvent, pvData, cbData, &pPayload);
+                    rc = ShClPayloadAlloc(idEvent, pvData, cbData, &pPayload);
                     if (RT_SUCCESS(rc))
                     {
-                        rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
+                        rc = ShClEventSignal(&pTransfer->Events, idEvent, pPayload);
                         if (RT_FAILURE(rc))
                             ShClPayloadFree(pPayload);
@@ -1711 +1711 @@
                 uint32_t cbData = sizeof(SHCLOBJDATACHUNK);
 
-                const SHCLEVENTID uEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
+                const SHCLEVENTID idEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(uCID);
 
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClPayloadAlloc(uEvent, pvData, cbData, &pPayload);
+                rc = ShClPayloadAlloc(idEvent, pvData, cbData, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
+                    rc = ShClEventSignal(&pTransfer->Events, idEvent, pPayload);
                     if (RT_FAILURE(rc))
                         ShClPayloadFree(pPayload);
@@ -1977 +1977 @@
  * @param   uStatus             Status to report.
  * @param   rcTransfer          Result code to report. Optional and depending on status.
- * @param   puEvent             Where to store the created wait event. Optional.
+ * @param   pidEvent             Where to store the created wait event. Optional.
  */
 int shClSvcTransferSendStatus(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer, SHCLTRANSFERSTATUS uStatus,
-                              int rcTransfer, PSHCLEVENTID puEvent)
+                              int rcTransfer, PSHCLEVENTID pidEvent)
 {
     AssertPtrReturn(pClient,   VERR_INVALID_POINTER);
     AssertPtrReturn(pTransfer, VERR_INVALID_POINTER);
-    /* puEvent is optional. */
+    /* pidEvent is optional. */
 
     PSHCLCLIENTMSG pMsgReadData = shClSvcMsgAlloc(pClient, VBOX_SHCL_HOST_MSG_TRANSFER_STATUS,
@@ -1991 +1991 @@
         return VERR_NO_MEMORY;
 
-    const SHCLEVENTID uEvent = ShClEventIDGenerate(&pTransfer->Events);
+    const SHCLEVENTID idEvent = ShClEventIDGenerate(&pTransfer->Events);
 
     HGCMSvcSetU64(&pMsgReadData->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
-                                                                      pTransfer->State.uID, uEvent));
+                                                                      pTransfer->State.uID, idEvent));
     HGCMSvcSetU32(&pMsgReadData->paParms[1], pTransfer->State.enmDir);
     HGCMSvcSetU32(&pMsgReadData->paParms[2], uStatus);
@@ -2003 +2003 @@
     if (RT_SUCCESS(rc))
     {
-        rc = ShClEventRegister(&pTransfer->Events, uEvent);
+        rc = ShClEventRegister(&pTransfer->Events, idEvent);
         if (RT_SUCCESS(rc))
         {
@@ -2012 +2012 @@
                          ShClTransferStatusToStr(uStatus), rcTransfer, pTransfer->State.uID));
 
-                if (puEvent)
-                    *puEvent = uEvent;
+                if (pidEvent)
+                    *pidEvent = idEvent;
             }
             else
-                ShClEventUnregister(&pTransfer->Events, uEvent);
+                ShClEventUnregister(&pTransfer->Events, idEvent);
         }
     }
@@ -2108 +2108 @@
                             if (RT_SUCCESS(rc))
                             {
-                                SHCLEVENTID uEvent;
+                                SHCLEVENTID idEvent;
                                 rc = shClSvcTransferSendStatus(pClient, pTransfer,
                                                                SHCLTRANSFERSTATUS_INITIALIZED, VINF_SUCCESS,
-                                                               &uEvent);
+                                                               &idEvent);
                                 if (RT_SUCCESS(rc))
                                 {
@@ -2118 +2118 @@
 
                                     PSHCLEVENTPAYLOAD pPayload;
-                                    rc = ShClEventWait(&pTransfer->Events, uEvent, pTransfer->uTimeoutMs, &pPayload);
+                                    rc = ShClEventWait(&pTransfer->Events, idEvent, pTransfer->uTimeoutMs, &pPayload);
                                     if (RT_SUCCESS(rc))
                                     {
@@ -2183 +2183 @@
 int shClSvcTransferStop(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
 {
-    SHCLEVENTID uEvent;
+    SHCLEVENTID idEvent;
     int rc = shClSvcTransferSendStatus(pClient, pTransfer,
                                        SHCLTRANSFERSTATUS_STOPPED, VINF_SUCCESS,
-                                       &uEvent);
+                                       &idEvent);
     if (RT_SUCCESS(rc))
     {
         LogRel2(("Shared Clipboard: Waiting for stop of transfer %RU32 on guest ...\n", pTransfer->State.uID));
 
-        rc = ShClEventWait(&pTransfer->Events, uEvent, pTransfer->uTimeoutMs, NULL);
+        rc = ShClEventWait(&pTransfer->Events, idEvent, pTransfer->uTimeoutMs, NULL);
         if (RT_SUCCESS(rc))
             LogRel2(("Shared Clipboard: Stopped transfer %RU32 on guest\n", pTransfer->State.uID));

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

@@ -178 +178 @@
     }
 
-    SHCLEVENTID uEvent = 0;
-    int rc = ShClSvcDataReadRequest(pCtx->pClient, fFormat, &uEvent);
+    SHCLEVENTID idEvent = 0;
+    int rc = ShClSvcDataReadRequest(pCtx->pClient, fFormat, &idEvent);
     if (RT_SUCCESS(rc))
     {
         PSHCLEVENTPAYLOAD pPayload;
-        rc = ShClEventWait(&pCtx->pClient->EventSrc, uEvent, 30 * 1000, &pPayload);
+        rc = ShClEventWait(&pCtx->pClient->EventSrc, idEvent, 30 * 1000, &pPayload);
         if (RT_SUCCESS(rc))
         {
@@ -190 +190 @@
 
             /* Detach the payload, as the caller then will own the data. */
-            ShClEventPayloadDetach(&pCtx->pClient->EventSrc, uEvent);
+            ShClEventPayloadDetach(&pCtx->pClient->EventSrc, idEvent);
             /**
              * @todo r=bird: The payload has already been detached,
@@ -198 +198 @@
         }
 
-        ShClEventUnregister(&pCtx->pClient->EventSrc, uEvent);
+        ShClEventUnregister(&pCtx->pClient->EventSrc, idEvent);
     }
 

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11.cpp

@@ -167 +167 @@
     uint32_t            *pcbActual;
     /** The request's event ID. */
-    SHCLEVENTID          uEvent;
+    SHCLEVENTID          idEvent;
 };
 
@@ -193 +193 @@
         pReq->pcbActual = pcbActual;
         const SHCLEVENTID idEvent = ShClEventIdGenerateAndRegister(&pClient->EventSrc);
-        pReq->uEvent    = idEvent;
+        pReq->idEvent    = idEvent;
         if (idEvent)
         {
@@ -283 +283 @@
     RT_NOREF(rcCompletion);
 
-    LogFlowFunc(("rcCompletion=%Rrc, pReq=%p, pv=%p, cb=%RU32, uEvent=%RU32\n", rcCompletion, pReq, pv, cb, pReq->uEvent));
+    LogFlowFunc(("rcCompletion=%Rrc, pReq=%p, pv=%p, cb=%RU32, idEvent=%RU32\n", rcCompletion, pReq, pv, cb, pReq->idEvent));
 
     AssertMsgRC(rcCompletion, ("Clipboard data completion from X11 failed with %Rrc\n", rcCompletion));
 
-    if (pReq->uEvent != NIL_SHCLEVENTID)
+    if (pReq->idEvent != NIL_SHCLEVENTID)
     {
         int rc2;
@@ -294 +294 @@
         if (pv && cb)
         {
-            rc2 = ShClPayloadAlloc(pReq->uEvent, pv, cb, &pPayload);
+            rc2 = ShClPayloadAlloc(pReq->idEvent, pv, cb, &pPayload);
             AssertRC(rc2);
         }
 
         RTCritSectEnter(&pCtx->pClient->CritSect);
-        rc2 = ShClEventSignal(&pCtx->pClient->EventSrc, pReq->uEvent, pPayload);
+        rc2 = ShClEventSignal(&pCtx->pClient->EventSrc, pReq->idEvent, pPayload);
         AssertRC(rc2);
         RTCritSectLeave(&pCtx->pClient->CritSect);
@@ -340 +340 @@
     {
         /* Request data from the guest. */
-        SHCLEVENTID uEvent;
-        rc = ShClSvcDataReadRequest(pCtx->pClient, fFormat, &uEvent);
+        SHCLEVENTID idEvent;
+        rc = ShClSvcDataReadRequest(pCtx->pClient, fFormat, &idEvent);
         if (RT_SUCCESS(rc))
         {
             PSHCLEVENTPAYLOAD pPayload;
-            rc = ShClEventWait(&pCtx->pClient->EventSrc, uEvent, 30 * 1000, &pPayload);
+            rc = ShClEventWait(&pCtx->pClient->EventSrc, idEvent, 30 * 1000, &pPayload);
             if (RT_SUCCESS(rc))
             {
@@ -352 +352 @@
 
                 /* Detach the payload, as the caller then will own the data. */
-                ShClEventPayloadDetach(&pCtx->pClient->EventSrc, uEvent);
+                ShClEventPayloadDetach(&pCtx->pClient->EventSrc, idEvent);
             }
 
-            ShClEventUnregister(&pCtx->pClient->EventSrc, uEvent);
+            ShClEventUnregister(&pCtx->pClient->EventSrc, idEvent);
         }
     }
@@ -389 +389 @@
     LogFlowFuncEnter();
 
-    SHCLEVENTID uEvent = ShClEventIDGenerate(&pClient->EventSrc);
-
-    int rc = ShClEventRegister(&pClient->EventSrc, uEvent);
+    SHCLEVENTID idEvent = ShClEventIDGenerate(&pClient->EventSrc);
+
+    int rc = ShClEventRegister(&pClient->EventSrc, idEvent);
     if (RT_SUCCESS(rc))
     {
@@ -397 +397 @@
         if (pReq)
         {
-            pReq->uEvent = uEvent;
+            pReq->idEvent = idEvent;
 
             rc = ShClX11ReadDataFromX11(&pClient->State.pCtx->X11, VBOX_SHCL_FMT_URI_LIST, pReq);
@@ -404 +404 @@
                 /* X supplies the data asynchronously, so we need to wait for data to arrive first. */
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = ShClEventWait(&pClient->EventSrc, uEvent, 30 * 1000, &pPayload);
+                rc = ShClEventWait(&pClient->EventSrc, idEvent, 30 * 1000, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -413 +413 @@
         }
 
-        ShClEventUnregister(&pClient->EventSrc, uEvent);
+        ShClEventUnregister(&pClient->EventSrc, idEvent);
     }
 

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp

@@ -1218 +1218 @@
     LogFlowFuncEnter();
 
-    SHCLEVENTID uEvent;
+    SHCLEVENTID idEvent;
     if (!(pClient->State.fGuestFeatures0 & VBOX_SHCL_GF_0_CONTEXT_ID)) /* Legacy, Guest Additions < 6.1. */
     {
         /* Older Guest Additions (<= VBox 6.0) did not have any context ID handling, so we ASSUME that the last event registered
          * is the one we want to handle (as this all was a synchronous protocol anyway). */
-        uEvent = ShClEventGetLast(&pClient->EventSrc);
+        idEvent = ShClEventGetLast(&pClient->EventSrc);
     }
     else
-        uEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(pCmdCtx->uContextID);
+        idEvent = VBOX_SHCL_CONTEXTID_GET_EVENT(pCmdCtx->uContextID);
 
     int rc = VINF_SUCCESS;
@@ -1232 +1232 @@
     PSHCLEVENTPAYLOAD pPayload = NULL;
     if (pData->cbData)
-        rc = ShClPayloadAlloc(uEvent, pData->pvData, pData->cbData, &pPayload);
+        rc = ShClPayloadAlloc(idEvent, pData->pvData, pData->cbData, &pPayload);
 
     if (RT_SUCCESS(rc))
     {
         RTCritSectEnter(&pClient->CritSect);
-        rc = ShClEventSignal(&pClient->EventSrc, uEvent, pPayload);
+        rc = ShClEventSignal(&pClient->EventSrc, idEvent, pPayload);
         RTCritSectLeave(&pClient->CritSect);
         if (RT_FAILURE(rc))
@@ -2392 +2392 @@
             /* The service extension wants read data from the guest. */
             case VBOX_CLIPBOARD_EXT_FN_DATA_READ:
-                rc = ShClSvcDataReadRequest(pClient, u32Format, NULL /* puEvent */);
+                rc = ShClSvcDataReadRequest(pClient, u32Format, NULL /* pidEvent */);
                 break;
 

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp

@@ -130 +130 @@
 static void testMsgAddReadData(PSHCLCLIENT pClient, uint32_t fFormat)
 {
-    int rc = ShClSvcDataReadRequest(pClient, fFormat, NULL /* puEvent */);
+    int rc = ShClSvcDataReadRequest(pClient, fFormat, NULL /* pidEvent */);
     RTTESTI_CHECK_RC_OK(rc);
 }