Changeset 80996 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Sep 25, 2019 7:13:06 AM (5 years ago)

Author:

vboxsync

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

133590

Message:

Shared Clipboard: Build fix.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc.cpp (modified) (2 diffs)
• testcase/tstClipboardServiceHost.cpp (modified) (4 diffs)

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

@@ -265 +265 @@
 
 /** Getter for headless setting. Also needed by testcase. */
-bool VBoxSvcClipboardGetHeadless(void)
+bool ShClSvcGetHeadless(void)
 {
     return g_fHeadless;
@@ -1167 +1167 @@
         if (RT_SUCCESS(rc))
         {
-            rc = ShClSvcImplConnect(pClient, VBoxSvcClipboardGetHeadless());
+            rc = ShClSvcImplConnect(pClient, ShClSvcGetHeadless());
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
             if (RT_SUCCESS(rc))

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

@@ -216 +216 @@
                            1, parms);
     RTTESTI_CHECK_RC_OK(rc);
-    fHeadless = VBoxSvcClipboardGetHeadless();
+    fHeadless = ShClSvcGetHeadless();
     RTTESTI_CHECK_MSG(fHeadless == false, ("fHeadless=%RTbool\n", fHeadless));
     rc = table.pfnHostCall(NULL, VBOX_SHCL_HOST_FN_SET_HEADLESS,
@@ -232 +232 @@
                            1, parms);
     RTTESTI_CHECK_RC_OK(rc);
-    fHeadless = VBoxSvcClipboardGetHeadless();
+    fHeadless = ShClSvcGetHeadless();
     RTTESTI_CHECK_MSG(fHeadless == true, ("fHeadless=%RTbool\n", fHeadless));
     HGCMSvcSetU32(&parms[0], 99);
@@ -238 +238 @@
                            1, parms);
     RTTESTI_CHECK_RC_OK(rc);
-    fHeadless = VBoxSvcClipboardGetHeadless();
+    fHeadless = ShClSvcGetHeadless();
     RTTESTI_CHECK_MSG(fHeadless == true, ("fHeadless=%RTbool\n", fHeadless));
     table.pfnUnload(NULL);
@@ -277 +277 @@
 }
 
-int SharedClipboardSvcImplInit() { return VINF_SUCCESS; }
-void SharedClipboardSvcImplDestroy() { }
-int SharedClipboardSvcImplDisconnect(PSHCLCLIENT)
+int ShClSvcImplInit() { return VINF_SUCCESS; }
+void ShClSvcImplDestroy() { }
+int ShClSvcImplDisconnect(PSHCLCLIENT)
 { return VINF_SUCCESS; }
-int SharedClipboardSvcImplConnect(PSHCLCLIENT, bool)
+int ShClSvcImplConnect(PSHCLCLIENT, bool)
 { return VINF_SUCCESS; }
-int SharedClipboardSvcImplFormatAnnounce(PSHCLCLIENT, PSHCLCLIENTCMDCTX, PSHCLFORMATDATA)
+int ShClSvcImplFormatAnnounce(PSHCLCLIENT, PSHCLCLIENTCMDCTX, PSHCLFORMATDATA)
 { AssertFailed(); return VINF_SUCCESS; }
-int SharedClipboardSvcImplReadData(PSHCLCLIENT, PSHCLCLIENTCMDCTX, PSHCLDATABLOCK, unsigned int *)
+int ShClSvcImplReadData(PSHCLCLIENT, PSHCLCLIENTCMDCTX, PSHCLDATABLOCK, unsigned int *)
 { AssertFailed(); return VERR_WRONG_ORDER; }
-int SharedClipboardSvcImplWriteData(PSHCLCLIENT, PSHCLCLIENTCMDCTX, PSHCLDATABLOCK)
+int ShClSvcImplWriteData(PSHCLCLIENT, PSHCLCLIENTCMDCTX, PSHCLDATABLOCK)
 { AssertFailed(); return VINF_SUCCESS; }
-int SharedClipboardSvcImplSync(PSHCLCLIENT)
+int ShClSvcImplSync(PSHCLCLIENT)
 { AssertFailed(); return VERR_WRONG_ORDER; }