From 5007c54522576a9fac9d0b954c7607e096402486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Tue, 16 Dec 2014 20:28:44 +0000 Subject: [PATCH] [BASESRV]: Use BaseSrvCleanupVDMResources taking a CSR_PROCESS structure instead of just its PID to be able to possibly use more things to do VDM cleanup (in the future). svn path=/trunk/; revision=65686 --- reactos/subsystems/win/basesrv/init.c | 4 ++-- reactos/subsystems/win/basesrv/vdm.c | 7 +++++-- reactos/subsystems/win/basesrv/vdm.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/reactos/subsystems/win/basesrv/init.c b/reactos/subsystems/win/basesrv/init.c index 3cdf94d7be3..8895e147a73 100644 --- a/reactos/subsystems/win/basesrv/init.c +++ b/reactos/subsystems/win/basesrv/init.c @@ -599,8 +599,8 @@ VOID NTAPI BaseClientDisconnectRoutine(IN PCSR_PROCESS CsrProcess) { - /* Cleanup the VDM console records */ - BaseSrvCleanupVdmRecords(HandleToUlong(CsrProcess->ClientId.UniqueProcess)); + /* Cleanup VDM resources */ + BaseSrvCleanupVDMResources(CsrProcess); } CSR_SERVER_DLL_INIT(ServerDllInitialization) diff --git a/reactos/subsystems/win/basesrv/vdm.c b/reactos/subsystems/win/basesrv/vdm.c index 5130011b2d7..e1df0c05515 100644 --- a/reactos/subsystems/win/basesrv/vdm.c +++ b/reactos/subsystems/win/basesrv/vdm.c @@ -228,11 +228,14 @@ VOID NTAPI BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo) RtlFreeHeap(BaseSrvHeap, 0, CommandInfo); } -VOID NTAPI BaseSrvCleanupVdmRecords(ULONG ProcessId) +VOID +NTAPI +BaseSrvCleanupVDMResources(IN PCSR_PROCESS CsrProcess) { - PLIST_ENTRY i; + ULONG ProcessId = HandleToUlong(CsrProcess->ClientId.UniqueProcess); PVDM_CONSOLE_RECORD ConsoleRecord = NULL; PVDM_DOS_RECORD DosRecord; + PLIST_ENTRY i; /* Enter the critical section */ RtlEnterCriticalSection(&DosCriticalSection); diff --git a/reactos/subsystems/win/basesrv/vdm.h b/reactos/subsystems/win/basesrv/vdm.h index 3da59d90442..db11e65bce9 100644 --- a/reactos/subsystems/win/basesrv/vdm.h +++ b/reactos/subsystems/win/basesrv/vdm.h @@ -49,7 +49,7 @@ ULONG NTAPI GetNextDosSesId(VOID); BOOLEAN NTAPI BaseSrvIsVdmAllowed(VOID); NTSTATUS NTAPI BaseSrvCreatePairWaitHandles(PHANDLE ServerEvent, PHANDLE ClientEvent); VOID NTAPI BaseSrvFreeVDMInfo(PVDM_COMMAND_INFO CommandInfo); -VOID NTAPI BaseSrvCleanupVdmRecords(ULONG ProcessId); +VOID NTAPI BaseSrvCleanupVDMResources(IN PCSR_PROCESS CsrProcess); BOOLEAN NTAPI BaseSrvCopyCommand(PBASE_CHECK_VDM CheckVdmRequest, PVDM_DOS_RECORD DosRecord); NTSTATUS NTAPI BaseSrvFillCommandInfo( PVDM_COMMAND_INFO CommandInfo,