December 2021 - Wine-commits

Zebediah Figura : winegstreamer: Use the size of the data read when allocating the read buffer.
by Alexandre Julliard 30 Dec '21

30 Dec '21

Module: wine Branch: master Commit: 4d2a628dfe9e4aad9ba772854717253d0c6a7bb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d2a628dfe9e4aad9ba77285… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 21:01:52 2021 -0600 winegstreamer: Use the size of the data read when allocating the read buffer. Instead of the size of the data requested, which may be e.g. UINT_MAX. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52277 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 67 ++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 0178538fa81..013566b25e9 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -80,11 +80,11 @@ struct wg_parser pthread_cond_t read_cond, read_done_cond; struct { - void *data; + GstBuffer *buffer; uint64_t offset; uint32_t size; bool done; - bool ret; + GstFlowReturn ret; } read_request; bool flushing, sink_connected; @@ -556,7 +556,7 @@ static NTSTATUS wg_parser_get_next_read_offset(void *args) pthread_mutex_lock(&parser->mutex); - while (parser->sink_connected && !parser->read_request.data) + while (parser->sink_connected && !parser->read_request.size) pthread_cond_wait(&parser->read_cond, &parser->mutex); if (!parser->sink_connected) @@ -580,12 +580,35 @@ static NTSTATUS wg_parser_push_data(void *args) uint32_t size = params->size; pthread_mutex_lock(&parser->mutex); - parser->read_request.size = size; - parser->read_request.done = true; - parser->read_request.ret = !!data; + if (data) - memcpy(parser->read_request.data, data, size); - parser->read_request.data = NULL; + { + if (size) + { + GstMapInfo map_info; + + /* Note that we don't allocate the buffer until we have a size. + * midiparse passes a NULL buffer and a size of UINT_MAX, in an + * apparent attempt to read the whole input stream at once. */ + if (!parser->read_request.buffer) + parser->read_request.buffer = gst_buffer_new_and_alloc(size); + gst_buffer_map(parser->read_request.buffer, &map_info, GST_MAP_WRITE); + memcpy(map_info.data, data, size); + gst_buffer_unmap(parser->read_request.buffer, &map_info); + parser->read_request.ret = GST_FLOW_OK; + } + else + { + parser->read_request.ret = GST_FLOW_EOS; + } + } + else + { + parser->read_request.ret = GST_FLOW_ERROR; + } + parser->read_request.done = true; + parser->read_request.size = 0; + pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->read_done_cond); @@ -1279,9 +1302,7 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, guint64 offset, guint size, GstBuffer **buffer) { struct wg_parser *parser = gst_pad_get_element_private(pad); - GstBuffer *new_buffer = NULL; - GstMapInfo map_info; - bool ret; + GstFlowReturn ret; GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, size %u, buffer %p.", pad, offset, size, *buffer); @@ -1289,25 +1310,22 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, offset = parser->next_pull_offset; parser->next_pull_offset = offset + size; - if (!*buffer) - *buffer = new_buffer = gst_buffer_new_and_alloc(size); - if (!size) { /* asfreader occasionally asks for zero bytes. gst_buffer_map() will * return NULL in this case. Avoid confusing the read thread by asking * it for zero bytes. */ + if (!*buffer) + *buffer = gst_buffer_new_and_alloc(0); gst_buffer_set_size(*buffer, 0); GST_LOG("Returning empty buffer."); return GST_FLOW_OK; } - gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); - pthread_mutex_lock(&parser->mutex); - assert(!parser->read_request.data); - parser->read_request.data = map_info.data; + assert(!parser->read_request.size); + parser->read_request.buffer = *buffer; parser->read_request.offset = offset; parser->read_request.size = size; parser->read_request.done = false; @@ -1320,21 +1338,14 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, while (!parser->read_request.done) pthread_cond_wait(&parser->read_done_cond, &parser->mutex); + *buffer = parser->read_request.buffer; ret = parser->read_request.ret; - gst_buffer_set_size(*buffer, parser->read_request.size); pthread_mutex_unlock(&parser->mutex); - gst_buffer_unmap(*buffer, &map_info); - - GST_LOG("Request returned %d.", ret); + GST_LOG("Request returned %s.", gst_flow_get_name(ret)); - if ((!ret || !size) && new_buffer) - gst_buffer_unref(new_buffer); - - if (ret) - return size ? GST_FLOW_OK : GST_FLOW_EOS; - return GST_FLOW_ERROR; + return ret; } static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query)

1 0

Zebediah Figura : winegstreamer: Always set the initial video type for the WMF reader to WG_VIDEO_FORMAT_BGR.
by Alexandre Julliard 30 Dec '21

30 Dec '21

Module: wine Branch: master Commit: 03d92af78a5000097b26560bba97320eb013441a URL: https://source.winehq.org/git/wine.git/?a=commit;h=03d92af78a5000097b26560b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 22:04:35 2021 -0600 winegstreamer: Always set the initial video type for the WMF reader to WG_VIDEO_FORMAT_BGR. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52273 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wm_reader.c | 8 +++++--- dlls/wmvcore/tests/wmvcore.c | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 3a1f1684fdc..693e9adfc19 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1503,9 +1503,11 @@ static HRESULT init_stream(struct wm_reader *reader, QWORD file_size) { /* Call of Juarez: Bound in Blood breaks if I420 is enumerated. * Some native decoders output I420, but the msmpeg4v3 decoder - * never does. */ - if (stream->format.u.video.format == WG_VIDEO_FORMAT_I420) - stream->format.u.video.format = WG_VIDEO_FORMAT_YV12; + * never does. + * + * Shadowgrounds provides wmv3 video and assumes that the initial + * video type will be BGR. */ + stream->format.u.video.format = WG_VIDEO_FORMAT_BGR; } wg_parser_stream_enable(stream->wg_stream, &stream->format); } diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 66ad89a185e..1b9cffaee1d 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -2388,6 +2388,8 @@ static void test_async_reader_types(void) else { ok(IsEqualGUID(&majortype, &MEDIATYPE_Video), "Got major type %s.\n", debugstr_guid(&majortype)); + /* Shadowgrounds assumes that the initial video type will be RGB24. */ + ok(IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24), "Got subtype %s.\n", debugstr_guid(&mt->subtype)); got_video = true; check_video_type(mt); }

1 0

Zebediah Figura : ws2_32/tests: Test that the socket returned from accept() inherits event selection parameters.
by Alexandre Julliard 30 Dec '21

30 Dec '21

Module: wine Branch: master Commit: 4c617058a288aca09d943bfb5a627bb425fb2b8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c617058a288aca09d943bfb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 17:15:32 2021 -0600 ws2_32/tests: Test that the socket returned from accept() inherits event selection parameters. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d1cefd5eccc..6bbd1c24666 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5142,6 +5142,37 @@ static void test_accept_events(struct event_test_ctx *ctx) closesocket(client); closesocket(listener); + + /* The socket returned from accept() inherits the same parameters. */ + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = bind(listener, (const struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + len = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &len); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + ret = listen(listener, 2); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + + select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT | FD_WRITE); + check_events(ctx, FD_ACCEPT, 0, 200); + + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + ctx->socket = server; + check_events_todo(ctx, FD_WRITE, 0, 200); + check_events_todo_event(ctx, 0, 0, 0); + + closesocket(server); + closesocket(client); + + closesocket(listener); } static void test_connect_events(struct event_test_ctx *ctx)

1 0

Zebediah Figura : server: Reselect the socket returned from accept_socket().
by Alexandre Julliard 30 Dec '21

30 Dec '21

Module: wine Branch: master Commit: b1a2238a10413af1437982dd80f0c61d216ec12e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1a2238a10413af1437982dd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 17:15:33 2021 -0600 server: Reselect the socket returned from accept_socket(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52024 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- server/sock.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6bbd1c24666..9ff4a5d844d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5166,8 +5166,8 @@ static void test_accept_events(struct event_test_ctx *ctx) server = accept(listener, NULL, NULL); ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); ctx->socket = server; - check_events_todo(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, FD_WRITE, 0, 200); + check_events(ctx, 0, 0, 0); closesocket(server); closesocket(client); diff --git a/server/sock.c b/server/sock.c index 2df4f3d3056..736f34feac5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -722,6 +722,7 @@ static void complete_async_accept( struct sock *sock, struct accept_req *req ) handle = alloc_handle_no_access_check( async_get_thread( async )->process, &acceptsock->obj, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, OBJ_INHERIT ); acceptsock->wparam = handle; + sock_reselect( acceptsock ); release_object( acceptsock ); if (!handle) { @@ -2174,6 +2175,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) handle = alloc_handle( current->process, &acceptsock->obj, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, OBJ_INHERIT ); acceptsock->wparam = handle; + sock_reselect( acceptsock ); release_object( acceptsock ); set_reply_data( &handle, sizeof(handle) ); return;

1 0

Zebediah Figura : ws2_32/tests: Increase tolerance in a timing test.
by Alexandre Julliard 30 Dec '21

30 Dec '21

Module: wine Branch: master Commit: 9d7f41e702e9f2cacc3b16e8b88a73d81e44860f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d7f41e702e9f2cacc3b16e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 17:20:59 2021 -0600 ws2_32/tests: Increase tolerance in a timing test. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9ff4a5d844d..5e16343a577 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3182,7 +3182,7 @@ static void test_select(void) ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ticks = GetTickCount() - ticks; ok(ret == 0, "select should not return any socket handles\n"); - ok(ticks < 10, "select was blocking for %u ms, expected < 10 ms\n", ticks); + ok(ticks < 100, "select was blocking for %u ms\n", ticks); ok(!FD_ISSET(fdRead, &readfds), "FD should not be set\n"); ok(!FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); ok(!FD_ISSET(fdRead, &exceptfds), "FD should not be set\n");

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 29 Dec '21

29 Dec '21

Module: wine Branch: master Commit: a225ca161be6cf862af6a1fc154a623378ea10de URL: https://source.winehq.org/git/wine.git/?a=commit;h=a225ca161be6cf862af6a1fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 28 23:24:00 2021 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 1258 +++++++++++++++++++++++++++++--------------------------------- 1 file changed, 594 insertions(+), 664 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a225ca161be6cf862af6…

1 0

André Zwing : kernel32/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard 29 Dec '21

29 Dec '21

Module: wine Branch: master Commit: a6bf1a5ffb112db7d165508226fb9f029fa94d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6bf1a5ffb112db7d1655082… Author: André Zwing <nerv(a)dawncrow.de> Date: Tue Dec 28 20:09:48 2021 +0100 kernel32/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 68 ++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d64a08666f8..2d327b7130c 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -7048,22 +7048,19 @@ static BOOL CALLBACK calinfo_procA(LPSTR calinfo) static void test_EnumCalendarInfoA(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoA( calinfo_procA, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoA( calinfo_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoA for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoA( calinfo_procA, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoA( calinfo_procA, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoA for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7076,22 +7073,19 @@ static BOOL CALLBACK calinfo_procW(LPWSTR calinfo) static void test_EnumCalendarInfoW(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoW( calinfo_procW, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoW( calinfo_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoW for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoW( calinfo_procW, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoW( calinfo_procW, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoW for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7105,22 +7099,19 @@ static BOOL CALLBACK calinfoex_procA(LPSTR calinfo, LCID calid) static void test_EnumCalendarInfoExA(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoExA( calinfoex_procA, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoExA( calinfoex_procA, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoExA for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoExA( calinfoex_procA, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoExA( calinfoex_procA, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoExA for LCID %#06x failed: %u\n", lcid, GetLastError() ); } } @@ -7134,22 +7125,19 @@ static BOOL CALLBACK calinfoex_procW(LPWSTR calinfo, LCID calid) static void test_EnumCalendarInfoExW(void) { + BOOL ret; INT i; - ok( EnumCalendarInfoExW( calinfoex_procW, - LOCALE_USER_DEFAULT, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ), - "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); + ret = EnumCalendarInfoExW( calinfoex_procW, LOCALE_USER_DEFAULT, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret, "EnumCalendarInfoExW for user default locale failed: %u\n", GetLastError() ); for (i = 0; i < ARRAY_SIZE( locales_with_optional_calendars ); i++) { LCID lcid = locales_with_optional_calendars[i]; - ok( EnumCalendarInfoExW( calinfoex_procW, - lcid, - ENUM_ALL_CALENDARS, - CAL_RETURN_NUMBER | CAL_ICALINTVALUE ) || - broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, + ret = EnumCalendarInfoExW( calinfoex_procW, lcid, ENUM_ALL_CALENDARS, + CAL_RETURN_NUMBER | CAL_ICALINTVALUE ); + ok( ret || broken( GetLastError() == ERROR_INVALID_FLAGS ) /* no locale */, "EnumCalendarInfoExW for LCID %#06x failed: %u\n", lcid, GetLastError() ); } }

1 0

André Zwing : kernelbase/tests: Don't test functions directly when reporting GetLastError().
by Alexandre Julliard 29 Dec '21

29 Dec '21

Module: wine Branch: master Commit: 25e1fcc56302d9c6ae364ec943c87cf78da9ba6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=25e1fcc56302d9c6ae364ec9… Author: André Zwing <nerv(a)dawncrow.de> Date: Tue Dec 28 20:09:49 2021 +0100 kernelbase/tests: Don't test functions directly when reporting GetLastError(). Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/process.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index a28411f4e5b..1a008be9a7b 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -35,6 +35,7 @@ static BOOL (WINAPI *pCompareObjectHandles)(HANDLE, HANDLE); static void test_CompareObjectHandles(void) { HANDLE h1, h2; + BOOL ret; if (!pCompareObjectHandles) { @@ -42,24 +43,24 @@ static void test_CompareObjectHandles(void) return; } - ok( pCompareObjectHandles( GetCurrentProcess(), GetCurrentProcess() ), - "comparing GetCurrentProcess() to self failed with %u\n", GetLastError() ); + ret = pCompareObjectHandles( GetCurrentProcess(), GetCurrentProcess() ); + ok( ret, "comparing GetCurrentProcess() to self failed with %u\n", GetLastError() ); - ok( pCompareObjectHandles( GetCurrentThread(), GetCurrentThread() ), - "comparing GetCurrentThread() to self failed with %u\n", GetLastError() ); + ret = pCompareObjectHandles( GetCurrentThread(), GetCurrentThread() ); + ok( ret, "comparing GetCurrentThread() to self failed with %u\n", GetLastError() ); SetLastError(0); - ok( !pCompareObjectHandles( GetCurrentProcess(), GetCurrentThread() ) && - GetLastError() == ERROR_NOT_SAME_OBJECT, + ret = pCompareObjectHandles( GetCurrentProcess(), GetCurrentThread() ); + ok( !ret && GetLastError() == ERROR_NOT_SAME_OBJECT, "comparing GetCurrentProcess() to GetCurrentThread() returned %u\n", GetLastError() ); h1 = NULL; - ok( DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), - &h1, 0, FALSE, DUPLICATE_SAME_ACCESS ), - "failed to duplicate current process handle: %u\n", GetLastError() ); + ret = DuplicateHandle( GetCurrentProcess(), GetCurrentProcess(), GetCurrentProcess(), + &h1, 0, FALSE, DUPLICATE_SAME_ACCESS ); + ok( ret, "failed to duplicate current process handle: %u\n", GetLastError() ); - ok( pCompareObjectHandles( GetCurrentProcess(), h1 ), - "comparing GetCurrentProcess() with %p failed with %u\n", h1, GetLastError() ); + ret = pCompareObjectHandles( GetCurrentProcess(), h1 ); + ok( ret, "comparing GetCurrentProcess() with %p failed with %u\n", h1, GetLastError() ); CloseHandle( h1 ); @@ -67,12 +68,12 @@ static void test_CompareObjectHandles(void) ok( h1 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); h2 = NULL; - ok( DuplicateHandle( GetCurrentProcess(), h1, GetCurrentProcess(), - &h2, 0, FALSE, DUPLICATE_SAME_ACCESS ), - "failed to duplicate handle %p: %u\n", h1, GetLastError() ); + ret = DuplicateHandle( GetCurrentProcess(), h1, GetCurrentProcess(), + &h2, 0, FALSE, DUPLICATE_SAME_ACCESS ); + ok( ret, "failed to duplicate handle %p: %u\n", h1, GetLastError() ); - ok( pCompareObjectHandles( h1, h2 ), - "comparing %p with %p failed with %u\n", h1, h2, GetLastError() ); + ret = pCompareObjectHandles( h1, h2 ); + ok( ret, "comparing %p with %p failed with %u\n", h1, h2, GetLastError() ); CloseHandle( h2 ); @@ -80,7 +81,8 @@ static void test_CompareObjectHandles(void) ok( h2 != INVALID_HANDLE_VALUE, "CreateFile failed (%d)\n", GetLastError() ); SetLastError(0); - ok( !pCompareObjectHandles( h1, h2 ) && GetLastError() == ERROR_NOT_SAME_OBJECT, + ret = pCompareObjectHandles( h1, h2 ); + ok( !ret && GetLastError() == ERROR_NOT_SAME_OBJECT, "comparing %p with %p returned %u\n", h1, h2, GetLastError() ); CloseHandle( h2 );

1 0

Martin Storsjö : widl: Fix including tlb files in mingw-w64-tools configuration.
by Alexandre Julliard 29 Dec '21

29 Dec '21

Module: wine Branch: master Commit: 7f95c692998daa83cbeffcbe261ebbff80af54a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f95c692998daa83cbeffcbe… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Dec 29 00:05:07 2021 +0200 widl: Fix including tlb files in mingw-w64-tools configuration. Prior to c94f44f9b4559351c0ca86d344fe37aabc15200c (widl: Search for imported typelibs in the library search path.), widl looked for tlb files in the path specified by BIN_TO_INCLUDEDIR. After that commit, widl looks for tlb files in a subdirectory (get_pe_dir) of BIN_TO_DLLDIR (which mingw-w64 sets to the same as BIN_TO_INCLUDEDIR). For compatibility with the mingw-w64 usecase, check for tlb files in the directory specified by BIN_TO_DLLDIR without a separate subdirectory suffix too. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 0b5f07236f0..f696a73bd2f 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -698,7 +698,11 @@ int open_typelib( const char *name ) if (stdinc) { - if (dlldir) TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name )); + if (dlldir) + { + TRYOPEN( strmake( "%s%s/%s", dlldir, pe_dir, name )); + TRYOPEN( strmake( "%s/%s", dlldir, name )); + } for (i = 0; i < ARRAY_SIZE(default_dirs); i++) { if (i && !strcmp( default_dirs[i], default_dirs[0] )) continue;

1 0

Zebediah Figura : ws2_32: Correctly null-terminate the addrinfo chain.
by Alexandre Julliard 29 Dec '21

29 Dec '21

Module: wine Branch: master Commit: 9947a8d0de8dfa6bd3ca860940e94aa3dc91019b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9947a8d0de8dfa6bd3ca8609… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 29 12:38:53 2021 -0600 ws2_32: Correctly null-terminate the addrinfo chain. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52288 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/unixlib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index e89ebe35248..56a0bed308d 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -752,6 +752,7 @@ static NTSTATUS unix_getaddrinfo( void *args ) dst->ai_addrlen = sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, NULL, 0 ); dst->ai_addr = next; sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, dst->ai_addr, dst->ai_addrlen ); + dst->ai_next = NULL; next = (char *)dst->ai_addr + dst->ai_addrlen; if (dst == params->info || !addrinfo_in_list( params->info, dst )) @@ -763,8 +764,6 @@ static NTSTATUS unix_getaddrinfo( void *args ) } } - dst->ai_next = NULL; - freeaddrinfo( unix_info ); return 0; #else

1 0