Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [CMD] FOR: Additional Windows' CMD compatibility "fixes" for FOR /F token parsing command.
by Hermès Bélusca-Maïto 21 Sep '20

21 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0695ecbfd641306f9912a… commit 0695ecbfd641306f9912af865010dbb0ccf20fbd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 26 20:15:25 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 21 03:31:01 2020 +0200 [CMD] FOR: Additional Windows' CMD compatibility "fixes" for FOR /F token parsing command. This compatibility behaviour implements the buggy behaviour of FOR /F token parsing that can be observed in Windows' CMD, and that is tested by the cmd_winetests. It can be disabled at compile time via the MSCMD_FOR_QUIRKS define. It fixes additional cmd_winetests, in concert with commit cb2a9c31. Explanation of the implemented buggy behaviour ============================================== In principle, the "tokens=x,y,m-n[*]" option describes a list of token numbers (must be between 1 and 31) that will be assigned into variables. Theoretically this option does not cumulate: only the latest 'tokens=' specification should be taken into account. However things are not that simple in practice. First, not all of the "tokens=" option state is reset when more than one specification is provided. Second, when specifying a token range, e.g. "1-5", Windows' CMD just ignores without error ranges that are not specified in increasing order. Thus for example, a range "5-1" is ignored without error. Then, token numbers strictly greater than 31 are just ignored, and if they appear in a range, the whole range is ignored. Another bug is the following one: suppose that the 'tokens' specification reads: "tokens=1-5,1-30" , or: "tokens=1-5,3" , i.e. more than one range, that overlap partially. Then the actual total number of variables will not be of the larger range size, but will be the sum, instead. Thus, in the first example, a total of 5 + 30 == 35 variables (> 31) is allocated, while in the second example, a total of 5 + 1 == 6 variables is allocated, even if they won't all store data !! In the first example, only the first 30 FOR variables will be used, and the 5 others will contain an empty string. In the second example, only the first 5 FOR variables will be used, and the other one will be empty. We also see that due to that, the "Variables" buffer of fixed size cannot always be used (since it can contain at most 32 variables). Last but not least, when more than one "tokens=" specification is provided, for example: "tokens=1-31 tokens=1-20" a total number of 31 FOR variables (because 31 is the max of 31 and 20) is allocated, **but** only 20 are actually used, and the 11 others return an empty string. And in the specification: "tokens=1-31,* tokens=1-20", a total of 31 + 1 + 20 = 52 variables is initialized, but only the first 20 will be used, and no "remaining-line" token (the '*' one) is used. --- base/shell/cmd/for.c | 165 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 135 insertions(+), 30 deletions(-) diff --git a/base/shell/cmd/for.c b/base/shell/cmd/for.c index 300588bed31..151be0ca2c8 100644 --- a/base/shell/cmd/for.c +++ b/base/shell/cmd/for.c @@ -32,6 +32,10 @@ #include "precomp.h" +/* Enable this define for "buggy" Windows' CMD FOR-command compatibility. + * Currently, this enables the buggy behaviour of FOR /F token parsing. */ +#define MSCMD_FOR_QUIRKS + /* FOR is a special command, so this function is only used for showing help now */ INT cmd_for(LPTSTR param) @@ -121,23 +125,27 @@ static LPTSTR ReadFileContents(FILE *InputFile, TCHAR *Buffer) static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { LPTSTR Delims = _T(" \t"); - LPTSTR DelimsEndPtr = NULL; + PTCHAR DelimsEndPtr = NULL; TCHAR DelimsEndChr = _T('\0'); TCHAR Eol = _T(';'); INT SkipLines = 0; - DWORD Tokens = (1 << 1); - BOOL RemainderVar = FALSE; + DWORD TokensMask = (1 << 1); +#ifdef MSCMD_FOR_QUIRKS + DWORD NumTokens = 1; + DWORD RemainderVar = 0; +#else + DWORD NumTokens = 0; +#endif TCHAR StringQuote = _T('"'); TCHAR CommandQuote = _T('\''); LPTSTR Variables[32]; - TCHAR *Start, *End; - INT i; + PTCHAR Start, End; INT Ret = 0; if (Cmd->For.Params) { TCHAR Quote = 0; - TCHAR *Param = Cmd->For.Params; + PTCHAR Param = Cmd->For.Params; if (*Param == _T('"') || *Param == _T('\'')) Quote = *Param++; @@ -161,7 +169,7 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { if (*Param == _T(' ')) { - TCHAR *FirstSpace = Param; + PTCHAR FirstSpace = Param; Param += _tcsspn(Param, _T(" ")); /* Exclude trailing spaces if this is not the last parameter */ if (*Param && *Param != Quote) @@ -197,24 +205,59 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) } else if (_tcsnicmp(Param, _T("tokens="), 7) == 0) { +#ifdef MSCMD_FOR_QUIRKS + DWORD NumToksInSpec = 0; // Number of tokens in this specification. +#endif Param += 7; - /* tokens=x,y,m-n: List of token numbers (must be between - * 1 and 31) that will be assigned into variables. */ - Tokens = 0; + /* + * tokens=x,y,m-n: List of token numbers (must be between 1 and 31) + * that will be assigned into variables. This option does not cumulate: + * only the latest 'tokens=' specification is taken into account. + * + * NOTE: In MSCMD_FOR_QUIRKS mode, for Windows' CMD compatibility, + * not all the tokens-state is reset. This leads to subtle bugs. + */ + TokensMask = 0; +#ifdef MSCMD_FOR_QUIRKS + NumToksInSpec = 0; + // Windows' CMD compatibility: bug: the asterisk-token's position is not reset! + // RemainderVar = 0; +#else + NumTokens = 0; +#endif + while (*Param && *Param != Quote && *Param != _T('*')) { INT First = _tcstol(Param, &Param, 0); INT Last = First; +#ifdef MSCMD_FOR_QUIRKS if (First < 1) +#else + if ((First < 1) || (First > 31)) +#endif goto error; if (*Param == _T('-')) { /* It's a range of tokens */ Last = _tcstol(Param + 1, &Param, 0); - if (Last < First || Last > 31) +#ifdef MSCMD_FOR_QUIRKS + /* Ignore the range if the endpoints are not in correct order */ + if (Last < 1) +#else + if ((Last < First) || (Last > 31)) +#endif goto error; } - Tokens |= (2 << Last) - (1 << First); +#ifdef MSCMD_FOR_QUIRKS + /* Ignore the range if the endpoints are not in correct order */ + if ((First <= Last) && (Last <= 31)) + { +#endif + TokensMask |= (2 << Last) - (1 << First); +#ifdef MSCMD_FOR_QUIRKS + NumToksInSpec += (Last - First + 1); + } +#endif if (*Param != _T(',')) break; @@ -222,12 +265,19 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) } /* With an asterisk at the end, an additional variable * will be created to hold the remainder of the line - * (after the last token specified). */ + * (after the last specified token). */ if (*Param == _T('*')) { - RemainderVar = TRUE; +#ifdef MSCMD_FOR_QUIRKS + RemainderVar = ++NumToksInSpec; +#else + ++NumTokens; +#endif Param++; } +#ifdef MSCMD_FOR_QUIRKS + NumTokens = max(NumTokens, NumToksInSpec); +#endif } else if (_tcsnicmp(Param, _T("useback"), 7) == 0) { @@ -248,12 +298,31 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) } } +#ifdef MSCMD_FOR_QUIRKS + /* Windows' CMD compatibility: use the wrongly evaluated number of tokens */ + fc->varcount = NumTokens; + /* Allocate a large enough variables array if needed */ + if (NumTokens <= ARRAYSIZE(Variables)) + { + fc->values = Variables; + } + else + { + fc->values = cmd_alloc(fc->varcount * sizeof(*fc->values)); + if (!fc->values) + { + error_out_of_memory(); + return 1; + } + } +#else /* Count how many variables will be set: one for each token, - * plus maybe one for the remainder */ - fc->varcount = RemainderVar; - for (i = 1; i < 32; i++) - fc->varcount += (Tokens >> i & 1); + * plus maybe one for the remainder. */ + fc->varcount = NumTokens; + for (NumTokens = 1; NumTokens < 32; ++NumTokens) + fc->varcount += (TokensMask >> NumTokens) & 1; fc->values = Variables; +#endif if (*List == StringQuote || *List == CommandQuote) { @@ -267,7 +336,7 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) End = List; while (!ExitingOrGoto(Cmd) && GetNextElement(&Start, &End)) { - FILE *InputFile; + FILE* InputFile; LPTSTR FullInput, In, NextLine; INT Skip; single_element: @@ -280,13 +349,18 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) } else if (*Start == CommandQuote && End[-1] == CommandQuote) { - /* Read input from a command */ + /* + * Read input from a command. We let the CRT do the ANSI/UNICODE conversion. + * NOTE: Should we do that, or instead read in binary mode and + * do the conversion by ourselves, using *OUR* current codepage?? + */ End[-1] = _T('\0'); InputFile = _tpopen(Start + 1, _T("r")); if (!InputFile) { error_bad_command(Start + 1); - return 1; + Ret = 1; + goto Quit; } FullInput = ReadFileContents(InputFile, Buffer); _pclose(InputFile); @@ -302,7 +376,8 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) if (!InputFile) { error_sfile_not_found(Start); - return 1; + Ret = 1; + goto Quit; } FullInput = ReadFileContents(InputFile, Buffer); fclose(InputFile); @@ -311,7 +386,8 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) if (!FullInput) { error_out_of_memory(); - return 1; + Ret = 1; + goto Quit; } /* Patch the delimiters string */ @@ -326,8 +402,13 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) !ExitingOrGoto(Cmd) && (In != NULL); In = NextLine) { - DWORD RemainingTokens = Tokens; - LPTSTR *CurVar = Variables; + DWORD RemainingTokens = TokensMask; + LPTSTR* CurVar = fc->values; + + ZeroMemory(fc->values, fc->varcount * sizeof(*fc->values)); +#ifdef MSCMD_FOR_QUIRKS + NumTokens = fc->varcount; +#endif NextLine = _tcschr(In, _T('\n')); if (NextLine) @@ -341,11 +422,19 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) if (*In == Eol) continue; - while ((RemainingTokens >>= 1) != 0) + /* Loop as long as we have not reached the end of + * the line, and that we have tokens available. + * A maximum of 31 tokens will be enumerated. */ + while (*In && ((RemainingTokens >>= 1) != 0)) { /* Save pointer to this token in a variable if requested */ if (RemainingTokens & 1) + { +#ifdef MSCMD_FOR_QUIRKS + --NumTokens; +#endif *CurVar++ = In; + } /* Find end of token */ In += _tcscspn(In, Delims); /* NULL-terminate it and advance to next token */ @@ -355,11 +444,21 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) In += _tcsspn(In, Delims); } } - /* Save pointer to remainder of line */ - *CurVar = In; - /* Don't run unless the line had enough tokens to fill at least one variable */ - if (*Variables[0]) + /* Save pointer to remainder of the line if we need to do so */ + if (*In) +#ifdef MSCMD_FOR_QUIRKS + if (RemainderVar && (fc->varcount - NumTokens + 1 == RemainderVar)) +#endif + { + /* NOTE: This sets fc->values[0] at least, if no tokens + * were initialized so far, since CurVar is initialized + * originally to point to fc->values. */ + *CurVar = In; + } + + /* Don't run unless we have at least one variable filled */ + if (fc->values[0]) Ret = RunInstance(Cmd); } @@ -370,6 +469,12 @@ static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) cmd_free(FullInput); } +Quit: +#ifdef MSCMD_FOR_QUIRKS + if (fc->values && (fc->values != Variables)) + cmd_free(fc->values); +#endif + return Ret; }

1 0

[reactos] 01/02: [CMD] IF: Fix x64 warning C4267.
by Hermès Bélusca-Maïto 21 Sep '20

21 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e904471023214afbf66a0… commit e904471023214afbf66a0177700d95a670145c75 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 19 20:57:35 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Sep 21 03:31:01 2020 +0200 [CMD] IF: Fix x64 warning C4267. --- base/shell/cmd/if.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/shell/cmd/if.c b/base/shell/cmd/if.c index e219a3db225..a8426e1367a 100644 --- a/base/shell/cmd/if.c +++ b/base/shell/cmd/if.c @@ -113,7 +113,7 @@ INT ExecuteIf(PARSED_COMMAND *Cmd) else if (Cmd->If.Operator == IF_EXIST) { BOOL IsDir; - INT Size; + SIZE_T Size; WIN32_FIND_DATA f; HANDLE hFind; DWORD attrs;

1 0

[reactos] 15/15: [NTOS:PS] On x64 don't fail in NtSetInformationProcess with ProcessUserModeIOPL information class, instead just don't do anything.
by Timo Kreuzer 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb22d5f697187d013ce85… commit cb22d5f697187d013ce85f3126ef723809aef56a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Feb 11 11:26:51 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:PS] On x64 don't fail in NtSetInformationProcess with ProcessUserModeIOPL information class, instead just don't do anything. For NT6+ appcompat setting return STATUS_NOT_IMPLEMENTED --- ntoskrnl/include/internal/rtl.h | 5 +++++ ntoskrnl/ps/query.c | 9 +++++++++ sdk/lib/rtl/process.c | 17 +++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/ntoskrnl/include/internal/rtl.h b/ntoskrnl/include/internal/rtl.h index c38886c7cab..80e363c7acd 100644 --- a/ntoskrnl/include/internal/rtl.h +++ b/ntoskrnl/include/internal/rtl.h @@ -34,4 +34,9 @@ RtlFindCharInUnicodeString( _Out_ PUSHORT Position ); +_IRQL_requires_max_(APC_LEVEL) +ULONG +NTAPI +RtlRosGetAppcompatVersion(VOID); + /* EOF */ diff --git a/ntoskrnl/ps/query.c b/ntoskrnl/ps/query.c index 31275a5247f..5e340c7ccdf 100644 --- a/ntoskrnl/ps/query.c +++ b/ntoskrnl/ps/query.c @@ -1902,6 +1902,15 @@ NtSetInformationProcess(IN HANDLE ProcessHandle, /* Only supported on x86 */ #if defined (_X86_) Ke386SetIOPL(); +#elif defined(_M_AMD64) + /* On x64 this function isn't implemented. + On Windows 2003 it returns success. + On Vista+ it returns STATUS_NOT_IMPLEMENTED. */ + if ((ExGetPreviousMode() != KernelMode) && + (RtlRosGetAppcompatVersion() > _WIN32_WINNT_WS03)) + { + Status = STATUS_NOT_IMPLEMENTED; + } #else Status = STATUS_NOT_IMPLEMENTED; #endif diff --git a/sdk/lib/rtl/process.c b/sdk/lib/rtl/process.c index 444c6cc2018..637046ba8a9 100644 --- a/sdk/lib/rtl/process.c +++ b/sdk/lib/rtl/process.c @@ -493,3 +493,20 @@ RtlGetCurrentProcessorNumber(VOID) /* Forward to kernel */ return NtGetCurrentProcessorNumber(); } + +_IRQL_requires_max_(APC_LEVEL) +ULONG +NTAPI +RtlRosGetAppcompatVersion(VOID) +{ + /* Get the current PEB */ + PPEB Peb = RtlGetCurrentPeb(); + if (Peb == NULL) + { + /* Default to Server 2003 */ + return _WIN32_WINNT_WS03; + } + + /* Calculate OS version from PEB fields */ + return (Peb->OSMajorVersion << 8) | Peb->OSMinorVersion; +}

1 0

[reactos] 14/15: [NTOS:MM] Fix MiSubsectionPteToSubsection
by Timo Kreuzer 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26484eea9fcc0a56a2c00… commit 26484eea9fcc0a56a2c004090f8b28aa4a5db96a Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Sep 11 17:52:24 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:MM] Fix MiSubsectionPteToSubsection --- ntoskrnl/include/internal/amd64/mm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index 0131817d4cf..bfc4a4b68d1 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -252,9 +252,10 @@ MiPxeToAddress(PMMPTE PointerPxe) // // Decodes a Prototype PTE into the underlying PTE +// The 48 bit signed value gets sign-extended to 64 bits. // #define MiSubsectionPteToSubsection(x) \ - (PMMPTE)((x)->u.Subsect.SubsectionAddress >> 16) + (PMMPTE)((LONG64)(x)->u.Subsect.SubsectionAddress) FORCEINLINE VOID

1 0

[reactos] 13/15: [NTOS:MM] Call MiSessionAddProcess() from MmCreateProcess() like on x86
by Timo Kreuzer 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=896d090ee6537872faa0e… commit 896d090ee6537872faa0e173a4d9436773f84f0c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Feb 12 19:25:08 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:MM] Call MiSessionAddProcess() from MmCreateProcess() like on x86 --- ntoskrnl/mm/amd64/page.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index fb00e41bb96..afae9827191 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -713,6 +713,8 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, ASSERT(Process->AddressSpaceInitialized == 0); Process->AddressSpaceInitialized = 1; + /* Add the process to the session */ + MiSessionAddProcess(Process); return TRUE; }

1 0

[reactos] 12/15: [NTOS:MM] In the x64 version of MmCreateProcessAddressSpace() zero out all page table PFNs
by Timo Kreuzer 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bebcda0b0b57ab1c7fe09… commit bebcda0b0b57ab1c7fe092c5157c0f627e2b009b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Jan 29 12:34:45 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:MM] In the x64 version of MmCreateProcessAddressSpace() zero out all page table PFNs --- ntoskrnl/mm/amd64/page.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/mm/amd64/page.c b/ntoskrnl/mm/amd64/page.c index c5f6158d813..fb00e41bb96 100644 --- a/ntoskrnl/mm/amd64/page.c +++ b/ntoskrnl/mm/amd64/page.c @@ -626,8 +626,11 @@ MmCreateProcessAddressSpace(IN ULONG MinWs, /* Release PFN lock */ MiReleasePfnLock(OldIrql); - /* Zero pages */ /// FIXME: + /* Zero pages */ + MiZeroPhysicalPage(TableBasePfn); MiZeroPhysicalPage(HyperPfn); + MiZeroPhysicalPage(HyperPdPfn); + MiZeroPhysicalPage(HyperPtPfn); MiZeroPhysicalPage(WorkingSetPfn); /* Set the base directory pointers */

1 0

[reactos] 11/15: [NTOS:KE] Zero out ExceptionFrame member in Syscall handler
by Timo Kreuzer 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=04f0c7d0d7d3d9981476c… commit 04f0c7d0d7d3d9981476cca55372bdf49d200a1e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue May 15 12:43:37 2018 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Zero out ExceptionFrame member in Syscall handler --- ntoskrnl/ke/amd64/stubs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index ff973935d69..b5ae60a550d 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -330,6 +330,9 @@ KiSystemCallHandler( TrapFrame->TrapFrame = (ULONG64)Thread->TrapFrame; Thread->TrapFrame = TrapFrame; + /* We don't have an exception frame yet */ + TrapFrame->ExceptionFrame = 0; + /* Before enabling interrupts get the user rsp from the KPCR */ UserRsp = __readgsqword(FIELD_OFFSET(KIPCR, UserRsp)); TrapFrame->Rsp = UserRsp;

1 0

[reactos] 10/15: [NTOS:KE] Disable interrupts before lowering IRQL in KiDpcInterruptHandler to avoid stacking up DPC interrupts
by Timo Kreuzer 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=366e8a840ca8ef4484a18… commit 366e8a840ca8ef4484a183ce6a22ba410a0cafed Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Mar 9 21:07:10 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Disable interrupts before lowering IRQL in KiDpcInterruptHandler to avoid stacking up DPC interrupts --- ntoskrnl/ke/amd64/stubs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/amd64/stubs.c b/ntoskrnl/ke/amd64/stubs.c index 43117fe6868..ff973935d69 100644 --- a/ntoskrnl/ke/amd64/stubs.c +++ b/ntoskrnl/ke/amd64/stubs.c @@ -71,9 +71,9 @@ KiDpcInterruptHandler(VOID) KiSwapContext(APC_LEVEL, OldThread); } - /* Go back to old irql and disable interrupts */ - KeLowerIrql(OldIrql); + /* Disable interrupts and go back to old irql */ _disable(); + KeLowerIrql(OldIrql); }

1 0

[reactos] 09/15: [NTOS:KE] Save and restore previous mode in KiZwSystemService and fix restoring the trap frame
by Timo Kreuzer 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3aaee3562910cd0611356… commit 3aaee3562910cd06113569cace4eb155ee2a6050 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Feb 5 01:23:30 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Save and restore previous mode in KiZwSystemService and fix restoring the trap frame --- ntoskrnl/ke/amd64/trap.S | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 15f816f756b..3bcaa1684bf 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -835,6 +835,10 @@ FUNC KiZwSystemService /* Get current thread */ mov r11, gs:[PcCurrentThread] + /* Save PreviousMode in the trap frame */ + mov dil, byte ptr [r11 + KTHREAD_PreviousMode] + mov byte ptr [rbp + KTRAP_FRAME_PreviousMode], dil + /* Save the old trap frame in TrapFrame.Rdx */ mov rdi, [r11 + KTHREAD_TrapFrame] mov [rbp + KTRAP_FRAME_Rdx], rdi @@ -865,9 +869,13 @@ FUNC KiZwSystemService /* Restore the old trap frame */ mov r11, gs:[PcCurrentThread] - mov rsi, [rsp + KTRAP_FRAME_Rdx] + mov rsi, [rbp + KTRAP_FRAME_Rdx] mov [r11 + KTHREAD_TrapFrame], rsi + /* Restore PreviousMode from the trap frame */ + mov dil, byte ptr [rbp + KTRAP_FRAME_PreviousMode] + mov byte ptr [r11 + KTHREAD_PreviousMode], dil + /* Restore rdi and rsi */ mov rsi, [rbp + KTRAP_FRAME_Rsi] mov rdi, [rbp + KTRAP_FRAME_Rdi]

1 0

[reactos] 08/15: [NTOS:KE] Don't use FrLdrDbgPrint anymore. It served us well, but now it's time to go away.
by Timo Kreuzer 20 Sep '20

20 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2a483b9ea02020c42db0… commit b2a483b9ea02020c42db07091dc78e4f1bfcdc66 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Mar 9 22:06:03 2018 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 20 23:08:17 2020 +0200 [NTOS:KE] Don't use FrLdrDbgPrint anymore. It served us well, but now it's time to go away. --- ntoskrnl/ke/amd64/trap.S | 89 +----------------------------------------------- 1 file changed, 1 insertion(+), 88 deletions(-) diff --git a/ntoskrnl/ke/amd64/trap.S b/ntoskrnl/ke/amd64/trap.S index 3a017b85b77..15f816f756b 100644 --- a/ntoskrnl/ke/amd64/trap.S +++ b/ntoskrnl/ke/amd64/trap.S @@ -12,7 +12,6 @@ #include <trapamd64.inc> EXTERN KiDispatchException:PROC -EXTERN FrLdrDbgPrint:DWORD EXTERN KeBugCheckWithTf:PROC EXTERN MmAccessFault:PROC EXTERN KiSystemFatalException:PROC @@ -27,64 +26,6 @@ EXTERN KdSetOwedBreakpoints:PROC #endif -/* GLOBALS *******************************************************************/ - -.data - -PUBLIC MsgUnimplemented -MsgUnimplemented: -.asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" - -MsgPageFault: -.asciz "Page fault! Code = 0x%x, RIP = %p, FaultingAddress = %p\n" - -MsgGeneralProtFault: -.asciz "General protection fault at %p!\n" - -MsgBreakpointTrap: -.asciz "BreakpointTrap at %p\n" - -MsgUnexpectedInterrupt: -.asciz "UnexpectedInterrupt Vector=0x%02lx\n" - -MsgInvalidOpcodeFault: -.asciz "Invalid opcode fault at %p!\n" - -MsgDoubleFault: -.asciz "Double fault at %p, rbp=%p!\n" - -MsgTrapInfo: -.asciz "Trap: %s at %p\n" - -MACRO(TRAPINFO, func) -LOCAL label1, label2 -#if 0 - jmp label2 -label1: .asciz "\func" -label2: - push rax - push rcx - push rdx - push r8 - push r9 - push r10 - push r11 - sub rsp, 32 - lea rcx, MsgTrapInfo[rip] - lea rdx, 1b[rip] - mov r8, [rbp + KTRAP_FRAME_Rip] - call qword ptr FrLdrDbgPrint[rip] - pop r11 - pop r10 - pop r9 - pop r8 - pop rdx - pop rcx - pop rax - add rsp, 32 -#endif -ENDM - /* Helper Macros *************************************************************/ MACRO(DispatchException, Status, Number, P1, P2, P3) @@ -235,8 +176,6 @@ FUNC KiDebugTrapOrFault /* Push pseudo error code */ EnterTrap TF_SAVE_ALL - TRAPINFO KiDebugTrapOrFault - /* Check if the frame was from kernelmode */ test word ptr [rbp + KTRAP_FRAME_SegCs], 3 jz KiDebugTrapOrFaultKMode @@ -332,12 +271,6 @@ FUNC KiInvalidOpcodeFault /* Push pseudo error code */ EnterTrap TF_SAVE_ALL - TRAPINFO KiInvalidOpcodeFault - - mov rdx, [rbp + KTRAP_FRAME_Rip] - lea rcx, MsgInvalidOpcodeFault[rip] - call qword ptr FrLdrDbgPrint[rip] - /* Enable interrupts */ sti @@ -385,10 +318,7 @@ FUNC KiDoubleFaultAbort /* A zero error code is pushed */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) - lea rcx, MsgDoubleFault[rip] - mov rdx, [rbp + KTRAP_FRAME_FaultAddress] - mov r8, rbp - call qword ptr FrLdrDbgPrint[rip] + int 3 /* Bugcheck */ Fatal 8 // EXCEPTION_DOUBLE_FAULT @@ -446,11 +376,6 @@ FUNC KiGeneralProtectionFault /* We have an error code */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) - //TRAPINFO KiGeneralProtectionFault - //mov rdx, [rbp + KTRAP_FRAME_Rip] - //lea rcx, MsgGeneralProtFault[rip] - //call qword ptr FrLdrDbgPrint[rip] - /* Call the C handler */ mov rcx, rbp call KiGeneralProtectionFaultHandler @@ -485,16 +410,6 @@ FUNC KiPageFault /* We have an error code */ EnterTrap (TF_HAS_ERROR_CODE OR TF_SAVE_ALL) - TRAPINFO KiPageFault - -#if 0 - lea rcx, MsgPageFault[rip] - mov rdx, [rbp + KTRAP_FRAME_ErrorCode] - mov r8, [rbp + KTRAP_FRAME_Rip] - mov r9, [rbp + KTRAP_FRAME_FaultAddress] - call qword ptr FrLdrDbgPrint[rip] -#endif - /* Save page fault address */ mov rdx, cr2 mov [rbp + KTRAP_FRAME_FaultAddress], rdx @@ -644,8 +559,6 @@ FUNC KiDebugServiceTrap /* No error code */ EnterTrap TF_SAVE_ALL - TRAPINFO KiDebugServiceTrap - /* Increase Rip to skip the int3 */ inc qword ptr [rbp + KTRAP_FRAME_Rip]

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs