VirtualBox

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


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

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

    r78340 r78389  
    461461      WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "DriverVersion" 1
    462462      WriteRegDWORD HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "Flags" 1
    463       WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "Dll" "VBoxOGL.dll"
     463      WriteRegStr   HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion\OpenGLDrivers\VBoxOGL" "Dll" "VBoxOGL-x86.dll"
    464464    ${EndIf}
    465465    SetRegView 64
    … …  
    521521
    522522!if $%VBOX_WITH_WDDM% == "1"
    523   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
    524   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
    525   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.inf"
     523  Delete /REBOOTOK "$INSTDIR\VBoxWddm.cat"
     524  Delete /REBOOTOK "$INSTDIR\VBoxWddm.sys"
     525  Delete /REBOOTOK "$INSTDIR\VBoxWddm.inf"
    526526  ; Obsolete files begin
    527   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
    528   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
    529   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
    530   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
    531   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
    532   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
     527  Delete /REBOOTOK "$INSTDIR\VBoxVideoWddm.cat"
     528  Delete /REBOOTOK "$INSTDIR\VBoxVideoWddm.sys"
     529  Delete /REBOOTOK "$INSTDIR\VBoxVideoWddm.inf"
     530  Delete /REBOOTOK "$INSTDIR\VBoxVideoW8.cat"
     531  Delete /REBOOTOK "$INSTDIR\VBoxVideoW8.sys"
     532  Delete /REBOOTOK "$INSTDIR\VBoxVideoW8.inf"
    533533  ; Obsolete files end
    534   Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
     534  Delete /REBOOTOK "$INSTDIR\VBoxDispD3D.dll"
    535535  !if $%VBOX_WITH_MESA3D% == "1"
    536     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxNine.dll"
    537     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxSVGA.dll"
    538     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxICD.dll"
    539     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxGL.dll"
     536    Delete /REBOOTOK "$INSTDIR\VBoxNine.dll"
     537    Delete /REBOOTOK "$INSTDIR\VBoxSVGA.dll"
     538    Delete /REBOOTOK "$INSTDIR\VBoxICD.dll"
     539    Delete /REBOOTOK "$INSTDIR\VBoxGL.dll"
    540540  !endif
    541541
    542     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
    543     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
    544     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
    545     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
    546     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
    547     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
    548 
    549     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"
    550     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
     542    Delete /REBOOTOK "$INSTDIR\VBoxOGLcrutil.dll"
     543    Delete /REBOOTOK "$INSTDIR\VBoxOGLarrayspu.dll"
     544    Delete /REBOOTOK "$INSTDIR\VBoxOGLerrorspu.dll"
     545    Delete /REBOOTOK "$INSTDIR\VBoxOGLpackspu.dll"
     546    Delete /REBOOTOK "$INSTDIR\VBoxOGLpassthroughspu.dll"
     547    Delete /REBOOTOK "$INSTDIR\VBoxOGLfeedbackspu.dll"
     548    Delete /REBOOTOK "$INSTDIR\VBoxOGL.dll"
     549
     550    Delete /REBOOTOK "$INSTDIR\VBoxD3D9wddm.dll"
     551    Delete /REBOOTOK "$INSTDIR\wined3dwddm.dll"
    551552    ; Try to delete libWine in case it is there from old installation
    552     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\libWine.dll"
     553    Delete /REBOOTOK "$INSTDIR\libWine.dll"
    553554
    554555  !if $%BUILD_TARGET_ARCH% == "amd64"
    555     Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
     556    Delete /REBOOTOK "$INSTDIR\VBoxDispD3D-x86.dll"
    556557    !if $%VBOX_WITH_MESA3D% == "1"
    557       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxNine-x86.dll"
    558       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxSVGA-x86.dll"
    559       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxICD-x86.dll"
    560       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxGL-x86.dll"
     558      Delete /REBOOTOK "$INSTDIR\VBoxNine-x86.dll"
     559      Delete /REBOOTOK "$INSTDIR\VBoxSVGA-x86.dll"
     560      Delete /REBOOTOK "$INSTDIR\VBoxICD-x86.dll"
     561      Delete /REBOOTOK "$INSTDIR\VBoxGL-x86.dll"
    561562    !endif
    562563
    563       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
    564       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
    565       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
    566       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
    567       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
    568       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
    569 
    570       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxD3D9wddm-x86.dll"
    571       Delete /REBOOTOK "$%PATH_OUT%\bin\additions\wined3dwddm-x86.dll"
     564      Delete /REBOOTOK "$INSTDIR\VBoxOGLcrutil-x86.dll"
     565      Delete /REBOOTOK "$INSTDIR\VBoxOGLarrayspu-x86.dll"
     566      Delete /REBOOTOK "$INSTDIR\VBoxOGLerrorspu-x86.dll"
     567      Delete /REBOOTOK "$INSTDIR\VBoxOGLpackspu-x86.dll"
     568      Delete /REBOOTOK "$INSTDIR\VBoxOGLpassthroughspu-x86.dll"
     569      Delete /REBOOTOK "$INSTDIR\VBoxOGLfeedbackspu-x86.dll"
     570      Delete /REBOOTOK "$INSTDIR\VBoxOGL-x86.dll"
     571
     572      Delete /REBOOTOK "$INSTDIR\VBoxD3D9wddm-x86.dll"
     573      Delete /REBOOTOK "$INSTDIR\wined3dwddm-x86.dll"
    572574  !endif ; $%BUILD_TARGET_ARCH% == "amd64"
    573575!endif ; $%VBOX_WITH_WDDM% == "1"
    … …  
    627629
    628630  Delete /REBOOTOK "$g_strSystemDir\VBoxDispD3D.dll"
     631  !if $%BUILD_TARGET_ARCH% == "amd64"
     632    Delete /REBOOTOK "$g_strSysWow64\VBoxDispD3D-x86.dll"
     633  !endif
     634
    629635  !if $%VBOX_WITH_MESA3D% == "1"
    630636    Delete /REBOOTOK "$g_strSystemDir\VBoxNine.dll"
    … …  
    632638    Delete /REBOOTOK "$g_strSystemDir\VBoxICD.dll"
    633639    Delete /REBOOTOK "$g_strSystemDir\VBoxGL.dll"
     640
     641    !if $%BUILD_TARGET_ARCH% == "amd64"
     642      Delete /REBOOTOK "$g_strSysWow64\VBoxNine-x86.dll"
     643      Delete /REBOOTOK "$g_strSysWow64\VBoxSVGA-x86.dll"
     644      Delete /REBOOTOK "$g_strSysWow64\VBoxICD-x86.dll"
     645      Delete /REBOOTOK "$g_strSysWow64\VBoxGL-x86.dll"
     646    !endif
    634647  !endif
    635648!endif ; $%VBOX_WITH_WDDM% == "1"
    … …  
    649662
    650663  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLcrutil.dll"
     664  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLarrayspu.dll"
    651665  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLerrorspu.dll"
    652666  Delete /REBOOTOK "$g_strSystemDir\VBoxOGLpackspu.dll"
    … …  
    660674  Delete /REBOOTOK "$g_strSystemDir\VBoxD3D8.dll"
    661675  Delete /REBOOTOK "$g_strSystemDir\VBoxD3D9.dll"
     676  Delete /REBOOTOK "$g_strSystemDir\VBoxD3D9wddm.dll"
    662677  Delete /REBOOTOK "$g_strSystemDir\wined3d.dll"
     678  Delete /REBOOTOK "$g_strSystemDir\wined3dwddm.dll"
    663679  ; Update DLL cache
    664680  ${If} ${FileExists} "$g_strSystemDir\dllcache\msd3d8.dll"
    … …  
    682698  !if $%BUILD_TARGET_ARCH% == "amd64"
    683699    ; Only 64-bit installer: Also remove 32-bit DLLs on 64-bit target arch in Wow64 node
    684     Delete /REBOOTOK "$g_strSysWow64\VBoxOGLcrutil.dll"
    685     Delete /REBOOTOK "$g_strSysWow64\VBoxOGLerrorspu.dll"
    686     Delete /REBOOTOK "$g_strSysWow64\VBoxOGLpackspu.dll"
    687     Delete /REBOOTOK "$g_strSysWow64\VBoxOGLpassthroughspu.dll"
    688     Delete /REBOOTOK "$g_strSysWow64\VBoxOGLfeedbackspu.dll"
    689     Delete /REBOOTOK "$g_strSysWow64\VBoxOGL.dll"
     700    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLcrutil-x86.dll"
     701    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLarrayspu-x86.dll"
     702    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLerrorspu-x86.dll"
     703    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLpackspu-x86.dll"
     704    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLpassthroughspu-x86.dll"
     705    Delete /REBOOTOK "$g_strSysWow64\VBoxOGLfeedbackspu-x86.dll"
     706    Delete /REBOOTOK "$g_strSysWow64\VBoxOGL-x86.dll"
    690707
    691708    ; Remove D3D stuff
    692709    ; @todo add a feature flag to only remove if installed explicitly
    693710    Delete /REBOOTOK "$g_strSysWow64\libWine.dll"
    694     Delete /REBOOTOK "$g_strSysWow64\VBoxD3D8.dll"
    695     Delete /REBOOTOK "$g_strSysWow64\VBoxD3D9.dll"
     711    Delete /REBOOTOK "$g_strSysWow64\VBoxD3D8-x86.dll"
     712    Delete /REBOOTOK "$g_strSysWow64\VBoxD3D9-x86.dll"
     713    Delete /REBOOTOK "$g_strSysWow64\VBoxD3D9wddm-x86.dll"
     714    Delete /REBOOTOK "$g_strSysWow64\wined3dwddm-x86.dll"
    696715    Delete /REBOOTOK "$g_strSysWow64\wined3d.dll"
    697716    ; Update DLL cache
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette