Changeset 9016 for trunk/src/dinput/keyboard.c

Timestamp:

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

Author:

sandervl

Message:

Wine resync; added missing bugfix

File:

• trunk/src/dinput/keyboard.c (modified) (13 diffs)

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