Changeset 78625 in vbox for trunk/src/VBox

Timestamp:

May 21, 2019 9:47:03 AM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Windows build fix.

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (8 diffs)

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

@@ -162 +162 @@
     Assert(pCtx->pClientData);
     Assert(pCtx->hRenderEvent);
-    Assert(pCtx->pClientData->data.pv == NULL && pCtx->pClientData->data.cb == 0 && pCtx->pClientData->data.u32Format == 0);
+    Assert(pCtx->pClientData->State.data.pv == NULL && pCtx->pClientData->State.data.cb == 0 && pCtx->pClientData->State.data.u32Format == 0);
 
     LogFlowFunc(("fFormat=%02X\n", fFormat));
@@ -300 +300 @@
 
                 LogFunc(("vboxClipboardReadDataFromClient rc = %Rrc, pv %p, cb %d, u32Format %d\n",
-                          rc, pCtx->pClientData->data.pv, pCtx->pClientData->data.cb, pCtx->pClientData->data.u32Format));
+                          rc, pCtx->pClientData->State.data.pv, pCtx->pClientData->State.data.cb, pCtx->pClientData->State.data.u32Format));
 
                 if (   RT_SUCCESS (rc)
-                    && pCtx->pClientData->data.pv != NULL
-                    && pCtx->pClientData->data.cb > 0
-                    && pCtx->pClientData->data.u32Format == fFormat)
-                {
-                    HANDLE hMem = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, pCtx->pClientData->data.cb);
+                    && pCtx->pClientData->State.data.pv != NULL
+                    && pCtx->pClientData->State.data.cb > 0
+                    && pCtx->pClientData->State.data.u32Format == fFormat)
+                {
+                    HANDLE hMem = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, pCtx->pClientData->State.data.cb);
 
                     LogFunc(("hMem %p\n", hMem));
@@ -321 +321 @@
                             LogFunc(("WM_RENDERFORMAT setting data\n"));
 
-                            if (pCtx->pClientData->data.pv)
+                            if (pCtx->pClientData->State.data.pv)
                             {
-                                memcpy(pMem, pCtx->pClientData->data.pv, pCtx->pClientData->data.cb);
-
-                                RTMemFree(pCtx->pClientData->data.pv);
-                                pCtx->pClientData->data.pv        = NULL;
+                                memcpy(pMem, pCtx->pClientData->State.data.pv, pCtx->pClientData->State.data.cb);
+
+                                RTMemFree(pCtx->pClientData->State.data.pv);
+                                pCtx->pClientData->State.data.pv        = NULL;
                             }
 
-                            pCtx->pClientData->data.cb        = 0;
-                            pCtx->pClientData->data.u32Format = 0;
+                            pCtx->pClientData->State.data.cb        = 0;
+                            pCtx->pClientData->State.data.u32Format = 0;
 
                             /* The memory must be unlocked before inserting to the Clipboard. */
@@ -353 +353 @@
                 }
 
-                RTMemFree(pCtx->pClientData->data.pv);
-                pCtx->pClientData->data.pv        = NULL;
-                pCtx->pClientData->data.cb        = 0;
-                pCtx->pClientData->data.u32Format = 0;
+                RTMemFree(pCtx->pClientData->State.data.pv);
+                pCtx->pClientData->State.data.pv        = NULL;
+                pCtx->pClientData->State.data.cb        = 0;
+                pCtx->pClientData->State.data.u32Format = 0;
 
                 /* Something went wrong. */
@@ -684 +684 @@
 int VBoxClipboardSvcImplReadData(PVBOXCLIPBOARDCLIENTDATA pClientData, uint32_t u32Format, void *pv, uint32_t cb, uint32_t *pcbActual)
 {
-    AssertPtrReturn(pClientData,       VERR_INVALID_POINTER);
+    AssertPtrReturn(pClientData,             VERR_INVALID_POINTER);
     AssertPtrReturn(pClientData->State.pCtx, VERR_INVALID_POINTER);
 
@@ -823 +823 @@
      * The guest returns data that was requested in the WM_RENDERFORMAT handler.
      */
-    Assert(pClientData->data.pv == NULL && pClientData->data.cb == 0 && pClientData->data.u32Format == 0);
+    Assert(pClientData->State.data.pv == NULL && pClientData->State.data.cb == 0 && pClientData->State.data.u32Format == 0);
 
     vboxClipboardDump(pv, cb, u32Format);
@@ -841 +841 @@
                 if (pszResult != NULL && cbResult != 0)
                 {
-                    pClientData->data.pv        = pszResult;
-                    pClientData->data.cb        = cbResult;
-                    pClientData->data.u32Format = u32Format;
+                    pClientData->State.data.pv        = pszResult;
+                    pClientData->State.data.cb        = cbResult;
+                    pClientData->State.data.u32Format = u32Format;
                 }
             }
@@ -849 +849 @@
         else
         {
-            pClientData->data.pv = RTMemDup(pv, cb);
-            if (pClientData->data.pv)
-            {
-                pClientData->data.cb = cb;
-                pClientData->data.u32Format = u32Format;
+            pClientData->State.data.pv = RTMemDup(pv, cb);
+            if (pClientData->State.data.pv)
+            {
+                pClientData->State.data.cb = cb;
+                pClientData->State.data.u32Format = u32Format;
             }
         }