Changeset 8533 for trunk/src

Timestamp:

May 31, 2002, 11:54:05 AM (23 years ago)

Author:

sandervl

Message:

Generate injected WH_MOUSE_LL hook event in SetCursorPos (with LLMHF_INJECTED flag set)

Location:

trunk/src/user32

Files:

• winicon.cpp (modified) (2 diffs)
• winmouse.cpp (modified) (3 diffs)

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.33 2001-10-27 10:30:11 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.34 2002-05-31 09:54:05 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -451 +451 @@
     return hOldCursor;
 }
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetCursorPos( PPOINT lpPoint)
-{
-    dprintf2(("USER32: GetCursorPos %x", lpPoint));
-
-    if (!lpPoint) return FALSE;
-
-    if (OSLibWinQueryPointerPos(lpPoint)) //POINT == POINTL
-    {
-        mapScreenPoint((OSLIBPOINT*)lpPoint);
-        return TRUE;
-    }
-    else return FALSE;
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API SetCursorPos( int X, int Y)
-{
-    dprintf(("USER32: SetCursorPos %d %d", X,Y));
-    return OSLibWinSetPointerPos(X, mapScreenY(Y));
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API ClipCursor(const RECT * lpRect)
-{
-    if(lpRect) {
-         dprintf(("USER32: ClipCursor (%d,%d)(%d,%d)", lpRect->left, lpRect->top, lpRect->right, lpRect->bottom));
-    }
-    else dprintf(("USER32: ClipCursor NULL"));
-    return OSLibWinClipCursor(lpRect);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetClipCursor( LPRECT lpRect)
-{
-    dprintf(("USER32: GetClipCursor %x", lpRect));
-    return OSLibWinGetClipCursor(lpRect);
-}
-//******************************************************************************
-//******************************************************************************
 /*****************************************************************************
  * Name      : BOOL WIN32API SetSystemCursor

trunk/src/user32/winmouse.cpp

@@ -1 @@
-/* $Id: winmouse.cpp,v 1.23 2002-04-30 14:54:06 sandervl Exp $ */
+/* $Id: winmouse.cpp,v 1.24 2002-05-31 09:54:05 sandervl Exp $ */
 /*
  * Win32 mouse functions
@@ -35 +35 @@
 #include "winmouse.h"
 #include "oslibmsg.h"
+#include "oslibres.h"
 #include "pmwindow.h"
 #include "oslibwin.h"
+#include "hook.h"
 
 #define DBG_LOCALLOG    DBG_winmouse
@@ -51 +53 @@
 //******************************************************************************
 //******************************************************************************
-
+BOOL WIN32API GetCursorPos( PPOINT lpPoint)
+{
+    if (!lpPoint) return FALSE;
+
+    if (OSLibWinQueryPointerPos(lpPoint)) //POINT == POINTL
+    {
+        mapScreenPoint((OSLIBPOINT*)lpPoint);
+        dprintf2(("USER32: GetCursorPos (%d,%d)", lpPoint->x, lpPoint->y));
+        return TRUE;
+    }
+    else return FALSE;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API SetCursorPos( int X, int Y)
+{
+    BOOL ret;
+
+    dprintf(("USER32: SetCursorPos %d %d", X,Y));
+    ret = OSLibWinSetPointerPos(X, mapScreenY(Y));
+    if(ret == TRUE) {
+        MSLLHOOKSTRUCT hook;
+
+        hook.pt.x        = X;
+        hook.pt.y        = Y;
+        hook.mouseData   = 0;
+        //signal to dinput hook that it only needs to modify the last
+        //known position (not treat it as a new event)
+        hook.flags       = LLMHF_INJECTED;
+        hook.time        = GetCurrentTime();
+        hook.dwExtraInfo = 0;
+
+        HOOK_CallHooksW( WH_MOUSE_LL, HC_ACTION, WM_MOUSEMOVE, (LPARAM)&hook);
+    }
+    return ret;
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API ClipCursor(const RECT * lpRect)
+{
+    if(lpRect) {
+         dprintf(("USER32: ClipCursor (%d,%d)(%d,%d)", lpRect->left, lpRect->top, lpRect->right, lpRect->bottom));
+    }
+    else dprintf(("USER32: ClipCursor NULL"));
+    return OSLibWinClipCursor(lpRect);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetClipCursor( LPRECT lpRect)
+{
+    dprintf(("USER32: GetClipCursor %x", lpRect));
+    return OSLibWinGetClipCursor(lpRect);
+}
+//******************************************************************************
 // capture handle "cache"
 static HWND hwndWin32Capture = 0;
-
+//******************************************************************************
 HWND WIN32API GetCapture()
 {