[APPLICATIONS]

- Remove broken casts

svn path=/trunk/; revision=64663
This commit is contained in:
Thomas Faber 2014-10-11 12:39:50 +00:00
parent d4378d8e20
commit a747a1b3f5
9 changed files with 15 additions and 15 deletions

View file

@ -541,7 +541,7 @@ _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInst, LPTSTR lpCmdLine, INT nCmdSh
hProcessHeap = GetProcessHeap(); hProcessHeap = GetProcessHeap();
WndClass.style = 0; WndClass.style = 0;
WndClass.lpfnWndProc = (WNDPROC)WndProc; WndClass.lpfnWndProc = WndProc;
WndClass.cbClsExtra = 0; WndClass.cbClsExtra = 0;
WndClass.cbWndExtra = 0; WndClass.cbWndExtra = 0;
WndClass.hInstance = hInstance; WndClass.hInstance = hInstance;

View file

@ -321,7 +321,7 @@ LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
break; break;
} }
} }
return CallWindowProc( (WNDPROC)Globals.EditProc, hWnd, msg, wParam, lParam); return CallWindowProc( Globals.EditProc, hWnd, msg, wParam, lParam);
} }
/*********************************************************************** /***********************************************************************

View file

@ -286,7 +286,7 @@ LRESULT CALLBACK AddressBarProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar
{ {
WNDPROC oldwndproc; WNDPROC oldwndproc;
static WCHAR s_szNode[256]; static WCHAR s_szNode[256];
oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWLP_USERDATA); oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA);
switch (uMsg) switch (uMsg)
{ {
@ -406,7 +406,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
0); 0);
} }
/* Subclass the AddressBar */ /* 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_USERDATA, (DWORD_PTR)oldproc);
SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_WNDPROC, (DWORD_PTR)AddressBarProc); SetWindowLongPtr(g_pChildWnd->hAddressBarWnd, GWLP_WNDPROC, (DWORD_PTR)AddressBarProc);
break; break;

View file

@ -233,7 +233,7 @@ LRESULT CALLBACK DwordEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
{ {
WNDPROC oldwndproc; WNDPROC oldwndproc;
oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWLP_USERDATA); oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA);
switch (uMsg) switch (uMsg)
{ {
@ -288,7 +288,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
/* subclass the edit control */ /* subclass the edit control */
hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); 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_USERDATA, (DWORD_PTR)oldproc);
SetWindowLongPtr(hwndValue, GWLP_WNDPROC, (DWORD_PTR)DwordEditSubclassProc); SetWindowLongPtr(hwndValue, GWLP_WNDPROC, (DWORD_PTR)DwordEditSubclassProc);

View file

@ -62,7 +62,7 @@ static UINT ClipboardFormatID = 0;
#define HEHT_ASCIIDUMP (0x6) #define HEHT_ASCIIDUMP (0x6)
#define HEHT_RIGHTMARGIN (0x7) #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 ATOM
WINAPI WINAPI
@ -75,7 +75,7 @@ RegisterHexEditorClass(HINSTANCE hInstance)
ZeroMemory(&WndClass, sizeof(WNDCLASSEXW)); ZeroMemory(&WndClass, sizeof(WNDCLASSEXW));
WndClass.cbSize = sizeof(WNDCLASSEXW); WndClass.cbSize = sizeof(WNDCLASSEXW);
WndClass.style = CS_DBLCLKS; WndClass.style = CS_DBLCLKS;
WndClass.lpfnWndProc = (WNDPROC)HexEditWndProc; WndClass.lpfnWndProc = HexEditWndProc;
WndClass.cbWndExtra = sizeof(PHEXEDIT_DATA); WndClass.cbWndExtra = sizeof(PHEXEDIT_DATA);
WndClass.hInstance = hInstance; WndClass.hInstance = hInstance;
WndClass.hCursor = LoadCursorW(NULL, IDC_IBEAM); WndClass.hCursor = LoadCursorW(NULL, IDC_IBEAM);
@ -1415,13 +1415,13 @@ HEXEDIT_WM_CONTEXTMENU(PHEXEDIT_DATA hed, INT x, INT y)
PostMessageW(hed->hWndSelf, WM_NULL, 0, 0); PostMessageW(hed->hWndSelf, WM_NULL, 0, 0);
} }
INT_PTR CALLBACK LRESULT CALLBACK
HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) HexEditWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{ {
PHEXEDIT_DATA hed; PHEXEDIT_DATA hed;
POINTS p; POINTS p;
hed = (PHEXEDIT_DATA)(LONG_PTR)GetWindowLongPtr(hWnd, (DWORD_PTR)0); hed = (PHEXEDIT_DATA)GetWindowLongPtr(hWnd, (DWORD_PTR)0);
switch(uMsg) switch(uMsg)
{ {
case WM_ERASEBKGND: case WM_ERASEBKGND:

View file

@ -126,7 +126,7 @@ Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
/* /*
* We pass on all non-handled messages * 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) void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd)

View file

@ -636,5 +636,5 @@ GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
/* /*
* We pass on all non-handled messages * We pass on all non-handled messages
*/ */
return CallWindowProcW((WNDPROC)OldGraphCtrlWndProc, hWnd, message, wParam, lParam); return CallWindowProcW(OldGraphCtrlWndProc, hWnd, message, wParam, lParam);
} }

View file

@ -197,9 +197,9 @@ PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
/* /*
* Subclass graph buttons * 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); 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); SetWindowLongPtrW(hPerformancePageCpuUsageHistoryGraph, GWLP_WNDPROC, (LONG_PTR)GraphCtrl_WndProc);
return TRUE; return TRUE;

View file

@ -141,7 +141,7 @@ ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
/* /*
* Subclass the process list control so we can intercept WM_ERASEBKGND * 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 #ifdef RUN_PROC_PAGE
/* Start our refresh thread */ /* Start our refresh thread */