shell32: Cast-qual warnings fix.

This commit is contained in:
Andrew Talbot 2006-09-28 23:13:35 +01:00 committed by Alexandre Julliard
parent cf47c3afbb
commit 699f4cc703
1 changed files with 7 additions and 5 deletions

View File

@ -713,7 +713,8 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
BROWSEINFOW bi; BROWSEINFOW bi;
LPITEMIDLIST lpid; LPITEMIDLIST lpid;
INT len; INT len;
LPWSTR title;
TRACE("%p\n", lpbi); TRACE("%p\n", lpbi);
bi.hwndOwner = lpbi->hwndOwner; bi.hwndOwner = lpbi->hwndOwner;
@ -729,12 +730,13 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
if (lpbi->lpszTitle) if (lpbi->lpszTitle)
{ {
len = MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, NULL, 0 ); len = MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, NULL, 0 );
bi.lpszTitle = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); title = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, (LPWSTR)bi.lpszTitle, len ); MultiByteToWideChar( CP_ACP, 0, lpbi->lpszTitle, -1, title, len );
} }
else else
bi.lpszTitle = NULL; title = NULL;
bi.lpszTitle = title;
bi.ulFlags = lpbi->ulFlags; bi.ulFlags = lpbi->ulFlags;
bi.lpfn = lpbi->lpfn; bi.lpfn = lpbi->lpfn;
bi.lParam = lpbi->lParam; bi.lParam = lpbi->lParam;
@ -746,7 +748,7 @@ LPITEMIDLIST WINAPI SHBrowseForFolderA (LPBROWSEINFOA lpbi)
lpbi->pszDisplayName, MAX_PATH, 0, NULL); lpbi->pszDisplayName, MAX_PATH, 0, NULL);
HeapFree( GetProcessHeap(), 0, bi.pszDisplayName ); HeapFree( GetProcessHeap(), 0, bi.pszDisplayName );
} }
HeapFree(GetProcessHeap(), 0, (LPVOID)bi.lpszTitle); HeapFree(GetProcessHeap(), 0, title);
lpbi->iImage = bi.iImage; lpbi->iImage = bi.iImage;
return lpid; return lpid;
} }