Changeset 37458 in vbox

Timestamp:

Jun 14, 2011 9:15:32 PM (14 years ago)

Author:

vboxsync

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

72267

Message:

HostServices/SharedClipboard/testcase: re-enable Windows

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxClipboard.h (modified) (1 diff)
• service.cpp (modified) (3 diffs)
• testcase/Makefile.kmk (modified) (1 diff)
• testcase/tstClipboardServiceHost.cpp (modified) (5 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard.h

@@ -95 +95 @@
 /* Host unit testing interface */
 #ifdef UNIT_TEST
-uint32_t testClipSvcGetMode(void);
+uint32_t TestClipSvcGetMode(void);
 #endif
 

trunk/src/VBox/HostServices/SharedClipboard/service.cpp

@@ -144 +144 @@
 #ifdef UNIT_TEST
 /** Testing interface, getter for clipboard mode */
-uint32_t testClipSvcGetMode(void)
+uint32_t TestClipSvcGetMode(void)
 {
     return vboxSvcClipboardMode();
@@ -743 +743 @@
 }
 
+#ifdef UNIT_TEST
+static int testSSMStubRC(void) { AssertFailedReturn(VERR_WRONG_ORDER); }
+static uint32_t testSSMStubU32(void) { AssertFailedReturn(0); }
+# define SSMR3PutU32(pSSM, u32) testSSMStubRC()
+# define SSMR3PutStructEx(pSSM, pvStruct, cbStruct, fFlags, paFields, pvUser) \
+      testSSMStubRC()
+# define SSMR3GetU32(pSSM, pu32) ( *(pu32) = 0, testSSMStubRC() )
+# define SSMR3HandleHostBits(pSSM) testSSMStubU32()
+# define SSMR3GetStructEx(pSSM, pvStruct, cbStruct, fFlags, paFields, pvUser) \
+      testSSMStubRC()
+#endif
+
 /**
  * SSM descriptor table for the VBOXCLIPBOARDCLIENTDATA structure.
@@ -907 +919 @@
 }
 
+#ifdef UNIT_TEST
+# undef SSMR3PutU32
+# undef SSMR3GetU32
+# undef SSMR3HandleHostBits
+# undef SSMR3GetStructEx
+#endif
+
 static DECLCALLBACK(int) extCallback (uint32_t u32Function, uint32_t u32Format, void *pvData, uint32_t cbData)
 {

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

@@ -21 +21 @@
 if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK)
 
- ifneq ($(KBUILD_TARGET),win)
-  PROGRAMS += tstClipboardServiceHost
- endif
+ PROGRAMS += tstClipboardServiceHost
 
  tstClipboardServiceHost_TEMPLATE = VBOXR3TSTEXE

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

@@ -19 +19 @@
 
 #include <VBox/HostServices/VBoxClipboardSvc.h>
-
-#define IN_VMM_R3 /* so that the SSM function stubs are exports not imports */
-#include <VBox/vmm/ssm.h>
 
 #include <iprt/assert.h>
@@ -51 +48 @@
                            1, parms);
     RTTESTI_CHECK_RC_OK(rc);
-    u32Mode = testClipSvcGetMode();
+    u32Mode = TestClipSvcGetMode();
     RTTESTI_CHECK_MSG(u32Mode == VBOX_SHARED_CLIPBOARD_MODE_OFF,
                       ("u32Mode=%u\n", (unsigned) u32Mode));
@@ -68 +65 @@
                            1, parms);
     RTTESTI_CHECK_RC_OK(rc);
-    u32Mode = testClipSvcGetMode();
+    u32Mode = TestClipSvcGetMode();
     RTTESTI_CHECK_MSG(u32Mode == VBOX_SHARED_CLIPBOARD_MODE_HOST_TO_GUEST,
                       ("u32Mode=%u\n", (unsigned) u32Mode));
@@ -75 +72 @@
                            1, parms);
     RTTESTI_CHECK_RC_OK(rc);
-    u32Mode = testClipSvcGetMode();
+    u32Mode = TestClipSvcGetMode();
     RTTESTI_CHECK_MSG(u32Mode == VBOX_SHARED_CLIPBOARD_MODE_OFF,
                       ("u32Mode=%u\n", (unsigned) u32Mode));
@@ -164 +161 @@
 { AssertFailed(); return VERR_WRONG_ORDER; }
 void vboxClipboardWriteData(_VBOXCLIPBOARDCLIENTDATA*, void*, unsigned int, unsigned int) { AssertFailed(); }
-VMMR3DECL(int) SSMR3PutU32(PSSMHANDLE pSSM, uint32_t u32)
-{ AssertFailed(); return VERR_WRONG_ORDER; }
-VMMR3DECL(int) SSMR3PutStructEx(PSSMHANDLE pSSM, const void *pvStruct, size_t cbStruct, uint32_t fFlags, PCSSMFIELD paFields, void *pvUser)
-{ AssertFailed(); return VERR_WRONG_ORDER; }
-VMMR3DECL(int) SSMR3GetU32(PSSMHANDLE pSSM, uint32_t *pu32)
-{ AssertFailed(); return VERR_WRONG_ORDER; }
-VMMR3DECL(uint32_t)     SSMR3HandleHostBits(PSSMHANDLE pSSM)
-{ AssertFailed(); return 0; }
-VMMR3DECL(int) SSMR3GetStructEx(PSSMHANDLE pSSM, void *pvStruct, size_t cbStruct, uint32_t fFlags, PCSSMFIELD paFields, void *pvUser)
-{ AssertFailed(); return VERR_WRONG_ORDER; }
 int vboxClipboardSync(_VBOXCLIPBOARDCLIENTDATA*)
 { AssertFailed(); return VERR_WRONG_ORDER; }