ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Nikolay Sivov 2020-08-11 08:43:11 +03:00 committed by Alexandre Julliard
parent e64908b9a8
commit f3e949c30b
4 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/combase/combase.c
View File

@ -1098,6 +1098,16 @@ HRESULT WINAPI IIDFromString(LPCOLESTR str, IID *iid)
return guid_from_string(str, iid) ? S_OK : CO_E_IIDSTRING; 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) static void init_multi_qi(DWORD count, MULTI_QI *mqi, HRESULT hr)
{ {
ULONG i; ULONG i;

4
dlls/combase/combase.spec
View File

@ -318,9 +318,9 @@
@ stub SetCleanupFlag @ stub SetCleanupFlag
@ stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo @ stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo
@ stub SetRestrictedErrorInfo @ stub SetRestrictedErrorInfo
@ stdcall StringFromCLSID(ptr ptr) ole32.StringFromCLSID @ stdcall StringFromCLSID(ptr ptr)
@ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2 @ stdcall StringFromGUID2(ptr ptr long) ole32.StringFromGUID2
@ stdcall StringFromIID(ptr ptr) ole32.StringFromIID @ stdcall StringFromIID(ptr ptr) StringFromCLSID
@ stub UpdateDCOMSettings @ stub UpdateDCOMSettings
@ stdcall WdtpInterfacePointer_UserFree(ptr) @ stdcall WdtpInterfacePointer_UserFree(ptr)
@ stub -arch=win64 WdtpInterfacePointer_UserFree64 @ stub -arch=win64 WdtpInterfacePointer_UserFree64

25
dlls/ole32/compobj.c
View File

@ -2186,31 +2186,6 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved )
return S_OK; 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.@] * StringFromGUID2 [OLE32.@]
* *

4
dlls/ole32/ole32.spec
View File

@ -279,9 +279,9 @@
@ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr) @ stdcall StgOpenStorageEx(wstr long long long ptr ptr ptr ptr)
@ stdcall StgOpenStorageOnILockBytes(ptr ptr long ptr long ptr) @ stdcall StgOpenStorageOnILockBytes(ptr ptr long ptr long ptr)
@ stdcall StgSetTimes(wstr ptr ptr ptr ) @ stdcall StgSetTimes(wstr ptr ptr ptr )
@ stdcall StringFromCLSID(ptr ptr) @ stdcall StringFromCLSID(ptr ptr) combase.StringFromCLSID
@ stdcall StringFromGUID2(ptr ptr long) @ stdcall StringFromGUID2(ptr ptr long)
@ stdcall StringFromIID(ptr ptr) StringFromCLSID @ stdcall StringFromIID(ptr ptr) combase.StringFromIID
@ stub UpdateDCOMSettings @ stub UpdateDCOMSettings
@ stub UtConvertDvtd16toDvtd32 @ stub UtConvertDvtd16toDvtd32
@ stub UtConvertDvtd32toDvtd16 @ stub UtConvertDvtd32toDvtd16