Changeset 76098 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 10, 2018 9:07:39 AM (6 years ago)

Author:

vboxsync

Message:

Additions/VBoxTray: Added VBoxTrayShowError() and warn if VBoxHook.dll is not found. Otherwise VBoxTray will fail without any hint whatsoever what went wrong. Annoying.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxSeamless.cpp (modified) (2 diffs)
• VBoxTray.cpp (modified) (3 diffs)
• VBoxTray.h (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -99 +99 @@
         }
         else
+        {
+            if (rc == VERR_FILE_NOT_FOUND)
+                VBoxTrayShowError("VBoxHook.dll not found");
+
             LogFlowFunc(("Unable to load %s, rc=%Rrc\n", VBOXHOOK_DLL_NAME, rc));
+        }
     }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -585 +585 @@
     }
     else
-        MessageBoxA(GetDesktopWindow(), ErrInfo.szMsg, "VBoxTray - Logging Error", MB_OK | MB_ICONERROR);
+        VBoxTrayShowError(ErrInfo.szMsg);
 
     return rc;
@@ -593 +593 @@
 {
     RTLogDestroy(RTLogRelSetDefaultInstance(NULL));
+}
+
+/**
+ * Displays an error message.
+ *
+ * @returns RTEXITCODE_FAILURE.
+ * @param   pszFormat   The message text.
+ * @param   ...         Format arguments.
+ */
+RTEXITCODE VBoxTrayShowError(const char *pszFormat, ...)
+{
+    va_list args;
+    va_start(args, pszFormat);
+    char *psz = NULL;
+    RTStrAPrintfV(&psz, pszFormat, args);
+    va_end(args);
+
+    AssertPtr(psz);
+    LogRel(("Error: %s", psz));
+
+    MessageBox(GetDesktopWindow(), psz, "VBoxTray - Error", MB_OK | MB_ICONERROR);
+
+    RTStrFree(psz);
+
+    return RTEXITCODE_FAILURE;
 }
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2017 Oracle Corporation
+ * Copyright (C) 2006-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -188 +188 @@
 extern uint32_t     g_fGuestDisplaysChanged;
 
+RTEXITCODE VBoxTrayShowError(const char *pszFormat, ...);
+
 #endif /* !___VBOXTRAY_H */