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

Timestamp:

Dec 9, 2019 7:48:38 PM (5 years ago)

Author:

vboxsync

Message:

SharedClipboardSvc,Vbgl: Looked at the connect and feature exchange stuff. Decided to make the connect one always fail, that way the beta and rc additions should not try make use of any of the new features and we should be free to do whatever we like. Need to circle back and drop the _61B parameter count variants later. bugref:9437

File:

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

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

@@ -257 +257 @@
                     {
                         LogFunc(("WM_CLIPBOARDUPDATE: Reporting formats %#x\n", Formats.Formats));
-                        rc = VbglR3ClipboardReportFormats(pCtx->CmdCtx.uClientID, Formats.Formats);
+                        rc = VbglR3ClipboardReportFormats(pCtx->CmdCtx.idClient, Formats.Formats);
                     }
                 }
@@ -303 +303 @@
                     if (   RT_SUCCESS(rc)
                         && Formats.Formats != VBOX_SHCL_FMT_NONE)
-                        rc = VbglR3ClipboardReportFormats(pCtx->CmdCtx.uClientID, Formats.Formats);
+                        rc = VbglR3ClipboardReportFormats(pCtx->CmdCtx.idClient, Formats.Formats);
                 }
                 else
@@ -647 +647 @@
 
                     /* Requested clipboard format is not available, send empty data. */
-                    VbglR3ClipboardWriteData(pCtx->CmdCtx.uClientID, VBOX_SHCL_FMT_NONE, NULL, 0);
+                    VbglR3ClipboardWriteData(pCtx->CmdCtx.idClient, VBOX_SHCL_FMT_NONE, NULL, 0);
                 }
 
@@ -922 +922 @@
         rc = SharedClipboardWinCtxInit(&pCtx->Win);
         if (RT_SUCCESS(rc))
-            rc = VbglR3ClipboardConnectEx(&pCtx->CmdCtx);
+            rc = VbglR3ClipboardConnectEx(&pCtx->CmdCtx, VBOX_SHCL_GF_0_CONTEXT_ID);
         if (RT_SUCCESS(rc))
         {
@@ -1004 +1004 @@
         if (pCtx->CmdCtx.fUseLegacyProtocol)
         {
-            rc = VbglR3ClipboardGetHostMsgOld(pCtx->CmdCtx.uClientID, &uMsg, &uFormats);
+            rc = VbglR3ClipboardGetHostMsgOld(pCtx->CmdCtx.idClient, &uMsg, &uFormats);
             if (RT_FAILURE(rc))
             {
@@ -1179 +1179 @@
     /* Disconnect from the host service.
      * This will also send a VBOX_SHCL_HOST_MSG_QUIT from the host so that we can break out from our message worker. */
-    VbglR3ClipboardDisconnect(pCtx->CmdCtx.uClientID);
-    pCtx->CmdCtx.uClientID = 0;
+    VbglR3ClipboardDisconnect(pCtx->CmdCtx.idClient);
+    pCtx->CmdCtx.idClient = 0;
 
     LogFlowFuncLeaveRC(VINF_SUCCESS);
@@ -1194 +1194 @@
 
     /* Make sure that we are disconnected. */
-    Assert(pCtx->CmdCtx.uClientID == 0);
+    Assert(pCtx->CmdCtx.idClient == 0);
 
     vboxClipboardDestroy(pCtx);