Changeset 80283 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Aug 15, 2019 8:47:23 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update; more work on root list handling.

File:

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

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

@@ -59 +59 @@
     /** Pointer to the VBoxClient service environment. */
     const VBOXSERVICEENV    *pEnv;
-    /** Client ID the service is connected to the HGCM service with. */
-    uint32_t                 u32ClientID;
+    /** Command context. */
+    VBGLR3SHCLCMDCTX         CmdCtx;
     /** Windows-specific context data. */
     VBOXCLIPBOARDWINCTX      Win;
@@ -119 +119 @@
     RTThreadUserSignal(RTThreadSelf());
 
-    uint32_t uClientID;
-    int rc = VbglR3ClipboardConnect(&uClientID);
+    VBGLR3SHCLCMDCTX cmdCtx;
+    RT_ZERO(cmdCtx);
+
+    int rc = VbglR3ClipboardConnect(&cmdCtx.uClientID);
     if (RT_SUCCESS(rc))
     {
-        rc = VbglR3ClipboardTransferSendStatus(uClientID, SHAREDCLIPBOARDURITRANSFERSTATUS_RUNNING);
+        rc = VbglR3ClipboardTransferSendStatus(&cmdCtx, SHAREDCLIPBOARDURITRANSFERSTATUS_RUNNING);
         if (RT_SUCCESS(rc))
         {
@@ -132 +134 @@
             {
                 PVBGLR3CLIPBOARDEVENT pEvent = NULL;
-                rc = VbglR3ClipboardEventGetNext(uClientID, pTransfer, &pEvent);
+                rc = VbglR3ClipboardEventGetNext(&cmdCtx, pTransfer, &pEvent);
                 if (RT_SUCCESS(rc))
                 {
@@ -152 +154 @@
         }
 
-        VbglR3ClipboardDisconnect(uClientID);
+        VbglR3ClipboardDisconnect(cmdCtx.uClientID);
     }
 
@@ -235 +237 @@
     AssertPtr(pThisCtx);
 
+    RT_NOREF(pThisCtx);
+
     int rc = 0; // VbglR3ClipboardRecvListOpen(pThisCtx->u32ClientID, pListHdr, phList);
 
@@ -251 +255 @@
     AssertPtr(pThisCtx);
 
-    LogFlowFunc(("c=%RU32\n", pThisCtx->u32ClientID));
+    RT_NOREF(pThisCtx);
 
     int rc = SharedClipboardURIListHdrInit(pListHdr);
@@ -293 +297 @@
     AssertPtr(pThisCtx);
 
+    RT_NOREF(pThisCtx);
+
     RT_NOREF(pListEntry);
     int rc = 0; // VbglR3ClipboardListEntryRead(pThisCtx->u32ClientID, pListEntry);
@@ -316 +322 @@
 */
 
-static int vboxClipboardURIObjOpen(PSHAREDCLIPBOARDPROVIDERCTX pCtx, const char *pszPath,
-                                   PVBOXCLIPBOARDCREATEPARMS pCreateParms, PSHAREDCLIPBOARDOBJHANDLE phObj)
+static int vboxClipboardURIObjOpen(PSHAREDCLIPBOARDPROVIDERCTX pCtx,
+                                   PVBOXCLIPBOARDOBJOPENCREATEPARMS pCreateParms, PSHAREDCLIPBOARDOBJHANDLE phObj)
 {
     LogFlowFuncEnter();
@@ -324 +330 @@
     AssertPtr(pThisCtx);
 
-    int rc = VbglR3ClipboardObjOpen(pThisCtx->u32ClientID, pszPath, pCreateParms, phObj);
+    int rc = VbglR3ClipboardObjOpenSend(&pThisCtx->CmdCtx, pCreateParms, phObj);
 
     LogFlowFuncLeaveRC(rc);
@@ -337 +343 @@
     AssertPtr(pThisCtx);
 
-    int rc = VbglR3ClipboardObjClose(pThisCtx->u32ClientID, hObj);
+    int rc = VbglR3ClipboardObjCloseSend(&pThisCtx->CmdCtx, hObj);
 
     LogFlowFuncLeaveRC(rc);
@@ -353 +359 @@
     AssertPtr(pThisCtx);
 
-    int rc = VbglR3ClipboardObjRead(pThisCtx->u32ClientID, hObj, pvData, cbData, pcbRead);
+    int rc = VbglR3ClipboardObjReadSend(&pThisCtx->CmdCtx, hObj, pvData, cbData, pcbRead);
 
     LogFlowFuncLeaveRC(rc);
@@ -369 +375 @@
     AssertPtr(pThisCtx);
 
-    int rc = VbglR3ClipboardObjWrite(pThisCtx->u32ClientID, hObj, pvData, cbData, pcbWritten);
+    int rc = VbglR3ClipboardObjWriteSend(&pThisCtx->CmdCtx, hObj, pvData, cbData, pcbWritten);
 
     LogFlowFuncLeaveRC(rc);
@@ -401 +407 @@
                {
                    LogFunc(("WM_CLIPBOARDUPDATE: Reporting formats 0x%x\n", fFormats));
-                   rc = VbglR3ClipboardReportFormats(pCtx->u32ClientID, fFormats);
+                   rc = VbglR3ClipboardReportFormats(pCtx->CmdCtx.uClientID, fFormats);
                }
            }
@@ -425 +431 @@
                int rc = VBoxClipboardWinGetFormats(pWinCtx, &fFormats);
                if (RT_SUCCESS(rc))
-                   rc = VbglR3ClipboardReportFormats(pCtx->u32ClientID, fFormats);
+                   rc = VbglR3ClipboardReportFormats(pCtx->CmdCtx.uClientID, fFormats);
            }
 
@@ -478 +484 @@
                    {
                        /* Read the host data to the preallocated buffer. */
-                       int rc = VbglR3ClipboardReadData(pCtx->u32ClientID, fFormat, pMem, cbPrealloc, &cb);
+                       int rc = VbglR3ClipboardReadData(pCtx->CmdCtx.uClientID, fFormat, pMem, cbPrealloc, &cb);
                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc\n",  rc));
 
@@ -509 +515 @@
                                        /* Read the host data to the preallocated buffer. */
                                        uint32_t cbNew = 0;
-                                       rc = VbglR3ClipboardReadData(pCtx->u32ClientID, fFormat, pMem, cb, &cbNew);
+                                       rc = VbglR3ClipboardReadData(pCtx->CmdCtx.uClientID, fFormat, pMem, cb, &cbNew);
                                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc, cb = %d, cbNew = %d\n",
                                                     rc, cb, cbNew));
@@ -698 +704 @@
                        if (lp != NULL)
                        {
-                           rc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_BITMAP,
+                           rc = VbglR3ClipboardWriteData(pCtx->CmdCtx.uClientID, VBOX_SHARED_CLIPBOARD_FMT_BITMAP,
                                                          lp, GlobalSize(hClip));
                            GlobalUnlock(hClip);
@@ -716 +722 @@
                        if (uniString != NULL)
                        {
-                           rc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+                           rc = VbglR3ClipboardWriteData(pCtx->CmdCtx.uClientID, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
                                                          uniString, (lstrlenW(uniString) + 1) * 2);
                            GlobalUnlock(hClip);
@@ -738 +744 @@
                            if (lp != NULL)
                            {
-                               rc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_HTML,
+                               rc = VbglR3ClipboardWriteData(pCtx->CmdCtx.uClientID, VBOX_SHARED_CLIPBOARD_FMT_HTML,
                                                              lp, GlobalSize(hClip));
                                GlobalUnlock(hClip);
@@ -755 +761 @@
 
                    /* Requested clipboard format is not available, send empty data. */
-                   VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_NONE, NULL, 0);
+                   VbglR3ClipboardWriteData(pCtx->CmdCtx.uClientID, VBOX_SHARED_CLIPBOARD_FMT_NONE, NULL, 0);
 #ifdef DEBUG_andy
                    AssertFailed();
@@ -1047 +1053 @@
         /* ignore rc */ VBoxClipboardWinCheckAndInitNewAPI(&pCtx->Win.newAPI);
 
-        rc = VbglR3ClipboardConnect(&pCtx->u32ClientID);
+        rc = VbglR3ClipboardConnect(&pCtx->CmdCtx.uClientID);
         if (RT_SUCCESS(rc))
         {
+            pCtx->CmdCtx.uProtocol = 0;
+
             rc = vboxClipboardCreateWindow(pCtx);
             if (RT_SUCCESS(rc))
@@ -1061 +1069 @@
             else
             {
-                VbglR3ClipboardDisconnect(pCtx->u32ClientID);
+                VbglR3ClipboardDisconnect(pCtx->CmdCtx.uClientID);
             }
         }
@@ -1095 +1103 @@
         uint32_t u32Msg;
         uint32_t u32Formats;
-        rc = VbglR3ClipboardGetHostMsgOld(pCtx->u32ClientID, &u32Msg, &u32Formats);
+        rc = VbglR3ClipboardGetHostMsgOld(pCtx->CmdCtx.uClientID, &u32Msg, &u32Formats);
         if (RT_FAILURE(rc))
         {
@@ -1185 +1193 @@
     AssertPtr(pCtx);
 
-    VbglR3ClipboardDisconnect(pCtx->u32ClientID);
-    pCtx->u32ClientID = 0;
+    VbglR3ClipboardDisconnect(pCtx->CmdCtx.uClientID);
+    pCtx->CmdCtx.uClientID = 0;
 
     LogFlowFuncLeaveRC(VINF_SUCCESS);
@@ -1200 +1208 @@
 
     /* Make sure that we are disconnected. */
-    Assert(pCtx->u32ClientID == 0);
+    Assert(pCtx->CmdCtx.uClientID == 0);
 
     vboxClipboardDestroy(pCtx);