Changeset 81134 in vbox for trunk/src/VBox/Additions

Timestamp:

Oct 7, 2019 7:41:41 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/VBoxTray: Shutdown fixes.

File:

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

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

@@ -246 +246 @@
         {
             LogFunc(("WM_CLIPBOARDUPDATE: pWinCtx=%p\n", pWinCtx));
+
+            if (pCtx->fShutdown) /* If we're about to shut down, skip handling stuff here. */
+                break;
 
             int rc = RTCritSectEnter(&pWinCtx->CritSect);
@@ -828 +831 @@
     LogRel2(("Shared Clipboard: Destroying ...\n"));
 
-    pCtx->fShutdown = true;
-
     const PSHCLWINCTX pWinCtx = &pCtx->Win;
-
-    if (pWinCtx->hWnd)
-    {
-        DestroyWindow(pWinCtx->hWnd);
-        pWinCtx->hWnd = NULL;
-    }
 
     if (pCtx->hThread != NIL_RTTHREAD)
@@ -845 +840 @@
                      rc, rcThread));
         RT_NOREF(rc);
+    }
+
+    if (pWinCtx->hWnd)
+    {
+        DestroyWindow(pWinCtx->hWnd);
+        pWinCtx->hWnd = NULL;
     }
 
@@ -1019 +1020 @@
                     }
 
+                    case VBOX_SHCL_HOST_MSG_QUIT:
+                    {
+                        pEvent->enmType = VBGLR3CLIPBOARDEVENTTYPE_QUIT;
+                        break;
+                    }
+
                     default:
                         rc = VERR_NOT_SUPPORTED;
@@ -1145 +1152 @@
     AssertPtr(pCtx);
 
+    /* Set shutdown indicator. */
+    ASMAtomicWriteBool(&pCtx->fShutdown, true);
+
+    /* Let our clipboard know that we're going to shut down. */
+    PostMessage(pCtx->Win.hWnd, WM_QUIT, 0, 0);
+
+    /* Disconnect from the host service.
+    /* This will also send a VBOX_SHCL_HOST_MSG_QUIT from the host so that we can break out from our message worker. */
     VbglR3ClipboardDisconnect(pCtx->CmdCtx.uClientID);
     pCtx->CmdCtx.uClientID = 0;