[ros-diffs] [tkreuzer] 65732: [WIN32K] - Rename IntGdiOffsetRgn to REGION_iOffsetRgn

Author: tkreuzer
Date: Thu Dec 18 08:12:34 2014
New Revision: 65732

URL: http://svn.reactos.org/svn/reactos?rev=65732&view=rev
Log:
[WIN32K]
- Rename IntGdiOffsetRgn to REGION_iOffsetRgn

Modified:
    trunk/reactos/win32ss/gdi/ntgdi/bitblt.c
    trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c
    trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c
    trunk/reactos/win32ss/gdi/ntgdi/region.c
    trunk/reactos/win32ss/gdi/ntgdi/region.h
    trunk/reactos/win32ss/user/ntuser/painting.c
    trunk/reactos/win32ss/user/ntuser/vis.c
    trunk/reactos/win32ss/user/ntuser/windc.c
    trunk/reactos/win32ss/user/ntuser/winpos.c

Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c	[iso-8859-1] Thu Dec 18 08:12:34 2014
@@ -1053,7 +1053,7 @@
 
     /* Transform region into device coordinates */
     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);
         return FALSE;

Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c	[iso-8859-1] Thu Dec 18 08:12:34 2014
@@ -57,7 +57,7 @@
     ASSERT(prgn != NULL);
 
     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);
 }
@@ -365,9 +365,9 @@
 
     if(dc->dclevel.prgnClip != NULL)
     {
-        Result = IntGdiOffsetRgn(dc->dclevel.prgnClip,
-                                XOffset,
-                                YOffset);
+        Result = REGION_iOffsetRgn(dc->dclevel.prgnClip,
+                                   XOffset,
+                                   YOffset);
         dc->fs |= DC_FLAG_DIRTY_RAO;
     }
     else
@@ -572,7 +572,7 @@
     }
 
 
-    IntGdiOffsetRgn(pDC->prgnRao, pDC->ptlDCOrig.x, pDC->ptlDCOrig.y);
+    REGION_iOffsetRgn(pDC->prgnRao, pDC->ptlDCOrig.x, pDC->ptlDCOrig.y);
 
     RtlCopyMemory(&pDC->erclClip,
                 &pDC->prgnRao->rdh.rcBound,
@@ -590,7 +590,7 @@
                            pDC->prgnRao->Buffer,
                            &pDC->erclClip);
 
-    IntGdiOffsetRgn(pDC->prgnRao, -pDC->ptlDCOrig.x, -pDC->ptlDCOrig.y);
+    REGION_iOffsetRgn(pDC->prgnRao, -pDC->ptlDCOrig.x, -pDC->ptlDCOrig.y);
 }
 
 /* EOF */

Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c	[iso-8859-1] Thu Dec 18 08:12:34 2014
@@ -779,7 +779,7 @@
         {
             ret = IntGdiCombineRgn(prgnDest, prgnSrc, 0, RGN_COPY) == ERROR ? -1 : 1;
             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);
         }
         else

Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/region.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/region.c	[iso-8859-1] Thu Dec 18 08:12:34 2014
@@ -1867,31 +1867,31 @@
     else
     {
         /* 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) */
         REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc);
 
         /* 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) */
         REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc);
 
         /* 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) */
         REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc);
 
         /* 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) */
         REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc);
 
         /* 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 */
         REGION_SubtractRegion(prgnDest, prgnSrc, prgnDest);
@@ -1961,7 +1961,7 @@
         if (pmx->flAccel & XFORM_UNITY)
         {
             /* 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
         {
@@ -2586,7 +2586,7 @@
 
 INT
 FASTCALL
-IntGdiOffsetRgn(
+REGION_iOffsetRgn(
     PREGION rgn,
     INT XOffset,
     INT YOffset)
@@ -3786,7 +3786,7 @@
         return ERROR;
     }
 
-    ret = IntGdiOffsetRgn(rgn, XOffset, YOffset);
+    ret = REGION_iOffsetRgn(rgn, XOffset, YOffset);
 
     RGNOBJAPI_Unlock(rgn);
     return ret;

Modified: trunk/reactos/win32ss/gdi/ntgdi/region.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.h…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/region.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/region.h	[iso-8859-1] Thu Dec 18 08:12:34 2014
@@ -62,7 +62,7 @@
     _In_ ULONG cPolygons,
     _In_ INT iMode);
 
-INT FASTCALL IntGdiOffsetRgn(PREGION,INT,INT);
+INT FASTCALL REGION_iOffsetRgn(PREGION,INT,INT);
 BOOL FASTCALL IntRectInRegion(HRGN,LPRECTL);
 
 INT FASTCALL IntGdiCombineRgn(PREGION, PREGION, PREGION, INT);

Modified: trunk/reactos/win32ss/user/ntuser/painting.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/painting.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/painting.c	[iso-8859-1] Thu Dec 18 08:12:34 2014
@@ -460,13 +460,13 @@
        PREGION RgnClip = RGNOBJAPI_Lock(Wnd->hrgnClip, NULL);
        if (RgnClip)
        {
-           IntGdiOffsetRgn( Rgn,
-                            -Wnd->rcWindow.left,
-                            -Wnd->rcWindow.top);
+           REGION_iOffsetRgn(Rgn,
+                             -Wnd->rcWindow.left,
+                             -Wnd->rcWindow.top);
            RgnType = IntGdiCombineRgn(Rgn, Rgn, RgnClip, RGN_AND);
-           IntGdiOffsetRgn( Rgn,
-                            Wnd->rcWindow.left,
-                            Wnd->rcWindow.top);
+           REGION_iOffsetRgn(Rgn,
+                             Wnd->rcWindow.left,
+                             Wnd->rcWindow.top);
            RGNOBJAPI_Unlock(RgnClip);
        }
    }
@@ -682,7 +682,7 @@
           }
           else
           {
-              IntGdiOffsetRgn(TmpRgn, Window->rcClient.left,
Window->rcClient.top);
+              REGION_iOffsetRgn(TmpRgn, Window->rcClient.left,
Window->rcClient.top);
           }
       }
       else if (UpdateRect != NULL)
@@ -690,7 +690,7 @@
          if (!RECTL_bIsEmptyRect(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)
||
@@ -1229,7 +1229,7 @@
     IntIntersectWithParents(Window, &Rect);
     REGION_SetRectRgn(Rgn, Rect.left, Rect.top, Rect.right, Rect.bottom);
     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);
 
    if (bErase && RegionType != NULLREGION && RegionType != ERROR)
@@ -1565,7 +1565,7 @@
 
       /* Substract the part of the dest that was visible in source */
       IntGdiCombineRgn(RgnTmp, RgnTmp, pDC->prgnVis, RGN_AND);
-      IntGdiOffsetRgn(RgnTmp, dx, dy);
+      REGION_iOffsetRgn(RgnTmp, dx, dy);
       Result = IntGdiCombineRgn(RgnOwn, RgnOwn, RgnTmp, RGN_DIFF);
 
       /* DO NOT Unlock DC while messing with prgnVis! */
@@ -1851,7 +1851,7 @@
              RgnWinupd = IntSysCreateRectpRgn( 0, 0, 0, 0);
              IntGdiCombineRgn( RgnWinupd, RgnTemp, 0, RGN_COPY);
           }
-          IntGdiOffsetRgn(RgnTemp, dx, dy);
+          REGION_iOffsetRgn(RgnTemp, dx, dy);
           IntGdiCombineRgn(RgnTemp, RgnTemp, RgnClip, RGN_AND);
           if (hrgnUpdate)
               IntGdiCombineRgn( RgnWinupd, RgnWinupd, RgnTemp, RGN_OR );

Modified: trunk/reactos/win32ss/user/ntuser/vis.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/vis.c?…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/vis.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/vis.c	[iso-8859-1] Thu Dec 18 08:12:34 2014
@@ -81,9 +81,9 @@
                   PREGION SiblingClipRgn = RGNOBJAPI_Lock(CurrentSibling->hrgnClip,
NULL);
                   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);
-                      IntGdiOffsetRgn(ClipRgn, CurrentSibling->rcWindow.left,
CurrentSibling->rcWindow.top);
+                      REGION_iOffsetRgn(ClipRgn, CurrentSibling->rcWindow.left,
CurrentSibling->rcWindow.top);
                       RGNOBJAPI_Unlock(SiblingClipRgn);
                   }
                }
@@ -113,9 +113,9 @@
                PREGION CurrentRgnClip = RGNOBJAPI_Lock(CurrentWindow->hrgnClip,
NULL);
                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);
-                   IntGdiOffsetRgn(ClipRgn, CurrentWindow->rcWindow.left,
CurrentWindow->rcWindow.top);
+                   REGION_iOffsetRgn(ClipRgn, CurrentWindow->rcWindow.left,
CurrentWindow->rcWindow.top);
                    RGNOBJAPI_Unlock(CurrentRgnClip);
                }
             }
@@ -131,9 +131,9 @@
       PREGION WndRgnClip = RGNOBJAPI_Lock(Wnd->hrgnClip, NULL);
       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);
-          IntGdiOffsetRgn(VisRgn, Wnd->rcWindow.left, Wnd->rcWindow.top);
+          REGION_iOffsetRgn(VisRgn, Wnd->rcWindow.left, Wnd->rcWindow.top);
           RGNOBJAPI_Unlock(WndRgnClip);
       }
    }
@@ -160,9 +160,9 @@
            return;
 
        IntGdiCombineRgn(TempRgn, NewlyExposed, NULL, RGN_COPY);
-       IntGdiOffsetRgn(TempRgn,
-                       Wnd->rcWindow.left - Parent->rcClient.left,
-                       Wnd->rcWindow.top - Parent->rcClient.top);
+       REGION_iOffsetRgn(TempRgn,
+                         Wnd->rcWindow.left - Parent->rcClient.left,
+                         Wnd->rcWindow.top - Parent->rcClient.top);
 
        UserRefObjectCo(Parent, &Ref);
        co_UserRedrawWindow(Parent, NULL, TempRgn,

Modified: trunk/reactos/win32ss/user/ntuser/windc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/windc.…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/windc.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/windc.c	[iso-8859-1] Thu Dec 18 08:12:34 2014
@@ -873,7 +873,7 @@
 
             if (NULL != dc->dclevel.prgnClip)
             {
-               IntGdiOffsetRgn(dc->dclevel.prgnClip, DeltaX, DeltaY);
+               REGION_iOffsetRgn(dc->dclevel.prgnClip, DeltaX, DeltaY);
                dc->fs |= DC_FLAG_DIRTY_RAO;
             }
             if (NULL != pDCE->hrgnClip)

Modified: trunk/reactos/win32ss/user/ntuser/winpos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/winpos.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/winpos.c	[iso-8859-1] Thu Dec 18 08:12:34 2014
@@ -1440,7 +1440,7 @@
             TRACE("skip all the topmost windows\n");
             /* skip all the topmost windows */
             while (List[i] &&
-                   (ChildObject = ValidateHwndNoErr(List[i])) &&  
+                   (ChildObject = ValidateHwndNoErr(List[i])) &&
                    (ChildObject->ExStyle & WS_EX_TOPMOST)) i++;
          }
       }
@@ -1532,9 +1532,9 @@
    POINT pt;
 
    /* Finally make sure that all coordinates are valid */
-   if (WinPos->x < -32768) WinPos->x = -32768;   
+   if (WinPos->x < -32768) WinPos->x = -32768;
    else if (WinPos->x > 32767) WinPos->x = 32767;
-   if (WinPos->y < -32768) WinPos->y = -32768;   
+   if (WinPos->y < -32768) WinPos->y = -32768;
    else if (WinPos->y > 32767) WinPos->y = 32767;
 
    WinPos->cx = max(WinPos->cx, 0);
@@ -1762,10 +1762,10 @@
          }
          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
*/
          if (!(WinPos.flags & SWP_NOSIZE))
          {
              VisBeforeJustClient = VIS_ComputeVisibleRegion(Window, TRUE, FALSE,
@@ -1779,7 +1779,7 @@
              }
              else if(VisBeforeJustClient)
              {
-                 IntGdiOffsetRgn(VisBeforeJustClient, -Window->rcWindow.left,
-Window->rcWindow.top);
+                 REGION_iOffsetRgn(VisBeforeJustClient, -Window->rcWindow.left,
-Window->rcWindow.top);
              }
          }
       }
@@ -1864,7 +1864,7 @@
       }
       else if(VisAfter)
       {
-         IntGdiOffsetRgn(VisAfter, -Window->rcWindow.left, -Window->rcWindow.top);
+         REGION_iOffsetRgn(VisAfter, -Window->rcWindow.left,
-Window->rcWindow.top);
       }
 
       /*
@@ -1905,9 +1905,9 @@
             PREGION RgnUpdate = RGNOBJAPI_Lock(Window->hrgnUpdate, NULL);
             if (RgnUpdate)
             {
-                IntGdiOffsetRgn(CopyRgn, NewWindowRect.left, NewWindowRect.top);
+                REGION_iOffsetRgn(CopyRgn, NewWindowRect.left, NewWindowRect.top);
                 IntGdiCombineRgn(CopyRgn, CopyRgn, RgnUpdate, RGN_DIFF);
-                IntGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top);
+                REGION_iOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top);
                 RGNOBJAPI_Unlock(RgnUpdate);
             }
          }
@@ -1939,7 +1939,7 @@
            * to create a copy of CopyRgn and pass that. We need CopyRgn later
            */
             IntGdiCombineRgn(DcRgnObj, CopyRgn, NULL, RGN_COPY);
-            IntGdiOffsetRgn(DcRgnObj, NewWindowRect.left, NewWindowRect.top);
+            REGION_iOffsetRgn(DcRgnObj, NewWindowRect.left, NewWindowRect.top);
             RGNOBJAPI_Unlock(DcRgnObj);
             Dc = UserGetDCEx( Window,
                               DcRgn,
@@ -1992,7 +1992,7 @@
 
                 PWND Parent = Window->spwndParent;
 
-                IntGdiOffsetRgn( DirtyRgn,
+                REGION_iOffsetRgn( DirtyRgn,
                                 Window->rcWindow.left,
                                 Window->rcWindow.top);
                 if ( (Window->style & WS_CHILD) &&
@@ -2027,9 +2027,9 @@
          if (ExposedRgn)
          {
              RgnType = IntGdiCombineRgn(ExposedRgn, VisBefore, NULL, RGN_COPY);
-             IntGdiOffsetRgn( ExposedRgn,
-                             OldWindowRect.left - NewWindowRect.left,
-                             OldWindowRect.top  - NewWindowRect.top);
+             REGION_iOffsetRgn(ExposedRgn,
+                               OldWindowRect.left - NewWindowRect.left,
+                               OldWindowRect.top  - NewWindowRect.top);
 
              if (VisAfter != NULL)
                 RgnType = IntGdiCombineRgn(ExposedRgn, ExposedRgn, VisAfter, RGN_DIFF);