windowscodecs: Implement MetadataHandler_GetMetadataFormat.

This commit is contained in:
Dmitry Timoshkov 2012-06-20 14:00:17 +09:00 committed by Alexandre Julliard
parent 27743c81a9
commit 75a8814633
2 changed files with 19 additions and 11 deletions

View File

@ -133,15 +133,6 @@ static ULONG WINAPI MetadataHandler_Release(IWICMetadataWriter *iface)
return ref;
}
static HRESULT WINAPI MetadataHandler_GetMetadataFormat(IWICMetadataWriter *iface,
GUID *pguidMetadataFormat)
{
if (!pguidMetadataFormat) return E_INVALIDARG;
FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidMetadataFormat));
return E_NOTIMPL;
}
static HRESULT WINAPI MetadataHandler_GetMetadataHandlerInfo(IWICMetadataWriter *iface,
IWICMetadataHandlerInfo **ppIHandler)
{
@ -161,6 +152,25 @@ static HRESULT WINAPI MetadataHandler_GetMetadataHandlerInfo(IWICMetadataWriter
return hr;
}
static HRESULT WINAPI MetadataHandler_GetMetadataFormat(IWICMetadataWriter *iface,
GUID *pguidMetadataFormat)
{
HRESULT hr;
IWICMetadataHandlerInfo *metadata_info;
TRACE("%p,%p\n", iface, pguidMetadataFormat);
if (!pguidMetadataFormat) return E_INVALIDARG;
hr = MetadataHandler_GetMetadataHandlerInfo(iface, &metadata_info);
if (FAILED(hr)) return hr;
hr = IWICMetadataHandlerInfo_GetMetadataFormat(metadata_info, pguidMetadataFormat);
IWICMetadataHandlerInfo_Release(metadata_info);
return hr;
}
static HRESULT WINAPI MetadataHandler_GetCount(IWICMetadataWriter *iface,
UINT *pcCount)
{

View File

@ -418,9 +418,7 @@ static void test_metadata_IFD(void)
IWICEnumMetadataItem_Release(enumerator);
hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
todo_wine
ok(hr == S_OK, "GetMetadataFormat error %#x\n", hr);
todo_wine
ok(IsEqualGUID(&format, &GUID_MetadataFormatIfd), "unexpected format %s\n", debugstr_guid(&format));
hr = IWICMetadataReader_GetMetadataFormat(reader, NULL);