Changeset 9016 for trunk/src

Timestamp:

Aug 16, 2002, 5:08:25 PM (23 years ago)

Author:

sandervl

Message:

Wine resync; added missing bugfix

Location:

trunk/src/dinput

Files:

• device.c (modified) (42 diffs)
• device_private.h (modified) (3 diffs)
• dinput_main.c (modified) (15 diffs)
• dinput_private.h (modified) (4 diffs)
• keyboard.c (modified) (13 diffs)
• mouse.c (modified) (58 diffs)

trunk/src/dinput/device.c

@@ -4 +4 @@
  * Copyright 1998,1999 Lionel Ulmer
  *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -14 +28 @@
 
 #include <string.h>
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
 #include "winerror.h"
@@ -21 +35 @@
 #include "device_private.h"
 
-DEFAULT_DEBUG_CHANNEL(dinput);
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 /******************************************************************************
@@ -112 +126 @@
           *((char *) (out_c + df->dt[i].offset_out)) = *((char *) (in_c + df->dt[i].offset_in));
           break;
-        
+
         case 2:
           TRACE("Copying (s) to %d from %d (value %d)\n",
@@ -118 +132 @@
           *((short *) (out_c + df->dt[i].offset_out)) = *((short *) (in_c + df->dt[i].offset_in));
           break;
-        
+
         case 4:
           TRACE("Copying (i) to %d from %d (value %d)\n",
@@ -124 +138 @@
           *((int *) (out_c + df->dt[i].offset_out)) = *((int *) (in_c + df->dt[i].offset_in));
           break;
-        
+
         default:
           memcpy((out_c + df->dt[i].offset_out), (in_c + df->dt[i].offset_in), df->dt[i].size);
@@ -135 +149 @@
           *((char *) (out_c + df->dt[i].offset_out)) = (char) df->dt[i].value;
           break;
-        
+
         case 2:
           TRACE("Copying (s) to %d default value %d\n",
@@ -141 +155 @@
           *((short *) (out_c + df->dt[i].offset_out)) = (short) df->dt[i].value;
           break;
-        
+
         case 4:
           TRACE("Copying (i) to %d default value %d\n",
@@ -147 +161 @@
           *((int *) (out_c + df->dt[i].offset_out)) = (int) df->dt[i].value;
           break;
-        
+
         default:
           memset((out_c + df->dt[i].offset_out), df->dt[i].size, 0);
@@ -163 +177 @@
   int *done;
   int index = 0;
-  
+
   ret = (DataFormat *) HeapAlloc(GetProcessHeap(), 0, sizeof(DataFormat));
-  
+
   done = (int *) HeapAlloc(GetProcessHeap(), 0, sizeof(int) * asked_format->dwNumObjs);
   memset(done, 0, sizeof(int) * asked_format->dwNumObjs);
@@ -172 +186 @@
 
   TRACE("Creating DataTransform : \n");
-  
+
   for (i = 0; i < wine_format->dwNumObjs; i++) {
     offset[i] = -1;
-    
+
     for (j = 0; j < asked_format->dwNumObjs; j++) {
       if (done[j] == 1)
         continue;
-      
+
       if (((asked_format->rgodf[j].pguid == NULL) || (IsEqualGUID(wine_format->rgodf[i].pguid, asked_format->rgodf[j].pguid)))
           &&
@@ -186 +200 @@
         done[j] = 1;
 
-        TRACE("Matching : \n"); 
+        TRACE("Matching : \n");
         TRACE("   - Asked (%d) : %s - Ofs = %3ld - (Type = 0x%02x | Instance = %04x)\n",
-              j, debugstr_guid(asked_format->rgodf[j].pguid), 
+              j, debugstr_guid(asked_format->rgodf[j].pguid),
               asked_format->rgodf[j].dwOfs,
               DIDFT_GETTYPE(asked_format->rgodf[j].dwType), DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType));
-        
+
         TRACE("   - Wine  (%d) : %s - Ofs = %3ld - (Type = 0x%02x | Instance = %04x)\n",
-              j, debugstr_guid(wine_format->rgodf[i].pguid), 
+              j, debugstr_guid(wine_format->rgodf[i].pguid),
               wine_format->rgodf[i].dwOfs,
               DIDFT_GETTYPE(wine_format->rgodf[i].dwType), DIDFT_GETINSTANCE(wine_format->rgodf[i].dwType));
-        
+
         if (wine_format->rgodf[i].dwType & DIDFT_BUTTON)
           dt[index].size = sizeof(BYTE);
@@ -205 +219 @@
         dt[index].value = 0;
         index++;
-        
+
         if (wine_format->rgodf[i].dwOfs != asked_format->rgodf[j].dwOfs)
           same = 0;
@@ -222 +236 @@
     if (done[j] == 0) {
       TRACE(" - Asked (%d) : %s - Ofs = %3ld - (Type = 0x%02x | Instance = %04x)\n",
-            j, debugstr_guid(asked_format->rgodf[j].pguid), 
+            j, debugstr_guid(asked_format->rgodf[j].pguid),
             asked_format->rgodf[j].dwOfs,
             DIDFT_GETTYPE(asked_format->rgodf[j].dwType), DIDFT_GETINSTANCE(asked_format->rgodf[j].dwType));
 
-      
+
       if (asked_format->rgodf[j].dwType & DIDFT_BUTTON)
         dt[index].size = sizeof(BYTE);
@@ -248 +262 @@
     ret->dt = dt;
   }
-  
+
   HeapFree(GetProcessHeap(), 0, done);
 
@@ -259 +273 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat(
-        LPDIRECTINPUTDEVICE2A iface,LPCDIDATAFORMAT df
+        LPDIRECTINPUTDEVICE8A iface,LPCDIDATAFORMAT df
 ) {
   int i;
@@ -265 +279 @@
 
   TRACE("(this=%p,%p)\n",This,df);
-  
+
   TRACE("df.dwSize=%ld\n",df->dwSize);
   TRACE("(df.dwObjsize=%ld)\n",df->dwObjSize);
@@ -271 +285 @@
   TRACE("(df.dwDataSize=%ld)\n",df->dwDataSize);
   TRACE("(df.dwNumObjs=%ld)\n",df->dwNumObjs);
-  
+
   for (i=0;i<df->dwNumObjs;i++) {
     TRACE("df.rgodf[%d].guid %s\n",i,debugstr_guid(df->rgodf[i].pguid));
@@ -282 +296 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(
-        LPDIRECTINPUTDEVICE2A iface,HWND hwnd,DWORD dwflags
+        LPDIRECTINPUTDEVICE8A iface,HWND hwnd,DWORD dwflags
 ) {
         ICOM_THIS(IDirectInputDevice2AImpl,iface);
@@ -292 +306 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(
-        LPDIRECTINPUTDEVICE2A iface,HANDLE hnd
+        LPDIRECTINPUTDEVICE8A iface,HANDLE hnd
 ) {
         ICOM_THIS(IDirectInputDevice2AImpl,iface);
@@ -299 +313 @@
 }
 
-ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE2A iface)
+ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface)
 {
         ICOM_THIS(IDirectInputDevice2AImpl,iface);
@@ -310 +324 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(
-        LPDIRECTINPUTDEVICE2A iface,REFIID riid,LPVOID *ppobj
+        LPDIRECTINPUTDEVICE8A iface,REFIID riid,LPVOID *ppobj
 )
 {
@@ -336 +350 @@
 
 ULONG WINAPI IDirectInputDevice2AImpl_AddRef(
-        LPDIRECTINPUTDEVICE2A iface)
+        LPDIRECTINPUTDEVICE8A iface)
 {
         ICOM_THIS(IDirectInputDevice2AImpl,iface);
@@ -343 +357 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback,
         LPVOID lpvRef,
@@ -354 +368 @@
           DPRINTF("\n");
         }
-        
-        return DI_OK;
-}
-        
+
+        return DI_OK;
+}
+
 HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         REFGUID rguid,
         LPDIPROPHEADER pdiph)
@@ -365 +379 @@
         FIXME("(this=%p,%s,%p): stub!\n",
               iface, debugstr_guid(rguid), pdiph);
-        
+
         if (TRACE_ON(dinput))
           _dump_DIPROPHEADER(pdiph);
-        
+
         return DI_OK;
 }
 
 HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIDEVICEOBJECTINSTANCEA pdidoi,
         DWORD dwObj,
@@ -380 +394 @@
         FIXME("(this=%p,%p,%ld,0x%08lx): stub!\n",
               iface, pdidoi, dwObj, dwHow);
-        
-        return DI_OK;
-}
-        
+
+        return DI_OK;
+}
+
 HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceInfo(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIDEVICEINSTANCEA pdidi)
 {
         FIXME("(this=%p,%p): stub!\n",
               iface, pdidi);
-        
-        return DI_OK;
-}
-        
+
+        return DI_OK;
+}
+
 HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         HWND hwndOwner,
         DWORD dwFlags)
@@ -401 +415 @@
   FIXME("(this=%p,0x%08x,0x%08lx): stub!\n",
         iface, hwndOwner, dwFlags);
-        
-        return DI_OK;
-}
-        
+
+        return DI_OK;
+}
+
 HRESULT WINAPI IDirectInputDevice2AImpl_Initialize(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         HINSTANCE hinst,
         DWORD dwVersion,
@@ -415 +429 @@
         return DI_OK;
 }
-        
+
 /******************************************************************************
  *      IDirectInputDevice2A
@@ -421 +435 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_CreateEffect(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         REFGUID rguid,
         LPCDIEFFECT lpeff,
@@ -433 +447 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_EnumEffects(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIENUMEFFECTSCALLBACKA lpCallback,
         LPVOID lpvRef,
@@ -440 +454 @@
         FIXME("(this=%p,%p,%p,0x%08lx): stub!\n",
               iface, lpCallback, lpvRef, dwFlags);
-        
+
         if (lpCallback)
                 lpCallback(NULL, lpvRef);
@@ -447 +461 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_GetEffectInfo(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIEFFECTINFOA lpdei,
         REFGUID rguid)
@@ -457 +471 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDWORD pdwOut)
 {
@@ -466 +480 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_SendForceFeedbackCommand(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         DWORD dwFlags)
 {
@@ -475 +489 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_EnumCreatedEffectObjects(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback,
         LPVOID lpvRef,
@@ -488 +502 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_Escape(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIEFFESCAPE lpDIEEsc)
 {
@@ -497 +511 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_Poll(
-        LPDIRECTINPUTDEVICE2A iface)
+        LPDIRECTINPUTDEVICE8A iface)
 {
         /* Because wine devices do not need to be polled, just return DI_NOEFFECT */
@@ -504 +518 @@
 
 HRESULT WINAPI IDirectInputDevice2AImpl_SendDeviceData(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         DWORD cbObjectData,
-        LPDIDEVICEOBJECTDATA rgdod,
+        LPCDIDEVICEOBJECTDATA rgdod,
         LPDWORD pdwInOut,
         DWORD dwFlags)
@@ -512 +526 @@
         FIXME("(this=%p,0x%08lx,%p,%p,0x%08lx): stub!\n",
               iface, cbObjectData, rgdod, pdwInOut, dwFlags);
-        
-        return DI_OK;
-}
-
-HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE7A iface,
+
+        return DI_OK;
+}
+
+HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8A iface,
                                                           LPCSTR lpszFileName,
                                                           LPDIENUMEFFECTSINFILECALLBACK pec,
@@ -527 +541 @@
 }
 
-HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE7A iface,
+HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8A iface,
                                                           LPCSTR lpszFileName,
                                                           DWORD dwEntries,
@@ -534 +548 @@
 {
   FIXME("(%p)->(%s,%08lx,%p,%08lx): stub !\n", iface, lpszFileName, dwEntries, rgDiFileEft, dwFlags);
-  
+
   return DI_OK;
 }
+
+HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface,
+                                                       LPDIACTIONFORMATA lpdiaf,
+                                                       LPCSTR lpszUserName,
+                                                       DWORD dwFlags)
+{
+  FIXME("(%p)->(%p,%s,%08lx): stub !\n", iface, lpdiaf, lpszUserName, dwFlags);
+
+  return DI_OK;
+}
+
+HRESULT WINAPI IDirectInputDevice8AImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
+                                                     LPDIACTIONFORMATA lpdiaf,
+                                                     LPCSTR lpszUserName,
+                                                     DWORD dwFlags)
+{
+  FIXME("(%p)->(%p,%s,%08lx): stub !\n", iface, lpdiaf, lpszUserName, dwFlags);
+
+  return DI_OK;
+}
+
+HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface,
+                                                     LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader)
+{
+  FIXME("(%p)->(%p): stub !\n", iface, lpdiDevImageInfoHeader);
+
+  return DI_OK;
+}

trunk/src/dinput/device_private.h

@@ +1 @@
+/*
+ * Copyright 2000 Lionel Ulmer
+ * Copyright 2000-2001 TransGaming Technologies Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H
 #define __WINE_DLLS_DINPUT_DINPUTDEVICE_PRIVATE_H
@@ -61 +80 @@
 /* And the stubs */
 extern HRESULT WINAPI IDirectInputDevice2AImpl_SetDataFormat(
-        LPDIRECTINPUTDEVICE2A iface,LPCDIDATAFORMAT df ) ;
+        LPDIRECTINPUTDEVICE8A iface,LPCDIDATAFORMAT df ) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_SetCooperativeLevel(
-        LPDIRECTINPUTDEVICE2A iface,HWND hwnd,DWORD dwflags ) ;
+        LPDIRECTINPUTDEVICE8A iface,HWND hwnd,DWORD dwflags ) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(
-        LPDIRECTINPUTDEVICE2A iface,HANDLE hnd ) ;
-extern ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE2A iface) ;
+        LPDIRECTINPUTDEVICE8A iface,HANDLE hnd ) ;
+extern ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(
-        LPDIRECTINPUTDEVICE2A iface,REFIID riid,LPVOID *ppobj ) ;
+        LPDIRECTINPUTDEVICE8A iface,REFIID riid,LPVOID *ppobj ) ;
 extern ULONG WINAPI IDirectInputDevice2AImpl_AddRef(
-        LPDIRECTINPUTDEVICE2A iface) ;
+        LPDIRECTINPUTDEVICE8A iface) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_EnumObjects(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback,
         LPVOID lpvRef,
         DWORD dwFlags) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_GetProperty(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         REFGUID rguid,
         LPDIPROPHEADER pdiph) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIDEVICEOBJECTINSTANCEA pdidoi,
         DWORD dwObj,
         DWORD dwHow) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_GetDeviceInfo(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIDEVICEINSTANCEA pdidi) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_RunControlPanel(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         HWND hwndOwner,
         DWORD dwFlags) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_Initialize(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         HINSTANCE hinst,
         DWORD dwVersion,
         REFGUID rguid) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_CreateEffect(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         REFGUID rguid,
         LPCDIEFFECT lpeff,
@@ -104 +123 @@
         LPUNKNOWN pUnkOuter) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_EnumEffects(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIENUMEFFECTSCALLBACKA lpCallback,
         LPVOID lpvRef,
         DWORD dwFlags) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_GetEffectInfo(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIEFFECTINFOA lpdei,
         REFGUID rguid) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDWORD pdwOut) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_SendForceFeedbackCommand(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         DWORD dwFlags) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_EnumCreatedEffectObjects(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback,
         LPVOID lpvRef,
         DWORD dwFlags) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_Escape(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIEFFESCAPE lpDIEEsc) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_Poll(
-        LPDIRECTINPUTDEVICE2A iface) ;
+        LPDIRECTINPUTDEVICE8A iface) ;
 extern HRESULT WINAPI IDirectInputDevice2AImpl_SendDeviceData(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         DWORD cbObjectData,
-        LPDIDEVICEOBJECTDATA rgdod,
+        LPCDIDEVICEOBJECTDATA rgdod,
         LPDWORD pdwInOut,
         DWORD dwFlags) ;
-extern HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE7A iface,
+extern HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8A iface,
                                                                  LPCSTR lpszFileName,
                                                                  LPDIENUMEFFECTSINFILECALLBACK pec,
                                                                  LPVOID pvRef,
                                                                  DWORD dwFlags) ;
-extern HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE7A iface,
+extern HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8A iface,
                                                                  LPCSTR lpszFileName,
                                                                  DWORD dwEntries,
                                                                  LPDIFILEEFFECT rgDiFileEft,
                                                                  DWORD dwFlags) ;
+extern HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface,
+                                                              LPDIACTIONFORMATA lpdiaf,
+                                                              LPCSTR lpszUserName,
+                                                              DWORD dwFlags);
+extern HRESULT WINAPI IDirectInputDevice8AImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
+                                                            LPDIACTIONFORMATA lpdiaf,
+                                                            LPCSTR lpszUserName,
+                                                            DWORD dwFlags);
+extern HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface,
+                                                            LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader);
 
 #ifdef __WIN32OS2__

trunk/src/dinput/dinput_main.c

@@ -3 +3 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 1998,1999 Lionel Ulmer
- *
+ * Copyright 2000-2002 TransGaming Technologies Inc.
+ *
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 /* Status:
@@ -11 +26 @@
  * - WingCommander Prophecy Demo:
  *   Doesn't get Input Focus.
- * 
+ *
  * - Fallout : works great in X and DGA mode
- *
- * FIXME: The keyboard handling needs to (and will) be merged into keyboard.c
- *        (The current implementation is currently only a proof of concept and
- *         an utter mess.)
  */
 
@@ -23 +34 @@
 #include <string.h>
 
-#include "debugtools.h"
+#include "wine/debug.h"
 #include "winbase.h"
+#include "winuser.h"
 #include "winerror.h"
 #include "windef.h"
 #include "dinput_private.h"
 
-DEFAULT_DEBUG_CHANNEL(dinput);
-
-static ICOM_VTABLE(IDirectInputA) ddiavt;
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
+
 static ICOM_VTABLE(IDirectInput7A) ddi7avt;
+static ICOM_VTABLE(IDirectInput8A) ddi8avt;
 
 /* This array will be filled a dinput.so loading */
@@ -39 +51 @@
 static int nrof_dinput_devices = 0;
 
-/* register a direct draw driver. We better not use malloc for we are in 
+BOOL WINAPI Init( HINSTANCE inst, DWORD reason, LPVOID reserv)
+{
+    switch(reason)
+    {
+      case DLL_PROCESS_ATTACH:
+        keyboard_hook = SetWindowsHookExW( WH_KEYBOARD_LL, KeyboardCallback, 0, 0 );
+        break;
+      case DLL_PROCESS_DETACH:
+        UnhookWindowsHookEx(keyboard_hook);
+        break;
+    }
+    return TRUE;
+}
+
+
+/* register a direct draw driver. We better not use malloc for we are in
  * the ELF startup initialisation at this point.
  */
@@ -74 +101 @@
                 (DWORD)hinst,dwVersion,debugstr_guid(riid),ppDI,punkOuter
         );
-        if (IsEqualGUID(&IID_IDirectInputA,riid)) {
+        if (IsEqualGUID(&IID_IDirectInputA,riid) ||
+            IsEqualGUID(&IID_IDirectInput2A,riid) ||
+            IsEqualGUID(&IID_IDirectInput7A,riid)) {
           This = (IDirectInputAImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputAImpl));
+          This->lpVtbl = &ddi7avt;
           This->ref = 1;
-          ICOM_VTBL(This) = &ddiavt;
           *ppDI = This;
-          
+
           return DI_OK;
         }
-        
-        if (IsEqualGUID(&IID_IDirectInput7A,riid)) {
+
+
+        if (IsEqualGUID(&IID_IDirectInput8A,riid)) {
           This = (IDirectInputAImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputAImpl));
+          This->lpVtbl = &ddi8avt;
           This->ref = 1;
-          ICOM_VTBL(This) = (ICOM_VTABLE(IDirectInputA) *) &ddi7avt;
           *ppDI = This;
-          
+
           return DI_OK;
         }
@@ -105 +135 @@
         );
         This = (IDirectInputAImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDirectInputAImpl));
+        This->lpVtbl = &ddi7avt;
         This->ref = 1;
-        ICOM_VTBL(This) = &ddiavt;
         *ppDI=(IDirectInputA*)This;
         return 0;
+
 }
 /******************************************************************************
@@ -126 +157 @@
         for (i = 0; i < nrof_dinput_devices; i++) {
           if (dinput_devices[i]->enum_device(dwDevType, dwFlags, &devInstance)) {
+            devInstance.dwSize = sizeof(devInstance);
             if (lpCallback(&devInstance,pvRef) == DIENUM_STOP)
               return 0;
           }
         }
-        
+
         return 0;
+}
+
+static HRESULT WINAPI IDirectInputAImpl_QueryInterface(
+        LPDIRECTINPUT7A iface,REFIID riid,LPVOID *ppobj
+) {
+        ICOM_THIS(IDirectInputAImpl,iface);
+
+        TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
+        if (IsEqualGUID(&IID_IUnknown,riid) ||
+            IsEqualGUID(&IID_IDirectInputA,riid) ||
+            IsEqualGUID(&IID_IDirectInput2A,riid) ||
+            IsEqualGUID(&IID_IDirectInput7A,riid)) {
+                IDirectInputA_AddRef(iface);
+                *ppobj = This;
+                return 0;
+        }
+        TRACE("Unsupported interface !\n");
+        return E_FAIL;
 }
 
@@ -157 +207 @@
         HRESULT ret_value = DIERR_DEVICENOTREG;
         int i;
-        
+
         TRACE("(this=%p,%s,%p,%p)\n",This,debugstr_guid(rguid),pdev,punk);
 
@@ -173 +223 @@
 }
 
-static HRESULT WINAPI IDirectInputAImpl_QueryInterface(
-        LPDIRECTINPUT7A iface,REFIID riid,LPVOID *ppobj
-) {
-        ICOM_THIS(IDirectInputAImpl,iface);
-
-        TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
-        if (IsEqualGUID(&IID_IUnknown,riid)) {
-                IDirectInputA_AddRef(iface);
-                *ppobj = This;
-                return 0;
-        }
-        if (IsEqualGUID(&IID_IDirectInputA,riid)) {
-                IDirectInputA_AddRef(iface);
-                *ppobj = This;
-                return 0;
-        }
-        TRACE("Unsupported interface !\n");
-        return E_FAIL;
-}
-
 static HRESULT WINAPI IDirectInputAImpl_Initialize(
         LPDIRECTINPUT7A iface,HINSTANCE hinst,DWORD x
@@ -202 +232 @@
                                                         REFGUID rguid) {
   ICOM_THIS(IDirectInputAImpl,iface);
-  
+
   FIXME("(%p)->(%s): stub\n",This,debugstr_guid(rguid));
-  
+
   return DI_OK;
 }
@@ -213 +243 @@
   ICOM_THIS(IDirectInputAImpl,iface);
   FIXME("(%p)->(%08lx,%08lx): stub\n",This, (DWORD) hwndOwner, dwFlags);
-  
+
   return DI_OK;
 }
 
-static HRESULT WINAPI IDirectInput2AImpl_FindDevice(LPDIRECTINPUT2A iface, REFGUID rguid,
+static HRESULT WINAPI IDirectInput2AImpl_FindDevice(LPDIRECTINPUT7A iface, REFGUID rguid,
                                                     LPCSTR pszName, LPGUID pguidInstance) {
   ICOM_THIS(IDirectInputAImpl,iface);
   FIXME("(%p)->(%s, %s, %p): stub\n", This, debugstr_guid(rguid), pszName, pguidInstance);
-  
+
   return DI_OK;
 }
@@ -231 +261 @@
   HRESULT ret_value = DIERR_DEVICENOTREG;
   int i;
-        
+
   TRACE("(%p)->(%s, %s, %p, %p)\n", This, debugstr_guid(rguid), debugstr_guid(riid), pvOut, lpUnknownOuter);
 
@@ -239 +269 @@
     if ((ret = dinput_devices[i]->create_device(This, rguid, riid, (LPDIRECTINPUTDEVICEA*) pvOut)) == DI_OK)
       return DI_OK;
-    
+
     if (ret == DIERR_NOINTERFACE)
       ret_value = DIERR_NOINTERFACE;
   }
-  
+
   return ret_value;
 }
 
+static HRESULT WINAPI IDirectInput8AImpl_QueryInterface(
+      LPDIRECTINPUT8A iface,REFIID riid,LPVOID *ppobj
+) {
+      ICOM_THIS(IDirectInputAImpl,iface);
+
+      TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(riid),ppobj);
+      if (IsEqualGUID(&IID_IUnknown,riid) ||
+          IsEqualGUID(&IID_IDirectInput8A,riid)) {
+              IDirectInputA_AddRef(iface);
+              *ppobj = This;
+              return 0;
+      }
+      TRACE("Unsupported interface !\n");
+      return E_FAIL;
+}
+
+static HRESULT WINAPI IDirectInput8AImpl_EnumDevicesBySemantics(
+      LPDIRECTINPUT8A iface, LPCSTR ptszUserName, LPDIACTIONFORMATA lpdiActionFormat,
+      LPDIENUMDEVICESBYSEMANTICSCBA lpCallback,
+      LPVOID pvRef, DWORD dwFlags
+)
+{
+      ICOM_THIS(IDirectInputAImpl,iface);
+
+      FIXME("(this=%p,%s,%p,%p,%p,%04lx): stub\n", This, ptszUserName, lpdiActionFormat,
+            lpCallback, pvRef, dwFlags);
+      return 0;
+}
+
+static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices(
+      LPDIRECTINPUT8A iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback,
+      LPDICONFIGUREDEVICESPARAMSA lpdiCDParams, DWORD dwFlags, LPVOID pvRefData
+)
+{
+      ICOM_THIS(IDirectInputAImpl,iface);
+
+      FIXME("(this=%p,%p,%p,%04lx,%p): stub\n", This, lpdiCallback, lpdiCDParams,
+            dwFlags, pvRefData);
+      return 0;
+}
+
 #if !defined(__STRICT_ANSI__) && defined(__GNUC__)
-# define XCAST(fun)     (typeof(ddiavt.fun))
-#else
-# define XCAST(fun)     (void*)
-#endif
-
-static ICOM_VTABLE(IDirectInputA) ddiavt = 
-{
-        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-        XCAST(QueryInterface)IDirectInputAImpl_QueryInterface,
-        XCAST(AddRef)IDirectInputAImpl_AddRef,
-        XCAST(Release)IDirectInputAImpl_Release,
-        XCAST(CreateDevice)IDirectInputAImpl_CreateDevice,
-        XCAST(EnumDevices)IDirectInputAImpl_EnumDevices,
-        XCAST(GetDeviceStatus)IDirectInputAImpl_GetDeviceStatus,
-        XCAST(RunControlPanel)IDirectInputAImpl_RunControlPanel,
-        XCAST(Initialize)IDirectInputAImpl_Initialize
-};
-#undef XCAST
-
-#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
-# define XCAST(fun)     (typeof(ddi7avt.fun))
+# define XCAST(fun)   (typeof(ddi7avt.fun))
 #else
 # define XCAST(fun)     (void*)
@@ -288 +339 @@
 #undef XCAST
 
+#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
+# define XCAST(fun)     (typeof(ddi8avt.fun))
+#else
+# define XCAST(fun)     (void*)
+#endif
+
+static ICOM_VTABLE(IDirectInput8A) ddi8avt = {
+        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+        XCAST(QueryInterface)IDirectInput8AImpl_QueryInterface,
+        XCAST(AddRef)IDirectInputAImpl_AddRef,
+        XCAST(Release)IDirectInputAImpl_Release,
+        XCAST(CreateDevice)IDirectInputAImpl_CreateDevice,
+        XCAST(EnumDevices)IDirectInputAImpl_EnumDevices,
+        XCAST(GetDeviceStatus)IDirectInputAImpl_GetDeviceStatus,
+        XCAST(RunControlPanel)IDirectInputAImpl_RunControlPanel,
+        XCAST(Initialize)IDirectInputAImpl_Initialize,
+        XCAST(FindDevice)IDirectInput2AImpl_FindDevice,
+        IDirectInput8AImpl_EnumDevicesBySemantics,
+        IDirectInput8AImpl_ConfigureDevices
+};
+#undef XCAST
+
 /***********************************************************************
  *              DllCanUnloadNow (DINPUT.@)
@@ -304 +377 @@
                                         LPVOID *ppv)
 {
-    FIXME("(%p, %p, %p): stub\n", debugstr_guid(rclsid), 
+    FIXME("(%p, %p, %p): stub\n", debugstr_guid(rclsid),
           debugstr_guid(riid), ppv);
 

trunk/src/dinput/dinput_private.h

@@ +1 @@
+/*
+ * Copyright 2000 Lionel Ulmer
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 #ifndef __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H
 #define __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H
@@ -9 +27 @@
 struct IDirectInputAImpl
 {
-        ICOM_VFIELD(IDirectInputA);
-        DWORD                   ref;
+   LPVOID lpVtbl;
+   DWORD  ref;
 
-        /* Used to have an unique sequence number for all the events */
-        DWORD evsequence;
+   /* Used to have an unique sequence number for all the events */
+   DWORD evsequence;
 };
 
@@ -19 +37 @@
 typedef struct dinput_device {
   INT pref;
-  BOOL (*enum_device)(DWORD dwDevType, DWORD dwFlags, LPCDIDEVICEINSTANCEA lpddi);
+  BOOL (*enum_device)(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi);
   HRESULT (*create_device)(IDirectInputAImpl *dinput, REFGUID rguid, REFIID riid, LPDIRECTINPUTDEVICEA* pdev);
 } dinput_device;
@@ -25 +43 @@
 extern void dinput_register_device(dinput_device *device) ;
 
+HHOOK keyboard_hook;
+
+LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam );
+
 #endif /* __WINE_DLLS_DINPUT_DINPUT_PRIVATE_H */

trunk/src/dinput/keyboard.c

@@ -3 +3 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 1998,1999 Lionel Ulmer
+ * Copyright 2000-2001 TransGaming Technologies Inc.
  *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 #ifdef HAVE_SYS_ERRNO_H
@@ -19 +35 @@
 #include "dinput_private.h"
 #include "device_private.h"
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(dinput);
-
-static ICOM_VTABLE(IDirectInputDevice2A) SysKeyboardAvt;
-static ICOM_VTABLE(IDirectInputDevice7A) SysKeyboard7Avt;
-     
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
+
+static ICOM_VTABLE(IDirectInputDevice8A) SysKeyboardAvt;
+
 typedef struct SysKeyboardAImpl SysKeyboardAImpl;
 struct SysKeyboardAImpl
 {
-        /* IDirectInputDevice2AImpl */
-        ICOM_VFIELD(IDirectInputDevice2A);
+        LPVOID                          lpVtbl;
         DWORD                           ref;
         GUID                            guid;
 
         IDirectInputAImpl *dinput;
-        
+
+        HANDLE  hEvent;
         /* SysKeyboardAImpl */
-        BYTE                            keystate[256];
         int                             acquired;
+        int                             buffersize;  /* set in 'SetProperty'         */
+        LPDIDEVICEOBJECTDATA            buffer;      /* buffer for 'GetDeviceData'.
+                                                        Alloc at 'Acquire', Free at
+                                                        'Unacquire'                  */
+        int                             count;       /* number of objects in use in
+                                                        'buffer'                     */
+        int                             start;       /* 'buffer' rotates. This is the
+                                                        first in use (if count > 0)  */
+        BOOL                            overflow;    /* return DI_BUFFEROVERFLOW in
+                                                        'GetDeviceData'              */
+        CRITICAL_SECTION                crit;
 };
+
+SysKeyboardAImpl *current; /* Today's acquired device
+FIXME: currently this can be only one.
+Maybe this should be a linked list or st.
+I don't know what the rules are for multiple acquired keyboards,
+but 'DI_LOSTFOCUS' and 'DI_UNACQUIRED' exist for a reason.
+*/
+
+static BYTE DInputKeyState[256]; /* array for 'GetDeviceState' */
+
+HHOOK keyboard_hook;
+
+LRESULT CALLBACK KeyboardCallback( int code, WPARAM wparam, LPARAM lparam )
+{
+  TRACE("(%d,%d,%ld)\n", code, wparam, lparam);
+
+  if (code == HC_ACTION)
+    {
+      BYTE dik_code;
+      BOOL down;
+      DWORD timestamp;
+
+      {
+        KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam;
+        dik_code = hook->scanCode;
+        if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80;
+        down = !(hook->flags & LLKHF_UP);
+        timestamp = hook->time;
+      }
+
+      DInputKeyState[dik_code] = (down ? 0x80 : 0);
+
+      if (current != NULL)
+        {
+          if (current->hEvent)
+            SetEvent(current->hEvent);
+
+          if (current->buffer != NULL)
+            {
+              int n;
+
+              EnterCriticalSection(&(current->crit));
+
+              n = (current->start + current->count) % current->buffersize;
+
+              current->buffer[n].dwOfs = dik_code;
+              current->buffer[n].dwData = down ? 0x80 : 0;
+              current->buffer[n].dwTimeStamp = timestamp;
+              current->buffer[n].dwSequence = current->dinput->evsequence++;
+
+              TRACE("Adding event at offset %d : %ld - %ld - %ld - %ld\n", n,
+                    current->buffer[n].dwOfs, current->buffer[n].dwData, current->buffer[n].dwTimeStamp, current->buffer[n].dwSequence);
+
+              if (current->count == current->buffersize)
+                {
+                  current->start++;
+                  current->overflow = TRUE;
+                }
+              else
+                current->count++;
+
+              LeaveCriticalSection(&(current->crit));
+            }
+        }
+    }
+
+  return CallNextHookEx(keyboard_hook, code, wparam, lparam);
+}
 
 static GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */
@@ -48 +141 @@
 };
 
-static BOOL keyboarddev_enum_device(DWORD dwDevType, DWORD dwFlags, LPCDIDEVICEINSTANCEA lpddi)
+static BOOL keyboarddev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi)
 {
   if ((dwDevType == 0) || (dwDevType == DIDEVTYPE_KEYBOARD)) {
     TRACE("Enumerating the Keyboard device\n");
-    
+
     lpddi->guidInstance = GUID_SysKeyboard;/* DInput's GUID */
     lpddi->guidProduct = DInput_Wine_Keyboard_GUID; /* Vendor's GUID */
@@ -58 +151 @@
     strcpy(lpddi->tszInstanceName, "Keyboard");
     strcpy(lpddi->tszProductName, "Wine Keyboard");
-    
+
     return TRUE;
   }
@@ -65 +158 @@
 }
 
-static SysKeyboardAImpl *alloc_device(REFGUID rguid, ICOM_VTABLE(IDirectInputDevice2A) *kvt, IDirectInputAImpl *dinput)
+static SysKeyboardAImpl *alloc_device(REFGUID rguid, LPVOID kvt, IDirectInputAImpl *dinput)
 {
     SysKeyboardAImpl* newDevice;
     newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysKeyboardAImpl));
+    newDevice->lpVtbl = kvt;
     newDevice->ref = 1;
-    ICOM_VTBL(newDevice) = kvt;
     memcpy(&(newDevice->guid),rguid,sizeof(*rguid));
-    memset(newDevice->keystate,0,256);
     newDevice->dinput = dinput;
 
@@ -83 +175 @@
   if ((IsEqualGUID(&GUID_SysKeyboard,rguid)) ||          /* Generic Keyboard */
       (IsEqualGUID(&DInput_Wine_Keyboard_GUID,rguid))) { /* Wine Keyboard */
-    if ((riid == NULL) || (IsEqualGUID(&IID_IDirectInputDevice2A,riid)) || (IsEqualGUID(&IID_IDirectInputDevice2A,riid))) {
+    if ((riid == NULL) ||
+        IsEqualGUID(&IID_IDirectInputDeviceA,riid) ||
+        IsEqualGUID(&IID_IDirectInputDevice2A,riid) ||
+        IsEqualGUID(&IID_IDirectInputDevice7A,riid) ||
+        IsEqualGUID(&IID_IDirectInputDevice8A,riid)) {
       *pdev=(IDirectInputDeviceA*) alloc_device(rguid, &SysKeyboardAvt, dinput);
-    
       TRACE("Creating a Keyboard device (%p)\n", *pdev);
-      return DI_OK;
-    } else if (IsEqualGUID(&IID_IDirectInputDevice7A,riid)) {
-      *pdev=(IDirectInputDeviceA*) alloc_device(rguid, (ICOM_VTABLE(IDirectInputDevice2A) *) &SysKeyboard7Avt, dinput);
-    
-      TRACE("Creating a Keyboard DInput7A device (%p)\n", *pdev);
       return DI_OK;
     } else
@@ -109 +199 @@
 
 static HRESULT WINAPI SysKeyboardAImpl_SetProperty(
-        LPDIRECTINPUTDEVICE2A iface,REFGUID rguid,LPCDIPROPHEADER ph
+        LPDIRECTINPUTDEVICE8A iface,REFGUID rguid,LPCDIPROPHEADER ph
 )
 {
@@ -123 +213 @@
 
                         TRACE("(buffersize=%ld)\n",pd->dwData);
+
+                        if (This->acquired)
+                           return DIERR_INVALIDPARAM;
+
+                        This->buffersize = pd->dwData;
+
                         break;
                 }
@@ -134 +230 @@
 
 static HRESULT WINAPI SysKeyboardAImpl_GetDeviceState(
-        LPDIRECTINPUTDEVICE2A iface,DWORD len,LPVOID ptr
+        LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr
 )
 {
-    DWORD i;
-
-    memset( ptr, 0, len );
+    /* Note: device does not need to be acquired */
     if (len != 256)
-    {
-        WARN("whoops, got len %ld?\n", len);
-        return DI_OK;
-    }
-    for (i = 0; i < 0x80; i++)
-    {
-        WORD vkey = MapVirtualKeyA( i, 1 );
-        if (vkey && (GetAsyncKeyState( vkey ) & 0x8000))
-        {
-            ((LPBYTE)ptr)[i] = 0x80;
-            ((LPBYTE)ptr)[i | 0x80] = 0x80;
-        }
-    }
+      return DIERR_INVALIDPARAM;
+
+    memcpy(ptr, DInputKeyState, 256);
     return DI_OK;
 }
 
 static HRESULT WINAPI SysKeyboardAImpl_GetDeviceData(
-        LPDIRECTINPUTDEVICE2A iface,DWORD dodsize,LPDIDEVICEOBJECTDATA dod,
+        LPDIRECTINPUTDEVICE8A iface,DWORD dodsize,LPDIDEVICEOBJECTDATA dod,
         LPDWORD entries,DWORD flags
 )
 {
         ICOM_THIS(SysKeyboardAImpl,iface);
-        int i, n;
+        int ret = DI_OK, i = 0;
 
         TRACE("(this=%p,%ld,%p,%p(%ld)),0x%08lx)\n",
               This,dodsize,dod,entries,entries?*entries:0,flags);
 
-
-        for (i = n = 0; (i < 0x80) && (n < *entries); i++)
-        {
-            WORD state, vkey = MapVirtualKeyA( i, 1 );
-            if (!vkey) continue;
-            state = (GetAsyncKeyState( vkey ) >> 8) & 0x80;
-            if (state != This->keystate[vkey])
-            {
-                if (dod)
-                {
-                    /* add an entry */
-                    dod[n].dwOfs       = i; /* scancode */
-                    dod[n].dwData      = state;
-                    dod[n].dwTimeStamp = GetCurrentTime(); /* umm */
-                    dod[n].dwSequence  = This->dinput->evsequence++;
-                    n++;
-                }
-                if (!(flags & DIGDD_PEEK)) This->keystate[vkey] = state;
-            }
-        }
-        if (n) TRACE_(dinput)("%d entries\n",n);
-        *entries = n;
-        return DI_OK;
-}
-
-static HRESULT WINAPI SysKeyboardAImpl_Acquire(LPDIRECTINPUTDEVICE2A iface)
+        if (This->acquired == 0)
+          return DIERR_NOTACQUIRED;
+
+        if (This->buffer == NULL)
+          return DIERR_NOTBUFFERED;
+
+        if (dodsize < sizeof(*dod))
+          return DIERR_INVALIDPARAM;
+
+        EnterCriticalSection(&(This->crit));
+
+        /* Copy item at a time for the case dodsize > sizeof(buffer[n]) */
+        while ((i < *entries || *entries == INFINITE) && i < This->count)
+          {
+            if (dod != NULL)
+              {
+                int n = (This->start + i) % This->buffersize;
+                LPDIDEVICEOBJECTDATA pd
+                   = (LPDIDEVICEOBJECTDATA)((BYTE *)dod + dodsize * i);
+                pd->dwOfs       = This->buffer[n].dwOfs;
+                pd->dwData      = This->buffer[n].dwData;
+                pd->dwTimeStamp = This->buffer[n].dwTimeStamp;
+                pd->dwSequence  = This->buffer[n].dwSequence;
+              }
+            i++;
+          }
+
+        *entries = i;
+
+        if (This->overflow)
+          ret = DI_BUFFEROVERFLOW;
+
+        if (!(flags & DIGDD_PEEK))
+          {
+            /* Empty buffer */
+            This->count -= i;
+            This->start = (This->start + i) % This->buffersize;
+            This->overflow = FALSE;
+          }
+
+        LeaveCriticalSection(&(This->crit));
+
+        TRACE("Returning %ld events queued\n", *entries);
+
+        return ret;
+}
+
+static HRESULT WINAPI SysKeyboardAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface);
+
+static HRESULT WINAPI SysKeyboardAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
 {
         ICOM_THIS(SysKeyboardAImpl,iface);
-        
+
         TRACE("(this=%p)\n",This);
-        
-        if (This->acquired == 0) {
-          This->acquired = 1;
-        }
-        
+
+        if (This->acquired)
+          return S_FALSE;
+
+        This->acquired = 1;
+
+        if (current != NULL)
+          {
+            FIXME("Not more than one keyboard can be acquired at the same time.\n");
+            SysKeyboardAImpl_Unacquire(iface);
+          }
+
+        current = This;
+
+        if (This->buffersize > 0)
+          {
+            This->buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+                                     This->buffersize * sizeof(*(This->buffer)));
+            This->start = 0;
+            This->count = 0;
+            This->overflow = FALSE;
+            InitializeCriticalSection(&(This->crit));
+          }
+        else
+          This->buffer = NULL;
+
         return DI_OK;
 }
 
-static HRESULT WINAPI SysKeyboardAImpl_Unacquire(LPDIRECTINPUTDEVICE2A iface)
+static HRESULT WINAPI SysKeyboardAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
 {
         ICOM_THIS(SysKeyboardAImpl,iface);
         TRACE("(this=%p)\n",This);
 
-        if (This->acquired == 1) {
-          This->acquired = 0;
-        } else {
-          ERR("Unacquiring a not-acquired device !!!\n");
-        }
+        if (This->acquired == 0)
+          return DI_NOEFFECT;
+
+        if (current == This)
+          current = NULL;
+        else
+          ERR("this != current\n");
+
+        This->acquired = 0;
+
+        if (This->buffersize >= 0)
+          {
+            HeapFree(GetProcessHeap(), 0, This->buffer);
+            This->buffer = NULL;
+            DeleteCriticalSection(&(This->crit));
+          }
 
         return DI_OK;
+}
+
+static HRESULT WINAPI SysKeyboardAImpl_SetEventNotification(LPDIRECTINPUTDEVICE8A iface,
+                                                            HANDLE hnd) {
+  ICOM_THIS(SysKeyboardAImpl,iface);
+
+  TRACE("(this=%p,0x%08lx)\n",This,(DWORD)hnd);
+
+  This->hEvent = hnd;
+  return DI_OK;
 }
 
@@ -224 +374 @@
   */
 static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIDEVCAPS lpDIDevCaps)
 {
@@ -246 +396 @@
     FIXME("DirectX 3.0 not supported....\n");
   }
-  
+
   return DI_OK;
 }
 
-static ICOM_VTABLE(IDirectInputDevice2A) SysKeyboardAvt = 
+static ICOM_VTABLE(IDirectInputDevice8A) SysKeyboardAvt =
 {
         ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
@@ -265 +415 @@
         SysKeyboardAImpl_GetDeviceData,
         IDirectInputDevice2AImpl_SetDataFormat,
-        IDirectInputDevice2AImpl_SetEventNotification,
+        SysKeyboardAImpl_SetEventNotification,
         IDirectInputDevice2AImpl_SetCooperativeLevel,
         IDirectInputDevice2AImpl_GetObjectInfo,
@@ -279 +429 @@
         IDirectInputDevice2AImpl_Escape,
         IDirectInputDevice2AImpl_Poll,
-        IDirectInputDevice2AImpl_SendDeviceData
+        IDirectInputDevice2AImpl_SendDeviceData,
+        IDirectInputDevice7AImpl_EnumEffectsInFile,
+        IDirectInputDevice7AImpl_WriteEffectToFile,
+        IDirectInputDevice8AImpl_BuildActionMap,
+        IDirectInputDevice8AImpl_SetActionMap,
+        IDirectInputDevice8AImpl_GetImageInfo
 };
-
-#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
-# define XCAST(fun)     (typeof(SysKeyboard7Avt.fun))
-#else
-# define XCAST(fun)     (void*)
-#endif
-
-static ICOM_VTABLE(IDirectInputDevice7A) SysKeyboard7Avt = 
-{
-        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-        XCAST(QueryInterface)IDirectInputDevice2AImpl_QueryInterface,
-        XCAST(AddRef)IDirectInputDevice2AImpl_AddRef,
-        XCAST(Release)IDirectInputDevice2AImpl_Release,
-        XCAST(GetCapabilities)SysKeyboardAImpl_GetCapabilities,
-        XCAST(EnumObjects)IDirectInputDevice2AImpl_EnumObjects,
-        XCAST(GetProperty)IDirectInputDevice2AImpl_GetProperty,
-        XCAST(SetProperty)SysKeyboardAImpl_SetProperty,
-        XCAST(Acquire)SysKeyboardAImpl_Acquire,
-        XCAST(Unacquire)SysKeyboardAImpl_Unacquire,
-        XCAST(GetDeviceState)SysKeyboardAImpl_GetDeviceState,
-        XCAST(GetDeviceData)SysKeyboardAImpl_GetDeviceData,
-        XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat,
-        XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification,
-        XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel,
-        XCAST(GetObjectInfo)IDirectInputDevice2AImpl_GetObjectInfo,
-        XCAST(GetDeviceInfo)IDirectInputDevice2AImpl_GetDeviceInfo,
-        XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel,
-        XCAST(Initialize)IDirectInputDevice2AImpl_Initialize,
-        XCAST(CreateEffect)IDirectInputDevice2AImpl_CreateEffect,
-        XCAST(EnumEffects)IDirectInputDevice2AImpl_EnumEffects,
-        XCAST(GetEffectInfo)IDirectInputDevice2AImpl_GetEffectInfo,
-        XCAST(GetForceFeedbackState)IDirectInputDevice2AImpl_GetForceFeedbackState,
-        XCAST(SendForceFeedbackCommand)IDirectInputDevice2AImpl_SendForceFeedbackCommand,
-        XCAST(EnumCreatedEffectObjects)IDirectInputDevice2AImpl_EnumCreatedEffectObjects,
-        XCAST(Escape)IDirectInputDevice2AImpl_Escape,
-        XCAST(Poll)IDirectInputDevice2AImpl_Poll,
-        XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData,
-        IDirectInputDevice7AImpl_EnumEffectsInFile,
-        IDirectInputDevice7AImpl_WriteEffectToFile
-};
-
-#undef XCAST

trunk/src/dinput/mouse.c

@@ -3 +3 @@
  * Copyright 1998 Marcus Meissner
  * Copyright 1998,1999 Lionel Ulmer
+ * Copyright 2000-2001 TransGaming Technologies Inc.
  *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 #ifdef HAVE_SYS_ERRNO_H
@@ -20 +36 @@
 #include "dinput_private.h"
 #include "device_private.h"
-#include "debugtools.h"
+#include "wine/debug.h"
 
 #define MOUSE_HACK
 
-DEFAULT_DEBUG_CHANNEL(dinput);
+WINE_DEFAULT_DEBUG_CHANNEL(dinput);
 
 /* Wine mouse driver object instances */
 #define WINE_MOUSE_X_AXIS_INSTANCE 0x0001
 #define WINE_MOUSE_Y_AXIS_INSTANCE 0x0002
-#define WINE_MOUSE_L_BUTTON_INSTANCE 0x0004
-#define WINE_MOUSE_R_BUTTON_INSTANCE 0x0008
-#define WINE_MOUSE_M_BUTTON_INSTANCE 0x0010
+#define WINE_MOUSE_Z_AXIS_INSTANCE 0x0004
+#define WINE_MOUSE_L_BUTTON_INSTANCE 0x0008
+#define WINE_MOUSE_R_BUTTON_INSTANCE 0x0010
+#define WINE_MOUSE_M_BUTTON_INSTANCE 0x0020
 
 /* ------------------------------- */
@@ -40 +57 @@
 #define WINE_MOUSE_X_POSITION 0
 #define WINE_MOUSE_Y_POSITION 1
-#define WINE_MOUSE_L_POSITION 2
-#define WINE_MOUSE_R_POSITION 3
-#define WINE_MOUSE_M_POSITION 4
+#define WINE_MOUSE_Z_POSITION 2
+#define WINE_MOUSE_L_POSITION 3
+#define WINE_MOUSE_R_POSITION 4
+#define WINE_MOUSE_M_POSITION 5
 
 typedef struct {
   LONG lX;
   LONG lY;
+  LONG lZ;
   BYTE rgbButtons[4];
 } Wine_InternalMouseData;
 
-#define WINE_INTERNALMOUSE_NUM_OBJS 5
+#define WINE_INTERNALMOUSE_NUM_OBJS 6
 
 static DIOBJECTDATAFORMAT Wine_InternalMouseObjectFormat[WINE_INTERNALMOUSE_NUM_OBJS] = {
@@ -57 +76 @@
   { &GUID_YAxis,   FIELD_OFFSET(Wine_InternalMouseData, lY),
       DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS, 0 },
+  { &GUID_ZAxis,   FIELD_OFFSET(Wine_InternalMouseData, lZ),
+      DIDFT_MAKEINSTANCE(WINE_MOUSE_Z_AXIS_INSTANCE) | DIDFT_RELAXIS, 0 },
   { &GUID_Button, (FIELD_OFFSET(Wine_InternalMouseData, rgbButtons)) + 0,
       DIDFT_MAKEINSTANCE(WINE_MOUSE_L_BUTTON_INSTANCE) | DIDFT_PSHBUTTON, 0 },
@@ -74 +95 @@
 };
 
-static ICOM_VTABLE(IDirectInputDevice2A) SysMouseAvt;
-static ICOM_VTABLE(IDirectInputDevice7A) SysMouse7Avt;
+static ICOM_VTABLE(IDirectInputDevice8A) SysMouseAvt;
 typedef struct SysMouseAImpl SysMouseAImpl;
 
@@ -86 +106 @@
 struct SysMouseAImpl
 {
-        /* IDirectInputDevice2AImpl */
-        ICOM_VFIELD(IDirectInputDevice2A);
+        LPVOID                          lpVtbl;
         DWORD                           ref;
         GUID                            guid;
 
         IDirectInputAImpl *dinput;
-        
+
         /* The current data format and the conversion between internal
            and external data formats */
         LPDIDATAFORMAT                  df;
         DataFormat                     *wine_df;
-        int                             offset_array[5];
-        
+        int                             offset_array[WINE_INTERNALMOUSE_NUM_OBJS];
+
         /* SysMouseAImpl */
         BYTE                            absolute;
@@ -133 +152 @@
 
 /* FIXME: This is ugly and not thread safe :/ */
-static IDirectInputDevice2A* current_lock = NULL;
-
-
-static BOOL mousedev_enum_device(DWORD dwDevType, DWORD dwFlags, LPCDIDEVICEINSTANCEA lpddi)
+static IDirectInputDevice8A* current_lock = NULL;
+
+
+static BOOL mousedev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi)
 {
   if ((dwDevType == 0) || (dwDevType == DIDEVTYPE_MOUSE)) {
@@ -154 +173 @@
 }
 
-static SysMouseAImpl *alloc_device(REFGUID rguid, ICOM_VTABLE(IDirectInputDevice2A) *mvt, IDirectInputAImpl *dinput)
-{
-    int offset_array[5] = {
+static SysMouseAImpl *alloc_device(REFGUID rguid, LPVOID mvt, IDirectInputAImpl *dinput)
+{
+    int offset_array[WINE_INTERNALMOUSE_NUM_OBJS] = {
       FIELD_OFFSET(Wine_InternalMouseData, lX),
       FIELD_OFFSET(Wine_InternalMouseData, lY),
+      FIELD_OFFSET(Wine_InternalMouseData, lZ),
       FIELD_OFFSET(Wine_InternalMouseData, rgbButtons) + 0,
       FIELD_OFFSET(Wine_InternalMouseData, rgbButtons) + 1,
@@ -166 +186 @@
     newDevice = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(SysMouseAImpl));
     newDevice->ref = 1;
-    ICOM_VTBL(newDevice) = mvt;
+    newDevice->lpVtbl = mvt;
     InitializeCriticalSection(&(newDevice->crit));
     memcpy(&(newDevice->guid),rguid,sizeof(*rguid));
-    
+
     /* Per default, Wine uses its internal data format */
     newDevice->df = &Wine_InternalMouseFormat;
-    memcpy(newDevice->offset_array, offset_array, 5 * sizeof(int));
+    memcpy(newDevice->offset_array, offset_array, WINE_INTERNALMOUSE_NUM_OBJS * sizeof(int));
     newDevice->wine_df = (DataFormat *) HeapAlloc(GetProcessHeap(), 0, sizeof(DataFormat));
     newDevice->wine_df->size = 0;
@@ -186 +206 @@
   if ((IsEqualGUID(&GUID_SysMouse,rguid)) ||             /* Generic Mouse */
       (IsEqualGUID(&DInput_Wine_Mouse_GUID,rguid))) { /* Wine Mouse */
-    if ((riid == NULL) || (IsEqualGUID(&IID_IDirectInputDevice2A,riid)) || (IsEqualGUID(&IID_IDirectInputDevice2A,riid))) {
+    if ((riid == NULL) ||
+        IsEqualGUID(&IID_IDirectInputDeviceA,riid) ||
+        IsEqualGUID(&IID_IDirectInputDevice2A,riid) ||
+        IsEqualGUID(&IID_IDirectInputDevice7A,riid) ||
+        IsEqualGUID(&IID_IDirectInputDevice8A,riid)) {
       *pdev=(IDirectInputDeviceA*) alloc_device(rguid, &SysMouseAvt, dinput);
-    
       TRACE("Creating a Mouse device (%p)\n", *pdev);
-      return DI_OK;
-    }else if (IsEqualGUID(&IID_IDirectInputDevice7A,riid)) {
-      *pdev=(IDirectInputDeviceA*) alloc_device(rguid, (ICOM_VTABLE(IDirectInputDevice2A) *) &SysMouse7Avt, dinput);
-    
-      TRACE("Creating a Mouse DInput7A device (%p)\n", *pdev);
       return DI_OK;
     } else
@@ -218 +236 @@
   *     Release : release the mouse buffer.
   */
-static ULONG WINAPI SysMouseAImpl_Release(LPDIRECTINPUTDEVICE2A iface)
+static ULONG WINAPI SysMouseAImpl_Release(LPDIRECTINPUTDEVICE8A iface)
 {
         ICOM_THIS(SysMouseAImpl,iface);
@@ -234 +252 @@
           HeapFree(GetProcessHeap(),0,This->data_queue);
 
-        if (This->hook) UnhookWindowsHookEx( This->hook );
+        if (This->hook) {
+          UnhookWindowsHookEx( This->hook );
+          if (This->dwCoopLevel & DISCL_EXCLUSIVE)
+            ShowCursor(TRUE); /* show cursor */
+        }
         DeleteCriticalSection(&(This->crit));
 
@@ -242 +264 @@
           HeapFree(GetProcessHeap(), 0, This->df);
         }
-        
+
         HeapFree(GetProcessHeap(),0,This);
         return 0;
@@ -253 +275 @@
   */
 static HRESULT WINAPI SysMouseAImpl_SetCooperativeLevel(
-        LPDIRECTINPUTDEVICE2A iface,HWND hwnd,DWORD dwflags
+        LPDIRECTINPUTDEVICE8A iface,HWND hwnd,DWORD dwflags
 )
 {
@@ -268 +290 @@
   This->win = hwnd;
   This->dwCoopLevel = dwflags;
-  
+
   return 0;
 }
@@ -281 +303 @@
   */
 static HRESULT WINAPI SysMouseAImpl_SetDataFormat(
-        LPDIRECTINPUTDEVICE2A iface,LPCDIDATAFORMAT df
+        LPDIRECTINPUTDEVICE8A iface,LPCDIDATAFORMAT df
 )
 {
   ICOM_THIS(SysMouseAImpl,iface);
   int i;
-  
+
   TRACE("(this=%p,%p)\n",This,df);
 
@@ -319 +341 @@
   /* Prepare all the data-conversion filters */
   This->wine_df = create_DataFormat(&(Wine_InternalMouseFormat), df, This->offset_array);
-  
+
   return 0;
 }
-  
+
 /* low-level mouse hook */
 #ifdef __WIN32OS2__
@@ -335 +357 @@
     SysMouseAImpl* This = (SysMouseAImpl*) current_lock;
 #endif
-
-//testestest
+    DWORD dwCoop;
+    static long last_event = 0;
+    int wdata;
+
+#ifdef __WIN32OS2__
     dprintf(("dinput_mouse_hook %d %x %x", code, wparam, lparam));
+#endif
 
     if (code != HC_ACTION) return CallNextHookEx( This->hook, code, wparam, lparam );
 
     EnterCriticalSection(&(This->crit));
+    dwCoop = This->dwCoopLevel;
+
+#ifndef __WIN32OS2__
+    /* Only allow mouse events every 10 ms.
+     * This is to allow the cursor to start acceleration before
+     * the warps happen. But if it involves a mouse button event we
+     * allow it since we dont want to loose the clicks.
+     */
+    if (((GetCurrentTime() - last_event) < 10)
+        && wparam == WM_MOUSEMOVE)
+      goto end;
+    else last_event = GetCurrentTime();
+#endif
+
     /* Mouse moved -> send event if asked */
     if (This->hEvent)
@@ -350 +390 @@
       if(hook->flags != LLMHF_INJECTED)
 #endif
-      if(hook->dwExtraInfo != 666) 
         if (This->absolute) {
           if (hook->pt.x != This->prevX)
@@ -364 +403 @@
             goto end;
           }
-                  
+
           /* Relative mouse input with absolute mouse event : the real fun starts here... */
           if ((This->need_warp == WARP_NEEDED) ||
@@ -379 +418 @@
               This->need_warp = WARP_NEEDED;
             }
-            
+
             if (hook->pt.y != This->mapped_center.y) {
               GEN_EVENT(This->offset_array[WINE_MOUSE_Y_POSITION], hook->pt.y - This->mapped_center.y, hook->time, (This->dinput->evsequence)++);
@@ -389 +428 @@
         This->prevX = hook->pt.x;
         This->prevY = hook->pt.y;
-        
+
         if (This->absolute) {
           This->m_state.lX = hook->pt.x;
@@ -434 +473 @@
         This->m_state.rgbButtons[2] = 0x00;
         break;
+    case WM_MOUSEWHEEL:
+        wdata = (short)HIWORD(hook->mouseData);
+        GEN_EVENT(This->offset_array[WINE_MOUSE_Z_POSITION], wdata,
+                  hook->time, This->dinput->evsequence++);
+        This->m_state.lZ += wdata;
+        break;
     }
 
@@ -441 +486 @@
 
 end:
-  if (This->dwCoopLevel & DISCL_NONEXCLUSIVE)
+  LeaveCriticalSection(&(This->crit));
+
+  if (dwCoop & DISCL_NONEXCLUSIVE)
   { /* pass the events down to previous handlers (e.g. win32 input) */
       ret = CallNextHookEx( This->hook, code, wparam, lparam );
   }
   else ret = 1;  /* ignore message */
-  LeaveCriticalSection(&(This->crit));
   return ret;
 }
 
 
+static void dinput_window_check(SysMouseAImpl* This)
+{
+  RECT rect;
+  DWORD centerX, centerY;
+
+  /* make sure the window hasn't moved */
+  GetWindowRect(This->win, &rect);
+  centerX = (rect.right  - rect.left) / 2;
+  centerY = (rect.bottom - rect.top ) / 2;
+  if (This->win_centerX != centerX || This->win_centerY != centerY) {
+    This->win_centerX = centerX;
+    This->win_centerY = centerY;
+  }
+  This->mapped_center.x = This->win_centerX;
+  This->mapped_center.y = This->win_centerY;
+  MapWindowPoints(This->win, HWND_DESKTOP, &This->mapped_center, 1);
+}
+
+
 /******************************************************************************
   *     Acquire : gets exclusive control of the mouse
   */
-static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE2A iface)
+static HRESULT WINAPI SysMouseAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
 {
   ICOM_THIS(SysMouseAImpl,iface);
@@ -464 +529 @@
   TRACE("(this=%p)\n",This);
 #endif
+
   if (This->acquired == 0) {
     POINT point;
 
     /* Store (in a global variable) the current lock */
-    current_lock = (IDirectInputDevice2A*)This;
+    current_lock = (IDirectInputDevice8A*)This;
 
     /* Init the mouse state */
@@ -481 +547 @@
       This->m_state.lY = 0;
     }
+    This->m_state.lZ = 0;
     This->m_state.rgbButtons[0] = (GetKeyState(VK_LBUTTON) ? 0xFF : 0x00);
     This->m_state.rgbButtons[1] = (GetKeyState(VK_MBUTTON) ? 0xFF : 0x00);
@@ -486 +553 @@
 
     /* Install our mouse hook */
+    if (This->dwCoopLevel & DISCL_EXCLUSIVE)
+      ShowCursor(FALSE); /* hide cursor */
+
 #ifdef __WIN32OS2__
     /* push ebp */
@@ -524 +594 @@
       This->mapped_center.y = This->win_centerY;
       MapWindowPoints(This->win, HWND_DESKTOP, &This->mapped_center, 1);
-      TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y); 
+      TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y);
       SetCursorPos( This->mapped_center.x, This->mapped_center.y );
 #ifdef MOUSE_HACK
@@ -533 +603 @@
     }
 #endif
+
     This->acquired = 1;
-  }
-  return DI_OK;
+    return DI_OK;
+  }
+  return S_FALSE;
 }
 
@@ -541 +613 @@
   *     Unacquire : frees the mouse
   */
-static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE2A iface)
+static HRESULT WINAPI SysMouseAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
 {
     ICOM_THIS(SysMouseAImpl,iface);
@@ -550 +622 @@
     TRACE("(this=%p)\n",This);
 #endif
-
     if (This->acquired)
     {
         /* Reinstall previous mouse event handler */
-        if (This->hook) UnhookWindowsHookEx( This->hook );
-        This->hook = 0;
+        if (This->hook) {
+          UnhookWindowsHookEx( This->hook );
+          This->hook = 0;
+          if (This->dwCoopLevel & DISCL_EXCLUSIVE)
+            ShowCursor(TRUE); /* show cursor */
+        }
 
         /* No more locks */
@@ -565 +640 @@
     else
         ERR("Unacquiring a not-acquired device !!!\n");
-  
+
     return DI_OK;
 }
@@ -576 +651 @@
   */
 static HRESULT WINAPI SysMouseAImpl_GetDeviceState(
-        LPDIRECTINPUTDEVICE2A iface,DWORD len,LPVOID ptr
+        LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr
 ) {
   ICOM_THIS(SysMouseAImpl,iface);
-  
+
+#ifdef __WIN32OS2__
+  /* mouse state may have changed since last hook call; update it first */
+  POINT point;
+  GetCursorPos(&point);
+
+  if(point.x != This->prevX || point.y != This->prevY) {
+      MSLLHOOKSTRUCT hook;
+
+      //Note: this is not entirely correct (should use HOOK_CallHooksW)
+      hook.pt.x        = point.x;
+      hook.pt.y        = point.y;
+      hook.mouseData   = 0;
+      hook.flags       = 0;
+      hook.time        = GetCurrentTime();
+      hook.dwExtraInfo = 0;
+
+      dinput_mouse_hook(This, HC_ACTION, WM_MOUSEMOVE, (LPARAM)&hook );
+  }
+#endif
+
   EnterCriticalSection(&(This->crit));
   TRACE("(this=%p,0x%08lx,%p): \n",This,len,ptr);
-  
+
   /* Copy the current mouse state */
   fill_DataFormat(ptr, &(This->m_state), This->wine_df);
-  
+
   /* Initialize the buffer when in relative mode */
   if (This->absolute == 0) {
     This->m_state.lX = 0;
     This->m_state.lY = 0;
+    This->m_state.lZ = 0;
   }
 
@@ -596 +692 @@
   /* Check if we need to do a mouse warping */
   if (This->need_warp == WARP_NEEDED) {
-    This->mapped_center.x = This->win_centerX;
-    This->mapped_center.y = This->win_centerY;
-    MapWindowPoints(This->win, HWND_DESKTOP, &This->mapped_center, 1);
-    TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y); 
+    dinput_window_check(This);
+    TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y);
     SetCursorPos( This->mapped_center.x, This->mapped_center.y );
 
@@ -609 +703 @@
   }
 #endif
-
   LeaveCriticalSection(&(This->crit));
-  
+
   TRACE("(X: %ld - Y: %ld   L: %02x M: %02x R: %02x)\n",
         This->m_state.lX, This->m_state.lY,
         This->m_state.rgbButtons[0], This->m_state.rgbButtons[2], This->m_state.rgbButtons[1]);
-  
+
   return 0;
 }
@@ -622 +715 @@
   *     GetDeviceState : gets buffered input data.
   */
-static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE2A iface,
+static HRESULT WINAPI SysMouseAImpl_GetDeviceData(LPDIRECTINPUTDEVICE8A iface,
                                               DWORD dodsize,
                                               LPDIDEVICEOBJECTDATA dod,
@@ -630 +723 @@
   ICOM_THIS(SysMouseAImpl,iface);
   DWORD len, nqtail;
-  
+
   EnterCriticalSection(&(This->crit));
   TRACE("(%p)->(dods=%ld,entries=%ld,fl=0x%08lx)\n",This,dodsize,*entries,flags);
@@ -639 +732 @@
 
   if (dod == NULL) {
+    if (len)
+        TRACE("Application discarding %ld event(s).\n", len);
+
     *entries = len;
     nqtail = This->queue_tail + len;
     while (nqtail >= This->queue_len) nqtail -= This->queue_len;
   } else {
-    if (dodsize != sizeof(DIDEVICEOBJECTDATA)) {
+    if (dodsize < sizeof(DIDEVICEOBJECTDATA)) {
       ERR("Wrong structure size !\n");
       LeaveCriticalSection(&(This->crit));
@@ -650 +746 @@
 
     if (len)
-        TRACE("Application retrieving %ld event(s).\n", len); 
+        TRACE("Application retrieving %ld event(s).\n", len);
 
     *entries = 0;
@@ -676 +772 @@
   /* Check if we need to do a mouse warping */
   if (This->need_warp == WARP_NEEDED) {
-    This->mapped_center.x = This->win_centerX;
-    This->mapped_center.y = This->win_centerY;
-    MapWindowPoints(This->win, HWND_DESKTOP, &This->mapped_center, 1);
-    TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y); 
+    dinput_window_check(This);
+    TRACE("Warping mouse to %ld - %ld\n", This->mapped_center.x, This->mapped_center.y);
     SetCursorPos( This->mapped_center.x, This->mapped_center.y );
 
@@ -695 +789 @@
   *     SetProperty : change input device properties
   */
-static HRESULT WINAPI SysMouseAImpl_SetProperty(LPDIRECTINPUTDEVICE2A iface,
+static HRESULT WINAPI SysMouseAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
                                             REFGUID rguid,
                                             LPCDIPROPHEADER ph)
@@ -702 +796 @@
 
   TRACE("(this=%p,%s,%p)\n",This,debugstr_guid(rguid),ph);
-  
+
   if (!HIWORD(rguid)) {
     switch ((DWORD)rguid) {
     case (DWORD) DIPROP_BUFFERSIZE: {
       LPCDIPROPDWORD    pd = (LPCDIPROPDWORD)ph;
-      
+
       TRACE("buffersize = %ld\n",pd->dwData);
 
@@ -728 +822 @@
     }
   }
-  
+
   return 0;
 }
@@ -735 +829 @@
   *     GetProperty : get input device properties
   */
-static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE2A iface,
+static HRESULT WINAPI SysMouseAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
                                                 REFGUID rguid,
                                                 LPDIPROPHEADER pdiph)
@@ -746 +840 @@
   if (TRACE_ON(dinput))
     _dump_DIPROPHEADER(pdiph);
-  
+
   if (!HIWORD(rguid)) {
     switch ((DWORD)rguid) {
     case (DWORD) DIPROP_BUFFERSIZE: {
       LPDIPROPDWORD     pd = (LPDIPROPDWORD)pdiph;
-      
+
       TRACE(" return buffersize = %d\n",This->queue_len);
       pd->dwData = This->queue_len;
+      break;
+    }
+
+    case (DWORD) DIPROP_GRANULARITY: {
+      LPDIPROPDWORD pr = (LPDIPROPDWORD) pdiph;
+
+      /* We'll just assume that the app asks about the Z axis */
+      pr->dwData = WHEEL_DELTA;
+
       break;
     }
@@ -769 +872 @@
         pr->lMax = DIPROPRANGE_NOMAX;
       }
-      
+
       break;
     }
-      
+
     default:
       FIXME("Unknown type %ld (%s)\n",(DWORD)rguid,debugstr_guid(rguid));
@@ -778 +881 @@
     }
   }
-  
-  
+
+
   return DI_OK;
 }
@@ -788 +891 @@
   *     SetEventNotification : specifies event to be sent on state change
   */
-static HRESULT WINAPI SysMouseAImpl_SetEventNotification(LPDIRECTINPUTDEVICE2A iface,
+static HRESULT WINAPI SysMouseAImpl_SetEventNotification(LPDIRECTINPUTDEVICE8A iface,
                                                          HANDLE hnd) {
   ICOM_THIS(SysMouseAImpl,iface);
@@ -803 +906 @@
   */
 static HRESULT WINAPI SysMouseAImpl_GetCapabilities(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIDEVCAPS lpDIDevCaps)
 {
@@ -813 +916 @@
     lpDIDevCaps->dwFlags = DIDC_ATTACHED;
     lpDIDevCaps->dwDevType = DIDEVTYPE_MOUSE;
-    lpDIDevCaps->dwAxes = 2;
+    lpDIDevCaps->dwAxes = 3;
     lpDIDevCaps->dwButtons = 3;
     lpDIDevCaps->dwPOVs = 0;
@@ -825 +928 @@
     FIXME("DirectX 3.0 not supported....\n");
   }
-  
+
   return DI_OK;
 }
@@ -834 +937 @@
   */
 static HRESULT WINAPI SysMouseAImpl_EnumObjects(
-        LPDIRECTINPUTDEVICE2A iface,
+        LPDIRECTINPUTDEVICE8A iface,
         LPDIENUMDEVICEOBJECTSCALLBACKA lpCallback,
         LPVOID lpvRef,
@@ -841 +944 @@
   ICOM_THIS(SysMouseAImpl,iface);
   DIDEVICEOBJECTINSTANCEA ddoi;
-  
+
   TRACE("(this=%p,%p,%p,%08lx)\n", This, lpCallback, lpvRef, dwFlags);
   if (TRACE_ON(dinput)) {
@@ -851 +954 @@
   /* Only the fields till dwFFMaxForce are relevant */
   ddoi.dwSize = FIELD_OFFSET(DIDEVICEOBJECTINSTANCEA, dwFFMaxForce);
-    
+
   /* In a mouse, we have : two relative axis and three buttons */
   if ((dwFlags == DIDFT_ALL) ||
@@ -862 +965 @@
     _dump_OBJECTINSTANCEA(&ddoi);
     if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK;
-    
+
     /* Y axis */
     ddoi.guidType = GUID_YAxis;
@@ -870 +973 @@
     _dump_OBJECTINSTANCEA(&ddoi);
     if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK;
+
+    /* Z axis */
+    ddoi.guidType = GUID_ZAxis;
+    ddoi.dwOfs = This->offset_array[WINE_MOUSE_Z_POSITION];
+    ddoi.dwType = DIDFT_MAKEINSTANCE(WINE_MOUSE_Z_AXIS_INSTANCE) | DIDFT_RELAXIS;
+    strcpy(ddoi.tszName, "Z-Axis");
+    _dump_OBJECTINSTANCEA(&ddoi);
+    if (lpCallback(&ddoi, lpvRef) != DIENUM_CONTINUE) return DI_OK;
   }
 
@@ -902 +1013 @@
 
 
-static ICOM_VTABLE(IDirectInputDevice2A) SysMouseAvt = 
+static ICOM_VTABLE(IDirectInputDevice8A) SysMouseAvt =
 {
         ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
@@ -932 +1043 @@
         IDirectInputDevice2AImpl_Poll,
         IDirectInputDevice2AImpl_SendDeviceData,
+        IDirectInputDevice7AImpl_EnumEffectsInFile,
+        IDirectInputDevice7AImpl_WriteEffectToFile,
+        IDirectInputDevice8AImpl_BuildActionMap,
+        IDirectInputDevice8AImpl_SetActionMap,
+        IDirectInputDevice8AImpl_GetImageInfo
 };
-
-#if !defined(__STRICT_ANSI__) && defined(__GNUC__)
-# define XCAST(fun)     (typeof(SysMouse7Avt.fun))
-#else
-# define XCAST(fun)     (void*)
-#endif
-
-static ICOM_VTABLE(IDirectInputDevice7A) SysMouse7Avt = 
-{
-        ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-        XCAST(QueryInterface)IDirectInputDevice2AImpl_QueryInterface,
-        XCAST(AddRef)IDirectInputDevice2AImpl_AddRef,
-        XCAST(Release)SysMouseAImpl_Release,
-        XCAST(GetCapabilities)SysMouseAImpl_GetCapabilities,
-        XCAST(EnumObjects)SysMouseAImpl_EnumObjects,
-        XCAST(GetProperty)SysMouseAImpl_GetProperty,
-        XCAST(SetProperty)SysMouseAImpl_SetProperty,
-        XCAST(Acquire)SysMouseAImpl_Acquire,
-        XCAST(Unacquire)SysMouseAImpl_Unacquire,
-        XCAST(GetDeviceState)SysMouseAImpl_GetDeviceState,
-        XCAST(GetDeviceData)SysMouseAImpl_GetDeviceData,
-        XCAST(SetDataFormat)SysMouseAImpl_SetDataFormat,
-        XCAST(SetEventNotification)SysMouseAImpl_SetEventNotification,
-        XCAST(SetCooperativeLevel)SysMouseAImpl_SetCooperativeLevel,
-        XCAST(GetObjectInfo)IDirectInputDevice2AImpl_GetObjectInfo,
-        XCAST(GetDeviceInfo)IDirectInputDevice2AImpl_GetDeviceInfo,
-        XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel,
-        XCAST(Initialize)IDirectInputDevice2AImpl_Initialize,
-        XCAST(CreateEffect)IDirectInputDevice2AImpl_CreateEffect,
-        XCAST(EnumEffects)IDirectInputDevice2AImpl_EnumEffects,
-        XCAST(GetEffectInfo)IDirectInputDevice2AImpl_GetEffectInfo,
-        XCAST(GetForceFeedbackState)IDirectInputDevice2AImpl_GetForceFeedbackState,
-        XCAST(SendForceFeedbackCommand)IDirectInputDevice2AImpl_SendForceFeedbackCommand,
-        XCAST(EnumCreatedEffectObjects)IDirectInputDevice2AImpl_EnumCreatedEffectObjects,
-        XCAST(Escape)IDirectInputDevice2AImpl_Escape,
-        XCAST(Poll)IDirectInputDevice2AImpl_Poll,
-        XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData,
-        IDirectInputDevice7AImpl_EnumEffectsInFile,
-        IDirectInputDevice7AImpl_WriteEffectToFile
-};
-
-#undef XCAST