From 23ccc2eef17050d411ef574383dddd77faa08659 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 23 Jan 2025 09:01:50 +1100 Subject: [PATCH] Rebase against ff2de2a73b830a601cfe26aca5feeafb309fbff5. --- ...lerate-partial-reads-in-the-IFD-meta.patch | 26 +++++++++---------- staging/upstream-commit | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/patches/windowscodecs-TIFF_Support/0015-windowscodecs-Tolerate-partial-reads-in-the-IFD-meta.patch b/patches/windowscodecs-TIFF_Support/0015-windowscodecs-Tolerate-partial-reads-in-the-IFD-meta.patch index 59f34867..3f5f838f 100644 --- a/patches/windowscodecs-TIFF_Support/0015-windowscodecs-Tolerate-partial-reads-in-the-IFD-meta.patch +++ b/patches/windowscodecs-TIFF_Support/0015-windowscodecs-Tolerate-partial-reads-in-the-IFD-meta.patch @@ -1,4 +1,4 @@ -From bae2039e857a7304d26bbdf4f2e7ba30c4203ee7 Mon Sep 17 00:00:00 2001 +From 17a42ea7b9cf8a29fee0e7bac01724b512c2bf76 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Fri, 16 Dec 2016 18:08:51 +0800 Subject: [PATCH] windowscodecs: Tolerate partial reads in the IFD metadata @@ -9,10 +9,10 @@ Subject: [PATCH] windowscodecs: Tolerate partial reads in the IFD metadata 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c -index 6d519c0f3cd..3960beac954 100644 +index 7618d8cd6aa..10233236f7f 100644 --- a/dlls/windowscodecs/metadatahandler.c +++ b/dlls/windowscodecs/metadatahandler.c -@@ -720,7 +720,7 @@ static int tag_to_vt(SHORT tag) +@@ -791,7 +791,7 @@ static int tag_to_vt(SHORT tag) static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, MetadataItem *item, BOOL native_byte_order) { @@ -21,7 +21,7 @@ index 6d519c0f3cd..3960beac954 100644 SHORT type; LARGE_INTEGER pos; HRESULT hr; -@@ -772,9 +772,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, +@@ -843,9 +843,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, CoTaskMemFree(item->value.caub.pElems); return hr; } @@ -33,7 +33,7 @@ index 6d519c0f3cd..3960beac954 100644 { CoTaskMemFree(item->value.caub.pElems); return hr; -@@ -807,7 +806,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, +@@ -878,7 +877,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, item->value.vt |= VT_VECTOR; item->value.caui.cElems = count; @@ -42,7 +42,7 @@ index 6d519c0f3cd..3960beac954 100644 if (!item->value.caui.pElems) return E_OUTOFMEMORY; pos.QuadPart = value; -@@ -817,9 +816,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, +@@ -888,9 +887,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, CoTaskMemFree(item->value.caui.pElems); return hr; } @@ -54,7 +54,7 @@ index 6d519c0f3cd..3960beac954 100644 { CoTaskMemFree(item->value.caui.pElems); return hr; -@@ -850,9 +848,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, +@@ -921,9 +919,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, CoTaskMemFree(item->value.caul.pElems); return hr; } @@ -66,8 +66,8 @@ index 6d519c0f3cd..3960beac954 100644 { CoTaskMemFree(item->value.caul.pElems); return hr; -@@ -878,8 +875,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, - hr = IStream_Seek(input, pos, SEEK_SET, NULL); +@@ -949,8 +946,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, + hr = IStream_Seek(input, pos, STREAM_SEEK_SET, NULL); if (FAILED(hr)) return hr; - hr = IStream_Read(input, &ull, sizeof(ull), &bytesread); @@ -76,7 +76,7 @@ index 6d519c0f3cd..3960beac954 100644 if (hr != S_OK) return hr; item->value.uhVal.QuadPart = ull; -@@ -907,9 +903,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, +@@ -978,9 +974,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, CoTaskMemFree(item->value.cauh.pElems); return hr; } @@ -88,7 +88,7 @@ index 6d519c0f3cd..3960beac954 100644 { CoTaskMemFree(item->value.cauh.pElems); return hr; -@@ -945,9 +940,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, +@@ -1016,9 +1011,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, CoTaskMemFree(item->value.pszVal); return hr; } @@ -100,7 +100,7 @@ index 6d519c0f3cd..3960beac954 100644 { CoTaskMemFree(item->value.pszVal); return hr; -@@ -981,9 +975,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, +@@ -1052,9 +1046,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry, CoTaskMemFree(item->value.blob.pBlobData); return hr; } @@ -113,5 +113,5 @@ index 6d519c0f3cd..3960beac954 100644 CoTaskMemFree(item->value.blob.pBlobData); return hr; -- -2.40.1 +2.45.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index 26a74bee..c1a167e1 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -b073859675060c9211fcbccfd90e4e87520dc2c2 +ff2de2a73b830a601cfe26aca5feeafb309fbff5