Changeset 60784 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

May 2, 2016 11:41:08 AM (9 years ago)

Author:

vboxsync

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

106982

Message:

SharedClipboard: vboxOpenClipboard cleanup

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

@@ -99 +99 @@
 {
     /* "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;
 }
@@ -131 +144 @@
     /* Query list of available formats and report to host. */
     int rc = vboxOpenClipboard(pCtx->hwnd);
-    if(RT_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         uint32_t u32Formats = 0;
@@ -502 +515 @@
              * 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();
@@ -510 +523 @@
             else
             {
-                LogFlowFunc(("WM_RENDERALLFORMATS: Failed to open clipboard! rc: %Rrc\n", res));
+                LogFlowFunc(("WM_RENDERALLFORMATS: Failed to open clipboard! rc: %Rrc\n", vboxrc));
             }
         } break;
@@ -519 +532 @@
             uint32_t u32Formats = (uint32_t)lParam;
             
-            int res = vboxOpenClipboard(hwnd);
-            if(RT_SUCCESS(res))
+            int vboxrc = vboxOpenClipboard(hwnd);
+            if (RT_SUCCESS(vboxrc))
             {
                 EmptyClipboard();
@@ -553 +566 @@
             else
             {
-                LogFlowFunc(("WM_USER: Failed to open clipboard! error = %Rrc\n", res));
+                LogFlowFunc(("WM_USER: Failed to open clipboard! error = %Rrc\n", vboxrc));
             }
         } break;
@@ -563 +576 @@
             HANDLE hClip = NULL;
 
-            int res = vboxOpenClipboard(hwnd);
-            if (RT_SUCCESS(res))
-            {
-                int vboxrc;
+            int vboxrc = vboxOpenClipboard(hwnd);
+            if (RT_SUCCESS(vboxrc))
+            {
                 if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
                 {
@@ -637 +649 @@
             else
             {
-                LogFlowFunc(("WM_USER: Failed to open clipboard! rc: %Rrc\n", res));
+                LogFlowFunc(("WM_USER: Failed to open clipboard! rc: %Rrc\n", vboxrc));
             }