June 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : hidclass.sys: Build an alternate value array.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 51560aabcb259cb89659d96654d8ad38edbb528d URL: https://source.winehq.org/git/wine.git/?a=commit;h=51560aabcb259cb89659d966… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 21 09:05:20 2021 +0200 hidclass.sys: Build an alternate value array. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 99 +++++++++++++++++++++++++++++++++++++++++- include/wine/hid.h | 11 +++++ 2 files changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index e1f1b0bd4f9..e319519ca90 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -287,8 +287,13 @@ struct hid_parser_state struct hid_value_caps *collections; DWORD collections_size; + struct hid_value_caps *values[3]; + ULONG values_size[3]; + ULONG bit_size[3][256]; USHORT *byte_size[3]; /* pointers to caps */ + USHORT *value_idx[3]; /* pointers to caps */ + USHORT *data_idx[3]; /* pointers to caps */ }; static BOOL array_reserve( struct hid_value_caps **array, DWORD *array_size, DWORD index ) @@ -447,7 +452,12 @@ static BOOL parse_end_collection( struct hid_parser_state *state ) static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TYPE type, struct collection *collection ) { + struct hid_value_caps *value; + USAGE usage_page = state->items.usage_page; + DWORD usages_size = max(1, state->usages_size); USHORT *byte_size = state->byte_size[type]; + USHORT *value_idx = state->value_idx[type]; + USHORT *data_idx = state->data_idx[type]; ULONG *bit_size = &state->bit_size[type][state->items.report_id]; struct feature *feature; int j; @@ -472,6 +482,34 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY *bit_size += state->items.bit_size * state->items.report_count; *byte_size = max( *byte_size, (*bit_size + 7) / 8 ); + if (!state->items.report_count) + { + reset_local_items( state ); + return TRUE; + } + + if (!array_reserve( &state->values[type], &state->values_size[type], *value_idx + usages_size )) + { + ERR( "HID parser values overflow!\n" ); + return FALSE; + } + value = state->values[type] + *value_idx; + + state->items.report_count -= usages_size - 1; + while (usages_size--) + { + state->items.usage_page = state->usages_page[usages_size]; + state->items.usage_min = state->usages_min[usages_size]; + state->items.usage_max = state->usages_max[usages_size]; + state->items.data_index_min = *data_idx; + state->items.data_index_max = *data_idx + state->items.usage_max - state->items.usage_min; + if (state->items.usage_max || state->items.usage_min) *data_idx = state->items.data_index_max + 1; + *value++ = state->items; + *value_idx += 1; + state->items.report_count = 1; + } + + state->items.usage_page = usage_page; reset_local_items( state ); return TRUE; } @@ -482,6 +520,14 @@ static void init_parser_state( struct hid_parser_state *state ) state->byte_size[HidP_Input] = &state->caps.InputReportByteLength; state->byte_size[HidP_Output] = &state->caps.OutputReportByteLength; state->byte_size[HidP_Feature] = &state->caps.FeatureReportByteLength; + + state->value_idx[HidP_Input] = &state->caps.NumberInputValueCaps; + state->value_idx[HidP_Output] = &state->caps.NumberOutputValueCaps; + state->value_idx[HidP_Feature] = &state->caps.NumberFeatureValueCaps; + + state->data_idx[HidP_Input] = &state->caps.NumberInputDataIndices; + state->data_idx[HidP_Output] = &state->caps.NumberOutputDataIndices; + state->data_idx[HidP_Feature] = &state->caps.NumberFeatureDataIndices; } static void free_parser_state( struct hid_parser_state *state ) @@ -490,6 +536,9 @@ static void free_parser_state( struct hid_parser_state *state ) if (state->collection_idx) ERR( "%u unpopped device collection on the stack\n", state->collection_idx ); free( state->stack ); free( state->collections ); + free( state->values[HidP_Input] ); + free( state->values[HidP_Output] ); + free( state->values[HidP_Feature] ); free( state ); } @@ -785,9 +834,10 @@ static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct collection *base_c { WINE_HID_LINK_COLLECTION_NODE *nodes; WINE_HIDP_PREPARSED_DATA *data; + struct hid_value_caps *caps; unsigned int report_count; unsigned int size; - DWORD i; + DWORD i, button, filler, caps_len, caps_off; struct preparse_ctx ctx; unsigned int element_off; @@ -804,13 +854,26 @@ static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct collection *base_c nodes_offset = size; size += state->caps.NumberLinkCollectionNodes * sizeof(WINE_HID_LINK_COLLECTION_NODE); + caps_len = state->caps.NumberInputValueCaps + state->caps.NumberOutputValueCaps + state->caps.NumberFeatureValueCaps; + caps_off = size; + size += caps_len * sizeof(*caps); + if (!(data = calloc(1, size))) return NULL; data->magic = HID_MAGIC; data->dwSize = size; data->caps = state->caps; + data->new_caps = state->caps; data->elementOffset = element_off; data->nodesOffset = nodes_offset; + data->value_caps_offset = caps_off; + data->value_caps_count[HidP_Input] = state->caps.NumberInputValueCaps; + data->value_caps_count[HidP_Output] = state->caps.NumberOutputValueCaps; + data->value_caps_count[HidP_Feature] = state->caps.NumberFeatureValueCaps; + + data->caps.NumberInputValueCaps = data->caps.NumberInputButtonCaps = data->caps.NumberInputDataIndices = 0; + data->caps.NumberOutputValueCaps = data->caps.NumberOutputButtonCaps = data->caps.NumberOutputDataIndices = 0; + data->caps.NumberFeatureValueCaps = data->caps.NumberFeatureButtonCaps = data->caps.NumberFeatureDataIndices = 0; preparse_collection(base_collection, base_collection, data, &ctx); nodes = HID_NODES( data ); @@ -830,6 +893,40 @@ static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct collection *base_c } } + /* fixup value vs button vs filler counts */ + + caps = HID_INPUT_VALUE_CAPS( data ); + memcpy( caps, state->values[0], data->new_caps.NumberInputValueCaps * sizeof(*caps) ); + for (i = 0, button = 0, filler = 0; i < data->new_caps.NumberInputValueCaps; ++i) + { + if (!caps[i].usage_min && !caps[i].usage_max) filler++; + else if (HID_VALUE_CAPS_IS_BUTTON( caps + i )) button++; + } + data->new_caps.NumberInputButtonCaps = button; + data->new_caps.NumberInputValueCaps -= filler + button; + + caps = HID_OUTPUT_VALUE_CAPS( data ); + memcpy( caps, state->values[1], data->new_caps.NumberOutputValueCaps * sizeof(*caps) ); + for (i = 0, button = 0, filler = 0; i < data->new_caps.NumberOutputValueCaps; ++i) + { + if (!caps[i].usage_min && !caps[i].usage_max) filler++; + else if (HID_VALUE_CAPS_IS_BUTTON( caps + i )) button++; + } + caps += data->new_caps.NumberOutputValueCaps; + data->new_caps.NumberOutputButtonCaps = button; + data->new_caps.NumberOutputValueCaps -= filler + button; + + caps = HID_FEATURE_VALUE_CAPS( data ); + memcpy( caps, state->values[2], data->new_caps.NumberFeatureValueCaps * sizeof(*caps) ); + for (i = 0, button = 0, filler = 0; i < data->new_caps.NumberFeatureValueCaps; ++i) + { + if (!caps[i].usage_min && !caps[i].usage_max) filler++; + else if (HID_VALUE_CAPS_IS_BUTTON( caps + i )) button++; + } + caps += data->new_caps.NumberFeatureValueCaps; + data->new_caps.NumberFeatureButtonCaps = button; + data->new_caps.NumberFeatureValueCaps -= filler + button; + return data; } diff --git a/include/wine/hid.h b/include/wine/hid.h index 185015a52d9..5609adec11f 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -73,6 +73,8 @@ struct hid_value_caps USAGE usage_page; USAGE usage_min; USAGE usage_max; + USHORT data_index_min; + USHORT data_index_max; USHORT string_min; USHORT string_max; USHORT designator_min; @@ -97,6 +99,8 @@ struct hid_value_caps #define HID_VALUE_CAPS_IS_ABSOLUTE(x) (((x)->bit_field & 0x04) == 0) #define HID_VALUE_CAPS_HAS_NULL(x) (((x)->bit_field & 0x40) != 0) +#define HID_VALUE_CAPS_IS_ARRAY(c) (((c)->bit_field & 2) == 0) +#define HID_VALUE_CAPS_IS_BUTTON(c) ((c)->bit_size == 1 || HID_VALUE_CAPS_IS_ARRAY(c)) typedef struct __WINE_HID_REPORT { @@ -122,12 +126,15 @@ typedef struct __WINE_HIDP_PREPARSED_DATA DWORD magic; DWORD dwSize; HIDP_CAPS caps; + HIDP_CAPS new_caps; DWORD elementOffset; DWORD nodesOffset; DWORD reportCount[3]; BYTE reportIdx[3][256]; + DWORD value_caps_offset; + USHORT value_caps_count[3]; WINE_HID_REPORT reports[1]; } WINE_HIDP_PREPARSED_DATA, *PWINE_HIDP_PREPARSED_DATA; @@ -137,4 +144,8 @@ typedef struct __WINE_HIDP_PREPARSED_DATA #define HID_ELEMS(d) ((WINE_HID_ELEMENT*)((BYTE*)(d) + (d)->elementOffset)) #define HID_NODES(d) ((WINE_HID_LINK_COLLECTION_NODE*)((BYTE*)(d) + (d)->nodesOffset)) +#define HID_INPUT_VALUE_CAPS(d) ((struct hid_value_caps*)((char *)(d) + (d)->value_caps_offset)) +#define HID_OUTPUT_VALUE_CAPS(d) (HID_INPUT_VALUE_CAPS(d) + (d)->value_caps_count[0]) +#define HID_FEATURE_VALUE_CAPS(d) (HID_OUTPUT_VALUE_CAPS(d) + (d)->value_caps_count[1]) + #endif /* __WINE_PARSE_H */

1 0

Zebediah Figura : ws2_32: Move the getsockopt(SO_BROADCAST) implementation to ntdll.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: d9b281e5c7a70f4485e9947d62d6ae520652220e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9b281e5c7a70f4485e9947d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:44 2021 -0500 ws2_32: Move the getsockopt(SO_BROADCAST) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 22 ++++++++++++++++++++++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 04db120dcbd..c3392f94b54 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1146,6 +1146,25 @@ static void complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo } +static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, void *out_buffer, + ULONG out_size, int level, int option ) +{ + int fd, needs_close = FALSE; + socklen_t len = out_size; + NTSTATUS status; + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = getsockopt( fd, level, option, out_buffer, &len ); + if (needs_close) close( fd ); + if (ret) return sock_errno_to_status( errno ); + io->Information = len; + return STATUS_SUCCESS; +} + + NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { @@ -1566,6 +1585,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_WINE_GET_SO_BROADCAST: + return do_getsockopt( handle, io, out_buffer, out_size, SOL_SOCKET, SO_BROADCAST ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3dac76fd3f0..3b00e65fe3d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2098,9 +2098,11 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_ACCEPTCONN: return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ACCEPTCONN, optval, optlen ); + case WS_SO_BROADCAST: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_BROADCAST, optval, optlen ); + /* Handle common cases. The special cases are below, sorted * alphabetically */ - case WS_SO_BROADCAST: case WS_SO_DEBUG: case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: diff --git a/include/wine/afd.h b/include/wine/afd.h index 4c501872dde..8916fafae53 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -160,6 +160,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Andrey Gusev : msvcr120: Add version.rc file.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 772291539522189fa1712a8a5fa61659bccd883f URL: https://source.winehq.org/git/wine.git/?a=commit;h=772291539522189fa1712a8a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jun 22 23:51:22 2021 +0300 msvcr120: Add version.rc file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51244 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/Makefile.in | 2 ++ dlls/msvcr120/version.rc | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index 3c949851ff6..aff77ba24ac 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -40,3 +40,5 @@ C_SRCS = \ time.c \ undname.c \ wcs.c + +RC_SRCS = version.rc diff --git a/dlls/msvcr120/version.rc b/dlls/msvcr120/version.rc new file mode 100644 index 00000000000..f29899e48cb --- /dev/null +++ b/dlls/msvcr120/version.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2021 Andrey Gusev + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine CRT library" +#define WINE_FILENAME_STR "msvcr120.dll" +#define WINE_FILEVERSION 12,0,40664,0 +#define WINE_FILEVERSION_STR "12.0.40664.0" + +#include "wine/wine_common_ver.rc"

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_GET_SO_ACCEPTCONN.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 697f9e979e95fe9345291dbcd46df757fc6f6bdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=697f9e979e95fe9345291dbc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:42 2021 -0500 server: Introduce IOCTL_AFD_WINE_GET_SO_ACCEPTCONN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index e497eece0be..4c501872dde 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -159,6 +159,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index b73fbb98388..71f22845827 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2532,6 +2532,20 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_GET_SO_ACCEPTCONN: + { + int listening = (sock->state == SOCK_LISTENING); + + if (get_reply_max_size() < sizeof(listening)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &listening, sizeof(listening) ); + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_GET_SO_ACCEPTCONN.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 8eed10c534b095135db285137ca280d253a25965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eed10c534b095135db28513… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:43 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_GET_SO_ACCEPTCONN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cb576bad5f2..3dac76fd3f0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2063,6 +2063,19 @@ int WINAPI WS_getsockname( SOCKET s, struct WS_sockaddr *addr, int *len ) return status ? -1 : 0; } + +static int server_getsockopt( SOCKET s, ULONG code, char *optval, int *optlen ) +{ + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, NULL, 0, optval, *optlen ); + if (!status) *optlen = io.Information; + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; +} + + /*********************************************************************** * getsockopt (WS2_32.7) */ @@ -2082,6 +2095,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, { switch(optname) { + case WS_SO_ACCEPTCONN: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ACCEPTCONN, optval, optlen ); + /* Handle common cases. The special cases are below, sorted * alphabetically */ case WS_SO_BROADCAST: @@ -2101,21 +2117,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; - case WS_SO_ACCEPTCONN: - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, optval, (socklen_t *)optlen) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - { - /* BSD returns != 0 while Windows return exact == 1 */ - if (*(int *)optval) *(int *)optval = 1; - } - release_sock_fd( s, fd ); - return ret; + case WS_SO_BSP_STATE: { CSADDR_INFO *csinfo = (CSADDR_INFO *)optval;

1 0

Rémi Bernon : hidclass.sys: Compute report sizes during parsing.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 7af8ca63717b85306f9ab8ff2d5c2e061676a5bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af8ca63717b85306f9ab8ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 21 09:05:19 2021 +0200 hidclass.sys: Compute report sizes during parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 646f6eaa492..e1f1b0bd4f9 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -286,6 +286,9 @@ struct hid_parser_state struct hid_value_caps *collections; DWORD collections_size; + + ULONG bit_size[3][256]; + USHORT *byte_size[3]; /* pointers to caps */ }; static BOOL array_reserve( struct hid_value_caps **array, DWORD *array_size, DWORD index ) @@ -444,6 +447,8 @@ static BOOL parse_end_collection( struct hid_parser_state *state ) static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TYPE type, struct collection *collection ) { + USHORT *byte_size = state->byte_size[type]; + ULONG *bit_size = &state->bit_size[type][state->items.report_id]; struct feature *feature; int j; @@ -463,10 +468,22 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY } } + if (!*bit_size) *bit_size = 8; + *bit_size += state->items.bit_size * state->items.report_count; + *byte_size = max( *byte_size, (*bit_size + 7) / 8 ); + reset_local_items( state ); return TRUE; } +static void init_parser_state( struct hid_parser_state *state ) +{ + memset( state, 0, sizeof(*state) ); + state->byte_size[HidP_Input] = &state->caps.InputReportByteLength; + state->byte_size[HidP_Output] = &state->caps.OutputReportByteLength; + state->byte_size[HidP_Feature] = &state->caps.FeatureReportByteLength; +} + static void free_parser_state( struct hid_parser_state *state ) { if (state->global_idx) ERR( "%u unpopped device caps on the stack\n", state->global_idx ); @@ -747,20 +764,14 @@ static void preparse_collection(const struct collection *root, const struct coll case HidP_Input: build_elements(report, elem, f, &data->caps.NumberInputDataIndices); count_elements(f, &data->caps.NumberInputButtonCaps, &data->caps.NumberInputValueCaps); - data->caps.InputReportByteLength = - max(data->caps.InputReportByteLength, (report->bitSize + 7) / 8); break; case HidP_Output: build_elements(report, elem, f, &data->caps.NumberOutputDataIndices); count_elements(f, &data->caps.NumberOutputButtonCaps, &data->caps.NumberOutputValueCaps); - data->caps.OutputReportByteLength = - max(data->caps.OutputReportByteLength, (report->bitSize + 7) / 8); break; case HidP_Feature: build_elements(report, elem, f, &data->caps.NumberFeatureDataIndices); count_elements(f, &data->caps.NumberFeatureButtonCaps, &data->caps.NumberFeatureValueCaps); - data->caps.FeatureReportByteLength = - max(data->caps.FeatureReportByteLength, (report->bitSize + 7) / 8); break; } } @@ -865,6 +876,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) } list_init(&base->features); list_init(&base->collections); + init_parser_state( state ); if (parse_descriptor( descriptor, 0, length, base, state ) < 0) {

1 0

Paul Gofman : ntdll/tests: Do not write to fs, gs when testing cleared segment regs on x64.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 4e4847dd71a3c682356559a51705ccec93b2490e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e4847dd71a3c682356559a5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 23 19:37:33 2021 +0300 ntdll/tests: Do not write to fs, gs when testing cleared segment regs on x64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51152 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 253b304d312..7e849fba1aa 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2906,13 +2906,30 @@ static const struct exception 0x31, 0xc0, /* xor %eax,%eax */ 0x8e, 0xc0, /* mov %eax,%es */ 0x8e, 0xd8, /* mov %eax,%ds */ +#if 0 + /* It is observed that fs/gs base is reset + on some CPUs when setting the segment value + even to 0 (regardless of CPU spec + saying otherwise) and it is not currently + handled in Wine. + Disable this part to avoid crashing the test. */ 0x8e, 0xe0, /* mov %eax,%fs */ 0x8e, 0xe8, /* mov %eax,%gs */ +#else + 0x90, 0x90, /* nop */ + 0x90, 0x90, /* nop */ +#endif 0xfa, /* cli */ 0x58, /* pop %rax */ +#if 0 0x8e, 0xe8, /* mov %eax,%gs */ 0x58, /* pop %rax */ 0x8e, 0xe0, /* mov %eax,%fs */ +#else + 0x58, /* pop %rax */ + 0x90, 0x90, /* nop */ + 0x90, 0x90, /* nop */ +#endif 0x58, /* pop %rax */ 0x8e, 0xd8, /* mov %eax,%ds */ 0x58, /* pop %rax */

1 0

Zebediah Figura : ws2_32/tests: Add some tests for SO_DEBUG.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 75fe1064f714fb1676085ac7b6e7cdff6ae17eae URL: https://source.winehq.org/git/wine.git/?a=commit;h=75fe1064f714fb1676085ac7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:46 2021 -0500 ws2_32/tests: Add some tests for SO_DEBUG. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c12ff45b921..c4a3f953175 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10978,6 +10978,41 @@ static void test_timeout(void) CloseHandle(overlapped.hEvent); } +static void test_so_debug(void) +{ + int ret, len; + DWORD debug; + SOCKET s; + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + len = sizeof(debug); + WSASetLastError(0xdeadbeef); + debug = 0xdeadbeef; + ret = getsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&debug, &len); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(len == sizeof(debug), "got len %u\n", len); + ok(!debug, "got debug %u\n", debug); + + WSASetLastError(0xdeadbeef); + debug = 2; + ret = setsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&debug, sizeof(debug)); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + len = sizeof(debug); + WSASetLastError(0xdeadbeef); + debug = 0xdeadbeef; + ret = getsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&debug, &len); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(len == sizeof(debug), "got len %u\n", len); + todo_wine ok(debug == 1, "got debug %u\n", debug); + + closesocket(s); +} + START_TEST( sock ) { int i; @@ -10993,6 +11028,7 @@ START_TEST( sock ) test_so_reuseaddr(); test_ip_pktinfo(); test_extendedSocketOptions(); + test_so_debug(); for (i = 0; i < ARRAY_SIZE(tests); i++) do_test(&tests[i]);

1 0

Zhiyi Zhang : light.msstyles: Add Classic Blue visual style.
by Alexandre Julliard June 23, 2021

June 23, 2021

1 0

Nikolay Sivov : mf/session: Complete start command when called from invalid state.
by Alexandre Julliard June 23, 2021

June 23, 2021

Module: wine Branch: master Commit: 5eec2141dce9b5b6c60af6ed876956b21e6eabfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eec2141dce9b5b6c60af6ed… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 23 14:03:05 2021 +0300 mf/session: Complete start command when called from invalid state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 8b0d3cbf681..de82d687aba 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -865,6 +865,7 @@ static void session_start(struct media_session *session, const GUID *time_format case SESSION_STATE_CLOSED: IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStarted, &GUID_NULL, MF_E_INVALIDREQUEST, NULL); + session_command_complete(session); break; default: ;

1 0