Ros-diffs January 2022

ros-diffs@reactos.org

28 participants
173 discussions

[reactos] 01/01: [NTUSER] Implement NtUserQueryInputContext (#4227)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cdf3b5e85ac106e9e0fce… commit cdf3b5e85ac106e9e0fce956054621aebaa9cc1f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Jan 1 20:56:50 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Jan 1 20:56:50 2022 +0900 [NTUSER] Implement NtUserQueryInputContext (#4227) Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> - Modify NtUserQueryInputContext prototype. - Implement NtUserQueryInputContext function. - Add enum QUERY_INPUT_CONTEXT (QIC_*) to undocuser.h. CORE-11700 --- dll/win32/imm32/compstr.c | 2 +- dll/win32/imm32/ime.c | 4 ++-- dll/win32/imm32/imm.c | 4 ++-- dll/win32/imm32/precomp.h | 2 +- dll/win32/imm32/utils.c | 4 ++-- sdk/include/reactos/undocuser.h | 9 +++++++++ win32ss/include/ntuser.h | 4 ++-- win32ss/user/ntuser/ntstubs.c | 45 +++++++++++++++++++++++++++++++++++++---- 8 files changed, 60 insertions(+), 14 deletions(-) diff --git a/dll/win32/imm32/compstr.c b/dll/win32/imm32/compstr.c index 7fa9a0e4111..b49b4a5db19 100644 --- a/dll/win32/imm32/compstr.c +++ b/dll/win32/imm32/compstr.c @@ -527,7 +527,7 @@ Imm32SetCompositionStringAW(HIMC hIMC, DWORD dwIndex, LPVOID pComp, DWORD dwComp UINT uCodePage; LPRECONVERTSTRING pRS; - dwThreadId = NtUserQueryInputContext(hIMC, 1); + dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); if (dwThreadId != GetCurrentThreadId()) return FALSE; diff --git a/dll/win32/imm32/ime.c b/dll/win32/imm32/ime.c index cfe0b66754e..7da1ea09fec 100644 --- a/dll/win32/imm32/ime.c +++ b/dll/win32/imm32/ime.c @@ -376,7 +376,7 @@ Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParen if (!hIMC) return 0; - dwProcessId = NtUserQueryInputContext(hIMC, 0); + dwProcessId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTPROCESSID); if (dwProcessId == 0) return 0; @@ -392,7 +392,7 @@ Imm32GetImeMenuItemsAW(HIMC hIMC, DWORD dwFlags, DWORD dwType, LPVOID lpImeParen if (pIC == NULL) return 0; - dwThreadId = NtUserQueryInputContext(hIMC, 1); + dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); if (dwThreadId == 0) { ImmUnlockIMC(hIMC); diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index c21c5a23567..4ac2cdebb6e 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -818,7 +818,7 @@ LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect) if (!pClientImc->hInputContext) { - dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, 1); + dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); if (dwThreadId == GetCurrentThreadId() && Imm32IsCiceroMode() && !Imm32Is16BitMode()) { @@ -833,7 +833,7 @@ LPINPUTCONTEXT APIENTRY Imm32LockIMCEx(HIMC hIMC, BOOL fSelect) } } - if (!NtUserQueryInputContext(hIMC, 2)) + if (!NtUserQueryInputContext(hIMC, QIC_DEFAULTWINDOWIME)) { RtlLeaveCriticalSection(&pClientImc->cs); goto Quit; diff --git a/dll/win32/imm32/precomp.h b/dll/win32/imm32/precomp.h index 285ab70b8d1..4cd92e5e09d 100644 --- a/dll/win32/imm32/precomp.h +++ b/dll/win32/imm32/precomp.h @@ -97,7 +97,7 @@ BOOL APIENTRY Imm32ReleaseIME(HKL hKL); static inline BOOL Imm32IsCrossThreadAccess(HIMC hIMC) { - DWORD dwImeThreadId = NtUserQueryInputContext(hIMC, 1); + DWORD dwImeThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); DWORD dwThreadId = GetCurrentThreadId(); return (dwImeThreadId != dwThreadId); } diff --git a/dll/win32/imm32/utils.c b/dll/win32/imm32/utils.c index e035fec3ed2..29c2c3adfeb 100644 --- a/dll/win32/imm32/utils.c +++ b/dll/win32/imm32/utils.c @@ -186,7 +186,7 @@ BOOL APIENTRY Imm32CheckImcProcess(PIMC pIMC) return TRUE; hIMC = pIMC->head.h; - dwProcessID = NtUserQueryInputContext(hIMC, 0); + dwProcessID = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTPROCESSID); return dwProcessID == (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess; } @@ -211,7 +211,7 @@ Imm32NotifyAction(HIMC hIMC, HWND hwnd, DWORD dwAction, DWORD_PTR dwIndex, DWORD if (dwAction) { - dwThreadId = NtUserQueryInputContext(hIMC, 1); + dwThreadId = (DWORD)NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); if (dwThreadId) { /* find keyboard layout and lock it */ diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index f63e5cd4153..ca13a8b0239 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -379,6 +379,15 @@ BOOL WINAPI RegisterUserApiHook(PUSERAPIHOOKINFO puah); BOOL WINAPI UnregisterUserApiHook(VOID); +/* dwType for NtUserQueryInputContext */ +typedef enum _QUERY_INPUT_CONTEXT +{ + QIC_INPUTPROCESSID = 0, + QIC_INPUTTHREADID, + QIC_DEFAULTWINDOWIME, + QIC_DEFAULTIMC +} QUERY_INPUT_CONTEXT; + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */ diff --git a/win32ss/include/ntuser.h b/win32ss/include/ntuser.h index 9d936530827..0e6d4c3b4d9 100644 --- a/win32ss/include/ntuser.h +++ b/win32ss/include/ntuser.h @@ -2877,11 +2877,11 @@ NtUserQueryInformationThread( OUT PVOID ThreadInformation, IN ULONG ThreadInformationLength); -DWORD +DWORD_PTR NTAPI NtUserQueryInputContext( HIMC hIMC, - DWORD dwUnknown2); + DWORD dwType); DWORD NTAPI diff --git a/win32ss/user/ntuser/ntstubs.c b/win32ss/user/ntuser/ntstubs.c index 9d7b624151b..1a173714958 100644 --- a/win32ss/user/ntuser/ntstubs.c +++ b/win32ss/user/ntuser/ntstubs.c @@ -647,14 +647,51 @@ Quit: return Status; } -DWORD +DWORD_PTR APIENTRY NtUserQueryInputContext( HIMC hIMC, - DWORD dwUnknown2) + DWORD dwType) { - TRACE("NtUserQueryInputContext(%p, 0x%lX)\n", hIMC, dwUnknown2); - return 0; + PIMC pIMC; + PTHREADINFO ptiIMC; + DWORD_PTR ret = 0; + + UserEnterExclusive(); + + if (!IS_IMM_MODE()) + goto Quit; + + pIMC = UserGetObject(gHandleTable, hIMC, TYPE_INPUTCONTEXT); + if (!pIMC) + goto Quit; + + ptiIMC = pIMC->head.pti; + + switch (dwType) + { + case QIC_INPUTPROCESSID: + ret = (DWORD_PTR)PsGetThreadProcessId(ptiIMC->pEThread); + break; + + case QIC_INPUTTHREADID: + ret = (DWORD_PTR)PsGetThreadId(ptiIMC->pEThread); + break; + + case QIC_DEFAULTWINDOWIME: + if (ptiIMC->spwndDefaultIme) + ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spwndDefaultIme); + break; + + case QIC_DEFAULTIMC: + if (ptiIMC->spDefaultImc) + ret = (DWORD_PTR)UserHMGetHandle(ptiIMC->spDefaultImc); + break; + } + +Quit: + UserLeave(); + return ret; } BOOL

2 years, 8 months

[reactos] 02/02: [FREELDR] Slightly revamp the Exception BSOD screen.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d00a5d6eb977461e61bc… commit 0d00a5d6eb977461e61bc552647358b9f1d71e3f Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 1 04:49:06 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 1 05:04:23 2022 +0100 [FREELDR] Slightly revamp the Exception BSOD screen. - Don't store trailing newlines in the exception description text strings. - Remove unused i386PrintChar(). - Display CR4 in x86. - Use the "indentation" printf generation trick in order to get aligned strings for (CF4 and) DR6 and DR7, without having to hardcode the tons of alignment whitespaces (--> make the strings stored in freeldr shorter). - Show the IP/ErrorCode/EFlags/GDTR/IDTR/LDTR values vertically aligned. - Display the stack frames in both x86 and x64 modes. - Adjust the instruction pointer when a BREAKPOINT or OVERFLOW exception arises, so that the offending instruction can show up in the instruction stream. --- boot/freeldr/freeldr/arch/i386/i386bug.c | 117 +++++++++++++++--------------- boot/freeldr/freeldr/arch/i386/i386trap.S | 2 +- 2 files changed, 61 insertions(+), 58 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/i386bug.c b/boot/freeldr/freeldr/arch/i386/i386bug.c index 908ad46950c..7e03deacdcb 100644 --- a/boot/freeldr/freeldr/arch/i386/i386bug.c +++ b/boot/freeldr/freeldr/arch/i386/i386bug.c @@ -5,31 +5,31 @@ typedef struct _FRAME { - struct _FRAME *Next; - void *Address; + struct _FRAME* Next; + PVOID Address; } FRAME; static const CHAR *i386ExceptionDescriptionText[] = { - "Exception 00: DIVIDE BY ZERO\n\n", - "Exception 01: DEBUG EXCEPTION\n\n", - "Exception 02: NON-MASKABLE INTERRUPT EXCEPTION\n\n", - "Exception 03: BREAKPOINT (INT 3)\n\n", - "Exception 04: OVERFLOW\n\n", - "Exception 05: BOUND EXCEPTION\n\n", - "Exception 06: INVALID OPCODE\n\n", - "Exception 07: FPU NOT AVAILABLE\n\n", - "Exception 08: DOUBLE FAULT\n\n", - "Exception 09: COPROCESSOR SEGMENT OVERRUN\n\n", - "Exception 0A: INVALID TSS\n\n", - "Exception 0B: SEGMENT NOT PRESENT\n\n", - "Exception 0C: STACK EXCEPTION\n\n", - "Exception 0D: GENERAL PROTECTION FAULT\n\n", - "Exception 0E: PAGE FAULT\n\n", - "Exception 0F: Reserved\n\n", - "Exception 10: COPROCESSOR ERROR\n\n", - "Exception 11: ALIGNMENT CHECK\n\n", - "Exception 12: MACHINE CHECK\n\n" + "Exception 00: DIVIDE BY ZERO", + "Exception 01: DEBUG EXCEPTION", + "Exception 02: NON-MASKABLE INTERRUPT EXCEPTION", + "Exception 03: BREAKPOINT (INT 3)", + "Exception 04: OVERFLOW", + "Exception 05: BOUND EXCEPTION", + "Exception 06: INVALID OPCODE", + "Exception 07: FPU NOT AVAILABLE", + "Exception 08: DOUBLE FAULT", + "Exception 09: COPROCESSOR SEGMENT OVERRUN", + "Exception 0A: INVALID TSS", + "Exception 0B: SEGMENT NOT PRESENT", + "Exception 0C: STACK EXCEPTION", + "Exception 0D: GENERAL PROTECTION FAULT", + "Exception 0E: PAGE FAULT", + "Exception 0F: Reserved", + "Exception 10: COPROCESSOR ERROR", + "Exception 11: ALIGNMENT CHECK", + "Exception 12: MACHINE CHECK" }; #define SCREEN_ATTR 0x1F // Bright white on blue background @@ -38,14 +38,6 @@ static const CHAR *i386ExceptionDescriptionText[] = static ULONG i386_ScreenPosX = 0; static ULONG i386_ScreenPosY = 0; -#if 0 -static void -i386PrintChar(CHAR chr, ULONG x, ULONG y) -{ - MachVideoPutChar(chr, SCREEN_ATTR, x, y); -} -#endif - static void i386PrintText(CHAR *pszText) { @@ -96,18 +88,17 @@ PrintText(const CHAR *Format, ...) static void i386PrintFrames(PKTRAP_FRAME TrapFrame) { - FRAME *Frame; + FRAME* Frame; PrintText("Frames:\n"); + for (Frame = #ifdef _M_IX86 - for (Frame = (FRAME*)TrapFrame->Ebp; - Frame != 0 && (ULONG_PTR)Frame < STACKADDR; - Frame = Frame->Next) + (FRAME*)TrapFrame->Ebp; #else - for (Frame = (FRAME*)TrapFrame->TrapFrame; - Frame != 0 && (ULONG_PTR)Frame < STACKADDR; - Frame = Frame->Next) + (FRAME*)TrapFrame->TrapFrame; #endif + Frame != NULL && (ULONG_PTR)Frame < STACKADDR; + Frame = Frame->Next) { PrintText("%p ", Frame->Address); } @@ -126,7 +117,8 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST PrintText("An error occured in " VERSION "\n" "Report this error on the ReactOS Bug Tracker: https://jira.reactos.org\n\n" - "0x%02lx: %s\n", TrapIndex, i386ExceptionDescriptionText[TrapIndex]); + "0x%02lx: %s\n\n", TrapIndex, i386ExceptionDescriptionText[TrapIndex]); + #ifdef _M_IX86 PrintText("EAX: %.8lx ESP: %.8lx CR0: %.8lx DR0: %.8lx\n", TrapFrame->Eax, TrapFrame->HardwareEsp, Special->Cr0, TrapFrame->Dr0); @@ -136,29 +128,28 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST TrapFrame->Ecx, TrapFrame->Esi, Special->Cr2, TrapFrame->Dr2); PrintText("EDX: %.8lx EDI: %.8lx CR3: %.8lx DR3: %.8lx\n", TrapFrame->Edx, TrapFrame->Edi, Special->Cr3, TrapFrame->Dr3); - PrintText(" DR6: %.8lx\n", - TrapFrame->Dr6); - PrintText(" DR7: %.8lx\n\n", - TrapFrame->Dr7); + PrintText("%*s CR4: %.8lx DR6: %.8lx\n", + 41, "", Special->Cr4, TrapFrame->Dr6); + PrintText("%*s DR7: %.8lx\n", + 62, "", TrapFrame->Dr7); /* NOTE: Segment registers are intrinsically 16 bits. Even if the x86 * KTRAP_FRAME structure stores them as ULONG, only their lower 16 bits * are initialized. We thus cast them to USHORT before display. */ - PrintText("CS: %.4lx EIP: %.8lx\n", + PrintText(" CS: %.4lx EIP: %.8lx\n", (USHORT)TrapFrame->SegCs, TrapFrame->Eip); - PrintText("DS: %.4lx ERROR CODE: %.8lx\n", + PrintText(" DS: %.4lx ERROR CODE: %.8lx\n", (USHORT)TrapFrame->SegDs, TrapFrame->ErrCode); - PrintText("ES: %.4lx EFLAGS: %.8lx\n", + PrintText(" ES: %.4lx EFLAGS: %.8lx\n", (USHORT)TrapFrame->SegEs, TrapFrame->EFlags); - PrintText("FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", + PrintText(" FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", + // " FS: %.4lx GDTR: Base %.8lx Limit %.4x\n" (USHORT)TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); - PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", + PrintText(" GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", + // " GS: %.4lx IDTR: Base %.8lx Limit %.4x\n", (USHORT)TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); - PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", + PrintText(" SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", (USHORT)TrapFrame->HardwareSegSs, Special->Ldtr, Special->Tr); - - i386PrintFrames(TrapFrame); // Display frames - InstructionPointer = (PUCHAR)TrapFrame->Eip; #else PrintText("RAX: %.8lx R8: %.8lx R12: %.8lx RSI: %.8lx\n", TrapFrame->Rax, TrapFrame->R8, 0, TrapFrame->Rsi); @@ -169,21 +160,33 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST PrintText("RDX: %.8lx R11: %.8lx R15: %.8lx RSP: %.8lx\n", TrapFrame->Rdx, TrapFrame->R11, 0, TrapFrame->Rsp); - PrintText("CS: %.4lx RIP: %.8lx\n", + PrintText(" CS: %.4lx RIP: %.8lx\n", TrapFrame->SegCs, TrapFrame->Rip); - PrintText("DS: %.4lx ERROR CODE: %.8lx\n", + PrintText(" DS: %.4lx ERROR CODE: %.8lx\n", TrapFrame->SegDs, TrapFrame->ErrorCode); - PrintText("ES: %.4lx EFLAGS: %.8lx\n", + PrintText(" ES: %.4lx EFLAGS: %.8lx\n", TrapFrame->SegEs, TrapFrame->EFlags); - PrintText("FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", + PrintText(" FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); - PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", + PrintText(" GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); - PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", + PrintText(" SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", TrapFrame->SegSs, Special->Ldtr, Special->Tr); +#endif + + /* Display the stack frames */ + i386PrintFrames(TrapFrame); + +#ifdef _M_IX86 + InstructionPointer = (PUCHAR)TrapFrame->Eip; +#else InstructionPointer = (PUCHAR)TrapFrame->Rip; #endif - PrintText("\nInstruction stream: %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x \n", + /* Adjust IP for #BP (INT 03) or #OF to point to the offending instruction */ + if ((TrapIndex == 3) || (TrapIndex == 4)) + InstructionPointer--; + + PrintText("\nInstruction stream: %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x\n", InstructionPointer[0], InstructionPointer[1], InstructionPointer[2], InstructionPointer[3], InstructionPointer[4], InstructionPointer[5], diff --git a/boot/freeldr/freeldr/arch/i386/i386trap.S b/boot/freeldr/freeldr/arch/i386/i386trap.S index 0be6ec7e5a2..bbc5367d70d 100644 --- a/boot/freeldr/freeldr/arch/i386/i386trap.S +++ b/boot/freeldr/freeldr/arch/i386/i386trap.S @@ -82,7 +82,7 @@ MACRO(SAVE_CPU_REGS) push eax ENDM -/* Set by each exception handler to the address of the description text */ +/* Set by each exception handler to the index of the description text */ i386ExceptionIndex: .long 0

2 years, 8 months

[reactos] 01/02: [FREELDR] Fix displayed information in the Exception BSOD. CORE-16748

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2c9dbacebbee6b53bf331… commit 2c9dbacebbee6b53bf331e032d9f2af4e4f828eb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Jan 1 02:24:52 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jan 1 05:04:22 2022 +0100 [FREELDR] Fix displayed information in the Exception BSOD. CORE-16748 - Display the correct TR register value. - Ensure that the x86 segment register values displayed are really 2-byte long. Segment registers are intrinsically 16 bits. Even if the x86 KTRAP_FRAME structure stores them as ULONG, only their lower 16 bits are initialized. We thus cast them to USHORT before display. These segment registers are saved in a stack-based KTRAP_FRAME by the CPU trap mechanism (for SS), and by 'push CS' etc. instructions for the others, and from Intel documentation, we know that: " If the source operand is a segment register (16 bits) and the operand size is 64-bits, a zero-extended value is pushed on the stack; if the operand size is 32-bits, either a zero-extended value is pushed on the stack or the segment selector is written on the stack using a 16-bit move. For the last case, all recent Core and Atom processors perform a 16-bit move, leaving the upper portion of the stack location unmodified. " So it may happen, when using the push, that either they get zero-extended, or garbage gets stored in the higher bits, and these need to be trimmed. --- boot/freeldr/freeldr/arch/i386/i386bug.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/i386bug.c b/boot/freeldr/freeldr/arch/i386/i386bug.c index f94639650f4..908ad46950c 100644 --- a/boot/freeldr/freeldr/arch/i386/i386bug.c +++ b/boot/freeldr/freeldr/arch/i386/i386bug.c @@ -140,18 +140,22 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST TrapFrame->Dr6); PrintText(" DR7: %.8lx\n\n", TrapFrame->Dr7); + + /* NOTE: Segment registers are intrinsically 16 bits. Even if the x86 + * KTRAP_FRAME structure stores them as ULONG, only their lower 16 bits + * are initialized. We thus cast them to USHORT before display. */ PrintText("CS: %.4lx EIP: %.8lx\n", - TrapFrame->SegCs, TrapFrame->Eip); + (USHORT)TrapFrame->SegCs, TrapFrame->Eip); PrintText("DS: %.4lx ERROR CODE: %.8lx\n", - TrapFrame->SegDs, TrapFrame->ErrCode); + (USHORT)TrapFrame->SegDs, TrapFrame->ErrCode); PrintText("ES: %.4lx EFLAGS: %.8lx\n", - TrapFrame->SegEs, TrapFrame->EFlags); + (USHORT)TrapFrame->SegEs, TrapFrame->EFlags); PrintText("FS: %.4lx GDTR Base: %.8lx Limit: %.4x\n", - TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); + (USHORT)TrapFrame->SegFs, Special->Gdtr.Base, Special->Gdtr.Limit); PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", - TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); + (USHORT)TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", - TrapFrame->HardwareSegSs, Special->Ldtr, Special->Idtr.Limit); + (USHORT)TrapFrame->HardwareSegSs, Special->Ldtr, Special->Tr); i386PrintFrames(TrapFrame); // Display frames InstructionPointer = (PUCHAR)TrapFrame->Eip; @@ -176,7 +180,7 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST PrintText("GS: %.4lx IDTR Base: %.8lx Limit: %.4x\n", TrapFrame->SegGs, Special->Idtr.Base, Special->Idtr.Limit); PrintText("SS: %.4lx LDTR: %.4lx TR: %.4lx\n\n", - TrapFrame->SegSs, Special->Ldtr, Special->Idtr.Limit); + TrapFrame->SegSs, Special->Ldtr, Special->Tr); InstructionPointer = (PUCHAR)TrapFrame->Rip; #endif PrintText("\nInstruction stream: %.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x \n",

2 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 January 2022