Commit 29bdfed9 authored by Detlef Riekenberg's avatar Detlef Riekenberg Committed by Alexandre Julliard

comdlg32: Fix return type of COMDLG32_StrRetToStrNW.

parent 0a9a1bc9
...@@ -149,7 +149,7 @@ static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos) ...@@ -149,7 +149,7 @@ static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos)
} }
/* copied from shell32 to avoid linking to it */ /* 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); 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 ...@@ -181,7 +181,7 @@ static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPC
} }
return(FALSE); return(FALSE);
} }
return S_OK; return TRUE;
} }
/* /*
...@@ -881,7 +881,7 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr ...@@ -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(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)) if (PathMatchSpecW(szPathW, fodInfos->ShellInfos.lpstrCurrentFilter))
return S_OK; return S_OK;
......
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