- Removed NtGdiSetMapMode from w32ksvc.db and updated ntgdibad.h.

- Moved NtGdiSetMapMode to an internal function.
- Changed NtGdiPaintRgn and added IntdiPaintRgn.
- Cleaned up win32k path.c.
- Connected the gdi32 parts.


svn path=/trunk/; revision=28446

reactos/dll/win32/gdi32/gdi32.def

@@ -555,7 +555,7 @@ SetICMProfileW@8
 SetLayout@8
 SetLayoutWidth@12
 SetMagicColors@12
-SetMapMode@8=NtGdiSetMapMode@8
+SetMapMode@8
 SetMapperFlags@8
 SetMetaFileBitsEx@8
 SetMetaRgn@4

reactos/dll/win32/gdi32/objects/dc.c

@@ -932,3 +932,18 @@ SelectPalette(
 {
     return NtUserSelectPalette(hDC, hPal, bForceBackground);
 }
+
+/*
+ * @implemented
+ */
+INT
+STDCALL
+SetMapMode(
+	HDC hdc,
+	INT Mode
+	)
+{
+  return GetAndSetDCDWord( hdc, GdiGetSetMapMode, Mode, 0, 0, 0 );
+}
+
+

reactos/include/reactos/win32k/ntgdibad.h

@@ -642,14 +642,6 @@ STDCALL
 NtGdiSetICMProfile(HDC  hDC,
                         LPWSTR  Filename);
 
-/* Needs to be done in user-mode, using shared GDI Object Attributes. */
-int
-STDCALL
-NtGdiSetMapMode (
-	HDC	hDC,
-	int	MapMode
-	);
-
 /* Needs to be done in user-mode, using shared GDI Object Attributes. */
 DWORD
 STDCALL

reactos/subsystems/win32/win32k/include/coord.h

@@ -21,6 +21,8 @@ VOID
 FASTCALL
 IntLPtoDP ( PDC dc, LPPOINT Points, INT Count );
 
+int STDCALL IntGdiSetMapMode(PDC, int);
+
 BOOL
 FASTCALL
 IntGdiModifyWorldTransform(PDC pDc,

reactos/subsystems/win32/win32k/include/region.h

@@ -17,5 +17,7 @@ typedef struct _ROSRGNDATA {
 HRGN FASTCALL RGNDATA_AllocRgn(INT n);
 BOOL INTERNAL_CALL RGNDATA_Cleanup(PVOID ObjectBody);
 
+BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN );
+
 #endif
 

reactos/subsystems/win32/win32k/objects/coord.c

@@ -454,6 +454,7 @@ NtGdiModifyWorldTransform(HDC hDC,
    }
    _SEH_END;
 
+   DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED );
    DC_UnlockDc(dc);
    return Ret;
 }
@@ -621,18 +622,10 @@ NtGdiSetGraphicsMode(HDC  hDC,
 
 int
 STDCALL
-NtGdiSetMapMode(HDC  hDC,
+IntGdiSetMapMode(PDC  dc,
                 int  MapMode)
 {
   int PrevMapMode;
-  PDC dc;
-
-  dc = DC_LockDc(hDC);
-  if (!dc)
-  {
-    SetLastWin32Error(ERROR_INVALID_HANDLE);
-    return 0;
-  }
 
   PrevMapMode = dc->Dc_Attr.iMapMode;
 
@@ -693,8 +686,6 @@ NtGdiSetMapMode(HDC  hDC,
     DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED );
   }
 
-  DC_UnlockDc(dc);
-
   return PrevMapMode;
 }
 

reactos/subsystems/win32/win32k/objects/dc.c

@@ -2269,8 +2269,7 @@ NtGdiGetAndSetDCDword(
     case GdiGetSetMapperFlagsInternal:
       break;
     case GdiGetSetMapMode:
-      SafeResult = dc->Dc_Attr.iMapMode;
+      SafeResult = IntGdiSetMapMode( dc, dwIn);
-      dc->Dc_Attr.iMapMode = dwIn;
       break;
     case GdiGetSetArcDirection:
       if (dwIn != AD_COUNTERCLOCKWISE && dwIn != AD_CLOCKWISE)

reactos/subsystems/win32/win32k/objects/path.c

@@ -412,11 +412,11 @@ PATH_FillPath( PDC dc, GdiPath *pPath )
      */
 
     /* Save the information about the old mapping mode */
-    mapMode = NtGdiGetMapMode( dc->hSelf );
+    mapMode = dc->Dc_Attr.iMapMode;
-    NtGdiGetViewportExtEx( dc->hSelf, &ptViewportExt );
+    ptViewportExt = dc->Dc_Attr.szlViewportExt;
-    NtGdiGetViewportOrgEx( dc->hSelf, &ptViewportOrg );
+    ptViewportOrg = dc->Dc_Attr.ptlViewportOrg;
-    NtGdiGetWindowExtEx( dc->hSelf, &ptWindowExt );
+    ptWindowExt   = dc->Dc_Attr.szlWindowExt;
-    NtGdiGetWindowOrgEx( dc->hSelf, &ptWindowOrg );
+    ptWindowOrg   = dc->Dc_Attr.ptlWindowOrg;
 
     /* Save world transform
      * NB: The Windows documentation on world transforms would lead one to
@@ -424,32 +424,36 @@ PATH_FillPath( PDC dc, GdiPath *pPath )
      * tests show that resetting the graphics mode to GM_COMPATIBLE does
      * not reset the world transform.
      */
-    NtGdiGetTransform( dc->hSelf, GdiWorldSpaceToPageSpace, &xform );
+    xform = dc->w.xformWorld2Wnd;
-
+    
     /* Set MM_TEXT */
-    NtGdiSetMapMode( dc->hSelf, MM_TEXT );
+    IntGdiSetMapMode( dc, MM_TEXT );
-    NtGdiSetViewportOrgEx( dc->hSelf, 0, 0, NULL );
+    dc->Dc_Attr.ptlViewportOrg.x = 0;
-    NtGdiSetWindowOrgEx( dc->hSelf, 0, 0, NULL );
+    dc->Dc_Attr.ptlViewportOrg.y = 0;
-    graphicsMode = NtGdiGetGraphicsMode( dc->hSelf );
+    dc->Dc_Attr.ptlWindowOrg.x = 0;
-    NtGdiSetGraphicsMode( dc->hSelf, GM_ADVANCED );
+    dc->Dc_Attr.ptlWindowOrg.y = 0;
-    NtGdiModifyWorldTransform( dc->hSelf, &xform, MWT_IDENTITY );
+
-    NtGdiSetGraphicsMode( dc->hSelf, graphicsMode );
+    graphicsMode = dc->Dc_Attr.iGraphicsMode;
+    dc->Dc_Attr.iGraphicsMode = GM_ADVANCED;
+    IntGdiModifyWorldTransform( dc, &xform, MWT_IDENTITY );
+    dc->Dc_Attr.iGraphicsMode =  graphicsMode;
 
     /* Paint the region */
-    NtGdiPaintRgn( dc->hSelf, hrgn );
+    IntGdiPaintRgn( dc, hrgn );
     NtGdiDeleteObject( hrgn );
     /* Restore the old mapping mode */
-    NtGdiSetMapMode( dc->hSelf, mapMode );
+    IntGdiSetMapMode( dc, mapMode );
-    NtGdiSetViewportExtEx( dc->hSelf, ptViewportExt.cx, ptViewportExt.cy, NULL );
+    dc->Dc_Attr.szlViewportExt = ptViewportExt;
-    NtGdiSetViewportOrgEx( dc->hSelf, ptViewportOrg.x, ptViewportOrg.y, NULL );
+    dc->Dc_Attr.ptlViewportOrg = ptViewportOrg;
-    NtGdiSetWindowExtEx( dc->hSelf, ptWindowExt.cx, ptWindowExt.cy, NULL );
+    dc->Dc_Attr.szlWindowExt   = ptWindowExt;
-    NtGdiSetWindowOrgEx( dc->hSelf, ptWindowOrg.x, ptWindowOrg.y, NULL );
+    dc->Dc_Attr.ptlWindowOrg   = ptWindowOrg;
 
     /* Go to GM_ADVANCED temporarily to restore the world transform */
-    graphicsMode = NtGdiGetGraphicsMode( dc->hSelf );
+    graphicsMode = dc->Dc_Attr.iGraphicsMode;
-    NtGdiSetGraphicsMode( dc->hSelf, GM_ADVANCED );
+    dc->Dc_Attr.iGraphicsMode = GM_ADVANCED;
-    NtGdiModifyWorldTransform( dc->hSelf, &xform, MWT_MAX+1 );
+    IntGdiModifyWorldTransform( dc, &xform, MWT_MAX+1 );
-    NtGdiSetGraphicsMode( dc->hSelf, graphicsMode );
+    dc->Dc_Attr.iGraphicsMode = graphicsMode;
+//    DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED );
     return TRUE;
   }
   return FALSE;
@@ -1623,7 +1627,7 @@ end:
         IntDPtoLP(dc, &pt, 1);
         IntGdiMoveToEx(dc, pt.x, pt.y, NULL);
     }
-
+    DCU_UpdateUserXForms(dc, WORLD_TO_PAGE_IDENTITY|DEVICE_TO_WORLD_INVALID|WORLD_XFORM_CHANGED );
     DPRINT("Leave %s, ret=%d\n", __FUNCTION__, ret);
     return ret;
 }

reactos/subsystems/win32/win32k/objects/region.c

@@ -2524,13 +2524,11 @@ NtGdiOffsetRgn(HRGN  hRgn,
 }
 
 BOOL
-STDCALL
+FASTCALL
-NtGdiPaintRgn(HDC  hDC,
+IntGdiPaintRgn(PDC dc, HRGN  hRgn)
-                   HRGN  hRgn)
 {
   //RECT box;
-  HRGN tmpVisRgn; //, prevVisRgn;
+  HRGN tmpVisRgn; //, prevVisRgn;   
-  DC *dc = DC_LockDc(hDC);
   PROSRGNDATA visrgn;
   CLIPOBJ* ClipRegion;
   BOOL bRet = FALSE;
@@ -2595,10 +2593,23 @@ NtGdiPaintRgn(HDC  hDC,
   NtGdiDeleteObject( tmpVisRgn );
 
   // Fill the region
-  DC_UnlockDc( dc );
   return TRUE;
 }
 
+BOOL
+STDCALL
+NtGdiPaintRgn(HDC  hDC,
+                   HRGN  hRgn)
+{
+  DC *dc = DC_LockDc(hDC);
+
+  BOOL Ret = IntGdiPaintRgn(dc, hRgn);
+
+  DC_UnlockDc( dc );
+  return Ret;
+}
+
+
 BOOL
 STDCALL
 NtGdiPtInRegion(HRGN  hRgn,

reactos/subsystems/win32/win32k/w32ksvc.db

@@ -698,7 +698,6 @@ NtGdiSetDIBits                          7
 NtGdiSetEnhMetaFileBits                 2
 NtGdiSetGraphicsMode                    2
 NtGdiSetICMProfile                      2
-NtGdiSetMapMode                         2
 NtGdiSetMapperFlags                     2
 NtGdiSetPaletteEntries                  4
 NtGdiSetPixelV                          4