From 2de179532ee6ff3eaa311fd51f9b87290f1220fd Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 6 Oct 2018 19:03:12 +1000 Subject: [PATCH] Rebase against 2e754a652725c067bc44445cebe8b96487ec4a6e --- patches/patchinstall.sh | 2 +- ...plement-IWICPalette-InitializeFromBi.patch | 2 +- ...nd_decoder-should-return-an-error-it.patch | 24 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 8ba15e11..97b83b1c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "ee206a37609f99e9dc024dbe19d4a9b842433813" + echo "2e754a652725c067bc44445cebe8b96487ec4a6e" } # Show version information diff --git a/patches/windowscodecs-IWICPalette_InitializeFromBitmap/0002-windowscodecs-Implement-IWICPalette-InitializeFromBi.patch b/patches/windowscodecs-IWICPalette_InitializeFromBitmap/0002-windowscodecs-Implement-IWICPalette-InitializeFromBi.patch index 8f0da421..c6dac9f0 100644 --- a/patches/windowscodecs-IWICPalette_InitializeFromBitmap/0002-windowscodecs-Implement-IWICPalette-InitializeFromBi.patch +++ b/patches/windowscodecs-IWICPalette_InitializeFromBitmap/0002-windowscodecs-Implement-IWICPalette-InitializeFromBi.patch @@ -264,7 +264,7 @@ index 89ec9ea..a8370ff 100644 + else + rgb24_source = source; + -+ hr = ComponentFactory_CreateInstance(&IID_IWICImagingFactory, (void **)&factory); ++ hr = ImagingFactory_CreateInstance(&IID_IWICImagingFactory, (void **)&factory); + if (hr != S_OK) goto fail; + + hr = IWICImagingFactory_CreateBitmapFromSource(factory, rgb24_source, WICBitmapCacheOnLoad, &rgb24_bitmap); diff --git a/patches/windowscodecs-Palette_Images/0020-windowscodecs-find_decoder-should-return-an-error-it.patch b/patches/windowscodecs-Palette_Images/0020-windowscodecs-find_decoder-should-return-an-error-it.patch index 69cc20eb..7616b143 100644 --- a/patches/windowscodecs-Palette_Images/0020-windowscodecs-find_decoder-should-return-an-error-it.patch +++ b/patches/windowscodecs-Palette_Images/0020-windowscodecs-find_decoder-should-return-an-error-it.patch @@ -1,22 +1,22 @@ -From 55f662c7d5e524c33bc588d58580087a68083fbc Mon Sep 17 00:00:00 2001 +From 0b8859b133017e8f192e5ffb425837ea87c31ddb Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 4 Oct 2016 18:33:40 +0800 -Subject: windowscodecs: find_decoder() should return an error it received from - the decoder. +Subject: [PATCH] windowscodecs: find_decoder() should return an error it + received from the decoder. If IWICBitmapDecoderInfo::MatchesPattern() has recognized the decoder by the pattern, and the called IWICBitmapDecoder::Initialize() has failed, an error should be returned right away instead of trying next codec. This allows report image format related errors instead of WINCODEC_ERR_COMPONENTNOTFOUND. --- - dlls/windowscodecs/imgfactory.c | 42 ++++++++++++++++++++++------------------- + dlls/windowscodecs/imgfactory.c | 42 ++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c -index e1bcc89a8b..70f2f0c1f3 100644 +index dbcc5f59234..58ef1a02f68 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c -@@ -120,22 +120,23 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromFilename( +@@ -130,22 +130,23 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromFilename( return hr; } @@ -45,7 +45,7 @@ index e1bcc89a8b..70f2f0c1f3 100644 { res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); -@@ -160,18 +161,21 @@ static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendo +@@ -170,18 +171,21 @@ static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendo if (SUCCEEDED(res) && matches) { @@ -71,7 +71,7 @@ index e1bcc89a8b..70f2f0c1f3 100644 } } } -@@ -187,7 +191,7 @@ static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendo +@@ -197,7 +201,7 @@ static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendo IEnumUnknown_Release(enumdecoders); @@ -79,8 +79,8 @@ index e1bcc89a8b..70f2f0c1f3 100644 + return WINCODEC_ERR_COMPONENTNOTFOUND; } - static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream( -@@ -201,9 +205,9 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream( + static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( +@@ -211,9 +215,9 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( metadataOptions, ppIDecoder); if (pguidVendor) @@ -92,7 +92,7 @@ index e1bcc89a8b..70f2f0c1f3 100644 if (decoder) { -@@ -218,17 +222,17 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream( +@@ -228,17 +232,17 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( BYTE data[4]; ULONG bytesread; @@ -118,5 +118,5 @@ index e1bcc89a8b..70f2f0c1f3 100644 } -- -2.16.2 +2.19.0