[ros-diffs] [jimtabor] 28079: Move meta code from painting to arc. Including the new Pie function with ifed out.

Author: jimtabor
Date: Wed Aug  1 23:26:55 2007
New Revision: 28079

URL: http://svn.reactos.org/svn/reactos?rev=28079&view=rev
Log:
Move meta code from painting to arc. Including the new Pie function with ifed out.

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

Modified: trunk/reactos/dll/win32/gdi32/objects/arc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ar…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/arc.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/arc.c Wed Aug  1 23:26:55 2007
@@ -1,79 +1,193 @@
-#include "precomp.h"
-
-BOOL
-WINAPI
-Arc(
-	HDC hDC,
-	int nLeftRect,
-	int nTopRect,
-	int nRightRect,
-	int nBottomRect,
-	int nXStartArc,
-	int nYStartArc,
-	int nXEndArc,
-	int nYEndArc
-)
-{
-	return NtGdiArcInternal(GdiTypeArc,
-	                        hDC,
-	                        nLeftRect,
-	                        nTopRect,
-	                        nRightRect,
-	                        nBottomRect,
-	                        nXStartArc,
-	                        nYStartArc,
-	                        nXEndArc,
-	                        nYEndArc);
-}
-
-BOOL
-WINAPI
-ArcTo(
-	HDC  hDC,
-	int  nLeftRect,
-	int  nTopRect,
-	int  nRightRect,
-	int  nBottomRect,
-	int  nXRadial1,
-	int  nYRadial1,
-	int  nXRadial2,
-	int  nYRadial2)
-{
-	return NtGdiArcInternal(GdiTypeArcTo,
-	                        hDC,
-	                        nLeftRect,
-	                        nTopRect,
-	                        nRightRect,
-	                        nBottomRect,
-	                        nXRadial1,
-	                        nYRadial1,
-	                        nXRadial2,
-	                        nYRadial2);
-}
-
-BOOL
-WINAPI
-Chord(
-	HDC  hDC,
-	int  nLeftRect,
-	int  nTopRect,
-	int  nRightRect,
-	int  nBottomRect,
-	int  nXRadial1,
-	int  nYRadial1,
-	int  nXRadial2,
-	int  nYRadial2)
-{
-	return NtGdiArcInternal(GdiTypeChord,
-	                        hDC,
-	                        nLeftRect,
-	                        nTopRect,
-	                        nRightRect,
-	                        nBottomRect,
-	                        nXRadial1,
-	                        nYRadial1,
-	                        nXRadial2,
-	                        nYRadial2);
-}
-
-
+#include "precomp.h"
+
+BOOL
+WINAPI
+Arc(
+	HDC hDC,
+	int nLeftRect,
+	int nTopRect,
+	int nRightRect,
+	int nBottomRect,
+	int nXStartArc,
+	int nYStartArc,
+	int nXEndArc,
+	int nYEndArc
+)
+{
+#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)
+//    Call Wine (rewrite of) MFDRV_MetaParam8
+      return MFDRV_MetaParam8( hDC, META_ARC, a1, a2, a3, a4, a5, a6, a7, a8)
+    else
+    {
+      PLDC pLDC = GdiGetLDC(hDC);      
+      if ( !pLDC )
+      {
+         SetLastError(ERROR_INVALID_HANDLE);
+         return FALSE;
+      }
+      if (pLDC->iType == LDC_EMFLDC)
+      {
+//      Call Wine (rewrite of) EMFDRV_ArcChordPie
+        BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARC);
+        return Ret;
+      }
+      return FALSE;  
+    } 
+ }
+#endif
+	return NtGdiArcInternal(GdiTypeArc,
+	                        hDC,
+	                        nLeftRect,
+	                        nTopRect,
+	                        nRightRect,
+	                        nBottomRect,
+	                        nXStartArc,
+	                        nYStartArc,
+	                        nXEndArc,
+	                        nYEndArc);
+}
+
+BOOL
+WINAPI
+ArcTo(
+	HDC  hDC,
+	int  nLeftRect,
+	int  nTopRect,
+	int  nRightRect,
+	int  nBottomRect,
+	int  nXRadial1,
+	int  nYRadial1,
+	int  nXRadial2,
+	int  nYRadial2)
+{
+#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 FALSE; //No meta support for ArcTo
+    else
+    {
+      PLDC pLDC = GdiGetLDC(hDC);
+      if ( !pLDC )
+      {
+         SetLastError(ERROR_INVALID_HANDLE);
+         return FALSE;
+      }
+      if (pLDC->iType == LDC_EMFLDC)
+      {
+        BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARCTO);
+        return Ret;
+      }
+      return FALSE;
+    }
+ }
+#endif
+	return NtGdiArcInternal(GdiTypeArcTo,
+	                        hDC,
+	                        nLeftRect,
+	                        nTopRect,
+	                        nRightRect,
+	                        nBottomRect,
+	                        nXRadial1,
+	                        nYRadial1,
+	                        nXRadial2,
+	                        nYRadial2);
+}
+
+BOOL
+WINAPI
+Chord(
+	HDC  hDC,
+	int  nLeftRect,
+	int  nTopRect,
+	int  nRightRect,
+	int  nBottomRect,
+	int  nXRadial1,
+	int  nYRadial1,
+	int  nXRadial2,
+	int  nYRadial2)
+{
+#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_MetaParam8( hDC, META_CHORD, a1, a2, a3, a4, a5, a6, a7, a8)
+    else
+    {
+      PLDC pLDC = GdiGetLDC(hDC);
+      if ( !pLDC )
+      {
+         SetLastError(ERROR_INVALID_HANDLE);
+         return FALSE;
+      }
+      if (pLDC->iType == LDC_EMFLDC)
+      {
+        BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_CHORD);
+        return Ret;
+      }
+      return FALSE;
+    }
+ }
+#endif
+	return NtGdiArcInternal(GdiTypeChord,
+	                        hDC,
+	                        nLeftRect,
+	                        nTopRect,
+	                        nRightRect,
+	                        nBottomRect,
+	                        nXRadial1,
+	                        nYRadial1,
+	                        nXRadial2,
+	                        nYRadial2);
+}
+
+
+#if 0
+/*
+ * @unimplemented
+ */
+BOOL
+STDCALL
+Pie(
+	HDC	hDC,
+	int	a1,
+	int	a2,
+	int	a3,
+	int	a4,
+	int	a5,
+	int	a6,
+	int	a7,
+	int	a8
+	)
+{
+// 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_MetaParam8( hDC, META_PIE, a1, a2, a3, a4, a5, a6, a7, a8)
+    else
+    {
+      PLDC pLDC = GdiGetLDC(hDC);
+      if ( !pLDC )
+      {
+         SetLastError(ERROR_INVALID_HANDLE);
+         return FALSE;
+      }
+      if (pLDC->iType == LDC_EMFLDC)
+      {
+        BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_PIE);
+        return Ret;
+      }
+      return FALSE;
+    }
+ }
+ return NtGdiArcInternal(GdiTypePie, hDC, a1, a2, a3, a4, a5, a6, a7, a8);
+}
+#endif
+

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 Wed Aug  1 23:26:55 2007
@@ -234,176 +234,6 @@
 }
 
 
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-NewArc(
-	HDC	hDC,
-	int	a1,
-	int	a2,
-	int	a3,
-	int	a4,
-	int	a5,
-	int	a6,
-	int	a7,
-	int	a8
-	)
-{
-// 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)
-//    Call Wine (rewrite of) MFDRV_MetaParam8
-      return MFDRV_MetaParam8( hDC, META_ARC, a1, a2, a3, a4, a5, a6, a7, a8)
-    else
-    {
-      PLDC pLDC = GdiGetLDC(hDC);      
-      if ( !pLDC )
-      {
-         SetLastError(ERROR_INVALID_HANDLE);
-         return FALSE;
-      }
-      if (pLDC->iType == LDC_EMFLDC)
-      {
-//      Call Wine (rewrite of) EMFDRV_ArcChordPie
-        BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARC);
-        return Ret;
-      }
-      return FALSE;  
-    } 
- }
- return NtGdiArcInternal(GdiTypeArc, hDC, a1, a2, a3, a4, a5, a6, a7, a8);
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-NewArcTo(
-	HDC	hDC,
-	int	a1,
-	int	a2,
-	int	a3,
-	int	a4,
-	int	a5,
-	int	a6,
-	int	a7,
-	int	a8
-	)
-{
-// 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 FALSE; //No meta support for ArcTo
-    else
-    {
-      PLDC pLDC = GdiGetLDC(hDC);
-      if ( !pLDC )
-      {
-         SetLastError(ERROR_INVALID_HANDLE);
-         return FALSE;
-      }
-      if (pLDC->iType == LDC_EMFLDC)
-      {
-        BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARCTO);
-        return Ret;
-      }
-      return FALSE;
-    }
- }
- return NtGdiArcInternal(GdiTypeArcTo, hDC, a1, a2, a3, a4, a5, a6, a7, a8);
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-Chord(
-	HDC	hDC,
-	int	a1,
-	int	a2,
-	int	a3,
-	int	a4,
-	int	a5,
-	int	a6,
-	int	a7,
-	int	a8
-	)
-{
-// 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_MetaParam8( hDC, META_CHORD, a1, a2, a3, a4, a5, a6, a7, a8)
-    else
-    {
-      PLDC pLDC = GdiGetLDC(hDC);
-      if ( !pLDC )
-      {
-         SetLastError(ERROR_INVALID_HANDLE);
-         return FALSE;
-      }
-      if (pLDC->iType == LDC_EMFLDC)
-      {
-        BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_CHORD);
-        return Ret;
-      }
-      return FALSE;
-    }
- }
- return NtGdiArcInternal(GdiTypeChord, hDC, a1, a2, a3, a4, a5, a6, a7, a8);
-}
-
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-NewPie(
-	HDC	hDC,
-	int	a1,
-	int	a2,
-	int	a3,
-	int	a4,
-	int	a5,
-	int	a6,
-	int	a7,
-	int	a8
-	)
-{
-// 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_MetaParam8( hDC, META_PIE, a1, a2, a3, a4, a5, a6, a7, a8)
-    else
-    {
-      PLDC pLDC = GdiGetLDC(hDC);
-      if ( !pLDC )
-      {
-         SetLastError(ERROR_INVALID_HANDLE);
-         return FALSE;
-      }
-      if (pLDC->iType == LDC_EMFLDC)
-      {
-        BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_PIE);
-        return Ret;
-      }
-      return FALSE;
-    }
- }
- return NtGdiArcInternal(GdiTypePie, hDC, a1, a2, a3, a4, a5, a6, a7, a8);
-}
-
-
 BOOL
 STDCALL
 Ellipse(HDC hDC, INT Left, INT Top, INT Right, INT Bottom)