MishaProductions
diff --git a/‎dll/win32/propsys/CMakeLists.txt‎
Lines changed: 3 additions & 2 deletions b/‎dll/win32/propsys/CMakeLists.txt‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎dll/win32/propsys/precomp.h‎
Lines changed: 2 additions & 1 deletion b/‎dll/win32/propsys/precomp.h‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎dll/win32/propsys/propstore.c‎
Lines changed: 23 additions & 3 deletions b/‎dll/win32/propsys/propstore.c‎
Lines changed: 23 additions & 3 deletions
diff --git a/‎dll/win32/propsys/propsys.spec‎
Lines changed: 9 additions & 9 deletions b/‎dll/win32/propsys/propsys.spec‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎dll/win32/propsys/propsys_main.c‎
Lines changed: 12 additions & 48 deletions b/‎dll/win32/propsys/propsys_main.c‎
Lines changed: 12 additions & 48 deletions
diff --git a/‎dll/win32/propsys/propsys_private.h‎
Lines changed: 1 addition & 1 deletion b/‎dll/win32/propsys/propsys_private.h‎
Lines changed: 1 addition & 1 deletion
@@ -1,6 +1,7 @@
 
 include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
-add_definitions(-D__WINESRC__)
+remove_definitions(-D_CRT_NON_CONFORMING_SWPRINTFS -D__ROS_LONG64__)
+add_definitions(-D__WINESRC__ -D_PROPSYS_)
 spec2def(propsys.dll propsys.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
@@ -16,7 +17,7 @@ add_library(propsys MODULE
     ${CMAKE_CURRENT_BINARY_DIR}/propsys.def)
 
 set_module_type(propsys win32dll)
-target_link_libraries(propsys uuid wine)
+target_link_libraries(propsys uuid wine wine_dll_register)
 add_importlibs(propsys ole32 oleaut32 msvcrt kernel32 ntdll)
 add_pch(propsys precomp.h SOURCE)
 add_cd_file(TARGET propsys DESTINATION reactos/system32 FOR all)
@@ -9,13 +9,14 @@
 #define COM_NO_WINDOWS_H
 
 #define COBJMACROS
-#define NONAMELESSUNION
 
 #include <windef.h>
 #include <winbase.h>
 #include <winnls.h>
 #include <objbase.h>
 #include <propsys.h>
+#include <oleauto.h>
+#include <oaidl.h>
 
 #include <wine/debug.h>
 
 
@@ -92,7 +92,7 @@ static ULONG WINAPI PropertyStore_AddRef(IPropertyStoreCache *iface)
     PropertyStore *This = impl_from_IPropertyStoreCache(iface);
     ULONG ref = InterlockedIncrement(&This->ref);
 
-    TRACE("(%p) refcount=%u\n", iface, ref);
+    TRACE("(%p) refcount=%lu\n", iface, ref);
 
     return ref;
 }
@@ -113,7 +113,7 @@ static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface)
     PropertyStore *This = impl_from_IPropertyStoreCache(iface);
     ULONG ref = InterlockedDecrement(&This->ref);
 
-    TRACE("(%p) refcount=%u\n", iface, ref);
+    TRACE("(%p) refcount=%lu\n", iface, ref);
 
     if (ref == 0)
     {
@@ -159,7 +159,7 @@ static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface,
     propstore_value *value;
     HRESULT hr;
 
-    TRACE("%p,%d,%p\n", iface, iProp, pkey);
+    TRACE("%p,%ld,%p\n", iface, iProp, pkey);
 
     if (!pkey)
         return E_POINTER;
@@ -464,7 +464,11 @@ HRESULT PropertyStore_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv
 
     This->IPropertyStoreCache_iface.lpVtbl = &PropertyStore_Vtbl;
     This->ref = 1;
+#ifdef __REACTOS__
     InitializeCriticalSection(&This->lock);
+#else
+    InitializeCriticalSectionEx(&This->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO);
+#endif
     This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStore.lock");
     list_init(&This->formats);
 
@@ -473,3 +477,19 @@ HRESULT PropertyStore_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv
 
     return ret;
 }
+
+HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown *obj, DWORD access, REFIID riid, void **ret)
+{
+    HRESULT hr;
+
+    TRACE("(%p, %ld, %s, %p)\n", obj, access, debugstr_guid(riid), ret);
+
+    if (!obj || !ret)
+        return E_POINTER;
+
+    if (IsEqualIID(riid, &IID_IPropertyStore) && SUCCEEDED(hr = IUnknown_QueryInterface(obj, riid, ret)))
+        return hr;
+
+    FIXME("Unimplemented for %s.\n", debugstr_guid(riid));
+    return E_NOTIMPL;
+}
@@ -42,15 +42,15 @@
 @ stub InitPropVariantFromResource
 @ stub InitPropVariantFromStrRet
 @ stub InitPropVariantFromStringAsVector
-@ stub InitPropVariantFromStringVector
+@ stdcall InitPropVariantFromStringVector(ptr long ptr)
 @ stub InitPropVariantFromUInt16Vector
 @ stub InitPropVariantFromUInt32Vector
 @ stub InitPropVariantFromUInt64Vector
 @ stub InitPropVariantVectorFromPropVariant
 @ stub InitVariantFromBooleanArray
 @ stdcall InitVariantFromBuffer(ptr long ptr)
 @ stub InitVariantFromDoubleArray
-@ stub InitVariantFromFileTime
+@ stdcall InitVariantFromFileTime(ptr ptr)
 @ stub InitVariantFromFileTimeArray
 @ stdcall InitVariantFromGUIDAsString(ptr ptr)
 @ stub InitVariantFromInt16Array
@@ -69,7 +69,7 @@
 @ stdcall PSCreateMemoryPropertyStore(ptr ptr)
 @ stub PSCreateMultiplexPropertyStore
 @ stub PSCreatePropertyChangeArray
-@ stub PSCreatePropertyStoreFromObject
+@ stdcall PSCreatePropertyStoreFromObject(ptr long ptr ptr)
 @ stub PSCreatePropertyStoreFromPropertySetStorage
 @ stub PSCreateSimplePropertyChange
 @ stub PSEnumeratePropertyDescriptions
@@ -107,7 +107,7 @@
 @ stub PropVariantGetUInt16Elem
 @ stub PropVariantGetUInt32Elem
 @ stub PropVariantGetUInt64Elem
-@ stub PropVariantToBSTR
+@ stdcall PropVariantToBSTR(ptr ptr)
 @ stdcall PropVariantToBoolean(ptr ptr)
 @ stub PropVariantToBooleanVector
 @ stub PropVariantToBooleanVectorAlloc
@@ -146,12 +146,12 @@
 @ stdcall PropVariantToUInt32(ptr ptr)
 @ stub PropVariantToUInt32Vector
 @ stub PropVariantToUInt32VectorAlloc
-@ stub PropVariantToUInt32WithDefault
+@ stdcall PropVariantToUInt32WithDefault(ptr long)
 @ stdcall PropVariantToUInt64(ptr ptr)
 @ stub PropVariantToUInt64Vector
 @ stub PropVariantToUInt64VectorAlloc
 @ stub PropVariantToUInt64WithDefault
-@ stub PropVariantToVariant
+@ stdcall PropVariantToVariant(ptr ptr)
 @ stub StgDeserializePropVariant
 @ stub StgSerializePropVariant
 @ stub VariantCompare
@@ -189,13 +189,13 @@
 @ stub VariantToInt64Array
 @ stub VariantToInt64ArrayAlloc
 @ stub VariantToInt64WithDefault
-@ stub VariantToPropVariant
+@ stdcall VariantToPropVariant(ptr ptr)
 @ stub VariantToStrRet
-@ stub VariantToString
+@ stdcall VariantToString(ptr ptr long)
 @ stub VariantToStringAlloc
 @ stub VariantToStringArray
 @ stub VariantToStringArrayAlloc
-@ stub VariantToStringWithDefault
+@ stdcall VariantToStringWithDefault(ptr wstr)
 @ stub VariantToUInt16
 @ stub VariantToUInt16Array
 @ stub VariantToUInt16ArrayAlloc
 
@@ -22,9 +22,6 @@
 #define COBJMACROS
 
 #include <stdarg.h>
-#ifdef __REACTOS__
-#include <wchar.h>
-#endif
 
 #include "windef.h"
 #include "winbase.h"
@@ -37,35 +34,6 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(propsys);
 
-static HINSTANCE propsys_hInstance;
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
-{
-    TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
-
-    switch (fdwReason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            propsys_hInstance = hinstDLL;
-            DisableThreadLibraryCalls(hinstDLL);
-            break;
-    }
-
-    return TRUE;
-}
-
-HRESULT WINAPI DllRegisterServer(void)
-{
-    return __wine_register_resources( propsys_hInstance );
-}
-
-HRESULT WINAPI DllUnregisterServer(void)
-{
-    return __wine_unregister_resources( propsys_hInstance );
-}
-
 static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)
 {
     *ppv = NULL;
@@ -135,11 +103,6 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
     return CLASS_E_CLASSNOTAVAILABLE;
 }
 
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-    return S_FALSE;
-}
-
 static HRESULT WINAPI propsys_QueryInterface(IPropertySystem *iface, REFIID riid, void **obj)
 {
     *obj = NULL;
@@ -194,7 +157,7 @@ static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface,
     REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags,
     LPWSTR dest, DWORD destlen)
 {
-    FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen);
+    FIXME("%p %p %x %p %ld: stub\n", key, propvar, flags, dest, destlen);
     return E_NOTIMPL;
 }
 
@@ -283,12 +246,6 @@ HRESULT WINAPI PSRefreshPropertySchema(void)
 
 HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch)
 {
-    static const WCHAR guid_fmtW[] = {'{','%','0','8','X','-','%','0','4','X','-',
-                                      '%','0','4','X','-','%','0','2','X','%','0','2','X','-',
-                                      '%','0','2','X','%','0','2','X','%','0','2','X',
-                                      '%','0','2','X','%','0','2','X','%','0','2','X','}',0};
-    static const WCHAR pid_fmtW[] = {'%','u',0};
-
     WCHAR pidW[PKEY_PIDSTR_MAX + 1];
     LPWSTR p = psz;
     int len;
@@ -308,8 +265,8 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch
         return E_NOT_SUFFICIENT_BUFFER;
     }
 
-    swprintf(psz, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2,
-             pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1],
+    swprintf(psz, cch, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", pkey->fmtid.Data1,
+             pkey->fmtid.Data2, pkey->fmtid.Data3, pkey->fmtid.Data4[0], pkey->fmtid.Data4[1],
              pkey->fmtid.Data4[2], pkey->fmtid.Data4[3], pkey->fmtid.Data4[4],
              pkey->fmtid.Data4[5], pkey->fmtid.Data4[6], pkey->fmtid.Data4[7]);
 
@@ -318,7 +275,7 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch
     *p++ = ' ';
     cch -= GUIDSTRING_MAX - 1 + 1;
 
-    len = swprintf(pidW, pid_fmtW, pkey->pid);
+    len = swprintf(pidW, ARRAY_SIZE(pidW), L"%u", pkey->pid);
 
     if (cch >= len + 1)
     {
@@ -498,7 +455,7 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey)
     }
 
     /* Overflow is not checked. */
-    while (iswdigit(*pszString))
+    while ('0' <= *pszString && *pszString <= '9')
     {
         pkey->pid *= 10;
         pkey->pid += (*pszString - '0');
@@ -517,3 +474,10 @@ HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID riid, void **ppv)
 
     return PropertyStore_CreateInstance(NULL, riid, ppv);
 }
+
+#ifdef __REACTOS__
+HRESULT WINAPI DllCanUnloadNow(void)
+{
+    return S_FALSE;
+}
+#endif
@@ -20,4 +20,4 @@
 
 #pragma once
 
-HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN;
+HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv);
Original file line number	Diff line number	Diff line change
`@@ -20,4 +20,4 @@`
`20`	`20`
`21`	`21`	`#pragma once`
`22`	`22`
`23`		`-HRESULT PropertyStore_CreateInstance(IUnknown outer, REFIID riid, void *ppv) DECLSPEC_HIDDEN;`
	`23`	`+HRESULT PropertyStore_CreateInstance(IUnknown outer, REFIID riid, void *ppv);`