Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [TIMEDATE] French translation (#2811)
by Kyle Katarn 20 May '20

20 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b8f7d4c56dcc872a5efcd… commit b8f7d4c56dcc872a5efcd9517f32bd2dde58a056 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Wed May 20 15:45:47 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 20 15:45:47 2020 +0200 [TIMEDATE] French translation (#2811) --- dll/cpl/timedate/lang/fr-FR.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/cpl/timedate/lang/fr-FR.rc b/dll/cpl/timedate/lang/fr-FR.rc index 6cc76bcabcd..595e05158e0 100644 --- a/dll/cpl/timedate/lang/fr-FR.rc +++ b/dll/cpl/timedate/lang/fr-FR.rc @@ -54,6 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Prochaine synchronisation: %s à %s" IDS_INETTIMESYNCING "Veuillez patienter pendant que ReactOS synchronise l'heure avec %s" IDS_INETTIMEERROR "Une erreur a eu lieu pendant que ReactOS synchronisait avec %s" - IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" - IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" + IDS_INETTIMESUCFILL "Veuillez saisir un nom de serveur NTP pour synchroniser le temps" + IDS_INETTIMEWELCOME "Sélectionnez un serveur NTP dans la liste ou saisissez un nom de serveur NTP pour synchroniser le temps de l'ordinateur" END

1 0

[reactos] 01/01: [SHELL32] Allow creation of an empty CFileSysEnum CORE-16908
by Mark Jansen 19 May '20

19 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83a9f7169086d25a9d32a… commit 83a9f7169086d25a9d32a2e227bb421e5c417bdf Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Tue May 19 20:35:52 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Tue May 19 20:35:52 2020 +0200 [SHELL32] Allow creation of an empty CFileSysEnum CORE-16908 --- dll/win32/shell32/folders/CFSFolder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/folders/CFSFolder.cpp b/dll/win32/shell32/folders/CFSFolder.cpp index a97ad5d4980..918ba8f5ff2 100644 --- a/dll/win32/shell32/folders/CFSFolder.cpp +++ b/dll/win32/shell32/folders/CFSFolder.cpp @@ -460,8 +460,8 @@ public: if (!sPathTarget || !sPathTarget[0]) { - FAILED_UNEXPECTEDLY(E_INVALIDARG); - return E_INVALIDARG; + WARN("No path for CFileSysEnum, empty result!\n"); + return S_FALSE; } WCHAR szFindPattern[MAX_PATH];

1 0

[reactos] 01/01: [SYSSETUP] Fix broken build on RosBE2.1.6 CORE-17028
by Joachim Henze 19 May '20

19 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4cbb21761cde71af7ad47… commit 4cbb21761cde71af7ad47573099ca92d966c8920 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue May 19 20:32:21 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue May 19 20:32:21 2020 +0200 [SYSSETUP] Fix broken build on RosBE2.1.6 CORE-17028 The build broke due to a typo introduced by 0.4.15-dev-275-g 612729b09272aeb693e156de6b5991891951dbf2 ../dll/win32/syssetup/wizard.c: In function 'ProductPageDlgProc': ../dll/win32/syssetup/wizard.c:527:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration- after-statement] cc1.exe: all warnings being treated as errors --- dll/win32/syssetup/wizard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index ae100d041f7..6564407c5a9 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -523,7 +523,7 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) LPNMHDR lpnm; PSETUPDATA pSetupData; INT iItem; - WCHAR szText[64], szDefault[64];; + WCHAR szText[64], szDefault[64]; HICON hIcon; pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, DWLP_USER);

1 0

[reactos] 01/01: [JOY] Fix missing UI elements and French translation (#2808)
by Kyle Katarn 19 May '20

19 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb2a9bb60ddc690933baf… commit fb2a9bb60ddc690933baf5845b7ff767c49471b2 Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Tue May 19 12:09:05 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 19 19:09:05 2020 +0900 [JOY] Fix missing UI elements and French translation (#2808) Missing GUI elements added. Improve French translation. --- dll/cpl/joy/joy.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- dll/cpl/joy/lang/bg-BG.rc | 1 + dll/cpl/joy/lang/cs-CZ.rc | 1 + dll/cpl/joy/lang/de-DE.rc | 1 + dll/cpl/joy/lang/el-GR.rc | 1 + dll/cpl/joy/lang/en-US.rc | 1 + dll/cpl/joy/lang/es-ES.rc | 1 + dll/cpl/joy/lang/fr-FR.rc | 9 +++++---- dll/cpl/joy/lang/he-IL.rc | 1 + dll/cpl/joy/lang/id-ID.rc | 1 + dll/cpl/joy/lang/it-IT.rc | 1 + dll/cpl/joy/lang/no-NO.rc | 1 + dll/cpl/joy/lang/pl-PL.rc | 1 + dll/cpl/joy/lang/pt-PT.rc | 1 + dll/cpl/joy/lang/ro-RO.rc | 1 + dll/cpl/joy/lang/ru-RU.rc | 1 + dll/cpl/joy/lang/sk-SK.rc | 1 + dll/cpl/joy/lang/sq-AL.rc | 1 + dll/cpl/joy/lang/tr-TR.rc | 1 + dll/cpl/joy/lang/uk-UA.rc | 1 + dll/cpl/joy/lang/zh-CN.rc | 1 + dll/cpl/joy/lang/zh-TW.rc | 1 + dll/cpl/joy/resource.h | 1 + 23 files changed, 68 insertions(+), 7 deletions(-) diff --git a/dll/cpl/joy/joy.c b/dll/cpl/joy/joy.c index 530a78d442c..f58c874c9e6 100644 --- a/dll/cpl/joy/joy.c +++ b/dll/cpl/joy/joy.c @@ -23,12 +23,13 @@ * PURPOSE: ReactOS Software Control Panel * PROGRAMMER: Dmitry Chapyshev (lentind(a)yandex.ru) * UPDATE HISTORY: - * 10-18-2007 Created + * 10-18-2007 Created + * 05-18-2020 Updated (init of dialog and combobox) */ #include "joy.h" -#define NUM_APPLETS (1) +#define NUM_APPLETS (1) LONG CALLBACK SystemApplet(HWND hwnd, UINT uMsg, LPARAM lParam1, LPARAM lParam2); HINSTANCE hApplet = 0; @@ -80,7 +81,15 @@ AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case WM_INITDIALOG: + { + WCHAR szBuf[256]; + HWND hComboHwnd = GetDlgItem(hwndDlg,IDC_PREFERRED_DEV_COMBO); + + LoadStringW(hApplet, IDS_NONE, szBuf, _countof(szBuf)); + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + SendMessageW(hComboHwnd, CB_SETCURSEL, 0, (LPARAM)NULL); break; + } case WM_COMMAND: switch (LOWORD(wParam)) @@ -118,7 +127,37 @@ CustomPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case WM_INITDIALOG: + { + WCHAR szBuf[2]; + HWND hComboHwnd; + szBuf[1] = UNICODE_NULL; + + CheckDlgButton(hwndDlg, IDC_JOYSTICK_RADIO, BST_CHECKED); + + hComboHwnd = GetDlgItem(hwndDlg, IDC_AXES_COMBO); + szBuf[0] = L'2'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'3'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'4'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + SendMessageW(hComboHwnd, CB_SETCURSEL, 0, 0); + + hComboHwnd = GetDlgItem(hwndDlg, IDC_BUTTONS_COMBO); + szBuf[0] = L'0'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'1'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'2'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'3'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + szBuf[0] = L'4'; + SendMessageW(hComboHwnd, CB_ADDSTRING, 0, (LPARAM)szBuf); + SendMessageW(hComboHwnd, CB_SETCURSEL, 4, 0); + break; + } case WM_COMMAND: switch (LOWORD(wParam)) @@ -203,7 +242,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (uMsg) { case WM_INITDIALOG: - AddColumns(GetDlgItem(hwndDlg,IDC_CONTROLLER_LIST)); + AddColumns(GetDlgItem(hwndDlg, IDC_CONTROLLER_LIST)); s_hIcon = LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM)); s_hIconSm = (HICON)LoadImageW(hApplet, MAKEINTRESOURCEW(IDI_CPLSYSTEM), IMAGE_ICON, diff --git a/dll/cpl/joy/lang/bg-BG.rc b/dll/cpl/joy/lang/bg-BG.rc index 5ceabd05425..f675307354b 100644 --- a/dll/cpl/joy/lang/bg-BG.rc +++ b/dll/cpl/joy/lang/bg-BG.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Добавяне, премахване и настройване на игрови управления от рода на ръчки и игрови подложки." IDS_CONTROLLER "Управление" IDS_STATUS "Състояние" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/cs-CZ.rc b/dll/cpl/joy/lang/cs-CZ.rc index c737c3d3daa..c26b43fc031 100644 --- a/dll/cpl/joy/lang/cs-CZ.rc +++ b/dll/cpl/joy/lang/cs-CZ.rc @@ -86,4 +86,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Přidat, odebrat a konfigurovat herní ovladače jako například joysticky nebo gamepady." IDS_CONTROLLER "Ovladač" IDS_STATUS "Stav" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/de-DE.rc b/dll/cpl/joy/lang/de-DE.rc index 3868dfdc2c5..93f62df313f 100644 --- a/dll/cpl/joy/lang/de-DE.rc +++ b/dll/cpl/joy/lang/de-DE.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Hinzufügen, Entfernen und Konfigurieren von Gamecontrollerhardware wie Joysticks und Gamepads." IDS_CONTROLLER "Controller" IDS_STATUS "Status" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/el-GR.rc b/dll/cpl/joy/lang/el-GR.rc index 3ef9c253816..01098f0877a 100644 --- a/dll/cpl/joy/lang/el-GR.rc +++ b/dll/cpl/joy/lang/el-GR.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Προσθήκη, κατάργηση και ρύθμιση του υλικού ελεγκτών παιχνιδιών όπως joystick και χειριστήρια παιχνιδιών." IDS_CONTROLLER "Ελεγκτής" IDS_STATUS "Κατάσταση" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/en-US.rc b/dll/cpl/joy/lang/en-US.rc index 543c4dfde9f..2ec701a5afa 100644 --- a/dll/cpl/joy/lang/en-US.rc +++ b/dll/cpl/joy/lang/en-US.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Add, remove, and configure game controller hardware such as joysticks and gamepads." IDS_CONTROLLER "Controller" IDS_STATUS "Status" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/es-ES.rc b/dll/cpl/joy/lang/es-ES.rc index 95ae4bd2471..021c2a8ac5e 100644 --- a/dll/cpl/joy/lang/es-ES.rc +++ b/dll/cpl/joy/lang/es-ES.rc @@ -83,4 +83,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Agrega, quita y configura hardware de dispositivos de juego como joysticks y controladores para juegos." IDS_CONTROLLER "Dispositivo" IDS_STATUS "Estado" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/fr-FR.rc b/dll/cpl/joy/lang/fr-FR.rc index dd3cdbfdde1..a0f813ba571 100644 --- a/dll/cpl/joy/lang/fr-FR.rc +++ b/dll/cpl/joy/lang/fr-FR.rc @@ -28,10 +28,10 @@ BEGIN LTEXT "Sélectionnez un contrôleur de jeu dans la liste suivante, puis cliquez sur OK. Si votre contrôleur de jeu n'apparaît pas dans la liste, cliquez sur Personnaliser.", -1, 35, 7, 210, 33 LTEXT "Contrôleurs de jeu :", -1, 8, 45, 126, 8 LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP - AUTOCHECKBOX "Activ&er les palonniers et les pédales", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 100, 10, WS_GROUP + AUTOCHECKBOX "Activ&er les palonniers et les pédales", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 250, 10, WS_GROUP LTEXT "Port de jeu:", -1, 7, 134, 38, 8, NOT WS_VISIBLE COMBOBOX IDC_GAME_PORT_COMBO, 7, 147, 140, 50, CBS_DROPDOWNLIST | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL - PUSHBUTTON "Personnaliser...", IDC_CUSTOM_BUTTON, 208, 147, 50, 14 + PUSHBUTTON "Personnaliser...", IDC_CUSTOM_BUTTON, 200, 147, 58, 14 CONTROL "", -25525, "STATIC", SS_ETCHEDHORZ, 7, 170, 251, 1 DEFPUSHBUTTON "OK", IDOK, 155, 179, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 208, 179, 50, 14 @@ -54,7 +54,7 @@ BEGIN AUTORADIOBUTTON "Axe Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE GROUPBOX "&Boutons", -1, 137, 67, 116, 44 COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE - AUTOCHECKBOX "Inclue un contrôle de &point de vue", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + AUTOCHECKBOX "Inclut un contrôle de &point de vue", IDC_INC_POINT_CHECKBOX, 7, 123, 120, 10 LTEXT "N&om du contrôleur :", -1, 7, 139, 200, 9 EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 @@ -70,7 +70,7 @@ BEGIN ICON IDI_CPLSYSTEM, -1, 7, 24, 20, 20 DEFPUSHBUTTON "OK", IDOK, 106, 65, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 163, 65, 50, 14 - LTEXT "Sélectionnez le périphérique que vous désirez utiliser avec d'anciens programmes.", -1, 7, 7, 208, 10 + LTEXT "Sélectionnez le périphérique que vous désirez utiliser avec d'anciens programmes.", -1, 7, 7, 208, 16 LTEXT "&Périphérique préféré:", -1, 34, 24, 70, 10 COMBOBOX IDC_PREFERRED_DEV_COMBO, 34, 38, 179, 75, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL END @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Ajouter, supprimer, et configurer le matériel de contrôle de jeu comme les joysticks et les manettes de jeu." IDS_CONTROLLER "Contrôleur" IDS_STATUS "Statut" + IDS_NONE "(Aucun)" END diff --git a/dll/cpl/joy/lang/he-IL.rc b/dll/cpl/joy/lang/he-IL.rc index b647bf742c1..eaa45c61bce 100644 --- a/dll/cpl/joy/lang/he-IL.rc +++ b/dll/cpl/joy/lang/he-IL.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Add, remove, and configure game controller hardware such as joysticks and gamepads." IDS_CONTROLLER "בקר" IDS_STATUS "מצב" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/id-ID.rc b/dll/cpl/joy/lang/id-ID.rc index 4356e48a2d0..8c90a5fc8b7 100644 --- a/dll/cpl/joy/lang/id-ID.rc +++ b/dll/cpl/joy/lang/id-ID.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Tambahkan, hapus, dan konfigurasikan perangkat keras pengontrol permainan seperti joystick dan gamepad." IDS_CONTROLLER "Pengontrol" IDS_STATUS "Status" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/it-IT.rc b/dll/cpl/joy/lang/it-IT.rc index bc006c8f6b9..79c66454ddd 100644 --- a/dll/cpl/joy/lang/it-IT.rc +++ b/dll/cpl/joy/lang/it-IT.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Aggiunge, rimuove e configura periferiche di gioco come joystick e gamepad." IDS_CONTROLLER "Dispositivo" IDS_STATUS "Stato" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/no-NO.rc b/dll/cpl/joy/lang/no-NO.rc index ad35c8330fb..9bfc0c0c27c 100644 --- a/dll/cpl/joy/lang/no-NO.rc +++ b/dll/cpl/joy/lang/no-NO.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Legg til, fjern, og konfigurer spillkontroller maskinvare som styrespak og spillkontroll." IDS_CONTROLLER "Kontroller" IDS_STATUS "Status" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/pl-PL.rc b/dll/cpl/joy/lang/pl-PL.rc index 24c1a3b6bbb..bebdba06ccf 100644 --- a/dll/cpl/joy/lang/pl-PL.rc +++ b/dll/cpl/joy/lang/pl-PL.rc @@ -89,4 +89,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Dodaje, usuwa i konfiguruje Kontrolery gier, takie jak joysticki, pady czy kierownice." IDS_CONTROLLER "Kontroler" IDS_STATUS "Stan" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/pt-PT.rc b/dll/cpl/joy/lang/pt-PT.rc index 7874363de5d..4a5095c3709 100644 --- a/dll/cpl/joy/lang/pt-PT.rc +++ b/dll/cpl/joy/lang/pt-PT.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Adicionar, remover e configurar o hardware controlador de jogos, tais como joysticks e consolas de jogos." IDS_CONTROLLER "Controlador" IDS_STATUS "Status" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/ro-RO.rc b/dll/cpl/joy/lang/ro-RO.rc index fbcd4e65d76..91ade0a0f19 100644 --- a/dll/cpl/joy/lang/ro-RO.rc +++ b/dll/cpl/joy/lang/ro-RO.rc @@ -83,4 +83,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Adăugarea, eliminarea sau configurarea dispozitivelor de control pentru jocuri, precum joystick-uri sau gamepad-uri." IDS_CONTROLLER "Dispozitiv de control" IDS_STATUS "Stare" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/ru-RU.rc b/dll/cpl/joy/lang/ru-RU.rc index 062bd3ac398..9c7239b4bd2 100644 --- a/dll/cpl/joy/lang/ru-RU.rc +++ b/dll/cpl/joy/lang/ru-RU.rc @@ -81,4 +81,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Добавление, удаление и настройка параметров игровых устройств, например, джойстиков или игровых планшетов." IDS_CONTROLLER "Устройство" IDS_STATUS "Состояние" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/sk-SK.rc b/dll/cpl/joy/lang/sk-SK.rc index 3c19f4d6e4f..c5bc1b0365f 100644 --- a/dll/cpl/joy/lang/sk-SK.rc +++ b/dll/cpl/joy/lang/sk-SK.rc @@ -85,4 +85,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Pridá, odstráni a konfiguruje hracie zariadenia, ako sú napríklad pákové ovládače alebo gamepady." IDS_CONTROLLER "Zariadenie" IDS_STATUS "Stav" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/sq-AL.rc b/dll/cpl/joy/lang/sq-AL.rc index e97ee17bbbd..62ffb9280fa 100644 --- a/dll/cpl/joy/lang/sq-AL.rc +++ b/dll/cpl/joy/lang/sq-AL.rc @@ -85,4 +85,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Shtoni, hiqni, dhe konfiguroni pajisjet elektronike kontrolluese të lojërave të tilla si levë dhe pad-loje." IDS_CONTROLLER "Kontrollues" IDS_STATUS "Gjendje" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/tr-TR.rc b/dll/cpl/joy/lang/tr-TR.rc index 09944f942df..a43d537128b 100644 --- a/dll/cpl/joy/lang/tr-TR.rc +++ b/dll/cpl/joy/lang/tr-TR.rc @@ -83,4 +83,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Oyun çubukları ve oyun kolları gibi oyun denetleyicisi donanımlarını ekler, çıkarır ve yapılandırır." IDS_CONTROLLER "Denetleyici" IDS_STATUS "Durum" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/uk-UA.rc b/dll/cpl/joy/lang/uk-UA.rc index bd416680cc5..597e9f122b4 100644 --- a/dll/cpl/joy/lang/uk-UA.rc +++ b/dll/cpl/joy/lang/uk-UA.rc @@ -89,4 +89,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Додавання, видалення й настройка параметрів ігрових пристроїв, наприклад, джойстиків або ігрових планшетів." IDS_CONTROLLER "Пристрій" IDS_STATUS "Стан" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/zh-CN.rc b/dll/cpl/joy/lang/zh-CN.rc index 56b0266f9c1..c7747bdb56e 100644 --- a/dll/cpl/joy/lang/zh-CN.rc +++ b/dll/cpl/joy/lang/zh-CN.rc @@ -87,4 +87,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "添加、删除或配置游戏控制器硬件，如游戏杆和游戏板" IDS_CONTROLLER "控制器" IDS_STATUS "状态" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/lang/zh-TW.rc b/dll/cpl/joy/lang/zh-TW.rc index cbe77f94a13..bfb0645686a 100644 --- a/dll/cpl/joy/lang/zh-TW.rc +++ b/dll/cpl/joy/lang/zh-TW.rc @@ -83,4 +83,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "添加、刪除或配置遊戲控制器硬體，如遊戲杆和遊戲板" IDS_CONTROLLER "控制器" IDS_STATUS "狀態" + IDS_NONE "(None)" END diff --git a/dll/cpl/joy/resource.h b/dll/cpl/joy/resource.h index 7e6ad4d8804..27b09dd6a3c 100644 --- a/dll/cpl/joy/resource.h +++ b/dll/cpl/joy/resource.h @@ -14,6 +14,7 @@ #define IDS_CPLSYSTEMDESCRIPTION 1099 #define IDS_CONTROLLER 1151 #define IDS_STATUS 1152 +#define IDS_NONE 1200 /* Controls */ #define IDC_CONTROLLER_LIST 1020

1 0

[reactos] 01/01: [SYSSETUP][BOOTDATA] Make Server default again and write Service Pack (#2749)
by Katayama Hirofumi MZ 19 May '20

19 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=612729b09272aeb693e15… commit 612729b09272aeb693e156de6b5991891951dbf2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue May 19 15:41:26 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 19 15:41:26 2020 +0900 [SYSSETUP][BOOTDATA] Make Server default again and write Service Pack (#2749) - Make "ReactOS Server" the default product option again instead of "ReactOS Workstation". - Write "Service Pack" info onto registry. - Add ProductOption option to bootcd unattend.inf. - Delete IDC_PRODUCT_SUITE and IDC_PRODUCT_TYPE controls. CORE-17028 --- boot/bootdata/bootcd/unattend.inf | 5 + dll/ntdll/rtl/version.c | 2 +- dll/win32/syssetup/lang/bg-BG.rc | 11 +- dll/win32/syssetup/lang/cs-CZ.rc | 11 +- dll/win32/syssetup/lang/da-DK.rc | 11 +- dll/win32/syssetup/lang/de-DE.rc | 11 +- dll/win32/syssetup/lang/el-GR.rc | 11 +- dll/win32/syssetup/lang/en-US.rc | 11 +- dll/win32/syssetup/lang/es-ES.rc | 11 +- dll/win32/syssetup/lang/et-EE.rc | 11 +- dll/win32/syssetup/lang/fi-FI.rc | 11 +- dll/win32/syssetup/lang/fr-FR.rc | 11 +- dll/win32/syssetup/lang/he-IL.rc | 11 +- dll/win32/syssetup/lang/hi-IN.rc | 11 +- dll/win32/syssetup/lang/hu-HU.rc | 11 +- dll/win32/syssetup/lang/id-ID.rc | 11 +- dll/win32/syssetup/lang/it-IT.rc | 11 +- dll/win32/syssetup/lang/ja-JP.rc | 11 +- dll/win32/syssetup/lang/lt-LT.rc | 11 +- dll/win32/syssetup/lang/nl-NL.rc | 11 +- dll/win32/syssetup/lang/no-NO.rc | 11 +- dll/win32/syssetup/lang/pl-PL.rc | 11 +- dll/win32/syssetup/lang/pt-BR.rc | 11 +- dll/win32/syssetup/lang/pt-PT.rc | 11 +- dll/win32/syssetup/lang/ro-RO.rc | 11 +- dll/win32/syssetup/lang/ru-RU.rc | 11 +- dll/win32/syssetup/lang/sk-SK.rc | 11 +- dll/win32/syssetup/lang/sq-AL.rc | 11 +- dll/win32/syssetup/lang/sv-SE.rc | 11 +- dll/win32/syssetup/lang/th-TH.rc | 11 +- dll/win32/syssetup/lang/tr-TR.rc | 11 +- dll/win32/syssetup/lang/uk-UA.rc | 11 +- dll/win32/syssetup/lang/zh-CN.rc | 11 +- dll/win32/syssetup/lang/zh-TW.rc | 11 +- dll/win32/syssetup/resource.h | 3 +- dll/win32/syssetup/wizard.c | 185 +++++++++++++++++---------- sdk/include/reactos/libs/syssetup/syssetup.h | 3 +- 37 files changed, 252 insertions(+), 298 deletions(-) diff --git a/boot/bootdata/bootcd/unattend.inf b/boot/bootdata/bootcd/unattend.inf index 9d61b5a0b9c..ce5593788e2 100644 --- a/boot/bootdata/bootcd/unattend.inf +++ b/boot/bootdata/bootcd/unattend.inf @@ -53,6 +53,11 @@ DisableGeckoInst = no ; see hivesys.inf for available languages LocaleID = 409 +; set product option +; 0: ReactOS Server +; 1: ReactOS Workstation +ProductOption = 0 + ; enable this section to automatically launch programs ; after 3rd boot ; diff --git a/dll/ntdll/rtl/version.c b/dll/ntdll/rtl/version.c index f7d44e5f209..96a9be1f162 100644 --- a/dll/ntdll/rtl/version.c +++ b/dll/ntdll/rtl/version.c @@ -59,7 +59,7 @@ SetRosSpecificInfo(IN OUT PRTL_OSVERSIONINFOEXW VersionInformation) { /* It is, modify the product type to report a workstation */ VersionInformation->wProductType = VER_NT_WORKSTATION; - DPRINT1("We modified the reported OS from NtProductServer to NtProductWinNt\n"); + DPRINT("We modified the reported OS from NtProductServer to NtProductWinNt\n"); } } diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index acb30d85d9c..8cd84944369 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index afc12c6d9bb..fb772edfcc4 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -38,12 +38,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -254,7 +250,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 98256294e0d..6e40752aa8b 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index da3c8c33f03..2c04c138921 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 7ff078d51cb..6e1a9f668e0 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index c908775f3dc..eea2920ef1d 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -268,7 +264,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 1d9a689addb..e5ecf26c24c 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -41,12 +41,8 @@ BEGIN LTEXT "&Opciones de producto:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Información de producto", IDC_STATIC, 5, 50, 305, 85 - LTEXT "Suite del Producto:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Tipo de Producto:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Descripción:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Descripción:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -257,7 +253,8 @@ BEGIN IDS_PRODUCTTITLE "Opciones de producto" IDS_PRODUCTSUBTITLE "Puedes seleccionar una opción de producto afectará al comportamiento del sistema." IDS_PRODUCTSERVERNAME "ReactOS como Servidor" - IDS_PRODUCTWORKSTATIONNAME "ReactOS como Sobremesa (Por defecto)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS como Sobremesa" IDS_PRODUCTSERVERINFO "El sistema será reconocido como un servidor. Las carpetas privadas ""Mis imágenes"", ""Mis vídeos"" y ""Mi música"" serán independientes de ""Mis documentos""." IDS_PRODUCTWORKSTATIONINFO "El sistema será reconocido como un PC de sobremesa. Las carpetas privadas ""Mis imágenes"", ""Mis vídeos"" y ""Mi música"" estarán dentro de ""Mis documentos""." + IDS_DEFAULT "(Por defecto)" END diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 573ffbffe78..3d07a9d2c56 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 490d2351716..a4c1480ade1 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index dd1ab18be48..66dc007feb0 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 43745881c40..dc201d16d53 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index e342bc288fd..86bf4160689 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -39,12 +39,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -256,7 +252,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 8c81298d715..70f414fb0b5 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "&Kiadások:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 135, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Kiadási információk", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Leírás:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Leírás:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -247,7 +243,8 @@ BEGIN IDS_PRODUCTTITLE "Kiadások" IDS_PRODUCTSUBTITLE "Választhat egy kiadást, amely befolyásolja a rendszer viselkedését." IDS_PRODUCTSERVERNAME "ReactOS Szerver" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Munkaállomás (alapértelmezett)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Munkaállomás" IDS_PRODUCTSERVERINFO "A rendszer szerverként lesz felismerhető. A ""Képek"", ""Videók"" és ""Zenék"" személyes mappák függetlenek lesznek a ""Dokumentumok"" mappától." IDS_PRODUCTWORKSTATIONINFO "A rendszer munkaállomásként lesz felismerhető. A ""Képek"", ""Videók"" és ""Zenék"" személyes mappák a ""Dokumentumok"" mappában lesznek." + IDS_DEFAULT "(alapértelmezett)" END diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index ca3d81bd92e..9b08333fd1d 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Pilihan Pr&oduk:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informasi Produk", IDC_STATIC, 5, 50, 305, 85 - LTEXT "RangkaianProduk:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "JenisProduk:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Deskripsi:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Deskripsi:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Pilihan Produk" IDS_PRODUCTSUBTITLE "Anda bisa memilih opsi produk yang bisa mempengaruhi tindakan sistem." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Asli)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "Sistem akan dikenal sebagai server. Folder pribadi ""Gambar Saya"", ""Video Saya"" dan ""Musik Saya"" disendirikan dari ""Dokumen Saya""." IDS_PRODUCTWORKSTATIONINFO "Sistem akan dikenal sebagai workstation. Folder pribadi ""Gambar Saya"", ""Video Saya"" dan ""Musik Saya"" dimasukkan dalam ""Dokumen Saya""." + IDS_DEFAULT "(Asli)" END diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 7079281a83f..e8aec4e87a7 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 69d89c4f13e..bb6e31cb6bc 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "製品オプション(&O):", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "製品情報", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "説明:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "説明:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "製品オプション" IDS_PRODUCTSUBTITLE "システムのふるまいに影響する製品オプションを選べます。" IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (既定)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "システムはサーバとして認識されます。個人用フォルダ ""マイピクチャ""、""マイビデオ""、""マイミュージック"" は ""マイドキュメント"" から独立しています。" IDS_PRODUCTWORKSTATIONINFO "システムはワークステーションとして認識されます。個人用フォルダ ""マイピクチャ""、""マイビデオ""、""マイミュージック"" は、""マイドキュメント"" の中にあります。" + IDS_DEFAULT "(既定)" END diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index cd66f13dfa3..9aae25cea7a 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index b09d3ef683e..5837718d597 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 1db3db9aebe..2891b5790b6 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 6abb05c7214..5f2854ce9da 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 40c931d8a3e..f78bd39a79e 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index 9b727816bad..dff8801bcb7 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -32,12 +32,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -248,7 +244,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 614cd25351a..4ab26a635f1 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -41,12 +41,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -257,7 +253,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index 46f572bc366..4e8f4dbdde6 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -35,12 +35,8 @@ BEGIN LTEXT "&Тип продукта:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Информация о продукте", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Описание:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Описание:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -251,7 +247,8 @@ BEGIN IDS_PRODUCTTITLE "Тип продукта" IDS_PRODUCTSUBTITLE "Вы можете выбрать тип продукта, который изменяет поведение системы." IDS_PRODUCTSERVERNAME "Сервер ReactOS" - IDS_PRODUCTWORKSTATIONNAME "Рабочая станция ReactOS (по умолчанию)" + IDS_PRODUCTWORKSTATIONNAME "Рабочая станция ReactOS" IDS_PRODUCTSERVERINFO "Система будет распознаваться как сервер. Приватные папки ""Мои Изображения"", ""Мои видеозаписи"" и ""Моя музыка"" не будут зависеть от папки ""Мои документы""." IDS_PRODUCTWORKSTATIONINFO "Система будет разпознаваться как рабочая станция. Приватные папки ""Мои изображения"", ""Мои видеозаписи"" и ""Моя музыка"" будут находится в папке ""Мои документы""." + IDS_DEFAULT "(по умолчанию)" END diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 4748c97c7f1..2341f62500a 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -38,12 +38,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -254,7 +250,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index e229246450e..83ebd25cb57 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 1a581684b2e..b24a9c69e33 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 63d355645e4..1e99af5eaaa 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -51,12 +51,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -267,7 +263,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index a768dbbefcc..a911d89e318 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -34,12 +34,8 @@ BEGIN LTEXT "Ü&rün seçenekleri:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Ürün Bilgisi", IDC_STATIC, 5, 50, 305, 85 - LTEXT "Ürün Takımı:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Ürün Türü:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Tanım:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Tanım:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -250,7 +246,8 @@ BEGIN IDS_PRODUCTTITLE "Ürün Seçenekleri" IDS_PRODUCTSUBTITLE "Sisteminizin davranışını etkileyen bir ürün seçeneği seçebilirsiniz." IDS_PRODUCTSERVERNAME "ReactOS Sunucu" - IDS_PRODUCTWORKSTATIONNAME "ReactOS İş İstasyonu (Ön Tanımlı)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS İş İstasyonu" IDS_PRODUCTSERVERINFO "Sistem bir sunucu olarak tanınacaktır. ""Resimlerim"", ""Videolarım"" and ""Müziklerim"" özel klasörleri ""Belgelerim""den bağımsızdır." IDS_PRODUCTWORKSTATIONINFO "Sistem bir iş istasyonu olarak tanınacaktır. ""Resimlerim"", ""Videolarım"" and ""Müziklerim"" özel klasörleri ""Belgelerim""in içindedir." + IDS_DEFAULT "(Ön Tanımlı)" END diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 65f07117587..b759b174866 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -40,12 +40,8 @@ BEGIN LTEXT "Тип &продукту:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Інформація про продукт", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Опис:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Опис:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -256,7 +252,8 @@ BEGIN IDS_PRODUCTTITLE "Тип продукту" IDS_PRODUCTSUBTITLE "Ви можете вибрати тип продукту. Це вплине на поведінку системи." IDS_PRODUCTSERVERNAME "Сервер ReactOS" - IDS_PRODUCTWORKSTATIONNAME "Робоча станція ReactOS (за замовчуванням)" + IDS_PRODUCTWORKSTATIONNAME "Робоча станція ReactOS" IDS_PRODUCTSERVERINFO "Система буде розпізнаватися як сервер. Особисті папки ""Мої зображення"", ""Мої відео"" та ""Моя музика"" не будуть залежати від папки ""Мої документи""." IDS_PRODUCTWORKSTATIONINFO "Система буде розпізнаватися як робоча станція. Особисті папки ""Мої зображення"", ""Мої відео"" та ""Моя музика"" будуть в папці ""Мої документи""." + IDS_DEFAULT "(за замовчуванням)" END diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index aa85fe923d7..fdf9e957017 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -34,12 +34,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -253,7 +249,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 1167abdf7f3..dcc72bf9e2b 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -54,12 +54,8 @@ BEGIN LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 - EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 - EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 - EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL + LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 @@ -275,7 +271,8 @@ BEGIN IDS_PRODUCTTITLE "Product Options" IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" + IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_DEFAULT "(Default)" END diff --git a/dll/win32/syssetup/resource.h b/dll/win32/syssetup/resource.h index 469c22e3fad..a324cfea1ae 100644 --- a/dll/win32/syssetup/resource.h +++ b/dll/win32/syssetup/resource.h @@ -91,8 +91,6 @@ #define IDD_PRODUCT 2400 #define IDC_PRODUCT_ICON 2401 #define IDC_PRODUCT_OPTIONS 2402 -#define IDC_PRODUCT_SUITE 2403 -#define IDC_PRODUCT_TYPE 2404 #define IDC_PRODUCT_DESCRIPTION 2405 #define IDS_ACKTITLE 3010 @@ -159,5 +157,6 @@ #define IDS_PRODUCTWORKSTATIONNAME 3903 #define IDS_PRODUCTSERVERINFO 3904 #define IDS_PRODUCTWORKSTATIONINFO 3905 +#define IDS_DEFAULT 3906 #define IDR_GPL 4000 diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 386b04bf356..ae100d041f7 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -6,6 +6,7 @@ * PROGRAMMERS: Eric Kohl * Pierre Schweitzer <heis_spiter(a)hotmail.com> * Ismael Ferreras Morezuelas <swyterzone+ros(a)gmail.com> + * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ /* INCLUDES *****************************************************************/ @@ -18,8 +19,8 @@ #include <windowsx.h> #include <wincon.h> #include <shlobj.h> - #include <tzlib.h> +#include <strsafe.h> #define NDEBUG #include <debug.h> @@ -390,88 +391,129 @@ AckPageDlgProc(HWND hwndDlg, return FALSE; } +static const WCHAR s_szProductOptions[] = L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions"; +static const WCHAR s_szRosVersion[] = L"SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"; +static const WCHAR s_szControlWindows[] = L"SYSTEM\\CurrentControlSet\\Control\\Windows"; + +typedef struct PRODUCT_OPTION_DATA +{ + LPCWSTR ProductSuite; + LPCWSTR ProductType; + DWORD ReportAsWorkstation; + DWORD CSDVersion; +} PRODUCT_OPTION_DATA, *LPPRODUCT_OPTION_DATA; + +static const PRODUCT_OPTION_DATA s_ProductOptionData[] = +{ + { L"Terminal Server\0", L"ServerNT", 0, 0x200 }, + { L"\0", L"WinNT", 1, 0x300 } +}; + static BOOL DoWriteProductOption(PRODUCT_OPTION nOption) { - static const WCHAR s_szProductOptions[] = L"SYSTEM\\CurrentControlSet\\Control\\ProductOptions"; - static const WCHAR s_szRosVersion[] = L"SYSTEM\\CurrentControlSet\\Control\\ReactOS\\Settings\\Version"; HKEY hKey; LONG error; - LPCWSTR pData; - DWORD cbData, dwValue; + LPCWSTR pszData; + DWORD dwValue, cbData; + const PRODUCT_OPTION_DATA *pData = &s_ProductOptionData[nOption]; + ASSERT(0 <= nOption && nOption < _countof(s_ProductOptionData)); + /* open ProductOptions key */ error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_szProductOptions, 0, KEY_WRITE, &hKey); if (error) - return FALSE; - - switch (nOption) { - case PRODUCT_OPTION_SERVER: - /* write ProductSuite */ - pData = L"Terminal Server\0"; - cbData = sizeof(L"Terminal Server\0"); - error = RegSetValueExW(hKey, L"ProductSuite", 0, REG_MULTI_SZ, (BYTE *)pData, cbData); - if (error) - break; - - /* write ProductType */ - pData = L"ServerNT"; - cbData = sizeof(L"ServerNT"); - error = RegSetValueExW(hKey, L"ProductType", 0, REG_SZ, (BYTE *)pData, cbData); - break; + DPRINT1("RegOpenKeyExW failed\n"); + goto Error; + } - case PRODUCT_OPTION_WORKSTATION: - /* write ProductSuite */ - pData = L"\0"; - cbData = sizeof(L"\0"); - error = RegSetValueExW(hKey, L"ProductSuite", 0, REG_MULTI_SZ, (BYTE *)pData, cbData); - if (error) - break; + /* write ProductSuite */ + pszData = pData->ProductSuite; + cbData = (lstrlenW(pszData) + 2) * sizeof(WCHAR); + error = RegSetValueExW(hKey, L"ProductSuite", 0, REG_MULTI_SZ, (const BYTE *)pData, cbData); + if (error) + { + DPRINT1("RegSetValueExW failed\n"); + goto Error; + } - /* write ProductType */ - pData = L"WinNT"; - cbData = sizeof(L"WinNT"); - error = RegSetValueExW(hKey, L"ProductType", 0, REG_SZ, (BYTE *)pData, cbData); - break; + /* write ProductType */ + pszData = pData->ProductType; + cbData = (lstrlenW(pszData) + 1) * sizeof(WCHAR); + error = RegSetValueExW(hKey, L"ProductType", 0, REG_SZ, (const BYTE *)pData, cbData); + if (error) + { + DPRINT1("RegSetValueExW failed\n"); + goto Error; } RegCloseKey(hKey); + /* open ReactOS version key */ error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_szRosVersion, 0, KEY_WRITE, &hKey); if (error) - return FALSE; + { + DPRINT1("RegOpenKeyExW failed\n"); + goto Error; + } - /* write ReportAsWorkstation value */ - dwValue = (nOption == PRODUCT_OPTION_WORKSTATION); + /* write ReportAsWorkstation */ + dwValue = pData->ReportAsWorkstation; cbData = sizeof(dwValue); - error = RegSetValueExW(hKey, L"ReportAsWorkstation", 0, REG_DWORD, (BYTE *)&dwValue, cbData); + error = RegSetValueExW(hKey, L"ReportAsWorkstation", 0, REG_DWORD, (const BYTE *)&dwValue, cbData); + if (error) + { + DPRINT1("RegSetValueExW failed\n"); + goto Error; + } RegCloseKey(hKey); - return error == ERROR_SUCCESS; -} + /* open Control Windows key */ + error = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_szControlWindows, 0, KEY_WRITE, &hKey); + if (error) + { + DPRINT1("RegOpenKeyExW failed\n"); + goto Error; + } -static void -OnChooseServer(HWND hwndDlg) -{ - WCHAR szText[256]; + /* write Control Windows CSDVersion */ + dwValue = pData->CSDVersion; + cbData = sizeof(dwValue); + error = RegSetValueExW(hKey, L"CSDVersion", 0, REG_DWORD, (const BYTE *)&dwValue, cbData); + if (error) + { + DPRINT1("RegSetValueExW failed\n"); + goto Error; + } - SetDlgItemTextW(hwndDlg, IDC_PRODUCT_SUITE, L"Terminal Server"); - SetDlgItemTextW(hwndDlg, IDC_PRODUCT_TYPE, L"ServerNT"); +Error: + if (hKey) + RegCloseKey(hKey); - LoadStringW(hDllInstance, IDS_PRODUCTSERVERINFO, szText, _countof(szText)); - SetDlgItemTextW(hwndDlg, IDC_PRODUCT_DESCRIPTION, szText); + return error == ERROR_SUCCESS; } static void -OnChooseWorkstation(HWND hwndDlg) +OnChooseOption(HWND hwndDlg, PRODUCT_OPTION nOption) { WCHAR szText[256]; + ASSERT(0 <= nOption && nOption < _countof(s_ProductOptionData)); + + switch (nOption) + { + case PRODUCT_OPTION_SERVER: + LoadStringW(hDllInstance, IDS_PRODUCTSERVERINFO, szText, _countof(szText)); + break; - SetDlgItemTextW(hwndDlg, IDC_PRODUCT_SUITE, L""); - SetDlgItemTextW(hwndDlg, IDC_PRODUCT_TYPE, L"WinNT"); + case PRODUCT_OPTION_WORKSTATION: + LoadStringW(hDllInstance, IDS_PRODUCTWORKSTATIONINFO, szText, _countof(szText)); + break; + + default: + return; + } - LoadStringW(hDllInstance, IDS_PRODUCTWORKSTATIONINFO, szText, _countof(szText)); SetDlgItemTextW(hwndDlg, IDC_PRODUCT_DESCRIPTION, szText); } @@ -481,7 +523,7 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) LPNMHDR lpnm; PSETUPDATA pSetupData; INT iItem; - WCHAR szText[64]; + WCHAR szText[64], szDefault[64];; HICON hIcon; pSetupData = (PSETUPDATA)GetWindowLongPtr(hwndDlg, DWLP_USER); @@ -493,14 +535,26 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) pSetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSetupData); + LoadStringW(hDllInstance, IDS_DEFAULT, szDefault, _countof(szDefault)); + LoadStringW(hDllInstance, IDS_PRODUCTSERVERNAME, szText, _countof(szText)); + if (PRODUCT_OPTION_DEFAULT == PRODUCT_OPTION_SERVER) + { + StringCchCatW(szText, _countof(szText), L" "); + StringCchCatW(szText, _countof(szText), szDefault); + } SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_ADDSTRING, 0, (LPARAM)szText); LoadStringW(hDllInstance, IDS_PRODUCTWORKSTATIONNAME, szText, _countof(szText)); + if (PRODUCT_OPTION_DEFAULT == PRODUCT_OPTION_WORKSTATION) + { + StringCchCatW(szText, _countof(szText), L" "); + StringCchCatW(szText, _countof(szText), szDefault); + } SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_ADDSTRING, 0, (LPARAM)szText); - SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_SETCURSEL, PRODUCT_OPTION_WORKSTATION, 0); - OnChooseWorkstation(hwndDlg); + SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_SETCURSEL, PRODUCT_OPTION_DEFAULT, 0); + OnChooseOption(hwndDlg, PRODUCT_OPTION_DEFAULT); hIcon = LoadIcon(NULL, IDI_WINLOGO); SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_ICON, STM_SETICON, (WPARAM)hIcon, 0); @@ -511,19 +565,7 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (HIWORD(wParam) == CBN_SELCHANGE && IDC_PRODUCT_OPTIONS == LOWORD(wParam)) { iItem = SendDlgItemMessageW(hwndDlg, IDC_PRODUCT_OPTIONS, CB_GETCURSEL, 0, 0); - switch ((PRODUCT_OPTION)iItem) - { - case PRODUCT_OPTION_SERVER: - OnChooseServer(hwndDlg); - break; - - case PRODUCT_OPTION_WORKSTATION: - OnChooseWorkstation(hwndDlg); - break; - - default: - break; - } + OnChooseOption(hwndDlg, (PRODUCT_OPTION)iItem); } break; @@ -538,8 +580,7 @@ ProductPageDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (pSetupData->UnattendSetup) { - pSetupData->ProductOption = PRODUCT_OPTION_WORKSTATION; - OnChooseWorkstation(hwndDlg); + OnChooseOption(hwndDlg, pSetupData->ProductOption); DoWriteProductOption(pSetupData->ProductOption); SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, IDD_LOCALEPAGE); return TRUE; @@ -2396,7 +2437,10 @@ ProcessUnattendSection( else pSetupData->DisableGeckoInst = FALSE; } - + else if (!_wcsicmp(szName, L"ProductOption")) + { + pSetupData->ProductOption = (PRODUCT_OPTION)_wtoi(szValue); + } } while (SetupFindNextLine(&InfContext, &InfContext)); if (SetupFindFirstLineW(pSetupData->hSetupInf, @@ -2672,6 +2716,7 @@ InstallWizard(VOID) MB_ICONERROR | MB_OK); goto done; } + pSetupData->ProductOption = PRODUCT_OPTION_DEFAULT; hNetShell = LoadLibraryW(L"netshell.dll"); if (hNetShell != NULL) diff --git a/sdk/include/reactos/libs/syssetup/syssetup.h b/sdk/include/reactos/libs/syssetup/syssetup.h index adb924e390d..1eb5e2ab75c 100644 --- a/sdk/include/reactos/libs/syssetup/syssetup.h +++ b/sdk/include/reactos/libs/syssetup/syssetup.h @@ -26,7 +26,8 @@ typedef enum _PRODUCT_OPTION { PRODUCT_OPTION_SERVER, - PRODUCT_OPTION_WORKSTATION + PRODUCT_OPTION_WORKSTATION, + PRODUCT_OPTION_DEFAULT = PRODUCT_OPTION_SERVER } PRODUCT_OPTION, *PPRODUCT_OPTION; /* Private Setup data shared between syssetup.dll and netshell.dll */

1 0

[reactos] 01/01: [SHELL32_APITEST] Strengthen SHChangeNotify testcase (#2797)
by Katayama Hirofumi MZ 19 May '20

19 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5800ee5e27ae5dbc5315f… commit 5800ee5e27ae5dbc5315fedbec81b597415ac546 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue May 19 09:29:42 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue May 19 09:29:42 2020 +0900 [SHELL32_APITEST] Strengthen SHChangeNotify testcase (#2797) Investigate on nSources and fRecursive parameters. CORE-13950 --- .../rostests/apitests/shell32/SHChangeNotify.cpp | 153 ++++++++++----------- modules/rostests/apitests/shell32/SHChangeNotify.h | 47 +++++++ modules/rostests/apitests/shell32/shell-notify.cpp | 70 ++++------ 3 files changed, 144 insertions(+), 126 deletions(-) diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.cpp b/modules/rostests/apitests/shell32/SHChangeNotify.cpp index 79c9eafaaae..b800eaab328 100644 --- a/modules/rostests/apitests/shell32/SHChangeNotify.cpp +++ b/modules/rostests/apitests/shell32/SHChangeNotify.cpp @@ -8,33 +8,13 @@ #include "shelltest.h" #include <shlwapi.h> #include <stdio.h> +#include "SHChangeNotify.h" -#define WM_SHELL_NOTIFY (WM_USER + 100) -#define WM_GET_NOTIFY_FLAGS (WM_USER + 101) -#define WM_CLEAR_FLAGS (WM_USER + 102) -#define WM_SET_PATHS (WM_USER + 103) - -static WCHAR s_dir1[MAX_PATH]; // "%TEMP%\\WatchDir1" -static WCHAR s_dir2[MAX_PATH]; // "%TEMP%\\WatchDir1\\Dir2" -static WCHAR s_dir3[MAX_PATH]; // "%TEMP%\\WatchDir1\\Dir3" -static WCHAR s_file1[MAX_PATH]; // "%TEMP%\\WatchDir1\\File1.txt" -static WCHAR s_file2[MAX_PATH]; // "%TEMP%\\WatchDir1\\File2.txt" +#define DONT_SEND 0x24242424 static HWND s_hwnd = NULL; static const WCHAR s_szName[] = L"SHChangeNotify testcase"; - -typedef enum TYPE -{ - TYPE_RENAMEITEM, - TYPE_CREATE, - TYPE_DELETE, - TYPE_MKDIR, - TYPE_RMDIR, - TYPE_UPDATEDIR, - TYPE_UPDATEITEM, - TYPE_RENAMEFOLDER, - TYPE_FREESPACE -} TYPE; +static WCHAR s_szSubProgram[MAX_PATH]; typedef void (*ACTION)(void); @@ -108,7 +88,8 @@ DoAction8(void) ok_int(RemoveDirectoryW(s_dir1), TRUE); } -static const TEST_ENTRY s_TestEntries[] = { +static const TEST_ENTRY s_TestEntriesMode0[] = +{ {__LINE__, SHCNE_MKDIR, s_dir1, NULL, "000100000", NULL, s_dir1, L""}, {__LINE__, SHCNE_MKDIR, s_dir2, NULL, "000100000", NULL, s_dir2, L""}, {__LINE__, SHCNE_RMDIR, s_dir2, NULL, "000010000", NULL, s_dir2, L""}, @@ -156,6 +137,9 @@ static const TEST_ENTRY s_TestEntries[] = { {__LINE__, SHCNE_RMDIR, s_dir1, NULL, "000010000", DoAction8, s_dir1, L""}, }; +#define s_TestEntriesMode1 s_TestEntriesMode0 +#define s_TestEntriesMode2 s_TestEntriesMode0 + LPCSTR PatternFromFlags(DWORD flags) { static char s_buf[TYPE_FREESPACE + 1 + 1]; @@ -173,7 +157,10 @@ DoGetClipText(LPWSTR pszPath1, LPWSTR pszPath2) { pszPath1[0] = pszPath2[0] = 0; - if (!OpenClipboard(NULL) || !IsClipboardFormatAvailable(CF_UNICODETEXT)) + if (!IsClipboardFormatAvailable(CF_UNICODETEXT)) + return FALSE; + + if (!OpenClipboard(NULL)) return FALSE; WCHAR szText[MAX_PATH * 2]; @@ -201,7 +188,10 @@ DoTestEntry(const TEST_ENTRY *entry) (*entry->action)(); } - SHChangeNotify(entry->event, SHCNF_PATHW | SHCNF_FLUSH, entry->item1, entry->item2); + if (entry->event != DONT_SEND) + { + SHChangeNotify(entry->event, SHCNF_PATHW | SHCNF_FLUSH, entry->item1, entry->item2); + } DWORD flags = SendMessageW(s_hwnd, WM_GET_NOTIFY_FLAGS, 0, 0); LPCSTR pattern = PatternFromFlags(flags); @@ -223,30 +213,13 @@ DoTestEntry(const TEST_ENTRY *entry) } static BOOL -DoInit(HWND hwnd) +DoInit(void) { - WCHAR szTemp[MAX_PATH], szPath[MAX_PATH]; - - GetTempPathW(_countof(szTemp), szTemp); - GetLongPathNameW(szTemp, szPath, _countof(szPath)); + DoInitPaths(); - lstrcpyW(s_dir1, szPath); - PathAppendW(s_dir1, L"WatchDir1"); CreateDirectoryW(s_dir1, NULL); - lstrcpyW(s_dir2, s_dir1); - PathAppendW(s_dir2, L"Dir2"); - - lstrcpyW(s_dir3, s_dir1); - PathAppendW(s_dir3, L"Dir3"); - - lstrcpyW(s_file1, s_dir1); - PathAppendW(s_file1, L"File1.txt"); - - lstrcpyW(s_file2, s_dir1); - PathAppendW(s_file2, L"File2.txt"); - - return TRUE; + return PathIsDirectoryW(s_dir1); } static void @@ -261,44 +234,40 @@ DoEnd(HWND hwnd) SendMessageW(s_hwnd, WM_COMMAND, IDOK, 0); } -static BOOL CALLBACK -PropEnumProcEx(HWND hwnd, LPWSTR lpszString, HANDLE hData, ULONG_PTR dwData) +static BOOL +GetSubProgramPath(void) { - if (HIWORD(lpszString)) - trace("Prop: '%S' --> %p\n", lpszString, hData); - else - trace("Prop: '%u' --> %p\n", LOWORD(lpszString), hData); + GetModuleFileNameW(NULL, s_szSubProgram, _countof(s_szSubProgram)); + PathRemoveFileSpecW(s_szSubProgram); + PathAppendW(s_szSubProgram, L"shell-notify.exe"); + + if (!PathFileExistsW(s_szSubProgram)) + { + PathRemoveFileSpecW(s_szSubProgram); + PathAppendW(s_szSubProgram, L"testdata\\shell-notify.exe"); + + if (!PathFileExistsW(s_szSubProgram)) + { + return FALSE; + } + } + return TRUE; } static void -DoPropTest(HWND hwnd) -{ - EnumPropsExW(hwnd, PropEnumProcEx, 0); -} - -START_TEST(SHChangeNotify) +JustDoIt(INT nMode) { - WCHAR szPath[MAX_PATH]; - GetModuleFileNameW(NULL, szPath, _countof(szPath)); - PathRemoveFileSpecW(szPath); - PathAppendW(szPath, L"shell-notify.exe"); - - if (!PathFileExistsW(szPath)) + if (!DoInit()) { - trace("szPath: %S\n", szPath); - PathRemoveFileSpecW(szPath); - PathAppendW(szPath, L"testdata\\shell-notify.exe"); - - if (!PathFileExistsW(szPath)) - { - trace("szPath: %S\n", szPath); - skip("shell-notify.exe not found\n"); - return; - } + skip("Unable to initialize.\n"); + return; } - HINSTANCE hinst = ShellExecuteW(NULL, NULL, szPath, NULL, NULL, SW_SHOWNORMAL); + WCHAR szParams[8]; + wsprintfW(szParams, L"%u", nMode); + + HINSTANCE hinst = ShellExecuteW(NULL, NULL, s_szSubProgram, szParams, NULL, SW_SHOWNORMAL); if ((INT_PTR)hinst <= 32) { skip("Unable to run shell-notify.exe.\n"); @@ -320,18 +289,38 @@ START_TEST(SHChangeNotify) return; } - if (!DoInit(s_hwnd)) + switch (nMode) { - skip("Unable to initialize.\n"); - return; + case 0: + case 1: + case 2: + for (size_t i = 0; i < _countof(s_TestEntriesMode0); ++i) + { + DoTestEntry(&s_TestEntriesMode0[i]); + } + break; } - DoPropTest(s_hwnd); + DoEnd(s_hwnd); - for (size_t i = 0; i < _countof(s_TestEntries); ++i) + for (int i = 0; i < 15; ++i) + { + s_hwnd = FindWindowW(s_szName, s_szName); + if (!s_hwnd) + break; + + Sleep(50); + } +} + +START_TEST(SHChangeNotify) +{ + if (!GetSubProgramPath()) { - DoTestEntry(&s_TestEntries[i]); + skip("shell-notify.exe not found\n"); } - DoEnd(s_hwnd); + JustDoIt(0); + JustDoIt(1); + JustDoIt(2); } diff --git a/modules/rostests/apitests/shell32/SHChangeNotify.h b/modules/rostests/apitests/shell32/SHChangeNotify.h new file mode 100644 index 00000000000..7a5cbc4f988 --- /dev/null +++ b/modules/rostests/apitests/shell32/SHChangeNotify.h @@ -0,0 +1,47 @@ +#pragma once + +typedef enum TYPE +{ + TYPE_RENAMEITEM, + TYPE_CREATE, + TYPE_DELETE, + TYPE_MKDIR, + TYPE_RMDIR, + TYPE_UPDATEDIR, + TYPE_UPDATEITEM, + TYPE_RENAMEFOLDER, + TYPE_FREESPACE +} TYPE; + +#define WM_SHELL_NOTIFY (WM_USER + 100) +#define WM_GET_NOTIFY_FLAGS (WM_USER + 101) +#define WM_CLEAR_FLAGS (WM_USER + 102) +#define WM_SET_PATHS (WM_USER + 103) + +static WCHAR s_dir1[MAX_PATH]; // "%TEMP%\\WatchDir1" +static WCHAR s_dir2[MAX_PATH]; // "%TEMP%\\WatchDir1\\Dir2" +static WCHAR s_dir3[MAX_PATH]; // "%TEMP%\\WatchDir1\\Dir3" +static WCHAR s_file1[MAX_PATH]; // "%TEMP%\\WatchDir1\\File1.txt" +static WCHAR s_file2[MAX_PATH]; // "%TEMP%\\WatchDir1\\File2.txt" + +inline void DoInitPaths(void) +{ + WCHAR szTemp[MAX_PATH], szPath[MAX_PATH]; + GetTempPathW(_countof(szTemp), szTemp); + GetLongPathNameW(szTemp, szPath, _countof(szPath)); + + lstrcpyW(s_dir1, szPath); + PathAppendW(s_dir1, L"WatchDir1"); + + lstrcpyW(s_dir2, s_dir1); + PathAppendW(s_dir2, L"Dir2"); + + lstrcpyW(s_dir3, s_dir1); + PathAppendW(s_dir3, L"Dir3"); + + lstrcpyW(s_file1, s_dir1); + PathAppendW(s_file1, L"File1.txt"); + + lstrcpyW(s_file2, s_dir1); + PathAppendW(s_file2, L"File2.txt"); +} diff --git a/modules/rostests/apitests/shell32/shell-notify.cpp b/modules/rostests/apitests/shell32/shell-notify.cpp index bcf3770b3d2..8f7043b96a4 100644 --- a/modules/rostests/apitests/shell32/shell-notify.cpp +++ b/modules/rostests/apitests/shell32/shell-notify.cpp @@ -8,37 +8,15 @@ #include "shelltest.h" #include <shlwapi.h> #include <stdio.h> - -#define WM_SHELL_NOTIFY (WM_USER + 100) -#define WM_GET_NOTIFY_FLAGS (WM_USER + 101) -#define WM_CLEAR_FLAGS (WM_USER + 102) -#define WM_SET_PATHS (WM_USER + 103) +#include "SHChangeNotify.h" static HWND s_hwnd = NULL; static const WCHAR s_szName[] = L"SHChangeNotify testcase"; - -typedef enum TYPE -{ - TYPE_RENAMEITEM, - TYPE_CREATE, - TYPE_DELETE, - TYPE_MKDIR, - TYPE_RMDIR, - TYPE_UPDATEDIR, - TYPE_UPDATEITEM, - TYPE_RENAMEFOLDER, - TYPE_FREESPACE -} TYPE; +static INT s_nMode; static BYTE s_counters[TYPE_FREESPACE + 1]; static UINT s_uRegID = 0; -static WCHAR s_dir1[MAX_PATH]; // "%TEMP%\\WatchDir1" -static WCHAR s_dir2[MAX_PATH]; // "%TEMP%\\WatchDir1\\Dir2" -static WCHAR s_dir3[MAX_PATH]; // "%TEMP%\\WatchDir1\\Dir3" -static WCHAR s_file1[MAX_PATH]; // "%TEMP%\\WatchDir1\\File1.txt" -static WCHAR s_file2[MAX_PATH]; // "%TEMP%\\WatchDir1\\File2.txt" - static WCHAR s_path1[MAX_PATH], s_path2[MAX_PATH]; static LPITEMIDLIST s_pidl = NULL; @@ -49,32 +27,34 @@ OnCreate(HWND hwnd) { s_hwnd = hwnd; - WCHAR szTemp[MAX_PATH], szPath[MAX_PATH]; - - GetTempPathW(_countof(szTemp), szTemp); - GetLongPathNameW(szTemp, szPath, _countof(szPath)); + DoInitPaths(); - lstrcpyW(s_dir1, szPath); - PathAppendW(s_dir1, L"WatchDir1"); - - lstrcpyW(s_dir2, s_dir1); - PathAppendW(s_dir2, L"Dir2"); - - lstrcpyW(s_dir3, s_dir1); - PathAppendW(s_dir3, L"Dir3"); + s_pidl = ILCreateFromPathW(s_dir1); + s_entry.pidl = s_pidl; - lstrcpyW(s_file1, s_dir1); - PathAppendW(s_file1, L"File1.txt"); + INT nSources; + switch (s_nMode) + { + case 0: + s_entry.fRecursive = TRUE; + nSources = SHCNRF_ShellLevel; + break; - lstrcpyW(s_file2, s_dir1); - PathAppendW(s_file2, L"File2.txt"); + case 1: + s_entry.fRecursive = TRUE; + nSources = SHCNRF_ShellLevel | SHCNRF_InterruptLevel; + break; - s_pidl = ILCreateFromPathW(s_dir1); + case 2: + s_entry.fRecursive = FALSE; + nSources = SHCNRF_ShellLevel | SHCNRF_NewDelivery; + break; - s_entry.pidl = s_pidl; - s_entry.fRecursive = TRUE; + default: + return FALSE; + } LONG fEvents = SHCNE_ALLEVENTS; - s_uRegID = SHChangeNotifyRegister(hwnd, SHCNRF_ShellLevel, fEvents, WM_SHELL_NOTIFY, + s_uRegID = SHChangeNotifyRegister(hwnd, nSources, fEvents, WM_SHELL_NOTIFY, 1, &s_entry); return s_uRegID != 0; } @@ -279,6 +259,8 @@ wWinMain(HINSTANCE hInstance, LPWSTR lpCmdLine, INT nCmdShow) { + s_nMode = _wtoi(lpCmdLine); + WNDCLASSW wc; ZeroMemory(&wc, sizeof(wc)); wc.lpfnWndProc = WindowProc;

1 0

[reactos] 01/01: [SHELL32_APITEST] Disabled DragDrop test due to race condition To be enabled back when the bug is fixed CORE-17057
by Victor Perevertkin 18 May '20

18 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b105ceb56ee94e961958… commit 7b105ceb56ee94e961958693c813c09bf2f7ab69 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Mon May 18 20:50:07 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Mon May 18 20:50:07 2020 +0300 [SHELL32_APITEST] Disabled DragDrop test due to race condition To be enabled back when the bug is fixed CORE-17057 --- modules/rostests/apitests/shell32/testlist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/shell32/testlist.c b/modules/rostests/apitests/shell32/testlist.c index 5b6afe32963..ba56769a97a 100644 --- a/modules/rostests/apitests/shell32/testlist.c +++ b/modules/rostests/apitests/shell32/testlist.c @@ -38,7 +38,7 @@ const struct test winetest_testlist[] = { "CShellDesktop", func_CShellDesktop }, { "CShellLink", func_CShellLink }, { "CUserNotification", func_CUserNotification }, - { "DragDrop", func_DragDrop }, + // { "DragDrop", func_DragDrop }, disabled due to CORE-17057 { "ExtractIconEx", func_ExtractIconEx }, { "IShellFolderViewCB", func_IShellFolderViewCB }, { "menu", func_menu },

1 0

[reactos] 03/03: [CMD] Add a ExecuteCommandWithEcho() helper and use it in Batch() and as the implementation of RunInstance() FOR-loop helper.
by Hermès Bélusca-Maïto 18 May '20

18 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=240f6737e95eee6e80bfc… commit 240f6737e95eee6e80bfc5b3f4dbac7b4da3b679 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon May 18 02:03:15 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 18 02:21:57 2020 +0200 [CMD] Add a ExecuteCommandWithEcho() helper and use it in Batch() and as the implementation of RunInstance() FOR-loop helper. --- base/shell/cmd/batch.c | 13 ++----------- base/shell/cmd/cmd.c | 21 ++++++++++++++++++++- base/shell/cmd/cmd.h | 10 +++++++++- base/shell/cmd/for.c | 16 +++------------- 4 files changed, 34 insertions(+), 26 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 3c384e279af..8d6afb222e5 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -353,18 +353,9 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) continue; /* JPP 19980807 */ - /* Echo batch file line */ - if (bEcho && !bDisableBatchEcho && Cmd->Type != C_QUIET) - { - if (!bIgnoreEcho) - ConOutChar(_T('\n')); - PrintPrompt(); - EchoCommand(Cmd); - ConOutChar(_T('\n')); - } - + /* Echo the command and execute it */ bc->current = Cmd; - ret = ExecuteCommand(Cmd); + ret = ExecuteCommandWithEcho(Cmd); FreeCommand(Cmd); } diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index ed79b192339..bef99f272c4 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -769,7 +769,8 @@ failed: } INT -ExecuteCommand(PARSED_COMMAND *Cmd) +ExecuteCommand( + IN PARSED_COMMAND *Cmd) { PARSED_COMMAND *Sub; LPTSTR First, Rest; @@ -830,6 +831,24 @@ ExecuteCommand(PARSED_COMMAND *Cmd) return Ret; } +INT +ExecuteCommandWithEcho( + IN PARSED_COMMAND *Cmd) +{ + /* Echo the reconstructed command line */ + if (bEcho && !bDisableBatchEcho && Cmd->Type != C_QUIET) + { + if (!bIgnoreEcho) + ConOutChar(_T('\n')); + PrintPrompt(); + EchoCommand(Cmd); + ConOutChar(_T('\n')); + } + + /* Run the command */ + return ExecuteCommand(Cmd); +} + LPTSTR GetEnvVar(LPCTSTR varName) { diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 20f946463ca..875ce5ec113 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -80,7 +80,15 @@ INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, UINT len, BOOL bPutSeparator HANDLE RunFile(DWORD, LPTSTR, LPTSTR, LPTSTR, INT); INT ParseCommandLine(LPTSTR); struct _PARSED_COMMAND; -INT ExecuteCommand(struct _PARSED_COMMAND *Cmd); + +INT +ExecuteCommand( + IN struct _PARSED_COMMAND *Cmd); + +INT +ExecuteCommandWithEcho( + IN struct _PARSED_COMMAND *Cmd); + LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); diff --git a/base/shell/cmd/for.c b/base/shell/cmd/for.c index b8628145d47..0bfedb967bf 100644 --- a/base/shell/cmd/for.c +++ b/base/shell/cmd/for.c @@ -69,19 +69,9 @@ static BOOL GetNextElement(TCHAR **pStart, TCHAR **pEnd) } /* Execute a single instance of a FOR command */ -static INT RunInstance(PARSED_COMMAND *Cmd) -{ - if (bEcho && !bDisableBatchEcho && Cmd->Subcommands->Type != C_QUIET) - { - if (!bIgnoreEcho) - ConOutChar(_T('\n')); - PrintPrompt(); - EchoCommand(Cmd->Subcommands); - ConOutChar(_T('\n')); - } - /* Just run the command (variable expansion is done in DoDelayedExpansion) */ - return ExecuteCommand(Cmd->Subcommands); -} +/* Just run the command (variable expansion is done in DoDelayedExpansion) */ +#define RunInstance(Cmd) \ + ExecuteCommandWithEcho((Cmd)->Subcommands) /* Check if this FOR should be terminated early */ static BOOL Exiting(PARSED_COMMAND *Cmd)

1 0

[reactos] 02/03: [CMD] Fix the stop-batch prompt appearance: do not display it more than once in a row.
by Hermès Bélusca-Maïto 18 May '20

18 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ce543fbb72f2c4d9c4da4… commit ce543fbb72f2c4d9c4da4fe71c4cf0cf9c7882dd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 17 20:13:32 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 18 02:21:57 2020 +0200 [CMD] Fix the stop-batch prompt appearance: do not display it more than once in a row. --- base/shell/cmd/misc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/base/shell/cmd/misc.c b/base/shell/cmd/misc.c index bcefe215002..8d5239949b6 100644 --- a/base/shell/cmd/misc.c +++ b/base/shell/cmd/misc.c @@ -151,10 +151,9 @@ BOOL CheckCtrlBreak(INT mode) LoadString(CMD_ModuleHandle, STRING_COPY_OPTION, options, ARRAYSIZE(options)); - /* we need to be sure the string arrives on the screen! */ + ConOutResPuts(STRING_CANCEL_BATCH_FILE); do { - ConOutResPuts(STRING_CANCEL_BATCH_FILE); c = _totupper(cgetchar()); } while (!(_tcschr(options, c) || c == _T('\3')) || !c);

1 0

[reactos] 01/03: [CMD] Fix the ErrorMessage() function.
by Hermès Bélusca-Maïto 18 May '20

18 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0ced4ffdffa83cd4aa1c… commit d0ced4ffdffa83cd4aa1cf7694912a9a5c2c8793 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 17 20:08:41 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon May 18 02:21:56 2020 +0200 [CMD] Fix the ErrorMessage() function. Specify its szFormat parameter optional, and correctly initialize the szMessage buffer. --- base/shell/cmd/cmd.h | 6 +++++- base/shell/cmd/del.c | 2 +- base/shell/cmd/error.c | 16 ++++++++++------ base/shell/cmd/vol.c | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 48f6df0b5b2..20f946463ca 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -165,7 +165,11 @@ INT CommandEchoerr (LPTSTR); INT CommandEchoserr (LPTSTR); /* Prototypes for ERROR.C */ -VOID ErrorMessage (DWORD, LPTSTR, ...); +VOID +ErrorMessage( + IN DWORD dwErrorCode, + IN LPTSTR szFormat OPTIONAL, + ...); VOID error_no_pipe (VOID); VOID error_bad_command (LPTSTR); diff --git a/base/shell/cmd/del.c b/base/shell/cmd/del.c index 7f2d2a63db6..8e5cfbdccb8 100644 --- a/base/shell/cmd/del.c +++ b/base/shell/cmd/del.c @@ -263,7 +263,7 @@ DeleteFiles(LPTSTR FileName, DWORD* dwFlags, DWORD dwAttrFlags) } else { - ErrorMessage (GetLastError(), _T("")); + ErrorMessage (GetLastError(), NULL); // FindClose(hFile); // return -1; } diff --git a/base/shell/cmd/error.c b/base/shell/cmd/error.c index 92f08a0d996..c0f61fd00a7 100644 --- a/base/shell/cmd/error.c +++ b/base/shell/cmd/error.c @@ -22,19 +22,23 @@ #include "precomp.h" - -VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...) +VOID +ErrorMessage( + IN DWORD dwErrorCode, + IN LPTSTR szFormat OPTIONAL, + ...) { - TCHAR szMsg[RC_STRING_MAX_SIZE]; - TCHAR szMessage[1024]; - LPTSTR szError; va_list arg_ptr; + LPTSTR szError; + TCHAR szMsg[RC_STRING_MAX_SIZE]; + TCHAR szMessage[1024]; if (dwErrorCode == ERROR_SUCCESS) return; nErrorLevel = 1; + *szMessage = 0; if (szFormat) { va_start(arg_ptr, szFormat); @@ -48,7 +52,7 @@ VOID ErrorMessage (DWORD dwErrorCode, LPTSTR szFormat, ...) { ConErrPrintf(_T("%s %s\n"), szError, szMessage); if (szError) - LocalFree (szError); + LocalFree(szError); return; } diff --git a/base/shell/cmd/vol.c b/base/shell/cmd/vol.c index eed27c9dd57..cdd529e6376 100644 --- a/base/shell/cmd/vol.c +++ b/base/shell/cmd/vol.c @@ -41,7 +41,7 @@ PrintVolumeHeader (LPTSTR pszRootPath) NULL, 0)) { - ErrorMessage(GetLastError (), _T("")); + ErrorMessage(GetLastError (), NULL); return 1; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs