ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

windowscodecs: Implement QueryCapability in the TIFF decoder.

This commit is contained in:
Dmitry Timoshkov 2012-11-21 17:12:47 +08:00 committed by Alexandre Julliard
parent 9e5ecdb745
commit a3711295da
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/windowscodecs/tests/tiffformat.c
View File

@ -212,31 +212,25 @@ static void test_QueryCapability(void)
capability = 0xdeadbeef; capability = 0xdeadbeef;
hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability);
todo_wine
ok(hr == S_OK, "QueryCapability error %#x\n", hr); ok(hr == S_OK, "QueryCapability error %#x\n", hr);
todo_wine
ok(capability == exp_caps || capability == exp_caps_xp, ok(capability == exp_caps || capability == exp_caps_xp,
"expected %#x, got %#x\n", exp_caps, capability); "expected %#x, got %#x\n", exp_caps, capability);
frame_count = 0xdeadbeef; frame_count = 0xdeadbeef;
hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count);
ok(hr == S_OK, "GetFrameCount error %#x\n", hr); ok(hr == S_OK, "GetFrameCount error %#x\n", hr);
todo_wine
ok(frame_count == 1, "expected 1, got %u\n", frame_count); ok(frame_count == 1, "expected 1, got %u\n", frame_count);
pos.QuadPart = 0; pos.QuadPart = 0;
hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos); hr = IStream_Seek(stream, pos, SEEK_CUR, &cur_pos);
ok(hr == S_OK, "IStream_Seek error %#x\n", hr); ok(hr == S_OK, "IStream_Seek error %#x\n", hr);
todo_wine
ok(cur_pos.QuadPart > 4 && cur_pos.QuadPart < sizeof(tiff_1bpp_data), 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); "current stream pos is at %x/%x\n", cur_pos.u.LowPart, cur_pos.u.HighPart);
hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability);
todo_wine
ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr);
hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand); hr = IWICBitmapDecoder_Initialize(decoder, stream, WICDecodeMetadataCacheOnDemand);
todo_wine
ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr);
IWICBitmapDecoder_Release(decoder); IWICBitmapDecoder_Release(decoder);
@ -261,7 +255,6 @@ todo_wine
ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr);
hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability); hr = IWICBitmapDecoder_QueryCapability(decoder, stream, &capability);
todo_wine
ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr); ok(hr == WINCODEC_ERR_WRONGSTATE, "expected WINCODEC_ERR_WRONGSTATE, got %#x\n", hr);
IWICBitmapDecoder_Release(decoder); IWICBitmapDecoder_Release(decoder);

19
dlls/windowscodecs/tiffformat.c
View File

@ -550,11 +550,22 @@ static ULONG WINAPI TiffDecoder_Release(IWICBitmapDecoder *iface)
return ref; return ref;
} }
static HRESULT WINAPI TiffDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, static HRESULT WINAPI TiffDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream,
DWORD *pdwCapability) DWORD *capability)
{ {
FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); HRESULT hr;
return E_NOTIMPL;
TRACE("(%p,%p,%p)\n", iface, stream, capability);
if (!stream || !capability) return E_INVALIDARG;
hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand);
if (hr != S_OK) return hr;
*capability = WICBitmapDecoderCapabilityCanDecodeAllImages |
WICBitmapDecoderCapabilityCanDecodeSomeImages |
WICBitmapDecoderCapabilityCanEnumerateMetadata;
return S_OK;
} }
static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, static HRESULT WINAPI TiffDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream,