windowscodecs: Implement MetadataHandler_GetValue.

[Dmitry Timoshkov]

---
 dlls/windowscodecs/metadatahandler.c | 64 ++++++++++++++++++++++++++++++++++--
 dlls/windowscodecs/tests/metadata.c  | 41 ++++++++++++++++++++++-
 2 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c
index a3eea1f..815e367 100644
--- a/dlls/windowscodecs/metadatahandler.c
+++ b/dlls/windowscodecs/metadatahandler.c
@@ -213,11 +213,69 @@ static HRESULT WINAPI MetadataHandler_GetValueByIndex(IWICMetadataWriter *iface,
     return hr;
 }
 
+/* FiXME: Use propsys.PropVariantCompareEx once it's implemented */
+static int propvar_cmp(const PROPVARIANT *v1, const PROPVARIANT *v2)
+{
+    if (v1->vt != v2->vt) return v1->vt - v2->vt;
+
+    switch (v1->vt)
+    {
+    case VT_EMPTY:
+        return 0;
+    case VT_I1:
+    case VT_UI1:
+        return v1->u.bVal - v2->u.bVal;
+    case VT_I2:
+    case VT_UI2:
+        return v1->u.uiVal - v2->u.uiVal;
+    case VT_I4:
+    case VT_UI4:
+    case VT_R4:
+        return v1->u.ulVal - v2->u.ulVal;
+    case VT_I8:
+    case VT_UI8:
+    case VT_R8:
+        return v1->u.uhVal.QuadPart - v2->u.uhVal.QuadPart;
+    case VT_LPSTR:
+        return strcmp(v1->u.pszVal, v2->u.pszVal);
+    case VT_BLOB:
+        if (v1->u.blob.cbSize != v2->u.blob.cbSize)
+            return v1->u.blob.cbSize - v2->u.blob.cbSize;
+        return memcmp(v1->u.blob.pBlobData, v2->u.blob.pBlobData, v1->u.blob.cbSize);
+    default:
+        FIXME("not supported variant type %d\n", v1->vt);
+        return -1;
+    }
+}
+
 static HRESULT WINAPI MetadataHandler_GetValue(IWICMetadataWriter *iface,
-    const PROPVARIANT *pvarSchema, const PROPVARIANT *pvarId, PROPVARIANT *pvarValue)
+    const PROPVARIANT *schema, const PROPVARIANT *id, PROPVARIANT *value)
 {
-    FIXME("(%p,%p,%p,%p): stub\n", iface, pvarSchema, pvarId, pvarValue);
-    return E_NOTIMPL;
+    UINT i;
+    HRESULT hr = WINCODEC_ERR_PROPERTYNOTFOUND;
+    MetadataHandler *This = impl_from_IWICMetadataWriter(iface);
+
+    TRACE("(%p,%p,%p,%p)\n", iface, schema, id, value);
+
+    if (!id) return E_INVALIDARG;
+
+    EnterCriticalSection(&This->lock);
+
+    for (i = 0; i < This->item_count; i++)
+    {
+        if (schema && This->items[i].schema.vt != VT_EMPTY)
+        {
+            if (propvar_cmp(schema, &This->items[i].schema) != 0) continue;
+        }
+
+        if (propvar_cmp(id, &This->items[i].id) != 0) continue;
+
+        hr = value ? PropVariantCopy(value, &This->items[i].value) : S_OK;
+        break;
+    }
+
+    LeaveCriticalSection(&This->lock);
+    return hr;
 }
 
 static HRESULT WINAPI MetadataHandler_GetEnumerator(IWICMetadataWriter *iface,
diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c
index 76fd241..d3b2869 100644
--- a/dlls/windowscodecs/tests/metadata.c
+++ b/dlls/windowscodecs/tests/metadata.c
@@ -726,7 +726,46 @@ static void test_metadata_IFD(void)
     PropVariantClear(&value);
 
     hr = IWICMetadataReader_GetValueByIndex(reader, count, &schema, NULL, NULL);
-    ok(hr == E_INVALIDARG, "GetValueByIndex should fail\n");
+    ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr);
+
+    PropVariantInit(&schema);
+    PropVariantInit(&id);
+    PropVariantInit(&value);
+
+    hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value);
+    ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "expected WINCODEC_ERR_PROPERTYNOTFOUND, got %#x\n", hr);
+
+    hr = IWICMetadataReader_GetValue(reader, NULL, &id, NULL);
+    ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "expected WINCODEC_ERR_PROPERTYNOTFOUND, got %#x\n", hr);
+
+    hr = IWICMetadataReader_GetValue(reader, &schema, NULL, NULL);
+    ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr);
+
+    hr = IWICMetadataReader_GetValue(reader, &schema, &id, NULL);
+    ok(hr == WINCODEC_ERR_PROPERTYNOTFOUND, "expected WINCODEC_ERR_PROPERTYNOTFOUND, got %#x\n", hr);
+
+    hr = IWICMetadataReader_GetValue(reader, &schema, NULL, &value);
+    ok(hr == E_INVALIDARG, "expected E_INVALIDARG, got %#x\n", hr);
+
+    id.vt = VT_UI2;
+    U(id).uiVal = 0xf00e;
+    hr = IWICMetadataReader_GetValue(reader, NULL, &id, NULL);
+    ok(hr == S_OK, "GetValue error %#x\n", hr);
+
+    /* schema is ignored by Ifd metadata reader */
+    schema.vt = VT_UI4;
+    U(schema).ulVal = 0xdeadbeef;
+    hr = IWICMetadataReader_GetValue(reader, &schema, &id, &value);
+    ok(hr == S_OK, "GetValue error %#x\n", hr);
+    ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt);
+    ok(!strcmp(U(value).pszVal, "Hello World!"), "unexpected value: %s\n", U(value).pszVal);
+    PropVariantClear(&value);
+
+    hr = IWICMetadataReader_GetValue(reader, NULL, &id, &value);
+    ok(hr == S_OK, "GetValue error %#x\n", hr);
+    ok(value.vt == VT_LPSTR, "unexpected vt: %i\n", id.vt);
+    ok(!strcmp(U(value).pszVal, "Hello World!"), "unexpected value: %s\n", U(value).pszVal);
+    PropVariantClear(&value);
 
     hr = IWICMetadataReader_QueryInterface(reader, &IID_IWICMetadataBlockReader, (void**)&blockreader);
     ok(hr == E_NOINTERFACE, "QueryInterface failed, hr=%x\n", hr);
-- 
1.7.11.1