25 Jul
2008
25 Jul
'08
4 p.m.
Author: sserapion
Date: Fri Jul 25 11:00:47 2008
New Revision: 34786
URL: http://svn.reactos.org/svn/reactos?rev=34786&view=rev
Log:
Fix broken DLGPROC definition.
Fix previous, unneeded, fixes.
Modified:
branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c
branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c
branches/ros-amd64-bringup/reactos/base/applications/charmap/charmap.c
branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c
branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c
branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c
branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c
branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/mainwnd.c
branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c
branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/mainwnd.c
branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c
branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c
branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c
branches/ros-amd64-bringup/reactos/base/applications/notepad/main.c
branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lex.yy.c
branches/ros-amd64-bringup/reactos/include/psdk/winuser.h
Modified: branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/calc/winmain.c [iso-8859-1] Fri
Jul 25 11:00:47 2008
@@ -1303,7 +1303,7 @@
SetFocus(GetDlgItem(hWnd, IDC_BUTTON_FOCUS));
switch (LOWORD(wp)) {
case IDM_HELP_ABOUT:
- DialogBox(calc.hInstance,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWnd,(DLGPROC)
AboutDlgProc);
+ DialogBox(calc.hInstance,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWnd,
AboutDlgProc);
return TRUE;
case IDM_HELP_HELP:
#ifndef DISABLE_HTMLHELP_SUPPORT
@@ -1626,7 +1626,7 @@
if (IsWindow(calc.hStatWnd))
break;
calc.hStatWnd = CreateDialog(calc.hInstance,
- MAKEINTRESOURCE(IDD_DIALOG_STAT), hWnd,
(DLGPROC)DlgStatProc);
+ MAKEINTRESOURCE(IDD_DIALOG_STAT), hWnd,
DlgStatProc);
if (calc.hStatWnd != NULL) {
enable_allowed_controls(hWnd, calc.base);
SendMessage(calc.hStatWnd, WM_SETFOCUS, 0, 0);
@@ -1715,7 +1715,7 @@
else
dwLayout = IDD_DIALOG_STANDARD;
- CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, (DLGPROC)DlgMainProc);
+ CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL, DlgMainProc);
while (GetMessage(&msg, NULL, 0, 0)) {
#ifndef USE_KEYBOARD_HOOK
Modified: branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/charmap/about.c [iso-8859-1] Fri
Jul 25 11:00:47 2008
@@ -79,5 +79,5 @@
DialogBoxW(hInstance,
MAKEINTRESOURCEW(IDD_ABOUTBOX),
hWndParent,
- (DLGPROC)AboutDialogProc);
+ AboutDialogProc);
}
Modified: branches/ros-amd64-bringup/reactos/base/applications/charmap/charmap.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/charmap/charmap.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/charmap/charmap.c [iso-8859-1]
Fri Jul 25 11:00:47 2008
@@ -182,7 +182,7 @@
}
-static BOOL CALLBACK
+static INT_PTR CALLBACK
DlgProc(HWND hDlg,
UINT Message,
WPARAM wParam,
@@ -351,7 +351,7 @@
Ret = DialogBoxW(hInstance,
MAKEINTRESOURCEW(IDD_CHARMAP),
NULL,
- (DLGPROC)DlgProc) >= 0;
+ DlgProc) >= 0;
UnregisterMapClasses(hInstance);
}
Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/display.c [iso-8859-1] Fri
Jul 25 11:00:47 2008
@@ -338,7 +338,7 @@
break;
pContext->hDisplayWnd = hDlgs;
- hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG),
pContext->hMainDialog, (DLGPROC)DisplayPageWndProc, (LPARAM)pContext);
+ hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_DISPLAY_DIALOG),
pContext->hMainDialog, DisplayPageWndProc, (LPARAM)pContext);
if (!hwndDlg)
break;
Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/dxdiag.c [iso-8859-1] Fri
Jul 25 11:00:47 2008
@@ -119,11 +119,11 @@
pContext->hTabCtrl = hTabCtrlWnd;
/* create the dialogs */
- pContext->hDialogs[0] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), hTabCtrlWnd, (DLGPROC)SystemPageWndProc,
(LPARAM)pContext);
- pContext->hDialogs[1] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hTabCtrlWnd, (DLGPROC)MusicPageWndProc,
(LPARAM)pContext);
- pContext->hDialogs[2] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hTabCtrlWnd, (DLGPROC)InputPageWndProc,
(LPARAM)pContext);
- pContext->hDialogs[3] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hTabCtrlWnd, (DLGPROC)NetworkPageWndProc,
(LPARAM)pContext);
- pContext->hDialogs[4] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_HELP_DIALOG), hTabCtrlWnd, (DLGPROC)HelpPageWndProc,
(LPARAM)pContext);
+ pContext->hDialogs[0] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), hTabCtrlWnd, SystemPageWndProc, (LPARAM)pContext);
+ pContext->hDialogs[1] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), hTabCtrlWnd, MusicPageWndProc, (LPARAM)pContext);
+ pContext->hDialogs[2] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_INPUT_DIALOG), hTabCtrlWnd, InputPageWndProc, (LPARAM)pContext);
+ pContext->hDialogs[3] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), hTabCtrlWnd, NetworkPageWndProc, (LPARAM)pContext);
+ pContext->hDialogs[4] = CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_HELP_DIALOG), hTabCtrlWnd, HelpPageWndProc, (LPARAM)pContext);
/* insert tab ctrl items */
@@ -238,7 +238,7 @@
hInst = hInstance;
- DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, (DLGPROC) DxDiagWndProc);
+ DialogBox(hInst, MAKEINTRESOURCE(IDD_MAIN_DIALOG), NULL, DxDiagWndProc);
return 0;
}
Modified: branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/dxdiag/sound.c [iso-8859-1] Fri
Jul 25 11:00:47 2008
@@ -209,7 +209,7 @@
return FALSE;
pContext->hSoundWnd = hDlgs;
- hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG),
pContext->hMainDialog, (DLGPROC)SoundPageWndProc, (LPARAM)pContext);
+ hwndDlg = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SOUND_DIALOG),
pContext->hMainDialog, SoundPageWndProc, (LPARAM)pContext);
if (!hwndDlg)
return FALSE;
Modified: branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/msconfig/msconfig.c [iso-8859-1]
Fri Jul 25 11:00:47 2008
@@ -21,12 +21,12 @@
TCITEM item;
hTabWnd = GetDlgItem(hWnd, IDC_TAB);
- hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, (DLGPROC)
GeneralPageWndProc);
- hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, (DLGPROC)
SystemPageWndProc);
- hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, (DLGPROC)
FreeLdrPageWndProc);
- hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd,
(DLGPROC) ServicesPageWndProc);
- hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, (DLGPROC)
StartupPageWndProc);
- hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, (DLGPROC)
ToolsPageWndProc);
+ hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd,
GeneralPageWndProc);
+ hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd,
SystemPageWndProc);
+ hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd,
FreeLdrPageWndProc);
+ hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd,
ServicesPageWndProc);
+ hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd,
StartupPageWndProc);
+ hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd,
ToolsPageWndProc);
LoadString(hInst, IDS_MSCONFIG, szTemp, 256);
SetWindowText(hWnd, szTemp);
@@ -222,7 +222,7 @@
hInst = hInstance;
- DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, (DLGPROC) MsConfigWndProc);
+ DialogBox(hInst, (LPCTSTR)IDD_MSCONFIG_DIALOG, NULL, MsConfigWndProc);
return 0;
}
Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/mainwnd.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/mainwnd.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/devmgmt/mainwnd.c
[iso-8859-1] Fri Jul 25 11:00:47 2008
@@ -464,7 +464,7 @@
DialogBox(hInstance,
MAKEINTRESOURCE(IDD_ABOUTBOX),
Info->hMainWnd,
- (DLGPROC)AboutDialogProc);
+ AboutDialogProc);
SetFocus(Info->hTreeView);
}
Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/create.c
[iso-8859-1] Fri Jul 25 11:00:47 2008
@@ -302,7 +302,7 @@
hHelp = CreateDialog(hInstance,
MAKEINTRESOURCE(IDD_DLG_HELP_OPTIONS),
hDlg,
- (DLGPROC)CreateHelpDialogProc);
+ CreateHelpDialogProc);
if(hHelp != NULL)
{
bHelpOpen = TRUE;
Modified: branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/mainwnd.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/mainwnd.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/mainwnd.c
[iso-8859-1] Fri Jul 25 11:00:47 2008
@@ -432,7 +432,7 @@
ret = DialogBoxParam(hInstance,
MAKEINTRESOURCE(IDD_DLG_CREATE),
Info->hMainWnd,
- (DLGPROC)CreateDialogProc,
+ CreateDialogProc,
(LPARAM)Info);
if (ret == IDOK)
RefreshServiceList(Info);
@@ -448,7 +448,7 @@
DialogBoxParam(hInstance,
MAKEINTRESOURCE(IDD_DLG_DELETE),
Info->hMainWnd,
- (DLGPROC)DeleteDialogProc,
+ DeleteDialogProc,
(LPARAM)Info);
}
else
@@ -569,7 +569,7 @@
DialogBox(hInstance,
MAKEINTRESOURCE(IDD_ABOUTBOX),
Info->hMainWnd,
- (DLGPROC)AboutDialogProc);
+ AboutDialogProc);
SetFocus(Info->hListView);
break;
Modified:
branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mscutils/servman/progress.c
[iso-8859-1] Fri Jul 25 11:00:47 2008
@@ -113,7 +113,7 @@
hProgDlg = CreateDialog(hInstance,
MAKEINTRESOURCE(IDD_DLG_PROGRESS),
hParent,
- (DLGPROC)ProgressDialogProc);
+ ProgressDialogProc);
if (hProgDlg != NULL)
{
/* write the info to the progress dialog */
Modified: branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c
[iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/base/applications/mstsc/connectdialog.c
[iso-8859-1] Fri Jul 25 11:00:47 2008
@@ -986,7 +986,7 @@
if (CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_GENERAL),
pInfo->hTab,
- (DLGPROC)GeneralDlgProc,
+ GeneralDlgProc,
(LPARAM)pInfo))
{
WCHAR str[256];
@@ -1001,7 +1001,7 @@
if (CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_DISPLAY),
pInfo->hTab,
- (DLGPROC)DisplayDlgProc,
+ DisplayDlgProc,
(LPARAM)pInfo))
{
WCHAR str[256];
@@ -1233,6 +1233,6 @@
return (DialogBoxParamW(hInst,
MAKEINTRESOURCEW(IDD_CONNECTDIALOG),
NULL,
- (DLGPROC)DlgProc,
+ DlgProc,
(LPARAM)pRdpSettings) == IDOK);
}
Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/notepad/dialog.c [iso-8859-1] Fri
Jul 25 11:00:47 2008
@@ -851,7 +851,7 @@
}
nLine = DialogBoxParam(Globals.hInstance, MAKEINTRESOURCE(DIALOG_GOTO),
- Globals.hMainWnd, (DLGPROC)DIALOG_GoTo_DialogProc, nLine);
+ Globals.hMainWnd, DIALOG_GoTo_DialogProc, nLine);
if (nLine >= 1)
{
@@ -981,7 +981,7 @@
VOID DIALOG_FilePageSetup(void)
{
DialogBox(Globals.hInstance, MAKEINTRESOURCE(DIALOG_PAGESETUP),
- Globals.hMainWnd, (DLGPROC)DIALOG_PAGESETUP_DlgProc);
+ Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc);
}
Modified: branches/ros-amd64-bringup/reactos/base/applications/notepad/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/notepad/main.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/notepad/main.c [iso-8859-1] Fri
Jul 25 11:00:47 2008
@@ -91,7 +91,7 @@
case CMD_ABOUT: DialogBox(GetModuleHandle(NULL),
MAKEINTRESOURCE(IDD_ABOUTBOX),
Globals.hMainWnd,
- (DLGPROC) AboutDialogProc);
+ AboutDialogProc);
break;
case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break;
Modified: branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lex.yy.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/…
==============================================================================
--- branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/base/applications/winhlp32/lex.yy.c [iso-8859-1]
Fri Jul 25 11:00:47 2008
@@ -1662,7 +1662,7 @@
void macro_test(void)
{
WNDPROC lpfnDlg = MakeProcInstance(MACRO_TestDialogProc, Globals.hInstance);
- DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd,
(DLGPROC)lpfnDlg);
+ DialogBox(Globals.hInstance, STRING_DIALOG_TEST, Globals.active_win->hMainWnd,
lpfnDlg);
FreeProcInstance(lpfnDlg);
macro = szTestMacro;
}
Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu…
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/psdk/winuser.h [iso-8859-1] Fri Jul 25
11:00:47 2008
@@ -2691,7 +2691,7 @@
#define STATE_SYSTEM_VALID 0x1fffffff
#ifndef RC_INVOKED
-typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
+typedef INT_PTR(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD);
typedef BOOL(CALLBACK *GRAYSTRINGPROC)(HDC,LPARAM,int);
typedef LRESULT(CALLBACK *HOOKPROC)(int,WPARAM,LPARAM);