diff --git a/dlls/propsys/tests/Makefile.in b/dlls/propsys/tests/Makefile.in
index d30f983647a..e3c774bccbd 100644
--- a/dlls/propsys/tests/Makefile.in
+++ b/dlls/propsys/tests/Makefile.in
@@ -3,7 +3,7 @@ TOPOBJDIR = ../../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 TESTDLL   = propsys.dll
-IMPORTS   = propsys
+IMPORTS   = propsys ole32
 
 C_SRCS = \
 	propsys.c
diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c
index cc5585bf867..8c11c42cdf3 100644
--- a/dlls/propsys/tests/propsys.c
+++ b/dlls/propsys/tests/propsys.c
@@ -1,6 +1,7 @@
 /*
  * 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
@@ -21,6 +22,7 @@
 #define COBJMACROS
 
 #include <stdarg.h>
+#include <stdio.h>
 
 #include "windef.h"
 #include "winbase.h"
@@ -30,6 +32,19 @@
 #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);
+
+static char *show_guid(const GUID *guid, char *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 void test_PSStringFromPropertyKey(void)
 {
@@ -134,7 +149,243 @@ static void test_PSStringFromPropertyKey(void)
     }
 }
 
+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_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 = {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, out_init},
+        {emptyW, NULL, E_POINTER},
+        {emptyW, &out, E_INVALIDARG, {GUID_NULL, 0}},
+        {fmtid_clsidW, &out, E_INVALIDARG, {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_NULL, 0}},
+        {fmtid_badbracketW, &out, E_INVALIDARG, {GUID_NULL, 0}},
+        {fmtid_badcharW, &out, E_INVALIDARG, {GUID_NULL, 0}},
+        {fmtid_badchar2W, &out, E_INVALIDARG, {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_NULL, 0 }},
+        {fmtid_spaceendW, &out, E_INVALIDARG, {expect_guid, 0}},
+        {fmtid_spacesendW, &out, E_INVALIDARG, {expect_guid, 0}},
+        {fmtid_nopidW, &out, E_INVALIDARG, {expect_guid, 0}},
+        {fmtid_badpidW, &out, S_OK, {expect_guid, 0}},
+        {fmtid_adjpidW, &out, S_OK, {expect_guid, 13579}},
+        {fmtid_spacespidW, &out, S_OK, {expect_guid, 13579}},
+        {fmtid_negpidW, &out, S_OK, {expect_guid, 13579}},
+        {fmtid_negnegpidW, &out, S_OK, {expect_guid, 4294953717U}},
+        {fmtid_negnegnegpidW, &out, S_OK, {expect_guid, 0}},
+        {fmtid_negspacepidW, &out, S_OK, {expect_guid, 13579}},
+        {fmtid_negspacenegpidW, &out, S_OK, {expect_guid, 4294953717U}},
+        {fmtid_negspacespidW, &out, S_OK, {expect_guid, 0}},
+        {fmtid_pospidW, &out, S_OK, {expect_guid, 0}},
+        {fmtid_posnegpidW, &out, S_OK, {expect_guid, 0}},
+        {fmtid_symbolpidW, &out, S_OK, {expect_guid, 0}},
+        {fmtid_letterpidW, &out, S_OK, {expect_guid, 0}},
+        {fmtid_spacepadpidW, &out, S_OK, {expect_guid, 13579}},
+        {fmtid_spacemixpidW, &out, S_OK, {expect_guid, 1}},
+        {fmtid_tabpidW, &out, S_OK, {expect_guid, 0}},
+        {fmtid_hexpidW, &out, S_OK, {expect_guid, 0}},
+        {fmtid_mixedpidW, &out, S_OK, {expect_guid, 0}},
+        {fmtid_overflowpidW, &out, S_OK, {expect_guid, 3755744309U}},
+        {fmtid_normalpidW, &out, S_OK, {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);
+        }
+    }
+}
+
 START_TEST(propsys)
 {
     test_PSStringFromPropertyKey();
+    test_PSPropertyKeyFromString();
 }