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

Timestamp:

Apr 30, 2025 3:01:33 PM (9 days ago)

Author:

vboxsync

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

168672

Message:

Windows Additions installer: Got rid of strstr.nsh and use the official (included with NSIS) StrFunc.nsh library.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (3 diffs)
• VBoxGuestAdditions.nsi (modified) (2 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (3 diffs)
• VBoxGuestAdditionsW2KXP.nsh (modified) (1 diff)
• strstr.nsh (deleted)

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

@@ -311 +311 @@
                 $(PATH_SUB_CURRENT)/ReplaceDLL.nsh \
                 $(PATH_SUB_CURRENT)/servicepack.nsh \
-                $(PATH_SUB_CURRENT)/strstr.nsh \
                 $(PATH_SUB_CURRENT)/winver.nsh \
                 $(PATH_SUB_CURRENT)/Languages/English.nsh \
@@ -366 +365 @@
                 $(PATH_SUB_CURRENT)/ReplaceDLL.nsh \
                 $(PATH_SUB_CURRENT)/servicepack.nsh \
-                $(PATH_SUB_CURRENT)/strstr.nsh \
                 $(PATH_SUB_CURRENT)/winver.nsh \
                 $(PATH_SUB_CURRENT)/Languages/English.nsh \
@@ -491 +489 @@
         ReplaceDLL.nsh \
         servicepack.nsh \
-        strstr.nsh \
         VBoxGuestAdditionsCommon.nsh \
         VBoxGuestAdditionsExternal.nsh \

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -95 +95 @@
 !include "Library.nsh"
 !include "Sections.nsh"
-!include "strstr.nsh"         ; Function "strstr".
+
+; String functions.
+!include "StrFunc.nsh"
+${Using:StrFunc} StrStr
+${Using:StrFunc} UnStrStr
+${Using:StrFunc} StrStrAdv
+; Provide a custom define for ${UnStrStr} so that we can make use of it in
+; macro function which are (also) being used in the uninstaller (functions must begin with ".un").
+!define `un.StrStr` `${UnStrStr}`
+
 !if $%KBUILD_TARGET_ARCH% == "x86" ; Only needed for NT4 SP6 recommendation.
   !include "servicepack.nsh"  ; Function "GetServicePack".
@@ -615 +624 @@
   ${LogVerbose} "Installer runs in debug mode"
 !endif
+
+    Abort
 
   ;

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

@@ -288 +288 @@
   Pop $0         ; Windows Version.
 
-  Push $0        ; The windows version string.
-  Push "NT"      ; String to search for. W2K+ returns no string containing "NT".
-  Call ${un}StrStr
-  Pop $1
+  ; Param "$1"        ; Result string.
+  ; Param "$0"        ; The windows version string.
+  ; Param "NT"        ; String to search for. W2K+ returns no string containing "NT".
+  ${${un}StrStr} "$1" "$0" "NT"
 
   ${If} $1 == "" ; If empty -> not NT 3.XX or 4.XX.
@@ -297 +297 @@
   ${Else}
     ; Ok we know it is NT. Must be a string like NT X.XX.
-    Push $0        ; The windows version string.
-    Push "4."      ; String to search for.
-    Call ${un}StrStr
-    Pop $1
+    ; Param "$1"      ; Result string.
+    ; Param "$0"      ; The windows version string.
+    ; Param "4."      ; String to search for.
+    ${${un}StrStr} "$1" "$0" "4."
     ${If} $1 == "" ; If empty -> not NT 4.
       ;; @todo NT <= 3.x ?
@@ -342 +342 @@
 
   ; Extract major version.
-  Push "$0"       ; String
-  Push "."        ; SubString
-  Push ">"        ; SearchDirection
-  Push "<"        ; StrInclusionDirection
-  Push "0"        ; IncludeSubString
-  Push "0"        ; Loops
-  Push "0"        ; CaseSensitive
-  Call ${un}StrStrAdv
-  Pop $g_strAddVerMaj
+  ; Param "$g_strAddVerMaj"   ; Result string
+  ; Param "$0"                ; String to search for
+  ; Param "."                 ; SubString
+  ; Param ">"                 ; SearchDirection
+  ; Param "<"                 ; StrInclusionDirection
+  ; Param "0"                 ; IncludeSubString
+  ; Param "0"                 ; Loops
+  ; Param "0"                 ; CaseSensitive
+  ${${un}StrStrAdv} "$g_strAddVerMaj" "$0" "." ">" "<" "0" "0" "0"
 
   ; Extract minor version.
-  Push "$0"       ; String
-  Push "."        ; SubString
-  Push ">"        ; SearchDirection
-  Push ">"        ; StrInclusionDirection
-  Push "0"        ; IncludeSubString
-  Push "0"        ; Loops
-  Push "0"        ; CaseSensitive
-  Call ${un}StrStrAdv
-  Pop $1          ; Got first part (e.g. "1.5")
-
-  Push "$1"       ; String
-  Push "."        ; SubString
-  Push ">"        ; SearchDirection
-  Push "<"        ; StrInclusionDirection
-  Push "0"        ; IncludeSubString
-  Push "0"        ; Loops
-  Push "0"        ; CaseSensitive
-  Call ${un}StrStrAdv
-  Pop $g_strAddVerMin   ; Extracted second part (e.g. "5" from "1.5")
+  ; Param "$1"                ; Result string
+  ; Param "$0"                ; String
+  ; Param "."                 ; SubString
+  ; Param ">"                 ; SearchDirection
+  ; Param ">"                 ; StrInclusionDirection
+  ; Param "0"                 ; IncludeSubString
+  ; Param "0"                 ; Loops
+  ; Param "0"                 ; CaseSensitive
+  ${${un}StrStrAdv} "$1" "$0" "." ">" ">" "0" "0" "0"
+
+  ; Param "$g_strAddVerMin"   ; Result string
+  ; Param "$1"                ; String
+  ; Param "."                 ; SubString
+  ; Param ">"                 ; SearchDirection
+  ; Param "<"                 ; StrInclusionDirection
+  ; Param "0"                 ; IncludeSubString
+  ; Param "0"                 ; Loops
+  ; Param "0"                 ; CaseSensitive
+  ${${un}StrStrAdv} "$g_strAddVerMin" "$1" "." ">" "<" "0" "0" "0"
 
   ; Extract build number.
-  Push "$0"       ; String
-  Push "."        ; SubString
-  Push "<"        ; SearchDirection
-  Push ">"        ; StrInclusionDirection
-  Push "0"        ; IncludeSubString
-  Push "0"        ; Loops
-  Push "0"        ; CaseSensitive
-  Call ${un}StrStrAdv
-  Pop $g_strAddVerBuild
+  ; Param "$g_strAddVerBuild" ; Result string
+  ; Param "$0"                ; String
+  ; Param "."                 ; SubString
+  ; Param "<"                 ; SearchDirection
+  ; Param ">"                 ; StrInclusionDirection
+  ; Param "0"                 ; IncludeSubString
+  ; Param "0"                 ; Loops
+  ; Param "0"                 ; CaseSensitive
+  ${${un}StrStrAdv} "$g_strAddVerBuild" "$0" "." "<" ">" "0" "0" "0"
 
   Pop $1

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

@@ -61 +61 @@
     ; Or: \Registry\Machine\System\CurrentControlSet\Control\Video\vboxvideo\Device0
     ; Result: Machine\System\CurrentControlSet\Control\Video\{28B74D2B-F0A9-48E0-8028-D76F6BB1AE65}\0000
-    Push "$tmp" ; String
-    Push "\" ; SubString
-    Push ">" ; SearchDirection
-    Push ">" ; StrInclusionDirection
-    Push "0" ; IncludeSubString
-    Push "2" ; Loops
-    Push "0" ; CaseSensitive
-    Call StrStrAdv
-    Pop $tmppath ; $1 only contains the full path
+    ; Param: "$tmppath" ; Result string
+    ; Param: "$tmp"     ; String to be searched
+    ; Param: "\"        ; SubString
+    ; Param: ">"        ; SearchDirection
+    ; Param: ">"        ; StrInclusionDirection
+    ; Param: "0"        ; IncludeSubString
+    ; Param: "2"        ; Loops
+    ; Param: "0"        ; CaseSensitive
+    ${StrStrAdv} "$tmppath" "$tmp" "\" ">" ">" "0" "2" "0"
     StrCmp $tmppath "" dev_not_found