Ros-diffs October 2024

ros-diffs@reactos.org

20 participants
117 discussions

[reactos] 01/01: [SPEC2DEF] Use explicit ordinals on MSVC, too

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7dcfda815c569ddcf2a7f… commit 7dcfda815c569ddcf2a7f860a176be50cc942bff Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Sep 13 21:06:20 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Wed Oct 16 20:00:26 2024 +0300 [SPEC2DEF] Use explicit ordinals on MSVC, too This prevents MSVC from reordering the exports in a way that doesn't match our spec file. Also improve the algorithm to apply ordinals, by starting with the first specified ordinal, possibly reserving ordinals for anything declared without an ordinal before. --- sdk/tools/spec2def/spec2def.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/sdk/tools/spec2def/spec2def.c b/sdk/tools/spec2def/spec2def.c index 55955ee605e..36612eb4bfc 100644 --- a/sdk/tools/spec2def/spec2def.c +++ b/sdk/tools/spec2def/spec2def.c @@ -781,8 +781,8 @@ OutputLine_def(FILE *fileDest, EXPORT *pexp) else OutputLine_def_GCC(fileDest, pexp); - /* On GCC builds we force ordinals */ - if ((pexp->uFlags & FL_ORDINAL) || (!gbMSComp && !gbImportLib)) + /* If it is not an import lib, we force ordinals */ + if ((pexp->uFlags & FL_ORDINAL) || !gbImportLib) { fprintf(fileDest, " @%d", pexp->nOrdinal); } @@ -1421,6 +1421,7 @@ ApplyOrdinals(EXPORT* pexports, unsigned cExports) { unsigned short i, j; char* used; + unsigned short firstOrdinal = 0xFFFF, firstIndex = 0; /* Allocate a table to mark used ordinals */ used = malloc(65536); @@ -1442,11 +1443,28 @@ ApplyOrdinals(EXPORT* pexports, unsigned cExports) return -1; } used[pexports[i].nOrdinal] = 1; + if (pexports[i].nOrdinal < firstOrdinal) + { + firstOrdinal = pexports[i].nOrdinal; + firstIndex = i; + } } } + /* Check if we found an ordinal and it's larger than it's index */ + if ((firstOrdinal != 0xFFFF) && (firstOrdinal > firstIndex)) + { + /* We did. Calculate an appropriate starting ordinal. */ + firstOrdinal -= firstIndex; + } + else + { + /* We didn't, so start with 1 */ + firstOrdinal = 1; + } + /* Pass 2: apply available ordinals */ - for (i = 0, j = 1; i < cExports; i++) + for (i = 0, j = firstOrdinal; i < cExports; i++) { if ((pexports[i].uFlags & FL_ORDINAL) == 0 && pexports[i].bVersionIncluded) { @@ -1640,13 +1658,10 @@ int main(int argc, char *argv[]) return -1; } - if (!gbMSComp) + if (ApplyOrdinals(pexports, cExports) < 0) { - if (ApplyOrdinals(pexports, cExports) < 0) - { - fprintf(stderr, "error: could not apply ordinals!\n"); - return -1; - } + fprintf(stderr, "error: could not apply ordinals!\n"); + return -1; } if (pszDefFileName)

2 months, 1 week

[reactos] 01/01: [SHELL32] Exclude executable extensions from File Types dialog (#7452)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f271bebb7171bb7d0a7a7… commit f271bebb7171bb7d0a7a7a8979cf5b9d201c35a1 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Wed Oct 16 14:09:33 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 16 14:09:33 2024 +0200 [SHELL32] Exclude executable extensions from File Types dialog (#7452) PathIsExeW is used and will exclude exe, com, pif, cmd, bat, scf and scr. The previous #6122 PR added support for the FTA_Exclude flag and that will exclude .lnk files. CORE-19805 --- dll/win32/shell32/dialogs/filetypes.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dll/win32/shell32/dialogs/filetypes.cpp b/dll/win32/shell32/dialogs/filetypes.cpp index 33a7a1376bc..c02de0eee10 100644 --- a/dll/win32/shell32/dialogs/filetypes.cpp +++ b/dll/win32/shell32/dialogs/filetypes.cpp @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL (fprop); ///////////////////////////////////////////////////////////////////////////// +EXTERN_C BOOL PathIsExeW(LPCWSTR lpszPath); + #define FTA_MODIFYMASK (FTA_OpenIsSafe) // Bits modified by EditTypeDlg #define NOASSOCRESID IDI_SHELL_DOCUMENT #define SUPPORT_EXTENSIONWITHOUTPROGID 1 // NT5 does not support these but NT6 does @@ -741,6 +743,14 @@ FileTypesDlg_InsertToLV(HWND hListView, LPCWSTR Assoc, INT iItem, PFILE_TYPE_GLO if (Assoc[0] == L'.') { + if (PathIsExeW(Assoc)) + { +exclude: + HeapFree(pG->hHeap, 0, Entry); + RegCloseKey(hKey); + return NULL; + } + dwSize = sizeof(Entry->ClassKey); if (RegQueryValueExW(hKey, NULL, NULL, NULL, LPBYTE(Entry->ClassKey), &dwSize)) { @@ -754,21 +764,13 @@ FileTypesDlg_InsertToLV(HWND hListView, LPCWSTR Assoc, INT iItem, PFILE_TYPE_GLO } #else if (!Entry->ClassKey[0]) - { - HeapFree(pG->hHeap, 0, Entry); - RegCloseKey(hKey); - return NULL; - } + goto exclude; #endif } Entry->EditFlags = GetRegDWORD(hKey, L"EditFlags", 0); if (Entry->EditFlags & FTA_Exclude) - { - HeapFree(pG->hHeap, 0, Entry); - RegCloseKey(hKey); - return NULL; - } + goto exclude; wcscpy(Entry->FileExtension, Assoc);

2 months, 1 week

[reactos] 01/01: [USETUP] CabinetExtractFile(): Do not overwrite Status value (#7456)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=54433319af31c2b497374… commit 54433319af31c2b49737469d36072153de375f4d Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Wed Oct 16 12:20:41 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 16 12:20:41 2024 +0200 [USETUP] CabinetExtractFile(): Do not overwrite Status value (#7456) Addendum to 5d4d912 (r15403). --- base/setup/usetup/spapisup/cabinet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/setup/usetup/spapisup/cabinet.c b/base/setup/usetup/spapisup/cabinet.c index 52c35ed1888..831ee8b5308 100644 --- a/base/setup/usetup/spapisup/cabinet.c +++ b/base/setup/usetup/spapisup/cabinet.c @@ -1260,7 +1260,8 @@ CabinetExtractFile( DPRINT("Cannot uncompress block\n"); if (Status == CS_NOMEMORY) Status = CAB_STATUS_NOMEMORY; - Status = CAB_STATUS_INVALID_CAB; + else + Status = CAB_STATUS_INVALID_CAB; goto UnmapDestFile; }

2 months, 1 week

[reactos] 01/01: [NTOS:KDBG] For SYSREG2: HACK emission of a 'bt' command when entering the debugger

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=52192f19d65665ffd5df0… commit 52192f19d65665ffd5df02caafbcd6b2cecfa1cc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 14 23:36:20 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 14 23:37:22 2024 +0200 [NTOS:KDBG] For SYSREG2: HACK emission of a 'bt' command when entering the debugger CORE-19807 --- ntoskrnl/kdbg/kdb_cli.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 852326cff22..b4794dca739 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3278,6 +3278,12 @@ KdbpCliMainLoop( static CHAR Command[1024]; static CHAR LastCommand[1024] = ""; +// FIXME HACK: SYSREG SUPPORT CORE-19807 -- Emit a backtrace. +// TODO: Remove once SYSREG "bt" command emission is fixed! +#if 1 + KdbpDoCommand("bt"); +#endif + if (EnteredOnSingleStep) { if (!KdbSymPrintAddress((PVOID)KeGetContextPc(KdbCurrentTrapFrame), KdbCurrentTrapFrame))

2 months, 1 week

[reactos] 04/04: [WIN32SS:ENG] Only accept VGASave service (ie vga.sys driver) as the real VGA device

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42914af218a46728e6e4f… commit 42914af218a46728e6e4f29467f551970105e48f Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Oct 13 22:28:51 2024 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Oct 14 23:26:11 2024 +0200 [WIN32SS:ENG] Only accept VGASave service (ie vga.sys driver) as the real VGA device CORE-19796 --- win32ss/gdi/eng/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 1f11e5fef01..4744124b85e 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -94,8 +94,8 @@ EngpHasVgaDriver( return FALSE; } - /* Device is using VGA driver if service name starts with 'VGA' (case insensitive) */ - return (_wcsnicmp(awcServiceName, L"VGA", 3) == 0); + /* Device is using VGA driver if service name is 'VGASave' (case insensitive) */ + return (_wcsicmp(awcServiceName, L"VGASave") == 0); } /* @@ -242,7 +242,7 @@ EngpUpdateGraphicsDeviceList(VOID) if (pGraphicsDevice->StateFlags & DISPLAY_DEVICE_VGA_COMPATIBLE) { /* Save this as the VGA adapter */ - if (!gpVgaGraphicsDevice) + if (!gpVgaGraphicsDevice || !EngpHasVgaDriver(gpVgaGraphicsDevice)) { gpVgaGraphicsDevice = pGraphicsDevice; TRACE("gpVgaGraphicsDevice = %p\n", gpVgaGraphicsDevice);

2 months, 1 week

[reactos] 03/04: [WIN32SS:ENG] Make gpPrimaryGraphicsDevice variable static

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4e781d72dd5f738cc339… commit b4e781d72dd5f738cc33992c63a067a9bdd9ea18 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Oct 13 21:35:28 2024 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Oct 14 23:26:11 2024 +0200 [WIN32SS:ENG] Make gpPrimaryGraphicsDevice variable static --- win32ss/gdi/eng/device.c | 2 +- win32ss/gdi/eng/device.h | 2 -- win32ss/gdi/eng/pdevobj.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index 299e75ad4f7..1f11e5fef01 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -12,7 +12,7 @@ DBG_DEFAULT_CHANNEL(EngDev); -PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; +static PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; static PGRAPHICS_DEVICE gpVgaGraphicsDevice; static PGRAPHICS_DEVICE gpGraphicsDeviceFirst = NULL; diff --git a/win32ss/gdi/eng/device.h b/win32ss/gdi/eng/device.h index 7248598a8f0..54caac283b3 100644 --- a/win32ss/gdi/eng/device.h +++ b/win32ss/gdi/eng/device.h @@ -8,8 +8,6 @@ NTAPI PDEVOBJ_vRefreshModeList( PPDEVOBJ ppdev); -extern PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; - VOID APIENTRY EngFileWrite( diff --git a/win32ss/gdi/eng/pdevobj.c b/win32ss/gdi/eng/pdevobj.c index 66d81ea8739..54d69cf7dc7 100644 --- a/win32ss/gdi/eng/pdevobj.c +++ b/win32ss/gdi/eng/pdevobj.c @@ -895,7 +895,7 @@ PDEVOBJ_lChangeDisplaySettings( } else if (RequestedMode) { - pGraphicsDevice = gpPrimaryGraphicsDevice; + pGraphicsDevice = EngpFindGraphicsDevice(NULL, 0); if (!pGraphicsDevice) { ERR("Wrong device'\n");

2 months, 1 week

[reactos] 02/04: [WIN32SS:ENG] Make gpVgaGraphicsDevice variable static

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e71e9424220975c9136c… commit 6e71e9424220975c9136c7455e759222b64ff0e5 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Oct 13 21:29:45 2024 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Oct 14 23:26:10 2024 +0200 [WIN32SS:ENG] Make gpVgaGraphicsDevice variable static --- win32ss/gdi/eng/device.c | 2 +- win32ss/gdi/eng/device.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/win32ss/gdi/eng/device.c b/win32ss/gdi/eng/device.c index d9f6b8a9465..299e75ad4f7 100644 --- a/win32ss/gdi/eng/device.c +++ b/win32ss/gdi/eng/device.c @@ -13,7 +13,7 @@ DBG_DEFAULT_CHANNEL(EngDev); PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; -PGRAPHICS_DEVICE gpVgaGraphicsDevice; +static PGRAPHICS_DEVICE gpVgaGraphicsDevice; static PGRAPHICS_DEVICE gpGraphicsDeviceFirst = NULL; static PGRAPHICS_DEVICE gpGraphicsDeviceLast = NULL; diff --git a/win32ss/gdi/eng/device.h b/win32ss/gdi/eng/device.h index a7d352c6bbe..7248598a8f0 100644 --- a/win32ss/gdi/eng/device.h +++ b/win32ss/gdi/eng/device.h @@ -9,7 +9,6 @@ PDEVOBJ_vRefreshModeList( PPDEVOBJ ppdev); extern PGRAPHICS_DEVICE gpPrimaryGraphicsDevice; -extern PGRAPHICS_DEVICE gpVgaGraphicsDevice; VOID APIENTRY

2 months, 1 week

[reactos] 01/04: [WIN32SS:USER] Remove assignation of gpPrimaryGraphicsDevice (already done in EngpUpdateGraphicsDeviceList)

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d8e26588a018c1ce4866… commit 0d8e26588a018c1ce4866aa923eff1c06e1cc148 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Apr 17 07:55:07 2023 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Oct 14 23:26:10 2024 +0200 [WIN32SS:USER] Remove assignation of gpPrimaryGraphicsDevice (already done in EngpUpdateGraphicsDeviceList) --- win32ss/user/ntuser/display.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/win32ss/user/ntuser/display.c b/win32ss/user/ntuser/display.c index 8ce655fbb27..5a9a5911262 100644 --- a/win32ss/user/ntuser/display.c +++ b/win32ss/user/ntuser/display.c @@ -168,22 +168,6 @@ InitVideo(VOID) if (!NT_SUCCESS(Status)) return Status; - /* Check if we had any success */ - if (!gpPrimaryGraphicsDevice) - { - /* Check if there is a VGA device we skipped */ - if (gpVgaGraphicsDevice) - { - /* There is, use the VGA device */ - gpPrimaryGraphicsDevice = gpVgaGraphicsDevice; - } - else - { - ERR("No usable display driver was found.\n"); - return STATUS_UNSUCCESSFUL; - } - } - InitSysParams(); return STATUS_SUCCESS;

2 months, 1 week

[reactos] 01/01: [WINETESTS] Fix warnings when compiling comctl32_winetest (#7316)

by Justin Miller

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=770adbc8a3f50de5c0553… commit 770adbc8a3f50de5c055374ed72e3fb9601de288 Author: Justin Miller <justin.miller(a)reactos.org> AuthorDate: Mon Oct 14 14:14:56 2024 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 14 14:14:56 2024 -0700 [WINETESTS] Fix warnings when compiling comctl32_winetest (#7316) fix warnings when compiling comctl32_winetest the comctl32 winetest just does a few things so properly mark the ros diff. --- modules/rostests/winetests/comctl32/CMakeLists.txt | 5 +++++ modules/rostests/winetests/comctl32/rebar.c | 4 ++++ modules/rostests/winetests/comctl32/static.c | 2 ++ 3 files changed, 11 insertions(+) diff --git a/modules/rostests/winetests/comctl32/CMakeLists.txt b/modules/rostests/winetests/comctl32/CMakeLists.txt index 9fa7c45621d..e2ff22ecdf5 100644 --- a/modules/rostests/winetests/comctl32/CMakeLists.txt +++ b/modules/rostests/winetests/comctl32/CMakeLists.txt @@ -47,6 +47,11 @@ if(MSVC AND ARCH STREQUAL "amd64") target_compile_options(comctl32_winetest PRIVATE /wd4334) endif() +if(MSVC) + # warning C4045: 'large_truncated_80_w': array bounds overflow + target_compile_options(comctl32_winetest PRIVATE /wd4045) +endif() + target_compile_options(comctl32_winetest PRIVATE $<$<NOT:$<C_COMPILER_ID:MSVC>>:-Wno-format>) set_module_type(comctl32_winetest win32cui) diff --git a/modules/rostests/winetests/comctl32/rebar.c b/modules/rostests/winetests/comctl32/rebar.c index 6c82295d40b..de8a295189e 100644 --- a/modules/rostests/winetests/comctl32/rebar.c +++ b/modules/rostests/winetests/comctl32/rebar.c @@ -18,6 +18,10 @@ */ /* make sure the structures work with a comctl32 v5.x */ +#ifdef __REACTOS__ +#undef _WIN32_WINNT +#undef _WIN32_IE +#endif #define _WIN32_WINNT 0x500 #define _WIN32_IE 0x500 diff --git a/modules/rostests/winetests/comctl32/static.c b/modules/rostests/winetests/comctl32/static.c index a65e3527282..1cc7e8a01df 100644 --- a/modules/rostests/winetests/comctl32/static.c +++ b/modules/rostests/winetests/comctl32/static.c @@ -20,7 +20,9 @@ #include <stdarg.h> #include <stdio.h> +#ifndef __REACTOS__ #define STRICT +#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> #include "commctrl.h"

2 months, 1 week

[reactos] 03/03: [NTOS:KDBG] Reintroduce the capability of KdbpCliInit() to interpret the KDBinit file (#4917)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b15963abb821c4557fc84… commit b15963abb821c4557fc840fa9b1a1b25b4123ade Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 28 03:13:31 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 14 22:51:54 2024 +0200 [NTOS:KDBG] Reintroduce the capability of KdbpCliInit() to interpret the KDBinit file (#4917) Addendum to commit baa47fa5e. Similarly to what was originally done, have KdbpCliInterpretInitFile() parse the KDBinit file by breaking back into the debugger. But contrary to before, replace the deprecated call to KdbEnter() by a standard DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C) . This allows KdbEnterDebuggerException() to do the KdbpCliInterpretInitFile() call. Additional fixes and improvements: - Run KdbpCliInterpretInitFile() in full KDBG environment (interrupts disabled, modified IRQL, own stack), like the usual interactive loop. - The KDBinit data buffer must be in non-paged pool. - Demote the "Could not open KDBinit" error to a DPRINT, so that it doesn't pollute the debug log when the KDBG init function is called early (before the storage stack is initialized), or if the file doesn't exist -- since this is an optional feature. --- ntoskrnl/kdbg/kdb.c | 37 ++++++++++++++++++-------- ntoskrnl/kdbg/kdb.h | 2 +- ntoskrnl/kdbg/kdb_cli.c | 70 +++++++++++++++++++++++++------------------------ 3 files changed, 63 insertions(+), 46 deletions(-) diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index bb5b3afe0af..05b8bc0765f 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -1141,20 +1141,29 @@ KdbpAttachToProcess( return KdbpAttachToThread(Thread->Cid.UniqueThread); } -/*!\brief Calls the main loop ... - */ +/** + * @brief Calls the main interactive debugger loop. + **/ static VOID KdbpCallMainLoop(VOID) { KdbpCliMainLoop(KdbEnteredOnSingleStep); } -/*!\brief Internal function to enter KDB. +/** + * @brief + * Internal function to enter KDBG and run the specified procedure. * * Disables interrupts, releases display ownership, ... - */ + * + * @param[in] Procedure + * The procedure to execute under the KDBG environment. + * Either execute the main interactive debugger loop (KdbpCallMainLoop) + * or run the KDBinit file (KdbpCliInterpretInitFile). + **/ static VOID -KdbpInternalEnter(VOID) +KdbpInternalEnter( + _In_ VOID (*Procedure)(VOID)) { PETHREAD Thread; PVOID SavedInitialStack, SavedStackBase, SavedKernelStack; @@ -1166,7 +1175,7 @@ KdbpInternalEnter(VOID) if (KdpDebugMode.Screen) KdpScreenAcquire(); - /* Call the interface's main loop on a different stack */ + /* Call the specified debugger procedure on a different stack */ Thread = PsGetCurrentThread(); SavedInitialStack = Thread->Tcb.InitialStack; SavedStackBase = Thread->Tcb.StackBase; @@ -1179,7 +1188,7 @@ KdbpInternalEnter(VOID) // KdbPrintf("Switching to KDB stack 0x%08x-0x%08x (Current Stack is 0x%08x)\n", // Thread->Tcb.StackLimit, Thread->Tcb.StackBase, Esp); - KdbpStackSwitchAndCall(KdbStack + KDB_STACK_SIZE - KDB_STACK_RESERVE, KdbpCallMainLoop); + KdbpStackSwitchAndCall(KdbStack + KDB_STACK_SIZE - KDB_STACK_RESERVE, Procedure); Thread->Tcb.InitialStack = SavedInitialStack; Thread->Tcb.StackBase = SavedStackBase; @@ -1276,6 +1285,7 @@ KdbEnterDebuggerException( ULONG OldEflags; KIRQL OldIrql; NTSTATUS ExceptionCode; + VOID (*EntryPoint)(VOID) = KdbpCallMainLoop; ExceptionCode = (ExceptionRecord ? ExceptionRecord->ExceptionCode : STATUS_BREAKPOINT); @@ -1481,11 +1491,15 @@ KdbEnterDebuggerException( } else if (ExceptionCode == STATUS_BREAKPOINT) { + /* Do the condition check and banner display only if we enter + * from a true code breakpoint. We skip those when running the + * KDBinit file, because it is done via an artificial breakpoint. */ if (KdbInitFileBuffer) { - KdbpCliInterpretInitFile(); - EnterConditionMet = FALSE; + EntryPoint = KdbpCliInterpretInitFile; + goto EnterKdbg; } + if (!EnterConditionMet) { return kdHandleException; @@ -1493,6 +1507,7 @@ KdbEnterDebuggerException( KdbPrintf("\nEntered debugger on embedded INT3 at 0x%04x:0x%p.\n", Context->SegCs & 0xffff, KeGetContextPc(Context)); +EnterKdbg:; } else { @@ -1543,8 +1558,8 @@ KdbEnterDebuggerException( return kdHandleException; } - /* Call the main loop */ - KdbpInternalEnter(); + /* Enter KDBG proper and run either the main loop or the KDBinit file */ + KdbpInternalEnter(EntryPoint); /* Check if we should single step */ if (KdbNumSingleSteps > 0) diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index df2945a7d9c..b76c4706bc5 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -61,7 +61,7 @@ typedef enum _KD_CONTINUE_TYPE /* GLOBALS *******************************************************************/ -extern PCHAR KdbInitFileBuffer; +extern volatile PCHAR KdbInitFileBuffer; extern PEPROCESS KdbCurrentProcess; extern PETHREAD KdbCurrentThread; diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 08c33d8afb8..852326cff22 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -134,7 +134,7 @@ static ULONG KdbNumberOfColsPrinted = 0; static BOOLEAN KdbOutputAborted = FALSE; static BOOLEAN KdbRepeatLastCommand = FALSE; -PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */ +volatile PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */ BOOLEAN KdbpBugCheckRequested = FALSE; /* Variables for Dmesg */ @@ -3330,20 +3330,28 @@ KdbpCliMainLoop( } } -/*!\brief This function is called by KdbEnterDebuggerException... +/** + * @brief + * Interprets the KDBinit file from the \SystemRoot\System32\drivers\etc + * directory, that has been loaded by KdbpCliInit(). * - * Used to interpret the init file in a context with a trapframe setup - * (KdbpCliInit call KdbEnter which will call KdbEnterDebuggerException which will - * call this function if KdbInitFileBuffer is not NULL. - */ + * This function is used to interpret the init file in the debugger context + * with a trap frame set up. KdbpCliInit() enters the debugger by calling + * DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C). In turn, this will call + * KdbEnterDebuggerException() which will finally call this function if + * KdbInitFileBuffer is not NULL. + **/ VOID KdbpCliInterpretInitFile(VOID) { PCHAR p1, p2; + p1 = InterlockedExchangePointer((PVOID*)&KdbInitFileBuffer, NULL); + if (!p1) + return; + /* Execute the commands in the init file */ - DPRINT("KDB: Executing KDBinit file...\n"); - p1 = KdbInitFileBuffer; + KdbPuts("KDB: Executing KDBinit file...\n"); while (p1[0] != '\0') { size_t i = strcspn(p1, "\r\n"); @@ -3360,11 +3368,12 @@ KdbpCliInterpretInitFile(VOID) if (strncmp(p2, "break", sizeof("break")-1) == 0 && (p2[sizeof("break")-1] == '\0' || isspace(p2[sizeof("break")-1]))) { - /* break into the debugger */ + /* Run the interactive debugger loop */ KdbpCliMainLoop(FALSE); } else if (p2[0] != '#' && p2[0] != '\0') /* Ignore empty lines and comments */ { + /* Invoke the command */ KdbpDoCommand(p1); } @@ -3375,14 +3384,14 @@ KdbpCliInterpretInitFile(VOID) while (p1[0] == '\r' || p1[0] == '\n') p1++; } - DPRINT("KDB: KDBinit executed\n"); + KdbPuts("KDB: KDBinit executed\n"); } /** * @brief Called when KDB is initialized. * - * Reads the KDBinit file from the SystemRoot\System32\drivers\etc directory - * and executes it. + * Loads the KDBinit file from the \SystemRoot\System32\drivers\etc + * directory and interprets it, by calling back into the debugger. **/ NTSTATUS KdbpCliInit(VOID) @@ -3393,9 +3402,8 @@ KdbpCliInit(VOID) IO_STATUS_BLOCK Iosb; FILE_STANDARD_INFORMATION FileStdInfo; HANDLE hFile = NULL; - INT FileSize; + ULONG FileSize; PCHAR FileBuffer; - ULONG OldEflags; /* Don't load the KDBinit file if its buffer is already lying around */ if (KdbInitFileBuffer) @@ -3416,7 +3424,7 @@ KdbpCliInit(VOID) FILE_NO_INTERMEDIATE_BUFFERING); if (!NT_SUCCESS(Status)) { - DPRINT1("Could not open \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%lx)\n", Status); + DPRINT("Could not open %wZ (Status 0x%lx)\n", &FileName, Status); return Status; } @@ -3427,22 +3435,23 @@ KdbpCliInit(VOID) if (!NT_SUCCESS(Status)) { ZwClose(hFile); - DPRINT1("Could not query size of \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%lx)\n", Status); + DPRINT1("Could not query size of %wZ (Status 0x%lx)\n", &FileName, Status); return Status; } FileSize = FileStdInfo.EndOfFile.u.LowPart; - /* Allocate memory for the file */ - FileBuffer = ExAllocatePool(PagedPool, FileSize + 1); /* add 1 byte for terminating '\0' */ + /* Allocate memory for the file (add 1 byte for terminating NUL) */ + FileBuffer = ExAllocatePool(NonPagedPool, FileSize + 1); if (!FileBuffer) { ZwClose(hFile); - DPRINT1("Could not allocate %d bytes for KDBinit file\n", FileSize); + DPRINT1("Could not allocate %lu bytes for KDBinit file\n", FileSize); return Status; } /* Load file into memory */ - Status = ZwReadFile(hFile, NULL, NULL, NULL, &Iosb, FileBuffer, FileSize, NULL, NULL); + Status = ZwReadFile(hFile, NULL, NULL, NULL, &Iosb, + FileBuffer, FileSize, NULL, NULL); ZwClose(hFile); if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) @@ -3452,20 +3461,13 @@ KdbpCliInit(VOID) return Status; } - FileSize = min(FileSize, (INT)Iosb.Information); - FileBuffer[FileSize] = '\0'; - - /* Enter critical section */ - OldEflags = __readeflags(); - _disable(); - - /* Interpret the init file... */ - KdbInitFileBuffer = FileBuffer; - //KdbEnter(); // FIXME, see commit baa47fa5e - KdbInitFileBuffer = NULL; + FileSize = min(FileSize, (ULONG)Iosb.Information); + FileBuffer[FileSize] = ANSI_NULL; - /* Leave critical section */ - __writeeflags(OldEflags); + /* Interpret the KDBinit file by calling back into the debugger */ + InterlockedExchangePointer((PVOID*)&KdbInitFileBuffer, FileBuffer); + DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + InterlockedExchangePointer((PVOID*)&KdbInitFileBuffer, NULL); ExFreePool(FileBuffer); @@ -3607,7 +3609,7 @@ KdbInitialize( if (BootPhase >= 2) { - /* I/O is now set up for disk access: Read KDB Data */ + /* I/O is now set up for disk access: load the KDBinit file */ NTSTATUS Status = KdbpCliInit(); /* Schedule an I/O reinitialization if needed */

2 months, 1 week

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2024