[ros-diffs] [tfaber] 64663: [APPLICATIONS] - Remove broken casts

Author: tfaber
Date: Sat Oct 11 12:39:50 2014
New Revision: 64663

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

Modified:
    trunk/reactos/base/applications/kbswitch/kbswitch.c
    trunk/reactos/base/applications/notepad/main.c
    trunk/reactos/base/applications/regedit/childwnd.c
    trunk/reactos/base/applications/regedit/edit.c
    trunk/reactos/base/applications/regedit/hexedit.c
    trunk/reactos/base/applications/taskmgr/graph.c
    trunk/reactos/base/applications/taskmgr/graphctl.c
    trunk/reactos/base/applications/taskmgr/perfpage.c
    trunk/reactos/base/applications/taskmgr/procpage.c

Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch…
==============================================================================
--- trunk/reactos/base/applications/kbswitch/kbswitch.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/kbswitch/kbswitch.c	[iso-8859-1] Sat Oct 11 12:39:50
2014
@@ -541,7 +541,7 @@
     hProcessHeap = GetProcessHeap();
 
     WndClass.style = 0;
-    WndClass.lpfnWndProc   = (WNDPROC)WndProc;
+    WndClass.lpfnWndProc   = WndProc;
     WndClass.cbClsExtra    = 0;
     WndClass.cbWndExtra    = 0;
     WndClass.hInstance     = hInstance;

Modified: trunk/reactos/base/applications/notepad/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…
==============================================================================
--- trunk/reactos/base/applications/notepad/main.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/notepad/main.c	[iso-8859-1] Sat Oct 11 12:39:50 2014
@@ -321,7 +321,7 @@
             break;
         }
     }
-    return CallWindowProc( (WNDPROC)Globals.EditProc, hWnd, msg, wParam, lParam);
+    return CallWindowProc( Globals.EditProc, hWnd, msg, wParam, lParam);
 }
 
 /***********************************************************************

Modified: trunk/reactos/base/applications/regedit/childwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/childwnd.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/childwnd.c	[iso-8859-1] Sat Oct 11 12:39:50
2014
@@ -286,7 +286,7 @@
 {
     WNDPROC oldwndproc;
     static WCHAR s_szNode[256];
-    oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 
     switch (uMsg)
     {
@@ -406,7 +406,7 @@
                          0);
         }
         /* Subclass the AddressBar */
-        oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(g_pChildWnd->hAddressBarWnd,
GWLP_WNDPROC);
+        oldproc = (WNDPROC)GetWindowLongPtr(g_pChildWnd->hAddressBarWnd,
GWLP_WNDPROC);
         SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_USERDATA,
(DWORD_PTR)oldproc);
         SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_WNDPROC,
(DWORD_PTR)AddressBarProc);
         break;

Modified: trunk/reactos/base/applications/regedit/edit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/edit.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/edit.c	[iso-8859-1] Sat Oct 11 12:39:50 2014
@@ -233,7 +233,7 @@
 {
     WNDPROC oldwndproc;
 
-    oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+    oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 
     switch (uMsg)
     {
@@ -288,7 +288,7 @@
 
         /* subclass the edit control */
         hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA);
-        oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwndValue, GWLP_WNDPROC);
+        oldproc = (WNDPROC)GetWindowLongPtr(hwndValue, GWLP_WNDPROC);
         SetWindowLongPtr(hwndValue, GWLP_USERDATA, (DWORD_PTR)oldproc);
         SetWindowLongPtr(hwndValue, GWLP_WNDPROC, (DWORD_PTR)DwordEditSubclassProc);
 

Modified: trunk/reactos/base/applications/regedit/hexedit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…
==============================================================================
--- trunk/reactos/base/applications/regedit/hexedit.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/regedit/hexedit.c	[iso-8859-1] Sat Oct 11 12:39:50
2014
@@ -62,7 +62,7 @@
 #define HEHT_ASCIIDUMP      (0x6)
 #define HEHT_RIGHTMARGIN    (0x7)
 
-INT_PTR CALLBACK HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+LRESULT CALLBACK HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 ATOM
 WINAPI
@@ -75,7 +75,7 @@
     ZeroMemory(&WndClass, sizeof(WNDCLASSEXW));
     WndClass.cbSize = sizeof(WNDCLASSEXW);
     WndClass.style = CS_DBLCLKS;
-    WndClass.lpfnWndProc = (WNDPROC)HexEditWndProc;
+    WndClass.lpfnWndProc = HexEditWndProc;
     WndClass.cbWndExtra = sizeof(PHEXEDIT_DATA);
     WndClass.hInstance = hInstance;
     WndClass.hCursor = LoadCursorW(NULL, IDC_IBEAM);
@@ -1415,13 +1415,13 @@
     PostMessageW(hed->hWndSelf, WM_NULL, 0, 0);
 }
 
-INT_PTR CALLBACK
+LRESULT CALLBACK
 HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     PHEXEDIT_DATA hed;
     POINTS p;
 
-    hed = (PHEXEDIT_DATA)(LONG_PTR)GetWindowLongPtr(hWnd, (DWORD_PTR)0);
+    hed = (PHEXEDIT_DATA)GetWindowLongPtr(hWnd, (DWORD_PTR)0);
     switch(uMsg)
     {
     case WM_ERASEBKGND:

Modified: trunk/reactos/base/applications/taskmgr/graph.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/graph.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/graph.c	[iso-8859-1] Sat Oct 11 12:39:50 2014
@@ -126,7 +126,7 @@
     /*
      * We pass on all non-handled messages
      */
-    return CallWindowProcW((WNDPROC)OldGraphWndProc, hWnd, message, wParam, lParam);
+    return CallWindowProcW(OldGraphWndProc, hWnd, message, wParam, lParam);
 }
 
 void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd)

Modified: trunk/reactos/base/applications/taskmgr/graphctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/graphctl.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/graphctl.c	[iso-8859-1] Sat Oct 11 12:39:50
2014
@@ -636,5 +636,5 @@
     /*
      *  We pass on all non-handled messages
      */
-    return CallWindowProcW((WNDPROC)OldGraphCtrlWndProc, hWnd, message, wParam, lParam);
-}
+    return CallWindowProcW(OldGraphCtrlWndProc, hWnd, message, wParam, lParam);
+}

Modified: trunk/reactos/base/applications/taskmgr/perfpage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/perfpage.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/perfpage.c	[iso-8859-1] Sat Oct 11 12:39:50
2014
@@ -197,9 +197,9 @@
         /*
          *  Subclass graph buttons
          */
-        OldGraphWndProc = (WNDPROC)(LONG_PTR)
SetWindowLongPtrW(hPerformancePageCpuUsageGraph, GWLP_WNDPROC, (LONG_PTR)Graph_WndProc);
+        OldGraphWndProc = (WNDPROC)SetWindowLongPtrW(hPerformancePageCpuUsageGraph,
GWLP_WNDPROC, (LONG_PTR)Graph_WndProc);
         SetWindowLongPtrW(hPerformancePageMemUsageGraph, GWLP_WNDPROC,
(LONG_PTR)Graph_WndProc);
-        OldGraphCtrlWndProc = (WNDPROC)(LONG_PTR)
SetWindowLongPtrW(hPerformancePageMemUsageHistoryGraph, GWLP_WNDPROC,
(LONG_PTR)GraphCtrl_WndProc);
+        OldGraphCtrlWndProc =
(WNDPROC)SetWindowLongPtrW(hPerformancePageMemUsageHistoryGraph, GWLP_WNDPROC,
(LONG_PTR)GraphCtrl_WndProc);
         SetWindowLongPtrW(hPerformancePageCpuUsageHistoryGraph, GWLP_WNDPROC,
(LONG_PTR)GraphCtrl_WndProc);
         return TRUE;
 

Modified: trunk/reactos/base/applications/taskmgr/procpage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
==============================================================================
--- trunk/reactos/base/applications/taskmgr/procpage.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/taskmgr/procpage.c	[iso-8859-1] Sat Oct 11 12:39:50
2014
@@ -141,7 +141,7 @@
         /*
          * Subclass the process list control so we can intercept WM_ERASEBKGND
          */
-        OldProcessListWndProc = (WNDPROC)(LONG_PTR)
SetWindowLongPtrW(hProcessPageListCtrl, GWLP_WNDPROC, (LONG_PTR)ProcessListWndProc);
+        OldProcessListWndProc = (WNDPROC)SetWindowLongPtrW(hProcessPageListCtrl,
GWLP_WNDPROC, (LONG_PTR)ProcessListWndProc);
 
 #ifdef RUN_PROC_PAGE
         /* Start our refresh thread */