[ros-diffs] [jimtabor] 28377: Use Gdi32 DeleteDC now. Soon tests will start with most Get functions using dcattr.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Fri Aug 17 04:40:57 2007
New Revision: 28377

URL: http://svn.reactos.org/svn/reactos?rev=28377&view=rev
Log:
Use Gdi32 DeleteDC now. Soon tests will start with most Get functions using dcattr.

Modified:
    trunk/reactos/dll/win32/gdi32/gdi32.def
    trunk/reactos/dll/win32/gdi32/objects/dc.c

Modified: trunk/reactos/dll/win32/gdi32/gdi32.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?rev=28377&r1=28376&r2=28377&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.def (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Aug 17 04:40:57 2007
@@ -91,7 +91,7 @@
 CreateSolidBrush at 4
 DPtoLP at 12
 DeleteColorSpace at 4
-DeleteDC at 4=NtGdiDeleteObjectApp at 4
+DeleteDC at 4
 DeleteEnhMetaFile at 4
 DeleteMetaFile at 4
 DeleteObject at 4

Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc.c?rev=28377&r1=28376&r2=28377&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/dc.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/dc.c Fri Aug 17 04:40:57 2007
@@ -240,15 +240,14 @@
  */
 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 @@
           LocalFree( pLDC );
         }
     }
-
+#endif
   Ret = NtGdiDeleteObjectApp(hDC);
   
   return Ret;