Changeset 97274 in vbox for trunk/src/VBox/HostServices

Timestamp:

Oct 24, 2022 8:34:59 AM (2 years ago)

Author:

vboxsync

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

154262

Message:

Validation Kit/HGCM: Added initial GuestHost/HGCMMockUtils.h. See header for docs [build fix].

File:

• trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardMockHGCM.cpp (modified) (4 diffs)

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

@@ -108 +108 @@
     /** Clipboard-specific task data. */
     CLIPBOARDTESTTASK Task;
+    struct
+    {
+        /** The VbglR3 Shared Clipboard context to work on. */
+        VBGLR3SHCLCMDCTX CmdCtx;
+    } Guest;
 } CLIPBOARDTESTCTX;
 
@@ -460 +465 @@
     }
 
-    PVBGLR3SHCLCMDCTX pCmdCtx = &pCtx->HGCM.Guest.CmdCtx;
+    PVBGLR3SHCLCMDCTX pCmdCtx = &pCtx->Guest.CmdCtx;
 
     /* Do random chunked reads. */
@@ -513 +518 @@
     RTThreadSleep(1000); /* Fudge; wait until the host has prepared the data for the clipboard. */
 
-    RT_ZERO(pCtx->Guest.CmdCtx);
-    RTTEST_CHECK_RC_OK(g_hTest, VbglR3ClipboardConnectEx(&pCtx->Guest.CmdCtx, VBOX_SHCL_GF_0_CONTEXT_ID));
-
-    RTThreadSleep(1000); /* Fudge; wait until the host has prepared the data for the clipboard. */
-
     PCLIPBOARDTESTCTX  pTstCtx  = (PCLIPBOARDTESTCTX)pvCtx;
     AssertPtr(pTstCtx);
+
+    RT_ZERO(pTstCtx->Guest.CmdCtx);
+    RTTEST_CHECK_RC_OK(g_hTest, VbglR3ClipboardConnectEx(&pTstCtx->Guest.CmdCtx, VBOX_SHCL_GF_0_CONTEXT_ID));
+
+    RTThreadSleep(1000); /* Fudge; wait until the host has prepared the data for the clipboard. */
+
     PCLIPBOARDTESTTASK pTstTask = (PCLIPBOARDTESTTASK)pCtx->Task.pvUser;
     AssertPtr(pTstTask);
@@ -527 +533 @@
     TstHGCMUtilsTaskSignal(&pCtx->Task, VINF_SUCCESS);
 
-    RTTEST_CHECK_RC_OK(g_hTest, VbglR3ClipboardDisconnectEx(&pCtx->Guest.CmdCtx));
+    RTTEST_CHECK_RC_OK(g_hTest, VbglR3ClipboardDisconnectEx(&pTstCtx->Guest.CmdCtx));
 
     return VINF_SUCCESS;