[PATCH] windowscodecs: Fix tiffformat test on current Windows 10.

[Vincent Povirk]

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>
---
I'd prefer we get a sign-off or feedback from Dmitry before committing
this if possible.

On current Windows 10, QueryCapability leaves the stream position at 0,
causing the stream position test to fail, as well as a later test
showing native fails when the stream position isn't at the start.
I figure Windows has shown every possible behavior, so there's no point
in testing the position, but we should set it to show that
CreateDecoderFromStream still cares about the stream position.

 dlls/windowscodecs/tests/tiffformat.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c
index 2f9a0ca65f0..861e620e44d 100644
--- a/dlls/windowscodecs/tests/tiffformat.c
+++ b/dlls/windowscodecs/tests/tiffformat.c
@@ -405,7 +405,6 @@ static void test_QueryCapability(void)
                                      WICBitmapDecoderCapabilityCanDecodeSomeImages;
     DWORD capability;
     LARGE_INTEGER pos;
-    ULARGE_INTEGER cur_pos;
     UINT frame_count;
 
     stream = create_stream(&tiff_1bpp_data, sizeof(tiff_1bpp_data));
@@ -442,11 +441,9 @@ static void test_QueryCapability(void)
     ok(hr == S_OK, "GetFrame error %#x\n", hr);
     IWICBitmapFrameDecode_Release(frame);
 
-    pos.QuadPart = 0;
-    hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos);
+    pos.QuadPart = 5;
+    hr = IStream_Seek(stream, pos, SEEK_SET, NULL);
     ok(hr == S_OK, "IStream_Seek error %#x\n", hr);
-    ok(cur_pos.QuadPart > 4 && cur_pos.QuadPart < sizeof(tiff_1bpp_data),
-       "current stream pos is at %x/%x\n", cur_pos.u.LowPart, cur_pos.u.HighPart);
 
     hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability);
     ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr);
@@ -456,6 +453,7 @@ static void test_QueryCapability(void)
 
     IWICBitmapDecoder_Release(decoder);
 
+    /* CreateDecoderFromStream fails if seeked past the start */
     hr = IWICImagingFactory_CreateDecoderFromStream(factory, stream, NULL, 0, &decoder);
 todo_wine
     ok(hr == WINCODEC_ERR_COMPONENTNOTFOUND, "expected WINCODEC_ERR_COMPONENTNOTFOUND, got %#x\n", hr);
-- 
2.17.1

[Dmitry Timoshkov]

Vincent Povirk <vincent(a)codeweavers.com> wrote:
> On current Windows 10, QueryCapability leaves the stream position at 0,
> causing the stream position test to fail, as well as a later test
> showing native fails when the stream position isn't at the start.
> I figure Windows has shown every possible behavior, so there's no point
> in testing the position, but we should set it to show that
> CreateDecoderFromStream still cares about the stream position.

The patch looks good to me.

-- 
Dmitry.