Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 07:33:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32k]

Browse source 
- Remove CriticalRegion calls.

svn path=/trunk/; revision=45197
This commit is contained in:
James Tabor 2010-01-22 01:12:06 +00:00
parent f4519c0c43
commit be48e3ae53
3 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsystems/win32/win32k/objects/dcattr.c
View file

@ -159,7 +159,6 @@ DC_AllocateDcAttr(HDC hDC)
PVOID NewMem = NULL; PVOID NewMem = NULL;
PDC pDC; PDC pDC;
KeEnterCriticalRegion();
{ {
INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hDC); INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hDC);
PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index];
@ -179,7 +178,6 @@ DC_AllocateDcAttr(HDC hDC)
DPRINT1("DC_ATTR not allocated!\n"); DPRINT1("DC_ATTR not allocated!\n");
} }
} }
KeLeaveCriticalRegion();
pDC = DC_LockDc(hDC); pDC = DC_LockDc(hDC);
ASSERT(pDC->pdcattr == &pDC->dcattr); ASSERT(pDC->pdcattr == &pDC->dcattr);
if (NewMem) if (NewMem)
@ -198,7 +196,6 @@ DC_FreeDcAttr(HDC DCToFree )
pDC->pdcattr = &pDC->dcattr; pDC->pdcattr = &pDC->dcattr;
DC_UnlockDc(pDC); DC_UnlockDc(pDC);
KeEnterCriticalRegion();
{ {
INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)DCToFree); INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)DCToFree);
PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index];
@ -208,7 +205,6 @@ DC_FreeDcAttr(HDC DCToFree )
Entry->UserData = NULL; Entry->UserData = NULL;
} }
} }
KeLeaveCriticalRegion();
} }

4
reactos/subsystems/win32/win32k/objects/gdiobj.c
View file

@ -755,10 +755,8 @@ GreDeleteObject(HGDIOBJ hObject)
} }
if (pAttr) if (pAttr)
{ {
KeEnterCriticalRegion();
FreeObjectAttr(pAttr); FreeObjectAttr(pAttr);
Entry->UserData = NULL; Entry->UserData = NULL;
KeLeaveCriticalRegion();
} }
break; break;
@ -1575,12 +1573,10 @@ IntGdiSetRegionOwner(HRGN hRgn, DWORD OwnerMask)
level functions. level functions.
*/ */
// FIXME! HAX!!! Remove this once we get everything right! // FIXME! HAX!!! Remove this once we get everything right!
KeEnterCriticalRegion();
Index = GDI_HANDLE_GET_INDEX(hRgn); Index = GDI_HANDLE_GET_INDEX(hRgn);
Entry = &GdiHandleTable->Entries[Index]; Entry = &GdiHandleTable->Entries[Index];
if (Entry->UserData) FreeObjectAttr(Entry->UserData); if (Entry->UserData) FreeObjectAttr(Entry->UserData);
Entry->UserData = NULL; Entry->UserData = NULL;
KeLeaveCriticalRegion();
// //
if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE) if ((OwnerMask == GDI_OBJ_HMGR_PUBLIC) || OwnerMask == GDI_OBJ_HMGR_NONE)
{ {

6
reactos/subsystems/win32/win32k/objects/region.c
View file

@ -2063,11 +2063,9 @@ REGION_AllocRgnWithHandle(INT nReg)
} }
} }
KeEnterCriticalRegion();
Index = GDI_HANDLE_GET_INDEX(hReg); Index = GDI_HANDLE_GET_INDEX(hReg);
Entry = &GdiHandleTable->Entries[Index]; Entry = &GdiHandleTable->Entries[Index];
Entry->UserData = AllocateObjectAttr(); Entry->UserData = AllocateObjectAttr();
KeLeaveCriticalRegion();
EMPTY_REGION(pReg); EMPTY_REGION(pReg);
pReg->rdh.dwSize = sizeof(RGNDATAHEADER); pReg->rdh.dwSize = sizeof(RGNDATAHEADER);
@ -2091,12 +2089,10 @@ RGNOBJAPI_Lock(HRGN hRgn, PRGN_ATTR *ppRgn_Attr)
if (pRgn) if (pRgn)
{ {
KeEnterCriticalRegion();
Index = GDI_HANDLE_GET_INDEX(hRgn); Index = GDI_HANDLE_GET_INDEX(hRgn);
Entry = &GdiHandleTable->Entries[Index]; Entry = &GdiHandleTable->Entries[Index];
pRgn_Attr = Entry->UserData; pRgn_Attr = Entry->UserData;
pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1);
KeLeaveCriticalRegion();
if ( pid == NtCurrentTeb()->ClientId.UniqueProcess && if ( pid == NtCurrentTeb()->ClientId.UniqueProcess &&
pRgn_Attr ) pRgn_Attr )
@ -2151,12 +2147,10 @@ RGNOBJAPI_Unlock(PROSRGNDATA pRgn)
if (pRgn) if (pRgn)
{ {
KeEnterCriticalRegion();
Index = GDI_HANDLE_GET_INDEX(pRgn->BaseObject.hHmgr); Index = GDI_HANDLE_GET_INDEX(pRgn->BaseObject.hHmgr);
Entry = &GdiHandleTable->Entries[Index]; Entry = &GdiHandleTable->Entries[Index];
pRgn_Attr = Entry->UserData; pRgn_Attr = Entry->UserData;
pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1); pid = (HANDLE)((ULONG_PTR)Entry->ProcessId & ~0x1);
KeLeaveCriticalRegion();
if ( pid == NtCurrentTeb()->ClientId.UniqueProcess && if ( pid == NtCurrentTeb()->ClientId.UniqueProcess &&
pRgn_Attr ) pRgn_Attr )