[ros-diffs] [hbelusca] 73659: - Port the last welcome.exe change from r73658. - Fix the path to welcome settings for the FOSDEM CD. - Add the welcome.exe localized customizations for FOSDEM 2017 CD.

Author: hbelusca
Date: Wed Feb  1 04:07:02 2017
New Revision: 73659

URL: http://svn.reactos.org/svn/reactos?rev=73659&view=rev
Log:
- Port the last welcome.exe change from r73658.
- Fix the path to welcome settings for the FOSDEM CD.
- Add the welcome.exe localized customizations for FOSDEM 2017 CD.

Added:
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/de-DE.ini  
(with props)
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/en-US.ini  
(with props)
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/fr-FR.ini  
(with props)
Modified:
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/   (props changed)
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c
    branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt

Propchange: branches/ReactOS-0.4.4-FOSDEM2017/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Wed Feb  1 04:07:02 2017
@@ -23,4 +23,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:73522-73601,73606-73608,73610-73611,73613,73616-73618,73620-73623,73633-73636,73642-73643,73654,73656
+/trunk/reactos:73522-73601,73606-73608,73610-73611,73613,73616-73618,73620-73623,73633-73636,73642-73643,73654,73656-73658

Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c	[iso-8859-1]
(original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/base/setup/welcome/welcome.c	[iso-8859-1]
Wed Feb  1 04:07:02 2017
@@ -197,7 +197,7 @@
 }
 
 static BOOL
-LoadTopicsFromINI(LCID Locale, LPTSTR lpResPath)
+LoadLocalizedResourcesFromINI(LCID Locale, LPTSTR lpResPath)
 {
     DWORD dwRet;
     DWORD dwSize;
@@ -236,6 +236,8 @@
         return FALSE; // TODO: For localized resource, see the general function.
 
     /* Try to load the default localized strings */
+    GetPrivateProfileString(TEXT("Defaults"), TEXT("AppTitle"),
TEXT("ReactOS Welcome") /* default */,
+                            szAppTitle, ARRAYSIZE(szAppTitle), szIniPath);
     if (!GetPrivateProfileString(TEXT("Defaults"),
TEXT("DefaultTopicTitle"), NULL /* default */,
                                  szDefaultTitle, ARRAYSIZE(szDefaultTitle), szIniPath))
     {
@@ -325,7 +327,7 @@
 }
 
 static BOOL
-LoadTopics(LPTSTR lpResPath)
+LoadLocalizedResources(LPTSTR lpResPath)
 {
 #define MAX_NUMBER_INTERNAL_TOPICS  3
 
@@ -339,13 +341,15 @@
      * First, try to load the default internal (localized) strings.
      * They can be redefined by the localized INI files.
      */
+    if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle)))
+        StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS
Welcome"));
     if (!LoadString(hInstance, IDS_DEFAULTTOPICTITLE, szDefaultTitle,
ARRAYSIZE(szDefaultTitle)))
         *szDefaultTitle = 0;
     if (!LoadString(hInstance, IDS_DEFAULTTOPICDESC, szDefaultDesc,
ARRAYSIZE(szDefaultDesc)))
         *szDefaultDesc = 0;
 
-    /* Try to load the topics from INI file */
-    if (*lpResPath && LoadTopicsFromINI(LOCALE_USER_DEFAULT, lpResPath))
+    /* Try to load the resources from INI file */
+    if (*lpResPath && LoadLocalizedResourcesFromINI(LOCALE_USER_DEFAULT,
lpResPath))
         return TRUE;
 
     /* We failed, fall back to internal (localized) resource */
@@ -381,7 +385,7 @@
 }
 
 static VOID
-FreeTopics(VOID)
+FreeResources(VOID)
 {
     if (!pTopics)
         return;
@@ -421,8 +425,8 @@
     /* Verify that the file exists, otherwise use the default configuration */
     if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES)
     {
-        /* Use the default configuration and retrieve the default topics */
-        return LoadTopics(TEXT(""));
+        /* Use the default configuration and retrieve the default resources */
+        return LoadLocalizedResources(TEXT(""));
     }
 
     /* Load the settings from the INI configuration file */
@@ -435,9 +439,9 @@
         *szResPath = 0;
     }
 
-    /* Set the current directory to the one of this application, and retrieve the topics
*/
+    /* Set the current directory to the one of this application, and retrieve the
resources */
     SetCurrentDirectory(szAppPath);
-    return LoadTopics(szResPath);
+    return LoadLocalizedResources(szResPath);
 }
 
 #if 0
@@ -556,10 +560,7 @@
     rcRightPanel.left = rcLeftPanel.right;
     rcRightPanel.right = ulInnerWidth - 1;
 
-    if (!LoadString(hInstance, IDS_APPTITLE, szAppTitle, ARRAYSIZE(szAppTitle)))
-        StringCchCopy(szAppTitle, ARRAYSIZE(szAppTitle), TEXT("ReactOS
Welcome"));
-
-    /* Load the configuration and the topics */
+    /* Load the configuration and the resources */
     LoadConfiguration();
 
     /* Create main window */
@@ -592,7 +593,7 @@
     }
 
     /* Cleanup */
-    FreeTopics();
+    FreeResources();
 
     return msg.wParam;
 }

Modified: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
--- branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt	[iso-8859-1]
(original)
+++ branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/CMakeLists.txt	[iso-8859-1]
Wed Feb  1 04:07:02 2017
@@ -32,7 +32,7 @@
 # Welcome.exe optional custom configuration (only for HybridCD)
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/)
     # Copy the main configuration file
-    add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/welcome.ini DESTINATION
bootcd/reactos NO_CAB FOR hybridcd)
+    add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/welcome_config/welcome.ini DESTINATION
setup/reactos NO_CAB FOR hybridcd)
 
     # Convert the translation files (name format: xx-YY.ini) into UTF-16
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/welcome_config)
@@ -43,7 +43,7 @@
         add_custom_command(OUTPUT "${_converted_file}"
                            COMMAND native-utf16le "${_source_file}"
"${_converted_file}"
                            DEPENDS native-utf16le "${_source_file}")
-        add_cd_file(TARGET converted_welcome_i18n_files FILE ${_converted_file}
DESTINATION bootcd/reactos/welcome NO_CAB NAME_ON_CD ${_file} FOR hybridcd)
+        add_cd_file(TARGET converted_welcome_i18n_files FILE ${_converted_file}
DESTINATION setup/reactos/welcome NO_CAB NAME_ON_CD ${_file} FOR hybridcd)
         list(APPEND _converted_welcome_i18n_files ${_converted_file})
     endforeach(_file)
     add_custom_target(converted_welcome_i18n_files DEPENDS
${_converted_welcome_i18n_files})

Added: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/de-DE.ini
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
---
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/de-DE.ini	(added)
+++
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/de-DE.ini	[iso-8859-1]
Wed Feb  1 04:07:02 2017
@@ -0,0 +1,47 @@
+
+[Defaults]
+AppTitle = "ReactOS 0.4.4-RC für FOSDEM 2017"
+DefaultTopicTitle       = "ReactOS"
+DefaultTopicDescription = "ReactOS ist ein modernes Open-Source-Betriebssystem,
welches auf dem Design von Windows® XP/2003 basiert. Dazu gehört sowohl die volle
Kompatibilität mit Windows-Anwendungen und -Treibern als auch eine ähnliche
Benutzeroberfläche, damit sich die meisten Anwender sofort zurechtfinden. Der Quellcode
des gesamten Systems ist frei verfügbar und steht größtenteils unter der GNU General
Public License."
+
+[Topic0]
+Button      = "ReactOS installieren"
+Title       = "ReactOS installieren"
+Description = "Installiert ReactOS auf ihrem Computer.\n\nBitte beachten Sie, dass
Sie Ihren Computer mit der ReactOS-CD im Laufwerk neu starten müssen, um die Installation
zu starten.\n\nAlternativ können Sie ReactOS problemlos in einer virtuellen QEMU-Maschine
ausprobieren, wenn Sie den entsprechenden Menüpunkt auf der linken Seite wählen."
+Action      = "<msg>Sie müssen Ihren Computer mit der ReactOS-CD im Laufwerk
neu starten, um die Installation zu starten.\n\nBITTE BEACHTEN SIE: Es wird dringend davon
abgeraten, ReactOS auf einem Computer zu installieren, welcher wichtige Daten
enthält!"
+
+[Topic1]
+Button      = "ReactOS in QEMU ausprobieren"
+Title       = "ReactOS in QEMU ausprobieren"
+Description = "Möglicherweise möchten Sie ein Betriebssystem im Alpha-Stadium
nicht auf Ihrem eigenen Computer testen oder es gibt Probleme bei der Installation. Daher
haben wir ReactOS auf einer virtuellen QEMU-Maschine vorinstalliert, mit der Sie das
Betriebssystem problemlos testen können, ohne dass es direkt auf Ihrem Computer
installiert werden muss.\n\nEin Klick auf diesen Menüpunkt öffnet das QEMU-Paket in
7-Zip."
+Action      = "\extras\ReactOS on QEMU\ReactOS-044-FOSDEM2017RC-QEMU.7z"
+
+[Topic2]
+Button      = "ReactOS Build Environment installieren"
+Title       = "ReactOS Build Environment installieren"
+Description = "Damit ReactOS so einfach wie möglich kompiliert werden kann, wurde
das ReactOS Build Environment geschaffen. Dieses enthält die passenden Compiler-Versionen
und alle nötigen Tools, um den gesamten ReactOS-Quellcode zu kompilieren.\n\nDie
Windows-Version des Build Environments ist kompatibel mit Windows XP oder neueren
Versionen. Sie wird über diesen Menüpunkt installiert.\nDie CD enthält auch das Build
Environment für Unix-ähnliche Betriebssysteme, wie z.B. Linux oder Mac OS
X.\n\nZusätzlich befindet sich auf dieser CD der Quellcode dieser ReactOS-Version."
+Action      = "\extras\ReactOS Build Environment\RosBE-2.1.3.exe"
+
+[Topic3]
+Button      = "ReactOS-Quellcodepaket öffnen"
+Title       = "ReactOS-Quellcodepaket öffnen"
+Description = "Die CD enthält auch den gesamten Quellcode dieser ReactOS-Version,
welcher mit dem ReactOS Build Environment kompiliert werden kann.\n\nEin Klick auf diesen
Menüpunkt öffnet ihn in 7-Zip."
+Action      = "\extras\ReactOS Source Code\ReactOS-044-FOSDEM2017RC-Source.7z"
+
+[Topic4]
+Button      = "Die ReactOS-Website besuchen"
+Title       = "Die ReactOS-Website besuchen"
+Description = "Die ReactOS-Website liefert viele weitere Informationen über das
Projekt. Hier finden Sie die neusten ReactOS-Versionen und Neuigkeiten bezüglich der
Entwicklung."
+Action      = "https://www.reactos.org/"
+
+[Topic5]
+Button      = "Die CD durchsuchen"
+Title       = "Die CD durchsuchen"
+Description = "Durchsuchen Sie den Inhalt dieser CD."
+Action      = "explorer.exe"
+
+[Topic6]
+Button      = "Beenden"
+Title       = "Beenden"
+Description = "Beendet das AutoRun-Programm."
+Action      = "<exit>"

Propchange:
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/de-DE.ini
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/en-US.ini
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
---
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/en-US.ini	(added)
+++
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/en-US.ini	[iso-8859-1]
Wed Feb  1 04:07:02 2017
@@ -0,0 +1,47 @@
+
+[Defaults]
+AppTitle = "ReactOS 0.4.4-RC for FOSDEM 2017"
+DefaultTopicTitle       = "ReactOS"
+DefaultTopicDescription = "ReactOS is a modern open source operating system based on
the design of Windows® XP/2003. This encompasses full compatibility with Windows
applications and drivers as well as a familiar user interface, such that people accustomed
to Windows would find using ReactOS straightforward. The source code of the entire system
is available for free under several open source licenses, mostly the GNU General Public
License."
+
+[Topic0]
+Button      = "Install ReactOS"
+Title       = "Install ReactOS"
+Description = "Installs ReactOS on your computer.\n\nPlease note that you have to
restart your computer with the ReactOS CD in the drive to start the
installation.\n\nAlternatively, you can easily try out ReactOS in a QEMU virtual machine
by choosing the respective menu entry on the left side."
+Action      = "<msg>You have to restart your computer with the ReactOS CD in
the drive to start the installation.\n\nPLEASE NOTE: You're highly advised to not
install ReactOS on a computer that contains important data!"
+
+[Topic1]
+Button      = "Try out ReactOS in QEMU"
+Title       = "Try out ReactOS in QEMU"
+Description = "Perhaps you don't want to try out an alpha-stage operating system
on your own computer or you face problems during the installation. For these cases, we
have preinstalled ReactOS on a QEMU virtual machine. This way, you can try out the
operating system without needing to install it on your computer.\n\nA click on this menu
entry opens the QEMU package in 7-Zip."
+Action      = "\extras\ReactOS on QEMU\ReactOS-044-FOSDEM2017RC-QEMU.7z"
+
+[Topic2]
+Button      = "Install ReactOS Build Environment"
+Title       = "Install ReactOS Build Environment"
+Description = "To make building ReactOS as easy as possible, the ReactOS Build
Environment has been created. This contains the right compiler versions and all needed
tools to compile the entire ReactOS Source Code.\n\nThe Windows version of the Build
Environment is compatible with Windows XP or newer versions. It is installed using this
menu entry.\n\nAdditionally, the source code of this ReactOS version is included on this
CD."
+Action      = "\extras\ReactOS Build Environment\RosBE-2.1.3.exe"
+
+[Topic3]
+Button      = "Open the ReactOS Source Code Package"
+Title       = "Open the ReactOS Source Code Package"
+Description = "The CD also contains the entire source code of this ReactOS version,
which can be compiled using the ReactOS Build Environment.\n\nA click on this menu entry
opens it in 7-Zip."
+Action      = "\extras\ReactOS Source Code\ReactOS-044-FOSDEM2017RC-Source.7z"
+
+[Topic4]
+Button      = "Visit the ReactOS Website"
+Title       = "Visit the ReactOS Website"
+Description = "The ReactOS Website offers many more information about the project.
Here you find the latest ReactOS releases and news regarding the development."
+Action      = "https://www.reactos.org/"
+
+[Topic5]
+Button      = "Browse the CD"
+Title       = "Browse the CD"
+Description = "Browse the contents of this CD."
+Action      = "explorer.exe"
+
+[Topic6]
+Button      = "Exit"
+Title       = "Exit"
+Description = "Exits the AutoRun program."
+Action      = "<exit>"

Propchange:
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/en-US.ini
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/fr-FR.ini
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.4.4-FOSDEM2017/reacto…
==============================================================================
---
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/fr-FR.ini	(added)
+++
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/fr-FR.ini	[iso-8859-1]
Wed Feb  1 04:07:02 2017
@@ -0,0 +1,47 @@
+
+[Defaults]
+AppTitle = "ReactOS 0.4.4-RC pour FOSDEM 2017"
+DefaultTopicTitle       = "ReactOS"
+DefaultTopicDescription = "ReactOS est un système d'exploitation moderne basé
sur le design de Windows® XP/2003. Cela signifie une compatibilité totale avec les
applications écrites pour Windows, les pilotes de périphériques ainsi qu'une
interface utilisateur familière, afin que les personnes habituées à utiliser Windows
trouvent ReactOS simple d'utilisation. L'intégralité du code source du système
d'exploitation est disponible gratuitement sous diverses licences open source, en
majorité la GNU General Public License."
+
+[Topic0]
+Button      = "Installer ReactOS"
+Title       = "Installer ReactOS"
+Description = "Installe ReactOS sur votre ordinateur.\n\nVeuillez noter que vous
aurez besoin de redémarrer votre ordinateur tout en ayant le CD de ReactOS inséré dans
le lecteur afin de démarrer l'installation.\n\nAutrement, vous pouvez aisément
essayer ReactOS dans une machine virtuelle QEMU en sélectionnant le bouton adéquat dans
le menu à gauche."
+Action      = "<msg>Vous ne pouvez pas encore installer ReactOS directement
depuis ce CD ! Veuillez redémarrer votre ordinateur depuis ce CD pour pouvoir installer
ReactOS."
+
+[Topic1]
+Button      = "Essayer ReactOS sous QEMU"
+Title       = "Essayer ReactOS sous QEMU"
+Description = "Peut-être vous ne voulez pas essayer un système d'exploitation
alpha sur votre propre ordinateur, ou bien vous faites face à des problèmes lors de
l'installation. Afin de pallier à ces inconvénients, nous avons préinstallé
ReactOS sur une machine virtuelle QEMU. Ainsi, vous pouvez essayer le système
d'exploitation sans avoir besoin de l'installer sur votre ordinateur.\n\nUn clic
sur ce bouton ouvre le package QEMU avec 7-Zip."
+Action      = "\extras\ReactOS on QEMU\ReactOS-044-FOSDEM2017RC-QEMU.7z"
+
+[Topic2]
+Button      = "Installer ReactOS Build Environment"
+Title       = "Installer ReactOS Build Environment"
+Description = "Afin de rendre la compilation de ReactOS aussi simple que possible,
l'environnement de développement ReactOS (ReactOS Build Environment) a été créé.
Il comprend les correctes versions des compilateurs ainsi que les outils nécessaires afin
de compiler l'intégralité du code source de ReactOS.\n\nLa version Windows de
l'environnement de développement est compatible avec Windows XP ou ultérieur. Elle
est installée en cliquant sur ce bouton.\n\nEn supplément, le code source de cette
version de ReactOS est inclus dans ce CD."
+Action      = "\extras\ReactOS Build Environment\RosBE-2.1.3.exe"
+
+[Topic3]
+Button      = "Découvrir le code source de ReactOS"
+Title       = "Découvrir le code source de ReactOS"
+Description = "Ce CD contient aussi l'intégralité du code source de cette
version de ReactOS qui peut être compilé en utilisant l'environnement de
développement ReactOS.\n\nUn clic sur ce bouton ouvre l'archive avec 7-Zip."
+Action      = "\extras\ReactOS Source Code\ReactOS-044-FOSDEM2017RC-Source.7z"
+
+[Topic4]
+Button      = "Visiter le site Web de ReactOS"
+Title       = "Visiter le site Web de ReactOS"
+Description = "Le site Web de ReactOS fournit plus d'informations à propos du
projet. Vous y trouverez les dernières versions de ReactOS ainsi que des nouvelles
concernant son développement."
+Action      = "https://www.reactos.org/"
+
+[Topic5]
+Button      = "Parcourir le CD"
+Title       = "Parcourir le CD"
+Description = "Parcourir le contenu du CD."
+Action      = "explorer.exe"
+
+[Topic6]
+Button      = "Quitter"
+Title       = "Quitter"
+Description = "Quitte le programme AutoRun."
+Action      = "<exit>"

Propchange:
branches/ReactOS-0.4.4-FOSDEM2017/reactos/boot/bootdata/welcome_config/fr-FR.ini
------------------------------------------------------------------------------
    svn:eol-style = native