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

Timestamp:

Oct 30, 2024 11:54:21 PM (3 months ago)

Author:

vboxsync

Message:

Installer/win/Stub: Don't bother crossbuilding the installer stub on win.arm64, not worth the extra effort. jiraref:VBP-1253

Location:

trunk/src/VBox/Installer/win/Stub

Files:

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

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

@@ -42 +42 @@
 #
 PROGRAMS += VBoxStub
-VBoxStub_TEMPLATE     := VBoxStubTemplate
-VBoxStub_BLD_TRG_ARCH := x86
-VBoxStub_DEFS         := _WIN32_WINNT=0x0501 IN_RT_R3
+VBoxStub_TEMPLATE      := VBoxStubTemplate
+if1of ($(KBUILD_TARGET_ARCH), x86 amd64) # don't care for this on arm64
+ VBoxStub_BLD_TRG_ARCH := x86
+ VBoxStub_DEFS         := IN_RT_R3 _WIN32_WINNT=0x0501
+else
+ VBoxStub_DEFS         := IN_RT_R3
+endif
 
 VBoxStub_SOURCES = \
@@ -52 +56 @@
 VBoxStub_SDKS = \
         VBoxNtDll
-VBoxStub_LIBS += \
-        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/delayimp.lib
+ifdef VBoxStub_BLD_TRG_ARCH
+ VBoxStub_LIBS += \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/delayimp.lib
+else
+ VBoxStub_LIBS += \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/delayimp.lib
+endif
 
 VBoxStub_LDFLAGS = -SubSystem:Windows -DelayLoad:comctl32.dll

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

@@ -433 +433 @@
 
     /* Check the content. */
-    uint32_t off = 0;
+    size_t off = 0;
     while (off < cbData)
     {
@@ -439 +439 @@
         size_t  cbToRead = RT_MIN(cbData - off, sizeof(abBuf));
         rc = RTFileRead(hFile, abBuf, cbToRead, NULL);
-        AssertRCReturn(rc, LogErrorRc(rc, "#%u: RTFileRead failed on '%s' at offset %#RX32: %Rrc",
+        AssertRCReturn(rc, LogErrorRc(rc, "#%u: RTFileRead failed on '%s' at offset %#zx: %Rrc",
                                       idxPackage, pszTempFile, off, rc));
         AssertReturn(memcmp(abBuf, &pbData[off], cbToRead) == 0,
-                     LogErrorRc(VERR_STATE_CHANGED, "#%u: File '%s' has change (mismatch in %#zx byte block at %#RX32)",
+                     LogErrorRc(VERR_STATE_CHANGED, "#%u: File '%s' has change (mismatch in %#zx byte block at %#zx)",
                                 idxPackage, pszTempFile, cbToRead, off));
         off += cbToRead;