Updated windowscodecs-TIFF_Support patchset

wine-staging · Feb 22, 2018 · 950a11a · 950a11a
1 parent cf19a5d
commit 950a11a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 545 deletions.
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
@@ -8608,7 +8608,6 @@ if test "$enable_windowscodecs_TIFF_Support" -eq 1; then
 	patch_apply windowscodecs-TIFF_Support/0011-windowscodecs-Add-support-for-32bppCMYK-and-64bppCMY.patch
 	patch_apply windowscodecs-TIFF_Support/0012-windowscodecs-Add-support-for-4bpp-RGBA-format-to-TI.patch
 	patch_apply windowscodecs-TIFF_Support/0013-windowscodecs-Add-support-for-16bpp-RGBA-format-to-T.patch
-	patch_apply windowscodecs-TIFF_Support/0014-windowscodecs-Add-some-tests-for-various-TIFF-color-.patch
 	patch_apply windowscodecs-TIFF_Support/0015-windowscodecs-Tolerate-partial-reads-in-the-IFD-meta.patch
 	patch_apply windowscodecs-TIFF_Support/0016-gdiplus-Add-support-for-more-image-color-formats.patch
 	patch_apply windowscodecs-TIFF_Support/0017-gdiplus-tests-Add-some-tests-for-loading-TIFF-images.patch

diff --git a/...indowscodecs-TIFF_Support/0001-windowscodecs-tests-Add-a-test-for-8bpp-indexed-TIFF.patch b/...indowscodecs-TIFF_Support/0001-windowscodecs-tests-Add-a-test-for-8bpp-indexed-TIFF.patch
@@ -1,14 +1,14 @@
-From b303a2aee86042ffd0fe3881f7831be247ad6c2c Mon Sep 17 00:00:00 2001
+From cc82aea8b29379273e5b9d4aca4ff935f302f073 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Mon, 28 Nov 2016 21:17:59 +0800
-Subject: windowscodecs/tests: Add a test for 8bpp indexed TIFF format.
+Subject: [PATCH] windowscodecs/tests: Add a test for 8bpp indexed TIFF format.
 
 ---
- dlls/windowscodecs/tests/tiffformat.c | 174 ++++++++++++++++++++++++++++++----
- 1 file changed, 154 insertions(+), 20 deletions(-)
+ dlls/windowscodecs/tests/tiffformat.c | 180 +++++++++++++++++++++++++++++-----
+ 1 file changed, 157 insertions(+), 23 deletions(-)
 
 diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c
-index e4a4b66..3291b48 100644
+index a7b6f5b594..e93d03ad68 100644
 --- a/dlls/windowscodecs/tests/tiffformat.c
 +++ b/dlls/windowscodecs/tests/tiffformat.c
 @@ -136,6 +136,49 @@ static const struct tiff_8bpp_alpha
@@ -61,7 +61,7 @@ index e4a4b66..3291b48 100644
  static const struct tiff_resolution_test_data
  {
      struct IFD_rational resx;
-@@ -235,29 +278,41 @@ static IStream *create_stream(const void
+@@ -235,29 +278,41 @@ static IStream *create_stream(const void *data, int data_size)
      return stream;
  }
 
@@ -102,12 +102,12 @@ index e4a4b66..3291b48 100644
 +        ok(hr == S_OK, "GetContainerFormat error %#x\n", hr);
 +        ok(IsEqualGUID(&format, &GUID_ContainerFormatTiff),
 +           "wrong container format %s\n", wine_dbgstr_guid(&format));
-+
+
+-    return decoder;
 +        refcount = IStream_Release(stream);
 +        ok(refcount > 0, "expected stream refcount > 0\n");
 +    }
-
--    return decoder;
++
 +    return hr;
  }
 
@@ -227,6 +227,19 @@ index e4a4b66..3291b48 100644
  static void test_tiff_resolution(void)
  {
      HRESULT hr;
+@@ -461,9 +594,9 @@ static void test_tiff_resolution(void)
+         tiff_resolution_image_data.resy = test_data->resy;
+         tiff_resolution_image_data.entry[12].value = test_data->resolution_unit;
+
+-        decoder = create_decoder(&tiff_resolution_image_data, sizeof(tiff_resolution_image_data));
+-        ok(decoder != 0, "%d: Failed to load TIFF image data\n", i);
+-        if (!decoder) continue;
++        hr = create_decoder(&tiff_resolution_image_data, sizeof(tiff_resolution_image_data), &decoder);
++        ok(hr == S_OK, "Failed to load TIFF image data %#x\n", hr);
++        if (hr != S_OK) return;
+
+         hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame);
+         ok(hr == S_OK, "%d: GetFrame error %#x\n", i, hr);
 @@ -509,7 +642,8 @@ START_TEST(tiffformat)
      ok(hr == S_OK, "CoCreateInstance error %#x\n", hr);
      if (FAILED(hr)) return;
@@ -238,4 +251,5 @@ index e4a4b66..3291b48 100644
      test_tiff_8bpp_alpha();
      test_tiff_resolution();
 -- 
-2.9.0
+2.16.1
+