From 23147625437ec1cc91d8dd12b749695bd8fae321 Mon Sep 17 00:00:00 2001
From: Thomas Bluemel <thomas@reactsoft.com>
Date: Sun, 23 Nov 2003 12:08:00 +0000
Subject: [PATCH] revert my implementation of WM_SETCURSOR messages

svn path=/trunk/; revision=6759
---
 reactos/subsys/win32k/include/cursoricon.h |  1 -
 reactos/subsys/win32k/ntuser/msgqueue.c    | 11 +----------
 reactos/subsys/win32k/objects/cursoricon.c | 17 +----------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/reactos/subsys/win32k/include/cursoricon.h b/reactos/subsys/win32k/include/cursoricon.h
index f3b86ee30c6..6b7ff1776a7 100644
--- a/reactos/subsys/win32k/include/cursoricon.h
+++ b/reactos/subsys/win32k/include/cursoricon.h
@@ -15,7 +15,6 @@ typedef struct _CURICON_OBJECT
   ICONINFO IconInfo;
 } CURICON_OBJECT, *PCURICON_OBJECT;
 
-LPARAM FASTCALL IntSendSetCursorMessage(PWINDOW_OBJECT Window, USHORT Msg, USHORT HitTest);
 HCURSOR FASTCALL IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange);
 BOOL FASTCALL IntSetupCurIconHandles(PWINSTATION_OBJECT WinStaObject);
 PCURICON_OBJECT FASTCALL IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HICON hIcon);
diff --git a/reactos/subsys/win32k/ntuser/msgqueue.c b/reactos/subsys/win32k/ntuser/msgqueue.c
index 6d0dbdd55f0..3d499695a29 100644
--- a/reactos/subsys/win32k/ntuser/msgqueue.c
+++ b/reactos/subsys/win32k/ntuser/msgqueue.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: msgqueue.c,v 1.36 2003/11/23 11:39:48 navaraf Exp $
+/* $Id: msgqueue.c,v 1.37 2003/11/23 12:08:00 weiden Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -269,10 +269,6 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
 
   if (Window == NULL)
   {
-    /* set default cursor */
-    if(CaptureWin == NULL)
-      IntSendSetCursorMessage(NULL, Msg, HTNOWHERE);
-    
     ExFreePool(Message);
     return(FALSE);
   }
@@ -311,11 +307,6 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
   
   *ScreenPoint = Message->Msg.pt;
   Point = Message->Msg.pt;
-  
-  if(!CaptureWin && !IntSendSetCursorMessage(Window, Msg, *HitTest))
-  {
-    /* FIXME - what should we do here? */
-  }
 
   if ((*HitTest) != HTCLIENT)
   {
diff --git a/reactos/subsys/win32k/objects/cursoricon.c b/reactos/subsys/win32k/objects/cursoricon.c
index bdf61822681..693b22ebd99 100644
--- a/reactos/subsys/win32k/objects/cursoricon.c
+++ b/reactos/subsys/win32k/objects/cursoricon.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: cursoricon.c,v 1.25 2003/11/23 11:39:48 navaraf Exp $ */
+/* $Id: cursoricon.c,v 1.26 2003/11/23 12:08:00 weiden Exp $ */
 
 #undef WIN32_LEAN_AND_MEAN
 
@@ -63,21 +63,6 @@ IntCopyBitmap(HBITMAP bmp)
   return ret;
 }
 
-LPARAM FASTCALL
-IntSendSetCursorMessage(PWINDOW_OBJECT Window, USHORT Msg, USHORT HitTest)
-{
-  /* FIXME - high-order word of lParam is 0 if we're in menu mode */
-  if(Window)
-    return IntSendMessage(Window->Self, WM_SETCURSOR, (WPARAM)Window->Self, MAKELPARAM(HitTest, Msg), FALSE);
-  else
-  {
-    /* set default cursor */
-    IntLoadDefaultCursors(TRUE);
-    return 1;
-  }
-}
-
-
 #define COLORCURSORS_ALLOWED FALSE
 HCURSOR FASTCALL
 IntSetCursor(PWINSTATION_OBJECT WinStaObject, PCURICON_OBJECT NewCursor, BOOL ForceChange)