Fri Aug 24 19:37:54 CEST 2007

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 at 4 to NtGdiEnableEudc at 4, EngAssociateSurface at 12 to NtGdiEngAssociateSurface at 12, EngCheckAbort at 4 to NtGdiEngCheckAbort at 4, EngDeleteClip at 4 to NtGdiEngDeleteClip at 4
Redirect : EngCreateClip at 0 to NtGdiEngCreateClip at 0, EngCreateDeviceSurface at 16 to NtGdiEngCreateDeviceSurface at 16,  EngCreateDeviceBitmap at 16 to NtGdiEngCreateDeviceBitmap at 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?rev=28518&r1=28517&r2=28518&view=diff
==============================================================================

--- 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 at 16
+EnableEUDC at 4=NtGdiEnableEudc at 4
+EndDoc at 4
+EndFormPage at 4
+EndPage at 4
+EndPath at 4
+EngAcquireSemaphore at 4
+EngAlphaBlend at 28=NtGdiEngAlphaBlend at 28
+EngAssociateSurface at 12=NtGdiEngAssociateSurface at 12
+EngBitBlt at 44=NtGdiEngBitBlt at 44
+EngCreateClip at 0=NtGdiEngCreateClip at 0
+EngDeleteClip at 4=NtGdiEngDeleteClip at 4
+EngCheckAbort at 4=NtGdiEngCheckAbort at 4
+EngComputeGlyphSet at 12
+EngCreateSemaphore at 0
+EngCreateBitmap at 24
+EngCreateDeviceSurface at 16=NtGdiEngCreateDeviceSurface at 16
+EngCreateDeviceBitmap at 16=NtGdiEngCreateDeviceBitmap at 16
 
 ClearBitmapAttributes at 8
 ClearBrushAttributes at 8
@@ -158,24 +175,9 @@
 DdEntry55 at 12=NtGdiDdUpdateOverlay at 12
 DdEntry56 at 8=NtGdiDdWaitForVerticalBlank at 8
 Ellipse at 20=NtGdiEllipse at 20
-EnableEUDC at 4
-EndDoc at 4
-EndFormPage at 4
-EndPage at 4
-EndPath at 4
-EngAcquireSemaphore at 4
-EngAlphaBlend at 28=NtGdiEngAlphaBlend at 28;
-EngAssociateSurface at 12
-EngBitBlt at 44=NtGdiEngBitBlt at 44;
-EngCheckAbort at 4
-EngComputeGlyphSet at 12
 EngCopyBits at 24
-EngCreateBitmap at 24
-EngCreateClip at 0
 EngCreateDeviceBitmap at 16
-EngCreateDeviceSurface at 16
 EngCreatePalette at 24
-EngCreateSemaphore at 0
 EngDeleteClip at 4
 EngDeletePalette at 4
 EngDeletePath at 4

Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs.c?rev=28518&r1=28517&r2=28518&view=diff
==============================================================================
--- 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/region.c?rev=28518&r1=28517&r2=28518&view=diff
==============================================================================
--- 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


