Changeset 68239 in vbox for trunk/src/VBox/Main/include

Timestamp:

Aug 2, 2017 12:39:12 PM (7 years ago)

Author:

vboxsync

Message:

Unattended: Added detectedOSLanguages and language attributes to deal with the windows installer's stupid UILanguage requirement. The specified language must be supported by the installation media, probably by way of lang.ini, which means we need to implement UDF support to really get this right. For now, looking for language specifier in the ISO name (ASSUMES filename unchanged since MSDN download).

File:

• trunk/src/VBox/Main/include/UnattendedImpl.h (modified) (5 diffs)

trunk/src/VBox/Main/include/UnattendedImpl.h

@@ -60 +60 @@
     PCRTTIMEZONEINFO i_getTimeZoneInfo() const;
     Utf8Str const &i_getLocale() const;
+    Utf8Str const &i_getLanguage() const;
     Utf8Str const &i_getCountry() const;
     bool           i_isMinimalInstallation() const;
@@ -100 +101 @@
     PCRTTIMEZONEINFO mpTimeZoneInfo;
     Utf8Str         mStrLocale;
+    Utf8Str         mStrLanguage;           /**< (only relevant for windows at the moment) */
     Utf8Str         mStrCountry;
     RTCList<RTCString, RTCString *> mPackageSelectionAdjustments;
@@ -110 +112 @@
     Utf8Str         mStrPostInstallCommand;
     Utf8Str         mStrExtraInstallKernelParameters;
+
+    bool            mfDoneDetectIsoOS;         /**< Set by detectIsoOS(), cleared by setIsoPath(). */
     Utf8Str         mStrDetectedOSTypeId;
     Utf8Str         mStrDetectedOSVersion;
     Utf8Str         mStrDetectedOSFlavor;
+    RTCList<RTCString, RTCString *> mDetectedOSLanguages; /**< (only relevant for windows at the moment) */
     Utf8Str         mStrDetectedOSHints;
     /** @} */
@@ -166 +171 @@
     HRESULT getLocale(com::Utf8Str &aLocale);
     HRESULT setLocale(const com::Utf8Str &aLocale);
+    HRESULT getLanguage(com::Utf8Str &aLanguage);
+    HRESULT setLanguage(const com::Utf8Str &aLanguage);
     HRESULT getCountry(com::Utf8Str &aCountry);
     HRESULT setCountry(const com::Utf8Str &aCountry);
@@ -190 +197 @@
     HRESULT getDetectedOSTypeId(com::Utf8Str &aDetectedOSTypeId);
     HRESULT getDetectedOSVersion(com::Utf8Str &aDetectedOSVersion);
+    HRESULT getDetectedOSLanguages(com::Utf8Str &aDetectedOSLanguages);
     HRESULT getDetectedOSFlavor(com::Utf8Str &aDetectedOSFlavor);
     HRESULT getDetectedOSHints(com::Utf8Str &aDetectedOSHints);