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

Timestamp:

Aug 15, 2019 4:47:43 PM (5 years ago)

Author:

vboxsync

Message:

Additions/WINNT/Installer: Remove Direct3D support for XPDM which was a hack anyway, no replacement using VMSVGA/VBoxSVGA for now, so XP has no 3D support at all for now, bugref:9529

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi (modified) (1 diff)

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

@@ -787 +787 @@
   ${EndIf}
 !endif
-
-  Call SetAppMode64
-  SetOverwrite on
-
-  ${If} $g_strSystemDir == ''
-    StrCpy $g_strSystemDir "$SYSDIR"
-  ${EndIf}
-
-  SetOutPath $g_strSystemDir
-  ${LogVerbose} "Installing XPDM Direct3D support ..."
-  FILE "$%PATH_OUT%\bin\additions\VBoxD3D8.dll"
-  FILE "$%PATH_OUT%\bin\additions\VBoxD3D9.dll"
-  FILE "$%PATH_OUT%\bin\additions\wined3d.dll"
-
-  ;
-  ; Update DLL cache
-  ;
-  ${If} $g_bCapDllCache == "true"
-    ${If} ${FileExists} "$g_strSystemDir\dllcache"
-      SetOutPath "$g_strSystemDir\dllcache"
-      ${CopyFileEx} "" "$g_strSystemDir\dllcache\d3d8.dll" "$g_strSystemDir\dllcache\msd3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
-      ${CopyFileEx} "" "$g_strSystemDir\dllcache\d3d9.dll" "$g_strSystemDir\dllcache\msd3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
-
-      ; Exchange DLLs
-      ${PrepareWRPFileEx} "" "$g_strSystemDir\dllcache\d3d8.dll"
-      ${InstallFileEx} "" "$%PATH_OUT%\bin\additions\d3d8.dll" "$g_strSystemDir\dllcache\d3d8.dll" "$TEMP"
-      ${PrepareWRPFileEx} "" "$g_strSystemDir\dllcache\d3d9.dll"
-      ${InstallFileEx} "" "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\dllcache\d3d9.dll" "$TEMP"
-    ${Else}
-        ${LogVerbose} "DLL cache does not exist, skipping"
-    ${EndIf}
-  ${EndIf}
-
-  ;
-  ; Save original DLLs (only if msd3d*.dll does not exist) ...
-  ;
-  SetOutPath $g_strSystemDir
-  ${CopyFileEx} "" "$g_strSystemDir\d3d8.dll" "$g_strSystemDir\msd3d8.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
-  ${CopyFileEx} "" "$g_strSystemDir\d3d9.dll" "$g_strSystemDir\msd3d9.dll" "Microsoft Corporation" "$%BUILD_TARGET_ARCH%"
-
-  ; Exchange DLLs
-  ${PrepareWRPFileEx} "" "$g_strSystemDir\d3d8.dll"
-  ${InstallFileEx} "" "$%PATH_OUT%\bin\additions\d3d8.dll" "$g_strSystemDir\d3d8.dll" "$TEMP"
-  ${PrepareWRPFileEx} "" "$g_strSystemDir\d3d9.dll"
-  ${InstallFileEx} "" "$%PATH_OUT%\bin\additions\d3d9.dll" "$g_strSystemDir\d3d9.dll" "$TEMP"
-
-!if $%BUILD_TARGET_ARCH% == "amd64"
-    ; Only 64-bit installer:
-    ; Also copy 32-bit DLLs on 64-bit Windows in SysWOW64 node
-    SetOutPath $g_strSysWow64
-    ${LogVerbose} "Installing Direct3D support for 32-bit applications (SysWOW64: $g_strSysWow64) ..."
-    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D8.dll"
-    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\VBoxD3D9.dll"
-    FILE "$%VBOX_PATH_ADDITIONS_WIN_X86%\wined3d.dll"
-
-    ;
-    ; Update DLL cache
-    ;
-    ${If} $g_bCapDllCache == "true"
-      ${If} ${FileExists} "$g_strSysWow64\dllcache"
-        SetOutPath "$g_strSysWow64\dllcache"
-        ${CopyFileEx} "" "$g_strSysWow64\dllcache\d3d8.dll" "$g_strSysWow64\dllcache\msd3d8.dll" "Microsoft Corporation" "x86"
-        ${CopyFileEx} "" "$g_strSysWow64\dllcache\d3d9.dll" "$g_strSysWow64\dllcache\msd3d9.dll" "Microsoft Corporation" "x86"
-
-        ; Exchange DLLs
-        ${PrepareWRPFileEx} "" "$g_strSysWow64\dllcache\d3d8.dll"
-        ${InstallFileEx} "" "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$g_strSysWow64\dllcache\d3d8.dll" "$TEMP"
-        ${PrepareWRPFileEx} "" "$g_strSysWow64\dllcache\d3d9.dll"
-        ${InstallFileEx} "" "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$g_strSysWow64\dllcache\d3d9.dll" "$TEMP"
-      ${Else}
-        ${LogVerbose} "DLL cache does not exist, skipping"
-      ${EndIf}
-    ${EndIf}
-
-    ;
-    ; Update original DLLs
-    ;
-
-    ; Save original DLLs (only if msd3d*.dll does not exist) ...
-    ${CopyFileEx} "" "$g_strSysWow64\d3d8.dll" "$g_strSysWow64\msd3d8.dll" "Microsoft Corporation" "x86"
-    ${CopyFileEx} "" "$g_strSysWow64\d3d9.dll" "$g_strSysWow64\msd3d9.dll" "Microsoft Corporation" "x86"
-
-    ${PrepareWRPFileEx} "" "$g_strSysWow64\d3d8.dll"
-    ${InstallFileEx} "" "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d8.dll" "$g_strSysWow64\d3d8.dll" "$TEMP"
-    ${PrepareWRPFileEx} "" "$g_strSysWow64\d3d9.dll"
-    ${InstallFileEx} "" "$%VBOX_PATH_ADDITIONS_WIN_X86%\d3d9.dll" "$g_strSysWow64\d3d9.dll" "$TEMP"
-
-!endif ; amd64
-  Goto done
-
-error:
-  ; @todo
-  Goto exit
-
-done:
 
 !ifndef WFP_FILE_EXCEPTION