VirtualBox

Ignore:
Timestamp:
Dec 24, 2010 3:42:36 PM (14 years ago)
Author:
vboxsync
Message:
  1. wddm: 64bit support 2. wddm: installation fixes (64bit support, unsigned driver warning) 3. propper fix for #5438 (compile with disabled CROGL)
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r35006 r35319  
    189189  FILE "$%PATH_OUT%\bin\additions\VBoxService.exe" ; Only used by W2K and up (for Shared Folders at the moment)
    190190
     191!if $%VBOX_WITH_WDDM% == "1"
     192  ${If} $g_bWithWDDM == "true"
     193    ; WDDM Video driver
     194    SetOutPath "$INSTDIR"
     195   
     196    !ifdef VBOX_SIGN_ADDITIONS
     197      FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
     198    !endif
     199    FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
     200    FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
     201    FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
     202
     203    !if $%VBOX_WITH_CROGL% == "1"
     204      FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
     205      FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
     206      FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
     207      FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
     208      FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
     209      FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
     210      FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
     211
     212      FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"
     213      FILE "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
     214    !endif ; $%VBOX_WITH_CROGL% == "1"
     215     
     216    !if $%BUILD_TARGET_ARCH% == "amd64"
     217      FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
     218
     219      !if $%VBOX_WITH_CROGL% == "1"
     220        FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"
     221        FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
     222        FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
     223        FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
     224        FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
     225        FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
     226        FILE "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
     227
     228        FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm-x86.dll"
     229        FILE "$%PATH_OUT%\bin\additions\wined3dwddm-x86.dll"
     230      !endif ; $%VBOX_WITH_CROGL% == "1"
     231    !endif ; $%BUILD_TARGET_ARCH% == "amd64"
     232     
     233    Goto doneCr
     234  ${EndIf}
     235!endif ; $%VBOX_WITH_WDDM% == "1"
     236
    191237!if $%VBOX_WITH_CROGL% == "1"
    192   !if $%VBOX_WITH_WDDM% == "1"
    193     !if $%BUILD_TARGET_ARCH% == "x86"
    194       ${If} $g_bWithWDDM == "true"
    195         ; WDDM Video driver
    196         StrCpy $0 "$TEMP\VBoxGuestAdditions\WDDM"
    197         CreateDirectory "$0"
    198         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"         "$INSTDIR\VBoxVideoWddm.sys"         "$0"
    199         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"         "$INSTDIR\VBoxVideoWddm.inf"         "$0"
    200         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"           "$INSTDIR\VBoxDispD3D.dll"           "$0"
    201 
    202         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"       "$INSTDIR\VBoxOGLarrayspu.dll"       "$0"
    203         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"         "$INSTDIR\VBoxOGLcrutil.dll"         "$0"
    204         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"       "$INSTDIR\VBoxOGLerrorspu.dll"       "$0"
    205         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"        "$INSTDIR\VBoxOGLpackspu.dll"        "$0"
    206         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll" "$INSTDIR\VBoxOGLpassthroughspu.dll" "$0"
    207         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"    "$INSTDIR\VBoxOGLfeedbackspu.dll"    "$0"
    208         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxOGL.dll"               "$INSTDIR\VBoxOGL.dll"               "$0"
    209 
    210         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\libWine.dll"               "$INSTDIR\libWine.dll"               "$0"
    211         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"          "$INSTDIR\VBoxD3D9wddm.dll"          "$0"
    212         !insertmacro InstallLib DLL NOTSHARED REBOOT_PROTECTED "$%PATH_OUT%\bin\additions\wined3dwddm.dll"           "$INSTDIR\wined3dwddm.dll"           "$0"
    213 
    214         Goto doneCr
    215       ${EndIf}
    216     !endif ; $%BUILD_TARGET_ARCH% == "x86"
    217   !endif ; $%VBOX_WITH_WDDM% == "1"
    218238  ; crOpenGL
    219239  !if $%BUILD_TARGET_ARCH% == "amd64"
    … …  
    250270  !endif
    251271
     272!endif ; VBOX_WITH_CROGL
     273
    252274doneCr:
    253 
    254 !endif ; VBOX_WITH_CROGL
    255275
    256276  Pop $0
    … …  
    452472  Delete /REBOOTOK "$INSTDIR\VBoxControl.exe"
    453473  Delete /REBOOTOK "$INSTDIR\VBoxService.exe" ; File from an older installation maybe, not present here anymore
     474 
     475!if $%VBOX_WITH_WDDM% == "1"
     476  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
     477  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
     478  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
     479  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
     480
     481    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
     482    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
     483    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
     484    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
     485    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
     486    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
     487    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
     488
     489    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"
     490    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
     491    ; try to delete libWine in case it is there from old installation
     492    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\libWine.dll"
     493     
     494  !if $%BUILD_TARGET_ARCH% == "amd64"
     495    Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
     496
     497      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"
     498      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
     499      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
     500      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
     501      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
     502      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
     503      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
     504
     505      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxD3D9wddm-x86.dll"
     506      Delete /REBOOTOK "$%PATH_OUT%\bin\additions\wined3dwddm-x86.dll"
     507  !endif ; $%BUILD_TARGET_ARCH% == "amd64"
     508!endif ; $%VBOX_WITH_WDDM% == "1"
    454509
    455510  ; WHQL fake
    … …  
    471526
    472527  Push $0
    473 !if $%VBOX_WITH_WDDM% == "1"
    474   ; First check whether WDDM driver is installed
    475   nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /matchdrv "PCI\VEN_80EE&DEV_BEEF&SUBSYS_00000000&REV_00" "WDDM"'
    476   Pop $0    ; Ret value
    477   ${If} $0 == "0"
    478     DetailPrint "WDDM display driver is installed"
    479     StrCpy $g_bWithWDDM "true"
    480   ${ElseIf} $0 == "4"
    481     DetailPrint "Non-WDDM display driver is installed"
    482   ${Else}
    483     DetailPrint "Error occured"
    484     ; @todo Add error handling here!
    485   ${Endif}
    486 !endif
    487528
    488529  ; Remove VirtualBox graphics adapter & PCI base drivers
    … …  
    498539
    499540  ; Remove video driver
    500   ${If} $g_bWithWDDM == "true"
    501     nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /delsvc VBoxVideoWddm'
    502     Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideoWddm.sys"
    503     Delete /REBOOTOK "$g_strSystemDir\VBoxDispD3D.dll"
    504   ${Else}
    505     nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /delsvc VBoxVideo'
    506     Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideo.sys"
    507     Delete /REBOOTOK "$g_strSystemDir\VBoxDisp.dll"
    508   ${Endif}
     541!if $%VBOX_WITH_WDDM% == "1"
     542  ; always try to remove both VBoxVideoWddm & VBoxVideo services no matter what is installed currently
     543  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /delsvc VBoxVideoWddm'
     544  ;misha> @todo driver file removal (as well as service removal) should be done as driver package uninstall
     545  ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
     546  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideoWddm.sys"
     547  Delete /REBOOTOK "$g_strSystemDir\VBoxDispD3D.dll"
     548!endif ; $%VBOX_WITH_WDDM% == "1"
     549  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" /delsvc VBoxVideo'
     550  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideo.sys"
     551  Delete /REBOOTOK "$g_strSystemDir\VBoxDisp.dll"
    509552
    510553  ; Remove mouse driver
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