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

windowscodecs: Use IWICComponentFactory_CreateStream in GetReaderByIndex. 

Instead of StreamImpl_Create.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Esme Povirk <esme@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-01-20 10:30:06 +01:00 committed by Alexandre Julliard
parent f6c7f150ec
commit 3c6cf6ef2c
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/windowscodecs/decoder.c
View File

@ -595,7 +595,7 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc
{
CommonDecoderFrame *This = impl_from_IWICMetadataBlockReader(iface);
HRESULT hr;
IWICComponentFactory* factory;
IWICComponentFactory* factory = NULL;
IWICStream* stream;
TRACE("%p,%d,%p\n", iface, nIndex, ppIMetadataReader);
@ -609,7 +609,10 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc
hr = E_INVALIDARG;
if (SUCCEEDED(hr))
hr = StreamImpl_Create(&stream);
hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory);
if (SUCCEEDED(hr))
hr = IWICComponentFactory_CreateStream(factory, &stream);
if (SUCCEEDED(hr))
{
@ -664,23 +667,17 @@ static HRESULT WINAPI CommonDecoderFrame_Block_GetReaderByIndex(IWICMetadataBloc
}
else
{
if (SUCCEEDED(hr))
hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICComponentFactory, (void**)&factory);
if (SUCCEEDED(hr))
{
hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory,
&This->parent->decoder_info.block_format, NULL,
This->metadata_blocks[nIndex].options & DECODER_BLOCK_OPTION_MASK,
(IStream*)stream, ppIMetadataReader);
IWICComponentFactory_Release(factory);
}
hr = IWICComponentFactory_CreateMetadataReaderFromContainer(factory,
&This->parent->decoder_info.block_format, NULL,
This->metadata_blocks[nIndex].options & DECODER_BLOCK_OPTION_MASK,
(IStream*)stream, ppIMetadataReader);
}
IWICStream_Release(stream);
}
if (factory) IWICComponentFactory_Release(factory);
if (FAILED(hr))
*ppIMetadataReader = NULL;