Changeset 70396 in vbox for trunk/src

Timestamp:

Jan 1, 2018 12:27:08 PM (7 years ago)

Author:

vboxsync

Message:

IPRT,ValidationKit: Fixes for vcc100-shell32-fakes.

Location:

trunk/src/VBox

Files:

• Runtime/Makefile.kmk (modified) (1 diff)
• Runtime/r3/win/vcc100-shell32-fakesA.asm (modified) (1 diff)
• ValidationKit/Config.kmk (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2884 +2884 @@
 RuntimeR3VccTricks_SOURCES  = \
         r3/win/vcc100-kernel32-fakes.cpp \
-        r3/win/vcc100-kernel32-fakesA.asm
+        r3/win/vcc100-kernel32-fakesA.asm \
+        r3/win/vcc100-shell32-fakes.cpp \
+        r3/win/vcc100-shell32-fakesA.asm
 
 if defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86" # Ugly hacks... :-)

trunk/src/VBox/Runtime/r3/win/vcc100-shell32-fakesA.asm

@@ -43 +43 @@
 
 BEGINDATA
-GLOBALNAME vcc100_user32_fakes_asm
+GLOBALNAME vcc100_shell32_fakes_asm
 
 ; NT 3.1

trunk/src/VBox/ValidationKit/Config.kmk

@@ -97 +97 @@
        $(PATH_TOOL_$(TEMPLATE_VBoxValidationKitR3_TOOL.win.x86)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \
         $(PATH_STAGE_LIB)/RuntimeR3VccTricks$(VBOX_SUFF_LIB)
+TEMPLATE_VBoxValidationKitR3_LDFLAGS.win.x86 = \
+        -Include:_vcc100_shell32_fakes_cpp \
+        -Include:_vcc100_shell32_fakes_asm
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
  TEMPLATE_VBoxValidationKitR3_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out)$$(NLTAB))$(TEMPLATE_VBoxValidationKitR3Base_POST_CMDS)$$(NLTAB)