[WIN32K]

   Some cleanup, no code change.

svn path=/branches/reactos-yarotows/; revision=47279

diff --git a/subsystems/win32/win32k/ntuser/monitor.c b/subsystems/win32/win32k/ntuser/monitor.c
index 2061e40..ec84942 100644 (file)
--- a/subsystems/win32/win32k/ntuser/monitor.c
+++ b/subsystems/win32/win32k/ntuser/monitor.c
@@ -506,7 +506,7 @@ NtUserEnumDisplayMonitors(
          /* FIXME: setlasterror? */
          return -1;
       }
-      dcVisRgn = ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr;
+      dcVisRgn = dc->prgnVis->BaseObject.hHmgr;
       DC_UnlockDc(dc);
 
       regionType = NtGdiGetRgnBox(dcVisRgn, &dcRect);

diff --git a/subsystems/win32/win32k/ntuser/painting.c b/subsystems/win32/win32k/ntuser/painting.c
index c0e0484..5ecce2f 100644 (file)
--- a/subsystems/win32/win32k/ntuser/painting.c
+++ b/subsystems/win32/win32k/ntuser/painting.c
@@ -1206,7 +1206,7 @@ UserScrollDC(
       {
          return FALSE;
       }
-      hrgnVisible = ((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr;  // pDC->prgnRao?
+      hrgnVisible = pDC->prgnVis->BaseObject.hHmgr;  // pDC->prgnRao?
       DC_UnlockDc(pDC);
 
       /* Begin with the shifted and then clipped scroll rect */

diff --git a/subsystems/win32/win32k/objects/cliprgn.c b/subsystems/win32/win32k/objects/cliprgn.c
index cfa2c75..6ef8ed7 100644 (file)
--- a/subsystems/win32/win32k/objects/cliprgn.c
+++ b/subsystems/win32/win32k/objects/cliprgn.c
@@ -37,7 +37,7 @@ CLIPPING_UpdateGCRegion(DC* Dc)
    }
    else
    {
-       hRgnVis = ((PROSRGNDATA)Dc->prgnVis)->BaseObject.hHmgr ;
+       hRgnVis = Dc->prgnVis->BaseObject.hHmgr ;
    }
 
 
@@ -94,13 +94,13 @@ GdiSelectVisRgn(HDC hdc, HRGN hrgn)
   if (dc->prgnVis == NULL)
   {
     dc->prgnVis = IntSysCreateRectpRgn(0, 0, 0, 0);
-    GDIOBJ_CopyOwnership(hdc, ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr);
+    GDIOBJ_CopyOwnership(hdc, dc->prgnVis->BaseObject.hHmgr);
   }
 
-  retval = NtGdiCombineRgn(((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, hrgn, 0, RGN_COPY);
+  retval = NtGdiCombineRgn(dc->prgnVis->BaseObject.hHmgr, hrgn, 0, RGN_COPY);
   if ( retval != ERROR )
   {
-    NtGdiOffsetRgn(((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, -dc->ptlDCOrig.x, -dc->ptlDCOrig.y);
+    IntGdiOffsetRgn(dc->prgnVis, -dc->ptlDCOrig.x, -dc->ptlDCOrig.y);
     CLIPPING_UpdateGCRegion(dc);
   }
   DC_UnlockDc(dc);

diff --git a/subsystems/win32/win32k/objects/region.c b/subsystems/win32/win32k/objects/region.c
index cc9fa31..e5fe56a 100644 (file)
--- a/subsystems/win32/win32k/objects/region.c
+++ b/subsystems/win32/win32k/objects/region.c
@@ -3691,7 +3691,7 @@ NtGdiGetRandomRgn(
         else if (pDC->dclevel.prgnMeta) hSrc = ((PROSRGNDATA)pDC->dclevel.prgnMeta)->BaseObject.hHmgr;
         break;
     case SYSRGN:
-        if (pDC->prgnVis) hSrc = ((PROSRGNDATA)pDC->prgnVis)->BaseObject.hHmgr;
+        if (pDC->prgnVis) hSrc = pDC->prgnVis->BaseObject.hHmgr;
         break;
     default:
         hSrc = 0;