Changeset 62135 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jul 8, 2016 11:33:34 AM (8 years ago)

Author:

vboxsync

Message:

VBoxTray: prevent crash and failure to start with old Windows guests.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxSeamless.cpp (modified) (1 diff)
• VBoxTray.cpp (modified) (1 diff)
• VBoxVRDP.cpp (modified) (1 diff)

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

@@ -110 +110 @@
 {
     LogFlowFuncEnter();
+
+    if (!pInstance)
+        return;
 
     PVBOXSEAMLESSCONTEXT pCtx = (PVBOXSEAMLESSCONTEXT)pInstance;

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

@@ -303 +303 @@
         if (RT_FAILURE(rc2))
         {
-            LogRel(("Failed to initialize service '%s', rc=%Rrc\n", pSvc->pDesc->pszName, rc));
+            LogRel(("Failed to initialize service '%s', rc=%Rrc\n", pSvc->pDesc->pszName, rc2));
             if (rc2 == VERR_NOT_SUPPORTED)
             {

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

@@ -300 +300 @@
         g_Ctx.pfnIsThemeActive = NULL;
     }
+
+    /* Tell the caller that the service does not work but it is OK to continue. */
+    if (RT_FAILURE(rc))
+        rc = VERR_NOT_SUPPORTED;
 
     LogFlowFuncLeaveRC(rc);