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

Timestamp:

Nov 9, 2024 1:46:17 AM (2 months ago)

Author:

vboxsync

Message:

Add/Nt/InstallHelper: Don't set the windows version of arm64 and amd64 to nt4. bugref:10762 VBP-1253

Location:

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxGuestInstallHelper.cpp (modified) (1 diff)

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

@@ -38 +38 @@
 PROGRAMS += VBoxGuestInstallHelper
 VBoxGuestInstallHelper_TEMPLATE = VBoxGuestR3Exe
-VBoxGuestInstallHelper_DEFS    = _WIN32_WINNT=0x0400 _UNICODE UNICODE
-VBoxGuestInstallHelper_DEFS   += VBOX_SVN_REV=$(VBOX_SVN_REV)
+VBoxGuestInstallHelper_DEFS     = _UNICODE UNICODE
+VBoxGuestInstallHelper_DEFS    += VBOX_SVN_REV=$(VBOX_SVN_REV)
 ifdef VBOX_WITH_WDDM
- VBoxGuestInstallHelper_DEFS  += VBOX_WITH_WDDM
+ VBoxGuestInstallHelper_DEFS   += VBOX_WITH_WDDM
 endif
-VBoxGuestInstallHelper_DEPS    = $(VBOX_SVN_REV_KMK)
-VBoxGuestInstallHelper_SDKS    = ReorderCompilerIncs $(VBOX_WINPSDK_GST) $(VBOX_WINDDK_GST)
-VBoxGuestInstallHelper_INCS    = ../../include
+if1of ($(KBUILD_TARGET_ARCH), x86)
+ VBoxGuestInstallHelper_DEFS   += _WIN32_WINNT=0x0400
+else if1of ($(KBUILD_TARGET_ARCH), amd64)
+ VBoxGuestInstallHelper_DEFS   += _WIN32_WINNT=0x0501
+endif
+VBoxGuestInstallHelper_DEPS     = $(VBOX_SVN_REV_KMK)
+VBoxGuestInstallHelper_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK_GST) $(VBOX_WINDDK_GST)
+VBoxGuestInstallHelper_INCS     = ../../include
 VBoxGuestInstallHelper_SOURCES = \
         VBoxGuestInstallHelper.cpp \
@@ -79 +84 @@
 VBoxGuestInstallHelperDll_DEFS            := WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
 if1of ($(KBUILD_TARGET_ARCH), x86)
- VBoxGuestInstallHelperDll_DEFS           := _WIN32_WINNT=0x0400
+ VBoxGuestInstallHelperDll_DEFS           += _WIN32_WINNT=0x0400
  VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86 := nt4
 else if1of ($(KBUILD_TARGET_ARCH), amd64)
- VBoxGuestInstallHelperDll_DEFS           := _WIN32_WINNT=0x0501
+ VBoxGuestInstallHelperDll_DEFS           += _WIN32_WINNT=0x0501
  VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86 := xp
 else
- VBoxGuestInstallHelperDll_DEFS           := _WIN32_WINNT=0x0a00
+ VBoxGuestInstallHelperDll_DEFS           += _WIN32_WINNT=0x0a00
  VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86 := w8
 endif

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp

@@ -760 +760 @@
      *          - SP_INF_SIGNER_INFO_W,
      *       but we only make use of SP_DRVINFO_DATA_W.
+     * 
+     *       The newer SP_DRVINFO_DATA_W version was introduced with Windows
+     *       2000, so this only affects x86.
      */
     SetLastError(NO_ERROR);
+#if defined(RT_ARCH_X86)
     SP_DRVINFO_DATA_V1_W drvInfoData = { sizeof(drvInfoData) };
+#else
+    SP_DRVINFO_DATA_W drvInfoData = { sizeof(drvInfoData) };
+#endif
     if (!SetupDiEnumDriverInfoW(hDevInfo, NULL, SPDIT_CLASSDRIVER, 0, &drvInfoData))
         return ErrorMsgLastErr("SetupDiEnumDriverInfoW");