dinput: IDirectInputDevice8WImpl_SetActionMap() is redundant so remove it.

Francois Gouget fgouget at free.fr
Sat Feb 28 11:30:07 CST 2015


---

All the actual implementations do their own tracing and then call 
_set_action_map() which calls IDirectInputDevice8WImpl_SetActionMap(). 
So given that the latter was only doing a bit of generic tracing it was 
really not useful. Also the naming of _set_action_map() feels less 
confusing than IDirectInputDevice8WImpl_SetActionMap() given that it's 
not part of an actual IDirectInputDevice8W implementation.


 dlls/dinput/device.c         | 12 +-----------
 dlls/dinput/device_private.h |  4 ----
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 08ebfd7..ab43029 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -866,7 +866,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L
     /* Save the settings to disk */
     save_mapping_settings(iface, lpdiaf, username);
 
-    return IDirectInputDevice8WImpl_SetActionMap(iface, lpdiaf, lpszUserName, dwFlags);
+    return DI_OK;
 }
 
 /******************************************************************************
@@ -1719,16 +1719,6 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa
     return DI_OK;
 }
 
-HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface,
-                                                     LPDIACTIONFORMATW lpdiaf,
-                                                     LPCWSTR lpszUserName,
-                                                     DWORD dwFlags)
-{
-    FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, debugstr_w(lpszUserName), dwFlags);
-
-    return DI_OK;
-}
-
 HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface,
 						     LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader)
 {
diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
index 660ebd7..52bbec4 100644
--- a/dlls/dinput/device_private.h
+++ b/dlls/dinput/device_private.h
@@ -243,10 +243,6 @@ extern HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVIC
 							      LPDIACTIONFORMATW lpdiaf,
 							      LPCWSTR lpszUserName,
 							      DWORD dwFlags) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface,
-							    LPDIACTIONFORMATW lpdiaf,
-							    LPCWSTR lpszUserName,
-							    DWORD dwFlags) DECLSPEC_HIDDEN;
 extern HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface,
 							    LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader) DECLSPEC_HIDDEN;
 extern HRESULT WINAPI IDirectInputDevice8WImpl_GetImageInfo(LPDIRECTINPUTDEVICE8W iface,
-- 
2.1.4



More information about the wine-patches mailing list