Changeset 80997 in vbox for trunk/src

Timestamp:

Sep 25, 2019 7:42:22 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard: MacOS build fix.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-darwin.cpp (modified) (6 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (3 diffs)

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

@@ -104 +104 @@
         /* call this behind the lock because we don't know if the api is
            thread safe and in any case we're calling several methods. */
-        VBoxSvcClipboardLock();
+        ShClSvcLock();
         vboxClipboardChanged(pCtx);
         VBoxSvcClipboardUnlock();
@@ -166 +166 @@
     }
 
-    VBoxSvcClipboardLock();
+    ShClSvcLock();
 
     pClient->State.pCtx = &g_ctx;
@@ -181 +181 @@
 {
     /* Sync the host clipboard content with the client. */
-    VBoxSvcClipboardLock();
+    ShClSvcLock();
 
     int rc = vboxClipboardChanged(pClient->State.pCtx);
@@ -192 +192 @@
 int ShClSvcImplDisconnect(PSHCLCLIENT pClient)
 {
-    VBoxSvcClipboardLock();
+    ShClSvcLock();
 
     pClient->State.pCtx->pClient = NULL;
@@ -241 +241 @@
     RT_NOREF(pCmdCtx);
 
-    VBoxSvcClipboardLock();
+    ShClSvcLock();
 
     /* Default to no data available. */
@@ -267 +267 @@
     RT_NOREF(pCmdCtx);
 
-    VBoxSvcClipboardLock();
+    ShClSvcLock();
 
     writeToPasteboard(pClient->State.pCtx->pasteboard, pData->pvData, pData->cbData, pData->uFormat);

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

@@ -301 +301 @@
 }
 
-bool VBoxSvcClipboardLock(void)
+bool ShClSvcLock(void)
 {
     return RT_SUCCESS(RTCritSectEnter(&g_CritSect));
 }
 
-void VBoxSvcClipboardUnlock(void)
+void ShClSvcUnlock(void)
 {
     int rc2 = RTCritSectLeave(&g_CritSect);
@@ -1063 +1063 @@
     int rc = VINF_SUCCESS;
 
-    if (VBoxSvcClipboardLock())
+    if (ShClSvcLock())
     {
         pClient->State.enmSource = enmSource;
@@ -1069 +1069 @@
         LogFlowFunc(("Source of client %RU32 is now %RU32\n", pClient->State.uClientID, pClient->State.enmSource));
 
-        VBoxSvcClipboardUnlock();
+        ShClSvcUnlock();
     }