Changeset 8416 for trunk/src

Timestamp:

May 15, 2002, 12:58:07 PM (23 years ago)

Author:

sandervl

Message:

Made mouse code reentrant

File:

• trunk/src/dinput/mouse.c (modified) (8 diffs)

trunk/src/dinput/mouse.c

@@ -117 +117 @@
         CRITICAL_SECTION                crit;
 
+#ifdef __WIN32OS2__
+        char                            hookcode[32];
+#endif
+
         /* This is for mouse reporting. */
         Wine_InternalMouseData          m_state;
@@ -218 +222 @@
         ICOM_THIS(SysMouseAImpl,iface);
 
+#ifdef __WIN32OS2__
+        dprintf(("SysMouseAImpl_Release %x", This));
+#endif
+
         This->ref--;
         if (This->ref)
@@ -316 +324 @@
   
 /* low-level mouse hook */
+#ifdef __WIN32OS2__
+static LRESULT CALLBACK dinput_mouse_hook(SysMouseAImpl* This, int code, WPARAM wparam, LPARAM lparam )
+#else
 static LRESULT CALLBACK dinput_mouse_hook( int code, WPARAM wparam, LPARAM lparam )
+#endif
 {
     LRESULT ret;
     MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam;
+#ifndef __WIN32OS2__
     SysMouseAImpl* This = (SysMouseAImpl*) current_lock;
+#endif
 
 //testestest
@@ -440 +454 @@
   ICOM_THIS(SysMouseAImpl,iface);
   RECT  rect;
-  
+
+#ifdef __WIN32OS2__
+  dprintf(("SysMouseAImpl_Acquire %x", This));
+#else  
   TRACE("(this=%p)\n",This);
-
+#endif
   if (This->acquired == 0) {
     POINT point;
@@ -465 +482 @@
 
     /* Install our mouse hook */
+#ifdef __WIN32OS2__
+    //push ebp
+    This->hookcode[0]  = 0x55;
+    //mov  ebp, esp
+    This->hookcode[1]  = 0x8B; This->hookcode[2]  = 0xEC;
+    //push [ebp+16]
+    This->hookcode[3]  = 0xFF; This->hookcode[4]  = 0x75; This->hookcode[5]  = 0x10;
+    //push [ebp+12]
+    This->hookcode[6]  = 0xFF; This->hookcode[7]  = 0x75; This->hookcode[8]  = 0x0C;
+    //push [ebp+8]
+    This->hookcode[9]  = 0xFF; This->hookcode[10] = 0x75; This->hookcode[11] = 0x08;
+    //push This
+    This->hookcode[12] = 0x68; *(DWORD *)&This->hookcode[13]  = (DWORD)This;
+    //mov  eax, dinput_mouse_hook
+    This->hookcode[17] = 0xB8; *(DWORD *)&This->hookcode[18]  = (DWORD)&dinput_mouse_hook;
+    //call eax
+    This->hookcode[22] = 0xFF; This->hookcode[23]  = 0xD0;
+    //pop  ebp
+    This->hookcode[24] = 0x5D;
+    //ret  12
+    This->hookcode[25] = 0xC2; *(WORD *)&This->hookcode[26]  = 0x000C;
+
+    This->hook = SetWindowsHookExW( WH_MOUSE_LL, (HOOKPROC)This->hookcode, 0, 0 );
+#else
     This->hook = SetWindowsHookExW( WH_MOUSE_LL, dinput_mouse_hook, 0, 0 );
+#endif
 
     /* Get the window dimension and find the center */
@@ -472 +514 @@
     This->win_centerY = (rect.bottom - rect.top ) / 2;
 
+#ifndef __WIN32OS2__
     /* Warp the mouse to the center of the window */
     if (This->absolute == 0) {
@@ -485 +528 @@
 #endif
     }
-
+#endif
     This->acquired = 1;
   }
@@ -498 +541 @@
     ICOM_THIS(SysMouseAImpl,iface);
 
+#ifdef __WIN32OS2__
+    dprintf(("SysMouseAImpl_Unacquire %x", This));
+#else
     TRACE("(this=%p)\n",This);
+#endif
 
     if (This->acquired)