Author: jimtabor
Date: Fri Jan 22 02:12:06 2010
New Revision: 45197
URL:
http://svn.reactos.org/svn/reactos?rev=45197&view=rev
Log:
[Win32k]
- Remove CriticalRegion calls.
Modified:
trunk/reactos/subsystems/win32/win32k/objects/dcattr.c
trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
trunk/reactos/subsystems/win32/win32k/objects/region.c
Modified: trunk/reactos/subsystems/win32/win32k/objects/dcattr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dcattr.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dcattr.c [iso-8859-1] Fri Jan 22
02:12:06 2010
@@ -159,7 +159,6 @@
PVOID NewMem = NULL;
PDC pDC;
- KeEnterCriticalRegion();
{
INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hDC);
PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index];
@@ -179,7 +178,6 @@
DPRINT1("DC_ATTR not allocated!\n");
}
}
- KeLeaveCriticalRegion();
pDC = DC_LockDc(hDC);
ASSERT(pDC->pdcattr == &pDC->dcattr);
if (NewMem)
@@ -198,7 +196,6 @@
pDC->pdcattr = &pDC->dcattr;
DC_UnlockDc(pDC);
- KeEnterCriticalRegion();
{
INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)DCToFree);
PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index];
@@ -208,7 +205,6 @@
Entry->UserData = NULL;
}
}
- KeLeaveCriticalRegion();
}
Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Fri Jan 22
02:12:06 2010
@@ -755,10 +755,8 @@
}
if (pAttr)
{
- KeEnterCriticalRegion();
FreeObjectAttr(pAttr);
Entry->UserData = NULL;
- KeLeaveCriticalRegion();
}
break;
@@ -1575,12 +1573,10 @@
level functions.
*/
// FIXME! HAX!!! Remove this once we get everything right!
- KeEnterCriticalRegion();
Index = GDI_HANDLE_GET_INDEX(hRgn);
Entry = &GdiHandleTable->Entries[Index];
if (Entry->UserData) FreeObjectAttr(Entry->UserData);
Entry->UserData = NULL;
- KeLeaveCriticalRegion();
//
if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE)
{
Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Fri Jan 22
02:12:06 2010
@@ -2063,11 +2063,9 @@
}
}
- KeEnterCriticalRegion();
Index = GDI_HANDLE_GET_INDEX(hReg);
Entry = &GdiHandleTable->Entries[Index];
Entry->UserData = AllocateObjectAttr();
- KeLeaveCriticalRegion();
EMPTY_REGION(pReg);
pReg->rdh.dwSize = sizeof(RGNDATAHEADER);
@@ -2091,12 +2089,10 @@
if (pRgn)
{
- KeEnterCriticalRegion();
Index = GDI_HANDLE_GET_INDEX(hRgn);
Entry = &GdiHandleTable->Entries[Index];
pRgn_Attr = Entry->UserData;
pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1);
- KeLeaveCriticalRegion();
if ( pid == NtCurrentTeb()->ClientId.UniqueProcess &&
pRgn_Attr )
@@ -2151,12 +2147,10 @@
if (pRgn)
{
- KeEnterCriticalRegion();
Index = GDI_HANDLE_GET_INDEX(pRgn->BaseObject.hHmgr);
Entry = &GdiHandleTable->Entries[Index];
pRgn_Attr = Entry->UserData;
pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1);
- KeLeaveCriticalRegion();
if ( pid == NtCurrentTeb()->ClientId.UniqueProcess &&
pRgn_Attr )