vbox的更動 60772 路徑 trunk/src/VBox/HostServices

時間撮記:

2016-4-29 下午09:16:24 (9 年 以前)

作者:

vboxsync

訊息:

Additions/SharedClipboard: fix for bugref:6466: fixed OpenClipboard() issue when multiple VM started.

檔案:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp (修改) (9 筆差異)

trunk/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp

@@ -111 +111 @@
 #endif /* LOG_ENABLED */
 
+
 static void vboxClipboardInitNewAPI(VBOXCLIPBOARDCONTEXT *pCtx)
 {
@@ -143 +144 @@
 }
 
+
+static int vboxOpenClipboard(HWND hwnd)
+{
+    /* "OpenClipboard fails if another window has the clipboard open."
+    * So try a few times and wait up to 1 second.
+    */
+    int rc;
+
+    uint32_t u32SleepMS = 1;
+    int i;
+    for (i = 0; i <= 9; ++i) /* u32SleepMS = [1..512] */
+    {
+        if (OpenClipboard(hwnd))
+        {
+            rc = 0;
+            break;
+        }
+        rc = RTErrConvertFromWin32(GetLastError());
+
+        RTThreadSleep(u32SleepMS);
+        u32SleepMS <<= 1;
+    }
+#ifdef LOG_ENABLED
+    if (i > 0)
+        LogFlow(("vboxOpenClipboard: %d times tried to open clipboard. \n", ++i));
+#endif
+    return rc;
+}
+
+
 static void vboxClipboardGetData (uint32_t u32Format, const void *pvSrc, uint32_t cbSrc,
                                   void *pvDst, uint32_t cbDst, uint32_t *pcbActualDst)
@@ -194 +225 @@
 
     /* Query list of available formats and report to host. */
-    if (OpenClipboard (pCtx->hwnd))
+    int rc = vboxOpenClipboard(pCtx->hwnd);
+    if (RT_SUCCESS(rc))
     {
         uint32_t u32Formats = 0;
@@ -240 +272 @@
         vboxSvcClipboardReportMsg (pCtx->pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS, u32Formats);
     }
+    else
+    {
+        LogFlow(("vboxClipboardChanged: error in open clipboard. hwnd: %x. err: %Rrc\n", pCtx->hwnd, rc));
+    }
 }
 
@@ -491 +527 @@
              * windows is to be destroyed and therefore the guest side becomes inactive.
              */
-            if (OpenClipboard (hwnd))
+            int res = vboxOpenClipboard(hwnd);
+            if (RT_SUCCESS(res))
             {
                 EmptyClipboard();
 
                 CloseClipboard();
+            }
+            else
+            {
+                LogFlow(("vboxClipboardWndProc: WM_RENDERALLFORMATS: error in open clipboard. hwnd: %x, rc: %Rrc\n", hwnd, res));
             }
         } break;
@@ -515 +556 @@
             Log(("WM_USER u32Formats = %02X\n", u32Formats));
 
-            if (OpenClipboard (hwnd))
+            int res = vboxOpenClipboard(hwnd);
+            if (RT_SUCCESS(res))
             {
                 EmptyClipboard();
@@ -553 +595 @@
             else
             {
-                dprintf(("window proc WM_USER: failed to open clipboard\n"));
+                dprintf(("window proc WM_USER: failed to open clipboard. rc: %Rrc \n", res));
             }
         } break;
@@ -748 +790 @@
      * The guest wants to read data in the given format.
      */
-    if (OpenClipboard (pClient->pCtx->hwnd))
+    int rc = vboxOpenClipboard(pClient->pCtx->hwnd);
+    if (RT_SUCCESS(rc))
     {
         dprintf(("Clipboard opened.\n"));
@@ -831 +874 @@
     else
     {
-        dprintf(("failed to open clipboard\n"));
+        dprintf(("vboxClipboardReadData: failed to open clipboard, rc: %Rrc \n", rc));
     }