Ros-diffs August 2022

ros-diffs@reactos.org

11 participants
86 discussions

[reactos] 01/01: [KEYBOARD][BOOTDATA][TOOLS] Rename keyboard layout files (#4596)
by Katayama Hirofumi MZ 05 Aug '22

05 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2220e566a2940fc157c63… commit 2220e566a2940fc157c636ad30460ec9ae06a79c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 6 08:03:46 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 6 08:03:46 2022 +0900 [KEYBOARD][BOOTDATA][TOOLS] Rename keyboard layout files (#4596) The keyboard layout file names of ReactOS are different from Windows' ones. It was one reason why ImmInstallIMEW fails. - s/kbdbgm/kbdbu/ Bulgarian (Typewriter) - s/kbdgrist/kbdgr1/ German_IBM - s/kbdes/kbdsp/ Spanish (non-alternate!) - s/kbdja/kbdjpn/ Japanese - s/kbdko/kbdkor/ Korean - s/kbdsk/kbdsl/ Slovak - s/kbdsk1/kbdsl1/ Slovak (QWERTY) CORE-11700 --- boot/bootdata/hivesys.inf | 14 +++++++------- boot/bootdata/txtsetup.sif | 14 +++++++------- dll/keyboard/CMakeLists.txt | 14 +++++++------- dll/keyboard/{kbdbgm/kbdbgm.c => kbdbu/kbdbu.c} | 0 dll/keyboard/{kbdbgm/kbdbgm.rc => kbdbu/kbdbu.rc} | 4 ++-- dll/keyboard/{kbdbgm/kbdbgm.spec => kbdbu/kbdbu.spec} | 0 dll/keyboard/{kbdgrist/kbdgrist.c => kbdgr1/kbdgr1.c} | 0 dll/keyboard/{kbdgrist/kbdgrist.rc => kbdgr1/kbdgr1.rc} | 4 ++-- dll/keyboard/{kbdes/kbdes.spec => kbdgr1/kbdgr1.spec} | 0 dll/keyboard/{kbdja/kbdja.c => kbdjpn/kbdjpn.c} | 0 dll/keyboard/{kbdja/kbdja.rc => kbdjpn/kbdjpn.rc} | 4 ++-- .../{kbdgrist/kbdgrist.spec => kbdjpn/kbdjpn.spec} | 0 dll/keyboard/{kbdko/kbdko.c => kbdkor/kbdkor.c} | 0 dll/keyboard/{kbdko/kbdko.rc => kbdkor/kbdkor.rc} | 4 ++-- dll/keyboard/{kbdja/kbdja.spec => kbdkor/kbdkor.spec} | 0 dll/keyboard/{kbdsk/kbdsk.c => kbdsl/kbdsl.c} | 0 dll/keyboard/{kbdsk/kbdsk.rc => kbdsl/kbdsl.rc} | 4 ++-- dll/keyboard/{kbdko/kbdko.spec => kbdsl/kbdsl.spec} | 0 dll/keyboard/{kbdsk1/kbdsk1.c => kbdsl1/kbdsl1.c} | 0 dll/keyboard/{kbdsk1/kbdsk1.rc => kbdsl1/kbdsl1.rc} | 4 ++-- dll/keyboard/{kbdsk/kbdsk.spec => kbdsl1/kbdsl1.spec} | 0 dll/keyboard/{kbdes/kbdes.c => kbdsp/kbdsp.c} | 0 dll/keyboard/{kbdes/kbdes.rc => kbdsp/kbdsp.rc} | 4 ++-- dll/keyboard/{kbdsk1/kbdsk1.spec => kbdsp/kbdsp.spec} | 0 sdk/tools/gen_baseaddress.py | 14 +++++++------- 25 files changed, 42 insertions(+), 42 deletions(-) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 4a447614b8f..08210654e43 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -492,7 +492,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020401","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020401","Layout Text",0x00000000,%ARABIC_102_AZERTY% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020401","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5086" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000402","Layout File",0x00000000,"kbdbgm.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000402","Layout File",0x00000000,"kbdbu.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000402","Layout Text",0x00000000,%BULGARIAN_BDS% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000402","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5136" @@ -524,7 +524,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout Text",0x00000000,%GERMAN_NEO% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00020407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5138" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout File",0x00000000,"kbdgrist.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout File",0x00000000,"kbdgr1.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout Text",0x00000000,%GERMAN_RISTOME% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00010407","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5137" @@ -582,7 +582,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Id", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Text",0x00000000,%US_ARABIC% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00050409","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5123" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout File",0x00000000,"kbdes.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout File",0x00000000,"kbdsp.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Text",0x00000000,%SPANISH% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000040a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5020" @@ -626,12 +626,12 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout Text",0x00000000,%ITALIAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000410","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5015" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout File",0x00000000,"kbdja.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout File",0x00000000,"kbdjpn.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Text",0x00000000,%JAPANESE% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5061" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000411","Layout Id",0x00000000,"0001" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout File",0x00000000,"kbdko.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout File",0x00000000,"kbdkor.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Text",0x00000000,%KOREAN% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5063" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000412","Layout Id",0x00000000,"0001" @@ -692,11 +692,11 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout File", HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout Text",0x00000000,%SERBIAN_CYRILLIC% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000c1a","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5057" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout File",0x00000000,"kbdsk.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout File",0x00000000,"kbdsl.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Text",0x00000000,%SLOVAK% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0000041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5039" -HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout File",0x00000000,"kbdsk1.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout File",0x00000000,"kbdsl1.dll" HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Text",0x00000000,%SLOVAK_QWERTY% HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\0001041b","Layout Display Name",0x00000000,"@%SystemRoot%\system32\input.dll,-5040" diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index c74b3328aae..9b7e35d025e 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -568,13 +568,13 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 00020401 = kbda3.dll 00020402 = kbdbgt.dll 00030402 = kbdbga.dll -00040402 = kbdbgm.dll +00040402 = kbdbu.dll 00000405 = kbdcz.dll 00010405 = kbdcz1.dll 00000406 = kbdda.dll 00000407 = kbdgr.dll 00000807 = kbdsg.dll -00010407 = kbdgrist.dll +00010407 = kbdgr1.dll 00020407 = kbdgneo.dll 00030407 = kbdgerg.dll 00000408 = kbdhe.dll @@ -588,7 +588,7 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 00030409 = kbdusl.dll 00040409 = kbdusr.dll 00050409 = kbdusa.dll -0000040A = kbdes.dll +0000040A = kbdsp.dll 0000080A = kbdla.dll 0000040B = kbdfi.dll 0000040C = kbdfr.dll @@ -598,8 +598,8 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 0000040E = kbdhu.dll 0000040F = kbdic.dll 00000410 = kbdit.dll -00000411 = kbdja.dll -00000412 = kbdko.dll +00000411 = kbdjpn.dll +00000412 = kbdkor.dll 00000413 = kbdne.dll 00000813 = kbdbe.dll 00000414 = kbdno.dll @@ -613,8 +613,8 @@ Default = "XT-, AT- or extended keyboard (83-105 keys)" 0000041A = kbdcr.dll 0000081A = kbdycl.dll 00000C1A = kbdycc.dll -0000041B = kbdsk.dll -0001041B = kbdsk1.dll +0000041B = kbdsl.dll +0001041B = kbdsl1.dll 0000041C = kbdal.dll 0000041D = kbdsw.dll 0000041E = kbdth0.dll diff --git a/dll/keyboard/CMakeLists.txt b/dll/keyboard/CMakeLists.txt index 9401bde674a..4a89c297d38 100644 --- a/dll/keyboard/CMakeLists.txt +++ b/dll/keyboard/CMakeLists.txt @@ -10,10 +10,10 @@ list(APPEND _keyboard_layouts kbdazel kbdbe kbdbga - kbdbgm kbdbgt kbdblr kbdbr + kbdbu kbdbur kbdcan kbdcr @@ -22,7 +22,6 @@ list(APPEND _keyboard_layouts kbdda kbddv kbdeo - kbdes kbdest kbdfc kbdfi @@ -31,7 +30,7 @@ list(APPEND _keyboard_layouts kbdgerg kbdgneo kbdgr - kbdgrist + kbdgr1 kbdhe kbdheb kbdhu @@ -43,9 +42,9 @@ list(APPEND _keyboard_layouts kbdinmal kbdir kbdit - kbdja + kbdjpn kbdkaz - kbdko + kbdkor kbdla kbdlt1 kbdlv @@ -61,8 +60,9 @@ list(APPEND _keyboard_layouts kbdru1 kbdsf kbdsg - kbdsk - kbdsk1 + kbdsl + kbdsl1 + kbdsp kbdsw kbdtat kbdth0 diff --git a/dll/keyboard/kbdbgm/kbdbgm.c b/dll/keyboard/kbdbu/kbdbu.c similarity index 100% rename from dll/keyboard/kbdbgm/kbdbgm.c rename to dll/keyboard/kbdbu/kbdbu.c diff --git a/dll/keyboard/kbdbgm/kbdbgm.rc b/dll/keyboard/kbdbu/kbdbu.rc similarity index 70% rename from dll/keyboard/kbdbgm/kbdbgm.rc rename to dll/keyboard/kbdbu/kbdbu.rc index fea38815ec0..fdb79cc8b78 100644 --- a/dll/keyboard/kbdbgm/kbdbgm.rc +++ b/dll/keyboard/kbdbu/kbdbu.rc @@ -1,6 +1,6 @@ #define REACTOS_VERSION_DLL #pragma code_page(65001) #define REACTOS_STR_FILE_DESCRIPTION "Марица - Българска клавиатурна подредба по БДС 5237-78 за РеактОС\0" -#define REACTOS_STR_INTERNAL_NAME "kbdbgm" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdbgm.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdbu" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdbu.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdbgm/kbdbgm.spec b/dll/keyboard/kbdbu/kbdbu.spec similarity index 100% rename from dll/keyboard/kbdbgm/kbdbgm.spec rename to dll/keyboard/kbdbu/kbdbu.spec diff --git a/dll/keyboard/kbdgrist/kbdgrist.c b/dll/keyboard/kbdgr1/kbdgr1.c similarity index 100% rename from dll/keyboard/kbdgrist/kbdgrist.c rename to dll/keyboard/kbdgr1/kbdgr1.c diff --git a/dll/keyboard/kbdgrist/kbdgrist.rc b/dll/keyboard/kbdgr1/kbdgr1.rc similarity index 57% rename from dll/keyboard/kbdgrist/kbdgrist.rc rename to dll/keyboard/kbdgr1/kbdgr1.rc index d6583979555..eac41c9938c 100644 --- a/dll/keyboard/kbdgrist/kbdgrist.rc +++ b/dll/keyboard/kbdgr1/kbdgr1.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS German Ristome Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdgrist" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdgrist.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdgr1" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdgr1.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdes/kbdes.spec b/dll/keyboard/kbdgr1/kbdgr1.spec similarity index 100% rename from dll/keyboard/kbdes/kbdes.spec rename to dll/keyboard/kbdgr1/kbdgr1.spec diff --git a/dll/keyboard/kbdja/kbdja.c b/dll/keyboard/kbdjpn/kbdjpn.c similarity index 100% rename from dll/keyboard/kbdja/kbdja.c rename to dll/keyboard/kbdjpn/kbdjpn.c diff --git a/dll/keyboard/kbdja/kbdja.rc b/dll/keyboard/kbdjpn/kbdjpn.rc similarity index 58% rename from dll/keyboard/kbdja/kbdja.rc rename to dll/keyboard/kbdjpn/kbdjpn.rc index 4bf7f7d62a6..1999ad9272c 100644 --- a/dll/keyboard/kbdja/kbdja.rc +++ b/dll/keyboard/kbdjpn/kbdjpn.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Japanese (JIS 106) Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdja" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdja.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdjpn" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdjpn.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdgrist/kbdgrist.spec b/dll/keyboard/kbdjpn/kbdjpn.spec similarity index 100% rename from dll/keyboard/kbdgrist/kbdgrist.spec rename to dll/keyboard/kbdjpn/kbdjpn.spec diff --git a/dll/keyboard/kbdko/kbdko.c b/dll/keyboard/kbdkor/kbdkor.c similarity index 100% rename from dll/keyboard/kbdko/kbdko.c rename to dll/keyboard/kbdkor/kbdkor.c diff --git a/dll/keyboard/kbdko/kbdko.rc b/dll/keyboard/kbdkor/kbdkor.rc similarity index 56% rename from dll/keyboard/kbdko/kbdko.rc rename to dll/keyboard/kbdkor/kbdkor.rc index 03bf04311ab..c3b6ecdecd7 100644 --- a/dll/keyboard/kbdko/kbdko.rc +++ b/dll/keyboard/kbdkor/kbdkor.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Korean Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdko" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdko.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdkor" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdkor.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdja/kbdja.spec b/dll/keyboard/kbdkor/kbdkor.spec similarity index 100% rename from dll/keyboard/kbdja/kbdja.spec rename to dll/keyboard/kbdkor/kbdkor.spec diff --git a/dll/keyboard/kbdsk/kbdsk.c b/dll/keyboard/kbdsl/kbdsl.c similarity index 100% rename from dll/keyboard/kbdsk/kbdsk.c rename to dll/keyboard/kbdsl/kbdsl.c diff --git a/dll/keyboard/kbdsk/kbdsk.rc b/dll/keyboard/kbdsl/kbdsl.rc similarity index 57% rename from dll/keyboard/kbdsk/kbdsk.rc rename to dll/keyboard/kbdsl/kbdsl.rc index 96284619b66..2bf6532a7e0 100644 --- a/dll/keyboard/kbdsk/kbdsk.rc +++ b/dll/keyboard/kbdsl/kbdsl.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Slovak Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdsk" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdsk.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdsl" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsl.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdko/kbdko.spec b/dll/keyboard/kbdsl/kbdsl.spec similarity index 100% rename from dll/keyboard/kbdko/kbdko.spec rename to dll/keyboard/kbdsl/kbdsl.spec diff --git a/dll/keyboard/kbdsk1/kbdsk1.c b/dll/keyboard/kbdsl1/kbdsl1.c similarity index 100% rename from dll/keyboard/kbdsk1/kbdsk1.c rename to dll/keyboard/kbdsl1/kbdsl1.c diff --git a/dll/keyboard/kbdsk1/kbdsk1.rc b/dll/keyboard/kbdsl1/kbdsl1.rc similarity index 58% rename from dll/keyboard/kbdsk1/kbdsk1.rc rename to dll/keyboard/kbdsl1/kbdsl1.rc index 38919752600..339c490c7db 100644 --- a/dll/keyboard/kbdsk1/kbdsk1.rc +++ b/dll/keyboard/kbdsl1/kbdsl1.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Slovak (QWERTY) Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdsk1" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdsk1.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdsl1" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsl1.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdsk/kbdsk.spec b/dll/keyboard/kbdsl1/kbdsl1.spec similarity index 100% rename from dll/keyboard/kbdsk/kbdsk.spec rename to dll/keyboard/kbdsl1/kbdsl1.spec diff --git a/dll/keyboard/kbdes/kbdes.c b/dll/keyboard/kbdsp/kbdsp.c similarity index 100% rename from dll/keyboard/kbdes/kbdes.c rename to dll/keyboard/kbdsp/kbdsp.c diff --git a/dll/keyboard/kbdes/kbdes.rc b/dll/keyboard/kbdsp/kbdsp.rc similarity index 57% rename from dll/keyboard/kbdes/kbdes.rc rename to dll/keyboard/kbdsp/kbdsp.rc index ac48c105edd..93d9ab634ff 100644 --- a/dll/keyboard/kbdes/kbdes.rc +++ b/dll/keyboard/kbdsp/kbdsp.rc @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Spanish Keyboard Layout" -#define REACTOS_STR_INTERNAL_NAME "kbdes" -#define REACTOS_STR_ORIGINAL_FILENAME "kbdes.dll" +#define REACTOS_STR_INTERNAL_NAME "kbdsp" +#define REACTOS_STR_ORIGINAL_FILENAME "kbdsp.dll" #include <reactos/version.rc> diff --git a/dll/keyboard/kbdsk1/kbdsk1.spec b/dll/keyboard/kbdsp/kbdsp.spec similarity index 100% rename from dll/keyboard/kbdsk1/kbdsk1.spec rename to dll/keyboard/kbdsp/kbdsp.spec diff --git a/sdk/tools/gen_baseaddress.py b/sdk/tools/gen_baseaddress.py index e709dfb9822..0b0cc2e4739 100644 --- a/sdk/tools/gen_baseaddress.py +++ b/sdk/tools/gen_baseaddress.py @@ -121,10 +121,10 @@ EXCLUDE = ( 'kbdazel.dll', 'kbdbe.dll', 'kbdbga.dll', - 'kbdbgm.dll', 'kbdbgt.dll', 'kbdblr.dll', 'kbdbr.dll', + 'kbdbu.dll', 'kbdbur.dll', 'kbdcan.dll', 'kbdcr.dll', @@ -132,7 +132,6 @@ EXCLUDE = ( 'kbdcz1.dll', 'kbdda.dll', 'kbddv.dll', - 'kbdes.dll', 'kbdest.dll', 'kbdfc.dll', 'kbdfi.dll', @@ -141,7 +140,7 @@ EXCLUDE = ( 'kbdgerg.dll', 'kbdgneo.dll', 'kbdgr.dll', - 'kbdgrist.dll', + 'kbdgr1.dll', 'kbdhe.dll', 'kbdheb.dll', 'kbdhu.dll', @@ -153,9 +152,9 @@ EXCLUDE = ( 'kbdinmal.dll', 'kbdir.dll', 'kbdit.dll', - 'kbdja.dll', + 'kbdjpn.dll', 'kbdkaz.dll', - 'kbdko.dll', + 'kbdkor.dll', 'kbdla.dll', 'kbdlt1.dll', 'kbdlv.dll', @@ -169,8 +168,9 @@ EXCLUDE = ( 'kbdru.dll', 'kbdru1.dll', 'kbdsg.dll', - 'kbdsk.dll', - 'kbdsk1.dll', + 'kbdsl.dll', + 'kbdsl1.dll', + 'kbdsp.dll', 'kbdsw.dll', 'kbdtat.dll', 'kbdth0.dll',

1 0

[reactos] 01/01: [NTUSER][USER32] NtUserGetKeyboardLayoutName and GetKeyboardLayoutNameW (#4595)
by Katayama Hirofumi MZ 05 Aug '22

05 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e42f7b47844dc4764c11… commit 3e42f7b47844dc4764c11d8641a8f816d6a493a0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Aug 6 08:02:31 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Aug 6 08:02:31 2022 +0900 [NTUSER][USER32] NtUserGetKeyboardLayoutName and GetKeyboardLayoutNameW (#4595) #4594 has proved that the 1st argument of NtUserGetKeyboardLayoutName has type PUNICODE_STRING. CORE-11700 --- .../win32u/win32u_2k3sp2/win32u_2k3sp2.spec | 2 +- .../apitests/win32u/win32u_ros/win32u_ros.spec | 2 +- .../apitests/win32u/win32u_vista/win32u_vista.spec | 2 +- .../apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec | 2 +- win32ss/include/ntuser.h | 2 +- win32ss/user/ntuser/kbdlayout.c | 23 +++++++++++++++++++--- win32ss/user/user32/windows/input.c | 8 +++++++- 7 files changed, 32 insertions(+), 9 deletions(-) diff --git a/modules/rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec b/modules/rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec index d09cec87675..f3bd7079f1f 100644 --- a/modules/rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec +++ b/modules/rostests/apitests/win32u/win32u_2k3sp2/win32u_2k3sp2.spec @@ -417,7 +417,7 @@ @ stdcall NtUserGetImeInfoEx(long long) @ stdcall NtUserGetInternalWindowPos(ptr ptr ptr) @ stdcall NtUserGetKeyboardLayoutList(long ptr) -@ stdcall NtUserGetKeyboardLayoutName(str) +@ stdcall NtUserGetKeyboardLayoutName(ptr) @ stdcall NtUserGetKeyboardState(ptr) @ stdcall NtUserGetKeyNameText(long wstr long) @ stdcall NtUserGetKeyState(long) diff --git a/modules/rostests/apitests/win32u/win32u_ros/win32u_ros.spec b/modules/rostests/apitests/win32u/win32u_ros/win32u_ros.spec index 6fe82b27349..d307cec4ac0 100644 --- a/modules/rostests/apitests/win32u/win32u_ros/win32u_ros.spec +++ b/modules/rostests/apitests/win32u/win32u_ros/win32u_ros.spec @@ -418,7 +418,7 @@ @ stdcall NtUserGetImeInfoEx(long long) @ stdcall NtUserGetInternalWindowPos(ptr ptr ptr) @ stdcall NtUserGetKeyboardLayoutList(long ptr) -@ stdcall NtUserGetKeyboardLayoutName(str) +@ stdcall NtUserGetKeyboardLayoutName(ptr) @ stdcall NtUserGetKeyboardState(ptr) @ stdcall NtUserGetKeyNameText(long wstr long) @ stdcall NtUserGetKeyState(long) diff --git a/modules/rostests/apitests/win32u/win32u_vista/win32u_vista.spec b/modules/rostests/apitests/win32u/win32u_vista/win32u_vista.spec index 8b716bb120f..2c39932a2b6 100644 --- a/modules/rostests/apitests/win32u/win32u_vista/win32u_vista.spec +++ b/modules/rostests/apitests/win32u/win32u_vista/win32u_vista.spec @@ -431,7 +431,7 @@ @ stdcall NtUserGetImeInfoEx(long long) @ stdcall NtUserGetInternalWindowPos(ptr ptr ptr) @ stdcall NtUserGetKeyboardLayoutList(long ptr) -@ stdcall NtUserGetKeyboardLayoutName(str) +@ stdcall NtUserGetKeyboardLayoutName(ptr) @ stdcall NtUserGetKeyboardState(ptr) @ stdcall NtUserGetKeyNameText(long wstr long) @ stdcall NtUserGetKeyState(long) diff --git a/modules/rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec b/modules/rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec index bd059a8c0e4..ecf140ad399 100644 --- a/modules/rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec +++ b/modules/rostests/apitests/win32u/win32u_xpsp2/win32u_xpsp2.spec @@ -417,7 +417,7 @@ @ stdcall NtUserGetImeInfoEx(long long) @ stdcall NtUserGetInternalWindowPos(ptr ptr ptr) @ stdcall NtUserGetKeyboardLayoutList(long ptr) -@ stdcall NtUserGetKeyboardLayoutName(str) +@ stdcall NtUserGetKeyboardLayoutName(ptr) @ stdcall NtUserGetKeyboardState(ptr) @ stdcall NtUserGetKeyNameText(long wstr long) @ stdcall NtUserGetKeyState(long) diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 7dde3b3810f..531d83392ef 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -2431,7 +2431,7 @@ NtUserGetKeyboardLayoutList( BOOL NTAPI NtUserGetKeyboardLayoutName( - LPWSTR lpszName); + _Inout_ PUNICODE_STRING pustrName); DWORD NTAPI diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index bca41faef3b..a91a641e994 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -649,11 +649,12 @@ Quit: BOOL APIENTRY NtUserGetKeyboardLayoutName( - LPWSTR pwszName) + _Inout_ PUNICODE_STRING pustrName) { BOOL bRet = FALSE; PKL pKl; PTHREADINFO pti; + UNICODE_STRING ustrTemp; UserEnterShared(); @@ -665,8 +666,24 @@ NtUserGetKeyboardLayoutName( _SEH2_TRY { - ProbeForWrite(pwszName, KL_NAMELENGTH*sizeof(WCHAR), 1); - wcscpy(pwszName, pKl->spkf->awchKF); + ProbeForWriteUnicodeString(pustrName); + ProbeForWrite(pustrName->Buffer, pustrName->MaximumLength, 1); + + if (IS_IME_HKL(pKl->hkl)) + { + RtlIntegerToUnicodeString((ULONG)(ULONG_PTR)pKl->hkl, 16, pustrName); + } + else + { + if (pustrName->MaximumLength < KL_NAMELENGTH * sizeof(WCHAR)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + goto cleanup; + } + RtlInitUnicodeString(&ustrTemp, pKl->spkf->awchKF); /* FIXME: Do not use awchKF */ + RtlCopyUnicodeString(pustrName, &ustrTemp); + } + bRet = TRUE; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c index 50189f831f4..1de1dc0f293 100644 --- a/win32ss/user/user32/windows/input.c +++ b/win32ss/user/user32/windows/input.c @@ -584,7 +584,13 @@ GetKeyboardLayoutNameA(LPSTR pwszKLID) BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID) { - return NtUserGetKeyboardLayoutName(pwszKLID); + UNICODE_STRING Name; + + RtlInitEmptyUnicodeString(&Name, + pwszKLID, + KL_NAMELENGTH * sizeof(WCHAR)); + + return NtUserGetKeyboardLayoutName(&Name); } /*

1 0

[reactos] 09/09: [NTOS] Don't assert, when dispatching an exception to user mode fails
by Timo Kreuzer 04 Aug '22

04 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=786017c5b6251cac760d4… commit 786017c5b6251cac760d48aa25dcf03b835e2b8b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 16:23:26 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 4 16:15:24 2022 +0200 [NTOS] Don't assert, when dispatching an exception to user mode fails Instead continue with second chance handling. --- ntoskrnl/ke/amd64/except.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/amd64/except.c b/ntoskrnl/ke/amd64/except.c index c9c97c9dd2f..de8e2b01697 100644 --- a/ntoskrnl/ke/amd64/except.c +++ b/ntoskrnl/ke/amd64/except.c @@ -361,9 +361,10 @@ KiDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, /* Forward exception to user mode debugger */ if (DbgkForwardException(ExceptionRecord, TRUE, FALSE)) return; - /* Forward exception to user mode (does not return) */ + /* Forward exception to user mode (does not return, if successful) */ KiDispatchExceptionToUser(TrapFrame, &Context, ExceptionRecord); - NT_ASSERT(FALSE); + + /* Failed to dispatch, fall through for second chance handling */ } /* Try second chance */

1 0

[reactos] 08/09: [NTOS] Treat page faults with interrupts disabled as access violation
by Timo Kreuzer 04 Aug '22

04 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3a8f8611de4c8c6e3c71… commit b3a8f8611de4c8c6e3c71d3c54f0b5bc8ebe2a27 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 12:42:20 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 4 16:15:24 2022 +0200 [NTOS] Treat page faults with interrupts disabled as access violation --- ntoskrnl/ke/amd64/trap.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 0b4f0375af2..73470363a23 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -428,6 +428,10 @@ FUNC KiPageFault /* Save page fault address */ mov rdx, cr2 mov [rbp + KTRAP_FRAME_FaultAddress], rdx + + /* If interrupts are off, treat this as an access violation */ + test dword ptr [rbp + KTRAP_FRAME_EFlags], EFLAGS_IF_MASK + jz AccessViolation /* Enable interrupts for the page fault handler */ sti

1 0

[reactos] 07/09: [NTOS:KE/X64] Enable interrupts when accessing user mode memory
by Timo Kreuzer 04 Aug '22

04 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e45af60560c5d030d70df… commit e45af60560c5d030d70df0c787f07d214c5a6250 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 16:19:52 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 4 16:15:24 2022 +0200 [NTOS:KE/X64] Enable interrupts when accessing user mode memory --- ntoskrnl/ke/amd64/except.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ntoskrnl/ke/amd64/except.c b/ntoskrnl/ke/amd64/except.c index a04d3038bd9..c9c97c9dd2f 100644 --- a/ntoskrnl/ke/amd64/except.c +++ b/ntoskrnl/ke/amd64/except.c @@ -119,6 +119,9 @@ KiDispatchExceptionToUser( /* Get pointer to the usermode context, exception record and machine frame */ UserStack = (PKUSER_EXCEPTION_STACK)UserRsp; + /* Enable interrupts */ + _enable(); + /* Set up the user-stack */ _SEH2_TRY { @@ -143,6 +146,7 @@ KiDispatchExceptionToUser( // FIXME: handle stack overflow /* Nothing we can do here */ + _disable(); _SEH2_YIELD(return); } _SEH2_END; @@ -165,6 +169,8 @@ KiDispatchExceptionToUser( /* Set RIP to the User-mode Dispatcher */ TrapFrame->Rip = (ULONG64)KeUserExceptionDispatcher; + _disable(); + /* Exit to usermode */ KiServiceExit2(TrapFrame); } @@ -202,6 +208,9 @@ KiPrepareUserDebugData(void) Teb = KeGetCurrentThread()->Teb; if (!Teb) return; + /* Enable interrupts */ + _enable(); + _SEH2_TRY { /* Get a pointer to the loader data */ @@ -230,6 +239,8 @@ KiPrepareUserDebugData(void) { } _SEH2_END; + + _disable(); } VOID

1 0

[reactos] 06/09: [NTOS:KE] Restore interrupts in KiSwitchKernelStack
by Timo Kreuzer 04 Aug '22

04 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=902c6eee1e0d68d0d9766… commit 902c6eee1e0d68d0d976687d72c6542dbe686cc6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 13:21:18 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 4 16:15:24 2022 +0200 [NTOS:KE] Restore interrupts in KiSwitchKernelStack --- ntoskrnl/ke/amd64/stubs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index 7aa5866b978..7933d2c1cf9 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -115,6 +115,7 @@ KiSwitchKernelStack(PVOID StackBase, PVOID StackLimit) LONG_PTR StackOffset; SIZE_T StackSize; PKIPCR Pcr; + ULONG Eflags; /* Get the current thread */ CurrentThread = KeGetCurrentThread(); @@ -135,6 +136,7 @@ KiSwitchKernelStack(PVOID StackBase, PVOID StackLimit) StackOffset = (PUCHAR)StackBase - (PUCHAR)CurrentThread->StackBase; /* Disable interrupts while messing with the stack */ + Eflags = __readeflags(); _disable(); /* Set the new trap frame */ @@ -157,6 +159,9 @@ KiSwitchKernelStack(PVOID StackBase, PVOID StackLimit) /* Adjust Rsp0 in the TSS */ Pcr->TssBase->Rsp0 += StackOffset; + /* Restore interrupts */ + __writeeflags(Eflags); + return OldStackBase; }

1 0

[reactos] 05/09: [NTOS] Add a hack for VBox
by Timo Kreuzer 04 Aug '22

04 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ae39ad4d1057fb4438b55… commit ae39ad4d1057fb4438b55bd3cf8e6c79101cbd56 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 13:35:14 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 4 16:15:24 2022 +0200 [NTOS] Add a hack for VBox --- ntoskrnl/ke/amd64/trap.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 644b4c2032d..0b4f0375af2 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -316,6 +316,10 @@ ENDFUNC PUBLIC KiDoubleFaultAbort FUNC KiDoubleFaultAbort + + /* Hack for VBox, which "forgets" to push an error code on the stack! */ + and rsp, HEX(FFFFFFFFFFFFFFF0) + /* A zero error code is pushed */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL)

1 0

[reactos] 04/09: [KERNEL32] Fix printing exception address
by Timo Kreuzer 04 Aug '22

04 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f96bee30ed4ab74280758… commit f96bee30ed4ab74280758f550de0c11fcd0a7cf0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 16:18:07 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 4 16:15:24 2022 +0200 [KERNEL32] Fix printing exception address --- dll/win32/kernel32/client/except.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/except.c b/dll/win32/kernel32/client/except.c index 38ac16fb8c3..b248878366e 100644 --- a/dll/win32/kernel32/client/except.c +++ b/dll/win32/kernel32/client/except.c @@ -104,7 +104,7 @@ PrintStackTrace(IN PEXCEPTION_POINTERS ExceptionInfo) if (ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionRecord->NumberParameters == 2) { - DbgPrint("Faulting Address: %8x\n", ExceptionRecord->ExceptionInformation[1]); + DbgPrint("Faulting Address: %p\n", (PVOID)ExceptionRecord->ExceptionInformation[1]); } /* Trace the wine special error and show the modulename and functionname */

1 0

[reactos] 03/09: [HAL] Add missing I/O port to int 10 BIOS emulator
by Timo Kreuzer 04 Aug '22

04 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f8b6cc249e258ef099641… commit f8b6cc249e258ef0996418f7e72aa0c1bd628946 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 17:07:00 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 4 16:15:24 2022 +0200 [HAL] Add missing I/O port to int 10 BIOS emulator --- hal/halx86/amd64/x86bios.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hal/halx86/amd64/x86bios.c b/hal/halx86/amd64/x86bios.c index 3baef39f69c..6d7ce9ae083 100644 --- a/hal/halx86/amd64/x86bios.c +++ b/hal/halx86/amd64/x86bios.c @@ -321,9 +321,15 @@ ValidatePort( case 0x3C9: return (Size == 1); case 0x3DA: return (Size == 1) && !IsWrite; - // CHECKME! + // OVMF debug messages used by VBox / QEMU + // https://www.virtualbox.org/svn/vbox/trunk/src/VBox/Devices/EFI/Firmware/Ovm… + case 0x402: return (Size == 1) && IsWrite; + + // BOCHS VBE: https://forum.osdev.org/viewtopic.php?f=1&t=14639 case 0x1CE: return (Size == 1) && IsWrite; case 0x1CF: return (Size == 1); + + // CHECKME! case 0x3B6: return (Size <= 2); }

1 0

[reactos] 02/09: [NTOS:KDBG] Improve x64 stack trace printing
by Timo Kreuzer 04 Aug '22

04 Aug '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74014e74c00f1610ce62c… commit 74014e74c00f1610ce62cb950743ef12fa17c845 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Jul 23 17:07:37 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Aug 4 16:15:24 2022 +0200 [NTOS:KDBG] Improve x64 stack trace printing --- ntoskrnl/kdbg/kdb_cli.c | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index d22b38658e8..e044572691d 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -1211,44 +1211,30 @@ KdbpCmdBackTrace( PCHAR Argv[]) { CONTEXT Context = *KdbCurrentTrapFrame; - ULONG64 CurrentRsp, CurrentRip; - - KdbpPrint("Rip:\n"); - if (!KdbSymPrintAddress((PVOID)KeGetContextPc(&Context), &Context)) - KdbpPrint("<%p>\n", KeGetContextPc(&Context)); - else - KdbpPrint("\n"); /* Walk through the frames */ KdbpPrint("Frames:\n"); - for (;;) + do { - CurrentRip = Context.Rip; - CurrentRsp = Context.Rsp; - - BOOLEAN GotNextFrame = GetNextFrame(&Context); + BOOLEAN GotNextFrame; - KdbpPrint("[%p] ", (PVOID)CurrentRsp); - Context.Rsp = Context.Rsp; + KdbpPrint("[%p] ", (PVOID)Context.Rsp); - /* Print the location afrer the call instruction */ - if (!KdbSymPrintAddress((PVOID)CurrentRip, &Context)) + /* Print the location after the call instruction */ + if (!KdbSymPrintAddress((PVOID)Context.Rip, &Context)) KdbpPrint("<%p>", (PVOID)Context.Rip); - - KdbpPrint(" (stack: 0x%Ix)\n", Context.Rsp - CurrentRsp); + KdbpPrint("\n"); if (KdbOutputAborted) break; - if (Context.Rsp == 0) - break; - + GotNextFrame = GetNextFrame(&Context); if (!GotNextFrame) { - KdbpPrint("Couldn't access memory at 0x%p!\n", (PVOID)Context.Rsp); + KdbpPrint("Couldn't get next frame\n"); break; } - } + } while ((Context.Rip != 0) && (Context.Rsp != 0)); return TRUE; }

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2022