From e2d01e0703a03f4aadf40cffc324cc94eae03702 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Fri, 17 Aug 2007 00:40:57 +0000
Subject: [PATCH] Use Gdi32 DeleteDC now. Soon tests will start with most Get
 functions using dcattr.

svn path=/trunk/; revision=28377
---
 reactos/dll/win32/gdi32/gdi32.def    | 2 +-
 reactos/dll/win32/gdi32/objects/dc.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def
index f2225597750..96ffdc3bcbe 100644
--- a/reactos/dll/win32/gdi32/gdi32.def
+++ b/reactos/dll/win32/gdi32/gdi32.def
@@ -91,7 +91,7 @@ CreateScalableFontResourceW@16
 CreateSolidBrush@4
 DPtoLP@12
 DeleteColorSpace@4
-DeleteDC@4=NtGdiDeleteObjectApp@4
+DeleteDC@4
 DeleteEnhMetaFile@4
 DeleteMetaFile@4
 DeleteObject@4
diff --git a/reactos/dll/win32/gdi32/objects/dc.c b/reactos/dll/win32/gdi32/objects/dc.c
index 99de25de40a..558108ccbb8 100644
--- a/reactos/dll/win32/gdi32/objects/dc.c
+++ b/reactos/dll/win32/gdi32/objects/dc.c
@@ -240,15 +240,14 @@ CreateICA(
  */
 BOOL
 STDCALL
-NEWDeleteDC(HDC hDC)
+DeleteDC(HDC hDC)
 {
   BOOL Ret = TRUE;
+#if 0
   PDC_ATTR Dc_Attr;
   PLDC pLDC;
 
-  Ret = GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr);
-
-  if ( !Ret ) return FALSE;
+  if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE;
   
   if ( Dc_Attr )
     {
@@ -260,7 +259,7 @@ NEWDeleteDC(HDC hDC)
           LocalFree( pLDC );
         }
     }
-
+#endif
   Ret = NtGdiDeleteObjectApp(hDC);
   
   return Ret;