Changeset 84054 in vbox for trunk/src/VBox/Additions/WINNT/Installer/InstallHelper

Timestamp:

Apr 28, 2020 4:05:00 PM (5 years ago)

Author:

vboxsync

Message:

IPRT,++: Apply bldprog-strtab.h and friends to the IPRT status message database (errmsg.cpp) to reduce size. The interface (RTErrMsg*) has been reworked as we no longer have C-strings in the database, but 'compressed' string w/o zero terminators. bugref:9726

File:

• trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -144 +144 @@
     if (RT_FAILURE(rc))
     {
-
-#ifdef UNICODE
-        TCHAR *pszErrAsString;
-        int rc2 = RTStrToUtf16(RTErrGetDefine(rc), &pszErrAsString);
+        char szMsg[80];
+        RTErrQueryDefine(rc, szMsg, sizeof(szMsg), false /*fFailIfUnknown*/);
+        /** @todo r=bird: Just use RTUtf16Printf here as RTErrQueryDefine drags in
+         *        the whole IPRT printf machinery anyway. */
+#ifdef UNICODE
+        int rc2 = RTStrToUtf16(szMsg, &pszErrAsString);
         if (RT_SUCCESS(rc2))
         {
-#else
-            TCHAR *pszErrAsString = RTErrGetDefine(rc);
 #endif
             StringCchPrintf(szErr, sizeof(szErr), _T("Error: %s"), pszErrAsString);