March 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Check the writemask for the correct render target in draw_primitive().
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: 998d901f0d621f4d117d1a56cf1c02394bad7382 URL: https://source.winehq.org/git/wine.git/?a=commit;h=998d901f0d621f4d117d1a56… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 23:42:07 2020 -0500 wined3d: Check the writemask for the correct render target in draw_primitive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0761dd6379..d9e3dfaa50 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5105,6 +5105,15 @@ static GLenum gl_tfb_primitive_type_from_d3d(enum wined3d_primitive_type primiti } } +static unsigned int get_render_target_writemask(const struct wined3d_blend_state *state, unsigned int index) +{ + if (!state) + return 0xf; + if (!state->desc.independent) + index = 0; + return state->desc.rt[index].writemask; +} + /* Routine common to the draw primitive and draw indexed primitive routines */ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) @@ -5154,7 +5163,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (!(rtv = fb->render_targets[i]) || rtv->format->id == WINED3DFMT_NULL) continue; - if (!state->blend_state || state->blend_state->desc.rt[0].writemask) + if (get_render_target_writemask(state->blend_state, i)) { wined3d_rendertarget_view_load_location(rtv, context, rtv->resource->draw_binding); wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding);

1 0

Nikolay Sivov : mfplat: Use underlying work queue API.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: wine Branch: master Commit: b43929367c39b8ebd26bb7c87af61e58bf9af29d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b43929367c39b8ebd26bb7c8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 16 12:17:06 2020 +0300 mfplat: Use underlying work queue API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 275 +++++++++++++++++++++++++++-------------------------- 1 file changed, 139 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b43929367c39b8ebd26b…

1 0

Francois Gouget : testbot: Trace the git HEAD after a repository update.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: tools Branch: master Commit: e10276b895fb2001522ac6f43281aa77cffdb14b URL: https://source.winehq.org/git/tools.git/?a=commit;h=e10276b895fb2001522ac6f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 22:53:13 2020 +0100 testbot: Trace the git HEAD after a repository update. 'git pull' already shows the old and new HEAD (if the repository is not already up-to-date), but this provides the commit id in the same format as ApplyPatch() which makes it available to the TestBot server. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index c425078..85df900 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -89,7 +89,8 @@ sub GitPull($) else { InfoMsg "\nUpdating the $Dir source\n"; - system("cd '$DataDir/$Dir' && set -x && git pull"); + system("cd '$DataDir/$Dir' && (set -x && git pull) && ". + "echo $Dir:HEAD=`git rev-parse HEAD`"); } if ($? != 0) {

1 0

Francois Gouget : testbot/WineTest: Rename DailyWineTest() to WineTestSuite().
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: tools Branch: master Commit: ef4821bd07c09537d3cc4e72700a3ff54b8734f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ef4821bd07c09537d3cc4e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Mar 15 22:53:05 2020 +0100 testbot/WineTest: Rename DailyWineTest() to WineTestSuite(). What matters is that it runs the full WineTest suite, not whether it is run daily. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 88f5e36..1afe9b8 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -90,7 +90,7 @@ sub SetupTest($$) return $BaseName; } -sub DailyWineTest($$$$) +sub WineTestSuite($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; @@ -461,7 +461,7 @@ foreach my $Mission (@{$TaskMissions->{Missions}}) } elsif ($Action eq "winetest") { - exit(1) if (!DailyWineTest($Mission, $OptNoSubmit, $BaseTag, \@ARGV)); + exit(1) if (!WineTestSuite($Mission, $OptNoSubmit, $BaseTag, \@ARGV)); } elsif (@ARGV) {

1 0

Francois Gouget : testbot/PatchUtils: Detect when make_unicode needs to be run.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: tools Branch: master Commit: 0a640370e6a9f99a4738f463a8e1eda20547c75a URL: https://source.winehq.org/git/tools.git/?a=commit;h=0a640370e6a9f99a4738f46… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 13 11:12:19 2020 +0100 testbot/PatchUtils: Detect when make_unicode needs to be run. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index cc61e31..c425078 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -157,6 +157,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeUnicode}) + { + InfoMsg "\nRunning make_unicode\n"; + system("cd '$DataDir/$Dir/' && set -x && ./tools/make_unicode"); + if ($? != 0) + { + LogMsg "make_unicode failed\n"; + return undef; + } + } if ($Impacts->{MakeVulkan}) { InfoMsg "\nRunning make_vulkan\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index f55dc4b..eaa9868 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -341,6 +341,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/tools/make_unicode$=) + { + $Impacts->{PatchedRoot} = $Impacts->{MakeUnicode} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- /dev/null$=) { $Change = "new";

1 0

Francois Gouget : testbot/LogUtils: Optimise the _GetLineKey() line cleanup.
by Alexandre Julliard March 16, 2020

March 16, 2020

Module: tools Branch: master Commit: 1d3e1efa699fee5564f41ab1dcc03a6ab989ea64 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1d3e1efa699fee5564f41ab… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 13 11:12:41 2020 +0100 testbot/LogUtils: Optimise the _GetLineKey() line cleanup. Most line cleanups are mutually exclusive so stop trying after the first successful attempt. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index bf933a0..57229bc 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1048,15 +1048,15 @@ sub _GetLineKey($) return undef if (!defined $Line); # Remove the line number - $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/; + $Line =~ s/^([_a-z0-9]+\.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/ # Remove the crash code address: it changes whenever the test is recompiled - $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/; - # and the process id - $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/; + or $Line =~ s/^(Unhandled exception: .* code) $0x[0-9a-fA-F]{8,16}$\.$/$1/ + # or the process id in Wine's exc_filter() lines + or $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8} at )[0-9a-fA-F]{8,16}$/$1/ # The exact amount of data printed does not change the error - $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; + or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )$\d+ bytes$$/$1/; # Note: The 'done (258)' lines are modified by ParseWineTestReport() and # no longer contain the pid. So they need no further change here.

1 0

Alexandre Julliard : Wine release 5.4
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: website Branch: master Commit: 9bcf9d21e7d6a214e9fce514b9ee0c9d6a1f6abd URL: https://source.winehq.org/git/website.git/?a=commit;h=9bcf9d21e7d6a214e9fce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 21:25:00 2020 +0100 Wine release 5.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020031301.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2020031301.xml b/news/en/2020031301.xml new file mode 100644 index 00000000..c0fd260c --- /dev/null +++ b/news/en/2020031301.xml @@ -0,0 +1,17 @@ +<news> +<date>March 13, 2020</date> +<title>Wine 5.4 Released</title> +<body> + The Wine development release 5.4 is now available. + <a href="{$root}/announce/5.4">What's new</a> in this release: +<ul> + <li>Unicode data updated to Unicode version 13.</li> + <li>Builtin programs use the new UCRTBase C runtime.</li> + <li>More correct support for Internationalized Domain Names.</li> + <li>Support for painting rounded rectangles in Direct2D.</li> + <li>Text drawing in D3DX9.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Sven Baars : d3dx9: Handle DT_CALCRECT in ID3DXFont_DrawText.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: 143a2a30f89dfc79cc2a49cd34af6fd587ce3f69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=143a2a30f89dfc79cc2a49cd… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Tue Mar 10 11:21:39 2020 +0100 d3dx9: Handle DT_CALCRECT in ID3DXFont_DrawText. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/font.c | 24 +++++++++++++++++++----- dlls/d3dx9_36/tests/core.c | 18 ++++++++++++++++-- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index e27858a2ce..3645903367 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -553,12 +553,11 @@ static void word_break(HDC hdc, const WCHAR *str, unsigned int *str_len, } static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, - WCHAR *dest, unsigned int *dest_len, int width, DWORD format) + WCHAR *dest, unsigned int *dest_len, int width, DWORD format, SIZE *size) { unsigned int i = 0; int orig_count = *count; int num_fit; - SIZE size; *dest_len = 0; while (*count && (str[i] != '\n' || (format & DT_SINGLELINE))) @@ -570,7 +569,7 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, } num_fit = 0; - GetTextExtentExPointW(hdc, dest, *dest_len, width, &num_fit, NULL, &size); + GetTextExtentExPointW(hdc, dest, *dest_len, width, &num_fit, NULL, size); if (num_fit < *dest_len) { @@ -578,7 +577,7 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, int *count, { unsigned int chars_used; - word_break(hdc, dest, dest_len, num_fit, &chars_used, format, &size); + word_break(hdc, dest, dest_len, num_fit, &chars_used, format, size); *count = orig_count - chars_used; i = chars_used; } @@ -608,7 +607,9 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, WCHAR *line; RECT textrect = {0}; int lh, x, y, width; + int max_width = 0; int ret = 0; + SIZE size; TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x.\n", iface, sprite, debugstr_wn(string, count), count, wine_dbgstr_rect(rect), format, color); @@ -660,7 +661,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, { unsigned int line_len; - string = read_line(font->hdc, string, &count, line, &line_len, width, format); + string = read_line(font->hdc, string, &count, line, &line_len, width, format, &size); if (!(format & DT_CALCRECT)) { @@ -705,11 +706,24 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, heap_free(results.lpCaretPos); heap_free(results.lpGlyphs); } + else if (size.cx > max_width) + { + max_width = size.cx; + } + y += lh; if (!(DT_NOCLIP & format) && (y > textrect.bottom)) break; } + if (format & DT_CALCRECT) + { + *rect = textrect; + + rect->bottom = y; + rect->right = rect->left + max_width; + } + ret = y - textrect.top; cleanup: diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 2b5a868033..6fae8bf8d5 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -64,6 +64,15 @@ static inline void check_mat(D3DXMATRIX got, D3DXMATRIX exp) U(exp).m[3][0],U(exp).m[3][1],U(exp).m[3][2],U(exp).m[3][3]); } +#define check_rect(rect, left, top, right, bottom) _check_rect(__LINE__, rect, left, top, right, bottom) +static inline void _check_rect(unsigned int line, const RECT *rect, int left, int top, int right, int bottom) +{ + ok_(__FILE__, line)(rect->left == left, "Unexpected rect.left %d\n", rect->left); + ok_(__FILE__, line)(rect->top == top, "Unexpected rect.top %d\n", rect->top); + ok_(__FILE__, line)(rect->right == right, "Unexpected rect.right %d\n", rect->right); + ok_(__FILE__, line)(rect->bottom == bottom, "Unexpected rect.bottom %d\n", rect->bottom); +} + static void test_ID3DXBuffer(void) { ID3DXBuffer *buffer; @@ -667,8 +676,8 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ok(height == tests[i].font_height, "Test %d: got unexpected height %u.\n", i, height); ok(!rect.left, "Test %d: got unexpected rect left %d.\n", i, rect.left); ok(!rect.top, "Test %d: got unexpected rect top %d.\n", i, rect.top); - todo_wine ok(rect.right, "Test %d: got unexpected rect right %d.\n", i, rect.right); - todo_wine ok(rect.bottom == tests[i].font_height, "Test %d: got unexpected rect bottom %d.\n", i, rect.bottom); + ok(rect.right, "Test %d: got unexpected rect right %d.\n", i, rect.right); + ok(rect.bottom == tests[i].font_height, "Test %d: got unexpected rect bottom %d.\n", i, rect.bottom); hr = ID3DXSprite_End(sprite); ok (hr == D3D_OK, "Test %d: got unexpected hr %#x.\n", i, hr); @@ -839,6 +848,11 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_CENTER, 0xff00ff); ok(height == 24, "Got unexpected height %d.\n", height); + SetRect(&rect, 10, 10, 50, 50); + height = ID3DXFont_DrawTextW(font, NULL, L"aaaa\naaaa", -1, &rect, DT_CALCRECT, 0xff00ff); + ok(height == 24, "Got unexpected height %d.\n", height); + check_rect(&rect, 10, 10, 30, 34); + ID3DXFont_Release(font); }

1 0

Zebediah Figura : d3dcompiler: Fail if modifiers are applied to a function.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: afd3a1e388ab720ae6eadad3ac7591ba9fa1614f URL: https://source.winehq.org/git/wine.git/?a=commit;h=afd3a1e388ab720ae6eadad3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 13 17:34:55 2020 +0100 d3dcompiler: Fail if modifiers are applied to a function. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 7 +++++++ dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 498ca4bb59..59e0df9d8c 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1322,8 +1322,15 @@ func_declaration: func_prototype compound_statement pop_scope(&hlsl_ctx); } + /* var_modifiers is necessary to avoid shift/reduce conflicts. */ func_prototype: var_modifiers type var_identifier '(' parameters ')' colon_attribute { + if ($1) + { + hlsl_report_message(get_location(&@1), HLSL_LEVEL_ERROR, + "unexpected modifiers on a function"); + YYABORT; + } if (get_variable(hlsl_ctx.globals, $3)) { hlsl_report_message(get_location(&@3), diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index b16f6e3454..3edee34d8d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -925,6 +925,11 @@ static void test_fail(void) " float a[(x = 2)];\n" " return float4(0, 0, 0, 0);\n" "}", + + "uniform float4 test() : SV_TARGET\n" + "{\n" + " return float4(0, 0, 0, 0);\n" + "}", }; static const char *targets[] = {"ps_2_0", "ps_3_0", "ps_4_0"};

1 0

Zebediah Figura : d3dcompiler: Don't add the default matrix majority attribute to variables.
by Alexandre Julliard March 13, 2020

March 13, 2020

Module: wine Branch: master Commit: eb4fc30463ac248f7b49596403db4f2f267336a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb4fc30463ac248f7b495964… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 13 17:34:54 2020 +0100 d3dcompiler: Don't add the default matrix majority attribute to variables. This is a type modifier, and thus does not make a lot of sense on a variable. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/hlsl.y | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index a24d29e5df..498ca4bb59 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -129,15 +129,7 @@ static BOOL declare_variable(struct hlsl_ir_var *decl, BOOL local) BOOL ret; TRACE("Declaring variable %s.\n", decl->name); - if (decl->data_type->type == HLSL_CLASS_MATRIX) - { - if (!(decl->modifiers & (HLSL_MODIFIER_ROW_MAJOR | HLSL_MODIFIER_COLUMN_MAJOR))) - { - decl->modifiers |= hlsl_ctx.matrix_majority == HLSL_ROW_MAJOR - ? HLSL_MODIFIER_ROW_MAJOR : HLSL_MODIFIER_COLUMN_MAJOR; - } - } - else + if (decl->data_type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(decl->modifiers, decl->loc); if (local)

1 0