Ros-diffs February 2020

ros-diffs@reactos.org

27 participants
239 discussions

[reactos] 01/01: [SYSSETUP] Improve resource ATTENTION comments

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba17d87636aae02273abf… commit ba17d87636aae02273abfd784a22b5c0aa2fecf9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 15 09:52:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Feb 15 09:52:58 2020 +0900 [SYSSETUP] Improve resource ATTENTION comments --- 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 | 2 +- dll/win32/syssetup/lang/el-GR.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/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/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-TW.rc | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dll/win32/syssetup/lang/bg-BG.rc b/dll/win32/syssetup/lang/bg-BG.rc index 81818e58615..bd45825696e 100644 --- a/dll/win32/syssetup/lang/bg-BG.rc +++ b/dll/win32/syssetup/lang/bg-BG.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Подкарване на устройствата..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/cs-CZ.rc b/dll/win32/syssetup/lang/cs-CZ.rc index 0f6f313dfc2..612df4cd96a 100644 --- a/dll/win32/syssetup/lang/cs-CZ.rc +++ b/dll/win32/syssetup/lang/cs-CZ.rc @@ -227,7 +227,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Instaluji zařízení..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/da-DK.rc b/dll/win32/syssetup/lang/da-DK.rc index bb8ae55b40d..e6a6b4adbf8 100644 --- a/dll/win32/syssetup/lang/da-DK.rc +++ b/dll/win32/syssetup/lang/da-DK.rc @@ -240,7 +240,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Installing devices..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Programmer" diff --git a/dll/win32/syssetup/lang/de-DE.rc b/dll/win32/syssetup/lang/de-DE.rc index 49311538f63..0b0fdab539a 100644 --- a/dll/win32/syssetup/lang/de-DE.rc +++ b/dll/win32/syssetup/lang/de-DE.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Geräte werden installiert..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Programme" diff --git a/dll/win32/syssetup/lang/el-GR.rc b/dll/win32/syssetup/lang/el-GR.rc index da95c35a699..d5d49ce27f9 100644 --- a/dll/win32/syssetup/lang/el-GR.rc +++ b/dll/win32/syssetup/lang/el-GR.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Εγκατάσταση συσκευών..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/en-US.rc b/dll/win32/syssetup/lang/en-US.rc index fa52280a237..ec146f004bf 100644 --- a/dll/win32/syssetup/lang/en-US.rc +++ b/dll/win32/syssetup/lang/en-US.rc @@ -241,7 +241,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Installing devices..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/es-ES.rc b/dll/win32/syssetup/lang/es-ES.rc index 2e72c99934f..7a66a88564c 100644 --- a/dll/win32/syssetup/lang/es-ES.rc +++ b/dll/win32/syssetup/lang/es-ES.rc @@ -229,7 +229,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Instalando dispositivos..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Archivos de programa" diff --git a/dll/win32/syssetup/lang/et-EE.rc b/dll/win32/syssetup/lang/et-EE.rc index 49b7eb6328f..0e49c09f878 100644 --- a/dll/win32/syssetup/lang/et-EE.rc +++ b/dll/win32/syssetup/lang/et-EE.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Seadmete paigaldamine..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Programmifailid" diff --git a/dll/win32/syssetup/lang/fi-FI.rc b/dll/win32/syssetup/lang/fi-FI.rc index 03c77e75adc..a58259b4849 100644 --- a/dll/win32/syssetup/lang/fi-FI.rc +++ b/dll/win32/syssetup/lang/fi-FI.rc @@ -240,7 +240,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Installing devices..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/fr-FR.rc b/dll/win32/syssetup/lang/fr-FR.rc index 2589e57a737..5f8319a0fb0 100644 --- a/dll/win32/syssetup/lang/fr-FR.rc +++ b/dll/win32/syssetup/lang/fr-FR.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Installation des périphériques en cours..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/he-IL.rc b/dll/win32/syssetup/lang/he-IL.rc index 55e3fd67cf4..3bbb674e7f0 100644 --- a/dll/win32/syssetup/lang/he-IL.rc +++ b/dll/win32/syssetup/lang/he-IL.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "מתקין התקנים..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/hi-IN.rc b/dll/win32/syssetup/lang/hi-IN.rc index f10a2609bb9..bab78ec78a8 100644 --- a/dll/win32/syssetup/lang/hi-IN.rc +++ b/dll/win32/syssetup/lang/hi-IN.rc @@ -229,7 +229,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "डिवाइस का इन्स्टलेशन..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\प्रोग्राम फाइलें" diff --git a/dll/win32/syssetup/lang/hu-HU.rc b/dll/win32/syssetup/lang/hu-HU.rc index ee1f9bd42b7..231124bb334 100644 --- a/dll/win32/syssetup/lang/hu-HU.rc +++ b/dll/win32/syssetup/lang/hu-HU.rc @@ -220,7 +220,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Eszközök telepítése..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/id-ID.rc b/dll/win32/syssetup/lang/id-ID.rc index f611941f2d1..3dcb44a89c3 100644 --- a/dll/win32/syssetup/lang/id-ID.rc +++ b/dll/win32/syssetup/lang/id-ID.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Memasang perangkat..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Berkas Program" diff --git a/dll/win32/syssetup/lang/it-IT.rc b/dll/win32/syssetup/lang/it-IT.rc index 8920cd372ab..a015df09b7e 100644 --- a/dll/win32/syssetup/lang/it-IT.rc +++ b/dll/win32/syssetup/lang/it-IT.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Installazione dei dispositivi in corso..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Programmi" diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 3c67332a409..3bb56ac7b88 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "デバイスをインストールしています..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/lt-LT.rc b/dll/win32/syssetup/lang/lt-LT.rc index 65da0ae4000..f6963f6ae1e 100644 --- a/dll/win32/syssetup/lang/lt-LT.rc +++ b/dll/win32/syssetup/lang/lt-LT.rc @@ -240,7 +240,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Installing devices..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/nl-NL.rc b/dll/win32/syssetup/lang/nl-NL.rc index 89b254054df..6042e86dfee 100644 --- a/dll/win32/syssetup/lang/nl-NL.rc +++ b/dll/win32/syssetup/lang/nl-NL.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Installing devices..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/no-NO.rc b/dll/win32/syssetup/lang/no-NO.rc index 11b507f583a..8ffbf0e2362 100644 --- a/dll/win32/syssetup/lang/no-NO.rc +++ b/dll/win32/syssetup/lang/no-NO.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Installerer enheter..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Programfiler" diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 3caea4d4cae..6fee059bde5 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Instalacja urządzeń..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/pt-BR.rc b/dll/win32/syssetup/lang/pt-BR.rc index 94e78749e12..e92271ec7ac 100644 --- a/dll/win32/syssetup/lang/pt-BR.rc +++ b/dll/win32/syssetup/lang/pt-BR.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Instalando dispositivos..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Arquivos de programas" diff --git a/dll/win32/syssetup/lang/pt-PT.rc b/dll/win32/syssetup/lang/pt-PT.rc index 6148b63983a..ee132f19011 100644 --- a/dll/win32/syssetup/lang/pt-PT.rc +++ b/dll/win32/syssetup/lang/pt-PT.rc @@ -221,7 +221,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "A instalar dispositivos..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Arquivos de programas" diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index ef846e5f5c4..2263f7ae3f7 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -230,7 +230,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Dispozitive în curs de instalare…" END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Fișiere de program" diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index d2d99a5abc0..6523d54b298 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -224,7 +224,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Установка оборудования..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/sk-SK.rc b/dll/win32/syssetup/lang/sk-SK.rc index bd0558c7f9d..ecc0f85b7e2 100644 --- a/dll/win32/syssetup/lang/sk-SK.rc +++ b/dll/win32/syssetup/lang/sk-SK.rc @@ -227,7 +227,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Inštalujem zariadenia..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/sq-AL.rc b/dll/win32/syssetup/lang/sq-AL.rc index 4bd954fcf59..7302d3d2c71 100644 --- a/dll/win32/syssetup/lang/sq-AL.rc +++ b/dll/win32/syssetup/lang/sq-AL.rc @@ -240,7 +240,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Instalimi Pajisjeve..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Dokumente Programi" diff --git a/dll/win32/syssetup/lang/sv-SE.rc b/dll/win32/syssetup/lang/sv-SE.rc index 893a9ed8c72..0f9a98dc64e 100644 --- a/dll/win32/syssetup/lang/sv-SE.rc +++ b/dll/win32/syssetup/lang/sv-SE.rc @@ -240,7 +240,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Installerar enheter..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program" diff --git a/dll/win32/syssetup/lang/th-TH.rc b/dll/win32/syssetup/lang/th-TH.rc index 5b6ddee906d..e2728a298ca 100644 --- a/dll/win32/syssetup/lang/th-TH.rc +++ b/dll/win32/syssetup/lang/th-TH.rc @@ -240,7 +240,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Installing devices..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\โปรแกรมไฟล์" diff --git a/dll/win32/syssetup/lang/tr-TR.rc b/dll/win32/syssetup/lang/tr-TR.rc index 6cc3224e4e0..0c3e0ad29b5 100644 --- a/dll/win32/syssetup/lang/tr-TR.rc +++ b/dll/win32/syssetup/lang/tr-TR.rc @@ -223,7 +223,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Aygıtlar kuruluyor..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\İzlence Kütükleri" diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index e2eb75512b8..64e4a7d5514 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -229,7 +229,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "Встановлення пристроїв..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ STRINGTABLE BEGIN IDS_PROGRAMFILES "%SystemDrive%\\Program Files" diff --git a/dll/win32/syssetup/lang/zh-CN.rc b/dll/win32/syssetup/lang/zh-CN.rc index 9b76c052180..0df21c9f029 100644 --- a/dll/win32/syssetup/lang/zh-CN.rc +++ b/dll/win32/syssetup/lang/zh-CN.rc @@ -223,7 +223,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "正在安装设备驱动程序..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ /* If there is no special situation, please DO NOT change English folder names into Chinese, or it may cause problems in the system. */ diff --git a/dll/win32/syssetup/lang/zh-TW.rc b/dll/win32/syssetup/lang/zh-TW.rc index 93c7bae0428..1dd4c0d7dc6 100644 --- a/dll/win32/syssetup/lang/zh-TW.rc +++ b/dll/win32/syssetup/lang/zh-TW.rc @@ -244,7 +244,7 @@ BEGIN IDS_STATUS_INSTALL_DEV "正在安裝裝置驅動程式..." END -/* ATTENTION: Synchronize the translation of these strings with shell32 */ +/* ATTENTION: Synchronize the translation with dll/win32/shell32/lang */ /* ATTENTION: If there is no special situation, please DO NOT change English folder names into Chinese, or it may cause problems in the system. */

4 years, 10 months

[reactos] 01/01: [SYSSETUP] Improve Japanese translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aec7a2bf5be636bd887f8… commit aec7a2bf5be636bd887f8d2886a851331c7002ea Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 15 09:41:46 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Feb 15 09:41:46 2020 +0900 [SYSSETUP] Improve Japanese translation --- dll/win32/syssetup/lang/ja-JP.rc | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dll/win32/syssetup/lang/ja-JP.rc b/dll/win32/syssetup/lang/ja-JP.rc index 466d0ed94dd..3c67332a409 100644 --- a/dll/win32/syssetup/lang/ja-JP.rc +++ b/dll/win32/syssetup/lang/ja-JP.rc @@ -23,20 +23,20 @@ BEGIN END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "ReactOS セットアップ" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE -FONT 8, "MS Shell Dlg" +FONT 9, "MS UI Gothic", 0, 0, 0x0 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 + 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 - GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + 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 "Description:", IDC_STATIC, 20, 102, 70, 10 + LTEXT "説明:", IDC_STATIC, 20, 102, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END @@ -150,20 +150,20 @@ END IDD_PS2MOUSEPROPERTIES DIALOGEX 0, 0, 252, 218 STYLE WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Advanced Settings" +CAPTION "高度な設定" FONT 8, "MS Shell Dlg" BEGIN - RTEXT "&Sample Rate:", -1, 27, 35, 90, 8 - LTEXT "reports per second", -1, 169, 35, 76, 8 + RTEXT "サンプルレート(&S):", -1, 27, 35, 90, 8 + LTEXT "報告/秒", -1, 169, 35, 76, 8 COMBOBOX IDC_PS2MOUSESAMPLERATE, 124, 33, 42, 41, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Wheel Detection:", -1, 27, 55, 90, 8 + RTEXT "ホイール検出(&W):", -1, 27, 55, 90, 8 COMBOBOX IDC_PS2MOUSEWHEEL, 124, 53, 95, 46, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL - RTEXT "&Input buffer length:", -1, 27, 75, 90, 8 - LTEXT "packets", -1, 169, 75, 26, 8 + RTEXT "入力バッファの長さ(&I):", -1, 27, 75, 90, 8 + LTEXT "パケット", -1, 169, 75, 26, 8 EDITTEXT IDC_PS2MOUSEINPUTLEN, 124, 72, 40, 14, ES_LEFT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER CONTROL "", IDC_PS2MOUSEINPUTUPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 168, 70, 10, 14 - AUTOCHECKBOX "&Fast Initialization", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 - PUSHBUTTON "&Defaults", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 + AUTOCHECKBOX "高速初期化(&F)", IDC_PS2MOUSEFASTINIT, 124, 97, 90, 10 + PUSHBUTTON "既定(&D)", IDC_PS2MOUSEDEFAULTS, 195, 188, 50, 14 END STRINGTABLE @@ -230,9 +230,9 @@ END STRINGTABLE BEGIN - IDS_DETECTIONDISABLED "Detection disabled" - IDS_LOOKFORWHEEL "Look for wheel" - IDS_ASSUMEPRESENT "Assume wheel is present" + IDS_DETECTIONDISABLED "検出は無効です" + IDS_LOOKFORWHEEL "ホイールを探す" + IDS_ASSUMEPRESENT "ホイールの存在を仮定" END STRINGTABLE @@ -245,10 +245,10 @@ END STRINGTABLE BEGIN - IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTTITLE "製品オプション" + IDS_PRODUCTSUBTITLE "システムのふるまいに影響する製品オプションを選べます。" IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" - 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_PRODUCTWORKSTATIONNAME "ReactOS Workstation (既定)" + IDS_PRODUCTSERVERINFO "システムはサーバとして認識されます。個人用フォルダ ""マイピクチャ"", ""マイビデオ"" and ""マイミュージック"" は ""マイドキュメント"" から独立しています。" + IDS_PRODUCTWORKSTATIONINFO "システムはワークステーションとして認識されます。個人用フォルダ ""マイピクチャ"", ""マイビデオ"" and ""マイミュージック"" は、""マイドキュメント"" の中にあります。" END

4 years, 10 months

[reactos] 01/01: [BOOTDATA][BOOTCDREGTEST] Don't hardcode C:\ReactOS (#2346)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78f5854348e4b746f7d03… commit 78f5854348e4b746f7d03deb17af09ad592a50c0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 15 09:21:41 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 15 09:21:41 2020 +0900 [BOOTDATA][BOOTCDREGTEST] Don't hardcode C:\ReactOS (#2346) - Use %WINDIR% instead of C:\ReactOS. - Quote paths. CORE-14747 --- boot/bootdata/bootcdregtest/regtest.cmd | 12 ++++++------ boot/bootdata/bootcdregtest/testboot.bat.sample | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/boot/bootdata/bootcdregtest/regtest.cmd b/boot/bootdata/bootcdregtest/regtest.cmd index ec263e13241..1f71cdd98eb 100644 --- a/boot/bootdata/bootcdregtest/regtest.cmd +++ b/boot/bootdata/bootcdregtest/regtest.cmd @@ -11,14 +11,14 @@ if "%errorlevel%"=="1" ( exit 0 ) -move C:\ReactOS\bin\redirtest1.dll C:\ReactOS\bin\kernel32test_versioned.dll -move C:\ReactOS\bin\testdata\redirtest2.dll C:\ReactOS\bin\testdata\kernel32test_versioned.dll -if exist "C:\ReactOS\bin\AHKAppTests.cmd" ( +move "%WINDIR%\bin\redirtest1.dll" "%WINDIR%\bin\kernel32test_versioned.dll" +move "%WINDIR%\bin\testdata\redirtest2.dll" "%WINDIR%\bin\testdata\kernel32test_versioned.dll" +if exist "%WINDIR%\bin\AHKAppTests.cmd" ( dbgprint "Preparing AHK Application testing suite." - call C:\ReactOS\bin\AHKAppTests.cmd - del C:\ReactOS\bin\AHKAppTests.cmd + call "%WINDIR%\bin\AHKAppTests.cmd" + del "%WINDIR%\bin\AHKAppTests.cmd" ) dbgprint --process "ipconfig" -cd C:\ReactOS\bin +cd "%WINDIR%\bin" start rosautotest /r /s /n diff --git a/boot/bootdata/bootcdregtest/testboot.bat.sample b/boot/bootdata/bootcdregtest/testboot.bat.sample index 884f265d98c..8cef6e53d69 100644 --- a/boot/bootdata/bootcdregtest/testboot.bat.sample +++ b/boot/bootdata/bootcdregtest/testboot.bat.sample @@ -9,7 +9,6 @@ REM ECHO REM START /WAIT abiword.exe REM start /WAIT dbgprint.exe SYSREG_CHECKPOINT:ABIWORD_INSTALL_COMPLETE - REM ECHO REM ECHO Installing OpenOffice REM ECHO @@ -19,10 +18,9 @@ REM start /WAIT dbgprint.exe SYSREG_CHECKPOINT:OPENOFFICE_INSTALL_COMPLETE ECHO ECHO Informing Sysreg that we are done ECHO -START C:\ReactOS\bin\dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE +START dbgprint.exe SYSREG_CHECKPOINT:THIRDBOOT_COMPLETE ECHO ECHO Shutting down ReactOS ECHO START shutdown.exe shutdown -

4 years, 10 months

[reactos] 01/01: [SHELL32] Better fix for the "Version" string in the About-dialog (#2349)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ce72ba172e69d25e6844… commit 6ce72ba172e69d25e6844244051e467d9d4b1e05 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Fri Feb 14 22:17:48 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 14 22:17:48 2020 +0100 [SHELL32] Better fix for the "Version" string in the About-dialog (#2349) The version string kernel number and the localized "version" word were too near in translation files. The patch fixes the problem introduced by #2276. Addendum to commit a57f7b50. --- dll/win32/shell32/lang/bg-BG.rc | 6 ++++-- dll/win32/shell32/lang/ca-ES.rc | 6 ++++-- dll/win32/shell32/lang/cs-CZ.rc | 6 ++++-- dll/win32/shell32/lang/da-DK.rc | 6 ++++-- dll/win32/shell32/lang/de-DE.rc | 6 ++++-- dll/win32/shell32/lang/el-GR.rc | 6 ++++-- dll/win32/shell32/lang/en-GB.rc | 6 ++++-- dll/win32/shell32/lang/en-US.rc | 6 ++++-- dll/win32/shell32/lang/es-ES.rc | 6 ++++-- dll/win32/shell32/lang/et-EE.rc | 6 ++++-- dll/win32/shell32/lang/fi-FI.rc | 6 ++++-- dll/win32/shell32/lang/fr-FR.rc | 6 ++++-- dll/win32/shell32/lang/he-IL.rc | 6 ++++-- dll/win32/shell32/lang/hi-IN.rc | 6 ++++-- dll/win32/shell32/lang/hu-HU.rc | 6 ++++-- dll/win32/shell32/lang/id-ID.rc | 6 ++++-- dll/win32/shell32/lang/it-IT.rc | 6 ++++-- dll/win32/shell32/lang/ja-JP.rc | 6 ++++-- dll/win32/shell32/lang/ko-KR.rc | 6 ++++-- dll/win32/shell32/lang/nl-NL.rc | 6 ++++-- dll/win32/shell32/lang/no-NO.rc | 6 ++++-- dll/win32/shell32/lang/pl-PL.rc | 6 ++++-- dll/win32/shell32/lang/pt-BR.rc | 6 ++++-- dll/win32/shell32/lang/pt-PT.rc | 6 ++++-- dll/win32/shell32/lang/ro-RO.rc | 6 ++++-- dll/win32/shell32/lang/ru-RU.rc | 6 ++++-- dll/win32/shell32/lang/sk-SK.rc | 6 ++++-- dll/win32/shell32/lang/sl-SI.rc | 6 ++++-- dll/win32/shell32/lang/sq-AL.rc | 6 ++++-- dll/win32/shell32/lang/sv-SE.rc | 6 ++++-- dll/win32/shell32/lang/tr-TR.rc | 6 ++++-- dll/win32/shell32/lang/uk-UA.rc | 6 ++++-- dll/win32/shell32/lang/zh-CN.rc | 6 ++++-- dll/win32/shell32/lang/zh-TW.rc | 6 ++++-- dll/win32/shell32/shresdef.h | 17 +++++++++-------- dll/win32/shell32/wine/shell32_main.c | 4 +++- 36 files changed, 148 insertions(+), 77 deletions(-) diff --git a/dll/win32/shell32/lang/bg-BG.rc b/dll/win32/shell32/lang/bg-BG.rc index 8e1f2e298c7..0b71386fcca 100644 --- a/dll/win32/shell32/lang/bg-BG.rc +++ b/dll/win32/shell32/lang/bg-BG.rc @@ -136,8 +136,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Версия ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -749,6 +748,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Версия %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Големи значета" IDS_VIEW_SMALL "&Малки значета" diff --git a/dll/win32/shell32/lang/ca-ES.rc b/dll/win32/shell32/lang/ca-ES.rc index 8d66a2a7ea8..956d0cee138 100644 --- a/dll/win32/shell32/lang/ca-ES.rc +++ b/dll/win32/shell32/lang/ca-ES.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" diff --git a/dll/win32/shell32/lang/cs-CZ.rc b/dll/win32/shell32/lang/cs-CZ.rc index 909bf5988d6..e07ae178be1 100644 --- a/dll/win32/shell32/lang/cs-CZ.rc +++ b/dll/win32/shell32/lang/cs-CZ.rc @@ -141,8 +141,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Verze ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -754,6 +753,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Přidá, mění a spravuje soubory písem." IDS_PRINTERS_DESCRIPTION "Zobrazí instalované tiskárny a faxy a pomůže přidat další." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Verze %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Vedle sebe" IDS_VIEW_SMALL "&Ikony" diff --git a/dll/win32/shell32/lang/da-DK.rc b/dll/win32/shell32/lang/da-DK.rc index ef0465e09da..63378d0e579 100644 --- a/dll/win32/shell32/lang/da-DK.rc +++ b/dll/win32/shell32/lang/da-DK.rc @@ -141,8 +141,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -754,6 +753,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Sto&re Ikoner" IDS_VIEW_SMALL "S&må Ikoner" diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index fa6b96ee04a..cbc8f00b686 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Das ReactOS Team\0", IDC_STATIC, 105, 75, 70, 10 @@ -749,6 +748,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Hinzufügen, Ändern und Verwalten von Schriftarten." IDS_PRINTERS_DESCRIPTION "Anzeigen und Hinzufügen von Drucker und Faxgeräten." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Große Symbole" IDS_VIEW_SMALL "&Kleine Symbole" diff --git a/dll/win32/shell32/lang/el-GR.rc b/dll/win32/shell32/lang/el-GR.rc index 9aa9c0c00f4..a7d0b695cb8 100644 --- a/dll/win32/shell32/lang/el-GR.rc +++ b/dll/win32/shell32/lang/el-GR.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Έκδοση ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -747,6 +746,9 @@ BEGIN IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Έκδοση %S (%S)" /* context menus */ IDS_VIEW_LARGE "&Μεγάλα εικονίδια" diff --git a/dll/win32/shell32/lang/en-GB.rc b/dll/win32/shell32/lang/en-GB.rc index cc866d38999..d8db3a92847 100644 --- a/dll/win32/shell32/lang/en-GB.rc +++ b/dll/win32/shell32/lang/en-GB.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" diff --git a/dll/win32/shell32/lang/en-US.rc b/dll/win32/shell32/lang/en-US.rc index 663b55a533b..01b13a364ec 100644 --- a/dll/win32/shell32/lang/en-US.rc +++ b/dll/win32/shell32/lang/en-US.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" diff --git a/dll/win32/shell32/lang/es-ES.rc b/dll/win32/shell32/lang/es-ES.rc index dc495722c51..d4f69478748 100644 --- a/dll/win32/shell32/lang/es-ES.rc +++ b/dll/win32/shell32/lang/es-ES.rc @@ -143,8 +143,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versión ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " El equipo de ReactOS\0", IDC_STATIC, 105, 75, 100, 10 @@ -756,6 +755,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Añada, cambie y administre las fuentes de su computadora." IDS_PRINTERS_DESCRIPTION "Muestra impresoras y faxes instalados y le ayuda a configurar nuevos." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Versión %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Iconos &grandes" IDS_VIEW_SMALL "Iconos &pequeños" diff --git a/dll/win32/shell32/lang/et-EE.rc b/dll/win32/shell32/lang/et-EE.rc index 8e853b4828e..d258c20d276 100644 --- a/dll/win32/shell32/lang/et-EE.rc +++ b/dll/win32/shell32/lang/et-EE.rc @@ -142,8 +142,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versioon ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Autoriõigus 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -755,6 +754,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Saad lisada, muuta ja hallata oma arvutis fonte." IDS_PRINTERS_DESCRIPTION "Kuvab installitud printerid ja faksprinterid ja aitab teil uusi lisada." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Versioon %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Suured ikoonid" IDS_VIEW_SMALL "&Väikesed ikoonid" diff --git a/dll/win32/shell32/lang/fi-FI.rc b/dll/win32/shell32/lang/fi-FI.rc index 77d68c20ad7..5bb7c1ae426 100644 --- a/dll/win32/shell32/lang/fi-FI.rc +++ b/dll/win32/shell32/lang/fi-FI.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Suuret Kuvakkeet" IDS_VIEW_SMALL "&Pienet Kuvakkeet" diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 5a4bd2b1420..91e2054228b 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Grandes icônes" IDS_VIEW_SMALL "&Petites icônes" diff --git a/dll/win32/shell32/lang/he-IL.rc b/dll/win32/shell32/lang/he-IL.rc index 0bf6fab9d42..cb75c79c3d5 100644 --- a/dll/win32/shell32/lang/he-IL.rc +++ b/dll/win32/shell32/lang/he-IL.rc @@ -137,8 +137,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "גירסה ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "זכויות יוצרים 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " צוות ReactOS\0", IDC_STATIC, 105, 75, 53, 10 @@ -750,6 +749,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "גירסה %S (%S)" + /* context menus */ IDS_VIEW_LARGE "סמלים גדולים" IDS_VIEW_SMALL "סמלים קטנים" diff --git a/dll/win32/shell32/lang/hi-IN.rc b/dll/win32/shell32/lang/hi-IN.rc index cc570f42b71..bb8bc654b96 100644 --- a/dll/win32/shell32/lang/hi-IN.rc +++ b/dll/win32/shell32/lang/hi-IN.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "वर्ज़न ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "कॉपीराइट 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " रिऐक्ट ओएस टीम\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "अपने कंप्यूटर पर फ़ॉन्ट ऐड करे, बदलें और प्रबंधित करें।" IDS_PRINTERS_DESCRIPTION "स्थापित प्रिंटर और फ़ैक्स प्रिंटर दिखाता है और आपको नए ऐड करने में मदद करता है।" + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "वर्ज़न %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&बड़े आइकन" IDS_VIEW_SMALL "&छोटे आइकन" diff --git a/dll/win32/shell32/lang/hu-HU.rc b/dll/win32/shell32/lang/hu-HU.rc index f74d10075e0..7d01b3acc76 100644 --- a/dll/win32/shell32/lang/hu-HU.rc +++ b/dll/win32/shell32/lang/hu-HU.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Nagy képek" IDS_VIEW_SMALL "Kis képek" diff --git a/dll/win32/shell32/lang/id-ID.rc b/dll/win32/shell32/lang/id-ID.rc index f15dac10660..22cea3f3485 100644 --- a/dll/win32/shell32/lang/id-ID.rc +++ b/dll/win32/shell32/lang/id-ID.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versi ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Tim ReactOS\0", IDC_STATIC, 105, 75, 53, 10 @@ -745,6 +744,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Tambah, ganti, dan atur fon pada komputer anda." IDS_PRINTERS_DESCRIPTION "Menampilkan printer terpasang dan printer faks serta membantu Anda menambahkan yang baru." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Versi %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Iko&n Besar" IDS_VIEW_SMALL "I&kon Kecil" diff --git a/dll/win32/shell32/lang/it-IT.rc b/dll/win32/shell32/lang/it-IT.rc index 59fa5b4bc58..7a3f02b95d5 100644 --- a/dll/win32/shell32/lang/it-IT.rc +++ b/dll/win32/shell32/lang/it-IT.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versione ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Versione %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Icone Grandi" IDS_VIEW_SMALL "I&cone Piccole" diff --git a/dll/win32/shell32/lang/ja-JP.rc b/dll/win32/shell32/lang/ja-JP.rc index abbb82c5eab..4652f91fcbf 100644 --- a/dll/win32/shell32/lang/ja-JP.rc +++ b/dll/win32/shell32/lang/ja-JP.rc @@ -135,8 +135,7 @@ FONT 9, "MS UI Gothic" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "バージョン ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -745,6 +744,9 @@ BEGIN IDS_FONTS_DESCRIPTION "あなたのコンピュータのフォントを追加、変更、管理します。" IDS_PRINTERS_DESCRIPTION "インストール済みのプリンタやFAXプリンタを表示し、新しいのを追加するのを助けます。" + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "バージョン %S (%S)" + /* context menus */ IDS_VIEW_LARGE "大きいアイコン(&G)" IDS_VIEW_SMALL "小さいアイコン(&M)" diff --git a/dll/win32/shell32/lang/ko-KR.rc b/dll/win32/shell32/lang/ko-KR.rc index 38cd18e92da..480b717cd82 100644 --- a/dll/win32/shell32/lang/ko-KR.rc +++ b/dll/win32/shell32/lang/ko-KR.rc @@ -135,8 +135,7 @@ FONT 9, "굴림" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" diff --git a/dll/win32/shell32/lang/nl-NL.rc b/dll/win32/shell32/lang/nl-NL.rc index 78130c243ce..7c68b13b1e3 100644 --- a/dll/win32/shell32/lang/nl-NL.rc +++ b/dll/win32/shell32/lang/nl-NL.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" diff --git a/dll/win32/shell32/lang/no-NO.rc b/dll/win32/shell32/lang/no-NO.rc index 40aa382549e..ef2cb04398e 100644 --- a/dll/win32/shell32/lang/no-NO.rc +++ b/dll/win32/shell32/lang/no-NO.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versjon ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Versjon %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Store ikoner" IDS_VIEW_SMALL "S&må ikoner" diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index dd92f3e1f15..01406d3dc0d 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -140,8 +140,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Wersja ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -753,6 +752,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Dodaj lub zmień czcionki zainstalowane na tym komputerze oraz zarządzaj nimi." IDS_PRINTERS_DESCRIPTION "Pokazuje zainstalowane drukarki i faks-drukarki oraz pomaga w dodawaniu nowych." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Wersja %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Duże Ikony" IDS_VIEW_SMALL "&Małe Ikony" diff --git a/dll/win32/shell32/lang/pt-BR.rc b/dll/win32/shell32/lang/pt-BR.rc index e2c2c5fba59..b45759202eb 100644 --- a/dll/win32/shell32/lang/pt-BR.rc +++ b/dll/win32/shell32/lang/pt-BR.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versão ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Versão %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Ícones &Grandes" IDS_VIEW_SMALL "Ícones &Pequenos" diff --git a/dll/win32/shell32/lang/pt-PT.rc b/dll/win32/shell32/lang/pt-PT.rc index 72d31e6f952..a6faa8cb5e8 100644 --- a/dll/win32/shell32/lang/pt-PT.rc +++ b/dll/win32/shell32/lang/pt-PT.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versão ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Adicionar, alterar e gerenciar fontes no seu computador." IDS_PRINTERS_DESCRIPTION "Lista as impressoras e fax instalados e ajuda-o a adicionar novos equipamentos." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Versão %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Ícones &grandes" IDS_VIEW_SMALL "Ícones &pequenos" diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index dc3d97a2f03..5b95f0f8ffb 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -137,8 +137,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versiune", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Drept de autor 1998-", IDC_STATIC, 35, 75, 68, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 103, 75, 17, 10 LTEXT " Echipa ReactOS\0", IDC_STATIC, 120, 75, 53, 10 @@ -750,6 +749,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Adăugarea, modificarea, și gestiunea fonturilor din calculator." IDS_PRINTERS_DESCRIPTION "Prezentarea imprimantelor și faxurilor, precum și asistență la instalarea unora noi." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Versiune %S (%S)" + /* context menus */ IDS_VIEW_LARGE "D&ale" IDS_VIEW_SMALL "&Pictograme" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 674ce5fd4ce..7f52ea46b46 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -142,8 +142,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Версия ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Команда ReactOS\0", IDC_STATIC, 105, 75, 65, 10 @@ -755,6 +754,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Добавление, изменение и управление шрифтами на компьютере." IDS_PRINTERS_DESCRIPTION "Показывает установленные принтеры и факсы и поможет вам добавить новые." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Версия %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Большие значки" IDS_VIEW_SMALL "&Мелкие значки" diff --git a/dll/win32/shell32/lang/sk-SK.rc b/dll/win32/shell32/lang/sk-SK.rc index 6c70fa24e58..ada0b527639 100644 --- a/dll/win32/shell32/lang/sk-SK.rc +++ b/dll/win32/shell32/lang/sk-SK.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Verzia ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Verzia %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Veľké ikony" IDS_VIEW_SMALL "&Malé ikony" diff --git a/dll/win32/shell32/lang/sl-SI.rc b/dll/win32/shell32/lang/sl-SI.rc index a4b2ac0bb85..e6306e9cddc 100644 --- a/dll/win32/shell32/lang/sl-SI.rc +++ b/dll/win32/shell32/lang/sl-SI.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" diff --git a/dll/win32/shell32/lang/sq-AL.rc b/dll/win32/shell32/lang/sq-AL.rc index 824e812e1f4..f1b5ca829ea 100644 --- a/dll/win32/shell32/lang/sq-AL.rc +++ b/dll/win32/shell32/lang/sq-AL.rc @@ -139,8 +139,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Versioni ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " Ekipi ReactOS\0", IDC_STATIC, 105, 75, 53, 10 @@ -752,6 +751,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Versioni %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Ikonat e mëdha" IDS_VIEW_SMALL "Ikonat e vogla" diff --git a/dll/win32/shell32/lang/sv-SE.rc b/dll/win32/shell32/lang/sv-SE.rc index 51b330036ff..ae303cfb2dd 100644 --- a/dll/win32/shell32/lang/sv-SE.rc +++ b/dll/win32/shell32/lang/sv-SE.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Version ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS-gruppen\0", IDC_STATIC, 105, 75, 60, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Version %S (%S)" + /* context menus */ IDS_VIEW_LARGE "Sto&ra ikoner" IDS_VIEW_SMALL "S&må ikoner" diff --git a/dll/win32/shell32/lang/tr-TR.rc b/dll/win32/shell32/lang/tr-TR.rc index 51820e05724..7fb888f3286 100644 --- a/dll/win32/shell32/lang/tr-TR.rc +++ b/dll/win32/shell32/lang/tr-TR.rc @@ -137,8 +137,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Sürüm ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Telif Hakkı 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Takımı\0", IDC_STATIC, 105, 75, 53, 10 @@ -750,6 +749,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Bilgisayarınızda yazı tiplerini ekle, değiştir ve yönet." IDS_PRINTERS_DESCRIPTION "Kurulu yazıcıları ve belgegeçer yazıcılarını gösterir ve yenilerini eklemene yardımcı olur." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Sürüm %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Büyük Simgeler" IDS_VIEW_SMALL "&Küçük Simgeler" diff --git a/dll/win32/shell32/lang/uk-UA.rc b/dll/win32/shell32/lang/uk-UA.rc index c2eb5864333..11c79e8ac8d 100644 --- a/dll/win32/shell32/lang/uk-UA.rc +++ b/dll/win32/shell32/lang/uk-UA.rc @@ -135,8 +135,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "Версія ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -748,6 +747,9 @@ BEGIN IDS_FONTS_DESCRIPTION "Додати, змінити або керувати шрифтами на комп'ютері." IDS_PRINTERS_DESCRIPTION "Показує встановлені принтери та принтери факсів і допомагає додавати нові." + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "Версія %S (%S)" + /* context menus */ IDS_VIEW_LARGE "&Великі значки" IDS_VIEW_SMALL "&Дрібні значки" diff --git a/dll/win32/shell32/lang/zh-CN.rc b/dll/win32/shell32/lang/zh-CN.rc index 3630ec665fd..54febb2ba2e 100644 --- a/dll/win32/shell32/lang/zh-CN.rc +++ b/dll/win32/shell32/lang/zh-CN.rc @@ -145,8 +145,7 @@ FONT 9, "宋体" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "版本 ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "版权所有 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -756,6 +755,9 @@ BEGIN IDS_FONTS_DESCRIPTION "添加、更改和管理您计算机上的字体" IDS_PRINTERS_DESCRIPTION "显示安装的打印机和传真打印机，并帮助您添加新的。" + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "版本 %S (%S)" + /* context menus */ IDS_VIEW_LARGE "大图标(&G)" IDS_VIEW_SMALL "小图标(&M)" diff --git a/dll/win32/shell32/lang/zh-TW.rc b/dll/win32/shell32/lang/zh-TW.rc index 020fc6ce8b4..b881cf4a712 100644 --- a/dll/win32/shell32/lang/zh-TW.rc +++ b/dll/win32/shell32/lang/zh-TW.rc @@ -144,8 +144,7 @@ FONT 9, "新細明體" BEGIN ICON "", IDC_ABOUT_ICON, 7, 55, 21, 20 LTEXT "", IDC_ABOUT_APPNAME, 35, 55, 200, 10 - LTEXT "版本 ", IDC_STATIC, 35, 65, 28, 10 - LTEXT "", IDC_ABOUT_VERSION, 61, 65, 200, 10 + LTEXT "", IDC_ABOUT_VERSION, 35, 65, 250, 10 LTEXT "Copyright 1998-", IDC_STATIC, 35, 75, 53, 10 LTEXT COPYRIGHT_YEAR, IDC_STATIC, 88, 75, 17, 10 LTEXT " ReactOS Team\0", IDC_STATIC, 105, 75, 53, 10 @@ -757,6 +756,9 @@ BEGIN IDS_FONTS_DESCRIPTION "新增、變更和管理您電腦上的字型。" IDS_PRINTERS_DESCRIPTION "顯示已安裝的印表機和傳真印表機並幫助您新增印表機。" + /* About shell dialog version string */ + IDS_ABOUT_VERSION_STRING "版本 %S (%S)" + /* context menus */ IDS_VIEW_LARGE "大圖示(&G)" IDS_VIEW_SMALL "小圖示(&M)" diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index 3984486ec60..4e9fc63703f 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -309,14 +309,15 @@ #define IDC_RUNDLG_LABEL 12305 /* ShellAbout dialog */ -#define IDD_ABOUT 2 -#define IDC_ABOUT_ICON 0x3009 -#define IDC_ABOUT_APPNAME 0x3500 -#define IDC_ABOUT_VERSION 0x3501 -#define IDC_ABOUT_OTHERSTUFF 0x350D -#define IDC_ABOUT_REG_USERNAME 0x3507 -#define IDC_ABOUT_REG_ORGNAME 0x3508 -#define IDC_ABOUT_PHYSMEM 0x3503 +#define IDD_ABOUT 2 +#define IDC_ABOUT_ICON 0x3009 +#define IDC_ABOUT_APPNAME 0x3500 +#define IDS_ABOUT_VERSION_STRING 0x3501 +#define IDC_ABOUT_VERSION 0x3502 +#define IDC_ABOUT_OTHERSTUFF 0x350D +#define IDC_ABOUT_REG_USERNAME 0x3507 +#define IDC_ABOUT_REG_ORGNAME 0x3508 +#define IDC_ABOUT_PHYSMEM 0x3503 /* About authors dialog */ #define IDD_ABOUT_AUTHORS 3 diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index e37d8a7e68f..ae44ee22a5d 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -1380,6 +1380,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, BOOL bRet; #ifdef __REACTOS__ WCHAR szVersionString[256]; + WCHAR szFormat[256]; #endif TRACE("\n"); @@ -1395,7 +1396,8 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff, #ifdef __REACTOS__ /* Output the version OS kernel strings */ - StringCchPrintfW(szVersionString, _countof(szVersionString), L"%S (%S)", KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR); + LoadStringW(shell32_hInstance, IDS_ABOUT_VERSION_STRING, szFormat, _countof(szFormat)); + StringCchPrintfW(szVersionString, _countof(szVersionString), szFormat, KERNEL_VERSION_STR, KERNEL_VERSION_BUILD_STR); #endif info.szApp = szApp;

4 years, 10 months

[reactos] 01/01: [SYSSETUP] Update Russian translation for Product Options page (#2348)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44e9fee23704c57127f7d… commit 44e9fee23704c57127f7d7a63a4d0888c90d2dd9 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Feb 14 20:22:48 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 14 19:22:48 2020 +0100 [SYSSETUP] Update Russian translation for Product Options page (#2348) --- dll/win32/syssetup/lang/ru-RU.rc | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dll/win32/syssetup/lang/ru-RU.rc b/dll/win32/syssetup/lang/ru-RU.rc index f4195575acc..d2d99a5abc0 100644 --- a/dll/win32/syssetup/lang/ru-RU.rc +++ b/dll/win32/syssetup/lang/ru-RU.rc @@ -1,4 +1,5 @@ -/* Russian translation by Dmitry Chapyshev, 2007-06-13 */ +/* Russian translation by Dmitry Chapyshev, 2007-06-13 + Updated by Oleg Dubinskiy, 2020-02-14 */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -25,20 +26,20 @@ BEGIN END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "Установка ReactOS" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" 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 + 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 - GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + 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 "Description:", IDC_STATIC, 20, 102, 70, 10 + LTEXT "Описание:", IDC_STATIC, 20, 102, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END @@ -247,10 +248,10 @@ END STRINGTABLE 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_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_PRODUCTTITLE "Тип продукта" + IDS_PRODUCTSUBTITLE "Вы можете выбрать тип продукта, который изменяет поведение системы." + IDS_PRODUCTSERVERNAME "Сервер ReactOS" + IDS_PRODUCTWORKSTATIONNAME "Рабочая станция ReactOS (по умолчанию)" + IDS_PRODUCTSERVERINFO "Система будет распознаваться как сервер. Приватные папки ""Мои Изображения"", ""Мои видеозаписи"" и ""Моя музыка"" не будут зависеть от папки ""Мои документы""." + IDS_PRODUCTWORKSTATIONINFO "Система будет разпознаваться как рабочая станция. Приватные папки ""Мои изображения"", ""Мои видеозаписи"" и ""Моя музыка"" будут находится в папке ""Мои документы""." END

4 years, 10 months

[reactos] 01/01: [FREELDR] Separate PC beep routines out into its own file (#2347)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=747d50c52e9f4e2806003… commit 747d50c52e9f4e28060032513cfbe52be8f48776 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sat Feb 15 00:22:17 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 14 19:22:17 2020 +0100 [FREELDR] Separate PC beep routines out into its own file (#2347) - Remove now unused i386rtl.c (and it doesn't contains RTL functions nowadays). - Separate PC beep routines out into its own file. - Also use delay function instead of BIOS interrupts. - Improve as well the accuracy of KeStallExecutionProcessor() by using the same HW delay function. --- boot/freeldr/freeldr/CMakeLists.txt | 5 +- boot/freeldr/freeldr/arch/i386/i386rtl.c | 117 ----------------------------- boot/freeldr/freeldr/arch/i386/ntoskrnl.c | 46 +----------- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 26 +++++++ boot/freeldr/freeldr/arch/i386/pc/pcbeep.c | 39 ++++++++++ 5 files changed, 69 insertions(+), 164 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 5b32b2e74eb..dd8bc31703e 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -121,7 +121,6 @@ if(ARCH STREQUAL "i386") arch/i386/hwpci.c arch/i386/i386bug.c arch/i386/i386idt.c - arch/i386/i386rtl.c arch/i386/i386vid.c disk/scsiport.c) @@ -129,6 +128,7 @@ if(ARCH STREQUAL "i386") list(APPEND FREELDR_ARC_SOURCE # FIXME: Abstract things better so we don't need to include /pc/* here arch/i386/pc/machpc.c # machxbox.c depends on it + arch/i386/pc/pcbeep.c # machxbox.c depends on it arch/i386/pc/pcdisk.c # hwdisk.c depends on it arch/i386/pc/pcmem.c # hwacpi.c/xboxmem.c depends on it arch/i386/xbox/machxbox.c @@ -142,6 +142,7 @@ if(ARCH STREQUAL "i386") else() list(APPEND FREELDR_ARC_SOURCE arch/i386/pc/machpc.c + arch/i386/pc/pcbeep.c arch/i386/pc/pccons.c arch/i386/pc/pcdisk.c arch/i386/pc/pcmem.c @@ -169,9 +170,9 @@ elseif(ARCH STREQUAL "amd64") arch/i386/hwdisk.c arch/i386/hwpci.c arch/i386/i386bug.c - arch/i386/i386rtl.c arch/i386/i386vid.c arch/i386/pc/machpc.c + arch/i386/pc/pcbeep.c arch/i386/pc/pccons.c arch/i386/pc/pcdisk.c arch/i386/pc/pcmem.c diff --git a/boot/freeldr/freeldr/arch/i386/i386rtl.c b/boot/freeldr/freeldr/arch/i386/i386rtl.c deleted file mode 100644 index e4ef701da52..00000000000 --- a/boot/freeldr/freeldr/arch/i386/i386rtl.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <freeldr.h> - -void sound(int freq); -void delay(unsigned msec); - -VOID PcBeep(VOID) -{ - sound(700); - delay(200); - sound(0); -} - -void delay(unsigned msec) -{ - REGS Regs; - unsigned usec; - unsigned msec_this; - - // Int 15h AH=86h - // BIOS - WAIT (AT,PS) - // - // AH = 86h - // CX:DX = interval in microseconds - // Return: - // CF clear if successful (wait interval elapsed) - // CF set on error or AH=83h wait already in progress - // AH = status (see #00496) - - // Note: The resolution of the wait period is 977 microseconds on - // many systems because many BIOSes use the 1/1024 second fast - // interrupt from the AT real-time clock chip which is available on INT 70; - // because newer BIOSes may have much more precise timers available, it is - // not possible to use this function accurately for very short delays unless - // the precise behavior of the BIOS is known (or found through testing) - - while (msec) - { - msec_this = msec; - - if (msec_this > 4000) - { - msec_this = 4000; - } - - usec = msec_this * 1000; - - Regs.b.ah = 0x86; - Regs.w.cx = usec >> 16; - Regs.w.dx = usec & 0xffff; - Int386(0x15, &Regs, &Regs); - - msec -= msec_this; - } -} - -void sound(int freq) -{ - int scale; - - if (freq == 0) - { - WRITE_PORT_UCHAR((PUCHAR)0x61, READ_PORT_UCHAR((PUCHAR)0x61) & ~3); - return; - } - - scale = 1193046 / freq; - WRITE_PORT_UCHAR((PUCHAR)0x43, 0xb6); - WRITE_PORT_UCHAR((PUCHAR)0x42, scale & 0xff); - WRITE_PORT_UCHAR((PUCHAR)0x42, scale >> 8); - WRITE_PORT_UCHAR((PUCHAR)0x61, READ_PORT_UCHAR((PUCHAR)0x61) | 3); -} - -VOID __cdecl ChainLoadBiosBootSectorCode( - IN UCHAR BootDrive OPTIONAL, - IN ULONG BootPartition OPTIONAL) -{ - REGS Regs; - - RtlZeroMemory(&Regs, sizeof(Regs)); - - /* Set the boot drive and the boot partition */ - Regs.b.dl = (UCHAR)(BootDrive ? BootDrive : FrldrBootDrive); - Regs.b.dh = (UCHAR)(BootPartition ? BootPartition : FrldrBootPartition); - - /* - * Don't stop the floppy drive motor when we are just booting a bootsector, - * a drive, or a partition. If we were to stop the floppy motor, the BIOS - * wouldn't be informed and if the next read is to a floppy then the BIOS - * will still think the motor is on and this will result in a read error. - */ - // DiskStopFloppyMotor(); - - Relocator16Boot(&Regs, - /* Stack segment:pointer */ - 0x0000, 0x7C00, - /* Code segment:pointer */ - 0x0000, 0x7C00); -} diff --git a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c index 3c30cad41ce..21f8425d6c5 100644 --- a/boot/freeldr/freeldr/arch/i386/ntoskrnl.c +++ b/boot/freeldr/freeldr/arch/i386/ntoskrnl.c @@ -10,11 +10,6 @@ #include <ntoskrnl.h> -/* For KeStallExecutionProcessor */ -#if defined(_M_IX86) || defined(_M_AMD64) -#include <arch/pc/pcbios.h> -#endif - /* FUNCTIONS *****************************************************************/ VOID @@ -99,44 +94,5 @@ NTAPI KeStallExecutionProcessor( IN ULONG MicroSeconds) { -#if defined(_M_IX86) || defined(_M_AMD64) - REGS Regs; - ULONG usec_this; - - // Int 15h AH=86h - // BIOS - WAIT (AT,PS) - // - // AH = 86h - // CX:DX = interval in microseconds - // Return: - // CF clear if successful (wait interval elapsed) - // CF set on error or AH=83h wait already in progress - // AH = status (see #00496) - - // Note: The resolution of the wait period is 977 microseconds on - // many systems because many BIOSes use the 1/1024 second fast - // interrupt from the AT real-time clock chip which is available on INT 70; - // because newer BIOSes may have much more precise timers available, it is - // not possible to use this function accurately for very short delays unless - // the precise behavior of the BIOS is known (or found through testing) - - while (MicroSeconds) - { - usec_this = MicroSeconds; - - if (usec_this > 4000000) - { - usec_this = 4000000; - } - - Regs.b.ah = 0x86; - Regs.w.cx = usec_this >> 16; - Regs.w.dx = usec_this & 0xffff; - Int386(0x15, &Regs, &Regs); - - MicroSeconds -= usec_this; - } -#else - #error unimplemented -#endif + StallExecutionProcessor(MicroSeconds); } diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index b0b1ee9694b..d4259de92aa 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -1416,6 +1416,32 @@ PcHwIdle(VOID) */ } +VOID __cdecl ChainLoadBiosBootSectorCode( + IN UCHAR BootDrive OPTIONAL, + IN ULONG BootPartition OPTIONAL) +{ + REGS Regs; + + RtlZeroMemory(&Regs, sizeof(Regs)); + + /* Set the boot drive and the boot partition */ + Regs.b.dl = (UCHAR)(BootDrive ? BootDrive : FrldrBootDrive); + Regs.b.dh = (UCHAR)(BootPartition ? BootPartition : FrldrBootPartition); + + /* + * Don't stop the floppy drive motor when we are just booting a bootsector, + * a drive, or a partition. If we were to stop the floppy motor, the BIOS + * wouldn't be informed and if the next read is to a floppy then the BIOS + * will still think the motor is on and this will result in a read error. + */ + // DiskStopFloppyMotor(); + + Relocator16Boot(&Regs, + /* Stack segment:pointer */ + 0x0000, 0x7C00, + /* Code segment:pointer */ + 0x0000, 0x7C00); +} /******************************************************************************/ diff --git a/boot/freeldr/freeldr/arch/i386/pc/pcbeep.c b/boot/freeldr/freeldr/arch/i386/pc/pcbeep.c new file mode 100644 index 00000000000..d499d8f50ca --- /dev/null +++ b/boot/freeldr/freeldr/arch/i386/pc/pcbeep.c @@ -0,0 +1,39 @@ +/* + * PROJECT: FreeLoader + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Hardware-specific beep routine + * COPYRIGHT: Copyright 1998-2003 Brian Palmer (brianp(a)reactos.org) + */ + +#include <freeldr.h> + +#if defined(SARCH_XBOX) +#define CLOCK_TICK_RATE 1125000 +#else +#define CLOCK_TICK_RATE 1193182 +#endif + +static VOID +Sound(USHORT Frequency) +{ + USHORT Scale; + + if (Frequency == 0) + { + WRITE_PORT_UCHAR((PUCHAR)0x61, READ_PORT_UCHAR((PUCHAR)0x61) & ~3); + return; + } + + Scale = CLOCK_TICK_RATE / Frequency; + WRITE_PORT_UCHAR((PUCHAR)0x43, 0xB6); + WRITE_PORT_UCHAR((PUCHAR)0x42, Scale & 0xFF); + WRITE_PORT_UCHAR((PUCHAR)0x42, Scale >> 8); + WRITE_PORT_UCHAR((PUCHAR)0x61, READ_PORT_UCHAR((PUCHAR)0x61) | 3); +} + +VOID PcBeep(VOID) +{ + Sound(700); + StallExecutionProcessor(100000); + Sound(0); +}

4 years, 10 months

[reactos] 02/02: [FREELDR] Separate PC and Xbox platform-specific code (#2185)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=571407c7d2bafa1051505… commit 571407c7d2bafa1051505f8bb03426c34588b7fe Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Dec 27 23:02:38 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 14 16:02:04 2020 +0100 [FREELDR] Separate PC and Xbox platform-specific code (#2185) CORE-16216 --- boot/freeldr/freeldr/CMakeLists.txt | 41 ++++++++++++--------- boot/freeldr/freeldr/arch/i386/archmach.c | 44 ----------------------- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 12 ++++++- boot/freeldr/freeldr/arch/i386/xbox/machxbox.c | 23 +++++++++++- boot/freeldr/freeldr/include/arch/amd64/amd64.h | 1 - boot/freeldr/freeldr/include/arch/i386/machxbox.h | 2 -- boot/freeldr/freeldr/include/arch/pc/machpc.h | 2 -- 7 files changed, 58 insertions(+), 67 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 2573130ad02..5b32b2e74eb 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -113,7 +113,6 @@ if(ARCH STREQUAL "i386") lib/fs/pxe.c arch/i386/halstub.c arch/i386/ntoskrnl.c - arch/i386/archmach.c arch/i386/drivemap.c arch/i386/hardware.c arch/i386/hwacpi.c @@ -124,22 +123,32 @@ if(ARCH STREQUAL "i386") arch/i386/i386idt.c arch/i386/i386rtl.c arch/i386/i386vid.c - arch/i386/pc/machpc.c - arch/i386/pc/pccons.c - arch/i386/pc/pcdisk.c - arch/i386/pc/pcmem.c - arch/i386/pc/pcrtc.c - arch/i386/pc/pcvideo.c - arch/i386/xbox/machxbox.c - arch/i386/xbox/xboxcons.c - arch/i386/xbox/xboxdisk.c - arch/i386/xbox/xboxfont.c - arch/i386/xbox/xboxi2c.c - arch/i386/xbox/xboxmem.c - arch/i386/xbox/xboxrtc.c - arch/i386/xbox/xboxvideo.c disk/scsiport.c) + if(SARCH STREQUAL "xbox") + list(APPEND FREELDR_ARC_SOURCE + # FIXME: Abstract things better so we don't need to include /pc/* here + arch/i386/pc/machpc.c # machxbox.c depends on it + arch/i386/pc/pcdisk.c # hwdisk.c depends on it + arch/i386/pc/pcmem.c # hwacpi.c/xboxmem.c depends on it + arch/i386/xbox/machxbox.c + arch/i386/xbox/xboxcons.c + arch/i386/xbox/xboxdisk.c + arch/i386/xbox/xboxfont.c + arch/i386/xbox/xboxi2c.c + arch/i386/xbox/xboxmem.c + arch/i386/xbox/xboxrtc.c + arch/i386/xbox/xboxvideo.c) + else() + list(APPEND FREELDR_ARC_SOURCE + arch/i386/pc/machpc.c + arch/i386/pc/pccons.c + arch/i386/pc/pcdisk.c + arch/i386/pc/pcmem.c + arch/i386/pc/pcrtc.c + arch/i386/pc/pcvideo.c) + endif() + elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_COMMON_ASM_SOURCE arch/amd64/entry.S @@ -196,7 +205,7 @@ if(USE_CLANG_CL) # We need to reduce the binary size add_target_compile_flags(freeldr_common "/Os") endif() -if(NOT MSVC AND ARCH STREQUAL "i386") +if(NOT MSVC AND ARCH STREQUAL "i386" AND SARCH STREQUAL "xbox") # Prevent a warning when doing a memcmp with address 0 set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") endif() diff --git a/boot/freeldr/freeldr/arch/i386/archmach.c b/boot/freeldr/freeldr/arch/i386/archmach.c deleted file mode 100644 index 293f9481529..00000000000 --- a/boot/freeldr/freeldr/arch/i386/archmach.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * FreeLoader - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <freeldr.h> - -VOID -MachInit(const char *CmdLine) -{ - ULONG PciId; - - memset(&MachVtbl, 0, sizeof(MACHVTBL)); - - /* Check for Xbox by identifying device at PCI 0:0:0, if it's - * 0x10de/0x02a5 then we're running on an Xbox */ - WRITE_PORT_ULONG((ULONG*)0xcf8, CONFIG_CMD(0, 0, 0)); - PciId = READ_PORT_ULONG((ULONG*)0xcfc); - if (PciId == 0x02a510de) - { - XboxMachInit(CmdLine); - } - else - { - PcMachInit(CmdLine); - } - - HalpCalibrateStallExecution(); -} - -/* EOF */ diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index 3ca5578aa4b..b0b1ee9694b 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -1348,6 +1348,8 @@ DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) /* FIXME: Detect more ISA devices */ } +/* FIXME: Abstract things better so we don't need to place define here */ +#if !defined(SARCH_XBOX) static UCHAR PcGetFloppyCount(VOID) @@ -1359,6 +1361,7 @@ PcGetFloppyCount(VOID) return ((Data & 0xF0) ? 1 : 0) + ((Data & 0x0F) ? 1 : 0); } +#endif PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID) @@ -1416,9 +1419,13 @@ PcHwIdle(VOID) /******************************************************************************/ +/* FIXME: Abstract things better so we don't need to place define here */ +#if !defined(SARCH_XBOX) VOID -PcMachInit(const char *CmdLine) +MachInit(const char *CmdLine) { + memset(&MachVtbl, 0, sizeof(MACHVTBL)); + /* Setup vtbl */ MachVtbl.ConsPutChar = PcConsPutChar; MachVtbl.ConsKbHit = PcConsKbHit; @@ -1448,6 +1455,8 @@ PcMachInit(const char *CmdLine) MachVtbl.InitializeBootDevices = PcInitializeBootDevices; MachVtbl.HwDetect = PcHwDetect; MachVtbl.HwIdle = PcHwIdle; + + HalpCalibrateStallExecution(); } VOID @@ -1457,5 +1466,6 @@ PcPrepareForReactOS(VOID) PcVideoPrepareForReactOS(); DiskStopFloppyMotor(); } +#endif /* EOF */ diff --git a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c index ed99abbb72a..4d84089b9fb 100644 --- a/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c @@ -253,8 +253,27 @@ VOID XboxHwIdle(VOID) /******************************************************************************/ VOID -XboxMachInit(const char *CmdLine) +MachInit(const char *CmdLine) { + ULONG PciId; + + memset(&MachVtbl, 0, sizeof(MACHVTBL)); + + /* Check for Xbox by identifying device at PCI 0:0:0, if it's + * 0x10DE/0x02A5 then we're running on an Xbox */ + WRITE_PORT_ULONG((ULONG *)0xCF8, CONFIG_CMD(0, 0, 0)); + PciId = READ_PORT_ULONG((ULONG *)0xCFC); + if (PciId != 0x02A510DE) + { + ERR("This is not original Xbox!\n"); + + /* Disable and halt the CPU */ + _disable(); + __halt(); + + while (TRUE); + } + /* Set LEDs to red before anything is initialized */ XboxSetLED("rrrr"); @@ -294,6 +313,8 @@ XboxMachInit(const char *CmdLine) /* Set LEDs to orange after init */ XboxSetLED("oooo"); + + HalpCalibrateStallExecution(); } VOID diff --git a/boot/freeldr/freeldr/include/arch/amd64/amd64.h b/boot/freeldr/freeldr/include/arch/amd64/amd64.h index 8a5ccddecca..17d6214c1a8 100644 --- a/boot/freeldr/freeldr/include/arch/amd64/amd64.h +++ b/boot/freeldr/freeldr/include/arch/amd64/amd64.h @@ -39,7 +39,6 @@ #ifndef ASM VOID FrLdrSetupGdtIdt(VOID); -#define MachInit PcMachInit #endif /* EOF */ diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index 4b85e9b59d3..062d74ff85b 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -48,8 +48,6 @@ extern UCHAR XboxFont8x16[256 * 16]; -VOID XboxMachInit(const char *CmdLine); - VOID XboxConsPutChar(int Ch); BOOLEAN XboxConsKbHit(VOID); int XboxConsGetCh(VOID); diff --git a/boot/freeldr/freeldr/include/arch/pc/machpc.h b/boot/freeldr/freeldr/include/arch/pc/machpc.h index b76e55e776a..35bf0e904c8 100644 --- a/boot/freeldr/freeldr/include/arch/pc/machpc.h +++ b/boot/freeldr/freeldr/include/arch/pc/machpc.h @@ -24,8 +24,6 @@ #include "mm.h" #endif -VOID PcMachInit(const char *CmdLine); - VOID PcBeep(VOID); VOID PcConsPutChar(int Ch);

4 years, 10 months

[reactos] 01/02: [FREELDR] Restructure platform-specific code. No code changes.

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c4e591ea9fbe5f50d822… commit 6c4e591ea9fbe5f50d822001cb46225a088b63a7 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Fri Dec 27 22:44:48 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 14 16:02:04 2020 +0100 [FREELDR] Restructure platform-specific code. No code changes. --- boot/freeldr/freeldr/CMakeLists.txt | 42 +++++++++++----------- boot/freeldr/freeldr/arch/i386/{ => pc}/machpc.c | 0 boot/freeldr/freeldr/arch/i386/{ => pc}/pccons.c | 0 boot/freeldr/freeldr/arch/i386/{ => pc}/pcdisk.c | 0 boot/freeldr/freeldr/arch/i386/{ => pc}/pcmem.c | 0 boot/freeldr/freeldr/arch/i386/{ => pc}/pcrtc.c | 0 boot/freeldr/freeldr/arch/i386/{ => pc}/pcvideo.c | 0 .../freeldr/arch/i386/{ => xbox}/machxbox.c | 0 .../freeldr/arch/i386/{ => xbox}/xboxcons.c | 0 .../freeldr/arch/i386/{ => xbox}/xboxdisk.c | 0 .../freeldr/arch/i386/{ => xbox}/xboxfont.c | 0 .../freeldr/freeldr/arch/i386/{ => xbox}/xboxi2c.c | 0 .../freeldr/freeldr/arch/i386/{ => xbox}/xboxmem.c | 0 .../freeldr/freeldr/arch/i386/{ => xbox}/xboxrtc.c | 0 .../freeldr/arch/i386/{ => xbox}/xboxvideo.c | 0 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 784febe1f43..2573130ad02 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -124,20 +124,20 @@ if(ARCH STREQUAL "i386") arch/i386/i386idt.c arch/i386/i386rtl.c arch/i386/i386vid.c - arch/i386/machpc.c - arch/i386/pccons.c - arch/i386/pcdisk.c - arch/i386/pcmem.c - arch/i386/pcrtc.c - arch/i386/pcvideo.c - arch/i386/machxbox.c - arch/i386/xboxcons.c - arch/i386/xboxdisk.c - arch/i386/xboxfont.c - arch/i386/xboxi2c.c - arch/i386/xboxmem.c - arch/i386/xboxrtc.c - arch/i386/xboxvideo.c + arch/i386/pc/machpc.c + arch/i386/pc/pccons.c + arch/i386/pc/pcdisk.c + arch/i386/pc/pcmem.c + arch/i386/pc/pcrtc.c + arch/i386/pc/pcvideo.c + arch/i386/xbox/machxbox.c + arch/i386/xbox/xboxcons.c + arch/i386/xbox/xboxdisk.c + arch/i386/xbox/xboxfont.c + arch/i386/xbox/xboxi2c.c + arch/i386/xbox/xboxmem.c + arch/i386/xbox/xboxrtc.c + arch/i386/xbox/xboxvideo.c disk/scsiport.c) elseif(ARCH STREQUAL "amd64") @@ -162,12 +162,12 @@ elseif(ARCH STREQUAL "amd64") arch/i386/i386bug.c arch/i386/i386rtl.c arch/i386/i386vid.c - arch/i386/machpc.c - arch/i386/pccons.c - arch/i386/pcdisk.c - arch/i386/pcmem.c - arch/i386/pcrtc.c - arch/i386/pcvideo.c) + arch/i386/pc/machpc.c + arch/i386/pc/pccons.c + arch/i386/pc/pcdisk.c + arch/i386/pc/pcmem.c + arch/i386/pc/pcrtc.c + arch/i386/pc/pcvideo.c) elseif(ARCH STREQUAL "arm") list(APPEND FREELDR_COMMON_ASM_SOURCE @@ -198,7 +198,7 @@ if(USE_CLANG_CL) endif() if(NOT MSVC AND ARCH STREQUAL "i386") # Prevent a warning when doing a memcmp with address 0 - set_source_files_properties(arch/i386/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") + set_source_files_properties(arch/i386/xbox/xboxmem.c PROPERTIES COMPILE_FLAGS "-Wno-nonnull") endif() set(PCH_SOURCE diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/machpc.c rename to boot/freeldr/freeldr/arch/i386/pc/machpc.c diff --git a/boot/freeldr/freeldr/arch/i386/pccons.c b/boot/freeldr/freeldr/arch/i386/pc/pccons.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/pccons.c rename to boot/freeldr/freeldr/arch/i386/pc/pccons.c diff --git a/boot/freeldr/freeldr/arch/i386/pcdisk.c b/boot/freeldr/freeldr/arch/i386/pc/pcdisk.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/pcdisk.c rename to boot/freeldr/freeldr/arch/i386/pc/pcdisk.c diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pc/pcmem.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/pcmem.c rename to boot/freeldr/freeldr/arch/i386/pc/pcmem.c diff --git a/boot/freeldr/freeldr/arch/i386/pcrtc.c b/boot/freeldr/freeldr/arch/i386/pc/pcrtc.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/pcrtc.c rename to boot/freeldr/freeldr/arch/i386/pc/pcrtc.c diff --git a/boot/freeldr/freeldr/arch/i386/pcvideo.c b/boot/freeldr/freeldr/arch/i386/pc/pcvideo.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/pcvideo.c rename to boot/freeldr/freeldr/arch/i386/pc/pcvideo.c diff --git a/boot/freeldr/freeldr/arch/i386/machxbox.c b/boot/freeldr/freeldr/arch/i386/xbox/machxbox.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/machxbox.c rename to boot/freeldr/freeldr/arch/i386/xbox/machxbox.c diff --git a/boot/freeldr/freeldr/arch/i386/xboxcons.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/xboxcons.c rename to boot/freeldr/freeldr/arch/i386/xbox/xboxcons.c diff --git a/boot/freeldr/freeldr/arch/i386/xboxdisk.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/xboxdisk.c rename to boot/freeldr/freeldr/arch/i386/xbox/xboxdisk.c diff --git a/boot/freeldr/freeldr/arch/i386/xboxfont.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxfont.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/xboxfont.c rename to boot/freeldr/freeldr/arch/i386/xbox/xboxfont.c diff --git a/boot/freeldr/freeldr/arch/i386/xboxi2c.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxi2c.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/xboxi2c.c rename to boot/freeldr/freeldr/arch/i386/xbox/xboxi2c.c diff --git a/boot/freeldr/freeldr/arch/i386/xboxmem.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/xboxmem.c rename to boot/freeldr/freeldr/arch/i386/xbox/xboxmem.c diff --git a/boot/freeldr/freeldr/arch/i386/xboxrtc.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxrtc.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/xboxrtc.c rename to boot/freeldr/freeldr/arch/i386/xbox/xboxrtc.c diff --git a/boot/freeldr/freeldr/arch/i386/xboxvideo.c b/boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/xboxvideo.c rename to boot/freeldr/freeldr/arch/i386/xbox/xboxvideo.c

4 years, 10 months

[reactos] 01/01: [SHELL32_APITEST] Don't hardcode C:\ReactOS (#2344)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7a51a0ae08a4c09d051a… commit e7a51a0ae08a4c09d051ab34d61bd3bd402c6787 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 14 23:04:17 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 14 23:04:17 2020 +0900 [SHELL32_APITEST] Don't hardcode C:\ReactOS (#2344) All tests successful. CORE-14747 --- .../rostests/apitests/shell32/ShellExecuteW.cpp | 227 ++++++++------------- 1 file changed, 86 insertions(+), 141 deletions(-) diff --git a/modules/rostests/apitests/shell32/ShellExecuteW.cpp b/modules/rostests/apitests/shell32/ShellExecuteW.cpp index 6c005380bf3..0111783d0e6 100644 --- a/modules/rostests/apitests/shell32/ShellExecuteW.cpp +++ b/modules/rostests/apitests/shell32/ShellExecuteW.cpp @@ -2,184 +2,129 @@ * PROJECT: ReactOS api tests * LICENSE: GPLv2+ - See COPYING in the top level directory * PURPOSE: Testing ShellExecuteW - * PROGRAMMER: Doug Lyons <douglyons(a)douglyons.com> + * PROGRAMMERS: Doug Lyons <douglyons(a)douglyons.com> + * Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "shelltest.h" #include <stdio.h> #include <winbase.h> +#include <shlwapi.h> -static -VOID -TestShellExecuteW() +#define WAIT_SLEEP 700 + +// ShellExecuteW(handle, "open", <path_to_executable>, <parameters>, NULL, SW_SHOWNORMAL); + +START_TEST(ShellExecuteW) { + INT ret; HINSTANCE hInstance; - INT retval; HWND hWnd; - const WCHAR *Name = L"ShellExecuteW"; - WCHAR WindowsDirectory[MAX_PATH]; - BOOL IsReactOS; - - /* Check if we are running under ReactOS from the SystemRoot directory */ - if(!GetWindowsDirectoryW(WindowsDirectory, MAX_PATH)) - printf("GetWindowsDirectoryW failed\n"); - - IsReactOS = !_wcsnicmp(&WindowsDirectory[3], L"reactos", 7); - - printf("OSVendor %s ReactOS.\n", IsReactOS ? "is" : "is not"); + WCHAR WinDir[MAX_PATH], SysDir[MAX_PATH], SysDrive[MAX_PATH]; -// ShellExecuteW(handle, "open", <fully_qualified_path_to_executable>, <parameters>, NULL, SW_SHOWNORMAL); + if (!GetWindowsDirectoryW(WinDir, _countof(WinDir))) + { + skip("GetWindowsDirectoryW failed\n"); + return; + } + if (!GetSystemDirectoryW(SysDir, _countof(SysDir))) + { + skip("GetSystemDirectoryW failed\n"); + return; + } + if (!GetEnvironmentVariableW(L"SystemDrive", SysDrive, _countof(SysDrive))) + { + trace("GetEnvironmentVariableW('SystemDrive') failed\n"); + SysDrive[0] = SysDir[0]; + SysDrive[1] = L':'; + SysDrive[2] = 0; + } + PathAddBackslashW(SysDrive); + // TEST #1: Open Control Panel hInstance = ShellExecuteW(NULL, L"open", L"rundll32.exe", L"shell32.dll,Control_RunDLL desk.cpl", NULL, SW_SHOWNORMAL); - retval = (UINT_PTR) hInstance; - - printf("Return Value for Open Control Panel is '%d'.\n", retval); - - ok(retval > 31, "ShellExecuteEx lpFile %s failed. Error: %lu\n", - wine_dbgstr_w(Name), GetLastError()); - + ret = (INT)(UINT_PTR)hInstance; + ok(ret > 31, "TEST #1: ret:%d, LastError: %ld\n", ret, GetLastError()); + trace("TEST #1 ret: %d.\n", ret); if (hInstance) { - LPCWSTR lpWinTitle = L"Display Properties"; - Sleep(1000); - hWnd = FindWindowW(NULL, lpWinTitle); - PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); // Terminate Window + Sleep(WAIT_SLEEP); + // Terminate Window + hWnd = FindWindowW(NULL, L"Display Properties"); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); } -// End of test #1 - Open Control Panel - - -// ShellExecuteW(handle, "open", <fully_qualified_path_to_executable>, NULL, NULL, SW_SHOWNORMAL); + // TEST #2: Open Notepad hInstance = ShellExecuteW(NULL, L"open", L"notepad.exe", NULL, NULL, SW_SHOWNORMAL); - retval = (UINT_PTR) hInstance; - - printf("Return Value for Open notepad.exe is '%d'.\n", retval); - - ok(retval > 31, "ShellExecuteEx lpFile %s failed. Error: %lu\n", - wine_dbgstr_w(Name), GetLastError()); - + ret = (INT)(UINT_PTR)hInstance; + ok(ret > 31, "TEST #2: ret:%d, LastError: %ld\n", ret, GetLastError()); + trace("TEST #2 ret: %d.\n", ret); if (hInstance) { - LPCWSTR lpWinClass = L"Notepad"; - LPCWSTR lpWinTitle = L"Untitled - Notepad"; - Sleep(1000); - hWnd = FindWindowW(lpWinClass, lpWinTitle); - PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); // Terminate Window + Sleep(WAIT_SLEEP); + // Terminate Window + hWnd = FindWindowW(L"Notepad", L"Untitled - Notepad"); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); } -// End of test #2 - Open notepad.exe - - -// ShellExecuteW(handle, NULL, <fully_qualified_path_to_folder>, NULL, NULL, SW_SHOWNORMAL); - - if(IsReactOS) - hInstance = ShellExecuteW(NULL, NULL, L"C:\\ReactOS", NULL, - NULL, SW_SHOWNORMAL); - else - hInstance = ShellExecuteW(NULL, NULL, L"C:\\Windows", NULL, - NULL, SW_SHOWNORMAL); - - retval = (UINT_PTR) hInstance; - - printf("Return Value for Open %s is '%d'.\n", IsReactOS ? "C:\\ReactOS" : "C:\\Windows", retval); - - ok(retval > 31, "ShellExecuteEx lpFile %s failed. Error: %lu\n", - wine_dbgstr_w(Name), GetLastError()); + // TEST #3: Open Windows folder + hInstance = ShellExecuteW(NULL, NULL, WinDir, NULL, NULL, SW_SHOWNORMAL); + ret = (INT)(UINT_PTR)hInstance; + ok(ret > 31, "TEST #3: ret:%d, LastError: %ld\n", ret, GetLastError()); + trace("TEST #3 ret: %d.\n", ret); if (hInstance) { - LPCWSTR lpWinClass = L"CabinetWClass"; - LPCWSTR lpWinTitleWindows = L"C:\\Windows"; - LPCWSTR lpWinTitleReactOS = L"C:\\ReactOS"; - - Sleep(1000); - if (IsReactOS) - hWnd = FindWindowW(lpWinClass, lpWinTitleReactOS); - else - hWnd = FindWindowW(lpWinClass, lpWinTitleWindows); - PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); // Terminate Window + Sleep(WAIT_SLEEP); + // Terminate Window + hWnd = FindWindowW(L"CabinetWClass", WinDir); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); } -// End of test #3 - Open C:\Windows - - -// ShellExecuteW(handle, "open", <fully_qualified_path_to_folder>, NULL, NULL, SW_SHOWNORMAL); - - if(IsReactOS) - hInstance = ShellExecuteW(NULL, L"open", L"C:\\ReactOS\\system32", NULL, - NULL, SW_SHOWNORMAL); - else - hInstance = ShellExecuteW(NULL, L"open", L"C:\\Windows\\system32", NULL, - NULL, SW_SHOWNORMAL); - - retval = (UINT_PTR) hInstance; - - printf("Return Value for C:\\...\\system32 is '%d'.\n", retval); - - ok(retval > 31, "ShellExecuteEx lpFile %s failed. Error: %lu\n", - wine_dbgstr_w(Name), GetLastError()); + // TEST #4: Open system32 folder + hInstance = ShellExecuteW(NULL, L"open", SysDir, NULL, NULL, SW_SHOWNORMAL); + ret = (INT)(UINT_PTR)hInstance; + ok(ret > 31, "TEST #4: ret:%d, LastError: %ld\n", ret, GetLastError()); + trace("TEST #4 ret: %d.\n", ret); if (hInstance) { - LPCWSTR lpWinClass = L"CabinetWClass"; - LPCWSTR lpWinTitle = L"C:\\Windows\\system32"; - Sleep(1000); - hWnd = FindWindowW(lpWinClass, lpWinTitle); - PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); // Terminate Window + Sleep(WAIT_SLEEP); + // Terminate Window + hWnd = FindWindowW(L"CabinetWClass", SysDir); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); } -// End of test #4 - Open C:\Windows\system32 - - -// ShellExecuteW(handle, "explore", <fully_qualified_path_to_folder>, NULL, NULL, SW_SHOWNORMAL); - - hInstance = ShellExecuteW(NULL, L"explore", L"C:\\", NULL, NULL, SW_SHOWNORMAL); - retval = (UINT_PTR) hInstance; - - printf("Return Value for explore c:\\ is '%d'.\n", retval); - - ok(retval > 31, "ShellExecuteEx lpFile %s failed. Error: %lu\n", - wine_dbgstr_w(Name), GetLastError()); + // TEST #5: Open %SystemDrive% + hInstance = ShellExecuteW(NULL, L"explore", SysDrive, NULL, NULL, SW_SHOWNORMAL); + ret = (INT)(UINT_PTR)hInstance; + ok(ret > 31, "TEST #5: ret:%d, LastError: %ld\n", ret, GetLastError()); + trace("TEST #5 ret: %d.\n", ret); if (hInstance) { - LPCWSTR lpWinClass = L"ExploreWClass"; - LPCWSTR lpWinTitle = L"C:\\"; - Sleep(1000); - hWnd = FindWindowW(lpWinClass, lpWinTitle); - PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); // Terminate Window + Sleep(WAIT_SLEEP); + // Terminate Window + hWnd = FindWindowW(L"ExploreWClass", SysDrive); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); } -// End of test #5 - explore C: - - -// ShellExecuteW(handle, "find", <fully_qualified_path_to_folder>, NULL, NULL, 0); - - hInstance = ShellExecuteW(NULL, L"find", L"C:\\", NULL, NULL, SW_SHOWNORMAL); - retval = (UINT_PTR) hInstance; - - printf("Return Value for find is '%d'.\n", retval); - - ok(retval > 31, "ShellExecuteEx lpFile %s failed. Error: %lu\n", - wine_dbgstr_w(Name), GetLastError()); + // TEST #6: Open Explorer Search on %SYSTEMDRIVE% + hInstance = ShellExecuteW(NULL, L"find", SysDrive, NULL, NULL, SW_SHOWNORMAL); + ret = (INT)(UINT_PTR)hInstance; + ok(ret > 31, "TEST #6: ret:%d, LastError: %ld\n", ret, GetLastError()); + trace("TEST #6 ret: %d.\n", ret); if (hInstance) { - LPCWSTR lpWinClass = L"CabinetWClass"; - LPCWSTR lpWinTitle = L"Search Results"; - Sleep(1000); - hWnd = FindWindowW(lpWinClass, lpWinTitle); - PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); // Terminate Window + Sleep(WAIT_SLEEP); + // Terminate Window + hWnd = FindWindowW(L"CabinetWClass", L"Search Results"); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); } -// End of test #6 - find -} - -START_TEST(ShellExecuteW) -{ - TestShellExecuteW(); } // Windows Server 2003 and Windows XP SP3 return values (Win 7 returns 42 in all cases) -// ShellExecuteW(NULL, L"open", L"rundll32.exe", L"shell32.dll,Control_RunDLL desk.cpl", NULL, SW_SHOWNORMAL) = 42 -// ShellExecuteW(NULL, L"open", L"notepad.exe", NULL, NULL, SW_SHOWNORMAL) = 42 -// ShellExecuteW(NULL, NULL, L"C:\\Windows", NULL, NULL, SW_SHOWNORMAL) = 33 -// ShellExecuteW(NULL, L"open", L"C:\\Windows\\system32", NULL, NULL, SW_SHOWNORMAL) = 33 -// ShellExecuteW(NULL, L"explore", L"C:\\", NULL, NULL, SW_SHOWNORMAL) = 33 -// ShellExecuteW(NULL, L"find", L"C:\\", NULL, NULL, SW_SHOWNORMAL) = 33 \ No newline at end of file +// ShellExecuteW(NULL, L"open", L"rundll32.exe", L"shell32.dll,Control_RunDLL desk.cpl", NULL, SW_SHOWNORMAL) = 42 +// ShellExecuteW(NULL, L"open", L"notepad.exe", NULL, NULL, SW_SHOWNORMAL) = 42 +// ShellExecuteW(NULL, NULL, WinDir, NULL, NULL, SW_SHOWNORMAL) = 33 +// ShellExecuteW(NULL, L"open", SysDir, NULL, NULL, SW_SHOWNORMAL) = 33 +// ShellExecuteW(NULL, L"explore", SysDrive, NULL, NULL, SW_SHOWNORMAL) = 33 +// ShellExecuteW(NULL, L"find", SysDrive, NULL, NULL, SW_SHOWNORMAL) = 33

4 years, 10 months

[reactos] 01/01: [LOCALSPL] Don't hardcode C:\ReactOS (#2343)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3b1185cdc743e9dd4392… commit f3b1185cdc743e9dd4392c04f6ebfe9be5d98633 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Feb 14 22:53:38 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 14 22:53:38 2020 +0900 [LOCALSPL] Don't hardcode C:\ReactOS (#2343) Use static top-level variables wszLocalSplFile and wszPrintUiFile instead of static hardcoded literal strings. CORE-14747 --- .../printing/providers/localspl/printerdrivers.c | 59 +++++++++++++++------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/win32ss/printing/providers/localspl/printerdrivers.c b/win32ss/printing/providers/localspl/printerdrivers.c index 351667cecc8..67dd7a03031 100644 --- a/win32ss/printing/providers/localspl/printerdrivers.c +++ b/win32ss/printing/providers/localspl/printerdrivers.c @@ -3,9 +3,37 @@ * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions for printer driver information * COPYRIGHT: Copyright 2018 Mark Jansen (mark.jansen(a)reactos.org) + * Copyright 2020 Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "precomp.h" +#include <strsafe.h> + +static WCHAR wszLocalSplFile[MAX_PATH] = L""; +static WCHAR wszPrintUiFile[MAX_PATH] = L""; + +static BOOL +DoInitPrinterDriversInternal(void) +{ + WCHAR szSysDir[MAX_PATH]; + + if (wszLocalSplFile[0] && wszPrintUiFile[0]) + return TRUE; + + if (!GetSystemDirectoryW(szSysDir, _countof(szSysDir))) + { + ERR("GetSystemDirectoryW failed\n"); + return FALSE; + } + + StringCbCopyW(wszLocalSplFile, sizeof(wszLocalSplFile), szSysDir); + StringCbCatW(wszLocalSplFile, sizeof(wszLocalSplFile), L"\\localspl.dll"); + + StringCbCopyW(wszPrintUiFile, sizeof(wszPrintUiFile), szSysDir); + StringCbCatW(wszPrintUiFile, sizeof(wszPrintUiFile), L"\\printui.dll"); + + return TRUE; +} // Local Constants static DWORD dwDriverInfo1Offsets[] = { @@ -91,7 +119,6 @@ _LocalGetPrinterDriverLevel1(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_1W* ppD return; } - // Finally copy the structure and advance to the next one in the output buffer. *ppDriverInfoEnd = PackStrings(pwszStrings, (PBYTE)(*ppDriverInfo), dwDriverInfo1Offsets, *ppDriverInfoEnd); (*ppDriverInfo)++; @@ -103,12 +130,11 @@ _LocalGetPrinterDriverLevel2(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_2W* ppD DWORD n; PCWSTR pwszStrings[5]; - /* Clearly these things should not be hardcoded, so when it is needed, someone can add meaningfull values here */ pwszStrings[0] = pHandle->pPrinter->pwszPrinterDriver; // pName pwszStrings[1] = wszCurrentEnvironment; // pEnvironment - pwszStrings[2] = L"c:\\reactos\\system32\\localspl.dll"; // pDriverPath - pwszStrings[3] = L"c:\\reactos\\system32\\localspl.dll"; // pDataFile - pwszStrings[4] = L"c:\\reactos\\system32\\localspl.dll"; // pConfigFile + pwszStrings[2] = wszLocalSplFile; // pDriverPath + pwszStrings[3] = wszLocalSplFile; // pDataFile + pwszStrings[4] = wszLocalSplFile; // pConfigFile // Calculate the string lengths. if (!ppDriverInfo) @@ -135,12 +161,11 @@ _LocalGetPrinterDriverLevel3(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_3W* ppD DWORD n; PCWSTR pwszStrings[9]; - /* Clearly these things should not be hardcoded, so when it is needed, someone can add meaningfull values here */ pwszStrings[0] = pHandle->pPrinter->pwszPrinterDriver; // pName pwszStrings[1] = wszCurrentEnvironment; // pEnvironment - pwszStrings[2] = L"c:\\reactos\\system32\\localspl.dll"; // pDriverPath - pwszStrings[3] = L"c:\\reactos\\system32\\localspl.dll"; // pDataFile - pwszStrings[4] = L"c:\\reactos\\system32\\printui.dll"; // pConfigFile + pwszStrings[2] = wszLocalSplFile; // pDriverPath + pwszStrings[3] = wszLocalSplFile; // pDataFile + pwszStrings[4] = wszPrintUiFile; // pConfigFile pwszStrings[5] = L""; // pHelpFile pwszStrings[6] = L"localspl.dll|printui.dll|"; // pDependentFiles, | is separator and terminator! pwszStrings[7] = NULL; // pMonitorName @@ -176,12 +201,11 @@ _LocalGetPrinterDriverLevel4(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_4W* ppD DWORD n; PCWSTR pwszStrings[10]; - /* Clearly these things should not be hardcoded, so when it is needed, someone can add meaningfull values here */ pwszStrings[0] = pHandle->pPrinter->pwszPrinterDriver; // pName pwszStrings[1] = wszCurrentEnvironment; // pEnvironment - pwszStrings[2] = L"c:\\reactos\\system32\\localspl.dll"; // pDriverPath - pwszStrings[3] = L"c:\\reactos\\system32\\localspl.dll"; // pDataFile - pwszStrings[4] = L"c:\\reactos\\system32\\printui.dll"; // pConfigFile + pwszStrings[2] = wszLocalSplFile; // pDriverPath + pwszStrings[3] = wszLocalSplFile; // pDataFile + pwszStrings[4] = wszPrintUiFile; // pConfigFile pwszStrings[5] = L""; // pHelpFile pwszStrings[6] = L"localspl.dll|printui.dll|"; // pDependentFiles, | is separator and terminator! pwszStrings[7] = NULL; // pMonitorName @@ -217,12 +241,11 @@ _LocalGetPrinterDriverLevel5(PLOCAL_PRINTER_HANDLE pHandle, PDRIVER_INFO_5W* ppD DWORD n; PCWSTR pwszStrings[5]; - /* Clearly these things should not be hardcoded, so when it is needed, someone can add meaningfull values here */ pwszStrings[0] = pHandle->pPrinter->pwszPrinterDriver; // pName pwszStrings[1] = wszCurrentEnvironment; // pEnvironment - pwszStrings[2] = L"c:\\reactos\\system32\\localspl.dll"; // pDriverPath UniDrv.dll - pwszStrings[3] = L"c:\\reactos\\system32\\localspl.dll"; // pDataFile.ppd - pwszStrings[4] = L"c:\\reactos\\system32\\printui.dll"; // pConfigFile UniDrvUI.dll + pwszStrings[2] = wszLocalSplFile; // pDriverPath UniDrv.dll + pwszStrings[3] = wszLocalSplFile; // pDataFile.ppd + pwszStrings[4] = wszPrintUiFile; // pConfigFile UniDrvUI.dll // Calculate the string lengths. if (!ppDriverInfo) @@ -261,6 +284,8 @@ BOOL WINAPI LocalGetPrinterDriver(HANDLE hPrinter, LPWSTR pEnvironment, DWORD Le TRACE("LocalGetPrinterDriver(%p, %lu, %lu, %p, %lu, %p)\n", hPrinter, pEnvironment, Level, pDriverInfo, cbBuf, pcbNeeded); + DoInitPrinterDriversInternal(); + // Check if this is a printer handle. pHandle = (PLOCAL_HANDLE)hPrinter; if (pHandle->HandleType != HandleType_Printer)

4 years, 10 months

← Newer
1
...
12
13
14
15
16
17
18
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2020