Changeset 73947 in vbox for trunk

Timestamp:

Aug 29, 2018 12:28:34 PM (6 years ago)

Author:

vboxsync

Message:

DnD/VBoxTray: Added a "started" indicator for the proxy window creation and check for it on startup.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDnD.cpp (modified) (5 diffs)
• VBoxDnD.h (modified) (2 diffs)

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

@@ -142 +142 @@
                             "dndwnd"); /** @todo Include ID if there's more than one proxy window. */
         if (RT_SUCCESS(rc))
-            rc = RTThreadUserWait(hThread, 30 * 1000 /* Timeout in ms */);
+        {
+            int rc2 = RTThreadUserWait(hThread, 30 * 1000 /* Timeout in ms */);
+            AssertRC(rc2);
+
+            if (!pCtx->fStarted) /* Did the thread fail to start? */
+                rc = VERR_GENERAL_FAILURE; /** @todo Find a better rc. */
+        }
     }
 
@@ -290 +296 @@
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
         rc = pThis->RegisterAsDropTarget();
-#else
-        rc = VINF_SUCCESS;
 #endif
     }
@@ -300 +304 @@
     }
 
-    bool fSignalled = false;
-
     if (RT_SUCCESS(rc))
-    {
-        rc = RTThreadUserSignal(hThread);
-        fSignalled = RT_SUCCESS(rc);
-
+        pCtx->fStarted = true; /* Set started indicator on success. */
+
+    int rc2 = RTThreadUserSignal(hThread);
+    bool fSignalled = RT_SUCCESS(rc2);
+
+    if (RT_SUCCESS(rc))
+    {
         bool fShutdown = false;
         for (;;)
@@ -332 +337 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-        int rc2 = pThis->UnregisterAsDropTarget();
+        rc2 = pThis->UnregisterAsDropTarget();
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -341 +346 @@
     if (!fSignalled)
     {
-        int rc2 = RTThreadUserSignal(hThread);
+        rc2 = RTThreadUserSignal(hThread);
         AssertRC(rc2);
     }

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013-2017 Oracle Corporation
+ * Copyright (C) 2013-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -229 +229 @@
     /** Pointer to the service environment. */
     const VBOXSERVICEENV      *pEnv;
+    /** Started indicator. */
+    bool                       fStarted;
     /** Shutdown indicator. */
     bool                       fShutdown;