October 2021 - Wine-Commits

Nikolay Sivov : d3d10/effect: Make it clear which assignment types are supported in state groups.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 0182f1f8489c607e1859c8fcd1e9f49f2b498bbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0182f1f8489c607e1859c8fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 1 09:14:00 2021 +0300 d3d10/effect: Make it clear which assignment types are supported in state groups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 8 +++++--- dlls/d3d10/effect.c | 25 ++++++++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index f980007427f..3fd17c7400d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -60,9 +60,11 @@ enum d3d10_effect_object_type_flags enum d3d10_effect_object_operation { - D3D10_EOO_VALUE = 1, - D3D10_EOO_PARSED_OBJECT = 2, - D3D10_EOO_PARSED_OBJECT_INDEX = 3, + D3D10_EOO_CONST = 1, + D3D10_EOO_VAR = 2, + D3D10_EOO_CONST_INDEX = 3, + D3D10_EOO_VAR_INDEX = 4, + D3D10_EOO_INDEX_EXPRESSION = 5, D3D10_EOO_ANONYMOUS_SHADER = 7, }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5d5db4eea6c..1823ffdc04b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1741,11 +1741,22 @@ static BOOL parse_fx10_state_group(const char *data, size_t data_size, return FALSE; } - if (!read_value_list(data, data_size, value_offset, property_info->type, idx, - property_info->size, (char *)container + property_info->offset)) + switch (operation) { - ERR("Failed to read values for property %#x.\n", id); - return FALSE; + case D3D10_EOO_CONST: + + /* Constant values output directly to backing store. */ + if (!read_value_list(data, data_size, value_offset, property_info->type, idx, + property_info->size, (char *)container + property_info->offset)) + { + ERR("Failed to read values for property %#x.\n", id); + return FALSE; + } + break; + + default: + FIXME("Unhandled operation %#x.\n", operation); + return E_FAIL; } } @@ -1787,7 +1798,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, switch(operation) { - case D3D10_EOO_VALUE: + case D3D10_EOO_CONST: TRACE("Copy variable values\n"); switch (o->type) @@ -1837,7 +1848,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, } break; - case D3D10_EOO_PARSED_OBJECT: + case D3D10_EOO_VAR: /* This is a local object, we've parsed in parse_fx10_local_object. */ if (!fx10_get_string(data, data_size, offset, &name, &name_len)) { @@ -1849,7 +1860,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, variable = e->lpVtbl->GetVariableByName(e, name); break; - case D3D10_EOO_PARSED_OBJECT_INDEX: + case D3D10_EOO_CONST_INDEX: /* This is a local object, we've parsed in parse_fx10_local_object, which has an array index. */ if (offset >= data_size || !require_space(offset, 2, sizeof(DWORD), data_size)) {

1 0

Nikolay Sivov : d3d10/effect: Reduce duplication in state and shader object release helpers.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 8a04f2eb1514fd1ca9c6467b3407ffb70314c367 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a04f2eb1514fd1ca9c6467b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 1 09:13:58 2021 +0300 d3d10/effect: Reduce duplication in state and shader object release helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 ++ dlls/d3d10/effect.c | 40 ++++------------------------------------ 2 files changed, 6 insertions(+), 36 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 648a7b0240a..f980007427f 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -83,6 +83,7 @@ struct d3d10_effect_object ID3D10VertexShader *vs; ID3D10PixelShader *ps; ID3D10GeometryShader *gs; + IUnknown *object; } object; }; @@ -136,6 +137,7 @@ struct d3d10_effect_state_object_variable ID3D10DepthStencilState *depth_stencil; ID3D10BlendState *blend; ID3D10SamplerState *sampler; + IUnknown *object; } object; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 3cd69192f4c..26634895ce1 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3017,23 +3017,11 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) break; case D3D10_SVT_DEPTHSTENCIL: - if (v->u.state.object.depth_stencil) - ID3D10DepthStencilState_Release(v->u.state.object.depth_stencil); - break; - case D3D10_SVT_BLEND: - if (v->u.state.object.blend) - ID3D10BlendState_Release(v->u.state.object.blend); - break; - case D3D10_SVT_RASTERIZER: - if (v->u.state.object.rasterizer) - ID3D10RasterizerState_Release(v->u.state.object.rasterizer); - break; - case D3D10_SVT_SAMPLER: - if (v->u.state.object.sampler) - ID3D10SamplerState_Release(v->u.state.object.sampler); + if (v->u.state.object.object) + IUnknown_Release(v->u.state.object.object); break; case D3D10_SVT_TEXTURE1D: @@ -3076,33 +3064,13 @@ static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) switch (o->type) { case D3D10_EOT_RASTERIZER_STATE: - if (o->object.rs) - ID3D10RasterizerState_Release(o->object.rs); - break; - case D3D10_EOT_DEPTH_STENCIL_STATE: - if (o->object.ds) - ID3D10DepthStencilState_Release(o->object.ds); - break; - case D3D10_EOT_BLEND_STATE: - if (o->object.bs) - ID3D10BlendState_Release(o->object.bs); - break; - case D3D10_EOT_VERTEXSHADER: - if (o->object.vs) - ID3D10VertexShader_Release(o->object.vs); - break; - case D3D10_EOT_PIXELSHADER: - if (o->object.ps) - ID3D10PixelShader_Release(o->object.ps); - break; - case D3D10_EOT_GEOMETRYSHADER: - if (o->object.gs) - ID3D10GeometryShader_Release(o->object.gs); + if (o->object.object) + IUnknown_Release(o->object.object); break; default:

1 0

Gabriel Ivăncescu : mshtml: Expose toString() for WineDOMTokenList.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: ec665f1c7d1d010f8afb49550225439a2c760775 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec665f1c7d1d010f8afb4955… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Oct 1 16:12:44 2021 +0300 mshtml: Expose toString() for WineDOMTokenList. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 10 ++++++++++ dlls/mshtml/mshtml_private_iface.idl | 2 ++ dlls/mshtml/tests/dom.js | 2 ++ 3 files changed, 14 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4e5aba7c344..b07de03be2d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6612,6 +6612,15 @@ static HRESULT WINAPI token_list_remove(IWineDOMTokenList *iface, BSTR token) return token_list_add_remove(iface, token, TRUE); } +static HRESULT WINAPI token_list_toString(IWineDOMTokenList *iface, BSTR *String) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + TRACE("(%p)->(%p)\n", token_list, String); + + return IHTMLElement_get_className(token_list->element, String); +} + static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_QueryInterface, token_list_AddRef, @@ -6622,6 +6631,7 @@ static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_Invoke, token_list_add, token_list_remove, + token_list_toString }; static inline struct token_list *token_list_from_DispatchEx(DispatchEx *iface) diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 2292e2cf76b..5755afdfe5c 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -115,6 +115,8 @@ interface IWineDOMTokenList : IDispatch HRESULT add([in] BSTR token); [id(2)] HRESULT remove([in] BSTR token); + [id(3)] + HRESULT toString([retval, out] BSTR *String); } } /* library MSHTML_private */ diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index efbab663902..73c2b3b0866 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -528,6 +528,7 @@ sync_test("classList", function() { classList.add("c"); ok(elem.className === "a b c 4", "(2) Expected className 'a b c 4', got " + elem.className); ok(("" + classList) === "a b c 4", "Expected classList value 'a b c 4', got " + classList); + ok(classList.toString() === "a b c 4", "Expected classList toString 'a b c 4', got " + classList.toString()); var exception = false @@ -609,4 +610,5 @@ sync_test("classList", function() { elem.className = " testclass foobar "; ok(("" + classList) === " testclass foobar ", "Expected classList value ' testclass foobar ', got " + classList); + ok(classList.toString() === " testclass foobar ", "Expected classList toString ' testclass foobar ', got " + classList.toString()); });

1 0

Huw Davies : nsiproxy: Use a pthread_mutex to guard the interface list.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 7199f32c0b4014785f048bc318ea59dd695d2ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7199f32c0b4014785f048bc3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 1 15:07:03 2021 +0100 nsiproxy: Use a pthread_mutex to guard the interface list. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/ndis.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/dlls/nsiproxy.sys/ndis.c b/dlls/nsiproxy.sys/ndis.c index bf237ea16db..1d0e69c593c 100644 --- a/dlls/nsiproxy.sys/ndis.c +++ b/dlls/nsiproxy.sys/ndis.c @@ -66,6 +66,8 @@ #include <net/if_types.h> #endif +#include <pthread.h> + #define NONAMELESSUNION #include "ntstatus.h" #define WIN32_NO_STATUS @@ -102,15 +104,7 @@ struct if_entry }; static struct list if_list = LIST_INIT( if_list ); - -static CRITICAL_SECTION if_list_cs; -static CRITICAL_SECTION_DEBUG if_list_cs_debug = -{ - 0, 0, &if_list_cs, - { &if_list_cs_debug.ProcessLocksList, &if_list_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": if_list_cs") } -}; -static CRITICAL_SECTION if_list_cs = { &if_list_cs_debug, -1, 0, 0, 0, 0 }; +static pthread_mutex_t if_list_lock = PTHREAD_MUTEX_INITIALIZER; static struct if_entry *find_entry_from_index( DWORD index ) { @@ -468,7 +462,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d TRACE( "%p %d %p %d %p %d %p %d %p\n", key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -485,7 +479,7 @@ static NTSTATUS ifinfo_enumerate_all( void *key_data, DWORD key_size, void *rw_d num++; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); if (!want_data || num <= *count) *count = num; else status = STATUS_BUFFER_OVERFLOW; @@ -503,7 +497,7 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void TRACE( "%p %d %p %d %p %d %p %d\n", key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -514,7 +508,7 @@ static NTSTATUS ifinfo_get_all_parameters( const void *key, DWORD key_size, void status = STATUS_SUCCESS; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -565,7 +559,7 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par TRACE( "%p %d %d %p %d %d\n", key, key_size, param_type, data, data_size, data_offset ); - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -583,7 +577,7 @@ static NTSTATUS ifinfo_get_parameter( const void *key, DWORD key_size, DWORD par } } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -599,7 +593,7 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD if (param_type != NSI_PARAM_TYPE_STATIC || data_size != sizeof(NET_LUID) || data_offset != 0) return STATUS_INVALID_PARAMETER; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -609,7 +603,7 @@ static NTSTATUS index_luid_get_parameter( const void *key, DWORD key_size, DWORD *(NET_LUID *)data = entry->if_luid; status = STATUS_SUCCESS; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return status; } @@ -618,7 +612,7 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) struct if_entry *entry; BOOL ret = FALSE; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -629,7 +623,7 @@ BOOL convert_unix_name_to_luid( const char *unix_name, NET_LUID *luid ) ret = TRUE; break; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return ret; } @@ -639,7 +633,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) struct if_entry *entry; BOOL ret = FALSE; - EnterCriticalSection( &if_list_cs ); + pthread_mutex_lock( &if_list_lock ); update_if_table(); @@ -650,7 +644,7 @@ BOOL convert_luid_to_unix_name( const NET_LUID *luid, const char **unix_name ) ret = TRUE; } - LeaveCriticalSection( &if_list_cs ); + pthread_mutex_unlock( &if_list_lock ); return ret; }

1 0

Rémi Bernon : winebus.sys: Implement PID device control for UDEV lnxev devices.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

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

Rémi Bernon : winebus.sys: Implement PID device control for SDL devices.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

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

Zhiyi Zhang : comctl32/button: Do not restore push button font after themed painting.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 8b30c00a7bf38f6b80779c2d1bceecb4fbbf8b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b30c00a7bf38f6b80779c2d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 1 11:26:53 2021 +0800 comctl32/button: Do not restore push button font after themed painting. Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index d3dcc67b169..7dfc1720508 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2656,13 +2656,13 @@ cleanup: static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { RECT bgRect, textRect; - HFONT font = infoPtr->font; - HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; WCHAR *text; + if (infoPtr->font) SelectObject(hDC, infoPtr->font); + GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); @@ -2672,7 +2672,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send erase notifications */ cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); @@ -2687,7 +2687,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (!(cdrf & CDRF_DOERASE) && (text = get_button_text(infoPtr))) { @@ -2700,7 +2700,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + if (cdrf & CDRF_SKIPPOSTPAINT) return; if (focused) { @@ -2716,9 +2716,6 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in DrawFocusRect( hDC, &focusRect ); } - -cleanup: - if (hPrevFont) SelectObject(hDC, hPrevFont); } static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused)

1 0

Jacek Caban : gdi32: Use native memory allocators in Unix library.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 6ea18f668174e8122e0c192f2b67d8b2c1daca2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ea18f668174e8122e0c192f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 01:57:05 2021 +0200 gdi32: Use native memory allocators in Unix library. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 14 ++--- dlls/gdi32/bitmap.c | 16 +++--- dlls/gdi32/brush.c | 12 ++--- dlls/gdi32/dc.c | 20 ++++---- dlls/gdi32/dib.c | 27 +++++----- dlls/gdi32/dibdrv/bitblt.c | 8 +-- dlls/gdi32/dibdrv/dc.c | 12 ++--- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 44 ++++++++-------- dlls/gdi32/dibdrv/objects.c | 10 ++-- dlls/gdi32/dibdrv/opengl.c | 6 +-- dlls/gdi32/driver.c | 9 ++-- dlls/gdi32/emfdrv.c | 4 +- dlls/gdi32/font.c | 120 ++++++++++++++++++++----------------------- dlls/gdi32/freetype.c | 100 ++++++++++++++++++------------------ dlls/gdi32/gdiobj.c | 6 +-- dlls/gdi32/painting.c | 25 +++++---- dlls/gdi32/palette.c | 25 ++++----- dlls/gdi32/path.c | 52 +++++++++---------- dlls/gdi32/pen.c | 12 ++--- dlls/gdi32/region.c | 22 ++++---- dlls/gdi32/win32u_private.h | 3 -- 22 files changed, 266 insertions(+), 283 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ea18f668174e8122e0c…

1 0

Zhiyi Zhang : comctl32/button: Do not restore split button font after themed painting.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 84e0eac1f90b72e89fb4fcc7f9f35dbe1e5e56e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84e0eac1f90b72e89fb4fcc7… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Oct 1 11:29:47 2021 +0800 comctl32/button: Do not restore split button font after themed painting. Fix button test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index f0b2c56b5fe..1a5d2afa999 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2876,12 +2876,13 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - HFONT old_font = infoPtr->font ? SelectObject(hDC, infoPtr->font) : NULL; RECT rc, content_rect, push_rect, dropdown_rect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; + if (infoPtr->font) SelectObject(hDC, infoPtr->font); + GetClientRect(infoPtr->hwnd, &rc); init_custom_draw(&nmcd, infoPtr, hDC, &rc); @@ -2890,7 +2891,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send erase notifications */ cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); @@ -2934,7 +2935,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); - if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; + if (cdrf & CDRF_SKIPDEFAULT) return; if (!(cdrf & CDRF_DOERASE)) { @@ -2963,7 +2964,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in nmcd.dwDrawStage = CDDS_POSTPAINT; SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); } - if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; + if (cdrf & CDRF_SKIPPOSTPAINT) return; if (focused) { @@ -2977,9 +2978,6 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in push_rect.bottom -= margins.cyBottomHeight; DrawFocusRect(hDC, &push_rect); } - -cleanup: - if (old_font) SelectObject(hDC, old_font); } static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused)

1 0

Rémi Bernon : winebus.sys: Add a PID device control output report.
by Alexandre Julliard Oct. 1, 2021

Oct. 1, 2021

Module: wine Branch: master Commit: 903c7ea75dee85311df55fdad0676d4215339c8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=903c7ea75dee85311df55fda… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 1 09:31:00 2021 +0200 winebus.sys: Add a PID device control output report. And include it in the HID report descriptor when SDL device has support for any haptic effect, or when UDEV lnxev device has any FF bit set. 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 | 21 ++++++++++-- dlls/winebus.sys/bus_udev.c | 15 +++++++++ dlls/winebus.sys/hid.c | 75 +++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/unix_private.h | 8 +++++ dlls/winebus.sys/unixlib.c | 12 +++++++ 5 files changed, 128 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=903c7ea75dee85311df5…

1 0