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

Rémi Bernon : hidclass.sys: Use the stack to store collection items.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: bf0ab04b10a6153084780e70a80b34c923dc3ea3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf0ab04b10a6153084780e70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 17 10:20:20 2021 +0200 hidclass.sys: Use the stack to store collection items. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 57 ++++++++++++++++++++++++++++++++++++++---- include/wine/hid.h | 3 +++ 2 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index b57ab2a7da8..19f12d77ded 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -144,6 +144,9 @@ static void copy_hidp_value_caps( HIDP_VALUE_CAPS *out, const struct hid_value_c { out->UsagePage = in->usage_page; out->ReportID = in->report_id; + out->LinkCollection = in->link_collection; + out->LinkUsagePage = in->link_usage_page; + out->LinkUsage = in->link_usage; out->IsAlias = FALSE; out->BitSize = in->bit_size; out->ReportCount = in->report_count; @@ -289,6 +292,8 @@ static void debug_print_preparsed(WINE_HIDP_PREPARSED_DATA *data) struct hid_parser_state { + HIDP_CAPS caps; + USAGE usages[256]; DWORD usages_size; @@ -297,6 +302,7 @@ struct hid_parser_state struct hid_value_caps *stack; DWORD stack_size; DWORD global_idx; + DWORD collection_idx; }; static BOOL array_reserve( struct hid_value_caps **array, DWORD *array_size, DWORD index ) @@ -321,12 +327,21 @@ static void copy_global_items( struct hid_value_caps *dst, const struct hid_valu dst->report_count = src->report_count; } +static void copy_collection_items( struct hid_value_caps *dst, const struct hid_value_caps *src ) +{ + dst->link_collection = src->link_collection; + dst->link_usage_page = src->link_usage_page; + dst->link_usage = src->link_usage; +} + static void reset_local_items( struct hid_parser_state *state ) { struct hid_value_caps tmp; copy_global_items( &tmp, &state->items ); + copy_collection_items( &tmp, &state->items ); memset( &state->items, 0, sizeof(state->items) ); copy_global_items( &state->items, &tmp ); + copy_collection_items( &state->items, &tmp ); state->usages_size = 0; } @@ -364,9 +379,44 @@ static BOOL parse_local_usage( struct hid_parser_state *state, USAGE usage ) return state->usages_size <= 255; } +static BOOL parse_new_collection( struct hid_parser_state *state ) +{ + if (!array_reserve( &state->stack, &state->stack_size, state->collection_idx )) + { + ERR( "HID parser stack overflow!\n" ); + return FALSE; + } + + copy_collection_items( state->stack + state->collection_idx, &state->items ); + state->collection_idx++; + + state->items.link_collection = state->caps.NumberLinkCollectionNodes; + state->items.link_usage_page = state->items.usage_page; + state->items.link_usage = state->items.usage_min; + state->caps.NumberLinkCollectionNodes++; + + reset_local_items( state ); + return TRUE; +} + +static BOOL parse_end_collection( struct hid_parser_state *state ) +{ + if (!state->collection_idx) + { + ERR( "HID parser collection stack underflow!\n" ); + return FALSE; + } + + state->collection_idx--; + copy_collection_items( &state->items, state->stack + state->collection_idx ); + reset_local_items( state ); + return TRUE; +} + 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 ); + if (state->collection_idx) ERR( "%u unpopped device collection on the stack\n", state->collection_idx ); free( state->stack ); free( state ); } @@ -496,7 +546,7 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int list_init(&subcollection->features); list_init(&subcollection->collections); parse_collection(size, value, subcollection); - reset_local_items( state ); + if (!parse_new_collection( state )) return -1; if ((i = parse_descriptor( descriptor, i, length, feature_index, collection_index, subcollection, state )) < 0) @@ -504,7 +554,7 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int continue; } case SHORT_ITEM(TAG_MAIN_END_COLLECTION, TAG_TYPE_MAIN): - reset_local_items( state ); + if (!parse_end_collection( state )) return -1; return i; case SHORT_ITEM(TAG_GLOBAL_USAGE_PAGE, TAG_TYPE_GLOBAL): @@ -611,9 +661,6 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems wine_element->caps = feature->caps; wine_element->caps.BitField = feature->BitField; - wine_element->caps.LinkCollection = feature->collection->index; - wine_element->caps.LinkUsage = feature->collection->caps.NotRange.Usage; - wine_element->caps.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.IsAbsolute = feature->IsAbsolute; wine_element->caps.HasNull = feature->HasNull; diff --git a/include/wine/hid.h b/include/wine/hid.h index 50b1493ab62..47aeda5575c 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -81,6 +81,9 @@ struct hid_value_caps BOOLEAN is_string_range; BOOLEAN is_designator_range; UCHAR report_id; + USHORT link_collection; + USAGE link_usage_page; + USAGE link_usage; USHORT bit_size; USHORT report_count; LONG logical_min;

1 0

Rémi Bernon : hidclass.sys: Set BitField item to current value.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 152aafc73f27cebeeb5ae7ffdd94d448d588b0ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=152aafc73f27cebeeb5ae7ff… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jun 17 10:20:21 2021 +0200 hidclass.sys: Set BitField item to current value. As documented on MSDN, and as testing shows. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 8 +++++--- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ++-- include/wine/hid.h | 4 ++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 19f12d77ded..86b68863308 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -147,7 +147,10 @@ static void copy_hidp_value_caps( HIDP_VALUE_CAPS *out, const struct hid_value_c out->LinkCollection = in->link_collection; out->LinkUsagePage = in->link_usage_page; out->LinkUsage = in->link_usage; + out->BitField = in->bit_field; out->IsAlias = FALSE; + out->IsAbsolute = HID_VALUE_CAPS_IS_ABSOLUTE( in ); + out->HasNull = HID_VALUE_CAPS_HAS_NULL( in ); out->BitSize = in->bit_size; out->ReportCount = in->report_count; out->UnitsExp = in->units_exp; @@ -501,6 +504,8 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int } i += size; + state->items.bit_field = value; + #define SHORT_ITEM(tag,type) (((tag)<<4)|((type)<<2)) switch (item & SHORT_ITEM(0xf,0x3)) { @@ -660,9 +665,6 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems wine_report->bitSize += wine_element->bitCount; wine_element->caps = feature->caps; - wine_element->caps.BitField = feature->BitField; - wine_element->caps.IsAbsolute = feature->IsAbsolute; - wine_element->caps.HasNull = feature->HasNull; if (wine_element->caps.IsRange) { diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index ff1db96a06a..5453af8ff1c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1892,7 +1892,7 @@ static void test_hidp(HANDLE file, int report_id) check_member(button_caps[i], expect_button_caps[i], "%04x", UsagePage); check_member(button_caps[i], expect_button_caps[i], "%d", ReportID); check_member(button_caps[i], expect_button_caps[i], "%d", IsAlias); - todo_wine + todo_wine_if(i == 1 || i == 2) check_member(button_caps[i], expect_button_caps[i], "%d", BitField); todo_wine_if(i >= 2) check_member(button_caps[i], expect_button_caps[i], "%d", LinkCollection); @@ -1994,7 +1994,7 @@ static void test_hidp(HANDLE file, int report_id) check_member(value_caps[i], expect_value_caps[i], "%04x", UsagePage); check_member(value_caps[i], expect_value_caps[i], "%d", ReportID); check_member(value_caps[i], expect_value_caps[i], "%d", IsAlias); - todo_wine + todo_wine_if(i == 2) check_member(value_caps[i], expect_value_caps[i], "%d", BitField); check_member(value_caps[i], expect_value_caps[i], "%d", LinkCollection); check_member(value_caps[i], expect_value_caps[i], "%04x", LinkUsage); diff --git a/include/wine/hid.h b/include/wine/hid.h index 47aeda5575c..185015a52d9 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -84,6 +84,7 @@ struct hid_value_caps USHORT link_collection; USAGE link_usage_page; USAGE link_usage; + USHORT bit_field; USHORT bit_size; USHORT report_count; LONG logical_min; @@ -94,6 +95,9 @@ struct hid_value_caps ULONG units_exp; }; +#define HID_VALUE_CAPS_IS_ABSOLUTE(x) (((x)->bit_field & 0x04) == 0) +#define HID_VALUE_CAPS_HAS_NULL(x) (((x)->bit_field & 0x40) != 0) + typedef struct __WINE_HID_REPORT { UCHAR reportID;

1 0

Vijay Kiran Kamuju : windowscodecs: Add initial support for WICPngDecoder2.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 9689e38a15752853efe71a011b373ad901679f18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9689e38a15752853efe71a01… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Thu Jun 17 15:20:41 2021 +0200 windowscodecs: Add initial support for WICPngDecoder2. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45940 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/unix_lib.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index f1be96dd11d..d6baea38a1c 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -47,6 +47,7 @@ static const classinfo wic_classes[] = { {&CLSID_WICImagingFactory2, ImagingFactory_CreateInstance}, {&CLSID_WICBmpDecoder, BmpDecoder_CreateInstance}, {&CLSID_WICPngDecoder, PngDecoder_CreateInstance}, + {&CLSID_WICPngDecoder2, PngDecoder_CreateInstance}, {&CLSID_WICPngEncoder, PngEncoder_CreateInstance}, {&CLSID_WICBmpEncoder, BmpEncoder_CreateInstance}, {&CLSID_WICGifDecoder, GifDecoder_CreateInstance}, diff --git a/dlls/windowscodecs/unix_lib.c b/dlls/windowscodecs/unix_lib.c index 268a1cd9d16..4b184ef60eb 100644 --- a/dlls/windowscodecs/unix_lib.c +++ b/dlls/windowscodecs/unix_lib.c @@ -69,7 +69,8 @@ HRESULT CDECL stream_write(IStream *stream, const void *buffer, ULONG write, ULO HRESULT CDECL decoder_create(const CLSID *decoder_clsid, struct decoder_info *info, struct decoder **result) { - if (IsEqualGUID(decoder_clsid, &CLSID_WICPngDecoder)) + if (IsEqualGUID(decoder_clsid, &CLSID_WICPngDecoder)|| + IsEqualGUID(decoder_clsid, &CLSID_WICPngDecoder2)) return png_decoder_create(info, result); if (IsEqualGUID(decoder_clsid, &CLSID_WICTiffDecoder))

1 0

Zebediah Figura : ntdll/tests: Relax tests for RtlWaitOnAddress() timeout.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: c82c5e96a9eb13bfa1fef95fb7467ce17624a341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c82c5e96a9eb13bfa1fef95f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 17 11:48:41 2021 -0500 ntdll/tests: Relax tests for RtlWaitOnAddress() timeout. RtlWaitOnAddress() shouldn't be waiting for less than 100 ms here, and it isn't, but using GetTickCount() to measure this can result in up to 15 ms of error, causing frequent test failures. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index a7f8eaa84e1..82f8188d176 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2304,7 +2304,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, 8, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); ok(compare == 0, "got %s\n", wine_dbgstr_longlong(compare)); @@ -2319,7 +2319,7 @@ static void test_wait_on_address(void) status = pRtlWaitOnAddress(&address, &compare, size, &timeout); ticks = GetTickCount() - ticks; ok(status == STATUS_TIMEOUT, "got 0x%08x\n", status); - ok(ticks >= 90 && ticks <= 1000, "got %u\n", ticks); + ok(ticks >= 80 && ticks <= 1000, "got %u\n", ticks); status = pRtlWaitOnAddress(&address, &compare, size << 1, &timeout); ok(!status, "got 0x%08x\n", status);

1 0

Yeshun Ye : iphlpapi: Fix the field 'AdapterName' of IP_ADAPTER_INFO returned by GetAdaptersInfo.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: fb648144e33d7afd27bda84ffd793bfcac96441d URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb648144e33d7afd27bda84f… Author: Yeshun Ye <yeyeshun(a)uniontech.com> Date: Thu Jun 17 08:56:30 2021 +0800 iphlpapi: Fix the field 'AdapterName' of IP_ADAPTER_INFO returned by GetAdaptersInfo. Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 9 ++++++++- dlls/iphlpapi/tests/iphlpapi.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 09414d26dde..21edd9ee128 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -706,9 +706,16 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) DWORD i; PIP_ADDR_STRING currentIPAddr = &ptr->IpAddressList; BOOL firstIPAddr = TRUE; + NET_LUID luid; + GUID guid; /* on Win98 this is left empty, but whatever */ - getInterfaceNameByIndex(table->indexes[ndx], ptr->AdapterName); + ConvertInterfaceIndexToLuid(table->indexes[ndx], &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(ptr->AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); getInterfaceNameByIndex(table->indexes[ndx], ptr->Description); ptr->AddressLength = sizeof(ptr->Address); getInterfacePhysicalByIndex(table->indexes[ndx], diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..b6e62138256 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1115,6 +1115,9 @@ static void testGetAdaptersInfo(void) ; /* no adapter's, that's okay */ else if (apiReturn == ERROR_BUFFER_OVERFLOW) { PIP_ADAPTER_INFO ptr, buf = HeapAlloc(GetProcessHeap(), 0, len); + NET_LUID luid; + GUID guid; + char AdapterName[ARRAY_SIZE(ptr->AdapterName)]; apiReturn = GetAdaptersInfo(buf, &len); ok(apiReturn == NO_ERROR, @@ -1122,6 +1125,13 @@ static void testGetAdaptersInfo(void) apiReturn); ptr = buf; while (ptr) { + ConvertInterfaceIndexToLuid(ptr->Index, &luid); + ConvertInterfaceLuidToGuid(&luid, &guid); + sprintf(AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); + ok(!strcmp(ptr->AdapterName, AdapterName), "expected '%s' got '%s'\n", ptr->AdapterName, AdapterName); ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP address must be present\n"); ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); ok(ptr->GatewayList.IpAddress.String[0], "A valid IP address must be present\n");

1 0

Zebediah Figura : server: Correctly access the sir_lsap_sel field.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 43a1a248c3227d7d7623f6b4ded8adc8e2e16cec URL: https://source.winehq.org/git/wine.git/?a=commit;h=43a1a248c3227d7d7623f6b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 16 23:33:08 2021 -0500 server: Correctly access the sir_lsap_sel field. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 6b0c4af6b11..23c750243a6 100644 --- a/server/sock.c +++ b/server/sock.c @@ -427,10 +427,10 @@ static socklen_t sockaddr_to_unix( const struct WS_sockaddr *wsaddr, int wsaddrl memcpy( &win, wsaddr, sizeof(win) ); uaddr->irda.sir_family = AF_IRDA; if (sscanf( win.irdaServiceName, "LSAP-SEL%u", &lsap_sel ) == 1) - uaddr->sir_lsap_sel = lsap_sel; + uaddr->irda.sir_lsap_sel = lsap_sel; else { - uaddr->sir_lsap_sel = LSAP_ANY; + uaddr->irda.sir_lsap_sel = LSAP_ANY; memcpy( uaddr->irda.sir_name, win.irdaServiceName, sizeof(win.irdaServiceName) ); } memcpy( &uaddr->irda.sir_addr, win.irdaDeviceID, sizeof(win.irdaDeviceID) );

1 0

Zebediah Figura : ws2_32: Check if the socket is bound in listen() in the server.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: f0b42b2ffa4a0eafedce69211b5d2259163a29dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0b42b2ffa4a0eafedce6921… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 16 23:33:09 2021 -0500 ws2_32: Check if the socket is bound in listen() in the server. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 ----------- server/sock.c | 6 ++++++ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 63c26a9c769..c8403808d8f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3282,20 +3282,9 @@ int WINAPI WS_listen( SOCKET s, int backlog ) struct afd_listen_params params = {.backlog = backlog}; IO_STATUS_BLOCK io; NTSTATUS status; - int fd, bound; TRACE( "socket %#lx, backlog %d\n", s, backlog ); - if ((fd = get_sock_fd( s, FILE_READ_DATA, NULL )) == -1) - return -1; - bound = is_fd_bound( fd, NULL, NULL ); - release_sock_fd( s, fd ); - if (bound <= 0) - { - SetLastError( bound ? wsaErrno() : WSAEINVAL ); - return -1; - } - status = NtDeviceIoControlFile( SOCKET2HANDLE(s), NULL, NULL, NULL, &io, IOCTL_AFD_LISTEN, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); diff --git a/server/sock.c b/server/sock.c index 23c750243a6..39575b22f76 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2084,6 +2084,12 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + if (!sock->bound) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (listen( unix_fd, params->backlog ) < 0) { set_error( sock_get_ntstatus( errno ) );

1 0

Zebediah Figura : ws2_32: Pass a Win32 socket address to IOCTL_AFD_WINE_CONNECT.
by Alexandre Julliard 17 Jun '21

17 Jun '21

Module: wine Branch: master Commit: 5295cc273e6d963d0abaa0412cdd5b9e75f04687 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5295cc273e6d963d0abaa041… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 16 23:33:10 2021 -0500 ws2_32: Pass a Win32 socket address to IOCTL_AFD_WINE_CONNECT. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 54 +++++++++------------------------------------------- include/wine/afd.h | 2 +- server/sock.c | 19 +++++++++++++----- 3 files changed, 24 insertions(+), 51 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c8403808d8f..845a0e68986 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1959,8 +1959,6 @@ int WINAPI WS_closesocket(SOCKET s) */ int WINAPI WS_connect( SOCKET s, const struct WS_sockaddr *addr, int len ) { - union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = ws_sockaddr_ws2u( addr, len, &uaddr ); struct afd_connect_params *params; IO_STATUS_BLOCK io; HANDLE sync_event; @@ -1968,35 +1966,19 @@ int WINAPI WS_connect( SOCKET s, const struct WS_sockaddr *addr, int len ) TRACE( "socket %#lx, addr %s, len %d\n", s, debugstr_sockaddr(addr), len ); - if (!uaddrlen) - { - SetLastError( WSAEFAULT ); - return -1; - } - - if (addr->sa_family == WS_AF_INET) - { - struct sockaddr_in *in4 = (struct sockaddr_in *)&uaddr; - if (!memcmp(&in4->sin_addr, magic_loopback_addr, sizeof(magic_loopback_addr))) - { - TRACE("Replacing magic address 127.12.34.56 with INADDR_LOOPBACK.\n"); - in4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); - } - } - if (!(sync_event = get_sync_event())) return -1; - if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + uaddrlen ))) + if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + len ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return -1; } - params->addr_len = uaddrlen; + params->addr_len = len; params->synchronous = TRUE; - memcpy(params + 1, &uaddr, uaddrlen); + memcpy( params + 1, addr, len ); status = NtDeviceIoControlFile( (HANDLE)s, sync_event, NULL, NULL, &io, IOCTL_AFD_WINE_CONNECT, - params, sizeof(*params) + uaddrlen, NULL, 0); + params, sizeof(*params) + len, NULL, 0 ); HeapFree( GetProcessHeap(), 0, params ); if (status == STATUS_PENDING) { @@ -2029,8 +2011,6 @@ int WINAPI WSAConnect( SOCKET s, const struct WS_sockaddr* name, int namelen, static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct WS_sockaddr *name, int namelen, void *send_buffer, DWORD send_len, DWORD *ret_len, OVERLAPPED *overlapped ) { - union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = ws_sockaddr_ws2u(name, namelen, &uaddr); struct afd_connect_params *params; void *cvalue = NULL; NTSTATUS status; @@ -2060,35 +2040,19 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct WS_sockaddr *name, int overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; - if (!uaddrlen) - { - SetLastError( WSAEFAULT ); - return SOCKET_ERROR; - } - - if (name->sa_family == WS_AF_INET) - { - struct sockaddr_in *in4 = (struct sockaddr_in *)&uaddr; - if (!memcmp( &in4->sin_addr, magic_loopback_addr, sizeof(magic_loopback_addr) )) - { - TRACE("Replacing magic address 127.12.34.56 with INADDR_LOOPBACK.\n"); - in4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); - } - } - - if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + uaddrlen + send_len ))) + if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + namelen + send_len ))) { SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return SOCKET_ERROR; } - params->addr_len = uaddrlen; + params->addr_len = namelen; params->synchronous = FALSE; - memcpy( params + 1, &uaddr, uaddrlen ); - memcpy( (char *)(params + 1) + uaddrlen, send_buffer, send_len ); + memcpy( params + 1, name, namelen ); + memcpy( (char *)(params + 1) + namelen, send_buffer, send_len ); status = NtDeviceIoControlFile( SOCKET2HANDLE(s), overlapped->hEvent, NULL, cvalue, (IO_STATUS_BLOCK *)overlapped, IOCTL_AFD_WINE_CONNECT, - params, sizeof(*params) + uaddrlen + send_len, NULL, 0 ); + params, sizeof(*params) + namelen + send_len, NULL, 0 ); HeapFree( GetProcessHeap(), 0, params ); if (ret_len) *ret_len = overlapped->InternalHigh; SetLastError( NtStatusToWSAError( status ) ); diff --git a/include/wine/afd.h b/include/wine/afd.h index 04468363673..19c1e064aaf 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -173,7 +173,7 @@ struct afd_connect_params { int addr_len; int synchronous; - /* VARARG(addr, struct sockaddr, addr_len); */ + /* VARARG(addr, struct WS(sockaddr), addr_len); */ /* VARARG(data, bytes); */ }; diff --git a/server/sock.c b/server/sock.c index 39575b22f76..88f6e4ac9fd 100644 --- a/server/sock.c +++ b/server/sock.c @@ -109,6 +109,8 @@ #define IP_UNICAST_IF 50 #endif +static const char magic_loopback_addr[] = {127, 12, 34, 56}; + union win_sockaddr { struct WS_sockaddr addr; @@ -2109,8 +2111,8 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) case IOCTL_AFD_WINE_CONNECT: { const struct afd_connect_params *params = get_req_data(); + const struct WS_sockaddr *addr; union unix_sockaddr unix_addr; - const struct sockaddr *addr; struct connect_req *req; socklen_t unix_len; int send_len, ret; @@ -2122,7 +2124,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } send_len = get_req_data_size() - sizeof(*params) - params->addr_len; - addr = (const struct sockaddr *)(params + 1); + addr = (const struct WS_sockaddr *)(params + 1); if (sock->accept_recv_req) { @@ -2144,7 +2146,16 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - ret = connect( unix_fd, addr, params->addr_len ); + unix_len = sockaddr_to_unix( addr, params->addr_len, &unix_addr ); + if (!unix_len) + { + set_error( STATUS_INVALID_ADDRESS ); + return 0; + } + if (unix_addr.addr.sa_family == AF_INET && !memcmp( &unix_addr.in.sin_addr, magic_loopback_addr, 4 )) + unix_addr.in.sin_addr.s_addr = htonl( INADDR_LOOPBACK ); + + ret = connect( unix_fd, &unix_addr.addr, unix_len ); if (ret < 0 && errno != EINPROGRESS) { set_error( sock_get_ntstatus( errno ) ); @@ -2427,8 +2438,6 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (unix_addr.addr.sa_family == WS_AF_INET) { - static const char magic_loopback_addr[] = {127, 12, 34, 56}; - if (!memcmp( &unix_addr.in.sin_addr, magic_loopback_addr, 4 ) || bind_to_interface( sock, &unix_addr.in )) bind_addr.in.sin_addr.s_addr = htonl( INADDR_ANY );

1 0

Alexandre Julliard : ntdll: Copy the implementation of __wine_dbg_output to the PE side.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: b572cf30253b0922c7c476bfc666c0345eb50256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b572cf30253b0922c7c476bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 16 15:33:07 2021 +0200 ntdll: Copy the implementation of __wine_dbg_output to the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/thread.c | 30 +++++++++++++++++++++++++++++- dlls/ntdll/unix/debug.c | 10 +++++++++- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unixlib.h | 5 +---- include/wine/debug.h | 1 + 6 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8cba4fa164a..bd72f50b864 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1621,6 +1621,7 @@ @ extern -arch=i386 __wine_ldt_copy # Debugging +@ stdcall -syscall -norelay __wine_dbg_write(ptr long) @ cdecl -norelay __wine_dbg_get_channel_flags(ptr) @ cdecl -norelay __wine_dbg_header(long long str) @ cdecl -norelay __wine_dbg_output(str) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index d86d20448bf..d0c2a89d4bb 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -69,6 +69,22 @@ static void init_options(void) while (debug_options[nb_debug_options].name[0]) nb_debug_options++; } +/* add a string to the output buffer */ +static int append_output( struct debug_info *info, const char *str, size_t len ) +{ + if (len >= sizeof(info->output) - info->out_pos) + { + __wine_dbg_write( info->output, info->out_pos ); + info->out_pos = 0; + ERR_(thread)( "debug buffer overflow:\n" ); + __wine_dbg_write( str, len ); + RtlRaiseStatus( STATUS_BUFFER_OVERFLOW ); + } + memcpy( info->output + info->out_pos, str, len ); + info->out_pos += len; + return len; +} + /*********************************************************************** * __wine_dbg_get_channel_flags (NTDLL.@) * @@ -146,7 +162,19 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ */ int __cdecl __wine_dbg_output( const char *str ) { - return unix_funcs->dbg_output( str ); + struct debug_info *info = get_info(); + const char *end = strrchr( str, '\n' ); + int ret = 0; + + if (end) + { + ret += append_output( info, str, end + 1 - str ); + __wine_dbg_write( info->output, info->out_pos ); + info->out_pos = 0; + str = end + 1; + } + if (*str) ret += append_output( info, str, strlen( str )); + return ret; } diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index 0272e68bea6..d43cdaeb917 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -249,6 +249,14 @@ const char * __cdecl __wine_dbg_strdup( const char *str ) return memcpy( info->strings + pos, str, n ); } +/*********************************************************************** + * __wine_dbg_write (NTDLL.@) + */ +int WINAPI __wine_dbg_write( const char *str, unsigned int len ) +{ + return write( 2, str, len ); +} + /*********************************************************************** * __wine_dbg_output (NTDLL.@) */ @@ -261,7 +269,7 @@ int __cdecl __wine_dbg_output( const char *str ) if (end) { ret += append_output( info, str, end + 1 - str ); - write( 2, info->output, info->out_pos ); + __wine_dbg_write( info->output, info->out_pos ); info->out_pos = 0; str = end + 1; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index fca63141ba3..b9f1fee6a9d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1850,7 +1850,6 @@ static struct unix_funcs unix_funcs = init_builtin_dll, init_unix_lib, unwind_builtin_dll, - __wine_dbg_output, }; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index cbe5c9d3ccd..ba37297a324 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 122 +#define NTDLL_UNIXLIB_VERSION 123 struct unix_funcs { @@ -78,9 +78,6 @@ struct unix_funcs NTSTATUS (CDECL *init_unix_lib)( void *module, DWORD reason, const void *ptr_in, void *ptr_out ); NTSTATUS (CDECL *unwind_builtin_dll)( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ); - - /* debugging functions */ - int (CDECL *dbg_output)( const char *str ); }; #endif /* __NTDLL_UNIXLIB_H */ diff --git a/include/wine/debug.h b/include/wine/debug.h index 2255f62e502..6aac7fe82e8 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -143,6 +143,7 @@ struct __wine_debug_channel #endif /* !__GNUC__ && !__SUNPRO_C */ +extern int WINAPI __wine_dbg_write( const char *str, unsigned int len ); extern unsigned char __cdecl __wine_dbg_get_channel_flags( struct __wine_debug_channel *channel ); extern const char * __cdecl __wine_dbg_strdup( const char *str ); extern int __cdecl __wine_dbg_output( const char *str );

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add tests with and without report IDs.
by Alexandre Julliard 16 Jun '21

16 Jun '21

Module: wine Branch: master Commit: 731dd7de44fa450c7fde6886ec1c54e52e1aa38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=731dd7de44fa450c7fde6886… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 16 11:20:50 2021 +0200 ntoskrnl.exe/tests: Add tests with and without report IDs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 +- dlls/ntoskrnl.exe/tests/driver_hid.c | 108 ++++++++++++++++++++++------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 56 ++++++++++++++---- 3 files changed, 114 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=731dd7de44fa450c7fde…

1 0