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

Timestamp:

May 6, 2019 1:22:36 PM (6 years ago)

Author:

vboxsync

Message:

Additions/WINNT/Installer: Fixed leftover files after unininstallation, fixed OpenGL support for 32bit apps on a 64bit system when using Windows 7 or older (the driver is called VBoxOGL-x86.dll instead of just VBoxOGL.dll)

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh (modified) (7 diffs)

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

@@ -461 +461 @@
       WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "DriverVersion" 1
       WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "Flags" 1
-      WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "Dll" "VBoxOGL.dll"
+      WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "Dll" "VBoxOGL-x86.dll"
     ${EndIf}
     SetRegView 64
@@ -521 +521 @@
 
 !if $%VBOX_WITH_WDDM% == "1"
-  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
-  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
-  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.inf"
+  Delete /REBOOTOK "$INSTDIR\VBoxWddm.cat"
+  Delete /REBOOTOK "$INSTDIR\VBoxWddm.sys"
+  Delete /REBOOTOK "$INSTDIR\VBoxWddm.inf"
   ; Obsolete files begin
-  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
-  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
-  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
-  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
-  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
-  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
+  Delete /REBOOTOK "$INSTDIR\VBoxVideoWddm.cat"
+  Delete /REBOOTOK "$INSTDIR\VBoxVideoWddm.sys"
+  Delete /REBOOTOK "$INSTDIR\VBoxVideoWddm.inf"
+  Delete /REBOOTOK "$INSTDIR\VBoxVideoW8.cat"
+  Delete /REBOOTOK "$INSTDIR\VBoxVideoW8.sys"
+  Delete /REBOOTOK "$INSTDIR\VBoxVideoW8.inf"
   ; Obsolete files end
-  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
+  Delete /REBOOTOK "$INSTDIR\VBoxDispD3D.dll"
   !if $%VBOX_WITH_MESA3D% == "1"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxNine.dll"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxSVGA.dll"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxICD.dll"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxGL.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxNine.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxSVGA.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxICD.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxGL.dll"
   !endif
 
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
-
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxOGLcrutil.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxOGLarrayspu.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxOGLerrorspu.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxOGLpackspu.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxOGLpassthroughspu.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxOGLfeedbackspu.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxOGL.dll"
+
+    Delete /REBOOTOK "$INSTDIR\VBoxD3D9wddm.dll"
+    Delete /REBOOTOK "$INSTDIR\wined3dwddm.dll"
     ; Try to delete libWine in case it is there from old installation
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\libWine.dll"
+    Delete /REBOOTOK "$INSTDIR\libWine.dll"
 
   !if $%BUILD_TARGET_ARCH% == "amd64"
-    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
+    Delete /REBOOTOK "$INSTDIR\VBoxDispD3D-x86.dll"
     !if $%VBOX_WITH_MESA3D% == "1"
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll"
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxSVGA-x86.dll"
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxICD-x86.dll"
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxGL-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxNine-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxSVGA-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxICD-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxGL-x86.dll"
     !endif
 
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
-
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxD3D9wddm-x86.dll"
-      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\wined3dwddm-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxOGLcrutil-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxOGLarrayspu-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxOGLerrorspu-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxOGLpackspu-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxOGLpassthroughspu-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxOGLfeedbackspu-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\VBoxOGL-x86.dll"
+
+      Delete /REBOOTOK "$INSTDIR\VBoxD3D9wddm-x86.dll"
+      Delete /REBOOTOK "$INSTDIR\wined3dwddm-x86.dll"
   !endif ; $%BUILD_TARGET_ARCH% == "amd64"
 !endif ; $%VBOX_WITH_WDDM% == "1"
@@ -627 +629 @@
 
   Delete /REBOOTOK "$g_strSystemDir\VBoxDispD3D.dll"
+  !if $%BUILD_TARGET_ARCH% == "amd64"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxDispD3D-x86.dll"
+  !endif
+
   !if $%VBOX_WITH_MESA3D% == "1"
     Delete /REBOOTOK "$g_strSystemDir\VBoxNine.dll"
@@ -632 +638 @@
     Delete /REBOOTOK "$g_strSystemDir\VBoxICD.dll"
     Delete /REBOOTOK "$g_strSystemDir\VBoxGL.dll"
+
+    !if $%BUILD_TARGET_ARCH% == "amd64"
+      Delete /REBOOTOK "$g_strSysWow64\VBoxNine-x86.dll"
+      Delete /REBOOTOK "$g_strSysWow64\VBoxSVGA-x86.dll"
+      Delete /REBOOTOK "$g_strSysWow64\VBoxICD-x86.dll"
+      Delete /REBOOTOK "$g_strSysWow64\VBoxGL-x86.dll"
+    !endif
   !endif
 !endif ; $%VBOX_WITH_WDDM% == "1"
@@ -649 +662 @@
 
   Delete /REBOOTOK "$g_strSystemDir\VBoxOGLcrutil.dll"
+  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLarrayspu.dll"
   Delete /REBOOTOK "$g_strSystemDir\VBoxOGLerrorspu.dll"
   Delete /REBOOTOK "$g_strSystemDir\VBoxOGLpackspu.dll"
@@ -660 +674 @@
   Delete /REBOOTOK "$g_strSystemDir\VBoxD3D8.dll"
   Delete /REBOOTOK "$g_strSystemDir\VBoxD3D9.dll"
+  Delete /REBOOTOK "$g_strSystemDir\VBoxD3D9wddm.dll"
   Delete /REBOOTOK "$g_strSystemDir\wined3d.dll"
+  Delete /REBOOTOK "$g_strSystemDir\wined3dwddm.dll"
   ; Update DLL cache
   ${If} ${FileExists} "$g_strSystemDir\dllcache\msd3d8.dll"
@@ -682 +698 @@
   !if $%BUILD_TARGET_ARCH% == "amd64"
     ; Only 64-bit installer: Also remove 32-bit DLLs on 64-bit target arch in Wow64 node
-    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLcrutil.dll"
-    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLerrorspu.dll"
-    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLpackspu.dll"
-    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLpassthroughspu.dll"
-    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLfeedbackspu.dll"
-    Delete /REBOOTOK "$g_strSysWow64\VBoxOGL.dll"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLcrutil-x86.dll"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLarrayspu-x86.dll"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLerrorspu-x86.dll"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLpackspu-x86.dll"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLpassthroughspu-x86.dll"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLfeedbackspu-x86.dll"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxOGL-x86.dll"
 
     ; Remove D3D stuff
     ; @todo add a feature flag to only remove if installed explicitly
     Delete /REBOOTOK "$g_strSysWow64\libWine.dll"
-    Delete /REBOOTOK "$g_strSysWow64\VBoxD3D8.dll"
-    Delete /REBOOTOK "$g_strSysWow64\VBoxD3D9.dll"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxD3D8-x86.dll"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxD3D9-x86.dll"
+    Delete /REBOOTOK "$g_strSysWow64\VBoxD3D9wddm-x86.dll"
+    Delete /REBOOTOK "$g_strSysWow64\wined3dwddm-x86.dll"
     Delete /REBOOTOK "$g_strSysWow64\wined3d.dll"
     ; Update DLL cache