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

Timestamp:

Oct 24, 2022 10:00:13 AM (2 years ago)

Author:

vboxsync

Message:

Shared Clipboard/testcase: Also enabled building reading host clipboard data from the guest side (also wrt overflow handling) with the HGCM mocking framework on Windows and Solaris. Also contains some Windows-related build adjustments.

Location:

trunk/src/VBox/HostServices/SharedClipboard/testcase

Files:

• Makefile.kmk (modified) (2 diffs)
• tstClipboardMockHGCM.cpp (modified) (7 diffs)

trunk/src/VBox/HostServices/SharedClipboard/testcase/Makefile.kmk

@@ -40 +40 @@
 #       without #ifdef modifications to the core code!
 #
-PROGRAMS.linux += tstClipboardMockHGCM
 tstClipboardMockHGCM_TEMPLATE = VBOXR3TSTEXE
 tstClipboardMockHGCM_DEFS     = VBOX_WITH_HGCM VBOX_WITH_SHARED_CLIPBOARD
@@ -51 +50 @@
 tstClipboardMockHGCM_LIBS     = $(LIB_RUNTIME)
 
-if1of ($(KBUILD_TARGET), linux)
- tstClipboardMockHGCM_SOURCES.linux  += \
+if1of ($(KBUILD_TARGET), linux solaris)
+ PROGRAMS += tstClipboardMockHGCM
+ tstClipboardMockHGCM_SOURCES += \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
         ../VBoxSharedClipboardSvc-x11.cpp
- tstClipboardMockHGCM_LIBPATH = \
+ tstClipboardMockHGCM_LIBPATH  = \
         $(VBOX_LIBPATH_X11)
- tstClipboardMockHGCM_LIBS   += \
+ tstClipboardMockHGCM_LIBS    += \
         Xt \
         X11
 endif
+if1of ($(KBUILD_TARGET), win)
+ PROGRAMS += tstClipboardMockHGCM
+ tstClipboardMockHGCM_SOURCES += \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp \
+        ../VBoxSharedClipboardSvc-win.cpp
+endif
 
-tstClipboardMockHGCM_SOURCES.darwin += ../VBoxSharedClipboardSvc-darwin.cpp
-tstClipboardMockHGCM_SOURCES.win    += ../VBoxSharedClipboardSvc-win.cpp
-
-tstClipboardMockHGCM_CLEAN           = $(tstClipboardMockHGCM_0_OUTDIR)/tstClipboardMockHGCM.run
+tstClipboardMockHGCM_CLEAN = $(tstClipboardMockHGCM_0_OUTDIR)/tstClipboardMockHGCM.run
 
 if defined(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS)

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

@@ -369 +369 @@
  * Test: Guest reading from host                                                                                                 *
  ********************************************************************************************************************************/
-#if defined(RT_OS_LINUX)
+#if defined (RT_OS_LINUX) || defined (RT_OS_SOLARIS)
 /* Called from SHCLX11 thread. */
 static DECLCALLBACK(int) tstTestReadFromHost_ReportFormatsCallback(PSHCLCONTEXT pCtx, uint32_t fFormats, void *pvUser)
@@ -402 +402 @@
     return VINF_SUCCESS;
 }
-#endif /* RT_OS_LINUX */
+#endif /* (RT_OS_LINUX) || defined (RT_OS_SOLARIS) */
 
 typedef struct TSTUSERMOCK
@@ -475 +475 @@
           *      It in turn returns VINF_BUFFER_OVERFLOW when the supplied buffer was too small. */
 
-        uint32_t cbChunk    = RTRandU32Ex(1, pTask->cbData / cChunkedReads);
+        uint32_t cbChunk    = RTRandU32Ex(1, (uint32_t)(pTask->cbData / cChunkedReads));
         uint32_t cbRead     = 0;
         RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Guest trying to read %RU32 bytes\n", cbChunk);
@@ -493 +493 @@
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Reading full data (%zu)\n", pTask->cbData);
     uint32_t cbRead = 0;
-    int vrc2 = VbglR3ClipboardReadData(pCmdCtx->idClient, pTask->enmFmtGst, pabDst, cbDst, &cbRead);
+    int vrc2 = VbglR3ClipboardReadData(pCmdCtx->idClient, pTask->enmFmtGst, pabDst, (uint32_t)cbDst, &cbRead);
     RTTEST_CHECK_MSG(g_hTest, vrc2 == VINF_SUCCESS, (g_hTest, "Got %Rrc, expected VINF_SUCCESS\n", vrc2));
     RTTEST_CHECK_MSG(g_hTest, cbRead == cbToRead, (g_hTest, "Read %RU32 bytes, expected %zu\n", cbRead, cbToRead));
@@ -554 +554 @@
     RT_NOREF(ppvCtx);
 
+#if defined (RT_OS_LINUX) || defined (RT_OS_SOLARIS)
     /* Initialize the Shared Clipboard backend callbacks. */
     PSHCLBACKEND pBackend = ShClSvcGetBackend();
@@ -562 +563 @@
     ShClCallbacks.pfnOnClipboardRead = tstTestReadFromHost_OnClipboardReadCallback;
     ShClBackendSetCallbacks(pBackend, &ShClCallbacks);
+#endif /* defined (RT_OS_LINUX) || defined (RT_OS_SOLARIS) */
 
     /* Set the right clipboard mode, so that the guest can read from the host. */
@@ -583 +585 @@
     pTask->cbData++; /* Add terminating zero. */
 #else
-    pTask->pvData      = tstGenerateUtf16StringA(pTask->cbData / sizeof(RTUTF16));
+    pTask->pvData      = tstGenerateUtf16StringA((uint32_t)(pTask->cbData / sizeof(RTUTF16)));
     pTask->cbData     += sizeof(RTUTF16); /* Add terminating zero. */
 #endif