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

Timestamp:

May 5, 2025 6:00:52 PM (4 days ago)

Author:

vboxsync

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

168721

Message:

Windows Additions installer: Got rid of the ancient servicepack.nsh + winver.nsh and use the official (included with NSIS) WinVer.nsh (in Include\WinVer.nsh). This also makes use if the ${AtLeastWinXXX} macros and stuff to improve code readability.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditionsCommon.nsh (modified) (11 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (5 diffs)

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

@@ -58 +58 @@
 
   ; Init global variables that depends on the Windows version.
-  ${If} $g_strWinVersion == "XP"
+  ${If} ${AtLeastWinVista}
+    StrCpy $g_strEarlyNTDrvInfix ""
+  ${Else}
     StrCpy $g_strEarlyNTDrvInfix "EarlyNT"
-  ${ElseIf} $g_strWinVersion == "2000"
-    StrCpy $g_strEarlyNTDrvInfix "EarlyNT"
-  ${ElseIf} $g_strWinVersion == "NT4"
-    StrCpy $g_strEarlyNTDrvInfix "EarlyNT"
-  ${Else}
-    StrCpy $g_strEarlyNTDrvInfix ""
   ${EndIf}
 
@@ -148 +144 @@
     FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
   !else
-  ${If} $g_strWinVersion == "10"
+  ${If} ${AtLeastWin10}
     FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
   ${Else}
@@ -166 +162 @@
     FILE "$%PATH_OUT%\bin\additions\VBoxMouse.cat"
   !else
-    ${If} $g_strWinVersion == "10"
+    ${If} ${AtLeastWin10}
       FILE "$%PATH_OUT%\bin\additions\VBoxMouse.cat"
     ${Else}
@@ -193 +189 @@
 !ifdef VBOX_SIGN_ADDITIONS
   !if $%KBUILD_TARGET_ARCH% != "arm64" ;; @todo win.arm64: Ditto.
-    ${If} $g_strWinVersion == "10"
+    ${If} ${AtLeastWin10}
       FILE "$%PATH_OUT%\bin\additions\VBoxVideo.cat"
     ${Else}
@@ -213 +209 @@
         FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
       !else
-      ${If} $g_strWinVersion == "10"
+      ${If} ${AtLeastWin10}
         FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
       ${Else}
@@ -249 +245 @@
   ; Shared Folders driver
   ;
-  ${If}   $g_strWinVersion <> "NT4" ; Only available for > NT4.
+  ${If}   ${AtLeastWin2000} ; Only available for > NT4.
   ${OrIf} $g_bOnlyExtract == "true"
     SetOutPath "$INSTDIR\VBoxSF"
@@ -273 +269 @@
   ;
 !ifdef VBOX_SIGN_ADDITIONS
-  ${If}   $g_strWinVersion <> "NT4" ; Only required for > NT4.
+  ${If}   ${AtLeastWin2000} ; Only required for > NT4.
   ${OrIf} $g_bOnlyExtract == "true"
     SetOutPath "$INSTDIR\Cert"
@@ -294 +290 @@
   ;
   SetOutPath "$INSTDIR\Tools"
-${If} $g_strWinVersion <> "NT4" ; VBoxDrvInst only works with > NT4.
-  FILE "$%PATH_OUT%\bin\additions\VBoxDrvInst.exe"
-  AccessControl::SetOnFile "$INSTDIR\VBoxDrvInst.exe" "(BU)" "GenericRead"
-${EndIf}
+  ${If} ${AtLeastWin2000} ; VBoxDrvInst only works with > NT4.
+    FILE "$%PATH_OUT%\bin\additions\VBoxDrvInst.exe"
+    AccessControl::SetOnFile "$INSTDIR\VBoxDrvInst.exe" "(BU)" "GenericRead"
+  ${EndIf}
   FILE "$%PATH_OUT%\bin\additions\VBoxGuestInstallHelper.exe"
   AccessControl::SetOnFile "$INSTDIR\VBoxGuestInstallHelper.exe" "(BU)" "GenericRead"
@@ -402 +398 @@
 
   ${LogVerbose} "Stopping VBoxService via SCM ..."
-  ${If} $g_strWinVersion == "NT4"
+  ${If} ${AtMostWinNT4}
     nsExec::Exec '"$SYSDIR\net.exe" stop VBoxService'
   ${Else}
@@ -537 +533 @@
 
   ; Does the guest have a DLL cache?
-  ${If}   $g_strWinVersion == "NT4"     ; bird: NT4 doesn't have a DLL cache, WTP is 5.0 <= NtVersion < 6.0.
-  ${OrIf} $g_strWinVersion == "2000"
-  ${OrIf} $g_strWinVersion == "XP"
+  ${If}   ${IsWin2000}
+  ${OrIf} ${IsWinXP}
     StrCpy $g_bCapDllCache "true"
     ${LogVerbose}  "OS has a DLL cache"
   ${EndIf}
 
-  ${If}   $g_strWinVersion == "2000"
-  ${OrIf} $g_strWinVersion == "XP"
-  ${OrIf} $g_strWinVersion == "2003"
-  ${OrIf} $g_strWinVersion == "Vista"
-  ${OrIf} $g_strWinVersion == "7"
+  ${If} ${AtLeastWin2000}
     StrCpy $g_bCapXPDM "true"
     ${LogVerbose} "OS is XPDM driver capable"
@@ -555 +546 @@
 !if $%VBOX_WITH_WDDM% == "1"
   ; By default use the WDDM driver on Vista+.
-  ${If}   $g_strWinVersion == "Vista"
-  ${OrIf} $g_strWinVersion == "7"
-  ${OrIf} $g_strWinVersion == "8"
-  ${OrIf} $g_strWinVersion == "8_1"
-  ${OrIf} $g_strWinVersion == "10"
+  ${If} ${AtLeastWinVista}
     StrCpy $g_bWithWDDM "true"
     StrCpy $g_bCapWDDM "true"

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

@@ -91 +91 @@
 
   ; If we're on Windows 2000, skip the ID detection ...
-  ${If} $g_strWinVersion == "2000"
+  ${If} ${IsWin2000}
     Goto change_res
   ${EndIf}
@@ -133 +133 @@
   Var /GLOBAL reg_path_monitor
 
-  ${LogVerbose} "Custom mode set: Platform is Windows $g_strWinVersion"
-  ${If} $g_strWinVersion == "2000"
-  ${OrIf} $g_strWinVersion == "Vista"
+  ${If}     ${IsWin2000}
     StrCpy $reg_path_device "SYSTEM\CurrentControlSet\SERVICES\VBoxVideo\Device0"
     StrCpy $reg_path_monitor "SYSTEM\CurrentControlSet\SERVICES\VBoxVideo\Device0\Mon00000001"
-  ${ElseIf} $g_strWinVersion == "XP"
-  ${OrIf} $g_strWinVersion == "7"
-  ${OrIf} $g_strWinVersion == "8"
-  ${OrIf} $g_strWinVersion == "8_1"
-  ${OrIf} $g_strWinVersion == "10"
+  ${ElseIf} ${IsAtLeastWinXP}
     StrCpy $reg_path_device "SYSTEM\CurrentControlSet\Control\Video\$dev_id\0000"
     StrCpy $reg_path_monitor "SYSTEM\CurrentControlSet\Control\VIDEO\$dev_id\0000\Mon00000001"
   ${Else}
-    ${LogVerbose} "Custom mode set: Windows $g_strWinVersion not supported yet"
+    ${LogVerbose} "Custom mode set: Windows $g_strWinVersion not supported, skipping"
     Goto exit
   ${EndIf}
@@ -300 +294 @@
   ; to do. On guest OSes < Windows 10 we always go for the PreW10 security
   ; catalog files (.cat) and there we install our legacy timestamp CA by default.
-  ${If}    $g_bInstallTimestampCA == "unset"
-  ${AndIf} $g_strWinVersion != "10"
-      StrCpy $g_bInstallTimestampCA "true"
+  ${If}       $g_bInstallTimestampCA == "unset"
+  ${AndIfNot} ${AtLeastWin10}
+    StrCpy $g_bInstallTimestampCA "true"
   ${EndIf}
   ${If} $g_bInstallTimestampCA == "true"
@@ -319 +313 @@
   ; Note that VBOX_GA_CERT_ROOT_SHA1 may be a SHA-2 cert, the hash algorithm
   ; refers to the windows signature structures not the certificate.
-  ${If} $g_strWinVersion != "2000"
+  ${If} ${AtLeastWinXP}
   !if  "$%VBOX_GA_CERT_ROOT_SHA2%" != "none"
     Push "SHA-2 root"
@@ -576 +570 @@
     !if $%KBUILD_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 == "XP"
-      ${OrIf} $g_strWinVersion == "2003"
-      ${OrIf} $g_strWinVersion == "7"
+      ${If}     ${AtLeastWin2000}
+      ${AndIf}  ${AtMostWin7}
         !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\VBoxSFW2K.sys" "$g_strSystemDir\drivers\VBoxSF.sys" "$INSTDIR"
-      ${Else}
+      ${ElseIf} ${AtLeastWin8}
         !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%PATH_OUT%\bin\additions\VBoxSF.sys" "$g_strSystemDir\drivers\VBoxSF.sys" "$INSTDIR"
       ${EndIf}