[ros-diffs] [jimtabor] 28707: Move GetDCObject to dc.c.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Fri Aug 31 18:41:01 2007
New Revision: 28707

URL: http://svn.reactos.org/svn/reactos?rev=28707&view=rev
Log:
Move GetDCObject to dc.c.

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

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=28707&r1=28706&r2=28707&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/dc.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/dc.c Fri Aug 31 18:41:01 2007
@@ -316,6 +316,43 @@
 }
 
 
+HGDIOBJ
+STDCALL
+GetDCObject( HDC hDC, INT iType)
+{
+#if 0
+ if((iType == GDI_OBJECT_TYPE_BRUSH) ||
+    (iType == GDI_OBJECT_TYPE_EXTPEN)||
+    (iType == GDI_OBJECT_TYPE_PEN)   ||
+    (iType == GDI_OBJECT_TYPE_COLORSPACE))
+ {
+   HGDIOBJ hGO;
+   PDC_ATTR Dc_Attr;
+   
+   if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return NULL;
+
+   switch (iType)
+   {
+     case GDI_OBJECT_TYPE_BRUSH:
+          hGO = Dc_Attr->hbrush;  
+          break;
+     
+     case GDI_OBJECT_TYPE_EXTPEN:
+     case GDI_OBJECT_TYPE_PEN:
+          hGO = Dc_Attr->hpen;
+          break;
+     
+     case GDI_OBJECT_TYPE_COLORSPACE:
+          hGO = Dc_Attr->hColorSpace;
+          break;
+   }   
+   return hGO;
+ }
+#endif
+ return NtGdiGetDCObject( hDC, iType );
+}
+
+
 /*
  * @implemented
  */

Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/painting.c?rev=28707&r1=28706&r2=28707&view=diff
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/painting.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/painting.c Fri Aug 31 18:41:01 2007
@@ -2,43 +2,6 @@
 
 
 #if 0 /* FIXME: enable this as soon as we have working usermode gdi */
-
-// Will move to dc.c
-HGDIOBJ
-STDCALL
-GetDCObject( HDC hDC, INT iType)
-{
-
- if((iType == GDI_OBJECT_TYPE_BRUSH) ||
-    (iType == GDI_OBJECT_TYPE_EXTPEN)||
-    (iType == GDI_OBJECT_TYPE_PEN)   ||
-    (iType == GDI_OBJECT_TYPE_COLORSPACE))
- {
-   HGDIOBJ hGO;
-   PDC_ATTR Dc_Attr;
-   
-   if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return NULL;
-
-   switch (iType)
-   {
-     case GDI_OBJECT_TYPE_BRUSH:
-          hGO = Dc_Attr->hbrush;  
-          break;
-     
-     case GDI_OBJECT_TYPE_EXTPEN:
-     case GDI_OBJECT_TYPE_PEN:
-          hGO = Dc_Attr->hpen;
-          break;
-     
-     case GDI_OBJECT_TYPE_COLORSPACE:
-          hGO = Dc_Attr->hColorSpace;
-          break;
-   }   
-   return hGO;
- }  
- return NtGdiGetDCObject( hDC, iType );
-}
-
 
 BOOL
 STDCALL