Author: hbelusca Date: Tue Dec 16 20:28:44 2014 New Revision: 65686
URL: http://svn.reactos.org/svn/reactos?rev=65686&view=rev Log: [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).
Modified: trunk/reactos/subsystems/win/basesrv/init.c trunk/reactos/subsystems/win/basesrv/vdm.c trunk/reactos/subsystems/win/basesrv/vdm.h
Modified: trunk/reactos/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/init... ============================================================================== --- trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/init.c [iso-8859-1] Tue Dec 16 20:28:44 2014 @@ -599,8 +599,8 @@ 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)
Modified: trunk/reactos/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm.... ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.c [iso-8859-1] Tue Dec 16 20:28:44 2014 @@ -228,11 +228,14 @@ RtlFreeHeap(BaseSrvHeap, 0, CommandInfo); }
-VOID NTAPI BaseSrvCleanupVdmRecords(ULONG ProcessId) -{ - PLIST_ENTRY i; +VOID +NTAPI +BaseSrvCleanupVDMResources(IN PCSR_PROCESS CsrProcess) +{ + ULONG ProcessId = HandleToUlong(CsrProcess->ClientId.UniqueProcess); PVDM_CONSOLE_RECORD ConsoleRecord = NULL; PVDM_DOS_RECORD DosRecord; + PLIST_ENTRY i;
/* Enter the critical section */ RtlEnterCriticalSection(&DosCriticalSection);
Modified: trunk/reactos/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win/basesrv/vdm.... ============================================================================== --- trunk/reactos/subsystems/win/basesrv/vdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win/basesrv/vdm.h [iso-8859-1] Tue Dec 16 20:28:44 2014 @@ -49,7 +49,7 @@ 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,