Ros-diffs November 2019

ros-diffs@reactos.org

24 participants
322 discussions

[reactos] 01/03: [NTOS:KD64] Whitespace fixes only!

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=384d55e47a561576bb7d5… commit 384d55e47a561576bb7d50880e70cab681050dd9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 23:32:56 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 23:46:51 2019 +0100 [NTOS:KD64] Whitespace fixes only! --- ntoskrnl/kd64/kdapi.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c index bfb7283ee1a..3b6ba4ff9f6 100644 --- a/ntoskrnl/kd64/kdapi.c +++ b/ntoskrnl/kd64/kdapi.c @@ -84,8 +84,8 @@ KdpCopyMemoryChunks(IN ULONG64 Address, } /* - * The chunk size can be larger than the remaining size if this isn't - * the first round, so check if we need to shrink it back + * The chunk size can be larger than the remaining size if this + * isn't the first round, so check if we need to shrink it back. */ while (CopyChunk > RemainingLength) { @@ -110,14 +110,12 @@ KdpCopyMemoryChunks(IN ULONG64 Address, RemainingLength = RemainingLength - CopyChunk; } - /* - * We may have modified executable code, flush the instruction cache - */ - KeSweepICache((PVOID)(ULONG_PTR)Address, TotalSize); + /* We may have modified executable code, flush the instruction cache */ + KeSweepICache((PVOID)(ULONG_PTR)Address, TotalSize); /* - * Return the size we managed to copy - * and return success if we could copy the whole range + * Return the size we managed to copy and return + * success if we could copy the whole range. */ if (ActualSize) *ActualSize = TotalSize - RemainingLength; return RemainingLength == 0 ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL; @@ -1201,12 +1199,12 @@ KdpWriteIoSpaceExtended(IN PDBGKD_MANIPULATE_STATE64 State, /* Call the internal routine */ State->ReturnStatus = KdpSysWriteIoSpace(WriteIoExtended->InterfaceType, - WriteIoExtended->BusNumber, - WriteIoExtended->AddressSpace, - WriteIoExtended->IoAddress, - &WriteIoExtended->DataValue, - WriteIoExtended->DataSize, - &WriteIoExtended->DataSize); + WriteIoExtended->BusNumber, + WriteIoExtended->AddressSpace, + WriteIoExtended->IoAddress, + &WriteIoExtended->DataValue, + WriteIoExtended->DataSize, + &WriteIoExtended->DataSize); /* Send the reply */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, @@ -1275,7 +1273,7 @@ KdpSendWaitContinue(IN ULONG PacketType, /* * Reset the context state to ensure the debugger has received - * the current context before it sets it + * the current context before it sets it. */ KdpContextSent = FALSE; @@ -1545,7 +1543,7 @@ SendPacket: break; case DbgKdGetContextExApi: - + /* Extended Context Get */ KdpGetContextEx(&ManipulateState, &Data, Context); break; @@ -2279,8 +2277,8 @@ KdRefreshDebuggerNotPresent(VOID) Enable = KdEnterDebugger(NULL, NULL); /* - * Attempt to send a string to the debugger to refresh the - * connection state + * Attempt to send a string to the debugger + * to refresh the connection state. */ KdpDprintf("KDTARGET: Refreshing KD connection\n"); @@ -2311,8 +2309,8 @@ NtQueryDebugFilterState(IN ULONG ComponentId, else if (ComponentId == MAXULONG) { /* - * This is the internal ID used for DbgPrint messages without ID and - * Level. Use the system-wide mask for those. + * This is the internal ID used for DbgPrint messages without ID + * and Level. Use the system-wide mask for those. */ Mask = &Kd_WIN2000_Mask; } @@ -2367,8 +2365,8 @@ NtSetDebugFilterState(IN ULONG ComponentId, else if (ComponentId == MAXULONG) { /* - * This is the internal ID used for DbgPrint messages without ID and - * Level. Use the system-wide mask for those. + * This is the internal ID used for DbgPrint messages without ID + * and Level. Use the system-wide mask for those. */ Mask = &Kd_WIN2000_Mask; }

5 years, 1 month

[reactos] 01/01: [KERNEL32] The DPRINT again - Nevermind

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93220e26d078b566ed67d… commit 93220e26d078b566ed67d56adad79e7e1e4c16f0 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Nov 3 23:41:34 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Nov 3 23:41:34 2019 +0100 [KERNEL32] The DPRINT again - Nevermind Tribute to DepositePirate. This reverts commit 4ed0c1acef766a6f100fcb7042f9677b591a8052. --- dll/win32/kernel32/client/proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index 7b78ca3c211..b44624c381b 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -131,7 +131,7 @@ BasepIsImageVersionOk(IN ULONG ImageMajorVersion, if (ImageMajorVersion > SharedUserData->NtMajorVersion || (ImageMajorVersion == SharedUserData->NtMajorVersion && ImageMinorVersion > SharedUserData->NtMinorVersion)) { - DPRINT1("Accepting image version %lu.%lu, although ReactOS is NT %hu.%hu OS!\n", + DPRINT1("Accepting image version %lu.%lu, although ReactOS is an NT %hu.%hu OS!\n", ImageMajorVersion, ImageMinorVersion, SharedUserData->NtMajorVersion,

5 years, 1 month

[reactos] 01/01: [KERNEL32] Fix typo in DPRINT

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ed0c1acef766a6f100fc… commit 4ed0c1acef766a6f100fcb7042f9677b591a8052 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Nov 3 22:30:35 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sun Nov 3 22:30:35 2019 +0100 [KERNEL32] Fix typo in DPRINT I checked: this is no Wine synced code. --- dll/win32/kernel32/client/proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/proc.c b/dll/win32/kernel32/client/proc.c index b44624c381b..7b78ca3c211 100644 --- a/dll/win32/kernel32/client/proc.c +++ b/dll/win32/kernel32/client/proc.c @@ -131,7 +131,7 @@ BasepIsImageVersionOk(IN ULONG ImageMajorVersion, if (ImageMajorVersion > SharedUserData->NtMajorVersion || (ImageMajorVersion == SharedUserData->NtMajorVersion && ImageMinorVersion > SharedUserData->NtMinorVersion)) { - DPRINT1("Accepting image version %lu.%lu, although ReactOS is an NT %hu.%hu OS!\n", + DPRINT1("Accepting image version %lu.%lu, although ReactOS is NT %hu.%hu OS!\n", ImageMajorVersion, ImageMinorVersion, SharedUserData->NtMajorVersion,

5 years, 1 month

[reactos] 02/02: [HTTPAPI] Fix MSVC2010 build.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c9d825b788601e1f15ad… commit 1c9d825b788601e1f15ad657e4768519ddc1bf91 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 16:59:47 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 17:00:58 2019 +0100 [HTTPAPI] Fix MSVC2010 build. --- dll/win32/httpapi/httpapi_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/httpapi/httpapi_main.c b/dll/win32/httpapi/httpapi_main.c index 45fad4d3641..62e90e85677 100644 --- a/dll/win32/httpapi/httpapi_main.c +++ b/dll/win32/httpapi/httpapi_main.c @@ -287,6 +287,7 @@ ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url) ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_REQUEST *request, ULONG size, ULONG *ret_size, OVERLAPPED *ovl) { +#ifndef __REACTOS__ struct http_receive_request_params params = { .addr = (ULONG_PTR)request, @@ -294,6 +295,10 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag .flags = flags, .bits = sizeof(void *) * 8, }; +#else + struct http_receive_request_params params = + { (ULONGLONG)(ULONG_PTR)request, id, flags, sizeof(void *) * 8 }; +#endif ULONG ret = ERROR_SUCCESS; OVERLAPPED sync_ovl;

5 years, 1 month

[reactos] 01/02: [DNSAPI] Fix MSVC build.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4b82c191969bd9d34a0fc… commit 4b82c191969bd9d34a0fc116e7e584b161941b9b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 16:59:11 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 17:00:57 2019 +0100 [DNSAPI] Fix MSVC build. --- dll/win32/dnsapi/dnsapi/query.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/dnsapi/dnsapi/query.c b/dll/win32/dnsapi/dnsapi/query.c index f7de6ab96c8..bc89c8d8ad8 100644 --- a/dll/win32/dnsapi/dnsapi/query.c +++ b/dll/win32/dnsapi/dnsapi/query.c @@ -1103,5 +1103,5 @@ GetCurrentTimeInSeconds(VOID) GetSystemTimeAsFileTime(&Time); memcpy(&lTime, &Time, sizeof(lTime)); lTime.QuadPart -= lAdj.QuadPart; - return (DWORD)(lTime.QuadPart/10000000LLU); + return (DWORD)(lTime.QuadPart/10000000ULL); }

5 years, 1 month

[reactos] 06/06: [NTOS:KDBG] Enhance the 'tss' command.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8826ee8ff7c77cbcb8c91… commit 8826ee8ff7c77cbcb8c91cecc483cdc02e950e51 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 03:44:55 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:08:40 2019 +0100 [NTOS:KDBG] Enhance the 'tss' command. We allow specifying manually the TSS selector number or its descriptor address, and dump more information from the associated KTSS structure. Also add the KdbpRetrieveTss() helper to retrieve the PKTSS from its corresponding selector number. It will also be useful for future improvements. --- ntoskrnl/kdbg/kdb_cli.c | 147 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 134 insertions(+), 13 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index d3d2a908997..fd93246afa7 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -178,7 +178,7 @@ 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 }, - { "tss", "tss", "Display a task state segment.", KdbpCmdTss }, + { "tss", "tss [selector|*descaddr]", "Display the current task state segment, or the one specified by its selector number or descriptor address.", KdbpCmdTss }, /* Others */ { NULL, NULL, "Others", NULL }, @@ -987,6 +987,52 @@ KdbpCmdRegs( return TRUE; } +static PKTSS +KdbpRetrieveTss( + IN USHORT TssSelector, + OUT PULONG pType OPTIONAL, + IN PKDESCRIPTOR pGdtr OPTIONAL) +{ + KDESCRIPTOR Gdtr; + KGDTENTRY Desc; + PKTSS Tss; + + /* Retrieve the Global Descriptor Table (user-provided or system) */ + if (pGdtr) + Gdtr = *pGdtr; + else + Ke386GetGlobalDescriptorTable(&Gdtr.Limit); + + /* Check limits */ + if ((TssSelector & (sizeof(KGDTENTRY) - 1)) || + (TssSelector < sizeof(KGDTENTRY)) || + (TssSelector + sizeof(KGDTENTRY) - 1 > Gdtr.Limit)) + { + return NULL; + } + + /* Retrieve the descriptor */ + if (!NT_SUCCESS(KdbpSafeReadMemory(&Desc, + (PVOID)(Gdtr.Base + TssSelector), + sizeof(KGDTENTRY)))) + { + return NULL; + } + + /* Check for TSS32(Avl) or TSS32(Busy) */ + if (Desc.HighWord.Bits.Type != 9 && Desc.HighWord.Bits.Type != 11) + { + return NULL; + } + if (pType) *pType = Desc.HighWord.Bits.Type; + + Tss = (PKTSS)(ULONG_PTR)(Desc.BaseLow | + Desc.HighWord.Bytes.BaseMid << 16 | + Desc.HighWord.Bytes.BaseHi << 24); + + return Tss; +} + static BOOLEAN KdbpTrapFrameFromPrevTss( PKTRAP_FRAME TrapFrame) @@ -2164,18 +2210,93 @@ KdbpCmdTss( ULONG Argc, PCHAR Argv[]) { - KTSS *Tss = KeGetPcr()->TSS; - - KdbpPrint("Current TSS is at 0x%p.\n", Tss); - KdbpPrint(" Eip: 0x%08x\n" - " Es: 0x%04x\n" - " Cs: 0x%04x\n" - " Ss: 0x%04x\n" - " Ds: 0x%04x\n" - " Fs: 0x%04x\n" - " Gs: 0x%04x\n" - " IoMapBase: 0x%04x\n", - Tss->Eip, Tss->Es, Tss->Cs, Tss->Ds, Tss->Fs, Tss->Gs, Tss->IoMapBase); + USHORT TssSelector; + PKTSS Tss = NULL; + + if (Argc >= 2) + { + /* + * Specified TSS via its selector [selector] or descriptor address [*descaddr]. + * Note that we ignore any other argument values. + */ + PCHAR Param, pszNext; + ULONG ulValue; + + Param = Argv[1]; + if (Argv[1][0] == '*') + ++Param; + + ulValue = strtoul(Param, &pszNext, 0); + if (pszNext && *pszNext) + { + KdbpPrint("Invalid TSS specification.\n"); + return TRUE; + } + + if (Argv[1][0] == '*') + { + /* Descriptor specified */ + TssSelector = 0; // Unknown selector! + // TODO: Room for improvement: Find the TSS descriptor + // in the GDT so as to validate it. + Tss = (PKTSS)(ULONG_PTR)ulValue; + if (!Tss) + { + KdbpPrint("Invalid 32-bit TSS descriptor.\n"); + return TRUE; + } + } + else + { + /* Selector specified, retrive the corresponding TSS */ + TssSelector = (USHORT)ulValue; + Tss = KdbpRetrieveTss(TssSelector, NULL, NULL); + if (!Tss) + { + KdbpPrint("Invalid 32-bit TSS selector.\n"); + return TRUE; + } + } + } + + if (!Tss) + { + /* If no TSS was specified, use the current TSS descriptor */ + TssSelector = Ke386GetTr(); + Tss = KeGetPcr()->TSS; + // NOTE: If everything works OK, Tss is the current TSS corresponding to the TR selector. + } + + KdbpPrint("%s TSS 0x%04x is at 0x%p.\n", + (Tss == KeGetPcr()->TSS) ? "Current" : "Specified", TssSelector, Tss); + KdbpPrint(" Backlink: 0x%04x\n" + " Ss0:Esp0: 0x%04x:0x%08x\n" + // NOTE: Ss1:Esp1 and Ss2:Esp2: are in the NotUsed1 field. + " CR3: 0x%08x\n" + " EFlags: 0x%08x\n" + " Eax: 0x%08x\n" + " Ebx: 0x%08x\n" + " Ecx: 0x%08x\n" + " Edx: 0x%08x\n" + " Esi: 0x%08x\n" + " Edi: 0x%08x\n" + " Eip: 0x%08x\n" + " Esp: 0x%08x\n" + " Ebp: 0x%08x\n" + " Cs: 0x%04x\n" + " Ss: 0x%04x\n" + " Ds: 0x%04x\n" + " Es: 0x%04x\n" + " Fs: 0x%04x\n" + " Gs: 0x%04x\n" + " LDT: 0x%04x\n" + " Flags: 0x%04x\n" + " IoMapBase: 0x%04x\n", + Tss->Backlink, Tss->Ss0, Tss->Esp0, Tss->CR3, Tss->EFlags, + Tss->Eax, Tss->Ebx, Tss->Ecx, Tss->Edx, Tss->Esi, Tss->Edi, + Tss->Eip, Tss->Esp, Tss->Ebp, + Tss->Cs, Tss->Ss, Tss->Ds, Tss->Es, Tss->Fs, Tss->Gs, + Tss->LDT, Tss->Flags, Tss->IoMapBase); return TRUE; }

5 years, 1 month

[reactos] 05/06: [NTOS:KDBG] Augment the 'cregs' command by also displaying the task segment register. Update the help message.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc0c721ff88630c287460… commit dc0c721ff88630c2874609c8feb3d41c0f702f37 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 03:33:53 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:08:39 2019 +0100 [NTOS:KDBG] Augment the 'cregs' command by also displaying the task segment register. Update the help message. --- ntoskrnl/kdbg/kdb_cli.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 1211a274383..d3d2a908997 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -146,7 +146,7 @@ static const struct { "disasm", "disasm [address] [L count]", "Disassemble count instructions at address.", KdbpCmdDisassembleX }, { "x", "x [address] [L count]", "Display count dwords, starting at address.", KdbpCmdDisassembleX }, { "regs", "regs", "Display general purpose registers.", KdbpCmdRegs }, - { "cregs", "cregs", "Display control registers.", KdbpCmdRegs }, + { "cregs", "cregs", "Display control, descriptor table and task segment registers.", KdbpCmdRegs }, { "sregs", "sregs", "Display status registers.", KdbpCmdRegs }, { "dregs", "dregs", "Display debug registers.", KdbpCmdRegs }, { "bt", "bt [*frameaddr|thread id]", "Prints current backtrace or from given frame address.", KdbpCmdBackTrace }, @@ -873,8 +873,9 @@ KdbpCmdRegs( Tf->Ecx, Tf->Edx, Tf->Esi, Tf->Edi, Tf->Ebp); - KdbpPrint("EFLAGS 0x%08x ", Tf->EFlags); + /* Display the EFlags */ + KdbpPrint("EFLAGS 0x%08x ", Tf->EFlags); for (i = 0; i < 32; i++) { if (i == 1) @@ -894,14 +895,13 @@ KdbpCmdRegs( KdbpPrint(EflagsBits[i]); } } - KdbpPrint("\n"); } else if (Argv[0][0] == 'c') /* cregs */ { ULONG Cr0, Cr2, Cr3, Cr4; KDESCRIPTOR Gdtr = {0, 0, 0}, Idtr = {0, 0, 0}; - USHORT Ldtr; + USHORT Ldtr, Tr; static const PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, " WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL, @@ -911,19 +911,20 @@ KdbpCmdRegs( NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; + /* Retrieve the control registers */ Cr0 = KdbCurrentTrapFrame->Cr0; Cr2 = KdbCurrentTrapFrame->Cr2; Cr3 = KdbCurrentTrapFrame->Cr3; Cr4 = KdbCurrentTrapFrame->Cr4; - /* Get descriptor table regs */ + /* Retrieve the descriptor table and task segment registers */ Ke386GetGlobalDescriptorTable(&Gdtr.Limit); Ldtr = Ke386GetLocalDescriptorTable(); __sidt(&Idtr.Limit); + Tr = Ke386GetTr(); /* Display the control registers */ KdbpPrint("CR0 0x%08x ", Cr0); - for (i = 0; i < 32; i++) { if (!Cr0Bits[i]) @@ -932,12 +933,12 @@ KdbpCmdRegs( if ((Cr0 & (1 << i)) != 0) KdbpPrint(Cr0Bits[i]); } + KdbpPrint("\n"); - KdbpPrint("\nCR2 0x%08x\n", Cr2); + KdbpPrint("CR2 0x%08x\n", Cr2); KdbpPrint("CR3 0x%08x Pagedir-Base 0x%08x %s%s\n", Cr3, (Cr3 & 0xfffff000), (Cr3 & (1 << 3)) ? " PWT" : "", (Cr3 & (1 << 4)) ? " PCD" : "" ); KdbpPrint("CR4 0x%08x ", Cr4); - for (i = 0; i < 32; i++) { if (!Cr4Bits[i]) @@ -946,11 +947,13 @@ KdbpCmdRegs( if ((Cr4 & (1 << i)) != 0) KdbpPrint(Cr4Bits[i]); } + KdbpPrint("\n"); - /* Display the descriptor table regs */ - KdbpPrint("\nGDTR Base 0x%08x Size 0x%04x\n", Gdtr.Base, Gdtr.Limit); - KdbpPrint("LDTR 0x%04x\n", Ldtr); - KdbpPrint("IDTR Base 0x%08x Size 0x%04x\n", Idtr.Base, Idtr.Limit); + /* Display the descriptor table and task segment registers */ + KdbpPrint("GDTR Base 0x%08x Size 0x%04x\n", Gdtr.Base, Gdtr.Limit); + KdbpPrint("LDTR 0x%04x\n", Ldtr); + KdbpPrint("IDTR Base 0x%08x Size 0x%04x\n", Idtr.Base, Idtr.Limit); + KdbpPrint("TR 0x%04x\n", Tr); } else if (Argv[0][0] == 's') /* sregs */ {

5 years, 1 month

[reactos] 04/06: [NTOS:KDBG] Use fixed-length hexadecimal printing for addresses.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89b44cfa074c337959530… commit 89b44cfa074c33795953033ba42236dc414ade91 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 02:17:15 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:08:39 2019 +0100 [NTOS:KDBG] Use fixed-length hexadecimal printing for addresses. --- ntoskrnl/kdbg/kdb_cli.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 1cafedd8686..1211a274383 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -797,7 +797,7 @@ KdbpCmdDisassembleX( while (Count > 0) { if (!KdbSymPrintAddress((PVOID)Address, NULL)) - KdbpPrint("<%x>:", Address); + KdbpPrint("<%08x>:", Address); else KdbpPrint(":"); @@ -2116,7 +2116,7 @@ KdbpCmdPcr( { PKIPCR Pcr = (PKIPCR)KeGetPcr(); - KdbpPrint("Current PCR is at 0x%08x.\n", (INT)Pcr); + KdbpPrint("Current PCR is at 0x%p.\n", Pcr); KdbpPrint(" Tib.ExceptionList: 0x%08x\n" " Tib.StackBase: 0x%08x\n" " Tib.StackLimit: 0x%08x\n" @@ -2163,7 +2163,7 @@ KdbpCmdTss( { KTSS *Tss = KeGetPcr()->TSS; - KdbpPrint("Current TSS is at 0x%08x.\n", (INT)Tss); + KdbpPrint("Current TSS is at 0x%p.\n", Tss); KdbpPrint(" Eip: 0x%08x\n" " Es: 0x%04x\n" " Cs: 0x%04x\n" @@ -3470,7 +3470,7 @@ KdbpCliMainLoop( { if (!KdbSymPrintAddress((PVOID)KdbCurrentTrapFrame->Tf.Eip, &KdbCurrentTrapFrame->Tf)) { - KdbpPrint("<%x>", KdbCurrentTrapFrame->Tf.Eip); + KdbpPrint("<%08x>", KdbCurrentTrapFrame->Tf.Eip); } KdbpPrint(": ");

5 years, 1 month

[reactos] 03/06: [NTOS:KDBG] Whitespace, minor code style and help-text style fixes.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0d59e745db2e9fdead47… commit f0d59e745db2e9fdead47ba40c3b8cbe4ea465e9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 3 02:14:17 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:08:38 2019 +0100 [NTOS:KDBG] Whitespace, minor code style and help-text style fixes. --- ntoskrnl/kdbg/kdb_cli.c | 103 ++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index b4d750db304..1cafedd8686 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -144,19 +144,19 @@ static const struct { NULL, NULL, "Data", NULL }, { "?", "? expression", "Evaluate expression.", KdbpCmdEvalExpression }, { "disasm", "disasm [address] [L count]", "Disassemble count instructions at address.", KdbpCmdDisassembleX }, - { "x", "x [address] [L count]", "Display count dwords, starting at addr.", KdbpCmdDisassembleX }, + { "x", "x [address] [L count]", "Display count dwords, starting at address.", KdbpCmdDisassembleX }, { "regs", "regs", "Display general purpose registers.", KdbpCmdRegs }, { "cregs", "cregs", "Display control registers.", KdbpCmdRegs }, { "sregs", "sregs", "Display status registers.", KdbpCmdRegs }, { "dregs", "dregs", "Display debug registers.", KdbpCmdRegs }, - { "bt", "bt [*frameaddr|thread id]", "Prints current backtrace or from given frame addr", KdbpCmdBackTrace }, + { "bt", "bt [*frameaddr|thread id]", "Prints current backtrace or from given frame address.", KdbpCmdBackTrace }, #ifdef __ROS_DWARF__ - { "dt", "dt [mod] [type] [addr]", "Print a struct. Addr is optional.", KdbpCmdPrintStruct }, + { "dt", "dt [mod] [type] [addr]", "Print a struct. The address is optional.", KdbpCmdPrintStruct }, #endif /* Flow control */ { NULL, NULL, "Flow control", NULL }, - { "cont", "cont", "Continue execution (leave debugger)", KdbpCmdContinue }, + { "cont", "cont", "Continue execution (leave debugger).", KdbpCmdContinue }, { "step", "step [count]", "Execute single instructions, stepping into interrupts.", KdbpCmdStep }, { "next", "next [count]", "Execute single instructions, skipping calls and reps.", KdbpCmdStep }, { "bl", "bl", "List breakpoints.", KdbpCmdBreakPointList }, @@ -174,17 +174,17 @@ static const struct /* System information */ { NULL, NULL, "System info", NULL }, { "mod", "mod [address]", "List all modules or the one containing address.", KdbpCmdMod }, - { "gdt", "gdt", "Display global descriptor table.", KdbpCmdGdtLdtIdt }, - { "ldt", "ldt", "Display local descriptor table.", KdbpCmdGdtLdtIdt }, - { "idt", "idt", "Display interrupt descriptor table.", KdbpCmdGdtLdtIdt }, - { "pcr", "pcr", "Display processor control region.", KdbpCmdPcr }, - { "tss", "tss", "Display task state segment.", KdbpCmdTss }, + { "gdt", "gdt", "Display the global descriptor table.", KdbpCmdGdtLdtIdt }, + { "ldt", "ldt", "Display the local descriptor table.", KdbpCmdGdtLdtIdt }, + { "idt", "idt", "Display the interrupt descriptor table.", KdbpCmdGdtLdtIdt }, + { "pcr", "pcr", "Display the processor control region.", KdbpCmdPcr }, + { "tss", "tss", "Display a task state segment.", KdbpCmdTss }, /* Others */ { NULL, NULL, "Others", NULL }, { "bugcheck", "bugcheck", "Bugchecks the system.", KdbpCmdBugCheck }, { "reboot", "reboot", "Reboots the system.", KdbpCmdReboot}, - { "filter", "filter [error|warning|trace|info|level]+|-[componentname|default]", "Enable/disable debug channels", KdbpCmdFilter }, + { "filter", "filter [error|warning|trace|info|level]+|-[componentname|default]", "Enable/disable debug channels.", KdbpCmdFilter }, { "set", "set [var] [value]", "Sets var to value or displays value of var.", KdbpCmdSet }, { "dmesg", "dmesg", "Display debug messages on screen, with navigation on pages.", KdbpCmdDmesg }, { "kmsg", "kmsg", "Kernel dmesg. Alias for dmesg.", KdbpCmdDmesg }, @@ -194,8 +194,8 @@ static const struct { "!poolfind", "!poolfind Tag [Pool]", "Search for pool tag allocations.", ExpKdbgExtPoolFind }, { "!filecache", "!filecache", "Display cache usage.", ExpKdbgExtFileCache }, { "!defwrites", "!defwrites", "Display cache write values.", ExpKdbgExtDefWrites }, - { "!irpfind", "!irpfind [Pool [startaddress [criteria data]]]", "Lists IRPs potentially matching criteria", ExpKdbgExtIrpFind }, - { "!handle", "!handle [Handle]", "Displays info about handles", ExpKdbgExtHandle }, + { "!irpfind", "!irpfind [Pool [startaddress [criteria data]]]", "Lists IRPs potentially matching criteria.", ExpKdbgExtIrpFind }, + { "!handle", "!handle [Handle]", "Displays info about handles.", ExpKdbgExtHandle }, }; /* FUNCTIONS *****************************************************************/ @@ -1888,7 +1888,7 @@ KdbpCmdMod( return TRUE; } -/*!\brief Displays GDT, LDT or IDTd. +/*!\brief Displays GDT, LDT or IDT. */ static BOOLEAN KdbpCmdGdtLdtIdt( @@ -2186,7 +2186,6 @@ KdbpCmdBugCheck( { /* Set the flag and quit looping */ KdbpBugCheckRequested = TRUE; - return FALSE; } @@ -2216,41 +2215,41 @@ KdbpCmdDmesg( ULONG Argc, PCHAR Argv[]) { - ULONG beg, end; + ULONG beg, end; + + KdbpIsInDmesgMode = TRUE; /* Toggle logging flag */ + if (!KdpDmesgBuffer) + { + KdbpPrint("Dmesg: error, buffer is not allocated! /DEBUGPORT=SCREEN kernel param required for dmesg.\n"); + return TRUE; + } + + KdbpPrint("*** Dmesg *** TotalWritten=%lu, BufferSize=%lu, CurrentPosition=%lu\n", + KdbDmesgTotalWritten, KdpDmesgBufferSize, KdpDmesgCurrentPosition); + + /* Pass data to the pager */ + end = KdpDmesgCurrentPosition; + beg = (end + KdpDmesgFreeBytes) % KdpDmesgBufferSize; + + /* No roll-overs, and overwritten=lost bytes */ + if (KdbDmesgTotalWritten <= KdpDmesgBufferSize) + { + /* Show buffer (KdpDmesgBuffer + beg, num) */ + KdbpPager(KdpDmesgBuffer, KdpDmesgCurrentPosition); + } + else + { + /* Show 2 buffers: (KdpDmesgBuffer + beg, KdpDmesgBufferSize - beg) + * and: (KdpDmesgBuffer, end) */ + KdbpPager(KdpDmesgBuffer + beg, KdpDmesgBufferSize - beg); + KdbpPrint("*** Dmesg: buffer rollup ***\n"); + KdbpPager(KdpDmesgBuffer, end); + } + KdbpPrint("*** Dmesg: end of output ***\n"); + + KdbpIsInDmesgMode = FALSE; /* Toggle logging flag */ - KdbpIsInDmesgMode = TRUE; /* Toggle logging flag */ - if (!KdpDmesgBuffer) - { - KdbpPrint("Dmesg: error, buffer is not allocated! /DEBUGPORT=SCREEN kernel param required for dmesg.\n"); return TRUE; - } - - KdbpPrint("*** Dmesg *** TotalWritten=%lu, BufferSize=%lu, CurrentPosition=%lu\n", - KdbDmesgTotalWritten, KdpDmesgBufferSize, KdpDmesgCurrentPosition); - - // Pass data to the pager: - end = KdpDmesgCurrentPosition; - beg = (end + KdpDmesgFreeBytes) % KdpDmesgBufferSize; - - // no roll-overs, and overwritten=lost bytes - if (KdbDmesgTotalWritten <= KdpDmesgBufferSize) - { - // show buffer (KdpDmesgBuffer + beg, num) - KdbpPager(KdpDmesgBuffer, KdpDmesgCurrentPosition); - } - else - { - // show 2 buffers: (KdpDmesgBuffer + beg, KdpDmesgBufferSize - beg) - // and: (KdpDmesgBuffer, end) - KdbpPager(KdpDmesgBuffer + beg, KdpDmesgBufferSize - beg); - KdbpPrint("*** Dmesg: buffer rollup ***\n"); - KdbpPager(KdpDmesgBuffer, end); - } - KdbpPrint("*** Dmesg: end of output ***\n"); - - KdbpIsInDmesgMode = FALSE; /* Toggle logging flag */ - - return TRUE; } /*!\brief Sets or displays a config variables value. @@ -2308,10 +2307,10 @@ KdbpCmdSet( continue; if (!KdbpGetEnterCondition(l, TRUE, &ConditionFirst)) - ASSERT(0); + ASSERT(FALSE); if (!KdbpGetEnterCondition(l, FALSE, &ConditionLast)) - ASSERT(0); + ASSERT(FALSE); KdbpPrint(" #%02d %-20s %-8s %-8s\n", l, ExceptionNames[l], KDB_ENTER_CONDITION_TO_STRING(ConditionFirst), @@ -2389,10 +2388,10 @@ KdbpCmdSet( else /* Argc >= 3 */ { if (!KdbpGetEnterCondition(l, TRUE, &ConditionFirst)) - ASSERT(0); + ASSERT(FALSE); if (!KdbpGetEnterCondition(l, FALSE, &ConditionLast)) - ASSERT(0); + ASSERT(FALSE); if (l < (RTL_NUMBER_OF(ExceptionNames) - 1)) { @@ -2918,7 +2917,7 @@ KdbpPager( break; /* Calculate the number of lines which will be printed in the terminal - * when outputting the current line + * when outputting the current line. */ if (i > 0) RowsPrintedByTerminal = (i + KdbNumberOfColsPrinted - 1) / KdbNumberOfColsTerminal;

5 years, 1 month

[reactos] 02/06: [NTOS:KD] Check for valid LoaderBlock and LoaderBlock->LoadOptions pointers when calling KdInitSystem() in BootPhase == 0.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=954f7c06609ffd9545fe3… commit 954f7c06609ffd9545fe35ffb6fe0096079ddb1c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 2 01:07:29 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 3 05:08:33 2019 +0100 [NTOS:KD] Check for valid LoaderBlock and LoaderBlock->LoadOptions pointers when calling KdInitSystem() in BootPhase == 0. --- ntoskrnl/kd/kdinit.c | 62 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/ntoskrnl/kd/kdinit.c b/ntoskrnl/kd/kdinit.c index 3a7071d5cb3..f5e1c489709 100644 --- a/ntoskrnl/kd/kdinit.c +++ b/ntoskrnl/kd/kdinit.c @@ -84,7 +84,6 @@ KdpGetDebugMode(PCHAR Currentp2) } } } - /* Check for Debug Log Debugging */ else if (!_strnicmp(p2, "FILE", 4)) { @@ -100,7 +99,6 @@ KdpGetDebugMode(PCHAR Currentp2) KdpLogFileName.Buffer = p1; } } - /* Check for BOCHS Debugging */ else if (!_strnicmp(p2, "BOCHS", 5)) { @@ -108,7 +106,6 @@ KdpGetDebugMode(PCHAR Currentp2) p2 += 5; KdpDebugMode.Bochs = TRUE; } - /* Check for GDB Debugging */ else if (!_strnicmp(p2, "GDB", 3)) { @@ -122,7 +119,6 @@ KdpGetDebugMode(PCHAR Currentp2) SharedUserData->KdDebuggerEnabled = TRUE; WrapperInitRoutine = KdpGdbStubInit; } - /* Check for PICE Debugging */ else if (!_strnicmp(p2, "PICE", 4)) { @@ -175,39 +171,55 @@ KdInitSystem(ULONG BootPhase, { ULONG Value; ULONG i; - PCHAR CommandLine, Port, BaudRate, Irq; + PCHAR CommandLine, Port = NULL, BaudRate = NULL, Irq = NULL; /* Set Default Port Options */ if (BootPhase == 0) { - /* Get the Command Line */ - CommandLine = LoaderBlock->LoadOptions; - - /* Upcase it */ - _strupr(CommandLine); - - /* XXX Check for settings that we support */ - if (strstr(CommandLine, "NODEBUG")) KdDebuggerEnabled = FALSE; - else if (strstr(CommandLine, "CRASHDEBUG")) KdDebuggerEnabled = FALSE; - else if (strstr(CommandLine, "DEBUG")) + /* Check if we have a loader block */ + if (LoaderBlock) { - /* Enable the kernel debugger */ - KdDebuggerNotPresent = FALSE; - KdDebuggerEnabled = TRUE; + /* Check if we have a command line */ + CommandLine = LoaderBlock->LoadOptions; + if (CommandLine) + { + /* Upcase it */ + _strupr(CommandLine); + + /* XXX Check for settings that we support */ + if (strstr(CommandLine, "NODEBUG")) KdDebuggerEnabled = FALSE; + else if (strstr(CommandLine, "CRASHDEBUG")) KdDebuggerEnabled = FALSE; + else if (strstr(CommandLine, "DEBUG")) + { + /* Enable the kernel debugger */ + KdDebuggerNotPresent = FALSE; + KdDebuggerEnabled = TRUE; #ifdef KDBG - /* Get the KDBG Settings */ - KdbpGetCommandLineSettings(LoaderBlock->LoadOptions); + /* Get the KDBG Settings */ + KdbpGetCommandLineSettings(LoaderBlock->LoadOptions); #endif + } + + /* Get the port and baud rate */ + Port = strstr(CommandLine, "DEBUGPORT"); + BaudRate = strstr(CommandLine, "BAUDRATE"); + Irq = strstr(CommandLine, "IRQ"); + } + else + { + /* No command line options? Disable debugger by default */ + KdDebuggerEnabled = FALSE; + } + } + else + { + /* Called from a bugcheck or a re-enable. Unconditionally enable KD */ + KdDebuggerEnabled = TRUE; } /* Let user-mode know our state */ SharedUserData->KdDebuggerEnabled = KdDebuggerEnabled; - /* Get the port and baud rate */ - Port = strstr(CommandLine, "DEBUGPORT"); - BaudRate = strstr(CommandLine, "BAUDRATE"); - Irq = strstr(CommandLine, "IRQ"); - /* Check if we got the /DEBUGPORT parameter(s) */ while (Port) {

5 years, 1 month

← Newer
1
...
26
27
28
29
30
31
32
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2019