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

Timestamp:

Jun 28, 2016 1:24:52 AM (8 years ago)

Author:

vboxsync

Message:

fix for ​​​​bugref:8441: improved windows procedures in Clipboard, DND and HostPowerWin.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxClipboard.cpp (modified) (2 diffs)
• VBoxDnD.cpp (modified) (1 diff)

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

@@ -659 +659 @@
         } break;
 
+        case WM_DESTROY:
+        {
+            vboxClipboardRemoveFromCBChain(pCtx);
+            if (pCtx->timerRefresh)
+                KillTimer(pCtx->hwnd, 0);
+            /* 
+             * don't need to call PostQuitMessage cause
+             * the VBoxTray already finished a message loop 
+             */
+        } break;
+
         default:
         {
@@ -732 +743 @@
     if (pCtx->hwnd)
     {
-        vboxClipboardRemoveFromCBChain(pCtx);
-        if (pCtx->timerRefresh)
-            KillTimer(pCtx->hwnd, 0);
-
         DestroyWindow(pCtx->hwnd);
         pCtx->hwnd = NULL;

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

@@ -289 +289 @@
         {
             MSG uMsg;
-            while (GetMessage(&uMsg, 0, 0, 0))
+            BOOL fRet;
+            while ((fRet = GetMessage(&uMsg, 0, 0, 0)) > 0)
             {
                 TranslateMessage(&uMsg);
                 DispatchMessage(&uMsg);
             }
+            Assert(fRet >= 0);
 
             if (ASMAtomicReadBool(&pCtx->fShutdown))