Changeset 26828 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Feb 26, 2010 11:12:20 AM (15 years ago)

Author:

vboxsync

Message:

VBoxTray/Clipboard: Bugfixes.

File:

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

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

@@ -139 +139 @@
             {
                 /* Clipboard was updated by another application. */
-                rc = vboxClipboardChanged(pCtx);
+                /* WM_DRAWCLIPBOARD always expects a return code of 0, so don't change "rc" here. */
+                if (RT_FAILURE(vboxClipboardChanged(pCtx))
+                    Log(("vboxClipboardProcessMsg: vboxClipboardChanged failed, rc = %Rrc\n", rc));
             }
 
             /* Pass the message to next windows in the clipboard chain. */
-            if (RT_SUCCESS(rc))
-                rc = SendMessage(pCtx->hwndNextInChain, msg, wParam, lParam);
+            SendMessage(pCtx->hwndNextInChain, msg, wParam, lParam);
         } break;
 
@@ -344 +345 @@
             if (FALSE == OpenClipboard(hwnd))
             {
-                DWORD dwErr = GetLastError();
-                Log(("vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", dwErr));
-                rc = RTErrConvertFromWin32(dwErr);
+                Log(("vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastErrors()));
             }
             else
@@ -389 +388 @@
             if (FALSE == OpenClipboard(hwnd))
             {
-                DWORD dwErr = GetLastError();
-                Log(("vboxClipboardProcessMsg: WM_USER + 1: Failed to open clipboard! Last error = %ld\n", dwErr));
-                rc = RTErrConvertFromWin32(dwErr);
+                Log(("vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastErrors()));
             }
             else