[02/10] windowscodecs: Reimplement QueryCapability of the BMP decoder.
Dmitry Timoshkov
dmitry at baikal.ru
Thu Nov 22 21:48:04 CST 2012
---
dlls/windowscodecs/bmpdecode.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/dlls/windowscodecs/bmpdecode.c b/dlls/windowscodecs/bmpdecode.c
index 43c745b..99cc895 100644
--- a/dlls/windowscodecs/bmpdecode.c
+++ b/dlls/windowscodecs/bmpdecode.c
@@ -1010,22 +1010,20 @@ static ULONG WINAPI BmpDecoder_Release(IWICBitmapDecoder *iface)
return ref;
}
-static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream,
- DWORD *pdwCapability)
+static HRESULT WINAPI BmpDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream,
+ DWORD *capability)
{
HRESULT hr;
BmpDecoder *This = impl_from_IWICBitmapDecoder(iface);
- EnterCriticalSection(&This->lock);
- hr = BmpDecoder_ReadHeaders(This, pIStream);
- LeaveCriticalSection(&This->lock);
- if (FAILED(hr)) return hr;
+ TRACE("(%p,%p,%p)\n", iface, stream, capability);
- if (This->read_data_func == BmpFrameDecode_ReadUnsupported)
- *pdwCapability = 0;
- else
- *pdwCapability = WICBitmapDecoderCapabilityCanDecodeAllImages;
+ if (!stream || !capability) return E_INVALIDARG;
+
+ hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand);
+ if (hr != S_OK) return hr;
+ *capability = This->read_data_func == BmpFrameDecode_ReadUnsupported ? 0 : WICBitmapDecoderCapabilityCanDecodeAllImages;
return S_OK;
}
--
1.7.12.4
More information about the wine-patches
mailing list