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

Timestamp:

Sep 1, 2022 8:34:00 PM (2 years ago)

Author:

vboxsync

Message:

Installer/win/Stub*: Built in no-CRT mode. Documented and reworked the resource structures a bit. bugref:10261

Location:

trunk/src/VBox/Installer/win/Stub

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxStub.cpp (modified) (15 diffs)

trunk/src/VBox/Installer/win/Stub/Makefile.kmk

@@ -57 +57 @@
 endif
 
-VBoxStub_LDFLAGS = \
-        -DelayLoad:comctl32.dll
+VBoxStub_LDFLAGS = -SubSystem:Windows -DelayLoad:comctl32.dll
 VBoxStub_POST_CMDS = $(VBOX_CHECK_IMPORTS) --image $(out) ntdll.dll kernel32.dll
 ifeq ($(KBUILD_TYPE),asan)
@@ -81 +80 @@
  endif
 
- $$(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h:  | $$(dir $$@) $(VBOX_RTSIGNTOOL) $(PATH_STAGE_SYS)/VBoxSup.sys
+ $$(VBoxStub_0_OUTDIR)/VBoxStubPublicCert.h:  | $$(dir $$@) $(VBOX_RTSIGNTOOL) $(VBOX_BIN2C) $(PATH_STAGE_SYS)/VBoxSup.sys
         $(RM) -f -- "$@" "[email protected]" "[email protected]" "[email protected]" "[email protected]"
 

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

@@ -32 +32 @@
 #include <iprt/win/windows.h>
 #include <iprt/win/commctrl.h>
-#include <fcntl.h>
-#include <io.h>
 #include <lmerr.h>
 #include <msiquery.h>
 #include <iprt/win/objbase.h>
-
 #include <iprt/win/shlobj.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <strsafe.h>
 
 #include <VBox/version.h>
@@ -63 +56 @@
 #include <iprt/utf16.h>
 
+#ifndef IPRT_NO_CRT
+# include <stdio.h>
+# include <stdlib.h>
+#endif
+
 #include "VBoxStub.h"
 #include "../StubBld/VBoxStubBld.h"
@@ -501 +499 @@
 static bool PackageIsNeeded(VBOXSTUBPKG const *pPackage)
 {
-    if (pPackage->byArch == VBOXSTUBPKGARCH_ALL)
+    if (pPackage->enmArch == VBOXSTUBPKGARCH_ALL)
         return true;
     VBOXSTUBPKGARCH enmArch = IsWow64() ? VBOXSTUBPKGARCH_AMD64 : VBOXSTUBPKGARCH_X86;
-    return pPackage->byArch == enmArch;
+    return pPackage->enmArch == enmArch;
 }
 
@@ -811 +809 @@
         rcExit = RTEXITCODE_SUCCESS; /* Ignore .cab files, they're generally referenced by other files. */
     else
-        rcExit = ShowError("Internal error: Do not know how to handle file '%s' (%s).", pPackage->szFileName, pRec->szPath);
+        rcExit = ShowError("Internal error: Do not know how to handle file '%s' (%s).", pPackage->szFilename, pRec->szPath);
     return rcExit;
 }
@@ -1023 +1021 @@
             RTFILE hFile = NIL_RTFILE;
             char   szDstFile[RTPATH_MAX];
-            if (fExtractOnly || pPackage->byArch == VBOXSTUBPKGARCH_ALL)
-                rc = RTPathJoin(szDstFile, sizeof(szDstFile), pszDstDir, pPackage->szFileName);
+            if (fExtractOnly || pPackage->enmArch == VBOXSTUBPKGARCH_ALL)
+                rc = RTPathJoin(szDstFile, sizeof(szDstFile), pszDstDir, pPackage->szFilename);
             else
             {
@@ -1030 +1028 @@
                 if (RT_SUCCESS(rc))
                 {
-                    const char *pszSuffix = RTPathSuffix(pPackage->szFileName);
+                    const char *pszSuffix = RTPathSuffix(pPackage->szFilename);
                     if (pszSuffix)
                         rc = RTStrCat(szDstFile, sizeof(szDstFile), pszSuffix);
@@ -1040 +1038 @@
                         if (RT_FAILURE(rc))
                             return ShowError("Failed to create unique filename for '%s' in '%s': %Rrc",
-                                             pPackage->szFileName, pszDstDir, rc);
+                                             pPackage->szFilename, pszDstDir, rc);
                     }
                 }
@@ -1049 +1047 @@
             rc = Extract(pPackage, szDstFile, hFile, k);
             if (RT_FAILURE(rc))
-                return ShowError("Error extracting package #%u (%s): %Rrc", k, pPackage->szFileName, rc);
+                return ShowError("Error extracting package #%u (%s): %Rrc", k, pPackage->szFilename, rc);
         }
     }
@@ -1056 +1054 @@
 }
 
-
-int WINAPI WinMain(HINSTANCE  hInstance,
-                   HINSTANCE  hPrevInstance,
-                   char      *lpCmdLine,
-                   int        nCmdShow)
-{
-    RT_NOREF(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
-    char **argv = __argv;
-    int argc    = __argc;
-
+int main(int argc, char **argv)
+{
     /*
      * Init IPRT. This is _always_ the very first thing we do.
@@ -1088 +1078 @@
     char szExtractPath[RTPATH_MAX] = {0};
     char szMSIArgs[_4K]            = {0};
-    char szMSILogFile[RTPATH_MAX]     = {0};
+    char szMSILogFile[RTPATH_MAX]  = {0};
 
     /* Argument enumeration IDs. */
@@ -1335 +1325 @@
      */
     SetLastError(0);
-    HANDLE hMutexAppRunning = CreateMutex(NULL, FALSE, "VBoxStubInstaller");
+    HANDLE hMutexAppRunning = CreateMutexW(NULL, FALSE, L"VBoxStubInstaller");
     if (   hMutexAppRunning != NULL
         && GetLastError() == ERROR_ALREADY_EXISTS)
@@ -1389 +1379 @@
             return ShowError("Unable to allocate console: LastError=%u\n", GetLastError());
 
+# ifdef IPRT_NO_CRT
+        PRTSTREAM pNewStdOutErr = NULL;
+        vrc = RTStrmOpen("CONOUT$", "a", &pNewStdOutErr);
+        if (RT_SUCCESS(vrc))
+        {
+            RTStrmSetBufferingMode(pNewStdOutErr, RTSTRMBUFMODE_UNBUFFERED);
+            g_pStdErr  = pNewStdOutErr;
+            g_pStdOut  = pNewStdOutErr;
+        }
+# else
         freopen("CONOUT$", "w", stdout);
         setvbuf(stdout, NULL, _IONBF, 0);
-
         freopen("CONOUT$", "w", stderr);
+# endif
     }
 #endif /* VBOX_STUB_WITH_OWN_CONSOLE */
@@ -1445 +1445 @@
              * From here on, we do everything in functions so we can counter clean up.
              */
-            rcExit = ExtractFiles(pHeader->byCntPkgs, szExtractPath, fExtractOnly, &pExtractDirRec);
+            rcExit = ExtractFiles(pHeader->cPackages, szExtractPath, fExtractOnly, &pExtractDirRec);
             if (rcExit == RTEXITCODE_SUCCESS)
             {
@@ -1462 +1462 @@
 #endif
                     unsigned iPackage = 0;
-                    while (   iPackage < pHeader->byCntPkgs
+                    while (   iPackage < pHeader->cPackages
                            && (rcExit == RTEXITCODE_SUCCESS || rcExit == (RTEXITCODE)ERROR_SUCCESS_REBOOT_REQUIRED))
                     {
@@ -1509 +1509 @@
     return rcExit != (RTEXITCODE)ERROR_SUCCESS_REBOOT_REQUIRED || !fIgnoreReboot ? rcExit : RTEXITCODE_SUCCESS;
 }
+
+#ifndef IPRT_NO_CRT
+int WINAPI WinMain(HINSTANCE  hInstance,
+                   HINSTANCE  hPrevInstance,
+                   char      *lpCmdLine,
+                   int        nCmdShow)
+{
+    RT_NOREF(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
+    return main(__argc, __argv);
+}
+#endif
+