comdlg32: Remove unnecessary casts.

This commit is contained in:
Andrew Talbot 2007-12-03 22:40:42 +00:00 committed by Alexandre Julliard
parent a9491cf0cd
commit 750a56016d
4 changed files with 12 additions and 13 deletions

View File

@ -1346,7 +1346,7 @@ BOOL WINAPI ChooseColorA( LPCHOOSECOLORA lpChCol )
lpcc->lpCustColors = lpChCol->lpCustColors; lpcc->lpCustColors = lpChCol->lpCustColors;
lpcc->Flags = lpChCol->Flags; lpcc->Flags = lpChCol->Flags;
lpcc->lCustData = lpChCol->lCustData; lpcc->lCustData = lpChCol->lCustData;
lpcc->lpfnHook = (LPCCHOOKPROC) lpChCol->lpfnHook; lpcc->lpfnHook = lpChCol->lpfnHook;
if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) { if ((lpcc->Flags & CC_ENABLETEMPLATE) && (lpChCol->lpTemplateName)) {
if (HIWORD(lpChCol->lpTemplateName)) { if (HIWORD(lpChCol->lpTemplateName)) {
INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0); INT len = MultiByteToWideChar( CP_ACP, 0, lpChCol->lpTemplateName, -1, NULL, 0);

View File

@ -531,7 +531,7 @@ static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control,
FD31_UpdateFileTitle(lfs); FD31_UpdateFileTitle(lfs);
if (lfs->hook) if (lfs->hook)
{ {
lRet = (BOOL)FD31_CallWindowProc(lfs, lfs->fileokstring, lRet = FD31_CallWindowProc(lfs, lfs->fileokstring,
0, lfs->lParam ); 0, lfs->lParam );
if (lRet) if (lRet)
{ {
@ -543,7 +543,7 @@ static LRESULT FD31_Validate( const FD31_DATA *lfs, LPCWSTR path, UINT control,
{ {
if (ofnW->lpstrFile) if (ofnW->lpstrFile)
{ {
LPWSTR str = (LPWSTR)ofnW->lpstrFile; LPWSTR str = ofnW->lpstrFile;
LPWSTR ptr = strrchrW(str, '\\'); LPWSTR ptr = strrchrW(str, '\\');
str[lstrlenW(str) + 1] = '\0'; str[lstrlenW(str) + 1] = '\0';
*ptr = 0; *ptr = 0;
@ -919,7 +919,7 @@ LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
if (ofn->Flags & OFN_HIDEREADONLY) if (ofn->Flags & OFN_HIDEREADONLY)
ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE); ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE);
if (lfs->hook) if (lfs->hook)
return (BOOL) FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); return FD31_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam);
return TRUE; return TRUE;
} }

View File

@ -375,8 +375,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
return hRes; return hRes;
} }
/* create an absolute pidl */ /* create an absolute pidl */
pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent, pidlTmp = COMDLG32_PIDL_ILCombine(fodInfos->ShellInfos.pidlAbsCurrent, pidl);
(LPCITEMIDLIST)pidl);
} }
else if(wFlags & SBSP_PARENT) else if(wFlags & SBSP_PARENT)
{ {
@ -388,7 +387,7 @@ static HRESULT WINAPI IShellBrowserImpl_BrowseObject(IShellBrowser *iface,
else /* SBSP_ABSOLUTE is 0x0000 */ else /* SBSP_ABSOLUTE is 0x0000 */
{ {
/* An absolute pidl (relative from the desktop) */ /* An absolute pidl (relative from the desktop) */
pidlTmp = COMDLG32_PIDL_ILClone((LPCITEMIDLIST)pidl); pidlTmp = COMDLG32_PIDL_ILClone(pidl);
psfTmp = GetShellFolderFromPidl(pidlTmp); psfTmp = GetShellFolderFromPidl(pidlTmp);
} }

View File

@ -3069,12 +3069,12 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
scalx = rcClient.right / (double)pda->curdlg.ptPaperSize.x; scalx = rcClient.right / (double)pda->curdlg.ptPaperSize.x;
scaly = rcClient.bottom / (double)pda->curdlg.ptPaperSize.y; scaly = rcClient.bottom / (double)pda->curdlg.ptPaperSize.y;
rcMargin = rcClient; rcMargin = rcClient;
rcMargin.left += (LONG)pda->curdlg.rtMargin.left * scalx; rcMargin.left += pda->curdlg.rtMargin.left * scalx;
rcMargin.top += (LONG)pda->curdlg.rtMargin.top * scalx; rcMargin.top += pda->curdlg.rtMargin.top * scalx;
rcMargin.right -= (LONG)pda->curdlg.rtMargin.right * scaly; rcMargin.right -= pda->curdlg.rtMargin.right * scaly;
rcMargin.bottom -= (LONG)pda->curdlg.rtMargin.bottom * scaly; rcMargin.bottom -= pda->curdlg.rtMargin.bottom * scaly;
/* if the space is too small then we make sure to not draw anything */ /* if the space is too small then we make sure to not draw anything */
rcMargin.left = min(rcMargin.left, rcMargin.right); rcMargin.left = min(rcMargin.left, rcMargin.right);
rcMargin.top = min(rcMargin.top, rcMargin.bottom); rcMargin.top = min(rcMargin.top, rcMargin.bottom);