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

Timestamp:

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

Author:

sandervl

Message:

Wine resync; added missing bugfix

File:

• trunk/src/dinput/dinput_main.c (modified) (15 diffs)

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);