Changeset 35018 in vbox

Timestamp:

Dec 13, 2010 2:46:17 PM (14 years ago)

Author:

vboxsync

Message:

Replaced ntdll.lib from the WINDDK with a mini version that avoids the CRT poison.

Location:

trunk

Files:

trunk/Config.kmk

-              r34926
+              r35018
 # Special SDK for the problematic NTDLL.LIB.
+#
+SDK_VBOX_NTDLL = Requires $(VBOX_WINDDK)
+SDK_VBOX_NTDLL_LIBS ?= $(PATH_SDK_$(VBOX_WINDDK)_LIB)/ntdll.lib
+SDK_VBOX_NTDLL_LIBS.x86 ?= $(PATH_SDK_$(VBOX_WINDDK)_LIB.x86)/ntdll.lib
+SDK_VBOX_NTDLL_LIBS.amd64 ?= $(PATH_SDK_$(VBOX_WINDDK)_LIB.amd64)/ntdll.lib
+ifeq ($(KBUILD_TARGET),win)
+ include $(KBUILD_PATH)/sdks/$(VBOX_WINDDK).kmk
+endif
+SDK_VBOX_NTDLL = Mini NTDLL import library, required IPRT.
+SDK_VBOX_NTDLL_LIBS.x86   ?= $(PATH_LIB)/RuntimeR3NtDll-x86.lib
+SDK_VBOX_NTDLL_LIBS.amd64 ?= $(PATH_LIB)/RuntimeR3NtDll-amd64.lib
+#

-              r34967
+              r35018
  DLLS += VBoxRT
 endif
+# Always build the ntdll import libraries on windows.
+LIBRARIES.win += RuntimeR3NtDll-amd64 RuntimeR3NtDll-x86
 # Where the generated stuff goes.
 …
+#
+# The NTDLL mini import library.
+#
+# Note! The reason for doing this is to avoid importing CRT symbols from the
+#       NTDLL.  We do not wish to do this because:
+#         - Our compiler is usually a different one and we should use the
+#           matching CRT,
+#         - Older versions of NTDLL may not sport all the exports our w2k3 or
+#           later WINDDK ntdll.lib have and thus we may easily end up with
+#           images that does not load on older windows versions.
+#
+RuntimeR3NtDll-amd64_TEMPLATE = VBoxR3Dll
+RuntimeR3NtDll-amd64_ARFLAGS  = /NODEFAULTLIB /MACHINE:amd64
+RuntimeR3NtDll-amd64_SOURCES  = \
+        r3/win/ntdll-mini-implib.c \
+        r3/win/ntdll-mini-implib.def
+RuntimeR3NtDll-x86_EXTENDS    = RuntimeR3NtDll-amd64
+RuntimeR3NtDll-x86_ARFLAGS    = /NODEFAULTLIB /MACHINE:x86
+#
 # errmsg.cpp depends on a generated header.
+#

Note: See TracChangeset for help on using the changeset viewer.