diff --git a/rostests/winetests/CMakeLists.txt b/rostests/winetests/CMakeLists.txt
index 95275caf08b..2b0870bce4e 100644
--- a/rostests/winetests/CMakeLists.txt
+++ b/rostests/winetests/CMakeLists.txt
@@ -58,6 +58,7 @@ add_subdirectory(oleacc)
 add_subdirectory(oleaut32)
 add_subdirectory(opengl32)
 add_subdirectory(pdh)
+add_subdirectory(propsys)
 add_subdirectory(psapi)
 add_subdirectory(qmgr)
 add_subdirectory(quartz)
diff --git a/rostests/winetests/propsys/CMakeLists.txt b/rostests/winetests/propsys/CMakeLists.txt
new file mode 100644
index 00000000000..cdd0824979c
--- /dev/null
+++ b/rostests/winetests/propsys/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+add_definitions(-D__ROS_LONG64__)
+add_executable(propsys_winetest propstore.c propsys.c testlist.c)
+target_link_libraries(propsys_winetest wine)
+set_module_type(propsys_winetest win32cui)
+add_importlibs(propsys_winetest propsys ole32 oleaut32 msvcrt kernel32 ntdll)
+add_cd_file(TARGET propsys_winetest DESTINATION reactos/bin FOR all)
diff --git a/rostests/winetests/propsys/propstore.c b/rostests/winetests/propsys/propstore.c
new file mode 100644
index 00000000000..78c1979bffb
--- /dev/null
+++ b/rostests/winetests/propsys/propstore.c
@@ -0,0 +1,263 @@
+/*
+ * Unit tests for IPropertyStore and related interfaces
+ *
+ * Copyright 2012 Vincent Povirk
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+#include <stdarg.h>
+//#include <stdio.h>
+
+#define NONAMELESSUNION
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <propsys.h>
+#include <wine/test.h>
+
+#include <initguid.h>
+
+DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4);
+
+static void test_inmemorystore(void)
+{
+    IPropertyStoreCache *propcache;
+    HRESULT hr;
+    PROPERTYKEY pkey;
+    PROPVARIANT propvar;
+    DWORD count;
+    PSC_STATE state;
+
+    hr = CoCreateInstance(&CLSID_InMemoryPropertyStore, NULL, CLSCTX_INPROC_SERVER,
+        &IID_IPropertyStoreCache, (void**)&propcache);
+    ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr);
+
+    if (FAILED(hr))
+    {
+        skip("CLSID_InMemoryPropertyStore not supported\n");
+        return;
+    }
+
+    hr = IPropertyStoreCache_GetCount(propcache, NULL);
+    ok(hr == E_POINTER, "GetCount failed, hr=%x\n", hr);
+
+    hr = IPropertyStoreCache_GetCount(propcache, &count);
+    ok(hr == S_OK, "GetCount failed, hr=%x\n", hr);
+    ok(count == 0, "GetCount returned %i, expected 0\n", count);
+
+    hr = IPropertyStoreCache_Commit(propcache);
+    ok(hr == S_OK, "Commit failed, hr=%x\n", hr);
+
+    hr = IPropertyStoreCache_Commit(propcache);
+    ok(hr == S_OK, "Commit failed, hr=%x\n", hr);
+
+    hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey);
+    ok(hr == E_INVALIDARG, "GetAt failed, hr=%x\n", hr);
+
+    pkey.fmtid = PKEY_WineTest;
+    pkey.pid = 4;
+
+    memset(&propvar, 0, sizeof(propvar));
+    propvar.vt = VT_I4;
+    propvar.u.lVal = 12345;
+
+    if (0)
+    {
+        /* Crashes on Windows 7 */
+        hr = IPropertyStoreCache_SetValue(propcache, NULL, &propvar);
+        ok(hr == E_POINTER, "SetValue failed, hr=%x\n", hr);
+
+        hr = IPropertyStoreCache_SetValue(propcache, &pkey, NULL);
+        ok(hr == E_POINTER, "SetValue failed, hr=%x\n", hr);
+    }
+
+    hr = IPropertyStoreCache_SetValue(propcache, &pkey, &propvar);
+    ok(hr == S_OK, "SetValue failed, hr=%x\n", hr);
+
+    hr = IPropertyStoreCache_GetCount(propcache, &count);
+    ok(hr == S_OK, "GetCount failed, hr=%x\n", hr);
+    ok(count == 1, "GetCount returned %i, expected 0\n", count);
+
+    memset(&pkey, 0, sizeof(pkey));
+
+    hr = IPropertyStoreCache_GetAt(propcache, 0, &pkey);
+    ok(hr == S_OK, "GetAt failed, hr=%x\n", hr);
+    ok(IsEqualGUID(&pkey.fmtid, &PKEY_WineTest), "got wrong pkey\n");
+    ok(pkey.pid == 4, "got pid of %i, expected 4\n", pkey.pid);
+
+    pkey.fmtid = PKEY_WineTest;
+    pkey.pid = 4;
+
+    memset(&propvar, 0, sizeof(propvar));
+
+    if (0)
+    {
+        /* Crashes on Windows 7 */
+        hr = IPropertyStoreCache_GetValue(propcache, NULL, &propvar);
+        ok(hr == E_POINTER, "GetValue failed, hr=%x\n", hr);
+    }
+
+    hr = IPropertyStoreCache_GetValue(propcache, &pkey, NULL);
+    ok(hr == E_POINTER, "GetValue failed, hr=%x\n", hr);
+
+    hr = IPropertyStoreCache_GetValue(propcache, &pkey, &propvar);
+    ok(hr == S_OK, "GetValue failed, hr=%x\n", hr);
+    ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt);
+    ok(propvar.u.lVal == 12345, "expected 12345, got %d\n", propvar.u.lVal);
+
+    pkey.fmtid = PKEY_WineTest;
+    pkey.pid = 10;
+
+    /* Get information for field that isn't set yet */
+    propvar.vt = VT_I2;
+    hr = IPropertyStoreCache_GetValue(propcache, &pkey, &propvar);
+    ok(hr == S_OK, "GetValue failed, hr=%x\n", hr);
+    ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt);
+
+    state = 0xdeadbeef;
+    hr = IPropertyStoreCache_GetState(propcache, &pkey, &state);
+    ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetState failed, hr=%x\n", hr);
+    ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state);
+
+    propvar.vt = VT_I2;
+    state = 0xdeadbeef;
+    hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state);
+    ok(hr == TYPE_E_ELEMENTNOTFOUND, "GetValueAndState failed, hr=%x\n", hr);
+    ok(propvar.vt == VT_EMPTY, "expected VT_EMPTY, got %d\n", propvar.vt);
+    ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state);
+
+    /* Set state on an unset field */
+    hr = IPropertyStoreCache_SetState(propcache, &pkey, PSC_NORMAL);
+    ok(hr == TYPE_E_ELEMENTNOTFOUND, "SetState failed, hr=%x\n", hr);
+
+    /* Manipulate state on already set field */
+    pkey.fmtid = PKEY_WineTest;
+    pkey.pid = 4;
+
+    state = 0xdeadbeef;
+    hr = IPropertyStoreCache_GetState(propcache, &pkey, &state);
+    ok(hr == S_OK, "GetState failed, hr=%x\n", hr);
+    ok(state == PSC_NORMAL, "expected PSC_NORMAL, got %d\n", state);
+
+    hr = IPropertyStoreCache_SetState(propcache, &pkey, 10);
+    ok(hr == S_OK, "SetState failed, hr=%x\n", hr);
+
+    state = 0xdeadbeef;
+    hr = IPropertyStoreCache_GetState(propcache, &pkey, &state);
+    ok(hr == S_OK, "GetState failed, hr=%x\n", hr);
+    ok(state == 10, "expected 10, got %d\n", state);
+
+    propvar.vt = VT_I4;
+    propvar.u.lVal = 12346;
+    hr = IPropertyStoreCache_SetValueAndState(propcache, &pkey, &propvar, 5);
+    ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr);
+
+    memset(&propvar, 0, sizeof(propvar));
+    state = 0xdeadbeef;
+    hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state);
+    ok(hr == S_OK, "GetValueAndState failed, hr=%x\n", hr);
+    ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt);
+    ok(propvar.u.lVal == 12346, "expected 12346, got %d\n", propvar.vt);
+    ok(state == 5, "expected 5, got %d\n", state);
+
+    /* Set new field with state */
+    pkey.fmtid = PKEY_WineTest;
+    pkey.pid = 8;
+
+    propvar.vt = VT_I4;
+    propvar.u.lVal = 12347;
+    hr = IPropertyStoreCache_SetValueAndState(propcache, &pkey, &propvar, PSC_DIRTY);
+    ok(hr == S_OK, "SetValueAndState failed, hr=%x\n", hr);
+
+    memset(&propvar, 0, sizeof(propvar));
+    state = 0xdeadbeef;
+    hr = IPropertyStoreCache_GetValueAndState(propcache, &pkey, &propvar, &state);
+    ok(hr == S_OK, "GetValueAndState failed, hr=%x\n", hr);
+    ok(propvar.vt == VT_I4, "expected VT_I4, got %d\n", propvar.vt);
+    ok(propvar.u.lVal == 12347, "expected 12347, got %d\n", propvar.vt);
+    ok(state == PSC_DIRTY, "expected PSC_DIRTY, got %d\n", state);
+
+    IPropertyStoreCache_Release(propcache);
+}
+
+static void test_persistserialized(void)
+{
+    IPropertyStore *propstore;
+    IPersistSerializedPropStorage *serialized;
+    HRESULT hr;
+    SERIALIZEDPROPSTORAGE *result;
+    DWORD result_size;
+
+    hr = CoCreateInstance(&CLSID_InMemoryPropertyStore, NULL, CLSCTX_INPROC_SERVER,
+        &IID_IPropertyStore, (void**)&propstore);
+    ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr);
+
+    hr = IPropertyStore_QueryInterface(propstore, &IID_IPersistSerializedPropStorage,
+        (void**)&serialized);
+    todo_wine ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr);
+
+    if (FAILED(hr))
+    {
+        skip("IPersistSerializedPropStorage not supported\n");
+        return;
+    }
+
+    hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, NULL, &result_size);
+    ok(hr == E_POINTER, "GetPropertyStorage failed, hr=%x\n", hr);
+
+    hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, &result, NULL);
+    ok(hr == E_POINTER, "GetPropertyStorage failed, hr=%x\n", hr);
+
+    hr = IPersistSerializedPropStorage_GetPropertyStorage(serialized, &result, &result_size);
+    ok(hr == S_OK, "GetPropertyStorage failed, hr=%x\n", hr);
+
+    if (SUCCEEDED(hr))
+    {
+        ok(result_size == 0, "expected 0 bytes, got %i\n", result_size);
+
+        CoTaskMemFree(result);
+    }
+
+    hr = IPersistSerializedPropStorage_SetPropertyStorage(serialized, NULL, 4);
+    ok(hr == E_POINTER, "SetPropertyStorage failed, hr=%x\n", hr);
+
+    hr = IPersistSerializedPropStorage_SetPropertyStorage(serialized, NULL, 0);
+    ok(hr == S_OK, "SetPropertyStorage failed, hr=%x\n", hr);
+
+    hr = IPropertyStore_GetCount(propstore, &result_size);
+    ok(hr == S_OK, "GetCount failed, hr=%x\n", hr);
+    ok(result_size == 0, "expecting 0, got %d\n", result_size);
+
+    IPropertyStore_Release(propstore);
+    IPersistSerializedPropStorage_Release(serialized);
+}
+
+START_TEST(propstore)
+{
+    CoInitialize(NULL);
+
+    test_inmemorystore();
+    test_persistserialized();
+
+    CoUninitialize();
+}
diff --git a/rostests/winetests/propsys/propsys.c b/rostests/winetests/propsys/propsys.c
new file mode 100644
index 00000000000..878cd985fe6
--- /dev/null
+++ b/rostests/winetests/propsys/propsys.c
@@ -0,0 +1,905 @@
+/*
+ * Unit tests for Windows property system
+ *
+ * Copyright 2006 Paul Vriens
+ * Copyright 2010 Andrew Nguyen
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+
+//#include <stdarg.h>
+#include <stdio.h>
+
+#define NONAMELESSUNION
+
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <winnls.h>
+//#include "objbase.h"
+#include <ole2.h>
+#include <initguid.h>
+#include <propsys.h>
+#include <propvarutil.h>
+#include <wine/test.h>
+
+DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
+DEFINE_GUID(dummy_guid, 0xdeadbeef, 0xdead, 0xbeef, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0xba, 0xbe);
+DEFINE_GUID(expect_guid, 0x12345678, 0x1234, 0x1234, 0x12, 0x34, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12);
+
+#define GUID_MEMBERS(g) {(g).Data1, (g).Data2, (g).Data3, {(g).Data4[0], (g).Data4[1], (g).Data4[2], (g).Data4[3], (g).Data4[4], (g).Data4[5], (g).Data4[6], (g).Data4[7]}}
+
+static char *show_guid(const GUID *guid, char *buf)
+{
+    static char static_buf[40];
+
+    if(!buf)
+        buf = static_buf;
+
+    sprintf(buf,
+        "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
+        guid->Data1, guid->Data2, guid->Data3,
+        guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
+        guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] );
+
+    return buf;
+}
+
+static int strcmp_wa(LPCWSTR strw, const char *stra)
+{
+    CHAR buf[512];
+    WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL);
+    return lstrcmpA(stra, buf);
+}
+
+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',
+                                    'X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X',
+                                    'X','X','X','X','X','X','X','X','X','X'};
+    static const WCHAR zero_fillerW[] = {'\0','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X',
+                                         'X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X','X',
+                                         'X','X','X','X','X','X','X','X','X','X','X','X','X','X'};
+    static const WCHAR zero_truncatedW[] = {'\0','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0',
+                                            '0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0',
+                                            '0','0','0','}',' ','\0','9','X','X','X','X','X','X','X','X','X'};
+    static const WCHAR zero_truncated2W[] = {'\0','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0',
+                                             '0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0',
+                                             '0','0','0','}',' ','\0','9','2','7','6','9','4','9','2','X','X'};
+    static const WCHAR zero_truncated3W[] = {'\0','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0',
+                                            '0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0',
+                                            '0','0','0','}',' ','\0','9','2','7','6','9','4','9','2','4','X'};
+    static const WCHAR zero_truncated4W[] = {'\0','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0',
+                                             '0','0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0',
+                                             '0','0','0','}',' ','\0','7','X','X','X','X','X','X','X','X','X'};
+    static const WCHAR truncatedW[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0',
+                                        '0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0',
+                                        '0','}',' ','\0','9','X','X','X','X','X','X','X','X','X'};
+    static const WCHAR truncated2W[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0',
+                                        '0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0',
+                                        '0','}',' ','\0','9','2','7','6','9','4','9','2','X','X'};
+    static const WCHAR truncated3W[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0',
+                                       '0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0',
+                                       '0','}',' ','\0','9','2','7','6','9','4','9','2','4','X'};
+    static const WCHAR truncated4W[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0',
+                                        '0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0',
+                                        '0','}',' ','\0','7','X','X','X','X','X','X','X','X','X'};
+    static const WCHAR expectedW[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0',
+                                      '0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0',
+                                      '0','}',' ','4','2','9','4','9','6','7','2','9','5',0};
+    static const WCHAR expected2W[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0',
+                                       '0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0',
+                                       '0','}',' ','1','3','5','7','9','\0','X','X','X','X','X'};
+    static const WCHAR expected3W[] = {'{','0','0','0','0','0','0','0','0','-','0','0','0','0','-','0','0','0',
+                                       '0','-','0','0','0','0','-','0','0','0','0','0','0','0','0','0','0','0',
+                                       '0','}',' ','0','\0','X','X','X','X','X','X','X','X','X'};
+    PROPERTYKEY prop = {GUID_MEMBERS(GUID_NULL), ~0U};
+    PROPERTYKEY prop2 = {GUID_MEMBERS(GUID_NULL), 13579};
+    PROPERTYKEY prop3 = {GUID_MEMBERS(GUID_NULL), 0};
+    WCHAR out[PKEYSTR_MAX];
+    HRESULT ret;
+
+    const struct
+    {
+        REFPROPERTYKEY pkey;
+        LPWSTR psz;
+        UINT cch;
+        HRESULT hr_expect;
+        const WCHAR *buf_expect;
+        int hr_broken;
+        HRESULT hr2;
+        int buf_broken;
+        const WCHAR *buf2;
+    } testcases[] =
+    {
+        {NULL, NULL, 0, E_POINTER},
+        {&prop, NULL, 0, E_POINTER},
+        {&prop, NULL, PKEYSTR_MAX, E_POINTER},
+        {NULL, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
+        {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, 0, 0, 1, fillerW},
+        {&prop, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
+        {&prop, out, GUIDSTRING_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
+        {&prop, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
+        {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, 1, S_OK, 1, truncatedW},
+        {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, 1, S_OK, 1, truncated2W},
+        {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, 1, S_OK, 1, truncated3W},
+        {&prop, out, PKEYSTR_MAX, S_OK, expectedW},
+        {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, 1, S_OK, 1, truncated4W},
+        {&prop2, out, GUIDSTRING_MAX + 6, S_OK, expected2W},
+        {&prop2, out, PKEYSTR_MAX, S_OK, expected2W},
+        {&prop3, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
+        {&prop3, out, GUIDSTRING_MAX + 2, S_OK, expected3W},
+        {&prop3, out, PKEYSTR_MAX, S_OK, expected3W},
+    };
+
+    int i;
+
+    for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++)
+    {
+        if (testcases[i].psz)
+            memcpy(testcases[i].psz, fillerW, PKEYSTR_MAX * sizeof(WCHAR));
+
+        ret = PSStringFromPropertyKey(testcases[i].pkey,
+                                      testcases[i].psz,
+                                      testcases[i].cch);
+        ok(ret == testcases[i].hr_expect ||
+           broken(testcases[i].hr_broken && ret == testcases[i].hr2), /* Vista/Win2k8 */
+           "[%d] Expected PSStringFromPropertyKey to return 0x%08x, got 0x%08x\n",
+           i, testcases[i].hr_expect, ret);
+
+        if (testcases[i].psz)
+            ok(!memcmp(testcases[i].psz, testcases[i].buf_expect, PKEYSTR_MAX * sizeof(WCHAR)) ||
+                broken(testcases[i].buf_broken &&
+                       !memcmp(testcases[i].psz, testcases[i].buf2, PKEYSTR_MAX * sizeof(WCHAR))), /* Vista/Win2k8 */
+               "[%d] Unexpected output contents\n", i);
+    }
+}
+
+static void test_PSPropertyKeyFromString(void)
+{
+    static const WCHAR emptyW[] = {0};
+    static const WCHAR fmtid_clsidW[] = {'S','t','d','F','o','n','t',' ','1',0};
+    static const WCHAR fmtid_truncatedW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-',0};
+    static const WCHAR fmtid_nobracketsW[] = {'1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                              '1','2','3','4','-','1','2','3','4','-',
+                                              '1','2','3','4','5','6','7','8','9','0','1','2',0};
+    static const WCHAR fmtid_badbracketW[] = {'X','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                              '1','2','3','4','-','1','2','3','4','-',
+                                              '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badcharW[] = {'{','X','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                           '1','2','3','4','-','1','2','3','4','-',
+                                           '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar2W[] = {'{','1','2','3','4','5','6','7','X','-','1','2','3','4','-',
+                                            '1','2','3','4','-','1','2','3','4','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_baddashW[] = {'{','1','2','3','4','5','6','7','8','X','1','2','3','4','-',
+                                           '1','2','3','4','-','1','2','3','4','-',
+                                           '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar3W[] = {'{','1','2','3','4','5','6','7','8','-','X','2','3','4','-',
+                                            '1','2','3','4','-','1','2','3','4','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar4W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','X','-',
+                                            '1','2','3','4','-','1','2','3','4','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_baddash2W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','X',
+                                            '1','2','3','4','-','1','2','3','4','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar5W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                            'X','2','3','4','-','1','2','3','4','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar6W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                            '1','2','3','X','-','1','2','3','4','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_baddash3W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                            '1','2','3','4','X','1','2','3','4','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar7W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                            '1','2','3','4','-','X','2','3','4','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar8W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                            '1','2','3','4','-','1','2','3','X','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_baddash4W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                            '1','2','3','4','-','1','2','3','4','X',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar9W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                            '1','2','3','4','-','1','2','3','4','-',
+                                            'X','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar9_adjW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                                '1','2','3','4','-','1','2','3','4','-',
+                                                '1','X','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar10W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','X','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar11W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','X','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar12W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','X','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badchar13W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','X','0','1','2','}',0};
+    static const WCHAR fmtid_badchar14W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','9','0','X','2','}',0};
+    static const WCHAR fmtid_badbracket2W[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','X',0};
+    static const WCHAR fmtid_spaceW[] = {' ','{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                         '1','2','3','4','-','1','2','3','4','-',
+                                         '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_spaceendW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                            '1','2','3','4','-','1','2','3','4','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',0};
+    static const WCHAR fmtid_spacesendW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',' ',' ',0};
+    static const WCHAR fmtid_nopidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                         '1','2','3','4','-','1','2','3','4','-',
+                                         '1','2','3','4','5','6','7','8','9','0','1','2','}',0};
+    static const WCHAR fmtid_badpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                          '1','2','3','4','-','1','2','3','4','-',
+                                          '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','D','E','A','D',0};
+    static const WCHAR fmtid_adjpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                          '1','2','3','4','-','1','2','3','4','-',
+                                          '1','2','3','4','5','6','7','8','9','0','1','2','}','1','3','5','7','9',0};
+    static const WCHAR fmtid_spacespidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',' ',' ','1','3','5','7','9',0};
+    static const WCHAR fmtid_negpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                          '1','2','3','4','-','1','2','3','4','-',
+                                          '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_negnegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','-','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_negnegnegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                                '1','2','3','4','-','1','2','3','4','-',
+                                                '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','-','-','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_negspacepidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','-',' ','1','3','5','7','9',0};
+    static const WCHAR fmtid_negspacenegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','-',' ','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_negspacespidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','-',' ','-',' ','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_pospidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                          '1','2','3','4','-','1','2','3','4','-',
+                                          '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','+','1','3','5','7','9',0};
+    static const WCHAR fmtid_posnegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','+','-','+','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_symbolpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','+','/','$','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_letterpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','A','B','C','D','1','3','5','7','9',0};
+    static const WCHAR fmtid_spacepadpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','3','5','7','9',' ',' ',' ',0};
+    static const WCHAR fmtid_spacemixpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1',' ','3',' ','5','7','9',' ',' ',' ',0};
+    static const WCHAR fmtid_tabpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                          '1','2','3','4','-','1','2','3','4','-',
+                                          '1','2','3','4','5','6','7','8','9','0','1','2','}','\t','1','3','5','7','9',0};
+    static const WCHAR fmtid_hexpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                          '1','2','3','4','-','1','2','3','4','-',
+                                          '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','0','x','D','E','A','D',0};
+    static const WCHAR fmtid_mixedpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                            '1','2','3','4','-','1','2','3','4','-',
+                                            '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','A','9','B','5','C','3','D','1',0};
+    static const WCHAR fmtid_overflowpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','2','3','4','5','6','7','8','9','0','1',0};
+    static const WCHAR fmtid_commapidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','9','0','1','2','}',',','1','3','5','7','9',0};
+    static const WCHAR fmtid_commaspidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','9','0','1','2','}',',',',',',','1','3','5','7','9',0};
+    static const WCHAR fmtid_commaspacepidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                                 '1','2','3','4','-','1','2','3','4','-',
+                                                 '1','2','3','4','5','6','7','8','9','0','1','2','}',',',' ','1','3','5','7','9',0};
+    static const WCHAR fmtid_spacecommapidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                                 '1','2','3','4','-','1','2','3','4','-',
+                                                 '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',',','1','3','5','7','9',0};
+    static const WCHAR fmtid_spccommaspcpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                                  '1','2','3','4','-','1','2','3','4','-',
+                                                  '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',',',' ','1','3','5','7','9',0};
+    static const WCHAR fmtid_spacescommaspidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                                   '1','2','3','4','-','1','2','3','4','-',
+                                                   '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',',',' ',',','1','3','5','7','9',0};
+    static const WCHAR fmtid_commanegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',',','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_spccommanegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',',','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_commaspcnegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',',',' ','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_spccommaspcnegpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',' ',',',' ','-','1','3','5','7','9',0};
+    static const WCHAR fmtid_commanegspcpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}',',','-',' ','1','3','5','7','9',0};
+    static const WCHAR fmtid_negcommapidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                               '1','2','3','4','-','1','2','3','4','-',
+                                               '1','2','3','4','5','6','7','8','9','0','1','2','}','-',',','1','3','5','7','9',0};
+    static const WCHAR fmtid_normalpidW[] = {'{','1','2','3','4','5','6','7','8','-','1','2','3','4','-',
+                                             '1','2','3','4','-','1','2','3','4','-',
+                                             '1','2','3','4','5','6','7','8','9','0','1','2','}',' ','1','3','5','7','9',0};
+    PROPERTYKEY out_init = {GUID_MEMBERS(dummy_guid), 0xdeadbeef};
+    PROPERTYKEY out;
+    HRESULT ret;
+    char guid_buf[40], guid_buf2[40];
+
+    const struct
+    {
+        LPCWSTR pwzString;
+        PROPERTYKEY *pkey;
+        HRESULT hr_expect;
+        PROPERTYKEY pkey_expect;
+    } testcases[] =
+    {
+        {NULL, NULL, E_POINTER},
+        {NULL, &out, E_POINTER, {GUID_MEMBERS(dummy_guid), 0xdeadbeef}},
+        {emptyW, NULL, E_POINTER},
+        {emptyW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}},
+        {fmtid_clsidW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}},
+        {fmtid_truncatedW, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_nobracketsW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}},
+        {fmtid_badbracketW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}},
+        {fmtid_badcharW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}},
+        {fmtid_badchar2W, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0}},
+        {fmtid_baddashW, &out, E_INVALIDARG, { {0x12345678,0,0,{0,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_badchar3W, &out, E_INVALIDARG, { {0x12345678,0,0,{0,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_badchar4W, &out, E_INVALIDARG, { {0x12345678,0,0,{0,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_baddash2W, &out, E_INVALIDARG, { {0x12345678,0,0,{0,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_badchar5W, &out, E_INVALIDARG, { {0x12345678,0x1234,0,{0,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_badchar6W, &out, E_INVALIDARG, { {0x12345678,0x1234,0,{0,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_baddash3W, &out, E_INVALIDARG, { {0x12345678,0x1234,0,{0,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_badchar7W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_badchar8W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_baddash4W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0,0,0,0,0,0,0}}, 0}},
+        {fmtid_badchar9W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0,0,0,0,0,0}}, 0}},
+        {fmtid_badchar9_adjW, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0,0,0,0,0,0}}, 0}},
+        {fmtid_badchar10W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0,0,0,0,0}}, 0}},
+        {fmtid_badchar11W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0,0,0,0}}, 0}},
+        {fmtid_badchar12W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0x56,0,0,0}}, 0}},
+        {fmtid_badchar13W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0x56,0x78,0,0}}, 0}},
+        {fmtid_badchar14W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0x56,0x78,0x90,0}}, 0}},
+        {fmtid_badbracket2W, &out, E_INVALIDARG, { {0x12345678,0x1234,0x1234,{0x12,0x34,0x12,0x34,0x56,0x78,0x90,0x00}}, 0 }},
+        {fmtid_spaceW, &out, E_INVALIDARG, {GUID_MEMBERS(GUID_NULL), 0 }},
+        {fmtid_spaceendW, &out, E_INVALIDARG, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_spacesendW, &out, E_INVALIDARG, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_nopidW, &out, E_INVALIDARG, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_badpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_adjpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}},
+        {fmtid_spacespidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}},
+        {fmtid_negpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}},
+        {fmtid_negnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}},
+        {fmtid_negnegnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_negspacepidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}},
+        {fmtid_negspacenegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}},
+        {fmtid_negspacespidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_pospidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_posnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_symbolpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_letterpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_spacepadpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}},
+        {fmtid_spacemixpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 1}},
+        {fmtid_tabpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_hexpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_mixedpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_overflowpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 3755744309U}},
+        {fmtid_commapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}},
+        {fmtid_commaspidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_commaspacepidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}},
+        {fmtid_spacecommapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}},
+        {fmtid_spccommaspcpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}},
+        {fmtid_spacescommaspidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_commanegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}},
+        {fmtid_spccommanegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}},
+        {fmtid_commaspcnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}},
+        {fmtid_spccommaspcnegpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 4294953717U}},
+        {fmtid_commanegspcpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0U}},
+        {fmtid_negcommapidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 0}},
+        {fmtid_normalpidW, &out, S_OK, {GUID_MEMBERS(expect_guid), 13579}},
+    };
+
+    int i;
+
+    for (i = 0; i < sizeof(testcases)/sizeof(testcases[0]); i++)
+    {
+        if (testcases[i].pkey)
+            *testcases[i].pkey = out_init;
+
+        ret = PSPropertyKeyFromString(testcases[i].pwzString, testcases[i].pkey);
+        ok(ret == testcases[i].hr_expect,
+           "[%d] Expected PSPropertyKeyFromString to return 0x%08x, got 0x%08x\n",
+           i, testcases[i].hr_expect, ret);
+
+        if (testcases[i].pkey)
+        {
+            ok(IsEqualGUID(&testcases[i].pkey->fmtid, &testcases[i].pkey_expect.fmtid),
+               "[%d] Expected GUID %s, got %s\n",
+               i, show_guid(&testcases[i].pkey_expect.fmtid, guid_buf), show_guid(&testcases[i].pkey->fmtid, guid_buf2));
+            ok(testcases[i].pkey->pid == testcases[i].pkey_expect.pid,
+               "[%d] Expected property ID %u, got %u\n",
+               i, testcases[i].pkey_expect.pid, testcases[i].pkey->pid);
+        }
+    }
+}
+
+static void test_PSRefreshPropertySchema(void)
+{
+    HRESULT ret;
+
+    ret = PSRefreshPropertySchema();
+    todo_wine
+    ok(ret == CO_E_NOTINITIALIZED,
+       "Expected PSRefreshPropertySchema to return CO_E_NOTINITIALIZED, got 0x%08x\n", ret);
+
+    CoInitialize(NULL);
+
+    ret = PSRefreshPropertySchema();
+    ok(ret == S_OK,
+       "Expected PSRefreshPropertySchema to return S_OK, got 0x%08x\n", ret);
+
+    CoUninitialize();
+}
+
+static void test_InitPropVariantFromGUIDAsString(void)
+{
+    PROPVARIANT propvar;
+    VARIANT var;
+    HRESULT hres;
+    int i;
+
+    const struct {
+        REFGUID guid;
+        const char *str;
+    } testcases[] = {
+        {&IID_NULL,             "{00000000-0000-0000-0000-000000000000}" },
+        {&dummy_guid,           "{DEADBEEF-DEAD-BEEF-DEAD-BEEFCAFEBABE}" },
+    };
+
+    hres = InitPropVariantFromGUIDAsString(NULL, &propvar);
+    ok(hres == E_FAIL, "InitPropVariantFromGUIDAsString returned %x\n", hres);
+
+    if(0) {
+        /* Returns strange data on Win7, crashes on older systems */
+        InitVariantFromGUIDAsString(NULL, &var);
+
+        /* Crashes on windows */
+        InitPropVariantFromGUIDAsString(&IID_NULL, NULL);
+        InitVariantFromGUIDAsString(&IID_NULL, NULL);
+    }
+
+    for(i=0; i<sizeof(testcases)/sizeof(testcases[0]); i++) {
+        memset(&propvar, 0, sizeof(PROPVARIANT));
+        hres = InitPropVariantFromGUIDAsString(testcases[i].guid, &propvar);
+        ok(hres == S_OK, "%d) InitPropVariantFromGUIDAsString returned %x\n", i, hres);
+        ok(propvar.vt == VT_LPWSTR, "%d) propvar.vt = %d\n", i, propvar.vt);
+        ok(!strcmp_wa(propvar.u.pwszVal, testcases[i].str), "%d) propvar.u.pwszVal = %s\n",
+                i, wine_dbgstr_w(propvar.u.pwszVal));
+        CoTaskMemFree(propvar.u.pwszVal);
+
+        memset(&var, 0, sizeof(VARIANT));
+        hres = InitVariantFromGUIDAsString(testcases[i].guid, &var);
+        ok(hres == S_OK, "%d) InitVariantFromGUIDAsString returned %x\n", i, hres);
+        ok(V_VT(&var) == VT_BSTR, "%d) V_VT(&var) = %d\n", i, V_VT(&var));
+        ok(SysStringLen(V_BSTR(&var)) == 38, "SysStringLen returned %d\n",
+                SysStringLen(V_BSTR(&var)));
+        ok(!strcmp_wa(V_BSTR(&var), testcases[i].str), "%d) V_BSTR(&var) = %s\n",
+                i, wine_dbgstr_w(V_BSTR(&var)));
+        VariantClear(&var);
+    }
+}
+
+static void test_InitPropVariantFromBuffer(void)
+{
+    static const char data_in[] = "test";
+    PROPVARIANT propvar;
+    VARIANT var;
+    HRESULT hres;
+    void *data_out;
+    LONG size;
+
+    hres = InitPropVariantFromBuffer(NULL, 0, &propvar);
+    ok(hres == S_OK, "InitPropVariantFromBuffer returned %x\n", hres);
+    ok(propvar.vt == (VT_VECTOR|VT_UI1), "propvar.vt = %d\n", propvar.vt);
+    ok(propvar.u.caub.cElems == 0, "cElems = %d\n", propvar.u.caub.cElems == 0);
+    PropVariantClear(&propvar);
+
+    hres = InitPropVariantFromBuffer(data_in, 4, &propvar);
+    ok(hres == S_OK, "InitPropVariantFromBuffer returned %x\n", hres);
+    ok(propvar.vt == (VT_VECTOR|VT_UI1), "propvar.vt = %d\n", propvar.vt);
+    ok(propvar.u.caub.cElems == 4, "cElems = %d\n", propvar.u.caub.cElems == 0);
+    ok(!memcmp(propvar.u.caub.pElems, data_in, 4), "Data inside array is incorrect\n");
+    PropVariantClear(&propvar);
+
+    hres = InitVariantFromBuffer(NULL, 0, &var);
+    ok(hres == S_OK, "InitVariantFromBuffer returned %x\n", hres);
+    ok(V_VT(&var) == (VT_ARRAY|VT_UI1), "V_VT(&var) = %d\n", V_VT(&var));
+    size = SafeArrayGetDim(V_ARRAY(&var));
+    ok(size == 1, "SafeArrayGetDim returned %d\n", size);
+    hres = SafeArrayGetLBound(V_ARRAY(&var), 1, &size);
+    ok(hres == S_OK, "SafeArrayGetLBound returned %x\n", hres);
+    ok(size == 0, "LBound = %d\n", size);
+    hres = SafeArrayGetUBound(V_ARRAY(&var), 1, &size);
+    ok(hres == S_OK, "SafeArrayGetUBound returned %x\n", hres);
+    ok(size == -1, "UBound = %d\n", size);
+    VariantClear(&var);
+
+    hres = InitVariantFromBuffer(data_in, 4, &var);
+    ok(hres == S_OK, "InitVariantFromBuffer returned %x\n", hres);
+    ok(V_VT(&var) == (VT_ARRAY|VT_UI1), "V_VT(&var) = %d\n", V_VT(&var));
+    size = SafeArrayGetDim(V_ARRAY(&var));
+    ok(size == 1, "SafeArrayGetDim returned %d\n", size);
+    hres = SafeArrayGetLBound(V_ARRAY(&var), 1, &size);
+    ok(hres == S_OK, "SafeArrayGetLBound returned %x\n", hres);
+    ok(size == 0, "LBound = %d\n", size);
+    hres = SafeArrayGetUBound(V_ARRAY(&var), 1, &size);
+    ok(hres == S_OK, "SafeArrayGetUBound returned %x\n", hres);
+    ok(size == 3, "UBound = %d\n", size);
+    hres = SafeArrayAccessData(V_ARRAY(&var), &data_out);
+    ok(hres == S_OK, "SafeArrayAccessData failed %x\n", hres);
+    ok(!memcmp(data_in, data_out, 4), "Data inside safe array is incorrect\n");
+    hres = SafeArrayUnaccessData(V_ARRAY(&var));
+    ok(hres == S_OK, "SafeArrayUnaccessData failed %x\n", hres);
+    VariantClear(&var);
+}
+
+static void test_PropVariantToGUID(void)
+{
+    PROPVARIANT propvar;
+    VARIANT var;
+    GUID guid;
+    HRESULT hres;
+
+    hres = InitPropVariantFromGUIDAsString(&IID_NULL, &propvar);
+    ok(hres == S_OK, "InitPropVariantFromGUIDAsString failed %x\n", hres);
+
+    hres = PropVariantToGUID(&propvar, &guid);
+    ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres);
+    ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
+    PropVariantClear(&propvar);
+
+    hres = InitPropVariantFromGUIDAsString(&dummy_guid, &propvar);
+    ok(hres == S_OK, "InitPropVariantFromGUIDAsString failed %x\n", hres);
+
+    hres = PropVariantToGUID(&propvar, &guid);
+    ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres);
+    ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
+
+    ok(propvar.vt == VT_LPWSTR, "incorrect PROPVARIANT type: %d\n", propvar.vt);
+    propvar.u.pwszVal[1] = 'd';
+    propvar.u.pwszVal[2] = 'E';
+    propvar.u.pwszVal[3] = 'a';
+    hres = PropVariantToGUID(&propvar, &guid);
+    ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres);
+    ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
+
+    propvar.u.pwszVal[1] = 'z';
+    hres = PropVariantToGUID(&propvar, &guid);
+    ok(hres == E_INVALIDARG, "PropVariantToGUID returned %x\n", hres);
+    PropVariantClear(&propvar);
+
+
+    hres = InitVariantFromGUIDAsString(&IID_NULL, &var);
+    ok(hres == S_OK, "InitVariantFromGUIDAsString failed %x\n", hres);
+
+    hres = VariantToGUID(&var, &guid);
+    ok(hres == S_OK, "VariantToGUID failed %x\n", hres);
+    ok(!memcmp(&IID_NULL, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
+    VariantClear(&var);
+
+    hres = InitVariantFromGUIDAsString(&dummy_guid, &var);
+    ok(hres == S_OK, "InitVariantFromGUIDAsString failed %x\n", hres);
+
+    hres = VariantToGUID(&var, &guid);
+    ok(hres == S_OK, "VariantToGUID failed %x\n", hres);
+    ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
+
+    ok(V_VT(&var) == VT_BSTR, "incorrect VARIANT type: %d\n", V_VT(&var));
+    V_BSTR(&var)[1] = 'z';
+    hres = VariantToGUID(&var, &guid);
+    ok(hres == E_FAIL, "VariantToGUID returned %x\n", hres);
+
+    V_BSTR(&var)[1] = 'd';
+    propvar.vt = V_VT(&var);
+    propvar.u.bstrVal = V_BSTR(&var);
+    V_VT(&var) = VT_EMPTY;
+    hres = PropVariantToGUID(&propvar, &guid);
+    ok(hres == S_OK, "PropVariantToGUID failed %x\n", hres);
+    ok(!memcmp(&dummy_guid, &guid, sizeof(GUID)), "incorrect GUID created: %s\n", show_guid(&guid, NULL));
+    PropVariantClear(&propvar);
+}
+
+static void test_PropVariantCompare(void)
+{
+    PROPVARIANT empty, null, emptyarray, i2_0, i2_2, i4_large, i4_largeneg, i4_2, str_2, str_02, str_b;
+    INT res;
+    static const WCHAR str_2W[] = {'2', 0};
+    static const WCHAR str_02W[] = {'0', '2', 0};
+    static const WCHAR str_bW[] = {'b', 0};
+    SAFEARRAY emptysafearray;
+
+    PropVariantInit(&empty);
+    PropVariantInit(&null);
+    PropVariantInit(&emptyarray);
+    PropVariantInit(&i2_0);
+    PropVariantInit(&i2_2);
+    PropVariantInit(&i4_large);
+    PropVariantInit(&i4_largeneg);
+    PropVariantInit(&i4_2);
+    PropVariantInit(&str_2);
+    PropVariantInit(&str_b);
+
+    empty.vt = VT_EMPTY;
+    null.vt = VT_NULL;
+    emptyarray.vt = VT_ARRAY | VT_I4;
+    emptyarray.u.parray = &emptysafearray;
+    emptysafearray.cDims = 1;
+    emptysafearray.fFeatures = FADF_FIXEDSIZE;
+    emptysafearray.cbElements = 4;
+    emptysafearray.cLocks = 0;
+    emptysafearray.pvData = NULL;
+    emptysafearray.rgsabound[0].cElements = 0;
+    emptysafearray.rgsabound[0].lLbound = 0;
+    i2_0.vt = VT_I2;
+    i2_0.u.iVal = 0;
+    i2_2.vt = VT_I2;
+    i2_2.u.iVal = 2;
+    i4_large.vt = VT_I4;
+    i4_large.u.lVal = 65536;
+    i4_largeneg.vt = VT_I4;
+    i4_largeneg.u.lVal = -65536;
+    i4_2.vt = VT_I4;
+    i4_2.u.lVal = 2;
+    str_2.vt = VT_BSTR;
+    str_2.u.bstrVal = SysAllocString(str_2W);
+    str_02.vt = VT_BSTR;
+    str_02.u.bstrVal = SysAllocString(str_02W);
+    str_b.vt = VT_BSTR;
+    str_b.u.bstrVal = SysAllocString(str_bW);
+
+    res = PropVariantCompareEx(&empty, &empty, 0, 0);
+    ok(res == 0, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&empty, &null, 0, 0);
+    ok(res == 0, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&null, &emptyarray, 0, 0);
+    ok(res == 0, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&null, &i2_0, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i2_0, &null, 0, 0);
+    ok(res == 1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&null, &i2_0, 0, PVCF_TREATEMPTYASGREATERTHAN);
+    ok(res == 1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i2_0, &null, 0, PVCF_TREATEMPTYASGREATERTHAN);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i2_2, &i2_0, 0, 0);
+    ok(res == 1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i2_0, &i2_2, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    /* Always return -1 if second value cannot be converted to first type */
+    res = PropVariantCompareEx(&i2_0, &i4_large, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i2_0, &i4_largeneg, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i4_large, &i2_0, 0, 0);
+    ok(res == 1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i4_largeneg, &i2_0, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i2_2, &i4_2, 0, 0);
+    ok(res == 0, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i2_2, &str_2, 0, 0);
+    todo_wine ok(res == 0, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i2_2, &str_02, 0, 0);
+    todo_wine ok(res == 0, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&str_2, &i2_2, 0, 0);
+    todo_wine ok(res == 0, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&str_02, &i2_2, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&str_02, &str_2, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&str_02, &str_b, 0, 0);
+    ok(res == -1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&str_2, &str_02, 0, 0);
+    ok(res == 1, "res=%i\n", res);
+
+    res = PropVariantCompareEx(&i4_large, &str_b, 0, 0);
+    todo_wine ok(res == -5 /* ??? */, "res=%i\n", res);
+
+    SysFreeString(str_2.u.bstrVal);
+    SysFreeString(str_02.u.bstrVal);
+    SysFreeString(str_b.u.bstrVal);
+}
+
+static inline const char* debugstr_longlong(ULONGLONG ll)
+{
+    static char string[17];
+    if (sizeof(ll) > sizeof(unsigned long) && ll >> 32)
+        sprintf(string, "%lx%08lx", (unsigned long)(ll >> 32), (unsigned long)ll);
+    else
+        sprintf(string, "%lx", (unsigned long)ll);
+    return string;
+}
+
+static void test_intconversions(void)
+{
+    PROPVARIANT propvar;
+    SHORT sval;
+    USHORT usval;
+    LONG lval;
+    ULONG ulval;
+    LONGLONG llval;
+    ULONGLONG ullval;
+    HRESULT hr;
+
+    propvar.vt = 0xdead;
+    hr = PropVariantClear(&propvar);
+    ok (FAILED(hr), "PropVariantClear fails on invalid vt.\n");
+
+    propvar.vt = VT_I8;
+    PropVariantClear(&propvar);
+
+    propvar.vt = VT_I8;
+    propvar.u.hVal.QuadPart = (LONGLONG)1 << 63;
+
+    hr = PropVariantToInt64(&propvar, &llval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(llval == (LONGLONG)1 << 63, "got wrong value %s\n", debugstr_longlong(llval));
+
+    hr = PropVariantToUInt64(&propvar, &ullval);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
+
+    hr = PropVariantToInt32(&propvar, &lval);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
+
+    hr = PropVariantToUInt32(&propvar, &ulval);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
+
+    hr = PropVariantToInt16(&propvar, &sval);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
+
+    hr = PropVariantToUInt16(&propvar, &usval);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
+
+    propvar.vt = VT_UI8;
+    propvar.u.uhVal.QuadPart = 5;
+
+    hr = PropVariantToInt64(&propvar, &llval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(llval == 5, "got wrong value %s\n", debugstr_longlong(llval));
+
+    hr = PropVariantToUInt64(&propvar, &ullval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(ullval == 5, "got wrong value %s\n", debugstr_longlong(ullval));
+
+    hr = PropVariantToInt32(&propvar, &lval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(lval == 5, "got wrong value %d\n", lval);
+
+    hr = PropVariantToUInt32(&propvar, &ulval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(ulval == 5, "got wrong value %d\n", ulval);
+
+    hr = PropVariantToInt16(&propvar, &sval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(sval == 5, "got wrong value %d\n", sval);
+
+    hr = PropVariantToUInt16(&propvar, &usval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(usval == 5, "got wrong value %d\n", usval);
+
+    propvar.vt = VT_I8;
+    propvar.u.hVal.QuadPart = -5;
+
+    hr = PropVariantToInt64(&propvar, &llval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(llval == -5, "got wrong value %s\n", debugstr_longlong(llval));
+
+    hr = PropVariantToUInt64(&propvar, &ullval);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
+
+    hr = PropVariantToInt32(&propvar, &lval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(lval == -5, "got wrong value %d\n", lval);
+
+    hr = PropVariantToUInt32(&propvar, &ulval);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
+
+    hr = PropVariantToInt16(&propvar, &sval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(sval == -5, "got wrong value %d\n", sval);
+
+    hr = PropVariantToUInt16(&propvar, &usval);
+    ok(hr == HRESULT_FROM_WIN32(ERROR_ARITHMETIC_OVERFLOW), "hr=%x\n", hr);
+
+    propvar.vt = VT_UI4;
+    propvar.u.ulVal = 6;
+
+    hr = PropVariantToInt64(&propvar, &llval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(llval == 6, "got wrong value %s\n", debugstr_longlong(llval));
+
+    propvar.vt = VT_I4;
+    propvar.u.lVal = -6;
+
+    hr = PropVariantToInt64(&propvar, &llval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(llval == -6, "got wrong value %s\n", debugstr_longlong(llval));
+
+    propvar.vt = VT_UI2;
+    propvar.u.uiVal = 7;
+
+    hr = PropVariantToInt64(&propvar, &llval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(llval == 7, "got wrong value %s\n", debugstr_longlong(llval));
+
+    propvar.vt = VT_I2;
+    propvar.u.iVal = -7;
+
+    hr = PropVariantToInt64(&propvar, &llval);
+    ok(hr == S_OK, "hr=%x\n", hr);
+    ok(llval == -7, "got wrong value %s\n", debugstr_longlong(llval));
+}
+
+START_TEST(propsys)
+{
+    test_PSStringFromPropertyKey();
+    test_PSPropertyKeyFromString();
+    test_PSRefreshPropertySchema();
+    test_InitPropVariantFromGUIDAsString();
+    test_InitPropVariantFromBuffer();
+    test_PropVariantToGUID();
+    test_PropVariantCompare();
+    test_intconversions();
+}
diff --git a/rostests/winetests/propsys/testlist.c b/rostests/winetests/propsys/testlist.c
new file mode 100644
index 00000000000..3773d6ad652
--- /dev/null
+++ b/rostests/winetests/propsys/testlist.c
@@ -0,0 +1,14 @@
+/* Automatically generated file; DO NOT EDIT!! */
+
+#define STANDALONE
+#include <wine/test.h>
+
+extern void func_propstore(void);
+extern void func_propsys(void);
+
+const struct test winetest_testlist[] =
+{
+    { "propstore", func_propstore },
+    { "propsys", func_propsys },
+    { 0, 0 }
+};