Changeset 68559 in vbox for trunk

Timestamp:

Aug 31, 2017 12:10:07 PM (7 years ago)

Author:

vboxsync

Message:

merging vbglioc r117711: VBoxTray/WinMain: RTR3Init shall always be the very first thing. Don't call VbglR3Term if VbglR3Init failed, it will assert.

File:

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

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

@@ -953 +953 @@
 {
     RT_NOREF(hPrevInstance, lpCmdLine, nCmdShow);
+    int rc = RTR3InitExeNoArguments(0);
+    if (RT_FAILURE(rc))
+        return RTEXITCODE_INIT;
 
     /* Note: Do not use a global namespace ("Global\\") for mutex name here,
@@ -968 +971 @@
     LogRel(("%s r%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr()));
 
-    int rc = RTR3InitExeNoArguments(0);
+    rc = vboxTrayLogCreate(NULL /* pszLogFile */);
     if (RT_SUCCESS(rc))
-        rc = vboxTrayLogCreate(NULL /* pszLogFile */);
-
-    if (RT_SUCCESS(rc))
+    {
         rc = VbglR3Init();
-    if (RT_SUCCESS(rc))
-    {
-        /* Save instance handle. */
-        g_hInstance = hInstance;
-
-        hlpReportStatus(VBoxGuestFacilityStatus_Init);
-        rc = vboxTrayCreateToolWindow();
         if (RT_SUCCESS(rc))
         {
-            VBoxCapsInit();
-
-            rc = vboxStInit(g_hwndToolWindow);
-            if (!RT_SUCCESS(rc))
-            {
-                LogFlowFunc(("vboxStInit failed, rc=%Rrc\n", rc));
-                /* ignore the St Init failure. this can happen for < XP win that do not support WTS API
-                 * in that case the session is treated as active connected to the physical console
-                 * (i.e. fallback to the old behavior that was before introduction of VBoxSt) */
-                Assert(vboxStIsActiveConsole());
-            }
-
-            rc = vboxDtInit();
-            if (!RT_SUCCESS(rc))
-            {
-                LogFlowFunc(("vboxDtInit failed, rc=%Rrc\n", rc));
-                /* ignore the Dt Init failure. this can happen for < XP win that do not support WTS API
-                 * in that case the session is treated as active connected to the physical console
-                 * (i.e. fallback to the old behavior that was before introduction of VBoxSt) */
-                Assert(vboxDtIsInputDesktop());
-            }
-
-            rc = VBoxAcquireGuestCaps(VMMDEV_GUEST_SUPPORTS_SEAMLESS | VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0, true);
-            if (!RT_SUCCESS(rc))
-                LogFlowFunc(("VBoxAcquireGuestCaps failed with rc=%Rrc, ignoring ...\n", rc));
-
-            rc = vboxTraySetupSeamless(); /** @todo r=andy Do we really want to be this critical for the whole application? */
+            /* Save instance handle. */
+            g_hInstance = hInstance;
+
+            hlpReportStatus(VBoxGuestFacilityStatus_Init);
+            rc = vboxTrayCreateToolWindow();
             if (RT_SUCCESS(rc))
             {
-                rc = vboxTrayServiceMain();
+                VBoxCapsInit();
+
+                rc = vboxStInit(g_hwndToolWindow);
+                if (!RT_SUCCESS(rc))
+                {
+                    LogFlowFunc(("vboxStInit failed, rc=%Rrc\n", rc));
+                    /* ignore the St Init failure. this can happen for < XP win that do not support WTS API
+                     * in that case the session is treated as active connected to the physical console
+                     * (i.e. fallback to the old behavior that was before introduction of VBoxSt) */
+                    Assert(vboxStIsActiveConsole());
+                }
+
+                rc = vboxDtInit();
+                if (!RT_SUCCESS(rc))
+                {
+                    LogFlowFunc(("vboxDtInit failed, rc=%Rrc\n", rc));
+                    /* ignore the Dt Init failure. this can happen for < XP win that do not support WTS API
+                     * in that case the session is treated as active connected to the physical console
+                     * (i.e. fallback to the old behavior that was before introduction of VBoxSt) */
+                    Assert(vboxDtIsInputDesktop());
+                }
+
+                rc = VBoxAcquireGuestCaps(VMMDEV_GUEST_SUPPORTS_SEAMLESS | VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0, true);
+                if (!RT_SUCCESS(rc))
+                    LogFlowFunc(("VBoxAcquireGuestCaps failed with rc=%Rrc, ignoring ...\n", rc));
+
+                rc = vboxTraySetupSeamless(); /** @todo r=andy Do we really want to be this critical for the whole application? */
                 if (RT_SUCCESS(rc))
-                    hlpReportStatus(VBoxGuestFacilityStatus_Terminating);
-                vboxTrayShutdownSeamless();
+                {
+                    rc = vboxTrayServiceMain();
+                    if (RT_SUCCESS(rc))
+                        hlpReportStatus(VBoxGuestFacilityStatus_Terminating);
+                    vboxTrayShutdownSeamless();
+                }
+
+                /* it should be safe to call vboxDtTerm even if vboxStInit above failed */
+                vboxDtTerm();
+
+                /* it should be safe to call vboxStTerm even if vboxStInit above failed */
+                vboxStTerm();
+
+                VBoxCapsTerm();
+
+                vboxTrayDestroyToolWindow();
             }
-
-            /* it should be safe to call vboxDtTerm even if vboxStInit above failed */
-            vboxDtTerm();
-
-            /* it should be safe to call vboxStTerm even if vboxStInit above failed */
-            vboxStTerm();
-
-            VBoxCapsTerm();
-
-            vboxTrayDestroyToolWindow();
-        }
-        if (RT_SUCCESS(rc))
-            hlpReportStatus(VBoxGuestFacilityStatus_Terminated);
-    }
-
-    if (RT_FAILURE(rc))
-    {
-        LogRel(("Error while starting, rc=%Rrc\n", rc));
-        hlpReportStatus(VBoxGuestFacilityStatus_Failed);
-    }
-    LogRel(("Ended\n"));
+            if (RT_SUCCESS(rc))
+                hlpReportStatus(VBoxGuestFacilityStatus_Terminated);
+            else
+            {
+                LogRel(("Error while starting, rc=%Rrc\n", rc));
+                hlpReportStatus(VBoxGuestFacilityStatus_Failed);
+            }
+
+            LogRel(("Ended\n"));
+            VbglR3Term();
+        }
+        else
+            LogRel(("VbglR3Init failed: %Rrc\n", rc));
+    }
 
     /* Release instance mutex. */
@@ -1045 +1050 @@
         hMutexAppRunning = NULL;
     }
-
-    VbglR3Term();
 
     vboxTrayLogDestroy();