Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [REGEIT] Fix inconsistent menu state for 'Permissions'

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=763de230b2a630bf534b4… commit 763de230b2a630bf534b442677f4752880da7dc4 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 18 09:59:41 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 18 09:59:41 2020 +0200 [REGEIT] Fix inconsistent menu state for 'Permissions' - Disable the 'Permissions' item in the main menu, when 'My Computer' is selected. - Enable the 'Permissions' item in the tree view context menu. CORE-16889 --- base/applications/regedit/childwnd.c | 8 ++++++++ base/applications/regedit/lang/bg-BG.rc | 2 +- base/applications/regedit/lang/cs-CZ.rc | 2 +- base/applications/regedit/lang/de-DE.rc | 2 +- base/applications/regedit/lang/el-GR.rc | 2 +- base/applications/regedit/lang/en-US.rc | 2 +- base/applications/regedit/lang/es-ES.rc | 2 +- base/applications/regedit/lang/fr-FR.rc | 2 +- base/applications/regedit/lang/he-IL.rc | 2 +- base/applications/regedit/lang/hu-HU.rc | 2 +- base/applications/regedit/lang/id-ID.rc | 2 +- base/applications/regedit/lang/it-IT.rc | 2 +- base/applications/regedit/lang/ja-JP.rc | 2 +- base/applications/regedit/lang/ko-KR.rc | 2 +- base/applications/regedit/lang/nl-NL.rc | 2 +- base/applications/regedit/lang/no-NO.rc | 2 +- base/applications/regedit/lang/pl-PL.rc | 2 +- base/applications/regedit/lang/pt-BR.rc | 2 +- base/applications/regedit/lang/pt-PT.rc | 2 +- base/applications/regedit/lang/ro-RO.rc | 2 +- base/applications/regedit/lang/ru-RU.rc | 2 +- base/applications/regedit/lang/sk-SK.rc | 2 +- base/applications/regedit/lang/sl-SI.rc | 2 +- base/applications/regedit/lang/sq-AL.rc | 2 +- base/applications/regedit/lang/sv-SE.rc | 2 +- base/applications/regedit/lang/th-TH.rc | 2 +- base/applications/regedit/lang/tr-TR.rc | 2 +- base/applications/regedit/lang/uk-UA.rc | 2 +- base/applications/regedit/lang/zh-CN.rc | 2 +- base/applications/regedit/lang/zh-TW.rc | 2 +- 30 files changed, 37 insertions(+), 29 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index f64a1861165..4cbd30d6b2c 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -179,6 +179,11 @@ static BOOL ChildWnd_CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l case ID_TREE_EXPORT: ExportRegistryFile(g_pChildWnd->hTreeWnd); break; + case ID_TREE_PERMISSIONS: + hSelection = TreeView_GetSelection(g_pChildWnd->hTreeWnd); + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, hSelection, &hRootKey); + RegKeyEditPermissions(hWnd, hRootKey, NULL, keyPath); + break; case ID_EDIT_FIND: FindDialog(hWnd); break; @@ -579,6 +584,9 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa UpdateAddress(pnmtv->itemNew.hItem, NULL, NULL); + /* Disable the Permissions menu item for 'My Computer' */ + EnableMenuItem(hMenuFrame , ID_EDIT_PERMISSIONS, MF_BYCOMMAND | ((hParentItem == NULL) ? MF_GRAYED : MF_ENABLED)); + /* * Disable Delete/Rename menu options for 'My Computer' (first item so doesn't have any parent) * and HKEY_* keys (their parent is 'My Computer' and the previous remark applies). diff --git a/base/applications/regedit/lang/bg-BG.rc b/base/applications/regedit/lang/bg-BG.rc index e3852b60779..fc2b3f3e1b5 100644 --- a/base/applications/regedit/lang/bg-BG.rc +++ b/base/applications/regedit/lang/bg-BG.rc @@ -134,7 +134,7 @@ BEGIN MENUITEM "&Преименуване", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Износ", ID_TREE_EXPORT - MENUITEM "&Права...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Права...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Запомняне стойността на ключа", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/cs-CZ.rc b/base/applications/regedit/lang/cs-CZ.rc index 9a015459f81..71f0c8c2beb 100644 --- a/base/applications/regedit/lang/cs-CZ.rc +++ b/base/applications/regedit/lang/cs-CZ.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Přejmenovat", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exportovat", ID_TREE_EXPORT - MENUITEM "Oprá&vnění...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "Oprá&vnění...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "Z&kopírovat název klíče", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/de-DE.rc b/base/applications/regedit/lang/de-DE.rc index 8606290700a..ad065c0ad62 100644 --- a/base/applications/regedit/lang/de-DE.rc +++ b/base/applications/regedit/lang/de-DE.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Umbenennen", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exportieren", ID_TREE_EXPORT - MENUITEM "&Berechtigungen...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Berechtigungen...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "S&chlüsselnamen kopieren", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/el-GR.rc b/base/applications/regedit/lang/el-GR.rc index 18bcce6baa7..96ee88543d9 100644 --- a/base/applications/regedit/lang/el-GR.rc +++ b/base/applications/regedit/lang/el-GR.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Μετονομασία", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Εξαγωγή", ID_TREE_EXPORT - MENUITEM "&Δικαιώματα...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Δικαιώματα...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Αντιγραφή Ονόματος Κλειδιού", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/en-US.rc b/base/applications/regedit/lang/en-US.rc index a372059f51a..1305b911625 100644 --- a/base/applications/regedit/lang/en-US.rc +++ b/base/applications/regedit/lang/en-US.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Rename", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Export", ID_TREE_EXPORT - MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permissions...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/es-ES.rc b/base/applications/regedit/lang/es-ES.rc index 0584e8bf44c..3172a48f176 100644 --- a/base/applications/regedit/lang/es-ES.rc +++ b/base/applications/regedit/lang/es-ES.rc @@ -132,7 +132,7 @@ BEGIN MENUITEM "&Renombrar", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exportar", ID_TREE_EXPORT - MENUITEM "&Permisos...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permisos...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copiar nombre de clave", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/fr-FR.rc b/base/applications/regedit/lang/fr-FR.rc index 326e8904549..e507fc29c12 100644 --- a/base/applications/regedit/lang/fr-FR.rc +++ b/base/applications/regedit/lang/fr-FR.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Renommer\tF2", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exporter", ID_TREE_EXPORT - MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permissions...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copier le nom de la clé", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/he-IL.rc b/base/applications/regedit/lang/he-IL.rc index 28370594819..de43566c720 100644 --- a/base/applications/regedit/lang/he-IL.rc +++ b/base/applications/regedit/lang/he-IL.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "שנה שם", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "יצא", ID_TREE_EXPORT - MENUITEM "הרשאות...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "הרשאות...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "העתק שם מפתח", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/hu-HU.rc b/base/applications/regedit/lang/hu-HU.rc index d4dea8b263d..1f545b28cd6 100644 --- a/base/applications/regedit/lang/hu-HU.rc +++ b/base/applications/regedit/lang/hu-HU.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Rename", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Export", ID_TREE_EXPORT - MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permissions...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/id-ID.rc b/base/applications/regedit/lang/id-ID.rc index 94e394ffbb8..edb3f60fb59 100644 --- a/base/applications/regedit/lang/id-ID.rc +++ b/base/applications/regedit/lang/id-ID.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Ganti nama", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Ekspor", ID_TREE_EXPORT - MENUITEM "&Perijinan...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Perijinan...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Salin Nama Kunci", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/it-IT.rc b/base/applications/regedit/lang/it-IT.rc index 0194a148bc2..045ffcaa7a7 100644 --- a/base/applications/regedit/lang/it-IT.rc +++ b/base/applications/regedit/lang/it-IT.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Rinomina", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Esporta", ID_TREE_EXPORT - MENUITEM "&Permessi...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permessi...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copia il nome della chiave", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/ja-JP.rc b/base/applications/regedit/lang/ja-JP.rc index 8eefdad5fec..98024b3adb4 100644 --- a/base/applications/regedit/lang/ja-JP.rc +++ b/base/applications/regedit/lang/ja-JP.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "名前の変更(&R)", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "エクスポート(&E)", ID_TREE_EXPORT - MENUITEM "アクセス許可(&P)...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "アクセス許可(&P)...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "キー名のコピー(&C)", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/ko-KR.rc b/base/applications/regedit/lang/ko-KR.rc index 907e13832fa..6532d409f21 100644 --- a/base/applications/regedit/lang/ko-KR.rc +++ b/base/applications/regedit/lang/ko-KR.rc @@ -131,7 +131,7 @@ BEGIN MENUITEM "이름 바꾸기(&R)", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "내보내기(&E)", ID_TREE_EXPORT - MENUITEM "권한 설정(&P)", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "권한 설정(&P)", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "키 이름 복사(&C)", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/nl-NL.rc b/base/applications/regedit/lang/nl-NL.rc index ab5d3533f6b..b5e7a4aef01 100644 --- a/base/applications/regedit/lang/nl-NL.rc +++ b/base/applications/regedit/lang/nl-NL.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Rename", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Export", ID_TREE_EXPORT - MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permissions...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/no-NO.rc b/base/applications/regedit/lang/no-NO.rc index c05b2e66696..2c9cbea4c25 100644 --- a/base/applications/regedit/lang/no-NO.rc +++ b/base/applications/regedit/lang/no-NO.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Gi nytt navn", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Eksport", ID_TREE_EXPORT - MENUITEM "&Rettigheter...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Rettigheter...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Kopier nøkkelnavn", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/pl-PL.rc b/base/applications/regedit/lang/pl-PL.rc index 28c6fe7f70b..b940faa8024 100644 --- a/base/applications/regedit/lang/pl-PL.rc +++ b/base/applications/regedit/lang/pl-PL.rc @@ -139,7 +139,7 @@ BEGIN MENUITEM "Z&mień nazwę", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Eksportuj", ID_TREE_EXPORT - MENUITEM "&Uprawnienia..", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Uprawnienia..", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Kopiuj nazwę klucza", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/pt-BR.rc b/base/applications/regedit/lang/pt-BR.rc index 166d481fe14..c30b784aecc 100644 --- a/base/applications/regedit/lang/pt-BR.rc +++ b/base/applications/regedit/lang/pt-BR.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Renomear", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exportar", ID_TREE_EXPORT - MENUITEM "&Permissões...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permissões...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copiar nome da chave", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/pt-PT.rc b/base/applications/regedit/lang/pt-PT.rc index c6079ee503b..b0647dae245 100644 --- a/base/applications/regedit/lang/pt-PT.rc +++ b/base/applications/regedit/lang/pt-PT.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Renomear", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exportar", ID_TREE_EXPORT - MENUITEM "&Permissões...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permissões...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copiar chave 'Nome'", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/ro-RO.rc b/base/applications/regedit/lang/ro-RO.rc index 33e499a56e7..f5043f9bfab 100644 --- a/base/applications/regedit/lang/ro-RO.rc +++ b/base/applications/regedit/lang/ro-RO.rc @@ -131,7 +131,7 @@ BEGIN MENUITEM "&Redenumește", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "E&xportă", ID_TREE_EXPORT - MENUITEM "Permisiuni…", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "Permisiuni…", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copiază numele cheii", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/ru-RU.rc b/base/applications/regedit/lang/ru-RU.rc index 39e44e1558c..73026201520 100644 --- a/base/applications/regedit/lang/ru-RU.rc +++ b/base/applications/regedit/lang/ru-RU.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Переименовать", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Экспорт", ID_TREE_EXPORT - MENUITEM "Разре&шения...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "Разре&шения...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Копировать имя ключа", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/sk-SK.rc b/base/applications/regedit/lang/sk-SK.rc index 5ee8d0ec1e8..7f90514c4e2 100644 --- a/base/applications/regedit/lang/sk-SK.rc +++ b/base/applications/regedit/lang/sk-SK.rc @@ -134,7 +134,7 @@ BEGIN MENUITEM "&Premenovať", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Export", ID_TREE_EXPORT - MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permissions...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/sl-SI.rc b/base/applications/regedit/lang/sl-SI.rc index b0294655a07..45ec925868b 100644 --- a/base/applications/regedit/lang/sl-SI.rc +++ b/base/applications/regedit/lang/sl-SI.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Rename", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Export", ID_TREE_EXPORT - MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permissions...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/sq-AL.rc b/base/applications/regedit/lang/sq-AL.rc index 442d19fcadd..6d04be14717 100644 --- a/base/applications/regedit/lang/sq-AL.rc +++ b/base/applications/regedit/lang/sq-AL.rc @@ -133,7 +133,7 @@ BEGIN MENUITEM "Emero", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exporto", ID_TREE_EXPORT - MENUITEM "T'drejta...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "T'drejta...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "Kopjo emrin çelesit", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/sv-SE.rc b/base/applications/regedit/lang/sv-SE.rc index 5e3e0cf1b4a..228879556b0 100644 --- a/base/applications/regedit/lang/sv-SE.rc +++ b/base/applications/regedit/lang/sv-SE.rc @@ -129,7 +129,7 @@ BEGIN MENUITEM "&Byt namn", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exportera", ID_TREE_EXPORT - MENUITEM "&Behörigheter...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Behörigheter...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Kopiera nyckelnamn", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/th-TH.rc b/base/applications/regedit/lang/th-TH.rc index 92bdac769aa..d343823fe6b 100644 --- a/base/applications/regedit/lang/th-TH.rc +++ b/base/applications/regedit/lang/th-TH.rc @@ -131,7 +131,7 @@ BEGIN MENUITEM "&Rename", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Export", ID_TREE_EXPORT - MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Permissions...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/tr-TR.rc b/base/applications/regedit/lang/tr-TR.rc index eadfdc5e597..3dfb068e5ad 100644 --- a/base/applications/regedit/lang/tr-TR.rc +++ b/base/applications/regedit/lang/tr-TR.rc @@ -131,7 +131,7 @@ BEGIN MENUITEM "&Adını Değiştir", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Ver...", ID_TREE_EXPORT - MENUITEM "&İzinler...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&İzinler...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Dizin Yolunu Çoğalt", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/uk-UA.rc b/base/applications/regedit/lang/uk-UA.rc index 2a36942cb5a..116a5eeb72d 100644 --- a/base/applications/regedit/lang/uk-UA.rc +++ b/base/applications/regedit/lang/uk-UA.rc @@ -131,7 +131,7 @@ BEGIN MENUITEM "Перей&менувати", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Експорт", ID_TREE_EXPORT - MENUITEM "&Дозволи...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "&Дозволи...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "&Копіювати ім'я розділу", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/zh-CN.rc b/base/applications/regedit/lang/zh-CN.rc index 1c5b784f2b3..83223e198e8 100644 --- a/base/applications/regedit/lang/zh-CN.rc +++ b/base/applications/regedit/lang/zh-CN.rc @@ -131,7 +131,7 @@ BEGIN MENUITEM "重命名(&R)", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "导出(&E)", ID_TREE_EXPORT - MENUITEM "权限(&P)...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "权限(&P)...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "复制键名(&C)", ID_EDIT_COPYKEYNAME END diff --git a/base/applications/regedit/lang/zh-TW.rc b/base/applications/regedit/lang/zh-TW.rc index 5aeed75ea02..2958b5b3e7a 100644 --- a/base/applications/regedit/lang/zh-TW.rc +++ b/base/applications/regedit/lang/zh-TW.rc @@ -132,7 +132,7 @@ BEGIN MENUITEM "重新命名(&R)", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "匯出(&E)", ID_TREE_EXPORT - MENUITEM "許可權(&P)...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM "許可權(&P)...", ID_TREE_PERMISSIONS MENUITEM SEPARATOR MENUITEM "複製項名稱(&C)", ID_EDIT_COPYKEYNAME END

4 years, 6 months

[reactos] 01/01: [REGEDIT] Add a special popup menu for the tree view root item

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b280615b85d25bc31a03a… commit b280615b85d25bc31a03ab975fcafdf2da8075ba Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 18 08:52:24 2020 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 18 08:53:17 2020 +0200 [REGEDIT] Add a special popup menu for the tree view root item CORE-16888 --- base/applications/regedit/childwnd.c | 70 ++++++++++++++++++--------------- base/applications/regedit/lang/bg-BG.rc | 8 ++++ base/applications/regedit/lang/cs-CZ.rc | 8 ++++ base/applications/regedit/lang/de-DE.rc | 8 ++++ base/applications/regedit/lang/el-GR.rc | 8 ++++ base/applications/regedit/lang/en-US.rc | 8 ++++ base/applications/regedit/lang/es-ES.rc | 8 ++++ base/applications/regedit/lang/fr-FR.rc | 8 ++++ base/applications/regedit/lang/he-IL.rc | 8 ++++ base/applications/regedit/lang/hu-HU.rc | 8 ++++ base/applications/regedit/lang/id-ID.rc | 8 ++++ base/applications/regedit/lang/it-IT.rc | 8 ++++ base/applications/regedit/lang/ja-JP.rc | 8 ++++ base/applications/regedit/lang/ko-KR.rc | 8 ++++ base/applications/regedit/lang/nl-NL.rc | 8 ++++ base/applications/regedit/lang/no-NO.rc | 8 ++++ base/applications/regedit/lang/pl-PL.rc | 8 ++++ base/applications/regedit/lang/pt-BR.rc | 8 ++++ base/applications/regedit/lang/pt-PT.rc | 8 ++++ base/applications/regedit/lang/ro-RO.rc | 8 ++++ base/applications/regedit/lang/ru-RU.rc | 8 ++++ base/applications/regedit/lang/sk-SK.rc | 8 ++++ base/applications/regedit/lang/sl-SI.rc | 8 ++++ base/applications/regedit/lang/sq-AL.rc | 8 ++++ base/applications/regedit/lang/sv-SE.rc | 8 ++++ base/applications/regedit/lang/th-TH.rc | 8 ++++ base/applications/regedit/lang/tr-TR.rc | 8 ++++ base/applications/regedit/lang/uk-UA.rc | 8 ++++ base/applications/regedit/lang/zh-CN.rc | 8 ++++ base/applications/regedit/lang/zh-TW.rc | 8 ++++ base/applications/regedit/main.h | 3 +- 31 files changed, 272 insertions(+), 33 deletions(-) diff --git a/base/applications/regedit/childwnd.c b/base/applications/regedit/childwnd.c index d02fb2da14d..f64a1861165 100644 --- a/base/applications/regedit/childwnd.c +++ b/base/applications/regedit/childwnd.c @@ -726,6 +726,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa HKEY hRootKey; int iLastPos; WORD wID; + BOOL isRoot; pt.x = (short) LOWORD(lParam); pt.y = (short) HIWORD(lParam); @@ -755,9 +756,11 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa if (hti.flags & TVHT_ONITEM) { - hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT); TreeView_SelectItem(g_pChildWnd->hTreeWnd, hti.hItem); + isRoot = (TreeView_GetParent(g_pChildWnd->hTreeWnd, hti.hItem) == NULL); + hContextMenu = GetSubMenu(hPopupMenus, isRoot ? PM_ROOTITEM : PM_TREECONTEXT); + memset(&item, 0, sizeof(item)); item.mask = TVIF_STATE | TVIF_CHILDREN; item.hItem = hti.hItem; @@ -773,45 +776,48 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa mii.dwTypeData = (LPWSTR) buffer; SetMenuItemInfo(hContextMenu, 0, TRUE, &mii); - /* Remove any existing suggestions */ - memset(&mii, 0, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_ID; - GetMenuItemInfo(hContextMenu, GetMenuItemCount(hContextMenu) - 1, TRUE, &mii); - if ((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX)) + if (isRoot == FALSE) { - do + /* Remove any existing suggestions */ + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID; + GetMenuItemInfo(hContextMenu, GetMenuItemCount(hContextMenu) - 1, TRUE, &mii); + if ((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX)) { - iLastPos = GetMenuItemCount(hContextMenu) - 1; - GetMenuItemInfo(hContextMenu, iLastPos, TRUE, &mii); - RemoveMenu(hContextMenu, iLastPos, MF_BYPOSITION); + do + { + iLastPos = GetMenuItemCount(hContextMenu) - 1; + GetMenuItemInfo(hContextMenu, iLastPos, TRUE, &mii); + RemoveMenu(hContextMenu, iLastPos, MF_BYPOSITION); + } + while((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX)); } - while((mii.wID >= ID_TREE_SUGGESTION_MIN) && (mii.wID <= ID_TREE_SUGGESTION_MAX)); - } - /* Come up with suggestions */ - keyPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hRootKey); - SuggestKeys(hRootKey, keyPath, Suggestions, COUNT_OF(Suggestions)); - if (Suggestions[0]) - { - AppendMenu(hContextMenu, MF_SEPARATOR, 0, NULL); + /* Come up with suggestions */ + keyPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hRootKey); + SuggestKeys(hRootKey, keyPath, Suggestions, COUNT_OF(Suggestions)); + if (Suggestions[0]) + { + AppendMenu(hContextMenu, MF_SEPARATOR, 0, NULL); - LoadStringW(hInst, IDS_GOTO_SUGGESTED_KEY, resource, COUNT_OF(resource)); + LoadStringW(hInst, IDS_GOTO_SUGGESTED_KEY, resource, COUNT_OF(resource)); - s = Suggestions; - wID = ID_TREE_SUGGESTION_MIN; - while(*s && (wID <= ID_TREE_SUGGESTION_MAX)) - { - _snwprintf(buffer, COUNT_OF(buffer), resource, s); + s = Suggestions; + wID = ID_TREE_SUGGESTION_MIN; + while(*s && (wID <= ID_TREE_SUGGESTION_MAX)) + { + _snwprintf(buffer, COUNT_OF(buffer), resource, s); - memset(&mii, 0, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_STRING | MIIM_ID; - mii.wID = wID++; - mii.dwTypeData = buffer; - InsertMenuItem(hContextMenu, GetMenuItemCount(hContextMenu), TRUE, &mii); + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STRING | MIIM_ID; + mii.wID = wID++; + mii.dwTypeData = buffer; + InsertMenuItem(hContextMenu, GetMenuItemCount(hContextMenu), TRUE, &mii); - s += wcslen(s) + 1; + s += wcslen(s) + 1; + } } } TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, g_pChildWnd->hWnd, NULL); diff --git a/base/applications/regedit/lang/bg-BG.rc b/base/applications/regedit/lang/bg-BG.rc index 5b71ef6fcf9..e3852b60779 100644 --- a/base/applications/regedit/lang/bg-BG.rc +++ b/base/applications/regedit/lang/bg-BG.rc @@ -139,6 +139,14 @@ BEGIN MENUITEM "&Запомняне стойността на ключа", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Разгръщане/Свиване", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Износ", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Изоставяне на рой...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "От&рязване", ID_HEXEDIT_CUT MENUITEM "За&помняне", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/cs-CZ.rc b/base/applications/regedit/lang/cs-CZ.rc index fe450829e22..9a015459f81 100644 --- a/base/applications/regedit/lang/cs-CZ.rc +++ b/base/applications/regedit/lang/cs-CZ.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "Z&kopírovat název klíče", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Rozbalit/Sbalit", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Exportovat", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Uvolnit strom registru...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "Vyj&mout", ID_HEXEDIT_CUT MENUITEM "&Kopírovat", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/de-DE.rc b/base/applications/regedit/lang/de-DE.rc index 16ad2cf1fe2..8606290700a 100644 --- a/base/applications/regedit/lang/de-DE.rc +++ b/base/applications/regedit/lang/de-DE.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "S&chlüsselnamen kopieren", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Erweitern/Schließen", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Exportieren", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Zweig entladen...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "&Ausschneiden", ID_HEXEDIT_CUT MENUITEM "&Kopieren", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/el-GR.rc b/base/applications/regedit/lang/el-GR.rc index edd1bfdc2ad..18bcce6baa7 100644 --- a/base/applications/regedit/lang/el-GR.rc +++ b/base/applications/regedit/lang/el-GR.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Αντιγραφή Ονόματος Κλειδιού", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Εξαγωγή", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Αφαίρεση Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ut", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/en-US.rc b/base/applications/regedit/lang/en-US.rc index 3d0d6d4b564..a372059f51a 100644 --- a/base/applications/regedit/lang/en-US.rc +++ b/base/applications/regedit/lang/en-US.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Export", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "Cu&t", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/es-ES.rc b/base/applications/regedit/lang/es-ES.rc index e4de1db8c18..0584e8bf44c 100644 --- a/base/applications/regedit/lang/es-ES.rc +++ b/base/applications/regedit/lang/es-ES.rc @@ -137,6 +137,14 @@ BEGIN MENUITEM "&Copiar nombre de clave", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Expandir/Contraer", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Exportar", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Descargar subárbol...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "&Cortar", ID_HEXEDIT_CUT MENUITEM "Cop&iar", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/fr-FR.rc b/base/applications/regedit/lang/fr-FR.rc index 7d3d15bf401..326e8904549 100644 --- a/base/applications/regedit/lang/fr-FR.rc +++ b/base/applications/regedit/lang/fr-FR.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Copier le nom de la clé", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Dérouler/Réduire", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Exporter", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Décharger la ruche...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ouper", ID_HEXEDIT_CUT MENUITEM "&Copier", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/he-IL.rc b/base/applications/regedit/lang/he-IL.rc index e39ff8c3c67..28370594819 100644 --- a/base/applications/regedit/lang/he-IL.rc +++ b/base/applications/regedit/lang/he-IL.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "העתק שם מפתח", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "הרחב/קפל", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "יצא", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "ביטול טעינת כוורת (Hive)...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "גזור", ID_HEXEDIT_CUT MENUITEM "העתק", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/hu-HU.rc b/base/applications/regedit/lang/hu-HU.rc index ba2cfd181cd..d4dea8b263d 100644 --- a/base/applications/regedit/lang/hu-HU.rc +++ b/base/applications/regedit/lang/hu-HU.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Export", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ut", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/id-ID.rc b/base/applications/regedit/lang/id-ID.rc index 4bf6af06143..94e394ffbb8 100644 --- a/base/applications/regedit/lang/id-ID.rc +++ b/base/applications/regedit/lang/id-ID.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Salin Nama Kunci", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Perluas/Perempit", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Ekspor", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Buang Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "&Gunting", ID_HEXEDIT_CUT MENUITEM "&Salin", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/it-IT.rc b/base/applications/regedit/lang/it-IT.rc index 95c21cec8f0..0194a148bc2 100644 --- a/base/applications/regedit/lang/it-IT.rc +++ b/base/applications/regedit/lang/it-IT.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Copia il nome della chiave", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Espandi/Raccogli", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Esporta", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Scarica Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "&Taglia", ID_HEXEDIT_CUT MENUITEM "&Copia", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/ja-JP.rc b/base/applications/regedit/lang/ja-JP.rc index b27b03b06bc..8eefdad5fec 100644 --- a/base/applications/regedit/lang/ja-JP.rc +++ b/base/applications/regedit/lang/ja-JP.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "キー名のコピー(&C)", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "展開する/閉じる", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "エクスポート(&E)", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "ハイブのアンロード...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "切り取り(&C)", ID_HEXEDIT_CUT MENUITEM "コピー(&C)", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/ko-KR.rc b/base/applications/regedit/lang/ko-KR.rc index 479d2d53260..907e13832fa 100644 --- a/base/applications/regedit/lang/ko-KR.rc +++ b/base/applications/regedit/lang/ko-KR.rc @@ -136,6 +136,14 @@ BEGIN MENUITEM "키 이름 복사(&C)", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "확장/축소", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "내보내기(&E)", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "하이브 언로드...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ut", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/nl-NL.rc b/base/applications/regedit/lang/nl-NL.rc index 6c20f3989f3..ab5d3533f6b 100644 --- a/base/applications/regedit/lang/nl-NL.rc +++ b/base/applications/regedit/lang/nl-NL.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Export", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ut", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/no-NO.rc b/base/applications/regedit/lang/no-NO.rc index e448ff3442c..c05b2e66696 100644 --- a/base/applications/regedit/lang/no-NO.rc +++ b/base/applications/regedit/lang/no-NO.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Kopier nøkkelnavn", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Utvid/Minimer", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Eksport", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Fjern struktur...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ut", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/pl-PL.rc b/base/applications/regedit/lang/pl-PL.rc index d2e4d3f1acb..28c6fe7f70b 100644 --- a/base/applications/regedit/lang/pl-PL.rc +++ b/base/applications/regedit/lang/pl-PL.rc @@ -144,6 +144,14 @@ BEGIN MENUITEM "&Kopiuj nazwę klucza", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Rozwiń/Zwiń", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Eksportuj", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Wyładuj Drzewo..", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "W&ytnij", ID_HEXEDIT_CUT MENUITEM "&Kopiuj", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/pt-BR.rc b/base/applications/regedit/lang/pt-BR.rc index cd3c7c942b9..166d481fe14 100644 --- a/base/applications/regedit/lang/pt-BR.rc +++ b/base/applications/regedit/lang/pt-BR.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Copiar nome da chave", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Expandir/Reduzir", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Exportar", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "&Descarregar Seção...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ut", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/pt-PT.rc b/base/applications/regedit/lang/pt-PT.rc index 84b402183cd..c6079ee503b 100644 --- a/base/applications/regedit/lang/pt-PT.rc +++ b/base/applications/regedit/lang/pt-PT.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Copiar chave 'Nome'", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Expandir/Recolher", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Exportar", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ortar", ID_HEXEDIT_CUT MENUITEM "&Copiar", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/ro-RO.rc b/base/applications/regedit/lang/ro-RO.rc index cd4a96c7fd1..33e499a56e7 100644 --- a/base/applications/regedit/lang/ro-RO.rc +++ b/base/applications/regedit/lang/ro-RO.rc @@ -136,6 +136,14 @@ BEGIN MENUITEM "&Copiază numele cheii", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Extin&de/Restrânge", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "E&xportă", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Eli&berare registru…", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "&Decupează", ID_HEXEDIT_CUT MENUITEM "&Copiază", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/ru-RU.rc b/base/applications/regedit/lang/ru-RU.rc index c90b91d6ced..39e44e1558c 100644 --- a/base/applications/regedit/lang/ru-RU.rc +++ b/base/applications/regedit/lang/ru-RU.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Копировать имя ключа", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Развернуть/Свернуть", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Экспорт", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Выгрузить куст...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "&Вырезать", ID_HEXEDIT_CUT MENUITEM "&Копировать", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/sk-SK.rc b/base/applications/regedit/lang/sk-SK.rc index 8e848e5c415..5ee8d0ec1e8 100644 --- a/base/applications/regedit/lang/sk-SK.rc +++ b/base/applications/regedit/lang/sk-SK.rc @@ -139,6 +139,14 @@ BEGIN MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Export", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ut", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/sl-SI.rc b/base/applications/regedit/lang/sl-SI.rc index 64630661e0f..b0294655a07 100644 --- a/base/applications/regedit/lang/sl-SI.rc +++ b/base/applications/regedit/lang/sl-SI.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Export", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ut", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/sq-AL.rc b/base/applications/regedit/lang/sq-AL.rc index 744b686c883..442d19fcadd 100644 --- a/base/applications/regedit/lang/sq-AL.rc +++ b/base/applications/regedit/lang/sq-AL.rc @@ -138,6 +138,14 @@ BEGIN MENUITEM "Kopjo emrin çelesit", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Hap/Zmadho", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Exporto", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Shkarko koshere...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "Prej", ID_HEXEDIT_CUT MENUITEM "Kopjo", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/sv-SE.rc b/base/applications/regedit/lang/sv-SE.rc index e7a4e5fdf03..5e3e0cf1b4a 100644 --- a/base/applications/regedit/lang/sv-SE.rc +++ b/base/applications/regedit/lang/sv-SE.rc @@ -134,6 +134,14 @@ BEGIN MENUITEM "&Kopiera nyckelnamn", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Visa/dölj nivå", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Exportera", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Ta bort Registerdata...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "Klipp &ut", ID_HEXEDIT_CUT MENUITEM "&Kopiera", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/th-TH.rc b/base/applications/regedit/lang/th-TH.rc index c98d1792daf..92bdac769aa 100644 --- a/base/applications/regedit/lang/th-TH.rc +++ b/base/applications/regedit/lang/th-TH.rc @@ -136,6 +136,14 @@ BEGIN MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Export", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ut", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/tr-TR.rc b/base/applications/regedit/lang/tr-TR.rc index 27cff32c12f..eadfdc5e597 100644 --- a/base/applications/regedit/lang/tr-TR.rc +++ b/base/applications/regedit/lang/tr-TR.rc @@ -136,6 +136,14 @@ BEGIN MENUITEM "&Dizin Yolunu Çoğalt", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "&Genişlet ya da Daralt", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Ver...", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Y&ığını kaldır...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "&Kes", ID_HEXEDIT_CUT MENUITEM "&Çoğalt", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/uk-UA.rc b/base/applications/regedit/lang/uk-UA.rc index 07c62979d3d..2a36942cb5a 100644 --- a/base/applications/regedit/lang/uk-UA.rc +++ b/base/applications/regedit/lang/uk-UA.rc @@ -136,6 +136,14 @@ BEGIN MENUITEM "&Копіювати ім'я розділу", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "Розгорнути/Згорнути", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "&Експорт", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "Вивантажити файл реєстру...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "C&ut", ID_HEXEDIT_CUT MENUITEM "&Copy", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/zh-CN.rc b/base/applications/regedit/lang/zh-CN.rc index 31cce603d91..1c5b784f2b3 100644 --- a/base/applications/regedit/lang/zh-CN.rc +++ b/base/applications/regedit/lang/zh-CN.rc @@ -136,6 +136,14 @@ BEGIN MENUITEM "复制键名(&C)", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "展开/折叠", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "导出(&E)", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "卸载配置单元...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "剪切(&U)", ID_HEXEDIT_CUT MENUITEM "复制(&C)", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/lang/zh-TW.rc b/base/applications/regedit/lang/zh-TW.rc index 0e52abca86e..5aeed75ea02 100644 --- a/base/applications/regedit/lang/zh-TW.rc +++ b/base/applications/regedit/lang/zh-TW.rc @@ -137,6 +137,14 @@ BEGIN MENUITEM "複製項名稱(&C)", ID_EDIT_COPYKEYNAME END POPUP "" + BEGIN + MENUITEM "展開/摺疊", ID_TREE_EXPANDBRANCH + MENUITEM SEPARATOR + MENUITEM "匯出(&E)", ID_TREE_EXPORT + MENUITEM SEPARATOR + MENUITEM "解除載入 Hive 控制檔...", ID_REGISTRY_UNLOADHIVE, GRAYED + END + POPUP "" BEGIN MENUITEM "剪下(&U)", ID_HEXEDIT_CUT MENUITEM "複製(&C)", ID_HEXEDIT_COPY diff --git a/base/applications/regedit/main.h b/base/applications/regedit/main.h index 084b62cf304..12ae68cfa3e 100644 --- a/base/applications/regedit/main.h +++ b/base/applications/regedit/main.h @@ -35,7 +35,8 @@ #define PM_MODIFYVALUE 0 #define PM_NEW 1 #define PM_TREECONTEXT 2 -#define PM_HEXEDIT 3 +#define PM_ROOTITEM 3 +#define PM_HEXEDIT 4 #define MAX_NEW_KEY_LEN 128

4 years, 6 months

[reactos] 01/01: [REGEDIT] CORE-16892 fr-FR Translation update

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=13dd917589a9869585f10… commit 13dd917589a9869585f10f38a05f90a52e9f9ddf Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Apr 18 01:59:39 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Apr 18 01:59:39 2020 +0200 [REGEDIT] CORE-16892 fr-FR Translation update Fix 3 text truncations in search-dlg --- base/applications/regedit/lang/fr-FR.rc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/applications/regedit/lang/fr-FR.rc b/base/applications/regedit/lang/fr-FR.rc index f3507eba6ce..7d3d15bf401 100644 --- a/base/applications/regedit/lang/fr-FR.rc +++ b/base/applications/regedit/lang/fr-FR.rc @@ -507,11 +507,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Chercher" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "Chercher le suivant", IDOK, 197, 7, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 197, 24, 50, 14 + DEFPUSHBUTTON "Chercher le suivant", IDOK, 185, 7, 67, 14 + PUSHBUTTON "Annuler", IDCANCEL, 185, 24, 67, 14 GROUPBOX "Rechercher", IDC_STATIC, 7, 25, 63, 51 - LTEXT "Rechercher :", IDC_STATIC, 7, 8, 37, 10 - EDITTEXT IDC_FINDWHAT, 47, 7, 142, 13, ES_AUTOHSCROLL + LTEXT "Rechercher :", IDC_STATIC, 7, 8, 42, 10 + EDITTEXT IDC_FINDWHAT, 48, 7, 133, 13, ES_AUTOHSCROLL CONTROL "Clés", IDC_LOOKAT_KEYS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 36, 35, 8 CONTROL "&Valeurs", IDC_LOOKAT_VALUES, "Button", BS_AUTOCHECKBOX | @@ -519,7 +519,7 @@ BEGIN CONTROL "&Données", IDC_LOOKAT_DATA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 60, 42, 8 CONTROL "Chaîne complète seulement", IDC_MATCHSTRING, "Button", BS_AUTOCHECKBOX | - WS_TABSTOP, 83, 32, 94, 13 + WS_TABSTOP, 83, 32, 99, 13 CONTROL "Sensible à la casse", IDC_MATCHCASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 83, 48, 90, 12 END

4 years, 6 months

[reactos] 01/01: [NETID] CORE-16594 fr-FR Avoid text truncations

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db8ba3548e25a350ddc69… commit db8ba3548e25a350ddc69785c07a00faf678d6fe Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Apr 18 01:26:09 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Apr 18 01:26:09 2020 +0200 [NETID] CORE-16594 fr-FR Avoid text truncations --- dll/win32/netid/lang/fr-FR.rc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dll/win32/netid/lang/fr-FR.rc b/dll/win32/netid/lang/fr-FR.rc index 9ba338a0563..4768ec5eb7b 100644 --- a/dll/win32/netid/lang/fr-FR.rc +++ b/dll/win32/netid/lang/fr-FR.rc @@ -7,17 +7,17 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS utilise les informations suivantes pour identifier votre ordinateur sur le réseau.", IDC_STATIC, 40, 5, 204, 20 - LTEXT "Description de l'ordinateur :", IDC_STATIC, 6, 40, 70, 9 - EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "Nom complet de l'ordinateur :", IDC_STATIC, 6, 68, 64, 9 - EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Description de l'ordinateur :", IDC_STATIC, 6, 40, 95, 9 + EDITTEXT IDC_COMPDESC, 103, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Nom complet de l'ordinateur :", IDC_STATIC, 6, 68, 95, 9 + EDITTEXT IDC_COMPUTERNAME, 103, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Groupe de travail :", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 - EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Pour utiliser l'Assistant Réseau, afin de rejoindre un domaine ou créer un utilisateur local, cliquez sur Identification Réseau.", IDC_STATIC, 6, 108, 172, 24 - PUSHBUTTON "&Identification &réseau...", IDC_NETWORK_ID, 190, 114, 58, 15 - LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Changer.", IDC_STATIC, 6, 149, 170, 17 - PUSHBUTTON "&Changer...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 - LTEXT "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur.", IDC_STATIC, 6, 179, 300, 9 + EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 103, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Pour utiliser l'Assistant Réseau, afin de rejoindre un domaine ou créer un utilisateur local, cliquez sur Identification Réseau.", IDC_STATIC, 6, 108, 160, 24 + PUSHBUTTON "&Identification &réseau...", IDC_NETWORK_ID, 170, 114, 78, 15 + LTEXT "Pour changer le nom de cet ordinateur ou rejoindre un domaine, cliquez sur Changer.", IDC_STATIC, 6, 149, 160, 17 + PUSHBUTTON "&Changer...", IDC_NETWORK_PROPERTY, 170, 149, 78, 15 + LTEXT "Note : Seuls les administrateurs peuvent modifier l'identification de cet ordinateur.", IDC_STATIC, 6, 179, 250, 18 END IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222

4 years, 6 months

[reactos] 01/01: [MMSYS] CORE-16881 fr-FR "Save As" button too narrow

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b983c647d7e945dab204b… commit b983c647d7e945dab204ba3c278f1a9857897445 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Apr 18 00:45:32 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Apr 18 00:45:32 2020 +0200 [MMSYS] CORE-16881 fr-FR "Save As" button too narrow --- dll/cpl/mmsys/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/cpl/mmsys/lang/fr-FR.rc b/dll/cpl/mmsys/lang/fr-FR.rc index 0c1d87dcd47..2dbbf3fc05d 100644 --- a/dll/cpl/mmsys/lang/fr-FR.rc +++ b/dll/cpl/mmsys/lang/fr-FR.rc @@ -30,7 +30,7 @@ BEGIN LTEXT "Un schéma sons est un ensemble de sons appliqués aux évènements de ReactOS et aux programmes. Vous pouvez sélectionner un schéma existant ou en enregistrer que vous avez modifié.", -1, 8, 7, 230, 40 LTEXT "S&chéma sons :", -1, 8, 42, 150, 17 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Enregistrer sous...", IDC_SAVEAS_BTN, 134, 70, 50, 15 + PUSHBUTTON "&Enregistrer sous...", IDC_SAVEAS_BTN, 120, 70, 65, 15 PUSHBUTTON "Supprimer", IDC_DELETE_BTN, 188, 70, 50, 15 LTEXT "Pour changer les sons, cliquez sur un évènement de programme dans la liste suivante, puis sélectionnez un son à appliquer. Vous pouvez enregistrer les changements en tant que nouveau schéma son.", -1, 8, 90, 230, 40 LTEXT "Évènements des programmes :", -1, 8, 118, 150, 17

4 years, 6 months

[reactos] 01/01: [FREELDR] Fix typos and PC-98 boot (#2564)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61d966bf1acfb69185f74… commit 61d966bf1acfb69185f749b6faa073031db104ad Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sat Apr 18 00:27:20 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 17 20:27:20 2020 +0200 [FREELDR] Fix typos and PC-98 boot (#2564) - INT 18h, AH=A0h doesn't exist, it was meant to be AH=0Ah. Thanks to SimK (@simk98l) on twitter for bug reporting and fix. - Adress -> Address. --- boot/freeldr/freeldr/arch/i386/pc98/pc98video.c | 6 +++--- sdk/include/reactos/drivers/pc98/video.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/pc98/pc98video.c b/boot/freeldr/freeldr/arch/i386/pc98/pc98video.c index a92038228a7..7f038a03870 100644 --- a/boot/freeldr/freeldr/arch/i386/pc98/pc98video.c +++ b/boot/freeldr/freeldr/arch/i386/pc98/pc98video.c @@ -117,7 +117,7 @@ Pc98VideoInit(VOID) for (i = 0; i < RTL_NUMBER_OF(CgaPalette); i++) Pc98VideoSetPaletteColor(i, CgaPalette[i].Red, CgaPalette[i].Green, CgaPalette[i].Blue); - /* Int 18h AH=A0h + /* Int 18h AH=0Ah * CRT BIOS - Set text screen mode * * AL0 - text rows @@ -137,7 +137,7 @@ Pc98VideoInit(VOID) * High-resolution machine: * AL4 - text rows, AL3 - KCG access mode */ - Regs.b.ah = 0xA0; + Regs.b.ah = 0x0A; Regs.b.al = HiResoMachine ? 0x10 : 0x00; Int386(0x18, &Regs, &Regs); /* 80x25(31) */ @@ -208,7 +208,7 @@ Pc98VideoSetTextCursorPosition(UCHAR X, UCHAR Y) CSRWPARAM CursorParameters; RtlZeroMemory(&CursorParameters, sizeof(CSRWPARAM)); - CursorParameters.CursorAdress = X + Y * TextCols; + CursorParameters.CursorAddress = X + Y * TextCols; CursorParameters.DotAddress = 0; WRITE_PORT_UCHAR((PUCHAR)GDC1_IO_o_COMMAND, GDC_COMMAND_CSRW); diff --git a/sdk/include/reactos/drivers/pc98/video.h b/sdk/include/reactos/drivers/pc98/video.h index 42132f39ef8..c55211d091b 100644 --- a/sdk/include/reactos/drivers/pc98/video.h +++ b/sdk/include/reactos/drivers/pc98/video.h @@ -89,7 +89,7 @@ WRITE_GDC_CSRFORM(PUCHAR Port, PCSRFORMPARAM CursorParameters) #define GDC_COMMAND_CSRW 0x49 typedef struct _CSRWPARAM { - ULONG CursorAdress; + ULONG CursorAddress; UCHAR DotAddress; } CSRWPARAM, *PCSRWPARAM; @@ -97,13 +97,13 @@ FORCEINLINE VOID WRITE_GDC_CSRW(PUCHAR Port, PCSRWPARAM CursorParameters) { - ASSERT(CursorParameters->CursorAdress < 0xF00000); + ASSERT(CursorParameters->CursorAddress < 0xF00000); ASSERT(CursorParameters->DotAddress < 0x10); - WRITE_PORT_UCHAR(Port, CursorParameters->CursorAdress & 0xFF); - WRITE_PORT_UCHAR(Port, (CursorParameters->CursorAdress >> 8) & 0xFF); + WRITE_PORT_UCHAR(Port, CursorParameters->CursorAddress & 0xFF); + WRITE_PORT_UCHAR(Port, (CursorParameters->CursorAddress >> 8) & 0xFF); WRITE_PORT_UCHAR(Port, (CursorParameters->DotAddress << 4) | - ((CursorParameters->CursorAdress >> 16) & 0x03)); + ((CursorParameters->CursorAddress >> 16) & 0x03)); } #define GDC_COMMAND_PRAM 0x70

4 years, 6 months

[reactos] 01/01: [RAPPS] Use _beginthreadex instead of CreateThread (#2552)

by He Yang

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ac13afefc439a7bc1cfa… commit 2ac13afefc439a7bc1cfa13e44027113fbf8f96a Author: He Yang <1160386205(a)qq.com> AuthorDate: Fri Apr 17 12:27:16 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Apr 17 19:27:16 2020 +0200 [RAPPS] Use _beginthreadex instead of CreateThread (#2552) --- base/applications/rapps/loaddlg.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 213e4afb3ab..4ee4cb518fb 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -41,6 +41,7 @@ #include <rosctrls.h> #include <windowsx.h> +#include <process.h> #undef SubclassWindow #include "rosui.h" @@ -355,7 +356,7 @@ public: static VOID Add(DownloadInfo info); static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE); static INT_PTR CALLBACK DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - static DWORD WINAPI ThreadFunc(LPVOID Context); + static unsigned int WINAPI ThreadFunc(LPVOID Context); static VOID LaunchDownloadDialog(BOOL); }; @@ -432,8 +433,8 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w // Start download process DownloadParam *param = new DownloadParam(Dlg, AppsToInstallList, szCaption); - DWORD ThreadId; - HANDLE Thread = CreateThread(NULL, 0, ThreadFunc, (LPVOID) param, 0, &ThreadId); + unsigned int ThreadId; + HANDLE Thread = (HANDLE)_beginthreadex(NULL, 0, ThreadFunc, (void *) param, 0, &ThreadId); if (!Thread) { @@ -507,7 +508,7 @@ VOID CDownloadManager::UpdateProgress( } } -DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) +unsigned int WINAPI CDownloadManager::ThreadFunc(LPVOID param) { ATL::CStringW Path; PWSTR p, q;

4 years, 6 months

[reactos] 04/04: [SDK][HOST-TOOLS] Add load_config workaround for gcc builds Since binutils can not add this, we re-introduce pefixup. It searches for the exported symbol '_load_config_used', and uses that to fill out the LOAD_CONFIG directory in the PE header

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b948581fc279f262cfef… commit 0b948581fc279f262cfef1aa517229bd29ac8736 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 13 12:20:47 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 17 17:47:24 2020 +0200 [SDK][HOST-TOOLS] Add load_config workaround for gcc builds Since binutils can not add this, we re-introduce pefixup. It searches for the exported symbol '_load_config_used', and uses that to fill out the LOAD_CONFIG directory in the PE header --- CMakeLists.txt | 2 +- modules/rostests/apitests/CMakeLists.txt | 6 +- .../rostests/apitests/loadconfig/CMakeLists.txt | 8 +- .../apitests/loadconfig/loadconfig_apitest.spec | 3 + sdk/cmake/gcc.cmake | 8 + sdk/cmake/msvc.cmake | 4 + sdk/tools/CMakeLists.txt | 5 +- sdk/tools/pefixup.c | 543 ++++++--------------- 8 files changed, 185 insertions(+), 394 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 777a0335304..50fbf192c4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ if(NOT CMAKE_CROSSCOMPILING) set(NATIVE_TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb) if(NOT MSVC) - list(APPEND NATIVE_TARGETS rsym) + list(APPEND NATIVE_TARGETS rsym pefixup) endif() export(TARGETS ${NATIVE_TARGETS} FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) diff --git a/modules/rostests/apitests/CMakeLists.txt b/modules/rostests/apitests/CMakeLists.txt index abb0fb8209b..2662835eeeb 100644 --- a/modules/rostests/apitests/CMakeLists.txt +++ b/modules/rostests/apitests/CMakeLists.txt @@ -22,11 +22,7 @@ add_subdirectory(gdi32) add_subdirectory(gditools) add_subdirectory(iphlpapi) add_subdirectory(kernel32) -if(NOT GCC) - # gcc / binutils are unable to add an IMAGE_LOAD_CONFIG_DIRECTORY - # So maybe we should resuscitate sdk/tools/pefixup.c - add_subdirectory(loadconfig) -endif() +add_subdirectory(loadconfig) add_subdirectory(localspl) add_subdirectory(mountmgr) add_subdirectory(msgina) diff --git a/modules/rostests/apitests/loadconfig/CMakeLists.txt b/modules/rostests/apitests/loadconfig/CMakeLists.txt index a09e73e90b1..8c0860b7c13 100644 --- a/modules/rostests/apitests/loadconfig/CMakeLists.txt +++ b/modules/rostests/apitests/loadconfig/CMakeLists.txt @@ -1,12 +1,16 @@ +spec2def(loadconfig_apitest.exe loadconfig_apitest.spec) + list(APPEND SOURCE common.c stacktrace.c loadconfig.h) -add_executable(loadconfig_apitest ${SOURCE} testlist.c) +add_executable(loadconfig_apitest ${SOURCE} testlist.c ${CMAKE_CURRENT_BINARY_DIR}/loadconfig_apitest.def) target_link_libraries(loadconfig_apitest wine ${PSEH_LIB}) set_module_type(loadconfig_apitest win32cui) add_importlibs(loadconfig_apitest msvcrt kernel32 ntdll) -add_pch(loadconfig_apitest loadconfig.h SOURCE) +#add_pch(loadconfig_apitest loadconfig.h SOURCE) add_rostests_file(TARGET loadconfig_apitest) + +fixup_load_config(loadconfig_apitest) diff --git a/modules/rostests/apitests/loadconfig/loadconfig_apitest.spec b/modules/rostests/apitests/loadconfig/loadconfig_apitest.spec new file mode 100644 index 00000000000..8eb80758252 --- /dev/null +++ b/modules/rostests/apitests/loadconfig/loadconfig_apitest.spec @@ -0,0 +1,3 @@ + +# Export this symbol so we can do binutils job +@ extern _load_config_used diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 5f0ea13b23a..7d42f327ecf 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -345,6 +345,14 @@ if(NOT ARCH STREQUAL "i386") set(DECO_OPTION "-@") endif() +function(fixup_load_config _target) + get_target_property(PEFIXUP native-pefixup IMPORTED_LOCATION_NOCONFIG) + add_custom_command(TARGET ${_target} POST_BUILD + COMMAND "${PEFIXUP}" + "$<TARGET_FILE:${_target}>" + COMMENT "Patching in LOAD_CONFIG") +endfunction() + function(generate_import_lib _libname _dllname _spec_file) # Generate the def for the import lib add_custom_command( diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 0662fd24692..ce526ed979f 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -371,6 +371,10 @@ function(add_delay_importlibs _module) target_link_libraries(${_module} delayimp) endfunction() +function(fixup_load_config _target) + # msvc knows how to generate a load_config so no hacks here +endfunction() + function(generate_import_lib _libname _dllname _spec_file) set(_def_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_exp.def) diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt index 7fab47e68ba..f9e0e19f5f4 100644 --- a/sdk/tools/CMakeLists.txt +++ b/sdk/tools/CMakeLists.txt @@ -4,8 +4,6 @@ function(add_host_tool _tool) set_target_properties(${_tool} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TOOLS_FOLDER}) endfunction() -#add_executable(pefixup pefixup.c) - if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DHAVE_IO_H=1) add_compile_flags_language("/EHsc" "CXX") @@ -40,4 +38,7 @@ add_subdirectory(xml2sdb) if(NOT MSVC) add_subdirectory(log2lines) add_subdirectory(rsym) + + add_host_tool(pefixup pefixup.c) + target_link_libraries(pefixup PRIVATE host_includes) endif() diff --git a/sdk/tools/pefixup.c b/sdk/tools/pefixup.c index be25015e48b..97529747ae1 100644 --- a/sdk/tools/pefixup.c +++ b/sdk/tools/pefixup.c @@ -1,421 +1,196 @@ /* * PE Fixup Utility * Copyright (C) 2005 Filip Navara + * Copyright (C) 2020 Mark Jansen * * The purpose of this utility is fix PE binaries generated by binutils and * to manipulate flags that can't be set by binutils. * - * Currently two features are implemented: + * Currently one features is implemented: * - * - Setting flags on PE sections for use by drivers. The sections - * .text, .data, .idata, .bss are marked as non-pageable and - * non-discarable, section PAGE is marked as pageable and section - * INIT is marked as discaradable. - * - * - Sorting of export name table in executables. DLLTOOL has bug - * in sorting algorithm when the --kill-at flag is used. The exports - * are sorted in the decorated form and so the fastcall symbols are - * incorrectly put at the beginning of export table. This option - * allow to correct sort the table, so binary search can be used - * to process them. + * - Updating the PE header to use a LOAD_CONFIG, + * when the struct is exported with the name '_load_config_used' */ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <fcntl.h> -#include <unistd.h> - -#ifndef O_BINARY -#define O_BINARY 0 -#endif - -/* The following definitions are ripped from MinGW W32API headers. We don't - use these headers directly in order to allow compilation on Linux hosts. */ - -typedef unsigned char BYTE, *PBYTE; -typedef unsigned short WORD; -typedef unsigned int DWORD; -typedef int LONG; -typedef long LONG_PTR; - -#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 -#define IMAGE_SIZEOF_SHORT_NAME 8 -#define IMAGE_DOS_SIGNATURE 0x5A4D -#define IMAGE_NT_SIGNATURE 0x00004550 -#define IMAGE_SCN_MEM_DISCARDABLE 0x2000000 -#define IMAGE_SCN_MEM_NOT_PAGED 0x8000000 -#define FIELD_OFFSET(t,f) ((LONG)(LONG_PTR)&(((t*)0)->f)) -#define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((unsigned long)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader)) -#define IMAGE_DIRECTORY_ENTRY_EXPORT 0 - -#pragma pack(2) -typedef struct _IMAGE_DOS_HEADER { - WORD e_magic; - WORD e_cblp; - WORD e_cp; - WORD e_crlc; - WORD e_cparhdr; - WORD e_minalloc; - WORD e_maxalloc; - WORD e_ss; - WORD e_sp; - WORD e_csum; - WORD e_ip; - WORD e_cs; - WORD e_lfarlc; - WORD e_ovno; - WORD e_res[4]; - WORD e_oemid; - WORD e_oeminfo; - WORD e_res2[10]; - LONG e_lfanew; -} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; -#pragma pack(4) -#pragma pack(4) -typedef struct _IMAGE_EXPORT_DIRECTORY { - DWORD Characteristics; - DWORD TimeDateStamp; - WORD MajorVersion; - WORD MinorVersion; - DWORD Name; - DWORD Base; - DWORD NumberOfFunctions; - DWORD NumberOfNames; - DWORD AddressOfFunctions; - DWORD AddressOfNames; - DWORD AddressOfNameOrdinals; -} IMAGE_EXPORT_DIRECTORY,*PIMAGE_EXPORT_DIRECTORY; -typedef struct _IMAGE_FILE_HEADER { - WORD Machine; - WORD NumberOfSections; - DWORD TimeDateStamp; - DWORD PointerToSymbolTable; - DWORD NumberOfSymbols; - WORD SizeOfOptionalHeader; - WORD Characteristics; -} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; -typedef struct _IMAGE_DATA_DIRECTORY { - DWORD VirtualAddress; - DWORD Size; -} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; -typedef struct _IMAGE_OPTIONAL_HEADER { - WORD Magic; - BYTE MajorLinkerVersion; - BYTE MinorLinkerVersion; - DWORD SizeOfCode; - DWORD SizeOfInitializedData; - DWORD SizeOfUninitializedData; - DWORD AddressOfEntryPoint; - DWORD BaseOfCode; - DWORD BaseOfData; - DWORD ImageBase; - DWORD SectionAlignment; - DWORD FileAlignment; - WORD MajorOperatingSystemVersion; - WORD MinorOperatingSystemVersion; - WORD MajorImageVersion; - WORD MinorImageVersion; - WORD MajorSubsystemVersion; - WORD MinorSubsystemVersion; - DWORD Reserved1; - DWORD SizeOfImage; - DWORD SizeOfHeaders; - DWORD CheckSum; - WORD Subsystem; - WORD DllCharacteristics; - DWORD SizeOfStackReserve; - DWORD SizeOfStackCommit; - DWORD SizeOfHeapReserve; - DWORD SizeOfHeapCommit; - DWORD LoaderFlags; - DWORD NumberOfRvaAndSizes; - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; -} IMAGE_OPTIONAL_HEADER,*PIMAGE_OPTIONAL_HEADER; -typedef struct _IMAGE_NT_HEADERS { - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER OptionalHeader; -} IMAGE_NT_HEADERS,*PIMAGE_NT_HEADERS; -typedef struct _IMAGE_SECTION_HEADER { - BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; - union { - DWORD PhysicalAddress; - DWORD VirtualSize; - } Misc; - DWORD VirtualAddress; - DWORD SizeOfRawData; - DWORD PointerToRawData; - DWORD PointerToRelocations; - DWORD PointerToLinenumbers; - WORD NumberOfRelocations; - WORD NumberOfLinenumbers; - DWORD Characteristics; -} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; -#pragma pack(4) -/* End of ripped definitions */ - -typedef struct _export_t { - DWORD name; - WORD ordinal; -} export_t; - -unsigned char *buffer; -PIMAGE_DOS_HEADER dos_header; -PIMAGE_NT_HEADERS nt_header; - -static inline WORD dtohs(WORD in) -{ - PBYTE in_ptr = (PBYTE)&in; - return in_ptr[0] | (in_ptr[1] << 8); -} +// host_includes +#include <typedefs.h> +#include <pecoff.h> +#include "../../dll/win32/dbghelp/compat.h" -static inline WORD htods(WORD in) +void *rva_to_ptr(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header, DWORD rva) { - WORD out; - PBYTE out_ptr = (PBYTE)&out; - out_ptr[0] = in; out_ptr[1] = in >> 8; - return out; + unsigned int i; + PIMAGE_SECTION_HEADER section_header = IMAGE_FIRST_SECTION(nt_header); + + for (i = 0; i < nt_header->FileHeader.NumberOfSections; i++, section_header++) + { + if (rva >= section_header->VirtualAddress && + rva < section_header->VirtualAddress + section_header->Misc.VirtualSize) + { + return buffer + rva - section_header->VirtualAddress + section_header->PointerToRawData; + } + } + + return NULL; } -static inline DWORD dtohl(DWORD in) -{ - PBYTE in_ptr = (PBYTE)&in; - return in_ptr[0] | (in_ptr[1] << 8) | (in_ptr[2] << 16) | (in_ptr[3] << 24); -} -static inline DWORD htodl(DWORD in) +static void fix_checksum(unsigned char *buffer, long len, PIMAGE_NT_HEADERS nt_header) { - DWORD out; - PBYTE out_ptr = (PBYTE)&out; - out_ptr[0] = in ; out_ptr[1] = in >> 8; - out_ptr[2] = in >> 16; out_ptr[3] = in >> 24; - return out; -} + unsigned int checksum = 0; + long n; -void *rva_to_ptr(DWORD rva) -{ - PIMAGE_SECTION_HEADER section_header; - unsigned int i; + nt_header->OptionalHeader.CheckSum = 0; - for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header); - i < dtohl(nt_header->FileHeader.NumberOfSections); - i++, section_header++) - { - if (rva >= dtohl(section_header->VirtualAddress) && - rva < dtohl(section_header->VirtualAddress) + - dtohl(section_header->Misc.VirtualSize)) - { - return buffer + rva - dtohl(section_header->VirtualAddress) + - dtohl(section_header->PointerToRawData); - } - } + for (n = 0; n < len; n += 2) + { + checksum += *(unsigned short *)(buffer + n); + checksum = (checksum + (checksum >> 16)) & 0xffff; + } - return NULL; + checksum += len; + nt_header->OptionalHeader.CheckSum = checksum; } -int export_compare_func(const void *a, const void *b) +static int add_loadconfig(unsigned char *buffer, PIMAGE_NT_HEADERS nt_header) { - const export_t *ap = a; - const export_t *bp = b; - char *an = rva_to_ptr(ap->name); - char *bn = rva_to_ptr(bp->name); - return strcmp(an, bn); + PIMAGE_DATA_DIRECTORY export_dir; + PIMAGE_EXPORT_DIRECTORY export_directory; + + export_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT]; + if (export_dir->Size != 0) + { + export_directory = rva_to_ptr(buffer, nt_header, export_dir->VirtualAddress); + if (export_directory != NULL) + { + DWORD *name_ptr, *function_ptr, n; + WORD *ordinal_ptr; + + name_ptr = rva_to_ptr(buffer, nt_header, export_directory->AddressOfNames); + ordinal_ptr = rva_to_ptr(buffer, nt_header, export_directory->AddressOfNameOrdinals); + function_ptr = rva_to_ptr(buffer, nt_header, export_directory->AddressOfFunctions); + + for (n = 0; n < export_directory->NumberOfNames; n++) + { + const char* name = rva_to_ptr(buffer, nt_header, name_ptr[n]); + if (!strcmp(name, "_load_config_used")) + { + PIMAGE_DATA_DIRECTORY load_config_dir; + DWORD load_config_rva = function_ptr[ordinal_ptr[n]]; + DWORD* load_config_ptr = rva_to_ptr(buffer, nt_header, load_config_rva); + + /* Update the DataDirectory pointer / size + The first entry of the LOAD_CONFIG struct is the size, use that as DataDirectory.Size */ + load_config_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG]; + load_config_dir->VirtualAddress = load_config_rva; + load_config_dir->Size = *load_config_ptr; + + return 0; + } + } + + fprintf(stderr, "Export '_load_config_used' not found\n"); + } + else + { + fprintf(stderr, "Invalid rva for export directory\n"); + } + } + else + { + fprintf(stderr, "No export directory\n"); + } + + return 1; } int main(int argc, char **argv) { - int fd_in, fd_out; - long len; - char hdrbuf[4] = { }, elfhdr[4] = { '\177', 'E', 'L', 'F' }; - PIMAGE_SECTION_HEADER section_header; - PIMAGE_DATA_DIRECTORY data_dir; - unsigned int i; - unsigned long checksum; - int fixup_exports = 0; - int fixup_sections = 0; - - /* - * Process parameters. - */ - - if (argc < 2) - { - printf("Usage: %s <filename> <options>\n" - "Options:\n" - " -sections Sets section flags for PE image.\n" - " -exports Sort the names in export table.\n", - argv[0]); - return 1; - } - - for (i = 2; i < argc; i++) - { - if (!strcmp(argv[i], "-sections")) - fixup_sections = 1; - else if (!strcmp(argv[i], "-exports")) - fixup_exports = 1; - else - { fprintf(stderr, "Invalid option: %s\n", argv[i]); return 1; } - } - - /* - * Nothing to do. - */ - if (fixup_sections == 0 && fixup_exports == 0) - return 0; - - /* - * Read the whole file to memory. - */ - - fd_in = open(argv[1], O_RDONLY | O_BINARY); - if (fd_in == 0) - { - fprintf(stderr, "Can't open input file.\n"); - return 1; - } - - /* - * PowerPC ReactOS uses elf, so doesn't need pefixup - */ - len = read(fd_in, hdrbuf, sizeof(elfhdr)); - if (!memcmp(hdrbuf, elfhdr, sizeof(elfhdr))) - { - close(fd_in); - return 0; - } - - len = lseek(fd_in, 0, SEEK_END); - if (len < sizeof(IMAGE_DOS_HEADER)) - { - close(fd_in); - fprintf(stderr, "'%s' isn't a PE image (too short)\n", argv[1]); - return 1; - } - - /* Lower down we overwrite the byte at len, so here, we need at least - * one more byte than len. We'll be guaranteed one or two now. */ - buffer = malloc((len + 2) & ~1); - if (buffer == NULL) - { - close(fd_in); - fprintf(stderr, "Not enough memory available.\n"); - return 1; - } - - /* Read the whole input file into a buffer */ - lseek(fd_in, 0, SEEK_SET); - read(fd_in, buffer, len); - /* Here is where the block end overwrite was */ - if (len & 1) - buffer[len] = 0; - - close(fd_in); - - /* - * Check the headers and save pointers to them. - */ - - dos_header = (PIMAGE_DOS_HEADER)buffer; - nt_header = (PIMAGE_NT_HEADERS)(buffer + dtohl(dos_header->e_lfanew)); - - if (dtohs(dos_header->e_magic) != IMAGE_DOS_SIGNATURE || - dtohl(nt_header->Signature) != IMAGE_NT_SIGNATURE) - { - fprintf(stderr, "'%s' isn't a PE image (bad headers)\n", argv[1]); - free(buffer); - return 1; - } - - if (fixup_exports) - { - /* Sort export directory */ - data_dir = &nt_header->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT]; - if (dtohl(data_dir->Size) != 0) - { - PIMAGE_EXPORT_DIRECTORY export_directory; - DWORD *name_ptr; - WORD *ordinal_ptr; - export_t *exports; - - export_directory = (PIMAGE_EXPORT_DIRECTORY)rva_to_ptr(dtohl(data_dir->VirtualAddress)); - if (export_directory != NULL) - { - exports = malloc(sizeof(export_t) * dtohl(export_directory->NumberOfNames)); - if (exports == NULL) + FILE* file; + long len; + unsigned char *buffer; + PIMAGE_DOS_HEADER dos_header; + int result = 1; + + if (argc < 2) + { + printf("Usage: %s <filename>\n", argv[0]); + return 1; + } + + /* Read the whole file to memory. */ + file = fopen(argv[1], "r+b"); + if (!file) + { + fprintf(stderr, "Can't open '%s'.\n", argv[1]); + return 1; + } + + fseek(file, 0, SEEK_END); + len = ftell(file); + if (len < sizeof(IMAGE_DOS_HEADER)) + { + fclose(file); + fprintf(stderr, "'%s' isn't a PE image (too short)\n", argv[1]); + return 1; + } + + /* Add one byte extra for the case where the input file size is odd. + We rely on this in our crc calculation */ + buffer = calloc(len + 1, 1); + if (buffer == NULL) + { + fclose(file); + fprintf(stderr, "Not enough memory available.\n"); + return 1; + } + + /* Read the whole input file into a buffer */ + fseek(file, 0, SEEK_SET); + fread(buffer, 1, len, file); + + /* Check the headers and save pointers to them. */ + dos_header = (PIMAGE_DOS_HEADER)buffer; + if (dos_header->e_magic == IMAGE_DOS_SIGNATURE) + { + PIMAGE_NT_HEADERS nt_header; + + nt_header = (PIMAGE_NT_HEADERS)(buffer + dos_header->e_lfanew); + + if (nt_header->Signature == IMAGE_NT_SIGNATURE) + { + if (!add_loadconfig(buffer, nt_header)) { - fprintf(stderr, "Not enough memory.\n"); - free(buffer); - return 1; - } + fix_checksum(buffer, len, nt_header); - name_ptr = (DWORD *)rva_to_ptr(dtohl(export_directory->AddressOfNames)); - ordinal_ptr = (WORD *)rva_to_ptr(dtohl(export_directory->AddressOfNameOrdinals)); + /* We could 'optimize by only writing the changed parts, but keep it simple for now */ + fseek(file, 0, SEEK_SET); + fwrite(buffer, 1, len, file); - for (i = 0; i < dtohl(export_directory->NumberOfNames); i++) - { - exports[i].name = dtohl(name_ptr[i]); - exports[i].ordinal = dtohl(ordinal_ptr[i]); + /* Success */ + result = 0; } - - qsort(exports, dtohl(export_directory->NumberOfNames), sizeof(export_t), - export_compare_func); - - for (i = 0; i < dtohl(export_directory->NumberOfNames); i++) + else { - name_ptr[i] = htodl(exports[i].name); - ordinal_ptr[i] = htodl(exports[i].ordinal); + /* Error already printed inside add_loadconfig */ } - - free(exports); - } - } - } - - if (fixup_sections) - { - /* Update section flags */ - for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header); - i < dtohl(nt_header->FileHeader.NumberOfSections); - i++, section_header++) - { - if (!strcmp((char*)section_header->Name, ".text") || - !strcmp((char*)section_header->Name, ".data") || - !strcmp((char*)section_header->Name, ".idata") || - !strcmp((char*)section_header->Name, ".rdata") || - !strcmp((char*)section_header->Name, ".bss")) - { - section_header->Characteristics |= htodl(IMAGE_SCN_MEM_NOT_PAGED); - section_header->Characteristics &= htodl(~IMAGE_SCN_MEM_DISCARDABLE); - } - else if (!strcmp((char*)section_header->Name, "INIT")) - { - section_header->Characteristics |= htodl(IMAGE_SCN_MEM_DISCARDABLE); - } - else if (!strcmp((char*)section_header->Name, "PAGE")) - { - section_header->Characteristics |= htodl(IMAGE_SCN_MEM_NOT_PAGED); - } - } - } - - /* Recalculate checksum */ - nt_header->OptionalHeader.CheckSum = 0; - checksum = 0; - for (i = 0; i < len; i += 2) - { - checksum += *(unsigned short *)(buffer + i); - checksum = (checksum + (checksum >> 16)) & 0xffff; - } - checksum += len; - nt_header->OptionalHeader.CheckSum = htods(checksum); - - /* Write the output file */ - fd_out = open(argv[1], O_WRONLY | O_BINARY); - write(fd_out, buffer, len); - close(fd_out); - - return 0; + } + else + { + fprintf(stderr, "'%s' Invalid PE signature: %x\n", argv[1], nt_header->Signature); + } + } + else + { + fprintf(stderr, "'%s' Invalid DOS signature: %x\n", argv[1], dos_header->e_magic); + } + + free(buffer); + fclose(file); + + return result; }

4 years, 6 months

[reactos] 03/04: [DBGHELPHOST] Add IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ed06c9588a810e700ee5… commit 2ed06c9588a810e700ee5053a2fb4e05f39462b9 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 13 11:27:21 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 17 17:47:24 2020 +0200 [DBGHELPHOST] Add IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG --- dll/win32/dbghelp/compat.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/win32/dbghelp/compat.h b/dll/win32/dbghelp/compat.h index b662cdde79a..f6061c773c7 100644 --- a/dll/win32/dbghelp/compat.h +++ b/dll/win32/dbghelp/compat.h @@ -139,6 +139,7 @@ INT __WideCharToMultiByte( UINT page, DWORD flags, LPCWSTR src, INT srclen, LPST #define IMAGE_SYM_CLASS_FILE 103 #define IMAGE_DIRECTORY_ENTRY_EXPORT 0 #define IMAGE_DIRECTORY_ENTRY_DEBUG 6 +#define IMAGE_DIRECTORY_ENTRY_LOAD_CONFIG 10 #define IMAGE_DEBUG_MISC_EXENAME 1 #define IMAGE_SEPARATE_DEBUG_SIGNATURE 0x4944 typedef struct _IMAGE_EXPORT_DIRECTORY {

4 years, 6 months

[reactos] 02/04: [LDR] Add initial LOAD_CONFIG support

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1e0f359fa7b5ff8cc535b… commit 1e0f359fa7b5ff8cc535b6c0b5b75fa6bdb7c76d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Apr 12 16:24:28 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Apr 17 17:47:24 2020 +0200 [LDR] Add initial LOAD_CONFIG support --- dll/ntdll/ldr/ldrinit.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dll/ntdll/ldr/ldrinit.c b/dll/ntdll/ldr/ldrinit.c index 955c9a23b8c..cdf51c64b38 100644 --- a/dll/ntdll/ldr/ldrinit.c +++ b/dll/ntdll/ldr/ldrinit.c @@ -1872,11 +1872,40 @@ LdrpInitializeProcess(IN PCONTEXT Context, HeapParameters.Length = sizeof(HeapParameters); /* Check if we have Configuration Data */ - if ((LoadConfig) && (ConfigSize == sizeof(IMAGE_LOAD_CONFIG_DIRECTORY))) +#define VALID_CONFIG_FIELD(Name) (ConfigSize >= (FIELD_OFFSET(IMAGE_LOAD_CONFIG_DIRECTORY, Name) + sizeof(LoadConfig->Name))) + /* The 'original' load config ends after SecurityCookie */ + if ((LoadConfig) && ConfigSize && (VALID_CONFIG_FIELD(SecurityCookie) || ConfigSize == LoadConfig->Size)) { - /* FIXME: Custom heap settings and misc. */ - DPRINT1("We don't support LOAD_CONFIG data yet\n"); + if (ConfigSize != sizeof(IMAGE_LOAD_CONFIG_DIRECTORY)) + DPRINT1("WARN: Accepting different LOAD_CONFIG size!\n"); + else + DPRINT1("Applying LOAD_CONFIG\n"); + + if (VALID_CONFIG_FIELD(GlobalFlagsSet) && LoadConfig->GlobalFlagsSet) + Peb->NtGlobalFlag |= LoadConfig->GlobalFlagsSet; + + if (VALID_CONFIG_FIELD(GlobalFlagsClear) && LoadConfig->GlobalFlagsClear) + Peb->NtGlobalFlag &= ~LoadConfig->GlobalFlagsClear; + + if (VALID_CONFIG_FIELD(CriticalSectionDefaultTimeout) && LoadConfig->CriticalSectionDefaultTimeout) + RtlpTimeout.QuadPart = Int32x32To64(LoadConfig->CriticalSectionDefaultTimeout, -10000000); + + if (VALID_CONFIG_FIELD(DeCommitFreeBlockThreshold) && LoadConfig->DeCommitFreeBlockThreshold) + HeapParameters.DeCommitFreeBlockThreshold = LoadConfig->DeCommitFreeBlockThreshold; + + if (VALID_CONFIG_FIELD(DeCommitTotalFreeThreshold) && LoadConfig->DeCommitTotalFreeThreshold) + HeapParameters.DeCommitTotalFreeThreshold = LoadConfig->DeCommitTotalFreeThreshold; + + if (VALID_CONFIG_FIELD(MaximumAllocationSize) && LoadConfig->MaximumAllocationSize) + HeapParameters.MaximumAllocationSize = LoadConfig->MaximumAllocationSize; + + if (VALID_CONFIG_FIELD(VirtualMemoryThreshold) && LoadConfig->VirtualMemoryThreshold) + HeapParameters.VirtualMemoryThreshold = LoadConfig->VirtualMemoryThreshold; + + if (VALID_CONFIG_FIELD(ProcessHeapFlags) && LoadConfig->ProcessHeapFlags) + HeapFlags = LoadConfig->ProcessHeapFlags; } +#undef VALID_CONFIG_FIELD /* Check for custom affinity mask */ if (Peb->ImageProcessAffinityMask)

4 years, 6 months

← Newer
1
...
19
20
21
22
23
24
25
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2020