[ros-diffs] [jimtabor] 28278: Added EMF and MF support to Ext-FloodFill. Changed gdi32.def too.

Author: jimtabor
Date: Sat Aug 11 11:57:46 2007
New Revision: 28278

URL: http://svn.reactos.org/svn/reactos?rev=28278&view=rev
Log:
Added EMF and MF support to Ext-FloodFill. Changed gdi32.def too.

Modified:
    trunk/reactos/dll/win32/gdi32/gdi32.def
    trunk/reactos/dll/win32/gdi32/objects/painting.c

Modified: trunk/reactos/dll/win32/gdi32/gdi32.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Aug 11 11:57:46 2007
@@ -226,7 +226,7 @@
 ExtCreatePen@20
 ExtCreateRegion@12=NtGdiExtCreateRegion@12
 ExtEscape@24
-ExtFloodFill@20=NtGdiExtFloodFill@20
+ExtFloodFill@20
 ExtSelectClipRgn@12=NtGdiExtSelectClipRgn@12
 ExtTextOutA@32
 ExtTextOutW@32

Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/painting.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/painting.c Sat Aug 11 11:57:46 2007
@@ -607,6 +607,43 @@
 }
 #endif
 
+
+BOOL
+STDCALL
+ExtFloodFill(
+       HDC hDC,
+       int nXStart, 
+       int nYStart,
+       COLORREF crFill,
+       UINT fuFillType
+             )
+{
+#if 0
+// Handle something other than a normal dc object.
+ if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC)
+ {
+    if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC)
+      return MFDRV_ExtFloodFill( hDC, nXStart, nYStart, crFill, fuFillType );
+    else
+    {
+      PLDC pLDC = GdiGetLDC(hDC);
+      if ( !pLDC )
+      {
+         SetLastError(ERROR_INVALID_HANDLE);
+         return FALSE;
+      }
+      if (pLDC->iType == LDC_EMFLDC)
+      {
+        return EMFDRV_ExtFloodFill( hDC, nXStart, nYStart, crFill, fuFillType );
+      }
+      return FALSE;
+    }
+ }
+#endif
+    return NtGdiExtFloodFill(hDC, nXStart, nYStart, crFill, fuFillType);
+}
+
+
 BOOL
 WINAPI
 FloodFill(
@@ -615,7 +652,7 @@
     int nYStart,
     COLORREF crFill)
 {
-    return NtGdiExtFloodFill(hDC, nXStart, nYStart, crFill, FLOODFILLBORDER);
+    return ExtFloodFill(hDC, nXStart, nYStart, crFill, FLOODFILLBORDER);
 }
 
 BOOL WINAPI