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

時間撮記:

2016-6-28 上午01:24:52 (8 年 以前)

作者:

vboxsync

訊息:

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

檔案:

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

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

@@ -62 +62 @@
 
     RTTHREAD thread;
-    bool volatile fTerminate;
 
     HANDLE hRenderEvent;
@@ -649 +648 @@
         } break;
 
-        case WM_CLOSE:
-        {
-            /* Do nothing. Ignore the message. */
+        case WM_DESTROY:
+        {
+            /* MS recommends to remove from Clipboard chain in this callback */
+            Assert(pCtx->hwnd);
+            removeFromCBChain(pCtx);
+            if (pCtx->timerRefresh)
+                KillTimer(pCtx->hwnd, 0);
+            PostQuitMessage(0);
         } break;
 
@@ -716 +720 @@
 
             MSG msg;
-            while (GetMessage(&msg, NULL, 0, 0) && !pCtx->fTerminate)
+            BOOL msgret = 0;
+            while ((msgret = GetMessage(&msg, NULL, 0, 0)) > 0)
             {
                 TranslateMessage(&msg);
                 DispatchMessage(&msg);
             }
-        }
-    }
-
-    if (pCtx->hwnd)
-    {
-        removeFromCBChain(pCtx);
-        if (pCtx->timerRefresh)
-            KillTimer(pCtx->hwnd, 0);
-
-        DestroyWindow (pCtx->hwnd);
-        pCtx->hwnd = NULL;
-    }
+            /* 
+            * Window procedure can return error, 
+            * but this is exceptional situation 
+            * that should be identified in testing
+            */
+            Assert(msgret >= 0);
+            Log(("VBoxClipboardThread Message loop finished. GetMessage returned %d, message id: %d \n", msgret, msg.message));
+        }
+    }
+
+    pCtx->hwnd = NULL;
 
     if (atomWindowClass != 0)
@@ -772 +776 @@
     Log(("vboxClipboardDestroy\n"));
 
-    /* Set the termination flag and ping the window thread. */
-    ASMAtomicWriteBool (&g_ctx.fTerminate, true);
-
     if (g_ctx.hwnd)
     {
-        PostMessage (g_ctx.hwnd, WM_CLOSE, 0, 0);
+        int rc = PostMessage (g_ctx.hwnd, WM_CLOSE, 0, 0);
     }