[PATCH 0/5] MR2020: dinput: Some cleanup before fixing its background thread.

List overview All Threads

newer

older

[PATCH v8 0/3] MR1578: ntdll:...

[PATCH 0/5] MR2014: win32u: Make...

Rémi Bernon (＠rbernon)

25 Jan 2023 25 Jan '23

8:48 a.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2020

Show replies by date

Rémi Bernon

25 Jan 25 Jan

8:48 a.m.

New subject: [PATCH 1/5] dinput: Remove outdated and superfluous comments.

From: Rémi Bernon rbernon@codeweavers.com

--- dlls/dinput/device.c | 42 ------------------------------------ dlls/dinput/device_private.h | 3 --- dlls/dinput/dinput_main.c | 39 --------------------------------- dlls/dinput/dinput_private.h | 1 - dlls/dinput/mouse.c | 6 ++---- 5 files changed, 2 insertions(+), 89 deletions(-)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 590151483c9..e53940a2e3b 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -19,12 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */

-/* This file contains all the Device specific functions that can be used as stubs - by real device implementations. - - It also contains all the helper functions. -*/ - #include <stdarg.h> #include <string.h> #include <math.h> @@ -87,9 +81,6 @@ static inline BOOL is_exclusively_acquired( struct dinput_device *device ) return device->status == STATUS_ACQUIRED && (device->dwCoopLevel & DISCL_EXCLUSIVE); }

-/****************************************************************************** - * Various debugging tools - */ static void _dump_cooperativelevel_DI(DWORD dwFlags) { if (TRACE_ON(dinput)) { unsigned int i; @@ -113,9 +104,6 @@ static void _dump_cooperativelevel_DI(DWORD dwFlags) { } }

-/****************************************************************************** - * Get the default and the app-specific config keys. - */ BOOL get_app_key(HKEY *defkey, HKEY *appkey) { char buffer[MAX_PATH+16]; @@ -148,9 +136,6 @@ BOOL get_app_key(HKEY *defkey, HKEY *appkey) return *defkey || *appkey; }

-/****************************************************************************** - * Get a config key from either the app-specific or the default config - */ DWORD get_config_key( HKEY defkey, HKEY appkey, const WCHAR *name, WCHAR *buffer, DWORD size ) { if (appkey && !RegQueryValueExW( appkey, name, 0, NULL, (LPBYTE)buffer, &size )) return 0; @@ -507,10 +492,6 @@ static BOOL set_app_data( struct dinput_device *dev, int offset, UINT_PTR app_da return TRUE; }

-/****************************************************************************** - * queue_event - add new event to the ring queue - */ - void queue_event( IDirectInputDevice8W *iface, int inst_id, DWORD data, DWORD time, DWORD seq ) { static ULONGLONG notify_ms = 0; @@ -561,10 +542,6 @@ void queue_event( IDirectInputDevice8W *iface, int inst_id, DWORD data, DWORD ti /* Send event if asked */ }

-/****************************************************************************** - * Acquire - */ - static HRESULT WINAPI dinput_device_Acquire( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); @@ -593,10 +570,6 @@ static HRESULT WINAPI dinput_device_Acquire( IDirectInputDevice8W *iface ) return hr; }

-/****************************************************************************** - * Unacquire - */ - static HRESULT WINAPI dinput_device_Unacquire( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); @@ -617,10 +590,6 @@ static HRESULT WINAPI dinput_device_Unacquire( IDirectInputDevice8W *iface ) return hr; }

-/****************************************************************************** - * IDirectInputDeviceA - */ - static HRESULT WINAPI dinput_device_SetDataFormat( IDirectInputDevice8W *iface, const DIDATAFORMAT *format ) { struct dinput_device *This = impl_from_IDirectInputDevice8W( iface ); @@ -653,11 +622,6 @@ static HRESULT WINAPI dinput_device_SetDataFormat( IDirectInputDevice8W *iface, return res; }

-/****************************************************************************** - * SetCooperativeLevel - * - * Set cooperative level and the source window for the events. - */ static HRESULT WINAPI dinput_device_SetCooperativeLevel( IDirectInputDevice8W *iface, HWND hwnd, DWORD flags ) { struct dinput_device *This = impl_from_IDirectInputDevice8W( iface ); @@ -685,7 +649,6 @@ static HRESULT WINAPI dinput_device_SetCooperativeLevel( IDirectInputDevice8W *i (IsEqualGUID( &This->guid, &GUID_SysMouse ) || IsEqualGUID( &This->guid, &GUID_SysKeyboard ))) return DIERR_UNSUPPORTED;

- /* Store the window which asks for the mouse */ EnterCriticalSection(&This->crit); if (This->status == STATUS_ACQUIRED) hr = DIERR_ACQUIRED; else @@ -718,9 +681,6 @@ static HRESULT WINAPI dinput_device_GetDeviceInfo( IDirectInputDevice8W *iface, return S_OK; }

-/****************************************************************************** - * SetEventNotification : specifies event to be sent on state change - */ static HRESULT WINAPI dinput_device_SetEventNotification( IDirectInputDevice8W *iface, HANDLE event ) { struct dinput_device *This = impl_from_IDirectInputDevice8W( iface ); @@ -742,11 +702,9 @@ void dinput_device_destroy( IDirectInputDevice8W *iface ) free( This->object_properties ); free( This->data_queue );

- /* Free data format */ free( This->device_format.rgodf ); dinput_device_release_user_format( This );

- /* Free action mapping */ free( This->action_map );

IDirectInput_Release(&This->dinput->IDirectInput7A_iface); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index be5d7861fd1..45250ed082b 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -77,7 +77,6 @@ enum device_status STATUS_UNPLUGGED, };

-/* Device implementation */ struct dinput_device { IDirectInputDevice8W IDirectInputDevice8W_iface; @@ -132,8 +131,6 @@ extern void dinput_device_destroy( IDirectInputDevice8W *iface ); extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; extern BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) DECLSPEC_HIDDEN; - -/* Routines to do DataFormat / WineFormat conversions */ extern void queue_event( IDirectInputDevice8W *iface, int inst_id, DWORD data, DWORD time, DWORD seq ) DECLSPEC_HIDDEN;

extern const GUID dinput_pidvid_guid DECLSPEC_HIDDEN; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index d3db22c70b5..9130c0480b7 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -20,15 +20,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* Status: - * - * - Tomb Raider 2 Demo: - * Playable using keyboard only. - * - WingCommander Prophecy Demo: - * Doesn't get Input Focus. - * - * - Fallout : works great in X and DGA mode - */

#include <assert.h> #include <stdarg.h> @@ -157,9 +148,6 @@ static HRESULT dinput_create( IUnknown **out ) return DI_OK; }

-/****************************************************************************** - * DirectInputCreateEx (DINPUT.@) - */ HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { IUnknown *unknown; @@ -190,9 +178,6 @@ HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, return DI_OK; }

-/****************************************************************************** - * DirectInput8Create (DINPUT8.@) - */ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) { IUnknown *unknown; @@ -225,17 +210,11 @@ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD vers return S_OK; }

-/****************************************************************************** - * DirectInputCreateA (DINPUT.@) - */ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA( HINSTANCE hinst, DWORD version, IDirectInputA **out, IUnknown *outer ) { return DirectInputCreateEx( hinst, version, &IID_IDirectInput7A, (void **)out, outer ); }

-/****************************************************************************** - * DirectInputCreateW (DINPUT.@) - */ HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW( HINSTANCE hinst, DWORD version, IDirectInputW **out, IUnknown *outer ) { return DirectInputCreateEx( hinst, version, &IID_IDirectInput7W, (void **)out, outer ); @@ -287,9 +266,6 @@ __ASM_GLOBAL_FUNC( enum_callback_wrapper, #define enum_callback_wrapper(callback, instance, ref) (callback)((instance), (ref)) #endif

-/****************************************************************************** - * IDirectInputW_EnumDevices - */ static HRESULT WINAPI dinput7_EnumDevices( IDirectInput7W *iface, DWORD type, LPDIENUMDEVICESCALLBACKW callback, void *context, DWORD flags ) { @@ -563,10 +539,6 @@ static HRESULT WINAPI dinput7_CreateDevice( IDirectInput7W *iface, const GUID *g return IDirectInput7_CreateDeviceEx( iface, guid, &IID_IDirectInputDeviceW, (void **)out, outer ); }

-/******************************************************************************* - * DirectInput8 - */ - static ULONG WINAPI dinput8_AddRef( IDirectInput8W *iface ) { struct dinput *impl = impl_from_IDirectInput8W( iface ); @@ -842,10 +814,6 @@ static HRESULT WINAPI dinput8_ConfigureDevices( IDirectInput8W *iface, LPDICONFI return _configure_devices( iface, callback, params, flags, context ); }

-/***************************************************************************** - * IDirectInputJoyConfig8 interface - */ - static inline struct dinput *impl_from_IDirectInputJoyConfig8( IDirectInputJoyConfig8 *iface ) { return CONTAINING_RECORD( iface, struct dinput, IDirectInputJoyConfig8_iface ); @@ -1124,9 +1092,6 @@ static const IClassFactoryVtbl class_factory_vtbl =

static struct class_factory class_factory = {{&class_factory_vtbl}};

-/*********************************************************************** - * DllGetClassObject (DINPUT.@) - */ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **out ) { TRACE( "clsid %s, iid %s, out %p.\n", debugstr_guid( clsid ), debugstr_guid( iid ), out ); @@ -1143,10 +1108,6 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **out ) return CLASS_E_CLASSNOTAVAILABLE; }

-/****************************************************************************** - * DInput hook thread - */ - static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) { struct dinput_device *impl; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index de48c4c5298..e48357e9ffc 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -29,7 +29,6 @@

extern HINSTANCE DINPUT_instance;

-/* Implementation specification */ struct dinput { IDirectInput7A IDirectInput7A_iface; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index ee172547a30..6aab20a631c 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -256,7 +256,6 @@ void dinput_mouse_rawinput_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPA LeaveCriticalSection( &impl->base.crit ); }

-/* low-level mouse hook */ int dinput_mouse_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; @@ -416,7 +415,6 @@ static HRESULT mouse_acquire( IDirectInputDevice8W *iface ) DIMOUSESTATE2 *state = (DIMOUSESTATE2 *)impl->base.device_state; POINT point;

- /* Init the mouse state */ GetCursorPos( &point ); if (impl->base.user_format.dwFlags & DIDF_ABSAXIS) { @@ -436,7 +434,7 @@ static HRESULT mouse_acquire( IDirectInputDevice8W *iface )

if (impl->base.dwCoopLevel & DISCL_EXCLUSIVE) { - ShowCursor( FALSE ); /* hide cursor */ + ShowCursor( FALSE ); warp_check( impl, TRUE ); } else if (impl->warp_override == WARP_FORCE_ON) @@ -461,7 +459,7 @@ static HRESULT mouse_unacquire( IDirectInputDevice8W *iface ) if (impl->base.dwCoopLevel & DISCL_EXCLUSIVE) { ClipCursor( NULL ); - ShowCursor( TRUE ); /* show cursor */ + ShowCursor( TRUE ); impl->clipped = FALSE; }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2020

Rémi Bernon

8:48 a.m.

New subject: [PATCH 2/5] dinput: Add traces to the ANSI wrappers.

From: Rémi Bernon rbernon@codeweavers.com

--- dlls/dinput/ansi.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)

diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 99ec3c73327..a9e948c97a4 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -33,6 +33,8 @@

#include "wine/debug.h"

+WINE_DEFAULT_DEBUG_CHANNEL(dinput); + static struct dinput_device *impl_from_IDirectInputDevice8A( IDirectInputDevice8A *iface ) { return CONTAINING_RECORD( iface, struct dinput_device, IDirectInputDevice8A_iface ); @@ -270,6 +272,7 @@ static HRESULT WINAPI dinput_device_a_QueryInterface( IDirectInputDevice8A *ifac { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, iid %s, out %p.\n", impl, debugstr_guid( iid ), out ); return IDirectInputDevice8_QueryInterface( iface_w, iid, out ); }

@@ -277,6 +280,7 @@ static ULONG WINAPI dinput_device_a_AddRef( IDirectInputDevice8A *iface_a ) { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p.\n", impl ); return IDirectInputDevice8_AddRef( iface_w ); }

@@ -284,6 +288,7 @@ static ULONG WINAPI dinput_device_a_Release( IDirectInputDevice8A *iface_a ) { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p.\n", impl ); return IDirectInputDevice8_Release( iface_w ); }

@@ -291,6 +296,7 @@ static HRESULT WINAPI dinput_device_a_GetCapabilities( IDirectInputDevice8A *ifa { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, caps %p.\n", impl, caps ); return IDirectInputDevice8_GetCapabilities( iface_w, caps ); }

@@ -316,6 +322,8 @@ static HRESULT WINAPI dinput_device_a_EnumObjects( IDirectInputDevice8A *iface_a struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl );

+ TRACE( "impl %p, callback %p, ref %p, flags %#lx.\n", impl, callback, ref, flags ); + if (!callback) return DIERR_INVALIDPARAM;

return IDirectInputDevice8_EnumObjects( iface_w, enum_objects_wtoa_callback, &params, flags ); @@ -325,6 +333,7 @@ static HRESULT WINAPI dinput_device_a_GetProperty( IDirectInputDevice8A *iface_a { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, guid %s, header %p.\n", impl, debugstr_guid( guid ), header ); return IDirectInputDevice8_GetProperty( iface_w, guid, header ); }

@@ -332,6 +341,7 @@ static HRESULT WINAPI dinput_device_a_SetProperty( IDirectInputDevice8A *iface_a { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, guid %s, header %p.\n", impl, debugstr_guid( guid ), header ); return IDirectInputDevice8_SetProperty( iface_w, guid, header ); }

@@ -339,6 +349,7 @@ static HRESULT WINAPI dinput_device_a_Acquire( IDirectInputDevice8A *iface_a ) { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p.\n", impl ); return IDirectInputDevice8_Acquire( iface_w ); }

@@ -346,6 +357,7 @@ static HRESULT WINAPI dinput_device_a_Unacquire( IDirectInputDevice8A *iface_a ) { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p.\n", impl ); return IDirectInputDevice8_Unacquire( iface_w ); }

@@ -353,6 +365,7 @@ static HRESULT WINAPI dinput_device_a_GetDeviceState( IDirectInputDevice8A *ifac { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, count %#lx, data %p.\n", impl, count, data ); return IDirectInputDevice8_GetDeviceState( iface_w, count, data ); }

@@ -361,6 +374,7 @@ static HRESULT WINAPI dinput_device_a_GetDeviceData( IDirectInputDevice8A *iface { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, data_size %#lx, data %p, entries %p, flags %#lx.\n", impl, data_size, data, entries, flags ); return IDirectInputDevice8_GetDeviceData( iface_w, data_size, data, entries, flags ); }

@@ -368,6 +382,7 @@ static HRESULT WINAPI dinput_device_a_SetDataFormat( IDirectInputDevice8A *iface { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, format %p.\n", impl, format ); return IDirectInputDevice8_SetDataFormat( iface_w, format ); }

@@ -375,6 +390,7 @@ static HRESULT WINAPI dinput_device_a_SetEventNotification( IDirectInputDevice8A { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, event %p.\n", impl, event ); return IDirectInputDevice8_SetEventNotification( iface_w, event ); }

@@ -382,6 +398,7 @@ static HRESULT WINAPI dinput_device_a_SetCooperativeLevel( IDirectInputDevice8A { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, window %p, flags %#lx.\n", impl, window, flags ); return IDirectInputDevice8_SetCooperativeLevel( iface_w, window, flags ); }

@@ -393,6 +410,8 @@ static HRESULT WINAPI dinput_device_a_GetObjectInfo( IDirectInputDevice8A *iface DIDEVICEOBJECTINSTANCEW instance_w = {sizeof(instance_w)}; HRESULT hr;

+ TRACE( "impl %p, instance_a %p, obj %#lx, how %#lx.\n", impl, instance_a, obj, how ); + if (!instance_a) return E_POINTER; if (instance_a->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && instance_a->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A)) @@ -411,6 +430,8 @@ static HRESULT WINAPI dinput_device_a_GetDeviceInfo( IDirectInputDevice8A *iface DIDEVICEINSTANCEW instance_w = {sizeof(instance_w)}; HRESULT hr;

+ TRACE( "impl %p, instance_a %p.\n", impl, instance_a ); + if (!instance_a) return E_POINTER; if (instance_a->dwSize != sizeof(DIDEVICEINSTANCEA) && instance_a->dwSize != sizeof(DIDEVICEINSTANCE_DX3A)) return DIERR_INVALIDPARAM; @@ -425,6 +446,7 @@ static HRESULT WINAPI dinput_device_a_RunControlPanel( IDirectInputDevice8A *ifa { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, owner %p, flags %#lx.\n", impl, owner, flags ); return IDirectInputDevice8_RunControlPanel( iface_w, owner, flags ); }

@@ -432,6 +454,7 @@ static HRESULT WINAPI dinput_device_a_Initialize( IDirectInputDevice8A *iface_a, { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, instance %p, version %#lx, guid %s.\n", impl, instance, version, debugstr_guid( guid ) ); return IDirectInputDevice8_Initialize( iface_w, instance, version, guid ); }

@@ -440,6 +463,7 @@ static HRESULT WINAPI dinput_device_a_CreateEffect( IDirectInputDevice8A *iface_ { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, guid %s, effect %p, out %p, outer %p.\n", impl, debugstr_guid( guid ), effect, out, outer ); return IDirectInputDevice8_CreateEffect( iface_w, guid, effect, out, outer ); }

@@ -465,6 +489,8 @@ static HRESULT WINAPI dinput_device_a_EnumEffects( IDirectInputDevice8A *iface_a struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl );

+ TRACE( "impl %p, callback %p, ref %p, type %#lx.\n", impl, callback, ref, type ); + if (!callback) return DIERR_INVALIDPARAM;

return IDirectInputDevice8_EnumEffects( iface_w, enum_effects_wtoa_callback, &params, type ); @@ -477,6 +503,8 @@ static HRESULT WINAPI dinput_device_a_GetEffectInfo( IDirectInputDevice8A *iface DIEFFECTINFOW info_w = {sizeof(info_w)}; HRESULT hr;

+ TRACE( "impl %p, info_a %p, guid %s.\n", impl, info_a, debugstr_guid( guid ) ); + if (!info_a) return E_POINTER; if (info_a->dwSize != sizeof(DIEFFECTINFOA)) return DIERR_INVALIDPARAM;

@@ -490,6 +518,7 @@ static HRESULT WINAPI dinput_device_a_GetForceFeedbackState( IDirectInputDevice8 { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, state %p.\n", impl, state ); return IDirectInputDevice8_GetForceFeedbackState( iface_w, state ); }

@@ -497,6 +526,7 @@ static HRESULT WINAPI dinput_device_a_SendForceFeedbackCommand( IDirectInputDevi { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, flags %#lx.\n", impl, flags ); return IDirectInputDevice8_SendForceFeedbackCommand( iface_w, flags ); }

@@ -505,6 +535,7 @@ static HRESULT WINAPI dinput_device_a_EnumCreatedEffectObjects( IDirectInputDevi { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, callback %p, ref %p, flags %#lx.\n", impl, callback, ref, flags ); return IDirectInputDevice8_EnumCreatedEffectObjects( iface_w, callback, ref, flags ); }

@@ -512,6 +543,7 @@ static HRESULT WINAPI dinput_device_a_Escape( IDirectInputDevice8A *iface_a, DIE { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, escape %p.\n", impl, escape ); return IDirectInputDevice8_Escape( iface_w, escape ); }

@@ -519,6 +551,7 @@ static HRESULT WINAPI dinput_device_a_Poll( IDirectInputDevice8A *iface_a ) { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p.\n", impl ); return IDirectInputDevice8_Poll( iface_w ); }

@@ -527,6 +560,7 @@ static HRESULT WINAPI dinput_device_a_SendDeviceData( IDirectInputDevice8A *ifac { struct dinput_device *impl = impl_from_IDirectInputDevice8A( iface_a ); IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + TRACE( "impl %p, count %#lx, data %p, inout %p, flags %#lx.\n", impl, count, data, inout, flags ); return IDirectInputDevice8_SendDeviceData( iface_w, count, data, inout, flags ); }

@@ -537,6 +571,9 @@ static HRESULT WINAPI dinput_device_a_EnumEffectsInFile( IDirectInputDevice8A *i IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); WCHAR buffer[MAX_PATH], *filename_w = buffer;

+ TRACE( "impl %p, filename_a %s, callback %p, ref %p, flags %#lx.\n", impl, + debugstr_a(filename_a), callback, ref, flags ); + if (!filename_a) filename_w = NULL; else MultiByteToWideChar( CP_ACP, 0, filename_a, -1, buffer, MAX_PATH );

@@ -550,6 +587,9 @@ static HRESULT WINAPI dinput_device_a_WriteEffectToFile( IDirectInputDevice8A *i IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); WCHAR buffer[MAX_PATH], *filename_w = buffer;

+ TRACE( "impl %p, filename_a %s, entries %#lx, file_effect %p, flags %#lx.\n", impl, + debugstr_a(filename_a), entries, file_effect, flags ); + if (!filename_a) filename_w = NULL; else MultiByteToWideChar( CP_ACP, 0, filename_a, -1, buffer, MAX_PATH );

@@ -565,6 +605,8 @@ static HRESULT WINAPI dinput_device_a_BuildActionMap( IDirectInputDevice8A *ifac HRESULT hr; WCHAR *username_w;

+ TRACE( "impl %p, format_a %p, username_a %s, flags %#lx.\n", impl, format_a, debugstr_a(username_a), flags ); + if (!format_a) return E_POINTER; if (format_a->dwSize != sizeof(DIACTIONFORMATA)) return DIERR_INVALIDPARAM; if (format_a->dwActionSize != sizeof(DIACTIONA)) return DIERR_INVALIDPARAM; @@ -594,6 +636,8 @@ static HRESULT WINAPI dinput_device_a_SetActionMap( IDirectInputDevice8A *iface_ HRESULT hr; WCHAR *username_w;

+ TRACE( "impl %p, format_a %p, username_a %s, flags %#lx.\n", impl, format_a, debugstr_a(username_a), flags ); + if (!format_a) return E_POINTER; if (format_a->dwSize != sizeof(DIACTIONFORMATA)) return DIERR_INVALIDPARAM; if (format_a->dwActionSize != sizeof(DIACTIONA)) return DIERR_INVALIDPARAM; @@ -621,6 +665,8 @@ static HRESULT WINAPI dinput_device_a_GetImageInfo( IDirectInputDevice8A *iface_ DIDEVICEIMAGEINFOHEADERW header_w = {sizeof(header_w), sizeof(DIDEVICEIMAGEINFOW)}; HRESULT hr;

+ TRACE( "impl %p, header_a %p.\n", impl, header_a ); + if (!header_a) return E_POINTER; if (header_a->dwSize != sizeof(DIDEVICEIMAGEINFOHEADERA)) return DIERR_INVALIDPARAM; if (header_a->dwSizeImageInfo != sizeof(DIDEVICEIMAGEINFOA)) return DIERR_INVALIDPARAM; @@ -680,6 +726,7 @@ static HRESULT WINAPI dinput8_a_QueryInterface( IDirectInput8A *iface_a, REFIID { struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); + TRACE( "impl %p, iid %s, out %p.\n", impl, debugstr_guid( iid ), out ); return IDirectInput8_QueryInterface( iface_w, iid, out ); }

@@ -687,6 +734,7 @@ static ULONG WINAPI dinput8_a_AddRef( IDirectInput8A *iface_a ) { struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); + TRACE( "impl %p.\n", impl ); return IDirectInput8_AddRef( iface_w ); }

@@ -694,6 +742,7 @@ static ULONG WINAPI dinput8_a_Release( IDirectInput8A *iface_a ) { struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); + TRACE( "impl %p.\n", impl ); return IDirectInput8_Release( iface_w ); }

@@ -704,6 +753,8 @@ static HRESULT WINAPI dinput8_a_CreateDevice( IDirectInput8A *iface_a, REFGUID g IDirectInputDevice8W *outw; HRESULT hr;

+ TRACE( "impl %p, guid %s, out %p, outer %p.\n", impl, debugstr_guid( guid ), out, outer ); + if (!out) return E_POINTER;

hr = IDirectInput8_CreateDevice( iface_w, guid, &outw, outer ); @@ -733,6 +784,8 @@ static HRESULT WINAPI dinput8_a_EnumDevices( IDirectInput8A *iface_a, DWORD type struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl );

+ TRACE( "impl %p, type %#lx, callback %p, ref %p, flags %#lx.\n", impl, type, callback, ref, flags ); + if (!callback) return DIERR_INVALIDPARAM;

return IDirectInput8_EnumDevices( iface_w, type, enum_devices_wtoa_callback, &params, flags ); @@ -742,6 +795,7 @@ static HRESULT WINAPI dinput8_a_GetDeviceStatus( IDirectInput8A *iface_a, REFGUI { struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); + TRACE( "impl %p, instance_guid %s.\n", impl, debugstr_guid( instance_guid ) ); return IDirectInput8_GetDeviceStatus( iface_w, instance_guid ); }

@@ -749,6 +803,7 @@ static HRESULT WINAPI dinput8_a_RunControlPanel( IDirectInput8A *iface_a, HWND o { struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); + TRACE( "impl %p, owner %p, flags %#lx.\n", impl, owner, flags ); return IDirectInput8_RunControlPanel( iface_w, owner, flags ); }

@@ -756,6 +811,7 @@ static HRESULT WINAPI dinput8_a_Initialize( IDirectInput8A *iface_a, HINSTANCE i { struct dinput *impl = impl_from_IDirectInput8A( iface_a ); IDirectInput8W *iface_w = IDirectInput8W_from_impl( impl ); + TRACE( "impl %p, instance %p, version %#lx.\n", impl, instance, version ); return IDirectInput8_Initialize( iface_w, instance, version ); }

@@ -766,6 +822,9 @@ static HRESULT WINAPI dinput8_a_FindDevice( IDirectInput8A *iface_a, REFGUID gui HRESULT hr; WCHAR *name_w;

+ TRACE( "impl %p, guid %s, name_a %s, instance_guid %s.\n", impl, debugstr_guid( guid ), + debugstr_a(name_a), debugstr_guid( instance_guid ) ); + if (FAILED(hr = string_atow( name_a, &name_w ))) return hr;

hr = IDirectInput8_FindDevice( iface_w, guid, name_w, instance_guid ); @@ -800,6 +859,9 @@ static HRESULT WINAPI dinput8_a_EnumDevicesBySemantics( IDirectInput8A *iface_a, HRESULT hr; WCHAR *username_w;

+ TRACE( "impl %p, username_a %s, format_a %p, callback %p, ref %p, flags %#lx.\n", impl, + debugstr_a(username_a), format_a, callback, ref, flags ); + if (!callback) return DIERR_INVALIDPARAM; if (FAILED(hr = string_atow( username_a, &username_w ))) return hr;

@@ -829,6 +891,8 @@ static HRESULT WINAPI dinput8_a_ConfigureDevices( IDirectInput8A *iface_a, LPDIC HRESULT hr; DWORD i;

+ TRACE( "impl %p, callback %p, params_a %p, flags %#lx, ref %p.\n", impl, callback, params_a, flags, ref ); + if (FAILED(hr = diconfiguredevicesparams_atow( params_a, &params_w ))) return hr;

format_w.dwNumActions = format_a->dwNumActions; @@ -875,6 +939,7 @@ static HRESULT WINAPI dinput7_a_QueryInterface( IDirectInput7A *iface_a, REFIID { struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); + TRACE( "impl %p, iid %s, out %p.\n", impl, debugstr_guid( iid ), out ); return IDirectInput7_QueryInterface( iface_w, iid, out ); }

@@ -882,6 +947,7 @@ static ULONG WINAPI dinput7_a_AddRef( IDirectInput7A *iface_a ) { struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); + TRACE( "impl %p.\n", impl ); return IDirectInput7_AddRef( iface_w ); }

@@ -889,6 +955,7 @@ static ULONG WINAPI dinput7_a_Release( IDirectInput7A *iface_a ) { struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); + TRACE( "impl %p.\n", impl ); return IDirectInput7_Release( iface_w ); }

@@ -899,6 +966,8 @@ static HRESULT WINAPI dinput7_a_CreateDevice( IDirectInput7A *iface_a, REFGUID g IDirectInputDeviceW *out_w; HRESULT hr;

+ TRACE( "impl %p, guid %s, out_a %p, outer %p.\n", impl, debugstr_guid( guid ), out_a, outer ); + if (!out_a) return E_POINTER;

hr = IDirectInput7_CreateDevice( iface_w, guid, &out_w, outer ); @@ -913,6 +982,8 @@ static HRESULT WINAPI dinput7_a_EnumDevices( IDirectInput7A *iface_a, DWORD type struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl );

+ TRACE( "impl %p, type %#lx, callback %p, ref %p, flags %#lx.\n", impl, type, callback, ref, flags ); + if (!callback) return DIERR_INVALIDPARAM;

return IDirectInput7_EnumDevices( iface_w, type, enum_devices_wtoa_callback, &params, flags ); @@ -922,6 +993,7 @@ static HRESULT WINAPI dinput7_a_GetDeviceStatus( IDirectInput7A *iface_a, REFGUI { struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); + TRACE( "impl %p, instance_guid %s.\n", impl, debugstr_guid( instance_guid ) ); return IDirectInput7_GetDeviceStatus( iface_w, instance_guid ); }

@@ -929,6 +1001,7 @@ static HRESULT WINAPI dinput7_a_RunControlPanel( IDirectInput7A *iface_a, HWND o { struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); + TRACE( "impl %p, owner %p, flags %#lx.\n", impl, owner, flags ); return IDirectInput7_RunControlPanel( iface_w, owner, flags ); }

@@ -936,6 +1009,7 @@ static HRESULT WINAPI dinput7_a_Initialize( IDirectInput7A *iface_a, HINSTANCE i { struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); + TRACE( "impl %p, instance %p, version %#lx.\n", impl, instance, version ); return IDirectInput7_Initialize( iface_w, instance, version ); }

@@ -946,6 +1020,9 @@ static HRESULT WINAPI dinput7_a_FindDevice( IDirectInput7A *iface_a, REFGUID gui HRESULT hr; WCHAR *name_w;

hr = IDirectInput7_FindDevice( iface_w, guid, name_w, instance_guid ); @@ -957,6 +1034,8 @@ static HRESULT WINAPI dinput7_a_CreateDeviceEx( IDirectInput7A *iface_a, REFGUID { struct dinput *impl = impl_from_IDirectInput7A( iface_a ); IDirectInput7W *iface_w = IDirectInput7W_from_impl( impl ); + TRACE( "impl %p, guid %s, iid %s, out %p, outer %p.\n", impl, debugstr_guid( guid ), + debugstr_guid( iid ), out, outer ); return IDirectInput7_CreateDeviceEx( iface_w, guid, iid, out, outer ); }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2020

Rémi Bernon

8:48 a.m.

New subject: [PATCH 3/5] dinput: Remove unnecessary initialization helpers.

From: Rémi Bernon rbernon@codeweavers.com

--- dlls/dinput/dinput_main.c | 63 ++++++++++++++---------------------- dlls/dinput/dinput_private.h | 1 - 2 files changed, 25 insertions(+), 39 deletions(-)

diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 9130c0480b7..b4c78036877 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -86,9 +86,6 @@ static struct list acquired_rawmouse_list = LIST_INIT( acquired_rawmouse_list ); static struct list acquired_keyboard_list = LIST_INIT( acquired_keyboard_list ); static struct list acquired_device_list = LIST_INIT( acquired_device_list );

-static HRESULT initialize_directinput_instance( struct dinput *impl, DWORD version ); -static void uninitialize_directinput_instance( struct dinput *impl ); - void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); @@ -140,6 +137,8 @@ static HRESULT dinput_create( IUnknown **out ) impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; impl->ref = 1;

+ list_init( &impl->device_players ); + #if DIRECTINPUT_VERSION == 0x0700 *out = (IUnknown *)&impl->IDirectInput7W_iface; #else @@ -299,7 +298,11 @@ static ULONG WINAPI dinput7_Release( IDirectInput7W *iface )

if (ref == 0) { - uninitialize_directinput_instance( impl ); + struct DevicePlayer *device_player, *device_player2; + + LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, &impl->device_players, struct DevicePlayer, entry ) + free( device_player ); + free( impl ); }

@@ -395,34 +398,6 @@ static void unregister_di_em_win_class(void) WARN( "Unable to unregister message window class\n" ); }

-static HRESULT initialize_directinput_instance( struct dinput *impl, DWORD version ) -{ - if (!impl->initialized) - { - impl->dwVersion = version; - impl->evsequence = 1; - - list_init( &impl->device_players ); - - impl->initialized = TRUE; - } - - return DI_OK; -} - -static void uninitialize_directinput_instance( struct dinput *impl ) -{ - if (impl->initialized) - { - struct DevicePlayer *device_player, *device_player2; - - LIST_FOR_EACH_ENTRY_SAFE ( device_player, device_player2, &impl->device_players, struct DevicePlayer, entry ) - free( device_player ); - - impl->initialized = FALSE; - } -} - enum directinput_versions { DIRECTINPUT_VERSION_300 = 0x0300, @@ -452,7 +427,13 @@ static HRESULT WINAPI dinput7_Initialize( IDirectInput7W *iface, HINSTANCE hinst version != DIRECTINPUT_VERSION_700 && version != DIRECTINPUT_VERSION) return DIERR_BETADIRECTINPUTVERSION;

- return initialize_directinput_instance( impl, version ); + if (!impl->dwVersion) + { + impl->dwVersion = version; + impl->evsequence = 1; + } + + return DI_OK; }

static HRESULT WINAPI dinput7_GetDeviceStatus( IDirectInput7W *iface, const GUID *guid ) @@ -464,7 +445,7 @@ static HRESULT WINAPI dinput7_GetDeviceStatus( IDirectInput7W *iface, const GUID TRACE( "iface %p, guid %s.\n", iface, debugstr_guid( guid ) );

if (!guid) return E_POINTER; - if (!impl->initialized) return DIERR_NOTINITIALIZED; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED;

hr = IDirectInput_CreateDevice( iface, guid, &device, NULL ); if (hr != DI_OK) return DI_NOTATTACHED; @@ -485,7 +466,7 @@ static HRESULT WINAPI dinput7_RunControlPanel( IDirectInput7W *iface, HWND owner

if (owner && !IsWindow( owner )) return E_HANDLE; if (flags) return DIERR_INVALIDPARAM; - if (!impl->initialized) return DIERR_NOTINITIALIZED; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED;

if (!CreateProcessW( NULL, control_exe, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) return HRESULT_FROM_WIN32(GetLastError()); @@ -514,7 +495,7 @@ static HRESULT WINAPI dinput7_CreateDeviceEx( IDirectInput7W *iface, const GUID *out = NULL;

if (!guid) return E_POINTER; - if (!impl->initialized) return DIERR_NOTINITIALIZED; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED;

if (IsEqualGUID( &GUID_SysKeyboard, guid )) hr = keyboard_create_device( impl, guid, &device ); else if (IsEqualGUID( &GUID_SysMouse, guid )) hr = mouse_create_device( impl, guid, &device ); @@ -593,7 +574,7 @@ static HRESULT WINAPI dinput8_EnumDevices( IDirectInput8W *iface, DWORD type, LP DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN)) return DIERR_INVALIDPARAM;

- if (!impl->initialized) return DIERR_NOTINITIALIZED; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED;

if (type <= DI8DEVCLASS_GAMECTRL) device_class = type; else device_type = type; @@ -652,7 +633,13 @@ static HRESULT WINAPI dinput8_Initialize( IDirectInput8W *iface, HINSTANCE hinst else if (version > DIRECTINPUT_VERSION) return DIERR_OLDDIRECTINPUTVERSION;

- return initialize_directinput_instance( impl, version ); + if (!impl->dwVersion) + { + impl->dwVersion = version; + impl->evsequence = 1; + } + + return DI_OK; }

static HRESULT WINAPI dinput8_FindDevice( IDirectInput8W *iface, const GUID *guid, const WCHAR *name, GUID *instance_guid ) diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index e48357e9ffc..79a5baabb6e 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -38,7 +38,6 @@ struct dinput IDirectInputJoyConfig8 IDirectInputJoyConfig8_iface; LONG ref;

- BOOL initialized; DWORD dwVersion; /* direct input version number */ DWORD evsequence; /* unique sequence number for events */ struct list device_players; /* device instance guid to player name */

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2020

Rémi Bernon

8:48 a.m.

New subject: [PATCH 4/5] dinput: Move dinput class implementation to dinput.c.

From: Rémi Bernon rbernon@codeweavers.com

--- dlls/dinput/Makefile.in | 1 + dlls/dinput/dinput.c | 966 ++++++++++++++++++++++++++++++++++++++ dlls/dinput/dinput_main.c | 938 ------------------------------------ dlls/dinput8/Makefile.in | 1 + 4 files changed, 968 insertions(+), 938 deletions(-) create mode 100644 dlls/dinput/dinput.c

diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index e1dd52cf67d..280ac49f9aa 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ config.c \ data_formats.c \ device.c \ + dinput.c \ dinput_main.c \ joystick_hid.c \ keyboard.c \ diff --git a/dlls/dinput/dinput.c b/dlls/dinput/dinput.c new file mode 100644 index 00000000000..2b1ce6d2e33 --- /dev/null +++ b/dlls/dinput/dinput.c @@ -0,0 +1,966 @@ +/* + * Copyright 1998 Marcus Meissner + * Copyright 1998,1999 Lionel Ulmer + * Copyright 2000-2002 TransGaming Technologies Inc. + * Copyright 2007 Vitaliy Margolen + * + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stddef.h> +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" + +#include "dinput_private.h" +#include "device_private.h" + +#include "wine/asm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + +static inline struct dinput *impl_from_IDirectInput7W( IDirectInput7W *iface ) +{ + return CONTAINING_RECORD( iface, struct dinput, IDirectInput7W_iface ); +} + +static inline struct dinput *impl_from_IDirectInput8W( IDirectInput8W *iface ) +{ + return CONTAINING_RECORD( iface, struct dinput, IDirectInput8W_iface ); +} + +static DWORD diactionformat_priorityW( DIACTIONFORMATW *action_format, DWORD genre ) +{ + int i; + DWORD priorityFlags = 0; + + /* If there's at least one action for the device it's priority 1 */ + for (i = 0; i < action_format->dwNumActions; i++) + if ((action_format->rgoAction[i].dwSemantic & genre) == genre) + priorityFlags |= DIEDBS_MAPPEDPRI1; + + return priorityFlags; +} + +#if defined __i386__ && defined _MSC_VER +__declspec(naked) BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref) +{ + __asm + { + push ebp + mov ebp, esp + push [ebp+16] + push [ebp+12] + call [ebp+8] + leave + ret + } +} +#elif defined __i386__ && defined __GNUC__ +extern BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref); +__ASM_GLOBAL_FUNC( enum_callback_wrapper, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl 16(%ebp)\n\t" + "pushl 12(%ebp)\n\t" + "call *8(%ebp)\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#else +#define enum_callback_wrapper(callback, instance, ref) (callback)((instance), (ref)) +#endif + +static HRESULT WINAPI dinput7_EnumDevices( IDirectInput7W *iface, DWORD type, LPDIENUMDEVICESCALLBACKW callback, + void *context, DWORD flags ) +{ + struct dinput *impl = impl_from_IDirectInput7W( iface ); + + TRACE( "iface %p, type %#lx, callback %p, context %p, flags %#lx.\n", iface, type, callback, context, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + if (type > DIDEVTYPE_JOYSTICK) return DIERR_INVALIDPARAM; + if (flags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS)) + return DIERR_INVALIDPARAM; + + return IDirectInput8_EnumDevices( &impl->IDirectInput8W_iface, type, callback, context, flags ); +} + +static ULONG WINAPI dinput7_AddRef( IDirectInput7W *iface ) +{ + struct dinput *impl = impl_from_IDirectInput7W( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI dinput7_Release( IDirectInput7W *iface ) +{ + struct dinput *impl = impl_from_IDirectInput7W( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + struct DevicePlayer *device_player, *device_player2; + + LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, &impl->device_players, struct DevicePlayer, entry ) + free( device_player ); + + free( impl ); + } + + return ref; +} + +static HRESULT WINAPI dinput7_QueryInterface( IDirectInput7W *iface, REFIID iid, void **out ) +{ + struct dinput *impl = impl_from_IDirectInput7W( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (!iid || !out) return E_POINTER; + + *out = NULL; + +#if DIRECTINPUT_VERSION == 0x0700 + if (IsEqualGUID( &IID_IDirectInputA, iid ) || + IsEqualGUID( &IID_IDirectInput2A, iid ) || + IsEqualGUID( &IID_IDirectInput7A, iid )) + *out = &impl->IDirectInput7A_iface; + else if (IsEqualGUID( &IID_IUnknown, iid ) || + IsEqualGUID( &IID_IDirectInputW, iid ) || + IsEqualGUID( &IID_IDirectInput2W, iid ) || + IsEqualGUID( &IID_IDirectInput7W, iid )) + *out = &impl->IDirectInput7W_iface; +#else + if (IsEqualGUID( &IID_IDirectInput8A, iid )) + *out = &impl->IDirectInput8A_iface; + else if (IsEqualGUID( &IID_IUnknown, iid ) || + IsEqualGUID( &IID_IDirectInput8W, iid )) + *out = &impl->IDirectInput8W_iface; +#endif + + if (IsEqualGUID( &IID_IDirectInputJoyConfig8, iid )) + *out = &impl->IDirectInputJoyConfig8_iface; + + if (*out) + { + IUnknown_AddRef( (IUnknown *)*out ); + return DI_OK; + } + + WARN( "Unsupported interface: %s\n", debugstr_guid( iid ) ); + return E_NOINTERFACE; +} + +enum directinput_versions +{ + DIRECTINPUT_VERSION_300 = 0x0300, + DIRECTINPUT_VERSION_500 = 0x0500, + DIRECTINPUT_VERSION_50A = 0x050A, + DIRECTINPUT_VERSION_5B2 = 0x05B2, + DIRECTINPUT_VERSION_602 = 0x0602, + DIRECTINPUT_VERSION_61A = 0x061A, + DIRECTINPUT_VERSION_700 = 0x0700, +}; + +static HRESULT WINAPI dinput7_Initialize( IDirectInput7W *iface, HINSTANCE hinst, DWORD version ) +{ + struct dinput *impl = impl_from_IDirectInput7W( iface ); + + TRACE( "iface %p, hinst %p, version %#lx.\n", iface, hinst, version ); + + if (!hinst) + return DIERR_INVALIDPARAM; + else if (version == 0) + return DIERR_NOTINITIALIZED; + else if (version > DIRECTINPUT_VERSION_700) + return DIERR_OLDDIRECTINPUTVERSION; + else if (version != DIRECTINPUT_VERSION_300 && version != DIRECTINPUT_VERSION_500 && + version != DIRECTINPUT_VERSION_50A && version != DIRECTINPUT_VERSION_5B2 && + version != DIRECTINPUT_VERSION_602 && version != DIRECTINPUT_VERSION_61A && + version != DIRECTINPUT_VERSION_700 && version != DIRECTINPUT_VERSION) + return DIERR_BETADIRECTINPUTVERSION; + + if (!impl->dwVersion) + { + impl->dwVersion = version; + impl->evsequence = 1; + } + + return DI_OK; +} + +static HRESULT WINAPI dinput7_GetDeviceStatus( IDirectInput7W *iface, const GUID *guid ) +{ + struct dinput *impl = impl_from_IDirectInput7W( iface ); + HRESULT hr; + IDirectInputDeviceW *device; + + TRACE( "iface %p, guid %s.\n", iface, debugstr_guid( guid ) ); + + if (!guid) return E_POINTER; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED; + + hr = IDirectInput_CreateDevice( iface, guid, &device, NULL ); + if (hr != DI_OK) return DI_NOTATTACHED; + + IUnknown_Release( device ); + + return DI_OK; +} + +static HRESULT WINAPI dinput7_RunControlPanel( IDirectInput7W *iface, HWND owner, DWORD flags ) +{ + struct dinput *impl = impl_from_IDirectInput7W( iface ); + WCHAR control_exe[] = {L"control.exe"}; + STARTUPINFOW si = {0}; + PROCESS_INFORMATION pi; + + TRACE( "iface %p, owner %p, flags %#lx.\n", iface, owner, flags ); + + if (owner && !IsWindow( owner )) return E_HANDLE; + if (flags) return DIERR_INVALIDPARAM; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED; + + if (!CreateProcessW( NULL, control_exe, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) + return HRESULT_FROM_WIN32(GetLastError()); + + return DI_OK; +} + +static HRESULT WINAPI dinput7_FindDevice( IDirectInput7W *iface, const GUID *guid, const WCHAR *name, GUID *instance_guid ) +{ + FIXME( "iface %p, guid %s, name %s, instance_guid %s stub!\n", iface, debugstr_guid( guid ), + debugstr_w(name), debugstr_guid( instance_guid ) ); + return DI_OK; +} + +static HRESULT WINAPI dinput7_CreateDeviceEx( IDirectInput7W *iface, const GUID *guid, + REFIID iid, void **out, IUnknown *outer ) +{ + struct dinput *impl = impl_from_IDirectInput7W( iface ); + IDirectInputDevice8W *device; + HRESULT hr; + + TRACE( "iface %p, guid %s, iid %s, out %p, outer %p.\n", iface, debugstr_guid( guid ), + debugstr_guid( iid ), out, outer ); + + if (!out) return E_POINTER; + *out = NULL; + + if (!guid) return E_POINTER; + if (!impl->dwVersion) return DIERR_NOTINITIALIZED; + + if (IsEqualGUID( &GUID_SysKeyboard, guid )) hr = keyboard_create_device( impl, guid, &device ); + else if (IsEqualGUID( &GUID_SysMouse, guid )) hr = mouse_create_device( impl, guid, &device ); + else hr = hid_joystick_create_device( impl, guid, &device ); + + if (FAILED(hr)) return hr; + + if (FAILED(hr = dinput_device_init_device_format( device ))) + { + IDirectInputDevice8_Release( device ); + return hr; + } + + hr = IDirectInputDevice8_QueryInterface( device, iid, out ); + IDirectInputDevice8_Release( device ); + return hr; +} + +static HRESULT WINAPI dinput7_CreateDevice( IDirectInput7W *iface, const GUID *guid, + IDirectInputDeviceW **out, IUnknown *outer ) +{ + return IDirectInput7_CreateDeviceEx( iface, guid, &IID_IDirectInputDeviceW, (void **)out, outer ); +} + +static ULONG WINAPI dinput8_AddRef( IDirectInput8W *iface ) +{ + struct dinput *impl = impl_from_IDirectInput8W( iface ); + return IDirectInput7_AddRef( &impl->IDirectInput7W_iface ); +} + +static HRESULT WINAPI dinput8_QueryInterface( IDirectInput8W *iface, REFIID iid, void **out ) +{ + struct dinput *impl = impl_from_IDirectInput8W( iface ); + return IDirectInput7_QueryInterface( &impl->IDirectInput7W_iface, iid, out ); +} + +static ULONG WINAPI dinput8_Release( IDirectInput8W *iface ) +{ + struct dinput *impl = impl_from_IDirectInput8W( iface ); + return IDirectInput7_Release( &impl->IDirectInput7W_iface ); +} + +static HRESULT WINAPI dinput8_CreateDevice( IDirectInput8W *iface, const GUID *guid, + IDirectInputDevice8W **out, IUnknown *outer ) +{ + struct dinput *impl = impl_from_IDirectInput8W( iface ); + return IDirectInput7_CreateDeviceEx( &impl->IDirectInput7W_iface, guid, + &IID_IDirectInputDevice8W, (void **)out, outer ); +} + +static BOOL try_enum_device( DWORD type, LPDIENUMDEVICESCALLBACKW callback, + DIDEVICEINSTANCEW *instance, void *context, DWORD flags ) +{ + if (type && (instance->dwDevType & 0xff) != type) return DIENUM_CONTINUE; + if ((flags & DIEDFL_FORCEFEEDBACK) && IsEqualGUID( &instance->guidFFDriver, &GUID_NULL )) + return DIENUM_CONTINUE; + return enum_callback_wrapper( callback, instance, context ); +} + +static HRESULT WINAPI dinput8_EnumDevices( IDirectInput8W *iface, DWORD type, LPDIENUMDEVICESCALLBACKW callback, void *context, + DWORD flags ) +{ + DIDEVICEINSTANCEW instance = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + struct dinput *impl = impl_from_IDirectInput8W( iface ); + DWORD device_class = 0, device_type = 0; + unsigned int i = 0; + HRESULT hr; + + TRACE( "iface %p, type %#lx, callback %p, context %p, flags %#lx.\n", iface, type, callback, context, flags ); + + if (!callback) return DIERR_INVALIDPARAM; + + if ((type > DI8DEVCLASS_GAMECTRL && type < DI8DEVTYPE_DEVICE) || type > DI8DEVTYPE_SUPPLEMENTAL) + return DIERR_INVALIDPARAM; + if (flags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | + DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN)) + return DIERR_INVALIDPARAM; + + if (!impl->dwVersion) return DIERR_NOTINITIALIZED; + + if (type <= DI8DEVCLASS_GAMECTRL) device_class = type; + else device_type = type; + + if (device_class == DI8DEVCLASS_ALL || device_class == DI8DEVCLASS_POINTER) + { + hr = mouse_enum_device( type, flags, &instance, impl->dwVersion ); + if (hr == DI_OK && try_enum_device( device_type, callback, &instance, context, flags ) == DIENUM_STOP) + return DI_OK; + } + + if (device_class == DI8DEVCLASS_ALL || device_class == DI8DEVCLASS_KEYBOARD) + { + hr = keyboard_enum_device( type, flags, &instance, impl->dwVersion ); + if (hr == DI_OK && try_enum_device( device_type, callback, &instance, context, flags ) == DIENUM_STOP) + return DI_OK; + } + + if (device_class == DI8DEVCLASS_ALL || device_class == DI8DEVCLASS_GAMECTRL) + { + do + { + hr = hid_joystick_enum_device( type, flags, &instance, impl->dwVersion, i++ ); + if (hr == DI_OK && try_enum_device( device_type, callback, &instance, context, flags ) == DIENUM_STOP) + return DI_OK; + } while (SUCCEEDED(hr)); + } + + return DI_OK; +} + +static HRESULT WINAPI dinput8_GetDeviceStatus( IDirectInput8W *iface, const GUID *guid ) +{ + struct dinput *impl = impl_from_IDirectInput8W( iface ); + return IDirectInput7_GetDeviceStatus( &impl->IDirectInput7W_iface, guid ); +} + +static HRESULT WINAPI dinput8_RunControlPanel( IDirectInput8W *iface, HWND owner, DWORD flags ) +{ + struct dinput *impl = impl_from_IDirectInput8W( iface ); + return IDirectInput7_RunControlPanel( &impl->IDirectInput7W_iface, owner, flags ); +} + +static HRESULT WINAPI dinput8_Initialize( IDirectInput8W *iface, HINSTANCE hinst, DWORD version ) +{ + struct dinput *impl = impl_from_IDirectInput8W( iface ); + + TRACE( "iface %p, hinst %p, version %#lx.\n", iface, hinst, version ); + + if (!hinst) + return DIERR_INVALIDPARAM; + else if (version == 0) + return DIERR_NOTINITIALIZED; + else if (version < DIRECTINPUT_VERSION) + return DIERR_BETADIRECTINPUTVERSION; + else if (version > DIRECTINPUT_VERSION) + return DIERR_OLDDIRECTINPUTVERSION; + + if (!impl->dwVersion) + { + impl->dwVersion = version; + impl->evsequence = 1; + } + + return DI_OK; +} + +static HRESULT WINAPI dinput8_FindDevice( IDirectInput8W *iface, const GUID *guid, const WCHAR *name, GUID *instance_guid ) +{ + struct dinput *impl = impl_from_IDirectInput8W( iface ); + return IDirectInput7_FindDevice( &impl->IDirectInput7W_iface, guid, name, instance_guid ); +} + +static BOOL should_enumerate_device( const WCHAR *username, DWORD flags, struct list *device_players, const GUID *guid ) +{ + BOOL should_enumerate = TRUE; + struct DevicePlayer *device_player; + + /* Check if user owns impl device */ + if (flags & DIEDBSFL_THISUSER && username && *username) + { + should_enumerate = FALSE; + LIST_FOR_EACH_ENTRY( device_player, device_players, struct DevicePlayer, entry ) + { + if (IsEqualGUID( &device_player->instance_guid, guid )) + { + if (*device_player->username && !wcscmp( username, device_player->username )) + return TRUE; /* Device username matches */ + break; + } + } + } + + /* Check if impl device is not owned by anyone */ + if (flags & DIEDBSFL_AVAILABLEDEVICES) + { + BOOL found = FALSE; + should_enumerate = FALSE; + LIST_FOR_EACH_ENTRY( device_player, device_players, struct DevicePlayer, entry ) + { + if (IsEqualGUID( &device_player->instance_guid, guid )) + { + if (*device_player->username) found = TRUE; + break; + } + } + if (!found) return TRUE; /* Device does not have a username */ + } + + return should_enumerate; +} + +struct enum_device_by_semantics_params +{ + IDirectInput8W *iface; + const WCHAR *username; + DWORD flags; + + DIDEVICEINSTANCEW *instances; + DWORD instance_count; +}; + +static BOOL CALLBACK enum_device_by_semantics( const DIDEVICEINSTANCEW *instance, void *context ) +{ + struct enum_device_by_semantics_params *params = context; + struct dinput *impl = impl_from_IDirectInput8W( params->iface ); + + if (should_enumerate_device( params->username, params->flags, &impl->device_players, &instance->guidInstance )) + { + params->instance_count++; + params->instances = realloc( params->instances, sizeof(DIDEVICEINSTANCEW) * params->instance_count ); + params->instances[params->instance_count - 1] = *instance; + } + + return DIENUM_CONTINUE; +} + +static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, const WCHAR *username, DIACTIONFORMATW *action_format, + LPDIENUMDEVICESBYSEMANTICSCBW callback, void *context, DWORD flags ) +{ + struct enum_device_by_semantics_params params = {.iface = iface, .username = username, .flags = flags}; + DWORD callbackFlags, enum_flags = DIEDFL_ATTACHEDONLY | (flags & DIEDFL_FORCEFEEDBACK); + static const GUID *guids[2] = {&GUID_SysKeyboard, &GUID_SysMouse}; + static const DWORD actionMasks[] = {DIKEYBOARD_MASK, DIMOUSE_MASK}; + struct dinput *impl = impl_from_IDirectInput8W( iface ); + DIDEVICEINSTANCEW didevi; + IDirectInputDevice8W *lpdid; + unsigned int i = 0; + HRESULT hr; + int remain; + + FIXME( "iface %p, username %s, action_format %p, callback %p, context %p, flags %#lx stub!\n", + iface, debugstr_w(username), action_format, callback, context, flags ); + + didevi.dwSize = sizeof(didevi); + + hr = IDirectInput8_EnumDevices( &impl->IDirectInput8W_iface, DI8DEVCLASS_GAMECTRL, + enum_device_by_semantics, &params, enum_flags ); + if (FAILED(hr)) + { + free( params.instances ); + return hr; + } + + remain = params.instance_count; + /* Add keyboard and mouse to remaining device count */ + if (!(flags & DIEDBSFL_FORCEFEEDBACK)) + { + for (i = 0; i < ARRAY_SIZE(guids); i++) + { + if (should_enumerate_device( username, flags, &impl->device_players, guids[i] )) remain++; + } + } + + for (i = 0; i < params.instance_count; i++) + { + callbackFlags = diactionformat_priorityW( action_format, action_format->dwGenre ); + IDirectInput_CreateDevice( iface, &params.instances[i].guidInstance, &lpdid, NULL ); + + if (callback( &params.instances[i], lpdid, callbackFlags, --remain, context ) == DIENUM_STOP) + { + free( params.instances ); + IDirectInputDevice_Release( lpdid ); + return DI_OK; + } + IDirectInputDevice_Release( lpdid ); + } + + free( params.instances ); + + if (flags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; + + /* Enumerate keyboard and mouse */ + for (i = 0; i < ARRAY_SIZE(guids); i++) + { + if (should_enumerate_device( username, flags, &impl->device_players, guids[i] )) + { + callbackFlags = diactionformat_priorityW( action_format, actionMasks[i] ); + + IDirectInput_CreateDevice( iface, guids[i], &lpdid, NULL ); + IDirectInputDevice_GetDeviceInfo( lpdid, &didevi ); + + if (callback( &didevi, lpdid, callbackFlags, --remain, context ) == DIENUM_STOP) + { + IDirectInputDevice_Release( lpdid ); + return DI_OK; + } + IDirectInputDevice_Release( lpdid ); + } + } + + return DI_OK; +} + +static HRESULT WINAPI dinput8_ConfigureDevices( IDirectInput8W *iface, LPDICONFIGUREDEVICESCALLBACK callback, + DICONFIGUREDEVICESPARAMSW *params, DWORD flags, void *context ) +{ + FIXME( "iface %p, callback %p, params %p, flags %#lx, context %p stub!\n", iface, callback, + params, flags, context ); + + /* Call helper function in config.c to do the real work */ + return _configure_devices( iface, callback, params, flags, context ); +} + +static inline struct dinput *impl_from_IDirectInputJoyConfig8( IDirectInputJoyConfig8 *iface ) +{ + return CONTAINING_RECORD( iface, struct dinput, IDirectInputJoyConfig8_iface ); +} + +static HRESULT WINAPI joy_config_QueryInterface( IDirectInputJoyConfig8 *iface, REFIID iid, void **out ) +{ + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); + return IDirectInput7_QueryInterface( &impl->IDirectInput7W_iface, iid, out ); +} + +static ULONG WINAPI joy_config_AddRef( IDirectInputJoyConfig8 *iface ) +{ + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); + return IDirectInput7_AddRef( &impl->IDirectInput7W_iface ); +} + +static ULONG WINAPI joy_config_Release( IDirectInputJoyConfig8 *iface ) +{ + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); + return IDirectInput7_Release( &impl->IDirectInput7W_iface ); +} + +static HRESULT WINAPI joy_config_Acquire( IDirectInputJoyConfig8 *iface ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_Unacquire( IDirectInputJoyConfig8 *iface ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_SetCooperativeLevel( IDirectInputJoyConfig8 *iface, HWND hwnd, DWORD flags ) +{ + FIXME( "iface %p, hwnd %p, flags %#lx stub!\n", iface, hwnd, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_SendNotify( IDirectInputJoyConfig8 *iface ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_EnumTypes( IDirectInputJoyConfig8 *iface, LPDIJOYTYPECALLBACK callback, void *context ) +{ + FIXME( "iface %p, callback %p, context %p stub!\n", iface, callback, context ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_GetTypeInfo( IDirectInputJoyConfig8 *iface, const WCHAR *name, + DIJOYTYPEINFO *info, DWORD flags ) +{ + FIXME( "iface %p, name %s, info %p, flags %#lx stub!\n", iface, debugstr_w(name), info, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_SetTypeInfo( IDirectInputJoyConfig8 *iface, const WCHAR *name, + const DIJOYTYPEINFO *info, DWORD flags, WCHAR *new_name ) +{ + FIXME( "iface %p, name %s, info %p, flags %#lx, new_name %s stub!\n", iface, debugstr_w(name), + info, flags, debugstr_w(new_name) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_DeleteType( IDirectInputJoyConfig8 *iface, const WCHAR *name ) +{ + FIXME( "iface %p, name %s stub!\n", iface, debugstr_w(name) ); + return E_NOTIMPL; +} + +struct find_device_from_index_params +{ + UINT index; + DIDEVICEINSTANCEW instance; +}; + +static BOOL CALLBACK find_device_from_index( const DIDEVICEINSTANCEW *instance, void *context ) +{ + struct find_device_from_index_params *params = context; + params->instance = *instance; + if (!params->index--) return DIENUM_STOP; + return DIENUM_CONTINUE; +} + +static HRESULT WINAPI joy_config_GetConfig( IDirectInputJoyConfig8 *iface, UINT id, DIJOYCONFIG *info, DWORD flags ) +{ + struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); + struct find_device_from_index_params params = {.index = id}; + HRESULT hr; + + FIXME( "iface %p, id %u, info %p, flags %#lx stub!\n", iface, id, info, flags ); + +#define X(x) if (flags & x) FIXME("\tflags |= "#x"\n"); + X(DIJC_GUIDINSTANCE) + X(DIJC_REGHWCONFIGTYPE) + X(DIJC_GAIN) + X(DIJC_CALLOUT) +#undef X + + hr = IDirectInput8_EnumDevices( &impl->IDirectInput8W_iface, DI8DEVCLASS_GAMECTRL, + find_device_from_index, &params, 0 ); + if (FAILED(hr)) return hr; + if (params.index != ~0) return DIERR_NOMOREITEMS; + if (flags & DIJC_GUIDINSTANCE) info->guidInstance = params.instance.guidInstance; + return DI_OK; +} + +static HRESULT WINAPI joy_config_SetConfig( IDirectInputJoyConfig8 *iface, UINT id, const DIJOYCONFIG *info, DWORD flags ) +{ + FIXME( "iface %p, id %u, info %p, flags %#lx stub!\n", iface, id, info, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_DeleteConfig( IDirectInputJoyConfig8 *iface, UINT id ) +{ + FIXME( "iface %p, id %u stub!\n", iface, id ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_GetUserValues( IDirectInputJoyConfig8 *iface, DIJOYUSERVALUES *info, DWORD flags ) +{ + FIXME( "iface %p, info %p, flags %#lx stub!\n", iface, info, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_SetUserValues( IDirectInputJoyConfig8 *iface, const DIJOYUSERVALUES *info, DWORD flags ) +{ + FIXME( "iface %p, info %p, flags %#lx stub!\n", iface, info, flags ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_AddNewHardware( IDirectInputJoyConfig8 *iface, HWND hwnd, const GUID *guid ) +{ + FIXME( "iface %p, hwnd %p, guid %s stub!\n", iface, hwnd, debugstr_guid( guid ) ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_OpenTypeKey( IDirectInputJoyConfig8 *iface, const WCHAR *name, DWORD security, HKEY *key ) +{ + FIXME( "iface %p, name %s, security %lu, key %p stub!\n", iface, debugstr_w(name), security, key ); + return E_NOTIMPL; +} + +static HRESULT WINAPI joy_config_OpenAppStatusKey( IDirectInputJoyConfig8 *iface, HKEY *key ) +{ + FIXME( "iface %p, key %p stub!\n", iface, key ); + return E_NOTIMPL; +} + +static const IDirectInput7WVtbl dinput7_vtbl = +{ + dinput7_QueryInterface, + dinput7_AddRef, + dinput7_Release, + dinput7_CreateDevice, + dinput7_EnumDevices, + dinput7_GetDeviceStatus, + dinput7_RunControlPanel, + dinput7_Initialize, + dinput7_FindDevice, + dinput7_CreateDeviceEx, +}; + +static const IDirectInput8WVtbl dinput8_vtbl = +{ + dinput8_QueryInterface, + dinput8_AddRef, + dinput8_Release, + dinput8_CreateDevice, + dinput8_EnumDevices, + dinput8_GetDeviceStatus, + dinput8_RunControlPanel, + dinput8_Initialize, + dinput8_FindDevice, + dinput8_EnumDevicesBySemantics, + dinput8_ConfigureDevices, +}; + +static const IDirectInputJoyConfig8Vtbl joy_config_vtbl = +{ + joy_config_QueryInterface, + joy_config_AddRef, + joy_config_Release, + joy_config_Acquire, + joy_config_Unacquire, + joy_config_SetCooperativeLevel, + joy_config_SendNotify, + joy_config_EnumTypes, + joy_config_GetTypeInfo, + joy_config_SetTypeInfo, + joy_config_DeleteType, + joy_config_GetConfig, + joy_config_SetConfig, + joy_config_DeleteConfig, + joy_config_GetUserValues, + joy_config_SetUserValues, + joy_config_AddNewHardware, + joy_config_OpenTypeKey, + joy_config_OpenAppStatusKey, +}; + +static HRESULT dinput_create( IUnknown **out ) +{ + struct dinput *impl; + + if (!(impl = calloc( 1, sizeof(struct dinput) ))) return E_OUTOFMEMORY; + impl->IDirectInput7A_iface.lpVtbl = &dinput7_a_vtbl; + impl->IDirectInput7W_iface.lpVtbl = &dinput7_vtbl; + impl->IDirectInput8A_iface.lpVtbl = &dinput8_a_vtbl; + impl->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; + impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; + impl->ref = 1; + + list_init( &impl->device_players ); + +#if DIRECTINPUT_VERSION == 0x0700 + *out = (IUnknown *)&impl->IDirectInput7W_iface; +#else + *out = (IUnknown *)&impl->IDirectInput8W_iface; +#endif + return DI_OK; +} + +struct class_factory +{ + IClassFactory IClassFactory_iface; +}; + +static inline struct class_factory *impl_from_IClassFactory( IClassFactory *iface ) +{ + return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface ); +} + +static HRESULT WINAPI class_factory_QueryInterface( IClassFactory *iface, REFIID iid, void **out ) +{ + struct class_factory *impl = impl_from_IClassFactory( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IClassFactory )) + *out = &impl->IClassFactory_iface; + else + { + *out = NULL; + WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + return E_NOINTERFACE; + } + + IUnknown_AddRef( (IUnknown *)*out ); + return S_OK; +} + +static ULONG WINAPI class_factory_AddRef( IClassFactory *iface ) +{ + return 2; +} + +static ULONG WINAPI class_factory_Release( IClassFactory *iface ) +{ + return 1; +} + +static HRESULT WINAPI class_factory_CreateInstance( IClassFactory *iface, IUnknown *outer, REFIID iid, void **out ) +{ + IUnknown *unknown; + HRESULT hr; + + TRACE( "iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid( iid ), out ); + + if (outer) return CLASS_E_NOAGGREGATION; + + if (FAILED(hr = dinput_create( &unknown ))) return hr; + hr = IUnknown_QueryInterface( unknown, iid, out ); + IUnknown_Release( unknown ); + + return hr; +} + +static HRESULT WINAPI class_factory_LockServer( IClassFactory *iface, BOOL lock ) +{ + FIXME( "iface %p, lock %d stub!\n", iface, lock ); + return S_OK; +} + +static const IClassFactoryVtbl class_factory_vtbl = +{ + class_factory_QueryInterface, + class_factory_AddRef, + class_factory_Release, + class_factory_CreateInstance, + class_factory_LockServer, +}; + +static struct class_factory class_factory = {{&class_factory_vtbl}}; + +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **out ) +{ + TRACE( "clsid %s, iid %s, out %p.\n", debugstr_guid( clsid ), debugstr_guid( iid ), out ); + +#if DIRECTINPUT_VERSION == 0x0700 + if (IsEqualCLSID( &CLSID_DirectInput, clsid )) + return IClassFactory_QueryInterface( &class_factory.IClassFactory_iface, iid, out ); +#else + if (IsEqualCLSID( &CLSID_DirectInput8, clsid )) + return IClassFactory_QueryInterface( &class_factory.IClassFactory_iface, iid, out ); +#endif + + WARN( "%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid( clsid ) ); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) +{ + IUnknown *unknown; + HRESULT hr; + + TRACE( "hinst %p, version %#lx, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); + + if (!IsEqualGUID( &IID_IDirectInputA, iid ) && + !IsEqualGUID( &IID_IDirectInputW, iid ) && + !IsEqualGUID( &IID_IDirectInput2A, iid ) && + !IsEqualGUID( &IID_IDirectInput2W, iid ) && + !IsEqualGUID( &IID_IDirectInput7A, iid ) && + !IsEqualGUID( &IID_IDirectInput7W, iid )) + return DIERR_NOINTERFACE; + + if (FAILED(hr = dinput_create( &unknown ))) return hr; + hr = IUnknown_QueryInterface( unknown, iid, out ); + IUnknown_Release( unknown ); + if (FAILED(hr)) return hr; + + if (outer || FAILED(hr = IDirectInput7_Initialize( (IDirectInput7W *)unknown, hinst, version ))) + { + IUnknown_Release( unknown ); + *out = NULL; + return hr; + } + + return DI_OK; +} + +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) +{ + IUnknown *unknown; + HRESULT hr; + + TRACE( "hinst %p, version %#lx, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); + + if (!out) return E_POINTER; + + if (!IsEqualGUID( &IID_IDirectInput8A, iid ) && + !IsEqualGUID( &IID_IDirectInput8W, iid ) && + !IsEqualGUID( &IID_IUnknown, iid )) + { + *out = NULL; + return DIERR_NOINTERFACE; + } + + if (FAILED(hr = dinput_create( &unknown ))) return hr; + hr = IUnknown_QueryInterface( unknown, iid, out ); + IUnknown_Release( unknown ); + if (FAILED(hr)) return hr; + + if (outer || FAILED(hr = IDirectInput8_Initialize( (IDirectInput8W *)unknown, hinst, version ))) + { + IUnknown_Release( (IUnknown *)unknown ); + *out = NULL; + return hr; + } + + return S_OK; +} + +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA( HINSTANCE hinst, DWORD version, IDirectInputA **out, IUnknown *outer ) +{ + return DirectInputCreateEx( hinst, version, &IID_IDirectInput7A, (void **)out, outer ); +} + +HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW( HINSTANCE hinst, DWORD version, IDirectInputW **out, IUnknown *outer ) +{ + return DirectInputCreateEx( hinst, version, &IID_IDirectInput7W, (void **)out, outer ); +} diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index b4c78036877..19bdf07975d 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -46,20 +46,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(dinput);

-static const IDirectInput7WVtbl dinput7_vtbl; -static const IDirectInput8WVtbl dinput8_vtbl; -static const IDirectInputJoyConfig8Vtbl joy_config_vtbl; - -static inline struct dinput *impl_from_IDirectInput7W( IDirectInput7W *iface ) -{ - return CONTAINING_RECORD( iface, struct dinput, IDirectInput7W_iface ); -} - -static inline struct dinput *impl_from_IDirectInput8W( IDirectInput8W *iface ) -{ - return CONTAINING_RECORD( iface, struct dinput, IDirectInput8W_iface ); -} - static inline struct dinput_device *impl_from_IDirectInputDevice8W( IDirectInputDevice8W *iface ) { return CONTAINING_RECORD( iface, struct dinput_device, IDirectInputDevice8W_iface ); @@ -125,233 +111,6 @@ static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface ) LeaveCriticalSection( &impl->crit ); }

-static HRESULT dinput_create( IUnknown **out ) -{ - struct dinput *impl; - - if (!(impl = calloc( 1, sizeof(struct dinput) ))) return E_OUTOFMEMORY; - impl->IDirectInput7A_iface.lpVtbl = &dinput7_a_vtbl; - impl->IDirectInput7W_iface.lpVtbl = &dinput7_vtbl; - impl->IDirectInput8A_iface.lpVtbl = &dinput8_a_vtbl; - impl->IDirectInput8W_iface.lpVtbl = &dinput8_vtbl; - impl->IDirectInputJoyConfig8_iface.lpVtbl = &joy_config_vtbl; - impl->ref = 1; - - list_init( &impl->device_players ); - -#if DIRECTINPUT_VERSION == 0x0700 - *out = (IUnknown *)&impl->IDirectInput7W_iface; -#else - *out = (IUnknown *)&impl->IDirectInput8W_iface; -#endif - return DI_OK; -} - -HRESULT WINAPI DirectInputCreateEx( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) -{ - IUnknown *unknown; - HRESULT hr; - - TRACE( "hinst %p, version %#lx, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); - - if (!IsEqualGUID( &IID_IDirectInputA, iid ) && - !IsEqualGUID( &IID_IDirectInputW, iid ) && - !IsEqualGUID( &IID_IDirectInput2A, iid ) && - !IsEqualGUID( &IID_IDirectInput2W, iid ) && - !IsEqualGUID( &IID_IDirectInput7A, iid ) && - !IsEqualGUID( &IID_IDirectInput7W, iid )) - return DIERR_NOINTERFACE; - - if (FAILED(hr = dinput_create( &unknown ))) return hr; - hr = IUnknown_QueryInterface( unknown, iid, out ); - IUnknown_Release( unknown ); - if (FAILED(hr)) return hr; - - if (outer || FAILED(hr = IDirectInput7_Initialize( (IDirectInput7W *)unknown, hinst, version ))) - { - IUnknown_Release( unknown ); - *out = NULL; - return hr; - } - - return DI_OK; -} - -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInput8Create( HINSTANCE hinst, DWORD version, REFIID iid, void **out, IUnknown *outer ) -{ - IUnknown *unknown; - HRESULT hr; - - TRACE( "hinst %p, version %#lx, iid %s, out %p, outer %p.\n", hinst, version, debugstr_guid( iid ), out, outer ); - - if (!out) return E_POINTER; - - if (!IsEqualGUID( &IID_IDirectInput8A, iid ) && - !IsEqualGUID( &IID_IDirectInput8W, iid ) && - !IsEqualGUID( &IID_IUnknown, iid )) - { - *out = NULL; - return DIERR_NOINTERFACE; - } - - if (FAILED(hr = dinput_create( &unknown ))) return hr; - hr = IUnknown_QueryInterface( unknown, iid, out ); - IUnknown_Release( unknown ); - if (FAILED(hr)) return hr; - - if (outer || FAILED(hr = IDirectInput8_Initialize( (IDirectInput8W *)unknown, hinst, version ))) - { - IUnknown_Release( (IUnknown *)unknown ); - *out = NULL; - return hr; - } - - return S_OK; -} - -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateA( HINSTANCE hinst, DWORD version, IDirectInputA **out, IUnknown *outer ) -{ - return DirectInputCreateEx( hinst, version, &IID_IDirectInput7A, (void **)out, outer ); -} - -HRESULT WINAPI DECLSPEC_HOTPATCH DirectInputCreateW( HINSTANCE hinst, DWORD version, IDirectInputW **out, IUnknown *outer ) -{ - return DirectInputCreateEx( hinst, version, &IID_IDirectInput7W, (void **)out, outer ); -} - -static DWORD diactionformat_priorityW( DIACTIONFORMATW *action_format, DWORD genre ) -{ - int i; - DWORD priorityFlags = 0; - - /* If there's at least one action for the device it's priority 1 */ - for (i = 0; i < action_format->dwNumActions; i++) - if ((action_format->rgoAction[i].dwSemantic & genre) == genre) - priorityFlags |= DIEDBS_MAPPEDPRI1; - - return priorityFlags; -} - -#if defined __i386__ && defined _MSC_VER -__declspec(naked) BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref) -{ - __asm - { - push ebp - mov ebp, esp - push [ebp+16] - push [ebp+12] - call [ebp+8] - leave - ret - } -} -#elif defined __i386__ && defined __GNUC__ -extern BOOL enum_callback_wrapper(void *callback, const void *instance, void *ref); -__ASM_GLOBAL_FUNC( enum_callback_wrapper, - "pushl %ebp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") - "movl %esp,%ebp\n\t" - __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "pushl 16(%ebp)\n\t" - "pushl 12(%ebp)\n\t" - "call *8(%ebp)\n\t" - "leave\n\t" - __ASM_CFI(".cfi_def_cfa %esp,4\n\t") - __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret" ) -#else -#define enum_callback_wrapper(callback, instance, ref) (callback)((instance), (ref)) -#endif - -static HRESULT WINAPI dinput7_EnumDevices( IDirectInput7W *iface, DWORD type, LPDIENUMDEVICESCALLBACKW callback, - void *context, DWORD flags ) -{ - struct dinput *impl = impl_from_IDirectInput7W( iface ); - - TRACE( "iface %p, type %#lx, callback %p, context %p, flags %#lx.\n", iface, type, callback, context, flags ); - - if (!callback) return DIERR_INVALIDPARAM; - - if (type > DIDEVTYPE_JOYSTICK) return DIERR_INVALIDPARAM; - if (flags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | DIEDFL_INCLUDEPHANTOMS)) - return DIERR_INVALIDPARAM; - - return IDirectInput8_EnumDevices( &impl->IDirectInput8W_iface, type, callback, context, flags ); -} - -static ULONG WINAPI dinput7_AddRef( IDirectInput7W *iface ) -{ - struct dinput *impl = impl_from_IDirectInput7W( iface ); - ULONG ref = InterlockedIncrement( &impl->ref ); - TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); - return ref; -} - -static ULONG WINAPI dinput7_Release( IDirectInput7W *iface ) -{ - struct dinput *impl = impl_from_IDirectInput7W( iface ); - ULONG ref = InterlockedDecrement( &impl->ref ); - - TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); - - if (ref == 0) - { - struct DevicePlayer *device_player, *device_player2; - - LIST_FOR_EACH_ENTRY_SAFE( device_player, device_player2, &impl->device_players, struct DevicePlayer, entry ) - free( device_player ); - - free( impl ); - } - - return ref; -} - -static HRESULT WINAPI dinput7_QueryInterface( IDirectInput7W *iface, REFIID iid, void **out ) -{ - struct dinput *impl = impl_from_IDirectInput7W( iface ); - - TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); - - if (!iid || !out) return E_POINTER; - - *out = NULL; - -#if DIRECTINPUT_VERSION == 0x0700 - if (IsEqualGUID( &IID_IDirectInputA, iid ) || - IsEqualGUID( &IID_IDirectInput2A, iid ) || - IsEqualGUID( &IID_IDirectInput7A, iid )) - *out = &impl->IDirectInput7A_iface; - else if (IsEqualGUID( &IID_IUnknown, iid ) || - IsEqualGUID( &IID_IDirectInputW, iid ) || - IsEqualGUID( &IID_IDirectInput2W, iid ) || - IsEqualGUID( &IID_IDirectInput7W, iid )) - *out = &impl->IDirectInput7W_iface; - -#else - if (IsEqualGUID( &IID_IDirectInput8A, iid )) - *out = &impl->IDirectInput8A_iface; - else if (IsEqualGUID( &IID_IUnknown, iid ) || - IsEqualGUID( &IID_IDirectInput8W, iid )) - *out = &impl->IDirectInput8W_iface; - -#endif - - if (IsEqualGUID( &IID_IDirectInputJoyConfig8, iid )) - *out = &impl->IDirectInputJoyConfig8_iface; - - if (*out) - { - IUnknown_AddRef( (IUnknown *)*out ); - return DI_OK; - } - - WARN( "Unsupported interface: %s\n", debugstr_guid( iid ) ); - return E_NOINTERFACE; -} - static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { struct dinput_device *impl; @@ -398,703 +157,6 @@ static void unregister_di_em_win_class(void) WARN( "Unable to unregister message window class\n" ); }

-enum directinput_versions -{ - DIRECTINPUT_VERSION_300 = 0x0300, - DIRECTINPUT_VERSION_500 = 0x0500, - DIRECTINPUT_VERSION_50A = 0x050A, - DIRECTINPUT_VERSION_5B2 = 0x05B2, - DIRECTINPUT_VERSION_602 = 0x0602, - DIRECTINPUT_VERSION_61A = 0x061A, - DIRECTINPUT_VERSION_700 = 0x0700, -}; - -static HRESULT WINAPI dinput7_Initialize( IDirectInput7W *iface, HINSTANCE hinst, DWORD version ) -{ - struct dinput *impl = impl_from_IDirectInput7W( iface ); - - TRACE( "iface %p, hinst %p, version %#lx.\n", iface, hinst, version ); - - if (!hinst) - return DIERR_INVALIDPARAM; - else if (version == 0) - return DIERR_NOTINITIALIZED; - else if (version > DIRECTINPUT_VERSION_700) - return DIERR_OLDDIRECTINPUTVERSION; - else if (version != DIRECTINPUT_VERSION_300 && version != DIRECTINPUT_VERSION_500 && - version != DIRECTINPUT_VERSION_50A && version != DIRECTINPUT_VERSION_5B2 && - version != DIRECTINPUT_VERSION_602 && version != DIRECTINPUT_VERSION_61A && - version != DIRECTINPUT_VERSION_700 && version != DIRECTINPUT_VERSION) - return DIERR_BETADIRECTINPUTVERSION; - - if (!impl->dwVersion) - { - impl->dwVersion = version; - impl->evsequence = 1; - } - - return DI_OK; -} - -static HRESULT WINAPI dinput7_GetDeviceStatus( IDirectInput7W *iface, const GUID *guid ) -{ - struct dinput *impl = impl_from_IDirectInput7W( iface ); - HRESULT hr; - IDirectInputDeviceW *device; - - TRACE( "iface %p, guid %s.\n", iface, debugstr_guid( guid ) ); - - if (!guid) return E_POINTER; - if (!impl->dwVersion) return DIERR_NOTINITIALIZED; - - hr = IDirectInput_CreateDevice( iface, guid, &device, NULL ); - if (hr != DI_OK) return DI_NOTATTACHED; - - IUnknown_Release( device ); - - return DI_OK; -} - -static HRESULT WINAPI dinput7_RunControlPanel( IDirectInput7W *iface, HWND owner, DWORD flags ) -{ - struct dinput *impl = impl_from_IDirectInput7W( iface ); - WCHAR control_exe[] = {L"control.exe"}; - STARTUPINFOW si = {0}; - PROCESS_INFORMATION pi; - - TRACE( "iface %p, owner %p, flags %#lx.\n", iface, owner, flags ); - - if (owner && !IsWindow( owner )) return E_HANDLE; - if (flags) return DIERR_INVALIDPARAM; - if (!impl->dwVersion) return DIERR_NOTINITIALIZED; - - if (!CreateProcessW( NULL, control_exe, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi )) - return HRESULT_FROM_WIN32(GetLastError()); - - return DI_OK; -} - -static HRESULT WINAPI dinput7_FindDevice( IDirectInput7W *iface, const GUID *guid, const WCHAR *name, GUID *instance_guid ) -{ - FIXME( "iface %p, guid %s, name %s, instance_guid %s stub!\n", iface, debugstr_guid( guid ), - debugstr_w(name), debugstr_guid( instance_guid ) ); - return DI_OK; -} - -static HRESULT WINAPI dinput7_CreateDeviceEx( IDirectInput7W *iface, const GUID *guid, - REFIID iid, void **out, IUnknown *outer ) -{ - struct dinput *impl = impl_from_IDirectInput7W( iface ); - IDirectInputDevice8W *device; - HRESULT hr; - - TRACE( "iface %p, guid %s, iid %s, out %p, outer %p.\n", iface, debugstr_guid( guid ), - debugstr_guid( iid ), out, outer ); - - if (!out) return E_POINTER; - *out = NULL; - - if (!guid) return E_POINTER; - if (!impl->dwVersion) return DIERR_NOTINITIALIZED; - - if (IsEqualGUID( &GUID_SysKeyboard, guid )) hr = keyboard_create_device( impl, guid, &device ); - else if (IsEqualGUID( &GUID_SysMouse, guid )) hr = mouse_create_device( impl, guid, &device ); - else hr = hid_joystick_create_device( impl, guid, &device ); - - if (FAILED(hr)) return hr; - - if (FAILED(hr = dinput_device_init_device_format( device ))) - { - IDirectInputDevice8_Release( device ); - return hr; - } - - hr = IDirectInputDevice8_QueryInterface( device, iid, out ); - IDirectInputDevice8_Release( device ); - return hr; -} - -static HRESULT WINAPI dinput7_CreateDevice( IDirectInput7W *iface, const GUID *guid, - IDirectInputDeviceW **out, IUnknown *outer ) -{ - return IDirectInput7_CreateDeviceEx( iface, guid, &IID_IDirectInputDeviceW, (void **)out, outer ); -} - -static ULONG WINAPI dinput8_AddRef( IDirectInput8W *iface ) -{ - struct dinput *impl = impl_from_IDirectInput8W( iface ); - return IDirectInput7_AddRef( &impl->IDirectInput7W_iface ); -} - -static HRESULT WINAPI dinput8_QueryInterface( IDirectInput8W *iface, REFIID iid, void **out ) -{ - struct dinput *impl = impl_from_IDirectInput8W( iface ); - return IDirectInput7_QueryInterface( &impl->IDirectInput7W_iface, iid, out ); -} - -static ULONG WINAPI dinput8_Release( IDirectInput8W *iface ) -{ - struct dinput *impl = impl_from_IDirectInput8W( iface ); - return IDirectInput7_Release( &impl->IDirectInput7W_iface ); -} - -static HRESULT WINAPI dinput8_CreateDevice( IDirectInput8W *iface, const GUID *guid, - IDirectInputDevice8W **out, IUnknown *outer ) -{ - struct dinput *impl = impl_from_IDirectInput8W( iface ); - return IDirectInput7_CreateDeviceEx( &impl->IDirectInput7W_iface, guid, - &IID_IDirectInputDevice8W, (void **)out, outer ); -} - -static BOOL try_enum_device( DWORD type, LPDIENUMDEVICESCALLBACKW callback, - DIDEVICEINSTANCEW *instance, void *context, DWORD flags ) -{ - if (type && (instance->dwDevType & 0xff) != type) return DIENUM_CONTINUE; - if ((flags & DIEDFL_FORCEFEEDBACK) && IsEqualGUID( &instance->guidFFDriver, &GUID_NULL )) - return DIENUM_CONTINUE; - return enum_callback_wrapper( callback, instance, context ); -} - -static HRESULT WINAPI dinput8_EnumDevices( IDirectInput8W *iface, DWORD type, LPDIENUMDEVICESCALLBACKW callback, void *context, - DWORD flags ) -{ - DIDEVICEINSTANCEW instance = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; - struct dinput *impl = impl_from_IDirectInput8W( iface ); - DWORD device_class = 0, device_type = 0; - unsigned int i = 0; - HRESULT hr; - - TRACE( "iface %p, type %#lx, callback %p, context %p, flags %#lx.\n", iface, type, callback, context, flags ); - - if (!callback) return DIERR_INVALIDPARAM; - - if ((type > DI8DEVCLASS_GAMECTRL && type < DI8DEVTYPE_DEVICE) || type > DI8DEVTYPE_SUPPLEMENTAL) - return DIERR_INVALIDPARAM; - if (flags & ~(DIEDFL_ATTACHEDONLY | DIEDFL_FORCEFEEDBACK | DIEDFL_INCLUDEALIASES | - DIEDFL_INCLUDEPHANTOMS | DIEDFL_INCLUDEHIDDEN)) - return DIERR_INVALIDPARAM; - - if (!impl->dwVersion) return DIERR_NOTINITIALIZED; - - if (type <= DI8DEVCLASS_GAMECTRL) device_class = type; - else device_type = type; - - if (device_class == DI8DEVCLASS_ALL || device_class == DI8DEVCLASS_POINTER) - { - hr = mouse_enum_device( type, flags, &instance, impl->dwVersion ); - if (hr == DI_OK && try_enum_device( device_type, callback, &instance, context, flags ) == DIENUM_STOP) - return DI_OK; - } - - if (device_class == DI8DEVCLASS_ALL || device_class == DI8DEVCLASS_KEYBOARD) - { - hr = keyboard_enum_device( type, flags, &instance, impl->dwVersion ); - if (hr == DI_OK && try_enum_device( device_type, callback, &instance, context, flags ) == DIENUM_STOP) - return DI_OK; - } - - if (device_class == DI8DEVCLASS_ALL || device_class == DI8DEVCLASS_GAMECTRL) - { - do - { - hr = hid_joystick_enum_device( type, flags, &instance, impl->dwVersion, i++ ); - if (hr == DI_OK && try_enum_device( device_type, callback, &instance, context, flags ) == DIENUM_STOP) - return DI_OK; - } while (SUCCEEDED(hr)); - } - - return DI_OK; -} - -static HRESULT WINAPI dinput8_GetDeviceStatus( IDirectInput8W *iface, const GUID *guid ) -{ - struct dinput *impl = impl_from_IDirectInput8W( iface ); - return IDirectInput7_GetDeviceStatus( &impl->IDirectInput7W_iface, guid ); -} - -static HRESULT WINAPI dinput8_RunControlPanel( IDirectInput8W *iface, HWND owner, DWORD flags ) -{ - struct dinput *impl = impl_from_IDirectInput8W( iface ); - return IDirectInput7_RunControlPanel( &impl->IDirectInput7W_iface, owner, flags ); -} - -static HRESULT WINAPI dinput8_Initialize( IDirectInput8W *iface, HINSTANCE hinst, DWORD version ) -{ - struct dinput *impl = impl_from_IDirectInput8W( iface ); - - TRACE( "iface %p, hinst %p, version %#lx.\n", iface, hinst, version ); - - if (!hinst) - return DIERR_INVALIDPARAM; - else if (version == 0) - return DIERR_NOTINITIALIZED; - else if (version < DIRECTINPUT_VERSION) - return DIERR_BETADIRECTINPUTVERSION; - else if (version > DIRECTINPUT_VERSION) - return DIERR_OLDDIRECTINPUTVERSION; - - if (!impl->dwVersion) - { - impl->dwVersion = version; - impl->evsequence = 1; - } - - return DI_OK; -} - -static HRESULT WINAPI dinput8_FindDevice( IDirectInput8W *iface, const GUID *guid, const WCHAR *name, GUID *instance_guid ) -{ - struct dinput *impl = impl_from_IDirectInput8W( iface ); - return IDirectInput7_FindDevice( &impl->IDirectInput7W_iface, guid, name, instance_guid ); -} - -static BOOL should_enumerate_device( const WCHAR *username, DWORD flags, struct list *device_players, const GUID *guid ) -{ - BOOL should_enumerate = TRUE; - struct DevicePlayer *device_player; - - /* Check if user owns impl device */ - if (flags & DIEDBSFL_THISUSER && username && *username) - { - should_enumerate = FALSE; - LIST_FOR_EACH_ENTRY(device_player, device_players, struct DevicePlayer, entry) - { - if (IsEqualGUID(&device_player->instance_guid, guid)) - { - if (*device_player->username && !wcscmp( username, device_player->username )) - return TRUE; /* Device username matches */ - break; - } - } - } - - /* Check if impl device is not owned by anyone */ - if (flags & DIEDBSFL_AVAILABLEDEVICES) - { - BOOL found = FALSE; - should_enumerate = FALSE; - LIST_FOR_EACH_ENTRY(device_player, device_players, struct DevicePlayer, entry) - { - if (IsEqualGUID(&device_player->instance_guid, guid)) - { - if (*device_player->username) - found = TRUE; - break; - } - } - if (!found) - return TRUE; /* Device does not have a username */ - } - - return should_enumerate; -} - -struct enum_device_by_semantics_params -{ - IDirectInput8W *iface; - const WCHAR *username; - DWORD flags; - - DIDEVICEINSTANCEW *instances; - DWORD instance_count; -}; - -static BOOL CALLBACK enum_device_by_semantics( const DIDEVICEINSTANCEW *instance, void *context ) -{ - struct enum_device_by_semantics_params *params = context; - struct dinput *impl = impl_from_IDirectInput8W( params->iface ); - - if (should_enumerate_device( params->username, params->flags, &impl->device_players, &instance->guidInstance )) - { - params->instance_count++; - params->instances = realloc( params->instances, sizeof(DIDEVICEINSTANCEW) * params->instance_count ); - params->instances[params->instance_count - 1] = *instance; - } - - return DIENUM_CONTINUE; -} - -static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, const WCHAR *username, DIACTIONFORMATW *action_format, - LPDIENUMDEVICESBYSEMANTICSCBW callback, void *context, DWORD flags ) -{ - struct enum_device_by_semantics_params params = {.iface = iface, .username = username, .flags = flags}; - DWORD callbackFlags, enum_flags = DIEDFL_ATTACHEDONLY | (flags & DIEDFL_FORCEFEEDBACK); - static const GUID *guids[2] = {&GUID_SysKeyboard, &GUID_SysMouse}; - static const DWORD actionMasks[] = { DIKEYBOARD_MASK, DIMOUSE_MASK }; - struct dinput *impl = impl_from_IDirectInput8W( iface ); - DIDEVICEINSTANCEW didevi; - IDirectInputDevice8W *lpdid; - unsigned int i = 0; - HRESULT hr; - int remain; - - FIXME( "iface %p, username %s, action_format %p, callback %p, context %p, flags %#lx stub!\n", - iface, debugstr_w(username), action_format, callback, context, flags ); - - didevi.dwSize = sizeof(didevi); - - hr = IDirectInput8_EnumDevices( &impl->IDirectInput8W_iface, DI8DEVCLASS_GAMECTRL, - enum_device_by_semantics, &params, enum_flags ); - if (FAILED(hr)) - { - free( params.instances ); - return hr; - } - - remain = params.instance_count; - /* Add keyboard and mouse to remaining device count */ - if (!(flags & DIEDBSFL_FORCEFEEDBACK)) - { - for (i = 0; i < ARRAY_SIZE(guids); i++) - { - if (should_enumerate_device( username, flags, &impl->device_players, guids[i] )) remain++; - } - } - - for (i = 0; i < params.instance_count; i++) - { - callbackFlags = diactionformat_priorityW( action_format, action_format->dwGenre ); - IDirectInput_CreateDevice( iface, &params.instances[i].guidInstance, &lpdid, NULL ); - - if (callback( &params.instances[i], lpdid, callbackFlags, --remain, context ) == DIENUM_STOP) - { - free( params.instances ); - IDirectInputDevice_Release(lpdid); - return DI_OK; - } - IDirectInputDevice_Release(lpdid); - } - - free( params.instances ); - - if (flags & DIEDBSFL_FORCEFEEDBACK) return DI_OK; - - /* Enumerate keyboard and mouse */ - for (i = 0; i < ARRAY_SIZE(guids); i++) - { - if (should_enumerate_device( username, flags, &impl->device_players, guids[i] )) - { - callbackFlags = diactionformat_priorityW( action_format, actionMasks[i] ); - - IDirectInput_CreateDevice(iface, guids[i], &lpdid, NULL); - IDirectInputDevice_GetDeviceInfo(lpdid, &didevi); - - if (callback( &didevi, lpdid, callbackFlags, --remain, context ) == DIENUM_STOP) - { - IDirectInputDevice_Release(lpdid); - return DI_OK; - } - IDirectInputDevice_Release(lpdid); - } - } - - return DI_OK; -} - -static HRESULT WINAPI dinput8_ConfigureDevices( IDirectInput8W *iface, LPDICONFIGUREDEVICESCALLBACK callback, - DICONFIGUREDEVICESPARAMSW *params, DWORD flags, void *context ) -{ - FIXME( "iface %p, callback %p, params %p, flags %#lx, context %p stub!\n", iface, callback, - params, flags, context ); - - /* Call helper function in config.c to do the real work */ - return _configure_devices( iface, callback, params, flags, context ); -} - -static inline struct dinput *impl_from_IDirectInputJoyConfig8( IDirectInputJoyConfig8 *iface ) -{ - return CONTAINING_RECORD( iface, struct dinput, IDirectInputJoyConfig8_iface ); -} - -static HRESULT WINAPI joy_config_QueryInterface( IDirectInputJoyConfig8 *iface, REFIID iid, void **out ) -{ - struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); - return IDirectInput7_QueryInterface( &impl->IDirectInput7W_iface, iid, out ); -} - -static ULONG WINAPI joy_config_AddRef( IDirectInputJoyConfig8 *iface ) -{ - struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); - return IDirectInput7_AddRef( &impl->IDirectInput7W_iface ); -} - -static ULONG WINAPI joy_config_Release( IDirectInputJoyConfig8 *iface ) -{ - struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); - return IDirectInput7_Release( &impl->IDirectInput7W_iface ); -} - -static HRESULT WINAPI joy_config_Acquire( IDirectInputJoyConfig8 *iface ) -{ - FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_Unacquire( IDirectInputJoyConfig8 *iface ) -{ - FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_SetCooperativeLevel( IDirectInputJoyConfig8 *iface, HWND hwnd, DWORD flags ) -{ - FIXME( "iface %p, hwnd %p, flags %#lx stub!\n", iface, hwnd, flags ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_SendNotify( IDirectInputJoyConfig8 *iface ) -{ - FIXME( "iface %p stub!\n", iface ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_EnumTypes( IDirectInputJoyConfig8 *iface, LPDIJOYTYPECALLBACK callback, void *context ) -{ - FIXME( "iface %p, callback %p, context %p stub!\n", iface, callback, context ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_GetTypeInfo( IDirectInputJoyConfig8 *iface, const WCHAR *name, - DIJOYTYPEINFO *info, DWORD flags ) -{ - FIXME( "iface %p, name %s, info %p, flags %#lx stub!\n", iface, debugstr_w(name), info, flags ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_SetTypeInfo( IDirectInputJoyConfig8 *iface, const WCHAR *name, - const DIJOYTYPEINFO *info, DWORD flags, WCHAR *new_name ) -{ - FIXME( "iface %p, name %s, info %p, flags %#lx, new_name %s stub!\n", - iface, debugstr_w(name), info, flags, debugstr_w(new_name) ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_DeleteType( IDirectInputJoyConfig8 *iface, const WCHAR *name ) -{ - FIXME( "iface %p, name %s stub!\n", iface, debugstr_w(name) ); - return E_NOTIMPL; -} - -struct find_device_from_index_params -{ - UINT index; - DIDEVICEINSTANCEW instance; -}; - -static BOOL CALLBACK find_device_from_index( const DIDEVICEINSTANCEW *instance, void *context ) -{ - struct find_device_from_index_params *params = context; - params->instance = *instance; - if (!params->index--) return DIENUM_STOP; - return DIENUM_CONTINUE; -} - -static HRESULT WINAPI joy_config_GetConfig( IDirectInputJoyConfig8 *iface, UINT id, DIJOYCONFIG *info, DWORD flags ) -{ - struct dinput *impl = impl_from_IDirectInputJoyConfig8( iface ); - struct find_device_from_index_params params = {.index = id}; - HRESULT hr; - - FIXME( "iface %p, id %u, info %p, flags %#lx stub!\n", iface, id, info, flags ); - -#define X(x) if (flags & x) FIXME("\tflags |= "#x"\n"); - X(DIJC_GUIDINSTANCE) - X(DIJC_REGHWCONFIGTYPE) - X(DIJC_GAIN) - X(DIJC_CALLOUT) -#undef X - - hr = IDirectInput8_EnumDevices( &impl->IDirectInput8W_iface, DI8DEVCLASS_GAMECTRL, - find_device_from_index, &params, 0 ); - if (FAILED(hr)) return hr; - if (params.index != ~0) return DIERR_NOMOREITEMS; - if (flags & DIJC_GUIDINSTANCE) info->guidInstance = params.instance.guidInstance; - return DI_OK; -} - -static HRESULT WINAPI joy_config_SetConfig( IDirectInputJoyConfig8 *iface, UINT id, const DIJOYCONFIG *info, DWORD flags ) -{ - FIXME( "iface %p, id %u, info %p, flags %#lx stub!\n", iface, id, info, flags ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_DeleteConfig( IDirectInputJoyConfig8 *iface, UINT id ) -{ - FIXME( "iface %p, id %u stub!\n", iface, id ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_GetUserValues( IDirectInputJoyConfig8 *iface, DIJOYUSERVALUES *info, DWORD flags ) -{ - FIXME( "iface %p, info %p, flags %#lx stub!\n", iface, info, flags ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_SetUserValues( IDirectInputJoyConfig8 *iface, const DIJOYUSERVALUES *info, DWORD flags ) -{ - FIXME( "iface %p, info %p, flags %#lx stub!\n", iface, info, flags ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_AddNewHardware( IDirectInputJoyConfig8 *iface, HWND hwnd, const GUID *guid ) -{ - FIXME( "iface %p, hwnd %p, guid %s stub!\n", iface, hwnd, debugstr_guid( guid ) ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_OpenTypeKey( IDirectInputJoyConfig8 *iface, const WCHAR *name, DWORD security, HKEY *key ) -{ - FIXME( "iface %p, name %s, security %lu, key %p stub!\n", iface, debugstr_w(name), security, key ); - return E_NOTIMPL; -} - -static HRESULT WINAPI joy_config_OpenAppStatusKey( IDirectInputJoyConfig8 *iface, HKEY *key ) -{ - FIXME( "iface %p, key %p stub!\n", iface, key ); - return E_NOTIMPL; -} - -static const IDirectInput7WVtbl dinput7_vtbl = -{ - dinput7_QueryInterface, - dinput7_AddRef, - dinput7_Release, - dinput7_CreateDevice, - dinput7_EnumDevices, - dinput7_GetDeviceStatus, - dinput7_RunControlPanel, - dinput7_Initialize, - dinput7_FindDevice, - dinput7_CreateDeviceEx, -}; - -static const IDirectInput8WVtbl dinput8_vtbl = -{ - dinput8_QueryInterface, - dinput8_AddRef, - dinput8_Release, - dinput8_CreateDevice, - dinput8_EnumDevices, - dinput8_GetDeviceStatus, - dinput8_RunControlPanel, - dinput8_Initialize, - dinput8_FindDevice, - dinput8_EnumDevicesBySemantics, - dinput8_ConfigureDevices, -}; - -static const IDirectInputJoyConfig8Vtbl joy_config_vtbl = -{ - joy_config_QueryInterface, - joy_config_AddRef, - joy_config_Release, - joy_config_Acquire, - joy_config_Unacquire, - joy_config_SetCooperativeLevel, - joy_config_SendNotify, - joy_config_EnumTypes, - joy_config_GetTypeInfo, - joy_config_SetTypeInfo, - joy_config_DeleteType, - joy_config_GetConfig, - joy_config_SetConfig, - joy_config_DeleteConfig, - joy_config_GetUserValues, - joy_config_SetUserValues, - joy_config_AddNewHardware, - joy_config_OpenTypeKey, - joy_config_OpenAppStatusKey, -}; - -struct class_factory -{ - IClassFactory IClassFactory_iface; -}; - -static inline struct class_factory *impl_from_IClassFactory( IClassFactory *iface ) -{ - return CONTAINING_RECORD( iface, struct class_factory, IClassFactory_iface ); -} - -static HRESULT WINAPI class_factory_QueryInterface( IClassFactory *iface, REFIID iid, void **out ) -{ - struct class_factory *impl = impl_from_IClassFactory(iface); - - TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - - if (IsEqualGUID(iid, &IID_IUnknown) || - IsEqualGUID(iid, &IID_IClassFactory)) - *out = &impl->IClassFactory_iface; - else - { - *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; -} - -static ULONG WINAPI class_factory_AddRef( IClassFactory *iface ) -{ - return 2; -} - -static ULONG WINAPI class_factory_Release( IClassFactory *iface ) -{ - return 1; -} - -static HRESULT WINAPI class_factory_CreateInstance( IClassFactory *iface, IUnknown *outer, REFIID iid, void **out ) -{ - IUnknown *unknown; - HRESULT hr; - - TRACE( "iface %p, outer %p, iid %s, out %p.\n", iface, outer, debugstr_guid( iid ), out ); - - if (outer) return CLASS_E_NOAGGREGATION; - - if (FAILED(hr = dinput_create( &unknown ))) return hr; - hr = IUnknown_QueryInterface( unknown, iid, out ); - IUnknown_Release( unknown ); - - return hr; -} - -static HRESULT WINAPI class_factory_LockServer( IClassFactory *iface, BOOL lock ) -{ - FIXME( "iface %p, lock %d stub!\n", iface, lock ); - return S_OK; -} - -static const IClassFactoryVtbl class_factory_vtbl = -{ - class_factory_QueryInterface, - class_factory_AddRef, - class_factory_Release, - class_factory_CreateInstance, - class_factory_LockServer, -}; - -static struct class_factory class_factory = {{&class_factory_vtbl}}; - -HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **out ) -{ - TRACE( "clsid %s, iid %s, out %p.\n", debugstr_guid( clsid ), debugstr_guid( iid ), out ); - -#if DIRECTINPUT_VERSION == 0x0700 - if (IsEqualCLSID( &CLSID_DirectInput, clsid )) - return IClassFactory_QueryInterface( &class_factory.IClassFactory_iface, iid, out ); -#else - if (IsEqualCLSID( &CLSID_DirectInput8, clsid )) - return IClassFactory_QueryInterface( &class_factory.IClassFactory_iface, iid, out ); -#endif - - WARN( "%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid( clsid ) ); - return CLASS_E_CLASSNOTAVAILABLE; -} - static LRESULT CALLBACK LL_hook_proc( int code, WPARAM wparam, LPARAM lparam ) { struct dinput_device *impl; diff --git a/dlls/dinput8/Makefile.in b/dlls/dinput8/Makefile.in index 164f2458da7..1d1b52c00ac 100644 --- a/dlls/dinput8/Makefile.in +++ b/dlls/dinput8/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ config.c \ data_formats.c \ device.c \ + dinput.c \ dinput_main.c \ joystick_hid.c \ keyboard.c \

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2020

Rémi Bernon

8:48 a.m.

New subject: [PATCH 5/5] dinput: Rename lpdid local variable to device.

From: Rémi Bernon rbernon@codeweavers.com

--- dlls/dinput/dinput.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/dinput/dinput.c b/dlls/dinput/dinput.c index 2b1ce6d2e33..08d36246071 100644 --- a/dlls/dinput/dinput.c +++ b/dlls/dinput/dinput.c @@ -498,8 +498,8 @@ static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, con static const GUID *guids[2] = {&GUID_SysKeyboard, &GUID_SysMouse}; static const DWORD actionMasks[] = {DIKEYBOARD_MASK, DIMOUSE_MASK}; struct dinput *impl = impl_from_IDirectInput8W( iface ); + IDirectInputDevice8W *device; DIDEVICEINSTANCEW didevi; - IDirectInputDevice8W *lpdid; unsigned int i = 0; HRESULT hr; int remain; @@ -530,15 +530,15 @@ static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, con for (i = 0; i < params.instance_count; i++) { callbackFlags = diactionformat_priorityW( action_format, action_format->dwGenre ); - IDirectInput_CreateDevice( iface, &params.instances[i].guidInstance, &lpdid, NULL ); + IDirectInput_CreateDevice( iface, &params.instances[i].guidInstance, &device, NULL );

- if (callback( &params.instances[i], lpdid, callbackFlags, --remain, context ) == DIENUM_STOP) + if (callback( &params.instances[i], device, callbackFlags, --remain, context ) == DIENUM_STOP) { free( params.instances ); - IDirectInputDevice_Release( lpdid ); + IDirectInputDevice_Release( device ); return DI_OK; } - IDirectInputDevice_Release( lpdid ); + IDirectInputDevice_Release( device ); }

free( params.instances ); @@ -552,15 +552,15 @@ static HRESULT WINAPI dinput8_EnumDevicesBySemantics( IDirectInput8W *iface, con { callbackFlags = diactionformat_priorityW( action_format, actionMasks[i] );

- IDirectInput_CreateDevice( iface, guids[i], &lpdid, NULL ); - IDirectInputDevice_GetDeviceInfo( lpdid, &didevi ); + IDirectInput_CreateDevice( iface, guids[i], &device, NULL ); + IDirectInputDevice_GetDeviceInfo( device, &didevi );

- if (callback( &didevi, lpdid, callbackFlags, --remain, context ) == DIENUM_STOP) + if (callback( &didevi, device, callbackFlags, --remain, context ) == DIENUM_STOP) { - IDirectInputDevice_Release( lpdid ); + IDirectInputDevice_Release( device ); return DI_OK; } - IDirectInputDevice_Release( lpdid ); + IDirectInputDevice_Release( device ); } }

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2020

743

Age (days ago)

743

Last active (days ago)

wine-gitlab@winehq.org

5 comments

2 participants

tags (0)

participants (2)

Rémi Bernon
Rémi Bernon (＠rbernon)