vbox的更動 62135 路徑 trunk/src/VBox/Additions

時間撮記:

2016-7-8 上午11:33:34 (8 年 以前)

作者:

vboxsync

訊息:

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

位置:

trunk/src/VBox/Additions/WINNT/VBoxTray

檔案:

• VBoxSeamless.cpp (修改) (1 筆差異)
• VBoxTray.cpp (修改) (1 筆差異)
• VBoxVRDP.cpp (修改) (1 筆差異)

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);