Changeset 79183 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Jun 17, 2019 12:51:35 PM (5 years ago)

Author:

vboxsync

Message:

Forward ported r131352 (6.0: Additions/VBoxTray: Don't make VBoxTray fail completely if seamless mode is not available for whatever reason (optional)).

File:

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

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

@@ -77 +77 @@
     if (uNtVersion < RTSYSTEM_MAKE_NT_VERSION(5, 0, 0)) /* Windows NT 4.0 or older */
     {
-        Log(("VBoxTray: VBoxSeamlessInit: Windows NT 4.0 or older not supported!\n"));
+        LogRel(("Seamless: Windows NT 4.0 or older not supported!\n"));
         rc = VERR_NOT_SUPPORTED;
     }
@@ -89 +89 @@
             *(PFNRT *)&pCtx->pfnVBoxHookRemoveWindowTracker  = RTLdrGetFunction(pCtx->hModHook, "VBoxHookRemoveWindowTracker");
 
-            /* rc should contain success status */
-            AssertRC(rc); /** @todo r=andy Makes no sense here!? */
-
-            VBoxSeamlessSetSupported(TRUE);
-
-            *ppInstance = pCtx;
+            if (   pCtx->pfnVBoxHookInstallWindowTracker
+                && pCtx->pfnVBoxHookRemoveWindowTracker)
+            {
+                VBoxSeamlessSetSupported(TRUE);
+
+                *ppInstance = pCtx;
+            }
+            else
+            {
+                LogRel(("Seamless: Not supported, skipping\n"));
+                rc = VERR_NOT_SUPPORTED;
+            }
         }
         else
         {
-            if (rc == VERR_FILE_NOT_FOUND)
-                VBoxTrayShowError("VBoxHook.dll not found");
-
-            LogFlowFunc(("Unable to load %s, rc=%Rrc\n", VBOXHOOK_DLL_NAME, rc));
+            LogRel(("Seamless: Could not load %s (%Rrc), skipping\n", VBOXHOOK_DLL_NAME, rc));
+            rc = VERR_NOT_SUPPORTED;
         }
     }