[ros-diffs] [jgardou] 47279: [WIN32K] Some cleanup, no code change.

jgardou at svn.reactos.org jgardou at svn.reactos.org
Wed May 19 19:41:56 CEST 2010


Author: jgardou
Date: Wed May 19 19:41:56 2010
New Revision: 47279

URL: http://svn.reactos.org/svn/reactos?rev=47279&view=rev
Log:
[WIN32K]
   Some cleanup, no code change.

Modified:
    branches/reactos-yarotows/subsystems/win32/win32k/ntuser/monitor.c
    branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c
    branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c
    branches/reactos-yarotows/subsystems/win32/win32k/objects/region.c

Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/monitor.c
URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win32/win32k/ntuser/monitor.c?rev=47279&r1=47278&r2=47279&view=diff
==============================================================================
--- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Wed May 19 19:41:56 2010
@@ -506,7 +506,7 @@
          /* FIXME: setlasterror? */
          return -1;
       }
-      dcVisRgn = ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr;
+      dcVisRgn = dc->prgnVis->BaseObject.hHmgr;
       DC_UnlockDc(dc);
 
       regionType = NtGdiGetRgnBox(dcVisRgn, &dcRect);

Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c
URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c?rev=47279&r1=47278&r2=47279&view=diff
==============================================================================
--- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Wed May 19 19:41:56 2010
@@ -1206,7 +1206,7 @@
       {
          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 */

Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c
URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c?rev=47279&r1=47278&r2=47279&view=diff
==============================================================================
--- branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Wed May 19 19:41:56 2010
@@ -37,7 +37,7 @@
    }
    else
    {
-       hRgnVis = ((PROSRGNDATA)Dc->prgnVis)->BaseObject.hHmgr ;
+       hRgnVis = Dc->prgnVis->BaseObject.hHmgr ;
    }
 
 
@@ -94,13 +94,13 @@
   if (dc->prgnVis == NULL)
   {
     dc->prgnVis = IntSysCreateRectpRgn(0, 0, 0, 0);
-    GDIOBJ_CopyOwnership(hdc, ((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr);
-  }
-
-  retval = NtGdiCombineRgn(((PROSRGNDATA)dc->prgnVis)->BaseObject.hHmgr, hrgn, 0, RGN_COPY);
+    GDIOBJ_CopyOwnership(hdc, dc->prgnVis->BaseObject.hHmgr);
+  }
+
+  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);

Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/region.c
URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win32/win32k/objects/region.c?rev=47279&r1=47278&r2=47279&view=diff
==============================================================================
--- branches/reactos-yarotows/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original)
+++ branches/reactos-yarotows/subsystems/win32/win32k/objects/region.c [iso-8859-1] Wed May 19 19:41:56 2010
@@ -3691,7 +3691,7 @@
         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;




More information about the Ros-diffs mailing list