- Wine-Devel - list.winehq.org

[PATCH] msvcrt: Use unaligned data types in memset.
by Piotr Caban Sept. 16, 2021

Sept. 16, 2021

This fixes a regression in memset on ARM described by Martin: ARM can do 64 bit writes with the STRD instruction, but that instruction requires a 32 bit aligned address - while these stores are unaligned. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/string.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)

2 1

[PATCH 2/2 v5] oleacc: Add STATE_SYSTEM_FOCUSED test for default client object.
by Piotr Caban Sept. 16, 2021

Sept. 16, 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 | 68 ++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 9 deletions(-)

1 0

[PATCH 1/2 v5] oleacc: Check proper GUI thread for window focus.
by Piotr Caban Sept. 16, 2021

Sept. 16, 2021

From: Connor McAdams <conmanx360(a)gmail.com> Check for window focus against the current foreground window's thread GUI data rather than the currently executing thread's GUI data. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v5: - cleaned up the tests dlls/oleacc/client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[PATCH v2] d2d1/tests: Add tests for 2D affine effect.
by Ziqing Hui Sept. 16, 2021

Sept. 16, 2021

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: * Use compare_figure. * Make image_4x4 static. dlls/d2d1/tests/d2d1.c | 127 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3e2eda8a4a4..7b936fedacc 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9875,6 +9875,132 @@ static void test_effect(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_2d_affine(BOOL d3d11) +{ + D2D1_MATRIX_3X2_F rotate, scale, skew; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + D2D_RECT_F output_bounds = {0}; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + D2D1_SIZE_U input_size; + ID2D1Factory1 *factory; + ID2D1Bitmap1 *bitmap; + ID2D1Effect *effect; + ID2D1Image *output; + unsigned int i; + BOOL match; + HRESULT hr; + + static const DWORD image_4x4[] = + { + 0xfdcba987, 0xffff0000, 0x98765432, 0xffffffff, + 0x4b4b4b4b, 0x89abcdef, 0xdeadbeef, 0xabcdef01, + 0x7f000011, 0x40ffffff, 0x12345678, 0xaabbccdd, + 0x44444444, 0xff7f7f7f, 0x1221abba, 0x00000000 + }; + DWORD image_16x16[16 * 16]; + + const struct effect_2d_affine_test + { + const DWORD *img_data; + unsigned int img_width; + unsigned int img_height; + + D2D1_MATRIX_3X2_F *matrix; + + D2D_RECT_F bounds; + const char *figure; + } + effect_2d_affine_tests[] = + { + {image_4x4, 4, 4, &rotate, {-6.0f, -3.0f, 2.0f, 4.0f}, "AQ8B7wEA"}, + {image_4x4, 4, 4, &scale, {-2.0f, -3.0f, 1.0f, 9.0f}, "AQ8BDwEPAQ8BDwEPAQ8BDwF/"}, + {image_4x4, 4, 4, &skew, {-7.0f, -3.0f, 3.0f, 7.0f}, "AQ8BAQ4BAQ4BzwEA"}, + {image_16x16, 16, 16, &rotate, {-14.0f, -3.0f, 10.0f, 21.0f}, + "AQ8BAQ4CAQ0DAQwEAQsFAQoGAQkHAQgIAQcIAQEGBwEBBwYBAQgFAQEJBAEBCgMBAQsCAQEM"}, + {image_16x16, 16, 16, &scale, {-2.0f, -3.0f, 10.0f, 39.0f}, + "AQkGCgYKBgoGCgYKBgoGCgYKBgoGCgYKBgoGCgYKBgoG"}, + {image_16x16, 16, 16, &skew, {-19.0f, -3.0f, 15.0f, 31.0f}, + "AQ8BAQ4CAQ0DAQwEAQsFAQoGAQkHAQgIAQcJAQYKAQULAQQMAQMNAQINAQIMAQMA"}, + }; + + memset(image_16x16, 0xff, sizeof(image_16x16)); + set_matrix_identity(&rotate); + set_matrix_identity(&scale); + set_matrix_identity(&skew); + translate_matrix(&rotate, -2.0f, -2.0f); + translate_matrix(&scale, -2.0f, -2.0f); + translate_matrix(&skew, -2.0f, -2.0f); + rotate_matrix(&rotate, M_PI_4); + scale_matrix(&scale, 0.75f, 2.5f); + skew_matrix(&skew, -1.0f, 1.0f); + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(effect_2d_affine_tests); ++i) + { + const struct effect_2d_affine_test *test = &effect_2d_affine_tests[i]; + winetest_push_context("Test %u", i); + + set_size_u(&input_size, test->img_width, test->img_height); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(context, input_size, test->img_data, + sizeof(*test->img_data) * test->img_width, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE); + todo_wine + hr = ID2D1Effect_SetValue(effect, D2D1_2DAFFINETRANSFORM_PROP_TRANSFORM_MATRIX, + D2D1_PROPERTY_TYPE_MATRIX_3X2, (const BYTE *)test->matrix, sizeof(*test->matrix)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1Effect_GetOutput(effect, &output); + + ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); + todo_wine + ok(compare_rect(&output_bounds, test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom, 1), + "Got unexpected output bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + output_bounds.left, output_bounds.top, output_bounds.right, output_bounds.bottom, + test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom); + + ID2D1DeviceContext_BeginDraw(context); + ID2D1DeviceContext_Clear(context, 0); + ID2D1DeviceContext_DrawImage(context, output, NULL, NULL, 0, 0); + hr = ID2D1DeviceContext_EndDraw(context, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + match = compare_figure(&ctx, 0, 0, 16, 16, 0xff652e89, 0, test->figure); + todo_wine + ok(match, "Figure does not match.\n"); + + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + } + + ID2D1Effect_Release(effect); + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -9937,6 +10063,7 @@ START_TEST(d2d1) queue_test(test_geometry_group); queue_test(test_mt_factory); queue_test(test_effect); + queue_test(test_effect_2d_affine); run_queued_tests(); } -- 2.25.1

2 1

[PATCH] mf/evr: Remove duplicated check in GetStreamSinkCount() (Coverity).
by Nikolay Sivov Sept. 16, 2021

Sept. 16, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 3 --- dlls/mf/tests/mf.c | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index a5545c157de..9552990006d 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1291,9 +1291,6 @@ static HRESULT WINAPI video_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface TRACE("%p, %p.\n", iface, count); - if (!count) - return E_POINTER; - EnterCriticalSection(&renderer->cs); if (renderer->flags & EVR_SHUT_DOWN) hr = MF_E_SHUTDOWN; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 3dfd852643c..1740e4e36d9 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4559,6 +4559,12 @@ todo_wine hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_GetStreamSinkCount(sink, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkCount(sink, &count); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, FALSE, &rate); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); -- 2.33.0

1 0

[PATCH] winhttp: Don't fail the request if authorization fails.
by Hans Leidekker Sept. 16, 2021

Sept. 16, 2021

Fixes a regression from 080dfbee311f2684280fafaa3f458f6bce6844bd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 001fff74a87..f2cb24d4486 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2736,7 +2736,7 @@ static DWORD receive_response( struct request *request, BOOL async ) { if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) break; - if ((ret = handle_authorization( request, status ))) break; + if (handle_authorization( request, status )) break; /* recurse synchronously */ if (!(ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue; -- 2.30.2

1 0

[PATCH v2] msvcrt: Avoid disallowed unaligned writes in memset on ARM
by Martin Storsjö Sept. 16, 2021

Sept. 16, 2021

This fixes a regression in memset on ARM since 7b17d7081512db52ef852705445762ac4016c29f. ARM can do 64 bit writes with the STRD instruction, but that instruction requires a 32 bit aligned address - while these stores are unaligned. Two consecutive stores to uint32_t* pointers can also be fused into one single STRD, as a uint32_t* is supposed to be properly aligned - therefore, do these stores as stores to volatile uint32_t* to avoid fusing them. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- v2: Using a macro to hide the difference. --- dlls/msvcrt/string.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f2b1b4a5b11..6fade4d80fc 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2876,17 +2876,28 @@ void *__cdecl memset(void *dst, int c, size_t n) unsigned char *d = (unsigned char *)dst; size_t a = 0x20 - ((uintptr_t)d & 0x1f); +#ifdef __arm__ +#define MEMSET_UNALIGNED_64(dst, off, val) do { \ + *(volatile uint32_t *)((dst) + (off) + 0) = val; \ + *(volatile uint32_t *)((dst) + (off) + 4) = val; \ + } while (0) +#else +#define MEMSET_UNALIGNED_64(dst, off, val) do { \ + *(uint64_t *)((dst) + (off)) = val; \ + } while (0) +#endif + if (n >= 16) { - *(uint64_t *)(d + 0) = v; - *(uint64_t *)(d + 8) = v; - *(uint64_t *)(d + n - 16) = v; - *(uint64_t *)(d + n - 8) = v; + MEMSET_UNALIGNED_64(d, 0, v); + MEMSET_UNALIGNED_64(d, 8, v); + MEMSET_UNALIGNED_64(d, n - 16, v); + MEMSET_UNALIGNED_64(d, n - 8, v); if (n <= 32) return dst; - *(uint64_t *)(d + 16) = v; - *(uint64_t *)(d + 24) = v; - *(uint64_t *)(d + n - 32) = v; - *(uint64_t *)(d + n - 24) = v; + MEMSET_UNALIGNED_64(d, 16, v); + MEMSET_UNALIGNED_64(d, 24, v); + MEMSET_UNALIGNED_64(d, n - 32, v); + MEMSET_UNALIGNED_64(d, n - 24, v); if (n <= 64) return dst; n = (n - a) & ~0x1f; @@ -2895,8 +2906,8 @@ void *__cdecl memset(void *dst, int c, size_t n) } if (n >= 8) { - *(uint64_t *)d = v; - *(uint64_t *)(d + n - 8) = v; + MEMSET_UNALIGNED_64(d, 0, v); + MEMSET_UNALIGNED_64(d, n - 8, v); return dst; } if (n >= 4) @@ -2916,6 +2927,7 @@ void *__cdecl memset(void *dst, int c, size_t n) *(uint8_t *)d = v; return dst; } +#undef MEMSET_UNALIGNED_64 return dst; } -- 2.25.1

1 0

[PATCH 00/12] Fifth step for Dwarf 3/4 support in dbghelp
by Eric Pouech Sept. 16, 2021

Sept. 16, 2021

The following series implements: - finish of refactoring for proper di / cu relationship wrt. image location (regular vs dwz file) - support of alternate .dwz file - references to DIE into an alternate .dwz file A+ --- Eric Pouech (12): dbghelp: separate alternate debug file lookup dbghelp: Added support for locating a .dwz file (GNU extension) attached to a debug file dbghelp/dwarf: store in dwarf2 module's information a potential link to an external DWZ file dbghelp/dwarf: Now properly handling DW_FORM_GNU_strp_alt dbghelp/dwarf: Now loading the alternate dwarf file content as we do for a regular dwarf module dbghelp/dwarf: No longer passing a parse context to dwarf2_find_attribute dbghelp/dwarf: No longer passing a unit context to dwarf2_get_cpp_name dbghelp/dwarf: Folded printing info about unit context when printing debug_info's dbghelp/dwarf: No longer passing a unit context when parsing debug_info content dbghelp/dwarf! Added a new helper to jump into another debug_info dbghelp/dwarf: added proper support for DW_FORM_GNU_ref_alt dbghelp/dwarf: When loading a DWZ alternate file, don't force loading of all debug_infos dlls/dbghelp/dwarf.c | 610 +++++++++++++++++++++-------------- dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/module.c | 100 ++++++ 3 files changed, 463 insertions(+), 248 deletions(-)

1 12

[PATCH] winex11.drv: some windows are not menu.
by Chao Long Sept. 16, 2021

Sept. 16, 2021

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- dlls/winex11.drv/event.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 1772a27c48b..3e4742078be 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -707,9 +707,11 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) { /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ + DWORD ht = HTCAPTION; + if (GetClassLongW(hwnd, GCL_STYLE) & WS_SYSMENU) ht = HTMENU; LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ), - MAKELONG( HTMENU, WM_LBUTTONDOWN ) ); + MAKELONG( ht, WM_LBUTTONDOWN ) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { set_focus( event->display, hwnd, event_time ); -- 2.20.1

1 0

[PATCH] mfplay: Remove some dead code (Coverity).
by Nikolay Sivov Sept. 16, 2021

Sept. 16, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplay/player.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 959cf701b99..f7832598ae6 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1884,7 +1884,6 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba IMFMediaEvent *session_event; MFP_MEDIAPLAYER_STATE state; HRESULT hr, event_status; - IMFPMediaItem *item = NULL; IMFTopology *topology; unsigned int status; PROPVARIANT value; @@ -1964,9 +1963,6 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba ; } - if (item) - IMFPMediaItem_Release(item); - if (event) { media_player_queue_event(player, event); -- 2.33.0

1 0