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

時間撮記:

2016-5-2 上午11:41:08 (9 年 以前)

作者:

vboxsync

訊息:

SharedClipboard: vboxOpenClipboard cleanup

檔案:

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

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

@@ -148 +148 @@
 {
     /* "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] */
+     * So try a few times and wait up to 1 second.
+     */
+    BOOL fOpened = FALSE;
+
+    int i = 0;
+    for (;;)
     {
         if (OpenClipboard(hwnd))
         {
-            rc = 0;
+            fOpened = TRUE;
             break;
         }
-        rc = RTErrConvertFromWin32(GetLastError());
-
-        RTThreadSleep(u32SleepMS);
-        u32SleepMS <<= 1;
-    }
+
+        if (i >= 10) /* sleep interval = [1..512] ms */
+            break;
+
+        RTThreadSleep(1 << i);
+        ++i;
+    }
+
 #ifdef LOG_ENABLED
     if (i > 0)
-        LogFlow(("vboxOpenClipboard: %d times tried to open clipboard. \n", ++i));
+        LogFlowFunc(("%d times tried to open clipboard.\n", i + 1));
 #endif
+
+    int rc;
+    if (fOpened)
+        rc = VINF_SUCCESS;
+    else
+    {
+        const DWORD err = GetLastError();
+        LogFlowFunc(("error %d\n", err));
+        rc = RTErrConvertFromWin32(err);
+    }
+
     return rc;
 }
@@ -527 +540 @@
              * windows is to be destroyed and therefore the guest side becomes inactive.
              */
-            int res = vboxOpenClipboard(hwnd);
-            if (RT_SUCCESS(res))
+            int vboxrc = vboxOpenClipboard(hwnd);
+            if (RT_SUCCESS(vboxrc))
             {
                 EmptyClipboard();
@@ -536 +549 @@
             else
             {
-                LogFlow(("vboxClipboardWndProc: WM_RENDERALLFORMATS: error in open clipboard. hwnd: %x, rc: %Rrc\n", hwnd, res));
+                LogFlow(("vboxClipboardWndProc: WM_RENDERALLFORMATS: error in open clipboard. hwnd: %x, rc: %Rrc\n", hwnd, vboxrc));
             }
         } break;
@@ -556 +569 @@
             Log(("WM_USER u32Formats = %02X\n", u32Formats));
 
-            int res = vboxOpenClipboard(hwnd);
-            if (RT_SUCCESS(res))
+            int vboxrc = vboxOpenClipboard(hwnd);
+            if (RT_SUCCESS(vboxrc))
             {
                 EmptyClipboard();
@@ -595 +608 @@
             else
             {
-                dprintf(("window proc WM_USER: failed to open clipboard. rc: %Rrc \n", res));
+                dprintf(("window proc WM_USER: failed to open clipboard. rc: %Rrc\n", vboxrc));
             }
         } break;
@@ -874 +887 @@
     else
     {
-        dprintf(("vboxClipboardReadData: failed to open clipboard, rc: %Rrc \n", rc));
+        dprintf(("vboxClipboardReadData: failed to open clipboard, rc: %Rrc\n", rc));
     }