Changeset 93495 in vbox for trunk/src/VBox/HostServices/SharedClipboard/testcase

Timestamp:

Jan 31, 2022 1:08:33 PM (3 years ago)

Author:

vboxsync

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

149618

Message:

Shared Clipboard: Implemented backend callbacks and a dedicated backend context, together with a new testcase which mocks HGCM to also test the guest-side clipboard code (disabled by default for now). Work in progress, only tested on Linux so far.

Location:

trunk/src/VBox/HostServices/SharedClipboard/testcase

Files:

• Makefile.kmk (modified) (1 diff)
• tstClipboardMockHGCM.cpp (added)
• tstClipboardServiceHost.cpp (modified) (1 diff)
• tstClipboardServiceImpl.cpp (modified) (2 diffs)

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

@@ -20 +20 @@
 
 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
+
+ if 0
+        #
+        # Testcase which mocks HGCM to also test the VbglR3-side of Shared Clipboard.
+        #
+        # Goal is to use and test as much guest side code as possible as a self-contained
+        # binary on the host here.
+        #
+        # Note: No #ifdef TESTCASE hacks or similar allowed, has to run
+        #       without #ifdef modifications to the core code!
+        #
+        PROGRAMS += tstClipboardMockHGCM
+        tstClipboardMockHGCM_TEMPLATE = VBOXR3TSTEXE
+        tstClipboardMockHGCM_DEFS     = VBOX_WITH_HGCM VBOX_WITH_SHARED_CLIPBOARD
+        tstClipboardMockHGCM_SOURCES  = \
+                ../VBoxSharedClipboardSvc.cpp \
+                $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-common.cpp \
+                $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp \
+                $(PATH_ROOT)/src/VBox/HostServices/common/message.cpp \
+                tstClipboardMockHGCM.cpp
+        tstClipboardMockHGCM_LIBS     = $(LIB_RUNTIME)
+
+        if1of ($(KBUILD_TARGET), linux)
+         tstClipboardMockHGCM_SOURCES.linux  += \
+                $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp \
+                ../VBoxSharedClipboardSvc-x11.cpp
+         tstClipboardMockHGCM_LIBPATH = \
+                $(VBOX_LIBPATH_X11)
+         tstClipboardMockHGCM_LIBS   += \
+                Xt \
+                X11
+        endif
+
+        tstClipboardMockHGCM_SOURCES.darwin += ../VBoxSharedClipboardSvc-darwin.cpp
+        tstClipboardMockHGCM_SOURCES.win    += ../VBoxSharedClipboardSvc-win.cpp
+
+        tstClipboardMockHGCM_CLEAN           = $(tstClipboardMockHGCM_0_OUTDIR)/tstClipboardMockHGCM.run
+
+        if defined(VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS)
+         tstClipboardMockHGCM_DEFS    += VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
+         tstClipboardMockHGCM_SOURCES += \
+                ../VBoxSharedClipboardSvc-transfers.cpp \
+         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp
+        endif
+ endif
 
  #

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

@@ -310 +310 @@
 }
 
-int ShClBackendInit(VBOXHGCMSVCFNTABLE *) { return VINF_SUCCESS; }
-void ShClBackendDestroy() { }
-int ShClBackendDisconnect(PSHCLCLIENT) { return VINF_SUCCESS; }
-int ShClBackendConnect(PSHCLCLIENT, bool) { return VINF_SUCCESS; }
-int ShClBackendFormatAnnounce(PSHCLCLIENT, SHCLFORMATS) { AssertFailed(); return VINF_SUCCESS; }
-int ShClBackendReadData(PSHCLCLIENT, PSHCLCLIENTCMDCTX, SHCLFORMAT, void *, uint32_t, unsigned int *) { AssertFailed(); return VERR_WRONG_ORDER; }
-int ShClBackendWriteData(PSHCLCLIENT, PSHCLCLIENTCMDCTX, SHCLFORMAT, void *, uint32_t) { AssertFailed(); return VINF_SUCCESS; }
-int ShClBackendSync(PSHCLCLIENT) { return VINF_SUCCESS; }
+int ShClBackendInit(PSHCLBACKEND, VBOXHGCMSVCFNTABLE *) { return VINF_SUCCESS; }
+void ShClBackendDestroy(PSHCLBACKEND) { }
+int ShClBackendDisconnect(PSHCLBACKEND, PSHCLCLIENT) { return VINF_SUCCESS; }
+int ShClBackendConnect(PSHCLBACKEND, PSHCLCLIENT, bool) { return VINF_SUCCESS; }
+int ShClBackendFormatAnnounce(PSHCLBACKEND, PSHCLCLIENT, SHCLFORMATS) { AssertFailed(); return VINF_SUCCESS; }
+int ShClBackendReadData(PSHCLBACKEND, PSHCLCLIENT, PSHCLCLIENTCMDCTX, SHCLFORMAT, void *, uint32_t, unsigned int *) { AssertFailed(); return VERR_WRONG_ORDER; }
+int ShClBackendWriteData(PSHCLBACKEND, PSHCLCLIENT, PSHCLCLIENTCMDCTX, SHCLFORMAT, void *, uint32_t) { AssertFailed(); return VINF_SUCCESS; }
+int ShClBackendSync(PSHCLBACKEND, PSHCLCLIENT) { return VINF_SUCCESS; }
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-int ShClBackendTransferCreate(PSHCLCLIENT, PSHCLTRANSFER) { return VINF_SUCCESS; }
-int ShClBackendTransferDestroy(PSHCLCLIENT, PSHCLTRANSFER) { return VINF_SUCCESS; }
-int ShClBackendTransferGetRoots(PSHCLCLIENT, PSHCLTRANSFER) { return VINF_SUCCESS; }
+int ShClBackendTransferCreate(PSHCLBACKEND, PSHCLCLIENT, PSHCLTRANSFER) { return VINF_SUCCESS; }
+int ShClBackendTransferDestroy(PSHCLBACKEND, PSHCLCLIENT, PSHCLTRANSFER) { return VINF_SUCCESS; }
+int ShClBackendTransferGetRoots(PSHCLBACKEND, PSHCLCLIENT, PSHCLTRANSFER) { return VINF_SUCCESS; }
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 

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

@@ -27 +27 @@
 #include <iprt/test.h>
 
-extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad (VBOXHGCMSVCFNTABLE *ptable);
+extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad(VBOXHGCMSVCFNTABLE *ptable);
 
 static SHCLCLIENT g_Client;
@@ -55 +55 @@
 }
 
-int ShClBackendInit(VBOXHGCMSVCFNTABLE *) { return VINF_SUCCESS; }
-void ShClBackendDestroy(void) { }
-int ShClBackendDisconnect(PSHCLCLIENT) { return VINF_SUCCESS; }
-int ShClBackendConnect(PSHCLCLIENT, bool) { return VINF_SUCCESS; }
-int ShClBackendFormatAnnounce(PSHCLCLIENT, SHCLFORMATS) { AssertFailed(); return VINF_SUCCESS; }
-int ShClBackendReadData(PSHCLCLIENT, PSHCLCLIENTCMDCTX, SHCLFORMAT, void *, uint32_t, unsigned int *) { AssertFailed(); return VERR_WRONG_ORDER; }
-int ShClBackendWriteData(PSHCLCLIENT, PSHCLCLIENTCMDCTX, SHCLFORMAT, void *, uint32_t) { AssertFailed(); return VINF_SUCCESS; }
-int ShClBackendSync(PSHCLCLIENT) { return VINF_SUCCESS; }
+int ShClBackendInit(PSHCLBACKEND, VBOXHGCMSVCFNTABLE *) { return VINF_SUCCESS; }
+void ShClBackendDestroy(PSHCLBACKEND) { }
+int ShClBackendDisconnect(PSHCLBACKEND, PSHCLCLIENT) { return VINF_SUCCESS; }
+int ShClBackendConnect(PSHCLBACKEND, PSHCLCLIENT, bool) { return VINF_SUCCESS; }
+int ShClBackendFormatAnnounce(PSHCLBACKEND, PSHCLCLIENT, SHCLFORMATS) { AssertFailed(); return VINF_SUCCESS; }
+int ShClBackendReadData(PSHCLBACKEND, PSHCLCLIENT, PSHCLCLIENTCMDCTX, SHCLFORMAT, void *, uint32_t, unsigned int *) { AssertFailed(); return VERR_WRONG_ORDER; }
+int ShClBackendWriteData(PSHCLBACKEND, PSHCLCLIENT, PSHCLCLIENTCMDCTX, SHCLFORMAT, void *, uint32_t) { AssertFailed(); return VINF_SUCCESS; }
+int ShClBackendSync(PSHCLBACKEND, PSHCLCLIENT) { return VINF_SUCCESS; }
 
 static void testAnnounceAndReadData(void)