mirror of
https://github.com/reactos/reactos.git
synced 2024-09-05 18:26:53 +00:00
[win32k]
Use PREGION as type fo the DC regions instead of PVOID. svn path=/branches/reactos-yarotows/; revision=46630
This commit is contained in:
parent
2190eb07dd
commit
49383c3d97
|
@ -8,6 +8,7 @@ typedef struct _DC *PDC;
|
||||||
#include "bitmaps.h"
|
#include "bitmaps.h"
|
||||||
#include "pdevobj.h"
|
#include "pdevobj.h"
|
||||||
#include "palette.h"
|
#include "palette.h"
|
||||||
|
#include "region.h"
|
||||||
|
|
||||||
/* Constants ******************************************************************/
|
/* Constants ******************************************************************/
|
||||||
|
|
||||||
|
@ -127,9 +128,9 @@ typedef struct _DC
|
||||||
RECTL erclWindow;
|
RECTL erclWindow;
|
||||||
RECTL erclBounds;
|
RECTL erclBounds;
|
||||||
RECTL erclBoundsApp;
|
RECTL erclBoundsApp;
|
||||||
PVOID prgnAPI; /* PROSRGNDATA */
|
PREGION prgnAPI; /* PROSRGNDATA */
|
||||||
PVOID prgnVis; /* Visible region (must never be 0) */
|
PREGION prgnVis; /* Visible region (must never be 0) */
|
||||||
PVOID prgnRao;
|
PREGION prgnRao;
|
||||||
POINTL ptlFillOrigin;
|
POINTL ptlFillOrigin;
|
||||||
EBRUSHOBJ eboFill;
|
EBRUSHOBJ eboFill;
|
||||||
EBRUSHOBJ eboLine;
|
EBRUSHOBJ eboLine;
|
||||||
|
|
|
@ -14,7 +14,7 @@ typedef struct _ROSRGNDATA
|
||||||
|
|
||||||
RGNDATAHEADER rdh;
|
RGNDATAHEADER rdh;
|
||||||
RECTL *Buffer;
|
RECTL *Buffer;
|
||||||
} ROSRGNDATA, *PROSRGNDATA, *LPROSRGNDATA;
|
} ROSRGNDATA, *PROSRGNDATA, *LPROSRGNDATA, REGION, *PREGION;
|
||||||
|
|
||||||
|
|
||||||
/* Functions ******************************************************************/
|
/* Functions ******************************************************************/
|
||||||
|
|
|
@ -365,7 +365,7 @@ DC_Cleanup(PVOID ObjectBody)
|
||||||
if (pdc->rosdc.hClipRgn)
|
if (pdc->rosdc.hClipRgn)
|
||||||
GreDeleteObject(pdc->rosdc.hClipRgn);
|
GreDeleteObject(pdc->rosdc.hClipRgn);
|
||||||
if (pdc->prgnVis)
|
if (pdc->prgnVis)
|
||||||
REGION_FreeRgnByHandle(((PROSRGNDATA)pdc->prgnVis)->BaseObject.hHmgr);
|
REGION_FreeRgnByHandle(pdc->prgnVis->BaseObject.hHmgr);
|
||||||
ASSERT(pdc->rosdc.hGCClipRgn);
|
ASSERT(pdc->rosdc.hGCClipRgn);
|
||||||
if (pdc->rosdc.hGCClipRgn)
|
if (pdc->rosdc.hGCClipRgn)
|
||||||
GreDeleteObject(pdc->rosdc.hGCClipRgn);
|
GreDeleteObject(pdc->rosdc.hGCClipRgn);
|
||||||
|
@ -419,12 +419,12 @@ DC_SetOwnership(HDC hDC, PEPROCESS Owner)
|
||||||
}
|
}
|
||||||
if (pDC->prgnVis)
|
if (pDC->prgnVis)
|
||||||
{ // FIXME! HAX!!!
|
{ // FIXME! HAX!!!
|
||||||
Index = GDI_HANDLE_GET_INDEX(((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr);
|
Index = GDI_HANDLE_GET_INDEX(pDC->prgnVis->BaseObject.hHmgr);
|
||||||
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;
|
||||||
//
|
//
|
||||||
if (!GDIOBJ_SetOwnership(((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr, Owner)) goto leave;
|
if (!GDIOBJ_SetOwnership(pDC->prgnVis->BaseObject.hHmgr, Owner)) goto leave;
|
||||||
}
|
}
|
||||||
if (pDC->rosdc.hGCClipRgn)
|
if (pDC->rosdc.hGCClipRgn)
|
||||||
{ // FIXME! HAX!!!
|
{ // FIXME! HAX!!!
|
||||||
|
|
Loading…
Reference in a new issue