Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 22:56:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
- Rename IntGdiOffsetRgn to REGION_iOffsetRgn

svn path=/trunk/; revision=65732
This commit is contained in:
Timo Kreuzer 2014-12-18 08:12:34 +00:00
parent 72bceaffc2
commit beff5fdc06
9 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/win32ss/gdi/ntgdi/bitblt.c
View file

@ -1053,7 +1053,7 @@ IntGdiFillRgn(
/* Transform region into device coordinates */ /* Transform region into device coordinates */
if (!REGION_LPTODP(pdc, prgnClip, prgn) || if (!REGION_LPTODP(pdc, prgnClip, prgn) ||
IntGdiOffsetRgn(prgnClip, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y) == ERROR) REGION_iOffsetRgn(prgnClip, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y) == ERROR)
{ {
REGION_Delete(prgnClip); REGION_Delete(prgnClip);
return FALSE; return FALSE;

8
reactos/win32ss/gdi/ntgdi/cliprgn.c
View file

@ -57,7 +57,7 @@ GdiSelectVisRgn(
ASSERT(prgn != NULL); ASSERT(prgn != NULL);
IntGdiCombineRgn(dc->prgnVis, prgn, NULL, RGN_COPY); IntGdiCombineRgn(dc->prgnVis, prgn, NULL, RGN_COPY);
IntGdiOffsetRgn(dc->prgnVis, -dc->ptlDCOrig.x, -dc->ptlDCOrig.y); REGION_iOffsetRgn(dc->prgnVis, -dc->ptlDCOrig.x, -dc->ptlDCOrig.y);
DC_UnlockDc(dc); DC_UnlockDc(dc);
} }
@ -365,7 +365,7 @@ int APIENTRY NtGdiOffsetClipRgn(HDC hDC,
if(dc->dclevel.prgnClip != NULL) if(dc->dclevel.prgnClip != NULL)
{ {
Result = IntGdiOffsetRgn(dc->dclevel.prgnClip, Result = REGION_iOffsetRgn(dc->dclevel.prgnClip,
XOffset, XOffset,
YOffset); YOffset);
dc->fs |= DC_FLAG_DIRTY_RAO; dc->fs |= DC_FLAG_DIRTY_RAO;
@ -572,7 +572,7 @@ CLIPPING_UpdateGCRegion(PDC pDC)
} }
IntGdiOffsetRgn(pDC->prgnRao, pDC->ptlDCOrig.x, pDC->ptlDCOrig.y); REGION_iOffsetRgn(pDC->prgnRao, pDC->ptlDCOrig.x, pDC->ptlDCOrig.y);
RtlCopyMemory(&pDC->erclClip, RtlCopyMemory(&pDC->erclClip,
&pDC->prgnRao->rdh.rcBound, &pDC->prgnRao->rdh.rcBound,
@ -590,7 +590,7 @@ CLIPPING_UpdateGCRegion(PDC pDC)
pDC->prgnRao->Buffer, pDC->prgnRao->Buffer,
&pDC->erclClip); &pDC->erclClip);
IntGdiOffsetRgn(pDC->prgnRao, -pDC->ptlDCOrig.x, -pDC->ptlDCOrig.y); REGION_iOffsetRgn(pDC->prgnRao, -pDC->ptlDCOrig.x, -pDC->ptlDCOrig.y);
} }
/* EOF */ /* EOF */

2
reactos/win32ss/gdi/ntgdi/dcobjs.c
View file

@ -779,7 +779,7 @@ NtGdiGetRandomRgn(
{ {
ret = IntGdiCombineRgn(prgnDest, prgnSrc, 0, RGN_COPY) == ERROR ? -1 : 1; ret = IntGdiCombineRgn(prgnDest, prgnSrc, 0, RGN_COPY) == ERROR ? -1 : 1;
if ((ret == 1) && (iCode == SYSRGN)) if ((ret == 1) && (iCode == SYSRGN))
IntGdiOffsetRgn(prgnDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y); REGION_iOffsetRgn(prgnDest, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y);
REGION_UnlockRgn(prgnDest); REGION_UnlockRgn(prgnDest);
} }
else else

16
reactos/win32ss/gdi/ntgdi/region.c
View file

@ -1867,31 +1867,31 @@ REGION_bMakeFrameRegion(
else else
{ {
/* Move the source region to the bottom-right */ /* Move the source region to the bottom-right */
IntGdiOffsetRgn(prgnSrc, cx, cy); REGION_iOffsetRgn(prgnSrc, cx, cy);
/* Intersect with the source region (this crops the top-left frame) */ /* Intersect with the source region (this crops the top-left frame) */
REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc);
/* Move the source region to the bottom-left */ /* Move the source region to the bottom-left */
IntGdiOffsetRgn(prgnSrc, -2 * cx, 0); REGION_iOffsetRgn(prgnSrc, -2 * cx, 0);
/* Intersect with the source region (this crops the top-right frame) */ /* Intersect with the source region (this crops the top-right frame) */
REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc);
/* Move the source region to the top-left */ /* Move the source region to the top-left */
IntGdiOffsetRgn(prgnSrc, 0, -2 * cy); REGION_iOffsetRgn(prgnSrc, 0, -2 * cy);
/* Intersect with the source region (this crops the bottom-right frame) */ /* Intersect with the source region (this crops the bottom-right frame) */
REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc);
/* Move the source region to the top-right */ /* Move the source region to the top-right */
IntGdiOffsetRgn(prgnSrc, 2 * cx, 0); REGION_iOffsetRgn(prgnSrc, 2 * cx, 0);
/* Intersect with the source region (this crops the bottom-left frame) */ /* Intersect with the source region (this crops the bottom-left frame) */
REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc);
/* Move the source region back to the original position */ /* Move the source region back to the original position */
IntGdiOffsetRgn(prgnSrc, -cx, cy); REGION_iOffsetRgn(prgnSrc, -cx, cy);
/* Finally subtract the cropped region from the source */ /* Finally subtract the cropped region from the source */
REGION_SubtractRegion(prgnDest, prgnSrc, prgnDest); REGION_SubtractRegion(prgnDest, prgnSrc, prgnDest);
@ -1961,7 +1961,7 @@ REGION_bXformRgn(
if (pmx->flAccel & XFORM_UNITY) if (pmx->flAccel & XFORM_UNITY)
{ {
/* Just offset the region */ /* Just offset the region */
return IntGdiOffsetRgn(prgn, (pmx->fxDx + 8) / 16, (pmx->fxDy + 8) / 16) != ERROR; return REGION_iOffsetRgn(prgn, (pmx->fxDx + 8) / 16, (pmx->fxDy + 8) / 16) != ERROR;
} }
else else
{ {
@ -2586,7 +2586,7 @@ REGION_SetRectRgn(
INT INT
FASTCALL FASTCALL
IntGdiOffsetRgn( REGION_iOffsetRgn(
PREGION rgn, PREGION rgn,
INT XOffset, INT XOffset,
INT YOffset) INT YOffset)
@ -3786,7 +3786,7 @@ NtGdiOffsetRgn(
return ERROR; return ERROR;
} }
ret = IntGdiOffsetRgn(rgn, XOffset, YOffset); ret = REGION_iOffsetRgn(rgn, XOffset, YOffset);
RGNOBJAPI_Unlock(rgn); RGNOBJAPI_Unlock(rgn);
return ret; return ret;

2
reactos/win32ss/gdi/ntgdi/region.h
View file

@ -62,7 +62,7 @@ GreCreatePolyPolygonRgn(
_In_ ULONG cPolygons, _In_ ULONG cPolygons,
_In_ INT iMode); _In_ INT iMode);
INT FASTCALL IntGdiOffsetRgn(PREGION,INT,INT); INT FASTCALL REGION_iOffsetRgn(PREGION,INT,INT);
BOOL FASTCALL IntRectInRegion(HRGN,LPRECTL); BOOL FASTCALL IntRectInRegion(HRGN,LPRECTL);
INT FASTCALL IntGdiCombineRgn(PREGION, PREGION, PREGION, INT); INT FASTCALL IntGdiCombineRgn(PREGION, PREGION, PREGION, INT);

14
reactos/win32ss/user/ntuser/painting.c
View file

@ -460,11 +460,11 @@ IntInvalidateWindows(PWND Wnd, PREGION Rgn, ULONG Flags)
PREGION RgnClip = RGNOBJAPI_Lock(Wnd->hrgnClip, NULL); PREGION RgnClip = RGNOBJAPI_Lock(Wnd->hrgnClip, NULL);
if (RgnClip) if (RgnClip)
{ {
IntGdiOffsetRgn( Rgn, REGION_iOffsetRgn(Rgn,
-Wnd->rcWindow.left, -Wnd->rcWindow.left,
-Wnd->rcWindow.top); -Wnd->rcWindow.top);
RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnClip, RGN_AND); RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnClip, RGN_AND);
IntGdiOffsetRgn( Rgn, REGION_iOffsetRgn(Rgn,
Wnd->rcWindow.left, Wnd->rcWindow.left,
Wnd->rcWindow.top); Wnd->rcWindow.top);
RGNOBJAPI_Unlock(RgnClip); RGNOBJAPI_Unlock(RgnClip);
@ -682,7 +682,7 @@ co_UserRedrawWindow(
} }
else else
{ {
IntGdiOffsetRgn(TmpRgn, Window->rcClient.left, Window->rcClient.top); REGION_iOffsetRgn(TmpRgn, Window->rcClient.left, Window->rcClient.top);
} }
} }
else if (UpdateRect != NULL) else if (UpdateRect != NULL)
@ -690,7 +690,7 @@ co_UserRedrawWindow(
if (!RECTL_bIsEmptyRect(UpdateRect)) if (!RECTL_bIsEmptyRect(UpdateRect))
{ {
TmpRgn = IntSysCreateRectpRgnIndirect(UpdateRect); TmpRgn = IntSysCreateRectpRgnIndirect(UpdateRect);
IntGdiOffsetRgn(TmpRgn, Window->rcClient.left, Window->rcClient.top); REGION_iOffsetRgn(TmpRgn, Window->rcClient.left, Window->rcClient.top);
} }
} }
else if ((Flags & (RDW_INVALIDATE | RDW_FRAME)) == (RDW_INVALIDATE | RDW_FRAME) || else if ((Flags & (RDW_INVALIDATE | RDW_FRAME)) == (RDW_INVALIDATE | RDW_FRAME) ||
@ -1229,7 +1229,7 @@ co_UserGetUpdateRgn(PWND Window, PREGION Rgn, BOOL bErase)
IntIntersectWithParents(Window, &Rect); IntIntersectWithParents(Window, &Rect);
REGION_SetRectRgn(Rgn, Rect.left, Rect.top, Rect.right, Rect.bottom); REGION_SetRectRgn(Rgn, Rect.left, Rect.top, Rect.right, Rect.bottom);
RegionType = IntGdiCombineRgn(Rgn, Rgn, UpdateRgn, RGN_AND); RegionType = IntGdiCombineRgn(Rgn, Rgn, UpdateRgn, RGN_AND);
IntGdiOffsetRgn(Rgn, -Window->rcClient.left, -Window->rcClient.top); REGION_iOffsetRgn(Rgn, -Window->rcClient.left, -Window->rcClient.top);
RGNOBJAPI_Unlock(UpdateRgn); RGNOBJAPI_Unlock(UpdateRgn);
if (bErase && RegionType != NULLREGION && RegionType != ERROR) if (bErase && RegionType != NULLREGION && RegionType != ERROR)
@ -1565,7 +1565,7 @@ UserScrollDC(
/* Substract the part of the dest that was visible in source */ /* Substract the part of the dest that was visible in source */
IntGdiCombineRgn(RgnTmp, RgnTmp, pDC->prgnVis, RGN_AND); IntGdiCombineRgn(RgnTmp, RgnTmp, pDC->prgnVis, RGN_AND);
IntGdiOffsetRgn(RgnTmp, dx, dy); REGION_iOffsetRgn(RgnTmp, dx, dy);
Result = IntGdiCombineRgn(RgnOwn, RgnOwn, RgnTmp, RGN_DIFF); Result = IntGdiCombineRgn(RgnOwn, RgnOwn, RgnTmp, RGN_DIFF);
/* DO NOT Unlock DC while messing with prgnVis! */ /* DO NOT Unlock DC while messing with prgnVis! */
@ -1851,7 +1851,7 @@ NtUserScrollWindowEx(
RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0); RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0);
IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY); IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY);
} }
IntGdiOffsetRgn(RgnTemp, dx, dy); REGION_iOffsetRgn(RgnTemp, dx, dy);
IntGdiCombineRgn(RgnTemp, RgnTemp, RgnClip, RGN_AND); IntGdiCombineRgn(RgnTemp, RgnTemp, RgnClip, RGN_AND);
if (hrgnUpdate) if (hrgnUpdate)
IntGdiCombineRgn( RgnWinupd, RgnWinupd, RgnTemp, RGN_OR ); IntGdiCombineRgn( RgnWinupd, RgnWinupd, RgnTemp, RGN_OR );

14
reactos/win32ss/user/ntuser/vis.c
View file

@ -81,9 +81,9 @@ VIS_ComputeVisibleRegion(
PREGION SiblingClipRgn = RGNOBJAPI_Lock(CurrentSibling->hrgnClip, NULL); PREGION SiblingClipRgn = RGNOBJAPI_Lock(CurrentSibling->hrgnClip, NULL);
if (SiblingClipRgn) if (SiblingClipRgn)
{ {
IntGdiOffsetRgn(ClipRgn, -CurrentSibling->rcWindow.left, -CurrentSibling->rcWindow.top); REGION_iOffsetRgn(ClipRgn, -CurrentSibling->rcWindow.left, -CurrentSibling->rcWindow.top);
IntGdiCombineRgn(ClipRgn, ClipRgn, SiblingClipRgn, RGN_AND); IntGdiCombineRgn(ClipRgn, ClipRgn, SiblingClipRgn, RGN_AND);
IntGdiOffsetRgn(ClipRgn, CurrentSibling->rcWindow.left, CurrentSibling->rcWindow.top); REGION_iOffsetRgn(ClipRgn, CurrentSibling->rcWindow.left, CurrentSibling->rcWindow.top);
RGNOBJAPI_Unlock(SiblingClipRgn); RGNOBJAPI_Unlock(SiblingClipRgn);
} }
} }
@ -113,9 +113,9 @@ VIS_ComputeVisibleRegion(
PREGION CurrentRgnClip = RGNOBJAPI_Lock(CurrentWindow->hrgnClip, NULL); PREGION CurrentRgnClip = RGNOBJAPI_Lock(CurrentWindow->hrgnClip, NULL);
if (CurrentRgnClip) if (CurrentRgnClip)
{ {
IntGdiOffsetRgn(ClipRgn, -CurrentWindow->rcWindow.left, -CurrentWindow->rcWindow.top); REGION_iOffsetRgn(ClipRgn, -CurrentWindow->rcWindow.left, -CurrentWindow->rcWindow.top);
IntGdiCombineRgn(ClipRgn, ClipRgn, CurrentRgnClip, RGN_AND); IntGdiCombineRgn(ClipRgn, ClipRgn, CurrentRgnClip, RGN_AND);
IntGdiOffsetRgn(ClipRgn, CurrentWindow->rcWindow.left, CurrentWindow->rcWindow.top); REGION_iOffsetRgn(ClipRgn, CurrentWindow->rcWindow.left, CurrentWindow->rcWindow.top);
RGNOBJAPI_Unlock(CurrentRgnClip); RGNOBJAPI_Unlock(CurrentRgnClip);
} }
} }
@ -131,9 +131,9 @@ VIS_ComputeVisibleRegion(
PREGION WndRgnClip = RGNOBJAPI_Lock(Wnd->hrgnClip, NULL); PREGION WndRgnClip = RGNOBJAPI_Lock(Wnd->hrgnClip, NULL);
if (WndRgnClip) if (WndRgnClip)
{ {
IntGdiOffsetRgn(VisRgn, -Wnd->rcWindow.left, -Wnd->rcWindow.top); REGION_iOffsetRgn(VisRgn, -Wnd->rcWindow.left, -Wnd->rcWindow.top);
IntGdiCombineRgn(VisRgn, VisRgn, WndRgnClip, RGN_AND); IntGdiCombineRgn(VisRgn, VisRgn, WndRgnClip, RGN_AND);
IntGdiOffsetRgn(VisRgn, Wnd->rcWindow.left, Wnd->rcWindow.top); REGION_iOffsetRgn(VisRgn, Wnd->rcWindow.left, Wnd->rcWindow.top);
RGNOBJAPI_Unlock(WndRgnClip); RGNOBJAPI_Unlock(WndRgnClip);
} }
} }
@ -160,7 +160,7 @@ co_VIS_WindowLayoutChanged(
return; return;
IntGdiCombineRgn(TempRgn, NewlyExposed, NULL, RGN_COPY); IntGdiCombineRgn(TempRgn, NewlyExposed, NULL, RGN_COPY);
IntGdiOffsetRgn(TempRgn, REGION_iOffsetRgn(TempRgn,
Wnd->rcWindow.left - Parent->rcClient.left, Wnd->rcWindow.left - Parent->rcClient.left,
Wnd->rcWindow.top - Parent->rcClient.top); Wnd->rcWindow.top - Parent->rcClient.top);

2
reactos/win32ss/user/ntuser/windc.c
View file

@ -873,7 +873,7 @@ DceResetActiveDCEs(PWND Window)
if (NULL != dc->dclevel.prgnClip) if (NULL != dc->dclevel.prgnClip)
{ {
IntGdiOffsetRgn(dc->dclevel.prgnClip, DeltaX, DeltaY); REGION_iOffsetRgn(dc->dclevel.prgnClip, DeltaX, DeltaY);
dc->fs |= DC_FLAG_DIRTY_RAO; dc->fs |= DC_FLAG_DIRTY_RAO;
} }
if (NULL != pDCE->hrgnClip) if (NULL != pDCE->hrgnClip)

16
reactos/win32ss/user/ntuser/winpos.c
View file

@ -1762,7 +1762,7 @@ co_WinPosSetWindowPos(
} }
else if(VisBefore) else if(VisBefore)
{ {
IntGdiOffsetRgn(VisBefore, -Window->rcWindow.left, -Window->rcWindow.top); REGION_iOffsetRgn(VisBefore, -Window->rcWindow.left, -Window->rcWindow.top);
} }
/* Calculate the non client area for resizes, as this is used in the copy region */ /* Calculate the non client area for resizes, as this is used in the copy region */
@ -1779,7 +1779,7 @@ co_WinPosSetWindowPos(
} }
else if(VisBeforeJustClient) else if(VisBeforeJustClient)
{ {
IntGdiOffsetRgn(VisBeforeJustClient, -Window->rcWindow.left, -Window->rcWindow.top); REGION_iOffsetRgn(VisBeforeJustClient, -Window->rcWindow.left, -Window->rcWindow.top);
} }
} }
} }
@ -1864,7 +1864,7 @@ co_WinPosSetWindowPos(
} }
else if(VisAfter) else if(VisAfter)
{ {
IntGdiOffsetRgn(VisAfter, -Window->rcWindow.left, -Window->rcWindow.top); REGION_iOffsetRgn(VisAfter, -Window->rcWindow.left, -Window->rcWindow.top);
} }
/* /*
@ -1905,9 +1905,9 @@ co_WinPosSetWindowPos(
PREGION RgnUpdate = RGNOBJAPI_Lock(Window->hrgnUpdate, NULL); PREGION RgnUpdate = RGNOBJAPI_Lock(Window->hrgnUpdate, NULL);
if (RgnUpdate) if (RgnUpdate)
{ {
IntGdiOffsetRgn(CopyRgn, NewWindowRect.left, NewWindowRect.top); REGION_iOffsetRgn(CopyRgn, NewWindowRect.left, NewWindowRect.top);
IntGdiCombineRgn(CopyRgn, CopyRgn, RgnUpdate, RGN_DIFF); IntGdiCombineRgn(CopyRgn, CopyRgn, RgnUpdate, RGN_DIFF);
IntGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); REGION_iOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top);
RGNOBJAPI_Unlock(RgnUpdate); RGNOBJAPI_Unlock(RgnUpdate);
} }
} }
@ -1939,7 +1939,7 @@ co_WinPosSetWindowPos(
* to create a copy of CopyRgn and pass that. We need CopyRgn later * to create a copy of CopyRgn and pass that. We need CopyRgn later
*/ */
IntGdiCombineRgn(DcRgnObj, CopyRgn, NULL, RGN_COPY); IntGdiCombineRgn(DcRgnObj, CopyRgn, NULL, RGN_COPY);
IntGdiOffsetRgn(DcRgnObj, NewWindowRect.left, NewWindowRect.top); REGION_iOffsetRgn(DcRgnObj, NewWindowRect.left, NewWindowRect.top);
RGNOBJAPI_Unlock(DcRgnObj); RGNOBJAPI_Unlock(DcRgnObj);
Dc = UserGetDCEx( Window, Dc = UserGetDCEx( Window,
DcRgn, DcRgn,
@ -1992,7 +1992,7 @@ co_WinPosSetWindowPos(
PWND Parent = Window->spwndParent; PWND Parent = Window->spwndParent;
IntGdiOffsetRgn( DirtyRgn, REGION_iOffsetRgn( DirtyRgn,
Window->rcWindow.left, Window->rcWindow.left,
Window->rcWindow.top); Window->rcWindow.top);
if ( (Window->style & WS_CHILD) && if ( (Window->style & WS_CHILD) &&
@ -2027,7 +2027,7 @@ co_WinPosSetWindowPos(
if (ExposedRgn) if (ExposedRgn)
{ {
RgnType = IntGdiCombineRgn(ExposedRgn, VisBefore, NULL, RGN_COPY); RgnType = IntGdiCombineRgn(ExposedRgn, VisBefore, NULL, RGN_COPY);
IntGdiOffsetRgn( ExposedRgn, REGION_iOffsetRgn(ExposedRgn,
OldWindowRect.left - NewWindowRect.left, OldWindowRect.left - NewWindowRect.left,
OldWindowRect.top - NewWindowRect.top); OldWindowRect.top - NewWindowRect.top);