Ros-diffs April 2021

ros-diffs@reactos.org

21 participants
173 discussions

[reactos] 01/01: [CMD_APITEST] Follow-up of #3632 (0c2230a)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=92e3b426b3ab1b1ab42b4… commit 92e3b426b3ab1b1ab42b43d7163e95df63da5e9d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Apr 30 10:48:33 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Apr 30 10:48:33 2021 +0900 [CMD_APITEST] Follow-up of #3632 (0c2230a) CORE-17500 --- modules/rostests/apitests/cmd/fc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/cmd/fc.c b/modules/rostests/apitests/cmd/fc.c index 1ff1aad84b6..3ca7a30f24c 100644 --- a/modules/rostests/apitests/cmd/fc.c +++ b/modules/rostests/apitests/cmd/fc.c @@ -250,8 +250,8 @@ static const TEST_ENTRY s_entries[] = NO_DIFF }, { - __LINE__, 1, "fc /W" FILES, "\tA \nB\n", "AB\nB\n", -1, -1, COMPARING - "***** fc-test1.txt\n A \nB\n" + __LINE__, 1, "fc /W /T" FILES, "\tA \nB\n", "AB\nB\n", -1, -1, COMPARING + "***** fc-test1.txt\n\tA \nB\n" "***** FC-TEST2.TXT\nAB\nB\n" "*****\n\n" },

3 years, 7 months

[reactos] 01/01: [INF] Remove stray file. Addendum to commit a1fc312a.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb467003b70ea2f392b0a… commit bb467003b70ea2f392b0aee27aede55b315757d7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Apr 30 02:42:35 2021 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Apr 30 02:42:35 2021 +0200 [INF] Remove stray file. Addendum to commit a1fc312a. --- reactos/media/inf/netisa.inf | Bin 5378 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/reactos/media/inf/netisa.inf b/reactos/media/inf/netisa.inf deleted file mode 100644 index ef6c91ce887..00000000000 Binary files a/reactos/media/inf/netisa.inf and /dev/null differ

3 years, 7 months

[reactos] 02/02: [NTOS:PS] NtQueryInformationProcess(): Fix ProcessDeviceMap case

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8a61e4f08cd00e3e68149… commit 8a61e4f08cd00e3e68149895450ef53970fc5d04 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Apr 29 21:40:58 2021 +0200 [NTOS:PS] NtQueryInformationProcess(): Fix ProcessDeviceMap case Fix Clang-Cl '...\ntoskrnl\ps\query.c(583,33): warning: variable 'Status' is uninitialized when used here [-Wuninitialized]' Addendum to 1074a9a. --- ntoskrnl/ps/query.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index c9b0b6b75a2..7c8737cba93 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -578,14 +578,10 @@ NtQueryInformationProcess( { /* Get the exception code */ Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); } _SEH2_END; - if (!NT_SUCCESS(Status)) - { - break; - } - /* Only one flag is supported and it needs LUID mappings */ if ((Flags & ~PROCESS_LUID_DOSDEVICES_ONLY) != 0 || !ObIsLUIDDeviceMapsEnabled())

3 years, 7 months

[reactos] 01/02: [NTOS:PS] NtQueryInformationProcess(): Sync' annotations

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c0961cac105ed590284a3… commit c0961cac105ed590284a39dce3d1df276f308bb4 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu Nov 12 01:22:46 2020 +0100 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Thu Apr 29 21:40:58 2021 +0200 [NTOS:PS] NtQueryInformationProcess(): Sync' annotations --- ntoskrnl/ps/query.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index cad72c4d60a..c9b0b6b75a2 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -56,11 +56,12 @@ PsReferenceProcessFilePointer(IN PEPROCESS Process, */ NTSTATUS NTAPI -NtQueryInformationProcess(IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - OUT PVOID ProcessInformation, - IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL) +NtQueryInformationProcess( + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _Out_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength, + _Out_opt_ PULONG ReturnLength) { PEPROCESS Process; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();

3 years, 7 months

[reactos] 01/01: [FC] Fix typo s/IDS_RESYNCH_/IDS_RESYNC_/ s/Resynch/Resync/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91dc5eac7dc6f6ac51bbc… commit 91dc5eac7dc6f6ac51bbcf4a155cbb84a85eafad Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 29 16:59:20 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Apr 29 16:59:20 2021 +0900 [FC] Fix typo s/IDS_RESYNCH_/IDS_RESYNC_/ s/Resynch/Resync/ CORE-17500 --- base/applications/cmdutils/fc/lang/bg-BG.rc | 2 +- base/applications/cmdutils/fc/lang/cs-CZ.rc | 2 +- base/applications/cmdutils/fc/lang/de-DE.rc | 2 +- base/applications/cmdutils/fc/lang/el-GR.rc | 2 +- base/applications/cmdutils/fc/lang/en-GB.rc | 2 +- base/applications/cmdutils/fc/lang/en-US.rc | 2 +- base/applications/cmdutils/fc/lang/es-ES.rc | 2 +- base/applications/cmdutils/fc/lang/et-EE.rc | 2 +- base/applications/cmdutils/fc/lang/fr-FR.rc | 2 +- base/applications/cmdutils/fc/lang/he-IL.rc | 2 +- base/applications/cmdutils/fc/lang/hu-HU.rc | 2 +- base/applications/cmdutils/fc/lang/id-ID.rc | 2 +- base/applications/cmdutils/fc/lang/it-IT.rc | 2 +- base/applications/cmdutils/fc/lang/ja-JP.rc | 2 +- base/applications/cmdutils/fc/lang/nl-NL.rc | 2 +- base/applications/cmdutils/fc/lang/no-NO.rc | 2 +- base/applications/cmdutils/fc/lang/pl-PL.rc | 2 +- base/applications/cmdutils/fc/lang/pt-BR.rc | 2 +- base/applications/cmdutils/fc/lang/pt-PT.rc | 2 +- base/applications/cmdutils/fc/lang/ro-RO.rc | 2 +- base/applications/cmdutils/fc/lang/ru-RU.rc | 2 +- base/applications/cmdutils/fc/lang/sk-SK.rc | 2 +- base/applications/cmdutils/fc/lang/sq-AL.rc | 2 +- base/applications/cmdutils/fc/lang/sv-SE.rc | 2 +- base/applications/cmdutils/fc/lang/tr-TR.rc | 2 +- base/applications/cmdutils/fc/lang/uk-UA.rc | 2 +- base/applications/cmdutils/fc/lang/zh-CN.rc | 2 +- base/applications/cmdutils/fc/lang/zh-TW.rc | 2 +- base/applications/cmdutils/fc/resource.h | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/base/applications/cmdutils/fc/lang/bg-BG.rc b/base/applications/cmdutils/fc/lang/bg-BG.rc index f0c672ff4ae..520e81f2466 100644 --- a/base/applications/cmdutils/fc/lang/bg-BG.rc +++ b/base/applications/cmdutils/fc/lang/bg-BG.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/cs-CZ.rc b/base/applications/cmdutils/fc/lang/cs-CZ.rc index b5bf38399c7..867ed3dca72 100644 --- a/base/applications/cmdutils/fc/lang/cs-CZ.rc +++ b/base/applications/cmdutils/fc/lang/cs-CZ.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/de-DE.rc b/base/applications/cmdutils/fc/lang/de-DE.rc index d4449b25972..58d6cbedd9a 100644 --- a/base/applications/cmdutils/fc/lang/de-DE.rc +++ b/base/applications/cmdutils/fc/lang/de-DE.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/el-GR.rc b/base/applications/cmdutils/fc/lang/el-GR.rc index 060954fec8e..27cc5bfcb90 100644 --- a/base/applications/cmdutils/fc/lang/el-GR.rc +++ b/base/applications/cmdutils/fc/lang/el-GR.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/en-GB.rc b/base/applications/cmdutils/fc/lang/en-GB.rc index 3fa575f8999..92a7545ce5a 100644 --- a/base/applications/cmdutils/fc/lang/en-GB.rc +++ b/base/applications/cmdutils/fc/lang/en-GB.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/en-US.rc b/base/applications/cmdutils/fc/lang/en-US.rc index ae4951d9450..a9976adf463 100644 --- a/base/applications/cmdutils/fc/lang/en-US.rc +++ b/base/applications/cmdutils/fc/lang/en-US.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/es-ES.rc b/base/applications/cmdutils/fc/lang/es-ES.rc index 451b19b834a..89d0c28db48 100644 --- a/base/applications/cmdutils/fc/lang/es-ES.rc +++ b/base/applications/cmdutils/fc/lang/es-ES.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/et-EE.rc b/base/applications/cmdutils/fc/lang/et-EE.rc index 7d7aeab13ba..ffe2139ab22 100644 --- a/base/applications/cmdutils/fc/lang/et-EE.rc +++ b/base/applications/cmdutils/fc/lang/et-EE.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/fr-FR.rc b/base/applications/cmdutils/fc/lang/fr-FR.rc index 01b6e46fa77..369a2519fd5 100644 --- a/base/applications/cmdutils/fc/lang/fr-FR.rc +++ b/base/applications/cmdutils/fc/lang/fr-FR.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/he-IL.rc b/base/applications/cmdutils/fc/lang/he-IL.rc index ab1687c260d..af0d0ce3708 100644 --- a/base/applications/cmdutils/fc/lang/he-IL.rc +++ b/base/applications/cmdutils/fc/lang/he-IL.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/hu-HU.rc b/base/applications/cmdutils/fc/lang/hu-HU.rc index a9ea667ed9e..0b344b27153 100644 --- a/base/applications/cmdutils/fc/lang/hu-HU.rc +++ b/base/applications/cmdutils/fc/lang/hu-HU.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/id-ID.rc b/base/applications/cmdutils/fc/lang/id-ID.rc index a97dfa3cafb..dfe0b376477 100644 --- a/base/applications/cmdutils/fc/lang/id-ID.rc +++ b/base/applications/cmdutils/fc/lang/id-ID.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/it-IT.rc b/base/applications/cmdutils/fc/lang/it-IT.rc index ebffa3679c8..b11895f30be 100644 --- a/base/applications/cmdutils/fc/lang/it-IT.rc +++ b/base/applications/cmdutils/fc/lang/it-IT.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/ja-JP.rc b/base/applications/cmdutils/fc/lang/ja-JP.rc index 0d4de1467e0..df289254a10 100644 --- a/base/applications/cmdutils/fc/lang/ja-JP.rc +++ b/base/applications/cmdutils/fc/lang/ja-JP.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/nl-NL.rc b/base/applications/cmdutils/fc/lang/nl-NL.rc index 381006a8dd7..02bf17eb76d 100644 --- a/base/applications/cmdutils/fc/lang/nl-NL.rc +++ b/base/applications/cmdutils/fc/lang/nl-NL.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/no-NO.rc b/base/applications/cmdutils/fc/lang/no-NO.rc index 00618a7fd47..4299d720445 100644 --- a/base/applications/cmdutils/fc/lang/no-NO.rc +++ b/base/applications/cmdutils/fc/lang/no-NO.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/pl-PL.rc b/base/applications/cmdutils/fc/lang/pl-PL.rc index bd73f2ed521..32f918a9b35 100644 --- a/base/applications/cmdutils/fc/lang/pl-PL.rc +++ b/base/applications/cmdutils/fc/lang/pl-PL.rc @@ -44,5 +44,5 @@ FC /B [dysk1:][ścieżka1]plik1 [dysk2:][ścieżka2]plik2\n\ IDS_CANT_USE_WILDCARD "Symbole wieloznaczne ('*' i '?') nie są jeszcze obsługiwane\n" IDS_DIFFERENT "FC: pliki %ls i %ls różnią się\n" IDS_TOO_LARGE "FC: plik %ls jest za duży\n" - IDS_RESYNCH_FAILED "Ponowna synchronizacja nie powiodła się. Pliki za bardzo się różnią.\n" + IDS_RESYNC_FAILED "Ponowna synchronizacja nie powiodła się. Pliki za bardzo się różnią.\n" END diff --git a/base/applications/cmdutils/fc/lang/pt-BR.rc b/base/applications/cmdutils/fc/lang/pt-BR.rc index f74d8d6a2df..9deefb1aab1 100644 --- a/base/applications/cmdutils/fc/lang/pt-BR.rc +++ b/base/applications/cmdutils/fc/lang/pt-BR.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/pt-PT.rc b/base/applications/cmdutils/fc/lang/pt-PT.rc index a7ceb26ca2b..5c39e8b8197 100644 --- a/base/applications/cmdutils/fc/lang/pt-PT.rc +++ b/base/applications/cmdutils/fc/lang/pt-PT.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/ro-RO.rc b/base/applications/cmdutils/fc/lang/ro-RO.rc index 55b992cd071..1998bcf1f8d 100644 --- a/base/applications/cmdutils/fc/lang/ro-RO.rc +++ b/base/applications/cmdutils/fc/lang/ro-RO.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/ru-RU.rc b/base/applications/cmdutils/fc/lang/ru-RU.rc index 64d99eabc8f..d2ce6f2996d 100644 --- a/base/applications/cmdutils/fc/lang/ru-RU.rc +++ b/base/applications/cmdutils/fc/lang/ru-RU.rc @@ -37,5 +37,5 @@ FC /B [диск1:][путь1]имя_файла1 [диск2:][путь2]имя_ф IDS_CANT_USE_WILDCARD "Подстановочные знаки ('*' и '?') пока не поддерживаются\n" IDS_DIFFERENT "FC: Файлы %ls и %ls различны\n" IDS_TOO_LARGE "FC: Файл %ls слишком большой\n" - IDS_RESYNCH_FAILED "Не удаётся синхронизировать строки. Слишком много различий между файлами.\n" + IDS_RESYNC_FAILED "Не удаётся синхронизировать строки. Слишком много различий между файлами.\n" END diff --git a/base/applications/cmdutils/fc/lang/sk-SK.rc b/base/applications/cmdutils/fc/lang/sk-SK.rc index d66a8042344..c1fd9f1de68 100644 --- a/base/applications/cmdutils/fc/lang/sk-SK.rc +++ b/base/applications/cmdutils/fc/lang/sk-SK.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/sq-AL.rc b/base/applications/cmdutils/fc/lang/sq-AL.rc index cf7c458382a..fdf077b3f9e 100644 --- a/base/applications/cmdutils/fc/lang/sq-AL.rc +++ b/base/applications/cmdutils/fc/lang/sq-AL.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/sv-SE.rc b/base/applications/cmdutils/fc/lang/sv-SE.rc index dc3fb6647ba..a725d0c4eeb 100644 --- a/base/applications/cmdutils/fc/lang/sv-SE.rc +++ b/base/applications/cmdutils/fc/lang/sv-SE.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/tr-TR.rc b/base/applications/cmdutils/fc/lang/tr-TR.rc index 04dfac5fdf7..ac4b0449e4c 100644 --- a/base/applications/cmdutils/fc/lang/tr-TR.rc +++ b/base/applications/cmdutils/fc/lang/tr-TR.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/uk-UA.rc b/base/applications/cmdutils/fc/lang/uk-UA.rc index 19f43286905..dbf1a8856b1 100644 --- a/base/applications/cmdutils/fc/lang/uk-UA.rc +++ b/base/applications/cmdutils/fc/lang/uk-UA.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/zh-CN.rc b/base/applications/cmdutils/fc/lang/zh-CN.rc index 1909aead09f..f984f2bee69 100644 --- a/base/applications/cmdutils/fc/lang/zh-CN.rc +++ b/base/applications/cmdutils/fc/lang/zh-CN.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/lang/zh-TW.rc b/base/applications/cmdutils/fc/lang/zh-TW.rc index f790f60dad4..875d71a09d5 100644 --- a/base/applications/cmdutils/fc/lang/zh-TW.rc +++ b/base/applications/cmdutils/fc/lang/zh-TW.rc @@ -37,5 +37,5 @@ FC /B [drive1:][path1]filename1 [drive2:][path2]filename2\n\ IDS_CANT_USE_WILDCARD "Wildcard ('*' and '?') are not supported yet\n" IDS_DIFFERENT "FC: File %ls and %ls are different\n" IDS_TOO_LARGE "FC: File %ls too large\n" - IDS_RESYNCH_FAILED "Resynch failed. Files are too different.\n" + IDS_RESYNC_FAILED "Resync failed. Files are too different.\n" END diff --git a/base/applications/cmdutils/fc/resource.h b/base/applications/cmdutils/fc/resource.h index 45f8e032bd8..d784a77c0de 100644 --- a/base/applications/cmdutils/fc/resource.h +++ b/base/applications/cmdutils/fc/resource.h @@ -10,4 +10,4 @@ #define IDS_CANT_USE_WILDCARD 1009 #define IDS_DIFFERENT 1010 #define IDS_TOO_LARGE 1011 -#define IDS_RESYNCH_FAILED 1012 +#define IDS_RESYNC_FAILED 1012

3 years, 7 months

[reactos] 01/01: [CMD_APITEST] Add FC testcase (#3632)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c2230ad64b3e4b1d8f0d… commit 0c2230ad64b3e4b1d8f0da4dfe766efdc3b88873 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Apr 29 16:39:13 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 29 16:39:13 2021 +0900 [CMD_APITEST] Add FC testcase (#3632) Add a testcase for FC (file comparison) command to investigate FC command. CORE-17500 --- modules/rostests/apitests/cmd/CMakeLists.txt | 3 +- modules/rostests/apitests/cmd/fc.c | 617 +++++++++++++++++++++++++++ modules/rostests/apitests/cmd/testlist.c | 2 + 3 files changed, 621 insertions(+), 1 deletion(-) diff --git a/modules/rostests/apitests/cmd/CMakeLists.txt b/modules/rostests/apitests/cmd/CMakeLists.txt index 00202dde809..432cc4f11fd 100644 --- a/modules/rostests/apitests/cmd/CMakeLists.txt +++ b/modules/rostests/apitests/cmd/CMakeLists.txt @@ -1,10 +1,11 @@ list(APPEND SOURCE cmd.c + fc.c testlist.c) add_executable(cmd_apitest ${SOURCE}) target_link_libraries(cmd_apitest wine ${PSEH_LIB}) set_module_type(cmd_apitest win32cui) -add_importlibs(cmd_apitest msvcrt kernel32) +add_importlibs(cmd_apitest shlwapi msvcrt kernel32) add_rostests_file(TARGET cmd_apitest) diff --git a/modules/rostests/apitests/cmd/fc.c b/modules/rostests/apitests/cmd/fc.c new file mode 100644 index 00000000000..1ff1aad84b6 --- /dev/null +++ b/modules/rostests/apitests/cmd/fc.c @@ -0,0 +1,617 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Test for fc.exe + * COPYRIGHT: Copyright 2021 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <shlwapi.h> + +typedef struct TEST_ENTRY +{ + INT lineno; + INT ret; + LPCSTR cmdline; + LPCSTR file1_data; + LPCSTR file2_data; + INT file1_size; // -1 for zero-terminated + INT file2_size; // -1 for zero-terminated + LPCSTR output; +} TEST_ENTRY; + +#define FILE1 "fc-test1.txt" +#define FILE2 "fc-test2.txt" +#define FILES " " FILE1 " " FILE2 +#define COMPARING "Comparing files fc-test1.txt and FC-TEST2.TXT\n" +#define NO_DIFF "FC: no differences encountered\n" +#define RESYNC_FAILED "Resync Failed. Files are too different.\n" + +static const TEST_ENTRY s_entries[] = +{ + /* binary comparison */ + { + __LINE__, 0, "fc /B" FILES, "", "", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /B" FILES, "A", "B", -1, -1, COMPARING + "00000000: 41 42\n" + }, + { + __LINE__, 1, "fc /B" FILES, "B", "A", -1, -1, COMPARING + "00000000: 42 41\n" + }, + { + __LINE__, 0, "fc /B" FILES, "AB", "AB", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /B" FILES, "AB", "BA", -1, -1, COMPARING + "00000000: 41 42\n" + "00000001: 42 41\n" + }, + { + __LINE__, 0, "fc /B" FILES, "ABC", "ABC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /B" FILES, "ABC", "ABCD", -1, -1, COMPARING + "FC: FC-TEST2.TXT longer than fc-test1.txt\n\n" + }, + { + __LINE__, 1, "fc /B" FILES, "ABC", "ABDD", -1, -1, COMPARING + "00000002: 43 44\n" + "FC: FC-TEST2.TXT longer than fc-test1.txt\n" + }, + { + __LINE__, 1, "fc /B /C" FILES, "ABC", "abc", -1, -1, COMPARING + "00000000: 41 61\n" + "00000001: 42 62\n" + "00000002: 43 63\n" + }, + /* text comparison */ + { + __LINE__, 0, "fc" FILES, "", "", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc" FILES, "A", "B", -1, -1, COMPARING + "***** fc-test1.txt\nA\n" + "***** FC-TEST2.TXT\nB\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc" FILES, "B", "A", -1, -1, COMPARING + "***** fc-test1.txt\nB\n" + "***** FC-TEST2.TXT\nA\n" + "*****\n\n" + }, + { + __LINE__, 0, "fc" FILES, "AB", "AB", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc" FILES, "AB", "BA", -1, -1, COMPARING + "***** fc-test1.txt\nAB\n" + "***** FC-TEST2.TXT\nBA\n" + "*****\n\n" + }, + { + __LINE__, 0, "fc" FILES, "ABC", "ABC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 0, "fc /C" FILES, "ABC", "abc", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc" FILES, "A\nB\nC\nD\nE\n", "A\nB\nB\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nB\nC\nD\n" + "***** FC-TEST2.TXT\nB\nB\nD\n" + "*****\n\n" + }, + /* Test /A */ + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "B\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nB\n" + "***** FC-TEST2.TXT\nB\nB\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "C\nC\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nB\nC\n" + "***** FC-TEST2.TXT\nC\nC\nC\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "A\nC\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nB\nC\n" + "***** FC-TEST2.TXT\nA\nC\nC\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "A\nC\nC\nC\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\n...\nE\n" + "***** FC-TEST2.TXT\nA\n...\nE\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nD\nF\n", -1, -1, COMPARING + "***** fc-test1.txt\nD\nE\n" + "***** FC-TEST2.TXT\nD\nF\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nF\nF\n", -1, -1, COMPARING + "***** fc-test1.txt\nC\nD\nE\n" + "***** FC-TEST2.TXT\nC\nF\nF\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nB\nC\nD\nE\n", "A\nB\nF\nF\nF\n", -1, -1, COMPARING + "***** fc-test1.txt\nB\n...\nE\n" + "***** FC-TEST2.TXT\nB\n...\nF\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /A" FILES, "A\nC\nE\nF\nE\n", "A\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nC\nE\n" + "***** FC-TEST2.TXT\nA\n...\nE\n" + "*****\n\n" + "***** fc-test1.txt\nF\nE\n" + "***** FC-TEST2.TXT\n" + "*****\n\n" + }, + /* Test /N /A */ + { + __LINE__, 1, "fc /N /A" FILES, "A\nB\nC\nD\nE\n", "A\nB\nB\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 2: B\n 3: C\n 4: D\n" + "***** FC-TEST2.TXT\n 2: B\n 3: B\n 4: D\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /N /A" FILES, "A\nC\nC\nD\nE\n", "A\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 1: A\n 2: C\n 3: C\n" + "***** FC-TEST2.TXT\n 1: A\n 2: B\n 3: C\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /N /A" FILES, "A\nC\nC\nC\nE\n", "A\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 1: A\n...\n 5: E\n" + "***** FC-TEST2.TXT\n 1: A\n...\n 5: E\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /N /A" FILES, "A\nC\nE\nF\nC\n", "A\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 1: A\n...\n 5: C\n" + "***** FC-TEST2.TXT\n 1: A\n 2: B\n 3: C\n" + "*****\n\n" + "***** fc-test1.txt\n" + "***** FC-TEST2.TXT\n 4: D\n 5: E\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /N /A" FILES, "A\nC\nE\nF\nE\n", "A\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 1: A\n 2: C\n 3: E\n" + "***** FC-TEST2.TXT\n 1: A\n...\n 5: E\n" + "*****\n\n" + "***** fc-test1.txt\n 4: F\n 5: E\n" + "***** FC-TEST2.TXT\n" + "*****\n\n" + }, + /* Test tab expansion */ + { + __LINE__, 0, "fc" FILES, "A\n\tB\nC", "A\n B\nC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 0, "fc" FILES, "A\n \tB\nC", "A\n B\nC", -1, -1, COMPARING + NO_DIFF + }, + /* Test /T */ + { + __LINE__, 1, "fc /T" FILES, "A\n\tB\nC", "A\n B\nC", -1, -1, COMPARING + "***** fc-test1.txt\nA\n\tB\nC\n" + "***** FC-TEST2.TXT\nA\n B\nC\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /T" FILES, "A\n \tB\nC", "A\n B\nC", -1, -1, COMPARING + "***** fc-test1.txt\nA\n \tB\nC\n" + "***** FC-TEST2.TXT\nA\n B\nC\n" + "*****\n\n" + }, + /* Test /W */ + { + __LINE__, 0, "fc /W" FILES, "A\n \tB\nC", "A\n B\nC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 0, "fc /W" FILES, "\tA \nB\n", "A\nB\n", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /W" FILES, " A \nB\n", "AB\nB\n", -1, -1, COMPARING + "***** fc-test1.txt\n A \nB\n" + "***** FC-TEST2.TXT\nAB\nB\n" + "*****\n\n" + }, + /* TEST /W /T */ + { + __LINE__, 0, "fc /W /T" FILES, "A\n \tB\nC", "A\n B\nC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 0, "fc /W /T" FILES, "A\n \tB\nC", "A\n B\nC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /W" FILES, "\tA \nB\n", "AB\nB\n", -1, -1, COMPARING + "***** fc-test1.txt\n A \nB\n" + "***** FC-TEST2.TXT\nAB\nB\n" + "*****\n\n" + }, + /* Test /N */ + { + __LINE__, 1, "fc /N" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nE\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\n 3: C\n 4: D\n 5: E\n" + "***** FC-TEST2.TXT\n 3: C\n 4: E\n" + "*****\n\n" + "***** fc-test1.txt\n" + "***** FC-TEST2.TXT\n 5: E\n" + "*****\n\n" + }, + /* Test NUL */ + { + __LINE__, 1, "fc" FILES, "ABC\000DE", "ABC\000\000\000", 6, 6, COMPARING + "***** fc-test1.txt\nABC\nDE\n" + "***** FC-TEST2.TXT\nABC\n\n\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc" FILES, "ABC\000DE", "ABC\n\000\000", 6, 6, COMPARING + "***** fc-test1.txt\nABC\nDE\n" + "***** FC-TEST2.TXT\nABC\n\n\n" + "*****\n\n" + }, + { + __LINE__, 0, "fc" FILES, "ABC\000DE", "ABC\nDE", 6, 6, COMPARING + NO_DIFF + }, + /* Test CR ('\r') */ + { + __LINE__, 0, "fc" FILES, "ABC\nABC", "ABC\r\nABC", -1, -1, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc" FILES, "ABC\nABC", "ABC\r\r\nABC", -1, -1, COMPARING + "***** fc-test1.txt\nABC\nABC\n" + "***** FC-TEST2.TXT\nABC\nABC\n" + "*****\n\n" + }, + /* Test '\n' at EOF */ + { + __LINE__, 0, "fc" FILES, "ABC", "ABC\n", -1, -1, COMPARING + NO_DIFF + }, + /* Test /U */ + { + /* L"AB" */ + __LINE__, 0, "fc /U" FILES, "A\000B\000", "A\000B\000", 4, 4, COMPARING + NO_DIFF + }, + { + __LINE__, 1, "fc /U" FILES, "A\000B\000", "A\000C\000", 4, 4, COMPARING + "***** fc-test1.txt\nAB\n" + "***** FC-TEST2.TXT\nAC\n" + "*****\n\n" + }, + /* Test /LB2 */ + { + __LINE__, 1, "fc /LB2" FILES, "A\nB\nC\nD\nE\n", "B\nB\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nB\n" + "***** FC-TEST2.TXT\nB\nB\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /LB2" FILES, "A\nB\nC\nD\nE\n", "C\nC\nC\nD\nE\n", -1, -1, COMPARING + RESYNC_FAILED + "***** fc-test1.txt\nA\nB\n" + "***** FC-TEST2.TXT\nC\nC\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /LB2" FILES, "A\nB\nC\nD\nE\n", "D\nD\nD\nD\nE\n", -1, -1, COMPARING + RESYNC_FAILED + "***** fc-test1.txt\nA\nB\n" + "***** FC-TEST2.TXT\nD\nD\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /LB2" FILES, "A\nB\nC\nD\nE\n", "A\nC\nC\nD\nE\n", -1, -1, COMPARING + RESYNC_FAILED + "***** fc-test1.txt\nA\nB\n" + "***** FC-TEST2.TXT\nA\nC\n" + "*****\n\n" + }, + /* Test /LB3 */ + { + __LINE__, 1, "fc /LB3" FILES, "A\nB\nC\nD\nE\n", "C\nC\nC\nD\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nA\nB\nC\n" + "***** FC-TEST2.TXT\nC\nC\n" + "*****\n\n" + "***** fc-test1.txt\nC\nD\n" + "***** FC-TEST2.TXT\nC\nC\nD\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /LB3" FILES, "A\nB\nC\nD\nE\n", "D\nD\nD\nD\nE\n", -1, -1, COMPARING + RESYNC_FAILED + "***** fc-test1.txt\nA\nB\nC\n" + "***** FC-TEST2.TXT\nD\nD\nD\n" + "*****\n\n" + }, + /* Test /N /LB2 */ + { + __LINE__, 1, "fc /N /LB2" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nE\nE\n", -1, -1, COMPARING + RESYNC_FAILED + "***** fc-test1.txt\n 3: C\n 4: D\n" + "***** FC-TEST2.TXT\n 3: C\n 4: E\n" + "*****\n\n" + }, + /* Test /1 */ + { + __LINE__, 1, "fc /1" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nE\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nC\nD\nE\n" + "***** FC-TEST2.TXT\nC\nE\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /1" FILES, "A\nB\nC\nD\nE\n", "A\nB\nX\nX\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nB\nC\nD\nE\n" + "***** FC-TEST2.TXT\nB\nX\nX\nE\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /1" FILES, "A\nB\nC\nD\nE\nF\n", "A\nB\nX\nD\nX\nF", -1, -1, COMPARING + "***** fc-test1.txt\nB\nC\nD\n" + "***** FC-TEST2.TXT\nB\nX\nD\n" + "*****\n\n" + "***** fc-test1.txt\nD\nE\nF\n" + "***** FC-TEST2.TXT\nD\nX\nF\n" + "*****\n\n" + }, + /* Test /3 */ + { + __LINE__, 1, "fc /3" FILES, "A\nB\nC\nD\nE\n", "A\nB\nC\nE\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nC\nD\nE\n" + "***** FC-TEST2.TXT\nC\nE\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /3" FILES, "A\nB\nC\nD\nE\n", "A\nB\nX\nX\nE\n", -1, -1, COMPARING + "***** fc-test1.txt\nB\nC\nD\nE\n" + "***** FC-TEST2.TXT\nB\nX\nX\nE\n" + "*****\n\n" + }, + { + __LINE__, 1, "fc /3" FILES, "A\nB\nC\nD\nE\nF\n", "A\nB\nX\nD\nX\nF", -1, -1, COMPARING + "***** fc-test1.txt\nB\nC\nD\nE\nF\n" + "***** FC-TEST2.TXT\nB\nX\nD\nX\nF\n" + "*****\n\n" + }, +}; + +BOOL DoDuplicateHandle(HANDLE hFile, PHANDLE phFile, BOOL bInherit) +{ + HANDLE hProcess = GetCurrentProcess(); + return DuplicateHandle(hProcess, hFile, hProcess, phFile, 0, + bInherit, DUPLICATE_SAME_ACCESS); +} + +static BOOL +PrepareForRedirect(STARTUPINFOA *psi, PHANDLE phInputWrite, PHANDLE phOutputRead, + PHANDLE phErrorRead) +{ + SECURITY_ATTRIBUTES sa; + HANDLE hInputRead = NULL, hInputWriteTmp = NULL; + HANDLE hOutputReadTmp = NULL, hOutputWrite = NULL; + HANDLE hErrorReadTmp = NULL, hErrorWrite = NULL; + + sa.nLength = sizeof(sa); + sa.lpSecurityDescriptor = NULL; + sa.bInheritHandle = TRUE; + + if (phInputWrite) + { + if (CreatePipe(&hInputRead, &hInputWriteTmp, &sa, 0)) + { + if (!DoDuplicateHandle(hInputWriteTmp, phInputWrite, FALSE)) + return FALSE; + CloseHandle(hInputWriteTmp); + } + else + goto failure; + } + + if (phOutputRead) + { + if (CreatePipe(&hOutputReadTmp, &hOutputWrite, &sa, 0)) + { + if (!DoDuplicateHandle(hOutputReadTmp, phOutputRead, FALSE)) + return FALSE; + CloseHandle(hOutputReadTmp); + } + else + goto failure; + } + + if (phOutputRead && phOutputRead == phErrorRead) + { + if (!DoDuplicateHandle(hOutputWrite, &hErrorWrite, TRUE)) + return FALSE; + } + else if (phErrorRead) + { + if (CreatePipe(&hErrorReadTmp, &hErrorWrite, &sa, 0)) + { + if (!DoDuplicateHandle(hErrorReadTmp, phErrorRead, FALSE)) + return FALSE; + CloseHandle(hErrorReadTmp); + } + else + goto failure; + } + + if (phInputWrite) + { + psi->hStdInput = hInputRead; + psi->dwFlags |= STARTF_USESTDHANDLES; + } + if (phOutputRead) + { + psi->hStdOutput = hOutputWrite; + psi->dwFlags |= STARTF_USESTDHANDLES; + } + if (phErrorRead) + { + psi->hStdOutput = hErrorWrite; + psi->dwFlags |= STARTF_USESTDHANDLES; + } + return TRUE; + +failure: + CloseHandle(hInputRead); + CloseHandle(hInputWriteTmp); + CloseHandle(hOutputReadTmp); + CloseHandle(hOutputWrite); + CloseHandle(hErrorReadTmp); + CloseHandle(hErrorWrite); + return FALSE; +} + +static void ConvertOutput(LPSTR psz) +{ + LPSTR pch1, pch2; + pch1 = pch2 = psz; + while (*pch1) + { + if (*pch1 != '\r') + { + *pch2++ = *pch1; + } + ++pch1; + } + *pch2 = 0; +} + +static void DoTestEntry(const TEST_ENTRY* pEntry) +{ + FILE *fp; + STARTUPINFOA si = { sizeof(si) }; + PROCESS_INFORMATION pi; + INT file1_size, file2_size; + HANDLE hOutputRead; + DWORD cbAvail, cbRead; + CHAR szOutput[1024]; + BOOL ret; + DWORD dwExitCode; + LPSTR psz; + + file1_size = pEntry->file1_size; + file2_size = pEntry->file2_size; + if (file1_size == -1) + file1_size = strlen(pEntry->file1_data); + if (file2_size == -1) + file2_size = strlen(pEntry->file2_data); + + fp = fopen(FILE1, "wb"); + fwrite(pEntry->file1_data, file1_size, 1, fp); + fclose(fp); + + fp = fopen(FILE2, "wb"); + fwrite(pEntry->file2_data, file2_size, 1, fp); + fclose(fp); + + ok(PathFileExistsA(FILE1), "Line %d: PathFileExistsA(FILE1) failed\n", pEntry->lineno); + ok(PathFileExistsA(FILE2), "Line %d: PathFileExistsA(FILE2) failed\n", pEntry->lineno); + + si.hStdInput = GetStdHandle(STD_INPUT_HANDLE); + si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + si.hStdError = GetStdHandle(STD_ERROR_HANDLE); + + PrepareForRedirect(&si, NULL, &hOutputRead, &hOutputRead); + + psz = _strdup(pEntry->cmdline); + ret = CreateProcessA(NULL, psz, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); + free(psz); + + ok(ret, "Line %d: CreateProcessA failed\n", pEntry->lineno); + +#define TIMEOUT (10 * 1000) + WaitForSingleObject(pi.hProcess, TIMEOUT); + + ZeroMemory(szOutput, sizeof(szOutput)); + if (PeekNamedPipe(hOutputRead, NULL, 0, NULL, &cbAvail, NULL)) + { + if (cbAvail > 0) + { + if (cbAvail > sizeof(szOutput)) + cbAvail = sizeof(szOutput) - 1; + + ReadFile(hOutputRead, szOutput, cbAvail, &cbRead, NULL); + } + } + ConvertOutput(szOutput); + + GetExitCodeProcess(pi.hProcess, &dwExitCode); + ok(dwExitCode == pEntry->ret, "Line %d: dwExitCode was 0x%lx\n", pEntry->lineno, dwExitCode); + + if (StrCmpNIA(pEntry->output, szOutput, strlen(pEntry->output)) != 0) + { + ok(FALSE, "Line %d: Output was wrong\n", pEntry->lineno); + printf("---FROM HERE\n"); + printf("%s\n", szOutput); + printf("---UP TO HERE\n"); + } + else + { + ok_int(TRUE, TRUE); + } + + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + + CloseHandle(hOutputRead); + if (si.hStdInput != GetStdHandle(STD_INPUT_HANDLE)) + CloseHandle(si.hStdInput); + if (si.hStdOutput != GetStdHandle(STD_OUTPUT_HANDLE)) + CloseHandle(si.hStdOutput); + if (si.hStdError != GetStdHandle(STD_ERROR_HANDLE)) + CloseHandle(si.hStdError); + + DeleteFileA(FILE1); + DeleteFileA(FILE2); +} + +#define ENGLISH_CP 437 /* English codepage */ + +START_TEST(fc) +{ + UINT i; + UINT uOldCP = GetConsoleCP(), uOldOutputCP = GetConsoleOutputCP(); + SetConsoleCP(ENGLISH_CP); + SetConsoleOutputCP(ENGLISH_CP); + + for (i = 0; i < _countof(s_entries); ++i) + { + DoTestEntry(&s_entries[i]); + } + + SetConsoleCP(uOldCP); + SetConsoleOutputCP(uOldOutputCP); +} diff --git a/modules/rostests/apitests/cmd/testlist.c b/modules/rostests/apitests/cmd/testlist.c index cc73f9d0805..a62c3c78be5 100644 --- a/modules/rostests/apitests/cmd/testlist.c +++ b/modules/rostests/apitests/cmd/testlist.c @@ -5,6 +5,7 @@ extern void func_attrib(void); extern void func_cd(void); extern void func_echo(void); extern void func_exit(void); +extern void func_fc(void); extern void func_pushd(void); const struct test winetest_testlist[] = @@ -13,6 +14,7 @@ const struct test winetest_testlist[] = { "cd", func_cd }, { "echo", func_echo }, { "exit", func_exit }, + { "fc", func_fc }, { "pushd", func_pushd }, { 0, 0 } };

3 years, 7 months

[reactos] 01/01: [NE2000] Use the real MAC address instead of a fake one

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1fc312a8941d66cf6465… commit a1fc312a8941d66cf64654be949c9be5a8d5becc Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Thu Apr 22 00:32:33 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Wed Apr 28 17:28:38 2021 +0200 [NE2000] Use the real MAC address instead of a fake one These lines were added 15 years ago, in r18445. --- drivers/network/dd/ne2000/netne2000.inf | 1 - drivers/network/dd/ne2000/netrtl8029.inf | 1 - reactos/media/inf/netisa.inf | Bin 0 -> 5378 bytes 3 files changed, 2 deletions(-) diff --git a/drivers/network/dd/ne2000/netne2000.inf b/drivers/network/dd/ne2000/netne2000.inf index fe6f8e5b208..cbcc1c41d7d 100644 --- a/drivers/network/dd/ne2000/netne2000.inf +++ b/drivers/network/dd/ne2000/netne2000.inf @@ -31,7 +31,6 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" -HKR,,NetworkAddress,0x00000000,"001122334455" [NE2000_CopyFiles.NT] ne2000.sys diff --git a/drivers/network/dd/ne2000/netrtl8029.inf b/drivers/network/dd/ne2000/netrtl8029.inf index b6b62161ac2..56cd50dc889 100644 --- a/drivers/network/dd/ne2000/netrtl8029.inf +++ b/drivers/network/dd/ne2000/netrtl8029.inf @@ -31,7 +31,6 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" -HKR,,NetworkAddress,0x00000000,"001122334455" [NE2000_CopyFiles.NT] ne2000.sys diff --git a/reactos/media/inf/netisa.inf b/reactos/media/inf/netisa.inf new file mode 100644 index 00000000000..ef6c91ce887 Binary files /dev/null and b/reactos/media/inf/netisa.inf differ

3 years, 8 months

[reactos] 01/01: [NTOS:KDBG] Fix invalid DBG print

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b97d5fd2f70f7685d0001… commit b97d5fd2f70f7685d000148670eae0cbbbee0333 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Apr 28 15:58:01 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Apr 28 15:58:01 2021 +0200 [NTOS:KDBG] Fix invalid DBG print --- ntoskrnl/kdbg/kdb_cli.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 01473e99b0d..ac43b48c5e1 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -1802,21 +1802,23 @@ KdbpCmdThread( " Stack Base: 0x%08x\n" " Kernel Stack: 0x%08x\n" " Trap Frame: 0x%08x\n" - " NPX State: %s (0x%x)\n", - (Argc < 2) ? "Current Thread:\n" : "", - Thread->Cid.UniqueThread, - State, Thread->Tcb.State, - Thread->Tcb.Priority, - Thread->Tcb.Affinity, - Thread->Tcb.InitialStack, - Thread->Tcb.StackLimit, - Thread->Tcb.StackBase, - Thread->Tcb.KernelStack, - Thread->Tcb.TrapFrame +#ifndef _M_AMD64 + " NPX State: %s (0x%x)\n" +#endif + , (Argc < 2) ? "Current Thread:\n" : "" + , Thread->Cid.UniqueThread + , State, Thread->Tcb.State + , Thread->Tcb.Priority + , Thread->Tcb.Affinity + , Thread->Tcb.InitialStack + , Thread->Tcb.StackLimit + , Thread->Tcb.StackBase + , Thread->Tcb.KernelStack + , Thread->Tcb.TrapFrame #ifndef _M_AMD64 , NPX_STATE_TO_STRING(Thread->Tcb.NpxState), Thread->Tcb.NpxState #endif -); + ); /* Release our reference if we had one */ if (ReferencedThread)

3 years, 8 months

[reactos] 01/01: [KDGDB] Remove debugging leftover

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ab44664b63949656e140… commit 0ab44664b63949656e140b8ec5f694439cfae5ae Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Wed Apr 28 14:52:05 2021 +0200 Commit: Jérôme Gardou <jerome.gardou(a)reactos.org> CommitDate: Wed Apr 28 14:52:05 2021 +0200 [KDGDB] Remove debugging leftover --- drivers/base/kdgdb/kdgdb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/kdgdb/kdgdb.h b/drivers/base/kdgdb/kdgdb.h index 4e365b77e27..f4869d40b49 100644 --- a/drivers/base/kdgdb/kdgdb.h +++ b/drivers/base/kdgdb/kdgdb.h @@ -19,7 +19,7 @@ #include <pstypes.h> -#define KDDEBUG /* uncomment to enable debugging this dll */ +// #define KDDEBUG /* uncomment to enable debugging this dll */ /* To undefine once https://sourceware.org/bugzilla/show_bug.cgi?id=17397 is resolved */ #define MONOPROCESS 1

3 years, 8 months

[reactos] 29/29: [NTOS:KDBG] Begin port for amd64.

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3726b992ed3631c3571df… commit 3726b992ed3631c3571df056da70839c35a05582 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Tue Apr 27 10:23:37 2021 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Apr 28 13:10:23 2021 +0200 [NTOS:KDBG] Begin port for amd64. Not really functional, but it prints debug output. Take this as an opportunity to add consistancy between some i386 & amd64 intrinsics --- ntoskrnl/include/internal/amd64/ke.h | 85 ++++++++++-- ntoskrnl/include/internal/i386/intrin_i.h | 64 +++++---- ntoskrnl/include/internal/i386/ke.h | 81 ++++++++++-- ntoskrnl/kd/kdio.c | 2 +- ntoskrnl/kdbg/amd64/amd64-dis.c | 0 ntoskrnl/kdbg/amd64/kdb_help.S | 22 ++++ ntoskrnl/kdbg/kdb.c | 33 ++--- ntoskrnl/kdbg/kdb_cli.c | 209 ++++++++++++++++++++++-------- ntoskrnl/kdbg/kdb_expr.c | 18 ++- ntoskrnl/ke/i386/cpu.c | 2 +- ntoskrnl/ntos.cmake | 4 + 11 files changed, 396 insertions(+), 124 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/ke.h b/ntoskrnl/include/internal/amd64/ke.h index d4e1354290d..9917b9334cd 100644 --- a/ntoskrnl/include/internal/amd64/ke.h +++ b/ntoskrnl/include/internal/amd64/ke.h @@ -119,25 +119,84 @@ extern ULONG KeI386CpuStep; #define KD_BREAKPOINT_VALUE 0xCC // -// Macros for getting and setting special purpose registers in portable code +// One-liners for getting and setting special purpose registers in portable code // -#define KeGetContextPc(Context) \ - ((Context)->Rip) +FORCEINLINE +ULONG_PTR +KeGetContextPc(PCONTEXT Context) +{ + return Context->Rip; +} -#define KeSetContextPc(Context, ProgramCounter) \ - ((Context)->Rip = (ProgramCounter)) +FORCEINLINE +VOID +KeSetContextPc(PCONTEXT Context, ULONG_PTR ProgramCounter) +{ + Context->Rip = ProgramCounter; +} -#define KeGetTrapFramePc(TrapFrame) \ - ((TrapFrame)->Rip) +FORCEINLINE +ULONG_PTR +KeGetContextReturnRegister(PCONTEXT Context) +{ + return Context->Rax; +} -#define KiGetLinkedTrapFrame(x) \ - (PKTRAP_FRAME)((x)->TrapFrame) +FORCEINLINE +VOID +KeSetContextReturnRegister(PCONTEXT Context, ULONG_PTR ReturnValue) +{ + Context->Rax = ReturnValue; +} + +FORCEINLINE +ULONG_PTR +KeGetContextStackRegister(PCONTEXT Context) +{ + return Context->Rsp; +} -#define KeGetContextReturnRegister(Context) \ - ((Context)->Rax) +FORCEINLINE +ULONG_PTR +KeGetContextFrameRegister(PCONTEXT Context) +{ + return Context->Rbp; +} -#define KeSetContextReturnRegister(Context, ReturnValue) \ - ((Context)->Rax = (ReturnValue)) +FORCEINLINE +VOID +KeSetContextFrameRegister(PCONTEXT Context, ULONG_PTR Frame) +{ + Context->Rbp = Frame; +} + +FORCEINLINE +ULONG_PTR +KeGetTrapFramePc(PKTRAP_FRAME TrapFrame) +{ + return TrapFrame->Rip; +} + +FORCEINLINE +PKTRAP_FRAME +KiGetLinkedTrapFrame(PKTRAP_FRAME TrapFrame) +{ + return (PKTRAP_FRAME)TrapFrame->TrapFrame; +} + +FORCEINLINE +ULONG_PTR +KeGetTrapFrameStackRegister(PKTRAP_FRAME TrapFrame) +{ + return TrapFrame->Rsp; +} + +FORCEINLINE +ULONG_PTR +KeGetTrapFrameFrameRegister(PKTRAP_FRAME TrapFrame) +{ + return TrapFrame->Rbp; +} // // Macro to get trap and exception frame from a thread stack diff --git a/ntoskrnl/include/internal/i386/intrin_i.h b/ntoskrnl/include/internal/i386/intrin_i.h index 76e391e10ba..a458be957fb 100644 --- a/ntoskrnl/include/internal/i386/intrin_i.h +++ b/ntoskrnl/include/internal/i386/intrin_i.h @@ -2,16 +2,29 @@ #if defined(__GNUC__) -#define Ke386SetGlobalDescriptorTable(X) \ - __asm__("lgdt %0\n\t" \ - : /* no outputs */ \ - : "m" (*X)); +FORCEINLINE +VOID +__lgdt(_Out_ PVOID Descriptor) +{ + PVOID* desc = Descriptor; + __asm__ __volatile__( + "lgdt %0" + : "=m" (*desc) + : /* no input */ + : "memory"); +} -#define Ke386GetGlobalDescriptorTable(X) \ - __asm__("sgdt %0\n\t" \ - : "=m" (*X) \ - : /* no input */ \ - : "memory"); +FORCEINLINE +VOID +__sgdt(_Out_ PVOID Descriptor) +{ + PVOID* desc = Descriptor; + __asm__ __volatile__( + "sgdt %0" + : "=m" (*desc) + : /* no input */ + : "memory"); +} FORCEINLINE VOID @@ -51,15 +64,14 @@ Ke386SaveFpuState(IN PFX_SAVE_AREA SaveArea) } FORCEINLINE -USHORT -Ke386GetLocalDescriptorTable(VOID) +VOID +__sldt(PVOID Descriptor) { - USHORT Ldt; - __asm__("sldt %0\n\t" - : "=m" (Ldt) - : /* no input */ - : "memory"); - return Ldt; + __asm__ __volatile__( + "sldt %0" + : "=m" (*((short*)Descriptor)) + : /* no input */ + : "memory"); } #define Ke386SetLocalDescriptorTable(X) \ @@ -155,8 +167,6 @@ __fnsave(OUT PFLOATING_SAVE_AREA SaveArea) __asm wait; } -#define Ke386GetGlobalDescriptorTable __sgdt - FORCEINLINE VOID __lgdt(IN PVOID Descriptor) @@ -167,13 +177,17 @@ __lgdt(IN PVOID Descriptor) lgdt [eax] } } -#define Ke386SetGlobalDescriptorTable __lgdt FORCEINLINE -USHORT -Ke386GetLocalDescriptorTable(VOID) +VOID +__sldt(PVOID Descriptor) { - __asm sldt ax; + __asm + { + sldt ax + mov ecx, Descriptor + mov [ecx], ax + } } FORCEINLINE @@ -305,4 +319,8 @@ Ke386SaveFpuState(IN PVOID SaveArea) #error Unknown compiler for inline assembler #endif +#define Ke386GetGlobalDescriptorTable __sgdt +#define Ke386SetGlobalDescriptorTable __lgdt +#define Ke386GetLocalDescriptorTable __sldt + /* EOF */ diff --git a/ntoskrnl/include/internal/i386/ke.h b/ntoskrnl/include/internal/i386/ke.h index e91b8d6ad16..58adbf52906 100644 --- a/ntoskrnl/include/internal/i386/ke.h +++ b/ntoskrnl/include/internal/i386/ke.h @@ -18,25 +18,80 @@ #define KD_BREAKPOINT_VALUE 0xCC // -// Macros for getting and setting special purpose registers in portable code +// One-liners for getting and setting special purpose registers in portable code // -#define KeGetContextPc(Context) \ - ((Context)->Eip) +FORCEINLINE +ULONG_PTR +KeGetContextPc(PCONTEXT Context) +{ + return Context->Eip; +} + +FORCEINLINE +VOID +KeSetContextPc(PCONTEXT Context, ULONG_PTR ProgramCounter) +{ + Context->Eip = ProgramCounter; +} + +FORCEINLINE +ULONG_PTR +KeGetContextReturnRegister(PCONTEXT Context) +{ + return Context->Eax; +} + +FORCEINLINE +VOID +KeSetContextReturnRegister(PCONTEXT Context, ULONG_PTR ReturnValue) +{ + Context->Eax = ReturnValue; +} + +FORCEINLINE +ULONG_PTR +KeGetContextFrameRegister(PCONTEXT Context) +{ + return Context->Ebp; +} -#define KeSetContextPc(Context, ProgramCounter) \ - ((Context)->Eip = (ProgramCounter)) +FORCEINLINE +VOID +KeSetContextFrameRegister(PCONTEXT Context, ULONG_PTR Frame) +{ + Context->Ebp = Frame; +} + +FORCEINLINE +ULONG_PTR +KeGetTrapFramePc(PKTRAP_FRAME TrapFrame) +{ + return TrapFrame->Eip; +} -#define KeGetTrapFramePc(TrapFrame) \ - ((TrapFrame)->Eip) +FORCEINLINE +PKTRAP_FRAME +KiGetLinkedTrapFrame(PKTRAP_FRAME TrapFrame) +{ + return (PKTRAP_FRAME)TrapFrame->Edx; +} -#define KiGetLinkedTrapFrame(x) \ - (PKTRAP_FRAME)((x)->Edx) -#define KeGetContextReturnRegister(Context) \ - ((Context)->Eax) +FORCEINLINE +ULONG_PTR +KeGetTrapFrameStackRegister(PKTRAP_FRAME TrapFrame) +{ + if (TrapFrame->PreviousPreviousMode == KernelMode) + return TrapFrame->TempEsp; + return TrapFrame->HardwareEsp; +} -#define KeSetContextReturnRegister(Context, ReturnValue) \ - ((Context)->Eax = (ReturnValue)) +FORCEINLINE +ULONG_PTR +KeGetTrapFrameFrameRegister(PKTRAP_FRAME TrapFrame) +{ + return TrapFrame->Ebp; +} // // Macro to get trap and exception frame from a thread stack diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index af7accb3afc..9c35c9586e9 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -611,7 +611,7 @@ KdSendPacket( if (KdbgExceptionRecord.ExceptionCode == STATUS_ASSERTION_FAILURE) { /* Bump EIP to the instruction following the int 2C */ - KdbgContext.Eip += 2; + KeSetContextPc(&KdbgContext, KeGetContextPc(&KdbgContext) + 2); } Result = KdbEnterDebuggerException(&KdbgExceptionRecord, diff --git a/ntoskrnl/kdbg/amd64/amd64-dis.c b/ntoskrnl/kdbg/amd64/amd64-dis.c new file mode 100644 index 00000000000..e69de29bb2d diff --git a/ntoskrnl/kdbg/amd64/kdb_help.S b/ntoskrnl/kdbg/amd64/kdb_help.S new file mode 100644 index 00000000000..39ae8721f8e --- /dev/null +++ b/ntoskrnl/kdbg/amd64/kdb_help.S @@ -0,0 +1,22 @@ + +#include <asm.inc> + +.code64 + +PUBLIC KdbpStackSwitchAndCall +KdbpStackSwitchAndCall: + push rbp + mov rbp, rsp /* Old stack - frame */ + + /* Switch stack */ + mov rsp, rcx + + /* Call function */ + call rdx + + /* Switch back to old stack */ + pop rsp + + ret 8 + +END diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index f9a3b8792bb..8ec2e3bef1d 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -650,14 +650,14 @@ KdbpIsBreakPointOurs( if (ExceptionCode == STATUS_BREAKPOINT) /* Software interrupt */ { - ULONG_PTR BpEip = (ULONG_PTR)Context->Eip - 1; /* Get EIP of INT3 instruction */ + ULONG_PTR BpPc = KeGetContextPc(Context) - 1; /* Get EIP of INT3 instruction */ for (i = 0; i < KdbSwBreakPointCount; i++) { ASSERT((KdbSwBreakPoints[i]->Type == KdbBreakPointSoftware || KdbSwBreakPoints[i]->Type == KdbBreakPointTemporary)); ASSERT(KdbSwBreakPoints[i]->Enabled); - if (KdbSwBreakPoints[i]->Address == BpEip) + if (KdbSwBreakPoints[i]->Address == BpPc) { return KdbSwBreakPoints[i] - KdbBreakPoints; } @@ -1321,7 +1321,7 @@ KdbEnterDebuggerException( KiDispatchException accounts for that. Whatever we do here with the TrapFrame does not matter anyway, since KiDispatchException will overwrite it with the values from the Context! */ - Context->Eip--; + KeSetContextPc(Context, KeGetContextPc(Context) - 1); } if ((BreakPoint->Type == KdbBreakPointHardware) && @@ -1345,8 +1345,8 @@ KdbEnterDebuggerException( if (--KdbNumSingleSteps > 0) { - if ((KdbSingleStepOver && !KdbpStepOverInstruction(Context->Eip)) || - (!KdbSingleStepOver && !KdbpStepIntoInstruction(Context->Eip))) + if ((KdbSingleStepOver && !KdbpStepOverInstruction(KeGetContextPc(Context))) || + (!KdbSingleStepOver && !KdbpStepIntoInstruction(KeGetContextPc(Context)))) { Context->EFlags |= EFLAGS_TF; } @@ -1394,8 +1394,8 @@ KdbEnterDebuggerException( if (BreakPoint->Type == KdbBreakPointSoftware) { - KdbpPrint("\nEntered debugger on breakpoint #%d: EXEC 0x%04x:0x%08x\n", - KdbLastBreakPointNr, Context->SegCs & 0xffff, Context->Eip); + KdbpPrint("\nEntered debugger on breakpoint #%d: EXEC 0x%04x:0x%p\n", + KdbLastBreakPointNr, Context->SegCs & 0xffff, KeGetContextPc(Context)); } else if (BreakPoint->Type == KdbBreakPointHardware) { @@ -1448,8 +1448,8 @@ KdbEnterDebuggerException( /*ASSERT((Context->Eflags & EFLAGS_TF) != 0);*/ if (--KdbNumSingleSteps > 0) { - if ((KdbSingleStepOver && KdbpStepOverInstruction(Context->Eip)) || - (!KdbSingleStepOver && KdbpStepIntoInstruction(Context->Eip))) + if ((KdbSingleStepOver && KdbpStepOverInstruction(KeGetContextPc(Context))) || + (!KdbSingleStepOver && KdbpStepIntoInstruction(KeGetContextPc(Context)))) { Context->EFlags &= ~EFLAGS_TF; } @@ -1488,8 +1488,8 @@ KdbEnterDebuggerException( return kdHandleException; } - KdbpPrint("\nEntered debugger on embedded INT3 at 0x%04x:0x%08x.\n", - Context->SegCs & 0xffff, Context->Eip - 1); + KdbpPrint("\nEntered debugger on embedded INT3 at 0x%04x:0x%p.\n", + Context->SegCs & 0xffff, KeGetContextPc(Context) - 1); } else { @@ -1552,8 +1552,8 @@ KdbEnterDebuggerException( /* Variable explains itself! */ KdbpEvenThoughWeHaveABreakPointToReenableWeAlsoHaveARealSingleStep = TRUE; - if ((KdbSingleStepOver && KdbpStepOverInstruction(KdbCurrentTrapFrame->Eip)) || - (!KdbSingleStepOver && KdbpStepIntoInstruction(KdbCurrentTrapFrame->Eip))) + if ((KdbSingleStepOver && KdbpStepOverInstruction(KeGetContextPc(KdbCurrentTrapFrame))) || + (!KdbSingleStepOver && KdbpStepIntoInstruction(KeGetContextPc(KdbCurrentTrapFrame)))) { ASSERT((KdbCurrentTrapFrame->EFlags & EFLAGS_TF) == 0); /*KdbCurrentTrapFrame->EFlags &= ~EFLAGS_TF;*/ @@ -1608,7 +1608,7 @@ continue_execution: if (!(KdbEnteredOnSingleStep && KdbSingleStepOver)) { /* Skip the current instruction */ - Context->Eip++; + KeSetContextPc(Context, KeGetContextPc(Context) + KD_BREAKPOINT_SIZE); } } @@ -1625,7 +1625,10 @@ KdbEnterDebuggerFirstChanceException( /* Copy TrapFrame to Context */ RtlZeroMemory(&Context, sizeof(CONTEXT)); - Context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_EXTENDED_REGISTERS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS; + Context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS; +#ifdef CONTEXT_EXTENDED_REGISTERS + Context.ContextFlags |= CONTEXT_EXTENDED_REGISTERS; +#endif KeTrapFrameToContext(TrapFrame, NULL, &Context); /* Create ExceptionRecord (assume breakpoint) */ diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 50805fe9f66..01473e99b0d 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -82,7 +82,9 @@ static BOOLEAN KdbpCmdProc(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdMod(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdPcr(ULONG Argc, PCHAR Argv[]); +#ifdef _M_IX86 static BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]); +#endif static BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdReboot(ULONG Argc, PCHAR Argv[]); @@ -103,6 +105,26 @@ BOOLEAN ExpKdbgExtHandle(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdPrintStruct(ULONG Argc, PCHAR Argv[]); #endif +/* Be more descriptive than intrinsics */ +#ifndef Ke386GetGlobalDescriptorTable +# define Ke386GetGlobalDescriptorTable __sgdt +#endif +#ifndef Ke386GetLocalDescriptorTable +# define Ke386GetLocalDescriptorTable __sldt +#endif + +/* Portability */ +FORCEINLINE +ULONG_PTR +strtoulptr(const char* nptr, char** endptr, int base) +{ +#ifdef _M_IX86 + return strtoul(nptr, endptr, base); +#else + return strtoull(nptr, endptr, base); +#endif +} + /* GLOBALS *******************************************************************/ typedef @@ -376,7 +398,9 @@ static const struct { "ldt", "ldt", "Display the local descriptor table.", KdbpCmdGdtLdtIdt }, { "idt", "idt", "Display the interrupt descriptor table.", KdbpCmdGdtLdtIdt }, { "pcr", "pcr", "Display the processor control region.", KdbpCmdPcr }, +#ifdef _M_IX86 { "tss", "tss [selector|*descaddr]", "Display the current task state segment, or the one specified by its selector number or descriptor address.", KdbpCmdTss }, +#endif /* Others */ { NULL, NULL, "Others", NULL }, @@ -793,7 +817,7 @@ KdbpCmdDisassembleX( ULONG ul; INT i; ULONGLONG Result = 0; - ULONG_PTR Address = KdbCurrentTrapFrame->Eip; + ULONG_PTR Address = KeGetContextPc(KdbCurrentTrapFrame); LONG InstLen; if (Argv[0][0] == 'x') /* display memory */ @@ -922,6 +946,7 @@ KdbpCmdRegs( if (Argv[0][0] == 'r') /* regs */ { +#ifdef _M_IX86 KdbpPrint("CS:EIP 0x%04x:0x%08x\n" "SS:ESP 0x%04x:0x%08x\n" " EAX 0x%08x EBX 0x%08x\n" @@ -934,7 +959,20 @@ KdbpCmdRegs( Context->Ecx, Context->Edx, Context->Esi, Context->Edi, Context->Ebp); - +#else + KdbpPrint("CS:RIP 0x%04x:0x%p\n" + "SS:RSP 0x%04x:0x%p\n" + " RAX 0x%p RBX 0x%p\n" + " RCX 0x%p RDX 0x%p\n" + " RSI 0x%p RDI 0x%p\n" + " RBP 0x%p\n", + Context->SegCs & 0xFFFF, Context->Rip, + Context->SegSs, Context->Rsp, + Context->Rax, Context->Rbx, + Context->Rcx, Context->Rdx, + Context->Rsi, Context->Rdi, + Context->Rbp); +#endif /* Display the EFlags */ KdbpPrint("EFLAGS 0x%08x ", Context->EFlags); for (i = 0; i < 32; i++) @@ -990,6 +1028,7 @@ KdbpCmdRegs( return TRUE; } +#ifdef _M_IX86 static PKTSS KdbpRetrieveTss( IN USHORT TssSelector, @@ -1102,6 +1141,7 @@ KdbpContextFromPrevTss( Context->Ebp = Ebp; return TRUE; } +#endif /*!\brief Displays a backtrace. */ @@ -1113,11 +1153,8 @@ KdbpCmdBackTrace( ULONG ul; ULONGLONG Result = 0; CONTEXT Context = *KdbCurrentTrapFrame; - ULONG_PTR Frame = Context.Ebp; + ULONG_PTR Frame = KeGetContextFrameRegister(&Context); ULONG_PTR Address; - KDESCRIPTOR Gdtr; - USHORT TssSelector; - PKTSS Tss; if (Argc >= 2) { @@ -1172,6 +1209,11 @@ KdbpCmdBackTrace( } } +#ifdef _M_IX86 + KDESCRIPTOR Gdtr; + USHORT TssSelector; + PKTSS Tss; + /* Retrieve the Global Descriptor Table */ Ke386GetGlobalDescriptorTable(&Gdtr.Limit); @@ -1183,13 +1225,14 @@ KdbpCmdBackTrace( /* Display the active TSS if it is nested */ KdbpPrint("[Active TSS 0x%04x @ 0x%p]\n", TssSelector, Tss); } +#endif /* If no Frame Address or Thread ID was given, try printing the function at EIP */ if (Argc <= 1) { KdbpPrint("Eip:\n"); - if (!KdbSymPrintAddress((PVOID)Context.Eip, &Context)) - KdbpPrint("<%08x>\n", Context.Eip); + if (!KdbSymPrintAddress((PVOID)KeGetContextPc(&Context), &Context)) + KdbpPrint("<%p>\n", KeGetContextPc(&Context)); else KdbpPrint("\n"); } @@ -1215,7 +1258,9 @@ KdbpCmdBackTrace( GotNextFrame = NT_SUCCESS(KdbpSafeReadMemory(&Frame, (PVOID)Frame, sizeof(ULONG_PTR))); if (GotNextFrame) - Context.Ebp = Frame; + { + KeSetContextFrameRegister(&Context, Frame); + } // else // Frame = 0; @@ -1237,6 +1282,9 @@ KdbpCmdBackTrace( continue; CheckForParentTSS: +#ifndef _M_IX86 + break; +#else /* * We have ended the stack walking for the current (active) TSS. * Check whether this TSS was nested, and if so switch to its parent @@ -1251,6 +1299,8 @@ CheckForParentTSS: KdbpPrint("Couldn't access parent TSS 0x%04x\n", Tss->Backlink); break; // Cannot retrieve the parent TSS, we stop there. } + + Address = Context.Eip; Frame = Context.Ebp; @@ -1260,6 +1310,7 @@ CheckForParentTSS: KdbpPrint("<%08x>\n", Address); else KdbpPrint("\n"); +#endif } return TRUE; @@ -1359,8 +1410,8 @@ KdbpCmdBreakPointList( else { GlobalOrLocal = Buffer; - sprintf(Buffer, " PID 0x%08lx", - (ULONG)(Process ? Process->UniqueProcessId : INVALID_HANDLE_VALUE)); + sprintf(Buffer, " PID 0x%lx", + (ULONG_PTR)(Process ? Process->UniqueProcessId : INVALID_HANDLE_VALUE)); } if (Type == KdbBreakPointSoftware || Type == KdbBreakPointTemporary) @@ -1579,10 +1630,10 @@ KdbpCmdThread( PETHREAD Thread = NULL; PEPROCESS Process = NULL; BOOLEAN ReferencedThread = FALSE, ReferencedProcess = FALSE; - PULONG Esp; - PULONG Ebp; - ULONG Eip; - ULONG ul = 0; + PULONG_PTR Stack; + PULONG_PTR Frame; + ULONG_PTR Pc; + ULONG_PTR ul = 0; PCHAR State, pend, str1, str2; static const PCHAR ThreadStateToString[DeferredReady+1] = { @@ -1599,7 +1650,7 @@ KdbpCmdThread( if (Argc >= 3) { - ul = strtoul(Argv[2], &pend, 0); + ul = strtoulptr(Argv[2], &pend, 0); if (Argv[2] == pend) { KdbpPrint("thread: '%s' is not a valid process id!\n", Argv[2]); @@ -1620,7 +1671,7 @@ KdbpCmdThread( if (Entry == &Process->ThreadListHead) { if (Argc >= 3) - KdbpPrint("No threads in process 0x%08x!\n", ul); + KdbpPrint("No threads in process 0x%px!\n", (PVOID)ul); else KdbpPrint("No threads in current process!\n"); @@ -1649,27 +1700,23 @@ KdbpCmdThread( if (!Thread->Tcb.InitialStack) { /* Thread has no kernel stack (probably terminated) */ - Esp = Ebp = NULL; - Eip = 0; + Stack = Frame = NULL; + Pc = 0; } else if (Thread->Tcb.TrapFrame) { - if (Thread->Tcb.TrapFrame->PreviousPreviousMode == KernelMode) - Esp = (PULONG)Thread->Tcb.TrapFrame->TempEsp; - else - Esp = (PULONG)Thread->Tcb.TrapFrame->HardwareEsp; - - Ebp = (PULONG)Thread->Tcb.TrapFrame->Ebp; - Eip = Thread->Tcb.TrapFrame->Eip; + Stack = (PULONG_PTR)KeGetTrapFrameStackRegister(Thread->Tcb.TrapFrame); + Frame = (PULONG_PTR)KeGetTrapFrameFrameRegister(Thread->Tcb.TrapFrame); + Pc = KeGetTrapFramePc(Thread->Tcb.TrapFrame); } else { - Esp = (PULONG)Thread->Tcb.KernelStack; - Ebp = (PULONG)Esp[4]; - Eip = 0; + Stack = (PULONG_PTR)Thread->Tcb.KernelStack; + Frame = (PULONG_PTR)Stack[4]; + Pc = 0; - if (Ebp) /* FIXME: Should we attach to the process to read Ebp[1]? */ - KdbpSafeReadMemory(&Eip, Ebp + 1, sizeof(Eip)); + if (Frame) /* FIXME: Should we attach to the process to read Ebp[1]? */ + KdbpSafeReadMemory(&Pc, Frame + 1, sizeof(Pc)); } if (Thread->Tcb.State < (DeferredReady + 1)) @@ -1683,8 +1730,8 @@ KdbpCmdThread( State, Thread->Tcb.Priority, Thread->Tcb.Affinity, - Ebp, - Eip, + Frame, + Pc, str2); Entry = Entry->Flink; @@ -1703,7 +1750,7 @@ KdbpCmdThread( return TRUE; } - ul = strtoul(Argv[2], &pend, 0); + ul = strtoulptr(Argv[2], &pend, 0); if (Argv[2] == pend) { KdbpPrint("thread attach: '%s' is not a valid thread id!\n", Argv[2]); @@ -1723,7 +1770,7 @@ KdbpCmdThread( if (Argc >= 2) { - ul = strtoul(Argv[1], &pend, 0); + ul = strtoulptr(Argv[1], &pend, 0); if (Argv[1] == pend) { KdbpPrint("thread: '%s' is not a valid thread id!\n", Argv[1]); @@ -1765,8 +1812,11 @@ KdbpCmdThread( Thread->Tcb.StackLimit, Thread->Tcb.StackBase, Thread->Tcb.KernelStack, - Thread->Tcb.TrapFrame, - NPX_STATE_TO_STRING(Thread->Tcb.NpxState), Thread->Tcb.NpxState); + Thread->Tcb.TrapFrame +#ifndef _M_AMD64 + , NPX_STATE_TO_STRING(Thread->Tcb.NpxState), Thread->Tcb.NpxState +#endif +); /* Release our reference if we had one */ if (ReferencedThread) @@ -1787,7 +1837,7 @@ KdbpCmdProc( PEPROCESS Process; BOOLEAN ReferencedProcess = FALSE; PCHAR State, pend, str1, str2; - ULONG ul; + ULONG_PTR ul; extern LIST_ENTRY PsActiveProcessHead; if (Argc >= 2 && _stricmp(Argv[1], "list") == 0) @@ -1837,7 +1887,7 @@ KdbpCmdProc( return TRUE; } - ul = strtoul(Argv[2], &pend, 0); + ul = strtoulptr(Argv[2], &pend, 0); if (Argv[2] == pend) { KdbpPrint("process attach: '%s' is not a valid process id!\n", Argv[2]); @@ -1849,8 +1899,8 @@ KdbpCmdProc( return TRUE; } - KdbpPrint("Attached to process 0x%08x, thread 0x%08x.\n", (ULONG)ul, - (ULONG)KdbCurrentThread->Cid.UniqueThread); + KdbpPrint("Attached to process 0x%p, thread 0x%p.\n", (PVOID)ul, + KdbCurrentThread->Cid.UniqueThread); } else { @@ -1858,7 +1908,7 @@ KdbpCmdProc( if (Argc >= 2) { - ul = strtoul(Argv[1], &pend, 0); + ul = strtoulptr(Argv[1], &pend, 0); if (Argv[1] == pend) { KdbpPrint("proc: '%s' is not a valid process id!\n", Argv[1]); @@ -1991,9 +2041,9 @@ KdbpCmdGdtLdtIdt( for (i = 0; (i + sizeof(SegDesc) - 1) <= Reg.Limit; i += 8) { - if (!NT_SUCCESS(KdbpSafeReadMemory(SegDesc, (PVOID)(Reg.Base + i), sizeof(SegDesc)))) + if (!NT_SUCCESS(KdbpSafeReadMemory(SegDesc, (PVOID)((ULONG_PTR)Reg.Base + i), sizeof(SegDesc)))) { - KdbpPrint("Couldn't access memory at 0x%08x!\n", Reg.Base + i); + KdbpPrint("Couldn't access memory at 0x%p!\n", (PVOID)((ULONG_PTR)Reg.Base + i)); return TRUE; } @@ -2046,7 +2096,7 @@ KdbpCmdGdtLdtIdt( ASSERT(Argv[0][0] == 'l'); /* Read LDTR */ - Reg.Limit = Ke386GetLocalDescriptorTable(); + Ke386GetLocalDescriptorTable(&Reg.Limit); Reg.Base = 0; i = 0; ul = 1 << 2; @@ -2065,9 +2115,9 @@ KdbpCmdGdtLdtIdt( for (; (i + sizeof(SegDesc) - 1) <= Reg.Limit; i += 8) { - if (!NT_SUCCESS(KdbpSafeReadMemory(SegDesc, (PVOID)(Reg.Base + i), sizeof(SegDesc)))) + if (!NT_SUCCESS(KdbpSafeReadMemory(SegDesc, (PVOID)((ULONG_PTR)Reg.Base + i), sizeof(SegDesc)))) { - KdbpPrint("Couldn't access memory at 0x%08x!\n", Reg.Base + i); + KdbpPrint("Couldn't access memory at 0x%p!\n", (ULONG_PTR)Reg.Base + i); return TRUE; } @@ -2194,36 +2244,80 @@ KdbpCmdPcr( " Tib.FiberData/Version: 0x%08x\n" " Tib.ArbitraryUserPointer: 0x%08x\n" " Tib.Self: 0x%08x\n" +#ifdef _M_IX86 " SelfPcr: 0x%08x\n" +#else + " Self: 0x%p\n" +#endif " PCRCB: 0x%08x\n" " Irql: 0x%02x\n" +#ifdef _M_IX86 " IRR: 0x%08x\n" " IrrActive: 0x%08x\n" " IDR: 0x%08x\n" +#endif " KdVersionBlock: 0x%08x\n" +#ifdef _M_IX86 " IDT: 0x%08x\n" " GDT: 0x%08x\n" " TSS: 0x%08x\n" +#endif " MajorVersion: 0x%04x\n" " MinorVersion: 0x%04x\n" +#ifdef _M_IX86 " SetMember: 0x%08x\n" +#endif " StallScaleFactor: 0x%08x\n" +#ifdef _M_IX86 " Number: 0x%02x\n" +#endif " L2CacheAssociativity: 0x%02x\n" +#ifdef _M_IX86 " VdmAlert: 0x%08x\n" +#endif " L2CacheSize: 0x%08x\n" - " InterruptMode: 0x%08x\n", - Pcr->NtTib.ExceptionList, Pcr->NtTib.StackBase, Pcr->NtTib.StackLimit, +#ifdef _M_IX86 + " InterruptMode: 0x%08x\n" +#endif + , Pcr->NtTib.ExceptionList, Pcr->NtTib.StackBase, Pcr->NtTib.StackLimit, Pcr->NtTib.SubSystemTib, Pcr->NtTib.FiberData, Pcr->NtTib.ArbitraryUserPointer, - Pcr->NtTib.Self, Pcr->SelfPcr, Pcr->Prcb, Pcr->Irql, Pcr->IRR, Pcr->IrrActive, - Pcr->IDR, Pcr->KdVersionBlock, Pcr->IDT, Pcr->GDT, Pcr->TSS, - Pcr->MajorVersion, Pcr->MinorVersion, Pcr->SetMember, Pcr->StallScaleFactor, - Pcr->Number, Pcr->SecondLevelCacheAssociativity, - Pcr->VdmAlert, Pcr->SecondLevelCacheSize, Pcr->InterruptMode); + Pcr->NtTib.Self +#ifdef _M_IX86 + , Pcr->SelfPcr +#else + , Pcr->Self +#endif + , Pcr->Prcb, Pcr->Irql +#ifdef _M_IX86 + , Pcr->IRR, Pcr->IrrActive , Pcr->IDR +#endif + , Pcr->KdVersionBlock +#ifdef _M_IX86 + , Pcr->IDT, Pcr->GDT, Pcr->TSS +#endif + , Pcr->MajorVersion, Pcr->MinorVersion +#ifdef _M_IX86 + , Pcr->SetMember +#endif + , Pcr->StallScaleFactor +#ifdef _M_IX86 + , Pcr->Number +#endif + , Pcr->SecondLevelCacheAssociativity +#ifdef _M_IX86 + , Pcr->VdmAlert +#endif + , Pcr->SecondLevelCacheSize +#ifdef _M_IX86 + , Pcr->InterruptMode +#endif + ); + return TRUE; } +#ifdef _M_IX86 /*!\brief Displays the TSS */ static BOOLEAN @@ -2321,6 +2415,7 @@ KdbpCmdTss( return TRUE; } +#endif /*!\brief Bugchecks the system. */ @@ -3613,13 +3708,13 @@ KdbpCliMainLoop( if (EnteredOnSingleStep) { - if (!KdbSymPrintAddress((PVOID)KdbCurrentTrapFrame->Eip, KdbCurrentTrapFrame)) + if (!KdbSymPrintAddress((PVOID)KeGetContextPc(KdbCurrentTrapFrame), KdbCurrentTrapFrame)) { - KdbpPrint("<%08x>", KdbCurrentTrapFrame->Eip); + KdbpPrint("<%p>", KeGetContextPc(KdbCurrentTrapFrame)); } KdbpPrint(": "); - if (KdbpDisassemble(KdbCurrentTrapFrame->Eip, KdbUseIntelSyntax) < 0) + if (KdbpDisassemble(KeGetContextPc(KdbCurrentTrapFrame), KdbUseIntelSyntax) < 0) { KdbpPrint("<INVALID>"); } diff --git a/ntoskrnl/kdbg/kdb_expr.c b/ntoskrnl/kdbg/kdb_expr.c index 9a1924852b6..69a57d8e8ae 100644 --- a/ntoskrnl/kdbg/kdb_expr.c +++ b/ntoskrnl/kdbg/kdb_expr.c @@ -111,8 +111,14 @@ static const struct } RegisterToTrapFrame[] = { + /* FIXME: X86 only */ +#ifdef _M_IX86 {"eip", FIELD_OFFSET(KDB_KTRAP_FRAME, Eip), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Eip)}, +#else + {"rip", FIELD_OFFSET(KDB_KTRAP_FRAME, Rip), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Rip)}, +#endif {"eflags", FIELD_OFFSET(KDB_KTRAP_FRAME, EFlags), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, EFlags)}, +#ifdef _M_IX86 {"eax", FIELD_OFFSET(KDB_KTRAP_FRAME, Eax), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Eax)}, {"ebx", FIELD_OFFSET(KDB_KTRAP_FRAME, Ebx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Ebx)}, {"ecx", FIELD_OFFSET(KDB_KTRAP_FRAME, Ecx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Ecx)}, @@ -121,6 +127,16 @@ RegisterToTrapFrame[] = {"edi", FIELD_OFFSET(KDB_KTRAP_FRAME, Edi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Edi)}, {"esp", FIELD_OFFSET(KDB_KTRAP_FRAME, Esp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Esp)}, {"ebp", FIELD_OFFSET(KDB_KTRAP_FRAME, Ebp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Ebp)}, +#else + {"rax", FIELD_OFFSET(KDB_KTRAP_FRAME, Rax), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Rax)}, + {"rbx", FIELD_OFFSET(KDB_KTRAP_FRAME, Rbx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Rbx)}, + {"rcx", FIELD_OFFSET(KDB_KTRAP_FRAME, Rcx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Rcx)}, + {"rdx", FIELD_OFFSET(KDB_KTRAP_FRAME, Rdx), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Rdx)}, + {"rsi", FIELD_OFFSET(KDB_KTRAP_FRAME, Rsi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Rsi)}, + {"rdi", FIELD_OFFSET(KDB_KTRAP_FRAME, Rdi), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Rdi)}, + {"rsp", FIELD_OFFSET(KDB_KTRAP_FRAME, Rsp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Rsp)}, + {"rbp", FIELD_OFFSET(KDB_KTRAP_FRAME, Rbp), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Rbp)}, +#endif {"cs", FIELD_OFFSET(KDB_KTRAP_FRAME, SegCs), 2 }, /* Use only the lower 2 bytes */ {"ds", FIELD_OFFSET(KDB_KTRAP_FRAME, SegDs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, SegDs)}, {"es", FIELD_OFFSET(KDB_KTRAP_FRAME, SegEs), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, SegEs)}, @@ -1009,7 +1025,7 @@ RpnpEvaluateStack( if (!Ok) { - _snprintf(ErrMsg, 128, "Couldn't access memory at 0x%lx", (ULONG)p); + _snprintf(ErrMsg, 128, "Couldn't access memory at 0x%p", p); if (ErrOffset) *ErrOffset = Op->CharacterOffset; diff --git a/ntoskrnl/ke/i386/cpu.c b/ntoskrnl/ke/i386/cpu.c index 043ab2b62d2..3b07453af53 100644 --- a/ntoskrnl/ke/i386/cpu.c +++ b/ntoskrnl/ke/i386/cpu.c @@ -979,7 +979,7 @@ KiSaveProcessorControlState(OUT PKPROCESSOR_STATE ProcessorState) Ke386GetGlobalDescriptorTable(&ProcessorState->SpecialRegisters.Gdtr.Limit); __sidt(&ProcessorState->SpecialRegisters.Idtr.Limit); ProcessorState->SpecialRegisters.Tr = Ke386GetTr(); - ProcessorState->SpecialRegisters.Ldtr = Ke386GetLocalDescriptorTable(); + Ke386GetLocalDescriptorTable(&ProcessorState->SpecialRegisters.Ldtr); } CODE_SEG("INIT") diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index c392bcd95ec..dbb9f911016 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -395,6 +395,10 @@ if(NOT _WINKD_) elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c) + if(KDBG) + list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/amd64/kdb_help.S) + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/i386-dis.c) + endif() elseif(ARCH STREQUAL "arm") list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c) endif()

3 years, 8 months

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 2021