diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 96213dce..c2aaa5ba 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "9629769fe7a6fee0e5adaafad3545516ef478461" + echo "5e0d1c89ed774e78d60709e5239d56927150d03d" } # Show version information diff --git a/patches/windowscodecs-TIFF_Support/0016-gdiplus-Add-support-for-more-image-color-formats.patch b/patches/windowscodecs-TIFF_Support/0016-gdiplus-Add-support-for-more-image-color-formats.patch index 00982c89..077533ce 100644 --- a/patches/windowscodecs-TIFF_Support/0016-gdiplus-Add-support-for-more-image-color-formats.patch +++ b/patches/windowscodecs-TIFF_Support/0016-gdiplus-Add-support-for-more-image-color-formats.patch @@ -1,23 +1,17 @@ -From d1795154072c2b4c358e3f11d641b95db347632c Mon Sep 17 00:00:00 2001 +From 6ae64bdf13f10acc9a9fb4c4f7d06d1fb0c6b161 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Fri, 16 Dec 2016 18:09:55 +0800 -Subject: gdiplus: Add support for more image color formats. +Subject: [PATCH] gdiplus: Add support for more image color formats. --- - dlls/gdiplus/image.c | 6 ++++++ - 1 file changed, 6 insertions(+) + dlls/gdiplus/image.c | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c -index bff0cdc836..ce2194317f 100644 +index 8bd723f031..9601a57d67 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c -@@ -55,13 +55,19 @@ static const struct - { - { &GUID_WICPixelFormatBlackWhite, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, - { &GUID_WICPixelFormat1bppIndexed, PixelFormat1bppIndexed, WICBitmapPaletteTypeFixedBW }, -+ { &GUID_WICPixelFormat4bppIndexed, PixelFormat4bppIndexed, WICBitmapPaletteTypeFixedHalftone8 }, - { &GUID_WICPixelFormat8bppGray, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedGray256 }, - { &GUID_WICPixelFormat8bppIndexed, PixelFormat8bppIndexed, WICBitmapPaletteTypeFixedHalftone256 }, +@@ -61,8 +61,13 @@ static const struct { &GUID_WICPixelFormat16bppBGR555, PixelFormat16bppRGB555, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat24bppBGR, PixelFormat24bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, { &GUID_WICPixelFormat32bppBGR, PixelFormat32bppRGB, WICBitmapPaletteTypeFixedHalftone256 }, @@ -32,5 +26,5 @@ index bff0cdc836..ce2194317f 100644 }; -- -2.11.0 +2.19.1 diff --git a/patches/windowscodecs-TIFF_Support/0017-gdiplus-tests-Add-some-tests-for-loading-TIFF-images.patch b/patches/windowscodecs-TIFF_Support/0017-gdiplus-tests-Add-some-tests-for-loading-TIFF-images.patch index 12d63e39..526e25e7 100644 --- a/patches/windowscodecs-TIFF_Support/0017-gdiplus-tests-Add-some-tests-for-loading-TIFF-images.patch +++ b/patches/windowscodecs-TIFF_Support/0017-gdiplus-tests-Add-some-tests-for-loading-TIFF-images.patch @@ -1,27 +1,18 @@ -From 29530ea2e00204e1beb741bc6932cd86824128d6 Mon Sep 17 00:00:00 2001 +From bee68edfabff94c5392499599c8bc9ab467f7a0d Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Fri, 16 Dec 2016 18:10:30 +0800 -Subject: gdiplus/tests: Add some tests for loading TIFF images in various - color formats. +Subject: [PATCH] gdiplus/tests: Add some tests for loading TIFF images in + various color formats. --- - dlls/gdiplus/tests/image.c | 183 ++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 181 insertions(+), 2 deletions(-) + dlls/gdiplus/tests/image.c | 181 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 181 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c -index 05dab89..79cdfa3 100644 +index f5ce0207dc..1c7a1aa141 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c -@@ -3087,8 +3087,6 @@ static GpImage *load_image(const BYTE *image_data, UINT image_size) - ok(refcount == 1, "expected stream refcount 1, got %d\n", refcount); - - status = GdipLoadImageFromStream(stream, &image); -- ok(status == Ok || broken(status == InvalidParameter), /* XP */ -- "GdipLoadImageFromStream error %d\n", status); - if (status != Ok) - { - IStream_Release(stream); -@@ -5148,6 +5146,186 @@ todo_wine +@@ -5482,6 +5482,186 @@ todo_wine GdipDisposeImage((GpImage *)bitmap); } @@ -183,7 +174,7 @@ index 05dab89..79cdfa3 100644 + continue; + } + -+ image = load_image(buf, sizeof(buf)); ++ image = load_image(buf, sizeof(buf), TRUE, FALSE); + if (!td[i].format) + ok(!image, + "%u: (%d,%d,%d) TIFF image loading should have failed\n", i, td[i].photometric, td[i].samples, td[i].bps); @@ -208,7 +199,7 @@ index 05dab89..79cdfa3 100644 START_TEST(image) { HMODULE mod = GetModuleHandleA("gdiplus.dll"); -@@ -5165,6 +5343,7 @@ START_TEST(image) +@@ -5506,6 +5686,7 @@ START_TEST(image) pGdipBitmapGetHistogram = (void*)GetProcAddress(mod, "GdipBitmapGetHistogram"); pGdipImageSetAbort = (void*)GetProcAddress(mod, "GdipImageSetAbort"); @@ -217,5 +208,5 @@ index 05dab89..79cdfa3 100644 test_png_color_formats(); test_supported_encoders(); -- -2.9.0 +2.19.1