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

windowscodecs: Make sure that stream is not reused once the decoder is initialized.

This commit is contained in:
Dmitry Timoshkov 2012-06-28 15:08:06 +09:00 committed by Alexandre Julliard
parent e7f31ddb81
commit 39f80e56fb
1 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
dlls/windowscodecs/imgfactory.c
View File

@ -121,26 +121,22 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromFilename(
return hr; return hr;
} }
static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream( static IWICBitmapDecoder *find_decoder(IStream *pIStream, const GUID *pguidVendor,
IWICComponentFactory *iface, IStream *pIStream, const GUID *pguidVendor, WICDecodeOptions metadataOptions)
WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder)
{ {
IEnumUnknown *enumdecoders; IEnumUnknown *enumdecoders;
IUnknown *unkdecoderinfo; IUnknown *unkdecoderinfo;
IWICBitmapDecoderInfo *decoderinfo; IWICBitmapDecoderInfo *decoderinfo;
IWICBitmapDecoder *decoder = NULL, *preferred_decoder = NULL; IWICBitmapDecoder *decoder = NULL;
GUID vendor; GUID vendor;
HRESULT res=S_OK; HRESULT res;
ULONG num_fetched; ULONG num_fetched;
BOOL matches; BOOL matches;
TRACE("(%p,%p,%s,%u,%p)\n", iface, pIStream, debugstr_guid(pguidVendor),
metadataOptions, ppIDecoder);
res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders); res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders);
if (FAILED(res)) return res; if (FAILED(res)) return NULL;
while (!preferred_decoder) while (!decoder)
{ {
res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched);
@ -150,40 +146,34 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream(
if (SUCCEEDED(res)) if (SUCCEEDED(res))
{ {
if (pguidVendor)
{
res = IWICBitmapDecoderInfo_GetVendorGUID(decoderinfo, &vendor);
if (FAILED(res) || !IsEqualIID(&vendor, pguidVendor))
{
IWICBitmapDecoderInfo_Release(decoderinfo);
IUnknown_Release(unkdecoderinfo);
continue;
}
}
res = IWICBitmapDecoderInfo_MatchesPattern(decoderinfo, pIStream, &matches); res = IWICBitmapDecoderInfo_MatchesPattern(decoderinfo, pIStream, &matches);
if (SUCCEEDED(res) && matches) if (SUCCEEDED(res) && matches)
{ {
IWICBitmapDecoder *new_decoder; res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &decoder);
res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &new_decoder);
/* FIXME: should use QueryCapability to choose a decoder */ /* FIXME: should use QueryCapability to choose a decoder */
if (SUCCEEDED(res)) if (SUCCEEDED(res))
{ {
res = IWICBitmapDecoder_Initialize(new_decoder, pIStream, metadataOptions); res = IWICBitmapDecoder_Initialize(decoder, pIStream, metadataOptions);
if (SUCCEEDED(res)) if (FAILED(res))
{ {
if (pguidVendor) IWICBitmapDecoder_Release(decoder);
{ decoder = NULL;
res = IWICBitmapDecoderInfo_GetVendorGUID(decoderinfo, &vendor);
if (SUCCEEDED(res) && IsEqualIID(&vendor, pguidVendor))
{
preferred_decoder = new_decoder;
new_decoder = NULL;
}
}
if (new_decoder && !decoder)
{
decoder = new_decoder;
new_decoder = NULL;
}
} }
if (new_decoder) IWICBitmapDecoder_Release(new_decoder);
} }
} }
@ -198,12 +188,23 @@ static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream(
IEnumUnknown_Release(enumdecoders); IEnumUnknown_Release(enumdecoders);
if (preferred_decoder) return decoder;
{ }
*ppIDecoder = preferred_decoder;
if (decoder) IWICBitmapDecoder_Release(decoder); static HRESULT WINAPI ComponentFactory_CreateDecoderFromStream(
return S_OK; IWICComponentFactory *iface, IStream *pIStream, const GUID *pguidVendor,
} WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder)
{
HRESULT res;
IWICBitmapDecoder *decoder = NULL;
TRACE("(%p,%p,%s,%u,%p)\n", iface, pIStream, debugstr_guid(pguidVendor),
metadataOptions, ppIDecoder);
if (pguidVendor)
decoder = find_decoder(pIStream, pguidVendor, metadataOptions);
if (!decoder)
decoder = find_decoder(pIStream, NULL, metadataOptions);
if (decoder) if (decoder)
{ {