Ros-diffs May 2023

ros-diffs@reactos.org

16 participants
69 discussions

[reactos] 01/01: [TASKMGR] Add status bar description for "Properties" and "Open File Location" menu items (#5280)
by Thamatip Chitpong 17 May '23

17 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56e93b882d0c576a1b649… commit 56e93b882d0c576a1b6497a2adf8110801074f88 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Wed May 17 17:41:28 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 17 12:41:28 2023 +0200 [TASKMGR] Add status bar description for "Properties" and "Open File Location" menu items (#5280) Also fix access key collision for en-US/el-GR. --- base/applications/taskmgr/lang/bg-BG.rc | 2 ++ base/applications/taskmgr/lang/cs-CZ.rc | 2 ++ base/applications/taskmgr/lang/da-DK.rc | 2 ++ base/applications/taskmgr/lang/de-DE.rc | 2 ++ base/applications/taskmgr/lang/el-GR.rc | 4 +++- base/applications/taskmgr/lang/en-US.rc | 4 +++- base/applications/taskmgr/lang/es-ES.rc | 2 ++ base/applications/taskmgr/lang/et-EE.rc | 2 ++ base/applications/taskmgr/lang/fr-FR.rc | 2 ++ base/applications/taskmgr/lang/he-IL.rc | 2 ++ base/applications/taskmgr/lang/hu-HU.rc | 2 ++ base/applications/taskmgr/lang/id-ID.rc | 2 ++ base/applications/taskmgr/lang/it-IT.rc | 2 ++ base/applications/taskmgr/lang/ja-JP.rc | 2 ++ base/applications/taskmgr/lang/ko-KR.rc | 2 ++ base/applications/taskmgr/lang/nl-NL.rc | 2 ++ base/applications/taskmgr/lang/no-NO.rc | 2 ++ base/applications/taskmgr/lang/pl-PL.rc | 2 ++ base/applications/taskmgr/lang/pt-BR.rc | 2 ++ base/applications/taskmgr/lang/pt-PT.rc | 2 ++ base/applications/taskmgr/lang/ro-RO.rc | 2 ++ base/applications/taskmgr/lang/ru-RU.rc | 2 ++ base/applications/taskmgr/lang/sk-SK.rc | 2 ++ base/applications/taskmgr/lang/sq-AL.rc | 2 ++ base/applications/taskmgr/lang/sv-SE.rc | 2 ++ base/applications/taskmgr/lang/tr-TR.rc | 2 ++ base/applications/taskmgr/lang/uk-UA.rc | 2 ++ base/applications/taskmgr/lang/zh-CN.rc | 2 ++ base/applications/taskmgr/lang/zh-HK.rc | 2 ++ base/applications/taskmgr/lang/zh-TW.rc | 2 ++ 30 files changed, 62 insertions(+), 2 deletions(-) diff --git a/base/applications/taskmgr/lang/bg-BG.rc b/base/applications/taskmgr/lang/bg-BG.rc index 21769152a3e..f59e380b5c0 100644 --- a/base/applications/taskmgr/lang/bg-BG.rc +++ b/base/applications/taskmgr/lang/bg-BG.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Дава на действието ОБИКНОВЕНО първенство" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Дава на действието ПОНИЖЕНО първенство" ID_PROCESS_PAGE_SETPRIORITY_LOW "Дава на действието НИСКО първенство" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/cs-CZ.rc b/base/applications/taskmgr/lang/cs-CZ.rc index 2d308767205..5a98f7782c0 100644 --- a/base/applications/taskmgr/lang/cs-CZ.rc +++ b/base/applications/taskmgr/lang/cs-CZ.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Přiřadí procesu normální prioritu" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Přiřadí procesu podprůměrnou prioritu" ID_PROCESS_PAGE_SETPRIORITY_LOW "Přiřadí procesu nízkou prioritu" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/da-DK.rc b/base/applications/taskmgr/lang/da-DK.rc index fb98f06e6a3..8c5f42f8df6 100644 --- a/base/applications/taskmgr/lang/da-DK.rc +++ b/base/applications/taskmgr/lang/da-DK.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sæt proces til Normal Priotet Klasse" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sæt proces til Under Normal Priotet Klasse" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sæt proces til Lav Priotet Klasse" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/de-DE.rc b/base/applications/taskmgr/lang/de-DE.rc index 2e7bb38b5e8..365544b3df4 100644 --- a/base/applications/taskmgr/lang/de-DE.rc +++ b/base/applications/taskmgr/lang/de-DE.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Legt die Priorität auf NORMAL fest." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Legt die Priorität auf NIEDRIGER ALS NORMAL fest." ID_PROCESS_PAGE_SETPRIORITY_LOW "Legt die Priorität auf NIEDRIG fest." + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/el-GR.rc b/base/applications/taskmgr/lang/el-GR.rc index 71bc45c53df..7f5c18169e8 100644 --- a/base/applications/taskmgr/lang/el-GR.rc +++ b/base/applications/taskmgr/lang/el-GR.rc @@ -127,7 +127,7 @@ BEGIN MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Debug", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR - POPUP "Set &Priority" + POPUP "Set P&riority" BEGIN MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME MENUITEM "&High", ID_PROCESS_PAGE_SETPRIORITY_HIGH @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sets process to the NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sets process to the BELOW NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/en-US.rc b/base/applications/taskmgr/lang/en-US.rc index d82f341ec09..e05a4580a8b 100644 --- a/base/applications/taskmgr/lang/en-US.rc +++ b/base/applications/taskmgr/lang/en-US.rc @@ -125,7 +125,7 @@ BEGIN MENUITEM "End Process &Tree", ID_PROCESS_PAGE_ENDPROCESSTREE MENUITEM "&Debug", ID_PROCESS_PAGE_DEBUG MENUITEM SEPARATOR - POPUP "Set &Priority" + POPUP "Set P&riority" BEGIN MENUITEM "&Realtime", ID_PROCESS_PAGE_SETPRIORITY_REALTIME MENUITEM "&High", ID_PROCESS_PAGE_SETPRIORITY_HIGH @@ -377,6 +377,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sets process to the NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sets process to the BELOW NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/es-ES.rc b/base/applications/taskmgr/lang/es-ES.rc index bf23377607a..10db2eba609 100644 --- a/base/applications/taskmgr/lang/es-ES.rc +++ b/base/applications/taskmgr/lang/es-ES.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Establece el proceso en prioridad NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Establece el proceso en prioridad ABAJO DE LO NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Establece el proceso en prioridad BAJA" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/et-EE.rc b/base/applications/taskmgr/lang/et-EE.rc index 58227163024..a3e698d294a 100644 --- a/base/applications/taskmgr/lang/et-EE.rc +++ b/base/applications/taskmgr/lang/et-EE.rc @@ -384,6 +384,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sätib protsessi keskmisele prioriteedile" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "SSätib protsessi alla keskmise prioriteedile" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sätib protsessi madalals prioriteedile" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/fr-FR.rc b/base/applications/taskmgr/lang/fr-FR.rc index 232dcc5432b..1e599893fbd 100644 --- a/base/applications/taskmgr/lang/fr-FR.rc +++ b/base/applications/taskmgr/lang/fr-FR.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Place le processus dans la priorité NORMALE" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Place le processus dans la priorité INFÉRIRIEURE À LA NORMALE" ID_PROCESS_PAGE_SETPRIORITY_LOW "Place le processus dans la priorité BASSE" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/he-IL.rc b/base/applications/taskmgr/lang/he-IL.rc index 5d6aeb681be..12b3cdac78b 100644 --- a/base/applications/taskmgr/lang/he-IL.rc +++ b/base/applications/taskmgr/lang/he-IL.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sets process to the NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sets process to the BELOW NORMAL priority class" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sets process to the LOW priority class" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/hu-HU.rc b/base/applications/taskmgr/lang/hu-HU.rc index 5d83099f012..57915b3d3be 100644 --- a/base/applications/taskmgr/lang/hu-HU.rc +++ b/base/applications/taskmgr/lang/hu-HU.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Normál prioritásra állítja a folyamatot" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Normál alatti prioritásra állítja a folyamatot" ID_PROCESS_PAGE_SETPRIORITY_LOW "Alacsony prioritásra állítja a folyamatot" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/id-ID.rc b/base/applications/taskmgr/lang/id-ID.rc index 1387c83d940..d9d4ec45847 100644 --- a/base/applications/taskmgr/lang/id-ID.rc +++ b/base/applications/taskmgr/lang/id-ID.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Menyetel proses ke kelas prioritas NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Menyetel proses ke kelas prioritas DI BAWAH NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Menyetel proses ke kelas prioritas RENDAH" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/it-IT.rc b/base/applications/taskmgr/lang/it-IT.rc index db9b4270173..e23bf0e4e39 100644 --- a/base/applications/taskmgr/lang/it-IT.rc +++ b/base/applications/taskmgr/lang/it-IT.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Assegna al processo la classe di priorità NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Assegna al processo la classe di priorità BELOW NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Assegna al processo la classe di priorità LOW" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/ja-JP.rc b/base/applications/taskmgr/lang/ja-JP.rc index 955c7395db6..081e4e07d5f 100644 --- a/base/applications/taskmgr/lang/ja-JP.rc +++ b/base/applications/taskmgr/lang/ja-JP.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "プロセスを通常優先度クラスに設定します" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "プロセスを通常以下の優先度クラスに設定します" ID_PROCESS_PAGE_SETPRIORITY_LOW "プロセスを低優先度クラスに設定します" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/ko-KR.rc b/base/applications/taskmgr/lang/ko-KR.rc index 8126980baa4..2f949c9fd6e 100644 --- a/base/applications/taskmgr/lang/ko-KR.rc +++ b/base/applications/taskmgr/lang/ko-KR.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "프로세스 우선 순위를 보통으로 설정합니다" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "프로세스 우선 순위를 보통 미만으로 설정합니다" ID_PROCESS_PAGE_SETPRIORITY_LOW "프로세스 우선 순위를 낮음으로 설정합니다" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/nl-NL.rc b/base/applications/taskmgr/lang/nl-NL.rc index 26b7b584183..163e534191e 100644 --- a/base/applications/taskmgr/lang/nl-NL.rc +++ b/base/applications/taskmgr/lang/nl-NL.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Het proces wordt ingesteld met de prioriteitsklasse NORMAAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Proces instellen op prioriteitsklasse LAGER DAN NORMAAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Het proces wordt ingesteld met de prioriteitsklasse LAAG" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/no-NO.rc b/base/applications/taskmgr/lang/no-NO.rc index 4c542911408..6dbc5dfb5d6 100644 --- a/base/applications/taskmgr/lang/no-NO.rc +++ b/base/applications/taskmgr/lang/no-NO.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Sett prosess til NORMAL prioritet klasse" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Sett prosess til NEDENFOR NORMAL prioritet klasse" ID_PROCESS_PAGE_SETPRIORITY_LOW "Sett prosess til LAV prioritet klasse" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/pl-PL.rc b/base/applications/taskmgr/lang/pl-PL.rc index dd883054ff5..6f120d77a51 100644 --- a/base/applications/taskmgr/lang/pl-PL.rc +++ b/base/applications/taskmgr/lang/pl-PL.rc @@ -387,6 +387,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Ustawia procesowi priorytet normalny" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Ustawia procesowi priorytet poniżej normalnego" ID_PROCESS_PAGE_SETPRIORITY_LOW "Ustawia procesowi priorytet niski" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/pt-BR.rc b/base/applications/taskmgr/lang/pt-BR.rc index 4457dd7c0ab..6a6b15667aa 100644 --- a/base/applications/taskmgr/lang/pt-BR.rc +++ b/base/applications/taskmgr/lang/pt-BR.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Define o processo como tendo classe de prioridade NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Define o processo com a classe de prioridade ABAIXO DO NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Define o processo como tendo classe de prioridade BAIXA" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/pt-PT.rc b/base/applications/taskmgr/lang/pt-PT.rc index 635ee17ddbe..4457e784dd2 100644 --- a/base/applications/taskmgr/lang/pt-PT.rc +++ b/base/applications/taskmgr/lang/pt-PT.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Define o processo como tendo classe de prioridade NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Define o processo com a classe de prioridade ABAIXO DO NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Define o processo como tendo classe de prioridade BAIXA" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/ro-RO.rc b/base/applications/taskmgr/lang/ro-RO.rc index 1170b13ae94..85e91a68f48 100644 --- a/base/applications/taskmgr/lang/ro-RO.rc +++ b/base/applications/taskmgr/lang/ro-RO.rc @@ -385,6 +385,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Desemnează prioritate ordinară." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Desemnează regim neprioritar." ID_PROCESS_PAGE_SETPRIORITY_LOW "Desemnează prioritate minimă." + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/ru-RU.rc b/base/applications/taskmgr/lang/ru-RU.rc index eff0e54ff3b..61d49828887 100644 --- a/base/applications/taskmgr/lang/ru-RU.rc +++ b/base/applications/taskmgr/lang/ru-RU.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Установить для процесса Средний приоритет" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Установить для процесса приоритет Ниже среднего" ID_PROCESS_PAGE_SETPRIORITY_LOW "Установить для процесса Низкий приоритет" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/sk-SK.rc b/base/applications/taskmgr/lang/sk-SK.rc index 6e8044c3560..0e8caf1dad3 100644 --- a/base/applications/taskmgr/lang/sk-SK.rc +++ b/base/applications/taskmgr/lang/sk-SK.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Zaradí proces do triedy priorít NORMÁLNA." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Zaradí proces do triedy priorít ZNÍŽENÁ." ID_PROCESS_PAGE_SETPRIORITY_LOW "Zaradí proces do triedy priorít NÍZKA." + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/sq-AL.rc b/base/applications/taskmgr/lang/sq-AL.rc index af1a2d67e34..78e491efa73 100644 --- a/base/applications/taskmgr/lang/sq-AL.rc +++ b/base/applications/taskmgr/lang/sq-AL.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Vendos procesin ne klasat e prioritet NORMAL" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Vendos procesin ne klasat e prioritet BELOW NORMAL" ID_PROCESS_PAGE_SETPRIORITY_LOW "Vendos procesin ne klasat e prioritet LOW" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/sv-SE.rc b/base/applications/taskmgr/lang/sv-SE.rc index 510200c45b8..9f24ef57b84 100644 --- a/base/applications/taskmgr/lang/sv-SE.rc +++ b/base/applications/taskmgr/lang/sv-SE.rc @@ -381,6 +381,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Ändrar processens prioritet till normal" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Ändrar processens prioritet till under normal" ID_PROCESS_PAGE_SETPRIORITY_LOW "Ändrar processens prioritet till låg" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index 72cf3c41e9c..329fa026f32 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "İşlemi NORMAL öncelik sınıfına getirir." ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "İşlemi NORMAL ALTI öncelik sınıfına getirir." ID_PROCESS_PAGE_SETPRIORITY_LOW "İşlemi DÜŞÜK öncelik sınıfına getirir." + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/uk-UA.rc b/base/applications/taskmgr/lang/uk-UA.rc index 0a5664b9990..04fad1c41b6 100644 --- a/base/applications/taskmgr/lang/uk-UA.rc +++ b/base/applications/taskmgr/lang/uk-UA.rc @@ -379,6 +379,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Установлює клас пріоритету ""Середній"" для процесу" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Установлює клас пріоритету ""Нижче середнього"" для процесу" ID_PROCESS_PAGE_SETPRIORITY_LOW "Установлює клас пріоритету ""Низький"" для процесу" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/zh-CN.rc b/base/applications/taskmgr/lang/zh-CN.rc index 5d00256f112..59b69ceaae4 100644 --- a/base/applications/taskmgr/lang/zh-CN.rc +++ b/base/applications/taskmgr/lang/zh-CN.rc @@ -386,6 +386,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "将进程设置为正常优先级" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "将进程设置为低于正常优先级" ID_PROCESS_PAGE_SETPRIORITY_LOW "将进程设置为低优先级" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/zh-HK.rc b/base/applications/taskmgr/lang/zh-HK.rc index 2c0a99f8852..95e97208e4c 100644 --- a/base/applications/taskmgr/lang/zh-HK.rc +++ b/base/applications/taskmgr/lang/zh-HK.rc @@ -387,6 +387,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "設定處理程序優先順序為標準" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "設定處理程序優先順序為低於標準" ID_PROCESS_PAGE_SETPRIORITY_LOW "設定處理程序優先順序為低" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE diff --git a/base/applications/taskmgr/lang/zh-TW.rc b/base/applications/taskmgr/lang/zh-TW.rc index 3f8f0746b27..e9dda1201ea 100644 --- a/base/applications/taskmgr/lang/zh-TW.rc +++ b/base/applications/taskmgr/lang/zh-TW.rc @@ -387,6 +387,8 @@ BEGIN ID_PROCESS_PAGE_SETPRIORITY_NORMAL "設定處理程序優先順序為中等" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "設定處理程序優先順序為中等以下" ID_PROCESS_PAGE_SETPRIORITY_LOW "設定處理程序優先順序為低" + ID_PROCESS_PAGE_PROPERTIES "Shows process file properties" + ID_PROCESS_PAGE_OPENFILELOCATION "Opens process file location" END STRINGTABLE

1 0

[reactos] 01/01: [NTOS:KE/x64] Fix KiConvertToGuiThread
by Timo Kreuzer 16 May '23

16 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15fbcc19b9e18115ce649… commit 15fbcc19b9e18115ce649955a6291ecfd1b8ce53 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed May 10 20:28:20 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue May 16 22:03:13 2023 +0300 [NTOS:KE/x64] Fix KiConvertToGuiThread - Do not allocate a new stack, if the thread already has a large one. This prevents the function from freeing a large stack as a normal stack and subsequently leaking system PTEs. - Fix the check for failure of PsConvertToGuiThread (test eax, not rax, for being negative, because by default rax is zero extended from eax, not sign extended). This fixes an infinite loop on failure. --- ntoskrnl/ke/amd64/trap.S | 13 ++++++++++--- sdk/include/asm/ksamd64.template.h | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 150d08d8133..082160893b4 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -1041,6 +1041,11 @@ FUNC KiConvertToGuiThread .allocstack 40 .endprolog + /* Check if we already have a large stack */ + mov rax, gs:[PcCurrentThread] + cmp byte ptr [rax + KTHREAD_LargeStack], 0 + jnz AlreadyLargeStack + // NewStack = (ULONG_PTR)MmCreateKernelStack(TRUE, 0); mov cl, 1 xor rdx, rdx @@ -1050,10 +1055,10 @@ FUNC KiConvertToGuiThread test rax, rax jz KiConvertToGuiThreadFailed - /* OldStack = KeSwitchKernelStack((PVOID)NewStack, (PVOID)(NewStack - KERNEL_STACK_SIZE)); */ + /* OldStack = KeSwitchKernelStack((PVOID)NewStack, (PVOID)(NewStack - KERNEL_LARGE_STACK_COMMIT )); */ mov rcx, rax mov rdx, rax - sub rdx, KERNEL_STACK_SIZE + sub rdx, KERNEL_LARGE_STACK_COMMIT call KeSwitchKernelStack // MmDeleteKernelStack(OldStack, FALSE); @@ -1061,11 +1066,13 @@ FUNC KiConvertToGuiThread xor rdx, rdx call MmDeleteKernelStack +AlreadyLargeStack: + /* Call the worker function */ call PsConvertToGuiThread /* Check for failure */ - test rax, rax + test eax, eax js KiConvertToGuiThreadFailed /* Disable interrupts for return */ diff --git a/sdk/include/asm/ksamd64.template.h b/sdk/include/asm/ksamd64.template.h index 6fcb43149ea..db36c5767bc 100644 --- a/sdk/include/asm/ksamd64.template.h +++ b/sdk/include/asm/ksamd64.template.h @@ -1047,6 +1047,7 @@ OFFSET(KTHREAD_TrapFrame, KTHREAD, TrapFrame), OFFSET(KTHREAD_PreviousMode, KTHREAD, PreviousMode), OFFSET(KTHREAD_KernelStack, KTHREAD, KernelStack), OFFSET(KTHREAD_UserApcPending, KTHREAD, ApcState.UserApcPending), +OFFSET(KTHREAD_LargeStack, KTHREAD, LargeStack), HEADER("KINTERRUPT"), OFFSET(KINTERRUPT_Type, KINTERRUPT, Type),

1 0

[reactos] 02/02: [USER32_APITEST] Add tests for GetClassInfo
by Timo Kreuzer 16 May '23

16 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7fd9983cbeb8a172f427… commit c7fd9983cbeb8a172f427cec87c72cb138c9d4cb Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri May 12 22:28:54 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue May 16 21:59:19 2023 +0300 [USER32_APITEST] Add tests for GetClassInfo --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + modules/rostests/apitests/user32/GetClassInfo.c | 170 +++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + .../apitests/win32nt/ntuser/NtUserGetClassInfo.c | 5 + 4 files changed, 178 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index 2ee5e76b815..4ab323f327c 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -15,6 +15,7 @@ list(APPEND SOURCE desktop.c EmptyClipboard.c EnumDisplaySettings.c + GetClassInfo.c GetDCEx.c GetIconInfo.c GetKeyState.c diff --git a/modules/rostests/apitests/user32/GetClassInfo.c b/modules/rostests/apitests/user32/GetClassInfo.c new file mode 100644 index 00000000000..37862c5d1db --- /dev/null +++ b/modules/rostests/apitests/user32/GetClassInfo.c @@ -0,0 +1,170 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for GetClassInfo + * COPYRIGHT: Copyright 2023 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include "precomp.h" + +static USHORT GetWinVersion(VOID) +{ + return ((GetVersion() & 0xFF) << 8) | + ((GetVersion() >> 8) & 0xFF); +} + +VOID Test_Desktop(VOID) +{ + WNDCLASSEXW wcex; + BOOL result; + + memset(&wcex, 0xab, sizeof(wcex)); + + result = GetClassInfoExW(GetModuleHandle(NULL), (LPCWSTR)WC_DESKTOP, &wcex); + ok_int(result, (ULONG_PTR)WC_DESKTOP); + + ok_hex(wcex.cbSize, 0xabababab); + ok_hex(wcex.style, 0x8); + ok(wcex.lpfnWndProc != NULL, "lpfnWndProc shound't be NULL\n"); + ok_int(wcex.cbClsExtra, 0); + ok_int(wcex.cbWndExtra, GetWinVersion() <= 0x502 ? 8 : 0); + ok_ptr(wcex.hInstance, GetModuleHandle(NULL)); + ok_ptr(wcex.hIcon, NULL); + ok(wcex.hCursor != NULL, "hCursor shound't be NULL\n"); + if (GetWinVersion() > 0x502) + ok_ptr(wcex.hbrBackground, (HBRUSH)(ULONG_PTR)2); + else + ok(wcex.hbrBackground != NULL, "hbrBackground shound't be NULL\n"); + ok_ptr(wcex.lpszMenuName, NULL); + ok_ptr(wcex.lpszClassName, (LPCWSTR)WC_DESKTOP); + ok_ptr(wcex.hIconSm, NULL); +} + +VOID Test_Dialog(VOID) +{ + WNDCLASSEXW wcex; + BOOL result; + + memset(&wcex, 0xab, sizeof(wcex)); + + result = GetClassInfoExW(GetModuleHandle(NULL), (LPCWSTR)(ULONG_PTR)WC_DIALOG, &wcex); + ok_int(result, (ULONG_PTR)WC_DIALOG); + + ok_hex(wcex.cbSize, 0xabababab); + ok_hex(wcex.style, 0x808); + ok(wcex.lpfnWndProc != NULL, "lpfnWndProc shound't be NULL\n"); + ok_int(wcex.cbClsExtra, 0); + ok_int(wcex.cbWndExtra, 30); // DLGWINDOWEXTRA + ok_ptr(wcex.hInstance, GetModuleHandle(NULL)); + ok_ptr(wcex.hIcon, NULL); + ok(wcex.hCursor != NULL, "hCursor shound't be NULL\n"); + ok_ptr(wcex.hbrBackground, NULL); + ok_ptr(wcex.lpszMenuName, NULL); + ok_ptr(wcex.lpszClassName, (LPCWSTR)(ULONG_PTR)WC_DIALOG); + ok_ptr(wcex.hIconSm, NULL); +} + +VOID Test_Menu(VOID) +{ + WNDCLASSEXW wcex; + BOOL result; + + memset(&wcex, 0xab, sizeof(wcex)); + + result = GetClassInfoExW(GetModuleHandle(NULL), (LPCWSTR)(ULONG_PTR)WC_MENU, &wcex); + ok_int(result, (ULONG_PTR)WC_MENU); + + ok_hex(wcex.cbSize, 0xabababab); + ok_hex(wcex.style, 0x803); + ok_ptr(wcex.lpfnWndProc, NULL); + ok_int(wcex.cbClsExtra, 0); + ok_int(wcex.cbWndExtra, 16); + ok_ptr(wcex.hInstance, GetModuleHandle(NULL)); + ok_ptr(wcex.hIcon, NULL); + ok(wcex.hCursor != NULL, "hCursor shound't be NULL\n"); + ok_ptr(wcex.hbrBackground, NULL); + ok_ptr(wcex.lpszMenuName, NULL); + ok_ptr(wcex.lpszClassName, (LPCWSTR)(ULONG_PTR)WC_MENU); + ok_ptr(wcex.hIconSm, NULL); +} + + +VOID Test_SwitchWnd(VOID) +{ + WNDCLASSEXW wcex; + BOOL result; + + memset(&wcex, 0xab, sizeof(wcex)); + + result = GetClassInfoExW(GetModuleHandle(NULL), (LPCWSTR)(ULONG_PTR)WC_SWITCH, &wcex); + ok_int(result, (ULONG_PTR)WC_SWITCH); + + ok_hex(wcex.cbSize, 0xabababab); + ok_hex(wcex.style, 0x803); + ok_ptr(wcex.lpfnWndProc, NULL); + ok_int(wcex.cbClsExtra, 0); + ok_int(wcex.cbWndExtra, GetWinVersion() <= 0x502 ? sizeof(ULONG_PTR) : 16); + ok_ptr(wcex.hInstance, GetModuleHandle(NULL)); + ok_ptr(wcex.hIcon, NULL); + ok(wcex.hCursor != NULL, "hCursor shound't be NULL\n"); + ok_ptr(wcex.hbrBackground, NULL); + ok_ptr(wcex.lpszMenuName, NULL); + ok_ptr(wcex.lpszClassName, (LPCWSTR)(ULONG_PTR)WC_SWITCH); + ok_ptr(wcex.hIconSm, NULL); +} + +VOID Test_Custom(VOID) +{ + WNDCLASSEXW wcex; + ATOM atom; + BOOL result; + + memset(&wcex, 0, sizeof(wcex)); + + wcex.cbSize = sizeof(WNDCLASSEXW); + wcex.style = 0x1; + wcex.lpfnWndProc = DefWindowProcW; + wcex.cbClsExtra = 1; + wcex.cbWndExtra = 5; + wcex.hInstance = GetModuleHandle(NULL); + wcex.hIcon = NULL; + wcex.hCursor = NULL; + wcex.hbrBackground = NULL; + wcex.lpszMenuName = NULL; + wcex.lpszClassName = L"ProTestClass1"; + wcex.hIconSm = 0; + + atom = RegisterClassExW(&wcex); + ok(atom != 0, "Failed to register class!\n"); + if (atom == 0) + { + skip("Failed to register class!"); + return; + } + + memset(&wcex, 0xab, sizeof(wcex)); + + result = GetClassInfoExW(GetModuleHandle(NULL), (LPCWSTR)(ULONG_PTR)atom, &wcex); + ok_int(result, atom); + + ok_hex(wcex.cbSize, 0xabababab); + ok_hex(wcex.style, 0x1); + ok_ptr(wcex.lpfnWndProc, DefWindowProcW); + ok_int(wcex.cbClsExtra, 1); + ok_int(wcex.cbWndExtra, 5); + ok_ptr(wcex.hInstance, GetModuleHandle(NULL)); + ok_ptr(wcex.hIcon, NULL); + ok_ptr(wcex.hIcon, NULL); + ok_ptr(wcex.hbrBackground, NULL); + ok_ptr(wcex.lpszMenuName, NULL); + ok_ptr(wcex.lpszClassName, (LPCWSTR)(ULONG_PTR)atom); + ok_ptr(wcex.hIconSm, NULL); +} + +START_TEST(GetClassInfo) +{ + Test_Desktop(); + Test_Dialog(); + Test_SwitchWnd(); + Test_Custom(); +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index 9b351182afb..ee6f6970d76 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -17,6 +17,7 @@ extern void func_DrawText(void); extern void func_desktop(void); extern void func_EmptyClipboard(void); extern void func_EnumDisplaySettings(void); +extern void func_GetClassInfo(void); extern void func_GetDCEx(void); extern void func_GetIconInfo(void); extern void func_GetKeyState(void); @@ -73,6 +74,7 @@ const struct test winetest_testlist[] = { "desktop", func_desktop }, { "EmptyClipboard", func_EmptyClipboard }, { "EnumDisplaySettings", func_EnumDisplaySettings }, + { "GetClassInfo", func_GetClassInfo }, { "GetDCEx", func_GetDCEx }, { "GetIconInfo", func_GetIconInfo }, { "GetKeyState", func_GetKeyState }, diff --git a/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c b/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c index 1e2a8a79265..65002ced27a 100644 --- a/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c +++ b/modules/rostests/apitests/win32nt/ntuser/NtUserGetClassInfo.c @@ -14,6 +14,11 @@ START_TEST(NtUserGetClassInfo) UNICODE_STRING us; PWSTR pwstr = NULL; +#ifdef _M_AMD64 + skip("Test is broken on x64.\n"); + return; +#endif + us.Length = 8; us.MaximumLength = 8; us.Buffer = L"test";

1 0

[reactos] 01/02: [USER32_APITEST] Add tests for [Get|Set]Window[Word|Long|LongPtr]
by Timo Kreuzer 16 May '23

16 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9675d00a2a5f1e8ee2df… commit a9675d00a2a5f1e8ee2df32c7b20e50df26e38e4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri May 12 22:35:55 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue May 16 21:59:19 2023 +0300 [USER32_APITEST] Add tests for [Get|Set]Window[Word|Long|LongPtr] --- modules/rostests/apitests/user32/CMakeLists.txt | 1 + modules/rostests/apitests/user32/GetSetWindowInt.c | 77 ++++++++++++++++++++++ modules/rostests/apitests/user32/testlist.c | 2 + 3 files changed, 80 insertions(+) diff --git a/modules/rostests/apitests/user32/CMakeLists.txt b/modules/rostests/apitests/user32/CMakeLists.txt index a9f4a4cb859..2ee5e76b815 100644 --- a/modules/rostests/apitests/user32/CMakeLists.txt +++ b/modules/rostests/apitests/user32/CMakeLists.txt @@ -20,6 +20,7 @@ list(APPEND SOURCE GetKeyState.c GetMessageTime.c GetPeekMessage.c + GetSetWindowInt.c GetSystemMetrics.c GetUserObjectInformation.c GetWindowPlacement.c diff --git a/modules/rostests/apitests/user32/GetSetWindowInt.c b/modules/rostests/apitests/user32/GetSetWindowInt.c new file mode 100644 index 00000000000..ef77cac4958 --- /dev/null +++ b/modules/rostests/apitests/user32/GetSetWindowInt.c @@ -0,0 +1,77 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Tests for GetClassInfo + * COPYRIGHT: Copyright 2023 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include "precomp.h" + +START_TEST(GetSetWindowInt) +{ + WNDCLASSEXW wcex = { 0 }; + ATOM atom; + HWND hwnd; + + wcex.cbSize = sizeof(WNDCLASSEXW); + wcex.style = 0x1; + wcex.lpfnWndProc = DefWindowProcW; + wcex.cbClsExtra = 1; + wcex.cbWndExtra = 5; + wcex.hInstance = GetModuleHandle(NULL); + wcex.lpszClassName = L"ProTestClass1"; + + atom = RegisterClassExW(&wcex); + ok(atom != 0, "Failed to register class!\n"); + + hwnd = CreateWindowW(wcex.lpszClassName, + L"WindowTitle", + WS_POPUP, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + NULL, + NULL, + GetModuleHandle(NULL), + NULL); + ok(hwnd != 0, "\n"); + + SetLastError(0xdeadbeef); + ok_hex(SetWindowWord(hwnd, 0, 0x1234), 0); + ok_hex(GetWindowWord(hwnd, 0), 0x1234); + ok_hex(SetWindowWord(hwnd, 1, 0x2345), 0x12); + ok_hex(GetWindowWord(hwnd, 1), 0x2345); + ok_hex(SetWindowWord(hwnd, 2, 0x3456), 0x23); + ok_hex(GetWindowWord(hwnd, 2), 0x3456); + ok_hex(SetWindowWord(hwnd, 3, 0x4567), 0x34); + ok_hex(GetWindowWord(hwnd, 3), 0x4567); + ok_err(0xdeadbeef); + ok_hex(SetWindowWord(hwnd, 4, 0x5678), 0); + ok_err(ERROR_INVALID_INDEX); + SetLastError(0xdeadbeef); + ok_hex(GetWindowWord(hwnd, 4), 0); + ok_err(ERROR_INVALID_INDEX); + + SetLastError(0xdeadbeef); + ok_hex(SetWindowLong(hwnd, 0, 0x12345678), 0x67564534); + ok_hex(GetWindowLong(hwnd, 0), 0x12345678); + ok_hex(SetWindowLong(hwnd, 1, 0x23456789), 0x45123456); + ok_hex(GetWindowLong(hwnd, 1), 0x23456789); + ok_err(0xdeadbeef); + ok_hex(SetWindowLong(hwnd, 2, 0x3456789a), 0); + ok_err(ERROR_INVALID_INDEX); + SetLastError(0xdeadbeef); + ok_hex(GetWindowLong(hwnd, 2), 0); + ok_err(ERROR_INVALID_INDEX); + +#ifdef _WIN64 + SetLastError(0xdeadbeef); + ok_hex(SetWindowLongPtr(hwnd, 0, 123), 0); + ok_err(ERROR_INVALID_INDEX); + SetLastError(0xdeadbeef); + ok_hex(GetWindowLongPtr(hwnd, 0), 0); + ok_err(ERROR_INVALID_INDEX); +#endif + +} diff --git a/modules/rostests/apitests/user32/testlist.c b/modules/rostests/apitests/user32/testlist.c index 34c34259eda..9b351182afb 100644 --- a/modules/rostests/apitests/user32/testlist.c +++ b/modules/rostests/apitests/user32/testlist.c @@ -22,6 +22,7 @@ extern void func_GetIconInfo(void); extern void func_GetKeyState(void); extern void func_GetMessageTime(void); extern void func_GetPeekMessage(void); +extern void func_GetSetWindowInt(void); extern void func_GetSystemMetrics(void); extern void func_GetUserObjectInformation(void); extern void func_GetWindowPlacement(void); @@ -77,6 +78,7 @@ const struct test winetest_testlist[] = { "GetKeyState", func_GetKeyState }, { "GetMessageTime", func_GetMessageTime }, { "GetPeekMessage", func_GetPeekMessage }, + { "GetSetWindowInt", func_GetSetWindowInt }, { "GetSystemMetrics", func_GetSystemMetrics }, { "GetUserObjectInformation", func_GetUserObjectInformation }, { "GetWindowPlacement", func_GetWindowPlacement },

1 0

[reactos] 01/01: [RAPPS] Centralize RAPPS exposed names: registry & user local settings (#4214)
by Hermès Bélusca-Maïto 16 May '23

16 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fefc5f48238ba760576df… commit fefc5f48238ba760576df0e5fe670045746486cf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Dec 29 01:05:00 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue May 16 12:37:49 2023 +0200 [RAPPS] Centralize RAPPS exposed names: registry & user local settings (#4214) Centralize the names of the RAPPS' registry setting sub-key, and user local settings & offline apps database sub-directories. - Change the name of the application database sub-directory from "rapps\rapps" to "RApps\appdb". - Adjust the documentation to reflect this. - Simplify CConfigParser constructor by removing GetINIFullPath(). --- base/applications/rapps/README.ENG | 10 ++++++---- base/applications/rapps/appdb.cpp | 8 ++++---- base/applications/rapps/configparser.cpp | 15 ++------------- base/applications/rapps/include/configparser.h | 2 +- base/applications/rapps/include/defines.h | 13 +++++++++++-- base/applications/rapps/misc.cpp | 2 +- base/applications/rapps/settings.cpp | 7 +++---- base/applications/rapps/settingsdlg.cpp | 2 +- base/applications/rapps/unattended.cpp | 4 ++-- 9 files changed, 31 insertions(+), 32 deletions(-) diff --git a/base/applications/rapps/README.ENG b/base/applications/rapps/README.ENG index 69d6cb1dd07..18abc406fb2 100644 --- a/base/applications/rapps/README.ENG +++ b/base/applications/rapps/README.ENG @@ -85,16 +85,18 @@ and synced every time RAPPS is launched for the first time. NOTE: You can find the most current URL in rapps.h, defined as APPLICATION_DATABASE_URL. -To generate a RAPPS database (usually a rappmgr.cab archive), use the included scripts: +To generate a RAPPS database (usually a rappmgr.cab/rappmgr2.cab archive), use +the included scripts: For Windows & other NT-derived: CreateCabFile.bat For Linux & other UNIX flavors: CreateCabFile.sh -Once the rappmgr.cab is downloaded to %appdata%\rapps, RAPPS extracts it using cabinet.dll -inside %appdata%\rapps\rapps, after that, it will parse all the *.txt files contained therein. +Once the rappmgr.cab is downloaded to the user's local %AppData%\RApps, RAPPS extracts it +using cabinet.dll inside %AppData%\RApps\appdb. After that, it will parse all the *.txt +files contained therein. -Every subsequent time the program tries to access the local .txt files +Every subsequent time, the program tries to access the local .txt files until a database update is manually triggered by the user. If the rappmgr.cab file is moved or just missing, RAPPS will download it again. diff --git a/base/applications/rapps/appdb.cpp b/base/applications/rapps/appdb.cpp index b6fb33214ac..02a404f9f53 100644 --- a/base/applications/rapps/appdb.cpp +++ b/base/applications/rapps/appdb.cpp @@ -74,7 +74,7 @@ CAppDB::EnumerateFiles() ClearList(m_Available); CPathW AppsPath = m_BasePath; - AppsPath += L"rapps"; + AppsPath += RAPPS_DATABASE_SUBDIR; CPathW WildcardPath = AppsPath; WildcardPath += L"*.txt"; @@ -95,7 +95,7 @@ CAppDB::EnumerateFiles() ATLASSERT(Info == NULL); if (!Info) { - CConfigParser *Parser = new CConfigParser(FindFileData.cFileName); + CConfigParser *Parser = new CConfigParser(CPathW(AppsPath) += FindFileData.cFileName); int Cat; if (!Parser->GetInt(L"Category", Cat)) Cat = ENUM_INVALID; @@ -130,7 +130,7 @@ CAppDB::UpdateAvailable() SettingsInfo.bUseSource ? SettingsInfo.szSourceURL : APPLICATION_DATABASE_URL, !SettingsInfo.bUseSource); CPathW AppsPath = m_BasePath; - AppsPath += L"rapps"; + AppsPath += RAPPS_DATABASE_SUBDIR; if (!ExtractFilesFromCab(APPLICATION_DATABASE_NAME, m_BasePath, AppsPath)) return; @@ -243,7 +243,7 @@ CAppDB::RemoveCached() { // Delete icons CPathW AppsPath = m_BasePath; - AppsPath += L"rapps"; + AppsPath += RAPPS_DATABASE_SUBDIR; CPathW IconPath = AppsPath; IconPath += L"icons"; DeleteWithWildcard(IconPath, L"*.ico"); diff --git a/base/applications/rapps/configparser.cpp b/base/applications/rapps/configparser.cpp index 11355b7beca..d550fbaedd4 100644 --- a/base/applications/rapps/configparser.cpp +++ b/base/applications/rapps/configparser.cpp @@ -7,6 +7,7 @@ * Copyright 2017 Alexander Shaposhnikov (sanchaez(a)reactos.org) * Copyright 2021 Mark Jansen <mark.jansen(a)reactos.org> */ + #include "rapps.h" #include <debug.h> @@ -24,19 +25,7 @@ struct CSectionNames }; static CSectionNames g_Names; -static CStringW -GetINIFullPath(const CStringW &FileName) -{ - CStringW szDir; - CStringW szBuffer; - - GetStorageDirectory(szDir); - szBuffer.Format(L"%ls\\rapps\\%ls", szDir.GetString(), FileName.GetString()); - - return szBuffer; -} - -CConfigParser::CConfigParser(const CStringW &FileName) : szConfigPath(GetINIFullPath(FileName)) +CConfigParser::CConfigParser(const CStringW &FilePath) : szConfigPath(FilePath) { CacheINI(); } diff --git a/base/applications/rapps/include/configparser.h b/base/applications/rapps/include/configparser.h index 364d073383c..4573e90f195 100644 --- a/base/applications/rapps/include/configparser.h +++ b/base/applications/rapps/include/configparser.h @@ -13,7 +13,7 @@ class CConfigParser ReadSection(CStringW &Buffer, const CStringW &Section, BOOL isArch); public: - CConfigParser(const CStringW &FileName); + CConfigParser(const CStringW &FilePath); BOOL GetString(const CStringW &KeyName, CStringW &ResultString); diff --git a/base/applications/rapps/include/defines.h b/base/applications/rapps/include/defines.h index f9d1d6d65ce..855927cb4a1 100644 --- a/base/applications/rapps/include/defines.h +++ b/base/applications/rapps/include/defines.h @@ -29,6 +29,15 @@ #include "resource.h" #include "winmain.h" -#define APPLICATION_DATABASE_URL L"https://rapps.reactos.org/rappmgr2.cab" -#define APPLICATION_DATABASE_NAME L"rappmgr2.cab" +/* Name of the registry sub-key where RAPPS settings are stored, and + * of the local AppData sub-directory where the RAPPS files are stored. */ +#define RAPPS_NAME L"RApps" + +/* Name of the RAPPS sub-directory where the offline RAPPS database is stored */ +#define RAPPS_DATABASE_SUBDIR L"appdb" + +/* URL and filename of the online RAPPS database */ +#define APPLICATION_DATABASE_URL L"https://rapps.reactos.org/rappmgr2.cab" +#define APPLICATION_DATABASE_NAME L"rappmgr2.cab" + #define MAX_STR_LEN 256 diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index a5da21d45ce..bf3b1ddc6b5 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -153,7 +153,7 @@ GetStorageDirectory(CStringW &Directory) BOOL bHasPath = SHGetSpecialFolderPathW(NULL, DirectoryStr, CSIDL_LOCAL_APPDATA, TRUE); if (bHasPath) { - PathAppendW(DirectoryStr, L"rapps"); + PathAppendW(DirectoryStr, RAPPS_NAME); } CachedDirectory.ReleaseBuffer(); diff --git a/base/applications/rapps/settings.cpp b/base/applications/rapps/settings.cpp index 4a00186f2ec..b0a0c191ebd 100644 --- a/base/applications/rapps/settings.cpp +++ b/base/applications/rapps/settings.cpp @@ -218,7 +218,7 @@ BOOL LoadSettings(PSETTINGS_INFO pSettingsInfo) { ATL::CRegKey RegKey; - if (RegKey.Open(HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", KEY_READ) != ERROR_SUCCESS) + if (RegKey.Open(HKEY_CURRENT_USER, L"Software\\ReactOS\\" RAPPS_NAME, KEY_READ) != ERROR_SUCCESS) { return FALSE; } @@ -245,9 +245,8 @@ SaveSettings(HWND hwnd, PSETTINGS_INFO pSettingsInfo) (wp.showCmd == SW_MAXIMIZE || (wp.showCmd == SW_SHOWMINIMIZED && (wp.flags & WPF_RESTORETOMAXIMIZED))); } - if (RegKey.Create( - HKEY_CURRENT_USER, L"Software\\ReactOS\\rapps", NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL) != - ERROR_SUCCESS) + if (RegKey.Create(HKEY_CURRENT_USER, L"Software\\ReactOS\\" RAPPS_NAME, NULL, + REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, NULL) != ERROR_SUCCESS) { return FALSE; } diff --git a/base/applications/rapps/settingsdlg.cpp b/base/applications/rapps/settingsdlg.cpp index b75a136c0ff..fdf99d99fb7 100644 --- a/base/applications/rapps/settingsdlg.cpp +++ b/base/applications/rapps/settingsdlg.cpp @@ -246,7 +246,7 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam) CStringW szMsgText; szMsgText.LoadStringW(IDS_URL_INVALID); - MessageBoxW(hDlg, szMsgText, NULL, 0); + MessageBoxW(hDlg, szMsgText, NULL, MB_OK); SetFocus(GetDlgItem(hDlg, IDC_SOURCE_URL)); break; } diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 8311e47a976..94fecfbeea7 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -241,13 +241,13 @@ ParseCmdAndExecute(LPWSTR lpCmdLine, BOOL bIsFirstLaunch, int nCmdShow) if (argc == 1) // RAPPS is launched without options { - // Check for if rapps MainWindow is already launched in another process + // Check whether the RAPPS MainWindow is already launched in another process HANDLE hMutex; hMutex = CreateMutexW(NULL, FALSE, szWindowClass); if ((!hMutex) || (GetLastError() == ERROR_ALREADY_EXISTS)) { - /* If already started, it is found its window */ + /* If already started, find its window */ HWND hWindow = FindWindowW(szWindowClass, NULL); /* Activate window */

1 0

[reactos] 01/01: [CPL:INPUT] Fix "Dvorak" typo in all .rc files (#5277)
by Jose Carlos Jesus 11 May '23

11 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30bc0b6b7a468150e701d… commit 30bc0b6b7a468150e701d13bb30655b6749eadf1 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu May 11 10:28:59 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 11 16:28:59 2023 +0200 [CPL:INPUT] Fix "Dvorak" typo in all .rc files (#5277) CORE-18843 --- dll/cpl/input/lang/bg-BG.rc | 2 +- dll/cpl/input/lang/cs-CZ.rc | 2 +- dll/cpl/input/lang/de-DE.rc | 2 +- dll/cpl/input/lang/el-GR.rc | 2 +- dll/cpl/input/lang/en-US.rc | 2 +- dll/cpl/input/lang/es-ES.rc | 2 +- dll/cpl/input/lang/fr-FR.rc | 2 +- dll/cpl/input/lang/he-IL.rc | 2 +- dll/cpl/input/lang/id-ID.rc | 2 +- dll/cpl/input/lang/it-IT.rc | 2 +- dll/cpl/input/lang/ja-JP.rc | 2 +- dll/cpl/input/lang/no-NO.rc | 2 +- dll/cpl/input/lang/pl-PL.rc | 2 +- dll/cpl/input/lang/pt-BR.rc | 2 +- dll/cpl/input/lang/pt-PT.rc | 2 +- dll/cpl/input/lang/ro-RO.rc | 2 +- dll/cpl/input/lang/ru-RU.rc | 2 +- dll/cpl/input/lang/sk-SK.rc | 2 +- dll/cpl/input/lang/sq-AL.rc | 2 +- dll/cpl/input/lang/tr-TR.rc | 2 +- dll/cpl/input/lang/uk-UA.rc | 2 +- dll/cpl/input/lang/zh-CN.rc | 2 +- dll/cpl/input/lang/zh-HK.rc | 2 +- dll/cpl/input/lang/zh-TW.rc | 2 +- dll/cpl/input/resource.h | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc index 3e7c9840a37..d7e7ff05828 100644 --- a/dll/cpl/input/lang/bg-BG.rc +++ b/dll/cpl/input/lang/bg-BG.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukrainian" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukrainian (Student)" IDS_UNITED_KINGDOM_LAYOUT "United Kingdom" - IDS_UNITED_STATES_DVIRAK_LAYOUT "United States-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "United States-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "United States-Dvorak for left hand" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "United States-Dvorak for right hand" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "United States-International" diff --git a/dll/cpl/input/lang/cs-CZ.rc b/dll/cpl/input/lang/cs-CZ.rc index 53b16411a2b..1b58469d1d1 100644 --- a/dll/cpl/input/lang/cs-CZ.rc +++ b/dll/cpl/input/lang/cs-CZ.rc @@ -251,7 +251,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukrajinština" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukrajinština (Student)" IDS_UNITED_KINGDOM_LAYOUT "Spojené království" - IDS_UNITED_STATES_DVIRAK_LAYOUT "Spojené státy-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "Spojené státy-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "Spojené státy-Dvorak pro levou ruku" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "Spojené státy-Dvorak pro pravou ruku" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "Spojené státy-Mezinárodní" diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc index 9ab6280cbb1..38984e61436 100644 --- a/dll/cpl/input/lang/de-DE.rc +++ b/dll/cpl/input/lang/de-DE.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukrainisch" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukrainisch (Student)" IDS_UNITED_KINGDOM_LAYOUT "Englisch (Großbritannien u. Nordirland)" - IDS_UNITED_STATES_DVIRAK_LAYOUT "Englisch (USA, Dvorak)" + IDS_UNITED_STATES_DVORAK_LAYOUT "Englisch (USA, Dvorak)" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "Englisch (USA, Dvorak für Linkshänder)" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "Englisch (USA, Dvorak für Rechtshänder)" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "Englisch (USA, International)" diff --git a/dll/cpl/input/lang/el-GR.rc b/dll/cpl/input/lang/el-GR.rc index 5cee8ff4129..fa982cd7b80 100644 --- a/dll/cpl/input/lang/el-GR.rc +++ b/dll/cpl/input/lang/el-GR.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ουκρανικά" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukrainian (Student)" IDS_UNITED_KINGDOM_LAYOUT "Ηνωμένο Βασίλειο" - IDS_UNITED_STATES_DVIRAK_LAYOUT "United States-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "United States-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "United States-Dvorak for left hand" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "United States-Dvorak for right hand" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "United States-International" diff --git a/dll/cpl/input/lang/en-US.rc b/dll/cpl/input/lang/en-US.rc index 554002777ee..9e8709b065f 100644 --- a/dll/cpl/input/lang/en-US.rc +++ b/dll/cpl/input/lang/en-US.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukrainian" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukrainian (Student)" IDS_UNITED_KINGDOM_LAYOUT "United Kingdom" - IDS_UNITED_STATES_DVIRAK_LAYOUT "United States-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "United States-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "United States-Dvorak for left hand" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "United States-Dvorak for right hand" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "United States-International" diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc index 9af3acc9d5a..9401b59f1d6 100644 --- a/dll/cpl/input/lang/es-ES.rc +++ b/dll/cpl/input/lang/es-ES.rc @@ -255,7 +255,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ucraniano" IDS_UKRAINIAN_STUDENT_LAYOUT "Ucraniano (Estudiante)" IDS_UNITED_KINGDOM_LAYOUT "Inglés (Reino Unido)" - IDS_UNITED_STATES_DVIRAK_LAYOUT "Estados Unidos, Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "Estados Unidos, Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "Estados Unidos, Dvorak para la mano izquierda" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "Estados Unidos, Dvorak para la mano derecha" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "Estados Unidos, Internacional" diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index 1a47da41c22..24ab68dab44 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -247,7 +247,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukrainien" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukrainien (Étudiants)" IDS_UNITED_KINGDOM_LAYOUT "Royaume-Uni" - IDS_UNITED_STATES_DVIRAK_LAYOUT "États-Unis-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "États-Unis-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "États-Unis-Dvorak pour la main gauche" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "États-Unis-Dvorak pour la main droite" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "États-Unis-International" diff --git a/dll/cpl/input/lang/he-IL.rc b/dll/cpl/input/lang/he-IL.rc index ca527b1a91d..e6685eb3155 100644 --- a/dll/cpl/input/lang/he-IL.rc +++ b/dll/cpl/input/lang/he-IL.rc @@ -248,7 +248,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "אוקראינית" IDS_UKRAINIAN_STUDENT_LAYOUT "אוקראינית (Student)" IDS_UNITED_KINGDOM_LAYOUT "בריטניה" - IDS_UNITED_STATES_DVIRAK_LAYOUT "ארצות הברית-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "ארצות הברית-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "ארצות הברית-Dvorak לשמאליים" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "ארצות הברית-Dvorak לימניים" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "ארצות הברית - בינלאומי" diff --git a/dll/cpl/input/lang/id-ID.rc b/dll/cpl/input/lang/id-ID.rc index 589692618d1..40667cfbc71 100644 --- a/dll/cpl/input/lang/id-ID.rc +++ b/dll/cpl/input/lang/id-ID.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukrainian" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukraina (Murid)" IDS_UNITED_KINGDOM_LAYOUT "Britania Raya" - IDS_UNITED_STATES_DVIRAK_LAYOUT "Amerika Serikat-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "Amerika Serikat-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "Amerika Serikat-Dvorak untuk Tangan Kiri" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "Amerika Serikat-Dvorak untuk Tangan Kanan" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "Amerika Serikat-Internasional" diff --git a/dll/cpl/input/lang/it-IT.rc b/dll/cpl/input/lang/it-IT.rc index 3c6c92d98fd..44acb4187b2 100644 --- a/dll/cpl/input/lang/it-IT.rc +++ b/dll/cpl/input/lang/it-IT.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ucraino" IDS_UKRAINIAN_STUDENT_LAYOUT "Ucraino(Studente)" IDS_UNITED_KINGDOM_LAYOUT "Regno Unito" - IDS_UNITED_STATES_DVIRAK_LAYOUT "Stati Uniti Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "Stati Uniti Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "Stati Uniti Dvorak per la mano sinistra" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "Stati Uniti Dvorak per la mano destra" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "Stati Uniti - Internazionale" diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index 7e63602e126..a3fbc0b8925 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "ウクライナ語" IDS_UKRAINIAN_STUDENT_LAYOUT "ウクライナ語 (学生)" IDS_UNITED_KINGDOM_LAYOUT "英国" - IDS_UNITED_STATES_DVIRAK_LAYOUT "米国 - Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "米国 - Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "米国 - Dvorak左手用" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "米国 - Dvorak右手用" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "米国 - インターナショナル" diff --git a/dll/cpl/input/lang/no-NO.rc b/dll/cpl/input/lang/no-NO.rc index fb6df7ec2b5..2dd97cb0dcd 100644 --- a/dll/cpl/input/lang/no-NO.rc +++ b/dll/cpl/input/lang/no-NO.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukrainian" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukrainian (Student)" IDS_UNITED_KINGDOM_LAYOUT "United Kingdom" - IDS_UNITED_STATES_DVIRAK_LAYOUT "United States-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "United States-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "United States-Dvorak for left hand" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "United States-Dvorak for right hand" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "United States-International" diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index ef5ecb316cd..8643faabee5 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -255,7 +255,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukraiński" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukraiński (Student)" IDS_UNITED_KINGDOM_LAYOUT "Angielski (Wielka Brytania)" - IDS_UNITED_STATES_DVIRAK_LAYOUT "Angielski (US-Dvorak)" + IDS_UNITED_STATES_DVORAK_LAYOUT "Angielski (US-Dvorak)" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "Angielski (Dvoraka dla leworęcznych)" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "Angielski (Dvoraka dla praworęcznych)" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "Międzynarodowy (USA)" diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc index 64cd9a42c75..9dbee2c881a 100644 --- a/dll/cpl/input/lang/pt-BR.rc +++ b/dll/cpl/input/lang/pt-BR.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ucraniano" IDS_UKRAINIAN_STUDENT_LAYOUT "Ucraniano (estudante)" IDS_UNITED_KINGDOM_LAYOUT "Reino Unido" - IDS_UNITED_STATES_DVIRAK_LAYOUT "Estados Unidos (Dvorak)" + IDS_UNITED_STATES_DVORAK_LAYOUT "Estados Unidos (Dvorak)" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "Estados Unidos (Dvorak para a mão esquerda)" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "Estados Unidos (Dvorak para a mão direita)" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "Estados Unidos (internacional)" diff --git a/dll/cpl/input/lang/pt-PT.rc b/dll/cpl/input/lang/pt-PT.rc index 4ad6e7836a7..b8d05992c31 100644 --- a/dll/cpl/input/lang/pt-PT.rc +++ b/dll/cpl/input/lang/pt-PT.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ucraniano" IDS_UKRAINIAN_STUDENT_LAYOUT "Ucraniano (estudante)" IDS_UNITED_KINGDOM_LAYOUT "Reino Unido" - IDS_UNITED_STATES_DVIRAK_LAYOUT "Estados Unidos (Dvorak)" + IDS_UNITED_STATES_DVORAK_LAYOUT "Estados Unidos (Dvorak)" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "Estados Unidos (Dvorak para a mão esquerda)" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "Estados Unidos (Dvorak para a mão direita)" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "Estados Unidos (internacional)" diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc index 16e888bd4b4..37ba927525c 100644 --- a/dll/cpl/input/lang/ro-RO.rc +++ b/dll/cpl/input/lang/ro-RO.rc @@ -254,7 +254,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ucraineană" IDS_UKRAINIAN_STUDENT_LAYOUT "Ucraineană (student)" IDS_UNITED_KINGDOM_LAYOUT "Britanică" - IDS_UNITED_STATES_DVIRAK_LAYOUT "Statele Unite-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "Statele Unite-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "Statele Unite-Dvorak pentru mâna stângă" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "Statele Unite-Dvorak pentru mâna dreaptă" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "Statele Unite-Internațională" diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index 413869214c3..ca1ddcccedd 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -246,7 +246,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Украинская" IDS_UKRAINIAN_STUDENT_LAYOUT "Украинская (студенческая)" IDS_UNITED_KINGDOM_LAYOUT "Британская" - IDS_UNITED_STATES_DVIRAK_LAYOUT "США - по Двораку" + IDS_UNITED_STATES_DVORAK_LAYOUT "США - по Двораку" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "США - по Двораку для левой руки" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "США - по Двораку для правой руки" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "США - международная" diff --git a/dll/cpl/input/lang/sk-SK.rc b/dll/cpl/input/lang/sk-SK.rc index 5479d745f6f..89422607055 100644 --- a/dll/cpl/input/lang/sk-SK.rc +++ b/dll/cpl/input/lang/sk-SK.rc @@ -251,7 +251,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukrainian" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukrainian (Student)" IDS_UNITED_KINGDOM_LAYOUT "United Kingdom" - IDS_UNITED_STATES_DVIRAK_LAYOUT "United States-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "United States-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "United States-Dvorak for left hand" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "United States-Dvorak for right hand" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "United States-International" diff --git a/dll/cpl/input/lang/sq-AL.rc b/dll/cpl/input/lang/sq-AL.rc index 12d1d071018..d8760da6718 100644 --- a/dll/cpl/input/lang/sq-AL.rc +++ b/dll/cpl/input/lang/sq-AL.rc @@ -250,7 +250,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukrainian" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukrainian (Student)" IDS_UNITED_KINGDOM_LAYOUT "United Kingdom" - IDS_UNITED_STATES_DVIRAK_LAYOUT "United States-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "United States-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "United States-Dvorak for left hand" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "United States-Dvorak for right hand" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "United States-International" diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc index 15172647d56..02e3367a43b 100644 --- a/dll/cpl/input/lang/tr-TR.rc +++ b/dll/cpl/input/lang/tr-TR.rc @@ -248,7 +248,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Ukraynaca" IDS_UKRAINIAN_STUDENT_LAYOUT "Ukraynaca (Öğrenci)" IDS_UNITED_KINGDOM_LAYOUT "Birleşik Krallık" - IDS_UNITED_STATES_DVIRAK_LAYOUT "ABD (Dvorak)" + IDS_UNITED_STATES_DVORAK_LAYOUT "ABD (Dvorak)" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "ABD (Dvorak - Sol el için.)" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "ABD (Dvorak - Sağ el için.)" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "ABD (Uluslararası)" diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc index 72964a71507..7e3be1e26c7 100644 --- a/dll/cpl/input/lang/uk-UA.rc +++ b/dll/cpl/input/lang/uk-UA.rc @@ -254,7 +254,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "Українська" IDS_UKRAINIAN_STUDENT_LAYOUT "Українська (студентська)" IDS_UNITED_KINGDOM_LAYOUT "Великобританія" - IDS_UNITED_STATES_DVIRAK_LAYOUT "США - Дворак" + IDS_UNITED_STATES_DVORAK_LAYOUT "США - Дворак" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "США - Дворак (для лівої руки)" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "США - Дворак (для правої руки)" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "США - міжнародна" diff --git a/dll/cpl/input/lang/zh-CN.rc b/dll/cpl/input/lang/zh-CN.rc index ae5cc27d299..41053c006e6 100644 --- a/dll/cpl/input/lang/zh-CN.rc +++ b/dll/cpl/input/lang/zh-CN.rc @@ -248,7 +248,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "乌克兰文" IDS_UKRAINIAN_STUDENT_LAYOUT "乌克兰文（学生）" IDS_UNITED_KINGDOM_LAYOUT "英国" - IDS_UNITED_STATES_DVIRAK_LAYOUT "美国英语-Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "美国英语-Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "美国英语-Dvorak（惯用左手）" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "美国英语-Dvorak（惯用右手）" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "美国英语-国际" diff --git a/dll/cpl/input/lang/zh-HK.rc b/dll/cpl/input/lang/zh-HK.rc index 4f7ac992dc4..355dd92d44e 100644 --- a/dll/cpl/input/lang/zh-HK.rc +++ b/dll/cpl/input/lang/zh-HK.rc @@ -254,7 +254,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "烏克蘭文" IDS_UKRAINIAN_STUDENT_LAYOUT "烏克蘭文（學生）" IDS_UNITED_KINGDOM_LAYOUT "英國" - IDS_UNITED_STATES_DVIRAK_LAYOUT "美國 - Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "美國 - Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "美國 - Dvorak（慣用左手）" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "美國 - Dvorak（慣用右手）" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "美國 - 國際" diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc index ec81477e1f9..e535fd54902 100644 --- a/dll/cpl/input/lang/zh-TW.rc +++ b/dll/cpl/input/lang/zh-TW.rc @@ -254,7 +254,7 @@ BEGIN IDS_UKRAINIAN_LAYOUT "烏克蘭文" IDS_UKRAINIAN_STUDENT_LAYOUT "烏克蘭文（學生）" IDS_UNITED_KINGDOM_LAYOUT "英國" - IDS_UNITED_STATES_DVIRAK_LAYOUT "美國 - Dvorak" + IDS_UNITED_STATES_DVORAK_LAYOUT "美國 - Dvorak" IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT "美國 - Dvorak（慣用左手）" IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT "美國 - Dvorak（慣用右手）" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT "美國 - 國際" diff --git a/dll/cpl/input/resource.h b/dll/cpl/input/resource.h index 31a2083f235..ca41eefa1db 100644 --- a/dll/cpl/input/resource.h +++ b/dll/cpl/input/resource.h @@ -151,7 +151,7 @@ #define IDS_BELGIAN_COMMA_LAYOUT 5089 #define IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT 5090 #define IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT 5091 -#define IDS_UNITED_STATES_DVIRAK_LAYOUT 5092 +#define IDS_UNITED_STATES_DVORAK_LAYOUT 5092 #define IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT 5093 #define IDS_ASSAMESE_LAYOUT 5094 #define IDS_BENGALI_LAYOUT 5095

1 0

[reactos] 01/01: [APPWIZ] start_params: Simplify using L"..."
by Katayama Hirofumi MZ 11 May '23

11 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e5e184cbd74e4b141e54… commit 1e5e184cbd74e4b141e54d841fb44acb2d98a104 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 11 13:01:02 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu May 11 13:01:02 2023 +0900 [APPWIZ] start_params: Simplify using L"..." --- dll/cpl/appwiz/appwiz.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dll/cpl/appwiz/appwiz.c b/dll/cpl/appwiz/appwiz.c index 2022b531eb3..83c9db9c68e 100644 --- a/dll/cpl/appwiz/appwiz.c +++ b/dll/cpl/appwiz/appwiz.c @@ -16,18 +16,17 @@ HINSTANCE hApplet = NULL; static LONG start_params(const WCHAR *params, HWND hwnd_parent) { - static const WCHAR install_geckoW[] = {'i','n','s','t','a','l','l','_','g','e','c','k','o',0}; - static const WCHAR install_monoW[] = {'i','n','s','t','a','l','l','_','m','o','n','o',0}; - - if(!params) + if (!params) return FALSE; - if(!strcmpW(params, install_geckoW)) { + if (!strcmpW(params, L"install_gecko")) + { install_addon(ADDON_GECKO, hwnd_parent); return TRUE; } - if(!strcmpW(params, install_monoW)) { + if (!strcmpW(params, L"install_mono")) + { install_addon(ADDON_MONO, hwnd_parent); return TRUE; }

1 0

[reactos] 01/01: [ADVAPI32_APITEST] IsTextUnicode: Use __LINE__ to identify test entry
by Katayama Hirofumi MZ 11 May '23

11 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df531336b179e349b5c1f… commit df531336b179e349b5c1f1b4b6c01e876022ce24 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 11 12:27:18 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu May 11 12:27:18 2023 +0900 [ADVAPI32_APITEST] IsTextUnicode: Use __LINE__ to identify test entry CORE-18837 --- modules/rostests/apitests/advapi32/IsTextUnicode.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/modules/rostests/apitests/advapi32/IsTextUnicode.c b/modules/rostests/apitests/advapi32/IsTextUnicode.c index ba10640ec62..404ab69d07d 100644 --- a/modules/rostests/apitests/advapi32/IsTextUnicode.c +++ b/modules/rostests/apitests/advapi32/IsTextUnicode.c @@ -58,10 +58,12 @@ START_TEST(IsTextUnicode) #define INVALID_FLAG 0xFFFFFFFF #define NEW_TEST(Buffer, Flags, ResultFlags, Success) \ - { (PVOID)(Buffer), sizeof((Buffer)), (Flags), (ResultFlags), (Success) } + { __LINE__, (PVOID)(Buffer), sizeof((Buffer)), (Flags), (ResultFlags), (Success) } static struct { + INT lineno; + /* Input */ PVOID Buffer; INT Size; @@ -73,57 +75,46 @@ START_TEST(IsTextUnicode) } Tests[] = { /* ANSI string */ - - // 0 NEW_TEST("ANSI string", IS_TEXT_UNICODE_ASCII16, 0, FALSE), NEW_TEST("ANSI string", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), NEW_TEST("ANSI string", INVALID_FLAG, 0, FALSE), /* UNICODE strings */ - - // 3 NEW_TEST(L"a", IS_TEXT_UNICODE_ASCII16, IS_TEXT_UNICODE_ASCII16, TRUE), NEW_TEST(L"a", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_STATISTICS | IS_TEXT_UNICODE_ASCII16, TRUE), NEW_TEST(L"a", IS_TEXT_UNICODE_STATISTICS, IS_TEXT_UNICODE_STATISTICS, TRUE), NEW_TEST(L"a", INVALID_FLAG, 0, TRUE), - // 7 NEW_TEST(L"UNICODE String 0", IS_TEXT_UNICODE_ASCII16, 0, FALSE), NEW_TEST(L"UNICODE String 0", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_STATISTICS, TRUE), NEW_TEST(L"UNICODE String 0", IS_TEXT_UNICODE_STATISTICS, IS_TEXT_UNICODE_STATISTICS, TRUE), NEW_TEST(L"UNICODE String 0", INVALID_FLAG, 0, TRUE), - // 11 NEW_TEST(L"\xFEFF" L"UNICODE String 1", IS_TEXT_UNICODE_ASCII16, 0, FALSE), NEW_TEST(L"\xFEFF" L"UNICODE String 1", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_SIGNATURE | IS_TEXT_UNICODE_CONTROLS, TRUE), NEW_TEST(L"\xFEFF" L"UNICODE String 1", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), NEW_TEST(L"\xFEFF" L"UNICODE String 1", INVALID_FLAG, 0, TRUE), - // 15 NEW_TEST(L"\xFFFE" L"UNICODE String 2", IS_TEXT_UNICODE_ASCII16, 0, FALSE), NEW_TEST(L"\xFFFE" L"UNICODE String 2", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_CONTROLS, TRUE), NEW_TEST(L"\xFFFE" L"UNICODE String 2", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), NEW_TEST(L"\xFFFE" L"UNICODE String 2", INVALID_FLAG, 0, FALSE), - // 19 NEW_TEST(L"UNICODE String 3 Привет!", IS_TEXT_UNICODE_ASCII16, 0, FALSE), NEW_TEST(L"UNICODE String 3 Привет!", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_CONTROLS | IS_TEXT_UNICODE_STATISTICS, TRUE), NEW_TEST(L"UNICODE String 3 Привет!", IS_TEXT_UNICODE_STATISTICS, IS_TEXT_UNICODE_STATISTICS, TRUE), NEW_TEST(L"UNICODE String 3 Привет!", INVALID_FLAG, 0, TRUE), - // 23 NEW_TEST(L"\xFEFF" L"UNICODE String 4 Привет!", IS_TEXT_UNICODE_ASCII16, 0, FALSE), NEW_TEST(L"\xFEFF" L"UNICODE String 4 Привет!", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_SIGNATURE | IS_TEXT_UNICODE_CONTROLS, TRUE), NEW_TEST(L"\xFEFF" L"UNICODE String 4 Привет!", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), NEW_TEST(L"\xFEFF" L"UNICODE String 4 Привет!", INVALID_FLAG, 0, TRUE), - // 27 NEW_TEST(L"\xFFFE" L"UNICODE String 5 Привет!", IS_TEXT_UNICODE_ASCII16, 0, FALSE), NEW_TEST(L"\xFFFE" L"UNICODE String 5 Привет!", IS_TEXT_UNICODE_UNICODE_MASK, IS_TEXT_UNICODE_CONTROLS, TRUE), NEW_TEST(L"\xFFFE" L"UNICODE String 5 Привет!", IS_TEXT_UNICODE_STATISTICS, 0, FALSE), NEW_TEST(L"\xFFFE" L"UNICODE String 5 Привет!", INVALID_FLAG, 0, FALSE), - // 31 /* Reverse BOM */ NEW_TEST(L"UNICODE S" L"\xFFFE" L"tring 5 Привет!", IS_TEXT_UNICODE_ILLEGAL_CHARS, IS_TEXT_UNICODE_ILLEGAL_CHARS, FALSE), /* UNICODE_NUL */ @@ -133,7 +124,6 @@ START_TEST(IsTextUnicode) /* Unicode 0xFFFF */ NEW_TEST(L"UNICODE S" L"\xFFFF" L"tring 5 Привет!", IS_TEXT_UNICODE_ILLEGAL_CHARS, IS_TEXT_UNICODE_ILLEGAL_CHARS, FALSE), - // 35 NEW_TEST(L"UNICODE String 0", IS_TEXT_UNICODE_DBCS_LEADBYTE, 0, FALSE) }; @@ -150,9 +140,9 @@ START_TEST(IsTextUnicode) { Result = Tests[i].Flags; Success = IsTextUnicode(Tests[i].Buffer, Tests[i].Size, ((Result != INVALID_FLAG) ? &Result : NULL)); - ok(Success == Tests[i].Success, "IsTextUnicode(%u) returned 0x%x, expected %s\n", i, Success, (Tests[i].Success ? "TRUE" : "FALSE")); + ok(Success == Tests[i].Success, "Line %u: IsTextUnicode() returned 0x%x, expected %s\n", Tests[i].lineno, Success, (Tests[i].Success ? "TRUE" : "FALSE")); if (Result != INVALID_FLAG) - ok(Result == Tests[i].ResultFlags, "IsTextUnicode(%u) Result returned 0x%x, expected 0x%x\n", i, Result, Tests[i].ResultFlags); + ok(Result == Tests[i].ResultFlags, "Line %u: IsTextUnicode() Result returned 0x%x, expected 0x%x\n", Tests[i].lineno, Result, Tests[i].ResultFlags); } /* Japanese */

1 0

[reactos] 01/01: [NTOS:PNP] IopEnumerateDetectedDevices(): Fix CmResourceList leak
by Stanislav Motylkov 10 May '23

10 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=059d12a5ac9b5adf5036e… commit 059d12a5ac9b5adf5036e24bb134af966f95fae3 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed May 10 20:28:47 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed May 10 20:29:29 2023 +0200 [NTOS:PNP] IopEnumerateDetectedDevices(): Fix CmResourceList leak CORE-18962 --- ntoskrnl/io/pnpmgr/pnpmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/io/pnpmgr/pnpmap.c b/ntoskrnl/io/pnpmgr/pnpmap.c index 97a170fc46d..613e95a20c6 100644 --- a/ntoskrnl/io/pnpmgr/pnpmap.c +++ b/ntoskrnl/io/pnpmgr/pnpmap.c @@ -487,6 +487,8 @@ IopEnumerateDetectedDevices( CmResourceList, BootResourcesLength + sizeof(ULONG)); + ExFreePool(CmResourceList); + if (!NT_SUCCESS(Status)) { DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status);

1 0

[reactos] 01/01: [NTUSER] Implement THREADSTATE_CHECKCONIME (#5272)
by Katayama Hirofumi MZ 10 May '23

10 May '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8946e20cbc756ed2f45e… commit d8946e20cbc756ed2f45e099ae114c2e498d8c5a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 10 20:24:21 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 10 20:24:21 2023 +0900 [NTUSER] Implement THREADSTATE_CHECKCONIME (#5272) - Add THREADSTATE_CHECKCONIME handling in NtUserGetThreadState function. CORE-11700 --- win32ss/user/ntuser/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index e24e41b9a81..ae458de7a42 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -336,7 +336,7 @@ NtUserGetThreadState( ret = (gpidLogon == PsGetCurrentProcessId()); break; case THREADSTATE_CHECKCONIME: - /* FIXME */ + ret = (IntTID2PTI(UlongToHandle(pti->rpdesk->dwConsoleThreadId)) == pti); break; }

1 0

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 May 2023