17 Jan
2016
17 Jan
'16
7:20 p.m.
Author: ekohl
Date: Sun Jan 17 19:20:47 2016
New Revision: 70607
URL: http://svn.reactos.org/svn/reactos?rev=70607&view=rev
Log:
[USERINIT]
Add two dialogs that are shown when the LiveCD is booted. The first dialog is used to
select the language and keyboard layout. The second dialog is used to either start the
shell or the GUI installer. Language and keyboard layout selection are still work in
progress.
Added:
trunk/reactos/base/system/userinit/livecd.c (with props)
trunk/reactos/base/system/userinit/res/ (with props)
trunk/reactos/base/system/userinit/res/rosbitmap.bmp (with props)
trunk/reactos/base/system/userinit/userinit.h (with props)
Modified:
trunk/reactos/base/system/userinit/CMakeLists.txt
trunk/reactos/base/system/userinit/lang/bg-BG.rc
trunk/reactos/base/system/userinit/lang/cs-CZ.rc
trunk/reactos/base/system/userinit/lang/de-DE.rc
trunk/reactos/base/system/userinit/lang/el-GR.rc
trunk/reactos/base/system/userinit/lang/en-US.rc
trunk/reactos/base/system/userinit/lang/es-ES.rc
trunk/reactos/base/system/userinit/lang/fr-FR.rc
trunk/reactos/base/system/userinit/lang/he-IL.rc
trunk/reactos/base/system/userinit/lang/hu-HU.rc
trunk/reactos/base/system/userinit/lang/id-ID.rc
trunk/reactos/base/system/userinit/lang/it-IT.rc
trunk/reactos/base/system/userinit/lang/ja-JP.rc
trunk/reactos/base/system/userinit/lang/lt-LT.rc
trunk/reactos/base/system/userinit/lang/nl-NL.rc
trunk/reactos/base/system/userinit/lang/no-NO.rc
trunk/reactos/base/system/userinit/lang/pl-PL.rc
trunk/reactos/base/system/userinit/lang/pt-BR.rc
trunk/reactos/base/system/userinit/lang/ro-RO.rc
trunk/reactos/base/system/userinit/lang/ru-RU.rc
trunk/reactos/base/system/userinit/lang/sk-SK.rc
trunk/reactos/base/system/userinit/lang/sq-AL.rc
trunk/reactos/base/system/userinit/lang/sv-SE.rc
trunk/reactos/base/system/userinit/lang/th-TH.rc
trunk/reactos/base/system/userinit/lang/tr-TR.rc
trunk/reactos/base/system/userinit/lang/uk-UA.rc
trunk/reactos/base/system/userinit/lang/zh-CN.rc
trunk/reactos/base/system/userinit/lang/zh-TW.rc
trunk/reactos/base/system/userinit/resource.h
trunk/reactos/base/system/userinit/userinit.c
trunk/reactos/base/system/userinit/userinit.rc
Modified: trunk/reactos/base/system/userinit/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/CMake…
==============================================================================
--- trunk/reactos/base/system/userinit/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/CMakeLists.txt [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,12 @@
-add_executable(userinit userinit.c userinit.rc)
+list(APPEND SOURCE
+ livecd.c
+ userinit.c
+ userinit.h)
+
+add_executable(userinit ${SOURCE} userinit.rc)
target_link_libraries(userinit wine)
set_module_type(userinit win32gui UNICODE)
-add_importlibs(userinit user32 advapi32 shell32 msvcrt kernel32 ntdll)
+add_importlibs(userinit user32 gdi32 advapi32 shell32 msvcrt kernel32 ntdll)
+add_pch(userinit userinit.h SOURCE)
add_cd_file(TARGET userinit DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/base/system/userinit/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/bg-BG.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "ÐÑиложениеÑо userinit не ÑÑÐ¿Ñ Ð´Ð°
пÑÑне обвивкаÑа!\n"
+ IDS_SHELL_FAIL "ÐÑиложениеÑо userinit не ÑÑÐ¿Ñ Ð´Ð° пÑÑне
обвивкаÑа!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/cs-CZ.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -5,7 +5,46 @@
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Aplikace Userinit selhala pÅi spouÅ¡tÄnÃ
uživatelského rozhranÃ!\n"
+ IDS_SHELL_FAIL "Aplikace Userinit selhala pÅi spouÅ¡tÄnà uživatelského
rozhranÃ!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/de-DE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/de-DE.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit konnte die Shell nicht starten!\n"
+ IDS_SHELL_FAIL "Userinit konnte die Shell nicht starten!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/el-GR.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -2,7 +2,46 @@
LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "H Userinit δε μÏÏÏεÏε να εκκινήÏει
Ïο κÎλÏ
ÏοÏ!\n"
+ IDS_SHELL_FAIL "H Userinit δε μÏÏÏεÏε να εκκινήÏει Ïο
κÎλÏ
ÏοÏ!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/en-US.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit failed to start the shell!\n"
+ IDS_SHELL_FAIL "Userinit failed to start the shell!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/es-ES.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit no pudo iniciar el shell con éxito!\n"
+ IDS_SHELL_FAIL "Userinit no pudo iniciar el shell con éxito!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/fr-FR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/fr-FR.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
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"
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit a échoué lors du chargement de l'interface
(shell) !\n"
+ IDS_SHELL_FAIL "Userinit a échoué lors du chargement de l'interface
(shell) !\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/he-IL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/he-IL.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit × ××©× ××פע×× ×ת ×××שק!\n"
+ IDS_SHELL_FAIL "Userinit × ××©× ××פע×× ×ת ×××שק!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/hu-HU.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -2,7 +2,46 @@
LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Az Userinit nem tudja elindÃtani a rendszert!\n"
+ IDS_SHELL_FAIL "Az Userinit nem tudja elindÃtani a rendszert!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/id-ID.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/id-ID.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit gagal untuk memulai shell!\n"
+ IDS_SHELL_FAIL "Userinit gagal untuk memulai shell!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/it-IT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/it-IT.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit non ha potuto avviare
l'ambiente(shell)!\n"
+ IDS_SHELL_FAIL "Userinit non ha potuto avviare l'ambiente(shell)!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/ja-JP.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit
ã¯ã·ã§ã«ãéå§ã§ãã¾ããã§ãã!\n"
+ IDS_SHELL_FAIL "Userinit ã¯ã·ã§ã«ãéå§ã§ãã¾ããã§ãã!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/lt-LT.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/lt-LT.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -2,7 +2,46 @@
LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit nepavyko paleisti aplinkos!\n"
+ IDS_SHELL_FAIL "Userinit nepavyko paleisti aplinkos!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/nl-NL.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -2,7 +2,46 @@
LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit kon de shell niet starten!\n"
+ IDS_SHELL_FAIL "Userinit kon de shell niet starten!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/no-NO.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit mislykket å starte skall!\n"
+ IDS_SHELL_FAIL "Userinit mislykket å starte skall!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/pl-PL.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -7,7 +7,46 @@
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Nie powiodÅo siÄ uruchomienie powÅoki przez
userinit!\n"
+ IDS_SHELL_FAIL "Nie powiodÅo siÄ uruchomienie powÅoki przez
userinit!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/pt-BR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/pt-BR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/pt-BR.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit falhou ao tentar iniciar o shell!\n"
+ IDS_SHELL_FAIL "Userinit falhou ao tentar iniciar o shell!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/ro-RO.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -2,7 +2,46 @@
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit a eÈuat în lansarea interfeÈei!\n"
+ IDS_SHELL_FAIL "Userinit a eÈuat în lansarea interfeÈei!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/ru-RU.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/ru-RU.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "ÐÑибка запÑÑка оболоÑки пÑи
иниÑиализаÑии полÑзоваÑелÑÑкого ÑеанÑа!\n"
+ IDS_SHELL_FAIL "ÐÑибка запÑÑка оболоÑки пÑи
иниÑиализаÑии полÑзоваÑелÑÑкого ÑеанÑа!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/sk-SK.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -2,7 +2,46 @@
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL, "Userinit zlyhal pri spúšťanà shellu!\n"
+ IDS_SHELL_FAIL "Userinit zlyhal pri spúšťanà shellu!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/sq-AL.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/sq-AL.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -4,7 +4,46 @@
LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit dështuar për të filluar shell'in!\n"
+ IDS_SHELL_FAIL "Userinit dështuar për të filluar shell'in!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/sv-SE.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,7 +1,47 @@
/* Translated by David Nordenberg */
LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit misslyckades att starta
användargränssnittet!\n"
+ IDS_SHELL_FAIL "Userinit misslyckades att starta
användargränssnittet!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/th-TH.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/th-TH.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -1,6 +1,45 @@
LANGUAGE LANG_THAI, SUBLANG_DEFAULT
+
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL
"à¸à¹à¸²à¸à¸¹à¹à¹à¸à¹à¸à¸´à¸à¸à¸¥à¸²à¸à¹à¸à¸à¸à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸à¸±à¹à¸à¸ªà¸à¸²à¸à¸°!\n"
+ IDS_SHELL_FAIL
"à¸à¹à¸²à¸à¸¹à¹à¹à¸à¹à¸à¸´à¸à¸à¸¥à¸²à¸à¹à¸à¸à¸à¸à¹à¸à¹à¸²à¸ªà¸¹à¹à¸à¸±à¹à¸à¸ªà¸à¸²à¸à¸°!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/tr-TR.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/tr-TR.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -2,7 +2,46 @@
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit, kabuÄu baÅlatmada baÅarısız oldu!\n"
+ IDS_SHELL_FAIL "Userinit, kabuÄu baÅlatmada baÅarısız oldu!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/uk-UA.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -8,7 +8,46 @@
LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit не вдалоÑÑ Ð·Ð°Ð¿ÑÑÑиÑи
оболонкÑ!\n"
+ IDS_SHELL_FAIL "Userinit не вдалоÑÑ Ð·Ð°Ð¿ÑÑÑиÑи
оболонкÑ!\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/zh-CN.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -2,7 +2,46 @@
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit æ æ³å¯å¨å¤å£³ï¼\n"
+ IDS_SHELL_FAIL "Userinit æ æ³å¯å¨å¤å£³ï¼\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Modified: trunk/reactos/base/system/userinit/lang/zh-TW.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/…
==============================================================================
--- trunk/reactos/base/system/userinit/lang/zh-TW.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/lang/zh-TW.rc [iso-8859-1] Sun Jan 17 19:20:47
2016
@@ -2,7 +2,46 @@
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
+IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 193
+STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION
+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
+ 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
+ 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
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ DEFPUSHBUTTON "&Next", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", 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"
+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
+
+ LTEXT "", IDC_STATIC, 7, 152, 300, 8
+
+ GROUPBOX "", IDC_STATIC, 0, 165, 317, 1
+ PUSHBUTTON "&Previous", IDOK, 205, 172, 50, 14
+ PUSHBUTTON "&Cancel", IDCANCEL, 260, 172, 50, 14
+END
+
STRINGTABLE
BEGIN
- STRING_USERINIT_FAIL "Userinit ç¡æ³ååå¤æ®¼ï¼\n"
+ IDS_SHELL_FAIL "Userinit ç¡æ³ååå¤æ®¼ï¼\n"
+ IDS_INSTALLER_FAIL "Userinit failed to start the installer!\n"
END
+
+STRINGTABLE
+BEGIN
+ IDS_SPAIN "Spanish (Spain)"
+END
Added: trunk/reactos/base/system/userinit/livecd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/livec…
==============================================================================
--- trunk/reactos/base/system/userinit/livecd.c (added)
+++ trunk/reactos/base/system/userinit/livecd.c [iso-8859-1] Sun Jan 17 19:20:47 2016
@@ -0,0 +1,530 @@
+/*
+ * COPYRIGHT: See COPYING in the top level directory
+ * PROJECT: ReactOS Userinit Logon Application
+ * FILE: base/system/userinit/livecd.c
+ * PROGRAMMERS: Eric Kohl
+ */
+
+#include "userinit.h"
+
+HWND hList;
+HWND hLocaleList;
+BOOL bSpain = FALSE;
+
+static VOID
+InitImageInfo(PIMGINFO ImgInfo)
+{
+ BITMAP bitmap;
+
+ ZeroMemory(ImgInfo, sizeof(*ImgInfo));
+
+ ImgInfo->hBitmap = LoadImage(hInstance,
+ MAKEINTRESOURCE(IDB_ROSLOGO),
+ IMAGE_BITMAP,
+ 0,
+ 0,
+ LR_DEFAULTCOLOR);
+
+ if (ImgInfo->hBitmap != NULL)
+ {
+ GetObject(ImgInfo->hBitmap, sizeof(BITMAP), &bitmap);
+
+ ImgInfo->cxSource = bitmap.bmWidth;
+ ImgInfo->cySource = bitmap.bmHeight;
+ }
+}
+
+
+BOOL
+IsLiveCD(VOID)
+{
+ HKEY ControlKey = NULL;
+ LPWSTR SystemStartOptions = NULL;
+ LPWSTR CurrentOption, NextOption; /* Pointers into SystemStartOptions */
+ LONG rc;
+ BOOL ret = FALSE;
+
+ TRACE("IsLiveCD()\n");
+
+ rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+ REGSTR_PATH_CURRENT_CONTROL_SET,
+ 0,
+ KEY_QUERY_VALUE,
+ &ControlKey);
+ if (rc != ERROR_SUCCESS)
+ {
+ WARN("RegOpenKeyEx() failed with error %lu\n", rc);
+ goto cleanup;
+ }
+
+ rc = ReadRegSzKey(ControlKey, L"SystemStartOptions",
&SystemStartOptions);
+ if (rc != ERROR_SUCCESS)
+ {
+ WARN("ReadRegSzKey() failed with error %lu\n", rc);
+ goto cleanup;
+ }
+
+ /* Check for CONSOLE switch in SystemStartOptions */
+ CurrentOption = SystemStartOptions;
+ while (CurrentOption)
+ {
+ NextOption = wcschr(CurrentOption, L' ');
+ if (NextOption)
+ *NextOption = L'\0';
+ if (_wcsicmp(CurrentOption, L"MININT") == 0)
+ {
+ TRACE("Found 'MININT' boot option\n");
+ ret = TRUE;
+ goto cleanup;
+ }
+ CurrentOption = NextOption ? NextOption + 1 : NULL;
+ }
+
+cleanup:
+ if (ControlKey != NULL)
+ RegCloseKey(ControlKey);
+ HeapFree(GetProcessHeap(), 0, SystemStartOptions);
+
+ TRACE("IsLiveCD() returning %d\n", ret);
+
+ return ret;
+}
+
+
+static BOOL CALLBACK
+LocalesEnumProc(LPTSTR lpLocale)
+{
+ LCID lcid;
+ WCHAR lang[255];
+ INT index;
+ BOOL bNoShow = FALSE;
+
+ lcid = wcstoul(lpLocale, NULL, 16);
+
+ /* Display only languages with installed support */
+ if (!IsValidLocale(lcid, LCID_INSTALLED))
+ return TRUE;
+
+ if (lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) ||
+ lcid == MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN),
SORT_DEFAULT))
+ {
+ if (bSpain == FALSE)
+ {
+ LoadStringW(hInstance, IDS_SPAIN, lang, 255);
+ bSpain = TRUE;
+ }
+ else
+ {
+ bNoShow = TRUE;
+ }
+ }
+ else
+ {
+ GetLocaleInfoW(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)/sizeof(WCHAR));
+ }
+
+ if (bNoShow == FALSE)
+ {
+ index = SendMessageW(hList,
+ CB_ADDSTRING,
+ 0,
+ (LPARAM)lang);
+
+ SendMessageW(hList,
+ CB_SETITEMDATA,
+ index,
+ (LPARAM)lcid);
+ }
+
+ return TRUE;
+}
+
+
+static VOID
+CreateLanguagesList(HWND hwnd)
+{
+ WCHAR langSel[255];
+
+ hList = hwnd;
+ bSpain = FALSE;
+ EnumSystemLocalesW(LocalesEnumProc, LCID_SUPPORTED);
+
+ /* Select current locale */
+ /* or should it be System and not user? */
+ GetLocaleInfoW(GetUserDefaultLCID(), LOCALE_SLANGUAGE, langSel,
sizeof(langSel)/sizeof(WCHAR));
+
+ SendMessageW(hList,
+ CB_SELECTSTRING,
+ -1,
+ (LPARAM)langSel);
+}
+
+
+static
+VOID
+InitializeDefaultUserLocale(
+ PLCID pNewLcid)
+{
+ WCHAR szBuffer[80];
+ PWSTR ptr;
+ HKEY hLocaleKey;
+ DWORD ret;
+ DWORD dwSize;
+ LCID lcid;
+ INT i;
+
+ struct {LCTYPE LCType; PWSTR pValue;} LocaleData[] = {
+ /* Number */
+ {LOCALE_SDECIMAL, L"sDecimal"},
+ {LOCALE_STHOUSAND, L"sThousand"},
+ {LOCALE_SNEGATIVESIGN, L"sNegativeSign"},
+ {LOCALE_SPOSITIVESIGN, L"sPositiveSign"},
+ {LOCALE_SGROUPING, L"sGrouping"},
+ {LOCALE_SLIST, L"sList"},
+ {LOCALE_SNATIVEDIGITS, L"sNativeDigits"},
+ {LOCALE_INEGNUMBER, L"iNegNumber"},
+ {LOCALE_IDIGITS, L"iDigits"},
+ {LOCALE_ILZERO, L"iLZero"},
+ {LOCALE_IMEASURE, L"iMeasure"},
+ {LOCALE_IDIGITSUBSTITUTION, L"NumShape"},
+
+ /* Currency */
+ {LOCALE_SCURRENCY, L"sCurrency"},
+ {LOCALE_SMONDECIMALSEP, L"sMonDecimalSep"},
+ {LOCALE_SMONTHOUSANDSEP, L"sMonThousandSep"},
+ {LOCALE_SMONGROUPING, L"sMonGrouping"},
+ {LOCALE_ICURRENCY, L"iCurrency"},
+ {LOCALE_INEGCURR, L"iNegCurr"},
+ {LOCALE_ICURRDIGITS, L"iCurrDigits"},
+
+ /* Time */
+ {LOCALE_STIMEFORMAT, L"sTimeFormat"},
+ {LOCALE_STIME, L"sTime"},
+ {LOCALE_S1159, L"s1159"},
+ {LOCALE_S2359, L"s2359"},
+ {LOCALE_ITIME, L"iTime"},
+ {LOCALE_ITIMEMARKPOSN, L"iTimePrefix"},
+ {LOCALE_ITLZERO, L"iTLZero"},
+
+ /* Date */
+ {LOCALE_SLONGDATE, L"sLongDate"},
+ {LOCALE_SSHORTDATE, L"sShortDate"},
+ {LOCALE_SDATE, L"sDate"},
+ {LOCALE_IFIRSTDAYOFWEEK, L"iFirstDayOfWeek"},
+ {LOCALE_IFIRSTWEEKOFYEAR, L"iFirstWeekOfYear"},
+ {LOCALE_IDATE, L"iDate"},
+ {LOCALE_ICALENDARTYPE, L"iCalendarType"},
+
+ /* Misc */
+ {LOCALE_SCOUNTRY, L"sCountry"},
+ {LOCALE_SLANGUAGE, L"sLanguage"},
+ {LOCALE_ICOUNTRY, L"iCountry"},
+ {0, NULL}};
+
+ ret = RegOpenKeyExW(HKEY_USERS,
+ L".DEFAULT\\Control Panel\\International",
+ 0,
+ KEY_READ | KEY_WRITE,
+ &hLocaleKey);
+ if (ret != ERROR_SUCCESS)
+ {
+ return;
+ }
+
+ if (pNewLcid == NULL)
+ {
+ dwSize = 9 * sizeof(WCHAR);
+ ret = RegQueryValueExW(hLocaleKey,
+ L"Locale",
+ NULL,
+ NULL,
+ (PBYTE)szBuffer,
+ &dwSize);
+ if (ret != ERROR_SUCCESS)
+ goto done;
+
+ lcid = (LCID)wcstoul(szBuffer, &ptr, 16);
+ if (lcid == 0)
+ goto done;
+ }
+ else
+ {
+ lcid = *pNewLcid;
+
+ swprintf(szBuffer, L"%08lx", lcid);
+ RegSetValueExW(hLocaleKey,
+ L"Locale",
+ 0,
+ REG_SZ,
+ (PBYTE)szBuffer,
+ (wcslen(szBuffer) + 1) * sizeof(WCHAR));
+ }
+
+ i = 0;
+ while (LocaleData[i].pValue != NULL)
+ {
+ if (GetLocaleInfo(lcid,
+ LocaleData[i].LCType | LOCALE_NOUSEROVERRIDE,
+ szBuffer,
+ sizeof(szBuffer) / sizeof(WCHAR)))
+ {
+ RegSetValueExW(hLocaleKey,
+ LocaleData[i].pValue,
+ 0,
+ REG_SZ,
+ (PBYTE)szBuffer,
+ (wcslen(szBuffer) + 1) * sizeof(WCHAR));
+ }
+
+ i++;
+ }
+
+done:
+ RegCloseKey(hLocaleKey);
+}
+
+
+VOID
+CenterWindow(HWND hWnd)
+{
+ HWND hWndParent;
+ RECT rcParent;
+ RECT rcWindow;
+
+ hWndParent = GetParent(hWnd);
+ if (hWndParent == NULL)
+ hWndParent = GetDesktopWindow();
+
+ GetWindowRect(hWndParent, &rcParent);
+ GetWindowRect(hWnd, &rcWindow);
+
+ SetWindowPos(hWnd,
+ HWND_TOP,
+ ((rcParent.right - rcParent.left) - (rcWindow.right - rcWindow.left)) /
2,
+ ((rcParent.bottom - rcParent.top) - (rcWindow.bottom - rcWindow.top)) /
2,
+ 0,
+ 0,
+ SWP_NOSIZE);
+}
+
+
+static
+VOID
+OnDrawItem(
+ LPDRAWITEMSTRUCT lpDrawItem,
+ PSTATE pState,
+ UINT uCtlID)
+{
+ HDC hdcMem;
+ LONG left;
+
+ if (lpDrawItem->CtlID == uCtlID)
+ {
+ /* position image in centre of dialog */
+ left = (lpDrawItem->rcItem.right - pState->ImageInfo.cxSource) / 2;
+
+ hdcMem = CreateCompatibleDC(lpDrawItem->hDC);
+ if (hdcMem != NULL)
+ {
+ SelectObject(hdcMem, pState->ImageInfo.hBitmap);
+ BitBlt(lpDrawItem->hDC,
+ left,
+ lpDrawItem->rcItem.top,
+ lpDrawItem->rcItem.right - lpDrawItem->rcItem.left,
+ lpDrawItem->rcItem.bottom - lpDrawItem->rcItem.top,
+ hdcMem,
+ 0,
+ 0,
+ SRCCOPY);
+ DeleteDC(hdcMem);
+ }
+ }
+}
+
+
+static
+INT_PTR
+CALLBACK
+LocaleDlgProc(
+ HWND hwndDlg,
+ UINT uMsg,
+ WPARAM wParam,
+ LPARAM lParam)
+{
+ PSTATE pState;
+
+ /* Retrieve pointer to the state */
+ pState = (PSTATE)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
+ switch (uMsg)
+ {
+ case WM_INITDIALOG:
+ /* Save pointer to the global state */
+ pState = (PSTATE)lParam;
+ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pState);
+
+ /* Center the dialog window */
+ CenterWindow (hwndDlg);
+ CreateLanguagesList(GetDlgItem(hwndDlg, IDC_LANGUAGELIST));
+
+ EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE);
+ return FALSE;
+
+ case WM_DRAWITEM:
+ OnDrawItem((LPDRAWITEMSTRUCT)lParam,
+ pState,
+ IDC_LOCALELOGO);
+ return TRUE;
+
+ case WM_COMMAND:
+ if (HIWORD(wParam) == BN_CLICKED)
+ {
+ switch (LOWORD(wParam))
+ {
+ case IDOK:
+ {
+ LCID NewLcid;
+ INT iCurSel;
+
+ iCurSel = SendDlgItemMessageW(hwndDlg,
+ IDC_LANGUAGELIST,
+ CB_GETCURSEL,
+ 0,
+ 0);
+ if (iCurSel == CB_ERR)
+ break;
+
+ NewLcid = SendDlgItemMessageW(hwndDlg,
+ IDC_LANGUAGELIST,
+ CB_GETITEMDATA,
+ iCurSel,
+ 0);
+ if (NewLcid == (LCID)CB_ERR)
+ break;
+
+ SetThreadLocale(NewLcid);
+ InitializeDefaultUserLocale(&NewLcid);
+ }
+
+ pState->NextPage = STARTPAGE;
+ EndDialog(hwndDlg, 0);
+ break;
+
+ default:
+ break;
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ return FALSE;
+}
+
+
+static
+INT_PTR
+CALLBACK
+StartDlgProc(
+ HWND hwndDlg,
+ UINT uMsg,
+ WPARAM wParam,
+ LPARAM lParam)
+{
+ PSTATE pState;
+
+ /* Retrieve pointer to the state */
+ pState = (PSTATE)GetWindowLongPtr (hwndDlg, GWL_USERDATA);
+
+ switch (uMsg)
+ {
+ case WM_INITDIALOG:
+ /* Save pointer to the state */
+ pState = (PSTATE)lParam;
+ SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)pState);
+
+ /* Center the dialog window */
+ CenterWindow(hwndDlg);
+
+ EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), FALSE);
+ return FALSE;
+
+ case WM_DRAWITEM:
+ OnDrawItem((LPDRAWITEMSTRUCT)lParam,
+ pState,
+ IDC_STARTLOGO);
+ return TRUE;
+
+ case WM_COMMAND:
+ if (HIWORD(wParam) == BN_CLICKED)
+ {
+ switch (LOWORD(wParam))
+ {
+ case IDC_RUN:
+ pState->NextPage = DONE;
+ pState->Run = SHELL;
+ EndDialog(hwndDlg, 0);
+ break;
+
+ case IDC_INSTALL:
+ pState->NextPage = DONE;
+ pState->Run = INSTALLER;
+ EndDialog(hwndDlg, 0);
+ break;
+
+ case IDOK:
+ pState->NextPage = LOCALEPAGE;
+ EndDialog(hwndDlg, 0);
+ break;
+
+ default:
+ break;
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ return FALSE;
+}
+
+
+VOID
+RunLiveCD(
+ PSTATE pState)
+{
+ InitImageInfo(&pState->ImageInfo);
+
+ while (pState->NextPage != DONE)
+ {
+ switch (pState->NextPage)
+ {
+ case LOCALEPAGE:
+ DialogBoxParam(hInstance,
+ MAKEINTRESOURCE(IDD_LOCALEPAGE),
+ NULL,
+ LocaleDlgProc,
+ (LPARAM)pState);
+ break;
+
+ case STARTPAGE:
+ DialogBoxParam(hInstance,
+ MAKEINTRESOURCE(IDD_STARTPAGE),
+ NULL,
+ StartDlgProc,
+ (LPARAM)pState);
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ DeleteObject(pState->ImageInfo.hBitmap);
+}
+
+/* EOF */
Propchange: trunk/reactos/base/system/userinit/livecd.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/base/system/userinit/res/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sun Jan 17 19:20:47 2016
@@ -0,0 +1 @@
+((CORE|ROSTESTS|ROSAPPS)-\d+)(,? ?((CORE|ROSTESTS|ROSAPPS)-\d+))*(,? ?(and |or
)?((CORE|ROSTESTS|ROSAPPS)-\d+))?
Propchange: trunk/reactos/base/system/userinit/res/
------------------------------------------------------------------------------
bugtraq:message = See issue %BUGID% for more details.
Propchange: trunk/reactos/base/system/userinit/res/
------------------------------------------------------------------------------
bugtraq:url = https://jira.reactos.org/browse/%BUGID%
Propchange: trunk/reactos/base/system/userinit/res/
------------------------------------------------------------------------------
tsvn:logminsize = 10
Added: trunk/reactos/base/system/userinit/res/rosbitmap.bmp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/res/r…
==============================================================================
Binary file - no diff available.
Propchange: trunk/reactos/base/system/userinit/res/rosbitmap.bmp
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: trunk/reactos/base/system/userinit/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/resou…
==============================================================================
--- trunk/reactos/base/system/userinit/resource.h [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/resource.h [iso-8859-1] Sun Jan 17 19:20:47 2016
@@ -1,4 +1,33 @@
#pragma once
#define RC_STRING_MAX_SIZE 2048
-#define STRING_USERINIT_FAIL 100
+
+/* Bitmaps */
+#define IDB_ROSLOGO 100
+
+#define IDC_STATIC -1
+
+
+/* Dialogs */
+#define IDD_LOCALEPAGE 200
+#define IDC_LOCALELOGO 201
+#define IDC_LANGUAGELIST 202
+#define IDC_FORMATLIST 203
+#define IDC_LAYOUTLIST 204
+
+#define IDD_STARTPAGE 300
+#define IDC_STARTLOGO 301
+#define IDC_RUN 302
+#define IDC_INSTALL 303
+#define IDC_UPDATE 304
+#define IDC_REPAIR 305
+
+
+/* Strings */
+#define IDS_SHELL_FAIL 600
+#define IDS_INSTALLER_FAIL 601
+
+
+
+
+#define IDS_SPAIN 3900
Modified: trunk/reactos/base/system/userinit/userinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri…
==============================================================================
--- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Sun Jan 17 19:20:47 2016
@@ -24,37 +24,22 @@
* Hervé Poussineau (hpoussin(a)reactos.org)
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <wingdi.h>
-#include <wincon.h>
-#include <shellapi.h>
-#include <regstr.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-#include <undocuser.h>
-#include <wine/debug.h>
-
-#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(userinit);
+#include "userinit.h"
#define CMP_MAGIC 0x01234567
/* GLOBALS ******************************************************************/
+HINSTANCE hInstance;
+
+
/* FUNCTIONS ****************************************************************/
-static LONG
+LONG
ReadRegSzKey(
IN HKEY hKey,
IN LPCWSTR pszKey,
- OUT LPWSTR* pValue)
+ OUT LPWSTR *pValue)
{
LONG rc;
DWORD dwType;
@@ -382,7 +367,7 @@
if (!TryToStartShell(Shell))
{
WARN("Failed to start default shell %s\n", debugstr_w(Shell));
- LoadString( GetModuleHandle(NULL), STRING_USERINIT_FAIL, szMsg, sizeof(szMsg) /
sizeof(szMsg[0]));
+ LoadString( GetModuleHandle(NULL), IDS_SHELL_FAIL, szMsg, sizeof(szMsg) /
sizeof(szMsg[0]));
MessageBox(0, szMsg, NULL, 0);
}
}
@@ -548,6 +533,27 @@
WARN("LoadLibrary() failed with error %lu\n", GetLastError());
}
+static
+VOID
+StartInstaller(VOID)
+{
+ WCHAR Shell[MAX_PATH];
+ WCHAR szMsg[RC_STRING_MAX_SIZE];
+
+ if (GetWindowsDirectory(Shell, MAX_PATH - 12))
+ wcscat(Shell, L"\\reactos.exe");
+ else
+ wcscpy(Shell, L"reactos.exe");
+
+ if (!TryToStartShell(Shell))
+ {
+ ERR("Failed to start the installer: %s\n", debugstr_w(Shell));
+ LoadStringW(GetModuleHandle(NULL), IDS_INSTALLER_FAIL, szMsg, sizeof(szMsg) /
sizeof(szMsg[0]));
+ MessageBoxW(0, szMsg, NULL, 0);
+ }
+}
+
+
#ifdef _MSC_VER
#pragma warning(disable : 4100)
#endif /* _MSC_VER */
@@ -558,9 +564,38 @@
IN LPWSTR lpszCmdLine,
IN int nCmdShow)
{
+ STATE State;
+
+ hInstance = hInst;
+
SetUserSettings();
- StartShell();
- NotifyLogon();
+
+ if (IsLiveCD())
+ {
+ State.NextPage = LOCALEPAGE;
+ State.Run = SHELL;
+ }
+ else
+ {
+ State.NextPage = DONE;
+ State.Run = SHELL;
+ }
+
+ if (State.NextPage != DONE)
+ {
+ RunLiveCD(&State);
+ }
+
+ if (State.Run == SHELL)
+ {
+ StartShell();
+ NotifyLogon();
+ }
+ else if (State.Run == INSTALLER)
+ {
+ StartInstaller();
+ }
+
return 0;
}
Added: trunk/reactos/base/system/userinit/userinit.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri…
==============================================================================
--- trunk/reactos/base/system/userinit/userinit.h (added)
+++ trunk/reactos/base/system/userinit/userinit.h [iso-8859-1] Sun Jan 17 19:20:47 2016
@@ -0,0 +1,74 @@
+/*
+ */
+
+#ifndef __USERINIT_H__
+#define __USERINIT_H__
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <wingdi.h>
+#include <wincon.h>
+#include <shellapi.h>
+#include <regstr.h>
+#include <shlobj.h>
+#include <shlwapi.h>
+#include <undocuser.h>
+#include <winnls.h>
+#include <stdio.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(userinit);
+
+#include "resource.h"
+
+
+typedef enum
+{
+ LOCALEPAGE,
+ STARTPAGE,
+ DONE
+} PAGESTATE;
+
+typedef enum
+{
+ SHELL,
+ INSTALLER
+} RUN;
+
+typedef struct _IMGINFO
+{
+ HBITMAP hBitmap;
+ INT cxSource;
+ INT cySource;
+} IMGINFO, *PIMGINFO;
+
+typedef struct
+{
+ PAGESTATE NextPage;
+ RUN Run;
+ IMGINFO ImageInfo;
+} STATE, *PSTATE;
+
+
+extern HINSTANCE hInstance;
+
+LONG
+ReadRegSzKey(
+ IN HKEY hKey,
+ IN LPCWSTR pszKey,
+ OUT LPWSTR *pValue);
+
+BOOL
+IsLiveCD(VOID);
+
+
+VOID
+RunLiveCD(
+ PSTATE State);
+
+#endif /* __USERINIT_H__ */
Propchange: trunk/reactos/base/system/userinit/userinit.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/system/userinit/userinit.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri…
==============================================================================
--- trunk/reactos/base/system/userinit/userinit.rc [iso-8859-1] (original)
+++ trunk/reactos/base/system/userinit/userinit.rc [iso-8859-1] Sun Jan 17 19:20:47 2016
@@ -1,4 +1,5 @@
#include <windef.h>
+#include <winuser.h>
#include "resource.h"
@@ -6,6 +7,10 @@
#define REACTOS_STR_INTERNAL_NAME "userinit"
#define REACTOS_STR_ORIGINAL_FILENAME "userinit.dll"
#include <reactos/version.rc>
+
+/* Bitmaps */
+IDB_ROSLOGO BITMAP "res/rosbitmap.bmp"
+
/* UTF-8 */
#pragma code_page(65001)
