VirtualBox

Ignore:
Timestamp:
Oct 9, 2014 11:34:57 AM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
96474
Message:

include,Additions: Windows 10 tweaks.

Location:
trunk/src/VBox/Additions/WINNT/Installer
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r50421 r53008  
    665665  StrCmp $g_strWinVersion "8" vista     ; Windows 8
    666666  StrCmp $g_strWinVersion "8_1" vista   ; Windows 8.1 / Windows 2012 Server R2
     667  StrCmp $g_strWinVersion "10" vista    ; Windows 10
    667668
    668669  ${If} $g_bForceInstall == "true"
    … …  
    762763  ${OrIf} $R0 == '8'     ; Windows 8.
    763764  ${OrIf} $R0 == '8_1'   ; Windows 8.1 / Windows Server 2012 R2.
     765  ${OrIf} $R0 == '10'    ; Windows 10.
    764766    ; Use VBoxCredProv on Vista and up.
    765767    ${LogVerbose} "Installing VirtualBox credential provider ..."
    … …  
    10261028    ${If}   $g_strWinVersion != "8"   ; On Windows 8 WDDM is mandatory
    10271029    ${AndIf} $g_strWinVersion != "8_1" ; ... also on Windows 8.1 / Windows 2012 Server R2
     1030    ${AndIf} $g_strWinVersion != "10" ; ... also on Windows 10
    10281031      StrCpy $g_bWithWDDM "false"
    10291032    ${EndIf}
    … …  
    12041207    !insertmacro SelectSection ${SEC03}
    12051208  ${EndIf}
    1206   ; On Windows 8 / 8.1 / Windows Server 2012 R2 we always select the 3D
     1209  ; On Windows 8 / 8.1 / Windows Server 2012 R2 and newer we always select the 3D
    12071210  ; section and disable it so that it cannot be deselected again
    12081211  ${If}   $g_strWinVersion == "8"
    12091212  ${OrIf} $g_strWinVersion == "8_1"
     1213  ${OrIf} $g_strWinVersion == "10"
    12101214    IntOp $0 ${SF_SELECTED} | ${SF_RO}
    12111215    SectionSetFlags ${SEC03} $0

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

    r50433 r53008  
    545545  ${OrIf} $g_strWinVersion == "8"
    546546  ${OrIf} $g_strWinVersion == "8_1"
     547  ${OrIf} $g_strWinVersion == "10"
    547548    StrCpy $g_bCapWDDM "true"
    548549    ${LogVerbose} "OS is WDDM driver capable"
    … …  
    552553  ${If}   $g_strWinVersion == "8"
    553554  ${OrIf} $g_strWinVersion == "8_1"
     555  ${OrIf} $g_strWinVersion == "10"
    554556    StrCpy $g_bWithWDDM "true"
    555557    ${LogVerbose} "OS needs WDDM driver by default"
    … …  
    576578  ${OrIf} $g_strWinVersion == "8"
    577579  ${OrIf} $g_strWinVersion == "8_1"
     580  ${OrIf} $g_strWinVersion == "10"
    578581    StrCpy $g_bCapDllCache "true"
    579582    ${LogVerbose}  "OS has a DLL cache"

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

    r46845 r53008  
    8787  StrCmp $g_strWinVersion "8" vista     ; Windows 8
    8888  StrCmp $g_strWinVersion "8_1" vista   ; Windows 8.1 / Windows Server 2012 R2
     89  StrCmp $g_strWinVersion "10" vista    ; Windows 10
    8990
    9091  ${If} $g_bForceInstall == "true"
    … …  
    146147  StrCmp $g_strWinVersion "8" vista     ; Windows 8
    147148  StrCmp $g_strWinVersion "8_1" vista   ; Windows 8.1 / Windows Server 2012 R2
     149  StrCmp $g_strWinVersion "10" vista    ; Windows 10
    148150
    149151  ${If} $g_bForceInstall == "true"

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

    r46876 r53008  
    122122  ${OrIf} $g_strWinVersion == "8"
    123123  ${OrIf} $g_strWinVersion == "8_1"
     124  ${OrIf} $g_strWinVersion == "10"
    124125    StrCpy $reg_path_device "SYSTEM\CurrentControlSet\Control\Video\$dev_id\0000"
    125126    StrCpy $reg_path_monitor "SYSTEM\CurrentControlSet\Control\VIDEO\$dev_id\0000\Mon00000001"
    … …  
    235236    ${If} $g_strWinVersion == "8"
    236237    ${OrIf} $g_strWinVersion == "8_1"
     238    ${OrIf} $g_strWinVersion == "10"
    237239      !ifdef VBOX_SIGN_ADDITIONS
    238240        FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
    … …  
    396398      ${If} $g_strWinVersion == "8"
    397399      ${OrIf} $g_strWinVersion == "8_1"
    398         ${LogVerbose} "Installing WDDM video driver for Windows 8..."
     400      ${OrIf} $g_strWinVersion == "10"
     401        ${LogVerbose} "Installing WDDM video driver for Windows 8 or newer..."
    399402        ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoW8.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
    400403      ${Else}
    … …  
    466469    SetRegView 32
    467470    ; Write additional keys required for Windows XP, Vista and 7 64-bit (but for 32-bit stuff)
    468     ${If} $g_strWinVersion   == '8_1'
     471    ${If} $g_strWinVersion   == '10'
     472    ${OrIf} $g_strWinVersion == '8_1'
    469473    ${OrIf} $g_strWinVersion == '8'
    470474    ${OrIf} $g_strWinVersion == '7'

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

    r46838 r53008  
    6767  StrCmp $R1 '6.1' lbl_winnt_7
    6868  StrCmp $R1 '6.2' lbl_winnt_8
    69   StrCmp $R1 '6.3' lbl_winnt_8_1 lbl_error
     69  StrCmp $R1 '6.3' lbl_winnt_8_1
     70  StrCmp $R1 '6.4' lbl_winnt_10 lbl_error
    7071
    7172  lbl_winnt_x:
    … …  
    101102  Goto lbl_done
    102103
     104  lbl_winnt_10:
     105    Strcpy $R0 '10'
     106  Goto lbl_done
     107
    103108  lbl_error:
    104109    Strcpy $R0 ''
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