move NtGdiGetSetBoundsrect from paintobj.c to dc.c, remove paintobj.c

svn path=/trunk/; revision=28481

diff --git a/reactos/subsystems/win32/win32k/objects/dc.c b/reactos/subsystems/win32/win32k/objects/dc.c
index ac6db50..13e4d6d 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/dc.c
+++ b/reactos/subsystems/win32/win32k/objects/dc.c
@@ -3168,4 +3168,26 @@ IntChangeDisplaySettings(
   return Ret;
 }
 
+DWORD
+APIENTRY
+NtGdiGetBoundsRect(
+    IN HDC hdc,
+    OUT LPRECT prc,
+    IN DWORD f)
+{
+  DPRINT("stub");
+  return  DCB_RESET;   /* bounding rectangle always empty */
+}
+
+DWORD
+APIENTRY
+NtGdiSetBoundsRect(
+    IN HDC hdc,
+    IN LPRECT prc,
+    IN DWORD f)
+{
+  DPRINT("stub");
+  return  DCB_DISABLE;   /* bounding rectangle always empty */
+}
+
 /* EOF */

diff --git a/reactos/subsystems/win32/win32k/objects/paintobj.c b/reactos/subsystems/win32/win32k/objects/paintobj.c
deleted file mode 100644 (file)
index 5599917..0000000
--- a/reactos/subsystems/win32/win32k/objects/paintobj.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  ReactOS W32 Subsystem
- *  Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/* $Id$ */
-
-#include <w32k.h>
-
-#define NDEBUG
-#include <debug.h>
-
-DWORD
-APIENTRY
-NtGdiGetBoundsRect(
-    IN HDC hdc,
-    OUT LPRECT prc,
-    IN DWORD f)
-{
-  DPRINT("stub");
-  return  DCB_RESET;   /* bounding rectangle always empty */
-}
-
-DWORD
-APIENTRY
-NtGdiSetBoundsRect(
-    IN HDC hdc,
-    IN LPRECT prc,
-    IN DWORD f)
-{
-  DPRINT("stub");
-  return  DCB_DISABLE;   /* bounding rectangle always empty */
-}
-/* EOF */

diff --git a/reactos/subsystems/win32/win32k/win32k.rbuild b/reactos/subsystems/win32/win32k/win32k.rbuild
index d427312..bc63813 100644 (file)
--- a/reactos/subsystems/win32/win32k/win32k.rbuild
+++ b/reactos/subsystems/win32/win32k/win32k.rbuild
@@ -148,7 +148,6 @@
                <file>icm.c</file>
                <file>line.c</file>
                <file>metafile.c</file>
-               <file>paintobj.c</file>
                <file>palobj.c</file>
                <file>path.c</file>
                <file>pen.c</file>