[ros-diffs] [hbelusca] 75302: [USERINIT]: Add the possibility to quit the UserInit "wizard" via the "Cancel" button, prompting the user for confirmation beforehand. This action restarts the computer. CORE-1353...

7 Jul 2017

Author: hbelusca
Date: Fri Jul  7 23:55:06 2017
New Revision: 75302

URL: http://svn.reactos.org/svn/reactos?rev=75302&view=rev
Log:
[USERINIT]: Add the possibility to quit the UserInit "wizard" via the
"Cancel" button, prompting the user for confirmation beforehand. This action
restarts the computer.
CORE-13530 #resolve

Modified:
    branches/setup_improvements/base/system/userinit/lang/bg-BG.rc
    branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc
    branches/setup_improvements/base/system/userinit/lang/de-DE.rc
    branches/setup_improvements/base/system/userinit/lang/el-GR.rc
    branches/setup_improvements/base/system/userinit/lang/en-US.rc
    branches/setup_improvements/base/system/userinit/lang/es-ES.rc
    branches/setup_improvements/base/system/userinit/lang/fr-FR.rc
    branches/setup_improvements/base/system/userinit/lang/he-IL.rc
    branches/setup_improvements/base/system/userinit/lang/hu-HU.rc
    branches/setup_improvements/base/system/userinit/lang/id-ID.rc
    branches/setup_improvements/base/system/userinit/lang/it-IT.rc
    branches/setup_improvements/base/system/userinit/lang/ja-JP.rc
    branches/setup_improvements/base/system/userinit/lang/lt-LT.rc
    branches/setup_improvements/base/system/userinit/lang/nl-NL.rc
    branches/setup_improvements/base/system/userinit/lang/no-NO.rc
    branches/setup_improvements/base/system/userinit/lang/pl-PL.rc
    branches/setup_improvements/base/system/userinit/lang/pt-BR.rc
    branches/setup_improvements/base/system/userinit/lang/ro-RO.rc
    branches/setup_improvements/base/system/userinit/lang/ru-RU.rc
    branches/setup_improvements/base/system/userinit/lang/sk-SK.rc
    branches/setup_improvements/base/system/userinit/lang/sq-AL.rc
    branches/setup_improvements/base/system/userinit/lang/sv-SE.rc
    branches/setup_improvements/base/system/userinit/lang/th-TH.rc
    branches/setup_improvements/base/system/userinit/lang/tr-TR.rc
    branches/setup_improvements/base/system/userinit/lang/uk-UA.rc
    branches/setup_improvements/base/system/userinit/lang/zh-CN.rc
    branches/setup_improvements/base/system/userinit/lang/zh-TW.rc
    branches/setup_improvements/base/system/userinit/livecd.c
    branches/setup_improvements/base/system/userinit/resource.h
    branches/setup_improvements/base/system/userinit/userinit.c
    branches/setup_improvements/base/system/userinit/userinit.h

Modified: branches/setup_improvements/base/system/userinit/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================

--- branches/setup_improvements/base/system/userinit/lang/bg-BG.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/bg-BG.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ userinit Ð½Ðµ ÑÑÐ¿Ñ Ð´Ð° Ð¿ÑÑÐ½Ðµ
Ð¾Ð±Ð²Ð¸Ð²ÐºÐ°ÑÐ°!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸ÐµÑÐ¾ userinit Ð½Ðµ ÑÑÐ¿Ñ Ð´Ð° Ð¿ÑÑÐ½Ðµ
Ð¾Ð±Ð²Ð¸Ð²ÐºÐ°ÑÐ°!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/cs-CZ.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -6,14 +6,14 @@
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Jazyk:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Jazyk:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "RozvrÅ¾enÃ klÃ¡vesnice:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "RozvrÅ¾enÃ &klÃ¡vesnice:", IDC_STATIC, 20, 132, 106, 11,
WS_CHILD | WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Vyberte si svÅ¯j jazyk a rozloÅ¾enÃ klÃ¡vesnice a kliknÄtÄ na
DalÅ¡Ã.", IDC_STATIC, 7, 152, 300, 8
 
@@ -23,13 +23,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Spustit &Live CD ReactOS", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Instalovat ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Spustit &Live CD ReactOS", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Instalovat ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -40,8 +40,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Aplikace Userinit selhala pÅi spouÅ¡tÄnÃ uÅ¾ivatelskÃ©ho
rozhranÃ!\n"
-    IDS_INSTALLER_FAIL "Aplikaci Userinit se nepodaÅilo spustit
instalÃ¡tor!\n"
+    IDS_SHELL_FAIL "Aplikace Userinit selhala pÅi spouÅ¡tÄnÃ uÅ¾ivatelskÃ©ho
rozhranÃ!"
+    IDS_INSTALLER_FAIL "Aplikaci Userinit se nepodaÅilo spustit instalÃ¡tor!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/de-DE.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/de-DE.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit konnte die Shell nicht starten!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit konnte die Shell nicht starten!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/el-GR.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/el-GR.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -3,14 +3,14 @@
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -20,13 +20,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -37,8 +37,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "H Userinit Î´Îµ Î¼ÏÏÏÎµÏÎµ Î½Î± ÎµÎºÎºÎ¹Î½Î®ÏÎµÎ¹ ÏÎ¿
ÎºÎÎ»ÏÏÎ¿Ï!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "H Userinit Î´Îµ Î¼ÏÏÏÎµÏÎµ Î½Î± ÎµÎºÎºÎ¹Î½Î®ÏÎµÎ¹ ÏÎ¿
ÎºÎÎ»ÏÏÎ¿Ï!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/en-US.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/en-US.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit failed to start the shell!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit failed to start the shell!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/es-ES.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/es-ES.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit no pudo iniciar el shell con Ã©xito!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit no pudo iniciar el shell con Ã©xito!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/fr-FR.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/fr-FR.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,45 +1,46 @@
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "ReactOS LiveCD"
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
+CAPTION "LiveCD ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Langue :", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "SchÃ©ma du &clavier :", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
+    LTEXT "SÃ©lectionnez votre langue et le schÃ©ma de clavier, et appuyez sur
Suivant pour continuer.", IDC_STATIC, 7, 152, 300, 8
 
     CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1
-    DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
-    PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+    DEFPUSHBUTTON "&Suivant", IDOK, 205, 172, 50, 14
+    PUSHBUTTON "&Annuler", IDCANCEL, 260, 172, 50, 14
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
-CAPTION "ReactOS LiveCD"
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
+CAPTION "LiveCD ReactOS"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "DÃ©marrer le &Live CD ReactOS", IDC_RUN, 71, 108, 175,
21
+    PUSHBUTTON "&Installer ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
     CONTROL "", IDC_STATIC, "STATIC", SS_ETCHEDHORZ, 0, 165, 317, 1
-    PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
-    PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+    PUSHBUTTON "&PrÃ©cÃ©dent", IDOK, 205, 172, 50, 14
+    PUSHBUTTON "&Annuler", IDCANCEL, 260, 172, 50, 14
 END
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit a Ã©chouÃ© lors du chargement de l'interface
(shell) !\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit a Ã©chouÃ© lors du chargement de l'interface
(shell) !"
+    IDS_INSTALLER_FAIL "Userinit a Ã©chouÃ© lors du dÃ©marrage de l'installation
!"
+    IDS_CANCEL_CONFIRM "Ãtes-vous sÃ»r de vouloir quitter le LiveCD ReactOS ?\nSi
tel est le cas, votre ordinateur redÃ©marrera certainement."
 END
 
 STRINGTABLE
 BEGIN
-    IDS_SPAIN "Spanish (Spain)"
+    IDS_SPAIN "Espagnol (Espagne)"
 END

Modified: branches/setup_improvements/base/system/userinit/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/he-IL.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/he-IL.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit × ××©× ×××¤×¢×× ××ª ××××©×§!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit × ××©× ×××¤×¢×× ××ª ××××©×§!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/hu-HU.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/hu-HU.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -3,14 +3,14 @@
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -20,13 +20,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -37,8 +37,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Az Userinit nem tudja elindÃtani a rendszert!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Az Userinit nem tudja elindÃtani a rendszert!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/id-ID.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/id-ID.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit gagal untuk memulai shell!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit gagal untuk memulai shell!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/it-IT.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/it-IT.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Lingua:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Lingua:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Layout di teastiera:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "Layout di &teastiera:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Selezionare la lingua e il layout di tastiera e premere su Avanti per
continuare.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Avvia ReactOS con &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Installa ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Avvia ReactOS con &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Installa ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit non ha potuto avviare l'ambiente grafico!\n"
-    IDS_INSTALLER_FAIL "Userinit non ha potuto avviare l'installazione!\n"
+    IDS_SHELL_FAIL "Userinit non ha potuto avviare l'ambiente grafico!"
+    IDS_INSTALLER_FAIL "Userinit non ha potuto avviare l'installazione!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/ja-JP.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/ja-JP.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit ã¯ã·ã§ã«ãéå§ã§ãã¾ããã§ãã!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit ã¯ã·ã§ã«ãéå§ã§ãã¾ããã§ãã!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/lt-LT.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/lt-LT.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -3,14 +3,14 @@
 LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -20,13 +20,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -37,8 +37,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit nepavyko paleisti aplinkos!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit nepavyko paleisti aplinkos!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/nl-NL.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/nl-NL.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -3,14 +3,14 @@
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -20,13 +20,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -37,8 +37,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit kon de shell niet starten!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit kon de shell niet starten!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/no-NO.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/no-NO.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit mislykket Ã¥ starte skall!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit mislykket Ã¥ starte skall!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/pl-PL.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/pl-PL.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -8,14 +8,14 @@
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -25,13 +25,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -42,8 +42,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Nie powiodÅo siÄ uruchomienie powÅoki przez
userinit!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Nie powiodÅo siÄ uruchomienie powÅoki przez userinit!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/pt-BR.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/pt-BR.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit falhou ao tentar iniciar o shell!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit falhou ao tentar iniciar o shell!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/ro-RO.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/ro-RO.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -3,14 +3,14 @@
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "LimbÄ:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&LimbÄ:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Aranjament tastaturÄ:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Aranjament tastaturÄ:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD
| WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "SelectaÈi limba Èi aranjamentul de tastaturÄ apoi apÄsaÈi
âÃnainteâ pentru a continua.", IDC_STATIC, 7, 152, 300, 8
 
@@ -20,13 +20,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "LanseazÄ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&InstaleazÄ ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "LanseazÄ ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&InstaleazÄ ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -37,8 +37,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit a eÈuat Ã®n lansarea interfeÈei!\n"
-    IDS_INSTALLER_FAIL "Userinit a eÈuat Ã®n lansarea instalÄrii!\n"
+    IDS_SHELL_FAIL "Userinit a eÈuat Ã®n lansarea interfeÈei!"
+    IDS_INSTALLER_FAIL "Userinit a eÈuat Ã®n lansarea instalÄrii!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/ru-RU.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/ru-RU.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Ð¯Ð·ÑÐº:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Ð¯Ð·ÑÐº:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Ð Ð°ÑÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ:", IDC_STATIC, 20, 132, 106,
11, WS_CHILD | WS_VISIBLE | WS_GROUP
+    RTEXT "&Ð Ð°ÑÐºÐ»Ð°Ð´ÐºÐ° ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ:", IDC_STATIC, 20, 132,
106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "ÐÑÐ±ÐµÑÐ¸ÑÐµ ÑÐ·ÑÐº Ð¸ ÑÐ°ÑÐºÐ»Ð°Ð´ÐºÑ ÐºÐ»Ð°Ð²Ð¸Ð°ÑÑÑÑ, Ð¸
Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐÐ°Ð»ÐµÐµ, ÑÑÐ¾Ð±Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ.", IDC_STATIC, 7, 152,
300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ReactOS &Live CD", IDC_RUN, 71, 102,
175, 21
-    PUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS", IDC_INSTALL, 71, 130, 175,
21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "ÐÐ°Ð¿ÑÑÑÐ¸ÑÑ ReactOS &Live CD", IDC_RUN, 71, 108,
175, 21
+    PUSHBUTTON "&Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ReactOS", IDC_INSTALL, 71, 136, 175,
21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð¿ÑÐ¸
Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ°!\n"
-    IDS_INSTALLER_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ
ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸!\n"
+    IDS_SHELL_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¾Ð±Ð¾Ð»Ð¾ÑÐºÐ¸ Ð¿ÑÐ¸
Ð¸Ð½Ð¸ÑÐ¸Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¾Ð³Ð¾ ÑÐµÐ°Ð½ÑÐ°!"
+    IDS_INSTALLER_FAIL "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿ÑÑÐºÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ
ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/sk-SK.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/sk-SK.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -3,14 +3,14 @@
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -20,13 +20,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -37,8 +37,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit zlyhal pri spÃºÅ¡Å¥anÃ shellu!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit zlyhal pri spÃºÅ¡Å¥anÃ shellu!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/sq-AL.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/sq-AL.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -5,14 +5,14 @@
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -22,13 +22,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -39,8 +39,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit dÃ«shtuar pÃ«r tÃ« filluar shell'in!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit dÃ«shtuar pÃ«r tÃ« filluar shell'in!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/sv-SE.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/sv-SE.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -3,14 +3,14 @@
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -20,13 +20,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -37,8 +37,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit misslyckades att starta
anvÃ¤ndargrÃ¤nssnittet!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit misslyckades att starta anvÃ¤ndargrÃ¤nssnittet!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/th-TH.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/th-TH.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -1,14 +1,14 @@
 LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -18,13 +18,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -35,8 +35,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL
"à¸à¹à¸²à¸à¸¹à¹à¹à¸à¹à¸à¸´à¸à¸à¸¥à¸²à¸à¹à¸à¸à¸à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸à¸±à¹à¸à¸ªà¸à¸²à¸à¸°!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL
"à¸à¹à¸²à¸à¸¹à¹à¹à¸à¹à¸à¸´à¸à¸à¸¥à¸²à¸à¹à¸à¸à¸à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸à¸±à¹à¸à¸ªà¸à¸²à¸à¸°!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/tr-TR.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/tr-TR.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -3,11 +3,11 @@
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS ÃalÄ±Åan CD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
     RTEXT "Dil:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
     RTEXT "DÃ¼Äme TakÄ±mÄ± DÃ¼zeni:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
@@ -20,13 +20,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS ÃalÄ±Åan CD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "&ReactOS ÃalÄ±Åan CD'yi ÃalÄ±ÅtÄ±r", IDC_RUN,
71, 102, 175, 21
-    PUSHBUTTON "R&eactOS'u Kur", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "&ReactOS ÃalÄ±Åan CD'yi ÃalÄ±ÅtÄ±r", IDC_RUN,
71, 108, 175, 21
+    PUSHBUTTON "R&eactOS'u Kur", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -37,8 +37,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit, kabuÄu baÅlatmada baÅarÄ±sÄ±z oldu!\n"
-    IDS_INSTALLER_FAIL "Userinit, Kur'u baÅlatmada baÅarÄ±sÄ±z oldu!\n"
+    IDS_SHELL_FAIL "Userinit, kabuÄu baÅlatmada baÅarÄ±sÄ±z oldu!"
+    IDS_INSTALLER_FAIL "Userinit, Kur'u baÅlatmada baÅarÄ±sÄ±z oldu!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/uk-UA.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/uk-UA.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -9,14 +9,14 @@
 LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "&Language:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
+    RTEXT "&Keyboard layout:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "Select your language and keyboard layout and click Next to
continue.", IDC_STATIC, 7, 152, 300, 8
 
@@ -26,13 +26,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "Run ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "&Install ReactOS", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -43,8 +43,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸
Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÑ!\n"
-    IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
+    IDS_SHELL_FAIL "Userinit Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿ÑÑÑÐ¸ÑÐ¸
Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÑ!"
+    IDS_INSTALLER_FAIL "Userinit failed to start the installer!"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/zh-CN.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/zh-CN.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -3,14 +3,14 @@
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "è¯è¨:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "è¯è¨(&L):", IDC_STATIC, 20, 109, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "é®çå¸å±:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE
| WS_GROUP
+    RTEXT "é®çå¸å±(&K):", IDC_STATIC, 20, 132, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "éæ©æ¨çè¯è¨åé®çå¸å±ï¼è¯·åå»ä¸ä¸æ¥ç»§ç»ã",
IDC_STATIC, 7, 152, 300, 8
 
@@ -20,13 +20,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "è¿è¡ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "è¿è¡ ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -37,8 +37,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit æ æ³å¯å¨å¤å£³ï¼\n"
-    IDS_INSTALLER_FAIL "Userinit å¯å¨å®è£ç¨åºå¤±è´¥!\n"
+    IDS_SHELL_FAIL "Userinit æ æ³å¯å¨å¤å£³ï¼"
+    IDS_INSTALLER_FAIL "Userinit å¯å¨å®è£ç¨åºå¤±è´¥ï¼"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/lang/zh-TW.rc	[iso-8859-1]
(original)
+++ branches/setup_improvements/base/system/userinit/lang/zh-TW.rc	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -3,14 +3,14 @@
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 
 IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    RTEXT "èªè¨:", IDC_STATIC, 20, 109, 106, 11, WS_CHILD | WS_VISIBLE |
WS_GROUP
+    CONTROL "IDB_LOGO", IDC_LOCALELOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    RTEXT "èªè¨(&L):", IDC_STATIC, 20, 109, 106, 11, WS_CHILD |
WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LANGUAGELIST, 132, 107, 176, 142, CBS_DROPDOWNLIST | CBS_SORT |
WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP
-    RTEXT "éµç¤éç½®:", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
+    RTEXT "éµç¤éç½®(&K):", IDC_STATIC, 20, 132, 106, 11, WS_CHILD | WS_VISIBLE | WS_GROUP
     COMBOBOX IDC_LAYOUTLIST, 132, 130, 176, 81, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL
| WS_CHILD | WS_VISIBLE | WS_TABSTOP
     LTEXT "é¸ææ¨çèªè¨åéµç¤éç½®ï¼è«æä¸ä¸ä¸ä¸æ¥ç¹¼çºã", IDC_STATIC, 7, 152, 300, 8
 
@@ -20,13 +20,13 @@
 END
 
 IDD_STARTPAGE DIALOGEX 0, 0, 317, 193
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION
| WS_SYSMENU
 CAPTION "ReactOS LiveCD"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99
-    DEFPUSHBUTTON "éè¡ ReactOS &Live CD", IDC_RUN, 71, 102, 175, 21
-    PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 130, 175, 21
+    CONTROL "IDB_LOGO", IDC_STARTLOGO, "Static", WS_CHILD |
WS_VISIBLE | SS_OWNERDRAW, 18, 4, 290, 99
+    DEFPUSHBUTTON "éè¡ ReactOS &Live CD", IDC_RUN, 71, 108, 175, 21
+    PUSHBUTTON "å®è£ ReactOS(&I)", IDC_INSTALL, 71, 136, 175, 21
 
     // LTEXT "", IDC_STATIC, 7, 152, 300, 8
 
@@ -37,8 +37,9 @@
 
 STRINGTABLE
 BEGIN
-    IDS_SHELL_FAIL "Userinit ç¡æ³ååå¤æ®¼ï¼\n"
-    IDS_INSTALLER_FAIL "Userinit ååå®è£ç¨å¼å¤±æ!\n"
+    IDS_SHELL_FAIL "Userinit ç¡æ³ååå¤æ®¼ï¼"
+    IDS_INSTALLER_FAIL "Userinit ååå®è£ç¨å¼å¤±æï¼"
+    IDS_CANCEL_CONFIRM "Are you sure you want to quit the ReactOS LiveCD?\nIf you
choose to do so, your computer might restart."
 END
 
 STRINGTABLE

Modified: branches/setup_improvements/base/system/userinit/livecd.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/livecd.c	[iso-8859-1] (original)
+++ branches/setup_improvements/base/system/userinit/livecd.c	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -564,9 +564,6 @@
             /* Fill the language and keyboard layout lists */
             CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST));
             CreateKeyboardLayoutList(GetDlgItem(hwndDlg, IDC_LAYOUTLIST));
-
-            /* Disable the 'Cancel' button*/
-            EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE);
             return FALSE;
 
         case WM_DRAWITEM:
@@ -631,13 +628,29 @@
                         /* Set the locale for the current thread */
                         NtSetDefaultLocale(TRUE, NewLcid);
 
-                        /* Store the locale setings in the registry */
+                        /* Store the locale settings in the registry */
                         InitializeDefaultUserLocale(&NewLcid);
 
                         SetKeyboardLayout(GetDlgItem(hwndDlg, IDC_LAYOUTLIST));
 
                         pState->NextPage = STARTPAGE;
-                        EndDialog(hwndDlg, 0);
+                        EndDialog(hwndDlg, LOWORD(wParam));
+                    }
+                    break;
+
+                case IDCANCEL:
+                    if (HIWORD(wParam) == BN_CLICKED)
+                    {
+                        static WCHAR szMsg[RC_STRING_MAX_SIZE];
+                        INT ret;
+                        LoadStringW(GetModuleHandle(NULL), IDS_CANCEL_CONFIRM, szMsg,
ARRAYSIZE(szMsg));
+                        ret = MessageBoxW(hwndDlg, szMsg, L"ReactOS LiveCD",
MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2);
+                        if (ret == IDOK || ret == IDYES)
+                        {
+                            pState->NextPage = DONE;
+                            pState->Run = REBOOT;
+                            EndDialog(hwndDlg, LOWORD(wParam));
+                        }
                     }
                     break;
 
@@ -677,8 +690,6 @@
 
             /* Center the dialog window */
             CenterWindow(hwndDlg);
-
-            EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE);
             return FALSE;
 
         case WM_DRAWITEM:
@@ -695,18 +706,34 @@
                     case IDC_RUN:
                         pState->NextPage = DONE;
                         pState->Run = SHELL;
-                        EndDialog(hwndDlg, 0);
+                        EndDialog(hwndDlg, LOWORD(wParam));
                         break;
 
                     case IDC_INSTALL:
                         pState->NextPage = DONE;
                         pState->Run = INSTALLER;
-                        EndDialog(hwndDlg, 0);
+                        EndDialog(hwndDlg, LOWORD(wParam));
                         break;
 
                     case IDOK:
                         pState->NextPage = LOCALEPAGE;
-                        EndDialog(hwndDlg, 0);
+                        EndDialog(hwndDlg, LOWORD(wParam));
+                        break;
+
+                    case IDCANCEL:
+                        if (HIWORD(wParam) == BN_CLICKED)
+                        {
+                            static WCHAR szMsg[RC_STRING_MAX_SIZE];
+                            INT ret;
+                            LoadStringW(GetModuleHandle(NULL), IDS_CANCEL_CONFIRM, szMsg,
ARRAYSIZE(szMsg));
+                            ret = MessageBoxW(hwndDlg, szMsg, L"ReactOS
LiveCD", MB_ICONWARNING | MB_YESNO | MB_DEFBUTTON2);
+                            if (ret == IDOK || ret == IDYES)
+                            {
+                                pState->NextPage = DONE;
+                                pState->Run = REBOOT;
+                                EndDialog(hwndDlg, LOWORD(wParam));
+                            }
+                        }
                         break;
 
                     default:

Modified: branches/setup_improvements/base/system/userinit/resource.h
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/resource.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/system/userinit/resource.h	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -26,8 +26,6 @@
 /* Strings */
 #define IDS_SHELL_FAIL       600
 #define IDS_INSTALLER_FAIL   601
-
-
-
+#define IDS_CANCEL_CONFIRM   602
 
 #define IDS_SPAIN 3900

Modified: branches/setup_improvements/base/system/userinit/userinit.c
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/userinit.c	[iso-8859-1] (original)
+++ branches/setup_improvements/base/system/userinit/userinit.c	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -570,6 +570,34 @@
     return TRUE;
 }
 
+/* Used to get the shutdown privilege */
+static BOOL
+EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege)
+{
+    BOOL   Success;
+    HANDLE hToken;
+    TOKEN_PRIVILEGES tp;
+
+    Success = OpenProcessToken(GetCurrentProcess(),
+                               TOKEN_ADJUST_PRIVILEGES,
+                               &hToken);
+    if (!Success) return Success;
+
+    Success = LookupPrivilegeValueW(NULL,
+                                    lpszPrivilegeName,
+                                    &tp.Privileges[0].Luid);
+    if (!Success) goto Quit;
+
+    tp.PrivilegeCount = 1;
+    tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0);
+
+    Success = AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL);
+
+Quit:
+    CloseHandle(hToken);
+    return Success;
+}
+
 
 int WINAPI
 wWinMain(IN HINSTANCE hInst,
@@ -603,15 +631,30 @@
         RunLiveCD(&State);
     }
 
-    if (State.Run == SHELL)
-    {
-        Success = StartShell();
-        if (Success)
-            NotifyLogon();
-    }
-    else if (State.Run == INSTALLER)
-    {
-        Success = StartInstaller();
+    switch (State.Run)
+    {
+        case SHELL:
+            Success = StartShell();
+            if (Success)
+                NotifyLogon();
+            break;
+
+        case INSTALLER:
+            Success = StartInstaller();
+            break;
+
+        case REBOOT:
+        {
+            EnablePrivilege(SE_SHUTDOWN_NAME, TRUE);
+            ExitWindowsEx(EWX_REBOOT, 0);
+            EnablePrivilege(SE_SHUTDOWN_NAME, FALSE);
+            Success = TRUE;
+            break;
+        }
+
+        default:
+            Success = FALSE;
+            break;
     }
 
     /*

Modified: branches/setup_improvements/base/system/userinit/userinit.h
URL:
http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/system/…
==============================================================================
--- branches/setup_improvements/base/system/userinit/userinit.h	[iso-8859-1] (original)
+++ branches/setup_improvements/base/system/userinit/userinit.h	[iso-8859-1] Fri Jul  7
23:55:06 2017
@@ -39,7 +39,8 @@
 typedef enum
 {
     SHELL,
-    INSTALLER
+    INSTALLER,
+    REBOOT
 } RUN;
 
 typedef struct _IMGINFO



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [hbelusca] 75302: [USERINIT]: Add the possibility to quit the UserInit "wizard" via the "Cancel" button, prompting the user for confirmation beforehand. This action restarts the computer. CORE-1353...