Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-21 05:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.7][REACTOS] Reduce count of (DLGPROC) casts, [CMIDRIVER] Remove useless aps file

Browse source 
ports back the following commits:
0.4.15-dev-3822-g 78a7d7dc32 [CMIDRIVER] Remove useless Visual Studio resource editor aps-file
0.4.12-dev-399-g 32faa24733 [BUTTERFLIES] Fix GCC build, addendum to 0.4.12-dev-397-g 2890a22179
a tiny fraction of 0.4.12-dev-397-g 2890a22179 just the [BUTTERFLIES] Avoid DLGPROC cast
0.4.8-dev-58-g bcbe0dd8cd [CPL] Remove unnecessary DLGPROC casts. (#99)
0.4.8-dev-30-g 830fc82afe [SERIALUI] Set the stdcall calling convention for CommDlgProc() and make it return INT_PTR

Ftr, there are still a few DLGPROC casts left after this commit in ros source tree,
but I don't want to port back the commits yet, which addressed them.
Too fresh still, no need to rush that.
This commit is contained in:
Joachim Henze 2023-09-18 16:15:28 +02:00
parent 509c7c3a90
commit 0c09cd7e98
20 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/setup/reactos/drivepage.c
View file

@ -218,14 +218,14 @@ DriveDlgProc(
DialogBoxParam(pSetupData->hInstance,
MAKEINTRESOURCE(IDD_BOOTOPTIONS),
hwndDlg,
(DLGPROC)MoreOptDlgProc,
MoreOptDlgProc,
(LPARAM)pSetupData);
break;
case IDC_PARTCREATE:
DialogBox(pSetupData->hInstance,
MAKEINTRESOURCE(IDD_PARTITION),
hwndDlg,
(DLGPROC) PartitionDlgProc);
PartitionDlgProc);
break;
case IDC_PARTDELETE:
break;

18
boot/freeldr/fdebug/fdebug.c
View file

@ -34,9 +34,9 @@ DWORD dwThreadId = 0; // Thread id of RS23
ATOM MyRegisterClass(HINSTANCE hInstance);
BOOL InitInstance(HINSTANCE, int);
LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
LRESULT CALLBACK About(HWND, UINT, WPARAM, LPARAM);
LRESULT CALLBACK ConnectionDialogProc(HWND, UINT, WPARAM, LPARAM);
LRESULT CALLBACK CaptureDialogProc(HWND, UINT, WPARAM, LPARAM);
INT_PTR CALLBACK About(HWND, UINT, WPARAM, LPARAM);
INT_PTR CALLBACK ConnectionDialogProc(HWND, UINT, WPARAM, LPARAM);
INT_PTR CALLBACK CaptureDialogProc(HWND, UINT, WPARAM, LPARAM);
VOID EnableFileMenuItemByID(UINT Id, BOOL Enable);
VOID CheckLocalEchoMenuItem(BOOL Checked);
VOID __cdecl Rs232Thread(VOID* Parameter);
@ -212,7 +212,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
switch (wmId)
{
case IDM_ABOUT:
DialogBox(hInst, (LPCTSTR)IDD_ABOUTBOX, hWnd, (DLGPROC)About);
DialogBox(hInst, (LPCTSTR)IDD_ABOUTBOX, hWnd, About);
break;
case IDM_EXIT:
DestroyWindow(hWnd);
@ -227,7 +227,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
}
else
{
if (DialogBox(hInst, (LPCTSTR)IDD_CONNECTION, hWnd, (DLGPROC)ConnectionDialogProc) == IDOK)
if (DialogBox(hInst, (LPCTSTR)IDD_CONNECTION, hWnd, ConnectionDialogProc) == IDOK)
{
bConnected = TRUE;
EnableFileMenuItemByID(IDM_FILE_DISCONNECT, TRUE);
@ -249,7 +249,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
}
break;
case IDM_FILE_STARTCAPTURE:
if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, (DLGPROC)CaptureDialogProc) == IDOK)
if (DialogBox(hInst, (LPCTSTR)IDD_CAPTURE, hWnd, CaptureDialogProc) == IDOK)
{
bCapturing = TRUE;
EnableFileMenuItemByID(IDM_FILE_STOPCAPTURE, TRUE);
@ -305,7 +305,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
return 0;
}
LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
HWND hLicenseEditWnd;
TCHAR strLicense[0x1000];
@ -335,7 +335,7 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
return FALSE;
}
LRESULT CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
INT_PTR CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
UNREFERENCED_PARAMETER(lParam);
@ -365,7 +365,7 @@ LRESULT CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LP
return FALSE;
}
LRESULT CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
INT_PTR CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
OPENFILENAME ofn;

10
dll/cpl/access/access.c
View file

@ -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);

2
dll/cpl/access/display.c
View file

@ -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;

2
dll/cpl/access/general.c
View file

@ -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;

10
dll/cpl/access/keyboard.c
View file

@ -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;

2
dll/cpl/access/mouse.c
View file

@ -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;

8
dll/cpl/powercfg/powercfg.c
View file

@ -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);

10
dll/cpl/sysdm/advanced.c
View file

@ -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:

4
dll/cpl/sysdm/hardprof.c
View file

@ -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;

2
dll/cpl/sysdm/hardware.c
View file

@ -95,7 +95,7 @@ HardwarePageProc(HWND hwndDlg,
DialogBox(hApplet,
MAKEINTRESOURCE(IDD_HARDWAREPROFILES),
hwndDlg,
(DLGPROC)HardProfDlgProc);
HardProfDlgProc);
return TRUE;
}
break;

6
dll/cpl/sysdm/sysdm.c
View file

@ -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);

6
dll/cpl/timedate/timedate.c
View file

@ -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);

2
dll/cpl/usrmgr/groupprops.c
View file

@ -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);
}

6
dll/cpl/usrmgr/userprops.c
View file

@ -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);
}

6
dll/cpl/usrmgr/usrmgr.c
View file

@ -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);
}

9
dll/win32/serialui/serialui.c
View file

@ -113,7 +113,7 @@ DWORD WINAPI drvCommConfigDialogW(LPCWSTR lpszDevice,
DialogInfo.lpCC = lpCommConfig;
return DialogBoxParamW(hDllInstance, MAKEINTRESOURCEW(IDD_COMMDLG),
hWnd, (DLGPROC)CommDlgProc, (LPARAM)&DialogInfo);
hWnd, CommDlgProc, (LPARAM)&DialogInfo);
}
/*
@ -186,10 +186,9 @@ DWORD WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice,
*
************************************/
LRESULT CommDlgProc(HWND hDlg,
UINT Msg,
WPARAM wParam,
LPARAM lParam)
INT_PTR
CALLBACK
CommDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
{
LPDIALOG_INFO lpDlgInfo = NULL;
HWND hBox;

5
dll/win32/serialui/serialui.h
View file

@ -82,7 +82,10 @@ DWORD WINAPI drvGetDefaultCommConfigA(LPCSTR lpszDevice,
*
************************************/
LRESULT CommDlgProc(HWND hDlg,
INT_PTR
CALLBACK
CommDlgProc(
HWND hDlg,
UINT Msg,
WPARAM wParam,
LPARAM lParam);

BIN
drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps
View file

Binary file not shown.

8
modules/rosapps/applications/screensavers/butterflies/butterflies.c
View file

@ -227,18 +227,16 @@ void Display()
Sleep(15); // Create A Short Delay (15 Milliseconds)
glFlush ();
}
BOOL AboutProc(HWND hdlg, UINT msg, WPARAM wpm, LPARAM lpm){
INT_PTR CALLBACK AboutProc(HWND hdlg, UINT msg, WPARAM wpm, LPARAM lpm){
switch(msg){
case WM_CTLCOLORSTATIC:
if(((HWND)lpm == GetDlgItem(hdlg, WEBPAGE1)) || ((HWND)lpm == GetDlgItem(hdlg, WEBPAGE2)))
{
SetTextColor((HDC)wpm, RGB(0,0,255));
SetBkColor((HDC)wpm, (COLORREF)GetSysColor(COLOR_3DFACE));
return((int)GetSysColorBrush(COLOR_3DFACE));
return (INT_PTR)GetSysColorBrush(COLOR_3DFACE);
}
break;
case WM_COMMAND:
@ -314,7 +312,7 @@ BOOL WINAPI ScreenSaverConfigureDialog(HWND hDlg, UINT message,
EndDialog(hDlg, TRUE);
break;
case IDABOUT:
DialogBox(hInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hDlg, (DLGPROC)AboutProc);
DialogBox(hInstance, MAKEINTRESOURCE(IDD_DLG_ABOUT), hDlg, AboutProc);
break;
}
}