Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [BLUE] Optimize ScrIoControl for speed (#5185)
by Katayama Hirofumi MZ 27 Mar '23

27 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3526ffc094277e03d1a01… commit 3526ffc094277e03d1a01435036bfb089806b88d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 28 08:12:38 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 28 08:12:38 2023 +0900 [BLUE] Optimize ScrIoControl for speed (#5185) Optimize IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE and IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER for speed by using cache. CORE-18838 --- drivers/setup/blue/blue.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/setup/blue/blue.c b/drivers/setup/blue/blue.c index 81011fe10cc..06e498d8208 100644 --- a/drivers/setup/blue/blue.c +++ b/drivers/setup/blue/blue.c @@ -1073,6 +1073,8 @@ ScrIoControl( if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) { + UCHAR attr = Buf->wAttribute; + vidmem = DeviceExtension->VideoMemory; offset = (Buf->dwCoord.X + Buf->dwCoord.Y * DeviceExtension->Columns) * 2 + 1; @@ -1082,7 +1084,7 @@ ScrIoControl( for (dwCount = 0; dwCount < nMaxLength; dwCount++) { - vidmem[offset + (dwCount * 2)] = (char)Buf->wAttribute; + vidmem[offset + (dwCount * 2)] = attr; } Buf->dwTransfered = dwCount; } @@ -1271,6 +1273,8 @@ ScrIoControl( if (DeviceExtension->Enabled && DeviceExtension->VideoMemory) { + UCHAR ch = Buf->cCharacter; + vidmem = DeviceExtension->VideoMemory; offset = (Buf->dwCoord.X + Buf->dwCoord.Y * DeviceExtension->Columns) * 2; @@ -1280,7 +1284,7 @@ ScrIoControl( for (dwCount = 0; dwCount < nMaxLength; dwCount++) { - vidmem[offset + (dwCount * 2)] = (char)Buf->cCharacter; + vidmem[offset + (dwCount * 2)] = ch; } Buf->dwTransfered = dwCount; }

1 0

[reactos] 04/04: [NTOS:KDBG] Move command history management in a separate file. Simplify duplicated code in KdbpReadCommand.
by Hermès Bélusca-Maïto 27 Mar '23

27 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6084da8c848839a1dc1a7… commit 6084da8c848839a1dc1a7384d02672c687b55429 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 27 22:40:09 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 27 23:31:34 2023 +0200 [NTOS:KDBG] Move command history management in a separate file. Simplify duplicated code in KdbpReadCommand. --- ntoskrnl/kdbg/kdb.h | 9 +++ ntoskrnl/kdbg/kdb_cli.c | 140 +++----------------------------------- ntoskrnl/kdbg/kdb_cmdhist.c | 162 ++++++++++++++++++++++++++++++++++++++++++++ ntoskrnl/ntos.cmake | 1 + 4 files changed, 182 insertions(+), 130 deletions(-) diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index cd7a0b5bec6..ac3f8b13004 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -104,6 +104,15 @@ KdbpCliMainLoop( VOID KdbpCliInterpretInitFile(VOID); +VOID +KdbpCommandHistoryAppend( + _In_ PCSTR Command); + +PCSTR +KdbGetHistoryEntry( + _Inout_ PLONG NextIndex, + _In_ BOOLEAN Next); + SIZE_T KdbpReadCommand( _Out_ PCHAR Buffer, diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index f114a862958..b50d18b692f 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -140,11 +140,6 @@ static PKDBG_CLI_ROUTINE KdbCliCallbacks[10]; static BOOLEAN KdbUseIntelSyntax = FALSE; /* Set to TRUE for intel syntax */ static BOOLEAN KdbBreakOnModuleLoad = FALSE; /* Set to TRUE to break into KDB when a module is loaded */ -static CHAR KdbCommandHistoryBuffer[2048]; /* Command history string ringbuffer */ -static PCHAR KdbCommandHistory[sizeof(KdbCommandHistoryBuffer) / 8] = { NULL }; /* Command history ringbuffer */ -static LONG KdbCommandHistoryBufferIndex = 0; -static LONG KdbCommandHistoryIndex = 0; - static ULONG KdbNumberOfRowsPrinted = 0; static ULONG KdbNumberOfColsPrinted = 0; static BOOLEAN KdbOutputAborted = FALSE; @@ -3262,77 +3257,6 @@ KdbpPrintUnicodeString( } -/*!\brief Appends a command to the command history - * - * \param Command Pointer to the command to append to the history. - */ -static VOID -KdbpCommandHistoryAppend( - IN PCHAR Command) -{ - SIZE_T Length1 = strlen(Command) + 1; - SIZE_T Length2 = 0; - INT i; - PCHAR Buffer; - - ASSERT(Length1 <= RTL_NUMBER_OF(KdbCommandHistoryBuffer)); - - if (Length1 <= 1 || - (KdbCommandHistory[KdbCommandHistoryIndex] && - strcmp(KdbCommandHistory[KdbCommandHistoryIndex], Command) == 0)) - { - return; - } - - /* Calculate Length1 and Length2 */ - Buffer = KdbCommandHistoryBuffer + KdbCommandHistoryBufferIndex; - KdbCommandHistoryBufferIndex += Length1; - if (KdbCommandHistoryBufferIndex >= (LONG)RTL_NUMBER_OF(KdbCommandHistoryBuffer)) - { - KdbCommandHistoryBufferIndex -= RTL_NUMBER_OF(KdbCommandHistoryBuffer); - Length2 = KdbCommandHistoryBufferIndex; - Length1 -= Length2; - } - - /* Remove previous commands until there is enough space to append the new command */ - for (i = KdbCommandHistoryIndex; KdbCommandHistory[i];) - { - if ((Length2 > 0 && - (KdbCommandHistory[i] >= Buffer || - KdbCommandHistory[i] < (KdbCommandHistoryBuffer + KdbCommandHistoryBufferIndex))) || - (Length2 <= 0 && - (KdbCommandHistory[i] >= Buffer && - KdbCommandHistory[i] < (KdbCommandHistoryBuffer + KdbCommandHistoryBufferIndex)))) - { - KdbCommandHistory[i] = NULL; - } - - i--; - if (i < 0) - i = RTL_NUMBER_OF(KdbCommandHistory) - 1; - - if (i == KdbCommandHistoryIndex) - break; - } - - /* Make sure the new command history entry is free */ - KdbCommandHistoryIndex++; - KdbCommandHistoryIndex %= RTL_NUMBER_OF(KdbCommandHistory); - if (KdbCommandHistory[KdbCommandHistoryIndex]) - { - KdbCommandHistory[KdbCommandHistoryIndex] = NULL; - } - - /* Append command */ - KdbCommandHistory[KdbCommandHistoryIndex] = Buffer; - ASSERT((KdbCommandHistory[KdbCommandHistoryIndex] + Length1) <= KdbCommandHistoryBuffer + RTL_NUMBER_OF(KdbCommandHistoryBuffer)); - memcpy(KdbCommandHistory[KdbCommandHistoryIndex], Command, Length1); - if (Length2 > 0) - { - memcpy(KdbCommandHistoryBuffer, Command + Length1, Length2); - } -} - /** * @brief Reads a line of user input from the terminal. * @@ -3358,8 +3282,7 @@ KdbpReadCommand( BOOLEAN EchoOn; static CHAR LastCommand[1024]; static CHAR NextKey = '\0'; - INT CmdHistIndex = -1; - INT_PTR i; + LONG CmdHistIndex = -1; // Start at end of history. /* Bail out if the buffer is zero-sized */ if (Size == 0) @@ -3445,6 +3368,7 @@ KdbpReadCommand( } else if (Key == KEY_BS || Key == KEY_DEL) { + /* Erase the last character */ if (Buffer > Orig) { Buffer--; @@ -3456,29 +3380,15 @@ KdbpReadCommand( KdpDprintf(" %c", KEY_BS); } } - else if (ScanCode == KEY_SCAN_UP) + else if (ScanCode == KEY_SCAN_UP || ScanCode == KEY_SCAN_DOWN) { - BOOLEAN Print = TRUE; - - if (CmdHistIndex < 0) + PCSTR CmdHistory = KdbGetHistoryEntry(&CmdHistIndex, + (ScanCode == KEY_SCAN_DOWN)); + if (CmdHistory) { - CmdHistIndex = KdbCommandHistoryIndex; - } - else - { - i = CmdHistIndex - 1; - - if (i < 0) - CmdHistIndex = RTL_NUMBER_OF(KdbCommandHistory) - 1; - - if (KdbCommandHistory[i] && i != KdbCommandHistoryIndex) - CmdHistIndex = i; - else - Print = FALSE; - } + SIZE_T i; - if (Print && KdbCommandHistory[CmdHistIndex]) - { + /* Erase the whole line */ while (Buffer > Orig) { Buffer--; @@ -3490,43 +3400,13 @@ KdbpReadCommand( KdpDprintf(" %c", KEY_BS); } - i = min(strlen(KdbCommandHistory[CmdHistIndex]), Size - 1); - memcpy(Orig, KdbCommandHistory[CmdHistIndex], i); + i = min(strlen(CmdHistory), Size - 1); + memcpy(Orig, CmdHistory, i); Orig[i] = '\0'; Buffer = Orig + i; KdpDprintf("%s", Orig); } } - else if (ScanCode == KEY_SCAN_DOWN) - { - if (CmdHistIndex > 0 && CmdHistIndex != KdbCommandHistoryIndex) - { - i = CmdHistIndex + 1; - if (i >= (INT)RTL_NUMBER_OF(KdbCommandHistory)) - i = 0; - - if (KdbCommandHistory[i]) - { - CmdHistIndex = i; - while (Buffer > Orig) - { - Buffer--; - *Buffer = '\0'; - - if (EchoOn) - KdpDprintf("%c %c", KEY_BS, KEY_BS); - else - KdpDprintf(" %c", KEY_BS); - } - - i = min(strlen(KdbCommandHistory[CmdHistIndex]), Size - 1); - memcpy(Orig, KdbCommandHistory[CmdHistIndex], i); - Orig[i] = '\0'; - Buffer = Orig + i; - KdpDprintf("%s", Orig); - } - } - } else { /* Don't accept any key if the buffer is full */ diff --git a/ntoskrnl/kdbg/kdb_cmdhist.c b/ntoskrnl/kdbg/kdb_cmdhist.c new file mode 100644 index 00000000000..c1f1fcb1eae --- /dev/null +++ b/ntoskrnl/kdbg/kdb_cmdhist.c @@ -0,0 +1,162 @@ +/* + * PROJECT: ReactOS KDBG Kernel Debugger + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Command History helpers + * COPYRIGHT: Copyright 2005 Gregor Anich <blight(a)blight.eu.org> + * Copyright 2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> + +/* GLOBALS *******************************************************************/ + +/** + * History range in ring buffer: + * (KdbCommandHistoryIndex; RTL_NUMBER_OF(KdbCommandHistory) - 1] + * and [0; KdbCommandHistoryIndex]. + **/ + +/* Command history string ring buffer */ +static CHAR KdbCommandHistoryBuffer[2048]; +/* Command history ring buffer */ +static PCHAR KdbCommandHistory[sizeof(KdbCommandHistoryBuffer) / 8] = { NULL }; +static LONG KdbCommandHistoryBufferIndex = 0; +static LONG KdbCommandHistoryIndex = 0; + +/* FUNCTIONS *****************************************************************/ + +/** + * @brief Appends a command to the command history. + * + * @param[in] Command + * Pointer to the command to append to the history. + **/ +VOID +KdbpCommandHistoryAppend( + _In_ PCSTR Command) +{ + SIZE_T Length1 = strlen(Command) + 1; + SIZE_T Length2 = 0; + LONG i; + PCHAR Buffer; + + ASSERT(Length1 <= RTL_NUMBER_OF(KdbCommandHistoryBuffer)); + + /* + * Do not append the string if: + * - it is empty (just the NULL terminator); + * - or the last command is the same. + */ + if (Length1 <= 1 || + (KdbCommandHistory[KdbCommandHistoryIndex] && + strcmp(KdbCommandHistory[KdbCommandHistoryIndex], Command) == 0)) + { + return; + } + + /* Calculate Length1 and Length2 */ + Buffer = KdbCommandHistoryBuffer + KdbCommandHistoryBufferIndex; + KdbCommandHistoryBufferIndex += Length1; + if (KdbCommandHistoryBufferIndex >= (LONG)RTL_NUMBER_OF(KdbCommandHistoryBuffer)) + { + KdbCommandHistoryBufferIndex -= RTL_NUMBER_OF(KdbCommandHistoryBuffer); + Length2 = KdbCommandHistoryBufferIndex; + Length1 -= Length2; + } + + /* Remove previous commands until there is enough space to append the new command */ + for (i = KdbCommandHistoryIndex; KdbCommandHistory[i];) + { + if ((Length2 > 0 && + (KdbCommandHistory[i] >= Buffer || + KdbCommandHistory[i] < (KdbCommandHistoryBuffer + KdbCommandHistoryBufferIndex))) || + (Length2 <= 0 && + (KdbCommandHistory[i] >= Buffer && + KdbCommandHistory[i] < (KdbCommandHistoryBuffer + KdbCommandHistoryBufferIndex)))) + { + KdbCommandHistory[i] = NULL; + } + + i--; + if (i < 0) + i = RTL_NUMBER_OF(KdbCommandHistory) - 1; + + if (i == KdbCommandHistoryIndex) + break; + } + + /* Make sure the new command history entry is free */ + KdbCommandHistoryIndex++; + KdbCommandHistoryIndex %= RTL_NUMBER_OF(KdbCommandHistory); + if (KdbCommandHistory[KdbCommandHistoryIndex]) + { + KdbCommandHistory[KdbCommandHistoryIndex] = NULL; + } + + /* Append command */ + KdbCommandHistory[KdbCommandHistoryIndex] = Buffer; + ASSERT((KdbCommandHistory[KdbCommandHistoryIndex] + Length1) <= KdbCommandHistoryBuffer + RTL_NUMBER_OF(KdbCommandHistoryBuffer)); + memcpy(KdbCommandHistory[KdbCommandHistoryIndex], Command, Length1); + if (Length2 > 0) + { + memcpy(KdbCommandHistoryBuffer, Command + Length1, Length2); + } +} + +static PCSTR +KdbpGetPrevHistoryEntry( + _Inout_ PLONG NextIndex) +{ + if (*NextIndex < 0) + { + /* Start at the end of the history */ + *NextIndex = KdbCommandHistoryIndex; + } + else + { + LONG i = *NextIndex - 1; + if (i < 0) + *NextIndex = RTL_NUMBER_OF(KdbCommandHistory) - 1; + + if (KdbCommandHistory[i] && i != KdbCommandHistoryIndex) + *NextIndex = i; + else + return NULL; + } + + return KdbCommandHistory[*NextIndex]; +} + +static PCSTR +KdbpGetNextHistoryEntry( + _Inout_ PLONG NextIndex) +{ + LONG i; + + if (!(*NextIndex > 0 && *NextIndex != KdbCommandHistoryIndex)) + return NULL; + + i = *NextIndex + 1; + if (i >= (LONG)RTL_NUMBER_OF(KdbCommandHistory)) + i = 0; + + if (KdbCommandHistory[i]) + *NextIndex = i; + + return KdbCommandHistory[i]; +} + +PCSTR +KdbGetHistoryEntry( + _Inout_ PLONG NextIndex, + _In_ BOOLEAN Next) +{ + if (Next) + return KdbpGetNextHistoryEntry(NextIndex); + else + return KdbpGetPrevHistoryEntry(NextIndex); +} + +/* EOF */ diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 6816452fab4..648de8faf6b 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -405,6 +405,7 @@ if(NOT _WINKD_) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_cli.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_cmdhist.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_expr.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_symbols.c) endif()

1 0

[reactos] 03/04: [NTOS:KD] Split internal/kd.h into a part shared in the whole kernel and a private part only used within ntoskrnl/kd.
by Hermès Bélusca-Maïto 27 Mar '23

27 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb02a852144c89f82b236… commit eb02a852144c89f82b236b29160408edb6002230 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Mar 27 23:13:53 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 27 23:31:34 2023 +0200 [NTOS:KD] Split internal/kd.h into a part shared in the whole kernel and a private part only used within ntoskrnl/kd. --- ntoskrnl/include/internal/kd.h | 116 +-------------------------------- ntoskrnl/{include/internal => kd}/kd.h | 71 ++------------------ ntoskrnl/kd/kdmain.c | 4 -- ntoskrnl/kdbg/kdb.h | 2 +- 4 files changed, 8 insertions(+), 185 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 64b83e7a168..a180acf5478 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -5,7 +5,6 @@ // // Kernel Debugger Port Definition // -struct _KD_DISPATCH_TABLE; BOOLEAN NTAPI @@ -29,7 +28,7 @@ KdPortPutByteEx( #ifdef _NTOSKRNL_ -/* KD ROUTINES ***************************************************************/ +/* KD GLOBALS ****************************************************************/ typedef enum _KD_CONTINUE_TYPE { @@ -38,94 +37,6 @@ typedef enum _KD_CONTINUE_TYPE kdHandleException } KD_CONTINUE_TYPE; -typedef -NTSTATUS -(NTAPI *PKDP_INIT_ROUTINE)( - _In_ struct _KD_DISPATCH_TABLE *DispatchTable, - _In_ ULONG BootPhase); - -typedef -VOID -(NTAPI*PKDP_PRINT_ROUTINE)( - PCHAR String, - ULONG Length -); - -/* INIT ROUTINES *************************************************************/ - -KIRQL -NTAPI -KdbpAcquireLock( - _In_ PKSPIN_LOCK SpinLock); - -VOID -NTAPI -KdbpReleaseLock( - _In_ PKSPIN_LOCK SpinLock, - _In_ KIRQL OldIrql); - -VOID -KdpScreenAcquire(VOID); - -VOID -KdpScreenRelease(VOID); - -NTSTATUS -NTAPI -KdpScreenInit( - _In_ struct _KD_DISPATCH_TABLE *DispatchTable, - _In_ ULONG BootPhase); - -NTSTATUS -NTAPI -KdpSerialInit( - _In_ struct _KD_DISPATCH_TABLE *DispatchTable, - _In_ ULONG BootPhase); - -NTSTATUS -NTAPI -KdpDebugLogInit( - _In_ struct _KD_DISPATCH_TABLE *DispatchTable, - _In_ ULONG BootPhase); - -#ifdef KDBG -#define KdpKdbgInit KdbInitialize -#endif - - -/* KD GLOBALS ***************************************************************/ - -/* Serial debug connection */ -#define DEFAULT_DEBUG_PORT 2 /* COM2 */ -#define DEFAULT_DEBUG_COM1_IRQ 4 /* COM1 IRQ */ -#define DEFAULT_DEBUG_COM2_IRQ 3 /* COM2 IRQ */ -#define DEFAULT_DEBUG_BAUD_RATE 115200 /* 115200 Baud */ - -/* KD Native Modes */ -#define KdScreen 0 -#define KdSerial 1 -#define KdFile 2 -#define KdKdbg 3 -#define KdMax 4 - -/* KD Private Debug Modes */ -typedef struct _KDP_DEBUG_MODE -{ - union - { - struct - { - /* Native Modes */ - UCHAR Screen :1; - UCHAR Serial :1; - UCHAR File :1; - }; - - /* Generic Value */ - ULONG Value; - }; -} KDP_DEBUG_MODE; - /* KD Internal Debug Services */ typedef enum _KDP_DEBUG_SERVICE { @@ -143,31 +54,6 @@ typedef enum _KDP_DEBUG_SERVICE ThatsWhatSheSaid = 69 /* FIGURE IT OUT */ } KDP_DEBUG_SERVICE; -/* Dispatch Table for Wrapper Functions */ -typedef struct _KD_DISPATCH_TABLE -{ - LIST_ENTRY KdProvidersList; - PKDP_INIT_ROUTINE KdpInitRoutine; - PKDP_PRINT_ROUTINE KdpPrintRoutine; - NTSTATUS InitStatus; -} KD_DISPATCH_TABLE, *PKD_DISPATCH_TABLE; - -/* The current Debugging Mode */ -extern KDP_DEBUG_MODE KdpDebugMode; - -/* Port Information for the Serial Native Mode */ -extern ULONG SerialPortNumber; -extern CPPORT SerialPortInfo; - -/* Init Functions for Native Providers */ -extern PKDP_INIT_ROUTINE InitRoutines[KdMax]; - -/* Dispatch Tables for Native Providers */ -extern KD_DISPATCH_TABLE DispatchTable[KdMax]; - -/* The KD Native Provider List */ -extern LIST_ENTRY KdProviders; - #endif // _NTOSKRNL_ #if DBG && defined(_M_IX86) && !defined(_WINKD_) // See ke/i386/traphdlr.c diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/kd/kd.h similarity index 60% copy from ntoskrnl/include/internal/kd.h copy to ntoskrnl/kd/kd.h index 64b83e7a168..5672408d4c6 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/kd/kd.h @@ -1,42 +1,8 @@ #pragma once -#include <cportlib/cportlib.h> - -// -// Kernel Debugger Port Definition -// -struct _KD_DISPATCH_TABLE; - -BOOLEAN -NTAPI -KdPortInitializeEx( - PCPPORT PortInformation, - ULONG ComPortNumber -); - -BOOLEAN -NTAPI -KdPortGetByteEx( - PCPPORT PortInformation, - PUCHAR ByteReceived); - -VOID -NTAPI -KdPortPutByteEx( - PCPPORT PortInformation, - UCHAR ByteToSend -); - -#ifdef _NTOSKRNL_ - /* KD ROUTINES ***************************************************************/ -typedef enum _KD_CONTINUE_TYPE -{ - kdContinue = 0, - kdDoNotHandleException, - kdHandleException -} KD_CONTINUE_TYPE; +struct _KD_DISPATCH_TABLE; typedef NTSTATUS @@ -46,7 +12,7 @@ NTSTATUS typedef VOID -(NTAPI*PKDP_PRINT_ROUTINE)( +(NTAPI *PKDP_PRINT_ROUTINE)( PCHAR String, ULONG Length ); @@ -93,7 +59,7 @@ KdpDebugLogInit( #endif -/* KD GLOBALS ***************************************************************/ +/* KD GLOBALS ****************************************************************/ /* Serial debug connection */ #define DEFAULT_DEBUG_PORT 2 /* COM2 */ @@ -126,23 +92,6 @@ typedef struct _KDP_DEBUG_MODE }; } KDP_DEBUG_MODE; -/* KD Internal Debug Services */ -typedef enum _KDP_DEBUG_SERVICE -{ - DumpNonPagedPool = 0x1e, /* a */ - ManualBugCheck = 0x30, /* b */ - DumpNonPagedPoolStats = 0x2e, /* c */ - DumpNewNonPagedPool = 0x20, /* d */ - DumpNewNonPagedPoolStats = 0x12, /* e */ - DumpAllThreads = 0x21, /* f */ - DumpUserThreads = 0x22, /* g */ - KdSpare1 = 0x23, /* h */ - KdSpare2 = 0x17, /* i */ - KdSpare3 = 0x24, /* j */ - EnterDebugger = 0x25, /* k */ - ThatsWhatSheSaid = 69 /* FIGURE IT OUT */ -} KDP_DEBUG_SERVICE; - /* Dispatch Table for Wrapper Functions */ typedef struct _KD_DISPATCH_TABLE { @@ -159,6 +108,9 @@ extern KDP_DEBUG_MODE KdpDebugMode; extern ULONG SerialPortNumber; extern CPPORT SerialPortInfo; +/* Logging file path */ +extern ANSI_STRING KdpLogFileName; + /* Init Functions for Native Providers */ extern PKDP_INIT_ROUTINE InitRoutines[KdMax]; @@ -167,14 +119,3 @@ extern KD_DISPATCH_TABLE DispatchTable[KdMax]; /* The KD Native Provider List */ extern LIST_ENTRY KdProviders; - -#endif // _NTOSKRNL_ - -#if DBG && defined(_M_IX86) && !defined(_WINKD_) // See ke/i386/traphdlr.c -#define ID_Win32PreServiceHook 'WSH0' -#define ID_Win32PostServiceHook 'WSH1' -typedef void (NTAPI *PKDBG_PRESERVICEHOOK)(ULONG, PULONG_PTR); -typedef ULONG_PTR (NTAPI *PKDBG_POSTSERVICEHOOK)(ULONG, ULONG_PTR); -extern PKDBG_PRESERVICEHOOK KeWin32PreServiceHook; -extern PKDBG_POSTSERVICEHOOK KeWin32PostServiceHook; -#endif diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index 6281f43ab8f..77515b0bf3c 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -11,10 +11,6 @@ #define NDEBUG #include <debug.h> -/* VARIABLES ***************************************************************/ - -extern ANSI_STRING KdpLogFileName; - /* PUBLIC FUNCTIONS *********************************************************/ static PCHAR diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 6a5027ec2e8..cd7a0b5bec6 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -1,5 +1,5 @@ #pragma once -#include "internal/kd.h" +#include "../kd/kd.h" /* TYPES *********************************************************************/

1 0

[reactos] 02/04: [NTOS:KD] Update file headers.
by Hermès Bélusca-Maïto 27 Mar '23

27 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfd07a02f1872e1964c24… commit bfd07a02f1872e1964c2420a0e12874cb0b11b0c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 26 01:32:33 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 27 23:31:33 2023 +0200 [NTOS:KD] Update file headers. --- ntoskrnl/kd/kdps2kbd.c | 20 ++++++++++---------- ntoskrnl/kd/kdserial.c | 19 ++++++++----------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/ntoskrnl/kd/kdps2kbd.c b/ntoskrnl/kd/kdps2kbd.c index 7b0164732ad..2f8f6661bd0 100644 --- a/ntoskrnl/kd/kdps2kbd.c +++ b/ntoskrnl/kd/kdps2kbd.c @@ -1,19 +1,19 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/kdbg/kdb_keyboard.c - * PURPOSE: Keyboard driver + * PROJECT: ReactOS KDBG Kernel Debugger Terminal Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: PS/2 Keyboard driver + * COPYRIGHT: Copyright 2001 David Welch <welch(a)cwcom.net> + * Copyright 2004 Art Yerkes <ayerkes(a)speakeasy.net> + * Copyright 2005 Gregor Anich <blight(a)blight.eu.org> + * Copyright 2009-2011 Dmitry Gorbachev <gorbachev(a)reactos.org> * - * PROGRAMMERS: Victor Kirhenshtein (sauros(a)iname.com) - * Jason Filby (jasonfilby(a)yahoo.com) + * NOTE: Adapted from historic PS/2 keyboard driver authored by + * Victor Kirhenshtein <sauros(a)iname.com> and Jason Filby <jasonfilby(a)yahoo.com> */ -/* INCLUDES ****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - #define KBD_STATUS_REG 0x64 #define KBD_CNTL_REG 0x64 diff --git a/ntoskrnl/kd/kdserial.c b/ntoskrnl/kd/kdserial.c index 38828065875..ff3ecf05274 100644 --- a/ntoskrnl/kd/kdserial.c +++ b/ntoskrnl/kd/kdserial.c @@ -1,19 +1,16 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/kdbg/kdb_serial.c - * PURPOSE: Serial driver - * - * PROGRAMMERS: Victor Kirhenshtein (sauros(a)iname.com) - * Jason Filby (jasonfilby(a)yahoo.com) - * arty + * PROJECT: ReactOS KDBG Kernel Debugger Terminal Driver + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Serial driver + * COPYRIGHT: Copyright 2004 Art Yerkes <ayerkes(a)speakeasy.net> + * Copyright 2005 Gregor Anich <blight(a)blight.eu.org> */ -/* INCLUDES ****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> + +/* FUNCTIONS *****************************************************************/ CHAR KdbpTryGetCharSerial(ULONG Retry)

1 0

[reactos] 01/04: [NTOS:KD:KDBG] Move some files to a better place.
by Hermès Bélusca-Maïto 27 Mar '23

27 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fafe54f89649a654c2b6… commit 6fafe54f89649a654c2b6b9737ae3387f645ea36 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 26 01:28:59 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 27 23:31:28 2023 +0200 [NTOS:KD:KDBG] Move some files to a better place. --- ntoskrnl/include/internal/kd.h | 19 ------------------- ntoskrnl/kd/arm/{kdbg.c => kdserial.c} | 0 ntoskrnl/kd/i386/{kdbg.c => kdserial.c} | 0 ntoskrnl/{kdbg/kdb_keyboard.c => kd/kdps2kbd.c} | 0 ntoskrnl/{kdbg/kdb_serial.c => kd/kdserial.c} | 0 ntoskrnl/{kd => kdbg}/i386/kdmemsup.c | 3 --- ntoskrnl/kdbg/kdb.h | 16 ++++++++++++++++ ntoskrnl/ntos.cmake | 15 ++++++--------- 8 files changed, 22 insertions(+), 31 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 424ae89fe1f..64b83e7a168 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -93,25 +93,6 @@ KdpDebugLogInit( #endif -/* KD ROUTINES ***************************************************************/ - -BOOLEAN -NTAPI -KdpSafeReadMemory( - IN ULONG_PTR Addr, - IN LONG Len, - OUT PVOID Value -); - -BOOLEAN -NTAPI -KdpSafeWriteMemory( - IN ULONG_PTR Addr, - IN LONG Len, - IN ULONGLONG Value -); - - /* KD GLOBALS ***************************************************************/ /* Serial debug connection */ diff --git a/ntoskrnl/kd/arm/kdbg.c b/ntoskrnl/kd/arm/kdserial.c similarity index 100% rename from ntoskrnl/kd/arm/kdbg.c rename to ntoskrnl/kd/arm/kdserial.c diff --git a/ntoskrnl/kd/i386/kdbg.c b/ntoskrnl/kd/i386/kdserial.c similarity index 100% rename from ntoskrnl/kd/i386/kdbg.c rename to ntoskrnl/kd/i386/kdserial.c diff --git a/ntoskrnl/kdbg/kdb_keyboard.c b/ntoskrnl/kd/kdps2kbd.c similarity index 100% rename from ntoskrnl/kdbg/kdb_keyboard.c rename to ntoskrnl/kd/kdps2kbd.c diff --git a/ntoskrnl/kdbg/kdb_serial.c b/ntoskrnl/kd/kdserial.c similarity index 100% rename from ntoskrnl/kdbg/kdb_serial.c rename to ntoskrnl/kd/kdserial.c diff --git a/ntoskrnl/kd/i386/kdmemsup.c b/ntoskrnl/kdbg/i386/kdmemsup.c similarity index 98% rename from ntoskrnl/kd/i386/kdmemsup.c rename to ntoskrnl/kdbg/i386/kdmemsup.c index 20a5824deb2..86edb18663b 100644 --- a/ntoskrnl/kd/i386/kdmemsup.c +++ b/ntoskrnl/kdbg/i386/kdmemsup.c @@ -9,15 +9,12 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/kd/i386/kdmemsup.c * PURPOSE: Kernel Debugger Safe Memory Support * * PROGRAMMERS: arty */ #include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> #define HIGH_PHYS_MASK 0x80000000 #define PAGE_TABLE_MASK 0x3ff diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 2ec084fbb13..6a5027ec2e8 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -259,6 +259,22 @@ KdbEnterDebuggerException(IN PEXCEPTION_RECORD64 ExceptionRecord, /* other functions */ +BOOLEAN +NTAPI +KdpSafeReadMemory( + IN ULONG_PTR Addr, + IN LONG Len, + OUT PVOID Value +); + +BOOLEAN +NTAPI +KdpSafeWriteMemory( + IN ULONG_PTR Addr, + IN LONG Len, + IN ULONGLONG Value +); + NTSTATUS KdbpSafeReadMemory(OUT PVOID Dest, IN PVOID Src, diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 1bef231351f..6816452fab4 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -366,7 +366,6 @@ elseif(ARCH STREQUAL "arm") ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/trap.s) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/config/arm/cmhardwr.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/arm/kdarm.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/cpu.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/exp.c @@ -387,21 +386,19 @@ if(NOT _WINKD_) endif() if(ARCH STREQUAL "i386") - list(APPEND SOURCE - ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c) + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdserial.c) if(KDBG) list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/kdb_help.S) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/i386-dis.c) endif() elseif(ARCH STREQUAL "amd64") - list(APPEND SOURCE - ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c) + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdserial.c) if(KDBG) list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/amd64/kdb_help.S) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/i386-dis.c) endif() elseif(ARCH STREQUAL "arm") - list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c) + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdserial.c) endif() if(KDBG) @@ -409,14 +406,14 @@ if(NOT _WINKD_) ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_cli.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_expr.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_keyboard.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_serial.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_symbols.c) endif() list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdio.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c) + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdps2kbd.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdserial.c) else() add_definitions(-D_WINKD_)

1 0

[reactos] 01/01: [MSPAINT] Simplify OFNHookProc and FileExtFromFilter
by Katayama Hirofumi MZ 22 Mar '23

22 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c8d578a15e7e244c63a9… commit 5c8d578a15e7e244c63a9aaf0272efc33578d70b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Mar 22 10:42:21 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Mar 22 10:42:21 2023 +0900 [MSPAINT] Simplify OFNHookProc and FileExtFromFilter ... by using PathFindExtension and PathFindFileName. CORE-18867 --- base/applications/mspaint/main.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 1099f6af3f8..170610c7748 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -57,7 +57,7 @@ CTextEditWindow textEditWindow; // get file name extension from filter string static BOOL -FileExtFromFilter(LPTSTR pExt, LPCTSTR pTitle, OPENFILENAME *pOFN) +FileExtFromFilter(LPTSTR pExt, OPENFILENAME *pOFN) { LPTSTR pchExt = pExt; *pchExt = 0; @@ -96,19 +96,9 @@ OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) hParent = GetParent(hwnd); TCHAR Path[MAX_PATH]; SendMessage(hParent, CDM_GETFILEPATH, _countof(Path), (LPARAM)Path); - LPTSTR pchTitle = _tcsrchr(Path, _T('\\')); - if (pchTitle == NULL) - pchTitle = _tcsrchr(Path, _T('/')); - - LPTSTR pch = _tcsrchr((pchTitle ? pchTitle : Path), _T('.')); - if (pch && pchTitle) - { - pchTitle++; - *pch = 0; - FileExtFromFilter(pch, pchTitle, pon->lpOFN); - SendMessage(hParent, CDM_SETCONTROLTEXT, 0x047c, (LPARAM)pchTitle); - lstrcpyn(pon->lpOFN->lpstrFile, Path, pon->lpOFN->nMaxFile); - } + FileExtFromFilter(PathFindExtension(Path), pon->lpOFN); + SendMessage(hParent, CDM_SETCONTROLTEXT, 0x047c, (LPARAM)PathFindFileName(Path)); + lstrcpyn(pon->lpOFN->lpstrFile, Path, pon->lpOFN->nMaxFile); } break; }

1 0

[reactos] 01/01: [COMCTL32][USER32] EDIT: Default processing on WM_IME_SELECT/WM_IME_CONTROL (#5173)
by Katayama Hirofumi MZ 22 Mar '23

22 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be518f9f5a5d1c3cc0ef7… commit be518f9f5a5d1c3cc0ef765ca16e4f3dfd1ffbc6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Mar 22 09:09:38 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 22 09:09:38 2023 +0900 [COMCTL32][USER32] EDIT: Default processing on WM_IME_SELECT/WM_IME_CONTROL (#5173) Do default processing on WM_IME_SELECT and WM_IME_CONTROL messages in EDIT controls. CORE-11700, CORE-15289 --- dll/win32/comctl32/edit.c | 6 ++++++ win32ss/user/user32/controls/edit.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index 15365715bb3..0a0023908a6 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -4997,9 +4997,15 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_IME_SELECT: +#ifdef __REACTOS__ + result = DefWindowProcW(hwnd, msg, wParam, lParam); +#endif break; case WM_IME_CONTROL: +#ifdef __REACTOS__ + result = DefWindowProcW(hwnd, msg, wParam, lParam); +#endif break; case WM_IME_REQUEST: diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index 46a0ed5b8b7..419f13ff16e 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -5310,9 +5310,15 @@ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP break; case WM_IME_SELECT: +#ifdef __REACTOS__ + result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); +#endif break; case WM_IME_CONTROL: +#ifdef __REACTOS__ + result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); +#endif break; case WM_IME_REQUEST:

1 0

[reactos] 01/01: [MSPAINT] Improve CMiniatureWindow::OnPaint
by Katayama Hirofumi MZ 21 Mar '23

21 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=68e6820ddf3ddf5d19c7d… commit 68e6820ddf3ddf5d19c7d89c14964ad7f5635c95 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Mar 22 08:10:26 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Mar 22 08:10:26 2023 +0900 [MSPAINT] Improve CMiniatureWindow::OnPaint CORE-18867 --- base/applications/mspaint/miniature.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/base/applications/mspaint/miniature.cpp b/base/applications/mspaint/miniature.cpp index 6df83aee49a..b9efd889a81 100644 --- a/base/applications/mspaint/miniature.cpp +++ b/base/applications/mspaint/miniature.cpp @@ -22,12 +22,14 @@ LRESULT CMiniatureWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& LRESULT CMiniatureWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - DefWindowProc(WM_PAINT, wParam, lParam); - RECT mclient; - HDC hdc; - miniature.GetClientRect(&mclient); - hdc = miniature.GetDC(); - StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, imageModel.GetDC(), 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), SRCCOPY); - miniature.ReleaseDC(hdc); + RECT rc; + GetClientRect(&rc); + + PAINTSTRUCT ps; + HDC hDC = BeginPaint(&ps); + StretchBlt(hDC, 0, 0, rc.right, rc.bottom, + imageModel.GetDC(), 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), + SRCCOPY); + EndPaint(&ps); return 0; }

1 0

[reactos] 01/01: [UNIATA] Fix Memory leak while claiming PCI IDE controller (#5053)
by Atharva Kulkarni 21 Mar '23

21 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=08248e83a0babebef805a… commit 08248e83a0babebef805a0df3bdd0d59b2e7b82e Author: Atharva Kulkarni <atharvak1910(a)gmail.com> AuthorDate: Wed Mar 22 03:31:18 2023 +0530 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Mar 22 01:01:18 2023 +0300 [UNIATA] Fix Memory leak while claiming PCI IDE controller (#5053) HalAssignSlotResources will allocate a new resource list which the caller must free. --- drivers/storage/ide/uniata/id_probe.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/storage/ide/uniata/id_probe.cpp b/drivers/storage/ide/uniata/id_probe.cpp index 1ca49d248ec..c950e6f9d8f 100644 --- a/drivers/storage/ide/uniata/id_probe.cpp +++ b/drivers/storage/ide/uniata/id_probe.cpp @@ -1941,8 +1941,11 @@ UniataClaimLegacyPCIIDE( ) { NTSTATUS status; - PCM_RESOURCE_LIST resourceList = NULL; UNICODE_STRING devname; + PCM_RESOURCE_LIST resourceList = NULL; +#ifdef __REACTOS__ + PCM_RESOURCE_LIST oldResList = NULL; +#endif KdPrint2((PRINT_PREFIX "UniataClaimLegacyPCIIDE:\n")); @@ -1970,6 +1973,10 @@ UniataClaimLegacyPCIIDE( del_do: IoDeleteDevice(BMList[i].PciIdeDevObj); BMList[i].PciIdeDevObj = NULL; +#ifdef __REACTOS__ + if (oldResList) + ExFreePool(oldResList); +#endif return status; } @@ -1977,6 +1984,10 @@ del_do: resourceList, sizeof(CM_RESOURCE_LIST)); +#ifdef __REACTOS__ + oldResList = resourceList; +#endif + // IoReportDetectedDevice() should be used for WDM OSes // TODO: check if resourceList is actually used inside HalAssignSlotResources() @@ -2006,6 +2017,11 @@ del_do: goto del_do; } +#ifdef __REACTOS__ + ExFreePool(resourceList); + ExFreePool(oldResList); +#endif + KdPrint2((PRINT_PREFIX "ok %#x\n", status)); BMList[i].ChanInitOk |= 0x80;

1 0

[reactos] 01/01: [MSPAINT] Simplify TextEdit by using SizeBox (#5177)
by Katayama Hirofumi MZ 21 Mar '23

21 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb454ef9ed19382d1e644… commit cb454ef9ed19382d1e6449e4d7fa6cc6b8529dd6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Mar 21 13:15:08 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Mar 21 13:15:08 2023 +0900 [MSPAINT] Simplify TextEdit by using SizeBox (#5177) Reduce source code. CORE-18867 --- base/applications/mspaint/textedit.cpp | 120 ++++++--------------------------- 1 file changed, 21 insertions(+), 99 deletions(-) diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 80f87682e32..881a00bff6f 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -19,94 +19,28 @@ CTextEditWindow::CTextEditWindow() : m_hFont(NULL), m_hFontZoomed(NULL), m_nAppI SetRectEmpty(&m_rc); } -#define X0 rc.left -#define X1 ((rc.left + rc.right - CXY_GRIP) / 2) -#define X2 (rc.right - CXY_GRIP) -#define Y0 rc.top -#define Y1 ((rc.top + rc.bottom - CXY_GRIP) / 2) -#define Y2 (rc.bottom - CXY_GRIP) -#define RECT0 X0, Y0, X0 + CXY_GRIP, Y0 + CXY_GRIP // Upper Left -#define RECT1 X1, Y0, X1 + CXY_GRIP, Y0 + CXY_GRIP // Top -#define RECT2 X2, Y0, X2 + CXY_GRIP, Y0 + CXY_GRIP // Upper Right -#define RECT3 X0, Y1, X0 + CXY_GRIP, Y1 + CXY_GRIP // Left -#define RECT4 X2, Y1, X2 + CXY_GRIP, Y1 + CXY_GRIP // Right -#define RECT5 X0, Y2, X0 + CXY_GRIP, Y2 + CXY_GRIP // Lower Left -#define RECT6 X1, Y2, X1 + CXY_GRIP, Y2 + CXY_GRIP // Bottom -#define RECT7 X2, Y2, X2 + CXY_GRIP, Y2 + CXY_GRIP // Lower Right - INT CTextEditWindow::DoHitTest(RECT& rc, POINT pt) { - RECT rcGrip; - - SetRect(&rcGrip, RECT0); - if (PtInRect(&rcGrip, pt)) - return HTTOPLEFT; - SetRect(&rcGrip, RECT1); - if (PtInRect(&rcGrip, pt)) - return HTTOP; - SetRect(&rcGrip, RECT2); - if (PtInRect(&rcGrip, pt)) - return HTTOPRIGHT; - - SetRect(&rcGrip, RECT3); - if (PtInRect(&rcGrip, pt)) - return HTLEFT; - SetRect(&rcGrip, RECT4); - if (PtInRect(&rcGrip, pt)) - return HTRIGHT; - - SetRect(&rcGrip, RECT5); - if (PtInRect(&rcGrip, pt)) - return HTBOTTOMLEFT; - SetRect(&rcGrip, RECT6); - if (PtInRect(&rcGrip, pt)) - return HTBOTTOM; - SetRect(&rcGrip, RECT7); - if (PtInRect(&rcGrip, pt)) - return HTBOTTOMRIGHT; - - // On border line? - RECT rcInner = rc; - InflateRect(&rcInner, -3, -3); - if (!PtInRect(&rcInner, pt) && PtInRect(&rc, pt)) - return HTCAPTION; - - return HTCLIENT; + switch (getSizeBoxHitTest(pt, &rc)) + { + case HIT_NONE: return HTNOWHERE; + case HIT_UPPER_LEFT: return HTTOPLEFT; + case HIT_UPPER_CENTER: return HTTOP; + case HIT_UPPER_RIGHT: return HTTOPRIGHT; + case HIT_MIDDLE_LEFT: return HTLEFT; + case HIT_MIDDLE_RIGHT: return HTRIGHT; + case HIT_LOWER_LEFT: return HTBOTTOMLEFT; + case HIT_LOWER_CENTER: return HTBOTTOM; + case HIT_LOWER_RIGHT: return HTBOTTOMRIGHT; + case HIT_BORDER: return HTCAPTION; // Enable drag move + case HIT_INNER: return HTCLIENT; + } + return HTNOWHERE; } void CTextEditWindow::DrawGrip(HDC hDC, RECT& rc) { - HGDIOBJ hbrOld = SelectObject(hDC, GetStockObject(NULL_BRUSH)); - HPEN hPen = CreatePen(PS_DOT, 1, GetSysColor(COLOR_HIGHLIGHT)); - HGDIOBJ hPenOld = SelectObject(hDC, hPen); - InflateRect(&rc, -1, -1); - Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom); - InflateRect(&rc, 1, 1); - SelectObject(hDC, hPenOld); - SelectObject(hDC, hbrOld); - DeleteObject(hPen); - - RECT rcGrip; - HBRUSH hbrHighlight = GetSysColorBrush(COLOR_HIGHLIGHT); - - SetRect(&rcGrip, RECT0); - FillRect(hDC, &rcGrip, hbrHighlight); - SetRect(&rcGrip, RECT1); - FillRect(hDC, &rcGrip, hbrHighlight); - SetRect(&rcGrip, RECT2); - FillRect(hDC, &rcGrip, hbrHighlight); - - SetRect(&rcGrip, RECT3); - FillRect(hDC, &rcGrip, hbrHighlight); - SetRect(&rcGrip, RECT4); - FillRect(hDC, &rcGrip, hbrHighlight); - - SetRect(&rcGrip, RECT5); - FillRect(hDC, &rcGrip, hbrHighlight); - SetRect(&rcGrip, RECT6); - FillRect(hDC, &rcGrip, hbrHighlight); - SetRect(&rcGrip, RECT7); - FillRect(hDC, &rcGrip, hbrHighlight); + drawSizeBoxes(hDC, &rc, TRUE, NULL); } void CTextEditWindow::FixEditPos(LPCTSTR pszOldText) @@ -257,7 +191,7 @@ LRESULT CTextEditWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BO UINT nHitTest = LOWORD(lParam); if (nHitTest == HTCAPTION) { - SetCursor(LoadCursor(NULL, IDC_SIZEALL)); + ::SetCursor(::LoadCursor(NULL, IDC_SIZEALL)); // Enable drag move return FALSE; } return DefWindowProc(nMsg, wParam, lParam); @@ -477,28 +411,16 @@ void CTextEditWindow::Reposition() imageArea.GetClientRect(&rcImage); if (rc.bottom > rcImage.bottom) - { - rc.top = rcImage.bottom - (rc.bottom - rc.top); - rc.bottom = rcImage.bottom; - } + ::OffsetRect(&rc, 0, rcImage.bottom - rc.bottom); if (rc.right > rcImage.right) - { - rc.left = rcImage.right - (rc.right - rc.left); - rc.right = rcImage.right; - } + ::OffsetRect(&rc, rcImage.right - rc.right, 0); if (rc.left < 0) - { - rc.right += -rc.left; - rc.left = 0; - } + ::OffsetRect(&rc, -rc.left, 0); if (rc.top < 0) - { - rc.bottom += -rc.top; - rc.top = 0; - } + ::OffsetRect(&rc, 0, -rc.top); ++m_nAppIsMovingOrSizing; MoveWindow(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, TRUE);

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