Detlef Riekenberg : comdlg32: Fix return type of COMDLG32_StrRetToStrNW.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 29bdfed9f83a8176247b85b2a8c36f84d641ad49
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=29bdfed9f83a8176247b85b2a8...

Author: Detlef Riekenberg 
Date:   Thu Jan 22 23:39:19 2009 +0100

comdlg32: Fix return type of COMDLG32_StrRetToStrNW.

---

dlls/comdlg32/filedlgbrowser.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/comdlg32/filedlgbrowser.c b/dlls/comdlg32/filedlgbrowser.c
index d485d73..704fb98 100644
--- a/dlls/comdlg32/filedlgbrowser.c
+++ b/dlls/comdlg32/filedlgbrowser.c
@@ -149,7 +149,7 @@ static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos)
 }

/* copied from shell32 to avoid linking to it */
-static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPCITEMIDLIST pidl)
+static BOOL COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPCITEMIDLIST pidl)
 {
    TRACE("dest=%p len=0x%x strret=%p pidl=%p stub\n",dest,len,src,pidl);

@@ -181,7 +181,7 @@ static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPC
        }
        return(FALSE);
    }
-	return S_OK;
+        return TRUE;
 }

/*
@@ -881,7 +881,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr

if (SUCCEEDED(IShellFolder_GetDisplayNameOf(fodInfos->Shell.FOIShellFolder, pidl, SHGDN_INFOLDER | SHGDN_FORPARSING, &str)))
     {
-      if (SUCCEEDED(COMDLG32_StrRetToStrNW(szPathW, MAX_PATH, &str, pidl)))
+      if (COMDLG32_StrRetToStrNW(szPathW, MAX_PATH, &str, pidl))
       {
      if (PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter))
           return S_OK;