https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bcbe0dd8cd14109d726e8b...
commit bcbe0dd8cd14109d726e8b75d4d840bad191351d Author: Thomas Faber thomas.faber@reactos.org AuthorDate: Tue Oct 31 00:37:37 2017 +0100
[CPL] Remove unnecessary DLGPROC casts. --- dll/cpl/access/access.c | 10 +++++----- dll/cpl/access/display.c | 2 +- dll/cpl/access/general.c | 2 +- dll/cpl/access/keyboard.c | 10 +++++----- dll/cpl/access/mouse.c | 2 +- dll/cpl/powercfg/powercfg.c | 8 ++++---- dll/cpl/sysdm/advanced.c | 10 +++++----- dll/cpl/sysdm/hardprof.c | 4 ++-- dll/cpl/sysdm/hardware.c | 2 +- dll/cpl/sysdm/sysdm.c | 6 +++--- dll/cpl/timedate/timedate.c | 6 +++--- dll/cpl/usrmgr/groupprops.c | 2 +- dll/cpl/usrmgr/userprops.c | 6 +++--- dll/cpl/usrmgr/usrmgr.c | 6 +++--- 14 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/dll/cpl/access/access.c b/dll/cpl/access/access.c index efd61954df..9bd028c64f 100644 --- a/dll/cpl/access/access.c +++ b/dll/cpl/access/access.c @@ -200,11 +200,11 @@ SystemApplet(VOID) psh.nStartPage = 0; psh.ppsp = psp;
- InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC)KeyboardPageProc, pGlobalData); - InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC)SoundPageProc, pGlobalData); - InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC)DisplayPageProc, pGlobalData); - InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC)MousePageProc, pGlobalData); - InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC)GeneralPageProc, pGlobalData); + InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, KeyboardPageProc, pGlobalData); + InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, SoundPageProc, pGlobalData); + InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, DisplayPageProc, pGlobalData); + InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, MousePageProc, pGlobalData); + InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, GeneralPageProc, pGlobalData);
ret = PropertySheet(&psh);
diff --git a/dll/cpl/access/display.c b/dll/cpl/access/display.c index 4f8bc16fa0..05e88f1e69 100644 --- a/dll/cpl/access/display.c +++ b/dll/cpl/access/display.c @@ -179,7 +179,7 @@ DisplayPageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_CONTRASTOPTIONS), hwndDlg, - (DLGPROC)HighContrastDlgProc, + HighContrastDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; diff --git a/dll/cpl/access/general.c b/dll/cpl/access/general.c index 8b1742a730..414b93016a 100644 --- a/dll/cpl/access/general.c +++ b/dll/cpl/access/general.c @@ -257,7 +257,7 @@ GeneralPageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_SERIALKEYSOPTIONS), hwndDlg, - (DLGPROC)SerialKeysDlgProc, + SerialKeysDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; diff --git a/dll/cpl/access/keyboard.c b/dll/cpl/access/keyboard.c index f5953c4ca9..a79624293c 100644 --- a/dll/cpl/access/keyboard.c +++ b/dll/cpl/access/keyboard.c @@ -467,7 +467,7 @@ FilterKeysDlgProc(HWND hwndDlg, DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_BOUNCEKEYSOPTIONS), hwndDlg, - (DLGPROC)BounceKeysDlgProc, + BounceKeysDlgProc, (LPARAM)pGlobalData); break;
@@ -492,7 +492,7 @@ FilterKeysDlgProc(HWND hwndDlg, DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_REPEATKEYSOPTIONS), hwndDlg, - (DLGPROC)RepeatKeysDlgProc, + RepeatKeysDlgProc, (LPARAM)pGlobalData); break;
@@ -621,7 +621,7 @@ KeyboardPageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_STICKYKEYSOPTIONS), hwndDlg, - (DLGPROC)StickyKeysDlgProc, + StickyKeysDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -635,7 +635,7 @@ KeyboardPageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_FILTERKEYSOPTIONS), hwndDlg, - (DLGPROC)FilterKeysDlgProc, + FilterKeysDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -649,7 +649,7 @@ KeyboardPageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_TOGGLEKEYSOPTIONS), hwndDlg, - (DLGPROC)ToggleKeysDlgProc, + ToggleKeysDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; diff --git a/dll/cpl/access/mouse.c b/dll/cpl/access/mouse.c index 81f1e3b324..a81d947d4e 100644 --- a/dll/cpl/access/mouse.c +++ b/dll/cpl/access/mouse.c @@ -177,7 +177,7 @@ MousePageProc(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_MOUSEKEYSOPTIONS), hwndDlg, - (DLGPROC)MouseKeysDlgProc, + MouseKeysDlgProc, (LPARAM)pGlobalData)) PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; diff --git a/dll/cpl/powercfg/powercfg.c b/dll/cpl/powercfg/powercfg.c index 9952f84bee..fd820cc6d2 100644 --- a/dll/cpl/powercfg/powercfg.c +++ b/dll/cpl/powercfg/powercfg.c @@ -97,16 +97,16 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) psh.nStartPage = 0; psh.phpage = hpsp;
- InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, (DLGPROC)PowerSchemesDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, PowerSchemesDlgProc); if (GetPwrCapabilities(&spc)) { if (spc.SystemBatteriesPresent) { - InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, (DLGPROC)AlarmsDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, AlarmsDlgProc); } } - InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC)AdvancedDlgProc); - InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, (DLGPROC)HibernateDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedDlgProc); + InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, HibernateDlgProc);
/* Load additional pages provided by shell extensions */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\Power"), MAX_POWER_PAGES - psh.nPages); diff --git a/dll/cpl/sysdm/advanced.c b/dll/cpl/sysdm/advanced.c index 873667249d..ffa1e051ed 100644 --- a/dll/cpl/sysdm/advanced.c +++ b/dll/cpl/sysdm/advanced.c @@ -134,35 +134,35 @@ AdvancedPageProc(HWND hwndDlg, DialogBox(hApplet, MAKEINTRESOURCE(IDD_VIRTMEM), hwndDlg, - (DLGPROC)VirtMemDlgProc); + VirtMemDlgProc); break;
case IDC_USERPROFILE: DialogBox(hApplet, MAKEINTRESOURCE(IDD_USERPROFILE), hwndDlg, - (DLGPROC)UserProfileDlgProc); + UserProfileDlgProc); break;
case IDC_STAREC: DialogBox(hApplet, MAKEINTRESOURCE(IDD_STARTUPRECOVERY), hwndDlg, - (DLGPROC)StartRecDlgProc); + StartRecDlgProc); break;
case IDC_SYSSETTINGS: DialogBox(hApplet, MAKEINTRESOURCE(IDD_SYSSETTINGS), hwndDlg, - (DLGPROC)SysSettingsDlgProc); + SysSettingsDlgProc); break;
case IDC_ENVVAR: DialogBox(hApplet, MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES), hwndDlg, - (DLGPROC)EnvironmentDlgProc); + EnvironmentDlgProc); break;
case IDC_ERRORREPORT: diff --git a/dll/cpl/sysdm/hardprof.c b/dll/cpl/sysdm/hardprof.c index 2a47ec3d24..7d8c6335f1 100644 --- a/dll/cpl/sysdm/hardprof.c +++ b/dll/cpl/sysdm/hardprof.c @@ -163,7 +163,7 @@ CopyHardwareProfile( if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_COPYPROFILE), hwndDlg, - (DLGPROC)CopyProfileDlgProc, + CopyProfileDlgProc, (LPARAM)&ProfileNames) != IDOK) return;
@@ -280,7 +280,7 @@ RenameHardwareProfile( if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_RENAMEPROFILE), hwndDlg, - (DLGPROC)RenameProfileDlgProc, + RenameProfileDlgProc, (LPARAM)&ProfileNames) != IDOK) return;
diff --git a/dll/cpl/sysdm/hardware.c b/dll/cpl/sysdm/hardware.c index 5e628e8b91..3211b4e63b 100644 --- a/dll/cpl/sysdm/hardware.c +++ b/dll/cpl/sysdm/hardware.c @@ -95,7 +95,7 @@ HardwarePageProc(HWND hwndDlg, DialogBox(hApplet, MAKEINTRESOURCE(IDD_HARDWAREPROFILES), hwndDlg, - (DLGPROC)HardProfDlgProc); + HardProfDlgProc); return TRUE; } break; diff --git a/dll/cpl/sysdm/sysdm.c b/dll/cpl/sysdm/sysdm.c index 64b489f7e2..36bd5f5114 100644 --- a/dll/cpl/sysdm/sysdm.c +++ b/dll/cpl/sysdm/sysdm.c @@ -147,10 +147,10 @@ SystemApplet(VOID) psh.phpage = hpsp; psh.pfnCallback = NULL;
- InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); + InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, GeneralPageProc); hNetIdDll = AddNetIdPage(&psh); - InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc); - InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); + InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, HardwarePageProc); + InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedPageProc);
/* Load additional pages provided by shell extensions */ hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\System"), MAX_SYSTEM_PAGES - psh.nPages); diff --git a/dll/cpl/timedate/timedate.c b/dll/cpl/timedate/timedate.c index f19882c86f..3bf0d7e57d 100644 --- a/dll/cpl/timedate/timedate.c +++ b/dll/cpl/timedate/timedate.c @@ -96,9 +96,9 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) psh.nStartPage = 0; psh.ppsp = psp;
- InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, (DLGPROC) DateTimePageProc); - InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, (DLGPROC) TimeZonePageProc); - InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, (DLGPROC) InetTimePageProc); + InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, DateTimePageProc); + InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, TimeZonePageProc); + InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, InetTimePageProc);
Ret = (LONG)(PropertySheetW(&psh) != -1);
diff --git a/dll/cpl/usrmgr/groupprops.c b/dll/cpl/usrmgr/groupprops.c index dd9c19a1b3..e9be4f678d 100644 --- a/dll/cpl/usrmgr/groupprops.c +++ b/dll/cpl/usrmgr/groupprops.c @@ -638,7 +638,7 @@ GroupProperties(HWND hwndDlg) psh.nStartPage = 0; psh.ppsp = psp;
- InitPropSheetPage(&psp[0], IDD_GROUP_GENERAL, (DLGPROC)GroupGeneralPageProc, szGroupName); + InitPropSheetPage(&psp[0], IDD_GROUP_GENERAL, GroupGeneralPageProc, szGroupName);
return (PropertySheet(&psh) == IDOK); } diff --git a/dll/cpl/usrmgr/userprops.c b/dll/cpl/usrmgr/userprops.c index e49ea258d1..fd76a91767 100644 --- a/dll/cpl/usrmgr/userprops.c +++ b/dll/cpl/usrmgr/userprops.c @@ -928,9 +928,9 @@ UserProperties(HWND hwndDlg) psh.nStartPage = 0; psh.ppsp = psp;
- InitPropSheetPage(&psp[0], IDD_USER_GENERAL, (DLGPROC)UserGeneralPageProc, szUserName); - InitPropSheetPage(&psp[1], IDD_USER_MEMBERSHIP, (DLGPROC)UserMembershipPageProc, szUserName); - InitPropSheetPage(&psp[2], IDD_USER_PROFILE, (DLGPROC)UserProfilePageProc, szUserName); + InitPropSheetPage(&psp[0], IDD_USER_GENERAL, UserGeneralPageProc, szUserName); + InitPropSheetPage(&psp[1], IDD_USER_MEMBERSHIP, UserMembershipPageProc, szUserName); + InitPropSheetPage(&psp[2], IDD_USER_PROFILE, UserProfilePageProc, szUserName);
return (PropertySheet(&psh) == IDOK); } diff --git a/dll/cpl/usrmgr/usrmgr.c b/dll/cpl/usrmgr/usrmgr.c index 2668e18a5c..81b57df38c 100644 --- a/dll/cpl/usrmgr/usrmgr.c +++ b/dll/cpl/usrmgr/usrmgr.c @@ -64,9 +64,9 @@ UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) psh.nStartPage = 0; psh.ppsp = psp;
- InitPropSheetPage(&psp[0], IDD_USERS, (DLGPROC)UsersPageProc); - InitPropSheetPage(&psp[1], IDD_GROUPS, (DLGPROC)GroupsPageProc); - InitPropSheetPage(&psp[2], IDD_EXTRA, (DLGPROC)ExtraPageProc); + InitPropSheetPage(&psp[0], IDD_USERS, UsersPageProc); + InitPropSheetPage(&psp[1], IDD_GROUPS, GroupsPageProc); + InitPropSheetPage(&psp[2], IDD_EXTRA, ExtraPageProc);
return (LONG)(PropertySheet(&psh) != -1); }
-
Thomas Faber