dinput: Fix name clashes

Andrew Talbot andrew.talbot at talbotville.com
Thu May 29 12:36:13 CDT 2008


Both joystick_input.c and joystick_linuxinput.c have a "struct JoystickImpl",
so this patch renames the one - and its functions - in the latter file.

-- Andy.
---
Changelog:
    dinput: Fix name clashes.

diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c
index 13bc1fb..e108b2d 100644
--- a/dlls/dinput/joystick_linuxinput.c
+++ b/dlls/dinput/joystick_linuxinput.c
@@ -151,7 +151,7 @@ HRESULT linuxinput_create_effect(int* fd, REFGUID rguid, LPDIRECTINPUTEFFECT* pe
 HRESULT linuxinput_get_info_A(int fd, REFGUID rguid, LPDIEFFECTINFOA info);
 HRESULT linuxinput_get_info_W(int fd, REFGUID rguid, LPDIEFFECTINFOW info);
 
-typedef struct JoystickImpl JoystickImpl;
+typedef struct JoystickInputImpl JoystickInputImpl;
 static const IDirectInputDevice8AVtbl JoystickAvt;
 static const IDirectInputDevice8WVtbl JoystickWvt;
 
@@ -173,7 +173,7 @@ struct JoyDev {
         struct wine_input_absinfo       axes[ABS_MAX];
 };
 
-struct JoystickImpl
+struct JoystickInputImpl
 {
         struct IDirectInputDevice2AImpl base;
 
@@ -201,7 +201,7 @@ struct JoystickImpl
 	int				ff_state;
 };
 
-static void fake_current_js_state(JoystickImpl *ji);
+static void fake_current_js_state(JoystickInputImpl *ji);
 static void find_joydevs(void);
 
 /* This GUID is slightly different from the linux joystick one. Take note. */
@@ -420,16 +420,16 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN
   return FALSE;
 }
 
-static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, unsigned short index)
+static JoystickInputImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *dinput, unsigned short index)
 {
-    JoystickImpl* newDevice;
+    JoystickInputImpl* newDevice;
     LPDIDATAFORMAT df = NULL;
     int i, idx = 0;
     char buffer[MAX_PATH+16];
     HKEY hkey, appkey;
     LONG def_deadzone = 0;
 
-    newDevice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(JoystickImpl));
+    newDevice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(JoystickInputImpl));
     if (!newDevice) return NULL;
 
     newDevice->base.lpVtbl = jvt;
@@ -442,7 +442,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm
     newDevice->ff_state    = FF_STATUS_STOPPED;
 #endif
     InitializeCriticalSection(&newDevice->base.crit);
-    newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->base.crit");
+    newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickInputImpl*->base.crit");
 
     /* get options */
     get_app_key(&hkey, &appkey);
@@ -616,9 +616,9 @@ const struct dinput_device joystick_linuxinput_device = {
 /******************************************************************************
   *     Acquire : gets exclusive control of the joystick
   */
-static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
+static HRESULT WINAPI JoystickInputAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
 {
-    JoystickImpl *This = (JoystickImpl *)iface;
+    JoystickInputImpl *This = (JoystickInputImpl *)iface;
     HRESULT res;
 
     TRACE("(this=%p)\n",This);
@@ -644,9 +644,9 @@ static HRESULT WINAPI JoystickAImpl_Acquire(LPDIRECTINPUTDEVICE8A iface)
 /******************************************************************************
   *     Unacquire : frees the joystick
   */
-static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
+static HRESULT WINAPI JoystickInputAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
 {
-    JoystickImpl *This = (JoystickImpl *)iface;
+    JoystickInputImpl *This = (JoystickInputImpl *)iface;
     HRESULT res;
 
     TRACE("(this=%p)\n",This);
@@ -665,7 +665,7 @@ static HRESULT WINAPI JoystickAImpl_Unacquire(LPDIRECTINPUTDEVICE8A iface)
 #define CENTER_AXIS(a) \
     (ji->axes[a] == -1 ? 0 : joystick_map_axis( &ji->props[ji->axes[a]], \
                                                 ji->joydev->axes[a].value ))
-static void fake_current_js_state(JoystickImpl *ji)
+static void fake_current_js_state(JoystickInputImpl *ji)
 {
     int i;
 
@@ -686,7 +686,7 @@ static void fake_current_js_state(JoystickImpl *ji)
 #undef CENTER_AXIS
 
 /* convert wine format offset to user format object index */
-static void joy_polldev(JoystickImpl *This)
+static void joy_polldev(JoystickInputImpl *This)
 {
     struct pollfd plfd;
     struct input_event ie;
@@ -785,10 +785,10 @@ static void joy_polldev(JoystickImpl *This)
   *     GetDeviceState : returns the "state" of the joystick.
   *
   */
-static HRESULT WINAPI JoystickAImpl_GetDeviceState(
+static HRESULT WINAPI JoystickInputAImpl_GetDeviceState(
 	LPDIRECTINPUTDEVICE8A iface,DWORD len,LPVOID ptr
 ) {
-    JoystickImpl *This = (JoystickImpl *)iface;
+    JoystickInputImpl *This = (JoystickInputImpl *)iface;
 
     TRACE("(this=%p,0x%08x,%p)\n", This, len, ptr);
 
@@ -809,11 +809,11 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceState(
 /******************************************************************************
   *     SetProperty : change input device properties
   */
-static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
+static HRESULT WINAPI JoystickInputAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
 					    REFGUID rguid,
 					    LPCDIPROPHEADER ph)
 {
-  JoystickImpl *This = (JoystickImpl *)iface;
+  JoystickInputImpl *This = (JoystickInputImpl *)iface;
 
   if (!ph) {
     WARN("invalid argument\n");
@@ -891,11 +891,11 @@ static HRESULT WINAPI JoystickAImpl_SetProperty(LPDIRECTINPUTDEVICE8A iface,
   return DI_OK;
 }
 
-static HRESULT WINAPI JoystickAImpl_GetCapabilities(
+static HRESULT WINAPI JoystickInputAImpl_GetCapabilities(
 	LPDIRECTINPUTDEVICE8A iface,
 	LPDIDEVCAPS lpDIDevCaps)
 {
-    JoystickImpl *This = (JoystickImpl *)iface;
+    JoystickInputImpl *This = (JoystickInputImpl *)iface;
 
     TRACE("%p->(%p)\n",iface,lpDIDevCaps);
 
@@ -925,9 +925,9 @@ static HRESULT WINAPI JoystickAImpl_GetCapabilities(
     return DI_OK;
 }
 
-static HRESULT WINAPI JoystickAImpl_Poll(LPDIRECTINPUTDEVICE8A iface)
+static HRESULT WINAPI JoystickInputAImpl_Poll(LPDIRECTINPUTDEVICE8A iface)
 {
-    JoystickImpl *This = (JoystickImpl *)iface;
+    JoystickInputImpl *This = (JoystickInputImpl *)iface;
 
     TRACE("(%p)\n",This);
 
@@ -941,11 +941,11 @@ static HRESULT WINAPI JoystickAImpl_Poll(LPDIRECTINPUTDEVICE8A iface)
 /******************************************************************************
   *     GetProperty : get input device properties
   */
-static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
+static HRESULT WINAPI JoystickInputAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
 						REFGUID rguid,
 						LPDIPROPHEADER pdiph)
 {
-    JoystickImpl *This = (JoystickImpl *)iface;
+    JoystickInputImpl *This = (JoystickInputImpl *)iface;
 
     TRACE("(this=%p,%s,%p)\n", iface, debugstr_guid(rguid), pdiph);
     _dump_DIPROPHEADER(pdiph);
@@ -988,7 +988,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
   *     GetObjectInfo : get information about a device object such as a button
   *                     or axis
   */
-static HRESULT WINAPI JoystickWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface,
+static HRESULT WINAPI JoystickInputWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface,
         LPDIDEVICEOBJECTINSTANCEW pdidoi, DWORD dwObj, DWORD dwHow)
 {
     static const WCHAR axisW[] = {'A','x','i','s',' ','%','d',0};
@@ -1010,7 +1010,7 @@ static HRESULT WINAPI JoystickWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface,
     return res;
 }
 
-static HRESULT WINAPI JoystickAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface,
+static HRESULT WINAPI JoystickInputAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface,
         LPDIDEVICEOBJECTINSTANCEA pdidoi, DWORD dwObj, DWORD dwHow)
 {
     HRESULT res;
@@ -1018,7 +1018,7 @@ static HRESULT WINAPI JoystickAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface,
     DWORD dwSize = pdidoi->dwSize;
 
     didoiW.dwSize = sizeof(didoiW);
-    res = JoystickWImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface, &didoiW, dwObj, dwHow);
+    res = JoystickInputWImpl_GetObjectInfo((LPDIRECTINPUTDEVICE8W)iface, &didoiW, dwObj, dwHow);
     if (res != DI_OK) return res;
 
     memset(pdidoi, 0, pdidoi->dwSize);
@@ -1033,7 +1033,7 @@ static HRESULT WINAPI JoystickAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface,
 /****************************************************************************** 
   *	CreateEffect - Create a new FF effect with the specified params
   */
-static HRESULT WINAPI JoystickAImpl_CreateEffect(LPDIRECTINPUTDEVICE8A iface,
+static HRESULT WINAPI JoystickInputAImpl_CreateEffect(LPDIRECTINPUTDEVICE8A iface,
 						 REFGUID rguid,
 						 LPCDIEFFECT lpeff,
 						 LPDIRECTINPUTEFFECT *ppdef,
@@ -1044,7 +1044,7 @@ static HRESULT WINAPI JoystickAImpl_CreateEffect(LPDIRECTINPUTDEVICE8A iface,
     HRESULT retval = DI_OK;
 #endif
 
-    JoystickImpl* This = (JoystickImpl*)iface;
+    JoystickInputImpl* This = (JoystickInputImpl*)iface;
     TRACE("(this=%p,%p,%p,%p,%p)\n", This, rguid, lpeff, ppdef, pUnkOuter);
 
 #ifndef HAVE_STRUCT_FF_EFFECT_DIRECTION
@@ -1079,7 +1079,7 @@ static HRESULT WINAPI JoystickAImpl_CreateEffect(LPDIRECTINPUTDEVICE8A iface,
 /*******************************************************************************
  *	EnumEffects - Enumerate available FF effects
  */
-static HRESULT WINAPI JoystickAImpl_EnumEffects(LPDIRECTINPUTDEVICE8A iface,
+static HRESULT WINAPI JoystickInputAImpl_EnumEffects(LPDIRECTINPUTDEVICE8A iface,
 						LPDIENUMEFFECTSCALLBACKA lpCallback,
 						LPVOID pvRef,
 						DWORD dwEffType)
@@ -1087,7 +1087,7 @@ static HRESULT WINAPI JoystickAImpl_EnumEffects(LPDIRECTINPUTDEVICE8A iface,
 #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION
     DIEFFECTINFOA dei; /* feif */
     DWORD type = DIEFT_GETTYPE(dwEffType);
-    JoystickImpl* This = (JoystickImpl*)iface;
+    JoystickInputImpl* This = (JoystickInputImpl*)iface;
 
     TRACE("(this=%p,%p,%d) type=%d\n", This, pvRef, dwEffType, type);
 
@@ -1153,7 +1153,7 @@ static HRESULT WINAPI JoystickAImpl_EnumEffects(LPDIRECTINPUTDEVICE8A iface,
     return DI_OK;
 }
 
-static HRESULT WINAPI JoystickWImpl_EnumEffects(LPDIRECTINPUTDEVICE8W iface,
+static HRESULT WINAPI JoystickInputWImpl_EnumEffects(LPDIRECTINPUTDEVICE8W iface,
                                                 LPDIENUMEFFECTSCALLBACKW lpCallback,
                                                 LPVOID pvRef,
                                                 DWORD dwEffType)
@@ -1163,7 +1163,7 @@ static HRESULT WINAPI JoystickWImpl_EnumEffects(LPDIRECTINPUTDEVICE8W iface,
      * are actually different (A/W) */
     DIEFFECTINFOW dei; /* feif */
     DWORD type = DIEFT_GETTYPE(dwEffType);
-    JoystickImpl* This = (JoystickImpl*)iface;
+    JoystickInputImpl* This = (JoystickInputImpl*)iface;
     int xfd = This->joyfd;
 
     TRACE("(this=%p,%p,%d) type=%d fd=%d\n", This, pvRef, dwEffType, type, xfd);
@@ -1236,11 +1236,11 @@ static HRESULT WINAPI JoystickWImpl_EnumEffects(LPDIRECTINPUTDEVICE8W iface,
 /*******************************************************************************
  *      GetEffectInfo - Get information about a particular effect 
  */
-static HRESULT WINAPI JoystickAImpl_GetEffectInfo(LPDIRECTINPUTDEVICE8A iface,
+static HRESULT WINAPI JoystickInputAImpl_GetEffectInfo(LPDIRECTINPUTDEVICE8A iface,
 						  LPDIEFFECTINFOA pdei,
 						  REFGUID guid)
 {
-    JoystickImpl* This = (JoystickImpl*)iface;
+    JoystickInputImpl* This = (JoystickInputImpl*)iface;
 
     TRACE("(this=%p,%p,%s)\n", This, pdei, _dump_dinput_GUID(guid));
 
@@ -1251,14 +1251,14 @@ static HRESULT WINAPI JoystickAImpl_GetEffectInfo(LPDIRECTINPUTDEVICE8A iface,
 #endif
 }
 
-static HRESULT WINAPI JoystickWImpl_GetEffectInfo(LPDIRECTINPUTDEVICE8W iface,
+static HRESULT WINAPI JoystickInputWImpl_GetEffectInfo(LPDIRECTINPUTDEVICE8W iface,
                                                   LPDIEFFECTINFOW pdei,
                                                   REFGUID guid)
 {
-    JoystickImpl* This = (JoystickImpl*)iface;
-            
+    JoystickInputImpl* This = (JoystickInputImpl*)iface;
+
     TRACE("(this=%p,%p,%s)\n", This, pdei, _dump_dinput_GUID(guid));
-        
+
 #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION
     return linuxinput_get_info_W(This->joyfd, guid, pdei);
 #else
@@ -1269,11 +1269,11 @@ static HRESULT WINAPI JoystickWImpl_GetEffectInfo(LPDIRECTINPUTDEVICE8W iface,
 /*******************************************************************************
  *      GetForceFeedbackState - Get information about the device's FF state 
  */
-static HRESULT WINAPI JoystickAImpl_GetForceFeedbackState(
+static HRESULT WINAPI JoystickInputAImpl_GetForceFeedbackState(
 	LPDIRECTINPUTDEVICE8A iface,
 	LPDWORD pdwOut)
 {
-    JoystickImpl* This = (JoystickImpl*)iface;
+    JoystickInputImpl* This = (JoystickInputImpl*)iface;
 
     TRACE("(this=%p,%p)\n", This, pdwOut);
 
@@ -1291,11 +1291,11 @@ static HRESULT WINAPI JoystickAImpl_GetForceFeedbackState(
 /*******************************************************************************
  *      SendForceFeedbackCommand - Send a command to the device's FF system
  */
-static HRESULT WINAPI JoystickAImpl_SendForceFeedbackCommand(
+static HRESULT WINAPI JoystickInputAImpl_SendForceFeedbackCommand(
 	LPDIRECTINPUTDEVICE8A iface,
 	DWORD dwFlags)
 {
-    JoystickImpl* This = (JoystickImpl*)iface;
+    JoystickInputImpl* This = (JoystickInputImpl*)iface;
     TRACE("(this=%p,%d)\n", This, dwFlags);
 
 #ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION
@@ -1336,7 +1336,7 @@ static HRESULT WINAPI JoystickAImpl_SendForceFeedbackCommand(
  *      EnumCreatedEffectObjects - Enumerate all the effects that have been
  *		created for this device.
  */
-static HRESULT WINAPI JoystickAImpl_EnumCreatedEffectObjects(
+static HRESULT WINAPI JoystickInputAImpl_EnumCreatedEffectObjects(
 	LPDIRECTINPUTDEVICE8A iface,
 	LPDIENUMCREATEDEFFECTOBJECTSCALLBACK lpCallback,
 	LPVOID pvRef,
@@ -1344,7 +1344,7 @@ static HRESULT WINAPI JoystickAImpl_EnumCreatedEffectObjects(
 {
     /* this function is safe to call on non-ff-enabled builds */
 
-    JoystickImpl* This = (JoystickImpl*)iface;
+    JoystickInputImpl* This = (JoystickInputImpl*)iface;
     EffectListItem* itr = This->top_effect;
     TRACE("(this=%p,%p,%p,%d)\n", This, lpCallback, pvRef, dwFlags);
 
@@ -1365,10 +1365,10 @@ static HRESULT WINAPI JoystickAImpl_EnumCreatedEffectObjects(
 /******************************************************************************
   *     GetDeviceInfo : get information about a device's identity
   */
-static HRESULT WINAPI JoystickAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A iface,
+static HRESULT WINAPI JoystickInputAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A iface,
                                                   LPDIDEVICEINSTANCEA pdidi)
 {
-    JoystickImpl *This = (JoystickImpl *)iface;
+    JoystickInputImpl *This = (JoystickInputImpl *)iface;
 
     TRACE("(%p) %p\n", This, pdidi);
 
@@ -1382,10 +1382,10 @@ static HRESULT WINAPI JoystickAImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8A iface,
     return DI_OK;
 }
 
-static HRESULT WINAPI JoystickWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface,
+static HRESULT WINAPI JoystickInputWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface,
                                                   LPDIDEVICEINSTANCEW pdidi)
 {
-    JoystickImpl *This = (JoystickImpl *)iface;
+    JoystickInputImpl *This = (JoystickInputImpl *)iface;
 
     TRACE("(%p) %p\n", This, pdidi);
 
@@ -1404,29 +1404,29 @@ static const IDirectInputDevice8AVtbl JoystickAvt =
 	IDirectInputDevice2AImpl_QueryInterface,
 	IDirectInputDevice2AImpl_AddRef,
         IDirectInputDevice2AImpl_Release,
-	JoystickAImpl_GetCapabilities,
+	JoystickInputAImpl_GetCapabilities,
         IDirectInputDevice2AImpl_EnumObjects,
-	JoystickAImpl_GetProperty,
-	JoystickAImpl_SetProperty,
-	JoystickAImpl_Acquire,
-	JoystickAImpl_Unacquire,
-	JoystickAImpl_GetDeviceState,
+	JoystickInputAImpl_GetProperty,
+	JoystickInputAImpl_SetProperty,
+	JoystickInputAImpl_Acquire,
+	JoystickInputAImpl_Unacquire,
+	JoystickInputAImpl_GetDeviceState,
 	IDirectInputDevice2AImpl_GetDeviceData,
         IDirectInputDevice2AImpl_SetDataFormat,
 	IDirectInputDevice2AImpl_SetEventNotification,
 	IDirectInputDevice2AImpl_SetCooperativeLevel,
-        JoystickAImpl_GetObjectInfo,
-	JoystickAImpl_GetDeviceInfo,
+        JoystickInputAImpl_GetObjectInfo,
+	JoystickInputAImpl_GetDeviceInfo,
 	IDirectInputDevice2AImpl_RunControlPanel,
 	IDirectInputDevice2AImpl_Initialize,
-	JoystickAImpl_CreateEffect,
-	JoystickAImpl_EnumEffects,
-	JoystickAImpl_GetEffectInfo,
-	JoystickAImpl_GetForceFeedbackState,
-	JoystickAImpl_SendForceFeedbackCommand,
-	JoystickAImpl_EnumCreatedEffectObjects,
+	JoystickInputAImpl_CreateEffect,
+	JoystickInputAImpl_EnumEffects,
+	JoystickInputAImpl_GetEffectInfo,
+	JoystickInputAImpl_GetForceFeedbackState,
+	JoystickInputAImpl_SendForceFeedbackCommand,
+	JoystickInputAImpl_EnumCreatedEffectObjects,
 	IDirectInputDevice2AImpl_Escape,
-	JoystickAImpl_Poll,
+	JoystickInputAImpl_Poll,
 	IDirectInputDevice2AImpl_SendDeviceData,
 	IDirectInputDevice7AImpl_EnumEffectsInFile,
         IDirectInputDevice7AImpl_WriteEffectToFile,
@@ -1446,29 +1446,29 @@ static const IDirectInputDevice8WVtbl JoystickWvt =
 	IDirectInputDevice2WImpl_QueryInterface,
 	XCAST(AddRef)IDirectInputDevice2AImpl_AddRef,
         XCAST(Release)IDirectInputDevice2AImpl_Release,
-	XCAST(GetCapabilities)JoystickAImpl_GetCapabilities,
+	XCAST(GetCapabilities)JoystickInputAImpl_GetCapabilities,
         IDirectInputDevice2WImpl_EnumObjects,
-	XCAST(GetProperty)JoystickAImpl_GetProperty,
-	XCAST(SetProperty)JoystickAImpl_SetProperty,
-	XCAST(Acquire)JoystickAImpl_Acquire,
-	XCAST(Unacquire)JoystickAImpl_Unacquire,
-	XCAST(GetDeviceState)JoystickAImpl_GetDeviceState,
+	XCAST(GetProperty)JoystickInputAImpl_GetProperty,
+	XCAST(SetProperty)JoystickInputAImpl_SetProperty,
+	XCAST(Acquire)JoystickInputAImpl_Acquire,
+	XCAST(Unacquire)JoystickInputAImpl_Unacquire,
+	XCAST(GetDeviceState)JoystickInputAImpl_GetDeviceState,
 	XCAST(GetDeviceData)IDirectInputDevice2AImpl_GetDeviceData,
         XCAST(SetDataFormat)IDirectInputDevice2AImpl_SetDataFormat,
 	XCAST(SetEventNotification)IDirectInputDevice2AImpl_SetEventNotification,
 	XCAST(SetCooperativeLevel)IDirectInputDevice2AImpl_SetCooperativeLevel,
-        JoystickWImpl_GetObjectInfo,
-	JoystickWImpl_GetDeviceInfo,
+        JoystickInputWImpl_GetObjectInfo,
+	JoystickInputWImpl_GetDeviceInfo,
 	XCAST(RunControlPanel)IDirectInputDevice2AImpl_RunControlPanel,
 	XCAST(Initialize)IDirectInputDevice2AImpl_Initialize,
-	XCAST(CreateEffect)JoystickAImpl_CreateEffect,
-	JoystickWImpl_EnumEffects,
-	JoystickWImpl_GetEffectInfo,
-	XCAST(GetForceFeedbackState)JoystickAImpl_GetForceFeedbackState,
-	XCAST(SendForceFeedbackCommand)JoystickAImpl_SendForceFeedbackCommand,
-	XCAST(EnumCreatedEffectObjects)JoystickAImpl_EnumCreatedEffectObjects,
+	XCAST(CreateEffect)JoystickInputAImpl_CreateEffect,
+	JoystickInputWImpl_EnumEffects,
+	JoystickInputWImpl_GetEffectInfo,
+	XCAST(GetForceFeedbackState)JoystickInputAImpl_GetForceFeedbackState,
+	XCAST(SendForceFeedbackCommand)JoystickInputAImpl_SendForceFeedbackCommand,
+	XCAST(EnumCreatedEffectObjects)JoystickInputAImpl_EnumCreatedEffectObjects,
 	XCAST(Escape)IDirectInputDevice2AImpl_Escape,
-	XCAST(Poll)JoystickAImpl_Poll,
+	XCAST(Poll)JoystickInputAImpl_Poll,
 	XCAST(SendDeviceData)IDirectInputDevice2AImpl_SendDeviceData,
         IDirectInputDevice7WImpl_EnumEffectsInFile,
         IDirectInputDevice7WImpl_WriteEffectToFile,



More information about the wine-patches mailing list