Changeset 41892 in vbox for trunk/src/VBox

Timestamp:

Jun 22, 2012 6:00:06 PM (13 years ago)

Author:

vboxsync

Message:

SharedClipboard/service.cpp: Redefining APIs screws up for editors that uses tags. Please avoid it or put it in some header we can systematically ignore.

File:

• trunk/src/VBox/HostServices/SharedClipboard/service.cpp (modified) (5 diffs)

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

@@ -745 +745 @@
 }
 
-#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.
@@ -772 +760 @@
 static DECLCALLBACK(int) svcSaveState(void *, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM)
 {
+#ifndef UNIT_TEST
     /* If there are any pending requests, they must be completed here. Since
      * the service is single threaded, there could be only requests
@@ -801 +790 @@
     vboxSvcClipboardCompleteReadData (pClient, VINF_SUCCESS, 0);
 
+#endif /* !UNIT_TEST */
     return VINF_SUCCESS;
 }
@@ -848 +838 @@
 static DECLCALLBACK(int) svcLoadState(void *, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM)
 {
+#ifndef UNIT_TEST
     LogRel2 (("svcLoadState: u32ClientID = %d\n", u32ClientID));
 
@@ -918 +909 @@
     vboxClipboardSync (pClient);
 
+#endif /* !UNIT_TEST */
     return VINF_SUCCESS;
 }
-
-#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)