From cd1abd68c3bd48267f96403e9ed937e1a11911db Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@codeweavers.com>
Date: Wed, 30 Oct 2013 14:50:51 -0500
Subject: [PATCH] explorer: Use StrRetToStrW to convert STRRET result.

---
 programs/explorer/explorer.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c
index 1df781c69dc..d01a3c31adb 100644
--- a/programs/explorer/explorer.c
+++ b/programs/explorer/explorer.c
@@ -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))
-- 
2.11.4.GIT