November 2018 - Wine-devel - list.winehq.org

[PATCH 3/7] widl: Introduce for_each_iface helper and use it in write_procformatstring.
by Jacek Caban 07 Nov '18

07 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/typegen.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-)

1 0

[PATCH 2/7] widl: Support async interfaces in headers generation.
by Jacek Caban 07 Nov '18

07 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/header.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)

1 0

[PATCH 1/7] widl: Create type for async variant of an interface with async_uuid attribute.
by Jacek Caban 07 Nov '18

07 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/parser.y | 106 +++++++++++++++++++++++++++++++++++++++-- tools/widl/typetree.c | 3 ++ tools/widl/widltypes.h | 1 + 3 files changed, 107 insertions(+), 3 deletions(-)

1 0

[PATCH] dwrite/tests: Test run bidi level too.
by Nikolay Sivov 07 Nov '18

07 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/layout.c | 40 ++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a117ca0d62..6aaf7925ae 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -311,6 +311,7 @@ struct drawcall_entry { WCHAR string[10]; /* only meaningful for DrawGlyphRun() */ WCHAR locale[LOCALE_NAME_MAX_LENGTH]; UINT32 glyphcount; /* only meaningful for DrawGlyphRun() */ + UINT32 bidilevel; }; struct drawcall_sequence @@ -432,6 +433,17 @@ static void ok_sequence_(struct drawcall_sequence **seq, int sequence_index, ok_(file, line) (expected->glyphcount == actual->glyphcount, "%s: wrong glyph count, %u was expected, but got %u instead\n", context, expected->glyphcount, actual->glyphcount); + + if (expected->bidilevel != actual->bidilevel && todo) { + failcount++; + todo_wine + ok_(file, line) (0, "%s: wrong bidi level, %u was expected, but got %u instead\n", + context, expected->bidilevel, actual->bidilevel); + } + else + ok_(file, line) (expected->bidilevel == actual->bidilevel, + "%s: wrong bidi level, %u was expected, but got %u instead\n", + context, expected->bidilevel, actual->bidilevel); } else if ((expected->kind & DRAW_KINDS_MASK) == DRAW_UNDERLINE) { int cmp = lstrcmpW(expected->locale, actual->locale); @@ -606,6 +618,7 @@ static HRESULT WINAPI testrenderer_DrawGlyphRun(IDWriteTextRenderer *iface, ok(lstrlenW(descr->localeName) < LOCALE_NAME_MAX_LENGTH, "unexpectedly long locale name\n"); lstrcpyW(entry.locale, descr->localeName); entry.glyphcount = run->glyphCount; + entry.bidilevel = run->bidiLevel; add_call(sequences, RENDERER_ID, &entry); return S_OK; } @@ -1681,14 +1694,22 @@ static const struct drawcall_entry draw_single_run_seq[] = { { DRAW_LAST_KIND } }; -static const struct drawcall_entry draw_reordered_run_seq[] = { +static const struct drawcall_entry draw_ltr_reordered_run_seq[] = { { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6 }, - { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7 }, - { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2 }, + { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7, 1 }, + { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2, 2 }, { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1 }, { DRAW_LAST_KIND } }; +static const struct drawcall_entry draw_rtl_reordered_run_seq[] = { + { DRAW_GLYPHRUN, {'1','2','3','-','5','2',0}, {'r','u',0}, 6, 2 }, + { DRAW_GLYPHRUN, {0x64a,0x64f,0x633,0x627,0x648,0x650,0x64a,0}, {'r','u',0}, 7, 1 }, + { DRAW_GLYPHRUN, {'7','1',0}, {'r','u',0}, 2, 2 }, + { DRAW_GLYPHRUN, {'.',0}, {'r','u',0}, 1, 1 }, + { DRAW_LAST_KIND } +}; + static void test_Draw(void) { static const WCHAR str3W[] = {'1','2','3','-','5','2',0x64a,0x64f,0x633,0x627,0x648,0x650, @@ -1887,10 +1908,21 @@ todo_wine ctxt.use_gdi_natural = FALSE; ctxt.snapping_disabled = TRUE; + hr = IDWriteTextLayout_SetReadingDirection(layout, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); + ok(hr == S_OK, "Failed to set reading direction, hr %#x.\n", hr); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_ltr_reordered_run_seq, "draw test 11", FALSE); + + hr = IDWriteTextLayout_SetReadingDirection(layout, DWRITE_READING_DIRECTION_RIGHT_TO_LEFT); + ok(hr == S_OK, "Failed to set reading direction, hr %#x.\n", hr); + flush_sequence(sequences, RENDERER_ID); hr = IDWriteTextLayout_Draw(layout, &ctxt, &testrenderer, 0.0f, 0.0f); ok(hr == S_OK, "got 0x%08x\n", hr); - ok_sequence(sequences, RENDERER_ID, draw_reordered_run_seq, "draw test 11", FALSE); + ok_sequence(sequences, RENDERER_ID, draw_rtl_reordered_run_seq, "draw test 12", FALSE); IDWriteTextLayout_Release(layout); -- 2.19.1

1 0

[PATCH] comctl32/tests: Fix Listbox test failures on some configurations.
by Nikolay Sivov 07 Nov '18

07 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listbox.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index c9d13a8d67..d4bb2cc2a8 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -793,6 +793,7 @@ static void test_listbox_item_data(void) static void test_listbox_LB_DIR(void) { + char path[MAX_PATH], curdir[MAX_PATH]; HWND hList; int res, itemCount; int itemCount_justFiles; @@ -805,6 +806,16 @@ static void test_listbox_LB_DIR(void) char driveletter; const char *wildcard = "*"; HANDLE file; + BOOL ret; + + GetCurrentDirectoryA(ARRAY_SIZE(curdir), curdir); + + GetTempPathA(ARRAY_SIZE(path), path); + ret = SetCurrentDirectoryA(path); + ok(ret, "Failed to set current directory.\n"); + + ret = CreateDirectoryA("lb_dir_test", NULL); + ok(ret, "Failed to create test directory.\n"); file = CreateFileA( "wtest1.tmp.c", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL ); ok(file != INVALID_HANDLE_VALUE, "Error creating the test file: %d\n", GetLastError()); @@ -1135,11 +1146,11 @@ static void test_listbox_LB_DIR(void) itemCount, itemCount_allDirs); ok(res + 1 == itemCount, "SendMessage(LB_DIR, DDL_DIRECTORY|DDL_EXCLUSIVE, *) returned incorrect index!\n"); - if (itemCount && GetCurrentDirectoryA( MAX_PATH, pathBuffer ) > 3) /* there's no [..] in drive root */ + if (itemCount) { memset(pathBuffer, 0, MAX_PATH); SendMessageA(hList, LB_GETTEXT, 0, (LPARAM)pathBuffer); - ok( !strcmp(pathBuffer, "[..]"), "First element is not [..]\n"); + ok( !strcmp(pathBuffer, "[..]"), "First element is %s, not [..]\n", pathBuffer); } /* This tests behavior when no files match the wildcard */ @@ -1224,6 +1235,9 @@ static void test_listbox_LB_DIR(void) DestroyWindow(hList); DeleteFileA( "wtest1.tmp.c" ); + RemoveDirectoryA("lb_dir_test"); + + SetCurrentDirectoryA(curdir); } static HWND g_listBox; -- 2.19.1

1 1

[PATCH] testbot/WineSendLog: Don't report non-existent build errors.
by Francois Gouget 07 Nov '18

07 Nov '18

Make sure there are errors to report even when there is no reference log which is typical of build logs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This will stop WineSendLog from sending an email for jobs such as 43971 where there is no new error, and the only 'build' error is that user32:msg prints too much data. https://testbot.winehq.org/JobDetails.pl?Key=43971 testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index bb6dab51ad..a651c097e8 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -296,7 +296,7 @@ EOF $NewGroups = $LogErrors->{Groups}; $NewErrors = $LogErrors->{Errors}; } - elsif (!@$NewGroups) + if (!$NewGroups or !@$NewGroups) { # There is no new error next; -- 2.19.1

1 0

[PATCH] d3d8: Remove abs() invocations on unsigned integers in color_match
by Gerald Pfeifer 07 Nov '18

07 Nov '18

This is per our discussion - since we're only dealing with unsigned integers here (and no casts to signed), abs() is a noop. Gerald --- dlls/d3d8/tests/visual.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index e8e6bf870e..0b2ce20787 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -52,13 +52,13 @@ static HWND create_window(void) static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; - if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; + if ((c1 & 0xff) - (c2 & 0xff) > max_diff) return FALSE; return TRUE; } -- 2.18.0

2 1

color_match in dlls/d3d8/tests/visual.c may not do what one would think
by Gerald Pfeifer 07 Nov '18

07 Nov '18

Hi Henri, hi everyone, earlier this year via commit 2f6fbdec8caee311e2fb85b2ddc9fbd8a9afaea5 Author: H. Verbeet <hverbeet(a)gmail.com> Date: Sat May 24 10:33:36 2008 +0200 d3d8: Test our texop implementation. we go the following function in dlls/d3d8/tests/visual.c: static BOOL color_match(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) { if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; c1 >>= 8; c2 >>= 8; if (abs((c1 & 0xff) - (c2 & 0xff)) > max_diff) return FALSE; return TRUE; } Intuitively it's clear what this does, however there's a little challenge: c1 and c2 are unsigned integers (D3DCOLOR being DWORD being unsigned long), and so are c1 & 0xff and c2 & 0xff. Substraction of two unsigned integer types is done in unsigned math, so we may be seeing wrapping, but never a negative number as a result -- and abs() is a noop. Gerald

3 4

[PATCH 5/5] d3d9: Set WINED3D_SWAPCHAIN_GDI_COMPATIBLE on the swapchain when required.
by Henri Verbeet 07 Nov '18

07 Nov '18

Instead of injecting WINED3D_TEXTURE_CREATE_GET_DC during device_parent_create_swapchain_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 840a786cce4..eaf162c7da3 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -346,6 +346,11 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); swapchain_desc->flags = (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH; + if (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format) + /* WINED3DFMT_UNKNOWN creates the swapchain with the current + * display format, which is always GDI-compatible. */ + || swapchain_desc->backbuffer_format == WINED3DFMT_UNKNOWN) + swapchain_desc->flags |= WINED3D_SWAPCHAIN_GDI_COMPATIBLE; swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; swapchain_desc->auto_restore_display_mode = TRUE; @@ -4177,9 +4182,6 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic if (container_parent == device_parent) container_parent = &device->IDirect3DDevice9Ex_iface; - if (is_gdi_compat_wined3dformat(desc->format)) - texture_flags |= WINED3D_TEXTURE_CREATE_GET_DC; - if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1, texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent, &d3d9_null_wined3d_parent_ops, texture))) -- 2.11.0

2 1

[PATCH 4/5] wined3d: Update the swapchain flags on wined3d_device_reset().
by Henri Verbeet 07 Nov '18

07 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3efae4bb56c..3697b8f0005 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4752,6 +4752,16 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) } } +static void update_swapchain_flags(struct wined3d_texture *texture) +{ + unsigned int flags = texture->swapchain->desc.flags; + + if (flags & WINED3D_SWAPCHAIN_GDI_COMPATIBLE) + texture->flags |= WINED3D_TEXTURE_GET_DC; + else + texture->flags &= ~WINED3D_TEXTURE_GET_DC; +} + HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) @@ -4835,7 +4845,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, swapchain->desc.swap_effect = swapchain_desc->swap_effect; swapchain->desc.enable_auto_depth_stencil = swapchain_desc->enable_auto_depth_stencil; swapchain->desc.auto_depth_stencil_format = swapchain_desc->auto_depth_stencil_format; - swapchain->desc.flags = swapchain_desc->flags; swapchain->desc.refresh_rate = swapchain_desc->refresh_rate; swapchain->desc.auto_restore_display_mode = swapchain_desc->auto_restore_display_mode; @@ -4881,6 +4890,17 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, swapchain_desc->multisample_type, swapchain_desc->multisample_quality))) return hr; + if (swapchain_desc->flags != swapchain->desc.flags) + { + swapchain->desc.flags = swapchain_desc->flags; + + update_swapchain_flags(swapchain->front_buffer); + for (i = 0; i < swapchain->desc.backbuffer_count; ++i) + { + update_swapchain_flags(swapchain->back_buffers[i]); + } + } + if (device->auto_depth_stencil_view) { wined3d_rendertarget_view_decref(device->auto_depth_stencil_view); -- 2.11.0

2 1