Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/06: [CONSRV] Some code simplification and tidy up.
by Hermès Bélusca-Maïto 02 Mar '20

02 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7babd9310730a7804a9a7… commit 7babd9310730a7804a9a74de0fc1f205a7633ef9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Mar 1 17:22:05 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 2 01:08:41 2020 +0100 [CONSRV] Some code simplification and tidy up. --- win32ss/user/winsrv/consrv/condrv/console.c | 23 +++++++++------------ win32ss/user/winsrv/consrv/condrv/dummyterm.c | 2 +- win32ss/user/winsrv/consrv/condrv/graphics.c | 1 - win32ss/user/winsrv/consrv/condrv/text.c | 2 +- win32ss/user/winsrv/consrv/coninput.c | 25 +++++++++++++++++++++++ win32ss/user/winsrv/consrv/conoutput.c | 2 +- win32ss/user/winsrv/consrv/console.c | 4 ++-- win32ss/user/winsrv/consrv/frontends/input.c | 20 +++--------------- win32ss/user/winsrv/consrv/include/conio.h | 7 +++---- win32ss/user/winsrv/consrv/include/conio_winsrv.h | 8 ++++---- 10 files changed, 50 insertions(+), 44 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/console.c b/win32ss/user/winsrv/consrv/condrv/console.c index e763a812553..a3d7a13ea79 100644 --- a/win32ss/user/winsrv/consrv/condrv/console.c +++ b/win32ss/user/winsrv/consrv/condrv/console.c @@ -79,24 +79,21 @@ RemoveConsole(IN PCONSOLE Console) VOID NTAPI ConDrvPause(PCONSOLE Console) { - /* In case we already have a pause event, just exit... */ - if (Console->UnpauseEvent) return; + /* In case we are already paused, just exit... */ + if (Console->ConsolePaused) return; - /* ... otherwise create it */ - NtCreateEvent(&Console->UnpauseEvent, EVENT_ALL_ACCESS, - NULL, NotificationEvent, FALSE); + /* ... otherwise set the flag */ + Console->ConsolePaused = TRUE; } VOID NTAPI ConDrvUnpause(PCONSOLE Console) { - /* In case we already freed the event, just exit... */ - if (!Console->UnpauseEvent) return; + /* In case we are already unpaused, just exit... */ + if (!Console->ConsolePaused) return; - /* ... otherwise set and free it */ - NtSetEvent(Console->UnpauseEvent, NULL); - NtClose(Console->UnpauseEvent); - Console->UnpauseEvent = NULL; + /* ... otherwise reset the flag */ + Console->ConsolePaused = FALSE; } @@ -248,7 +245,7 @@ ConDrvInitConsole(OUT PCONSOLE* NewConsole, } /* Make the new screen buffer active */ Console->ActiveBuffer = NewBuffer; - Console->UnpauseEvent = NULL; + Console->ConsolePaused = FALSE; DPRINT("Console initialized\n"); @@ -409,7 +406,7 @@ ConDrvDeleteConsole(IN PCONSOLE Console) /* Deinitialize the input buffer */ ConDrvDeinitInputBuffer(Console); - if (Console->UnpauseEvent) NtClose(Console->UnpauseEvent); + Console->ConsolePaused = FALSE; DPRINT("ConDrvDeleteConsole - Unlocking\n"); LeaveCriticalSection(&Console->Lock); diff --git a/win32ss/user/winsrv/consrv/condrv/dummyterm.c b/win32ss/user/winsrv/consrv/condrv/dummyterm.c index 7261994f6c9..eaeb94561c7 100644 --- a/win32ss/user/winsrv/consrv/condrv/dummyterm.c +++ b/win32ss/user/winsrv/consrv/condrv/dummyterm.c @@ -61,7 +61,7 @@ DummyWriteStream(IN OUT PTERMINAL This, */ // /* Stop here if the console is paused */ - // if (Console->UnpauseEvent != NULL) return STATUS_PENDING; + // if (Console->ConsolePaused) return STATUS_PENDING; return STATUS_PENDING; } diff --git a/win32ss/user/winsrv/consrv/condrv/graphics.c b/win32ss/user/winsrv/consrv/condrv/graphics.c index 04341c6b663..694c2f52106 100644 --- a/win32ss/user/winsrv/consrv/condrv/graphics.c +++ b/win32ss/user/winsrv/consrv/condrv/graphics.c @@ -228,7 +228,6 @@ GRAPHICS_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, } NewBuffer->ViewOrigin.X = NewBuffer->ViewOrigin.Y = 0; - NewBuffer->VirtualY = 0; NewBuffer->CursorBlinkOn = FALSE; NewBuffer->ForceCursorOff = TRUE; diff --git a/win32ss/user/winsrv/consrv/condrv/text.c b/win32ss/user/winsrv/consrv/condrv/text.c index d38317de29a..2b568652ec2 100644 --- a/win32ss/user/winsrv/consrv/condrv/text.c +++ b/win32ss/user/winsrv/consrv/condrv/text.c @@ -793,7 +793,7 @@ ConDrvWriteConsole(IN PCONSOLE Console, ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCharsToWrite == 0)); /* Stop here if the console is paused */ - if (Console->UnpauseEvent != NULL) return STATUS_PENDING; + if (Console->ConsolePaused) return STATUS_PENDING; /* Convert the string to UNICODE */ if (Unicode) diff --git a/win32ss/user/winsrv/consrv/coninput.c b/win32ss/user/winsrv/consrv/coninput.c index d8f5b24d9db..8c2e0e82adb 100644 --- a/win32ss/user/winsrv/consrv/coninput.c +++ b/win32ss/user/winsrv/consrv/coninput.c @@ -202,6 +202,31 @@ ConioProcessInputEvent(PCONSRV_CONSOLE Console, PINPUT_RECORD InputEvent) { ULONG NumEventsWritten; + + if (InputEvent->EventType == KEY_EVENT) + { + BOOL Down = InputEvent->Event.KeyEvent.bKeyDown; + UINT VirtualKeyCode = InputEvent->Event.KeyEvent.wVirtualKeyCode; + DWORD ShiftState = InputEvent->Event.KeyEvent.dwControlKeyState; + + /* Process Ctrl-C and Ctrl-Break */ + if ( (GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT) && + Down && (VirtualKeyCode == VK_PAUSE || VirtualKeyCode == 'C') && + (ShiftState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) ) + { + DPRINT1("Console_Api Ctrl-C\n"); + ConSrvConsoleProcessCtrlEvent(Console, 0, CTRL_C_EVENT); + + if (Console->LineBuffer && !Console->LineComplete) + { + /* Line input is in progress; end it */ + Console->LinePos = Console->LineSize = 0; + Console->LineComplete = TRUE; + } + return STATUS_SUCCESS; // STATUS_CONTROL_C_EXIT; + } + } + return ConioAddInputEvents(Console, InputEvent, 1, diff --git a/win32ss/user/winsrv/consrv/conoutput.c b/win32ss/user/winsrv/consrv/conoutput.c index 15fd4ff5ede..173926032ed 100644 --- a/win32ss/user/winsrv/consrv/conoutput.c +++ b/win32ss/user/winsrv/consrv/conoutput.c @@ -206,7 +206,7 @@ CSR_API(SrvCreateConsoleScreenBuffer) TEXTMODE_BUFFER_INFO TextModeInfo = {{80, 25}, {80, 25}, DEFAULT_SCREEN_ATTRIB, - DEFAULT_POPUP_ATTRIB , + DEFAULT_POPUP_ATTRIB, TRUE, CSR_DEFAULT_CURSOR_SIZE}; GRAPHICS_BUFFER_INFO GraphicsInfo; diff --git a/win32ss/user/winsrv/consrv/console.c b/win32ss/user/winsrv/consrv/console.c index 8b50465bfad..f838376204d 100644 --- a/win32ss/user/winsrv/consrv/console.c +++ b/win32ss/user/winsrv/consrv/console.c @@ -240,14 +240,14 @@ ConsoleFreeUnicodeString(IN PUNICODE_STRING UnicodeString) } VOID -ConioPause(PCONSRV_CONSOLE Console, UINT Flags) +ConioPause(PCONSRV_CONSOLE Console, UCHAR Flags) { Console->PauseFlags |= Flags; ConDrvPause((PCONSOLE)Console); } VOID -ConioUnpause(PCONSRV_CONSOLE Console, UINT Flags) +ConioUnpause(PCONSRV_CONSOLE Console, UCHAR Flags) { Console->PauseFlags &= ~Flags; diff --git a/win32ss/user/winsrv/consrv/frontends/input.c b/win32ss/user/winsrv/consrv/frontends/input.c index 8bc0ad0ffae..053e2006efb 100644 --- a/win32ss/user/winsrv/consrv/frontends/input.c +++ b/win32ss/user/winsrv/consrv/frontends/input.c @@ -34,17 +34,20 @@ ConioGetShiftState(PBYTE KeyState, LPARAM lParam) ssOut |= SCROLLLOCK_ON; if (KeyState[VK_SHIFT] & 0x80) + // || (KeyState[VK_LSHIFT] & 0x80) || (KeyState[VK_RSHIFT] & 0x80) ssOut |= SHIFT_PRESSED; if (KeyState[VK_LCONTROL] & 0x80) ssOut |= LEFT_CTRL_PRESSED; if (KeyState[VK_RCONTROL] & 0x80) ssOut |= RIGHT_CTRL_PRESSED; + // if (KeyState[VK_CONTROL] & 0x80) { ... } if (KeyState[VK_LMENU] & 0x80) ssOut |= LEFT_ALT_PRESSED; if (KeyState[VK_RMENU] & 0x80) ssOut |= RIGHT_ALT_PRESSED; + // if (KeyState[VK_MENU] & 0x80) { ... } /* See WM_CHAR MSDN documentation for instance */ if (lParam & 0x01000000) @@ -124,23 +127,6 @@ ConioProcessKey(PCONSRV_CONSOLE Console, MSG* msg) if (Fake) return; - /* Process Ctrl-C and Ctrl-Break */ - if ( (GetConsoleInputBufferMode(Console) & ENABLE_PROCESSED_INPUT) && - Down && (VirtualKeyCode == VK_PAUSE || VirtualKeyCode == 'C') && - (ShiftState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) || KeyState[VK_CONTROL] & 0x80) ) - { - DPRINT1("Console_Api Ctrl-C\n"); - ConSrvConsoleProcessCtrlEvent(Console, 0, CTRL_C_EVENT); - - if (Console->LineBuffer && !Console->LineComplete) - { - /* Line input is in progress; end it */ - Console->LinePos = Console->LineSize = 0; - Console->LineComplete = TRUE; - } - return; - } - // // FIXME: Scrolling via keyboard shortcuts must be done differently, // without touching the internal VirtualY variable. diff --git a/win32ss/user/winsrv/consrv/include/conio.h b/win32ss/user/winsrv/consrv/include/conio.h index cff5de40975..dc68afc4898 100644 --- a/win32ss/user/winsrv/consrv/include/conio.h +++ b/win32ss/user/winsrv/consrv/include/conio.h @@ -93,8 +93,6 @@ struct _CONSOLE_SCREEN_BUFFER COORD ViewOrigin; /* Beginning offset for the actual display area */ /***** Put that VV in TEXTMODE_SCREEN_BUFFER ?? *****/ - USHORT VirtualY; /* Top row of buffer being displayed, reported to callers */ - COORD CursorPosition; /* Current cursor position */ BOOLEAN CursorBlinkOn; BOOLEAN ForceCursorOff; @@ -152,6 +150,7 @@ typedef struct _TEXTMODE_SCREEN_BUFFER { CONSOLE_SCREEN_BUFFER; /* Screen buffer base class - MUST BE IN FIRST PLACE */ + USHORT VirtualY; /* Top row of buffer being displayed, reported to callers */ PCHAR_INFO Buffer; /* Pointer to UNICODE screen buffer (Buffer->Char.UnicodeChar only is valid, not Char.AsciiChar) */ USHORT ScreenDefaultAttrib; /* Default screen char attribute */ @@ -333,7 +332,7 @@ typedef struct _CONSOLE CONSOLE_STATE State; /* State of the console */ TERMINAL TermIFace; /* Terminal-specific interface */ - HANDLE UnpauseEvent; /* When != NULL, event for pausing the console */ + BOOLEAN ConsolePaused; /* If TRUE, the console is paused */ /******************************** Input buffer ********************************/ CONSOLE_INPUT_BUFFER InputBuffer; /* Input buffer of the console */ @@ -367,7 +366,7 @@ ConSrvConsoleCtrlEvent(IN ULONG CtrlEvent, /* conoutput.c */ PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); -NTSTATUS ConioResizeBuffer(PCONSOLE /*PCONSRV_CONSOLE*/ Console, +NTSTATUS ConioResizeBuffer(PCONSOLE Console, PTEXTMODE_SCREEN_BUFFER ScreenBuffer, COORD Size); diff --git a/win32ss/user/winsrv/consrv/include/conio_winsrv.h b/win32ss/user/winsrv/consrv/include/conio_winsrv.h index 5057a31e4ad..a77bfcb0d39 100644 --- a/win32ss/user/winsrv/consrv/include/conio_winsrv.h +++ b/win32ss/user/winsrv/consrv/include/conio_winsrv.h @@ -152,7 +152,7 @@ typedef struct _WINSRV_CONSOLE BOOLEAN HasFocus; /* TRUE if the console has focus (is in the foreground) */ /******************************* Pausing support ******************************/ - BYTE PauseFlags; + UCHAR PauseFlags; LIST_ENTRY ReadWaitQueue; /* List head for the queue of unique input buffer read wait blocks */ LIST_ENTRY WriteWaitQueue; /* List head for the queue of current screen-buffer write wait blocks */ @@ -197,8 +197,8 @@ typedef struct _WINSRV_CONSOLE } WINSRV_CONSOLE; // , *PWINSRV_CONSOLE; /* console.c */ -VOID ConioPause(PCONSRV_CONSOLE Console, UINT Flags); -VOID ConioUnpause(PCONSRV_CONSOLE Console, UINT Flags); +VOID ConioPause(PCONSRV_CONSOLE Console, UCHAR Flags); +VOID ConioUnpause(PCONSRV_CONSOLE Console, UCHAR Flags); PCONSOLE_PROCESS_DATA NTAPI ConSrvGetConsoleLeaderProcess(IN PCONSRV_CONSOLE Console); @@ -227,7 +227,7 @@ ConioProcessInputEvent(PCONSRV_CONSOLE Console, /* conoutput.c */ PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); -NTSTATUS ConioResizeBuffer(PCONSOLE /*PCONSRV_CONSOLE*/ Console, +NTSTATUS ConioResizeBuffer(PCONSOLE Console, PTEXTMODE_SCREEN_BUFFER ScreenBuffer, COORD Size);

1 0

[reactos] 04/06: [CONSRV] Use NtClearEvent() and NtClose() instead of the Win32 functions.
by Hermès Bélusca-Maïto 02 Mar '20

02 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=31c13e89fe5942cfba167… commit 31c13e89fe5942cfba167d4c5f3c6e41a191faaf Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 29 20:11:09 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 2 01:08:40 2020 +0100 [CONSRV] Use NtClearEvent() and NtClose() instead of the Win32 functions. --- win32ss/user/winsrv/consrv/condrv/coninput.c | 8 ++++---- win32ss/user/winsrv/consrv/condrv/console.c | 2 +- win32ss/user/winsrv/consrv/frontends/terminal.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/coninput.c b/win32ss/user/winsrv/consrv/condrv/coninput.c index a2041a0eae9..63549ec4511 100644 --- a/win32ss/user/winsrv/consrv/condrv/coninput.c +++ b/win32ss/user/winsrv/consrv/condrv/coninput.c @@ -185,7 +185,7 @@ PurgeInputBuffer(IN PCONSOLE_INPUT_BUFFER InputBuffer) ConsoleFreeHeap(Event); } - // CloseHandle(Console->InputBuffer.ActiveEvent); + // NtClose(Console->InputBuffer.ActiveEvent); } NTSTATUS NTAPI @@ -221,7 +221,7 @@ VOID NTAPI ConDrvDeinitInputBuffer(IN PCONSOLE Console) { PurgeInputBuffer(&Console->InputBuffer); - CloseHandle(Console->InputBuffer.ActiveEvent); + NtClose(Console->InputBuffer.ActiveEvent); } @@ -317,7 +317,7 @@ ConDrvGetConsoleInput(IN PCONSOLE Console, if (IsListEmpty(&InputBuffer->InputEvents)) { - ResetEvent(InputBuffer->ActiveEvent); + NtClearEvent(InputBuffer->ActiveEvent); } // FIXME: If we add back UNICODE support, it's here that we need to do the translation. @@ -365,7 +365,7 @@ ConDrvFlushConsoleInputBuffer(IN PCONSOLE Console, /* Discard all entries in the input event queue */ PurgeInputBuffer(InputBuffer); - ResetEvent(InputBuffer->ActiveEvent); + NtClearEvent(InputBuffer->ActiveEvent); return STATUS_SUCCESS; } diff --git a/win32ss/user/winsrv/consrv/condrv/console.c b/win32ss/user/winsrv/consrv/condrv/console.c index 50542ec3025..e763a812553 100644 --- a/win32ss/user/winsrv/consrv/condrv/console.c +++ b/win32ss/user/winsrv/consrv/condrv/console.c @@ -409,7 +409,7 @@ ConDrvDeleteConsole(IN PCONSOLE Console) /* Deinitialize the input buffer */ ConDrvDeinitInputBuffer(Console); - if (Console->UnpauseEvent) CloseHandle(Console->UnpauseEvent); + if (Console->UnpauseEvent) NtClose(Console->UnpauseEvent); DPRINT("ConDrvDeleteConsole - Unlocking\n"); LeaveCriticalSection(&Console->Lock); diff --git a/win32ss/user/winsrv/consrv/frontends/terminal.c b/win32ss/user/winsrv/consrv/frontends/terminal.c index ece6bb29933..7cb89e6b221 100644 --- a/win32ss/user/winsrv/consrv/frontends/terminal.c +++ b/win32ss/user/winsrv/consrv/frontends/terminal.c @@ -365,7 +365,7 @@ ConSrvTermReadStream(IN OUT PTERMINAL This, CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); if (IsListEmpty(&InputBuffer->InputEvents)) { - ResetEvent(InputBuffer->ActiveEvent); + NtClearEvent(InputBuffer->ActiveEvent); } Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); @@ -430,7 +430,7 @@ ConSrvTermReadStream(IN OUT PTERMINAL This, CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); if (IsListEmpty(&InputBuffer->InputEvents)) { - ResetEvent(InputBuffer->ActiveEvent); + NtClearEvent(InputBuffer->ActiveEvent); } Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry);

1 0

[reactos] 03/06: [CONSRV] Tidy up lineinput.c by moving the History* helper prototypes to a suitable header file.
by Hermès Bélusca-Maïto 02 Mar '20

02 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e624be1eb23b85f25e934… commit e624be1eb23b85f25e93489ac8ccaf5706e6e691 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 29 19:57:50 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 2 01:08:39 2020 +0100 [CONSRV] Tidy up lineinput.c by moving the History* helper prototypes to a suitable header file. --- win32ss/user/winsrv/consrv/history.h | 26 ++++++++++++++++++++++++++ win32ss/user/winsrv/consrv/lineinput.c | 24 +----------------------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/win32ss/user/winsrv/consrv/history.h b/win32ss/user/winsrv/consrv/history.h index c3ee78a4a7e..b9615bb92d9 100644 --- a/win32ss/user/winsrv/consrv/history.h +++ b/win32ss/user/winsrv/consrv/history.h @@ -8,6 +8,32 @@ #pragma once +VOID +HistoryAddEntry(PCONSRV_CONSOLE Console, + PUNICODE_STRING ExeName, + PUNICODE_STRING Entry); + +BOOL +HistoryFindEntryByPrefix(PCONSRV_CONSOLE Console, + PUNICODE_STRING ExeName, + PUNICODE_STRING Prefix, + PUNICODE_STRING Entry); + +VOID +HistoryGetCurrentEntry(PCONSRV_CONSOLE Console, + PUNICODE_STRING ExeName, + PUNICODE_STRING Entry); + +BOOL +HistoryRecallHistory(PCONSRV_CONSOLE Console, + PUNICODE_STRING ExeName, + INT Offset, + PUNICODE_STRING Entry); + +VOID +HistoryDeleteCurrentBuffer(PCONSRV_CONSOLE Console, + PUNICODE_STRING ExeName); + VOID HistoryDeleteBuffers(PCONSRV_CONSOLE Console); VOID diff --git a/win32ss/user/winsrv/consrv/lineinput.c b/win32ss/user/winsrv/consrv/lineinput.c index 32d799531f6..5d92d59ac49 100644 --- a/win32ss/user/winsrv/consrv/lineinput.c +++ b/win32ss/user/winsrv/consrv/lineinput.c @@ -9,6 +9,7 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" +#include "history.h" #include "popup.h" #define NDEBUG @@ -31,29 +32,6 @@ ConvertInputUnicodeToAnsi(PCONSRV_CONSOLE Console, /*P*/USHORT TargetLength); -VOID -HistoryAddEntry(PCONSRV_CONSOLE Console, - PUNICODE_STRING ExeName, - PUNICODE_STRING Entry); -BOOL -HistoryRecallHistory(PCONSRV_CONSOLE Console, - PUNICODE_STRING ExeName, - INT Offset, - PUNICODE_STRING Entry); -VOID -HistoryGetCurrentEntry(PCONSRV_CONSOLE Console, - PUNICODE_STRING ExeName, - PUNICODE_STRING Entry); -VOID -HistoryDeleteCurrentBuffer(PCONSRV_CONSOLE Console, - PUNICODE_STRING ExeName); -BOOL -HistoryFindEntryByPrefix(PCONSRV_CONSOLE Console, - PUNICODE_STRING ExeName, - PUNICODE_STRING Prefix, - PUNICODE_STRING Entry); - - /* PRIVATE FUNCTIONS **********************************************************/ static VOID

1 0

[reactos] 02/06: [KERNEL32:CONSOLE] Explicitly use _WIN32_WINNT_VISTA.
by Hermès Bélusca-Maïto 02 Mar '20

02 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98b58df2bff8502024ded… commit 98b58df2bff8502024dedd7e36c68eedd222ad67 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 29 19:55:52 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 2 01:08:36 2020 +0100 [KERNEL32:CONSOLE] Explicitly use _WIN32_WINNT_VISTA. --- dll/win32/kernel32/client/console/vista.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/kernel32/client/console/vista.c b/dll/win32/kernel32/client/console/vista.c index f2bc55dc037..40fbd431ad7 100644 --- a/dll/win32/kernel32/client/console/vista.c +++ b/dll/win32/kernel32/client/console/vista.c @@ -16,7 +16,7 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -#if _WIN32_WINNT >= 0x600 +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) /* * @implemented @@ -163,6 +163,6 @@ GetCurrentConsoleFontEx(IN HANDLE hConsoleOutput, return FALSE; } -#endif +#endif // (_WIN32_WINNT >= _WIN32_WINNT_VISTA) /* EOF */

1 0

[reactos] 01/06: [CONSRV] Support history resizing from console settings and from SetConsoleHistoryInfo() server implementation.
by Hermès Bélusca-Maïto 02 Mar '20

02 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19596768cb12cfbf97937… commit 19596768cb12cfbf97937497f6952f54e0e2c116 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Feb 29 17:35:57 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 2 01:08:35 2020 +0100 [CONSRV] Support history resizing from console settings and from SetConsoleHistoryInfo() server implementation. In addition, honour the maximum number of history buffers allowed when creating new ones. Some implementation information has been obtained from https://github.com/microsoft/terminal (under MIT License). --- win32ss/user/winsrv/consrv/console.c | 7 +- .../user/winsrv/consrv/frontends/gui/guisettings.c | 14 +- win32ss/user/winsrv/consrv/history.c | 215 ++++++++++++++------- win32ss/user/winsrv/consrv/history.h | 7 + win32ss/user/winsrv/consrv/include/conio_winsrv.h | 3 +- win32ss/user/winsrv/consrv/lineinput.c | 2 + win32ss/user/winsrv/consrv/settings.c | 8 +- 7 files changed, 174 insertions(+), 82 deletions(-) diff --git a/win32ss/user/winsrv/consrv/console.c b/win32ss/user/winsrv/consrv/console.c index ea39840cfdc..8b50465bfad 100644 --- a/win32ss/user/winsrv/consrv/console.c +++ b/win32ss/user/winsrv/consrv/console.c @@ -697,9 +697,10 @@ ConSrvInitConsole(OUT PHANDLE NewConsoleHandle, /* Initialize the alias and history buffers */ Console->Aliases = NULL; InitializeListHead(&Console->HistoryBuffers); - Console->HistoryBufferSize = ConsoleInfo->HistoryBufferSize; - Console->NumberOfHistoryBuffers = ConsoleInfo->NumberOfHistoryBuffers; - Console->HistoryNoDup = ConsoleInfo->HistoryNoDup; + Console->NumberOfHistoryBuffers = 0; + Console->MaxNumberOfHistoryBuffers = ConsoleInfo->NumberOfHistoryBuffers; + Console->HistoryBufferSize = ConsoleInfo->HistoryBufferSize; + Console->HistoryNoDup = ConsoleInfo->HistoryNoDup; /* Initialize the Input Line Discipline */ Console->LineBuffer = NULL; diff --git a/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c b/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c index 912bc9d2f41..1ee89ed8a47 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c +++ b/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c @@ -132,11 +132,11 @@ GuiConsoleShowConsoleProperties(PGUI_CONSOLE_DATA GuiData, pSharedInfo->hWnd = GuiData->hWindow; /* Console information */ - pSharedInfo->HistoryBufferSize = Console->HistoryBufferSize; - pSharedInfo->NumberOfHistoryBuffers = Console->NumberOfHistoryBuffers; - pSharedInfo->HistoryNoDup = Console->HistoryNoDup; pSharedInfo->QuickEdit = Console->QuickEdit; pSharedInfo->InsertMode = Console->InsertMode; + pSharedInfo->NumberOfHistoryBuffers = Console->MaxNumberOfHistoryBuffers; + pSharedInfo->HistoryBufferSize = Console->HistoryBufferSize; + pSharedInfo->HistoryNoDup = Console->HistoryNoDup; /// pSharedInfo->InputBufferSize = 0; pSharedInfo->ScreenBufferSize = ActiveBuffer->ScreenBufferSize; pSharedInfo->WindowSize = ActiveBuffer->ViewSize; @@ -154,7 +154,7 @@ GuiConsoleShowConsoleProperties(PGUI_CONSOLE_DATA GuiData, // FIXME: Gather defaults from the registry ? pSharedInfo->ScreenAttributes = DEFAULT_SCREEN_ATTRIB; - pSharedInfo->PopupAttributes = DEFAULT_POPUP_ATTRIB ; + pSharedInfo->PopupAttributes = DEFAULT_POPUP_ATTRIB; } /* We display the output code page only */ @@ -315,12 +315,6 @@ GuiApplyUserSettings(PGUI_CONSOLE_DATA GuiData, /* Retrieve terminal informations */ /* Console information */ -#if 0 // FIXME: Things not set - ConInfo.HistoryBufferSize = pConInfo->HistoryBufferSize; - ConInfo.NumberOfHistoryBuffers = pConInfo->NumberOfHistoryBuffers; - ConInfo.HistoryNoDup = !!pConInfo->HistoryNoDup; - ConInfo.CodePage = pConInfo->CodePage; // Done in ConSrvApplyUserSettings -#endif /* * Apply the settings diff --git a/win32ss/user/winsrv/consrv/history.c b/win32ss/user/winsrv/consrv/history.c index 7e28aa83247..d9fd38e8dd9 100644 --- a/win32ss/user/winsrv/consrv/history.c +++ b/win32ss/user/winsrv/consrv/history.c @@ -44,35 +44,52 @@ ConvertInputUnicodeToAnsi(PCONSRV_CONSOLE Console, /* PRIVATE FUNCTIONS **********************************************************/ static PHISTORY_BUFFER -HistoryCurrentBuffer(PCONSRV_CONSOLE Console, - PUNICODE_STRING ExeName) +HistoryCurrentBuffer( + IN PCONSRV_CONSOLE Console, + IN PUNICODE_STRING ExeName) { - PLIST_ENTRY Entry = Console->HistoryBuffers.Flink; + PLIST_ENTRY Entry; PHISTORY_BUFFER Hist; - for (; Entry != &Console->HistoryBuffers; Entry = Entry->Flink) + for (Entry = Console->HistoryBuffers.Flink; + Entry != &Console->HistoryBuffers; + Entry = Entry->Flink) { Hist = CONTAINING_RECORD(Entry, HISTORY_BUFFER, ListEntry); if (RtlEqualUnicodeString(ExeName, &Hist->ExeName, FALSE)) return Hist; } - /* Couldn't find the buffer, create a new one */ - Hist = ConsoleAllocHeap(0, sizeof(HISTORY_BUFFER) + ExeName->Length); - if (!Hist) return NULL; - Hist->MaxEntries = Console->HistoryBufferSize; - Hist->NumEntries = 0; - Hist->Entries = ConsoleAllocHeap(0, Hist->MaxEntries * sizeof(UNICODE_STRING)); - if (!Hist->Entries) + /* Could not find the buffer, create a new one */ + + if (Console->NumberOfHistoryBuffers < Console->MaxNumberOfHistoryBuffers) + { + Hist = ConsoleAllocHeap(0, sizeof(HISTORY_BUFFER) + ExeName->Length); + if (!Hist) return NULL; + Hist->MaxEntries = Console->HistoryBufferSize; + Hist->NumEntries = 0; + Hist->Entries = ConsoleAllocHeap(0, Hist->MaxEntries * sizeof(UNICODE_STRING)); + if (!Hist->Entries) + { + ConsoleFreeHeap(Hist); + return NULL; + } + Hist->ExeName.Length = Hist->ExeName.MaximumLength = ExeName->Length; + Hist->ExeName.Buffer = (PWCHAR)(Hist + 1); + RtlCopyMemory(Hist->ExeName.Buffer, ExeName->Buffer, ExeName->Length); + InsertHeadList(&Console->HistoryBuffers, &Hist->ListEntry); + Console->NumberOfHistoryBuffers++; + return Hist; + } + else { - ConsoleFreeHeap(Hist); + // FIXME: TODO !!!!!!! + // Reuse an older history buffer, if possible with the same Exe name, + // otherwise take the oldest one and reset its contents. + // And move the history buffer back to the head of the list. + UNIMPLEMENTED; return NULL; } - Hist->ExeName.Length = Hist->ExeName.MaximumLength = ExeName->Length; - Hist->ExeName.Buffer = (PWCHAR)(Hist + 1); - memcpy(Hist->ExeName.Buffer, ExeName->Buffer, ExeName->Length); - InsertHeadList(&Console->HistoryBuffers, &Hist->ListEntry); - return Hist; } static PHISTORY_BUFFER @@ -105,8 +122,9 @@ HistoryFindBuffer(PCONSRV_CONSOLE Console, } ExeNameU.Length = ExeNameU.MaximumLength; - Entry = Console->HistoryBuffers.Flink; - while (Entry != &Console->HistoryBuffers) + for (Entry = Console->HistoryBuffers.Flink; + Entry != &Console->HistoryBuffers; + Entry = Entry->Flink) { Hist = CONTAINING_RECORD(Entry, HISTORY_BUFFER, ListEntry); @@ -116,8 +134,6 @@ HistoryFindBuffer(PCONSRV_CONSOLE Console, if (!UnicodeExe) ConsoleFreeHeap(ExeNameU.Buffer); return Hist; } - - Entry = Entry->Flink; } if (!UnicodeExe) ConsoleFreeHeap(ExeNameU.Buffer); @@ -137,6 +153,34 @@ HistoryDeleteBuffer(PHISTORY_BUFFER Hist) ConsoleFreeHeap(Hist); } +static NTSTATUS +HistoryResizeBuffer( + IN PHISTORY_BUFFER Hist, + IN ULONG NumCommands) +{ + PUNICODE_STRING OldEntryList = Hist->Entries; + PUNICODE_STRING NewEntryList; + + NewEntryList = ConsoleAllocHeap(0, NumCommands * sizeof(UNICODE_STRING)); + if (!NewEntryList) + return STATUS_NO_MEMORY; + + /* If necessary, shrink by removing oldest entries */ + for (; Hist->NumEntries > NumCommands; Hist->NumEntries--) + { + RtlFreeUnicodeString(Hist->Entries++); + Hist->Position += (Hist->Position == 0); + } + + Hist->MaxEntries = NumCommands; + RtlCopyMemory(NewEntryList, Hist->Entries, + Hist->NumEntries * sizeof(UNICODE_STRING)); + Hist->Entries = NewEntryList; + ConsoleFreeHeap(OldEntryList); + + return STATUS_SUCCESS; +} + VOID HistoryAddEntry(PCONSRV_CONSOLE Console, PUNICODE_STRING ExeName, @@ -171,8 +215,8 @@ HistoryAddEntry(PCONSRV_CONSOLE Console, /* Just rotate the list to bring this entry to the end */ NewEntry = Hist->Entries[i]; - memmove(&Hist->Entries[i], &Hist->Entries[i + 1], - (Hist->NumEntries - (i + 1)) * sizeof(UNICODE_STRING)); + RtlMoveMemory(&Hist->Entries[i], &Hist->Entries[i + 1], + (Hist->NumEntries - (i + 1)) * sizeof(UNICODE_STRING)); Hist->Entries[Hist->NumEntries - 1] = NewEntry; Hist->Position = Hist->NumEntries - 1; return; @@ -184,8 +228,8 @@ HistoryAddEntry(PCONSRV_CONSOLE Console, { /* List is full, remove oldest entry */ RtlFreeUnicodeString(&Hist->Entries[0]); - memmove(&Hist->Entries[0], &Hist->Entries[1], - --Hist->NumEntries * sizeof(UNICODE_STRING)); + RtlMoveMemory(&Hist->Entries[0], &Hist->Entries[1], + --Hist->NumEntries * sizeof(UNICODE_STRING)); } if (NT_SUCCESS(RtlDuplicateUnicodeString(0, Entry, &Hist->Entries[Hist->NumEntries]))) @@ -323,6 +367,58 @@ HistoryDeleteBuffers(PCONSRV_CONSOLE Console) } } +VOID +HistoryReshapeAllBuffers( + IN PCONSRV_CONSOLE Console, + IN ULONG HistoryBufferSize, + IN ULONG MaxNumberOfHistoryBuffers, + IN BOOLEAN HistoryNoDup) +{ + PLIST_ENTRY Entry; + PHISTORY_BUFFER Hist; + NTSTATUS Status; + + // ASSERT(Console->NumberOfHistoryBuffers <= Console->MaxNumberOfHistoryBuffers); + if (MaxNumberOfHistoryBuffers < Console->NumberOfHistoryBuffers) + { + /* + * Trim the history buffers list and reduce it up to MaxNumberOfHistoryBuffers. + * We loop the history buffers list backwards so as to trim the oldest + * buffers first. + */ + while (!IsListEmpty(&Console->HistoryBuffers) && + (Console->NumberOfHistoryBuffers > MaxNumberOfHistoryBuffers)) + { + Entry = RemoveTailList(&Console->HistoryBuffers); + Hist = CONTAINING_RECORD(Entry, HISTORY_BUFFER, ListEntry); + HistoryDeleteBuffer(Hist); + Console->NumberOfHistoryBuffers--; + } + ASSERT(Console->NumberOfHistoryBuffers == MaxNumberOfHistoryBuffers); + ASSERT(((Console->NumberOfHistoryBuffers == 0) && IsListEmpty(&Console->HistoryBuffers)) || + ((Console->NumberOfHistoryBuffers > 0) && !IsListEmpty(&Console->HistoryBuffers))); + } + Console->MaxNumberOfHistoryBuffers = MaxNumberOfHistoryBuffers; + + /* Resize each history buffer */ + for (Entry = Console->HistoryBuffers.Flink; + Entry != &Console->HistoryBuffers; + Entry = Entry->Flink) + { + Hist = CONTAINING_RECORD(Entry, HISTORY_BUFFER, ListEntry); + Status = HistoryResizeBuffer(Hist, HistoryBufferSize); + if (!NT_SUCCESS(Status)) + { + DPRINT1("HistoryResizeBuffer(0x%p, %lu) failed, Status 0x%08lx\n", + Hist, HistoryBufferSize, Status); + } + } + Console->HistoryBufferSize = HistoryBufferSize; + + /* No duplicates */ + Console->HistoryNoDup = !!HistoryNoDup; +} + /* PUBLIC SERVER APIS *********************************************************/ @@ -516,27 +612,7 @@ CSR_API(SrvSetConsoleNumberOfCommands) SetHistoryNumberCommandsRequest->Unicode2); if (Hist) { - ULONG MaxEntries = SetHistoryNumberCommandsRequest->NumCommands; - PUNICODE_STRING OldEntryList = Hist->Entries; - PUNICODE_STRING NewEntryList = ConsoleAllocHeap(0, MaxEntries * sizeof(UNICODE_STRING)); - if (!NewEntryList) - { - Status = STATUS_NO_MEMORY; - } - else - { - /* If necessary, shrink by removing oldest entries */ - for (; Hist->NumEntries > MaxEntries; Hist->NumEntries--) - { - RtlFreeUnicodeString(Hist->Entries++); - Hist->Position += (Hist->Position == 0); - } - - Hist->MaxEntries = MaxEntries; - Hist->Entries = memcpy(NewEntryList, Hist->Entries, - Hist->NumEntries * sizeof(UNICODE_STRING)); - ConsoleFreeHeap(OldEntryList); - } + Status = HistoryResizeBuffer(Hist, SetHistoryNumberCommandsRequest->NumCommands); } ConSrvReleaseConsole(Console, TRUE); @@ -546,18 +622,20 @@ CSR_API(SrvSetConsoleNumberOfCommands) /* API_NUMBER: ConsolepGetHistory */ CSR_API(SrvGetConsoleHistory) { -#if 0 // Vista+ +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) + NTSTATUS Status; PCONSOLE_GETSETHISTORYINFO HistoryInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HistoryInfoRequest; PCONSRV_CONSOLE Console; - NTSTATUS Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - &Console, TRUE); - if (NT_SUCCESS(Status)) - { - HistoryInfoRequest->HistoryBufferSize = Console->HistoryBufferSize; - HistoryInfoRequest->NumberOfHistoryBuffers = Console->NumberOfHistoryBuffers; - HistoryInfoRequest->dwFlags = (Console->HistoryNoDup ? HISTORY_NO_DUP_FLAG : 0); - ConSrvReleaseConsole(Console, TRUE); - } + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + HistoryInfoRequest->HistoryBufferSize = Console->HistoryBufferSize; + HistoryInfoRequest->NumberOfHistoryBuffers = Console->MaxNumberOfHistoryBuffers; + HistoryInfoRequest->dwFlags = (Console->HistoryNoDup ? HISTORY_NO_DUP_FLAG : 0); + + ConSrvReleaseConsole(Console, TRUE); return Status; #else DPRINT1("%s not yet implemented\n", __FUNCTION__); @@ -568,19 +646,22 @@ CSR_API(SrvGetConsoleHistory) /* API_NUMBER: ConsolepSetHistory */ CSR_API(SrvSetConsoleHistory) { -#if 0 // Vista+ +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) + NTSTATUS Status; PCONSOLE_GETSETHISTORYINFO HistoryInfoRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.HistoryInfoRequest; PCONSRV_CONSOLE Console; - NTSTATUS Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), - &Console, TRUE); - if (NT_SUCCESS(Status)) - { - Console->HistoryBufferSize = HistoryInfoRequest->HistoryBufferSize; - Console->NumberOfHistoryBuffers = HistoryInfoRequest->NumberOfHistoryBuffers; - Console->HistoryNoDup = !!(HistoryInfoRequest->dwFlags & HISTORY_NO_DUP_FLAG); - ConSrvReleaseConsole(Console, TRUE); - } - return Status; + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + HistoryReshapeAllBuffers(Console, + HistoryInfoRequest->HistoryBufferSize, + HistoryInfoRequest->NumberOfHistoryBuffers, + !!(HistoryInfoRequest->dwFlags & HISTORY_NO_DUP_FLAG)); + + ConSrvReleaseConsole(Console, TRUE); + return STATUS_SUCCESS; #else DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; diff --git a/win32ss/user/winsrv/consrv/history.h b/win32ss/user/winsrv/consrv/history.h index 1b3833f23c0..c3ee78a4a7e 100644 --- a/win32ss/user/winsrv/consrv/history.h +++ b/win32ss/user/winsrv/consrv/history.h @@ -9,3 +9,10 @@ #pragma once VOID HistoryDeleteBuffers(PCONSRV_CONSOLE Console); + +VOID +HistoryReshapeAllBuffers( + IN PCONSRV_CONSOLE Console, + IN ULONG HistoryBufferSize, + IN ULONG MaxNumberOfHistoryBuffers, + IN BOOLEAN HistoryNoDup); diff --git a/win32ss/user/winsrv/consrv/include/conio_winsrv.h b/win32ss/user/winsrv/consrv/include/conio_winsrv.h index 79e0c042774..5057a31e4ad 100644 --- a/win32ss/user/winsrv/consrv/include/conio_winsrv.h +++ b/win32ss/user/winsrv/consrv/include/conio_winsrv.h @@ -159,8 +159,9 @@ typedef struct _WINSRV_CONSOLE /**************************** Aliases and Histories ***************************/ struct _ALIAS_HEADER *Aliases; LIST_ENTRY HistoryBuffers; + ULONG NumberOfHistoryBuffers; /* Number of history buffers */ + ULONG MaxNumberOfHistoryBuffers; /* Maximum number of history buffers allowed */ ULONG HistoryBufferSize; /* Size for newly created history buffers */ - ULONG NumberOfHistoryBuffers; /* Maximum number of history buffers allowed */ BOOLEAN HistoryNoDup; /* Remove old duplicate history entries */ /**************************** Input Line Discipline ***************************/ diff --git a/win32ss/user/winsrv/consrv/lineinput.c b/win32ss/user/winsrv/consrv/lineinput.c index 2aab09254ef..32d799531f6 100644 --- a/win32ss/user/winsrv/consrv/lineinput.c +++ b/win32ss/user/winsrv/consrv/lineinput.c @@ -323,7 +323,9 @@ LineInputKeyDown(PCONSRV_CONSOLE Console, case VK_F7: { if (KeyEvent->dwControlKeyState & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED)) + { HistoryDeleteCurrentBuffer(Console, ExeName); + } else { if (Popup) DestroyPopupWindow(Popup); diff --git a/win32ss/user/winsrv/consrv/settings.c b/win32ss/user/winsrv/consrv/settings.c index 879c152d4d1..fdfc4cb9468 100644 --- a/win32ss/user/winsrv/consrv/settings.c +++ b/win32ss/user/winsrv/consrv/settings.c @@ -10,6 +10,7 @@ /* INCLUDES *******************************************************************/ #include "consrv.h" +#include "history.h" #include "../concfg/font.h" #define NDEBUG @@ -40,10 +41,15 @@ ConSrvApplyUserSettings(IN PCONSOLE Console, /* * Apply terminal-edition settings: * - QuickEdit and Insert modes, - * - history settings. + * - History settings. */ Console->QuickEdit = !!ConsoleInfo->QuickEdit; Console->InsertMode = !!ConsoleInfo->InsertMode; + /// Console->InputBufferSize = 0; + HistoryReshapeAllBuffers(Console, + ConsoleInfo->HistoryBufferSize, + ConsoleInfo->NumberOfHistoryBuffers, + ConsoleInfo->HistoryNoDup); /* Copy the new console palette */ // FIXME: Possible buffer overflow if s_colors is bigger than ConsoleInfo->ColorTable.

1 0

[reactos] 01/01: [NTOS:IO] Fix indentation. No code changes!
by Eric Kohl 01 Mar '20

01 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7a7212f984fec6a3dff86… commit 7a7212f984fec6a3dff868011822bf93ec18e01a Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 1 23:34:30 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 1 23:34:30 2020 +0100 [NTOS:IO] Fix indentation. No code changes! --- ntoskrnl/io/pnpmgr/pnpmgr.c | 858 ++++++++++++++++++++++---------------------- 1 file changed, 430 insertions(+), 428 deletions(-) diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index aed457c993d..76d712298e1 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -59,7 +59,7 @@ PDEVICE_NODE FASTCALL IopGetDeviceNode(PDEVICE_OBJECT DeviceObject) { - return ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->DeviceNode; + return ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->DeviceNode; } VOID @@ -2872,128 +2872,128 @@ NTSTATUS IopActionConfigureChildServices(PDEVICE_NODE DeviceNode, PVOID Context) { - RTL_QUERY_REGISTRY_TABLE QueryTable[3]; - PDEVICE_NODE ParentDeviceNode; - PUNICODE_STRING Service; - UNICODE_STRING ClassGUID; - NTSTATUS Status; - DEVICE_CAPABILITIES DeviceCaps; + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; + PDEVICE_NODE ParentDeviceNode; + PUNICODE_STRING Service; + UNICODE_STRING ClassGUID; + NTSTATUS Status; + DEVICE_CAPABILITIES DeviceCaps; - DPRINT("IopActionConfigureChildServices(%p, %p)\n", DeviceNode, Context); + DPRINT("IopActionConfigureChildServices(%p, %p)\n", DeviceNode, Context); - ParentDeviceNode = (PDEVICE_NODE)Context; + ParentDeviceNode = (PDEVICE_NODE)Context; - /* - * We are called for the parent too, but we don't need to do special - * handling for this node - */ - if (DeviceNode == ParentDeviceNode) - { - DPRINT("Success\n"); - return STATUS_SUCCESS; - } + /* + * We are called for the parent too, but we don't need to do special + * handling for this node + */ + if (DeviceNode == ParentDeviceNode) + { + DPRINT("Success\n"); + return STATUS_SUCCESS; + } - /* - * Make sure this device node is a direct child of the parent device node - * that is given as an argument - */ + /* + * Make sure this device node is a direct child of the parent device node + * that is given as an argument + */ - if (DeviceNode->Parent != ParentDeviceNode) - { - DPRINT("Skipping 2+ level child\n"); - return STATUS_SUCCESS; - } + if (DeviceNode->Parent != ParentDeviceNode) + { + DPRINT("Skipping 2+ level child\n"); + return STATUS_SUCCESS; + } - if (!(DeviceNode->Flags & DNF_PROCESSED)) - { - DPRINT1("Child not ready to be configured\n"); - return STATUS_SUCCESS; - } + if (!(DeviceNode->Flags & DNF_PROCESSED)) + { + DPRINT1("Child not ready to be configured\n"); + return STATUS_SUCCESS; + } - if (!(DeviceNode->Flags & (DNF_DISABLED | DNF_STARTED | DNF_ADDED))) - { - UNICODE_STRING RegKey; - - /* Install the service for this if it's in the CDDB */ - IopInstallCriticalDevice(DeviceNode); - - /* - * Retrieve configuration from Enum key - */ - - Service = &DeviceNode->ServiceName; - - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - RtlInitUnicodeString(Service, NULL); - RtlInitUnicodeString(&ClassGUID, NULL); - - QueryTable[0].Name = L"Service"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[0].EntryContext = Service; - - QueryTable[1].Name = L"ClassGUID"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[1].EntryContext = &ClassGUID; - QueryTable[1].DefaultType = REG_SZ; - QueryTable[1].DefaultData = L""; - QueryTable[1].DefaultLength = 0; - - RegKey.Length = 0; - RegKey.MaximumLength = sizeof(ENUM_ROOT) + sizeof(WCHAR) + DeviceNode->InstancePath.Length; - RegKey.Buffer = ExAllocatePoolWithTag(PagedPool, - RegKey.MaximumLength, - TAG_IO); - if (RegKey.Buffer == NULL) - { - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_INSUFFICIENT_RESOURCES; - } + if (!(DeviceNode->Flags & (DNF_DISABLED | DNF_STARTED | DNF_ADDED))) + { + UNICODE_STRING RegKey; - RtlAppendUnicodeToString(&RegKey, ENUM_ROOT); - RtlAppendUnicodeToString(&RegKey, L"\\"); - RtlAppendUnicodeStringToString(&RegKey, &DeviceNode->InstancePath); + /* Install the service for this if it's in the CDDB */ + IopInstallCriticalDevice(DeviceNode); - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - RegKey.Buffer, QueryTable, NULL, NULL); - ExFreePoolWithTag(RegKey.Buffer, TAG_IO); + /* + * Retrieve configuration from Enum key + */ - if (!NT_SUCCESS(Status)) - { - /* FIXME: Log the error */ - DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", - &DeviceNode->InstancePath, Status); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_SUCCESS; - } + Service = &DeviceNode->ServiceName; - if (Service->Buffer == NULL) - { - if (NT_SUCCESS(IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps)) && - DeviceCaps.RawDeviceOK) - { - DPRINT("%wZ is using parent bus driver (%wZ)\n", &DeviceNode->InstancePath, &ParentDeviceNode->ServiceName); - RtlInitEmptyUnicodeString(&DeviceNode->ServiceName, NULL, 0); - } - else if (ClassGUID.Length != 0) - { - /* Device has a ClassGUID value, but no Service value. - * Suppose it is using the NULL driver, so state the - * device is started */ - DPRINT("%wZ is using NULL driver\n", &DeviceNode->InstancePath); - IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); - } - else - { - DeviceNode->Problem = CM_PROB_FAILED_INSTALL; + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + RtlInitUnicodeString(Service, NULL); + RtlInitUnicodeString(&ClassGUID, NULL); + + QueryTable[0].Name = L"Service"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[0].EntryContext = Service; + + QueryTable[1].Name = L"ClassGUID"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[1].EntryContext = &ClassGUID; + QueryTable[1].DefaultType = REG_SZ; + QueryTable[1].DefaultData = L""; + QueryTable[1].DefaultLength = 0; + + RegKey.Length = 0; + RegKey.MaximumLength = sizeof(ENUM_ROOT) + sizeof(WCHAR) + DeviceNode->InstancePath.Length; + RegKey.Buffer = ExAllocatePoolWithTag(PagedPool, + RegKey.MaximumLength, + TAG_IO); + if (RegKey.Buffer == NULL) + { IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - } - return STATUS_SUCCESS; - } + return STATUS_INSUFFICIENT_RESOURCES; + } - DPRINT("Got Service %S\n", Service->Buffer); - } + RtlAppendUnicodeToString(&RegKey, ENUM_ROOT); + RtlAppendUnicodeToString(&RegKey, L"\\"); + RtlAppendUnicodeStringToString(&RegKey, &DeviceNode->InstancePath); + + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + RegKey.Buffer, QueryTable, NULL, NULL); + ExFreePoolWithTag(RegKey.Buffer, TAG_IO); + + if (!NT_SUCCESS(Status)) + { + /* FIXME: Log the error */ + DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", + &DeviceNode->InstancePath, Status); + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + return STATUS_SUCCESS; + } + + if (Service->Buffer == NULL) + { + if (NT_SUCCESS(IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps)) && + DeviceCaps.RawDeviceOK) + { + DPRINT("%wZ is using parent bus driver (%wZ)\n", &DeviceNode->InstancePath, &ParentDeviceNode->ServiceName); + RtlInitEmptyUnicodeString(&DeviceNode->ServiceName, NULL, 0); + } + else if (ClassGUID.Length != 0) + { + /* Device has a ClassGUID value, but no Service value. + * Suppose it is using the NULL driver, so state the + * device is started */ + DPRINT("%wZ is using NULL driver\n", &DeviceNode->InstancePath); + IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); + } + else + { + DeviceNode->Problem = CM_PROB_FAILED_INSTALL; + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + } + return STATUS_SUCCESS; + } - return STATUS_SUCCESS; + DPRINT("Got Service %S\n", Service->Buffer); + } + + return STATUS_SUCCESS; } /* @@ -3017,120 +3017,122 @@ NTSTATUS IopActionInitChildServices(PDEVICE_NODE DeviceNode, PVOID Context) { - PDEVICE_NODE ParentDeviceNode; - NTSTATUS Status; - BOOLEAN BootDrivers = !PnpSystemInit; + PDEVICE_NODE ParentDeviceNode; + NTSTATUS Status; + BOOLEAN BootDrivers = !PnpSystemInit; - DPRINT("IopActionInitChildServices(%p, %p)\n", DeviceNode, Context); + DPRINT("IopActionInitChildServices(%p, %p)\n", DeviceNode, Context); - ParentDeviceNode = Context; + ParentDeviceNode = Context; - /* - * We are called for the parent too, but we don't need to do special - * handling for this node - */ - if (DeviceNode == ParentDeviceNode) - { - DPRINT("Success\n"); - return STATUS_SUCCESS; - } + /* + * We are called for the parent too, but we don't need to do special + * handling for this node + */ + if (DeviceNode == ParentDeviceNode) + { + DPRINT("Success\n"); + return STATUS_SUCCESS; + } - /* - * We don't want to check for a direct child because - * this function is called during boot to reinitialize - * devices with drivers that couldn't load yet due to - * stage 0 limitations (ie can't load from disk yet). - */ + /* + * We don't want to check for a direct child because + * this function is called during boot to reinitialize + * devices with drivers that couldn't load yet due to + * stage 0 limitations (ie can't load from disk yet). + */ - if (!(DeviceNode->Flags & DNF_PROCESSED)) - { - DPRINT1("Child not ready to be added\n"); - return STATUS_SUCCESS; - } + if (!(DeviceNode->Flags & DNF_PROCESSED)) + { + DPRINT1("Child not ready to be added\n"); + return STATUS_SUCCESS; + } - if (IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED) || - IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) || - IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) - return STATUS_SUCCESS; + if (IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED) || + IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) || + IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) + return STATUS_SUCCESS; - if (DeviceNode->ServiceName.Buffer == NULL) - { - /* We don't need to worry about loading the driver because we're - * being driven in raw mode so our parent must be loaded to get here */ - Status = IopInitializeDevice(DeviceNode, NULL); - if (NT_SUCCESS(Status)) - { - Status = IopStartDevice(DeviceNode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopStartDevice(%wZ) failed with status 0x%08x\n", - &DeviceNode->InstancePath, Status); - } - } - } - else - { - PLDR_DATA_TABLE_ENTRY ModuleObject; - PDRIVER_OBJECT DriverObject; - - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); - /* Get existing DriverObject pointer (in case the driver has - already been loaded and initialized) */ - Status = IopGetDriverObject( - &DriverObject, - &DeviceNode->ServiceName, - FALSE); + if (DeviceNode->ServiceName.Buffer == NULL) + { + /* We don't need to worry about loading the driver because we're + * being driven in raw mode so our parent must be loaded to get here */ + Status = IopInitializeDevice(DeviceNode, NULL); + if (NT_SUCCESS(Status)) + { + Status = IopStartDevice(DeviceNode); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IopStartDevice(%wZ) failed with status 0x%08x\n", + &DeviceNode->InstancePath, Status); + } + } + } + else + { + PLDR_DATA_TABLE_ENTRY ModuleObject; + PDRIVER_OBJECT DriverObject; - if (!NT_SUCCESS(Status)) - { - /* Driver is not initialized, try to load it */ - Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); + KeEnterCriticalRegion(); + ExAcquireResourceExclusiveLite(&IopDriverLoadResource, TRUE); + /* Get existing DriverObject pointer (in case the driver has + already been loaded and initialized) */ + Status = IopGetDriverObject( + &DriverObject, + &DeviceNode->ServiceName, + FALSE); - if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) - { - /* Initialize the driver */ - Status = IopInitializeDriverModule(DeviceNode, ModuleObject, - &DeviceNode->ServiceName, FALSE, &DriverObject); - if (!NT_SUCCESS(Status)) DeviceNode->Problem = CM_PROB_FAILED_DRIVER_ENTRY; - } - else if (Status == STATUS_DRIVER_UNABLE_TO_LOAD) - { - DPRINT1("Service '%wZ' is disabled\n", &DeviceNode->ServiceName); - DeviceNode->Problem = CM_PROB_DISABLED_SERVICE; - } - else - { - DPRINT("IopLoadServiceModule(%wZ) failed with status 0x%08x\n", - &DeviceNode->ServiceName, Status); - if (!BootDrivers) DeviceNode->Problem = CM_PROB_DRIVER_FAILED_LOAD; - } - } - ExReleaseResourceLite(&IopDriverLoadResource); - KeLeaveCriticalRegion(); + if (!NT_SUCCESS(Status)) + { + /* Driver is not initialized, try to load it */ + Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); - /* Driver is loaded and initialized at this point */ - if (NT_SUCCESS(Status)) - { - /* Initialize the device, including all filters */ - Status = PipCallDriverAddDevice(DeviceNode, FALSE, DriverObject); + if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) + { + /* Initialize the driver */ + Status = IopInitializeDriverModule(DeviceNode, ModuleObject, + &DeviceNode->ServiceName, FALSE, &DriverObject); + if (!NT_SUCCESS(Status)) + DeviceNode->Problem = CM_PROB_FAILED_DRIVER_ENTRY; + } + else if (Status == STATUS_DRIVER_UNABLE_TO_LOAD) + { + DPRINT1("Service '%wZ' is disabled\n", &DeviceNode->ServiceName); + DeviceNode->Problem = CM_PROB_DISABLED_SERVICE; + } + else + { + DPRINT("IopLoadServiceModule(%wZ) failed with status 0x%08x\n", + &DeviceNode->ServiceName, Status); + if (!BootDrivers) + DeviceNode->Problem = CM_PROB_DRIVER_FAILED_LOAD; + } + } + ExReleaseResourceLite(&IopDriverLoadResource); + KeLeaveCriticalRegion(); - /* Remove the extra reference */ - ObDereferenceObject(DriverObject); - } - else - { - /* - * Don't disable when trying to load only boot drivers - */ - if (!BootDrivers) - { - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - } - } - } + /* Driver is loaded and initialized at this point */ + if (NT_SUCCESS(Status)) + { + /* Initialize the device, including all filters */ + Status = PipCallDriverAddDevice(DeviceNode, FALSE, DriverObject); + + /* Remove the extra reference */ + ObDereferenceObject(DriverObject); + } + else + { + /* + * Don't disable when trying to load only boot drivers + */ + if (!BootDrivers) + { + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + } + } + } - return STATUS_SUCCESS; + return STATUS_SUCCESS; } /* @@ -3148,17 +3150,17 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode, NTSTATUS IopInitializePnpServices(IN PDEVICE_NODE DeviceNode) { - DEVICETREE_TRAVERSE_CONTEXT Context; + DEVICETREE_TRAVERSE_CONTEXT Context; - DPRINT("IopInitializePnpServices(%p)\n", DeviceNode); + DPRINT("IopInitializePnpServices(%p)\n", DeviceNode); - IopInitDeviceTreeTraverseContext( - &Context, - DeviceNode, - IopActionInitChildServices, - DeviceNode); + IopInitDeviceTreeTraverseContext( + &Context, + DeviceNode, + IopActionInitChildServices, + DeviceNode); - return IopTraverseDeviceTree(&Context); + return IopTraverseDeviceTree(&Context); } static @@ -3599,69 +3601,69 @@ INIT_FUNCTION BOOLEAN IopIsFirmwareMapperDisabled(VOID) { - UNICODE_STRING KeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CURRENTCONTROLSET\\Control\\Pnp"); - UNICODE_STRING KeyNameU = RTL_CONSTANT_STRING(L"DisableFirmwareMapper"); - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hPnpKey; - PKEY_VALUE_PARTIAL_INFORMATION KeyInformation; - ULONG DesiredLength, Length; - ULONG KeyValue = 0; - NTSTATUS Status; + UNICODE_STRING KeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CURRENTCONTROLSET\\Control\\Pnp"); + UNICODE_STRING KeyNameU = RTL_CONSTANT_STRING(L"DisableFirmwareMapper"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hPnpKey; + PKEY_VALUE_PARTIAL_INFORMATION KeyInformation; + ULONG DesiredLength, Length; + ULONG KeyValue = 0; + NTSTATUS Status; - InitializeObjectAttributes(&ObjectAttributes, &KeyPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwOpenKey(&hPnpKey, KEY_QUERY_VALUE, &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - Status = ZwQueryValueKey(hPnpKey, - &KeyNameU, - KeyValuePartialInformation, - NULL, - 0, - &DesiredLength); - if ((Status == STATUS_BUFFER_TOO_SMALL) || - (Status == STATUS_BUFFER_OVERFLOW)) - { - Length = DesiredLength; - KeyInformation = ExAllocatePool(PagedPool, Length); - if (KeyInformation) - { - Status = ZwQueryValueKey(hPnpKey, - &KeyNameU, - KeyValuePartialInformation, - KeyInformation, - Length, - &DesiredLength); - if (NT_SUCCESS(Status) && KeyInformation->DataLength == sizeof(ULONG)) - { - KeyValue = (ULONG)(*KeyInformation->Data); - } - else - { - DPRINT1("ZwQueryValueKey(%wZ%wZ) failed\n", &KeyPathU, &KeyNameU); - } + InitializeObjectAttributes(&ObjectAttributes, &KeyPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwOpenKey(&hPnpKey, KEY_QUERY_VALUE, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + Status = ZwQueryValueKey(hPnpKey, + &KeyNameU, + KeyValuePartialInformation, + NULL, + 0, + &DesiredLength); + if ((Status == STATUS_BUFFER_TOO_SMALL) || + (Status == STATUS_BUFFER_OVERFLOW)) + { + Length = DesiredLength; + KeyInformation = ExAllocatePool(PagedPool, Length); + if (KeyInformation) + { + Status = ZwQueryValueKey(hPnpKey, + &KeyNameU, + KeyValuePartialInformation, + KeyInformation, + Length, + &DesiredLength); + if (NT_SUCCESS(Status) && KeyInformation->DataLength == sizeof(ULONG)) + { + KeyValue = (ULONG)(*KeyInformation->Data); + } + else + { + DPRINT1("ZwQueryValueKey(%wZ%wZ) failed\n", &KeyPathU, &KeyNameU); + } - ExFreePool(KeyInformation); - } - else - { - DPRINT1("Failed to allocate memory for registry query\n"); - } - } - else - { - DPRINT1("ZwQueryValueKey(%wZ%wZ) failed with status 0x%08lx\n", &KeyPathU, &KeyNameU, Status); - } - - ZwClose(hPnpKey); - } - else - { - DPRINT1("ZwOpenKey(%wZ) failed with status 0x%08lx\n", &KeyPathU, Status); - } + ExFreePool(KeyInformation); + } + else + { + DPRINT1("Failed to allocate memory for registry query\n"); + } + } + else + { + DPRINT1("ZwQueryValueKey(%wZ%wZ) failed with status 0x%08lx\n", &KeyPathU, &KeyNameU, Status); + } + + ZwClose(hPnpKey); + } + else + { + DPRINT1("ZwOpenKey(%wZ) failed with status 0x%08lx\n", &KeyPathU, Status); + } - DPRINT("Firmware mapper is %s\n", KeyValue != 0 ? "disabled" : "enabled"); + DPRINT("Firmware mapper is %s\n", KeyValue != 0 ? "disabled" : "enabled"); - return (KeyValue != 0) ? TRUE : FALSE; + return (KeyValue != 0) ? TRUE : FALSE; } INIT_FUNCTION @@ -3669,32 +3671,32 @@ NTSTATUS NTAPI IopUpdateRootKey(VOID) { - UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum"); - UNICODE_STRING RootPathU = RTL_CONSTANT_STRING(L"Root"); - UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE hEnum, hRoot; - NTSTATUS Status; + UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum"); + UNICODE_STRING RootPathU = RTL_CONSTANT_STRING(L"Root"); + UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter"); + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hEnum, hRoot; + NTSTATUS Status; - InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwCreateKey() failed with status 0x%08lx\n", Status); - return Status; - } + InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwCreateKey() failed with status 0x%08lx\n", Status); + return Status; + } - InitializeObjectAttributes(&ObjectAttributes, &RootPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hEnum, NULL); - Status = ZwCreateKey(&hRoot, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL); - ZwClose(hEnum); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status); - return Status; - } + InitializeObjectAttributes(&ObjectAttributes, &RootPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hEnum, NULL); + Status = ZwCreateKey(&hRoot, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL); + ZwClose(hEnum); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status); + return Status; + } - if (!IopIsFirmwareMapperDisabled()) - { + if (!IopIsFirmwareMapperDisabled()) + { Status = IopOpenRegistryKeyEx(&hEnum, NULL, &MultiKeyPathU, KEY_ENUMERATE_SUB_KEYS); if (!NT_SUCCESS(Status)) { @@ -3711,16 +3713,16 @@ IopUpdateRootKey(VOID) NULL, 0); ZwClose(hEnum); - } - else - { + } + else + { /* Enumeration is disabled */ Status = STATUS_SUCCESS; - } + } - ZwClose(hRoot); + ZwClose(hRoot); - return Status; + return Status; } NTSTATUS @@ -4628,145 +4630,145 @@ IoOpenDeviceRegistryKey(IN PDEVICE_OBJECT DeviceObject, IN ACCESS_MASK DesiredAccess, OUT PHANDLE DevInstRegKey) { - static WCHAR RootKeyName[] = - L"\\Registry\\Machine\\System\\CurrentControlSet\\"; - static WCHAR ProfileKeyName[] = - L"Hardware Profiles\\Current\\System\\CurrentControlSet\\"; - static WCHAR ClassKeyName[] = L"Control\\Class\\"; - static WCHAR EnumKeyName[] = L"Enum\\"; - static WCHAR DeviceParametersKeyName[] = L"Device Parameters"; - ULONG KeyNameLength; - PWSTR KeyNameBuffer; - UNICODE_STRING KeyName; - ULONG DriverKeyLength; - OBJECT_ATTRIBUTES ObjectAttributes; - PDEVICE_NODE DeviceNode = NULL; - NTSTATUS Status; + static WCHAR RootKeyName[] = + L"\\Registry\\Machine\\System\\CurrentControlSet\\"; + static WCHAR ProfileKeyName[] = + L"Hardware Profiles\\Current\\System\\CurrentControlSet\\"; + static WCHAR ClassKeyName[] = L"Control\\Class\\"; + static WCHAR EnumKeyName[] = L"Enum\\"; + static WCHAR DeviceParametersKeyName[] = L"Device Parameters"; + ULONG KeyNameLength; + PWSTR KeyNameBuffer; + UNICODE_STRING KeyName; + ULONG DriverKeyLength; + OBJECT_ATTRIBUTES ObjectAttributes; + PDEVICE_NODE DeviceNode = NULL; + NTSTATUS Status; - DPRINT("IoOpenDeviceRegistryKey() called\n"); + DPRINT("IoOpenDeviceRegistryKey() called\n"); - if ((DevInstKeyType & (PLUGPLAY_REGKEY_DEVICE | PLUGPLAY_REGKEY_DRIVER)) == 0) - { - DPRINT1("IoOpenDeviceRegistryKey(): got wrong params, exiting... \n"); - return STATUS_INVALID_PARAMETER; - } + if ((DevInstKeyType & (PLUGPLAY_REGKEY_DEVICE | PLUGPLAY_REGKEY_DRIVER)) == 0) + { + DPRINT1("IoOpenDeviceRegistryKey(): got wrong params, exiting... \n"); + return STATUS_INVALID_PARAMETER; + } - if (!IopIsValidPhysicalDeviceObject(DeviceObject)) - return STATUS_INVALID_DEVICE_REQUEST; - DeviceNode = IopGetDeviceNode(DeviceObject); + if (!IopIsValidPhysicalDeviceObject(DeviceObject)) + return STATUS_INVALID_DEVICE_REQUEST; + DeviceNode = IopGetDeviceNode(DeviceObject); - /* - * Calculate the length of the base key name. This is the full - * name for driver key or the name excluding "Device Parameters" - * subkey for device key. - */ + /* + * Calculate the length of the base key name. This is the full + * name for driver key or the name excluding "Device Parameters" + * subkey for device key. + */ - KeyNameLength = sizeof(RootKeyName); - if (DevInstKeyType & PLUGPLAY_REGKEY_CURRENT_HWPROFILE) - KeyNameLength += sizeof(ProfileKeyName) - sizeof(UNICODE_NULL); - if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER) - { - KeyNameLength += sizeof(ClassKeyName) - sizeof(UNICODE_NULL); - Status = IoGetDeviceProperty(DeviceObject, DevicePropertyDriverKeyName, - 0, NULL, &DriverKeyLength); - if (Status != STATUS_BUFFER_TOO_SMALL) - return Status; - KeyNameLength += DriverKeyLength; - } - else - { - KeyNameLength += sizeof(EnumKeyName) - sizeof(UNICODE_NULL) + - DeviceNode->InstancePath.Length; - } + KeyNameLength = sizeof(RootKeyName); + if (DevInstKeyType & PLUGPLAY_REGKEY_CURRENT_HWPROFILE) + KeyNameLength += sizeof(ProfileKeyName) - sizeof(UNICODE_NULL); + if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER) + { + KeyNameLength += sizeof(ClassKeyName) - sizeof(UNICODE_NULL); + Status = IoGetDeviceProperty(DeviceObject, DevicePropertyDriverKeyName, + 0, NULL, &DriverKeyLength); + if (Status != STATUS_BUFFER_TOO_SMALL) + return Status; + KeyNameLength += DriverKeyLength; + } + else + { + KeyNameLength += sizeof(EnumKeyName) - sizeof(UNICODE_NULL) + + DeviceNode->InstancePath.Length; + } - /* - * Now allocate the buffer for the key name... - */ + /* + * Now allocate the buffer for the key name... + */ - KeyNameBuffer = ExAllocatePool(PagedPool, KeyNameLength); - if (KeyNameBuffer == NULL) - return STATUS_INSUFFICIENT_RESOURCES; + KeyNameBuffer = ExAllocatePool(PagedPool, KeyNameLength); + if (KeyNameBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; - KeyName.Length = 0; - KeyName.MaximumLength = (USHORT)KeyNameLength; - KeyName.Buffer = KeyNameBuffer; + KeyName.Length = 0; + KeyName.MaximumLength = (USHORT)KeyNameLength; + KeyName.Buffer = KeyNameBuffer; - /* - * ...and build the key name. - */ + /* + * ...and build the key name. + */ - KeyName.Length += sizeof(RootKeyName) - sizeof(UNICODE_NULL); - RtlCopyMemory(KeyNameBuffer, RootKeyName, KeyName.Length); + KeyName.Length += sizeof(RootKeyName) - sizeof(UNICODE_NULL); + RtlCopyMemory(KeyNameBuffer, RootKeyName, KeyName.Length); - if (DevInstKeyType & PLUGPLAY_REGKEY_CURRENT_HWPROFILE) - RtlAppendUnicodeToString(&KeyName, ProfileKeyName); + if (DevInstKeyType & PLUGPLAY_REGKEY_CURRENT_HWPROFILE) + RtlAppendUnicodeToString(&KeyName, ProfileKeyName); - if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER) - { - RtlAppendUnicodeToString(&KeyName, ClassKeyName); - Status = IoGetDeviceProperty(DeviceObject, DevicePropertyDriverKeyName, - DriverKeyLength, KeyNameBuffer + - (KeyName.Length / sizeof(WCHAR)), - &DriverKeyLength); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Call to IoGetDeviceProperty() failed with Status 0x%08lx\n", Status); - ExFreePool(KeyNameBuffer); - return Status; - } - KeyName.Length += (USHORT)DriverKeyLength - sizeof(UNICODE_NULL); - } - else - { - RtlAppendUnicodeToString(&KeyName, EnumKeyName); - Status = RtlAppendUnicodeStringToString(&KeyName, &DeviceNode->InstancePath); - if (DeviceNode->InstancePath.Length == 0) - { - ExFreePool(KeyNameBuffer); - return Status; - } - } + if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER) + { + RtlAppendUnicodeToString(&KeyName, ClassKeyName); + Status = IoGetDeviceProperty(DeviceObject, DevicePropertyDriverKeyName, + DriverKeyLength, KeyNameBuffer + + (KeyName.Length / sizeof(WCHAR)), + &DriverKeyLength); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Call to IoGetDeviceProperty() failed with Status 0x%08lx\n", Status); + ExFreePool(KeyNameBuffer); + return Status; + } + KeyName.Length += (USHORT)DriverKeyLength - sizeof(UNICODE_NULL); + } + else + { + RtlAppendUnicodeToString(&KeyName, EnumKeyName); + Status = RtlAppendUnicodeStringToString(&KeyName, &DeviceNode->InstancePath); + if (DeviceNode->InstancePath.Length == 0) + { + ExFreePool(KeyNameBuffer); + return Status; + } + } - /* - * Open the base key. - */ - Status = IopOpenRegistryKeyEx(DevInstRegKey, NULL, &KeyName, DesiredAccess); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoOpenDeviceRegistryKey(%wZ): Base key doesn't exist, exiting... (Status 0x%08lx)\n", &KeyName, Status); - ExFreePool(KeyNameBuffer); - return Status; - } - ExFreePool(KeyNameBuffer); + /* + * Open the base key. + */ + Status = IopOpenRegistryKeyEx(DevInstRegKey, NULL, &KeyName, DesiredAccess); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IoOpenDeviceRegistryKey(%wZ): Base key doesn't exist, exiting... (Status 0x%08lx)\n", &KeyName, Status); + ExFreePool(KeyNameBuffer); + return Status; + } + ExFreePool(KeyNameBuffer); - /* - * For driver key we're done now. - */ + /* + * For driver key we're done now. + */ - if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER) - return Status; + if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER) + return Status; - /* - * Let's go further. For device key we must open "Device Parameters" - * subkey and create it if it doesn't exist yet. - */ + /* + * Let's go further. For device key we must open "Device Parameters" + * subkey and create it if it doesn't exist yet. + */ - RtlInitUnicodeString(&KeyName, DeviceParametersKeyName); - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, - *DevInstRegKey, - NULL); - Status = ZwCreateKey(DevInstRegKey, - DesiredAccess, - &ObjectAttributes, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - NULL); - ZwClose(ObjectAttributes.RootDirectory); + RtlInitUnicodeString(&KeyName, DeviceParametersKeyName); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + *DevInstRegKey, + NULL); + Status = ZwCreateKey(DevInstRegKey, + DesiredAccess, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + NULL); + ZwClose(ObjectAttributes.RootDirectory); - return Status; + return Status; } static

1 0

[reactos] 01/01: [NTOS:IO] Improve the device action worker
by Eric Kohl 01 Mar '20

01 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a07cde37f710c0be2706… commit 9a07cde37f710c0be2706448d7a316e0f24b66f1 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Mar 1 23:29:23 2020 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Mar 1 23:32:25 2020 +0100 [NTOS:IO] Improve the device action worker - Improve the device action worker to support more than just a single action - Move the action queue code from IoInvalidateDeviceRelations to a new function IopQueueDeviceAction. --- ntoskrnl/include/internal/io.h | 31 +++++++++++++++ ntoskrnl/io/pnpmgr/pnpmgr.c | 89 +++++++++++++++++++++++++----------------- 2 files changed, 85 insertions(+), 35 deletions(-) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 471f6e067f4..d518e2e6ba9 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -538,6 +538,29 @@ typedef enum _SECURITY_DESCRIPTOR_TYPE SystemDefault, } SECURITY_DESCRIPTOR_TYPE, *PSECURITY_DESCRIPTOR_TYPE; +// +// Action types and data for IopQueueDeviceAction() +// +typedef enum _DEVICE_ACTION +{ + DeviceActionInvalidateDeviceRelations, + MaxDeviceAction +} DEVICE_ACTION; + +typedef struct _DEVICE_ACTION_DATA +{ + LIST_ENTRY RequestListEntry; + PDEVICE_OBJECT DeviceObject; + DEVICE_ACTION Action; + union + { + struct + { + DEVICE_RELATION_TYPE Type; + } InvalidateDeviceRelations; + }; +} DEVICE_ACTION_DATA, *PDEVICE_ACTION_DATA; + // // Resource code // @@ -1398,6 +1421,14 @@ IopStoreSystemPartitionInformation(IN PUNICODE_STRING NtSystemPartitionDeviceNam IN PUNICODE_STRING OsLoaderPathName ); +// +// Device action +// +VOID +IopQueueDeviceAction( + _In_ PDEVICE_ACTION_DATA ActionData +); + // // Global I/O Data // diff --git a/ntoskrnl/io/pnpmgr/pnpmgr.c b/ntoskrnl/io/pnpmgr/pnpmgr.c index b08f63eb289..aed457c993d 100644 --- a/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -38,14 +38,8 @@ WORK_QUEUE_ITEM IopDeviceActionWorkItem; BOOLEAN IopDeviceActionInProgress; KSPIN_LOCK IopDeviceActionLock; -typedef struct _DEVICE_ACTION_DATA -{ - LIST_ENTRY RequestListEntry; - PDEVICE_OBJECT DeviceObject; - DEVICE_RELATION_TYPE Type; -} DEVICE_ACTION_DATA, *PDEVICE_ACTION_DATA; - /* FUNCTIONS *****************************************************************/ + NTSTATUS NTAPI IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath, @@ -1073,8 +1067,17 @@ IopDeviceActionWorker( DEVICE_ACTION_DATA, RequestListEntry); - IoSynchronousInvalidateDeviceRelations(Data->DeviceObject, - Data->Type); + switch (Data->Action) + { + case DeviceActionInvalidateDeviceRelations: + IoSynchronousInvalidateDeviceRelations(Data->DeviceObject, + Data->InvalidateDeviceRelations.Type); + break; + + default: + DPRINT1("Unimplemented device action %u\n", Data->Action); + break; + } ObDereferenceObject(Data->DeviceObject); ExFreePoolWithTag(Data, TAG_IO); @@ -1084,6 +1087,43 @@ IopDeviceActionWorker( KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); } +VOID +IopQueueDeviceAction( + _In_ PDEVICE_ACTION_DATA ActionData) +{ + PDEVICE_ACTION_DATA Data; + KIRQL OldIrql; + + DPRINT("IopQueueDeviceAction(%p)\n", ActionData); + + Data = ExAllocatePoolWithTag(NonPagedPool, + sizeof(DEVICE_ACTION_DATA), + TAG_IO); + if (!Data) + return; + + ObReferenceObject(ActionData->DeviceObject); + RtlCopyMemory(Data, ActionData, sizeof(DEVICE_ACTION_DATA)); + + DPRINT("Action %u\n", Data->Action); + + KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); + InsertTailList(&IopDeviceActionRequestList, &Data->RequestListEntry); + if (IopDeviceActionInProgress) + { + KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); + return; + } + IopDeviceActionInProgress = TRUE; + KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); + + ExInitializeWorkItem(&IopDeviceActionWorkItem, + IopDeviceActionWorker, + NULL); + ExQueueWorkItem(&IopDeviceActionWorkItem, + DelayedWorkQueue); +} + NTSTATUS IopGetSystemPowerDeviceObject(PDEVICE_OBJECT *DeviceObject) { @@ -5112,34 +5152,13 @@ IoInvalidateDeviceRelations( IN PDEVICE_OBJECT DeviceObject, IN DEVICE_RELATION_TYPE Type) { - PDEVICE_ACTION_DATA Data; - KIRQL OldIrql; - - Data = ExAllocatePoolWithTag(NonPagedPool, - sizeof(DEVICE_ACTION_DATA), - TAG_IO); - if (!Data) - return; + DEVICE_ACTION_DATA ActionData; - ObReferenceObject(DeviceObject); - Data->DeviceObject = DeviceObject; - Data->Type = Type; + ActionData.DeviceObject = DeviceObject; + ActionData.Action = DeviceActionInvalidateDeviceRelations; + ActionData.InvalidateDeviceRelations.Type = Type; - KeAcquireSpinLock(&IopDeviceActionLock, &OldIrql); - InsertTailList(&IopDeviceActionRequestList, &Data->RequestListEntry); - if (IopDeviceActionInProgress) - { - KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); - return; - } - IopDeviceActionInProgress = TRUE; - KeReleaseSpinLock(&IopDeviceActionLock, OldIrql); - - ExInitializeWorkItem(&IopDeviceActionWorkItem, - IopDeviceActionWorker, - NULL); - ExQueueWorkItem(&IopDeviceActionWorkItem, - DelayedWorkQueue); + IopQueueDeviceAction(&ActionData); } /*

1 0

[reactos] 01/01: [FREELDR] Move the PC VESA and hardware detection libraries into the PC directory (#2355)
by Dmitry Borisov 01 Mar '20

01 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=74eda39118d9a266a92ba… commit 74eda39118d9a266a92ba79ca033e39f1f6b5005 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Mon Mar 2 01:41:47 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 1 20:41:47 2020 +0100 [FREELDR] Move the PC VESA and hardware detection libraries into the PC directory (#2355) Because it contains platform-specific code. --- boot/freeldr/freeldr/CMakeLists.txt | 10 ++++++---- boot/freeldr/freeldr/arch/i386/pc/machpc.c | 2 +- boot/freeldr/freeldr/arch/i386/{hardware.c => pc/pchw.c} | 0 boot/freeldr/freeldr/arch/i386/{i386vid.c => pc/pcvesa.c} | 0 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index dd8bc31703e..725419c37fe 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -114,14 +114,12 @@ if(ARCH STREQUAL "i386") arch/i386/halstub.c arch/i386/ntoskrnl.c arch/i386/drivemap.c - arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c arch/i386/hwdisk.c arch/i386/hwpci.c arch/i386/i386bug.c arch/i386/i386idt.c - arch/i386/i386vid.c disk/scsiport.c) if(SARCH STREQUAL "xbox") @@ -130,7 +128,9 @@ if(ARCH STREQUAL "i386") arch/i386/pc/machpc.c # machxbox.c depends on it arch/i386/pc/pcbeep.c # machxbox.c depends on it arch/i386/pc/pcdisk.c # hwdisk.c depends on it + arch/i386/pc/pchw.c # Many files depends on it arch/i386/pc/pcmem.c # hwacpi.c/xboxmem.c depends on it + arch/i386/pc/pcvesa.c # machpc.c depends on it arch/i386/xbox/machxbox.c arch/i386/xbox/xboxcons.c arch/i386/xbox/xboxdisk.c @@ -145,8 +145,10 @@ if(ARCH STREQUAL "i386") arch/i386/pc/pcbeep.c arch/i386/pc/pccons.c arch/i386/pc/pcdisk.c + arch/i386/pc/pchw.c arch/i386/pc/pcmem.c arch/i386/pc/pcrtc.c + arch/i386/pc/pcvesa.c arch/i386/pc/pcvideo.c) endif() @@ -164,19 +166,19 @@ elseif(ARCH STREQUAL "amd64") lib/fs/pxe.c arch/i386/ntoskrnl.c arch/i386/drivemap.c - arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c arch/i386/hwdisk.c arch/i386/hwpci.c arch/i386/i386bug.c - arch/i386/i386vid.c arch/i386/pc/machpc.c arch/i386/pc/pcbeep.c arch/i386/pc/pccons.c arch/i386/pc/pcdisk.c + arch/i386/pc/pchw.c arch/i386/pc/pcmem.c arch/i386/pc/pcrtc.c + arch/i386/pc/pcvesa.c arch/i386/pc/pcvideo.c) elseif(ARCH STREQUAL "arm") diff --git a/boot/freeldr/freeldr/arch/i386/pc/machpc.c b/boot/freeldr/freeldr/arch/i386/pc/machpc.c index d4259de92aa..d5b629f4600 100644 --- a/boot/freeldr/freeldr/arch/i386/pc/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/pc/machpc.c @@ -1236,7 +1236,7 @@ DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) } -// Implemented in i386vid.c, returns the VESA version +// Implemented in pcvesa.c, returns the VESA version USHORT BiosIsVesaSupported(VOID); BOOLEAN BiosIsVesaDdcSupported(VOID); BOOLEAN BiosVesaReadEdid(VOID); diff --git a/boot/freeldr/freeldr/arch/i386/hardware.c b/boot/freeldr/freeldr/arch/i386/pc/pchw.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/hardware.c rename to boot/freeldr/freeldr/arch/i386/pc/pchw.c diff --git a/boot/freeldr/freeldr/arch/i386/i386vid.c b/boot/freeldr/freeldr/arch/i386/pc/pcvesa.c similarity index 100% rename from boot/freeldr/freeldr/arch/i386/i386vid.c rename to boot/freeldr/freeldr/arch/i386/pc/pcvesa.c

1 0

[reactos] 01/01: [SHELL32] Improve ShellExecCmdLine in path resolving (#2397)
by Katayama Hirofumi MZ 01 Mar '20

01 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc11cf78caf29d0a4539e… commit fc11cf78caf29d0a4539ea4777370714d447f5cb Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 1 19:32:33 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 1 19:32:33 2020 +0900 [SHELL32] Improve ShellExecCmdLine in path resolving (#2397) Fix and improve private function shell32!ShellExecCmdLine to improve Run Dialog behavior. CORE-14409 --- dll/win32/shell32/shlexec.cpp | 31 +++++++++++++++---- .../rostests/apitests/shell32/ShellExecCmdLine.cpp | 36 ++++++++++++++++++---- 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 3feab9c2ff6..3514c9c380a 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -2457,12 +2457,26 @@ HRESULT WINAPI ShellExecCmdLine( { PathAddBackslashW(szFile); } - if (SearchPathW(NULL, szFile, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, szFile, wszExe, _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, szFile, wszCom, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, wszExe, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, wszCom, _countof(szFile2), szFile2, NULL)) + + WCHAR szCurDir[MAX_PATH]; + GetCurrentDirectoryW(_countof(szCurDir), szCurDir); + if (pwszStartDir) + { + SetCurrentDirectoryW(pwszStartDir); + } + + if (PathIsRelativeW(szFile) && + GetFullPathNameW(szFile, _countof(szFile2), szFile2, NULL) && + PathFileExistsW(szFile2)) + { + StringCchCopyW(szFile, _countof(szFile), szFile2); + } + else if (SearchPathW(NULL, szFile, NULL, _countof(szFile2), szFile2, NULL) || + SearchPathW(NULL, szFile, wszExe, _countof(szFile2), szFile2, NULL) || + SearchPathW(NULL, szFile, wszCom, _countof(szFile2), szFile2, NULL) || + SearchPathW(pwszStartDir, szFile, NULL, _countof(szFile2), szFile2, NULL) || + SearchPathW(pwszStartDir, szFile, wszExe, _countof(szFile2), szFile2, NULL) || + SearchPathW(pwszStartDir, szFile, wszCom, _countof(szFile2), szFile2, NULL)) { StringCchCopyW(szFile, _countof(szFile), szFile2); } @@ -2477,6 +2491,11 @@ HRESULT WINAPI ShellExecCmdLine( pchParams = NULL; } + if (pwszStartDir) + { + SetCurrentDirectoryW(szCurDir); + } + if (!(dwSeclFlags & SECL_ALLOW_NONEXE)) { if (!GetBinaryTypeW(szFile, &dwType)) diff --git a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp index 1f2007a35e0..770c71c365f 100644 --- a/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp +++ b/modules/rostests/apitests/shell32/ShellExecCmdLine.cpp @@ -133,12 +133,31 @@ HRESULT WINAPI ShellExecCmdLine( else { pchParams = SplitParams(lpCommand, szFile, _countof(szFile)); - if (SearchPathW(NULL, szFile, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, szFile, wszExe, _countof(szFile2), szFile2, NULL) || - SearchPathW(NULL, szFile, wszCom, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, NULL, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, wszExe, _countof(szFile2), szFile2, NULL) || - SearchPathW(pwszStartDir, szFile, wszCom, _countof(szFile2), szFile2, NULL)) + if (szFile[0] != UNICODE_NULL && szFile[1] == L':' && + szFile[2] == UNICODE_NULL) + { + PathAddBackslashW(szFile); + } + + WCHAR szCurDir[MAX_PATH]; + GetCurrentDirectoryW(_countof(szCurDir), szCurDir); + if (pwszStartDir) + { + SetCurrentDirectoryW(pwszStartDir); + } + + if (PathIsRelativeW(szFile) && + GetFullPathNameW(szFile, _countof(szFile2), szFile2, NULL) && + PathFileExistsW(szFile2)) + { + StringCchCopyW(szFile, _countof(szFile), szFile2); + } + else if (SearchPathW(NULL, szFile, NULL, _countof(szFile2), szFile2, NULL) || + SearchPathW(NULL, szFile, wszExe, _countof(szFile2), szFile2, NULL) || + SearchPathW(NULL, szFile, wszCom, _countof(szFile2), szFile2, NULL) || + SearchPathW(pwszStartDir, szFile, NULL, _countof(szFile2), szFile2, NULL) || + SearchPathW(pwszStartDir, szFile, wszExe, _countof(szFile2), szFile2, NULL) || + SearchPathW(pwszStartDir, szFile, wszCom, _countof(szFile2), szFile2, NULL)) { StringCchCopyW(szFile, _countof(szFile), szFile2); } @@ -153,6 +172,11 @@ HRESULT WINAPI ShellExecCmdLine( pchParams = NULL; } + if (pwszStartDir) + { + SetCurrentDirectoryW(szCurDir); + } + if (!(dwSeclFlags & SECL_ALLOW_NONEXE)) { if (!GetBinaryTypeW(szFile, &dwType))

1 0

[reactos] 01/01: [VIDEOPRT] Workaround bug CORE-16695 (infinite loop when reading EDID on LiveCD in QEMU)
by Hervé Poussineau 01 Mar '20

01 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=340d9360c3a3035e4854c… commit 340d9360c3a3035e4854cc4640374fe3294e20e0 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Mar 1 10:06:18 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Mar 1 10:12:13 2020 +0100 [VIDEOPRT] Workaround bug CORE-16695 (infinite loop when reading EDID on LiveCD in QEMU) For some reason, we don't get valid EDIDs when using LiveCD on QEMU. We ignore them, and try to read the one of the next child. This leads to a infinite loop and then, an out of memory error. As it can also happen in other circonstances, stop enumeration as soon as an invalid EDID is detected. This breaks configurations with graphic cards with 2+ outputs, where the first one is not plugged to a monitor, and the second one is plugged to a monitor. CORE-16695 --- win32ss/drivers/videoprt/videoprt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/win32ss/drivers/videoprt/videoprt.c b/win32ss/drivers/videoprt/videoprt.c index 0c80c7fbfb4..d040652b4ec 100644 --- a/win32ss/drivers/videoprt/videoprt.c +++ b/win32ss/drivers/videoprt/videoprt.c @@ -1225,6 +1225,10 @@ VideoPortEnumerateChildren( { /* Mark it invalid */ ChildExtension->EdidValid = FALSE; + // FIXME: the following break workarounds CORE-16695 + // but prevents graphic cards to return an invalid + // EDID as first child, and a valid one as second child. + break; } } }

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