Fix for a bug I introduced declaring FASTCALL MouseGDICallBack.

svn path=/trunk/; revision=4716

diff --git a/reactos/subsys/win32k/eng/mouse.c b/reactos/subsys/win32k/eng/mouse.c
index 2999856..5d60ea0 100644 (file)
--- a/reactos/subsys/win32k/eng/mouse.c
+++ b/reactos/subsys/win32k/eng/mouse.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.
  */
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */

-/* $Id: mouse.c,v 1.23 2003/05/18 17:16:17 ea Exp $
+/* $Id: mouse.c,v 1.24 2003/05/18 19:21:24 ea Exp $

  *
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Mouse
  *
  * PROJECT:          ReactOS kernel
  * PURPOSE:          Mouse


@@ -206,7 +206,7 @@ MouseSafetyOnDrawEnd(PSURFOBJ SurfObj, PSURFGDI SurfGDI)
   return(TRUE);
 }
 
   return(TRUE);
 }
 

-VOID FASTCALL
+VOID /* STDCALL */

 MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount)
 /*
  * FUNCTION: Call by the mouse driver when input events occur.
 MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount)
 /*
  * FUNCTION: Call by the mouse driver when input events occur.


@@ -303,9 +303,14 @@ MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount)
     mouse_x = min(mouse_x, 620);
     mouse_y = min(mouse_y, 460);
 
     mouse_x = min(mouse_x, 620);
     mouse_y = min(mouse_y, 460);
 

+

     if (SafetySwitch == FALSE && SafetySwitch2 == FALSE)
     {
     if (SafetySwitch == FALSE && SafetySwitch2 == FALSE)
     {

+#if 1

       SurfGDI->MovePointer(SurfObj, mouse_x, mouse_y, &MouseRect);
       SurfGDI->MovePointer(SurfObj, mouse_x, mouse_y, &MouseRect);

+#else
+      DbgPrint("WIN32K.%s: call SurfGDI->MovePointer()\n",__FUNCTION__);
+#endif

     }
   }
 }
     }
   }
 }

diff --git a/reactos/subsys/win32k/include/mouse.h b/reactos/subsys/win32k/include/mouse.h
index 36c37d0..58cf588 100644 (file)
--- a/reactos/subsys/win32k/include/mouse.h
+++ b/reactos/subsys/win32k/include/mouse.h
@@ -7,7 +7,7 @@
 INT  STDCALL  MouseSafetyOnDrawStart(PSURFOBJ SurfObj, PSURFGDI SurfGDI, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2);
 INT  FASTCALL MouseSafetyOnDrawEnd(PSURFOBJ SurfObj, PSURFGDI SurfGDI);
 VOID FASTCALL EnableMouse(HDC hDisplayDC);
 INT  STDCALL  MouseSafetyOnDrawStart(PSURFOBJ SurfObj, PSURFGDI SurfGDI, LONG HazardX1, LONG HazardY1, LONG HazardX2, LONG HazardY2);
 INT  FASTCALL MouseSafetyOnDrawEnd(PSURFOBJ SurfObj, PSURFGDI SurfGDI);
 VOID FASTCALL EnableMouse(HDC hDisplayDC);

-VOID FASTCALL MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount);
+VOID          MouseGDICallBack(PMOUSE_INPUT_DATA Data, ULONG InputCount);

 
 
 #endif /* __WIN32K_MOUSE_H */
 
 
 #endif /* __WIN32K_MOUSE_H */