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

ole32: Simplify GetDisplayName() for class moniker. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-09-14 11:47:50 +03:00 committed by Alexandre Julliard
parent 1f12b2160d
commit c79678ed31
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/ole32/classmoniker.c
View File

@ -510,37 +510,30 @@ static HRESULT WINAPI ClassMoniker_RelativePathTo(IMoniker* iface,IMoniker* pmOt
return MK_E_NOTBINDABLE; return MK_E_NOTBINDABLE;
} }
/****************************************************************************** static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker *iface,
* ClassMoniker_GetDisplayName IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *name)
******************************************************************************/
static HRESULT WINAPI ClassMoniker_GetDisplayName(IMoniker* iface,
IBindCtx* pbc,
IMoniker* pmkToLeft,
LPOLESTR *ppszDisplayName)
{ {
ClassMoniker *This = impl_from_IMoniker(iface); ClassMoniker *moniker = impl_from_IMoniker(iface);
static const WCHAR wszClsidPrefix[] = L"clsid:"; static const int name_len = CHARS_IN_GUID + 5 /* prefix */;
const GUID *guid = &moniker->clsid;
TRACE("(%p, %p, %p)\n", pbc, pmkToLeft, ppszDisplayName); TRACE("%p, %p, %p, %p.\n", iface, pbc, pmkToLeft, name);
if (!ppszDisplayName) if (!name)
return E_POINTER; return E_POINTER;
if (pmkToLeft) if (pmkToLeft)
return E_INVALIDARG; return E_INVALIDARG;
*ppszDisplayName = CoTaskMemAlloc(sizeof(wszClsidPrefix) + (CHARS_IN_GUID-2) * sizeof(WCHAR)); if (!(*name = CoTaskMemAlloc(name_len * sizeof(WCHAR))))
return E_OUTOFMEMORY;
StringFromGUID2(&This->clsid, *ppszDisplayName+ARRAY_SIZE(wszClsidPrefix)-2, CHARS_IN_GUID); swprintf(*name, name_len, L"clsid:%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]);
/* note: this overwrites the opening curly bracket of the CLSID string generated above */ TRACE("Returning %s\n", debugstr_w(*name));
memcpy(*ppszDisplayName, wszClsidPrefix, sizeof(wszClsidPrefix)-sizeof(WCHAR));
/* note: this overwrites the closing curly bracket of the CLSID string generated above */
(*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-2] = ':';
(*ppszDisplayName)[ARRAY_SIZE(wszClsidPrefix)-2+CHARS_IN_GUID-1] = '\0';
TRACE("string is %s\n", debugstr_w(*ppszDisplayName));
return S_OK; return S_OK;
} }