mirror of
https://github.com/reactos/reactos.git
synced 2025-06-01 15:38:37 +00:00
[CPL] Remove unnecessary DLGPROC casts.
This commit is contained in:
parent
dd4af77703
commit
bcbe0dd8cd
14 changed files with 38 additions and 38 deletions
|
@ -200,11 +200,11 @@ SystemApplet(VOID)
|
||||||
psh.nStartPage = 0;
|
psh.nStartPage = 0;
|
||||||
psh.ppsp = psp;
|
psh.ppsp = psp;
|
||||||
|
|
||||||
InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, (DLGPROC)KeyboardPageProc, pGlobalData);
|
InitPropSheetPage(&psp[0], IDD_PROPPAGEKEYBOARD, KeyboardPageProc, pGlobalData);
|
||||||
InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, (DLGPROC)SoundPageProc, pGlobalData);
|
InitPropSheetPage(&psp[1], IDD_PROPPAGESOUND, SoundPageProc, pGlobalData);
|
||||||
InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, (DLGPROC)DisplayPageProc, pGlobalData);
|
InitPropSheetPage(&psp[2], IDD_PROPPAGEDISPLAY, DisplayPageProc, pGlobalData);
|
||||||
InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, (DLGPROC)MousePageProc, pGlobalData);
|
InitPropSheetPage(&psp[3], IDD_PROPPAGEMOUSE, MousePageProc, pGlobalData);
|
||||||
InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, (DLGPROC)GeneralPageProc, pGlobalData);
|
InitPropSheetPage(&psp[4], IDD_PROPPAGEGENERAL, GeneralPageProc, pGlobalData);
|
||||||
|
|
||||||
ret = PropertySheet(&psh);
|
ret = PropertySheet(&psh);
|
||||||
|
|
||||||
|
|
|
@ -179,7 +179,7 @@ DisplayPageProc(HWND hwndDlg,
|
||||||
if (DialogBoxParam(hApplet,
|
if (DialogBoxParam(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_CONTRASTOPTIONS),
|
MAKEINTRESOURCE(IDD_CONTRASTOPTIONS),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)HighContrastDlgProc,
|
HighContrastDlgProc,
|
||||||
(LPARAM)pGlobalData))
|
(LPARAM)pGlobalData))
|
||||||
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -257,7 +257,7 @@ GeneralPageProc(HWND hwndDlg,
|
||||||
if (DialogBoxParam(hApplet,
|
if (DialogBoxParam(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_SERIALKEYSOPTIONS),
|
MAKEINTRESOURCE(IDD_SERIALKEYSOPTIONS),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)SerialKeysDlgProc,
|
SerialKeysDlgProc,
|
||||||
(LPARAM)pGlobalData))
|
(LPARAM)pGlobalData))
|
||||||
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -467,7 +467,7 @@ FilterKeysDlgProc(HWND hwndDlg,
|
||||||
DialogBoxParam(hApplet,
|
DialogBoxParam(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_BOUNCEKEYSOPTIONS),
|
MAKEINTRESOURCE(IDD_BOUNCEKEYSOPTIONS),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)BounceKeysDlgProc,
|
BounceKeysDlgProc,
|
||||||
(LPARAM)pGlobalData);
|
(LPARAM)pGlobalData);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -492,7 +492,7 @@ FilterKeysDlgProc(HWND hwndDlg,
|
||||||
DialogBoxParam(hApplet,
|
DialogBoxParam(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_REPEATKEYSOPTIONS),
|
MAKEINTRESOURCE(IDD_REPEATKEYSOPTIONS),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)RepeatKeysDlgProc,
|
RepeatKeysDlgProc,
|
||||||
(LPARAM)pGlobalData);
|
(LPARAM)pGlobalData);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -621,7 +621,7 @@ KeyboardPageProc(HWND hwndDlg,
|
||||||
if (DialogBoxParam(hApplet,
|
if (DialogBoxParam(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_STICKYKEYSOPTIONS),
|
MAKEINTRESOURCE(IDD_STICKYKEYSOPTIONS),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)StickyKeysDlgProc,
|
StickyKeysDlgProc,
|
||||||
(LPARAM)pGlobalData))
|
(LPARAM)pGlobalData))
|
||||||
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
||||||
break;
|
break;
|
||||||
|
@ -635,7 +635,7 @@ KeyboardPageProc(HWND hwndDlg,
|
||||||
if (DialogBoxParam(hApplet,
|
if (DialogBoxParam(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_FILTERKEYSOPTIONS),
|
MAKEINTRESOURCE(IDD_FILTERKEYSOPTIONS),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)FilterKeysDlgProc,
|
FilterKeysDlgProc,
|
||||||
(LPARAM)pGlobalData))
|
(LPARAM)pGlobalData))
|
||||||
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
||||||
break;
|
break;
|
||||||
|
@ -649,7 +649,7 @@ KeyboardPageProc(HWND hwndDlg,
|
||||||
if (DialogBoxParam(hApplet,
|
if (DialogBoxParam(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_TOGGLEKEYSOPTIONS),
|
MAKEINTRESOURCE(IDD_TOGGLEKEYSOPTIONS),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)ToggleKeysDlgProc,
|
ToggleKeysDlgProc,
|
||||||
(LPARAM)pGlobalData))
|
(LPARAM)pGlobalData))
|
||||||
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -177,7 +177,7 @@ MousePageProc(HWND hwndDlg,
|
||||||
if (DialogBoxParam(hApplet,
|
if (DialogBoxParam(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_MOUSEKEYSOPTIONS),
|
MAKEINTRESOURCE(IDD_MOUSEKEYSOPTIONS),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)MouseKeysDlgProc,
|
MouseKeysDlgProc,
|
||||||
(LPARAM)pGlobalData))
|
(LPARAM)pGlobalData))
|
||||||
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
PropSheet_Changed(GetParent(hwndDlg), hwndDlg);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -97,16 +97,16 @@ Applet1(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
|
||||||
psh.nStartPage = 0;
|
psh.nStartPage = 0;
|
||||||
psh.phpage = hpsp;
|
psh.phpage = hpsp;
|
||||||
|
|
||||||
InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, (DLGPROC)PowerSchemesDlgProc);
|
InitPropSheetPage(&psh, IDD_PROPPAGEPOWERSCHEMES, PowerSchemesDlgProc);
|
||||||
if (GetPwrCapabilities(&spc))
|
if (GetPwrCapabilities(&spc))
|
||||||
{
|
{
|
||||||
if (spc.SystemBatteriesPresent)
|
if (spc.SystemBatteriesPresent)
|
||||||
{
|
{
|
||||||
InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, (DLGPROC)AlarmsDlgProc);
|
InitPropSheetPage(&psh, IDD_PROPPAGEALARMS, AlarmsDlgProc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC)AdvancedDlgProc);
|
InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedDlgProc);
|
||||||
InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, (DLGPROC)HibernateDlgProc);
|
InitPropSheetPage(&psh, IDD_PROPPAGEHIBERNATE, HibernateDlgProc);
|
||||||
|
|
||||||
/* Load additional pages provided by shell extensions */
|
/* Load additional pages provided by shell extensions */
|
||||||
hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Power"), MAX_POWER_PAGES - psh.nPages);
|
hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\Power"), MAX_POWER_PAGES - psh.nPages);
|
||||||
|
|
|
@ -134,35 +134,35 @@ AdvancedPageProc(HWND hwndDlg,
|
||||||
DialogBox(hApplet,
|
DialogBox(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_VIRTMEM),
|
MAKEINTRESOURCE(IDD_VIRTMEM),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)VirtMemDlgProc);
|
VirtMemDlgProc);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_USERPROFILE:
|
case IDC_USERPROFILE:
|
||||||
DialogBox(hApplet,
|
DialogBox(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_USERPROFILE),
|
MAKEINTRESOURCE(IDD_USERPROFILE),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)UserProfileDlgProc);
|
UserProfileDlgProc);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_STAREC:
|
case IDC_STAREC:
|
||||||
DialogBox(hApplet,
|
DialogBox(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_STARTUPRECOVERY),
|
MAKEINTRESOURCE(IDD_STARTUPRECOVERY),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)StartRecDlgProc);
|
StartRecDlgProc);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_SYSSETTINGS:
|
case IDC_SYSSETTINGS:
|
||||||
DialogBox(hApplet,
|
DialogBox(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_SYSSETTINGS),
|
MAKEINTRESOURCE(IDD_SYSSETTINGS),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)SysSettingsDlgProc);
|
SysSettingsDlgProc);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_ENVVAR:
|
case IDC_ENVVAR:
|
||||||
DialogBox(hApplet,
|
DialogBox(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES),
|
MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)EnvironmentDlgProc);
|
EnvironmentDlgProc);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case IDC_ERRORREPORT:
|
case IDC_ERRORREPORT:
|
||||||
|
|
|
@ -163,7 +163,7 @@ CopyHardwareProfile(
|
||||||
if (DialogBoxParam(hApplet,
|
if (DialogBoxParam(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_COPYPROFILE),
|
MAKEINTRESOURCE(IDD_COPYPROFILE),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)CopyProfileDlgProc,
|
CopyProfileDlgProc,
|
||||||
(LPARAM)&ProfileNames) != IDOK)
|
(LPARAM)&ProfileNames) != IDOK)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -280,7 +280,7 @@ RenameHardwareProfile(
|
||||||
if (DialogBoxParam(hApplet,
|
if (DialogBoxParam(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_RENAMEPROFILE),
|
MAKEINTRESOURCE(IDD_RENAMEPROFILE),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)RenameProfileDlgProc,
|
RenameProfileDlgProc,
|
||||||
(LPARAM)&ProfileNames) != IDOK)
|
(LPARAM)&ProfileNames) != IDOK)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
@ -95,7 +95,7 @@ HardwarePageProc(HWND hwndDlg,
|
||||||
DialogBox(hApplet,
|
DialogBox(hApplet,
|
||||||
MAKEINTRESOURCE(IDD_HARDWAREPROFILES),
|
MAKEINTRESOURCE(IDD_HARDWAREPROFILES),
|
||||||
hwndDlg,
|
hwndDlg,
|
||||||
(DLGPROC)HardProfDlgProc);
|
HardProfDlgProc);
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -147,10 +147,10 @@ SystemApplet(VOID)
|
||||||
psh.phpage = hpsp;
|
psh.phpage = hpsp;
|
||||||
psh.pfnCallback = NULL;
|
psh.pfnCallback = NULL;
|
||||||
|
|
||||||
InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc);
|
InitPropSheetPage(&psh, IDD_PROPPAGEGENERAL, GeneralPageProc);
|
||||||
hNetIdDll = AddNetIdPage(&psh);
|
hNetIdDll = AddNetIdPage(&psh);
|
||||||
InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc);
|
InitPropSheetPage(&psh, IDD_PROPPAGEHARDWARE, HardwarePageProc);
|
||||||
InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc);
|
InitPropSheetPage(&psh, IDD_PROPPAGEADVANCED, AdvancedPageProc);
|
||||||
|
|
||||||
/* Load additional pages provided by shell extensions */
|
/* Load additional pages provided by shell extensions */
|
||||||
hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\System"), MAX_SYSTEM_PAGES - psh.nPages);
|
hpsxa = SHCreatePropSheetExtArray(HKEY_LOCAL_MACHINE, REGSTR_PATH_CONTROLSFOLDER TEXT("\\System"), MAX_SYSTEM_PAGES - psh.nPages);
|
||||||
|
|
|
@ -96,9 +96,9 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
|
||||||
psh.nStartPage = 0;
|
psh.nStartPage = 0;
|
||||||
psh.ppsp = psp;
|
psh.ppsp = psp;
|
||||||
|
|
||||||
InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, (DLGPROC) DateTimePageProc);
|
InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, DateTimePageProc);
|
||||||
InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, (DLGPROC) TimeZonePageProc);
|
InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, TimeZonePageProc);
|
||||||
InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, (DLGPROC) InetTimePageProc);
|
InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, InetTimePageProc);
|
||||||
|
|
||||||
Ret = (LONG)(PropertySheetW(&psh) != -1);
|
Ret = (LONG)(PropertySheetW(&psh) != -1);
|
||||||
|
|
||||||
|
|
|
@ -638,7 +638,7 @@ GroupProperties(HWND hwndDlg)
|
||||||
psh.nStartPage = 0;
|
psh.nStartPage = 0;
|
||||||
psh.ppsp = psp;
|
psh.ppsp = psp;
|
||||||
|
|
||||||
InitPropSheetPage(&psp[0], IDD_GROUP_GENERAL, (DLGPROC)GroupGeneralPageProc, szGroupName);
|
InitPropSheetPage(&psp[0], IDD_GROUP_GENERAL, GroupGeneralPageProc, szGroupName);
|
||||||
|
|
||||||
return (PropertySheet(&psh) == IDOK);
|
return (PropertySheet(&psh) == IDOK);
|
||||||
}
|
}
|
||||||
|
|
|
@ -928,9 +928,9 @@ UserProperties(HWND hwndDlg)
|
||||||
psh.nStartPage = 0;
|
psh.nStartPage = 0;
|
||||||
psh.ppsp = psp;
|
psh.ppsp = psp;
|
||||||
|
|
||||||
InitPropSheetPage(&psp[0], IDD_USER_GENERAL, (DLGPROC)UserGeneralPageProc, szUserName);
|
InitPropSheetPage(&psp[0], IDD_USER_GENERAL, UserGeneralPageProc, szUserName);
|
||||||
InitPropSheetPage(&psp[1], IDD_USER_MEMBERSHIP, (DLGPROC)UserMembershipPageProc, szUserName);
|
InitPropSheetPage(&psp[1], IDD_USER_MEMBERSHIP, UserMembershipPageProc, szUserName);
|
||||||
InitPropSheetPage(&psp[2], IDD_USER_PROFILE, (DLGPROC)UserProfilePageProc, szUserName);
|
InitPropSheetPage(&psp[2], IDD_USER_PROFILE, UserProfilePageProc, szUserName);
|
||||||
|
|
||||||
return (PropertySheet(&psh) == IDOK);
|
return (PropertySheet(&psh) == IDOK);
|
||||||
}
|
}
|
||||||
|
|
|
@ -64,9 +64,9 @@ UsrmgrApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam)
|
||||||
psh.nStartPage = 0;
|
psh.nStartPage = 0;
|
||||||
psh.ppsp = psp;
|
psh.ppsp = psp;
|
||||||
|
|
||||||
InitPropSheetPage(&psp[0], IDD_USERS, (DLGPROC)UsersPageProc);
|
InitPropSheetPage(&psp[0], IDD_USERS, UsersPageProc);
|
||||||
InitPropSheetPage(&psp[1], IDD_GROUPS, (DLGPROC)GroupsPageProc);
|
InitPropSheetPage(&psp[1], IDD_GROUPS, GroupsPageProc);
|
||||||
InitPropSheetPage(&psp[2], IDD_EXTRA, (DLGPROC)ExtraPageProc);
|
InitPropSheetPage(&psp[2], IDD_EXTRA, ExtraPageProc);
|
||||||
|
|
||||||
return (LONG)(PropertySheet(&psh) != -1);
|
return (LONG)(PropertySheet(&psh) != -1);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue