From 0c09cd7e98ece85c0b3b142cada33c6cbc119c32 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Mon, 18 Sep 2023 16:15:28 +0200 Subject: [PATCH] [0.4.7][REACTOS] Reduce count of (DLGPROC) casts, [CMIDRIVER] Remove useless aps file ports back the following commits: 0.4.15-dev-3822-g 78a7d7dc324ab4597de81ec470c70058d9b6c083 [CMIDRIVER] Remove useless Visual Studio resource editor aps-file 0.4.12-dev-399-g 32faa247331dc744d307aa9fd60146aa59cde8ba [BUTTERFLIES] Fix GCC build, addendum to 0.4.12-dev-397-g 2890a22179528006e637cd5efdfc2abb7e2ceb5b a tiny fraction of 0.4.12-dev-397-g 2890a22179528006e637cd5efdfc2abb7e2ceb5b just the [BUTTERFLIES] Avoid DLGPROC cast 0.4.8-dev-58-g bcbe0dd8cd14109d726e8b75d4d840bad191351d [CPL] Remove unnecessary DLGPROC casts. (#99) 0.4.8-dev-30-g 830fc82afe6853f8d4e6c5e54d6d813c5861fc34 [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. --- base/setup/reactos/drivepage.c | 4 ++-- boot/freeldr/fdebug/fdebug.c | 18 +++++++++--------- 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 +++--- dll/win32/serialui/serialui.c | 9 ++++----- dll/win32/serialui/serialui.h | 5 ++++- .../drivers/CMIDriver/cmicontrol/window.aps | Bin 440 -> 0 bytes .../screensavers/butterflies/butterflies.c | 8 +++----- 20 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index 8416305351a..014a23ec9c9 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -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; diff --git a/boot/freeldr/fdebug/fdebug.c b/boot/freeldr/fdebug/fdebug.c index f43582e3778..25ecd406e0d 100644 --- a/boot/freeldr/fdebug/fdebug.c +++ b/boot/freeldr/fdebug/fdebug.c @@ -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; diff --git a/dll/cpl/access/access.c b/dll/cpl/access/access.c index efd61954df6..9bd028c64f9 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 4f8bc16fa09..05e88f1e691 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 8b1742a7305..414b93016a5 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 f5953c4ca98..a79624293c9 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 81f1e3b3240..a81d947d4ea 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 9952f84bee6..fd820cc6d29 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 873667249db..ffa1e051ed6 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 2a47ec3d244..7d8c6335f15 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 5e628e8b915..3211b4e63ba 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 64b489f7e20..36bd5f51144 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 f19882c86f1..3bf0d7e57dd 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 dd9c19a1b38..e9be4f678da 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 e49ea258d14..fd76a91767f 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 2668e18a5c7..81b57df38cc 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); } diff --git a/dll/win32/serialui/serialui.c b/dll/win32/serialui/serialui.c index e4d4d50e17f..1e853104403 100644 --- a/dll/win32/serialui/serialui.c +++ b/dll/win32/serialui/serialui.c @@ -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; diff --git a/dll/win32/serialui/serialui.h b/dll/win32/serialui/serialui.h index f597eac5e19..121d11e2819 100644 --- a/dll/win32/serialui/serialui.h +++ b/dll/win32/serialui/serialui.h @@ -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); diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/window.aps deleted file mode 100644 index e596df04b52c480efd6972a5eb1fadd5bf6876fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 440 zcmZQzU|>)H;{X347|28cmO!2g5PL9$GdKb1|Nj}G^6V^71_KLF$ki$)+|$p+#XH8# zz`!7;xF|U$u{0$!KPEXhH6=3lGz~^a}zps`)3t#u_lN zvoL{K3=E238c03{IuZ$>>N^RRLDmOyAgY>E7;032KAM1`4q`L1S)g!m0b+dN0P@Qc h6g3FH0EOY;4v>W~2jOm*0+72IfMJSIgK#%Y4FF2EKXm{A diff --git a/modules/rosapps/applications/screensavers/butterflies/butterflies.c b/modules/rosapps/applications/screensavers/butterflies/butterflies.c index b11a45dd134..820c8b41634 100644 --- a/modules/rosapps/applications/screensavers/butterflies/butterflies.c +++ b/modules/rosapps/applications/screensavers/butterflies/butterflies.c @@ -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; } }