move object.c and ssec.c into ntuser where they belong

svn path=/trunk/; revision=17693

diff --git a/reactos/subsys/win32k/include/userfuncs.h b/reactos/subsys/win32k/include/userfuncs.h
index 270f0a6..1c3e12e 100644 (file)
--- a/reactos/subsys/win32k/include/userfuncs.h
+++ b/reactos/subsys/win32k/include/userfuncs.h
@@ -74,6 +74,8 @@ BOOL FASTCALL UserValidateRgn(HWND hWnd, HRGN hRgn);
 \r
 /*************** WINDOW.C ***************/\r
 \r
+PWINDOW_OBJECT FASTCALL UserGetWindowObjectNoRef(HWND hWnd);\r
+\r
 VOID FASTCALL\r
 co_DestroyThreadWindows(struct _ETHREAD *Thread);\r
 \r

diff --git a/reactos/subsys/win32k/misc/object.c b/reactos/subsys/win32k/ntuser/object.c
similarity index 100%
rename from reactos/subsys/win32k/misc/object.c
rename to reactos/subsys/win32k/ntuser/object.c

diff --git a/reactos/subsys/win32k/misc/ssec.c b/reactos/subsys/win32k/ntuser/ssec.c
similarity index 100%
rename from reactos/subsys/win32k/misc/ssec.c
rename to reactos/subsys/win32k/ntuser/ssec.c

diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index cafc7ea..04f1883 100644 (file)
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -75,6 +75,18 @@ CleanupWindowImpl(VOID)
 
 /* HELPER FUNCTIONS ***********************************************************/
 
+
+
+/* temp hack */
+PWINDOW_OBJECT FASTCALL UserGetWindowObjectNoRef(HWND hWnd)
+{
+   
+   PWINDOW_OBJECT w = IntGetWindowObject(hWnd);
+   if (w) IntReleaseWindowObject(w);
+   return w;
+}
+
+
 /*
  * IntIsWindow
  *

diff --git a/reactos/subsys/win32k/win32k.xml b/reactos/subsys/win32k/win32k.xml
index b340c51..7a5c66a 100644 (file)
--- a/reactos/subsys/win32k/win32k.xml
+++ b/reactos/subsys/win32k/win32k.xml
@@ -58,8 +58,6 @@
                <file>driver.c</file>
                <file>error.c</file>
                <file>math.c</file>
-               <file>object.c</file>
-               <file>ssec.c</file>
                <file>copy.c</file>
        </directory>
        <directory name="ntddraw">
@@ -99,6 +97,8 @@
                <file>window.c</file>
                <file>winpos.c</file>
                <file>winsta.c</file>
+               <file>object.c</file>
+               <file>ssec.c</file>
        </directory>
        <directory name="objects">
                <file>bezier.c</file>