From: Nikolay Sivov nsivov@codeweavers.com
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- dlls/windowscodecs/metadataquery.c | 377 +++++++++++++++++++++++++--- dlls/windowscodecs/tests/metadata.c | 35 +-- 2 files changed, 350 insertions(+), 62 deletions(-)
diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c index 1fd75bbff00..276f8725e75 100644 --- a/dlls/windowscodecs/metadataquery.c +++ b/dlls/windowscodecs/metadataquery.c @@ -167,22 +167,22 @@ static const struct VARTYPE vt; } str2vt[] = { - { 4, {'c','h','a','r'}, VT_I1 }, - { 5, {'u','c','h','a','r'}, VT_UI1 }, - { 5, {'s','h','o','r','t'}, VT_I2 }, - { 6, {'u','s','h','o','r','t'}, VT_UI2 }, - { 4, {'l','o','n','g'}, VT_I4 }, - { 5, {'u','l','o','n','g'}, VT_UI4 }, - { 3, {'i','n','t'}, VT_I4 }, - { 4, {'u','i','n','t'}, VT_UI4 }, - { 8, {'l','o','n','g','l','o','n','g'}, VT_I8 }, - { 9, {'u','l','o','n','g','l','o','n','g'}, VT_UI8 }, - { 5, {'f','l','o','a','t'}, VT_R4 }, - { 6, {'d','o','u','b','l','e'}, VT_R8 }, - { 3, {'s','t','r'}, VT_LPSTR }, - { 4, {'w','s','t','r'}, VT_LPWSTR }, - { 4, {'g','u','i','d'}, VT_CLSID }, - { 4, {'b','o','o','l'}, VT_BOOL } + { 4, L"char", VT_I1 }, + { 5, L"uchar", VT_UI1 }, + { 5, L"short", VT_I2 }, + { 6, L"ushort", VT_UI2 }, + { 4, L"long", VT_I4 }, + { 5, L"ulong", VT_UI4 }, + { 3, L"int", VT_I4 }, + { 4, L"uint", VT_UI4 }, + { 8, L"longlong", VT_I8 }, + { 9, L"ulonglong", VT_UI8 }, + { 5, L"float", VT_R4 }, + { 6, L"double", VT_R8 }, + { 3, L"str", VT_LPSTR }, + { 4, L"wstr", VT_LPWSTR }, + { 4, L"guid", VT_CLSID }, + { 4, L"bool", VT_BOOL } };
static VARTYPE map_type(struct string_t *str) @@ -204,6 +204,19 @@ static VARTYPE map_type(struct string_t *str) return VT_ILLEGAL; }
+static const WCHAR *get_type_name(VARTYPE vt) +{ + UINT i; + + for (i = 0; i < ARRAY_SIZE(str2vt); i++) + { + if (str2vt[i].vt == vt) + return str2vt[i].str; + } + + return NULL; +} + struct query_component { unsigned int index; @@ -730,9 +743,9 @@ static HRESULT WINAPI query_handler_GetMetadataByName(IWICMetadataQueryWriter *i return hr; }
-static WCHAR *query_get_guid_item_string(WCHAR *str, unsigned int len, const GUID *guid) +static WCHAR *query_get_guid_item_string(WCHAR *str, unsigned int len, const GUID *guid, bool resolve) { - if (SUCCEEDED(WICMapGuidToShortName(guid, len, str, NULL))) + if (resolve && SUCCEEDED(WICMapGuidToShortName(guid, len, str, NULL))) return str;
swprintf(str, len, L"{guid=%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", @@ -745,6 +758,20 @@ struct string_enumerator { IEnumString IEnumString_iface; LONG ref; + + struct + { + struct + { + GUID guid; + unsigned int index; + } *entries; + size_t count; + size_t capacity; + } guids; + + IEnumUnknown *object_enumerator; + IWICEnumMetadataItem *metadata_enumerator; };
static struct string_enumerator *impl_from_IEnumString(IEnumString *iface) @@ -783,48 +810,299 @@ static ULONG WINAPI string_enumerator_AddRef(IEnumString *iface)
static ULONG WINAPI string_enumerator_Release(IEnumString *iface) { - struct string_enumerator *this = impl_from_IEnumString(iface); - ULONG ref = InterlockedDecrement(&this->ref); + struct string_enumerator *enumerator = impl_from_IEnumString(iface); + ULONG ref = InterlockedDecrement(&enumerator->ref);
TRACE("iface %p, ref %lu.\n", iface, ref);
if (!ref) - free(this); + { + if (enumerator->object_enumerator) + IEnumUnknown_Release(enumerator->object_enumerator); + if (enumerator->metadata_enumerator) + IWICEnumMetadataItem_Release(enumerator->metadata_enumerator); + free(enumerator->guids.entries); + free(enumerator); + }
return ref; }
-static HRESULT WINAPI string_enumerator_Next(IEnumString *iface, ULONG count, LPOLESTR *strings, ULONG *ret) +static HRESULT string_enumerator_update_guid_index(struct string_enumerator *enumerator, + GUID *guid, unsigned int *index, IUnknown *object) { - FIXME("iface %p, count %lu, strings %p, ret %p stub.\n", iface, count, strings, ret); + IWICMetadataReader *reader = NULL; + HRESULT hr; + size_t i; + + *index = 0; + + hr = IUnknown_QueryInterface(object, &IID_IWICMetadataReader, (void **)&reader); + + if (SUCCEEDED(hr)) + hr = IWICMetadataReader_GetMetadataFormat(reader, guid); + + if (reader) + IWICMetadataReader_Release(reader); + + if (SUCCEEDED(hr)) + { + for (i = 0; i < enumerator->guids.count; ++i) + { + if (IsEqualGUID(&enumerator->guids.entries[i].guid, guid)) + { + *index = ++enumerator->guids.entries[i].index; + return S_OK; + } + } + + if (!wincodecs_array_reserve((void **)&enumerator->guids.entries, &enumerator->guids.capacity, + enumerator->guids.count + 1, sizeof(*enumerator->guids.entries))) + { + return E_OUTOFMEMORY; + } + enumerator->guids.entries[enumerator->guids.count].guid = *guid; + enumerator->guids.entries[enumerator->guids.count].index = 0; + enumerator->guids.count++; + } + + return hr; +}
- if (!strings || !ret) +static HRESULT get_query_item_name(const PROPVARIANT *var, WCHAR **name) +{ + const WCHAR *type; + WCHAR buffer[64]; + PROPVARIANT dest; + HRESULT hr; + size_t len; + + if (var->vt == VT_CLSID) + { + const WCHAR *value = query_get_guid_item_string(buffer, ARRAY_SIZE(buffer), var->puuid, false); + if (!(*name = wcsdup(value))) + return E_OUTOFMEMORY; + return S_OK; + } + + PropVariantInit(&dest); + type = get_type_name(var->vt); + if (type) + { + if (FAILED(hr = PropVariantChangeType(&dest, var, 0, VT_LPWSTR))) return hr; + } + + len = 4; + if (type) len += wcslen(type); + if (dest.pwszVal) len += wcslen(dest.pwszVal); + if (!(*name = malloc(len * sizeof(WCHAR)))) + { + PropVariantClear(&dest); + return E_OUTOFMEMORY; + } + + if (type) + swprintf(*name, len, L"{%s=%s}", type, dest.pwszVal); + else + wcscpy(*name, L"{}"); + PropVariantClear(&dest); + + return S_OK; +} + +static HRESULT WINAPI string_enumerator_Next(IEnumString *iface, ULONG count, + LPOLESTR *strings, ULONG *fetched) +{ + struct string_enumerator *enumerator = impl_from_IEnumString(iface); + WCHAR *str, name[64]; + unsigned int index; + IUnknown **objects; + HRESULT hr; + GUID guid; + ULONG tmp; + + TRACE("iface %p, count %lu, strings %p, fetched %p.\n", iface, count, strings, fetched); + + if (!strings) return E_INVALIDARG;
- *ret = 0; - return count ? S_FALSE : S_OK; + if (!fetched) fetched = &tmp; + *fetched = 0; + + if (enumerator->object_enumerator) + { + if (!(objects = calloc(count, sizeof(*objects)))) + return E_OUTOFMEMORY; + + if (SUCCEEDED(hr = IEnumUnknown_Next(enumerator->object_enumerator, count, objects, fetched))) + { + for (ULONG i = 0; i < *fetched; ++i) + { + index = 0; + hr = string_enumerator_update_guid_index(enumerator, &guid, &index, objects[i]); + if (FAILED(hr)) break; + + if (!(str = CoTaskMemAlloc(64 * sizeof(WCHAR)))) + { + hr = E_OUTOFMEMORY; + break; + } + + query_get_guid_item_string(name, ARRAY_SIZE(name), &guid, true); + + if (index) + swprintf(str, 64, L"/[%u]%s", index, name); + else + swprintf(str, 64, L"/%s", name); + + strings[i] = str; + } + + for (ULONG i = 0; i < *fetched; ++i) + IUnknown_Release(objects[i]); + } + + free(objects); + } + else if (enumerator->metadata_enumerator) + { + PROPVARIANT *vars, *schemas, *ids; + ULONG vars_count = max(count, 1); + + if (!(vars = calloc(vars_count * 2, sizeof(*vars)))) + return E_OUTOFMEMORY; + schemas = vars; + ids = vars + vars_count; + + if (SUCCEEDED(hr = IWICEnumMetadataItem_Next(enumerator->metadata_enumerator, count, schemas, ids, NULL, fetched))) + { + for (ULONG i = 0; i < *fetched; ++i) + { + WCHAR *schema_name = NULL, *id_name = NULL; + size_t size; + + if (schemas[i].vt != VT_EMPTY) + hr = get_query_item_name(&schemas[i], &schema_name); + if (SUCCEEDED(hr)) + hr = get_query_item_name(&ids[i], &id_name); + + if (SUCCEEDED(hr)) + { + size = 4; + if (schema_name) + size += wcslen(schema_name); + if (id_name) + size += wcslen(id_name); + + if (!(strings[i] = CoTaskMemAlloc(size * sizeof(WCHAR)))) + hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + { + wcscpy(strings[i], L"/"); + if (schema_name) + { + wcscat(strings[i], schema_name); + wcscat(strings[i], L":"); + } + wcscat(strings[i], id_name); + } + } + + free(schema_name); + free(id_name); + PropVariantClear(&schemas[i]); + PropVariantClear(&ids[i]); + } + } + + free(vars); + } + + return *fetched < count ? S_FALSE : S_OK; }
static HRESULT WINAPI string_enumerator_Reset(IEnumString *iface) { + struct string_enumerator *enumerator = impl_from_IEnumString(iface); + TRACE("iface %p.\n", iface);
+ enumerator->guids.count = 0; + if (enumerator->object_enumerator) + return IEnumUnknown_Reset(enumerator->object_enumerator); + else if (enumerator->metadata_enumerator) + return IWICEnumMetadataItem_Reset(enumerator->metadata_enumerator); + return S_OK; }
static HRESULT WINAPI string_enumerator_Skip(IEnumString *iface, ULONG count) { - FIXME("iface %p, count %lu stub.\n", iface, count); + struct string_enumerator *enumerator = impl_from_IEnumString(iface); + unsigned int index; + HRESULT hr = S_OK; + IUnknown *object; + ULONG fetched; + GUID guid; + + TRACE("iface %p, count %lu.\n", iface, count);
- return count ? S_FALSE : S_OK; + if (enumerator->object_enumerator) + { + while (count-- && IEnumUnknown_Next(enumerator->object_enumerator, 1, &object, &fetched) == S_OK) + { + string_enumerator_update_guid_index(enumerator, &guid, &index, object); + IUnknown_Release(object); + } + } + else if (enumerator->metadata_enumerator) + { + hr = IWICEnumMetadataItem_Skip(enumerator->metadata_enumerator, count); + } + + return hr; }
+static void string_enumerator_init(struct string_enumerator *object, IEnumUnknown *object_enumerator, + IWICEnumMetadataItem *metadata_enumerator); + static HRESULT WINAPI string_enumerator_Clone(IEnumString *iface, IEnumString **out) { - FIXME("iface %p, out %p stub.\n", iface, out); + struct string_enumerator *enumerator = impl_from_IEnumString(iface); + IWICEnumMetadataItem *metadata_enumerator = NULL; + IEnumUnknown *object_enumerator = NULL; + struct string_enumerator *object; + HRESULT hr = S_OK; + + TRACE("iface %p, out %p.\n", iface, out);
*out = NULL; - return E_NOTIMPL; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (enumerator->object_enumerator) + hr = IEnumUnknown_Clone(enumerator->object_enumerator, &object_enumerator); + else if (enumerator->metadata_enumerator) + hr = IWICEnumMetadataItem_Clone(enumerator->metadata_enumerator, &metadata_enumerator); + + if (FAILED(hr)) + { + free(object); + return hr; + } + + string_enumerator_init(object, object_enumerator, metadata_enumerator); + + if (metadata_enumerator) + IWICEnumMetadataItem_Release(metadata_enumerator); + if (object_enumerator) + IEnumUnknown_Release(object_enumerator); + + *out = &object->IEnumString_iface; + + return hr; }
static const IEnumStringVtbl string_enumerator_vtbl = @@ -838,15 +1116,42 @@ static const IEnumStringVtbl string_enumerator_vtbl = string_enumerator_Clone };
-static HRESULT string_enumerator_create(IEnumString **enum_string) +static void string_enumerator_init(struct string_enumerator *object, IEnumUnknown *object_enumerator, + IWICEnumMetadataItem *metadata_enumerator) { + object->IEnumString_iface.lpVtbl = &string_enumerator_vtbl; + object->ref = 1; + + object->object_enumerator = object_enumerator; + if (object->object_enumerator) + IEnumUnknown_AddRef(object->object_enumerator); + object->metadata_enumerator = metadata_enumerator; + if (object->metadata_enumerator) + IWICEnumMetadataItem_AddRef(object->metadata_enumerator); +} + +static HRESULT string_enumerator_create(struct query_handler *handler, IEnumString **enum_string) +{ + IWICEnumMetadataItem *metadata_enumerator = NULL; + IEnumUnknown *object_enumerator = NULL; struct string_enumerator *object;
if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY;
- object->IEnumString_iface.lpVtbl = &string_enumerator_vtbl; - object->ref = 1; + if (is_block_handler(handler)) + { + IWICMetadataBlockReader_GetEnumerator(handler->object.block_reader, &object_enumerator); + } + else + { + IWICMetadataReader_GetEnumerator(handler->object.reader, &metadata_enumerator); + } + + string_enumerator_init(object, object_enumerator, metadata_enumerator); + + if (object_enumerator) + IEnumUnknown_Release(object_enumerator);
*enum_string = &object->IEnumString_iface;
@@ -856,9 +1161,11 @@ static HRESULT string_enumerator_create(IEnumString **enum_string) static HRESULT WINAPI query_handler_GetEnumerator(IWICMetadataQueryWriter *iface, IEnumString **enum_string) { + struct query_handler *handler = impl_from_IWICMetadataQueryWriter(iface); + TRACE("iface %p, enum_string %p.\n", iface, enum_string);
- return string_enumerator_create(enum_string); + return string_enumerator_create(handler, enum_string); }
static HRESULT WINAPI query_handler_SetMetadataByName(IWICMetadataQueryWriter *iface, LPCWSTR name, const PROPVARIANT *value) @@ -941,7 +1248,7 @@ static HRESULT create_query_handler(IUnknown *block_handler, enum metadata_objec }
buff[0] = '/'; - query_get_guid_item_string(buff + 1, ARRAY_SIZE(buff) - 1, &guid); + query_get_guid_item_string(buff + 1, ARRAY_SIZE(buff) - 1, &guid, true); root = buff; } } diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 039bbdb6079..f6f10b94adf 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -767,15 +767,10 @@ static void test_metadata_unknown(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); str = NULL; hr = IEnumString_Next(enum_string, 1, &str, &fetched); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(fetched == 1, "Unexpected count %lu.\n", fetched); - if (hr == S_OK) - { - ok(!wcscmp(str, L"/{}"), "Unexpected query %s.\n", wine_dbgstr_w(str)); - CoTaskMemFree(str); - } + ok(!wcscmp(str, L"/{}"), "Unexpected query %s.\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); IEnumString_Release(enum_string);
PropVariantInit(&value); @@ -4639,15 +4634,10 @@ static void test_queryreader(void) hr = IWICMetadataQueryReader_GetEnumerator(reader, &enum_string); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumString_Next(enum_string, 1, &str, NULL); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - { - ok(!wcscmp(str, L"/ifd"), "Unexpected query %s.\n", wine_dbgstr_w(str)); - CoTaskMemFree(str); - } + ok(!wcscmp(str, L"/ifd"), "Unexpected query %s.\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); hr = IEnumString_Next(enum_string, 1, &str, NULL); - todo_wine ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr);
hr = IWICComponentFactory_CreateMetadataWriter(factory, &GUID_MetadataFormatApp1, NULL, 0, &writer); @@ -4661,28 +4651,19 @@ static void test_queryreader(void)
/* Existing enumerator does not pick it up. */ hr = IEnumString_Next(enum_string, 1, &str, NULL); - todo_wine ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); IEnumString_Release(enum_string);
hr = IWICMetadataQueryReader_GetEnumerator(reader, &enum_string); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IEnumString_Next(enum_string, 1, &str, NULL); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - { - ok(!wcscmp(str, L"/ifd"), "Unexpected query %s.\n", wine_dbgstr_w(str)); - CoTaskMemFree(str); - } + ok(!wcscmp(str, L"/ifd"), "Unexpected query %s.\n", wine_dbgstr_w(str)); + CoTaskMemFree(str); hr = IEnumString_Next(enum_string, 1, &str, NULL); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (hr == S_OK) - { - ok(!wcscmp(str, L"/app1"), "Unexpected query %s.\n", wine_dbgstr_w(str)); - CoTaskMemFree(str); - } + ok(!wcscmp(str, L"/app1"), "Unexpected query %s.\n", wine_dbgstr_w(str)); + CoTaskMemFree(str);
IEnumString_Release(enum_string);