Changeset 106813 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Nov 1, 2024 12:30:41 AM (3 months ago)

Author:

vboxsync

Message:

Installer/win/Stub: RTLdrLoadSystem can load COMCTL32.DLL since right after the 5.0 forward porting of the other lazy loading, so switch from -DelayLoad to VBoxDef2LazyLoad for the COMSPEC32.DLL import to simplify everything. jiraref:VBP-1253

Location:

trunk/src/VBox/Installer/win/Stub

Files:

• Makefile.kmk (modified) (2 diffs)
• comctl32.def (copied) (copied from trunk/src/VBox/Installer/win/Stub/user32.def ) (2 diffs)

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

@@ -56 +56 @@
 VBoxStub_SDKS = \
         VBoxNtDll
-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
+VBoxStub_LDFLAGS = -SubSystem:Windows
 VBoxStub_POST_CMDS = $(VBOX_CHECK_IMPORTS) --image $(out) ntdll.dll kernel32.dll
 ifeq ($(KBUILD_TYPE),asan)
@@ -180 +173 @@
         $(VBOX_DEF_2_LAZY_LOAD) --target "$(VBoxStub_BLD_TRG_ARCH)" --system --library SHELL32.DLL --output "$@" $(filter %.def, $^)
 
+# Dynamic import no. 6: COMCTL32.DLL
+VBoxStub_SOURCES += $(VBoxStub_0_OUTDIR)/ComCtl32LazyLoad.asm
+VBoxStub_CLEAN   += $(VBoxStub_0_OUTDIR)/ComCtl32LazyLoad.asm
+$$(VBoxStub_0_OUTDIR)/ComCtl32LazyLoad.asm: $(PATH_SUB_CURRENT)/comctl32.def $(VBOX_DEF_2_LAZY_LOAD) | $$(dir $$@)
+        $(call MSG_TOOL,VBoxDef2LazyLoad,VBoxStub,$(filter %.def, $^),$@)
+        $(QUIET)$(RM) -f -- "$@"
+        $(VBOX_DEF_2_LAZY_LOAD) --target "$(VBoxStub_BLD_TRG_ARCH)" --system --library COMCTL32.DLL --output "$@" $(filter %.def, $^)
+
 include $(FILE_KBUILD_SUB_FOOTER)
 

trunk/src/VBox/Installer/win/Stub/comctl32.def

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; Definitions for USER32.DLL lazy import library.
+; Definitions for COMCTL32.DLL lazy import library.
 ;
 
@@ -26 +26 @@
 ;
 
-LIBRARY USER32.DLL
+LIBRARY COMCTL32.DLL
 EXPORTS
-    _MessageBoxW@16
-    _MessageBoxA@16
-    _GetDesktopWindow@0
+    _InitCommonControlsEx@4