[ros-diffs] [greatlrd] 28518: Fix CreatePolygonRgn : use NtGdiPolyPolyDraw, old way was using NtGdiCreatePolyPolygonRgn, NtGdiCreatePolyPolygonRgn does not exists in windows NT 2000/XP/2003/VISTA Fix CreatePolyPolygonRgn : use NtGdiPolyPolyDraw, old way was using NtGdiCreatePolyPolygonRgn, NtGdiCreatePolyPolygonRgn does not exists in windows NT 2000/XP/2003/VISTA Redirect : EnableEUDC@4 to NtGdiEnableEudc@4, EngAssociateSurface@12 to NtGdiEngAssociateSurface@12, EngCheckAbort@4 to NtGdiEngCheckAbort@4, EngD

Author: greatlrd
Date: Fri Aug 24 21:37:53 2007
New Revision: 28518

URL: http://svn.reactos.org/svn/reactos?rev=28518&view=rev
Log:
Fix CreatePolygonRgn : use NtGdiPolyPolyDraw, old way was using NtGdiCreatePolyPolygonRgn,
NtGdiCreatePolyPolygonRgn does not exists in windows NT 2000/XP/2003/VISTA
Fix CreatePolyPolygonRgn : use NtGdiPolyPolyDraw, old way was using
NtGdiCreatePolyPolygonRgn, NtGdiCreatePolyPolygonRgn does not exists in windows NT
2000/XP/2003/VISTA
Redirect : EnableEUDC@4 to NtGdiEnableEudc@4, EngAssociateSurface@12 to
NtGdiEngAssociateSurface@12, EngCheckAbort@4 to NtGdiEngCheckAbort@4, EngDeleteClip@4 to
NtGdiEngDeleteClip@4
Redirect : EngCreateClip@0 to NtGdiEngCreateClip@0, EngCreateDeviceSurface@16 to
NtGdiEngCreateDeviceSurface@16,  EngCreateDeviceBitmap@16 to
NtGdiEngCreateDeviceBitmap@16


Modified:
    trunk/reactos/dll/win32/gdi32/gdi32.def
    trunk/reactos/dll/win32/gdi32/misc/stubs.c
    trunk/reactos/dll/win32/gdi32/objects/region.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 Fri Aug 24 21:37:53 2007
@@ -96,6 +96,23 @@
 DeviceCapabilitiesExA
 DeviceCapabilitiesExW
 DrawEscape@16
+EnableEUDC@4=NtGdiEnableEudc@4
+EndDoc@4
+EndFormPage@4
+EndPage@4
+EndPath@4
+EngAcquireSemaphore@4
+EngAlphaBlend@28=NtGdiEngAlphaBlend@28
+EngAssociateSurface@12=NtGdiEngAssociateSurface@12
+EngBitBlt@44=NtGdiEngBitBlt@44
+EngCreateClip@0=NtGdiEngCreateClip@0
+EngDeleteClip@4=NtGdiEngDeleteClip@4
+EngCheckAbort@4=NtGdiEngCheckAbort@4
+EngComputeGlyphSet@12
+EngCreateSemaphore@0
+EngCreateBitmap@24
+EngCreateDeviceSurface@16=NtGdiEngCreateDeviceSurface@16
+EngCreateDeviceBitmap@16=NtGdiEngCreateDeviceBitmap@16
 
 ClearBitmapAttributes@8
 ClearBrushAttributes@8
@@ -158,24 +175,9 @@
 DdEntry55@12=NtGdiDdUpdateOverlay@12
 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8
 Ellipse@20=NtGdiEllipse@20
-EnableEUDC@4
-EndDoc@4
-EndFormPage@4
-EndPage@4
-EndPath@4
-EngAcquireSemaphore@4
-EngAlphaBlend@28=NtGdiEngAlphaBlend@28;
-EngAssociateSurface@12
-EngBitBlt@44=NtGdiEngBitBlt@44;
-EngCheckAbort@4
-EngComputeGlyphSet@12
 EngCopyBits@24
-EngCreateBitmap@24
-EngCreateClip@0
 EngCreateDeviceBitmap@16
-EngCreateDeviceSurface@16
 EngCreatePalette@24
-EngCreateSemaphore@0
 EngDeleteClip@4
 EngDeletePalette@4
 EngDeletePath@4

Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Fri Aug 24 21:37:53 2007
@@ -1330,18 +1330,6 @@
 BOOL 
 STDCALL
 ColorCorrectPalette(HDC hDC,HPALETTE hPalette,DWORD dwFirstEntry,DWORD dwNumOfEntries)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL 
-STDCALL
-EnableEUDC(BOOL enable)
 {
 	UNIMPLEMENTED;
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
@@ -2458,7 +2446,7 @@
 }
 
 /*
- * @unimplemented
+ * @implemented
  */
 VOID
 STDCALL
@@ -2468,31 +2456,11 @@
 }
 
 
-/*
- * @unimplemented
- */
-BOOL STDCALL
-EngAssociateSurface(IN HSURF Surface,
-		    IN HDEV Dev,
-		    IN ULONG Hooks)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-
-
-/*
- * @unimplemented
- */
-BOOL STDCALL
-EngCheckAbort(SURFOBJ *pso)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
+
+
+
+
+
 
 /*
  * @unimplemented
@@ -2536,42 +2504,6 @@
 	return 0;
 }
 
-/*
- * @unimplemented
- */
-CLIPOBJ* STDCALL
-EngCreateClip(VOID)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-HBITMAP STDCALL
-EngCreateDeviceBitmap(IN DHSURF Surface,
-		      IN SIZEL Size,
-		      IN ULONG Format)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
-
-/*
- * @unimplemented
- */
-HSURF STDCALL
-EngCreateDeviceSurface(IN DHSURF Surface,
-		       IN SIZEL Size,
-		       IN ULONG FormatVersion)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 0;
-}
 
 /*
  * @unimplemented
@@ -2602,15 +2534,7 @@
   return (HSEMAPHORE)CritSect;
 }
 
-/*
- * @unimplemented
- */
-VOID STDCALL
-EngDeleteClip(CLIPOBJ *ClipRegion)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-}
+
 
 /*
  * @unimplemented

Modified: trunk/reactos/dll/win32/gdi32/objects/region.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/region.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/region.c Fri Aug 24 21:37:53 2007
@@ -30,14 +30,9 @@
 
 HRGN
 WINAPI 
-CreatePolygonRgn( const POINT* lppt, int cPoints, int fnPolyFillMode)
+CreatePolygonRgn( const POINT * lppt, int cPoints, int fnPolyFillMode)
 {
-    /* FIXME  NtGdiPolyPolyDraw */
-#if 0
-    return NtGdiPolyPolyDraw(fnPolyFillMode,lppt,cPoints,1,6);
-#else
-    return CreatePolyPolygonRgn(lppt, (const INT*)&cPoints, 1, fnPolyFillMode);
-#endif
+    return (HRGN) NtGdiPolyPolyDraw( (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG)
&cPoints, 1, GdiPolyPolyRgn);
 }
 
 
@@ -48,17 +43,7 @@
                       int nCount,
                       int fnPolyFillMode)
 {
-    /* FIXME NtGdiPolyPolyDraw  */
-#if 0
-  return (HRGN) NtGdiPolyPolyDraw(  (HDC) fnPolyFillMode,
-                                 (PPOINT) lppt,
-                                 (PULONG) lpPolyCounts,
-                                  (ULONG) nCount,
-                                          GdiPolyPolyRgn );
-#else
-    return NtGdiCreatePolyPolygonRgn( (PPOINT)lppt, (PINT)lpPolyCounts, nCount,
fnPolyFillMode);
-#endif
-
+    return (HRGN) NtGdiPolyPolyDraw(  (HDC) fnPolyFillMode, (PPOINT) lppt, (PULONG)
lpPolyCounts, (ULONG) nCount, GdiPolyPolyRgn );
 }
 
 HRGN