September 2021 - Wine-devel

[PATCH] riched20: Fix saving to disk first-indent and left-indent (\fi and \li)
by Philip Hardin 29 Sep '21

29 Sep '21

Signed-off-by: Philip Hardin <phoss(a)tutanota.com> --- dlls/riched20/writer.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 7c7e648f107..2477dda7407 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -662,10 +662,12 @@ static BOOL stream_out_para_props( ME_TextEditor *editor, ME_OutStream *pStream, if (!(editor->bEmulateVersion10 && /* v1.0 - 3.0 */ fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE)) { - if (fmt->dxOffset) - sprintf(props + strlen(props), "\\li%d", fmt->dxOffset); - if (fmt->dxStartIndent) - sprintf(props + strlen(props), "\\fi%d", fmt->dxStartIndent); + int first_indent = -fmt->dxOffset; + int left_indent = fmt->dxStartIndent + fmt->dxOffset; + if (first_indent) + sprintf(props + strlen(props), "\\fi%d", first_indent); + if (left_indent) + sprintf(props + strlen(props), "\\li%d", left_indent); if (fmt->dxRightIndent) sprintf(props + strlen(props), "\\ri%d", fmt->dxRightIndent); if (fmt->dwMask & PFM_TABSTOPS) { -- 2.25.1

2 1

[PATCH] wined3d: Do not call list_remove() on a Vulkan query which has not been started.
by Zebediah Figura 29 Sep '21

29 Sep '21

Or call it twice on one which has. This fixes a crash in Mafia: Definitive Edition. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/query.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 24892e42b34..8ee7ae07886 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1661,7 +1661,6 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); - list_remove(&query_vk->entry); if (query_vk->pending_count) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); memset((void *)query->data, 0, query->data_size); @@ -1742,7 +1741,8 @@ static void wined3d_query_vk_destroy(struct wined3d_query *query) struct wined3d_query_vk *query_vk = wined3d_query_vk(query); struct wined3d_context_vk *context_vk; - list_remove(&query_vk->entry); + if (query_vk->flags & WINED3D_QUERY_VK_FLAG_STARTED) + list_remove(&query_vk->entry); if (query_vk->pending_count) { context_vk = wined3d_context_vk(context_acquire(query_vk->q.device, NULL, 0)); @@ -1942,7 +1942,6 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data = query_vk + 1; wined3d_query_init(&query_vk->q, device, type, data, data_size, ops, parent, parent_ops); - list_init(&query_vk->entry); switch (type) { -- 2.33.0

2 1

[PATCH v3] d2d1/tests: Add tests for 2D affine effect.
by Ziqing Hui 29 Sep '21

29 Sep '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v3: Draw image in centre of the render target. dlls/d2d1/tests/d2d1.c | 149 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d38d49cd139..4beba7c963a 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9897,6 +9897,154 @@ 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; + unsigned int i, x, y, w, h; + D2D1_SIZE_U input_size; + ID2D1Factory1 *factory; + D2D1_POINT_2F offset; + ID2D1Bitmap1 *bitmap; + ID2D1Effect *effect; + ID2D1Image *output; + 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}, + "ASgBAQkBAQEBBwEBAQEBAQYBAQEBAQEHAQEBASgA"}, + {image_4x4, 4, 4, &scale, {-2.0f, -3.0f, 1.0f, 9.0f}, + "AQ8BAQEEAQEBBAEBAQQBAQEEAQEBBAEBAQQBAQEEAQEBBAEBAQQBAQEEAQEBBAEBARAA/"}, + {image_4x4, 4, 4, &skew, {-7.0f, -3.0f, 3.0f, 7.0f}, + "AS8CCwEBAQEJAQEBAQEBBwEBAQEBAQEBBgEBAQEBAQEBBwEBAQEBAQkCAj0A"}, + {image_16x16, 16, 16, &rotate, {-14.0f, -3.0f, 10.0f, 21.0f}, + "AWACGQECARcBBAEVAQYBEwEIAREBCgEPAQwBDQEOAQsBEAEJARIBBwEUAQUBARQBAQUBARIBAQcB" + "ARABAQkBAQ4BAQsBAQwBAQ0BAQoBAQ8BAQgBAREBAQYBARMBAQQBARUBAQIBARcBAgEZAkUA"}, + {image_16x16, 16, 16, &scale, {-2.0f, -3.0f, 10.0f, 39.0f}, + "ASEMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQM" + "BAwEDAQMBAwEDAQMBAwEDAQMBAwEDAQMBAwEDCIA"}, + {image_16x16, 16, 16, &skew, {-19.0f, -3.0f, 15.0f, 31.0f}, + "AYMBAiMBAgEhAQQBHwEGAR0BCAEbAQoBGQEMARcBDgEVARABEwESAREBFAEPARYBDQEYAQsBGgEJ" + "ARwBBwEeAQYBHgEHARwBCQEaAQsBGAENARYBDwEUAREBEgETARABFQEOARcBDAEZAQoBGwEIAR0B" + "BgEfAQQBIQECASMChAEA"}, + }; + + 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); + if (output_bounds.left == output_bounds.right || output_bounds.top == output_bounds.bottom) + { + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + continue; + } + + ID2D1DeviceContext_BeginDraw(context); + ID2D1DeviceContext_Clear(context, 0); + offset.x = 320.0f; + offset.y = 240.0f; + ID2D1DeviceContext_DrawImage(context, output, &offset, NULL, 0, 0); + hr = ID2D1DeviceContext_EndDraw(context, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + x = offset.x + output_bounds.left - 2.0f; + y = offset.y + output_bounds.top - 2.0f; + w = (output_bounds.right - output_bounds.left) + 4.0f; + h = (output_bounds.bottom - output_bounds.top) + 4.0f; + match = compare_figure(&ctx, x, y, w, h, 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"); @@ -9959,6 +10107,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] server: Fix Error found with Valgrind
by Andreas Pickart 29 Sep '21

29 Sep '21

Hi, currently i am trying to find and fix Errors occuring with (at first) winemine when run through Valgrind. This is my first Patch: Patch against Wine version 6.18-gde7adacedbdd78fd1ed8ee0986a78670e11a60bc server: Fix Error found with Valgrind: ==14116== Conditional jump or move depends on uninitialised value(s) ==14116== at 0x164AF0: req_select (thread.c:1585) ==14116== by 0x15701F: call_req_handler (request.c:312) ==14116== by 0x157257: read_request (request.c:367) ==14116== by 0x1615B3: thread_poll_event (thread.c:393) ==14116== by 0x12BD8A: fd_poll_event (fd.c:548) ==14116== by 0x12C070: main_loop_epoll (fd.c:642) ==14116== by 0x12C63B: main_loop (fd.c:998) ==14116== by 0x13769A: main (main.c:149) ==14116== Uninitialised value was created by a client request ==14116== at 0x13E8A5: mark_block_uninitialized (object.c:110) ==14116== by 0x13E92D: mem_alloc (object.c:120) ==14116== by 0x13EBDD: alloc_object (object.c:199) ==14116== by 0x141100: create_process (process.c:623) ==14116== by 0x157AB9: master_socket_poll_event (request.c:587) ==14116== by 0x12BD8A: fd_poll_event (fd.c:548) ==14116== by 0x12C070: main_loop_epoll (fd.c:642) ==14116== by 0x12C63B: main_loop (fd.c:998) ==14116== by 0x13769A: main (main.c:149) diff --git a/server/process.c b/server/process.c index 8109fbe8de4..e07a5736f02 100644 --- a/server/process.c +++ b/server/process.c @@ -639,6 +639,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->is_system = 0; process->debug_children = 1; process->is_terminating = 0; + process->machine = IMAGE_FILE_MACHINE_UNKNOWN; process->imagelen = 0; process->image = NULL; process->job = NULL;

1 0

[PATCH 11/11] gdi32: Use single get_cptable implementation.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 2 +- dlls/gdi32/freetype.c | 15 --------------- dlls/gdi32/ntgdi_private.h | 1 + 3 files changed, 2 insertions(+), 16 deletions(-)

2 1

[PATCH 10/11] gdi32: Move ntgdi functions to Unix library.
by Jacek Caban 29 Sep '21

29 Sep '21

3 2

[PATCH 09/11] gdi32: Avoid using CRT wide char functions in ntgdi functions.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/win32u_private.h | 90 +++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+)

2 1

[PATCH 08/11] gdi32: Introduce user_callbacks.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 3 +- dlls/gdi32/driver.c | 74 ++++++++----------- dlls/gdi32/freetype.c | 18 +++++ dlls/gdi32/gdiobj.c | 9 +-- dlls/gdi32/ntgdi_private.h | 3 +- dlls/gdi32/palette.c | 27 ++----- dlls/gdi32/region.c | 11 +-- dlls/gdi32/win32u_private.h | 41 +++++++++++ dlls/gdi32/wrappers.c | 141 ++++++++++++++++++++++++++++++++++++ 9 files changed, 246 insertions(+), 81 deletions(-) create mode 100644 dlls/gdi32/win32u_private.h create mode 100644 dlls/gdi32/wrappers.c

2 1

[PATCH 07/11] gdi32: Don't use WideCharToMultiByte in font.c.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/font.c | 56 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 48 insertions(+), 8 deletions(-)

2 1

[PATCH 06/11] gdi32: Use NtGdiOpenDCW for CreateDCW.
by Jacek Caban 29 Sep '21

29 Sep '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dc.c | 62 +++++------ dlls/gdi32/driver.c | 188 +++----------------------------- dlls/gdi32/emfdrv.c | 2 +- dlls/gdi32/gdidc.c | 215 +++++++++++++++++++++++++++++++++++++ dlls/gdi32/ntgdi_private.h | 3 +- 5 files changed, 260 insertions(+), 210 deletions(-)

2 1