Changeset 94561 in vbox for trunk

Timestamp:

Apr 11, 2022 4:00:50 PM (3 years ago)

Author:

vboxsync

Message:

IPRT: Fixed some errors when VBOX_WITH_MORE_NT4_COMPAT_BINARIES is defined. Not fully working yet though (linking errors).

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (3 diffs)
• r3/win/vcc-fakes-msvcrt.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2030 +2030 @@
         VBox/log-vbox.cpp \
         VBox/RTAssertShouldPanic-vbox.cpp \
-       \
-       common/string/ministring.cpp # for main
+        common/string/ministring.cpp # for main
 ifneq ($(KBUILD_HOST),win)
  RuntimeBldProg_SOURCES        += \
@@ -2448 +2447 @@
  TEMPLATE_VBoxR3RuntimeDllItself_LIBS.win.x86 = \
         $(filter-out $(PATH_STAGE_LIB)/RuntimeR3VccTricks%, $(TEMPLATE_VBoxR3RuntimeDll_LIBS.win.x86))
+ TEMPLATE_VBoxR3RuntimeDllItself_DEFS   += IN_RING3 VCC_FAKES_TARGET_$(VBOX_VCC_TOOL_STEM) VCC_FAKES_TARGET=$(substr $(VBOX_VCC_TOOL_STEM),-3)
  TEMPLATE_VBoxR3RuntimeDllItself_SOURCES = \
         r3/win/vcc-fakes-kernel32.cpp \
-        r3/win/vcc-fakes-kernel32-fakesA.asm \
+        r3/win/vcc-fakes-kernel32-A.asm \
         r3/win/vcc-fakes-ws2_32.cpp \
-        r3/win/vcc-fakes-ws2_32-fakesA.asm \
+        r3/win/vcc-fakes-ws2_32-A.asm \
         r3/win/vcc-fakes-ntdll.cpp \
-        r3/win/vcc-fakes-ntdll-fakesA.asm \
+        r3/win/vcc-fakes-ntdll-A.asm \
         r3/win/vcc-fakes-msvcrt.cpp
  VBoxRT_TEMPLATE         = VBoxR3RuntimeDllItself
@@ -3905 +3905 @@
 LIBRARIES += RuntimeR3VccTricks2
 RuntimeR3VccTricks2_TEMPLATE = VBoxR3Dll
+RuntimeR3VccTricks2_DEFS    += $(RuntimeR3VccTricks_DEFS)
 RuntimeR3VccTricks2_SOURCES  = $(RuntimeR3VccTricks_SOURCES)
 RuntimeR3VccTricks2_SOURCES += $(RuntimeR3VccTricks2_0_OUTDIR)/dynobjs.lib

trunk/src/VBox/Runtime/r3/win/vcc-fakes-msvcrt.cpp

@@ -78 +78 @@
 extern "C" void __cdecl my_setusermatherr(PFNRT pfnIgnore)
 {
+    RT_NOREF(pfnIgnore);
     /* pure stub. */
 }