Zebediah Figura : dinput: Rename dinput_device_init() to dinput_device_init_device_format().

Alexandre Julliard julliard at winehq.org
Mon May 16 15:37:58 CDT 2022


Module: wine
Branch: master
Commit: dd5f3b6fc1b3dc16242b1e84ec62445561645668
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=dd5f3b6fc1b3dc16242b1e84ec62445561645668

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Mon May 16 11:50:41 2022 +0200

dinput: Rename dinput_device_init() to dinput_device_init_device_format().

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dinput/device.c         | 2 +-
 dlls/dinput/device_private.h | 2 +-
 dlls/dinput/dinput_main.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index bd2064b1484..6636eae0e42 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -2220,7 +2220,7 @@ static BOOL CALLBACK enum_objects_init( const DIDEVICEOBJECTINSTANCEW *instance,
     return DIENUM_CONTINUE;
 }
 
-HRESULT dinput_device_init( IDirectInputDevice8W *iface )
+HRESULT dinput_device_init_device_format( IDirectInputDevice8W *iface )
 {
     struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface );
     DIDATAFORMAT *format = &impl->device_format;
diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h
index f23542a660c..772c5d35786 100644
--- a/dlls/dinput/device_private.h
+++ b/dlls/dinput/device_private.h
@@ -125,7 +125,7 @@ struct dinput_device
 
 extern HRESULT dinput_device_alloc( SIZE_T size, const struct dinput_device_vtbl *vtbl, const GUID *guid,
                                     struct dinput *dinput, void **out ) DECLSPEC_HIDDEN;
-extern HRESULT dinput_device_init( IDirectInputDevice8W *iface );
+extern HRESULT dinput_device_init_device_format( IDirectInputDevice8W *iface );
 extern void dinput_device_destroy( IDirectInputDevice8W *iface );
 
 extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN;
diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c
index 41e143ad43c..9738397ef5a 100644
--- a/dlls/dinput/dinput_main.c
+++ b/dlls/dinput/dinput_main.c
@@ -546,7 +546,7 @@ static HRESULT WINAPI dinput7_CreateDeviceEx( IDirectInput7W *iface, const GUID
 
     if (FAILED(hr)) return hr;
 
-    if (FAILED(hr = dinput_device_init( device )))
+    if (FAILED(hr = dinput_device_init_device_format( device )))
     {
         IDirectInputDevice8_Release( device );
         return hr;




More information about the wine-cvs mailing list