From fd89a1b64cb77e6f45e6bdcda95955553031ba5a Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 15 May 2016 17:32:04 +0200 Subject: [PATCH] Added patch to avoid test failures in d2d1 tests on specific Nvidia graphic cards. --- ...-test-failure-on-specific-Nvidia-gra.patch | 24 +++++++++++++++++++ patches/patchinstall.sh | 16 +++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 patches/d2d1-Tests/0001-d2d1-tests-Avoid-test-failure-on-specific-Nvidia-gra.patch diff --git a/patches/d2d1-Tests/0001-d2d1-tests-Avoid-test-failure-on-specific-Nvidia-gra.patch b/patches/d2d1-Tests/0001-d2d1-tests-Avoid-test-failure-on-specific-Nvidia-gra.patch new file mode 100644 index 00000000..85b3da9b --- /dev/null +++ b/patches/d2d1-Tests/0001-d2d1-tests-Avoid-test-failure-on-specific-Nvidia-gra.patch @@ -0,0 +1,24 @@ +From 46a3f35c38aa4dcb9ca3101fc346fe44fa0d240d Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Sun, 15 May 2016 17:30:35 +0200 +Subject: d2d1/tests: Avoid test failure on specific Nvidia graphic cards. + +--- + dlls/d2d1/tests/d2d1.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c +index 7f9632f..0961373 100644 +--- a/dlls/d2d1/tests/d2d1.c ++++ b/dlls/d2d1/tests/d2d1.c +@@ -1103,6 +1103,7 @@ static void test_bitmap_brush(void) + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + match = compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"); ++ todo_wine_if (compare_surface(surface, "f428a7d2f886e33a8be006a831fb38d88b235884")) + ok(match, "Surface does not match.\n"); + + ID2D1RenderTarget_BeginDraw(rt); +-- +2.8.0 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 0fc5a8f8..310923b0 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -101,6 +101,7 @@ patch_enable_all () enable_configure_Absolute_RPATH="$1" enable_crypt32_CMS_Certificates="$1" enable_crypt32_CryptUnprotectMemory="$1" + enable_d2d1_Tests="$1" enable_d3d9_DesktopWindow="$1" enable_d3d9_Surface_Refcount="$1" enable_d3d9_Tests="$1" @@ -474,6 +475,9 @@ patch_enable () crypt32-CryptUnprotectMemory) enable_crypt32_CryptUnprotectMemory="$2" ;; + d2d1-Tests) + enable_d2d1_Tests="$2" + ;; d3d9-DesktopWindow) enable_d3d9_DesktopWindow="$2" ;; @@ -2803,6 +2807,18 @@ if test "$enable_crypt32_CryptUnprotectMemory" -eq 1; then ) >> "$patchlist" fi +# Patchset d2d1-Tests +# | +# | Modified files: +# | * dlls/d2d1/tests/d2d1.c +# | +if test "$enable_d2d1_Tests" -eq 1; then + patch_apply d2d1-Tests/0001-d2d1-tests-Avoid-test-failure-on-specific-Nvidia-gra.patch + ( + echo '+ { "Sebastian Lackner", "d2d1/tests: Avoid test failure on specific Nvidia graphic cards.", 1 },'; + ) >> "$patchlist" +fi + # Patchset d3d9-DesktopWindow # | # | Modified files: