Changeset 82606 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Dec 17, 2019 12:39:23 PM (5 years ago)

Author:

vboxsync

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

135493

Message:

Windows Additions/Installer: Simplified ${un}VerifyFile.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh (modified) (2 diffs)

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

@@ -612 +612 @@
   Push $3 ;               S: old$3 old$2 old$1 old$0
 
-  IfFileExists "$0" check_vendor
+  ${LogVerbose} "Verifying file $\"$0$\" (vendor: $1, arch: $2) ..."
+
+  IfFileExists "$0" check_arch
   Goto not_found
 
-  ${LogVerbose} "Verifying file $\"$0$\" ..."
+check_arch:
+
+  ${LogVerbose} "File $\"$0$\" found"
+
+  Push $0
+  Call ${un}GetFileArchitecture
+  Pop $3
+
+  ${LogVerbose} "Architecture is: $3"
+
+  ${If} $3 == $2
+    Goto check_vendor
+  ${EndIf}
+  Goto invalid
 
 check_vendor:
@@ -623 +638 @@
   Pop $3
 
-  ${LogVerbose} "Vendor is: $3 (wanted: $2)"
+  ${LogVerbose} "Vendor is: $3"
 
   ${If} $3 == $1
-    Goto check_arch
-  ${EndIf}
+    Goto valid
+  ${EndIf}
+
+invalid:
+
+  ${LogVerbose} "File $\"$0$\" is invalid"
+
   StrCpy $3 "1" ; Invalid
   Goto end
 
-check_arch:
-
-  Push $0
-  Call ${un}GetFileArchitecture
-  Pop $3
-
-  ${LogVerbose} "Architecture is: $3 (wanted: $2)"
-
-  ${If} $3 == $2
-    StrCpy $3 "0" ; Valid
-  ${Else}
-    StrCpy $3 "1" ; Invalid
-  ${EndIf}
+valid:
+
+  ${LogVerbose} "File $\"$0$\" is valid"
+
+  StrCpy $3 "0" ; Valid
   Goto end
 
 not_found:
+
+  ${LogVerbose} "File $\"$0$\" was not found"
 
   StrCpy $3 "2" ; Not found