[PATCH 5/6] dinput: Implement IDirectInputDevice_EnumEffectsInFile WtoA conversion.

Rémi Bernon rbernon at codeweavers.com
Wed May 26 04:23:07 CDT 2021


Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/dinput/ansi.c   | 13 +++++++++++++
 dlls/dinput/device.c | 12 ------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c
index eb331891f25..05fc42440d7 100644
--- a/dlls/dinput/ansi.c
+++ b/dlls/dinput/ansi.c
@@ -305,3 +305,16 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SendDeviceData( IDirectInputDevice8A *if
     IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl );
     return IDirectInputDevice8_SendDeviceData( iface_w, count, data, inout, flags );
 }
+
+HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile( IDirectInputDevice8A *iface_a, const char *filename_a, LPDIENUMEFFECTSINFILECALLBACK callback,
+                                                           void *ref, DWORD flags )
+{
+    IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a );
+    IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl );
+    WCHAR buffer[MAX_PATH], *filename_w = buffer;
+
+    if (!filename_a) filename_w = NULL;
+    else MultiByteToWideChar( CP_ACP, 0, filename_a, -1, buffer, MAX_PATH );
+
+    return IDirectInputDevice8_EnumEffectsInFile( iface_w, filename_w, callback, ref, flags );
+}
diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index abdb235c097..fe9510d539d 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -1658,18 +1658,6 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData(LPDIRECTINPUTDEVICE8W ifa
     return DI_OK;
 }
 
-HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8A iface,
-							  LPCSTR lpszFileName,
-							  LPDIENUMEFFECTSINFILECALLBACK pec,
-							  LPVOID pvRef,
-							  DWORD dwFlags)
-{
-    IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface);
-    FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", This, lpszFileName, pec, pvRef, dwFlags);
-    
-    return DI_OK;
-}
-
 HRESULT WINAPI IDirectInputDevice7WImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8W iface,
 							  LPCWSTR lpszFileName,
 							  LPDIENUMEFFECTSINFILECALLBACK pec,
-- 
2.31.0




More information about the wine-devel mailing list