wine-commits March 2020

wine-commits@winehq.org

1 participants
996 discussions

Zebediah Figura : wined3d: Check the writemask for the correct render target in draw_primitive().
by Alexandre Julliard 16 Mar '20

16 Mar '20

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

Zebediah Figura : wined3d: Fix an accidental replacement of STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE).
by Alexandre Julliard 16 Mar '20

16 Mar '20

Module: wine Branch: master Commit: 980a060949694e6ccf858c7b0efbbe3c76745dd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=980a060949694e6ccf858c7b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 23:42:06 2020 -0500 wined3d: Fix an accidental replacement of STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE). 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e4f174b9f1..0761dd6379 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4471,7 +4471,7 @@ static void wined3d_context_gl_setup_target(struct wined3d_context_gl *context_g /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ if ((context_gl->c.current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) != (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) - context_invalidate_state(&context_gl->c, STATE_BLEND); + context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } /* When switching away from an offscreen render target, and we're not

1 0

Francois Gouget : testbot: Trace the git HEAD after a repository update.
by Alexandre Julliard 16 Mar '20

16 Mar '20

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 16 Mar '20

16 Mar '20

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/LogUtils: Optimise the _GetLineKey() line cleanup.
by Alexandre Julliard 16 Mar '20

16 Mar '20

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

Francois Gouget : testbot/PatchUtils: Detect when make_unicode needs to be run.
by Alexandre Julliard 16 Mar '20

16 Mar '20

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

Alexandre Julliard : Wine release 5.4
by Alexandre Julliard 13 Mar '20

13 Mar '20

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

Tag wine-5.4 : Alexandre Julliard : Release 5.4
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: refs/tags/wine-5.4 Tag: 85ae5a2e7fc1cb4a2f1153980905475e4cfbcbe7 URL: https://source.winehq.org/git/wine.git/?a=tag;h=85ae5a2e7fc1cb4a2f115398090… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 21:23:09 2020 +0100 Release 5.4

1 0

Alexandre Julliard : Release 5.4.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: 4c61c8dce09307ecfe0beea307213bd1fb6a69db URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c61c8dce09307ecfe0beea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 13 21:23:09 2020 +0100 Release 5.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 936 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 493 insertions(+), 464 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4c61c8dce09307ecfe0b…

1 0

Serge Gautherie : tools: Remove 0x0501 API versions forced by winapi_test.
by Alexandre Julliard 13 Mar '20

13 Mar '20

Module: wine Branch: master Commit: aa384d36429110970aa72acbc5043158de6aff03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa384d36429110970aa72acb… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Wed Mar 11 16:49:21 2020 +0100 tools: Remove 0x0501 API versions forced by winapi_test. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/generated.c | 4 ---- dlls/kernel32/tests/generated.c | 4 ---- dlls/ntdll/tests/generated.c | 4 ---- dlls/rpcrt4/tests/generated.c | 4 ---- dlls/shell32/tests/generated.c | 4 ---- dlls/shlwapi/tests/generated.c | 4 ---- dlls/urlmon/tests/generated.c | 4 ---- dlls/user32/tests/generated.c | 4 ---- dlls/wininet/tests/generated.c | 4 ---- dlls/winmm/tests/generated.c | 4 ---- tools/winapi/winapi_test | 4 ---- 11 files changed, 44 deletions(-) diff --git a/dlls/gdi32/tests/generated.c b/dlls/gdi32/tests/generated.c index 019524df86..fe3ecd937d 100644 --- a/dlls/gdi32/tests/generated.c +++ b/dlls/gdi32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/kernel32/tests/generated.c b/dlls/kernel32/tests/generated.c index a166d9746c..7c57feaab7 100644 --- a/dlls/kernel32/tests/generated.c +++ b/dlls/kernel32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index b099a5c084..d277e02073 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "ntdll_test.h" diff --git a/dlls/rpcrt4/tests/generated.c b/dlls/rpcrt4/tests/generated.c index 7eb8faa073..72672cd3a9 100644 --- a/dlls/rpcrt4/tests/generated.c +++ b/dlls/rpcrt4/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/shell32/tests/generated.c b/dlls/shell32/tests/generated.c index ace877eb42..55f4eab894 100644 --- a/dlls/shell32/tests/generated.c +++ b/dlls/shell32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/shlwapi/tests/generated.c b/dlls/shlwapi/tests/generated.c index e5e0896af8..3a8e4269fc 100644 --- a/dlls/shlwapi/tests/generated.c +++ b/dlls/shlwapi/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/urlmon/tests/generated.c b/dlls/urlmon/tests/generated.c index 63e892bc54..45fd5d84f3 100644 --- a/dlls/urlmon/tests/generated.c +++ b/dlls/urlmon/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/user32/tests/generated.c b/dlls/user32/tests/generated.c index 2107a44cb3..be1b698a2c 100644 --- a/dlls/user32/tests/generated.c +++ b/dlls/user32/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windows.h" diff --git a/dlls/wininet/tests/generated.c b/dlls/wininet/tests/generated.c index 1282b6fda5..f88834ab9d 100644 --- a/dlls/wininet/tests/generated.c +++ b/dlls/wininet/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include <stdarg.h> diff --git a/dlls/winmm/tests/generated.c b/dlls/winmm/tests/generated.c index ec25e076df..4c0fe7a530 100644 --- a/dlls/winmm/tests/generated.c +++ b/dlls/winmm/tests/generated.c @@ -5,10 +5,6 @@ * Unit tests for data structure packing */ -#define WINVER 0x0501 -#define _WIN32_IE 0x0501 -#define _WIN32_WINNT 0x0501 - #define WINE_NOWINSOCK #include "windef.h" diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 92f4ae366a..48c29f8f4a 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -503,10 +503,6 @@ sub output_header($$$) { print OUT " */\n"; print OUT "\n"; - print OUT "#define WINVER 0x0501\n"; - print OUT "#define _WIN32_IE 0x0501\n"; - print OUT "#define _WIN32_WINNT 0x0501\n"; - print OUT "\n"; print OUT "#define WINE_NOWINSOCK\n"; print OUT "\n"; foreach my $test (@tests) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2020