dinput: Remove IDirectInputDevice8AImpl_{Build,Set}ActionMap() as it is unused.

Francois Gouget fgouget at free.fr
Mon Aug 1 08:51:24 CDT 2011


The current pattern is for the device-specific Ansi version to first call the Unicode one, and only then call the generic version. So the generic Ansi version is not needed.
---

Note that these functions were used, but not anymore.

 dlls/dinput/device.c         |   37 -------------------------------------
 dlls/dinput/device_private.h |    8 --------
 2 files changed, 0 insertions(+), 45 deletions(-)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 58d4e14..fa079a6 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -1424,22 +1424,6 @@ HRESULT WINAPI IDirectInputDevice7WImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8W
     return DI_OK;
 }
 
-HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface,
-						       LPDIACTIONFORMATA lpdiaf,
-						       LPCSTR lpszUserName,
-						       DWORD dwFlags)
-{
-    FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, lpszUserName, dwFlags);
-#define X(x) if (dwFlags & x) FIXME("\tdwFlags =|"#x"\n");
-	X(DIDBAM_DEFAULT)
-	X(DIDBAM_PRESERVE)
-	X(DIDBAM_INITIALIZE)
-	X(DIDBAM_HWDEFAULTS)
-#undef X
-    _dump_diactionformatA(lpdiaf);
-    return DI_OK;
-}
-
 HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface,
 						       LPDIACTIONFORMATW lpdiaf,
 						       LPCWSTR lpszUserName,
@@ -1456,27 +1440,6 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa
     return DI_OK;
 }
 
-HRESULT WINAPI IDirectInputDevice8AImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
-						     LPDIACTIONFORMATA lpdiaf,
-						     LPCSTR lpszUserName,
-						     DWORD dwFlags)
-{
-    IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface);
-    DIACTIONFORMATW diafW;
-    HRESULT hr;
-
-    FIXME("(%p)->(%p,%s,%08x): semi-stub !\n", iface, lpdiaf, lpszUserName, dwFlags);
-
-    diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiaf->dwNumActions);
-    _copy_diactionformatAtoW(&diafW, lpdiaf);
-
-    hr = IDirectInputDevice8WImpl_SetActionMap(&This->IDirectInputDevice8W_iface, &diafW, NULL, dwFlags);
-
-    HeapFree(GetProcessHeap(), 0, diafW.rgoAction);
-
-    return hr;
-}
-
 HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface,
 						     LPDIACTIONFORMATW lpdiaf,
 						     LPCWSTR lpszUserName,
diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
index 6c061b2..e8fe00a 100644
--- a/dlls/dinput/device_private.h
+++ b/dlls/dinput/device_private.h
@@ -237,18 +237,10 @@ extern HRESULT WINAPI IDirectInputDevice7WImpl_WriteEffectToFile(LPDIRECTINPUTDE
 								 DWORD dwEntries,
 								 LPDIFILEEFFECT rgDiFileEft,
 								 DWORD dwFlags)  DECLSPEC_HIDDEN;
-extern HRESULT WINAPI IDirectInputDevice8AImpl_BuildActionMap(LPDIRECTINPUTDEVICE8A iface,
-							      LPDIACTIONFORMATA lpdiaf,
-							      LPCSTR lpszUserName,
-							      DWORD dwFlags) DECLSPEC_HIDDEN;
 extern HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface,
 							      LPDIACTIONFORMATW lpdiaf,
 							      LPCWSTR lpszUserName,
 							      DWORD dwFlags) DECLSPEC_HIDDEN;
-extern HRESULT WINAPI IDirectInputDevice8AImpl_SetActionMap(LPDIRECTINPUTDEVICE8A iface,
-							    LPDIACTIONFORMATA lpdiaf,
-							    LPCSTR lpszUserName,
-							    DWORD dwFlags) DECLSPEC_HIDDEN;
 extern HRESULT WINAPI IDirectInputDevice8WImpl_SetActionMap(LPDIRECTINPUTDEVICE8W iface,
 							    LPDIACTIONFORMATW lpdiaf,
 							    LPCWSTR lpszUserName,
-- 
1.7.5.4




More information about the wine-patches mailing list