Vincent Povirk : windowscodecs: Flesh out IWICMetadataReader test.
Alexandre Julliard
julliard at winehq.org
Wed Nov 16 12:46:45 CST 2011
Module: wine
Branch: master
Commit: 065470ed625d81ae6c396ac9a11ab9fb0e0d2a52
URL: http://source.winehq.org/git/wine.git/?a=commit;h=065470ed625d81ae6c396ac9a11ab9fb0e0d2a52
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Tue Nov 15 16:17:19 2011 -0600
windowscodecs: Flesh out IWICMetadataReader test.
---
dlls/windowscodecs/tests/metadata.c | 77 ++++++++++++++++++++++++++++++++--
include/wincodec.idl | 1 +
2 files changed, 73 insertions(+), 5 deletions(-)
diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c
index 715c9e7..8495e4d 100644
--- a/dlls/windowscodecs/tests/metadata.c
+++ b/dlls/windowscodecs/tests/metadata.c
@@ -163,24 +163,39 @@ static void test_metadata_tEXt(void)
IWICMetadataReader *reader;
IWICEnumMetadataItem *enumerator;
PROPVARIANT schema, id, value;
- ULONG items_returned;
+ ULONG items_returned, count;
+ GUID format;
+
+ PropVariantInit(&schema);
+ PropVariantInit(&id);
+ PropVariantInit(&value);
hr = CoCreateInstance(&CLSID_WICPngTextMetadataReader, NULL, CLSCTX_INPROC_SERVER,
&IID_IWICMetadataReader, (void**)&reader);
todo_wine ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr);
if (FAILED(hr)) return;
+ hr = IWICMetadataReader_GetCount(reader, NULL);
+ ok(hr == E_INVALIDARG, "GetCount failed, hr=%x\n", hr);
+
+ hr = IWICMetadataReader_GetCount(reader, &count);
+ ok(hr == S_OK, "GetCount failed, hr=%x\n", hr);
+ ok(count == 0, "unexpected count %i\n", count);
+
load_stream((IUnknown*)reader, metadata_tEXt, sizeof(metadata_tEXt));
+ hr = IWICMetadataReader_GetCount(reader, &count);
+ ok(hr == S_OK, "GetCount failed, hr=%x\n", hr);
+ ok(count == 1, "unexpected count %i\n", count);
+
+ hr = IWICMetadataReader_GetEnumerator(reader, NULL);
+ ok(hr == E_INVALIDARG, "GetEnumerator failed, hr=%x\n", hr);
+
hr = IWICMetadataReader_GetEnumerator(reader, &enumerator);
ok(hr == S_OK, "GetEnumerator failed, hr=%x\n", hr);
if (SUCCEEDED(hr))
{
- PropVariantInit(&schema);
- PropVariantInit(&id);
- PropVariantInit(&value);
-
hr = IWICEnumMetadataItem_Next(enumerator, 1, &schema, &id, &value, &items_returned);
ok(hr == S_OK, "Next failed, hr=%x\n", hr);
ok(items_returned == 1, "unexpected item count %i\n", items_returned);
@@ -205,6 +220,58 @@ static void test_metadata_tEXt(void)
IWICEnumMetadataItem_Release(enumerator);
}
+ hr = IWICMetadataReader_GetMetadataFormat(reader, &format);
+ ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr);
+ ok(IsEqualGUID(&format, &GUID_MetadataFormatChunktEXt), "unexpected format %s\n", debugstr_guid(&format));
+
+ hr = IWICMetadataReader_GetMetadataFormat(reader, NULL);
+ ok(hr == E_INVALIDARG, "GetMetadataFormat failed, hr=%x\n", hr);
+
+ id.vt = VT_LPSTR;
+ id.pszVal = CoTaskMemAlloc(strlen("winetest") + 1);
+ strcpy(id.pszVal, "winetest");
+
+ hr = IWICMetadataReader_GetValue(reader, NULL, &id, NULL);
+ ok(hr == S_OK, "GetValue failed, hr=%x\n", hr);
+
+ hr = IWICMetadataReader_GetValue(reader, &schema, NULL, &value);
+ ok(hr == E_INVALIDARG, "GetValue failed, hr=%x\n", hr);
+
+ hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value);
+ ok(hr == S_OK, "GetValue failed, hr=%x\n", hr);
+ ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt);
+ ok(!strcmp(value.pszVal, "value"), "unexpected value: %s\n", id.pszVal);
+ PropVariantClear(&value);
+
+ strcpy(id.pszVal, "test");
+
+ hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value);
+ ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "GetValue failed, hr=%x\n", hr);
+
+ PropVariantClear(&id);
+
+ hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, NULL);
+ ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr);
+
+ hr = IWICMetadataReader_GetValueByIndex(reader, 0, &schema, NULL, NULL);
+ ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr);
+ ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt);
+
+ hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, &id, NULL);
+ ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr);
+ ok(id.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt);
+ ok(!strcmp(id.pszVal, "winetest"), "unexpected id: %s\n", id.pszVal);
+ PropVariantClear(&id);
+
+ hr = IWICMetadataReader_GetValueByIndex(reader, 0, NULL, NULL, &value);
+ ok(hr == S_OK, "GetValueByIndex failed, hr=%x\n", hr);
+ ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt);
+ ok(!strcmp(value.pszVal, "value"), "unexpected value: %s\n", id.pszVal);
+ PropVariantClear(&value);
+
+ hr = IWICMetadataReader_GetValueByIndex(reader, 1, NULL, NULL, NULL);
+ ok(hr == E_INVALIDARG, "GetValueByIndex failed, hr=%x\n", hr);
+
IWICMetadataReader_Release(reader);
}
diff --git a/include/wincodec.idl b/include/wincodec.idl
index 8228bd8..4c46cf4 100644
--- a/include/wincodec.idl
+++ b/include/wincodec.idl
@@ -192,6 +192,7 @@ typedef UINT32 WICColor;
cpp_quote("#define WINCODEC_ERR_WRONGSTATE 0x88982f04")
cpp_quote("#define WINCODEC_ERR_VALUEOUTOFRANGE 0x88982f05")
cpp_quote("#define WINCODEC_ERR_NOTINITIALIZED 0x88982f0c")
+cpp_quote("#define WINCODEC_ERR_PROPERTYNOTFOUND 0x88982f40")
cpp_quote("#define WINCODEC_ERR_CODECNOTHUMBNAIL 0x88982f44")
cpp_quote("#define WINCODEC_ERR_PALETTEUNAVAILABLE 0x88982f45")
cpp_quote("#define WINCODEC_ERR_COMPONENTNOTFOUND 0x88982f50")
More information about the wine-cvs
mailing list