[PATCH v3 03/10] windowscodecs/metadata: Do not decorate 'wstr' items with a type name in returned queries.

[Nikolay Sivov]

From: Nikolay Sivov

Signed-off-by: Nikolay Sivov 
---
 dlls/windowscodecs/metadataquery.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dlls/windowscodecs/metadataquery.c b/dlls/windowscodecs/metadataquery.c
index 54f1065420d..b06d6ddd52b 100644
--- a/dlls/windowscodecs/metadataquery.c
+++ b/dlls/windowscodecs/metadataquery.c
@@ -903,9 +903,16 @@ static HRESULT get_query_item_name(const PROPVARIANT *var, WCHAR **name)
     }

if (type)
-        swprintf(*name, len, L"{%s=%s}", type, dest.pwszVal);
+    {
+        if (var->vt == VT_LPWSTR)
+            swprintf(*name, len, L"%s", dest.pwszVal);
+        else
+            swprintf(*name, len, L"{%s=%s}", type, dest.pwszVal);
+    }
     else
+    {
         wcscpy(*name, L"{}");
+    }
     PropVariantClear(&dest);

return S_OK;