Commit cd1abd68 authored by Vincent Povirk's avatar Vincent Povirk Committed by Alexandre Julliard

explorer: Use StrRetToStrW to convert STRRET result.

parent 1202e9af
......@@ -118,20 +118,13 @@ static BOOL create_combobox_item(IShellFolder *folder, LPCITEMIDLIST pidl, IImag
HICON icon;
strret.uType=STRRET_WSTR;
hres = IShellFolder_GetDisplayNameOf(folder,pidl,SHGDN_FORADDRESSBAR,&strret);
if(SUCCEEDED(hres))
hres = StrRetToStrW(&strret, pidl, &item->pszText);
if(FAILED(hres))
{
WINE_WARN("Could not get name for pidl\n");
return FALSE;
}
switch(strret.uType)
{
case STRRET_WSTR:
item->pszText = strret.u.pOleStr;
break;
default:
WINE_FIXME("Unimplemented STRRET type:%u\n",strret.uType);
break;
}
hres = IShellFolder_GetUIObjectOf(folder,NULL,1,&pidl,&IID_IExtractIconW,
&reserved,(void**)&extract_icon);
if(SUCCEEDED(hres))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment