May 2019 - Wine-Commits - list.winehq.org

Andrew Eikum : winebus.sys: Pack hatswitch values into button bytes.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 5ff326f80147f4608fd64ad37510d0cff330676e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ff326f80147f4608fd64ad3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 7 09:02:22 2019 -0500 winebus.sys: Pack hatswitch values into button bytes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 80 ++++++++++++++++++++++++++++--------------- dlls/winebus.sys/controller.h | 2 +- 2 files changed, 53 insertions(+), 29 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 59c1698..cd69f83 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -123,7 +123,7 @@ struct platform_private int button_start; int axis_start; int ball_start; - int hat_start; + int hat_bit_offs; /* hatswitches are reported in the same bytes as buttons */ int report_descriptor_size; BYTE *report_descriptor; @@ -164,10 +164,6 @@ static const BYTE CONTROLLER_BUTTONS[] = { 0x95, CONTROLLER_NUM_BUTTONS, /* REPORT_COUNT (11) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ - /* padding */ - 0x95, 0x05, /* REPORT_COUNT (5) */ - 0x75, 0x01, /* REPORT_SIZE (1) */ - 0x81, 0x03, /* INPUT (Cnst,Var,Abs) */ }; static const BYTE CONTROLLER_AXIS [] = { @@ -302,22 +298,50 @@ static void set_ball_value(struct platform_private *ext, int index, int value1, static void set_hat_value(struct platform_private *ext, int index, int value) { - int offset; - offset = ext->hat_start + index; + int byte = ext->button_start + (ext->hat_bit_offs + 4 * index) / 8; + int bit_offs = (ext->hat_bit_offs + 4 * index) % 8; + int num_low_bits, num_high_bits; + unsigned char val, low_mask, high_mask; + + /* 4-bit hatswitch value is packed into button bytes */ + if (bit_offs <= 4) + { + num_low_bits = 4; + num_high_bits = 0; + low_mask = 0xf; + high_mask = 0; + } + else + { + num_low_bits = 8 - bit_offs; + num_high_bits = 4 - num_low_bits; + low_mask = (1 << num_low_bits) - 1; + high_mask = (1 << num_high_bits) - 1; + } + switch (value) { /* 8 1 2 * 7 0 3 * 6 5 4 */ - case SDL_HAT_CENTERED: ext->report_buffer[offset] = 0; break; - case SDL_HAT_UP: ext->report_buffer[offset] = 1; break; - case SDL_HAT_RIGHTUP: ext->report_buffer[offset] = 2; break; - case SDL_HAT_RIGHT: ext->report_buffer[offset] = 3; break; - case SDL_HAT_RIGHTDOWN: ext->report_buffer[offset] = 4; break; - case SDL_HAT_DOWN: ext->report_buffer[offset] = 5; break; - case SDL_HAT_LEFTDOWN: ext->report_buffer[offset] = 6; break; - case SDL_HAT_LEFT: ext->report_buffer[offset] = 7; break; - case SDL_HAT_LEFTUP: ext->report_buffer[offset] = 8; break; + case SDL_HAT_CENTERED: val = 0; break; + case SDL_HAT_UP: val = 1; break; + case SDL_HAT_RIGHTUP: val = 2; break; + case SDL_HAT_RIGHT: val = 3; break; + case SDL_HAT_RIGHTDOWN: val = 4; break; + case SDL_HAT_DOWN: val = 5; break; + case SDL_HAT_LEFTDOWN: val = 6; break; + case SDL_HAT_LEFT: val = 7; break; + case SDL_HAT_LEFTUP: val = 8; break; + default: return; + } + + ext->report_buffer[byte] &= ~(low_mask << bit_offs); + ext->report_buffer[byte] |= (val & low_mask) << bit_offs; + if (high_mask) + { + ext->report_buffer[byte + 1] &= ~high_mask; + ext->report_buffer[byte + 1] |= val & high_mask; } } @@ -423,19 +447,17 @@ static BOOL build_report_descriptor(struct platform_private *ext) if (button_count) { descript_size += sizeof(REPORT_BUTTONS); - if (button_count % 8) - descript_size += sizeof(REPORT_PADDING); - report_size += (button_count + 7) / 8; } hat_count = pSDL_JoystickNumHats(ext->sdl_joystick); - ext->hat_start = report_size; + ext->hat_bit_offs = button_count; if (hat_count) { descript_size += sizeof(REPORT_HATSWITCH); - report_size += hat_count; } + report_size += (button_count + hat_count * 4 + 7) / 8; + descript_size += test_haptic(ext); TRACE("Report Descriptor will be %i bytes\n", descript_size); @@ -468,11 +490,6 @@ static BOOL build_report_descriptor(struct platform_private *ext) if (button_count) { report_ptr = add_button_block(report_ptr, 1, button_count); - if (button_count % 8) - { - BYTE padding = 8 - (button_count % 8); - report_ptr = add_padding_block(report_ptr, padding); - } } if (hat_count) report_ptr = add_hatswitch(report_ptr, hat_count); @@ -540,9 +557,11 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) ext->axis_start = 0; ext->button_start = CONTROLLER_NUM_AXES * sizeof(WORD); - ext->hat_start = ext->button_start + (CONTROLLER_NUM_BUTTONS + 7) / 8; + ext->hat_bit_offs = CONTROLLER_NUM_BUTTONS; - ext->buffer_length = (CONTROLLER_NUM_BUTTONS + 7) / 8 + CONTROLLER_NUM_AXES * sizeof(WORD) + CONTROLLER_NUM_HATSWITCHES; + ext->buffer_length = (CONTROLLER_NUM_BUTTONS + CONTROLLER_NUM_HATSWITCHES * 4 + 7) / 8 + + CONTROLLER_NUM_AXES * sizeof(WORD) + + 2/* unknown constant*/; TRACE("Report Descriptor will be %i bytes\n", descript_size); TRACE("Report will be %i bytes\n", ext->buffer_length); @@ -566,6 +585,7 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) memcpy(report_ptr, CONTROLLER_BUTTONS, sizeof(CONTROLLER_BUTTONS)); report_ptr += sizeof(CONTROLLER_BUTTONS); report_ptr = add_hatswitch(report_ptr, 1); + report_ptr = add_padding_block(report_ptr, 16);/* unknown constant */ report_ptr += build_haptic(ext, report_ptr); memcpy(report_ptr, REPORT_TAIL, sizeof(REPORT_TAIL)); @@ -584,6 +604,10 @@ static BOOL build_mapped_report_descriptor(struct platform_private *ext) set_hat_value(ext, 0, compose_dpad_value(ext->sdl_controller)); + /* unknown constant */ + ext->report_buffer[12] = 0x89; + ext->report_buffer[13] = 0xc5; + return TRUE; } diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index 5fce16b..293290d 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -79,7 +79,7 @@ static const BYTE REPORT_HATSWITCH[] = { 0x25, 0x08, /* LOGICAL_MAXIMUM (0x08) */ 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ 0x45, 0x08, /* PHYSICAL_MAXIMUM (8) */ - 0x75, 0x08, /* REPORT_SIZE (8) */ + 0x75, 0x04, /* REPORT_SIZE (4) */ 0x95, 0x01, /* REPORT_COUNT (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ };

1 0

Alexandre Julliard : kernelbase: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: cae33247397eb2d3172e5fb3e77acb68c47dfce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cae33247397eb2d3172e5fb3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:31:13 2019 -0500 kernelbase: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 3eefcd7..5331f37 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -763,7 +763,7 @@ HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end) TRACE("%s %p\n", debugstr_w(path), root_end); if (!path || !path[0] || !root_end - || (!memicmpW(unc_prefix, path, ARRAY_SIZE(unc_prefix)) && !is_prefixed_volume(path) && !is_prefixed_unc(path) + || (!strncmpiW(unc_prefix, path, ARRAY_SIZE(unc_prefix)) && !is_prefixed_volume(path) && !is_prefixed_unc(path) && !is_prefixed_disk(path))) return E_INVALIDARG;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_bind_texture().
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 6de183795502a852758a1c201c0fbe6d75356479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de183795502a852758a1c20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 15:18:11 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_bind_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 28 ++++++++++++++-------------- dlls/wined3d/state.c | 3 ++- dlls/wined3d/surface.c | 18 +++++++++++------- dlls/wined3d/texture.c | 5 +++-- dlls/wined3d/view.c | 16 +++++++++++----- dlls/wined3d/wined3d_private.h | 3 ++- 6 files changed, 43 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6de183795502a852758a…

1 0

Henri Verbeet : wined3d: Make the adapter responsible for context destruction and allocation.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 5ab6421dfedbc8678af4b67d7673db2721a13f22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ab6421dfedbc8678af4b67d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 15:18:10 2019 +0430 wined3d: Make the adapter responsible for context destruction and allocation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 48 ++++++++++++++- dlls/wined3d/adapter_vk.c | 28 ++++++++- dlls/wined3d/context.c | 132 +++++++++++++++++++---------------------- dlls/wined3d/directx.c | 30 +++++++++- dlls/wined3d/wined3d_private.h | 16 ++++- 5 files changed, 176 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ab6421dfedbc8678af4…

1 0

Louis Lenders : rpcrt4: Add NdrServerCallAll stub.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: e54224e88c9514b7a1293d2f5b9471effbb3358f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e54224e88c9514b7a1293d2f… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon May 6 20:09:47 2019 +0200 rpcrt4: Add NdrServerCallAll stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47131 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_stubless.c | 8 ++++++++ dlls/rpcrt4/rpcrt4.spec | 1 + include/rpcndr.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 813d7e8..530bd9e 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1557,6 +1557,14 @@ void WINAPI NdrServerCall( PRPC_MESSAGE msg ) NdrStubCall( NULL, NULL, msg, &phase ); } +/*********************************************************************** + * NdrServerCallAll [RPCRT4.@] + */ +void WINAPI NdrServerCallAll( PRPC_MESSAGE msg ) +{ + FIXME("%p stub\n", msg); +} + struct async_call_data { MIDL_STUB_MESSAGE *pStubMsg; diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 79c9645..d8e873d 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -274,6 +274,7 @@ @ stdcall NdrSendReceive(ptr ptr) @ stdcall NdrServerCall2(ptr) @ stdcall NdrServerCall(ptr) +@ stdcall NdrServerCallAll(ptr) @ stdcall NdrServerContextMarshall(ptr ptr long) @ stdcall NdrServerContextNewMarshall(ptr ptr ptr ptr) # wxp @ stdcall NdrServerContextNewUnmarshall(ptr ptr) # wxp diff --git a/include/rpcndr.h b/include/rpcndr.h index 077e02a..ac9da11 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -677,6 +677,8 @@ RPCRTAPI void RPC_ENTRY RPCRTAPI void RPC_ENTRY NdrServerCall( PRPC_MESSAGE pRpcMsg ); RPCRTAPI void RPC_ENTRY + NdrServerCallAll( PRPC_MESSAGE pRpcMsg ); +RPCRTAPI void RPC_ENTRY NdrAsyncServerCall( PRPC_MESSAGE pRpcMsg ); RPCRTAPI LONG RPC_ENTRY

1 0

Alexandre Julliard : fusion: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 70441899256db1d622e9660587790302776d0826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70441899256db1d622e96605… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:30:58 2019 -0500 fusion: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index ba86818..915515e 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -350,7 +350,7 @@ static HRESULT enum_gac_assemblies(struct list *assemblies, IAssemblyName *name, { unsigned int prefix_len = strlenW(prefix); if (strlenW(ffd.cFileName) >= prefix_len && - !memicmpW(ffd.cFileName, prefix, prefix_len)) + !strncmpiW(ffd.cFileName, prefix, prefix_len)) version += prefix_len; } sprintfW(disp, name_fmt, parent, version, token);

1 0

Dmitry Timoshkov : mshtml: Implement HTMLStyleSheetRulesCollection::item.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: a6fbd07ac8b4478932b29f98a8767bd8bad3a170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6fbd07ac8b4478932b29f98… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 7 14:45:11 2019 +0200 mshtml: Implement HTMLStyleSheetRulesCollection::item. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 188 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 16 ++++ dlls/mshtml/tests/elements.js | 19 +++++ 4 files changed, 223 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6fbd07ac8b4478932b2…

1 0

Henri Verbeet : wined3d: Get rid of a redundant initialisation in wined3d_device_set_implicit_swapchain ().
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 4f635833a8b94124b7b155e185237d51e934030d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f635833a8b94124b7b155e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 7 15:18:06 2019 +0430 wined3d: Get rid of a redundant initialisation in wined3d_device_set_implicit_swapchain(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a27251c..b2dbb40 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1153,8 +1153,6 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str goto err_out; device_init_swapchain_state(device, swapchain); - device->contexts[0]->last_was_rhw = 0; - TRACE("All defaults now set up.\n"); /* Clear the screen */

1 0

Alexandre Julliard : advapi32: Use strncmpiW instead of memicmpW for strings without embedded nulls.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: 6e0a5b81a4f339e8691091c35bfb9df07b957aeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e0a5b81a4f339e8691091c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 11:30:29 2019 -0500 advapi32: Use strncmpiW instead of memicmpW for strings without embedded nulls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 9a4c961..43ea3b3 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -108,7 +108,7 @@ static BOOL is_wow6432node( const UNICODE_STRING *name ) static const WCHAR wow6432nodeW[] = {'W','o','w','6','4','3','2','N','o','d','e'}; return (name->Length == sizeof(wow6432nodeW) && - !memicmpW( name->Buffer, wow6432nodeW, ARRAY_SIZE( wow6432nodeW ))); + !strncmpiW( name->Buffer, wow6432nodeW, ARRAY_SIZE( wow6432nodeW ))); } /* open the Wow6432Node subkey of the specified key */ @@ -149,7 +149,7 @@ static NTSTATUS create_key( HKEY *retkey, ACCESS_MASK access, OBJECT_ATTRIBUTES /* don't try to create registry root */ if (!attr->RootDirectory && len > ARRAY_SIZE( registry_root ) && - !memicmpW( buffer, registry_root, ARRAY_SIZE( registry_root ))) + !strncmpiW( buffer, registry_root, ARRAY_SIZE( registry_root ))) i += ARRAY_SIZE( registry_root ); while (i < len && buffer[i] != '\\') i++;

1 0

Andrew Eikum : dinput: Use heuristics to guess if a device is a gamepad or a joystick.
by Alexandre Julliard May 7, 2019

May 7, 2019

Module: wine Branch: master Commit: ae849579161cb14aae0f71a64563ade1bc74c847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae849579161cb14aae0f71a6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue May 7 08:59:38 2019 -0500 dinput: Use heuristics to guess if a device is a gamepad or a joystick. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47123 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_private.h | 2 +- dlls/dinput/joystick.c | 6 ++++- dlls/dinput/joystick_linux.c | 46 +++++++++++++++++++++++++++++++++++++-- dlls/dinput/joystick_linuxinput.c | 27 ++++++++++++++++++++--- dlls/dinput/joystick_osx.c | 20 ++++++++++++++--- 5 files changed, 91 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae849579161cb14aae0f…

1 0