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

windowscodecs: Store container formats in metadata component info object. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2018-04-02 20:49:24 +02:00 committed by Alexandre Julliard
parent 89642d9b08
commit f5cdbc21cc
1 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
dlls/windowscodecs/info.c
View File

@ -1502,6 +1502,8 @@ typedef struct
{
ComponentInfo base;
HKEY classkey;
GUID *container_formats;
UINT container_count;
} MetadataReaderInfo;
static inline MetadataReaderInfo *impl_from_IWICMetadataReaderInfo(IWICMetadataReaderInfo *iface)
@ -1554,6 +1556,7 @@ static ULONG WINAPI MetadataReaderInfo_Release(IWICMetadataReaderInfo *iface)
if (!ref)
{
RegCloseKey(This->classkey);
heap_free(This->container_formats);
HeapFree(GetProcessHeap(), 0, This);
}
return ref;
@ -1654,10 +1657,20 @@ static HRESULT WINAPI MetadataReaderInfo_GetContainerFormats(IWICMetadataReaderI
UINT length, GUID *formats, UINT *actual_length)
{
MetadataReaderInfo *This = impl_from_IWICMetadataReaderInfo(iface);
TRACE("(%p,%u,%p,%p)\n", iface, length, formats, actual_length);
return ComponentInfo_GetGuidList(This->classkey, containers_keyname, length,
formats, actual_length);
if (!actual_length)
return E_INVALIDARG;
*actual_length = This->container_count;
if (formats)
{
if (This->container_count && length < This->container_count)
return WINCODEC_ERR_INSUFFICIENTBUFFER;
memcpy(formats, This->container_formats, This->container_count);
}
return S_OK;
}
static HRESULT WINAPI MetadataReaderInfo_GetDeviceManufacturer(IWICMetadataReaderInfo *iface,
@ -1915,11 +1928,36 @@ static const IWICMetadataReaderInfoVtbl MetadataReaderInfo_Vtbl = {
MetadataReaderInfo_CreateInstance
};
static BOOL read_metadata_info(MetadataReaderInfo *info)
{
UINT format_count;
GUID *formats;
HRESULT hr;
hr = ComponentInfo_GetGuidList(info->classkey, containers_keyname, 0, NULL, &format_count);
if (FAILED(hr)) return TRUE;
formats = heap_calloc(format_count, sizeof(*formats));
if (!formats) return FALSE;
hr = ComponentInfo_GetGuidList(info->classkey, containers_keyname, format_count, formats,
&format_count);
if (FAILED(hr))
{
heap_free(formats);
return FALSE;
}
info->container_formats = formats;
info->container_count = format_count;
return TRUE;
}
static HRESULT MetadataReaderInfo_Constructor(HKEY classkey, REFCLSID clsid, ComponentInfo **info)
{
MetadataReaderInfo *This;
This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
This = heap_alloc_zero(sizeof(*This));
if (!This)
{
RegCloseKey(classkey);
@ -1931,6 +1969,12 @@ static HRESULT MetadataReaderInfo_Constructor(HKEY classkey, REFCLSID clsid, Com
This->classkey = classkey;
This->base.clsid = *clsid;
if (!read_metadata_info(This))
{
IWICComponentInfo_Release(&This->base.IWICComponentInfo_iface);
return WINCODEC_ERR_COMPONENTNOTFOUND;
}
*info = &This->base;
return S_OK;
}