Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-30 19:19:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed unused code from Arc. Removed old saveLevel and hSelf, use DcLevel. Other changes to region and clipping.

Browse source 
svn path=/trunk/; revision=33653
This commit is contained in:
James Tabor 2008-05-23 00:29:08 +00:00
parent 6eb7885be4
commit 6f3798d0cf
6 changed files with 188 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/dll/win32/gdi32/objects/region.c
View file

@ -232,7 +232,7 @@ GetClipRgn(
HRGN hrgn HRGN hrgn
) )
{ {
INT Ret = NtGdiGetRandomRgn(hdc, hrgn, 1); INT Ret = NtGdiGetRandomRgn(hdc, hrgn, CLIPRGN);
// if (Ret) // if (Ret)
// { // {
// if(GetLayout(hdc) & LAYOUT_RTL) MirrorRgnDC(hdc,(HRGN)Ret, NULL); // if(GetLayout(hdc) & LAYOUT_RTL) MirrorRgnDC(hdc,(HRGN)Ret, NULL);
@ -248,7 +248,7 @@ STDCALL
GetMetaRgn(HDC hdc, GetMetaRgn(HDC hdc,
HRGN hrgn) HRGN hrgn)
{ {
return NtGdiGetRandomRgn(hdc,hrgn,2); return NtGdiGetRandomRgn(hdc, hrgn, METARGN);
} }
/* /*

6
reactos/subsystems/win32/win32k/include/dc.h
View file

@ -115,7 +115,7 @@ typedef struct _DC
PVOID prfnt; // RFONT* PVOID prfnt; // RFONT*
unsigned co_[31]; // CLIPOBJ unsigned co_[31]; // CLIPOBJ
PVOID pPFFList; // PPFF* PVOID pPFFList; // PPFF*
PVOID ClrxFormObj; PVOID ClrxFormLnk;
INT ipfdDevMax; INT ipfdDevMax;
ULONG ulCopyCount; ULONG ulCopyCount;
PVOID pSurfInfo; PVOID pSurfInfo;
@ -129,9 +129,6 @@ typedef struct _DC
XLATEOBJ *XlateBrush; XLATEOBJ *XlateBrush;
XLATEOBJ *XlatePen; XLATEOBJ *XlatePen;
INT saveLevel; // DCLEVEL lSaveDepth
HDC hSelf; // DCLEVEL hdcSave Used only for MemoryDC & SaveDC.
UNICODE_STRING DriverName; UNICODE_STRING DriverName;
} DC, *PDC; } DC, *PDC;
@ -264,4 +261,5 @@ VOID FASTCALL IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType);
HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC);
BOOL FASTCALL IntGdiCleanDC(HDC hDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC);
#endif /* not __WIN32K_DC_H */ #endif /* not __WIN32K_DC_H */

20
reactos/subsystems/win32/win32k/objects/arc.c
View file

@ -38,26 +38,6 @@ IntGdiArcInternal(
IntGdiSetRect(&rc, LeftRect, TopRect, RightRect, BottomRect); IntGdiSetRect(&rc, LeftRect, TopRect, RightRect, BottomRect);
IntGdiSetRect(&rc1, XStartArc, YStartArc, XEndArc, YEndArc); IntGdiSetRect(&rc1, XStartArc, YStartArc, XEndArc, YEndArc);
if (dc->w.flags & DCX_WINDOW) //window rectangle instead of client rectangle
{
HWND hWnd;
PWINDOW_OBJECT Window;
hWnd = IntWindowFromDC((HDC) dc->BaseObject.hHmgr);
Window = UserGetWindowObject(hWnd);
if(!Window) return FALSE;
rc.left += Window->Wnd->ClientRect.left;
rc.top += Window->Wnd->ClientRect.top;
rc.right += Window->Wnd->ClientRect.left;
rc.bottom += Window->Wnd->ClientRect.top;
rc1.left += Window->Wnd->ClientRect.left;
rc1.top += Window->Wnd->ClientRect.top;
rc1.right += Window->Wnd->ClientRect.left;
rc1.bottom += Window->Wnd->ClientRect.top;
}
rx = (rc.right - rc.left)/2 - 1; rx = (rc.right - rc.left)/2 - 1;
ry = (rc.bottom - rc.top)/2 -1; ry = (rc.bottom - rc.top)/2 -1;
rc.left += rx; rc.left += rx;

147
reactos/subsystems/win32/win32k/objects/cliprgn.c
View file

@ -225,13 +225,6 @@ NtGdiGetAppClipBox(HDC hDC, LPRECT rc)
return Ret; return Ret;
} }
int STDCALL NtGdiGetMetaRgn(HDC hDC,
HRGN hrgn)
{
UNIMPLEMENTED;
return 0;
}
int STDCALL NtGdiExcludeClipRect(HDC hDC, int STDCALL NtGdiExcludeClipRect(HDC hDC,
int LeftRect, int LeftRect,
int TopRect, int TopRect,
@ -430,10 +423,146 @@ BOOL STDCALL NtGdiRectVisible(HDC hDC,
return Result; return Result;
} }
int
FASTCALL
IntGdiSetMetaRgn(PDC pDC)
{
INT Ret = ERROR;
PROSRGNDATA TempRgn;
if ( pDC->DcLevel.prgnMeta )
{
if ( pDC->DcLevel.prgnClip )
{
TempRgn = REGION_AllocRgnWithHandle(1);
if (TempRgn)
{
REGION_SetRectRgn(TempRgn, 0, 0, 0, 0);
Ret = IntGdiCombineRgn( TempRgn,
pDC->DcLevel.prgnMeta,
pDC->DcLevel.prgnClip,
RGN_AND);
if ( Ret )
{
REGION_UnlockRgn(TempRgn);
TempRgn = GDIOBJ_ShareLockObj(TempRgn->BaseObject.hHmgr,
GDI_OBJECT_TYPE_REGION);
GDIOBJ_ShareUnlockObjByPtr(pDC->DcLevel.prgnMeta);
if (!((PROSRGNDATA)pDC->DcLevel.prgnMeta)->BaseObject.ulShareCount)
REGION_FreeRgn(pDC->DcLevel.prgnMeta);
pDC->DcLevel.prgnMeta = TempRgn;
GDIOBJ_ShareUnlockObjByPtr(pDC->DcLevel.prgnClip);
if (!((PROSRGNDATA)pDC->DcLevel.prgnClip)->BaseObject.ulShareCount)
REGION_FreeRgn(pDC->DcLevel.prgnClip);
pDC->DcLevel.prgnClip = NULL;
pDC->DC_Flags |= DC_FLAG_DIRTY_RAO;
pDC->erclClip.left = 0;
pDC->erclClip.top = 0;
pDC->erclClip.right = 0;
pDC->erclClip.bottom = 0;
}
else
REGION_FreeRgn(TempRgn);
}
}
else
Ret = REGION_Complexity(pDC->DcLevel.prgnMeta);
}
else
{
if ( pDC->DcLevel.prgnClip )
{
Ret = REGION_Complexity(pDC->DcLevel.prgnClip);
pDC->DcLevel.prgnMeta = pDC->DcLevel.prgnClip;
pDC->DcLevel.prgnClip = NULL;
}
else
Ret = SIMPLEREGION;
}
return Ret;
}
int STDCALL NtGdiSetMetaRgn(HDC hDC) int STDCALL NtGdiSetMetaRgn(HDC hDC)
{ {
UNIMPLEMENTED; INT Ret;
return 0; PDC pDC = DC_LockDc(hDC);
if (!pDC)
{
SetLastWin32Error(ERROR_INVALID_PARAMETER);
return ERROR;
}
Ret = IntGdiSetMetaRgn(pDC);
DC_UnlockDc(pDC);
return Ret;
}
INT FASTCALL
NEW_CLIPPING_UpdateGCRegion(PDC pDC)
{
CLIPOBJ * co;
if (!pDC->prgnVis) return 0;
if (pDC->prgnAPI)
{
REGION_FreeRgn(pDC->prgnAPI);
pDC->prgnAPI = REGION_AllocRgnWithHandle(1);
REGION_SetRectRgn(pDC->prgnAPI, 0, 0, 0, 0);
}
if (pDC->prgnRao)
{
REGION_FreeRgn(pDC->prgnRao);
pDC->prgnRao = REGION_AllocRgnWithHandle(1);
REGION_SetRectRgn(pDC->prgnRao, 0, 0, 0, 0);
}
if (pDC->DcLevel.prgnMeta && pDC->DcLevel.prgnClip)
{
IntGdiCombineRgn( pDC->prgnAPI,
pDC->DcLevel.prgnClip,
pDC->DcLevel.prgnMeta,
RGN_AND);
}
else
{
if (pDC->DcLevel.prgnClip)
IntGdiCombineRgn( pDC->prgnAPI,
pDC->DcLevel.prgnClip,
NULL,
RGN_COPY);
else if (pDC->DcLevel.prgnMeta)
IntGdiCombineRgn( pDC->prgnAPI,
pDC->DcLevel.prgnMeta,
NULL,
RGN_COPY);
}
IntGdiCombineRgn( pDC->prgnRao,
pDC->prgnVis,
pDC->prgnAPI,
RGN_AND);
RtlCopyMemory(&pDC->erclClip, &((PROSRGNDATA)pDC->prgnRao)->rdh.rcBound , sizeof(RECTL));
pDC->DC_Flags &= ~DC_FLAG_DIRTY_RAO;
// if (Dc->CombinedClip != NULL) IntEngDeleteClipRegion(Dc->CombinedClip);
co = IntEngCreateClipRegion( ((PROSRGNDATA)pDC->prgnRao)->rdh.nCount,
(PRECTL)((PROSRGNDATA)pDC->prgnRao)->Buffer,
(PRECTL)&pDC->erclClip);
return REGION_Complexity(pDC->prgnRao);
} }
/* EOF */ /* EOF */

22
reactos/subsystems/win32/win32k/objects/dc.c
View file

@ -107,7 +107,7 @@ NtGdiCreateCompatibleDC(HDC hDC)
if(!nDc_Attr) nDc_Attr = &NewDC->Dc_Attr; if(!nDc_Attr) nDc_Attr = &NewDC->Dc_Attr;
/* Copy information from original DC to new DC */ /* Copy information from original DC to new DC */
NewDC->hSelf = hNewDC; NewDC->DcLevel.hdcSave = hNewDC;
NewDC->PDev = OrigDC->PDev; NewDC->PDev = OrigDC->PDev;
@ -1001,7 +1001,7 @@ IntGdiDeleteDC(HDC hDC, BOOL Force)
} }
/* First delete all saved DCs */ /* First delete all saved DCs */
while (DCToDelete->saveLevel) while (DCToDelete->DcLevel.lSaveDepth)
{ {
PDC savedDC; PDC savedDC;
HDC savedHDC; HDC savedHDC;
@ -1013,7 +1013,7 @@ IntGdiDeleteDC(HDC hDC, BOOL Force)
break; break;
} }
DC_SetNextDC (DCToDelete, DC_GetNextDC (savedDC)); DC_SetNextDC (DCToDelete, DC_GetNextDC (savedDC));
DCToDelete->saveLevel--; DCToDelete->DcLevel.lSaveDepth--;
DC_UnlockDc( savedDC ); DC_UnlockDc( savedDC );
IntGdiDeleteDC(savedHDC, Force); IntGdiDeleteDC(savedHDC, Force);
} }
@ -1376,7 +1376,7 @@ IntGdiCopyToSaveState(PDC dc, PDC newdc)
nDc_Attr->ptlViewportOrg = Dc_Attr->ptlViewportOrg; nDc_Attr->ptlViewportOrg = Dc_Attr->ptlViewportOrg;
nDc_Attr->szlViewportExt = Dc_Attr->szlViewportExt; nDc_Attr->szlViewportExt = Dc_Attr->szlViewportExt;
newdc->saveLevel = 0; newdc->DcLevel.lSaveDepth = 0;
newdc->DC_Type = dc->DC_Type; newdc->DC_Type = dc->DC_Type;
#if 0 #if 0
@ -1518,7 +1518,7 @@ IntGdiGetDCState(HDC hDC)
/* FIXME - newdc can be NULL!!!! Don't assert here!!! */ /* FIXME - newdc can be NULL!!!! Don't assert here!!! */
ASSERT( newdc ); ASSERT( newdc );
newdc->hSelf = hnewdc; newdc->DcLevel.hdcSave = hnewdc;
IntGdiCopyToSaveState( dc, newdc); IntGdiCopyToSaveState( dc, newdc);
DC_UnlockDc( newdc ); DC_UnlockDc( newdc );
@ -1541,7 +1541,7 @@ IntGdiSetDCState ( HDC hDC, HDC hDCSave )
{ {
if ( dcs->w.flags & DC_SAVED ) if ( dcs->w.flags & DC_SAVED )
{ {
IntGdiCopyFromSaveState( dc, dcs, dc->hSelf); IntGdiCopyFromSaveState( dc, dcs, dc->DcLevel.hdcSave);
} }
else else
{ {
@ -1805,16 +1805,16 @@ NtGdiRestoreDC(HDC hDC, INT SaveLevel)
} }
if (SaveLevel < 0) if (SaveLevel < 0)
SaveLevel = dc->saveLevel + SaveLevel + 1; SaveLevel = dc->DcLevel.lSaveDepth + SaveLevel + 1;
if(SaveLevel < 0 || dc->saveLevel<SaveLevel) if(SaveLevel < 0 || dc->DcLevel.lSaveDepth<SaveLevel)
{ {
DC_UnlockDc(dc); DC_UnlockDc(dc);
return FALSE; return FALSE;
} }
success=TRUE; success=TRUE;
while (dc->saveLevel >= SaveLevel) while (dc->DcLevel.lSaveDepth >= SaveLevel)
{ {
HDC hdcs = DC_GetNextDC (dc); HDC hdcs = DC_GetNextDC (dc);
@ -1828,7 +1828,7 @@ NtGdiRestoreDC(HDC hDC, INT SaveLevel)
DC_SetNextDC (dc, DC_GetNextDC (dcs)); DC_SetNextDC (dc, DC_GetNextDC (dcs));
dcs->hNext = 0; dcs->hNext = 0;
if (--dc->saveLevel < SaveLevel) if (--dc->DcLevel.lSaveDepth < SaveLevel)
{ {
DC_UnlockDc( dc ); DC_UnlockDc( dc );
DC_UnlockDc( dcs ); DC_UnlockDc( dcs );
@ -1903,7 +1903,7 @@ NtGdiSaveDC(HDC hDC)
DC_SetNextDC (dcs, DC_GetNextDC (dc)); DC_SetNextDC (dcs, DC_GetNextDC (dc));
DC_SetNextDC (dc, hdcs); DC_SetNextDC (dc, hdcs);
ret = ++dc->saveLevel; ret = ++dc->DcLevel.lSaveDepth;
DC_UnlockDc( dcs ); DC_UnlockDc( dcs );
DC_UnlockDc( dc ); DC_UnlockDc( dc );

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

@ -138,7 +138,7 @@ SOFTWARE.
(pReg)->rdh.nCount = 0; \ (pReg)->rdh.nCount = 0; \
(pReg)->rdh.rcBound.left = (pReg)->rdh.rcBound.top = 0; \ (pReg)->rdh.rcBound.left = (pReg)->rdh.rcBound.top = 0; \
(pReg)->rdh.rcBound.right = (pReg)->rdh.rcBound.bottom = 0; \ (pReg)->rdh.rcBound.right = (pReg)->rdh.rcBound.bottom = 0; \
(pReg)->rdh.iType = NULLREGION; \ (pReg)->rdh.iType = RDH_RECTANGLES; \
} }
#define REGION_NOT_EMPTY(pReg) pReg->rdh.nCount #define REGION_NOT_EMPTY(pReg) pReg->rdh.nCount
@ -542,7 +542,7 @@ REGION_SetExtents(ROSRGNDATA *pReg)
pReg->rdh.rcBound.top = 0; pReg->rdh.rcBound.top = 0;
pReg->rdh.rcBound.right = 0; pReg->rdh.rcBound.right = 0;
pReg->rdh.rcBound.bottom = 0; pReg->rdh.rcBound.bottom = 0;
pReg->rdh.iType = NULLREGION; pReg->rdh.iType = RDH_RECTANGLES;
return; return;
} }
@ -570,7 +570,7 @@ REGION_SetExtents(ROSRGNDATA *pReg)
pExtents->right = pRect->right; pExtents->right = pRect->right;
pRect++; pRect++;
} }
pReg->rdh.iType = (1 == pReg->rdh.nCount ? SIMPLEREGION : COMPLEXREGION); pReg->rdh.iType = RDH_RECTANGLES;
} }
// FIXME: This seems to be wrong // FIXME: This seems to be wrong
@ -724,7 +724,7 @@ REGION_CropAndOffsetRegion(
rgnDst->rdh.rcBound.top = ((PRECT)rgnDst->Buffer)->top; rgnDst->rdh.rcBound.top = ((PRECT)rgnDst->Buffer)->top;
rgnDst->rdh.rcBound.bottom = ((PRECT)rgnDst->Buffer + j)->bottom; rgnDst->rdh.rcBound.bottom = ((PRECT)rgnDst->Buffer + j)->bottom;
rgnDst->rdh.iType = (j >= 1) ? COMPLEXREGION : SIMPLEREGION; rgnDst->rdh.iType = RDH_RECTANGLES;
} }
return TRUE; return TRUE;
@ -1182,11 +1182,6 @@ REGION_RegionOp(
} }
} }
if (newReg->rdh.nCount == 0)
newReg->rdh.iType = NULLREGION;
else
newReg->rdh.iType = (newReg->rdh.nCount > 1)? COMPLEXREGION : SIMPLEREGION;
if (oldRects != &newReg->rdh.rcBound) if (oldRects != &newReg->rdh.rcBound)
ExFreePool(oldRects); ExFreePool(oldRects);
return; return;
@ -1886,7 +1881,7 @@ REGION_CreateFrameRgn(
return FALSE; return FALSE;
} }
if (srcObj->rdh.iType == SIMPLEREGION) if (REGION_Complexity(srcObj) == SIMPLEREGION)
{ {
if (!REGION_CreateSimpleFrameRgn(destObj, x, y)) if (!REGION_CreateSimpleFrameRgn(destObj, x, y))
{ {
@ -2096,7 +2091,7 @@ IntGdiCombineRgn(PROSRGNDATA destRgn,
{ {
if ( !REGION_CopyRegion(destRgn, src1Rgn) ) if ( !REGION_CopyRegion(destRgn, src1Rgn) )
return ERROR; return ERROR;
result = destRgn->rdh.iType; result = REGION_Complexity(destRgn);
} }
else else
{ {
@ -2117,7 +2112,7 @@ IntGdiCombineRgn(PROSRGNDATA destRgn,
REGION_SubtractRegion(destRgn, src1Rgn, src2Rgn); REGION_SubtractRegion(destRgn, src1Rgn, src2Rgn);
break; break;
} }
result = destRgn->rdh.iType; result = REGION_Complexity(destRgn);
} }
else if (src2Rgn == NULL) else if (src2Rgn == NULL)
{ {
@ -2156,7 +2151,7 @@ NtGdiCombineRgn(HRGN hDest,
{ {
if ( !REGION_CopyRegion(destRgn, src1Rgn) ) if ( !REGION_CopyRegion(destRgn, src1Rgn) )
return ERROR; return ERROR;
result = destRgn->rdh.iType; result = REGION_Complexity(destRgn);
} }
else else
{ {
@ -2179,7 +2174,7 @@ NtGdiCombineRgn(HRGN hDest,
break; break;
} }
REGION_UnlockRgn(src2Rgn); REGION_UnlockRgn(src2Rgn);
result = destRgn->rdh.iType; result = REGION_Complexity(destRgn);
} }
else if (hSrc2 == NULL) else if (hSrc2 == NULL)
{ {
@ -2554,7 +2549,7 @@ REGION_GetRgnBox(
if (Rgn) if (Rgn)
{ {
*pRect = Rgn->rdh.rcBound; *pRect = Rgn->rdh.rcBound;
ret = Rgn->rdh.iType; ret = REGION_Complexity(Rgn);
return ret; return ret;
} }
@ -2562,7 +2557,21 @@ REGION_GetRgnBox(
} }
/* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw */ /* See wine, msdn, osr and Feng Yuan - Windows Graphics Programming Win32 Gdi And Directdraw
1st: http://www.codeproject.com/gdi/cliprgnguide.asp is wrong!
The intersection of the clip with the meta region is not Rao it's API!
Go back and read 7.2 Clipping pages 418-19:
Rao = API & Vis:
1) The Rao region is the intersection of the API region and the system region,
named after the Microsoft engineer who initially proposed it.
2) The Rao region can be calculated from the API region and the system region.
API:
API region is the intersection of the meta region and the clipping region,
clearly named after the fact that it is controlled by GDI API calls.
*/
INT STDCALL INT STDCALL
NtGdiGetRandomRgn( NtGdiGetRandomRgn(
HDC hDC, HDC hDC,
@ -2584,16 +2593,14 @@ NtGdiGetRandomRgn(
switch (iCode) switch (iCode)
{ {
case 1: case CLIPRGN:
hSrc = pDC->w.hClipRgn; hSrc = pDC->w.hClipRgn;
// if (dc->DcLevel.prgnClip) hSrc = ((PROSRGNDATA)dc->DcLevel.prgnClip)->BaseObject.hHmgr;
break; break;
case 2: case METARGN:
//hSrc = dc->hMetaRgn; if (pDC->DcLevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->DcLevel.prgnMeta)->BaseObject.hHmgr;
DPRINT1("hMetaRgn not implemented\n");
DC_UnlockDc(pDC);
return -1;
break; break;
case 3: case APIRGN:
DPRINT1("hMetaRgn not implemented\n"); DPRINT1("hMetaRgn not implemented\n");
//hSrc = dc->hMetaClipRgn; //hSrc = dc->hMetaClipRgn;
if (!hSrc) if (!hSrc)
@ -2601,9 +2608,11 @@ NtGdiGetRandomRgn(
hSrc = pDC->w.hClipRgn; hSrc = pDC->w.hClipRgn;
} }
//if (!hSrc) rgn = dc->hMetaRgn; //if (!hSrc) rgn = dc->hMetaRgn;
// if (dc->prgnAPI) hSrc = ((PROSRGNDATA)dc->prgnAPI)->BaseObject.hHmgr;
break; break;
case 4: case SYSRGN:
hSrc = pDC->w.hVisRgn; hSrc = pDC->w.hVisRgn;
// if (dc->prgnVis) hSrc = ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr;
break; break;
default: default:
hSrc = 0; hSrc = 0;
@ -2768,7 +2777,7 @@ NtGdiOffsetRgn(
} }
} }
} }
ret = rgn->rdh.iType; ret = REGION_Complexity(rgn);
REGION_UnlockRgn(rgn); REGION_UnlockRgn(rgn);
return ret; return ret;
} }
@ -2984,7 +2993,7 @@ REGION_SetRectRgn(
firstRect->right = rgn->rdh.rcBound.right = RightRect; firstRect->right = rgn->rdh.rcBound.right = RightRect;
firstRect->bottom = rgn->rdh.rcBound.bottom = BottomRect; firstRect->bottom = rgn->rdh.rcBound.bottom = BottomRect;
rgn->rdh.nCount = 1; rgn->rdh.nCount = 1;
rgn->rdh.iType = SIMPLEREGION; rgn->rdh.iType = RDH_RECTANGLES;
} }
else else
EMPTY_REGION(rgn); EMPTY_REGION(rgn);