Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 12:55:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONSRV] Use NtClearEvent() and NtClose() instead of the Win32 functions.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2020-02-29 20:11:09 +01:00
parent e624be1eb2
commit 31c13e89fe
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
win32ss/user/winsrv/consrv/condrv/coninput.c
View file

@ -185,7 +185,7 @@ PurgeInputBuffer(IN PCONSOLE_INPUT_BUFFER InputBuffer)
ConsoleFreeHeap(Event); ConsoleFreeHeap(Event);
} }
// CloseHandle(Console->InputBuffer.ActiveEvent); // NtClose(Console->InputBuffer.ActiveEvent);
} }
NTSTATUS NTAPI NTSTATUS NTAPI
@ -221,7 +221,7 @@ VOID NTAPI
ConDrvDeinitInputBuffer(IN PCONSOLE Console) ConDrvDeinitInputBuffer(IN PCONSOLE Console)
{ {
PurgeInputBuffer(&Console->InputBuffer); PurgeInputBuffer(&Console->InputBuffer);
CloseHandle(Console->InputBuffer.ActiveEvent); NtClose(Console->InputBuffer.ActiveEvent);
} }
@ -317,7 +317,7 @@ ConDrvGetConsoleInput(IN PCONSOLE Console,
if (IsListEmpty(&InputBuffer->InputEvents)) 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. // 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 */ /* Discard all entries in the input event queue */
PurgeInputBuffer(InputBuffer); PurgeInputBuffer(InputBuffer);
ResetEvent(InputBuffer->ActiveEvent); NtClearEvent(InputBuffer->ActiveEvent);
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

2
win32ss/user/winsrv/consrv/condrv/console.c
View file

@ -409,7 +409,7 @@ ConDrvDeleteConsole(IN PCONSOLE Console)
/* Deinitialize the input buffer */ /* Deinitialize the input buffer */
ConDrvDeinitInputBuffer(Console); ConDrvDeinitInputBuffer(Console);
if (Console->UnpauseEvent) CloseHandle(Console->UnpauseEvent); if (Console->UnpauseEvent) NtClose(Console->UnpauseEvent);
DPRINT("ConDrvDeleteConsole - Unlocking\n"); DPRINT("ConDrvDeleteConsole - Unlocking\n");
LeaveCriticalSection(&Console->Lock); LeaveCriticalSection(&Console->Lock);

4
win32ss/user/winsrv/consrv/frontends/terminal.c
View file

@ -365,7 +365,7 @@ ConSrvTermReadStream(IN OUT PTERMINAL This,
CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents);
if (IsListEmpty(&InputBuffer->InputEvents)) if (IsListEmpty(&InputBuffer->InputEvents))
{ {
ResetEvent(InputBuffer->ActiveEvent); NtClearEvent(InputBuffer->ActiveEvent);
} }
Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry);
@ -430,7 +430,7 @@ ConSrvTermReadStream(IN OUT PTERMINAL This,
CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents); CurrentEntry = RemoveHeadList(&InputBuffer->InputEvents);
if (IsListEmpty(&InputBuffer->InputEvents)) if (IsListEmpty(&InputBuffer->InputEvents))
{ {
ResetEvent(InputBuffer->ActiveEvent); NtClearEvent(InputBuffer->ActiveEvent);
} }
Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry); Input = CONTAINING_RECORD(CurrentEntry, ConsoleInput, ListEntry);