Changeset 84972 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 26, 2020 2:58:51 PM (4 years ago)

Author:

vboxsync

Message:

Additions/WINNT/SharedFolders: Provide a dedicated 32bit VBoxSF driver for Windows <= 7 linked against the W2K3 DDK rdbss.lib and link the default one against the WHL version for Windows >= 8

The reason for shipping two binaries now is that the mmap FsPerf tests failed under certain circumstances, FlushViewOfFile() would return ERROR_INVALID_PARAMETER.
This only happens when the file is opened readonly first, and then opened read/write again while the first open is still active. The test would go on creating
a mapping of the file using the read/write handle, close both handles and then modify the mapping. Upon flushing the mapping ERROR_INVALID_PARAMETER is returned
because RDBSS passes the readonly file handle to our shared folder driver which the host shared folder service complains about rightfully because it is readonly.
The request returns VERR_INVALID_HANDLE for the write which gets translated to ERROR_INVALID_PARAMETER.
This only happens on 32bit Windows 8 and newer when linked against the W2K3 rdbss.lib, the reason is unknown.
Using the WHL version solves this and to not run into weird compatibility issues on older versions we ship two variants now and the installer decides during
install time which one is used.

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Installer/Makefile.kmk (modified) (1 diff)
• Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)
• SharedFolders/driver/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -91 +91 @@
 ifeq ($(KBUILD_TARGET_ARCH),x86)
 DRIVER_FILES += \
-        $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys
+        $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
+        $(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys
 endif
 DRIVER_FILES += \

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

@@ -302 +302 @@
 
   ; The Shared Folder IFS goes to the system directory
-  !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxSF.sys" "$g_strSystemDir\drivers\VBoxSF.sys" "$INSTDIR"
+  !if $%BUILD_TARGET_ARCH% == "x86"
+    ; On x86 we have to use a different shared folder driver linked against an older RDBSS for Windows 7 and older.
+    ${If} $g_strWinVersion == "2000"
+    ${OrIf} $g_strWinVersion == "Vista"
+    ${OrIf} $g_strWinVersion == "XP"
+    ${OrIf} $g_strWinVersion == "7"
+      !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxSFW2K.sys" "$g_strSystemDir\drivers\VBoxSF.sys" "$INSTDIR"
+    ${Else}
+      !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxSF.sys" "$g_strSystemDir\drivers\VBoxSF.sys" "$INSTDIR"
+    ${EndIf}
+  !else
+    !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxSF.sys" "$g_strSystemDir\drivers\VBoxSF.sys" "$INSTDIR"
+  !endif
+
   !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMRXNP.dll" "$g_strSystemDir\VBoxMRXNP.dll" "$INSTDIR"
   AccessControl::GrantOnFile "$g_strSystemDir\VBoxMRXNP.dll" "(BU)" "GenericRead"

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk

@@ -27 +27 @@
 #VBoxSF_DEFS       += LOG_ENABLED
 
-VBoxSF_SDKS.x86    = ReorderCompilerIncs $(VBOX_WINDDK_GST_W2K3)
-VBoxSF_SDKS.amd64  = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
+VBoxSF_SDKS        = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH)
 
 VBoxSF_LDFLAGS.x86   = -Entry:DriverEntry@8
@@ -44 +43 @@
         Win2kWorkaroundsA.asm
 
-VBoxSF_LIBS.x86  = \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/rxce.lib \
+VBoxSF_LIBS = \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rxce.lib \
         $(VBoxSF_0_OUTDIR)/rdbsslib.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/copysup.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ntoskrnl.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/hal.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ksecdd.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/BufferOverflowK.lib
-
-VBoxSF_LIBS.amd64  = \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/rxce.lib \
-        $(VBoxSF_0_OUTDIR)/rdbsslib.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/copysup.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/ntoskrnl.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/hal.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/ksecdd.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/BufferOverflowK.lib
-
-VBoxSF_LIBS = \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/copysup.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/ntoskrnl.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/hal.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/ksecdd.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/BufferOverflowK.lib \
+        \
         $(VBOX_LIB_VBGL_R0) \
         $(VBOX_LIB_IPRT_GUEST_R0)
@@ -70 +59 @@
 
 
+ifeq ($(KBUILD_TARGET_ARCH),x86)
+ SYSMODS += VBoxSFW2K
+
+ VBoxSFW2K_EXTENDS      := VBoxSF
+ VBoxSFW2K_SDKS         = ReorderCompilerIncs $(VBOX_WINDDK_GST_W2K3)
+ VBoxSFW2K_LIBS         = \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/rxce.lib \
+        $(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/copysup.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ntoskrnl.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/hal.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ksecdd.lib \
+        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/BufferOverflowK.lib \
+        \
+        $(VBOX_LIB_VBGL_R0) \
+        $(VBOX_LIB_IPRT_GUEST_R0)
+ VBoxSFW2K_CLEAN = \
+        $(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib
+endif
+
 include $(FILE_KBUILD_SUB_FOOTER)
 
 $(call KB_FN_AUTO_CMD_DEPS,$(VBoxSF_0_OUTDIR)/rdbsslib.lib)
+
 ifeq ($(KBUILD_TARGET_ARCH),x86)
-$(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
+$(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
+        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
+        $(VBOX_EDIT_COFF_LIB) --input "$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib" --output "$@" \
+                --select "write.obj" \
+               --redefine-sym "__imp__CcFlushCache@16=_g_pfnWrFlushCache" \
+               --redefine-sym "__imp__CcPurgeCacheSection@16=_g_pfnWrPurgeCacheSection" \
+                --select "read.obj" \
+               --redefine-sym "__imp__CcFlushCache@16=_g_pfnRdFlushCache"
+
+$(call KB_FN_AUTO_CMD_DEPS,$(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib)
+$(VBoxSFW2K_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
         $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
         $(VBOX_EDIT_COFF_LIB) --input "$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib" --output "$@" \