[jmorlan] 34652: - Make console handles start at 3, not 7. - Make CsrGetObject increment the ref count to prevent objects from being deleted while in use. Add CsrReleaseObjectByPointer calls where necessary.
Author: jmorlan Date: Mon Jul 21 19:33:42 2008 New Revision: 34652
URL: http://svn.reactos.org/svn/reactos?rev=34652&view=rev Log: - Make console handles start at 3, not 7. - Make CsrGetObject increment the ref count to prevent objects from being deleted while in use. Add CsrReleaseObjectByPointer calls where necessary.
Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c trunk/reactos/subsystems/win32/csrss/api/process.c trunk/reactos/subsystems/win32/csrss/include/csrplugin.h trunk/reactos/subsystems/win32/csrss/include/win32csr.h trunk/reactos/subsystems/win32/csrss/init.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c
Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api/... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/handle.c [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -63,21 +63,25 @@
NTSTATUS STDCALL CsrGetObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object ) { - ULONG h = (((ULONG)Handle) >> 2) - 1; + ULONG h = (ULONG)Handle >> 2; DPRINT("CsrGetObject, Object: %x, %x, %x\n", Object, Handle, ProcessData ? ProcessData->HandleTableSize : 0);
if (ProcessData == NULL) { return STATUS_INVALID_PARAMETER; } - if (!CsrIsConsoleHandle(Handle) || ProcessData->HandleTableSize <= h) + RtlEnterCriticalSection(&ProcessData->HandleTableLock); + if (!CsrIsConsoleHandle(Handle) || h >= ProcessData->HandleTableSize + || (*Object = ProcessData->HandleTable[h]) == NULL) { DPRINT1("CsrGetObject returning invalid handle (%x)\n", Handle); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_INVALID_HANDLE; } - *Object = ProcessData->HandleTable[h]; + _InterlockedIncrement(&(*Object)->ReferenceCount); + RtlLeaveCriticalSection(&ProcessData->HandleTableLock); // DbgPrint( "CsrGetObject returning\n" ); - return *Object ? STATUS_SUCCESS : STATUS_INVALID_HANDLE; + return STATUS_SUCCESS; }
@@ -114,7 +118,7 @@ CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle) { - ULONG h = (((ULONG)Handle) >> 2) - 1; + ULONG h = (ULONG)Handle >> 2; Object_t *Object;
if (ProcessData == NULL) @@ -171,7 +175,7 @@ ProcessData->HandleTableSize += 64; } ProcessData->HandleTable[i] = Object; - *Handle = (HANDLE)(((i + 1) << 2) | 0x3); + *Handle = (HANDLE)((i << 2) | 0x3); _InterlockedIncrement( &Object->ReferenceCount ); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return(STATUS_SUCCESS); @@ -216,7 +220,7 @@
NTSTATUS STDCALL CsrVerifyObject( PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle ) { - ULONG h = (((ULONG)Handle) >> 2) - 1; + ULONG h = (ULONG)Handle >> 2;
if (ProcessData == NULL) {
Modified: trunk/reactos/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api/... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/process.c [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -160,7 +160,7 @@ { if (pProcessData->HandleTable[c]) { - CsrReleaseObject(pProcessData, (HANDLE)(((c + 1) << 2)|0x3)); + CsrReleaseObjectByPointer(pProcessData->HandleTable[c]); } } RtlFreeHeap(CsrssApiHeap, 0, pProcessData->HandleTable); @@ -430,6 +430,7 @@ Request->Status = CsrInsertObject(ProcessData, &Request->Data.DuplicateHandleRequest.Handle, Object); + CsrReleaseObjectByPointer(Object); } return Request->Status; }
Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/incl... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -28,6 +28,7 @@ typedef NTSTATUS (STDCALL *CSRSS_GET_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object); +typedef NTSTATUS (STDCALL *CSRSS_RELEASE_OBJECT_BY_POINTER_PROC)(Object_t *Object); typedef NTSTATUS (STDCALL *CSRSS_RELEASE_OBJECT_PROC)(PCSRSS_PROCESS_DATA ProcessData, HANDLE Object ); typedef NTSTATUS (STDCALL *CSRSS_ENUM_PROCESSES_PROC)(CSRSS_ENUM_PROCESS_PROC EnumProc, @@ -37,6 +38,7 @@ { CSRSS_INSERT_OBJECT_PROC CsrInsertObjectProc; CSRSS_GET_OBJECT_PROC CsrGetObjectProc; + CSRSS_RELEASE_OBJECT_BY_POINTER_PROC CsrReleaseObjectByPointerProc; CSRSS_RELEASE_OBJECT_PROC CsrReleaseObjectProc; CSRSS_ENUM_PROCESSES_PROC CsrEnumProcessesProc; } CSRSS_EXPORTED_FUNCS, *PCSRSS_EXPORTED_FUNCS;
Modified: trunk/reactos/subsystems/win32/csrss/include/win32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/incl... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/win32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/win32csr.h [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -28,6 +28,7 @@ NTSTATUS FASTCALL Win32CsrGetObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Handle, Object_t **Object); +NTSTATUS FASTCALL Win32CsrReleaseObjectByPointer(Object_t *Object); NTSTATUS FASTCALL Win32CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, HANDLE Object); NTSTATUS FASTCALL Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc,
Modified: trunk/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/init... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/init.c [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -252,6 +252,7 @@ } Exports.CsrInsertObjectProc = CsrInsertObject; Exports.CsrGetObjectProc = CsrGetObject; + Exports.CsrReleaseObjectByPointerProc = CsrReleaseObjectByPointer; Exports.CsrReleaseObjectProc = CsrReleaseObject; Exports.CsrEnumProcessesProc = CsrEnumProcesses; if (! (*InitProc)(&ApiDefinitions, &ObjectDefinitions, &InitCompleteProc,
Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win3... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -47,6 +47,7 @@ return STATUS_INVALID_HANDLE; }
+ InterlockedIncrement(&ProcessConsole->Header.ReferenceCount); EnterCriticalSection(&(ProcessConsole->Header.Lock)); *Console = ProcessConsole;
@@ -1948,12 +1949,12 @@ } else { - return Request->Status = STATUS_INVALID_HANDLE; - } - - Request->Status = STATUS_SUCCESS; - - return Request->Status; + Status = STATUS_INVALID_HANDLE; + } + + Win32CsrReleaseObjectByPointer((Object_t *)Console); + + return Request->Status = Status; }
CSR_API(CsrGetConsoleMode) @@ -1987,6 +1988,7 @@ Request->Status = STATUS_INVALID_HANDLE; }
+ Win32CsrReleaseObjectByPointer((Object_t *)Console); return Request->Status; }
Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win3... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Mon Jul 21 19:33:42 2008 @@ -125,6 +125,7 @@
if ((*Object)->Type != Type) { + (CsrExports.CsrReleaseObjectByPointerProc)(*Object); return STATUS_INVALID_HANDLE; }
@@ -137,6 +138,13 @@ Win32CsrUnlockObject(Object_t *Object) { LeaveCriticalSection(&(Object->Lock)); + (CsrExports.CsrReleaseObjectByPointerProc)(Object); +} + +NTSTATUS FASTCALL +Win32CsrReleaseObjectByPointer(Object_t *Object) +{ + return (CsrExports.CsrReleaseObjectByPointerProc)(Object); }
NTSTATUS FASTCALL
-
jmorlan＠svn.reactos.org