Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SYSSETUP] Tweak resources CORE-18870
by Joachim Henze 10 Mar '23

10 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=784946db8c743bf5c66b1… commit 784946db8c743bf5c66b14223d3b756df457874e Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Mar 10 21:36:17 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Mar 10 21:36:46 2023 +0100 [SYSSETUP] Tweak resources CORE-18870 de-DE: Harmonize the length of IDC_COMPUTERNAME with IDC_ADMINPASSWORD1 and IDC_ADMINPASSWORD2 which looks better and is already done like that in en-US. de-DE: Also harmonize some 2nd stage captions. Some were named "Setup" and some were named "Installation". I harmonized to "Setup" everywhere as that is what is also used in 1st stage, is shorter and no german person will have any issue understanding that. It is also more likely to be kept in sync in the future if new dlgs would be added, as it is the same word as used in en-US. de-DE: Align the IDC_PROJECTS with the GPL button (which is slightly more wide in de-DE). All languages: Use same width for IDC_PRODUCT_OPTIONS as for IDC_PRODUCT_DESCRIPTION. --- dll/win32/syssetup/lang/bg-BG.rc | 2 +- dll/win32/syssetup/lang/cs-CZ.rc | 2 +- dll/win32/syssetup/lang/da-DK.rc | 2 +- dll/win32/syssetup/lang/de-DE.rc | 23 +++++++++++------------ dll/win32/syssetup/lang/el-GR.rc | 2 +- dll/win32/syssetup/lang/en-GB.rc | 2 +- dll/win32/syssetup/lang/en-US.rc | 2 +- dll/win32/syssetup/lang/es-ES.rc | 2 +- dll/win32/syssetup/lang/et-EE.rc | 2 +- dll/win32/syssetup/lang/eu-ES.rc | 2 +- dll/win32/syssetup/lang/fi-FI.rc | 2 +- dll/win32/syssetup/lang/fr-FR.rc | 2 +- dll/win32/syssetup/lang/he-IL.rc | 2 +- dll/win32/syssetup/lang/hi-IN.rc | 2 +- dll/win32/syssetup/lang/hr-HR.rc | 2 +- dll/win32/syssetup/lang/hu-HU.rc | 2 +- dll/win32/syssetup/lang/id-ID.rc | 2 +- dll/win32/syssetup/lang/it-IT.rc | 2 +- dll/win32/syssetup/lang/ja-JP.rc | 2 +- dll/win32/syssetup/lang/lt-LT.rc | 2 +- dll/win32/syssetup/lang/nl-NL.rc | 2 +- dll/win32/syssetup/lang/no-NO.rc | 2 +- dll/win32/syssetup/lang/pl-PL.rc | 2 +- dll/win32/syssetup/lang/pt-BR.rc | 2 +- dll/win32/syssetup/lang/pt-PT.rc | 2 +- dll/win32/syssetup/lang/ro-RO.rc | 2 +- dll/win32/syssetup/lang/ru-RU.rc | 2 +- dll/win32/syssetup/lang/sk-SK.rc | 2 +- dll/win32/syssetup/lang/sq-AL.rc | 2 +- dll/win32/syssetup/lang/sv-SE.rc | 2 +- dll/win32/syssetup/lang/th-TH.rc | 2 +- dll/win32/syssetup/lang/tr-TR.rc | 2 +- dll/win32/syssetup/lang/uk-UA.rc | 2 +- dll/win32/syssetup/lang/zh-CN.rc | 2 +- dll/win32/syssetup/lang/zh-HK.rc | 2 +- dll/win32/syssetup/lang/zh-TW.rc | 2 +- 36 files changed, 46 insertions(+), 47 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index b9e86724c35..216d3fb38b5 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 0fce822af5f..d41f7a3c3b3 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index 0c76f80322f..9bf69780f95 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 7f3b551e04e..dd9ef728895 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -2,7 +2,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Willkommen beim ReactOS Installationsassistenten.", IDC_WELCOMETITLE, 115, 9, 189, 31 @@ -12,11 +12,11 @@ END IDD_ACKPAGE DIALOGEX 0, 0, 317, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Die Entwicklung von ReactOS wurde teilweise durch folgende Open-Source-Projekte ermöglicht:", IDC_STATIC, 15, 7, 286, 19 - LISTBOX IDC_PROJECTS, 15, 30, 286, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL + LISTBOX IDC_PROJECTS, 15, 30, 291, 75, LBS_NOSEL | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL LTEXT "ReactOS ist unter der GNU General Public License (GPL) veröffentlicht. Wenn Sie ReactOS oder Teile davon weiterverwenden wollen, müssen Sie die Bestimmungen der GPL anerkennen.", IDC_STATIC, 15, 110, 227, 24 PUSHBUTTON "GPL &ansehen...", IDC_VIEWGPL, 251, 110, 55, 19 LTEXT "Klicken Sie auf Weiter, um mit der Einrichtung fortzufahren.", IDC_STATIC, 15, 136, 195, 17 @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Bitte wählen Sie eines der folgenden Produkte:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Produktauswahl:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Produktinformation", IDC_STATIC, 5, 50, 305, 85 LTEXT "Beschreibung:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL @@ -38,7 +38,7 @@ END IDD_OWNERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 @@ -51,13 +51,13 @@ END IDD_COMPUTERPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON1, IDC_STATIC, 21, 7, 20, 20 LTEXT "Bitte geben Sie einen Computernamen maximal 15 Zeichen ein. Wenn Sie im Netzwerk sind, muss dieser Name einmalig sein.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computername:", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + EDITTEXT IDC_COMPUTERNAME, 132, 35, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE ICON IDI_ICON5, IDC_STATIC, 21, 57, 20, 20 LTEXT "Das Installationsprogramm wird ein Administratorkonto erstellen. Benutzen Sie es, wenn Sie vollen Zugriff auf Ihren Computer benötigen.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Geben Sie ein Passwort für das Administratorkonto mit max. 127 Zeichen ein.", IDC_STATIC, 54, 87, 250, 8 @@ -69,7 +69,7 @@ END IDD_LOCALEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON4, IDC_STATIC, 21, 7, 20, 20 @@ -86,7 +86,7 @@ END IDD_DATETIMEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON3, IDC_STATIC, 21, 10, 20, 20 @@ -108,14 +108,13 @@ END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS-Installation" +CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Registrieren der Komponenten", IDC_TASKTEXT1, 65, 27, 232, 8 LTEXT "Installieren der Elemente des Startmenüs", IDC_TASKTEXT2, 65, 39, 232, 8 LTEXT "Speichern der Einstellungen", IDC_TASKTEXT3, 65, 51, 232, 8 LTEXT "Löschen der temporären Dateien", IDC_TASKTEXT4, 65, 63, 232, 8 - LTEXT "", IDC_ITEM, 21, 85, 275, 8 CONTROL "", IDC_PROCESSPROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 21, 97, 275, 11 END @@ -191,7 +190,7 @@ END STRINGTABLE BEGIN - IDS_REACTOS_SETUP "ReactOS-Installation" + IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unbekannter Fehler" IDS_LOADLIBRARY_FAILED "LoadLibrary fehlgeschlagen: " IDS_GETPROCADDR_FAILED "GetProcAddr fehlgeschlagen: " diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index 758afb2ebc2..6c7414eef7c 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/en-GB.rc b/dll/win32/syssetup/lang/en-GB.rc index cac3c294b4f..2db95470d24 100644 --- a/dll/win32/syssetup/lang/en-GB.rc +++ b/dll/win32/syssetup/lang/en-GB.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index c4606839be8..469674558c0 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 32433d97d4c..7d2032e6372 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Por favor, escriba una opción de producto:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Información de producto", IDC_STATIC, 5, 50, 305, 85 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 diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 3b1379caf99..a197c6263bb 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/eu-ES.rc b/dll/win32/syssetup/lang/eu-ES.rc index ba1465f6079..f3dc7b259f0 100644 --- a/dll/win32/syssetup/lang/eu-ES.rc +++ b/dll/win32/syssetup/lang/eu-ES.rc @@ -37,7 +37,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Mesedez, idatzi produktuaren aukera bat:", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Produktuen aukerak:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Produktuaren informazioa", IDC_STATIC, 5, 50, 305, 85 LTEXT "Deskribapena:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 277d6c66f9f..6d7cc24251f 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 45bf7b2e2ed..b88606343f1 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Veuillez choisir une option produit :", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Options produit :", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informations produit", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description :", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 88b9575c2e6..72de93e5b18 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index 6d98ffe752b..3ae65fa361a 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -37,7 +37,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/hr-HR.rc b/dll/win32/syssetup/lang/hr-HR.rc index 644efe3987c..4579c40a465 100644 --- a/dll/win32/syssetup/lang/hr-HR.rc +++ b/dll/win32/syssetup/lang/hr-HR.rc @@ -37,7 +37,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Molimo odaberite opciju proizvoda:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Opcija &proizvoda:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informacije o proizvodu", IDC_STATIC, 5, 50, 305, 85 LTEXT "Opis:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index 2392d9ac043..871fa65bc4a 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Kérjük válasszon egy kiadást:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Kiadási információk", IDC_STATIC, 5, 50, 305, 85 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 diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index 34186a8adf0..5fe2428acf5 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Silahkan pilih opsi produk:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informasi Produk", IDC_STATIC, 5, 50, 305, 85 LTEXT "Deskripsi:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index d3c16f093e4..2b1e3759634 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 671bd6319f4..282136f2d04 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "製品オプションをお選び下さい:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "製品情報", IDC_STATIC, 5, 50, 305, 85 LTEXT "説明:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index a5152697c96..4c9de69b0d2 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index dc68051a598..6ee368434bc 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 402c97e2717..88320f8bfd2 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index e96f716272b..b702155f2f9 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Wybierz opcję produktu:", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Opcje produktu:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informacje o produkcie", IDC_STATIC, 5, 50, 305, 85 LTEXT "Opis:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 8cd91638d45..01fc23f3b01 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index ff839c6a443..c10b791c079 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -30,7 +30,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Por favor escolha uma opção de produto:", IDC_STATIC, 35, 7, 230, 12 LTEXT "&Opções de produto:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informação de produto", IDC_STATIC, 5, 50, 305, 85 LTEXT "Descrição:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index 7d2c6859715..91a43e9b08b 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Alegeți o opțiune de produs:", IDC_STATIC, 35, 7, 230, 12 LTEXT "Opțiuni de p&rodus:", IDC_STATIC, 5, 32, 85, 10 - COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Informații despre produs", IDC_STATIC, 5, 50, 305, 85 LTEXT "Descriere:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index ca4035e6a20..03e07368777 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Пожалуйста, укажите тип продкута:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Информация о продукте", IDC_STATIC, 5, 50, 305, 85 LTEXT "Описание:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index 11670124b2c..285e5d35cf1 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -37,7 +37,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 7d339527e0f..43087340c53 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index ca4f4eb697f..964086a63a0 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 33ae67d0d12..82d4c7ba4b4 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index d4217ee58a4..a504f2cce5a 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Lütfen bir ürün seçeneği seçiniz:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Ürün Bilgisi", IDC_STATIC, 5, 50, 305, 85 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 diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index c3e57b46e63..41dac4e1872 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "Будь ласка, виберіть тип продукту:", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "Інформація про продукт", IDC_STATIC, 5, 50, 305, 85 LTEXT "Опис:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 30f1ae8ca0b..c2ab72e03ba 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "请选择您要安装的软件版本：", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "版本信息", IDC_STATIC, 5, 50, 305, 85 LTEXT "描述：", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/zh-HK.rc b/dll/win32/syssetup/lang/zh-HK.rc index 4cad49a51a0..c4619d2673e 100644 --- a/dll/win32/syssetup/lang/zh-HK.rc +++ b/dll/win32/syssetup/lang/zh-HK.rc @@ -38,7 +38,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "請選擇您要安裝的版本：", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "版本資訊", IDC_STATIC, 5, 50, 305, 85 LTEXT "説明：", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 112373ab73a..c0c6672d528 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -39,7 +39,7 @@ BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 LTEXT "請選擇您要安裝的版本︰", IDC_STATIC, 35, 7, 230, 12 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 + COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 205, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP GROUPBOX "版本資訊", IDC_STATIC, 5, 50, 305, 85 LTEXT "說明︰", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL

1 0

[reactos] 01/01: [NTOS:KDBG] Split KdbInitialize into KdbSymInit and KDBG initialization proper.
by Hermès Bélusca-Maïto 10 Mar '23

10 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dfb6996b4542fa88595e4… commit dfb6996b4542fa88595e4bdbfdb0e2e06a2dc360 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Mar 10 18:12:32 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 10 20:56:21 2023 +0100 [NTOS:KDBG] Split KdbInitialize into KdbSymInit and KDBG initialization proper. - KdbSymInit() in kdb_symbols.c only initializes symbols implementation support. - The rest of KdbInitialize gets moved into kdb_cli.c and initializes the KDBG debugger itself. - Move KdbDebugPrint to kdb_cli.c as well. --- ntoskrnl/include/internal/kd.h | 6 +---- ntoskrnl/kd/kdio.c | 18 --------------- ntoskrnl/kdbg/kdb.h | 13 +++++++++-- ntoskrnl/kdbg/kdb_cli.c | 47 ++++++++++++++++++++++++++++++++++++++ ntoskrnl/kdbg/kdb_symbols.c | 52 +++++++++++++++++------------------------- 5 files changed, 80 insertions(+), 56 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index ef014a2c6a5..75ffd8be63f 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -78,11 +78,7 @@ KdpDebugLogInit( _In_ ULONG BootPhase); #ifdef KDBG -VOID -NTAPI -KdpKdbgInit( - _In_ struct _KD_DISPATCH_TABLE *DispatchTable, - _In_ ULONG BootPhase); +#define KdpKdbgInit KdbInitialize #endif diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 742121e08fb..9c8a486fad8 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -577,24 +577,6 @@ KdpScreenInit( } } -#ifdef KDBG -/* KDBG FUNCTIONS ************************************************************/ - -/* NOTE: This may be moved completely into kdb_symbols.c */ -VOID NTAPI -KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase); - -VOID -NTAPI -KdpKdbgInit( - _In_ PKD_DISPATCH_TABLE DispatchTable, - _In_ ULONG BootPhase) -{ - /* Forward the call */ - KdbInitialize(DispatchTable, BootPhase); -} -#endif - /* GENERAL FUNCTIONS *********************************************************/ diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 8d1e9af2a47..11bc4cb452f 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -82,6 +82,12 @@ KdbpStackSwitchAndCall( extern PCHAR KdbInitFileBuffer; +VOID +NTAPI +KdbInitialize( + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase); + BOOLEAN NTAPI KdbRegisterCliCallback( @@ -158,14 +164,17 @@ KdbpSymFindModule( BOOLEAN KdbSymPrintAddress( IN PVOID Address, - IN PCONTEXT Context -); + IN PCONTEXT Context); VOID KdbSymProcessSymbols( _Inout_ PLDR_DATA_TABLE_ENTRY LdrEntry, _In_ BOOLEAN Load); +VOID +KdbSymInit( + _In_ ULONG BootPhase); + /* from kdb.c */ extern PEPROCESS KdbCurrentProcess; diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 114f4116838..c12f19554ef 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3880,3 +3880,50 @@ KdbpCliInit(VOID) ExFreePool(FileBuffer); } + + +static VOID +NTAPI +KdbDebugPrint( + PCH Message, + ULONG Length) +{ + /* Nothing here */ +} + +/** + * @brief Initializes the KDBG debugger. + * + * @param[in] DispatchTable + * Pointer to the KD dispatch table. + * + * @param[in] BootPhase + * Phase of initialization. + * + * @return None. + * @note Also known as "KdpKdbgInit". + **/ +VOID +NTAPI +KdbInitialize( + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) +{ + if (BootPhase == 0) + { + /* Write out the functions that we support for now */ + DispatchTable->KdpInitRoutine = KdbInitialize; + DispatchTable->KdpPrintRoutine = KdbDebugPrint; + + /* Register as a Provider */ + InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); + } + + if (BootPhase <= 1) + { + /* Initialize symbols support */ + KdbSymInit(BootPhase); + } +} + +/* EOF */ diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 06325b65fb6..46294733d89 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -330,31 +330,19 @@ KdbSymProcessSymbols( KeSetEvent(&SymbolsToLoadEvent, IO_NO_INCREMENT, FALSE); } -VOID -NTAPI -KdbDebugPrint( - PCH Message, - ULONG Length) -{ - /* Nothing here */ -} - -/*! \brief Initializes the KDB symbols implementation. +/** + * @brief Initializes the KDB symbols implementation. * - * \param DispatchTable Pointer to the KD dispatch table - * \param BootPhase Phase of initialization - */ + * @param[in] BootPhase + * Phase of initialization. + * + * @return None. + **/ VOID -NTAPI -KdbInitialize( - _In_ PKD_DISPATCH_TABLE DispatchTable, +KdbSymInit( _In_ ULONG BootPhase) { - PCHAR p1, p2; - SHORT Found = FALSE; - CHAR YesNo; - DPRINT("KdbSymInit() BootPhase=%d\n", BootPhase); LoadSymbols = FALSE; @@ -367,19 +355,16 @@ KdbInitialize( if (BootPhase == 0) { - /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdbInitialize; - DispatchTable->KdpPrintRoutine = KdbDebugPrint; - - /* Register as a Provider */ - InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); + PCHAR p1, p2; + SHORT Found = FALSE; + CHAR YesNo; /* Perform actual initialization of symbol module */ //NtoskrnlModuleObject->PatchInformation = NULL; //LdrHalModuleObject->PatchInformation = NULL; /* Check the command line for /LOADSYMBOLS, /NOLOADSYMBOLS, - * /LOADSYMBOLS={YES|NO}, /NOLOADSYMBOLS={YES|NO} */ + * /LOADSYMBOLS={YES|NO}, /NOLOADSYMBOLS={YES|NO} */ ASSERT(KeLoaderBlock); p1 = KeLoaderBlock->LoadOptions; while ('\0' != *p1 && NULL != (p2 = strchr(p1, '/'))) @@ -425,13 +410,18 @@ KdbInitialize( HANDLE Thread; NTSTATUS Status; KIRQL OldIrql; + PLIST_ENTRY ListEntry; /* Launch our worker thread */ InitializeListHead(&SymbolsToLoad); KeInitializeSpinLock(&SymbolsToLoadLock); KeInitializeEvent(&SymbolsToLoadEvent, SynchronizationEvent, FALSE); - Status = PsCreateSystemThread(&Thread, THREAD_ALL_ACCESS, NULL, NULL, NULL, LoadSymbolsRoutine, NULL); + Status = PsCreateSystemThread(&Thread, + THREAD_ALL_ACCESS, + NULL, NULL, NULL, + LoadSymbolsRoutine, + NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed starting symbols loader thread: 0x%08x\n", Status); @@ -443,12 +433,12 @@ KdbInitialize( KeAcquireSpinLock(&PsLoadedModuleSpinLock, &OldIrql); - PLIST_ENTRY ListEntry = PsLoadedModuleList.Flink; - while (ListEntry != &PsLoadedModuleList) + for (ListEntry = PsLoadedModuleList.Flink; + ListEntry != &PsLoadedModuleList; + ListEntry = ListEntry->Flink) { PLDR_DATA_TABLE_ENTRY LdrEntry = CONTAINING_RECORD(ListEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); KdbSymProcessSymbols(LdrEntry, TRUE); - ListEntry = ListEntry->Flink; } KeReleaseSpinLock(&PsLoadedModuleSpinLock, OldIrql);

1 0

[reactos] 01/01: [DXDIAG] Fix text truncation on button for french fr-FR.rc CORE-18853
by Joachim Henze 10 Mar '23

10 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=793e9f20ef84873705a78… commit 793e9f20ef84873705a782165e5c446b133e19e7 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Mar 10 18:03:02 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Mar 10 18:03:02 2023 +0100 [DXDIAG] Fix text truncation on button for french fr-FR.rc CORE-18853 By shortening the text to what MS Windows uses there. See the 2k3sp2 pic in the ticket. --- base/applications/dxdiag/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/dxdiag/lang/fr-FR.rc b/base/applications/dxdiag/lang/fr-FR.rc index c3e48b23fe9..9cecdaf4a59 100644 --- a/base/applications/dxdiag/lang/fr-FR.rc +++ b/base/applications/dxdiag/lang/fr-FR.rc @@ -185,7 +185,7 @@ BEGIN LTEXT "Vous ne trouvez pas les informations que vous cherchez ? Voici ce que vous pouvez faire :", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "Informations système", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "Affiche des informations système complémentaires", IDC_STATIC, 90, 23, 300, 10 - PUSHBUTTON "Remplacer la freq. de rafraichissement", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED + PUSHBUTTON "Remplacer...", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED LTEXT "Remplacer la freq. de rafraichissement pour DirectDraw", IDC_STATIC, 90, 43, 300, 10 END

1 0

[reactos] 01/01: [MSPAINT] Fix use of uninitialized variable on startup (#5140)
by Katayama Hirofumi MZ 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02c647802f609a3f4cb9a… commit 02c647802f609a3f4cb9a18a623ea0b35eae1c0a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 10 07:31:31 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 10 07:31:31 2023 +0900 [MSPAINT] Fix use of uninitialized variable on startup (#5140) There was an exception in starting up of mspaint of Visual Studio 2019 build. CORE-18594, CORE-18867 --- base/applications/mspaint/winproc.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 640e596215b..779db8ff51d 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -72,17 +72,18 @@ void CMainWindow::alignChildrenToMainWindow() h = clientRect.bottom - 3; } - RECT statusBarRect0; - int statusBarBorders[3]; - if (::IsWindow(hStatusBar)) + INT statusBarHeight = 0; + if (::IsWindowVisible(hStatusBar)) { - ::SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0); - ::SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders); + RECT Rect; + INT borders[3]; + ::SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&Rect); + ::SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&borders); + statusBarHeight = Rect.bottom - Rect.top + borders[1]; } - int statusBarHeight = statusBarRect0.bottom - statusBarRect0.top + statusBarBorders[1]; if (scrollboxWindow.IsWindow()) - scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE); + scrollboxWindow.MoveWindow(x, y, w, h - statusBarHeight, TRUE); if (paletteWindow.IsWindow()) paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); }

1 0

[reactos] 01/01: [DXDIAG] Fix text truncation german de-DE.rc CORE-18853 (#5137)
by Joachim Henze 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=29d0deef1384e7050098e… commit 29d0deef1384e7050098ee2f04900009550ec5d0 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Thu Mar 9 23:27:49 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 9 23:27:49 2023 +0100 [DXDIAG] Fix text truncation german de-DE.rc CORE-18853 (#5137) --- base/applications/dxdiag/lang/de-DE.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/dxdiag/lang/de-DE.rc b/base/applications/dxdiag/lang/de-DE.rc index c2f084a9674..e5b46e54aad 100644 --- a/base/applications/dxdiag/lang/de-DE.rc +++ b/base/applications/dxdiag/lang/de-DE.rc @@ -182,7 +182,7 @@ IDD_HELP_DIALOG DIALOGEX 0, 0, 462, 220 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Informationen, die Sie suchen immer noch nicht gefunden? Hier sind einige zusätzliche Dinge, die Sie tun können:", IDC_STATIC, 5, 0, 300, 10 + LTEXT "Information noch nicht gefunden? Hier sind einige zusätzliche Dinge, die Sie tun können:", IDC_STATIC, 5, 0, 300, 10 PUSHBUTTON "Systeminformationen...", IDC_BUTTON_SYSINFO, 5, 20, 80, 14, WS_DISABLED LTEXT "Zeigt zusätzliche Systeminformationen an", IDC_STATIC, 90, 23, 300, 10 PUSHBUTTON "Außer Kraft setzen...", IDC_BUTTON_DDRAW_REFRESH, 5, 40, 80, 14, WS_DISABLED

1 0

[reactos] 01/01: [NOTEPAD] Use Globals.hMainWnd in ShowLastError (#5132)
by Katayama Hirofumi MZ 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87e905ecd8d529c5e17ee… commit 87e905ecd8d529c5e17ee3053c77f19edc84aa22 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Mar 10 07:25:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 10 07:25:06 2023 +0900 [NOTEPAD] Use Globals.hMainWnd in ShowLastError (#5132) Improving UI/UX by making Globals.hMainWnd the owner of the message box. CORE-18837 --- base/applications/notepad/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 345f76a9fbd..e31d8d6f038 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -75,7 +75,7 @@ VOID ShowLastError(VOID) 0, NULL); - MessageBox(NULL, lpMsgBuf, szTitle, MB_OK | MB_ICONERROR); + MessageBox(Globals.hMainWnd, lpMsgBuf, szTitle, MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } }

1 0

[reactos] 01/01: [NTOS:KD] KdpDebugLogInit: Fix ZwCreateFile flags for appending to debug logging file.
by Hermès Bélusca-Maïto 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a49732e5b650bef2c0512… commit a49732e5b650bef2c051260e78228e0eefa62b67 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 9 20:42:11 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 9 18:59:16 2023 +0100 [NTOS:KD] KdpDebugLogInit: Fix ZwCreateFile flags for appending to debug logging file. However, ReactOS currently doesn't handle FILE_APPEND_DATA correctly, so temporarily add a hack for fixing its support. CORE-18789 --- ntoskrnl/kd/kdio.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index c186e60752d..742121e08fb 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -272,8 +272,9 @@ KdpDebugLogInit( NULL, FILE_ATTRIBUTE_NORMAL, FILE_SHARE_READ, - FILE_SUPERSEDE, - FILE_WRITE_THROUGH | FILE_SYNCHRONOUS_IO_NONALERT, + FILE_OPEN_IF, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT | + FILE_SEQUENTIAL_ONLY | FILE_WRITE_THROUGH, NULL, 0); @@ -285,6 +286,39 @@ KdpDebugLogInit( return; } + /** HACK for FILE_APPEND_DATA ** + ** Remove once CORE-18789 is fixed. ** + ** Enforce to go to the end of file **/ + { + FILE_STANDARD_INFORMATION FileInfo; + FILE_POSITION_INFORMATION FilePosInfo; + + Status = ZwQueryInformationFile(KdpLogFileHandle, + &Iosb, + &FileInfo, + sizeof(FileInfo), + FileStandardInformation); + DPRINT("Status: 0x%08lx - EOF offset: %I64d\n", + Status, FileInfo.EndOfFile.QuadPart); + + Status = ZwQueryInformationFile(KdpLogFileHandle, + &Iosb, + &FilePosInfo, + sizeof(FilePosInfo), + FilePositionInformation); + DPRINT("Status: 0x%08lx - Position: %I64d\n", + Status, FilePosInfo.CurrentByteOffset.QuadPart); + + FilePosInfo.CurrentByteOffset.QuadPart = FileInfo.EndOfFile.QuadPart; + Status = ZwSetInformationFile(KdpLogFileHandle, + &Iosb, + &FilePosInfo, + sizeof(FilePosInfo), + FilePositionInformation); + DPRINT("ZwSetInformationFile(FilePositionInfo) returned: 0x%08lx\n", Status); + } + /** END OF HACK **/ + KeInitializeEvent(&KdpLoggerThreadEvent, SynchronizationEvent, TRUE); /* Create the logger thread */

1 0

[reactos] 01/01: [NTOS:KD] Add some annotations.
by Hermès Bélusca-Maïto 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8b09eddc4a6c4a51f722… commit a8b09eddc4a6c4a51f72222faa259d0862197008 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 9 12:31:03 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 9 18:32:36 2023 +0100 [NTOS:KD] Add some annotations. --- ntoskrnl/include/internal/kd.h | 26 +++++++++++--------------- ntoskrnl/kd/kdio.c | 19 +++++++++++-------- ntoskrnl/kd/kdmain.c | 7 ++++--- ntoskrnl/kdbg/kdb_symbols.c | 4 ++-- sdk/include/reactos/kddll.h | 4 ++-- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 87f0854693d..ef014a2c6a5 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -40,10 +40,9 @@ typedef enum _KD_CONTINUE_TYPE typedef VOID -(NTAPI*PKDP_INIT_ROUTINE)( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); +(NTAPI *PKDP_INIT_ROUTINE)( + _In_ struct _KD_DISPATCH_TABLE *DispatchTable, + _In_ ULONG BootPhase); typedef VOID @@ -63,30 +62,27 @@ KdpScreenRelease(VOID); VOID NTAPI KdpScreenInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); + _In_ struct _KD_DISPATCH_TABLE *DispatchTable, + _In_ ULONG BootPhase); VOID NTAPI KdpSerialInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); + _In_ struct _KD_DISPATCH_TABLE *DispatchTable, + _In_ ULONG BootPhase); VOID NTAPI KdpDebugLogInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase -); + _In_ struct _KD_DISPATCH_TABLE *DispatchTable, + _In_ ULONG BootPhase); #ifdef KDBG VOID NTAPI KdpKdbgInit( - struct _KD_DISPATCH_TABLE *DispatchTable, - ULONG BootPhase); + _In_ struct _KD_DISPATCH_TABLE *DispatchTable, + _In_ ULONG BootPhase); #endif diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 5f2c7f966c7..c186e60752d 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -212,8 +212,9 @@ KdpPrintToLogFile(PCHAR String, VOID NTAPI -KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) +KdpDebugLogInit( + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) { NTSTATUS Status; UNICODE_STRING FileName; @@ -340,8 +341,9 @@ KdpSerialPrint(PCHAR String, VOID NTAPI -KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) +KdpSerialInit( + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) { if (!KdpDebugMode.Serial) return; @@ -504,8 +506,9 @@ KdpScreenPrint(PCHAR String, VOID NTAPI -KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) +KdpScreenInit( + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) { if (!KdpDebugMode.Screen) return; @@ -550,8 +553,8 @@ KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase); VOID NTAPI KdpKdbgInit( - PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) { /* Forward the call */ KdbInitialize(DispatchTable, BootPhase); diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index 073a128ef3a..be749a705a9 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -21,7 +21,8 @@ extern ANSI_STRING KdpLogFileName; static PCHAR NTAPI -KdpGetDebugMode(PCHAR Currentp2) +KdpGetDebugMode( + _In_ PCHAR Currentp2) { PCHAR p1, p2 = Currentp2; ULONG Value; @@ -83,7 +84,7 @@ KdpGetDebugMode(PCHAR Currentp2) NTSTATUS NTAPI KdDebuggerInitialize0( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock) { ULONG i; PCHAR CommandLine, Port = NULL; @@ -138,7 +139,7 @@ KdDebuggerInitialize0( NTSTATUS NTAPI KdDebuggerInitialize1( - IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock) { PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index f2e0088d006..06325b65fb6 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -348,8 +348,8 @@ KdbDebugPrint( VOID NTAPI KdbInitialize( - PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) + _In_ PKD_DISPATCH_TABLE DispatchTable, + _In_ ULONG BootPhase) { PCHAR p1, p2; SHORT Found = FALSE; diff --git a/sdk/include/reactos/kddll.h b/sdk/include/reactos/kddll.h index 5e6e45bd953..6829bde4822 100644 --- a/sdk/include/reactos/kddll.h +++ b/sdk/include/reactos/kddll.h @@ -9,13 +9,13 @@ typedef ULONG KDSTATUS; NTSTATUS NTAPI KdDebuggerInitialize0( - IN PLOADER_PARAMETER_BLOCK LoaderBlock + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock ); NTSTATUS NTAPI KdDebuggerInitialize1( - IN PLOADER_PARAMETER_BLOCK LoaderBlock + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock ); KDSTATUS

1 0

[reactos] 02/02: [NTOS:KD] Simplify min-values calculations in KdpPrintToLogFile and KdpScreenPrint.
by Hermès Bélusca-Maïto 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cee893be99b5cd159a580… commit cee893be99b5cd159a580a5dec9eef1ccef93dc5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 9 16:08:07 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 9 18:26:53 2023 +0100 [NTOS:KD] Simplify min-values calculations in KdpPrintToLogFile and KdpScreenPrint. --- ntoskrnl/kd/kdio.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 45733e0b3ca..5f2c7f966c7 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -174,10 +174,7 @@ KdpPrintToLogFile(PCHAR String, OldIrql = KdbpAcquireLock(&KdpDebugLogSpinLock); beg = KdpCurrentPosition; - num = KdpFreeBytes; - if (Length < num) - num = Length; - + num = min(Length, KdpFreeBytes); if (num != 0) { end = (beg + num) % KdpBufferSize; @@ -470,16 +467,14 @@ KdpScreenPrint(PCHAR String, return; if (KdpDmesgBuffer == NULL) - return; + return; /* Acquire the printing spinlock without waiting at raised IRQL */ OldIrql = KdbpAcquireLock(&KdpDmesgLogSpinLock); - /* Invariant: always_true(KdpDmesgFreeBytes == KdpDmesgBufferSize); - * set num to min(KdpDmesgFreeBytes, Length). - */ - num = (Length < KdpDmesgFreeBytes) ? Length : KdpDmesgFreeBytes; beg = KdpDmesgCurrentPosition; + /* Invariant: always_true(KdpDmesgFreeBytes == KdpDmesgBufferSize); */ + num = min(Length, KdpDmesgFreeBytes); if (num != 0) { end = (beg + num) % KdpDmesgBufferSize;

1 0

[reactos] 01/02: [NTOS:IO/KD/KDBG] Formatting fixes only.
by Hermès Bélusca-Maïto 09 Mar '23

09 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4585372c6ddd86c02ee84… commit 4585372c6ddd86c02ee84f9252a529d549af1cad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 9 12:11:19 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 9 18:26:02 2023 +0100 [NTOS:IO/KD/KDBG] Formatting fixes only. --- ntoskrnl/io/iomgr/iomgr.c | 6 +++--- ntoskrnl/io/iomgr/iotimer.c | 2 +- ntoskrnl/kd/kdmain.c | 2 +- ntoskrnl/kdbg/kdb_cli.c | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 0e901c605e9..380a8518661 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -584,8 +584,8 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return FALSE; } - // the disk subsystem is initialized here and the SystemRoot is set too - // we can finally load other drivers from the boot volume + /* The disk subsystem is initialized here and the SystemRoot is set too. + * We can finally load other drivers from the boot volume. */ PnPBootDriversInitialized = TRUE; #if !defined(_WINKD_) && defined(KDBG) @@ -640,7 +640,7 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) return FALSE; } - /* Load the System DLL and its Entrypoints */ + /* Load the System DLL and its entrypoints */ Status = PsLocateSystemDll(); if (!NT_SUCCESS(Status)) { diff --git a/ntoskrnl/io/iomgr/iotimer.c b/ntoskrnl/io/iomgr/iotimer.c index 9c62db19a11..4bd8ab2ca1f 100644 --- a/ntoskrnl/io/iomgr/iotimer.c +++ b/ntoskrnl/io/iomgr/iotimer.c @@ -39,7 +39,7 @@ IopTimerDispatch(IN PKDPC Dpc, PIO_TIMER Timer; ULONG i; - /* Check if any Timers are actualyl enabled as of now */ + /* Check if any Timers are actually enabled as of now */ if (IopTimerCount) { /* Lock the Timers */ diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index 76e28962a98..073a128ef3a 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -36,7 +36,7 @@ KdpGetDebugMode(PCHAR Currentp2) /* Check for Serial Debugging */ else if (!_strnicmp(p2, "COM", 3)) { - /* Gheck for a valid Serial Port */ + /* Check for a valid Serial Port */ p2 += 3; if (*p2 != ':') { diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 4a351db9afe..114f4116838 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3832,7 +3832,8 @@ KdbpCliInit(VOID) } /* Get the size of the file */ - Status = ZwQueryInformationFile(hFile, &Iosb, &FileStdInfo, sizeof(FileStdInfo), + Status = ZwQueryInformationFile(hFile, &Iosb, + &FileStdInfo, sizeof(FileStdInfo), FileStandardInformation); if (!NT_SUCCESS(Status)) { @@ -3855,7 +3856,7 @@ KdbpCliInit(VOID) Status = ZwReadFile(hFile, NULL, NULL, NULL, &Iosb, FileBuffer, FileSize, NULL, NULL); ZwClose(hFile); - if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) + if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) { ExFreePool(FileBuffer); DPRINT("Could not read KDBinit file into memory (Status 0x%lx)\n", Status);

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