[PATCH 1/7] dlls/propsys/tests: Add conformance tests for getting PropertyDescriptions from PropertySystem.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/propsys/tests/propsys.c | 114 +++++++++++++++++++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c
index 3cdd1eb6e12..d8b1d920187 100644
--- a/dlls/propsys/tests/propsys.c
+++ b/dlls/propsys/tests/propsys.c
@@ -32,6 +32,7 @@
 #include "propsys.h"
 #include "propvarutil.h"
 #include "strsafe.h"
+#include "propkey.h"
 #include "wine/test.h"

DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
@@ -56,6 +57,13 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line)
     ok_(__FILE__,line)(rc == ref, "expected refcount %ld, got %ld\n", ref, rc);
 }

+static inline const char *debugstr_propkey(const PROPERTYKEY *key)
+{
+    if (!key)
+        return "(null)";
+    return wine_dbg_sprintf("{%s,%04lx}", wine_dbgstr_guid(&key->fmtid), key->pid);
+}
+
 static void test_PSStringFromPropertyKey(void)
 {
     static const WCHAR fillerW[] = {'X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X',
@@ -2626,6 +2634,110 @@ static void test_PropVariantToVariant(void)
     VariantClear(&var);
 }

+static void test_PropertyDescription_(int line, const PROPERTYKEY *expect_key, const WCHAR *expect_name, VARTYPE expect_type,
+                                      IPropertyDescription *desc)
+{
+    HRESULT hr;
+    PROPERTYKEY key;
+    VARTYPE type;
+    WCHAR *name;
+
+    hr = IPropertyDescription_GetPropertyKey(desc, &key);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "got %#lx\n", hr);
+    ok_(__FILE__, line)(!memcmp(&key, expect_key, sizeof(key)), "%s != %s\n", debugstr_propkey(&key),
+                       debugstr_propkey(expect_key));
+    hr = IPropertyDescription_GetCanonicalName(desc, &name);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "got %#lx\n", hr);
+    if (SUCCEEDED(hr))
+    {
+        ok_(__FILE__, line)(!wcscmp(name, expect_name), "%s != %s\n", debugstr_w(name), debugstr_w(expect_name));
+        CoTaskMemFree(name);
+    }
+    hr = IPropertyDescription_GetPropertyType(desc, &type);
+    ok_(__FILE__, line)(SUCCEEDED(hr), "got %#lx\n", hr);
+    if (SUCCEEDED(hr))
+        ok_(__FILE__, line)(type == expect_type, "%s != !s\n", debugstr_vt(type), debugstr_vt(expect_type));
+}
+#define test_PropertyDescription(k,n,t,d) test_PropertyDescription_(__LINE__, k, n, t, d)
+
+static void test_PropertySystem(void)
+{
+    const static struct
+    {
+        const PROPERTYKEY *key;
+        const WCHAR *name;
+        VARTYPE type;
+    } system_props[] = {
+        {&PKEY_ItemNameDisplay, L"System.ItemNameDisplay", VT_LPWSTR},
+        {&PKEY_Devices_ContainerId, L"System.Devices.ContainerId", VT_CLSID},
+        {&PKEY_Devices_InterfaceClassGuid, L"System.Devices.InterfaceClassGuid", VT_CLSID},
+        {&PKEY_Devices_HardwareIds, L"System.Devices.HardwareIds", VT_VECTOR | VT_LPWSTR},
+        {&PKEY_Devices_ClassGuid, L"System.Devices.ClassGuid", VT_CLSID}
+    };
+    PROPERTYKEY empty = {0};
+    IPropertySystem *system;
+    HRESULT hr;
+    IPropertyDescription *desc;
+    SIZE_T i;
+
+    CoInitialize(NULL);
+    hr = CoCreateInstance(&CLSID_PropertySystem, NULL, CLSCTX_INPROC_SERVER, &IID_IPropertySystem, (void **)&system);
+    todo_wine ok(SUCCEEDED(hr), "got %#lx\n", hr);
+    if (FAILED(hr))
+    {
+        skip("Could not create IPropertySystem instance.\n");
+        CoUninitialize();
+        return;
+    }
+
+    for(i = 0; i < ARRAY_SIZE(system_props); i++)
+    {
+        IPropertyDescription *desc;
+        winetest_push_context("system_props %d", (int)i);
+
+        hr = IPropertySystem_GetPropertyDescription(system, system_props[i].key, &IID_IPropertyDescription, (void **)&desc);
+        todo_wine ok(SUCCEEDED(hr), "got %#lx\n", hr);
+        if (SUCCEEDED(hr))
+        {
+            test_PropertyDescription(system_props[i].key, system_props[i].name, system_props[i].type, desc);
+            IPropertyDescription_Release(desc);
+        }
+        hr = PSGetPropertyDescription(system_props[i].key, &IID_IPropertyDescription, (void **)&desc);
+        todo_wine ok(SUCCEEDED(hr), "got %#lx\n", hr);
+        if (SUCCEEDED(hr))
+        {
+            test_PropertyDescription(system_props[i].key, system_props[i].name, system_props[i].type, desc);
+            IPropertyDescription_Release(desc);
+        }
+
+        hr = IPropertySystem_GetPropertyDescriptionByName(system, system_props[i].name, &IID_IPropertyDescription, (void **)&desc);
+        todo_wine ok(SUCCEEDED(hr), "got %#lx\n", hr);
+        if (SUCCEEDED(hr))
+        {
+            test_PropertyDescription(system_props[i].key, system_props[i].name, system_props[i].type, desc);
+            IPropertyDescription_Release(desc);
+        }
+        hr = PSGetPropertyDescription(system_props[i].key, &IID_IPropertyDescription, (void **)&desc);
+        todo_wine ok(SUCCEEDED(hr), "got %#lx\n", hr);
+        if (SUCCEEDED(hr))
+        {
+            test_PropertyDescription(system_props[i].key, system_props[i].name, system_props[i].type, desc);
+            IPropertyDescription_Release(desc);
+        }
+
+        winetest_pop_context();
+    }
+
+    hr = IPropertySystem_GetPropertyDescription(system, &empty, &IID_IPropertyDescription, (void **)&desc);
+    todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "%#lx != %#lx\n", hr, TYPE_E_ELEMENTNOTFOUND);
+
+    hr = IPropertySystem_GetPropertyDescriptionByName(system, L"Non.Existent.Property.Name", &IID_IPropertyDescription, (void **)&desc);
+    todo_wine ok(hr == TYPE_E_ELEMENTNOTFOUND, "%#lx != %#lx\n", hr, TYPE_E_ELEMENTNOTFOUND);
+
+    IPropertySystem_Release(system);
+    CoUninitialize();
+}
+
 START_TEST(propsys)
 {
     test_InitPropVariantFromGUIDAsString();
@@ -2657,4 +2769,6 @@ START_TEST(propsys)
     test_VariantToString();
     test_VariantToPropVariant();
     test_PropVariantToVariant();
+
+    test_PropertySystem();
 }