Changeset 80446 in vbox

Timestamp:

Aug 27, 2019 5:56:22 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132937

Message:

Shared Clipboard/URI: Build fix.

Location:

trunk

Files:

• include/VBox/HostServices/VBoxClipboardSvc.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (2 diffs)
• src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp (modified) (2 diffs)

trunk/include/VBox/HostServices/VBoxClipboardSvc.h

@@ -324 +324 @@
             HGCMFunctionParameter pvData;
         } v1;
-    };
+    } u;
 } VBoxClipboardWriteDataMsg;
 

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -1706 +1706 @@
                        VBOX_SHARED_CLIPBOARD_GUEST_FN_DATA_WRITE, 2);
 
-    VbglHGCMParmUInt32Set(&Msg.v0.format, fFormat);
-    VbglHGCMParmPtrSet(&Msg.v0.ptr, pv, cb);
+    VbglHGCMParmUInt32Set(&Msg.u.v0.format, fFormat);
+    VbglHGCMParmPtrSet(&Msg.u.v0.ptr, pv, cb);
 
     int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
@@ -1743 +1743 @@
         LogFlowFunc(("CID=%RU32\n", pCtx->uContextID));
 
-        Msg.v1.uContext.SetUInt32(pCtx->uContextID);
-        Msg.v1.uFormat.SetUInt32(pData->uFormat);
-        Msg.v1.cbData.SetUInt32(pData->cbData);
-        Msg.v1.pvData.SetPtr(pData->pvData, pData->cbData);
+        Msg.u.v1.uContext.SetUInt32(pCtx->uContextID);
+        Msg.u.v1.uFormat.SetUInt32(pData->uFormat);
+        Msg.u.v1.cbData.SetUInt32(pData->cbData);
+        Msg.u.v1.pvData.SetPtr(pData->pvData, pData->cbData);
 
         rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));

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

@@ -26 +26 @@
 extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad (VBOXHGCMSVCFNTABLE *ptable);
 
-static VBOXCLIPBOARDCLIENTDATA g_Client;
+static VBOXCLIPBOARDCLIENT g_Client;
 static VBOXHGCMSVCHELPERS g_Helpers = { NULL };
 
@@ -281 +281 @@
 int VBoxClipboardSvcImplConnect(PVBOXCLIPBOARDCLIENT, bool)
 { return VINF_SUCCESS; }
-int VBoxClipboardSvcImplFormatAnnounce(PVBOXCLIPBOARDCLIENT, PVBOXCLIPBOARDCLIENTCMDCTX pCmdCtx, PSHAREDCLIPBOARDFORMATDATA pFormats)
+int VBoxClipboardSvcImplFormatAnnounce(PVBOXCLIPBOARDCLIENT, PVBOXCLIPBOARDCLIENTCMDCTX, PSHAREDCLIPBOARDFORMATDATA)
 { AssertFailed(); return VINF_SUCCESS; }
-int VBoxClipboardSvcImplReadData(PVBOXCLIPBOARDCLIENT, PVBOXCLIPBOARDCLIENTCMDCTX pCmdCtx, PSHAREDCLIPBOARDDATABLOCK pData, unsigned int *)
+int VBoxClipboardSvcImplReadData(PVBOXCLIPBOARDCLIENT, PVBOXCLIPBOARDCLIENTCMDCTX, PSHAREDCLIPBOARDDATABLOCK, unsigned int *)
 { AssertFailed(); return VERR_WRONG_ORDER; }
-int VBoxClipboardSvcImplWriteData(PVBOXCLIPBOARDCLIENT, PVBOXCLIPBOARDCLIENTCMDCTX pCmdCtx, PSHAREDCLIPBOARDDATABLOCK pData)
+int VBoxClipboardSvcImplWriteData(PVBOXCLIPBOARDCLIENT, PVBOXCLIPBOARDCLIENTCMDCTX, PSHAREDCLIPBOARDDATABLOCK)
 { AssertFailed(); return VINF_SUCCESS; }
 int VBoxClipboardSvcImplSync(PVBOXCLIPBOARDCLIENT)