moved IntGetDesktopWindow() to desktop.c and a few minor fixes

svn path=/trunk/; revision=6973

reactos/subsys/win32k/include/desktop.h

@@ -25,6 +25,9 @@ IntDesktopWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
 HDC FASTCALL
 IntGetScreenDC(VOID);
 
+HWND FASTCALL
+IntGetDesktopWindow (VOID);
+
 PUSER_MESSAGE_QUEUE FASTCALL
 IntGetFocusMessageQueue(VOID);
 

reactos/subsys/win32k/include/window.h

@@ -127,9 +127,6 @@ IntIsWindowVisible (HWND Wnd);
 BOOL FASTCALL
 IntIsChildWindow (HWND Parent, HWND Child);
 
-HWND FASTCALL
-IntGetDesktopWindow (VOID);
-
 BOOL FASTCALL
 IntSetProp(PWINDOW_OBJECT Wnd, ATOM Atom, HANDLE Data);
 

reactos/subsys/win32k/ntuser/desktop.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: desktop.c,v 1.2 2003/12/07 23:02:57 gvg Exp $
+ *  $Id: desktop.c,v 1.3 2003/12/12 18:18:21 weiden Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
@@ -136,6 +136,17 @@ IntSetFocusMessageQueue(PUSER_MESSAGE_QUEUE NewQueue)
    pdo->ActiveMessageQueue = NewQueue;
 }
 
+HWND FASTCALL IntGetDesktopWindow(VOID)
+{
+   PDESKTOP_OBJECT pdo = IntGetActiveDesktop();
+   if (!pdo)
+   {
+      DPRINT("No active desktop\n");
+      return NULL;
+   }
+  return pdo->DesktopWindow;
+}
+
 /* PUBLIC FUNCTIONS ***********************************************************/
 
 
@@ -681,7 +692,7 @@ NtUserSwitchDesktop(HDESK hDesktop)
 
    Status = IntValidateDesktopHandle(
       hDesktop,
-      KernelMode,
+      UserMode,
       0,
       &DesktopObject);
 

reactos/subsys/win32k/ntuser/metric.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: metric.c,v 1.16 2003/11/23 12:24:21 weiden Exp $
+/* $Id: metric.c,v 1.17 2003/12/12 18:18:21 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -36,6 +36,7 @@
 #include <include/winsta.h>
 #include <include/msgqueue.h>
 #include <include/window.h>
+#include <include/desktop.h>
 
 #define NDEBUG
 #include <debug.h>

reactos/subsys/win32k/ntuser/painting.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: painting.c,v 1.44 2003/12/08 18:21:25 navaraf Exp $
+ *  $Id: painting.c,v 1.45 2003/12/12 18:18:21 weiden Exp $
  *
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
@@ -36,6 +36,7 @@
 #include <include/object.h>
 #include <include/guicheck.h>
 #include <include/window.h>
+#include <include/desktop.h>
 #include <include/winpos.h>
 #include <include/class.h>
 #include <include/caret.h>

reactos/subsys/win32k/ntuser/windc.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: windc.c,v 1.43 2003/12/12 17:20:53 gvg Exp $
+/* $Id: windc.c,v 1.44 2003/12/12 18:18:21 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -37,6 +37,7 @@
 #include <include/winsta.h>
 #include <include/msgqueue.h>
 #include <include/window.h>
+#include <include/desktop.h>
 #include <include/rect.h>
 #include <include/dce.h>
 #include <include/vis.h>

reactos/subsys/win32k/ntuser/window.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: window.c,v 1.158 2003/12/12 16:56:20 weiden Exp $
+/* $Id: window.c,v 1.159 2003/12/12 18:18:21 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -432,12 +432,6 @@ IntGetClientRect(PWINDOW_OBJECT WindowObject, PRECT Rect)
 }
 
 
-HWND FASTCALL IntGetDesktopWindow(VOID)
-{
-  return IntGetActiveDesktop()->DesktopWindow;
-}
-
-
 #if 0
 HWND FASTCALL
 IntGetFocusWindow(VOID)

reactos/subsys/win32k/ntuser/winpos.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: winpos.c,v 1.52 2003/12/07 23:02:57 gvg Exp $
+/* $Id: winpos.c,v 1.53 2003/12/12 18:18:21 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -1236,6 +1236,12 @@ WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, POINT WinPoint,
   USHORT HitTest;
 
   *Window = NULL;
+  
+  if(!ScopeWin)
+  {
+    DPRINT1("WinPosWindowFromPoint(): ScopeWin == NULL!\n");
+    return(HTERROR);
+  }
 
   if (ScopeWin->Style & WS_DISABLED)
     {