[ros-diffs] [greatlrd] 28494: implement DeviceCapabilitiesExA and DeviceCapabilitiesExW, both always return -1 redirect DeleteColorSpace@4 to NtGdiDeleteColorSpace@4

Author: greatlrd
Date: Fri Aug 24 00:47:43 2007
New Revision: 28494

URL: http://svn.reactos.org/svn/reactos?rev=28494&view=rev
Log:
implement DeviceCapabilitiesExA and DeviceCapabilitiesExW, both always return -1 
redirect DeleteColorSpace@4 to NtGdiDeleteColorSpace@4


Modified:
    trunk/reactos/dll/win32/gdi32/gdi32.def
    trunk/reactos/dll/win32/gdi32/misc/stubs.c
    trunk/reactos/dll/win32/gdi32/misc/stubsa.c
    trunk/reactos/dll/win32/gdi32/misc/stubsw.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 00:47:43 2007
@@ -86,18 +86,21 @@
 CreateScalableFontResourceA@16
 CreateScalableFontResourceW@16
 CreateSolidBrush@4
-
-ClearBitmapAttributes@8
-ClearBrushAttributes@8
 DPtoLP@12
-DeleteColorSpace@4
+DeleteColorSpace@4=NtGdiDeleteColorSpace@4
 DeleteDC@4
 DeleteEnhMetaFile@4
 DeleteMetaFile@4
 DeleteObject@4
 DescribePixelFormat@16
-DeviceCapabilitiesExA@20
-DeviceCapabilitiesExW@20
+DeviceCapabilitiesExA
+DeviceCapabilitiesExW
+DrawEscape@16
+
+ClearBitmapAttributes@8
+ClearBrushAttributes@8
+DeleteObject@4
+DescribePixelFormat@16
 DdEntry1@16=NtGdiD3dContextCreate@16
 DdEntry2@4=NtGdiD3dContextDestroy@4
 DdEntry3@4=NtGdiD3dContextDestroyAll@4
@@ -154,7 +157,6 @@
 DdEntry54@8=NtGdiDdUnlockD3D@8
 DdEntry55@12=NtGdiDdUpdateOverlay@12
 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8
-DrawEscape@16
 Ellipse@20=NtGdiEllipse@20
 EnableEUDC@4
 EndDoc@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 00:47:43 2007
@@ -835,22 +835,6 @@
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return FALSE;
 }
-
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-DeleteColorSpace(
-	HCOLORSPACE	a0
-	)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return FALSE;
-}
-
 
 /*
  * @unimplemented

Modified: trunk/reactos/dll/win32/gdi32/misc/stubsa.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubsa.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubsa.c Fri Aug 24 00:47:43 2007
@@ -15,7 +15,7 @@
 
 
 /*
- * @unimplemented
+ * @implemented
  */
 int
 STDCALL
@@ -27,9 +27,8 @@
 	CONST DEVMODEA	*pDevMode
 	)
 {
-  UNIMPLEMENTED;
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return 0;
+	/* Note Windows 2000/XP/VISTA always return -1 */
+	return -1;
 }
 
 

Modified: trunk/reactos/dll/win32/gdi32/misc/stubsw.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubsw.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubsw.c Fri Aug 24 00:47:43 2007
@@ -14,7 +14,7 @@
 #define UNIMPLEMENTED DbgPrint("GDI32: %s is unimplemented, please try again
later.\n", __FUNCTION__);
 
 /*
- * @unimplemented
+ * @implemented
  */
 int
 STDCALL
@@ -26,18 +26,8 @@
 	CONST DEVMODEW	*pDevMode
 	)
 {
-#if 0
-  /* FIXME no NtGdiDeviceCapabilities???? */
-  return NtGdiDeviceCapabilities ( pDevice,
-				  pPort,
-				  fwCapability,
-				  pOutput,
-				  pDevMode );
-#else
-  UNIMPLEMENTED;
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return 0;
-#endif
+    /* Note Windows 2000/XP/VISTA always return -1 */
+    return -1;
 }