Module: wine Branch: master Commit: f3e949c30b9e282eb0d15f96e850e973699a5d73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3e949c30b9e282eb0d15f96e...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Aug 11 08:43:11 2020 +0300
combase: Move StringFromCLSID().
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/combase/combase.c | 10 ++++++++++ dlls/combase/combase.spec | 4 ++-- dlls/ole32/compobj.c | 25 ------------------------- dlls/ole32/ole32.spec | 4 ++-- 4 files changed, 14 insertions(+), 29 deletions(-)
diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 205a27b811..7c6eaec7fa 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -1098,6 +1098,16 @@ HRESULT WINAPI IIDFromString(LPCOLESTR str, IID *iid) return guid_from_string(str, iid) ? S_OK : CO_E_IIDSTRING; }
+/****************************************************************************** + * StringFromCLSID (combase.@) + */ +HRESULT WINAPI StringFromCLSID(REFCLSID clsid, LPOLESTR *str) +{ + if (!(*str = CoTaskMemAlloc(CHARS_IN_GUID * sizeof(WCHAR)))) return E_OUTOFMEMORY; + StringFromGUID2(clsid, *str, CHARS_IN_GUID); + return S_OK; +} + static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr) { ULONG i; diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index c0c1f2ada6..d56294af4d 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -318,9 +318,9 @@ @ stub SetCleanupFlag @ stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo @ stub SetRestrictedErrorInfo -@ stdcall StringFromCLSID(ptr ptr) ole32.StringFromCLSID +@ stdcall StringFromCLSID(ptr ptr) @ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 -@ stdcall StringFromIID(ptr ptr) ole32.StringFromIID +@ stdcall StringFromIID(ptr ptr) StringFromCLSID @ stub UpdateDCOMSettings @ stdcall WdtpInterfacePointer_UserFree(ptr) @ stub -arch=win64 WdtpInterfacePointer_UserFree64 diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 9715868584..ebcce6d390 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2186,31 +2186,6 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) return S_OK; }
-/****************************************************************************** - * StringFromCLSID [OLE32.@] - * StringFromIID [OLE32.@] - * - * Converts a GUID into the respective string representation. - * The target string is allocated using the OLE IMalloc. - * - * PARAMS - * id [I] the GUID to be converted. - * idstr [O] A pointer to a to-be-allocated pointer pointing to the resulting string. - * - * RETURNS - * S_OK - * E_FAIL - * - * SEE ALSO - * StringFromGUID2, CLSIDFromString - */ -HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR *idstr) -{ - if (!(*idstr = CoTaskMemAlloc(CHARS_IN_GUID * sizeof(WCHAR)))) return E_OUTOFMEMORY; - StringFromGUID2( id, *idstr, CHARS_IN_GUID ); - return S_OK; -} - /****************************************************************************** * StringFromGUID2 [OLE32.@] * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index cd530763c2..232ec8d87e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -279,9 +279,9 @@ @ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr) @ stdcall StgOpenStorageOnILockBytes(ptr ptr long ptr long ptr) @ stdcall StgSetTimes(wstr ptr ptr ptr ) -@ stdcall StringFromCLSID(ptr ptr) +@ stdcall StringFromCLSID(ptr ptr) combase.StringFromCLSID @ stdcall StringFromGUID2(ptr ptr long) -@ stdcall StringFromIID(ptr ptr) StringFromCLSID +@ stdcall StringFromIID(ptr ptr) combase.StringFromIID @ stub UpdateDCOMSettings @ stub UtConvertDvtd16toDvtd32 @ stub UtConvertDvtd32toDvtd16