WINNT

Timestamp:

Dec 17, 2019 10:26:44 AM (5 years ago)

Author:

vboxsync

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

135490

Message:

Windows Additions/Installer: Try restoring original Direct3D files which were replaced by older Guest Additions before.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

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

-              r81648
+              r82603
 Section /o $(VBOX_COMPONENT_D3D) SEC03
+!if $%VBOX_WITH_WDDM% == "1"
+  ${If} $g_bWithWDDM == "true"
+    ${LogVerbose} "Installing WDDM Direct3D support ..."
+    ; Do we need to restore the original d3d8.dll/d3d9.dll files because the guest
+    ; installation was upgraded from XPDM to WDDM driver? In a XPDM installation
+    ; those DLLs were replaced by our own stub files.
+    Call RestoreFilesDirect3D
+    Return
+  ${EndIf}
+!endif
+!ifndef WFP_FILE_EXCEPTION
+  MessageBox MB_ICONINFORMATION|MB_OK $(VBOX_WFP_WARN_REPLACE) /SD IDOK
+!endif
+  Goto exit
+exit:
+  ; Nothing to do in here right now.
 SectionEnd

-              r82587
+              r82603
 Function Vista_Prepare
+  ; Try to restore the original Direct3D files in case we're coming from an old(er) Guest Additions
+  ; installation, which formerly replaced those system files with our own stubs.
+  ; This no longer is needed and thus needs to be reverted in any case.
+  Call RestoreFilesDirect3D
+  ; Ignore the result in case we had trouble restoring. The system would be in an inconsistent state anyway.
   Call VBoxMMR_Uninstall

Note: See TracChangeset for help on using the changeset viewer.