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

Timestamp:

Nov 4, 2019 12:09:20 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

134406

Message:

Additions/WINNT/Installer: removed the wddm_or_basic_d3d dialog, because there is no basic d3d anymore. bugref:6482 bugref:9529

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Languages/English.nsh (modified) (1 diff)
• Languages/French.nsh (modified) (1 diff)
• Languages/German.nsh (modified) (1 diff)
• VBoxGuestAdditions.nsi (modified) (9 diffs)

trunk/src/VBox/Additions/WINNT/Installer/Languages/English.nsh

@@ -43 +43 @@
 
 LangString VBOX_COMPONENT_D3D  ${LANG_ENGLISH}                      "Direct3D Support (Experimental)"
-LangString VBOX_COMPONENT_D3D_DESC  ${LANG_ENGLISH}                 "Enables Direct3D support for guests (Experimental)"
+LangString VBOX_COMPONENT_D3D_DESC  ${LANG_ENGLISH}                 "Enables Direct3D and OpenGL acceleration for guests. In order to use it the virtual machine requires 256 MB of video memory and enabled 3D acceleration in the $\"Display$\" section of the virtual machine settings."
 LangString VBOX_COMPONENT_D3D_NO_SM ${LANG_ENGLISH}                 "Windows is currently not running in safe mode so Direct3D support cannot be installed."
 LangString VBOX_COMPONENT_D3D_NOT_SUPPORTED ${LANG_ENGLISH}         "The VirtualBox Direct3D support is not available on Windows $g_strWinVersion!"
-LangString VBOX_COMPONENT_D3D_OR_WDDM ${LANG_ENGLISH}               "This system supports the Windows Aero (WDDM) interface.$\r$\nVirtualBox support for this feature is experimental and should not be used on production systems yet.$\r$\n$\r$\nWould you like to install basic Direct3D support instead?"
-LangString VBOX_COMPONENT_D3D_HINT_VRAM ${LANG_ENGLISH}             "Please note that in order to use 3D acceleration the virtual machine requires at least 128 MB of video memory with 256 MB recommended if you wish to use it with multiple monitors.$\r$\n$\r$\nIf necessary you can change the video memory size in the $\"Display$\" section of the virtual machine settings."
+;LangString VBOX_COMPONENT_D3D_HINT_VRAM ${LANG_ENGLISH}             "Please note that in order to use 3D acceleration the virtual machine requires at least 128 MB of video memory with 256 MB recommended if you wish to use it with multiple monitors.$\r$\n$\r$\nIf necessary you can change the video memory size in the $\"Display$\" section of the virtual machine settings."
 LangString VBOX_COMPONENT_D3D_INVALID ${LANG_ENGLISH}               "The setup detected a corrupt/invalid DirectX installation.$\r$\n$\r$\nIn order to get Direct3D support working, consulting the VirtualBox manual is highly recommended.$\r$\n$\r$\nContinue anyway?"
 LangString VBOX_COMPONENT_D3D_INVALID_MANUAL ${LANG_ENGLISH}        "Shall the VirtualBox manual be displayed now to look for a solution?"

trunk/src/VBox/Additions/WINNT/Installer/Languages/French.nsh

@@ -46 +46 @@
 LangString VBOX_COMPONENT_D3D_NO_SM ${LANG_FRENCH}                  "Windows ne fonctionne pas en mode sans échec.$\r$\nDe ce fait, le support D3D ne peut être installé."
 LangString VBOX_COMPONENT_D3D_NOT_SUPPORTED ${LANG_FRENCH}          "Le support invité pour Direct3D n'est pas disponible sur Windows $g_strWinVersion!"
-LangString VBOX_COMPONENT_D3D_OR_WDDM ${LANG_FRENCH}                "Ce système supporte l'interface Windows Aero (WDDM).$\r$\nLe support VirtualBox pour cette fonctionalité est expérimental et ne devrait pas encore être utilisé sur des systèmes importants.$\r$\n$\r$\nVoulez-vous installer le support Direct3D de base à la place?"
-LangString VBOX_COMPONENT_D3D_HINT_VRAM ${LANG_FRENCH}              "Veuillez noter que l'utilisation de l'accélération 3D nécécssite au moins 128 MB de mémoire vidéo ; pour un utilisation avec plusieurs écrans nous recommandons  d'affecter 256 MB.$\r$\n$\r$\nSi nécéssaire vous pouvez changer la taille du mémoire vidéo dans la sous-section $\"Affichage$\" des paramètres de la machine virtuelle."
+;LangString VBOX_COMPONENT_D3D_HINT_VRAM ${LANG_FRENCH}              "Veuillez noter que l'utilisation de l'accélération 3D nécécssite au moins 128 MB de mémoire vidéo ; pour un utilisation avec plusieurs écrans nous recommandons  d'affecter 256 MB.$\r$\n$\r$\nSi nécéssaire vous pouvez changer la taille du mémoire vidéo dans la sous-section $\"Affichage$\" des paramètres de la machine virtuelle."
 LangString VBOX_COMPONENT_D3D_INVALID ${LANG_FRENCH}                "Le programme d'installation a détecté une installation DirectX corrompue ou invalide.$\r$\n$\r$\nAfin d'assurer le bon fonctionnement du support DirectX, nous conseillons de réinstaller le moteur d'exécution DirectX.$\r$\n$\r$\nDésirez-vous cependant continuer?"
 LangString VBOX_COMPONENT_D3D_INVALID_MANUAL ${LANG_FRENCH}         "Voulez-vous voir le manuel d'utilisateur VirtualBox pour chercher une solution?"

trunk/src/VBox/Additions/WINNT/Installer/Languages/German.nsh

@@ -46 +46 @@
 LangString VBOX_COMPONENT_D3D_NO_SM ${LANG_GERMAN}                  "Windows befindet sich aktuell nicht im abgesicherten Modus.$\r$\nDaher kann die D3D-Unterst�tzung nicht installiert werden."
 LangString VBOX_COMPONENT_D3D_NOT_SUPPORTED ${LANG_GERMAN}          "Direct3D Gast-Unterst�tzung nicht verf�gbar unter Windows $g_strWinVersion!"
-LangString VBOX_COMPONENT_D3D_OR_WDDM ${LANG_GERMAN}                "F�r diesen Gast ist Windows Aero (WDDM)-Unterst�tzung verf�gbar.$\r$\nDieses Feature ist jedoch noch experimentell und sollte daher noch nicht auf produktiven Systemen eingesetzt werden.$\r$\n$\r$\nM�chten Sie stattdessen die regul�re Direct3D-Unterst�tzung installieren?"
-LangString VBOX_COMPONENT_D3D_HINT_VRAM ${LANG_GERMAN}              "Bitte beachten Sie, dass die virtuelle Maschine f�r die Benutzung von 3D-Beschleunigung einen Grafikspeicher von mindestens 128 MB f�r einen Monitor ben�tigt und f�r den Multi-Monitor-Betrieb bis zu 256 MB empfohlen wird.$\r$\n$\r$\nSie k�nnen den Grafikspeicher in den VM-Einstellungen in der Kategorie $\"Anzeige$\" �ndern."
+;LangString VBOX_COMPONENT_D3D_HINT_VRAM ${LANG_GERMAN}              "Bitte beachten Sie, dass die virtuelle Maschine f�r die Benutzung von 3D-Beschleunigung einen Grafikspeicher von mindestens 128 MB f�r einen Monitor ben�tigt und f�r den Multi-Monitor-Betrieb bis zu 256 MB empfohlen wird.$\r$\n$\r$\nSie k�nnen den Grafikspeicher in den VM-Einstellungen in der Kategorie $\"Anzeige$\" �ndern."
 LangString VBOX_COMPONENT_D3D_INVALID ${LANG_GERMAN}                "Das Setup hat eine ung�ltige/besch�digte DirectX-Installation festgestellt.$\r$\n$\r$\nUm die Direct3D-Unterst�tzung installieren zu k�nnen wird empfohlen, zuerst das VirtualBox Benutzerhandbuch zu konsultieren.$\r$\n$\r$\nMit der Installation jetzt trotzdem fortfahren?"
 LangString VBOX_COMPONENT_D3D_INVALID_MANUAL ${LANG_GERMAN}         "Soll nun das VirtualBox-Handbuch angezeigt werden um nach einer L�sung zu suchen?"

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

@@ -222 +222 @@
 Var g_strWinVersion                     ; Current Windows version we're running on
 Var g_bLogEnable                        ; Do logging when installing? "true" or "false"
-Var g_bWithWDDM                         ; Install the WDDM graphics driver instead of the XPDM one
 Var g_bCapDllCache                      ; Capability: Does the (Windows) guest have have a DLL cache which needs to be taken care of?
 Var g_bCapWDDM                          ; Capability: Is the guest able to handle/use our WDDM driver?
@@ -244 +243 @@
 Var g_bNoStartMenuEntries               ; Cmd line: Do not create start menu entries
 Var g_bWithAutoLogon                    ; Cmd line: Install VBoxGINA / VBoxCredProv for auto logon support
-Var g_bWithD3D                          ; Cmd line: Install Direct3D support
+Var g_bWithWDDM                         ; Cmd line: Install the WDDM graphics driver instead of the XPDM one
 Var g_bOnlyExtract                      ; Cmd line: Only extract all files, do *not* install them. Only valid with param "/D" (target directory)
 Var g_bPostInstallStatus                ; Cmd line: Post the overall installation status to some external program (VBoxTray)
@@ -797 +796 @@
 SectionEnd
 
+; Start menu entries. Enabled by default and can be disabled by the user.
+Section /o $(VBOX_COMPONENT_STARTMENU) SEC04
+
+  CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" "" "$INSTDIR\iexplore.ico"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
+
+SectionEnd
+
 !ifdef USE_MUI
   ;Assign language strings to sections
@@ -802 +810 @@
     !insertmacro MUI_DESCRIPTION_TEXT   ${SEC01} $(VBOX_COMPONENT_MAIN_DESC)
     !insertmacro MUI_DESCRIPTION_TEXT   ${SEC02} $(VBOX_COMPONENT_AUTOLOGON_DESC)
+    !insertmacro MUI_DESCRIPTION_TEXT   ${SEC03} $(VBOX_COMPONENT_D3D_DESC)
     !insertmacro MUI_DESCRIPTION_TEXT   ${SEC04} $(VBOX_COMPONENT_STARTMENU_DESC)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
@@ -809 +818 @@
 
   WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
-
-SectionEnd
-
-; Start menu entries. Enabled by default and can be disabled by the user.
-Section /o $(VBOX_COMPONENT_STARTMENU) SEC04
-
-  CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url" "" "$INSTDIR\iexplore.ico"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
 
 SectionEnd
@@ -870 +870 @@
   Push $0
 
-  ; Handle selection of D3D component
+  ; Handle selection of WDDM component
   SectionGetFlags ${SEC03} $0
   ${If} $0 == ${SF_SELECTED}
 
-    StrCpy $g_bWithD3D "true"
-
 !if $%VBOX_WITH_WDDM% == "1"
-    ; If we're able to use the WDDM driver just use it instead of the replaced
-    ; D3D components below
+    ; If we're able to use the WDDM driver just use it.
     ${If} $g_bCapWDDM == "true"
-      ;
-      ; Temporary solution: Since WDDM is marked as experimental yet we notify the user
-      ; that WDDM (Aero) support is available but not recommended for production use. He now
-      ; can opt-in for installing WDDM or still go for the old (XPDM) way -- safe mode still required!
-      ;
-      MessageBox MB_ICONQUESTION|MB_YESNO $(VBOX_COMPONENT_D3D_OR_WDDM) /SD IDNO IDYES d3d_install
-      ; Display an unconditional hint about needed VRAM sizes
-      ; Note: We also could use the PCI configuration space (WMI: Win32_SystemSlot Class) for querying
-      ;       the current VRAM size, but let's keep it simple for now
-      MessageBox MB_ICONINFORMATION|MB_OK $(VBOX_COMPONENT_D3D_HINT_VRAM) /SD IDOK
       StrCpy $g_bWithWDDM "true"
       Goto exit
     ${EndIf}
 
-d3d_install:
-
 !endif ; $%VBOX_WITH_WDDM% == "1"
 
-    ${If} $g_bForceInstall != "true"
-      ; Do not install on < XP
-      ${If}   $g_strWinVersion == "NT4"
-      ${OrIf} $g_strWinVersion == "2000"
-      ${OrIf} $g_strWinVersion == ""
-        MessageBox MB_ICONINFORMATION|MB_OK $(VBOX_COMPONENT_D3D_NOT_SUPPORTED) /SD IDOK
-        Goto d3d_disable
-      ${EndIf}
-    ${EndIf}
-
-    ; If force flag is set skip the safe mode check
-    ${If} $g_bForceInstall != "true"
-      ; If we're not in safe mode, print a warning and don't install D3D support
-      ${If} $g_iSystemMode == '0'
-        MessageBox MB_ICONINFORMATION|MB_OK $(VBOX_COMPONENT_D3D_NO_SM) /SD IDOK
-        Goto d3d_disable
-      ${EndIf}
-    ${EndIf}
-
-  ${Else} ; D3D unselected again
+  ${Else} ; WDDM unselected again
 
     ${If}   $g_strWinVersion != "8"   ; On Windows 8 WDDM is mandatory
@@ -926 +892 @@
 
   ${EndIf}
-  Goto exit
-
-d3d_disable:
-
-  StrCpy $g_bWithD3D "false"
-  IntOp $0 $0 & ${SECTION_OFF} ; Unselect section again
-  SectionSetFlags ${SEC03} $0
   Goto exit
 
@@ -1000 +959 @@
   StrCpy $g_bNoStartMenuEntries "false"
   StrCpy $g_bWithAutoLogon "false"
-  StrCpy $g_bWithD3D "false"
   StrCpy $g_bOnlyExtract "false"
   StrCpy $g_bWithWDDM "false"
@@ -1109 +1067 @@
     SectionSetFlags ${SEC03} $0
   ${EndIf}
+  ; If the guest is not able to handle/use our WDDM driver, then 3D is not available
+  ${If} $g_bCapWDDM != "true"
+    SectionSetFlags ${SEC03} ${SF_RO}
+  ${EndIf}
 
   ;