Ros-diffs November 2022

ros-diffs@reactos.org

26 participants
175 discussions

[reactos] 01/01: [SYSDM] System Parameters: Close dialog on ESC (#4891)
by Thamatip Chitpong 19 Nov '22

19 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f125cd1c71fd529ccadf7… commit f125cd1c71fd529ccadf77d9f4485900f95c5d81 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Sun Nov 20 00:08:04 2022 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 19 20:08:04 2022 +0300 [SYSDM] System Parameters: Close dialog on ESC (#4891) CORE-18610 --- dll/cpl/sysdm/advanced.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/cpl/sysdm/advanced.c b/dll/cpl/sysdm/advanced.c index ffa1e051ed6..ce8a5942235 100644 --- a/dll/cpl/sysdm/advanced.c +++ b/dll/cpl/sysdm/advanced.c @@ -104,6 +104,10 @@ SysSettingsDlgProc(HWND hwndDlg, OnOK(hwndDlg); EndDialog(hwndDlg, 0); return TRUE; + + case IDCANCEL: + EndDialog(hwndDlg, 0); + return TRUE; } break; }

1 0

[reactos] 01/01: [REGEDIT] F4, Alt+D, Tab, and Shift+Tab (#4885)
by Katayama Hirofumi MZ 18 Nov '22

18 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f908d37bb375acb608848… commit f908d37bb375acb60884890a0c5b8401d582015a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 19 08:42:20 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 19 08:42:20 2022 +0900 [REGEDIT] F4, Alt+D, Tab, and Shift+Tab (#4885) CORE-12323 --- base/applications/regedit/framewnd.c | 14 ++++++++++++-- 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-HK.rc | 2 ++ base/applications/regedit/lang/zh-TW.rc | 2 ++ base/applications/regedit/main.c | 2 +- base/applications/regedit/resource.h | 1 + 33 files changed, 74 insertions(+), 3 deletions(-) diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index f608ab57149..e3d695a6728 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -1279,8 +1279,18 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) RegKeyEditPermissions(hWnd, hKeyRoot, NULL, keyPath); break; case ID_SWITCH_PANELS: - g_pChildWnd->nFocusPanel = !g_pChildWnd->nFocusPanel; - SetFocus(g_pChildWnd->nFocusPanel? g_pChildWnd->hListWnd: g_pChildWnd->hTreeWnd); + { + BOOL bShiftDown = GetKeyState(VK_SHIFT) < 0; + HWND hwndItem = GetNextDlgTabItem(g_pChildWnd->hWnd, GetFocus(), bShiftDown); + if (hwndItem == g_pChildWnd->hAddressBarWnd) + PostMessageW(hwndItem, EM_SETSEL, 0, -1); + SetFocus(hwndItem); + } + break; + + case ID_ADDRESS_FOCUS: + SendMessageW(g_pChildWnd->hAddressBarWnd, EM_SETSEL, 0, -1); + SetFocus(g_pChildWnd->hAddressBarWnd); break; default: diff --git a/base/applications/regedit/lang/bg-BG.rc b/base/applications/regedit/lang/bg-BG.rc index 854be85902f..96d43d1cd27 100644 --- a/base/applications/regedit/lang/bg-BG.rc +++ b/base/applications/regedit/lang/bg-BG.rc @@ -7,11 +7,13 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/cs-CZ.rc b/base/applications/regedit/lang/cs-CZ.rc index 21fe50adac9..477a5e00d9c 100644 --- a/base/applications/regedit/lang/cs-CZ.rc +++ b/base/applications/regedit/lang/cs-CZ.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/de-DE.rc b/base/applications/regedit/lang/de-DE.rc index 14051258156..f6d23a14570 100644 --- a/base/applications/regedit/lang/de-DE.rc +++ b/base/applications/regedit/lang/de-DE.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/el-GR.rc b/base/applications/regedit/lang/el-GR.rc index 5f016432c54..0c840b3662e 100644 --- a/base/applications/regedit/lang/el-GR.rc +++ b/base/applications/regedit/lang/el-GR.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/en-US.rc b/base/applications/regedit/lang/en-US.rc index 76c3635f8dc..c733468f1fc 100644 --- a/base/applications/regedit/lang/en-US.rc +++ b/base/applications/regedit/lang/en-US.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/es-ES.rc b/base/applications/regedit/lang/es-ES.rc index e1ea9f54910..ab8ed5c0afd 100644 --- a/base/applications/regedit/lang/es-ES.rc +++ b/base/applications/regedit/lang/es-ES.rc @@ -5,11 +5,13 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/fr-FR.rc b/base/applications/regedit/lang/fr-FR.rc index 9be278812e8..9db8d8ab118 100644 --- a/base/applications/regedit/lang/fr-FR.rc +++ b/base/applications/regedit/lang/fr-FR.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/he-IL.rc b/base/applications/regedit/lang/he-IL.rc index 2ed77b68c4b..31fbda0e42c 100644 --- a/base/applications/regedit/lang/he-IL.rc +++ b/base/applications/regedit/lang/he-IL.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/hu-HU.rc b/base/applications/regedit/lang/hu-HU.rc index cf34fd50515..923cf80e9ff 100644 --- a/base/applications/regedit/lang/hu-HU.rc +++ b/base/applications/regedit/lang/hu-HU.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/id-ID.rc b/base/applications/regedit/lang/id-ID.rc index 0a05d82ff06..0d2ab2c0a1d 100644 --- a/base/applications/regedit/lang/id-ID.rc +++ b/base/applications/regedit/lang/id-ID.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/it-IT.rc b/base/applications/regedit/lang/it-IT.rc index 6657986753a..6f7fd072280 100644 --- a/base/applications/regedit/lang/it-IT.rc +++ b/base/applications/regedit/lang/it-IT.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/ja-JP.rc b/base/applications/regedit/lang/ja-JP.rc index b850ffc5c9a..e49b42a0d00 100644 --- a/base/applications/regedit/lang/ja-JP.rc +++ b/base/applications/regedit/lang/ja-JP.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/ko-KR.rc b/base/applications/regedit/lang/ko-KR.rc index 0d75c938bb4..d68d0ab9d84 100644 --- a/base/applications/regedit/lang/ko-KR.rc +++ b/base/applications/regedit/lang/ko-KR.rc @@ -4,11 +4,13 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/nl-NL.rc b/base/applications/regedit/lang/nl-NL.rc index 21897461b84..455a615b57e 100644 --- a/base/applications/regedit/lang/nl-NL.rc +++ b/base/applications/regedit/lang/nl-NL.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/no-NO.rc b/base/applications/regedit/lang/no-NO.rc index 1c2d08a00ce..4f946548851 100644 --- a/base/applications/regedit/lang/no-NO.rc +++ b/base/applications/regedit/lang/no-NO.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/pl-PL.rc b/base/applications/regedit/lang/pl-PL.rc index fc42f95ebcb..fbff2d011c8 100644 --- a/base/applications/regedit/lang/pl-PL.rc +++ b/base/applications/regedit/lang/pl-PL.rc @@ -12,11 +12,13 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/pt-BR.rc b/base/applications/regedit/lang/pt-BR.rc index 4c91129d37f..8f501039601 100644 --- a/base/applications/regedit/lang/pt-BR.rc +++ b/base/applications/regedit/lang/pt-BR.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/pt-PT.rc b/base/applications/regedit/lang/pt-PT.rc index 61d5e3f0994..fddef2f9c3e 100644 --- a/base/applications/regedit/lang/pt-PT.rc +++ b/base/applications/regedit/lang/pt-PT.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/ro-RO.rc b/base/applications/regedit/lang/ro-RO.rc index 4cbdb719259..d746d684545 100644 --- a/base/applications/regedit/lang/ro-RO.rc +++ b/base/applications/regedit/lang/ro-RO.rc @@ -4,11 +4,13 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/ru-RU.rc b/base/applications/regedit/lang/ru-RU.rc index 97489d19d6d..6a13e2b0577 100644 --- a/base/applications/regedit/lang/ru-RU.rc +++ b/base/applications/regedit/lang/ru-RU.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/sk-SK.rc b/base/applications/regedit/lang/sk-SK.rc index 3b5602125f6..5f453c80f5c 100644 --- a/base/applications/regedit/lang/sk-SK.rc +++ b/base/applications/regedit/lang/sk-SK.rc @@ -7,11 +7,13 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/sl-SI.rc b/base/applications/regedit/lang/sl-SI.rc index d519d24b590..4d8d89eb17f 100644 --- a/base/applications/regedit/lang/sl-SI.rc +++ b/base/applications/regedit/lang/sl-SI.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/sq-AL.rc b/base/applications/regedit/lang/sq-AL.rc index d6192aae15f..280814c024e 100644 --- a/base/applications/regedit/lang/sq-AL.rc +++ b/base/applications/regedit/lang/sq-AL.rc @@ -6,11 +6,13 @@ LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/sv-SE.rc b/base/applications/regedit/lang/sv-SE.rc index 315cf46c7b9..7df2fca17b6 100644 --- a/base/applications/regedit/lang/sv-SE.rc +++ b/base/applications/regedit/lang/sv-SE.rc @@ -2,11 +2,13 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/th-TH.rc b/base/applications/regedit/lang/th-TH.rc index 0f1c3815171..2b7d63f609f 100644 --- a/base/applications/regedit/lang/th-TH.rc +++ b/base/applications/regedit/lang/th-TH.rc @@ -4,11 +4,13 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/tr-TR.rc b/base/applications/regedit/lang/tr-TR.rc index 7f2a968d327..da5f6fded08 100644 --- a/base/applications/regedit/lang/tr-TR.rc +++ b/base/applications/regedit/lang/tr-TR.rc @@ -4,11 +4,13 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/uk-UA.rc b/base/applications/regedit/lang/uk-UA.rc index 15a3b1ceb32..1ec8de53702 100644 --- a/base/applications/regedit/lang/uk-UA.rc +++ b/base/applications/regedit/lang/uk-UA.rc @@ -4,11 +4,13 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/zh-CN.rc b/base/applications/regedit/lang/zh-CN.rc index 6380d8a413b..3250830dc0e 100644 --- a/base/applications/regedit/lang/zh-CN.rc +++ b/base/applications/regedit/lang/zh-CN.rc @@ -12,11 +12,13 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/zh-HK.rc b/base/applications/regedit/lang/zh-HK.rc index 5f75641857f..0ec044875ae 100644 --- a/base/applications/regedit/lang/zh-HK.rc +++ b/base/applications/regedit/lang/zh-HK.rc @@ -10,11 +10,13 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/lang/zh-TW.rc b/base/applications/regedit/lang/zh-TW.rc index 8dff53ad18a..db2d11e39a5 100644 --- a/base/applications/regedit/lang/zh-TW.rc +++ b/base/applications/regedit/lang/zh-TW.rc @@ -11,11 +11,13 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL ID_ACCEL ACCELERATORS BEGIN + "D", ID_ADDRESS_FOCUS, VIRTKEY, ALT VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F4, ID_ADDRESS_FOCUS, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT END diff --git a/base/applications/regedit/main.c b/base/applications/regedit/main.c index 2d2a3fa1fdf..c762d6521dd 100644 --- a/base/applications/regedit/main.c +++ b/base/applications/regedit/main.c @@ -191,7 +191,7 @@ BOOL TranslateChildTabMessage(PMSG msg) if (msg->wParam != VK_TAB) return FALSE; if (GetParent(msg->hwnd) != g_pChildWnd->hWnd) return FALSE; - PostMessageW(g_pChildWnd->hWnd, WM_COMMAND, ID_SWITCH_PANELS, 0); + PostMessageW(hFrameWnd, WM_COMMAND, ID_SWITCH_PANELS, 0); return TRUE; } diff --git a/base/applications/regedit/resource.h b/base/applications/regedit/resource.h index dd39001ac1c..933a8a03420 100644 --- a/base/applications/regedit/resource.h +++ b/base/applications/regedit/resource.h @@ -157,6 +157,7 @@ #define ID_TREE_SUGGESTION_MAX 32887 #define ID_TREE_EXPORT 32888 #define ID_TREE_PERMISSIONS 32889 +#define ID_ADDRESS_FOCUS 32890 #define IDS_FLT_REGFILE 31000 #define IDS_FLT_REGFILES 31001

1 0

[reactos] 05/05: [NTOS:KD] Handle work-buffer allocation failure in KdpDebugLogInit. It can be ignored in KdpScreenInit.
by Hermès Bélusca-Maïto 18 Nov '22

18 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ffe3109d37939a70b0e74… commit ffe3109d37939a70b0e742fbdb6955b9c5b92473 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 18 18:08:21 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 18 18:48:46 2022 +0100 [NTOS:KD] Handle work-buffer allocation failure in KdpDebugLogInit. It can be ignored in KdpScreenInit. --- ntoskrnl/kd/kdio.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 1b0cd821383..8c0ca1825ad 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -237,7 +237,14 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, else if (BootPhase == 1) { /* Allocate a buffer for debug log */ - KdpDebugBuffer = ExAllocatePool(NonPagedPool, KdpBufferSize); + KdpDebugBuffer = ExAllocatePoolZero(NonPagedPool, + KdpBufferSize, + TAG_KDBG); + if (!KdpDebugBuffer) + { + KdpDebugMode.File = FALSE; + return; + } KdpFreeBytes = KdpBufferSize; /* Initialize spinlock */ @@ -519,8 +526,10 @@ KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, /* Allocate a buffer for dmesg log buffer. +1 for terminating null, * see kdbp_cli.c:KdbpCmdDmesg()/2 */ - KdpDmesgBuffer = ExAllocatePool(NonPagedPool, KdpDmesgBufferSize + 1); - RtlZeroMemory(KdpDmesgBuffer, KdpDmesgBufferSize + 1); + KdpDmesgBuffer = ExAllocatePoolZero(NonPagedPool, + KdpDmesgBufferSize + 1, + TAG_KDBG); + /* Ignore failure if KdpDmesgBuffer is NULL */ KdpDmesgFreeBytes = KdpDmesgBufferSize; KdbDmesgTotalWritten = 0;

1 0

[reactos] 04/05: [NTOS:KD] Cleanup of some old code.
by Hermès Bélusca-Maïto 18 Nov '22

18 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=271b985981d3c85dcc32b… commit 271b985981d3c85dcc32b1d8d5e9ea2a66892eb9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 18 17:44:29 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 18 18:11:30 2022 +0100 [NTOS:KD] Cleanup of some old code. - Remove KdbInit() macro and directly use KdbpCliInit() (since the place where it was used was already within an #ifdef KDBG block). - Declare KdpKdbgInit() only when KDBG is defined, move its definition into kdio.c and remove the legacy wrappers/kdbg.c file. And in KdbInitialize(), set KdpInitRoutine directly to the former, instead of using the KdpKdbgInit indirection. - Don't reset KdComPortInUse in KdpDebugLogInit(). - Minor refactorings: KdpSerialDebugPrint -> KdpSerialPrint and make it static; argument name "Message" -> "String", "StringLength" -> "Length". --- ntoskrnl/include/internal/kd.h | 12 ++----- ntoskrnl/io/iomgr/iomgr.c | 2 +- ntoskrnl/kd/kdio.c | 72 +++++++++++++++++++++++++++--------------- ntoskrnl/kd/wrappers/kdbg.c | 30 ------------------ ntoskrnl/kdbg/kdb_symbols.c | 4 +-- ntoskrnl/ntos.cmake | 1 - 6 files changed, 53 insertions(+), 68 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 7cc2ec45922..96862d1ef7e 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -27,16 +27,8 @@ KdPortPutByteEx( UCHAR ByteToSend ); -/* SYMBOL ROUTINES **********************************************************/ - #ifdef _NTOSKRNL_ -#ifdef KDBG -# define KdbInit() KdbpCliInit() -#else -# define KdbInit() do { } while (0) -#endif - /* KD ROUTINES ***************************************************************/ typedef enum _KD_CONTINUE_TYPE @@ -89,11 +81,13 @@ KdpDebugLogInit( ULONG BootPhase ); +#ifdef KDBG VOID NTAPI KdpKdbgInit( struct _KD_DISPATCH_TABLE *DispatchTable, ULONG BootPhase); +#endif /* KD ROUTINES ***************************************************************/ @@ -193,7 +187,7 @@ extern KD_DISPATCH_TABLE DispatchTable[KdMax]; /* The KD Native Provider List */ extern LIST_ENTRY KdProviders; -#endif +#endif // _NTOSKRNL_ #if DBG && defined(_M_IX86) && !defined(_WINKD_) // See ke/i386/traphdlr.c #define ID_Win32PreServiceHook 'WSH0' diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 06df1ceac8f..0e901c605e9 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -590,7 +590,7 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) #if !defined(_WINKD_) && defined(KDBG) /* Read KDB Data */ - KdbInit(); + KdbpCliInit(); /* I/O is now setup for disk access, so phase 3 */ KdInitSystem(3, LoaderBlock); diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 275971acd92..1b0cd821383 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -49,10 +49,15 @@ KDP_DEBUG_MODE KdpDebugMode; LIST_ENTRY KdProviders = {&KdProviders, &KdProviders}; KD_DISPATCH_TABLE DispatchTable[KdMax]; -PKDP_INIT_ROUTINE InitRoutines[KdMax] = {KdpScreenInit, - KdpSerialInit, - KdpDebugLogInit, - KdpKdbgInit}; +PKDP_INIT_ROUTINE InitRoutines[KdMax] = +{ + KdpScreenInit, + KdpSerialInit, + KdpDebugLogInit, +#ifdef KDBG + KdpKdbgInit +#endif +}; static ULONG KdbgNextApiNumber = DbgKdContinueApi; static CONTEXT KdbgContext; @@ -155,7 +160,7 @@ KdpLoggerThread(PVOID Context) static VOID NTAPI KdpPrintToLogFile(PCHAR String, - ULONG StringLength) + ULONG Length) { KIRQL OldIrql; ULONG beg, end, num; @@ -168,8 +173,8 @@ KdpPrintToLogFile(PCHAR String, beg = KdpCurrentPosition; num = KdpFreeBytes; - if (StringLength < num) - num = StringLength; + if (Length < num) + num = Length; if (num != 0) { @@ -222,8 +227,6 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, if (BootPhase == 0) { - KdComPortInUse = NULL; - /* Write out the functions that we support for now */ DispatchTable->KdpInitRoutine = KdpDebugLogInit; DispatchTable->KdpPrintRoutine = KdpPrintToLogFile; @@ -303,19 +306,19 @@ KdpDebugLogInit(PKD_DISPATCH_TABLE DispatchTable, /* SERIAL FUNCTIONS **********************************************************/ -VOID +static VOID NTAPI -KdpSerialDebugPrint(PCHAR Message, - ULONG Length) +KdpSerialPrint(PCHAR String, + ULONG Length) { - PCHAR pch = (PCHAR)Message; + PCHAR pch = String; KIRQL OldIrql; /* Acquire the printing spinlock without waiting at raised IRQL */ OldIrql = KdpAcquireLock(&KdpSerialSpinLock); - /* Output the message */ - while (pch < Message + Length && *pch != '\0') + /* Output the string */ + while (pch < String + Length && *pch) { if (*pch == '\n') { @@ -340,7 +343,7 @@ KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable, { /* Write out the functions that we support for now */ DispatchTable->KdpInitRoutine = KdpSerialInit; - DispatchTable->KdpPrintRoutine = KdpSerialDebugPrint; + DispatchTable->KdpPrintRoutine = KdpSerialPrint; /* Initialize the Port */ if (!KdPortInitializeEx(&SerialPortInfo, SerialPortNumber)) @@ -396,21 +399,21 @@ KdpScreenRelease(VOID) } /* - * Screen debug logger function KdpScreenPrint() writes text messages into + * Screen debug logger function KdpScreenPrint() writes text strings into * KdpDmesgBuffer, using it as a circular buffer. KdpDmesgBuffer contents could * be later (re)viewed using dmesg command of kdbg. KdpScreenPrint() protects * KdpDmesgBuffer from simultaneous writes by use of KdpDmesgLogSpinLock. */ static VOID NTAPI -KdpScreenPrint(PCHAR Message, +KdpScreenPrint(PCHAR String, ULONG Length) { - PCHAR pch = (PCHAR)Message; + PCHAR pch = String; KIRQL OldIrql; ULONG beg, end, num; - while (pch < Message + Length && *pch) + while (pch < String + Length && *pch) { if (*pch == '\b') { @@ -453,7 +456,7 @@ KdpScreenPrint(PCHAR Message, KdpScreenLineBufferPos = KdpScreenLineLength; } - /* Dmesg: store Message in the buffer to show it later */ + /* Dmesg: store the string in the buffer to show it later */ if (KdbpIsInDmesgMode) return; @@ -473,12 +476,12 @@ KdpScreenPrint(PCHAR Message, end = (beg + num) % KdpDmesgBufferSize; if (end > beg) { - RtlCopyMemory(KdpDmesgBuffer + beg, Message, Length); + RtlCopyMemory(KdpDmesgBuffer + beg, String, Length); } else { - RtlCopyMemory(KdpDmesgBuffer + beg, Message, KdpDmesgBufferSize - beg); - RtlCopyMemory(KdpDmesgBuffer, Message + (KdpDmesgBufferSize - beg), end); + RtlCopyMemory(KdpDmesgBuffer + beg, String, KdpDmesgBufferSize - beg); + RtlCopyMemory(KdpDmesgBuffer, String + (KdpDmesgBufferSize - beg), end); } KdpDmesgCurrentPosition = end; @@ -491,7 +494,7 @@ KdpScreenPrint(PCHAR Message, /* Optional step(?): find out a way to notify about buffer exhaustion, * and possibly fall into kbd to use dmesg command: user will read - * debug messages before they will be wiped over by next writes. + * debug strings before they will be wiped over by next writes. */ } @@ -531,6 +534,25 @@ KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, } } +#ifdef KDBG +/* KDBG FUNCTIONS ************************************************************/ + +/* NOTE: This may be moved completely into kdb_symbols.c */ +VOID NTAPI +KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase); + +VOID +NTAPI +KdpKdbgInit( + PKD_DISPATCH_TABLE DispatchTable, + ULONG BootPhase) +{ + /* Forward the call */ + KdbInitialize(DispatchTable, BootPhase); +} +#endif + + /* GENERAL FUNCTIONS *********************************************************/ BOOLEAN diff --git a/ntoskrnl/kd/wrappers/kdbg.c b/ntoskrnl/kd/wrappers/kdbg.c deleted file mode 100644 index 23655ac600b..00000000000 --- a/ntoskrnl/kd/wrappers/kdbg.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/kd/wrappers/kdbg.c - * PURPOSE: KDBG Wrapper for Kd - * - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) - */ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -VOID NTAPI -KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase); - -/* FUNCTIONS *****************************************************************/ - -VOID -NTAPI -KdpKdbgInit(PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) -{ -#ifdef KDBG - /* Forward the call */ - KdbInitialize(DispatchTable, BootPhase); -#else - /* When KDBG is disabled, it is not used/initialized at all */ -#endif -} diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index 2f2703b717c..f2e0088d006 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -368,7 +368,7 @@ KdbInitialize( if (BootPhase == 0) { /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdpKdbgInit; + DispatchTable->KdpInitRoutine = KdbInitialize; DispatchTable->KdpPrintRoutine = KdbDebugPrint; /* Register as a Provider */ @@ -382,7 +382,7 @@ KdbInitialize( * /LOADSYMBOLS={YES|NO}, /NOLOADSYMBOLS={YES|NO} */ ASSERT(KeLoaderBlock); p1 = KeLoaderBlock->LoadOptions; - while('\0' != *p1 && NULL != (p2 = strchr(p1, '/'))) + while ('\0' != *p1 && NULL != (p2 = strchr(p1, '/'))) { p2++; Found = 0; diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 67fe1186a14..1bef231351f 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -415,7 +415,6 @@ if(NOT _WINKD_) endif() list(APPEND SOURCE - ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/wrappers/kdbg.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdio.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c)

1 0

[reactos] 03/05: [NTOS:KD] Annotate KdInitSystem and remove redundant declaration in kd.h
by Hermès Bélusca-Maïto 18 Nov '22

18 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98e585364ba74081787f0… commit 98e585364ba74081787f04402052aa96565cf84c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 18 16:23:06 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 18 18:11:29 2022 +0100 [NTOS:KD] Annotate KdInitSystem and remove redundant declaration in kd.h --- ntoskrnl/include/internal/kd.h | 7 ------- ntoskrnl/include/internal/kd64.h | 4 ++-- ntoskrnl/kd64/kdinit.c | 7 ++++--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 346dc70e5f1..7cc2ec45922 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -62,13 +62,6 @@ VOID /* INIT ROUTINES *************************************************************/ -BOOLEAN -NTAPI -KdInitSystem( - ULONG Reserved, - PLOADER_PARAMETER_BLOCK LoaderBlock -); - VOID KdpScreenAcquire(VOID); diff --git a/ntoskrnl/include/internal/kd64.h b/ntoskrnl/include/internal/kd64.h index 7e992e0b4ec..8f87c591634 100644 --- a/ntoskrnl/include/internal/kd64.h +++ b/ntoskrnl/include/internal/kd64.h @@ -81,8 +81,8 @@ BOOLEAN BOOLEAN NTAPI KdInitSystem( - ULONG Reserved, - PLOADER_PARAMETER_BLOCK LoaderBlock + _In_ ULONG BootPhase, + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock ); VOID diff --git a/ntoskrnl/kd64/kdinit.c b/ntoskrnl/kd64/kdinit.c index 6b8319605db..8ce9ba72ce7 100644 --- a/ntoskrnl/kd64/kdinit.c +++ b/ntoskrnl/kd64/kdinit.c @@ -139,11 +139,12 @@ KdRegisterDebuggerDataBlock(IN ULONG Tag, BOOLEAN NTAPI -KdInitSystem(IN ULONG BootPhase, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) +KdInitSystem( + _In_ ULONG BootPhase, + _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock) { BOOLEAN EnableKd, DisableKdAfterInit = FALSE, BlockEnable; - LPSTR CommandLine, DebugLine, DebugOptionStart, DebugOptionEnd; + PSTR CommandLine, DebugLine, DebugOptionStart, DebugOptionEnd; STRING ImageName; PLDR_DATA_TABLE_ENTRY LdrEntry; PLIST_ENTRY NextEntry;

1 0

[reactos] 02/05: [NTOS:IO] Show the captured/generated driver name in one failure path of IoCreateDriver.
by Hermès Bélusca-Maïto 18 Nov '22

18 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a93b0a4638e9dc14c555… commit 4a93b0a4638e9dc14c555de10534099344f92504 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 18 16:17:30 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 18 18:11:28 2022 +0100 [NTOS:IO] Show the captured/generated driver name in one failure path of IoCreateDriver. --- ntoskrnl/io/iomgr/driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 8107c4906ed..c81e4714542 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -643,7 +643,7 @@ IopInitializeDriverModule( driverObject->Flags &= ~DRVO_LEGACY_DRIVER; } - // Windows does this fixup - keep it for compatibility + /* Windows does this fixup, keep it for compatibility */ for (INT i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) { /* @@ -1695,13 +1695,13 @@ try_again: if (!NT_SUCCESS(Status)) { /* If it didn't work, then kill the object */ - DPRINT1("'%wZ' initialization failed, status (0x%08lx)\n", DriverName, Status); + DPRINT1("'%wZ' initialization failed, status (0x%08lx)\n", &LocalDriverName, Status); ObMakeTemporaryObject(DriverObject); ObDereferenceObject(DriverObject); return Status; } - // Windows does this fixup - keep it for compatibility + /* Windows does this fixup, keep it for compatibility */ for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) { /*

1 0

[reactos] 01/05: [NTOS:IO][NDK] Add the exported IoDeleteDriver to the NDK headers.
by Hermès Bélusca-Maïto 18 Nov '22

18 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=56be4eafd5af419855e0a… commit 56be4eafd5af419855e0ab875eacb92e4ca4c93c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Nov 18 16:06:57 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Nov 18 18:11:26 2022 +0100 [NTOS:IO][NDK] Add the exported IoDeleteDriver to the NDK headers. --- ntoskrnl/io/iomgr/driver.c | 3 ++- sdk/include/ndk/iofuncs.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/io/iomgr/driver.c b/ntoskrnl/io/iomgr/driver.c index 38589441ad4..8107c4906ed 100644 --- a/ntoskrnl/io/iomgr/driver.c +++ b/ntoskrnl/io/iomgr/driver.c @@ -1731,7 +1731,8 @@ try_again: */ VOID NTAPI -IoDeleteDriver(IN PDRIVER_OBJECT DriverObject) +IoDeleteDriver( + _In_ PDRIVER_OBJECT DriverObject) { /* Simply dereference the Object */ ObDereferenceObject(DriverObject); diff --git a/sdk/include/ndk/iofuncs.h b/sdk/include/ndk/iofuncs.h index a141883381f..8bac30e3019 100644 --- a/sdk/include/ndk/iofuncs.h +++ b/sdk/include/ndk/iofuncs.h @@ -56,6 +56,12 @@ IoCreateDriver( _In_ PDRIVER_INITIALIZE InitializationFunction ); +VOID +NTAPI +IoDeleteDriver( + _In_ PDRIVER_OBJECT DriverObject +); + NTSTATUS NTAPI IoReportHalResourceUsage(

1 0

[reactos] 01/01: [COMCTL32] Remove a rosdiff TOOLBAR_EraseBackground() (#4887)
by Joachim Henze 18 Nov '22

18 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9c5bb096bc21cee00a8b8… commit 9c5bb096bc21cee00a8b8968214d24d5c5500d88 Author: Joachim Henze <joachim.henze(a)reactos.org> AuthorDate: Fri Nov 18 12:42:32 2022 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 18 12:42:32 2022 +0100 [COMCTL32] Remove a rosdiff TOOLBAR_EraseBackground() (#4887) This fixes the toolbar in FileZilla 3.8 being drawn wrong (grey) It regressed by 0.4.15-dev-1603-g 232c45fcd71b12a0d726b47f4a72e9a16f87432a And todays fix is a partial revert of that guilty rev. The reverted part is not even necessarily needed for what we had in mind back then, It was just a first tiny step with the aim to get rid of the comctl32.h changes of that commit. But that goal was and even is far out of reach for many other reasons also. Actually we should have reverted the toolbar.c change back then already, before committing the "flipfix9". CORE-18263 --- dll/win32/comctl32/toolbar.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dll/win32/comctl32/toolbar.c b/dll/win32/comctl32/toolbar.c index b725f3c5121..e2b6193b663 100644 --- a/dll/win32/comctl32/toolbar.c +++ b/dll/win32/comctl32/toolbar.c @@ -6603,10 +6603,6 @@ TOOLBAR_Paint (TOOLBAR_INFO *infoPtr, WPARAM wParam) TRACE("psrect=(%s)\n", wine_dbgstr_rect(&ps.rcPaint)); -#ifdef __REACTOS__ - TOOLBAR_EraseBackground(infoPtr, (WPARAM)hdc, (LPARAM) 0); -#endif - TOOLBAR_Refresh (infoPtr, hdc, &ps); if (!wParam) EndPaint (infoPtr->hwndSelf, &ps);

1 0

[reactos] 01/01: [NTUSER] Implement IntCheckImeShowStatusInThread
by Katayama Hirofumi MZ 17 Nov '22

17 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7cc89e520c3ac4182e9f6… commit 7cc89e520c3ac4182e9f6db13610e01a5e54efe5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Nov 17 10:27:12 2022 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Nov 17 10:27:12 2022 +0900 [NTUSER] Implement IntCheckImeShowStatusInThread CORE-11700 --- win32ss/user/ntuser/ime.c | 7 +++++++ win32ss/user/ntuser/simplecall.c | 2 +- win32ss/user/ntuser/window.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 57d2e3f0839..5c15a2375dd 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -2395,4 +2395,11 @@ BOOL FASTCALL IntBroadcastImeShowStatusChange(PWND pImeWnd, BOOL bShow) return TRUE; } +/* Win: xxxCheckImeShowStatusInThread */ +VOID FASTCALL IntCheckImeShowStatusInThread(PWND pImeWnd) +{ + if (IS_IMM_MODE() && !(pImeWnd->state2 & WNDS2_INDESTROY)) + IntCheckImeShowStatus(pImeWnd, pImeWnd->head.pti); +} + /* EOF */ diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c index a52d184fe20..6cfcf8e9d45 100644 --- a/win32ss/user/ntuser/simplecall.c +++ b/win32ss/user/ntuser/simplecall.c @@ -670,7 +670,7 @@ NtUserCallHwndLock( break; case HWNDLOCK_ROUTINE_CHECKIMESHOWSTATUSINTHRD: - // TODO: + IntCheckImeShowStatusInThread(Window); break; } diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index 0efbd4987a3..036cd690954 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -122,5 +122,6 @@ BOOL FASTCALL IntImeCanDestroyDefIMEforChild(PWND pImeWnd, PWND pwndTarget); BOOL FASTCALL IntImeCanDestroyDefIME(PWND pImeWnd, PWND pwndTarget); BOOL FASTCALL IntBroadcastImeShowStatusChange(PWND pImeWnd, BOOL bShow); VOID FASTCALL IntNotifyImeShowStatus(PWND pImeWnd); +VOID FASTCALL IntCheckImeShowStatusInThread(PWND pImeWnd); /* EOF */

1 0

[reactos] 01/01: [SYSDM][SMSS] Addendum to (#4843) (#4844) CORE-18574
by Joachim Henze 16 Nov '22

16 Nov '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcb9abc133e173c5bdabc… commit bcb9abc133e173c5bdabc50b823ec6b6a38b69fb Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Nov 16 23:08:52 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Nov 16 23:08:52 2022 +0100 [SYSDM][SMSS] Addendum to (#4843) (#4844) CORE-18574 [SYSDM] Prevent my german-teacher from getting a heart-attack by that misplaced comma. [SMSS] Prevent myself from getting a heart-attack by that superfluous dot. Furthermore this addendum serves the purpose of actually linking both PRs and their 4 previous commits to the actual JIRA ticket CORE-18754, which wasn't the case before: 0.4.15-dev-5392-g 04b2d35f5b7372578891d1d455ca5e0e669d7644 0.4.15-dev-5391-g a8e06d92e8f3f7605024c28fb16ce37251b09276 0.4.15-dev-5390-g a4274ad54837287bca58ca698b5a0ce237d0fd9d 0.4.15-dev-5389-g 5dc43c0f323da21d67e5604bcf4a44f9b1988d75 --- base/system/smss/pagefile.c | 2 +- dll/cpl/sysdm/lang/de-DE.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/system/smss/pagefile.c b/base/system/smss/pagefile.c index c8115955c4f..ae26de36cc7 100644 --- a/base/system/smss/pagefile.c +++ b/base/system/smss/pagefile.c @@ -512,7 +512,7 @@ SmpCreatePagingFile(IN PUNICODE_STRING Name, Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority); if (NT_SUCCESS(Status)) { - DPRINT("SMSS:PFILE: NtCreatePagingFile(%wZ, 0x%I64X, 0x%I64X) succeeded.\n", + DPRINT("SMSS:PFILE: NtCreatePagingFile(%wZ, 0x%I64X, 0x%I64X) succeeded\n", Name, MinSize->QuadPart, MaxSize->QuadPart); diff --git a/dll/cpl/sysdm/lang/de-DE.rc b/dll/cpl/sysdm/lang/de-DE.rc index a76aef59525..b29208c7af4 100644 --- a/dll/cpl/sysdm/lang/de-DE.rc +++ b/dll/cpl/sysdm/lang/de-DE.rc @@ -366,7 +366,7 @@ BEGIN IDS_WARNINITIALSIZE "Geben Sie einen numerischen Wert für die Anfangsgröße der Auslagerungsdatei an." IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert für die Maximalgröße der Auslagerungsdatei an." IDS_WARNINITIALRANGE "Die Anfangsgröße der Auslagerungsdatei muss zwischen 2 MB und %lu MB auf dem gewählten Laufwerk sein." - IDS_WARNMAXIMUMRANGE "Die Maximalgröße der Auslagerungsdatei darf nicht kleiner als die Anfangsgröße sein, und muss kleiner als %lu MB auf dem gewählten Laufwerk sein." + IDS_WARNMAXIMUMRANGE "Die Maximalgröße der Auslagerungsdatei darf nicht kleiner als die Anfangsgröße und muss kleiner als %lu MB auf dem gewählten Laufwerk sein." IDS_PAGEFILE_MB "%lu MB" IDS_PAGEFILE_NONE "Keine" IDS_PAGEFILE_SYSTEM "Systemverwaltet"

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2022