[PROPSYS] Sync with Wine Staging 4.0. CORE-15682

diff --git a/dll/win32/propsys/propsys.spec b/dll/win32/propsys/propsys.spec
index 73161a8..f496006 100644 (file)
--- a/dll/win32/propsys/propsys.spec
+++ b/dll/win32/propsys/propsys.spec
@@ -30,7 +30,7 @@
 @ stdcall -private DllUnregisterServer()
 @ stub InitPropVariantFromBooleanVector
 @ stdcall InitPropVariantFromBuffer(ptr long ptr)
 @ stdcall -private DllUnregisterServer()
 @ stub InitPropVariantFromBooleanVector
 @ stdcall InitPropVariantFromBuffer(ptr long ptr)

-@ stub InitPropVariantFromCLSID
+@ stdcall InitPropVariantFromCLSID(ptr ptr)

 @ stub InitPropVariantFromDoubleVector
 @ stub InitPropVariantFromFileTime
 @ stub InitPropVariantFromFileTimeVector
 @ stub InitPropVariantFromDoubleVector
 @ stub InitPropVariantFromFileTime
 @ stub InitPropVariantFromFileTimeVector

diff --git a/dll/win32/propsys/propvar.c b/dll/win32/propsys/propvar.c
index f087732..05ded2e 100644 (file)
--- a/dll/win32/propsys/propvar.c
+++ b/dll/win32/propsys/propvar.c
@@ -570,6 +570,19 @@ HRESULT WINAPI InitPropVariantFromBuffer(const VOID *pv, UINT cb, PROPVARIANT *p
     return S_OK;
 }
 
     return S_OK;
 }
 

+HRESULT WINAPI InitPropVariantFromCLSID(REFCLSID clsid, PROPVARIANT *ppropvar)
+{
+    TRACE("(%s %p)\n", debugstr_guid(clsid), ppropvar);
+
+    ppropvar->u.puuid = CoTaskMemAlloc(sizeof(*ppropvar->u.puuid));
+    if(!ppropvar->u.puuid)
+        return E_OUTOFMEMORY;
+
+    ppropvar->vt = VT_CLSID;
+    memcpy(ppropvar->u.puuid, clsid, sizeof(*ppropvar->u.puuid));
+    return S_OK;
+}
+

 HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar)
 {
     SAFEARRAY *arr;
 HRESULT WINAPI InitVariantFromBuffer(const VOID *pv, UINT cb, VARIANT *pvar)
 {
     SAFEARRAY *arr;

diff --git a/media/doc/README.WINE b/media/doc/README.WINE
index 6ca08c7..6fb3564 100644 (file)
--- a/media/doc/README.WINE
+++ b/media/doc/README.WINE
@@ -151,7 +151,7 @@ reactos/dll/win32/pdh                 # Synced to WineStaging-4.0
 reactos/dll/win32/pidgen              # Synced to WineStaging-4.0
 reactos/dll/win32/powrprof            # Forked at Wine-1.0rc5
 reactos/dll/win32/printui             # Synced to WineStaging-3.3
 reactos/dll/win32/pidgen              # Synced to WineStaging-4.0
 reactos/dll/win32/powrprof            # Forked at Wine-1.0rc5
 reactos/dll/win32/printui             # Synced to WineStaging-3.3

-reactos/dll/win32/propsys             # Synced to WineStaging-3.9
+reactos/dll/win32/propsys             # Synced to WineStaging-4.0

 reactos/dll/win32/pstorec             # Synced to WineStaging-3.3
 reactos/dll/win32/qmgr                # Synced to WineStaging-3.3
 reactos/dll/win32/qmgrprxy            # Synced to WineStaging-2.9
 reactos/dll/win32/pstorec             # Synced to WineStaging-3.3
 reactos/dll/win32/qmgr                # Synced to WineStaging-3.3
 reactos/dll/win32/qmgrprxy            # Synced to WineStaging-2.9