Module: wine Branch: master Commit: 699f4cc703116cdae8b9bb68e044cc05bd28ff4e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=699f4cc703116cdae8b9bb68...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Thu Sep 28 23:13:35 2006 +0100
shell32: Cast-qual warnings fix.
---
dlls/shell32/brsfolder.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 2d73d9b..30ee718 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -713,7 +713,8 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA ( BROWSEINFOW bi; LPITEMIDLIST lpid; INT len; - + LPWSTR title; + TRACE("%p\n", lpbi);
bi.hwndOwner = lpbi->hwndOwner; @@ -729,12 +730,13 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA ( if (lpbi->lpszTitle) { len = MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, NULL, 0 ); - bi.lpszTitle = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, (LPWSTR)bi.lpszTitle, len ); + title = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, title, len ); } else - bi.lpszTitle = NULL; + title = NULL;
+ bi.lpszTitle = title; bi.ulFlags = lpbi->ulFlags; bi.lpfn = lpbi->lpfn; bi.lParam = lpbi->lParam; @@ -746,7 +748,7 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA ( lpbi->pszDisplayName, MAX_PATH, 0, NULL); HeapFree( GetProcessHeap(), 0, bi.pszDisplayName ); } - HeapFree(GetProcessHeap(), 0, (LPVOID)bi.lpszTitle); + HeapFree(GetProcessHeap(), 0, title); lpbi->iImage = bi.iImage; return lpid; }