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

Timestamp:

Dec 7, 2011 3:43:14 PM (13 years ago)

Author:

vboxsync

Message:

Windows Guest Additions installer: Validation of D3D files (work in progress).

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• VBoxGuestAdditions.nsi (modified) (6 diffs)
• VBoxGuestAdditionsCommon.nsh (modified) (1 diff)

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

@@ -205 +205 @@
 Var g_iSystemMode                       ; Current system mode (0 = Normal boot, 1 = Fail-safe boot, 2 = Fail-safe with network boot)
 Var g_strSystemDir                      ; Windows system directory
+Var g_strSysWow64                       ; The SysWow64 directory on 64-bit systems
 Var g_strCurUser                        ; Current user using the system
 Var g_strAddVerMaj                      ; Installed Guest Additions: Major version
@@ -835 +836 @@
 
   !if $%BUILD_TARGET_ARCH% == "amd64"
-    ; We need a special directory set to SysWOW64 because some
-    ; shell operations don't support file redirection (yet)
-    Var /GLOBAL SYSWOW64DIR
-    StrCpy $SYSWOW64DIR "$WINDIR\SysWOW64"
     ; Only 64-bit installer:
     ; Also copy 32-bit DLLs on 64-bit Windows in SysWOW64 node
-    SetOutPath $SYSWOW64DIR
-    DetailPrint "Installing Direct3D support (SysWOW64: $SYSWOW64DIR) ..."
+    SetOutPath $g_strSysWow64
+    DetailPrint "Installing Direct3D support (SysWOW64: $g_strSysWow64) ..."
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\libWine.dll"
     FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D8.dll"
@@ -853 +850 @@
 
     ; Save original DLLs (only if msd3d*.dll does not exist) ...
-    SetOutPath "$SYSWOW64DIR\dllcache"
-    IfFileExists "$SYSWOW64DIR\dllcache\msd3d8.dll" +2
-      CopyFiles /SILENT "$SYSWOW64DIR\dllcache\d3d8.dll" "$SYSWOW64DIR\dllcache\msd3d8.dll"
-    IfFileExists "$SYSWOW64DIR\dllcache\msd3d9.dll" +2
-      CopyFiles /SILENT "$SYSWOW64DIR\dllcache\d3d9.dll" "$SYSWOW64DIR\dllcache\msd3d9.dll"
-
-    Push "$SYSWOW64DIR\dllcache\d3d8.dll"
+    SetOutPath "$g_strSysWow64\dllcache"
+    IfFileExists "$g_strSysWow64\dllcache\msd3d8.dll" +2
+      CopyFiles /SILENT "$g_strSysWow64\dllcache\d3d8.dll" "$g_strSysWow64\dllcache\msd3d8.dll"
+    IfFileExists "$g_strSysWow64\dllcache\msd3d9.dll" +2
+      CopyFiles /SILENT "$g_strSysWow64\dllcache\d3d9.dll" "$g_strSysWow64\dllcache\msd3d9.dll"
+
+    Push "$g_strSysWow64\dllcache\d3d8.dll"
     Call PrepareWRPFile
 
-    Push "$SYSWOW64DIR\dllcache\d3d9.dll"
+    Push "$g_strSysWow64\dllcache\d3d9.dll"
     Call PrepareWRPFile
 
     ; Exchange DLLs
-    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSWOW64DIR\dllcache\d3d8.dll" "$TEMP"
-    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSWOW64DIR\dllcache\d3d9.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$g_strSysWow64\dllcache\d3d8.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$g_strSysWow64\dllcache\d3d9.dll" "$TEMP"
 
     ; If exchange above failed, do it on reboot
-    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSWOW64DIR\dllcache\d3d8.dll" "$TEMP"
-    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSWOW64DIR\dllcache\d3d9.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$g_strSysWow64\dllcache\d3d8.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$g_strSysWow64\dllcache\d3d9.dll" "$TEMP"
 
     ;
@@ -878 +875 @@
 
     ; Save original DLLs (only if msd3d*.dll does not exist) ...
-    IfFileExists "$SYSWOW64DIR\msd3d8.dll" +2
-      CopyFiles /SILENT "$SYSWOW64DIR\d3d8.dll" "$SYSWOW64DIR\msd3d8.dll"
-    IfFileExists "$SYSWOW64DIR\msd3d9.dll" +2
-      CopyFiles /SILENT "$SYSWOW64DIR\d3d9.dll" "$SYSWOW64DIR\msd3d9.dll"
-
-    Push "$SYSWOW64DIR\d3d8.dll"
+    IfFileExists "$g_strSysWow64\msd3d8.dll" +2
+      CopyFiles /SILENT "$g_strSysWow64\d3d8.dll" "$g_strSysWow64\msd3d8.dll"
+    IfFileExists "$g_strSysWow64\msd3d9.dll" +2
+      CopyFiles /SILENT "$g_strSysWow64\d3d9.dll" "$g_strSysWow64\msd3d9.dll"
+
+    Push "$g_strSysWow64\d3d8.dll"
     Call PrepareWRPFile
 
-    Push "$SYSWOW64DIR\d3d9.dll"
+    Push "$g_strSysWow64\d3d9.dll"
     Call PrepareWRPFile
 
     ; Exchange DLLs
-    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSWOW64DIR\d3d8.dll" "$TEMP"
-    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSWOW64DIR\d3d9.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$g_strSysWow64\d3d8.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED NOREBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$g_strSysWow64\d3d9.dll" "$TEMP"
 
     ; If exchange above failed, do it on reboot
-    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$SYSWOW64DIR\d3d8.dll" "$TEMP"
-    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$SYSWOW64DIR\d3d9.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$g_strSysWow64\d3d8.dll" "$TEMP"
+    !insertmacro InstallLib DLL NOTSHARED REBOOT_NOTPROTECTED "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$g_strSysWow64\d3d9.dll" "$TEMP"
 
   !endif ; amd64
@@ -1018 +1015 @@
       ${EndIf}
     ${EndIf}
+
+    ; Validate D3D files
+    Call ValidateD3DFiles
+    Pop $0
+    ${If} $0 == "1"
+      MessageBox MB_ICONINFORMATION|MB_OK "D3D files invalid!" /SD IDOK
+      Goto d3d_disable
+    ${EndIf}
+
   ${Else} ; D3D unselected again
     ${If} $g_strWinVersion != "8" ; On Windows 8 WDDM is mandatory
@@ -1096 +1102 @@
   StrCpy $g_bPostInstallStatus "false"
 
+  ; We need a special directory set to SysWOW64 because some
+  ; shell operations don't support file redirection (yet)
+  StrCpy $g_strSysWow64 "$WINDIR\SysWOW64"
+
   SetErrorLevel 0
   ClearErrors

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

@@ -575 +575 @@
 !insertmacro SetAppMode64 "un."
 
+;
+; Retrieves the vendor ("CompanyName" of FILEINFO structure)
+; of a given file.
+; @return  Stack: Company name, or "" on error/if not found.
+; @param   Stack: File name to retrieve vendor for.
+;
+!macro GetFileVendor un
+Function ${un}GetFileVendor
+
+  ; Preserve values
+  Exch $0 ; Stack: $0 <filename> (Get file name into $0)
+  Push $1
+
+  IfFileExists "$0" found
+  Goto not_found
+
+found:
+
+  VBoxGuestInstallHelper::FileGetVendor "$0"
+  ; Stack: <vendor> $1 $0
+  Pop  $0 ; Get vendor
+  Pop  $1 ; Restore $1
+  Exch $0 ; Restore $0, push vendor on top of stack
+  Goto end
+
+not_found:
+
+  Pop $1
+  Pop $0
+  Push "File not found"
+  Goto end
+
+end:
+
+FunctionEnd
+!macroend
+!insertmacro GetFileVendor ""
+!insertmacro GetFileVendor "un."
+
+;
+; Retrieves the architecture of a given file.
+; @return  Stack: Architecture ("x86", "amd64") or error message.
+; @param   Stack: File name to retrieve architecture for.
+;
+!macro GetFileArchitecture un
+Function ${un}GetFileArchitecture
+
+  ; Preserve values
+  Exch $0 ; Stack: $0 <filename> (Get file name into $0)
+  Push $1
+
+  IfFileExists "$0" found
+  Goto not_found
+
+found:
+
+  VBoxGuestInstallHelper::FileGetArchitecture "$0"
+  ; Stack: <architecture> $1 $0
+  Pop  $0 ; Get architecture string
+  Pop  $1 ; Restore $1
+  Exch $0 ; Restore $0, push vendor on top of stack
+  Goto end
+
+not_found:
+
+  Pop $1
+  Pop $0
+  Push "File not found"
+  Goto end
+
+end:
+
+FunctionEnd
+!macroend
+!insertmacro GetFileArchitecture ""
+!insertmacro GetFileArchitecture "un."
+
+;
+; Verifies a given file by checking its file vendor and target
+; architecture.
+; @return  Stack: "0" if verify, "1" if not, "2" on error / not found.
+; @param   Stack: Architecture ("x86" or "amd64").
+; @param   Stack: Vendor.
+; @param   Stack: File name to verify.
+;
+!macro VerifyFile un
+Function ${un}VerifyFile
+
+  ; Preserve values
+  Exch $0 ; File;         S: old$0 vendor arch
+  Exch    ;               S: vendor old$0 arch
+  Exch $1 ; Vendor;       S: old$1 old$0 arch
+  Exch    ;               S: old$0 old$1 arch
+  Exch 2  ;               S: arch old$1 old$0
+  Exch $2 ; Architecture; S: old$2 old$1 old$0
+  Push $3 ;               S: old$3 old$2 old$1 old$0
+
+MessageBox MB_ICONSTOP "Vendor $1" /SD IDOK
+  IfFileExists "$0" check_vendor
+  Goto not_found
+
+check_vendor:
+
+  Push $0
+  Call ${un}GetFileVendor
+  Pop $3
+MessageBox MB_ICONSTOP "$3 vs. $1" /SD IDOK
+  ${If} $3 == $1
+    Goto check_arch
+  ${EndIf}
+  StrCpy $3 "1" ; Invalid
+  Goto end
+
+check_arch:
+
+  Push $0
+  Call ${un}GetFileArchitecture
+  Pop $3
+MessageBox MB_ICONSTOP "$3 vs. $2" /SD IDOK
+  ${If} $3 == $2
+    StrCpy $3 "0" ; Valid
+  ${Else}
+    StrCpy $3 "1" ; Invalid
+  ${EndIf}
+  Goto end
+
+not_found:
+
+  StrCpy $3 "2" ; Not found
+  Goto end
+
+end:
+MessageBox MB_ICONSTOP "Res: $3" /SD IDOK
+  ; S: old$3 old$2 old$1 old$0
+  Exch $3 ; S: $3 old$2 old$1 old$0
+  Exch    ; S: old$2 $3 old$1
+  Pop $2  ; S: $3 old$1 old$0
+  Exch    ; S: old$1 $3 old$0
+  Pop $1  ; S: $3 old$0
+  Exch    ; S: old$0 $3
+  Pop $0  ; S: $3
+
+FunctionEnd
+!macroend
+!insertmacro VerifyFile ""
+!insertmacro VerifyFile "un."
+
+!macro VerifyFileEx un File Vendor Architecture
+  Push "${Architecture}"
+  Push "${Vendor}"
+  Push "${File}"
+  Call ${un}VerifyFile
+!macroend
+!define VerifyFileEx "!insertmacro VerifyFileEx"
+
+;
+; Validates backed up original Direct3D files.
+; @return  Stack: "0" if files are valid; otherwise "1".
+;
+!macro ValidateFilesDirect3D un
+Function ${un}ValidateD3DFiles
+
+  ; TODO: Here comes the check
+  ${VerifyFileEx} "${un}" "$SYSDIR\foo.dll" "Microsoft Corporation" "x86"
+
+end:
+
+FunctionEnd
+!macroend
+!insertmacro ValidateFilesDirect3D ""
+!insertmacro ValidateFilesDirect3D "un."