Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

reverted last change

Browse source 
svn path=/trunk/; revision=16761
This commit is contained in:
Hartmut Birr 2005-07-26 21:33:38 +00:00
parent b0faf4f537
commit 13b2222c28
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/ntoskrnl/ex/handle.c
View file

@ -910,16 +910,14 @@ ExMapHandleToPointer(IN PHANDLE_TABLE HandleTable,
ASSERT(HandleTable); ASSERT(HandleTable);
ExAcquireHandleTableLockShared(HandleTable);
HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, HandleTableEntry = ExpLookupHandleTableEntry(HandleTable,
Handle); Handle);
if (HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry)) if (HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry))
{ {
DPRINT("ExMapHandleToPointer HT:0x%p Entry:0x%p locked\n", HandleTable, HandleTableEntry); DPRINT("ExMapHandleToPointer HT:0x%p Entry:0x%p locked\n", HandleTable, HandleTableEntry);
ExReleaseHandleTableLock(HandleTable);
return HandleTableEntry; return HandleTableEntry;
} }
ExReleaseHandleTableLock(HandleTable);
return NULL; return NULL;
} }
@ -938,14 +936,12 @@ ExChangeHandle(IN PHANDLE_TABLE HandleTable,
ASSERT(ChangeHandleCallback); ASSERT(ChangeHandleCallback);
KeEnterCriticalRegion(); KeEnterCriticalRegion();
ExAcquireHandleTableLockShared(HandleTable);
HandleTableEntry = ExpLookupHandleTableEntry(HandleTable, HandleTableEntry = ExpLookupHandleTableEntry(HandleTable,
Handle); Handle);
if(HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry)) if(HandleTableEntry != NULL && ExLockHandleTableEntry(HandleTable, HandleTableEntry))
{ {
ExReleaseHandleTableLock(HandleTable);
Ret = ChangeHandleCallback(HandleTable, Ret = ChangeHandleCallback(HandleTable,
HandleTableEntry, HandleTableEntry,
NULL); NULL);
@ -953,10 +949,7 @@ ExChangeHandle(IN PHANDLE_TABLE HandleTable,
ExUnlockHandleTableEntry(HandleTable, ExUnlockHandleTableEntry(HandleTable,
HandleTableEntry); HandleTableEntry);
} }
else
{
ExReleaseHandleTableLock(HandleTable);
}
KeLeaveCriticalRegion(); KeLeaveCriticalRegion();
return Ret; return Ret;