Changeset 52447 in vbox

Timestamp:

Aug 21, 2014 5:25:19 PM (11 years ago)

Author:

vboxsync

Message:

Use our own MZ stub binary, one that is compatible with silly Symantec Endpoint Protection import table patching bugs.

Location:

trunk

Files:

• Config.kmk (modified) (7 diffs)
• src/VBox/HostDrivers/Support/win/winstub.com (added)

trunk/Config.kmk

@@ -3129 +3129 @@
   endif
   TEMPLATE_VBoxRc_CFLAGS             = $(TEMPLATE_VBoxRc_CXXFLAGS)
-  TEMPLATE_VBoxRc_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) -Release -Debug
+  TEMPLATE_VBoxRc_LDFLAGS            = \
+        -Driver -Subsystem:NATIVE -Incremental:NO -Align:64 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) -Release -Debug \
+        -Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        -Stub:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
   ifdef VBOX_SIGNING_MODE
    TEMPLATE_VBoxRc_LDFLAGS          += -IntegrityCheck
@@ -3188 +3191 @@
 
  ifeq ($(VBOX_LDR_FMT32),pe)
-  TEMPLATE_VBoxRcExe_LDFLAGS = -Incremental:NO -MapInfo:Exports -NoD -Debug
+  TEMPLATE_VBoxRcExe_LDFLAGS = \
+        -Incremental:NO -MapInfo:Exports -NoD -Debug \
+        -Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        -Stub:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
   TEMPLATE_VBoxRcExe_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK)
   TEMPLATE_VBoxRcExe_LIBS    = \
@@ -3255 +3261 @@
  endif
 TEMPLATE_VBoxR0_CFLAGS              = $(TEMPLATE_VBoxR0_CXXFLAGS)
-TEMPLATE_VBoxR0_LDFLAGS             = -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) -Release -Debug
+TEMPLATE_VBoxR0_LDFLAGS             = \
+        -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) -Release -Debug \
+        -Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        -Stub:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
  ifdef VBOX_WITH_DTRACE_R0
 TEMPLATE_VBoxR0_LDFLAGS            += -Merge:VTGPrLc.Data=VTGPrLc.Begin -Merge:VTGPrLc.End=VTGPrLc.Begin -Merge:VTGPrLc.Begin=VTGObj
@@ -3362 +3371 @@
  TEMPLATE_VBOXR0DRV_CXXFLAGS           = -Zi -Zl -GR- -EHs- -GF -Gz -W3 -GS- -wd4996 -Zc:wchar_t- -Gs4096 $(VBOX_VCC_OPT) $(VBOX_VCC_FP)
  TEMPLATE_VBOXR0DRV_CFLAGS             = $(TEMPLATE_VBOXR0DRV_CXXFLAGS)
- TEMPLATE_VBOXR0DRV_LDFLAGS            = -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD -Release -Debug
+ TEMPLATE_VBOXR0DRV_LDFLAGS            = \
+        -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD -Release -Debug \
+        -Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        -Stub:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
  ifdef VBOX_WITH_DTRACE_R0DRV
   TEMPLATE_VBOXR0DRV_LDFLAGS          += -Merge:VTGPrLc.Data=VTGPrLc.Begin -Merge:VTGPrLc.End=VTGPrLc.Begin -Merge:VTGPrLc.Begin=VTGObj
@@ -3662 +3674 @@
         /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug \
         /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com \
         /DISALLOWLIB:libc.lib \
         /DISALLOWLIB:libcd.lib \
@@ -4329 +4342 @@
         /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug \
         /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com \
         /DISALLOWLIB:libc.lib \
         /DISALLOWLIB:libcd.lib \
@@ -4785 +4799 @@
   TEMPLATE_VBOXQT4GUIEXE_LDFLAGS = \
         /NOD /INCREMENTAL:NO /MAPINFO:EXPORTS /LargeAddressAware /DynamicBase /NxCompat /Release /Debug \
-        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
+        /Version:$(VBOX_VERSION_MAJOR)0$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \
+        /STUB:$(PATH_ROOT)/src/VBox/HostDrivers/Support/win/winstub.com
   if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_HARDENING)
    TEMPLATE_VBOXQT4GUIEXE_LDFLAGS += -IntegrityCheck