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

Timestamp:

Feb 26, 2010 10:51:22 AM (15 years ago)

Author:

vboxsync

Message:

VBoxTray/Clipboard: Formatting, error checking.

File:

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

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

@@ -66 +66 @@
         while ((format = EnumClipboardFormats (format)) != 0)
         {
-            Log (("vboxClipboardChanged: format = 0x%08X\n", format));
+            Log(("vboxClipboardChanged: format = 0x%08X\n", format));
             switch (format)
             {
@@ -114 +114 @@
             HWND hwndNext    = (HWND)lParam;
 
-            Log (("vboxClipboardProcessMsg: WM_CHANGECBCHAIN: hwndRemoved %p, hwndNext %p, hwnd %p\n", hwndRemoved, hwndNext, pCtx->hwnd));
+            Log(("vboxClipboardProcessMsg: WM_CHANGECBCHAIN: hwndRemoved %p, hwndNext %p, hwnd %p\n", hwndRemoved, hwndNext, pCtx->hwnd));
 
             if (hwndRemoved == pCtx->hwndNextInChain)
             {
                 /* The window that was next to our in the chain is being removed.
-                 * Relink to the new next window.
-                 */
+                 * Relink to the new next window. */
                 pCtx->hwndNextInChain = hwndNext;
             }
@@ -135 +134 @@
         case WM_DRAWCLIPBOARD:
         {
-            Log (("vboxClipboardProcessMsg: WM_DRAWCLIPBOARD, hwnd %p\n", pCtx->hwnd));
+            Log(("vboxClipboardProcessMsg: WM_DRAWCLIPBOARD, hwnd %p\n", pCtx->hwnd));
 
             if (GetClipboardOwner () != hwnd)
             {
                 /* Clipboard was updated by another application. */
-                vboxClipboardChanged(pCtx); /** @todo r=andy Check for return code! */
+                rc = vboxClipboardChanged(pCtx);
             }
 
             /* Pass the message to next windows in the clipboard chain. */
-            rc = SendMessage(pCtx->hwndNextInChain, msg, wParam, lParam);
+            if (RT_SUCCESS(rc))
+                rc = SendMessage(pCtx->hwndNextInChain, msg, wParam, lParam);
         } break;
 
@@ -158 +158 @@
             UINT format = (UINT)wParam;
 
-            Log (("vboxClipboardProcessMsg: WM_RENDERFORMAT, format = %x\n", format));
+            Log(("vboxClipboardProcessMsg: WM_RENDERFORMAT, format = %x\n", format));
             switch (format)
             {
@@ -175 +175 @@
 
                         int cActual = GetClipboardFormatName(format, szFormatName, sizeof(szFormatName)/sizeof (TCHAR));
-
                         if (cActual)
                         {
@@ -219 +218 @@
                                 /* 0 bytes returned means the clipboard is empty.
                                  * Deallocate the memory and set hMem to NULL to get to
-                                 * the clipboard empty code path.
-                                 */
+                                 * the clipboard empty code path. */
                                 GlobalUnlock(hMem);
                                 GlobalFree(hMem);
@@ -301 +299 @@
                                 {
                                     /* 'hMem' contains the host clipboard data.
-                                     * size is 'cb' and format is 'format'.
-                                     */
-                                    HANDLE hClip = SetClipboardData (format, hMem);
+                                     * size is 'cb' and format is 'format'. */
+                                    HANDLE hClip = SetClipboardData(format, hMem);
                                     Log(("vboxClipboardProcessMsg: WM_RENDERFORMAT hClip = %p\n", hClip));
 
@@ -316 +313 @@
                             }
                         }
-
                         if (hMem)
-                        {
                             GlobalUnlock(hMem);
-                        }
                     }
-
                     if (hMem)
-                    {
                         GlobalFree(hMem);
-                    }
                 }
 
@@ -339 +330 @@
              * windows is to be destroyed and therefore the guest side becomes inactive.
              */
-            if (OpenClipboard (hwnd))
+            if (OpenClipboard(hwnd))
             {
                 EmptyClipboard();
@@ -351 +342 @@
             uint32_t u32Formats = (uint32_t)lParam;
 
-            if (FALSE == OpenClipboard (hwnd))
-            {
-                Log(("vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", GetLastError()));
+            if (FALSE == OpenClipboard(hwnd))
+            {
+                DWORD dwErr = GetLastError();
+                Log(("vboxClipboardProcessMsg: WM_USER: Failed to open clipboard! Last error = %ld\n", dwErr));
+                rc = RTErrConvertFromWin32(dwErr);
             }
             else
@@ -392 +385 @@
             /* Send data in the specified format to the host. */
             uint32_t u32Formats = (uint32_t)lParam;
-
             HANDLE hClip = NULL;
 
             if (FALSE == OpenClipboard(hwnd))
             {
+                DWORD dwErr = GetLastError();
+                Log(("vboxClipboardProcessMsg: WM_USER + 1: Failed to open clipboard! Last error = %ld\n", dwErr));
+                rc = RTErrConvertFromWin32(dwErr);
             }
             else
@@ -427 +422 @@
                     if (hClip != NULL)
                     {
-                        LPWSTR uniString = (LPWSTR)GlobalLock (hClip);
+                        LPWSTR uniString = (LPWSTR)GlobalLock(hClip);
 
                         if (uniString != NULL)
@@ -447 +442 @@
                     if (format != 0)
                     {
-                        hClip = GetClipboardData (format);
+                        hClip = GetClipboardData(format);
                         if (hClip != NULL)
                         {
-                            LPVOID lp = GlobalLock (hClip);
+                            LPVOID lp = GlobalLock(hClip);
 
                             if (lp != NULL)
@@ -467 +462 @@
                 }
 
-                CloseClipboard ();
+                CloseClipboard();
             }
 
@@ -479 +474 @@
         default:
         {
-            rc = DefWindowProc (hwnd, msg, wParam, lParam);
+            rc = DefWindowProc(hwnd, msg, wParam, lParam);
         }
     }
 
+    Log(("vboxClipboardProcessMsg returned with rc = %ld\n", rc));
     return rc;
 }
@@ -536 +532 @@
 }
 
-static void vboxClipboardDestroy (VBOXCLIPBOARDCONTEXT *pCtx)
+static void vboxClipboardDestroy(VBOXCLIPBOARDCONTEXT *pCtx)
 {
     if (pCtx->hwnd)
@@ -560 +556 @@
 {
     /* Forward with proper context. */
-    return vboxClipboardProcessMsg (&gCtx, hwnd, msg, wParam, lParam);
+    return vboxClipboardProcessMsg(&gCtx, hwnd, msg, wParam, lParam);
 }
 
 int VBoxClipboardInit(const VBOXSERVICEENV *pEnv, void **ppInstance, bool *pfStartThread)
 {
-    Log (("VboxClipboardInit\n"));
+    Log(("VboxClipboardInit\n"));
     if (gCtx.pEnv)
     {
@@ -590 +586 @@
     }
 
-    if (RT_SUCCESS (rc))
+    if (RT_SUCCESS(rc))
         *ppInstance = &gCtx;
     return rc;