Skip to content

W
wine-winehq
Commit db4fab9f authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

comdlg32: Remove some explicit LPARAM/WPARAM casts.

parent 610fba75
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 36 deletions
dlls/comdlg32/filedlg.c
View file @ db4fab9f
...@@ -3206,7 +3206,7 @@ static int FILEDLG95_LOOKIN_RemoveMostExpandedItem(HWND hwnd) ...@@ -3206,7 +3206,7 @@ static int FILEDLG95_LOOKIN_RemoveMostExpandedItem(HWND hwnd)
if(liInfos->iMaxIndentation <= 2) if(liInfos->iMaxIndentation <= 2)
return -1; return -1;
if((iItemPos = FILEDLG95_LOOKIN_SearchItem(hwnd,(WPARAM)liInfos->iMaxIndentation,SEARCH_EXP)) >=0) if((iItemPos = FILEDLG95_LOOKIN_SearchItem(hwnd,liInfos->iMaxIndentation,SEARCH_EXP)) >=0)
{ {
SFOLDER *tmpFolder = (LPSFOLDER) CBGetItemDataPtr(hwnd,iItemPos); SFOLDER *tmpFolder = (LPSFOLDER) CBGetItemDataPtr(hwnd,iItemPos);
COMDLG32_SHFree(tmpFolder->pidlItem); COMDLG32_SHFree(tmpFolder->pidlItem);
...@@ -3363,7 +3363,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) ...@@ -3363,7 +3363,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd)
SetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrAllFile ); SetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrAllFile );
/* Select the file name like Windows does */ /* Select the file name like Windows does */
SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, (LPARAM)-1); SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, -1);
} }
HeapFree(GetProcessHeap(),0, lpstrAllFile ); HeapFree(GetProcessHeap(),0, lpstrAllFile );
} }
......
dlls/comdlg32/finddlg.c
View file @ db4fab9f
...@@ -187,11 +187,11 @@ static INT_PTR CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPA ...@@ -187,11 +187,11 @@ static INT_PTR CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPA
DestroyWindow(hDlgWnd); DestroyWindow(hDlgWnd);
return FALSE; return FALSE;
} }
SendDlgItemMessageA(hDlgWnd, edt1, EM_SETLIMITTEXT, (WPARAM)pdata->fr.wFindWhatLen, 0); SendDlgItemMessageA(hDlgWnd, edt1, EM_SETLIMITTEXT, pdata->fr.wFindWhatLen, 0);
SendDlgItemMessageA(hDlgWnd, edt1, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrFindWhat); SendDlgItemMessageA(hDlgWnd, edt1, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrFindWhat);
if(pdata->fr.Flags & FR_WINE_REPLACE) if(pdata->fr.Flags & FR_WINE_REPLACE)
{ {
SendDlgItemMessageA(hDlgWnd, edt2, EM_SETLIMITTEXT, (WPARAM)pdata->fr.wReplaceWithLen, 0); SendDlgItemMessageA(hDlgWnd, edt2, EM_SETLIMITTEXT, pdata->fr.wReplaceWithLen, 0);
SendDlgItemMessageA(hDlgWnd, edt2, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrReplaceWith); SendDlgItemMessageA(hDlgWnd, edt2, WM_SETTEXT, 0, (LPARAM)pdata->fr.lpstrReplaceWith);
} }
......
dlls/comdlg32/printdlg.c
View file @ db4fab9f
...@@ -979,11 +979,11 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru ...@@ -979,11 +979,11 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru
* FIXME: The ico3 is not displayed for some reason. I don't know why. * FIXME: The ico3 is not displayed for some reason. I don't know why.
*/ */
if (lppd->Flags & PD_COLLATE) { if (lppd->Flags & PD_COLLATE) {
SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)PrintStructures->hCollateIcon); (LPARAM)PrintStructures->hCollateIcon);
CheckDlgButton(hDlg, chx2, 1); CheckDlgButton(hDlg, chx2, 1);
} else { } else {
SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)PrintStructures->hNoCollateIcon); (LPARAM)PrintStructures->hNoCollateIcon);
CheckDlgButton(hDlg, chx2, 0); CheckDlgButton(hDlg, chx2, 0);
} }
...@@ -1090,7 +1090,7 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru ...@@ -1090,7 +1090,7 @@ static BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, PRINT_PTRA *PrintStru
PrintStructures->lpPrinterInfo->pPortName, PrintStructures->lpPrinterInfo->pPortName,
lpdm); lpdm);
CheckRadioButton(hDlg, rad1, rad2, bPortrait ? rad1: rad2); CheckRadioButton(hDlg, rad1, rad2, bPortrait ? rad1: rad2);
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)(bPortrait ? PrintStructures->hPortraitIcon : (LPARAM)(bPortrait ? PrintStructures->hPortraitIcon :
PrintStructures->hLandscapeIcon)); PrintStructures->hLandscapeIcon));
...@@ -1186,11 +1186,11 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, ...@@ -1186,11 +1186,11 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name,
* FIXME: The ico3 is not displayed for some reason. I don't know why. * FIXME: The ico3 is not displayed for some reason. I don't know why.
*/ */
if (lppd->Flags & PD_COLLATE) { if (lppd->Flags & PD_COLLATE) {
SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)PrintStructures->hCollateIcon); (LPARAM)PrintStructures->hCollateIcon);
CheckDlgButton(hDlg, chx2, 1); CheckDlgButton(hDlg, chx2, 1);
} else { } else {
SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)PrintStructures->hNoCollateIcon); (LPARAM)PrintStructures->hNoCollateIcon);
CheckDlgButton(hDlg, chx2, 0); CheckDlgButton(hDlg, chx2, 0);
} }
...@@ -1242,7 +1242,7 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, ...@@ -1242,7 +1242,7 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name,
PrintStructures->lpPrinterInfo->pPortName, PrintStructures->lpPrinterInfo->pPortName,
lpdm); lpdm);
CheckRadioButton(hDlg, rad1, rad2, bPortrait ? rad1: rad2); CheckRadioButton(hDlg, rad1, rad2, bPortrait ? rad1: rad2);
SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)(bPortrait ? PrintStructures->hPortraitIcon : (LPARAM)(bPortrait ? PrintStructures->hPortraitIcon :
PrintStructures->hLandscapeIcon)); PrintStructures->hLandscapeIcon));
...@@ -1307,7 +1307,7 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam, ...@@ -1307,7 +1307,7 @@ static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam,
LoadIconA(COMDLG32_hInstance, "PD32_LANDSCAPE"); LoadIconA(COMDLG32_hInstance, "PD32_LANDSCAPE");
/* display the collate/no_collate icon */ /* display the collate/no_collate icon */
SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)PrintStructures->hNoCollateIcon); (LPARAM)PrintStructures->hNoCollateIcon);
if(PrintStructures->hCollateIcon == 0 || if(PrintStructures->hCollateIcon == 0 ||
...@@ -1415,7 +1415,7 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam, ...@@ -1415,7 +1415,7 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam,
LoadIconW(COMDLG32_hInstance, pd32_landscapeW); LoadIconW(COMDLG32_hInstance, pd32_landscapeW);
/* display the collate/no_collate icon */ /* display the collate/no_collate icon */
SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)PrintStructures->hNoCollateIcon); (LPARAM)PrintStructures->hNoCollateIcon);
if(PrintStructures->hCollateIcon == 0 || if(PrintStructures->hCollateIcon == 0 ||
...@@ -1533,10 +1533,10 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, ...@@ -1533,10 +1533,10 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
case chx2: /* collate pages checkbox */ case chx2: /* collate pages checkbox */
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)PrintStructures->hCollateIcon); (LPARAM)PrintStructures->hCollateIcon);
else else
SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageA(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)PrintStructures->hNoCollateIcon); (LPARAM)PrintStructures->hNoCollateIcon);
break; break;
case edt1: /* from page nr editbox */ case edt1: /* from page nr editbox */
...@@ -1601,7 +1601,7 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, ...@@ -1601,7 +1601,7 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
if (lppd->Flags & PD_PRINTSETUP) if (lppd->Flags & PD_PRINTSETUP)
{ {
lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon)); (LPARAM)(PrintStructures->hPortraitIcon));
} }
break; break;
...@@ -1610,7 +1610,7 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, ...@@ -1610,7 +1610,7 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
if (lppd->Flags & PD_PRINTSETUP) if (lppd->Flags & PD_PRINTSETUP)
{ {
lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon)); (LPARAM)(PrintStructures->hLandscapeIcon));
} }
break; break;
...@@ -1655,21 +1655,17 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, ...@@ -1655,21 +1655,17 @@ static LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) { if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) { if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, IMAGE_ICON,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon); (LPARAM)PrintStructures->hPortraitIcon);
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, IMAGE_ICON,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon); (LPARAM)PrintStructures->hPortraitIcon);
} }
} else { } else {
if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) { if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE, IMAGE_ICON,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon); (LPARAM)PrintStructures->hLandscapeIcon);
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, IMAGE_ICON,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon); (LPARAM)PrintStructures->hLandscapeIcon);
} }
} }
...@@ -1709,10 +1705,10 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, ...@@ -1709,10 +1705,10 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
case chx2: /* collate pages checkbox */ case chx2: /* collate pages checkbox */
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED) if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)PrintStructures->hCollateIcon); (LPARAM)PrintStructures->hCollateIcon);
else else
SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico3, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)PrintStructures->hNoCollateIcon); (LPARAM)PrintStructures->hNoCollateIcon);
break; break;
case edt1: /* from page nr editbox */ case edt1: /* from page nr editbox */
...@@ -1764,7 +1760,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, ...@@ -1764,7 +1760,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
if (lppd->Flags & PD_PRINTSETUP) if (lppd->Flags & PD_PRINTSETUP)
{ {
lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon)); (LPARAM)(PrintStructures->hPortraitIcon));
} }
break; break;
...@@ -1773,7 +1769,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, ...@@ -1773,7 +1769,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
if (lppd->Flags & PD_PRINTSETUP) if (lppd->Flags & PD_PRINTSETUP)
{ {
lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon)); (LPARAM)(PrintStructures->hLandscapeIcon));
} }
break; break;
...@@ -1815,21 +1811,17 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, ...@@ -1815,21 +1811,17 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) { if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) { if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT; lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE, SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE, IMAGE_ICON,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon); (LPARAM)PrintStructures->hPortraitIcon);
SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, IMAGE_ICON,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon); (LPARAM)PrintStructures->hPortraitIcon);
} }
} else { } else {
if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) { if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE; lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE, SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE, IMAGE_ICON,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon); (LPARAM)PrintStructures->hLandscapeIcon);
SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, IMAGE_ICON,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon); (LPARAM)PrintStructures->hLandscapeIcon);
} }
} }
......
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