Francois Gouget : dinput: IDirectInputDevice8WImpl_SetActionMap() is redundant so remove it.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Mar 2 08:51:50 CST 2015
Module: wine
Branch: master
Commit: 128a86f0b0b3bd76eb887174cc1a748a33e0ed03
URL: http://source.winehq.org/git/wine.git/?a=commit;h=128a86f0b0b3bd76eb887174cc1a748a33e0ed03
Author: Francois Gouget <fgouget at free.fr>
Date: Sat Feb 28 18:30:07 2015 +0100
dinput: IDirectInputDevice8WImpl_SetActionMap() is redundant so remove it.
---
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,
More information about the wine-cvs
mailing list