Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [WINLOGON] Update french translation of the system shutdown dialog.
by Hermès Bélusca-Maïto 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37deb7593e8d6d8ca25fb… commit 37deb7593e8d6d8ca25fb0a7b2d47ba86e5bdd8d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 29 17:19:14 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 29 18:02:41 2018 +0200 [WINLOGON] Update french translation of the system shutdown dialog. --- base/system/winlogon/lang/fr-FR.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index a551a2fb64..a25cde97c5 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -24,14 +24,14 @@ END IDD_SYSSHUTDOWN DIALOGEX 50, 50, 180, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_CAPTION | WS_POPUP -CAPTION "System Shutdown" +CAPTION "Arrêt du système" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 - LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "Un arrêt du système a été initié. Veuillez enregistrer tous les travaux en cours et quitter votre session. Toutes les modifications non enregistrées seront perdues.", -1, 38, 7, 135, 40 + LTEXT "Le système s'arrête dans :", -1, 38, 50, 90, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 - LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "Message :", -1, 38, 65, 135, 8 LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END @@ -52,7 +52,7 @@ BEGIN IDS_SAVEYOURSETTINGS "Enregistrement de vos paramètres..." IDS_REACTOSISSTARTINGUP "Démarrage de ReactOS..." IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" - IDS_TIMEOUTLONGFORMAT "%d days" + IDS_TIMEOUTLONGFORMAT "%d jours" END STRINGTABLE

1 0

01/01: [WINLOGON] Add german translation of the system shutdown dialog
by Eric Kohl 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=153c645b2c57698e9bbe9… commit 153c645b2c57698e9bbe9a11ad36f960c13debad Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 29 17:44:41 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 29 17:44:41 2018 +0200 [WINLOGON] Add german translation of the system shutdown dialog --- base/system/winlogon/lang/de-DE.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc index 8b8ca8f14f..978292482d 100644 --- a/base/system/winlogon/lang/de-DE.rc +++ b/base/system/winlogon/lang/de-DE.rc @@ -28,10 +28,10 @@ CAPTION "System Shutdown" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_WARNING, IDC_SYSSHUTDOWNICON, 6, 7, 18, 20 - LTEXT "A system shutdown has been initiated. Please save all your work and terminate your session. All unsaved work will be lost when the system shuts down.", -1, 38, 7, 135, 40 - LTEXT "The system shuts down in:", -1, 38, 50, 90, 8 + LTEXT "Das System wird heruntergefahren. Speichern Sie alle Daten und melden Sie sich ab. Alle nicht gespeicherten Änderungen gehen verloren.", -1, 38, 7, 135, 40 + LTEXT "Zeit bis zum Herunterfahren:", -1, 38, 50, 93, 8 LTEXT "00:00:00", IDC_SYSSHUTDOWNTIMELEFT, 132, 50, 41, 8 - LTEXT "Message:", -1, 38, 65, 135, 8 + LTEXT "Meldung:", -1, 38, 65, 135, 8 LTEXT "", IDC_SYSSHUTDOWNMESSAGE, 38, 75, 135, 58 END

1 0

01/01: [WINLOGON] Localize the shutdown timeout
by Eric Kohl 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec2bfa2e1160070bdd83b… commit ec2bfa2e1160070bdd83b080121b81c439ee7e7a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 29 17:09:37 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 29 17:09:37 2018 +0200 [WINLOGON] Localize the shutdown timeout --- base/system/winlogon/lang/bg-BG.rc | 2 ++ base/system/winlogon/lang/cs-CZ.rc | 2 ++ base/system/winlogon/lang/de-DE.rc | 2 ++ base/system/winlogon/lang/el-GR.rc | 2 ++ base/system/winlogon/lang/en-US.rc | 2 ++ base/system/winlogon/lang/es-ES.rc | 2 ++ base/system/winlogon/lang/fr-FR.rc | 2 ++ base/system/winlogon/lang/he-IL.rc | 2 ++ base/system/winlogon/lang/hu-HU.rc | 2 ++ base/system/winlogon/lang/id-ID.rc | 2 ++ base/system/winlogon/lang/it-IT.rc | 2 ++ base/system/winlogon/lang/ja-JP.rc | 2 ++ base/system/winlogon/lang/lt-LT.rc | 2 ++ base/system/winlogon/lang/ms-MY.rc | 2 ++ base/system/winlogon/lang/nl-NL.rc | 2 ++ base/system/winlogon/lang/no-NO.rc | 2 ++ base/system/winlogon/lang/pl-PL.rc | 2 ++ base/system/winlogon/lang/pt-BR.rc | 2 ++ base/system/winlogon/lang/ro-RO.rc | 2 ++ base/system/winlogon/lang/ru-RU.rc | 2 ++ base/system/winlogon/lang/sk-SK.rc | 2 ++ base/system/winlogon/lang/sq-AL.rc | 2 ++ base/system/winlogon/lang/sv-SE.rc | 2 ++ base/system/winlogon/lang/tr-TR.rc | 2 ++ base/system/winlogon/lang/uk-UA.rc | 2 ++ base/system/winlogon/lang/zh-CN.rc | 2 ++ base/system/winlogon/lang/zh-TW.rc | 2 ++ base/system/winlogon/resource.h | 2 ++ base/system/winlogon/shutdown.c | 10 +++++++--- 29 files changed, 63 insertions(+), 3 deletions(-) diff --git a/base/system/winlogon/lang/bg-BG.rc b/base/system/winlogon/lang/bg-BG.rc index c4909af9af..d4b753de2a 100644 --- a/base/system/winlogon/lang/bg-BG.rc +++ b/base/system/winlogon/lang/bg-BG.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Приготвяне за сън..." IDS_SAVEYOURSETTINGS "Записване на настройките ви..." IDS_REACTOSISSTARTINGUP "РеактОС тръгва..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/cs-CZ.rc b/base/system/winlogon/lang/cs-CZ.rc index 0647df4545..29f7bb2246 100644 --- a/base/system/winlogon/lang/cs-CZ.rc +++ b/base/system/winlogon/lang/cs-CZ.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Příprava k přechodu do režimu hibernace..." IDS_SAVEYOURSETTINGS "Ukládání osobního nastavení..." IDS_REACTOSISSTARTINGUP "ReactOS se spouští..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/de-DE.rc b/base/system/winlogon/lang/de-DE.rc index 0c6065a3e8..8b8ca8f14f 100644 --- a/base/system/winlogon/lang/de-DE.rc +++ b/base/system/winlogon/lang/de-DE.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Vorbereiten für den Ruhezustand..." IDS_SAVEYOURSETTINGS "Speichern Ihrer persönlichen Einstellungen..." IDS_REACTOSISSTARTINGUP "ReactOS startet..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d Tage" END STRINGTABLE diff --git a/base/system/winlogon/lang/el-GR.rc b/base/system/winlogon/lang/el-GR.rc index c1fa72745a..4a12e0f9a7 100644 --- a/base/system/winlogon/lang/el-GR.rc +++ b/base/system/winlogon/lang/el-GR.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." IDS_SAVEYOURSETTINGS "Γίνεται αποθήκευση των ρυθμίσεών σας..." IDS_REACTOSISSTARTINGUP "Το ReactOS ξεκινά..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/en-US.rc b/base/system/winlogon/lang/en-US.rc index 1fa1c71d8b..151cd80e72 100644 --- a/base/system/winlogon/lang/en-US.rc +++ b/base/system/winlogon/lang/en-US.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparing to Hibernate..." IDS_SAVEYOURSETTINGS "Saving your settings..." IDS_REACTOSISSTARTINGUP "ReactOS is starting up..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/es-ES.rc b/base/system/winlogon/lang/es-ES.rc index 772184ebe3..450d66e697 100644 --- a/base/system/winlogon/lang/es-ES.rc +++ b/base/system/winlogon/lang/es-ES.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparando para hibernar..." IDS_SAVEYOURSETTINGS "Guardando su configuración personal..." IDS_REACTOSISSTARTINGUP "ReactOS se está iniciando..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/fr-FR.rc b/base/system/winlogon/lang/fr-FR.rc index b1f9b92512..a551a2fb64 100644 --- a/base/system/winlogon/lang/fr-FR.rc +++ b/base/system/winlogon/lang/fr-FR.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Préparation de l'hibernation..." IDS_SAVEYOURSETTINGS "Enregistrement de vos paramètres..." IDS_REACTOSISSTARTINGUP "Démarrage de ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/he-IL.rc b/base/system/winlogon/lang/he-IL.rc index d4f3785850..0fd7515079 100644 --- a/base/system/winlogon/lang/he-IL.rc +++ b/base/system/winlogon/lang/he-IL.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "מתכונן לשינה..." IDS_SAVEYOURSETTINGS "שומר את הגדרותיך..." IDS_REACTOSISSTARTINGUP "ReactOS מופעל..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/hu-HU.rc b/base/system/winlogon/lang/hu-HU.rc index ef62ded49e..110a1bde93 100644 --- a/base/system/winlogon/lang/hu-HU.rc +++ b/base/system/winlogon/lang/hu-HU.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Hibernálás elõkészítése..." IDS_SAVEYOURSETTINGS "Beállítások mentése..." IDS_REACTOSISSTARTINGUP "A ReactOS indul..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/id-ID.rc b/base/system/winlogon/lang/id-ID.rc index 129140fff3..d48ecd14c9 100644 --- a/base/system/winlogon/lang/id-ID.rc +++ b/base/system/winlogon/lang/id-ID.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Menyiapkan untuk Hibernasi..." IDS_SAVEYOURSETTINGS "Menyimpan setelan anda..." IDS_REACTOSISSTARTINGUP "ReactOS dimulai..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/it-IT.rc b/base/system/winlogon/lang/it-IT.rc index dc2ab0d8ee..9c5556d2ed 100644 --- a/base/system/winlogon/lang/it-IT.rc +++ b/base/system/winlogon/lang/it-IT.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparazione Hibernate..." IDS_SAVEYOURSETTINGS "Salvataggio delle impostazioni personali..." IDS_REACTOSISSTARTINGUP "ReactOS sta avviandosi..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ja-JP.rc b/base/system/winlogon/lang/ja-JP.rc index 30eeb77fb2..5dbeabc573 100644 --- a/base/system/winlogon/lang/ja-JP.rc +++ b/base/system/winlogon/lang/ja-JP.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "休止状態の準備をしています..." IDS_SAVEYOURSETTINGS "設定を保存しています..." IDS_REACTOSISSTARTINGUP "ReactOS を起動しています..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/lt-LT.rc b/base/system/winlogon/lang/lt-LT.rc index 6aba0931c6..e217a4a57c 100644 --- a/base/system/winlogon/lang/lt-LT.rc +++ b/base/system/winlogon/lang/lt-LT.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Ruošiamasi išjungti įrašant..." IDS_SAVEYOURSETTINGS "Išsaugomos nuostatos..." IDS_REACTOSISSTARTINGUP "Paleidžiama ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ms-MY.rc b/base/system/winlogon/lang/ms-MY.rc index 2d2bfff416..2e5bffa455 100644 --- a/base/system/winlogon/lang/ms-MY.rc +++ b/base/system/winlogon/lang/ms-MY.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Bersedia untuk berhibernasi..." IDS_SAVEYOURSETTINGS "Menyimpan seting anda..." IDS_REACTOSISSTARTINGUP "ReactOS sedang bermula komputer anda..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/nl-NL.rc b/base/system/winlogon/lang/nl-NL.rc index fa28236f5c..c4ea1c70f7 100644 --- a/base/system/winlogon/lang/nl-NL.rc +++ b/base/system/winlogon/lang/nl-NL.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Slaapstand wordt voorbereid..." IDS_SAVEYOURSETTINGS "Persoonlijke instellingen worden opgeslagen..." IDS_REACTOSISSTARTINGUP "ReactOS is aan het opstarten..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/no-NO.rc b/base/system/winlogon/lang/no-NO.rc index 0f7ef7e4b3..56527d56bc 100644 --- a/base/system/winlogon/lang/no-NO.rc +++ b/base/system/winlogon/lang/no-NO.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Forbreder dvalemodus..." IDS_SAVEYOURSETTINGS "Lagrer innstillingene..." IDS_REACTOSISSTARTINGUP "ReactOS starter opp..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/pl-PL.rc b/base/system/winlogon/lang/pl-PL.rc index 71e8e7828c..6bcff29401 100644 --- a/base/system/winlogon/lang/pl-PL.rc +++ b/base/system/winlogon/lang/pl-PL.rc @@ -56,6 +56,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Trwa przygotowywanie do hibernacji..." IDS_SAVEYOURSETTINGS "Trwa zapisywanie ustawień..." IDS_REACTOSISSTARTINGUP "Trwa uruchamianie systemu ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/pt-BR.rc b/base/system/winlogon/lang/pt-BR.rc index 7715d3242c..691855be07 100644 --- a/base/system/winlogon/lang/pt-BR.rc +++ b/base/system/winlogon/lang/pt-BR.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Preparando para Hibernar..." IDS_SAVEYOURSETTINGS "Salvando suas configurações..." IDS_REACTOSISSTARTINGUP "ReactOS está iniciando..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index d8b13f0309..30bdee4a92 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -58,6 +58,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Stare de hibernare în curs de pregătire…" IDS_SAVEYOURSETTINGS "Configurații personale în curs de păstrare…" IDS_REACTOSISSTARTINGUP "Sistem de operare în curs de pornire…" + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/ru-RU.rc b/base/system/winlogon/lang/ru-RU.rc index e38d1ff591..a8d1df0525 100644 --- a/base/system/winlogon/lang/ru-RU.rc +++ b/base/system/winlogon/lang/ru-RU.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Подготовка к переходу в спящий режим..." IDS_SAVEYOURSETTINGS "Сохраняются настройки..." IDS_REACTOSISSTARTINGUP "ReactOS загружается..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/sk-SK.rc b/base/system/winlogon/lang/sk-SK.rc index 59447f5e04..0b151f349a 100644 --- a/base/system/winlogon/lang/sk-SK.rc +++ b/base/system/winlogon/lang/sk-SK.rc @@ -54,6 +54,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Systém sa pripravuje na prechod do režimu dlhodobého spánku..." IDS_SAVEYOURSETTINGS "Systém ukladá Vaše nastavenia..." IDS_REACTOSISSTARTINGUP "Systém ReactOS sa spúšťa..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/sq-AL.rc b/base/system/winlogon/lang/sq-AL.rc index 699ec03d25..5051bf3745 100644 --- a/base/system/winlogon/lang/sq-AL.rc +++ b/base/system/winlogon/lang/sq-AL.rc @@ -53,6 +53,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Pergatitet per letargji..." IDS_SAVEYOURSETTINGS "Ruan konfigurimin tuaj..." IDS_REACTOSISSTARTINGUP "ReactOS po fillon..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/sv-SE.rc b/base/system/winlogon/lang/sv-SE.rc index 6f1c3e42d6..a9451e329e 100644 --- a/base/system/winlogon/lang/sv-SE.rc +++ b/base/system/winlogon/lang/sv-SE.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Förbereder för viloläge..." IDS_SAVEYOURSETTINGS "Sparar dina inställningar..." IDS_REACTOSISSTARTINGUP "ReactOS startas..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc index 2a3119823f..3e7e4b609e 100644 --- a/base/system/winlogon/lang/tr-TR.rc +++ b/base/system/winlogon/lang/tr-TR.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Anıkta Beklemeye Anıklanıyor..." IDS_SAVEYOURSETTINGS "Ayarlarınız Saklanıyor..." IDS_REACTOSISSTARTINGUP "ReactOS Başlatılıyor..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/uk-UA.rc b/base/system/winlogon/lang/uk-UA.rc index d88737ca63..dfccc9ab4b 100644 --- a/base/system/winlogon/lang/uk-UA.rc +++ b/base/system/winlogon/lang/uk-UA.rc @@ -49,6 +49,8 @@ BEGIN IDS_PREPARETOHIBERNATE "Підготовка до сплячого режиму..." IDS_SAVEYOURSETTINGS "Збереження параметрів..." IDS_REACTOSISSTARTINGUP "Запуск ReactOS..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/zh-CN.rc b/base/system/winlogon/lang/zh-CN.rc index 346dc27fc2..328b22dd39 100644 --- a/base/system/winlogon/lang/zh-CN.rc +++ b/base/system/winlogon/lang/zh-CN.rc @@ -52,6 +52,8 @@ BEGIN IDS_PREPARETOHIBERNATE "正在准备休眠..." IDS_SAVEYOURSETTINGS "正在保存设置..." IDS_REACTOSISSTARTINGUP "ReactOS 正在启动..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/lang/zh-TW.rc b/base/system/winlogon/lang/zh-TW.rc index 580707a5c3..a2d45339c0 100644 --- a/base/system/winlogon/lang/zh-TW.rc +++ b/base/system/winlogon/lang/zh-TW.rc @@ -51,6 +51,8 @@ BEGIN IDS_PREPARETOHIBERNATE "正在準備休眠..." IDS_SAVEYOURSETTINGS "正在儲存設定..." IDS_REACTOSISSTARTINGUP "ReactOS 正在啟動..." + IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" + IDS_TIMEOUTLONGFORMAT "%d days" END STRINGTABLE diff --git a/base/system/winlogon/resource.h b/base/system/winlogon/resource.h index 41037647d1..b57902dbae 100644 --- a/base/system/winlogon/resource.h +++ b/base/system/winlogon/resource.h @@ -33,5 +33,7 @@ #define IDS_PREPARETOHIBERNATE 1686 #define IDS_SAVEYOURSETTINGS 1687 #define IDS_REACTOSISSTARTINGUP 1690 +#define IDS_TIMEOUTSHORTFORMAT 1695 +#define IDS_TIMEOUTLONGFORMAT 1696 #define IDS_FAILEDACTIVATEUSERSHELL 1001 diff --git a/base/system/winlogon/shutdown.c b/base/system/winlogon/shutdown.c index d3b86aa140..f708b9690a 100644 --- a/base/system/winlogon/shutdown.c +++ b/base/system/winlogon/shutdown.c @@ -77,7 +77,8 @@ OnTimer( HWND hwndDlg, PSYS_SHUTDOWN_PARAMS pShutdownParams) { - WCHAR szBuffer[12]; + WCHAR szFormatBuffer[32]; + WCHAR szBuffer[32]; INT iSeconds, iMinutes, iHours, iDays; if (!pShutdownParams->bShuttingDown) @@ -95,12 +96,15 @@ OnTimer( iMinutes = iSeconds / 60; iSeconds -= iMinutes * 60; - swprintf(szBuffer, L"%02d:%02d:%02d", iHours, iMinutes, iSeconds); + LoadStringW(hAppInstance, IDS_TIMEOUTSHORTFORMAT, szFormatBuffer, ARRAYSIZE(szFormatBuffer)); + swprintf(szBuffer, szFormatBuffer, iHours, iMinutes, iSeconds); } else { iDays = (INT)(pShutdownParams->dwTimeout / SECONDS_PER_DAY); - swprintf(szBuffer, L"%d days", iDays); // FIXME: Localize + + LoadStringW(hAppInstance, IDS_TIMEOUTLONGFORMAT, szFormatBuffer, ARRAYSIZE(szFormatBuffer)); + swprintf(szBuffer, szFormatBuffer, iDays); } SetDlgItemTextW(hwndDlg, IDC_SYSSHUTDOWNTIMELEFT, szBuffer);

1 0

01/01: [MODE] Use more translated strings. CORE-12178
by Hermès Bélusca-Maïto 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e78e6a15680cf2e5979… commit 84e78e6a15680cf2e59796f8554a1fd2dd28e128 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Apr 29 16:56:33 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Apr 29 16:57:11 2018 +0200 [MODE] Use more translated strings. CORE-12178 --- base/applications/cmdutils/mode/lang/de-DE.rc | 14 +++++----- base/applications/cmdutils/mode/lang/en-US.rc | 14 +++++----- base/applications/cmdutils/mode/lang/ro-RO.rc | 13 +++++---- base/applications/cmdutils/mode/lang/ru-RU.rc | 13 +++++---- base/applications/cmdutils/mode/lang/tr-TR.rc | 14 +++++----- base/applications/cmdutils/mode/lang/zh-CN.rc | 14 +++++----- base/applications/cmdutils/mode/mode.c | 33 ++++++++++++----------- base/applications/cmdutils/mode/resource.h | 38 ++++++++++++++------------- 8 files changed, 86 insertions(+), 67 deletions(-) diff --git a/base/applications/cmdutils/mode/lang/de-DE.rc b/base/applications/cmdutils/mode/lang/de-DE.rc index 48ae8bcacb..883bc567ae 100644 --- a/base/applications/cmdutils/mode/lang/de-DE.rc +++ b/base/applications/cmdutils/mode/lang/de-DE.rc @@ -56,13 +56,15 @@ STRINGTABLE BEGIN IDS_ERROR_QUERY_DEVICES "ERROR: Unable to query DOS devices (0x%lx).\n" IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) returned unrecognised form %s.\n" - IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" - IDS_ERROR_INVALID_PARAMETER "ERROR: Unzulässiger Parameter - %s\n" - IDS_ERROR_ILLEGAL_DEVICE_NAME "ERROR: Unzulässiger Gerätename - %s (0x%lx)\n" - IDS_ERROR_STATUS_GET_DEVICE "ERROR: Failed to get the status for device COM%d:\n" - IDS_ERROR_STATUS_SET_DEVICE "ERROR: Failed to set the status for device COM%d:\n" + IDS_ERROR_SET_PARALLEL_STATE "ERROR: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" + IDS_ERROR_INVALID_PARAMETER "Unzulässiger Parameter - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "Unzulässiger Gerätename - %s (0x%lx)\n" + IDS_ERROR_STATUS_GET_DEVICE "Failed to get the status for device %s:\n" + IDS_ERROR_STATUS_SET_DEVICE "Failed to set the status for device %s:\n" + IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" + IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n" IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n" IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n" IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n" - IDS_ERROR_SCREEN_LINES_COL "ERROR: The screen cannot be set to the number of lines and columns specified.\n" + IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and columns specified.\n" END diff --git a/base/applications/cmdutils/mode/lang/en-US.rc b/base/applications/cmdutils/mode/lang/en-US.rc index 36cb76a573..9663215a3b 100644 --- a/base/applications/cmdutils/mode/lang/en-US.rc +++ b/base/applications/cmdutils/mode/lang/en-US.rc @@ -56,13 +56,15 @@ STRINGTABLE BEGIN IDS_ERROR_QUERY_DEVICES "ERROR: Unable to query DOS devices (0x%lx).\n" IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) returned unrecognised form %s.\n" - IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" - IDS_ERROR_INVALID_PARAMETER "ERROR: Invalid parameter - %s\n" - IDS_ERROR_ILLEGAL_DEVICE_NAME "ERROR: Illegal device name - %s (0x%lx)\n" - IDS_ERROR_STATUS_GET_DEVICE "ERROR: Failed to get the status for device COM%d:\n" - IDS_ERROR_STATUS_SET_DEVICE "ERROR: Failed to set the status for device COM%d:\n" + IDS_ERROR_SET_PARALLEL_STATE "ERROR: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" + IDS_ERROR_INVALID_PARAMETER "Invalid parameter - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "Illegal device name - %s (0x%lx)\n" + IDS_ERROR_STATUS_GET_DEVICE "Failed to get the status for device %s:\n" + IDS_ERROR_STATUS_SET_DEVICE "Failed to set the status for device %s:\n" + IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" + IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n" IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n" IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n" IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n" - IDS_ERROR_SCREEN_LINES_COL "ERROR: The screen cannot be set to the number of lines and columns specified.\n" + IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and columns specified.\n" END diff --git a/base/applications/cmdutils/mode/lang/ro-RO.rc b/base/applications/cmdutils/mode/lang/ro-RO.rc index 72822afcbe..6f92acd9db 100644 --- a/base/applications/cmdutils/mode/lang/ro-RO.rc +++ b/base/applications/cmdutils/mode/lang/ro-RO.rc @@ -64,12 +64,15 @@ STRINGTABLE BEGIN IDS_ERROR_QUERY_DEVICES "EROARE: Dispozitivul DOS (0x%lx) nu poate fi interogat.\n" IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) a returnat un formular nerecunoscut %s.\n" - IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" - IDS_ERROR_INVALID_PARAMETER "EROARE: Parametru nevalid - %s\n" - IDS_ERROR_ILLEGAL_DEVICE_NAME "EROARE: Nume eronat de dispozitiv - %s (0x%lx)\n" - IDS_ERROR_STATUS_GET_DEVICE "EROARE: Nu poate fi determinată starea dispozitivului COM%d:\n" - IDS_ERROR_STATUS_SET_DEVICE "EROARE: Nu poate fi schimbată starea pentru dispozitivul COM%d:\n" + IDS_ERROR_SET_PARALLEL_STATE "EROARE: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" + IDS_ERROR_INVALID_PARAMETER "Parametru nevalid - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "Nume eronat de dispozitiv - %s (0x%lx)\n" + IDS_ERROR_STATUS_GET_DEVICE "Nu poate fi determinată starea dispozitivului %s:\n" + IDS_ERROR_STATUS_SET_DEVICE "Nu poate fi schimbată starea pentru dispozitivul %s:\n" + IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" + IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n" IDS_ERROR_INVALID_PARITY_BITS "EROARE: Valoare eronată pentru biții de paritate %d:\n" IDS_ERROR_INVALID_STOP_BITS "EROARE: Valoare eronată pentru biții delimitori %d:\n" IDS_ERROR_NO_MEMORY "ERAORE: Nu există suficientă memorie.\n" + IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and columns specified.\n" END diff --git a/base/applications/cmdutils/mode/lang/ru-RU.rc b/base/applications/cmdutils/mode/lang/ru-RU.rc index 01c96d7fd0..7ef70b2368 100644 --- a/base/applications/cmdutils/mode/lang/ru-RU.rc +++ b/base/applications/cmdutils/mode/lang/ru-RU.rc @@ -56,12 +56,15 @@ STRINGTABLE BEGIN IDS_ERROR_QUERY_DEVICES "ОШИБКА: Не удалось опросить DOS устройства (0x%lx).\n" IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) возвратила не опознанное состояние %s.\n" - IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" - IDS_ERROR_INVALID_PARAMETER "ОШИБКА: Неверный параметр - %s\n" - IDS_ERROR_ILLEGAL_DEVICE_NAME "ОШИБКА: Недопустимое имя устройства - %s (0x%lx)\n" - IDS_ERROR_STATUS_GET_DEVICE "ОШИБКА: Не удалось получить состояние устройства COM%d:\n" - IDS_ERROR_STATUS_SET_DEVICE "ОШИБКА: Не удалось установить состояние устройства COM%d:\n" + IDS_ERROR_SET_PARALLEL_STATE "ОШИБКА: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" + IDS_ERROR_INVALID_PARAMETER "Неверный параметр - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "Недопустимое имя устройства - %s (0x%lx)\n" + IDS_ERROR_STATUS_GET_DEVICE "Не удалось получить состояние устройства %s:\n" + IDS_ERROR_STATUS_SET_DEVICE "Не удалось установить состояние устройства %s:\n" + IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" + IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n" IDS_ERROR_INVALID_PARITY_BITS "ОШИБКА: Неверное значение битов четности %d:\n" IDS_ERROR_INVALID_STOP_BITS "ОШИБКА: Неверное значение стоповых битов %d:\n" IDS_ERROR_NO_MEMORY "ОШИБКА: Недостаточно памяти.\n" + IDS_ERROR_SCREEN_LINES_COL "The screen cannot be set to the number of lines and columns specified.\n" END diff --git a/base/applications/cmdutils/mode/lang/tr-TR.rc b/base/applications/cmdutils/mode/lang/tr-TR.rc index 07003fc7d0..aa919dac56 100644 --- a/base/applications/cmdutils/mode/lang/tr-TR.rc +++ b/base/applications/cmdutils/mode/lang/tr-TR.rc @@ -58,13 +58,15 @@ STRINGTABLE BEGIN IDS_ERROR_QUERY_DEVICES "YANLIŞLIK: (0x%lx) DOS aygıtı sorgulanamaz.\n" IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s), %s tanınmamış biçim döndürdü.\n" - IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" - IDS_ERROR_INVALID_PARAMETER "YANLIŞLIK: Geçersiz değişken - %s\n" - IDS_ERROR_ILLEGAL_DEVICE_NAME "YANLIŞLIK: Geçersiz aygıt adı - %s (0x%lx)\n" - IDS_ERROR_STATUS_GET_DEVICE "YANLIŞLIK: COM%d aygıtının durumu alınamıyor:\n" - IDS_ERROR_STATUS_SET_DEVICE "YANLIŞLIK: COM%d aygıtının durumu ayarlanamıyor:\n" + IDS_ERROR_SET_PARALLEL_STATE "YANLIŞLIK: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" + IDS_ERROR_INVALID_PARAMETER "Geçersiz değişken - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "Geçersiz aygıt adı - %s (0x%lx)\n" + IDS_ERROR_STATUS_GET_DEVICE "%s: aygıtının durumu alınamıyor\n" + IDS_ERROR_STATUS_SET_DEVICE "%s: aygıtının durumu ayarlanamıyor\n" + IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" + IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n" IDS_ERROR_INVALID_PARITY_BITS "YANLIŞLIK: %d Eşlik İkilleri için geçersiz değer:\n" IDS_ERROR_INVALID_STOP_BITS "YANLIŞLIK: %d Durma İkilleri için geçersiz değer:\n" IDS_ERROR_NO_MEMORY "YANLIŞLIK: Yeterli bellek yok.\n" - IDS_ERROR_SCREEN_LINES_COL "YANLIŞLIK: Görüntülük, belirtilen yataç ve dikeç sayısına ayarlanamıyor.\n" + IDS_ERROR_SCREEN_LINES_COL "Görüntülük, belirtilen yataç ve dikeç sayısına ayarlanamıyor.\n" END diff --git a/base/applications/cmdutils/mode/lang/zh-CN.rc b/base/applications/cmdutils/mode/lang/zh-CN.rc index 6d752557a7..99bf6f6802 100644 --- a/base/applications/cmdutils/mode/lang/zh-CN.rc +++ b/base/applications/cmdutils/mode/lang/zh-CN.rc @@ -56,13 +56,15 @@ STRINGTABLE BEGIN IDS_ERROR_QUERY_DEVICES "错误: 无法查询 DOS 设备 (0x%lx)。\n" IDS_ERROR_QUERY_DEVICES_FORM " QueryDosDeviceW(%s) 返回无法识别的表格 %s。\n" - IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" - IDS_ERROR_INVALID_PARAMETER "错误: 无效参数 - %s\n" - IDS_ERROR_ILLEGAL_DEVICE_NAME "错误: 非法设备名 - %s (0x%lx)\n" - IDS_ERROR_STATUS_GET_DEVICE "错误: 无法获得设备 COM%d 的状态:\n" - IDS_ERROR_STATUS_SET_DEVICE "错误: 无法设置设备 COM%d 的状态:\n" + IDS_ERROR_SET_PARALLEL_STATE "错误: SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n" + IDS_ERROR_INVALID_PARAMETER "无效参数 - %s\n" + IDS_ERROR_ILLEGAL_DEVICE_NAME "非法设备名 - %s (0x%lx)\n" + IDS_ERROR_STATUS_GET_DEVICE "无法获得设备 %s: 的状态\n" + IDS_ERROR_STATUS_SET_DEVICE "无法设置设备 %s: 的状态\n" + IDS_ERROR_TIMEOUT_GET_DEVICE "Failed to get the timeout for device %s:\n" + IDS_ERROR_TIMEOUT_SET_DEVICE "Failed to set the timeout for device %s:\n" IDS_ERROR_INVALID_PARITY_BITS "错误: 奇偶位 %d 值无效:\n" IDS_ERROR_INVALID_STOP_BITS "错误: 终止位 %d 值无效:\n" IDS_ERROR_NO_MEMORY "错误: 内存不足。\n" - IDS_ERROR_SCREEN_LINES_COL "错误: 屏幕无法被设置成指定的行数和列数。\n" + IDS_ERROR_SCREEN_LINES_COL "屏幕无法被设置成指定的行数和列数。\n" END diff --git a/base/applications/cmdutils/mode/mode.c b/base/applications/cmdutils/mode/mode.c index 1d17ff7f00..f571549dfb 100644 --- a/base/applications/cmdutils/mode/mode.c +++ b/base/applications/cmdutils/mode/mode.c @@ -167,7 +167,7 @@ int ShowParallelStatus(INT nPortNum) } else { - ConPrintf(StdErr, L" QueryDosDeviceW(%s) returned unrecognised form %s.\n", szPortName, buffer); + ConResPrintf(StdErr, IDS_ERROR_QUERY_DEVICES_FORM, szPortName, buffer); } } else @@ -187,7 +187,7 @@ int SetParallelState(INT nPortNum) swprintf(szTargetPath, L"COM%d", nPortNum); if (!DefineDosDeviceW(DDD_REMOVE_DEFINITION, szPortName, szTargetPath)) { - ConPrintf(StdErr, L"SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n", nPortNum, szPortName, GetLastError()); + ConPrintf(StdErr, L"ERROR: SetParallelState(%d) - DefineDosDevice(%s) failed: 0x%lx\n", nPortNum, szPortName, GetLastError()); } ShowParallelStatus(nPortNum); @@ -408,12 +408,12 @@ int SetConsoleStateOld(IN PCWSTR ArgStr) Quit: ClearScreen(hConOut, &csbi); if (!ResizeTextConsole(hConOut, &csbi, Resolution)) - ConPuts(StdErr, L"The screen cannot be set to the number of lines and columns specified.\n"); + ConResPuts(StdErr, IDS_ERROR_SCREEN_LINES_COL); return 0; invalid_parameter: - ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr); + ConResPrintf(StdErr, IDS_ERROR_INVALID_PARAMETER, ArgStr); return 1; } @@ -486,7 +486,7 @@ int SetConsoleState(IN PCWSTR ArgStr) else { invalid_parameter: - ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr); + ConResPrintf(StdErr, IDS_ERROR_INVALID_PARAMETER, ArgStr); return 1; } } @@ -495,7 +495,7 @@ invalid_parameter: { ClearScreen(hConOut, &csbi); if (!ResizeTextConsole(hConOut, &csbi, Resolution)) - ConPuts(StdErr, L"The screen cannot be set to the number of lines and columns specified.\n"); + ConResPuts(StdErr, IDS_ERROR_SCREEN_LINES_COL); } else if (kbdMode) { @@ -537,7 +537,7 @@ int SetConsoleCPState(IN PCWSTR ArgStr) else { invalid_parameter: - ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr); + ConResPrintf(StdErr, IDS_ERROR_INVALID_PARAMETER, ArgStr); return 1; } @@ -570,8 +570,7 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWr if (hPort == INVALID_HANDLE_VALUE) { - ConPrintf(StdErr, L"Illegal device name - %s\n", szPortName); - ConPrintf(StdErr, L"Last error = 0x%lx\n", GetLastError()); + ConResPrintf(StdErr, IDS_ERROR_ILLEGAL_DEVICE_NAME, szPortName, GetLastError()); return FALSE; } @@ -579,7 +578,9 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWr : GetCommState(hPort, pDCB); if (!Success) { - ConPrintf(StdErr, L"Failed to %s the status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); + ConResPrintf(StdErr, + bWrite ? IDS_ERROR_STATUS_SET_DEVICE : IDS_ERROR_STATUS_GET_DEVICE, + szPortName); goto Quit; } @@ -587,7 +588,9 @@ SerialPortQuery(INT nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWr : GetCommTimeouts(hPort, pCommTimeouts); if (!Success) { - ConPrintf(StdErr, L"Failed to %s timeout status for device COM%d:\n", bWrite ? L"set" : L"get", nPortNum); + ConResPrintf(StdErr, + bWrite ? IDS_ERROR_TIMEOUT_SET_DEVICE : IDS_ERROR_TIMEOUT_GET_DEVICE, + szPortName); goto Quit; } @@ -619,12 +622,12 @@ int ShowSerialStatus(INT nPortNum) } if (dcb.Parity >= ARRAYSIZE(parity_strings)) { - ConPrintf(StdErr, L"ERROR: Invalid value for Parity Bits %d:\n", dcb.Parity); + ConResPrintf(StdErr, IDS_ERROR_INVALID_PARITY_BITS, dcb.Parity); dcb.Parity = 0; } if (dcb.StopBits >= ARRAYSIZE(stopbit_strings)) { - ConPrintf(StdErr, L"ERROR: Invalid value for Stop Bits %d:\n", dcb.StopBits); + ConResPrintf(StdErr, IDS_ERROR_INVALID_STOP_BITS, dcb.StopBits); dcb.StopBits = 0; } @@ -1087,7 +1090,7 @@ int SetSerialState(INT nPortNum, IN PCWSTR ArgStr) if (!Success) { - ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr); + ConResPrintf(StdErr, IDS_ERROR_INVALID_PARAMETER, ArgStr); return 1; } @@ -1282,7 +1285,7 @@ show_status: goto Quit; invalid_parameter: - ConPrintf(StdErr, L"Invalid parameter - %s\n", ArgStr); + ConResPrintf(StdErr, IDS_ERROR_INVALID_PARAMETER, ArgStr); goto Quit; Quit: diff --git a/base/applications/cmdutils/mode/resource.h b/base/applications/cmdutils/mode/resource.h index dac782113a..c54e8ac31e 100644 --- a/base/applications/cmdutils/mode/resource.h +++ b/base/applications/cmdutils/mode/resource.h @@ -18,20 +18,20 @@ #define IDS_COM_STATUS_PARITY 7 #define IDS_COM_STATUS_DATA_BITS 8 #define IDS_COM_STATUS_STOP_BITS 9 -#define IDS_COM_STATUS_TIMEOUT 10 -#define IDS_COM_STATUS_XON_XOFF 11 -#define IDS_COM_STATUS_CTS_HANDSHAKING 12 -#define IDS_COM_STATUS_DSR_HANDSHAKING 13 -#define IDS_COM_STATUS_DSR_SENSITIVITY 14 -#define IDS_COM_STATUS_DTR_CIRCUIT 15 -#define IDS_COM_STATUS_RTS_CIRCUIT 16 -#define IDS_CONSOLE_STATUS_LINES 17 -#define IDS_CONSOLE_STATUS_COLS 18 -#define IDS_CONSOLE_KBD_RATE 19 -#define IDS_CONSOLE_KBD_DELAY 20 -#define IDS_CONSOLE_CODEPAGE 21 -#define IDS_PRINTER_OUTPUT_NOT_REROUTED 22 -#define IDS_PRINTER_OUTPUT_REROUTED_SERIAL 23 +#define IDS_COM_STATUS_TIMEOUT 10 +#define IDS_COM_STATUS_XON_XOFF 11 +#define IDS_COM_STATUS_CTS_HANDSHAKING 12 +#define IDS_COM_STATUS_DSR_HANDSHAKING 13 +#define IDS_COM_STATUS_DSR_SENSITIVITY 14 +#define IDS_COM_STATUS_DTR_CIRCUIT 15 +#define IDS_COM_STATUS_RTS_CIRCUIT 16 +#define IDS_CONSOLE_STATUS_LINES 17 +#define IDS_CONSOLE_STATUS_COLS 18 +#define IDS_CONSOLE_KBD_RATE 19 +#define IDS_CONSOLE_KBD_DELAY 20 +#define IDS_CONSOLE_CODEPAGE 21 +#define IDS_PRINTER_OUTPUT_NOT_REROUTED 22 +#define IDS_PRINTER_OUTPUT_REROUTED_SERIAL 23 #define IDS_ERROR_QUERY_DEVICES 24 #define IDS_ERROR_QUERY_DEVICES_FORM 25 @@ -40,9 +40,11 @@ #define IDS_ERROR_ILLEGAL_DEVICE_NAME 28 #define IDS_ERROR_STATUS_GET_DEVICE 29 #define IDS_ERROR_STATUS_SET_DEVICE 30 -#define IDS_ERROR_INVALID_PARITY_BITS 31 -#define IDS_ERROR_INVALID_STOP_BITS 32 -#define IDS_ERROR_NO_MEMORY 33 -#define IDS_ERROR_SCREEN_LINES_COL 34 +#define IDS_ERROR_TIMEOUT_GET_DEVICE 31 +#define IDS_ERROR_TIMEOUT_SET_DEVICE 32 +#define IDS_ERROR_INVALID_PARITY_BITS 33 +#define IDS_ERROR_INVALID_STOP_BITS 34 +#define IDS_ERROR_NO_MEMORY 35 +#define IDS_ERROR_SCREEN_LINES_COL 36 #endif /* RESOURCE_H */

1 0

01/01: [SYSSETUP] Close the device key after the property sheet page has been released.
by Eric Kohl 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b6ebd50d3f75e61f098b0… commit b6ebd50d3f75e61f098b08b7fd23841c642c267c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 29 15:41:03 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 29 15:41:38 2018 +0200 [SYSSETUP] Close the device key after the property sheet page has been released. --- dll/win32/syssetup/proppage.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dll/win32/syssetup/proppage.c b/dll/win32/syssetup/proppage.c index 4072b224fd..0c1fcb08d1 100644 --- a/dll/win32/syssetup/proppage.c +++ b/dll/win32/syssetup/proppage.c @@ -490,9 +490,15 @@ MouseCallback( UINT uMsg, LPPROPSHEETPAGE ppsp) { + PMOUSE_INFO pMouseInfo; + + pMouseInfo = (PMOUSE_INFO)ppsp->lParam; + if (uMsg == PSPCB_RELEASE) { - HeapFree(GetProcessHeap(), 0, (PMOUSE_INFO)ppsp->lParam); + if (pMouseInfo->hDeviceKey != NULL) + RegCloseKey(pMouseInfo->hDeviceKey); + HeapFree(GetProcessHeap(), 0, pMouseInfo); } return 1;

1 0

01/01: [CALC][CLIPBRD][SOLITAIRE][SPIDER][NOTEPAD][REGEDIT][TASKMGR] Disable help menu/button
by Bișoc George 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c16f12de5268d7b46501… commit 6c16f12de5268d7b46501622842e80d82902040f Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Tue Apr 24 19:58:46 2018 +0200 Commit: David Quintana <gigaherz(a)gmail.com> CommitDate: Sun Apr 29 15:24:11 2018 +0200 [CALC][CLIPBRD][SOLITAIRE][SPIDER][NOTEPAD][REGEDIT][TASKMGR] Disable help menu/button --- base/applications/calc/winmain.c | 2 ++ base/applications/charmap/charmap.c | 2 ++ base/applications/clipbrd/clipbrd.c | 4 ++++ base/applications/games/solitaire/solitaire.cpp | 6 ++++++ base/applications/games/spider/spider.cpp | 3 +++ base/applications/notepad/main.c | 3 +++ base/applications/regedit/framewnd.c | 2 ++ base/applications/taskmgr/taskmgr.c | 2 ++ 8 files changed, 24 insertions(+) diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index 02c93a5959..e976131996 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -1269,6 +1269,8 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) return SubclassButtonProc(hWnd, wp, lp); case WM_INITDIALOG: + // For now, the Help dialog is disabled because of lacking of HTML Help support + EnableMenuItem(GetMenu(hWnd), IDM_HELP_HELP, MF_BYCOMMAND | MF_GRAYED); calc.hWnd=hWnd; #ifdef USE_KEYBOARD_HOOK diff --git a/base/applications/charmap/charmap.c b/base/applications/charmap/charmap.c index 85378ecc95..35cc8e6f9f 100644 --- a/base/applications/charmap/charmap.c +++ b/base/applications/charmap/charmap.c @@ -490,6 +490,8 @@ PanelWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { case WM_CREATE: + // For now, the Help push button is disabled because of lacking of HTML Help support + EnableWindow(GetDlgItem(hWnd, IDC_CMHELP), FALSE); return PanelOnCreate(hWnd, wParam, lParam); case WM_CLOSE: diff --git a/base/applications/clipbrd/clipbrd.c b/base/applications/clipbrd/clipbrd.c index bef831cd8b..f46daeb6e4 100644 --- a/base/applications/clipbrd/clipbrd.c +++ b/base/applications/clipbrd/clipbrd.c @@ -349,6 +349,10 @@ static LRESULT WINAPI MainWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP { Globals.hMenu = GetMenu(hWnd); Globals.hWndNext = SetClipboardViewer(hWnd); + + // For now, the Help dialog item is disabled because of lacking of HTML support + EnableMenuItem(Globals.hMenu, CMD_HELP, MF_BYCOMMAND | MF_GRAYED); + UpdateDisplayMenu(); SetDisplayFormat(0); break; diff --git a/base/applications/games/solitaire/solitaire.cpp b/base/applications/games/solitaire/solitaire.cpp index a5b9da40a7..84895cb570 100644 --- a/base/applications/games/solitaire/solitaire.cpp +++ b/base/applications/games/solitaire/solitaire.cpp @@ -277,6 +277,9 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar switch (uMsg) { case WM_INITDIALOG: + // For now, the Help dialog item is disabled because of lacking of HTML Help support + EnableMenuItem(GetMenu(hDlg), IDM_HELP_CONTENTS, MF_BYCOMMAND | MF_GRAYED); + CheckRadioButton(hDlg, IDC_OPT_DRAWONE, IDC_OPT_DRAWTHREE, (dwOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE : IDC_OPT_DRAWONE); @@ -603,6 +606,9 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) int parts[] = { 150, -1 }; RECT rcStatus; + // For now, the Help dialog item is disabled because of lacking of HTML Help support + EnableMenuItem(GetMenu(hwnd), IDM_HELP_CONTENTS, MF_BYCOMMAND | MF_GRAYED); + hwndStatus = CreateStatusWindow(WS_CHILD | WS_VISIBLE | CCS_BOTTOM | SBARS_SIZEGRIP, _T("Ready"), hwnd, 0); //SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0); diff --git a/base/applications/games/spider/spider.cpp b/base/applications/games/spider/spider.cpp index 8b5ab8b9e2..a301254bc2 100644 --- a/base/applications/games/spider/spider.cpp +++ b/base/applications/games/spider/spider.cpp @@ -310,6 +310,9 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { case WM_CREATE: { + // For now, the Help dialog is disabled because of lacking of HTML Help support + EnableMenuItem(GetMenu(hwnd), IDM_HELP_CONTENTS, MF_BYCOMMAND | MF_GRAYED); + SpiderWnd.Create(hwnd, 0, WS_CHILD | WS_VISIBLE, 0, 0, 100, 100); dwDifficulty = IDC_DIF_ONECOLOR; CreateSpider(); diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index 60d453ccb5..1540b73635 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -353,6 +353,9 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_CREATE: Globals.hMenu = GetMenu(hWnd); + + // For now, the "Help" dialog is disabled due to the lack of HTML Help support + EnableMenuItem(Globals.hMenu, CMD_HELP_CONTENTS, MF_BYCOMMAND | MF_GRAYED); break; case WM_COMMAND: diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index a16019ede2..7bddbf8158 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -1306,6 +1306,8 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa switch (message) { case WM_CREATE: + // For now, the Help dialog item is disabled because of lacking of HTML Help support + EnableMenuItem(GetMenu(hWnd), ID_HELP_HELPTOPICS, MF_BYCOMMAND | MF_GRAYED); CreateWindowExW(0, szChildClass, NULL, WS_CHILD | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, hWnd, (HMENU)0, hInst, 0); diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index edd50326ed..29afc59d4d 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -210,6 +210,8 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) switch (message) { case WM_INITDIALOG: + // For now, the Help dialog menu item is disabled because of lacking of HTML Help support + EnableMenuItem(GetMenu(hDlg), ID_HELP_TOPICS, MF_BYCOMMAND | MF_GRAYED); hMainWnd = hDlg; return OnCreate(hDlg);

1 0

01/01: [SYSSETUP] Read driver settings from and write them to the registry
by Eric Kohl 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1cb019bd21d09f6645a3f… commit 1cb019bd21d09f6645a3f57a710e4f9ed28c180b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Apr 29 14:55:57 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Apr 29 14:55:57 2018 +0200 [SYSSETUP] Read driver settings from and write them to the registry - Read the driver settings from the registry. - Write the driver settings to the registry. - Make the read-only edit control for the input buffer length look like a non-read-only one because it is controlled by the up-down control. --- dll/win32/syssetup/proppage.c | 306 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 292 insertions(+), 14 deletions(-) diff --git a/dll/win32/syssetup/proppage.c b/dll/win32/syssetup/proppage.c index eb38cf988f..4072b224fd 100644 --- a/dll/win32/syssetup/proppage.c +++ b/dll/win32/syssetup/proppage.c @@ -11,8 +11,22 @@ #define NDEBUG #include <debug.h> +typedef struct _MOUSE_INFO +{ + HKEY hDeviceKey; + DWORD dwSampleRateIndex; + DWORD dwWheelDetection; + DWORD dwInputBufferLength; + DWORD dwInitPolled; +} MOUSE_INFO, *PMOUSE_INFO; + DWORD MouseSampleRates[] = {20, 40, 60, 80, 100, 200}; +#define DEFAULT_SAMPLERATEINDEX 4 +#define DEFAULT_WHEELDETECTION 2 +#define DEFAULT_INPUTBUFFERSIZE 100 +#define DEFAULT_MINBUFFERSIZE 100 +#define DEFAULT_MAXBUFFERSIZE 300 /* * @implemented @@ -80,13 +94,42 @@ LegacyDriverPropPageProvider( static -VOID +DWORD +MouseGetSampleRateIndex( + DWORD dwSampleRate) +{ + DWORD i; + + for (i = 0; i < ARRAYSIZE(MouseSampleRates); i++) + { + if (MouseSampleRates[i] == dwSampleRate) + return i; + } + + return DEFAULT_SAMPLERATEINDEX; +} + + +static +BOOL MouseOnDialogInit( HWND hwndDlg, LPARAM lParam) { + PMOUSE_INFO pMouseInfo; WCHAR szBuffer[64]; UINT i; + DWORD dwType, dwSize; + DWORD dwSampleRate; + LONG lError; + + /* Get the pointer to the mouse info struct */ + pMouseInfo = (PMOUSE_INFO)((LPPROPSHEETPAGE)lParam)->lParam; + if (pMouseInfo == NULL) + return FALSE; + + /* Keep the pointer to the mouse info struct */ + SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (DWORD_PTR)pMouseInfo); /* Add the sample rates */ for (i = 0; i < ARRAYSIZE(MouseSampleRates); i++) @@ -99,6 +142,31 @@ MouseOnDialogInit( (LPARAM)szBuffer); } + /* Read the SampleRate parameter */ + dwSize = sizeof(DWORD); + lError = RegQueryValueExW(pMouseInfo->hDeviceKey, + L"SampleRate", + NULL, + &dwType, + (LPBYTE)&dwSampleRate, + &dwSize); + if (lError == ERROR_SUCCESS && dwType == REG_DWORD && dwSize == sizeof(DWORD)) + { + pMouseInfo->dwSampleRateIndex = MouseGetSampleRateIndex(dwSampleRate); + } + else + { + /* Set the default sample rate (100 samples per second) */ + pMouseInfo->dwSampleRateIndex = DEFAULT_SAMPLERATEINDEX; + } + + /* Set the sample rate */ + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSESAMPLERATE, + CB_SETCURSEL, + pMouseInfo->dwSampleRateIndex, + 0); + /* Add the detection options */ for (i = IDS_DETECTIONDISABLED; i <= IDS_ASSUMEPRESENT; i++) { @@ -110,18 +178,77 @@ MouseOnDialogInit( (LPARAM)szBuffer); } + /* Read the EnableWheelDetection parameter */ + dwSize = sizeof(DWORD); + lError = RegQueryValueExW(pMouseInfo->hDeviceKey, + L"EnableWheelDetection", + NULL, + &dwType, + (LPBYTE)&pMouseInfo->dwWheelDetection, + &dwSize); + if (lError != ERROR_SUCCESS || dwType != REG_DWORD || dwSize != sizeof(DWORD)) + { + /* Set the default wheel detection parameter */ + pMouseInfo->dwWheelDetection = DEFAULT_WHEELDETECTION; + } + + /* Set the wheel detection parameter */ + SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEWHEEL, + CB_SETCURSEL, + pMouseInfo->dwWheelDetection, + 0); + /* Set the input buffer length range: 100-300 */ SendDlgItemMessageW(hwndDlg, IDC_PS2MOUSEINPUTUPDN, UDM_SETRANGE32, - 100, - 300); + DEFAULT_MINBUFFERSIZE, + DEFAULT_MAXBUFFERSIZE); + + /* Read the MouseDataQueueSize parameter */ + dwSize = sizeof(DWORD); + lError = RegQueryValueExW(pMouseInfo->hDeviceKey, + L"MouseDataQueueSize", + NULL, + &dwType, + (LPBYTE)&pMouseInfo->dwInputBufferLength, + &dwSize); + if (lError != ERROR_SUCCESS || dwType != REG_DWORD || dwSize != sizeof(DWORD)) + { + /* Set the default input buffer length (100 packets) */ + pMouseInfo->dwInputBufferLength = DEFAULT_INPUTBUFFERSIZE; + } + /* Set the input buffer length */ SendDlgItemMessageW(hwndDlg, IDC_PS2MOUSEINPUTUPDN, UDM_SETPOS32, 0, - 100); + pMouseInfo->dwInputBufferLength); + + /* Read the MouseInitializePolled parameter */ + dwSize = sizeof(DWORD); + lError = RegQueryValueExW(pMouseInfo->hDeviceKey, + L"MouseInitializePolled", + NULL, + &dwType, + (LPBYTE)&pMouseInfo->dwInitPolled, + &dwSize); + if (lError != ERROR_SUCCESS || dwType != REG_DWORD || dwSize != sizeof(DWORD)) + { + /* Set the default init polled value (FALSE) */ + pMouseInfo->dwInitPolled = 0; + } + + /* Set the fast initialization option */ + SendDlgItemMessage(hwndDlg, + IDC_PS2MOUSEFASTINIT, + BM_SETCHECK, + (pMouseInfo->dwInitPolled == 0) ? BST_CHECKED : 0, + 0); + + return TRUE; } @@ -153,14 +280,14 @@ MouseOnCommand( SendDlgItemMessageW(hwndDlg, IDC_PS2MOUSESAMPLERATE, CB_SETCURSEL, - 4, + DEFAULT_SAMPLERATEINDEX, 0); /* Wheel detection: Assume wheel present */ SendDlgItemMessageW(hwndDlg, IDC_PS2MOUSEWHEEL, CB_SETCURSEL, - 2, + DEFAULT_WHEELDETECTION, 0); /* Input buffer length: 100 packets */ @@ -168,7 +295,7 @@ MouseOnCommand( IDC_PS2MOUSEINPUTUPDN, UDM_SETPOS32, 0, - 100); + DEFAULT_INPUTBUFFERSIZE); /* Fast Initialization: Checked */ SendDlgItemMessage(hwndDlg, @@ -188,6 +315,100 @@ MouseOnCommand( } +static +VOID +MouseOnApply( + HWND hwndDlg) +{ + PMOUSE_INFO pMouseInfo; + DWORD dwSampleRateIndex = 0; + DWORD dwSampleRate, dwWheelDetection; + DWORD dwInputBufferLength; + DWORD dwInitPolled; + UINT uValue; + BOOL bFailed; + INT nIndex; + + pMouseInfo = (PMOUSE_INFO)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); + + /* Get the sample rate setting and store it if it was changed */ + nIndex = SendDlgItemMessageW(hwndDlg, IDC_PS2MOUSESAMPLERATE, + CB_GETCURSEL, 0, 0); + if (nIndex == CB_ERR) + dwSampleRateIndex = DEFAULT_SAMPLERATEINDEX; + else + dwSampleRateIndex = (DWORD)nIndex; + + if (dwSampleRateIndex != pMouseInfo->dwSampleRateIndex) + { + dwSampleRate = MouseSampleRates[dwSampleRateIndex]; + RegSetValueExW(pMouseInfo->hDeviceKey, + L"SampleRate", + 0, + REG_DWORD, + (LPBYTE)&dwSampleRate, + sizeof(dwSampleRate)); + } + + /* Get the wheel detection setting and store it if it was changed */ + nIndex = SendDlgItemMessageW(hwndDlg, IDC_PS2MOUSEWHEEL, + CB_GETCURSEL, 0, 0); + if (nIndex == CB_ERR) + dwWheelDetection = DEFAULT_WHEELDETECTION; + else + dwWheelDetection = (DWORD)nIndex; + + if (dwWheelDetection != pMouseInfo->dwWheelDetection) + { + RegSetValueExW(pMouseInfo->hDeviceKey, + L"EnableWheelDetection", + 0, + REG_DWORD, + (LPBYTE)&dwWheelDetection, + sizeof(dwWheelDetection)); + } + + /* Get the input buffer length setting and store it if it was changed */ + uValue = SendDlgItemMessageW(hwndDlg, + IDC_PS2MOUSEINPUTUPDN, + UDM_GETPOS32, + 0, + (LPARAM)&bFailed); + if (bFailed) + dwInputBufferLength = DEFAULT_INPUTBUFFERSIZE; + else + dwInputBufferLength = (DWORD)uValue; + + if (dwInputBufferLength != pMouseInfo->dwInputBufferLength) + { + RegSetValueExW(pMouseInfo->hDeviceKey, + L"MouseDataQueueSize", + 0, + REG_DWORD, + (LPBYTE)&dwInputBufferLength, + sizeof(dwInputBufferLength)); + } + + /* Get the fast initialization setting and store it if it was changed */ + uValue = SendDlgItemMessage(hwndDlg, + IDC_PS2MOUSEFASTINIT, + BM_GETCHECK, + 0, + 0); + dwInitPolled = (uValue == BST_CHECKED) ? 0 : 1; + + if (dwInitPolled != pMouseInfo->dwInitPolled) + { + RegSetValueExW(pMouseInfo->hDeviceKey, + L"MouseInitializePolled", + 0, + REG_DWORD, + (LPBYTE)&dwInitPolled, + sizeof(dwInitPolled)); + } +} + + static BOOL MouseOnNotify( @@ -195,21 +416,41 @@ MouseOnNotify( WPARAM wParam, LPARAM lParam) { - switch (((LPNMHDR)lParam)->idFrom) + switch (((LPNMHDR)lParam)->code) { - case IDC_PS2MOUSEINPUTUPDN: - if (((LPNMHDR)lParam)->code == UDN_DELTAPOS) + case UDN_DELTAPOS: + if (((LPNMHDR)lParam)->idFrom == IDC_PS2MOUSEINPUTUPDN) { ((LPNMUPDOWN)lParam)->iDelta *= 10; return FALSE; } break; + + case PSN_APPLY: + MouseOnApply(hwndDlg); + return TRUE; } return FALSE; } +static +INT_PTR +MouseOnCtrlColorStatic( + HWND hwndDlg, + WPARAM wParam, + LPARAM lParam) +{ + if ((HWND)lParam != GetDlgItem(hwndDlg, IDC_PS2MOUSEINPUTLEN)) + return 0; + + SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT)); + SetBkColor((HDC)wParam, GetSysColor(COLOR_WINDOW)); + return (INT_PTR)GetSysColorBrush(COLOR_WINDOW); +} + + static INT_PTR CALLBACK @@ -224,8 +465,7 @@ MouseDlgProc( switch (uMsg) { case WM_INITDIALOG: - MouseOnDialogInit(hwndDlg, lParam); - return TRUE; + return MouseOnDialogInit(hwndDlg, lParam); case WM_COMMAND: MouseOnCommand(hwndDlg, wParam, lParam); @@ -234,12 +474,30 @@ MouseDlgProc( case WM_NOTIFY: return MouseOnNotify(hwndDlg, wParam, lParam); + case WM_CTLCOLORSTATIC: + return MouseOnCtrlColorStatic(hwndDlg, wParam, lParam); } return FALSE; } +static +UINT +CALLBACK +MouseCallback( + HWND hWnd, + UINT uMsg, + LPPROPSHEETPAGE ppsp) +{ + if (uMsg == PSPCB_RELEASE) + { + HeapFree(GetProcessHeap(), 0, (PMOUSE_INFO)ppsp->lParam); + } + + return 1; +} + /* * @implemented @@ -253,6 +511,7 @@ PS2MousePropPageProvider( { PROPSHEETPAGEW PropSheetPage; HPROPSHEETPAGE hPropSheetPage; + PMOUSE_INFO pMouseInfo; DPRINT("PS2MousePropPageProvider(%p %p %lx)\n", lpPropSheetPageRequest, lpfnAddPropSheetPageProc, lParam); @@ -260,18 +519,36 @@ PS2MousePropPageProvider( if (lpPropSheetPageRequest->PageRequested != SPPSR_ENUM_ADV_DEVICE_PROPERTIES) return FALSE; + pMouseInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MOUSE_INFO)); + if (pMouseInfo == NULL) + return FALSE; + + pMouseInfo->hDeviceKey = SetupDiOpenDevRegKey(lpPropSheetPageRequest->DeviceInfoSet, + lpPropSheetPageRequest->DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + KEY_ALL_ACCESS); + if (pMouseInfo->hDeviceKey == INVALID_HANDLE_VALUE) + { + DPRINT1("SetupDiOpenDevRegKey() failed (Error %lu)\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, pMouseInfo); + return FALSE; + } + PropSheetPage.dwSize = sizeof(PROPSHEETPAGEW); PropSheetPage.dwFlags = 0; PropSheetPage.hInstance = hDllInstance; PropSheetPage.pszTemplate = MAKEINTRESOURCE(IDD_PS2MOUSEPROPERTIES); PropSheetPage.pfnDlgProc = MouseDlgProc; - PropSheetPage.lParam = 0; - PropSheetPage.pfnCallback = NULL; + PropSheetPage.lParam = (LPARAM)pMouseInfo; + PropSheetPage.pfnCallback = MouseCallback; hPropSheetPage = CreatePropertySheetPageW(&PropSheetPage); if (hPropSheetPage == NULL) { DPRINT1("CreatePropertySheetPageW() failed!\n"); + HeapFree(GetProcessHeap(), 0, pMouseInfo); return FALSE; } @@ -279,6 +556,7 @@ PS2MousePropPageProvider( { DPRINT1("lpfnAddPropSheetPageProc() failed!\n"); DestroyPropertySheetPage(hPropSheetPage); + HeapFree(GetProcessHeap(), 0, pMouseInfo); return FALSE; }

1 0

02/02: [FASTFAT] Reduce the number of local declaration.
by Pierre Schweitzer 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00e843b1edf2e20272169… commit 00e843b1edf2e20272169ac80be3268d7db64112 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 29 12:33:53 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 29 12:33:53 2018 +0200 [FASTFAT] Reduce the number of local declaration. --- drivers/filesystems/fastfat/iface.c | 14 -------------- drivers/filesystems/fastfat/vfat.h | 8 ++++++++ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/filesystems/fastfat/iface.c b/drivers/filesystems/fastfat/iface.c index 903b1af3d6..41653a2549 100644 --- a/drivers/filesystems/fastfat/iface.c +++ b/drivers/filesystems/fastfat/iface.c @@ -30,24 +30,10 @@ #define NDEBUG #include <debug.h> -#ifdef KDBG -#include <ndk/kdfuncs.h> -#include <reactos/kdros.h> -#endif - #if defined(ALLOC_PRAGMA) #pragma alloc_text(INIT, DriverEntry) #endif -#ifdef KDBG -BOOLEAN -NTAPI -vfatKdbgHandler( - IN PCHAR Command, - IN ULONG Argc, - IN PCH Argv[]); -#endif - /* GLOBALS *****************************************************************/ PVFAT_GLOBAL_DATA VfatGlobalData; diff --git a/drivers/filesystems/fastfat/vfat.h b/drivers/filesystems/fastfat/vfat.h index 0de6a486a0..5bb5289feb 100644 --- a/drivers/filesystems/fastfat/vfat.h +++ b/drivers/filesystems/fastfat/vfat.h @@ -5,6 +5,10 @@ #include <ntdddisk.h> #include <dos.h> #include <pseh/pseh2.h> +#ifdef KDBG +#include <ndk/kdfuncs.h> +#include <reactos/kdros.h> +#endif #ifdef __GNUC__ #define INIT_SECTION __attribute__((section ("INIT"))) @@ -1042,6 +1046,10 @@ DriverEntry( PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); +#ifdef KDBG +/* kdbg.c */ +KDBG_CLI_ROUTINE vfatKdbgHandler; +#endif /* misc.c */

1 0

01/02: [SDK] Enforce callback type for KdRosRegisterCliCallback(), KdRosDeregisterCliCallback().
by Pierre Schweitzer 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dc4d408b2d04cb953c73… commit 3dc4d408b2d04cb953c7361a9ad5b428f77c4669 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 29 12:33:14 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 29 12:33:14 2018 +0200 [SDK] Enforce callback type for KdRosRegisterCliCallback(), KdRosDeregisterCliCallback(). --- sdk/include/reactos/kdros.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/kdros.h b/sdk/include/reactos/kdros.h index 30d85b64e6..50ede783eb 100644 --- a/sdk/include/reactos/kdros.h +++ b/sdk/include/reactos/kdros.h @@ -46,10 +46,18 @@ KdRosDumpStackFrames( } #if defined(KDBG) +typedef +BOOLEAN +(NTAPI KDBG_CLI_ROUTINE)( + IN PCHAR Command, + IN ULONG Argc, + IN PCH Argv[]); +typedef KDBG_CLI_ROUTINE *PKDBG_CLI_ROUTINE; + FORCEINLINE ULONG KdRosRegisterCliCallback( - PVOID Callback) + PKDBG_CLI_ROUTINE Callback) { return KdSystemDebugControl('RbdK', Callback, FALSE, 0, 0, 0, 0); } @@ -57,7 +65,7 @@ KdRosRegisterCliCallback( FORCEINLINE VOID KdRosDeregisterCliCallback( - PVOID Callback) + PKDBG_CLI_ROUTINE Callback) { KdSystemDebugControl('RbdK', Callback, TRUE, 0, 0, 0, 0); }

1 0

02/02: [FASTFAT] Use KdRosRegisterCliCallback() to register in KDBG.
by Pierre Schweitzer 29 Apr '18

29 Apr '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd8197645f583d58fcc7e… commit fd8197645f583d58fcc7e63267872be2e08a63fb Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Apr 29 12:23:18 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Apr 29 12:23:18 2018 +0200 [FASTFAT] Use KdRosRegisterCliCallback() to register in KDBG. --- drivers/filesystems/fastfat/iface.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/drivers/filesystems/fastfat/iface.c b/drivers/filesystems/fastfat/iface.c index b73854dbcd..903b1af3d6 100644 --- a/drivers/filesystems/fastfat/iface.c +++ b/drivers/filesystems/fastfat/iface.c @@ -30,21 +30,16 @@ #define NDEBUG #include <debug.h> +#ifdef KDBG +#include <ndk/kdfuncs.h> +#include <reactos/kdros.h> +#endif + #if defined(ALLOC_PRAGMA) #pragma alloc_text(INIT, DriverEntry) #endif #ifdef KDBG -NTSTATUS -NTAPI -KdSystemDebugControl(IN ULONG Command, - IN PVOID InputBuffer, - IN ULONG InputBufferLength, - OUT PVOID OutputBuffer, - IN ULONG OutputBufferLength, - IN OUT PULONG ReturnLength, - IN KPROCESSOR_MODE PreviousMode); - BOOLEAN NTAPI vfatKdbgHandler( @@ -160,7 +155,7 @@ DriverEntry( { BOOLEAN Registered; - Registered = KdSystemDebugControl('RbdK', vfatKdbgHandler, FALSE, NULL, 0, NULL, KernelMode); + Registered = KdRosRegisterCliCallback(vfatKdbgHandler); DPRINT1("FastFAT KDBG extension registered: %s\n", (Registered ? "yes" : "no")); } #endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs