[ros-diffs] [tfaber] 63627: [APPLICATIONS][NEWDEV] - Remove broken function pointer casts

Author: tfaber
Date: Sun Jun 22 18:33:18 2014
New Revision: 63627

URL: http://svn.reactos.org/svn/reactos?rev=63627&view=rev
Log:
[APPLICATIONS][NEWDEV]
- Remove broken function pointer casts

Modified:
    trunk/reactos/base/applications/calc/winmain.c
    trunk/reactos/base/applications/magnify/magnifier.c
    trunk/reactos/base/applications/mspaint/dialogs.c
    trunk/reactos/dll/win32/newdev/wizard.c

Modified: trunk/reactos/base/applications/calc/winmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win…
==============================================================================
--- trunk/reactos/base/applications/calc/winmain.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/calc/winmain.c	[iso-8859-1] Sun Jun 22 18:33:18 2014
@@ -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);
@@ -1722,7 +1722,7 @@
             dwLayout = IDD_DIALOG_STANDARD;
 
         /* This call will always fail if UNICODE for Win9x */
-        if (NULL == CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL,
(DLGPROC)DlgMainProc))
+        if (NULL == CreateDialog(hInstance, MAKEINTRESOURCE(dwLayout), NULL,
DlgMainProc))
             break;
 
         while (GetMessage(&msg, NULL, 0, 0)) {

Modified: trunk/reactos/base/applications/magnify/magnifier.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/…
==============================================================================
--- trunk/reactos/base/applications/magnify/magnifier.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/magnify/magnifier.c	[iso-8859-1] Sun Jun 22 18:33:18
2014
@@ -166,7 +166,7 @@
 
    if (bShowWarning)
    {
-      DialogBox (hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd,
(DLGPROC)WarningProc);
+      DialogBox (hInstance, MAKEINTRESOURCE(IDD_WARNINGDIALOG), hMainWnd, WarningProc);
    }
 
    return TRUE;
@@ -375,10 +375,10 @@
         switch (wmId)
         {
             case IDM_OPTIONS:
-                DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd,
(DLGPROC)OptionsProc);
+                DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOGOPTIONS), hWnd, OptionsProc);
                 break;
             case IDM_ABOUT:
-                DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd,
(DLGPROC)AboutProc);
+                DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hWnd, AboutProc);
                 break;
             case IDM_EXIT:
                 DestroyWindow(hWnd);

Modified: trunk/reactos/base/applications/mspaint/dialogs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/…
==============================================================================
--- trunk/reactos/base/applications/mspaint/dialogs.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/mspaint/dialogs.c	[iso-8859-1] Sun Jun 22 18:33:18
2014
@@ -14,7 +14,7 @@
 
 /* FUNCTIONS ********************************************************/
 
-LRESULT CALLBACK
+INT_PTR CALLBACK
 MRDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch (message)
@@ -66,10 +66,10 @@
 int
 mirrorRotateDlg()
 {
-    return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_MIRRORROTATE), hMainWnd,
(DLGPROC) MRDlgWinProc);
-}
-
-LRESULT CALLBACK
+    return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_MIRRORROTATE), hMainWnd,
MRDlgWinProc);
+}
+
+INT_PTR CALLBACK
 ATTDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch (message)
@@ -203,10 +203,10 @@
 int
 attributesDlg()
 {
-    return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_ATTRIBUTES), hMainWnd, (DLGPROC)
ATTDlgWinProc);
-}
-
-LRESULT CALLBACK
+    return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_ATTRIBUTES), hMainWnd,
ATTDlgWinProc);
+}
+
+INT_PTR CALLBACK
 CHSIZEDlgWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
     switch (message)
@@ -266,5 +266,5 @@
 int
 changeSizeDlg()
 {
-    return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_STRETCHSKEW), hMainWnd, (DLGPROC)
CHSIZEDlgWinProc);
-}
+    return DialogBox(hProgInstance, MAKEINTRESOURCE(IDD_STRETCHSKEW), hMainWnd,
CHSIZEDlgWinProc);
+}

Modified: trunk/reactos/dll/win32/newdev/wizard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?…
==============================================================================
--- trunk/reactos/dll/win32/newdev/wizard.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/newdev/wizard.c	[iso-8859-1] Sun Jun 22 18:33:18 2014
@@ -1255,49 +1255,49 @@
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
     psp.hInstance = hDllInstance;
     psp.lParam = (LPARAM)DevInstData;
-    psp.pfnDlgProc = (DLGPROC) WelcomeDlgProc;
+    psp.pfnDlgProc = WelcomeDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_WELCOMEPAGE);
     ahpsp[IDD_WELCOMEPAGE] = CreatePropertySheetPage(&psp);
 
     /* Create the Select Source page */
     psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
-    psp.pfnDlgProc = (DLGPROC) CHSourceDlgProc;
+    psp.pfnDlgProc = CHSourceDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_CHSOURCE);
     ahpsp[IDD_CHSOURCE] = CreatePropertySheetPage(&psp);
 
     /* Create the Search driver page */
     psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
-    psp.pfnDlgProc = (DLGPROC) SearchDrvDlgProc;
+    psp.pfnDlgProc = SearchDrvDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_SEARCHDRV);
     ahpsp[IDD_SEARCHDRV] = CreatePropertySheetPage(&psp);
 
     /* Create the Install driver page */
     psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE;
-    psp.pfnDlgProc = (DLGPROC) InstallDrvDlgProc;
+    psp.pfnDlgProc = InstallDrvDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLDRV);
     ahpsp[IDD_INSTALLDRV] = CreatePropertySheetPage(&psp);
 
     /* Create the No driver page */
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
-    psp.pfnDlgProc = (DLGPROC) NoDriverDlgProc;
+    psp.pfnDlgProc = NoDriverDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_NODRIVER);
     ahpsp[IDD_NODRIVER] = CreatePropertySheetPage(&psp);
 
     /* Create the Install failed page */
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
-    psp.pfnDlgProc = (DLGPROC) InstallFailedDlgProc;
+    psp.pfnDlgProc = InstallFailedDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_INSTALLFAILED);
     ahpsp[IDD_INSTALLFAILED] = CreatePropertySheetPage(&psp);
 
     /* Create the Need reboot page */
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
-    psp.pfnDlgProc = (DLGPROC) NeedRebootDlgProc;
+    psp.pfnDlgProc = NeedRebootDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_NEEDREBOOT);
     ahpsp[IDD_NEEDREBOOT] = CreatePropertySheetPage(&psp);
 
     /* Create the Finish page */
     psp.dwFlags = PSP_DEFAULT | PSP_HIDEHEADER;
-    psp.pfnDlgProc = (DLGPROC) FinishDlgProc;
+    psp.pfnDlgProc = FinishDlgProc;
     psp.pszTemplate = MAKEINTRESOURCE(IDD_FINISHPAGE);
     ahpsp[IDD_FINISHPAGE] = CreatePropertySheetPage(&psp);