Changeset 57865 in vbox for trunk/src/VBox/Runtime

Timestamp:

Sep 23, 2015 1:42:40 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102828

Message:

IPRT,libs: Hacks for building IPRT testcases that can run on NT4. Won't be enabled by default, as I'm doing pretty hairy things.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (4 diffs)
• common/path/RTPathGlob.cpp (modified) (3 diffs)
• r3/win/init-win.cpp (modified) (2 diffs)
• r3/win/internal-r3-win.h (modified) (1 diff)
• r3/win/vcc100-kernel32-fakes.cpp (modified) (2 diffs)
• r3/win/vcc100-kernel32-fakesA.asm (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1336 +1336 @@
 VBoxRT_SDKS                   += VBOX_OPENSSL
 VBoxRT_SDKS.win                = $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL
-if1of ($(KBUILD_TARGET)$(VBOX_WITH_HARDENING), darwin win$(VBOX_WITH_HARDENING))
+if1of ($(KBUILD_TARGET), win)
+VBoxRT_INST                    = $(INST_DLL) $(INST_TESTCASE) $(VBOX_INST_TOOLS)
+else if1of ($(KBUILD_TARGET)$(VBOX_WITH_HARDENING), darwin win$(VBOX_WITH_HARDENING))
 VBoxRT_INST                    = $(INST_DLL) $(INST_TESTCASE)
 endif
@@ -1452 +1454 @@
 $$(VBoxRT_0_OUTDIR)/VBoxRT.def: \
                 $(PATH_SUB_CURRENT)/r3/win/VBoxRT-$$(if-expr $$(KBUILD_TARGET_ARCH) == amd64,win64,win32).def \
-                $(PATH_SUB_CURRENT)/r3/win/$(if $(VBOX_OSE),VBoxRT-openssl-ose.def,VBoxRT-openssl.def)
+                $(PATH_SUB_CURRENT)/r3/win/$(if $(VBOX_OSE),VBoxRT-openssl-ose.def,VBoxRT-openssl.def) \
+                $(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86" && defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES)\
+                ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-msvcr100-win32.def ,) #$(PATH_SUB_CURRENT)/r3/win/VBoxRT-msvcp100-win32.def
         $(RM) -f -- $@
         $(REDIRECT) -wto $@ -- $(CAT_EXT) $^
@@ -1459 +1463 @@
 if1of (VBoxRT,$(DLLS))
  $(call VBOX_SET_VER_INFO_DLL,VBoxRT,VirtualBox Runtime)
+endif
+
+
+if defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86"
+ #
+ # Hacks for running tests on NT 4.  Really ugly!
+ #
+ # We put most of the CRT in VBoxRT because we cannot even load msvcr100.dll
+ # or msvcp100.dll on NT4 because of kernel32.dll dependencies.  More hacks
+ # in RuntimeR3VccTricks.
+ #
+ TEMPLATE_VBoxR3RuntimeDllItself = xx
+ TEMPLATE_VBoxR3RuntimeDllItself_EXTENDS = VBoxR3RuntimeDll
+ TEMPLATE_VBoxR3RuntimeDllItself_LIBS.win.x86 = \
+        $(filter-out $(PATH_STAGE_LIB)/RuntimeR3VccTricks%, $(TEMPLATE_VBoxR3RuntimeDll_LIBS.win.x86))
+ TEMPLATE_VBoxR3RuntimeDllItself_SOURCES = \
+        r3/win/vcc100-kernel32-fakes.cpp \
+        r3/win/vcc100-kernel32-fakesA.asm \
+        r3/win/vcc100-msvcrt-fakes.cpp
+ VBoxRT_TEMPLATE         = VBoxR3RuntimeDllItself
+ VBoxRT_TEMPLATE.win.x86 = VBoxR3RuntimeDllItself
+ VBoxRT_DEFS.win.x86     = $(TEMPLATE_VBoxR3RuntimeDll_DEFS.win.x86) _CRTIMP_PURE="__declspec(dllexport)"
+ VBoxRT_LDFLAGS.win.x86  = /IGNORE:4049 /IGNORE:4217
+ VBoxRT_LIBS.win.x86 = \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/libcmt.lib \
+        $(PATH_TOOL_$(VBOX_VCC_TOOL_STEM)X86_LIB)/libcpmt.lib
 endif
 
@@ -2493 +2524 @@
         r3/win/vcc100-kernel32-fakesA.asm
 
+if defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86" # Ugly hacks... :-)
+RuntimeR3VccTricks_SOURCES += $(RuntimeR3VccTricks_0_OUTDIR)/dynobjs.lib
+RuntimeR3VccTricks_CLEAN    = $(RuntimeR3VccTricks_0_OUTDIR)/dynobjs.lib
+RuntimeR3VccTricks_VBOX_LIBCMT_NEEDED = \
+
+$$(RuntimeR3VccTricks_0_OUTDIR)/dynobjs.lib: \
+                $$(PATH_TOOL_$$(TEMPLATE_VBoxR3Dll_TOOL.win.x86)_LIB)/msvcrt$(VBOX_VCC_CRT_TYPE).lib \
+                $$(PATH_TOOL_$$(TEMPLATE_VBoxR3Dll_TOOL.win.x86)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
+                $$(LIB_RUNTIME) \
+                $(MAKEFILE) | $$(dir $$@)
+        $(RM) -f -- "$@"
+#       $(REDIRECT) -C $(dir $@) -- $(KBUILD_DEVTOOLS)/common/openwatcom/v1.9-r2/binnt/wlib \
+#               $(PATH_TOOL_$(TEMPLATE_VBoxR3Dll_TOOL.win.x86)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \
+#               $(foreach file, $(RuntimeR3VccTricks_VBOX_LIBCMT_NEEDED), *$(file))
+        $(KBUILD_DEVTOOLS)/common/openwatcom/v1.9-r2/binnt/wlib [email protected] $< \
+                -MSVCR100.dll \
+                $(addprefix $(RuntimeR3VccTricks_0_OUTDIR)/, $(RuntimeR3VccTricks_VBOX_LIBCMT_NEEDED)) \
+               -chandler4gs.obj
+        $(KBUILD_DEVTOOLS)/common/openwatcom/v1.9-r2/binnt/wlib -o=$@ \
+               $(LIB_RUNTIME) \
+                [email protected]
+        $(RM) -f -- [email protected] $(addprefix $(RuntimeR3VccTricks_0_OUTDIR)/, $(RuntimeR3VccTricks_VBOX_LIBCMT_NEEDED))
+endif
+
 
 #

trunk/src/VBox/Runtime/common/path/RTPathGlob.cpp

@@ -45 +45 @@
 #if defined(RT_OS_WINDOWS)
 # include <Windows.h>
+# include "../../r3/win/internal-r3-win.h"
 
 #elif defined(RT_OS_OS2)
@@ -500 +501 @@
         /* Since this is used at the start of a pattern, we assume
            we've got more than enough buffer space. */
+        AssertReturn(g_pfnGetSystemWindowsDirectoryW, VERR_SYMBOL_NOT_FOUND);
         PRTUTF16 pwszTmp = (PRTUTF16)pszBuf;
-        UINT cch = GetSystemWindowsDirectoryW(pwszTmp, (UINT)(cbBuf / sizeof(WCHAR)));
+        UINT cch = g_pfnGetSystemWindowsDirectoryW(pwszTmp, (UINT)(cbBuf / sizeof(WCHAR)));
         if (cch >= 2)
         {
@@ -547 +549 @@
     {
         Assert(pszBuf); Assert(cbBuf);
+        AssertReturn(g_pfnGetSystemWindowsDirectoryW, VERR_SYMBOL_NOT_FOUND);
         RTUTF16 wszSystemRoot[MAX_PATH];
-        UINT cchSystemRoot = GetSystemWindowsDirectoryW(wszSystemRoot, MAX_PATH);
+        UINT cchSystemRoot = g_pfnGetSystemWindowsDirectoryW(wszSystemRoot, MAX_PATH);
         if (cchSystemRoot > 0)
             return RTUtf16ToUtf8Ex(wszSystemRoot, cchSystemRoot, &pszBuf, cbBuf, pcchValue);

trunk/src/VBox/Runtime/r3/win/init-win.cpp

@@ -57 +57 @@
 /** The native ntdll.dll handle. */
 DECLHIDDEN(HMODULE)             g_hModNtDll = NULL;
+/** GetSystemWindowsDirectoryW or GetWindowsDirectoryW (NT4). */
+DECLHIDDEN(PFNGETWINSYSDIR)     g_pfnGetSystemWindowsDirectoryW = NULL;
 
 
@@ -293 +295 @@
         rc = rtR3InitNativeObtrusiveWorker();
 
+    /*
+     * Resolve some kernel32.dll APIs we may need but aren't necessarily
+     * present in older windows versions.
+     */
+    g_pfnGetSystemWindowsDirectoryW = (PFNGETWINSYSDIR)GetProcAddress(g_hModKernel32, "GetSystemWindowsDirectoryW");
+    if (g_pfnGetSystemWindowsDirectoryW)
+        g_pfnGetSystemWindowsDirectoryW = (PFNGETWINSYSDIR)GetProcAddress(g_hModKernel32, "GetWindowsDirectoryW");
+
     return rc;
 }

trunk/src/VBox/Runtime/r3/win/internal-r3-win.h

@@ -93 +93 @@
 extern DECLHIDDEN(HMODULE)          g_hModNtDll;
 extern DECLHIDDEN(OSVERSIONINFOEXW) g_WinOsInfoEx;
+typedef UINT (WINAPI *PFNGETWINSYSDIR)(LPWSTR,UINT);
+extern DECLHIDDEN(PFNGETWINSYSDIR)  g_pfnGetSystemWindowsDirectoryW;
 #endif
 

trunk/src/VBox/Runtime/r3/win/vcc100-kernel32-fakes.cpp

@@ -30 +30 @@
 *********************************************************************************************************************************/
 #include <iprt/cdefs.h>
+#include <iprt/types.h>
 
 #ifndef RT_ARCH_X86
@@ -140 +141 @@
 }
 
+
+extern "C" int vcc100_kernel32_fakes_cpp(void)
+{
+    return 42;
+}
+

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

@@ -18 +18 @@
 
 BEGINDATA
+GLOBALNAME vcc100_kernel32_fakes_asm
 
 MAKE_IMPORT_ENTRY DecodePointer, 4