From ee0dd7fa6e1809d44758cb248060ea9b352e247e Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Thu, 23 Aug 2007 20:47:43 +0000
Subject: [PATCH] implement DeviceCapabilitiesExA and DeviceCapabilitiesExW,
 both always return -1 redirect DeleteColorSpace@4 to NtGdiDeleteColorSpace@4

svn path=/trunk/; revision=28494
---
 reactos/dll/win32/gdi32/gdi32.def     | 16 +++++++++-------
 reactos/dll/win32/gdi32/misc/stubs.c  | 16 ----------------
 reactos/dll/win32/gdi32/misc/stubsa.c |  7 +++----
 reactos/dll/win32/gdi32/misc/stubsw.c | 16 +++-------------
 4 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def
index 1e1272e65ea..1ef838f4b02 100644
--- a/reactos/dll/win32/gdi32/gdi32.def
+++ b/reactos/dll/win32/gdi32/gdi32.def
@@ -86,18 +86,21 @@ CreateRoundRectRgn@24=NtGdiCreateRoundRectRgn@24
 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 @@ DdEntry53@8=NtGdiDdUnlock@8
 DdEntry54@8=NtGdiDdUnlockD3D@8
 DdEntry55@12=NtGdiDdUpdateOverlay@12
 DdEntry56@8=NtGdiDdWaitForVerticalBlank@8
-DrawEscape@16
 Ellipse@20=NtGdiEllipse@20
 EnableEUDC@4
 EndDoc@4
diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c
index bbe1cd84e83..48d6e9a0bfc 100644
--- a/reactos/dll/win32/gdi32/misc/stubs.c
+++ b/reactos/dll/win32/gdi32/misc/stubs.c
@@ -836,22 +836,6 @@ SetColorSpace(
 	return FALSE;
 }
 
-
-/*
- * @unimplemented
- */
-BOOL
-STDCALL
-DeleteColorSpace(
-	HCOLORSPACE	a0
-	)
-{
-	UNIMPLEMENTED;
-	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return FALSE;
-}
-
-
 /*
  * @unimplemented
  */
diff --git a/reactos/dll/win32/gdi32/misc/stubsa.c b/reactos/dll/win32/gdi32/misc/stubsa.c
index aba6ee909d3..009f353ed91 100644
--- a/reactos/dll/win32/gdi32/misc/stubsa.c
+++ b/reactos/dll/win32/gdi32/misc/stubsa.c
@@ -15,7 +15,7 @@
 
 
 /*
- * @unimplemented
+ * @implemented
  */
 int
 STDCALL
@@ -27,9 +27,8 @@ DeviceCapabilitiesExA(
 	CONST DEVMODEA	*pDevMode
 	)
 {
-  UNIMPLEMENTED;
-  SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-  return 0;
+	/* Note Windows 2000/XP/VISTA always return -1 */
+	return -1;
 }
 
 
diff --git a/reactos/dll/win32/gdi32/misc/stubsw.c b/reactos/dll/win32/gdi32/misc/stubsw.c
index 55a313dccc6..05bdc26cd82 100644
--- a/reactos/dll/win32/gdi32/misc/stubsw.c
+++ b/reactos/dll/win32/gdi32/misc/stubsw.c
@@ -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 @@ DeviceCapabilitiesExW(
 	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;
 }