- Wine-Devel - list.winehq.org

[PATCH 2/5 v3] oleacc: Add Client_get_accFocus tests.
by Piotr Caban Sept. 20, 2021

Sept. 20, 2021

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/tests/main.c | 99 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 97 insertions(+), 2 deletions(-)

1 0

[PATCH 1/5 v3] oleacc: Add Client_get_accFocus implementation.
by Piotr Caban Sept. 20, 2021

Sept. 20, 2021

From: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/oleacc/client.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-)

1 0

[PATCH] winhttp: Limit recursion for synchronous callback calls.
by Paul Gofman Sept. 20, 2021

Sept. 20, 2021

Fixes a regression in Hitman 2, Death Stranding introduced by commit be5acd1c07e093c3b4fe079bff3db74f300ea83b. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- MSDN [1] explicitly warns about potential stack overflow when calling WinHttpReadData() from notification callback: "When the read buffer is very small, WinHttpReadData may complete synchronously, and if the WINHTTP_CALLBACK_STATUS_READ_COMPLETE completion then triggers another call to WinHttpReadData, a stack overflow can result. It is best to use a read buffer that is 8 Kilobytes or larger in size.". However, this exactly what happens in Hitman 2 in Wine with the referenced regression commit: the buffer size is 256, WinHttpReadData() is called from notification callback while much bigger amount of data is available and that eventually leads to stack overflow. Testing on Windows shows that the native implementation actually prevents too long recursion allowing maximum depth of 127 on older Windows (before Win7) and 2 on the newer Windows. Unlike Hitman 2 which depends on just the stack overflow not to happen, Death Stranding depends on the newer Windows recursion limit. It just hangs if it's notification callback is called recusrively for read. It doesn't happen with the max recursion level of 2 as it interleaves WinHttpQueryDataAvailable() and WinHttpReadData() from the notification callback (somewhat similar to what my unit test is doing). 1. https://docs.microsoft.com/en-us/windows/win32/api/winhttp/nf-winhttp-winht… dlls/winhttp/request.c | 11 ++- dlls/winhttp/session.c | 4 +- dlls/winhttp/tests/notification.c | 156 ++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 1 + 4 files changed, 167 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f2cb24d4486..ed3b41a3155 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2825,6 +2825,11 @@ static DWORD query_data_ready( struct request *request ) return count; } +static BOOL skip_async_queue( struct request *request ) +{ + return request->hdr.recursion_count < 3 && (end_of_read_data( request ) || query_data_ready( request )); +} + static DWORD query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD ret = ERROR_SUCCESS, count = 0; @@ -2889,8 +2894,7 @@ BOOL WINAPI WinHttpQueryDataAvailable( HINTERNET hrequest, LPDWORD available ) return FALSE; } - if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !end_of_read_data( request ) - && !query_data_ready( request )) + if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request )) { struct query_data *q; @@ -2947,8 +2951,7 @@ BOOL WINAPI WinHttpReadData( HINTERNET hrequest, LPVOID buffer, DWORD to_read, L return FALSE; } - if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !end_of_read_data( request ) - && !query_data_ready( request )) + if ((async = request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) && !skip_async_queue( request )) { struct read_data *r; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 659a1ec8cee..0c8ffec4fc3 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -48,8 +48,10 @@ void send_callback( struct object_header *hdr, DWORD status, void *info, DWORD b { if (hdr->callback && (hdr->notify_mask & status)) { - TRACE("%p, 0x%08x, %p, %u\n", hdr, status, info, buflen); + TRACE("%p, 0x%08x, %p, %u, %u\n", hdr, status, info, buflen, hdr->recursion_count); + ++hdr->recursion_count; hdr->callback( hdr->handle, hdr->context, status, info, buflen ); + --hdr->recursion_count; TRACE("returning from 0x%08x callback\n", status); } } diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 4cfffe6687e..b71eb48754b 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1212,6 +1212,161 @@ static void test_persistent_connection(int port) CloseHandle( info.wait ); } +struct test_recursion_context +{ + HANDLE request; + HANDLE wait; + unsigned int recursion_count, max_recursion_query, max_recursion_read; + BOOL read_from_callback; + BOOL have_sync_callback; +}; + +/* The limit is 128 before Win7 and 3 on newer Windows. */ +#define TEST_RECURSION_LIMIT 128 + +static void CALLBACK test_recursion_callback( HINTERNET handle, DWORD_PTR context_ptr, + DWORD status, void *buffer, DWORD buflen ) +{ + struct test_recursion_context *context = (struct test_recursion_context *)context_ptr; + DWORD err; + BOOL ret; + BYTE b; + + switch (status) + { + case WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE: + case WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE: + SetEvent( context->wait ); + break; + + case WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE: + if (!context->read_from_callback) + { + SetEvent( context->wait ); + break; + } + + if (!*(DWORD *)buffer) + { + SetEvent( context->wait ); + break; + } + + ok(context->recursion_count < TEST_RECURSION_LIMIT, + "Got unexpected context->recursion_count %u, thread %#x.\n", + context->recursion_count, GetCurrentThreadId()); + context->max_recursion_query = max( context->max_recursion_query, context->recursion_count ); + ++context->recursion_count; + ret = WinHttpReadData( context->request, &b, 1, NULL ); + err = GetLastError(); + ok(ret, "Failed to read data, GetLastError() %u.\n", err); + ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "Got unexpected err %u.\n", err); + if (err == ERROR_SUCCESS) + context->have_sync_callback = TRUE; + --context->recursion_count; + break; + + case WINHTTP_CALLBACK_STATUS_READ_COMPLETE: + if (!buflen) + { + SetEvent( context->wait ); + break; + } + ok(context->recursion_count < TEST_RECURSION_LIMIT, + "Got unexpected context->recursion_count %u, thread %#x.\n", + context->recursion_count, GetCurrentThreadId()); + context->max_recursion_read = max( context->max_recursion_read, context->recursion_count ); + context->read_from_callback = TRUE; + ++context->recursion_count; + ret = WinHttpQueryDataAvailable( context->request, NULL ); + err = GetLastError(); + ok(ret, "Failed to query data available, GetLastError() %u.\n", err); + ok(err == ERROR_SUCCESS || err == ERROR_IO_PENDING, "Got unexpected err %u.\n", err); + if (err == ERROR_SUCCESS) + context->have_sync_callback = TRUE; + --context->recursion_count; + break; + } +} + +static void test_recursion(void) +{ + struct test_recursion_context context; + HANDLE session, connection, request; + DWORD size, status, err; + BOOL ret; + BYTE b; + + memset( &context, 0, sizeof(context) ); + + context.wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + + session = WinHttpOpen( L"winetest", 0, NULL, NULL, WINHTTP_FLAG_ASYNC ); + ok(!!session, "Failed to open session, GetLastError() %u.\n", GetLastError()); + + WinHttpSetStatusCallback( session, test_recursion_callback, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); + + connection = WinHttpConnect( session, L"test.winehq.org", 0, 0 ); + ok(!!connection, "Failed to open a connection, GetLastError() %u.\n", GetLastError()); + + request = WinHttpOpenRequest( connection, NULL, L"/tests/hello.html", NULL, NULL, NULL, 0 ); + ok(!!request, "Failed to open a request, GetLastError() %u.\n", GetLastError()); + + context.request = request; + ret = WinHttpSendRequest( request, NULL, 0, NULL, 0, 0, (DWORD_PTR)&context ); + err = GetLastError(); + if (!ret && (err == ERROR_WINHTTP_CANNOT_CONNECT || err == ERROR_WINHTTP_TIMEOUT)) + { + skip("Connection failed, skipping\n"); + WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); + WinHttpCloseHandle( request ); + WinHttpCloseHandle( connection ); + WinHttpCloseHandle( session ); + CloseHandle( context.wait ); + return; + } + ok(ret, "Failed to send request, GetLastError() %u.\n", GetLastError()); + + WaitForSingleObject( context.wait, INFINITE ); + + ret = WinHttpReceiveResponse( request, NULL ); + ok(ret, "Failed to receive response, GetLastError() %u.\n", GetLastError()); + + WaitForSingleObject( context.wait, INFINITE ); + + size = sizeof(status); + ret = WinHttpQueryHeaders( request, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, NULL, + &status, &size, NULL ); + ok(ret, "Request failed, GetLastError() %u.\n", GetLastError()); + ok(status == 200, "Request failed unexpectedly, status %u.\n", status); + + ret = WinHttpQueryDataAvailable( request, NULL ); + ok(ret, "Failed to query data available, GetLastError() %u.\n", GetLastError()); + + WaitForSingleObject( context.wait, INFINITE ); + + ret = WinHttpReadData( request, &b, 1, NULL ); + ok(ret, "Failed to read data, GetLastError() %u.\n", GetLastError()); + + WaitForSingleObject( context.wait, INFINITE ); + if (context.have_sync_callback) + { + ok(context.max_recursion_query >= 2, "Got unexpected max_recursion_query %u.\n", context.max_recursion_query); + ok(context.max_recursion_read >= 2, "Got unexpected max_recursion_read %u.\n", context.max_recursion_read); + } + else + { + skip("No sync callbacks.\n"); + } + + WinHttpSetStatusCallback( session, NULL, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); + + WinHttpCloseHandle( request ); + WinHttpCloseHandle( connection ); + WinHttpCloseHandle( session ); + CloseHandle( context.wait ); +} + START_TEST (notification) { HMODULE mod = GetModuleHandleA( "winhttp.dll" ); @@ -1230,6 +1385,7 @@ START_TEST (notification) test_redirect(); test_async(); test_websocket(); + test_recursion(); si.event = CreateEventW( NULL, 0, 0, NULL ); si.port = 7533; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 069951d4811..3b257b770f3 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -49,6 +49,7 @@ struct object_header LONG refs; WINHTTP_STATUS_CALLBACK callback; DWORD notify_mask; + unsigned int recursion_count; struct list entry; }; -- 2.31.1

2 1

[PATCH] msxml3/tests: Avoid double-free using BSTR helper.
by Daniel Lehman Sept. 20, 2021

Sept. 20, 2021

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- same pattern as 001aa01760168cd7e21e70bc1bb5fcc39a8432c3 although they don't cause any crashes for me --- dlls/msxml3/tests/domdoc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9e9789ebd9a..a86c0b08d6b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -5267,7 +5267,6 @@ static void test_cloneNode(void ) V_VT(&v) = VT_BSTR; hr = IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), v); ok(hr == S_OK, "got 0x%08x\n", hr); - VariantClear(&v); /* clone document node */ hr = IXMLDOMDocument2_cloneNode(doc, VARIANT_TRUE, &node); @@ -8767,7 +8766,6 @@ static void test_put_nodeTypedValue(void) V_BSTR(&value) = _bstr_("1"); hr = IXMLDOMElement_put_nodeTypedValue(elem, value); EXPECT_HR(hr, S_OK); - VariantClear(&value); V_VT(&value) = VT_EMPTY; hr = IXMLDOMElement_get_nodeTypedValue(elem, &value); -- 2.25.1

1 0

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Parse the abs() intrinsic.
by Zebediah Figura Sept. 20, 2021

Sept. 20, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.y | 9 +++++++++ tests/abs.shader_test | 13 +++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 tests/abs.shader_test diff --git a/Makefile.am b/Makefile.am index c9ad38893..3287ec75a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/abs.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ @@ -273,6 +274,7 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ + tests/abs.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index fe3c3289d..bd2660389 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1555,6 +1555,14 @@ static const struct hlsl_ir_function_decl *find_function_call(struct hlsl_ctx *c return args.decl; } +static bool intrinsic_abs(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *args[3] = {params->args[0]}; + + return !!add_expr(ctx, params->instrs, HLSL_OP1_ABS, args, &loc); +} + static bool intrinsic_clamp(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1594,6 +1602,7 @@ static const struct intrinsic_function } intrinsic_functions[] = { + {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, {"saturate", 1, true, intrinsic_saturate}, diff --git a/tests/abs.shader_test b/tests/abs.shader_test new file mode 100644 index 000000000..6fa6d1ca7 --- /dev/null +++ b/tests/abs.shader_test @@ -0,0 +1,13 @@ +[pixel shader] +float4 main(uniform float2 u) : sv_target +{ + return float4(abs(u), abs(u.x - 0.5), abs(-0.4)); +} + +[test] +uniform 0 float4 0.1 0.7 0.0 0.0 +draw quad +probe all rgba (0.1, 0.7, 0.4, 0.4) +uniform 0 float4 -0.7 0.1 0.0 0.0 +draw quad +probe all rgba (0.7, 0.1, 1.2, 0.4) -- 2.33.0

4 20

[PATCH vkd3d v2 3/5] vkd3d-shader/hlsl: Parse the pow() intrinsic.
by Henri Verbeet Sept. 20, 2021

Sept. 20, 2021

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 214706. v2: Make the test less strict. My Intel SKL requires the same tolerance as reported by Giovanni. Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 23 +++++++++++++++++++++++ tests/pow.shader_test | 10 ++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 tests/pow.shader_test diff --git a/Makefile.am b/Makefile.am index 32b76e19..34617c67 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,6 +82,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ + tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ @@ -297,6 +298,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ + tests/pow.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-1.shader_test endif diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0d539600..96473d05 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1093,7 +1093,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_MOD] = "%", [HLSL_OP2_MUL] = "*", [HLSL_OP2_NEQUAL] = "!=", - [HLSL_OP2_POW] = "pow", [HLSL_OP2_RSHIFT] = ">>", [HLSL_OP3_LERP] = "lerp", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9b579b72..ce1f1b75 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -318,7 +318,6 @@ enum hlsl_ir_expr_op HLSL_OP2_MOD, HLSL_OP2_MUL, HLSL_OP2_NEQUAL, - HLSL_OP2_POW, HLSL_OP2_RSHIFT, HLSL_OP3_LERP, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bd266038..2b381dc8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1585,6 +1585,28 @@ static bool intrinsic_max(struct hlsl_ctx *ctx, return !!add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc); } +static bool intrinsic_pow(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *args[3] = {0}; + struct hlsl_ir_node *log, *exp; + struct hlsl_ir_expr *mul; + + if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], loc))) + return false; + list_add_tail(params->instrs, &log->entry); + + args[0] = params->args[1]; + args[1] = log; + if (!(mul = add_expr(ctx, params->instrs, HLSL_OP2_MUL, args, &loc))) + return false; + + if (!(exp = hlsl_new_unary_expr(ctx, HLSL_OP1_EXP2, &mul->node, loc))) + return false; + list_add_tail(params->instrs, &exp->entry); + return true; +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1605,6 +1627,7 @@ intrinsic_functions[] = {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, + {"pow", 2, true, intrinsic_pow}, {"saturate", 1, true, intrinsic_saturate}, }; diff --git a/tests/pow.shader_test b/tests/pow.shader_test new file mode 100644 index 00000000..21011e6c --- /dev/null +++ b/tests/pow.shader_test @@ -0,0 +1,10 @@ +[pixel shader] +float4 main(uniform float2 u, uniform float2 v) : sv_target +{ + return float4(pow(u.y, 3), pow(u, v), pow(0.5, v.y)); +} + +[test] +uniform 0 float4 0.4 0.8 2.5 2.0 +draw quad +probe all rgba (0.512, 0.101192884, 0.64, 0.25) 4 -- 2.20.1

1 0

[PATCH 4/4] gdi32: Handle scalable fonts directly in AddFontResourceExW and RemoveFontResourceExW.
by Jacek Caban Sept. 20, 2021

Sept. 20, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 101 ------------------------------------------ dlls/gdi32/text.c | 109 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 107 insertions(+), 103 deletions(-)

2 1

[PATCH 3/4] gdi32: Move CreateScalableFontResourceW to text.c.
by Jacek Caban Sept. 20, 2021

Sept. 20, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 248 +------------------------------------- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/text.c | 251 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 257 insertions(+), 244 deletions(-)

2 1

[PATCH 2/4] gdi32: Move load_script_name call to EnumFontFamiliesExW.
by Jacek Caban Sept. 20, 2021

Sept. 20, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- So that ntgdi part does not depend on gdi32 resources. dlls/gdi32/font.c | 32 ++++---------------------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/text.c | 25 +++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 28 deletions(-)

2 1

[PATCH 1/4] include: Add some missing ntgdi declarations.
by Jacek Caban Sept. 20, 2021

Sept. 20, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/driver.c | 8 +++--- include/d3dukmdt.h | 13 +++++++++ include/ddk/d3dkmthk.h | 27 ++++++++++++++++++ include/ntgdi.h | 64 +++++++++++++++++++++++------------------- 4 files changed, 79 insertions(+), 33 deletions(-)

2 1