From a7ad40c1355d5cd40e09f483566477b99cd832da Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 10 Jan 2019 11:08:38 +1100 Subject: [PATCH] Rebase against 807e5fc04af7a7ea563af1e7da6ebe6662536e6b --- patches/patchinstall.sh | 2 +- ...d-some-tests-for-various-TIFF-color-.patch | 28 +++++++++++++------ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 307663f4..5851a2e5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "54e4d51fdbda08333012040c0683394853a097e9" + echo "807e5fc04af7a7ea563af1e7da6ebe6662536e6b" } # Show version information diff --git a/patches/windowscodecs-TIFF_Support/0014-windowscodecs-Add-some-tests-for-various-TIFF-color-.patch b/patches/windowscodecs-TIFF_Support/0014-windowscodecs-Add-some-tests-for-various-TIFF-color-.patch index c5c278c8..9b1c795f 100644 --- a/patches/windowscodecs-TIFF_Support/0014-windowscodecs-Add-some-tests-for-various-TIFF-color-.patch +++ b/patches/windowscodecs-TIFF_Support/0014-windowscodecs-Add-some-tests-for-various-TIFF-color-.patch @@ -1,17 +1,17 @@ -From 05d258140cf227a2e51530afc11f8decf0bf156e Mon Sep 17 00:00:00 2001 +From 8baa01305598f32635ea565768e42fd2a362a912 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Fri, 9 Dec 2016 13:02:07 +0800 Subject: [PATCH] windowscodecs: Add some tests for various TIFF color formats. --- - dlls/windowscodecs/tests/tiffformat.c | 436 ++++++++++++++++++++++++++++++++++ - 1 file changed, 436 insertions(+) + dlls/windowscodecs/tests/tiffformat.c | 439 +++++++++++++++++++++++++++++++++- + 1 file changed, 438 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c -index 0f40295b9c..5671dfbfbc 100644 +index cfb16be..ac6a471 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c -@@ -312,6 +312,61 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma +@@ -361,6 +361,61 @@ static HRESULT create_decoder(const void *image_data, UINT image_size, IWICBitma return hr; } @@ -73,8 +73,18 @@ index 0f40295b9c..5671dfbfbc 100644 static void test_tiff_1bpp_palette(void) { HRESULT hr; -@@ -631,6 +686,386 @@ static void test_tiff_resolution(void) - } +@@ -694,7 +749,8 @@ static void test_tiff_24bpp(void) + BYTE data[3]; + static const BYTE expected_data[] = { 0x33,0x22,0x11 }; + +- decoder = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data)); ++ hr = create_decoder(&tiff_24bpp_data, sizeof(tiff_24bpp_data), &decoder); ++ ok(hr == S_OK, "got %#x\n", hr); + ok(decoder != NULL, "Failed to load TIFF image data\n"); + + hr = IWICBitmapDecoder_GetFrameCount(decoder, &count); +@@ -744,6 +800,386 @@ todo_wine_if(stride > 3) + IWICBitmapDecoder_Release(decoder); } +#include "pshpack2.h" @@ -460,7 +470,7 @@ index 0f40295b9c..5671dfbfbc 100644 START_TEST(tiffformat) { HRESULT hr; -@@ -642,6 +1077,7 @@ START_TEST(tiffformat) +@@ -755,6 +1191,7 @@ START_TEST(tiffformat) ok(hr == S_OK, "CoCreateInstance error %#x\n", hr); if (FAILED(hr)) return; @@ -469,5 +479,5 @@ index 0f40295b9c..5671dfbfbc 100644 test_tiff_8bpp_palette(); test_QueryCapability(); -- -2.16.1 +1.9.1