October 2021 - Wine-commits

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_EnumEffects.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 5b8daecabff01447e65db2df42fa165fbbe660b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b8daecabff01447e65db2df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 1 09:31:05 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_EnumEffects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 63 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index ac67625cddc..a43ecde0e9c 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -818,10 +818,71 @@ static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, co static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, void *context, DWORD type ) { - FIXME( "iface %p, callback %p, context %p, type %#x stub!\n", iface, callback, context, type ); + DIEFFECTINFOW info = {.dwSize = sizeof(info)}; + HRESULT hr; + + TRACE( "iface %p, callback %p, context %p, type %#x.\n", iface, callback, context, type ); if (!callback) return DIERR_INVALIDPARAM; + type = DIEFT_GETTYPE( type ); + + if (type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_ConstantForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_RAMPFORCE) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_RampForce ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_PERIODIC) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Square ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Sine ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Triangle ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothUp ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_SawtoothDown ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + + if (type == DIEFT_ALL || type == DIEFT_CONDITION) + { + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Spring ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Damper ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Inertia ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + + hr = IDirectInputDevice8_GetEffectInfo( iface, &info, &GUID_Friction ); + if (FAILED(hr) && hr != DIERR_DEVICENOTREG) return hr; + if (hr == DI_OK && callback( &info, context ) == DIENUM_STOP) return DI_OK; + } + return DI_OK; }

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_CreateEffect stub.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 4961876804d69f8dd6d8524bbaa77b4caf7a8175 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4961876804d69f8dd6d8524b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 1 09:31:06 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_CreateEffect stub. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 169 ++++++++++++++++++++++++++++++++++++++++++++- dlls/dinput8/tests/hid.c | 3 +- 2 files changed, 169 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index a43ecde0e9c..8f5dbee9dc3 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -120,6 +120,17 @@ static inline struct hid_joystick *impl_from_IDirectInputDevice8W( IDirectInputD struct hid_joystick, base ); } +struct hid_joystick_effect +{ + IDirectInputEffect IDirectInputEffect_iface; + LONG ref; +}; + +static inline struct hid_joystick_effect *impl_from_IDirectInputEffect( IDirectInputEffect *iface ) +{ + return CONTAINING_RECORD( iface, struct hid_joystick_effect, IDirectInputEffect_iface ); +} + static const GUID *object_usage_to_guid( USAGE usage_page, USAGE usage ) { switch (usage_page) @@ -803,16 +814,39 @@ static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, D return S_OK; } +static HRESULT hid_joystick_effect_create( IDirectInputEffect **out ); + static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, const GUID *guid, const DIEFFECT *params, IDirectInputEffect **out, IUnknown *outer ) { - FIXME( "iface %p, guid %s, params %p, out %p, outer %p stub!\n", iface, debugstr_guid( guid ), + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); + DWORD flags = DIEP_ALLPARAMS; + HRESULT hr; + + TRACE( "iface %p, guid %s, params %p, out %p, outer %p\n", iface, debugstr_guid( guid ), params, out, outer ); if (!out) return E_POINTER; + *out = NULL; - return DIERR_UNSUPPORTED; + if (!(impl->dev_caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_UNSUPPORTED; + if (FAILED(hr = hid_joystick_effect_create( out ))) return hr; + + hr = IDirectInputEffect_Initialize( *out, DINPUT_instance, impl->base.dinput->dwVersion, guid ); + if (FAILED(hr)) goto failed; + + if (!params) return DI_OK; + if (!impl->base.acquired || !(impl->base.dwCoopLevel & DISCL_EXCLUSIVE)) + flags |= DIEP_NODOWNLOAD; + hr = IDirectInputEffect_SetParameters( *out, params, flags ); + if (FAILED(hr)) goto failed; + return hr; + +failed: + IDirectInputEffect_Release( *out ); + *out = NULL; + return hr; } static HRESULT WINAPI hid_joystick_EnumEffects( IDirectInputDevice8W *iface, LPDIENUMEFFECTSCALLBACKW callback, @@ -1721,3 +1755,134 @@ const struct dinput_device joystick_hid_device = hid_joystick_enum_device, hid_joystick_create_device, }; + +static HRESULT WINAPI hid_joystick_effect_QueryInterface( IDirectInputEffect *iface, REFIID iid, void **out ) +{ + TRACE( "iface %p, iid %s, out %p\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IDirectInputEffect )) + { + IDirectInputEffect_AddRef( iface ); + *out = iface; + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI hid_joystick_effect_AddRef( IDirectInputEffect *iface ) +{ + struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %u.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI hid_joystick_effect_Release( IDirectInputEffect *iface ) +{ + struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + TRACE( "iface %p, ref %u.\n", iface, ref ); + if (!ref) HeapFree( GetProcessHeap(), 0, impl ); + return ref; +} + +static HRESULT WINAPI hid_joystick_effect_Initialize( IDirectInputEffect *iface, HINSTANCE inst, + DWORD version, REFGUID guid ) +{ + FIXME( "iface %p, inst %p, version %u, guid %s stub!\n", iface, inst, version, debugstr_guid( guid ) ); + return DI_OK; +} + +static HRESULT WINAPI hid_joystick_effect_GetEffectGuid( IDirectInputEffect *iface, GUID *guid ) +{ + FIXME( "iface %p, guid %p stub!\n", iface, guid ); + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *iface, DIEFFECT *params, DWORD flags ) +{ + FIXME( "iface %p, params %p, flags %#x stub!\n", iface, params, flags ); + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *iface, + const DIEFFECT *params, DWORD flags ) +{ + FIXME( "iface %p, params %p, flags %#x stub!\n", iface, params, flags ); + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_effect_Start( IDirectInputEffect *iface, DWORD iterations, DWORD flags ) +{ + FIXME( "iface %p, iterations %u, flags %#x stub!\n", iface, iterations, flags ); + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_effect_Stop( IDirectInputEffect *iface ) +{ + FIXME( "iface %p stub!\n", iface ); + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_effect_GetEffectStatus( IDirectInputEffect *iface, DWORD *status ) +{ + FIXME( "iface %p, status %p stub!\n", iface, status ); + + if (!status) return E_POINTER; + + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) +{ + FIXME( "iface %p stub!\n", iface ); + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_effect_Unload( IDirectInputEffect *iface ) +{ + FIXME( "iface %p stub!\n", iface ); + return DIERR_UNSUPPORTED; +} + +static HRESULT WINAPI hid_joystick_effect_Escape( IDirectInputEffect *iface, DIEFFESCAPE *escape ) +{ + FIXME( "iface %p, escape %p stub!\n", iface, escape ); + return DIERR_UNSUPPORTED; +} + +static IDirectInputEffectVtbl hid_joystick_effect_vtbl = +{ + /*** IUnknown methods ***/ + hid_joystick_effect_QueryInterface, + hid_joystick_effect_AddRef, + hid_joystick_effect_Release, + /*** IDirectInputEffect methods ***/ + hid_joystick_effect_Initialize, + hid_joystick_effect_GetEffectGuid, + hid_joystick_effect_GetParameters, + hid_joystick_effect_SetParameters, + hid_joystick_effect_Start, + hid_joystick_effect_Stop, + hid_joystick_effect_GetEffectStatus, + hid_joystick_effect_Download, + hid_joystick_effect_Unload, + hid_joystick_effect_Escape, +}; + +static HRESULT hid_joystick_effect_create( IDirectInputEffect **out ) +{ + struct hid_joystick_effect *impl; + + if (!(impl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*impl) ))) + return DIERR_OUTOFMEMORY; + impl->IDirectInputEffect_iface.lpVtbl = &hid_joystick_effect_vtbl; + impl->ref = 1; + + *out = &impl->IDirectInputEffect_iface; + return DI_OK; +} diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 7c46f19cc40..e83cc8a3f7b 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5066,12 +5066,13 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) hr = IDirectInputDevice8_CreateEffect( device, NULL, NULL, &effect, NULL ); todo_wine ok( hr == E_POINTER, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + if (hr == DI_OK) IDirectInputEffect_Release( effect ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_NULL, NULL, &effect, NULL ); todo_wine ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + if (hr == DI_OK) IDirectInputEffect_Release( effect ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); - todo_wine ok( hr == DI_OK, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); if (hr != DI_OK) return;

1 0

Rémi Bernon : winebus.sys: Implement PID device control for SDL devices.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: eeb97fa605ab94b58d88625a5af4179d39d58f5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeb97fa605ab94b58d88625a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 1 09:31:07 2021 +0200 winebus.sys: Implement PID device control for SDL devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 48 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index bd06717165d..772ee092c83 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -47,10 +47,11 @@ #include "ddk/wdm.h" #include "ddk/hidtypes.h" #include "ddk/hidsdi.h" -#include "wine/debug.h" -#include "wine/unicode.h" #include "hidusage.h" +#include "wine/debug.h" +#include "wine/hid.h" + #include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); @@ -95,12 +96,15 @@ MAKE_FUNCPTR(SDL_HapticClose); MAKE_FUNCPTR(SDL_HapticDestroyEffect); MAKE_FUNCPTR(SDL_HapticNewEffect); MAKE_FUNCPTR(SDL_HapticOpenFromJoystick); +MAKE_FUNCPTR(SDL_HapticPause); MAKE_FUNCPTR(SDL_HapticQuery); MAKE_FUNCPTR(SDL_HapticRumbleInit); MAKE_FUNCPTR(SDL_HapticRumblePlay); MAKE_FUNCPTR(SDL_HapticRumbleSupported); MAKE_FUNCPTR(SDL_HapticRunEffect); +MAKE_FUNCPTR(SDL_HapticSetGain); MAKE_FUNCPTR(SDL_HapticStopAll); +MAKE_FUNCPTR(SDL_HapticUnpause); MAKE_FUNCPTR(SDL_JoystickIsHaptic); MAKE_FUNCPTR(SDL_GameControllerAddMapping); MAKE_FUNCPTR(SDL_RegisterEvents); @@ -130,6 +134,7 @@ struct sdl_device DWORD effect_support; SDL_Haptic *sdl_haptic; int haptic_effect_id; + int effect_ids[256]; }; static inline struct sdl_device *impl_from_unix_device(struct unix_device *iface) @@ -168,6 +173,8 @@ static void set_hat_value(struct unix_device *iface, int index, int value) static BOOL descriptor_add_haptic(struct sdl_device *impl) { + USHORT i; + if (!pSDL_JoystickIsHaptic(impl->sdl_joystick) || !(impl->sdl_haptic = pSDL_HapticOpenFromJoystick(impl->sdl_joystick))) impl->effect_support = 0; @@ -197,6 +204,7 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) } impl->haptic_effect_id = -1; + for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) impl->effect_ids[i] = -1; return TRUE; } @@ -400,7 +408,38 @@ NTSTATUS sdl_device_haptics_start(struct unix_device *iface, DWORD duration_ms, static NTSTATUS sdl_device_physical_device_control(struct unix_device *iface, USAGE control) { - FIXME("iface %p, control %#04x stub\n", iface, control); + struct sdl_device *impl = impl_from_unix_device(iface); + unsigned int i; + + TRACE("iface %p, control %#04x.\n", iface, control); + + switch (control) + { + case PID_USAGE_DC_ENABLE_ACTUATORS: + pSDL_HapticSetGain(impl->sdl_haptic, 100); + return STATUS_SUCCESS; + case PID_USAGE_DC_DISABLE_ACTUATORS: + pSDL_HapticSetGain(impl->sdl_haptic, 0); + return STATUS_SUCCESS; + case PID_USAGE_DC_STOP_ALL_EFFECTS: + pSDL_HapticStopAll(impl->sdl_haptic); + return STATUS_SUCCESS; + case PID_USAGE_DC_DEVICE_RESET: + pSDL_HapticStopAll(impl->sdl_haptic); + for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) + { + if (impl->effect_ids[i] < 0) continue; + pSDL_HapticDestroyEffect(impl->sdl_haptic, impl->effect_ids[i]); + impl->effect_ids[i] = -1; + } + return STATUS_SUCCESS; + case PID_USAGE_DC_DEVICE_PAUSE: + pSDL_HapticPause(impl->sdl_haptic); + return STATUS_SUCCESS; + case PID_USAGE_DC_DEVICE_CONTINUE: + pSDL_HapticUnpause(impl->sdl_haptic); + return STATUS_SUCCESS; + } return STATUS_NOT_SUPPORTED; } @@ -665,12 +704,15 @@ NTSTATUS sdl_bus_init(void *args) LOAD_FUNCPTR(SDL_HapticDestroyEffect); LOAD_FUNCPTR(SDL_HapticNewEffect); LOAD_FUNCPTR(SDL_HapticOpenFromJoystick); + LOAD_FUNCPTR(SDL_HapticPause); LOAD_FUNCPTR(SDL_HapticQuery); LOAD_FUNCPTR(SDL_HapticRumbleInit); LOAD_FUNCPTR(SDL_HapticRumblePlay); LOAD_FUNCPTR(SDL_HapticRumbleSupported); LOAD_FUNCPTR(SDL_HapticRunEffect); + LOAD_FUNCPTR(SDL_HapticSetGain); LOAD_FUNCPTR(SDL_HapticStopAll); + LOAD_FUNCPTR(SDL_HapticUnpause); LOAD_FUNCPTR(SDL_JoystickIsHaptic); LOAD_FUNCPTR(SDL_GameControllerAddMapping); LOAD_FUNCPTR(SDL_RegisterEvents);

1 0

Rémi Bernon : winebus.sys: Implement PID device control for UDEV lnxev devices.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 11fe73ed8f2d78f72502a05a93e20f84d81fa7b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11fe73ed8f2d78f72502a05a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 1 09:31:08 2021 +0200 winebus.sys: Implement PID device control for UDEV lnxev devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 60 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index e4c0103b270..454ab3ea870 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -70,9 +70,9 @@ #include "ddk/wdm.h" #include "ddk/hidtypes.h" #include "ddk/hidsdi.h" + #include "wine/debug.h" -#include "wine/heap.h" -#include "wine/unicode.h" +#include "wine/hid.h" #ifdef HAS_PROPER_INPUT_HEADER # include "hidusage.h" @@ -140,6 +140,7 @@ struct lnxev_device BYTE button_map[KEY_MAX]; int haptic_effect_id; + int effect_ids[256]; }; static inline struct lnxev_device *lnxev_impl_from_unix_device(struct unix_device *iface) @@ -642,6 +643,8 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d return STATUS_NO_MEMORY; impl->haptic_effect_id = -1; + for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) impl->effect_ids[i] = -1; + if (test_bit(ffbits, FF_RUMBLE)) { effect.id = -1; @@ -811,9 +814,58 @@ static NTSTATUS lnxev_device_haptics_start(struct unix_device *iface, DWORD dura static NTSTATUS lnxev_device_physical_device_control(struct unix_device *iface, USAGE control) { - FIXME("iface %p, control %#04x stub!\n", iface, control); + struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); + unsigned int i; - return STATUS_NOT_IMPLEMENTED; + TRACE("iface %p, control %#04x.\n", iface, control); + + switch (control) + { + case PID_USAGE_DC_ENABLE_ACTUATORS: + { + struct input_event ie = + { + .type = EV_FF, + .code = FF_GAIN, + .value = 0xffff, + }; + if (write(impl->base.device_fd, &ie, sizeof(ie)) == -1) + WARN("write failed %d %s\n", errno, strerror(errno)); + return STATUS_SUCCESS; + } + case PID_USAGE_DC_DISABLE_ACTUATORS: + { + struct input_event ie = + { + .type = EV_FF, + .code = FF_GAIN, + .value = 0, + }; + if (write(impl->base.device_fd, &ie, sizeof(ie)) == -1) + WARN("write failed %d %s\n", errno, strerror(errno)); + return STATUS_SUCCESS; + } + case PID_USAGE_DC_STOP_ALL_EFFECTS: + FIXME("stop all not implemented!\n"); + return STATUS_NOT_IMPLEMENTED; + case PID_USAGE_DC_DEVICE_RESET: + for (i = 0; i < ARRAY_SIZE(impl->effect_ids); ++i) + { + if (impl->effect_ids[i] < 0) continue; + if (ioctl(impl->base.device_fd, EVIOCRMFF, impl->effect_ids[i]) == -1) + WARN("couldn't free effect, EVIOCRMFF ioctl failed: %d %s\n", errno, strerror(errno)); + impl->effect_ids[i] = -1; + } + return STATUS_SUCCESS; + case PID_USAGE_DC_DEVICE_PAUSE: + WARN("device pause not supported\n"); + return STATUS_NOT_SUPPORTED; + case PID_USAGE_DC_DEVICE_CONTINUE: + WARN("device continue not supported\n"); + return STATUS_NOT_SUPPORTED; + } + + return STATUS_NOT_SUPPORTED; } static const struct hid_device_vtbl lnxev_device_vtbl =

1 0

Alexandre Julliard : winemenubuilder: Abort on memory allocation failures.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 982a712c4dd3cee20aacc42afc2ee255f48fa4e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=982a712c4dd3cee20aacc42a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 09:35:48 2021 +0200 winemenubuilder: Abort on memory allocation failures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 1006 ++++++++++------------------ 1 file changed, 336 insertions(+), 670 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=982a712c4dd3cee20aac…

1 0

Alexandre Julliard : winemenubuilder: Use PathMatchSpec() instead of fnmatch().
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: e14f3c40cdf4eb638951c12396f94a9a0919d71e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e14f3c40cdf4eb638951c123… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 09:36:17 2021 +0200 winemenubuilder: Use PathMatchSpec() instead of fnmatch(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 2 -- include/config.h.in | 6 ---- programs/winemenubuilder/winemenubuilder.c | 49 +++++------------------------- 4 files changed, 8 insertions(+), 51 deletions(-) diff --git a/configure b/configure index eca83982196..038391a4439 100755 --- a/configure +++ b/configure @@ -7481,7 +7481,6 @@ for ac_header in \ dlfcn.h \ elf.h \ float.h \ - fnmatch.h \ getopt.h \ gettext-po.h \ grp.h \ @@ -17902,7 +17901,6 @@ for ac_func in \ __res_getservers \ _spawnvp \ epoll_create \ - fnmatch \ fork \ fstatfs \ futimens \ diff --git a/configure.ac b/configure.ac index 7ed1e73eb6d..da80562c445 100644 --- a/configure.ac +++ b/configure.ac @@ -450,7 +450,6 @@ AC_CHECK_HEADERS(\ dlfcn.h \ elf.h \ float.h \ - fnmatch.h \ getopt.h \ gettext-po.h \ grp.h \ @@ -2132,7 +2131,6 @@ AC_CHECK_FUNCS(\ __res_getservers \ _spawnvp \ epoll_create \ - fnmatch \ fork \ fstatfs \ futimens \ diff --git a/include/config.h.in b/include/config.h.in index dac43f7840e..80cc9c3a47f 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -96,12 +96,6 @@ /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H -/* Define to 1 if you have the `fnmatch' function. */ -#undef HAVE_FNMATCH - -/* Define to 1 if you have the <fnmatch.h> header file. */ -#undef HAVE_FNMATCH_H - /* Define to 1 if you have the <fontconfig/fontconfig.h> header file. */ #undef HAVE_FONTCONFIG_FONTCONFIG_H diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 06f3cb50705..a4f1ee26e9c 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -73,9 +73,6 @@ #endif #include <errno.h> #include <stdarg.h> -#ifdef HAVE_FNMATCH_H -#include <fnmatch.h> -#endif #define COBJMACROS #define NONAMELESSUNION @@ -181,7 +178,6 @@ struct xdg_mime_type { char *mimeType; char *glob; - char *lower_glob; struct list entry; }; @@ -1936,7 +1932,7 @@ static BOOL add_mimes(const char *xdg_data_dir, struct list *mime_types) int size = 0; while (ret && (ret = next_line(globs_file, &line, &size)) && line) { - char *pos, *l; + char *pos; struct xdg_mime_type *mime_type_entry = NULL; if (line[0] != '#' && (pos = strchr(line, ':'))) { @@ -1944,9 +1940,6 @@ static BOOL add_mimes(const char *xdg_data_dir, struct list *mime_types) *pos = 0; mime_type_entry->mimeType = xstrdup(line); mime_type_entry->glob = xstrdup(pos + 1); - mime_type_entry->lower_glob = xstrdup(pos + 1); - for (l = mime_type_entry->lower_glob; *l; l++) - *l = tolower(*l); list_add_tail(mime_types, &mime_type_entry->entry); } } @@ -1965,7 +1958,6 @@ static void free_native_mime_types(struct list *native_mime_types) { list_remove(&mime_type_entry->entry); heap_free(mime_type_entry->glob); - heap_free(mime_type_entry->lower_glob); heap_free(mime_type_entry->mimeType); heap_free(mime_type_entry); } @@ -2005,10 +1997,11 @@ static BOOL build_native_mime_types(const char *xdg_data_home, struct list *mime return ret; } -static BOOL match_glob(struct list *native_mime_types, const char *extension, - int ignoreGlobCase, char **match) +static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, + const char *extensionA, + LPCWSTR extensionW, + char **match) { -#ifdef HAVE_FNMATCH struct xdg_mime_type *mime_type_entry; int matchLength = 0; @@ -2016,46 +2009,20 @@ static BOOL match_glob(struct list *native_mime_types, const char *extension, LIST_FOR_EACH_ENTRY(mime_type_entry, native_mime_types, struct xdg_mime_type, entry) { - const char *glob = ignoreGlobCase ? mime_type_entry->lower_glob : mime_type_entry->glob; - if (fnmatch(glob, extension, 0) == 0) + if (PathMatchSpecA( extensionA, mime_type_entry->glob )) { - if (*match == NULL || matchLength < strlen(glob)) + if (*match == NULL || matchLength < strlen(mime_type_entry->glob)) { *match = mime_type_entry->mimeType; - matchLength = strlen(glob); + matchLength = strlen(mime_type_entry->glob); } } } if (*match != NULL) *match = xstrdup(*match); -#else - *match = NULL; -#endif return TRUE; } -static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, - const char *extensionA, - LPCWSTR extensionW, - char **mime_type) -{ - WCHAR *lower_extensionW; - char *lower_extensionA; - INT len; - BOOL ret = match_glob(native_mime_types, extensionA, 0, mime_type); - if (ret == FALSE || *mime_type != NULL) - return ret; - len = strlenW(extensionW); - lower_extensionW = xmalloc((len + 1)*sizeof(WCHAR)); - memcpy(lower_extensionW, extensionW, (len + 1)*sizeof(WCHAR)); - strlwrW(lower_extensionW); - lower_extensionA = wchars_to_utf8_chars(lower_extensionW); - ret = match_glob(native_mime_types, lower_extensionA, 1, mime_type); - heap_free(lower_extensionA); - heap_free(lower_extensionW); - return ret; -} - static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) { DWORD size;

1 0

Alexandre Julliard : winemenubuilder: Store the paths of .lnk files as DOS paths.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 56701db4741787546095af2bd67c06f421445241 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56701db4741787546095af2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:19:27 2021 +0200 winemenubuilder: Store the paths of .lnk files as DOS paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 87 ++++++++---------------------- 1 file changed, 21 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56701db4741787546095…

1 0

Alexandre Julliard : winemenubuilder: Launch .lnk files directly through the Wine loader.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 542d67342db8b77af8244328ca175f91cb504e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=542d67342db8b77af8244328… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:20:15 2021 +0200 winemenubuilder: Launch .lnk files directly through the Wine loader. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 59 ++++-------------------------- 1 file changed, 8 insertions(+), 51 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 06d1e655195..c0701d0241f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2492,10 +2492,8 @@ static char *get_start_exe_path(void) static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) { - static const WCHAR startW[] = {'\\','c','o','m','m','a','n','d', - '\\','s','t','a','r','t','.','e','x','e',0}; char *link_name = NULL, *icon_name = NULL, *work_dir = NULL; - char *escaped_path = NULL, *escaped_args = NULL, *description = NULL; + char *description = NULL; char *wmclass = NULL; WCHAR szTmp[INFOTIPSIZE]; WCHAR szDescription[INFOTIPSIZE], szPath[MAX_PATH], szWorkDir[MAX_PATH]; @@ -2503,7 +2501,6 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) int iIconId = 0, r = -1; DWORD csidl = -1; HANDLE hsem = NULL; - char *start_path = NULL; if ( !link ) { @@ -2574,37 +2571,11 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) /* check the path */ if( szPath[0] ) { - static const WCHAR exeW[] = {'.','e','x','e',0}; - WCHAR *p; - - /* check for .exe extension */ - if (!(p = strrchrW( szPath, '.' )) || - strchrW( p, '\\' ) || strchrW( p, '/' ) || - lstrcmpiW( p, exeW )) - { - /* Not .exe - use 'start.exe' to launch this file */ - p = szArgs + lstrlenW(szPath) + 2; - if (szArgs[0]) - { - p[0] = ' '; - memmove( p+1, szArgs, min( (lstrlenW(szArgs) + 1) * sizeof(szArgs[0]), - sizeof(szArgs) - (p + 1 - szArgs) * sizeof(szArgs[0]) ) ); - } - else - p[0] = 0; + /* FIXME: Use AppUserModelID if present. */ + WCHAR *p = PathFindFileNameW(szPath); - szArgs[0] = '"'; - lstrcpyW(szArgs + 1, szPath); - szArgs[lstrlenW(szArgs)] = '"'; - - GetWindowsDirectoryW(szPath, MAX_PATH); - lstrcatW(szPath, startW); - } - else + if (p) { - /* FIXME: Use AppUserModelID if present. */ - WCHAR *p = PathFindFileNameW(szPath); - lstrcpyW(szWMClass, p); CharLowerW(szWMClass); } @@ -2613,20 +2584,9 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) if (szWorkDir[0]) work_dir = wine_get_unix_file_name( szWorkDir ); } - else - { - /* if there's no path... try run the link itself */ - lstrcpynW(szArgs, link, MAX_PATH); - GetWindowsDirectoryW(szPath, MAX_PATH); - lstrcatW(szPath, startW); - } - /* escape the path and parameters */ - escaped_path = escape(szPath); - escaped_args = escape(szArgs); description = wchars_to_utf8_chars(szDescription); wmclass = wchars_to_utf8_chars(szWMClass); - start_path = get_start_exe_path(); /* building multiple menus concurrently has race conditions */ hsem = CreateSemaphoreA( NULL, 1, 1, "winemenubuilder_semaphore"); @@ -2646,17 +2606,17 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) else ++lastEntry; location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); - if (csidl == CSIDL_COMMON_DESKTOPDIRECTORY) - r = !write_desktop_entry(link, location, lastEntry, start_path, escape(link), + if (csidl == CSIDL_COMMON_DESKTOPDIRECTORY || !szPath[0]) + r = !write_desktop_entry(link, location, lastEntry, escape(link), "", description, work_dir, icon_name, wmclass); else - r = !write_desktop_entry(NULL, location, lastEntry, escaped_path, escaped_args, description, work_dir, icon_name, wmclass); + r = !write_desktop_entry(NULL, location, lastEntry, escape(szPath), escape(szArgs), description, work_dir, icon_name, wmclass); if (r == 0) chmod(location, 0755); heap_free(location); } else - r = !write_menu_entry(link, link_name, start_path, escape(link), + r = !write_menu_entry(link, link_name, escape(link), "", description, work_dir, icon_name, wmclass); ReleaseSemaphore( hsem, 1, NULL ); @@ -2666,11 +2626,8 @@ cleanup: heap_free(icon_name ); heap_free(work_dir ); heap_free(link_name ); - heap_free(escaped_args ); - heap_free(escaped_path ); heap_free(description ); heap_free(wmclass ); - heap_free(start_path ); if (r && !bWait) WINE_ERR("failed to build the menu\n" );

1 0

Alexandre Julliard : winemenubuilder: Use Unicode strings to process association entries.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: 41881ff6257cee6624372da71eee62435e30d7da URL: https://source.winehq.org/git/wine.git/?a=commit;h=41881ff6257cee6624372da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:25:27 2021 +0200 winemenubuilder: Use Unicode strings to process association entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 324 ++++++++++++++--------------- 1 file changed, 156 insertions(+), 168 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41881ff6257cee662437…

1 0

Alexandre Julliard : winemenubuilder: Use Unicode strings to write desktop entries.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: wine Branch: master Commit: d4a773a1d778b1e0ee3ec0d35487933477145853 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4a773a1d778b1e0ee3ec0d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 10:25:57 2021 +0200 winemenubuilder: Use Unicode strings to write desktop entries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 305 ++++++++++------------------- 1 file changed, 108 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4a773a1d778b1e0ee3e…

1 0