From 31c13e89fe5942cfba167d4c5f3c6e41a191faaf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 29 Feb 2020 20:11:09 +0100 Subject: [PATCH] [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); -- 2.17.1