Vincent Povirk : explorer: Use StrRetToStrW to convert STRRET result.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 1619a7efd90c73536f54720ef3053f75033961ee
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1619a7efd90c73536f54720ef3...

Author: Vincent Povirk <vincent(a)codeweavers.com>
Date:   Wed Oct 30 14:50:51 2013 -0500

explorer: Use StrRetToStrW to convert STRRET result.

(cherry picked from commit cd1abd68c3bd48267f96403e9ed937e1a11911db)

---

 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 1df781c..d01a3c3 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))