Changeset 34195 in vbox for trunk/src/VBox/Installer/win/Stub

Timestamp:

Nov 19, 2010 1:14:17 PM (14 years ago)

Author:

vboxsync

Message:

VBoxStub: Misc bugfixes, added error string lookup.

File:

• trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp (modified) (5 diffs)

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -20 +20 @@
 *******************************************************************************/
 #include <windows.h>
+#include <lmerr.h>
 #include <msiquery.h>
 #include <objbase.h>
@@ -89 +90 @@
     char       *pszMsg;
     va_list     va;
+    int         rc;
 
     va_start(va, pszFmt);
-    RTStrAPrintfV(&pszMsg, pszFmt, va);
+    if (RTStrAPrintfV(&pszMsg, pszFmt, va))
+    {
+        rc = MessageBox(GetDesktopWindow(), pszMsg, VBOX_STUB_TITLE, MB_ICONERROR);
+        RTStrFree(pszMsg);
+    }
+    else /* Should never happen! */
+        AssertMsgFailed(("Failed to format error text of format string: %s!\n", pszFmt));
     va_end(va);
-
-    int rc;
-    if (pszMsg)
-        rc = MessageBox(GetDesktopWindow(), pszMsg, VBOX_STUB_TITLE, MB_ICONERROR);
-    else
-        rc = MessageBox(GetDesktopWindow(), pszFmt, VBOX_STUB_TITLE, MB_ICONERROR);
-    RTStrFree(pszMsg);
     return rc;
 }
@@ -130 +131 @@
         /* Get resource size. */
         *pdwSize = SizeofResource(hInst, hRsrc);
-        AssertMsgBreak((*pdwSize > 0, "Size of resource is invalid!\n"));
+        AssertMsgBreak(*pdwSize > 0, ("Size of resource is invalid!\n"));
 
         /* Get pointer to resource. */
@@ -547 +548 @@
                         {
                             char *pszLog = RTPathJoinA(szExtractPath, "VBoxInstallLog.txt");
-                            AssertMsgRCBreak(vrc, ("Could not convert MSI log string to current codepage!\n"));
+                            AssertMsgBreak(pszLog, ("Could not construct path for log file!\n"));
                             UINT uLogLevel = MsiEnableLog(INSTALLLOGMODE_VERBOSE,
                                                           pszLog, INSTALLLOGATTRIBUTES_FLUSHEACHLINE);
@@ -571 +572 @@
                                     case ERROR_INSTALL_PLATFORM_UNSUPPORTED:
 
-                                        ShowError("This installation package is not supported on this platform.\n");
+                                        ShowError("This installation package is not supported on this platform.");
                                         break;
 
                                     default:
-
-                                        /** @todo Use FormatMessage here! */
-                                        ShowError("Installation failed! ERROR: %u", uStatus);
+                                    {
+                                        DWORD dwFormatFlags =   FORMAT_MESSAGE_ALLOCATE_BUFFER
+                                                              | FORMAT_MESSAGE_IGNORE_INSERTS
+                                                              | FORMAT_MESSAGE_FROM_SYSTEM;
+                                        HMODULE hModule = NULL;
+                                        if (uStatus >= NERR_BASE && uStatus <= MAX_NERR)
+                                        {
+                                            hModule = LoadLibraryEx(TEXT("netmsg.dll"),
+                                                                    NULL,
+                                                                    LOAD_LIBRARY_AS_DATAFILE);
+                                            if (hModule != NULL)
+                                                dwFormatFlags |= FORMAT_MESSAGE_FROM_HMODULE;
+                                        }
+
+                                        DWORD dwBufferLength;
+                                        LPSTR szMessageBuffer;
+                                        if (dwBufferLength = FormatMessageA(dwFormatFlags,
+                                                                            hModule, /* If NULL, load system stuff. */
+                                                                            uStatus,
+                                                                            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                                                                            (LPSTR)&szMessageBuffer,
+                                                                            0,
+                                                                            NULL))
+                                        {
+                                            ShowError("Installation failed! Error: %s", szMessageBuffer);
+                                            LocalFree(szMessageBuffer);
+                                        }
+                                        else /* If text lookup failed, show at least the error number. */
+                                            ShowError("Installation failed! Error: %u", uStatus);
+                                        if (hModule)
+                                            FreeLibrary(hModule);
                                         break;
+                                    }
                                 }
                             }