Authors: Thomas Weidenmueller <wine-patches@reactsoft.com>, Filip Navara <xnavara@volny.cz>
DLGPROCs return INT_PTR.
This commit is contained in:
parent
c9b27e90ce
commit
86663762ec
|
@ -31,14 +31,15 @@
|
|||
|
||||
#include "taskmgr.h"
|
||||
|
||||
LRESULT CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
void OnAbout(void)
|
||||
{
|
||||
DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, (DLGPROC)AboutDialogWndProc);
|
||||
DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUTBOX), hMainWnd, AboutDialogWndProc);
|
||||
}
|
||||
|
||||
LRESULT CALLBACK AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK
|
||||
AboutDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
HWND hLicenseEditWnd;
|
||||
TCHAR strLicense[0x1000];
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
HANDLE hProcessAffinityHandle;
|
||||
|
||||
LRESULT CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
void ProcessPage_OnSetAffinity(void)
|
||||
{
|
||||
|
@ -62,14 +62,15 @@ void ProcessPage_OnSetAffinity(void)
|
|||
MessageBox(hMainWnd, strErrorText, _T("Unable to Access or Set Process Affinity"), MB_OK|MB_ICONSTOP);
|
||||
return;
|
||||
}
|
||||
DialogBox(hInst, MAKEINTRESOURCE(IDD_AFFINITY_DIALOG), hMainWnd, (DLGPROC)AffinityDialogWndProc);
|
||||
DialogBox(hInst, MAKEINTRESOURCE(IDD_AFFINITY_DIALOG), hMainWnd, AffinityDialogWndProc);
|
||||
if (hProcessAffinityHandle) {
|
||||
CloseHandle(hProcessAffinityHandle);
|
||||
hProcessAffinityHandle = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
LRESULT CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK
|
||||
AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
DWORD dwProcessAffinityMask = 0;
|
||||
DWORD dwSystemAffinityMask = 0;
|
||||
|
|
|
@ -64,7 +64,8 @@ BOOL bRestore /* Restore the window if it is minimized */
|
|||
);
|
||||
#endif
|
||||
|
||||
LRESULT CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK
|
||||
ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
RECT rc;
|
||||
int nXDifference;
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
UINT ColumnDataHints[25];
|
||||
|
||||
int InsertColumn(int nCol, LPCTSTR lpszColumnHeading, int nFormat, int nWidth, int nSubItem);
|
||||
LRESULT CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
void AddColumns(void)
|
||||
{
|
||||
|
@ -329,7 +329,7 @@ void ProcessPage_OnViewSelectColumns(void)
|
|||
{
|
||||
int i;
|
||||
|
||||
if (DialogBox(hInst, MAKEINTRESOURCE(IDD_COLUMNS_DIALOG), hMainWnd, (DLGPROC)ColumnsDialogWndProc) == IDOK)
|
||||
if (DialogBox(hInst, MAKEINTRESOURCE(IDD_COLUMNS_DIALOG), hMainWnd, ColumnsDialogWndProc) == IDOK)
|
||||
{
|
||||
for (i=Header_GetItemCount(hProcessPageHeaderCtrl)-1; i>=0; i--)
|
||||
{
|
||||
|
@ -369,7 +369,8 @@ void ProcessPage_OnViewSelectColumns(void)
|
|||
}
|
||||
}
|
||||
|
||||
LRESULT CALLBACK ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK
|
||||
ColumnsDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
|
||||
switch (message)
|
||||
|
|
|
@ -348,7 +348,7 @@ static void DebugChannels_OnNotify(HWND hDlg, LPARAM lParam)
|
|||
}
|
||||
}
|
||||
|
||||
static LRESULT CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
static INT_PTR CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
switch (message)
|
||||
{
|
||||
|
@ -371,5 +371,5 @@ static LRESULT CALLBACK DebugChannelsDlgProc(HWND hDlg, UINT message, WPARAM wPa
|
|||
|
||||
void ProcessPage_OnDebugChannels(void)
|
||||
{
|
||||
DialogBox(hInst, (LPCTSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, (DLGPROC)DebugChannelsDlgProc);
|
||||
DialogBox(hInst, (LPCTSTR)IDD_DEBUG_CHANNELS_DIALOG, hMainWnd, DebugChannelsDlgProc);
|
||||
}
|
||||
|
|
|
@ -44,7 +44,8 @@ void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd);
|
|||
void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd);
|
||||
void Graph_DrawMemUsageHistoryGraph(HDC hDC, HWND hWnd);
|
||||
|
||||
LRESULT CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK
|
||||
Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
HDC hdc;
|
||||
PAINTSTRUCT ps;
|
||||
|
|
|
@ -532,7 +532,8 @@ extern TGraphCtrl PerformancePageMemUsageHistoryGraph;
|
|||
extern HWND hPerformancePageCpuUsageHistoryGraph;
|
||||
extern HWND hPerformancePageMemUsageHistoryGraph;
|
||||
|
||||
LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK
|
||||
GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
RECT rcClient;
|
||||
HDC hdc;
|
||||
|
|
|
@ -104,7 +104,7 @@ color);
|
|||
void GraphCtrl_SetRange(TGraphCtrl* this, double dLower, double
|
||||
dUpper, int nDecimalPlaces);
|
||||
|
||||
LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
@ -115,7 +115,8 @@ static void AdjustCntrlPos(int ctrl_id, HWND hDlg, int nXDifference, int nYDiffe
|
|||
AdjustFrameSize(GetDlgItem(hDlg, ctrl_id), hDlg, nXDifference, nYDifference, 0);
|
||||
}
|
||||
|
||||
LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK
|
||||
PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
RECT rc;
|
||||
int nXDifference;
|
||||
|
|
|
@ -116,5 +116,5 @@ LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
|
|||
/*
|
||||
* We pass on all messages except WM_ERASEBKGND
|
||||
*/
|
||||
return CallWindowProc((WNDPROC)OldProcessListWndProc, hWnd, message, wParam, lParam);
|
||||
return CallWindowProc(OldProcessListWndProc, hWnd, message, wParam, lParam);
|
||||
}
|
||||
|
|
|
@ -52,7 +52,8 @@ void CommaSeparateNumberString(LPTSTR strNumber, int nMaxCount);
|
|||
void ProcessPageShowContextMenu(DWORD dwProcessId);
|
||||
DWORD WINAPI ProcessPageRefreshThread(void *lpParameter);
|
||||
|
||||
LRESULT CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK
|
||||
ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
RECT rc;
|
||||
int nXDifference;
|
||||
|
|
|
@ -96,7 +96,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
|
|||
return -1;
|
||||
}
|
||||
|
||||
DialogBox(hInst, (LPCTSTR)IDD_TASKMGR_DIALOG, NULL, (DLGPROC)TaskManagerWndProc);
|
||||
DialogBox(hInst, (LPCTSTR)IDD_TASKMGR_DIALOG, NULL, TaskManagerWndProc);
|
||||
|
||||
/* Save our settings to the registry */
|
||||
SaveSettings();
|
||||
|
@ -105,7 +105,8 @@ int APIENTRY WinMain(HINSTANCE hInstance,
|
|||
}
|
||||
|
||||
/* Message handler for dialog box. */
|
||||
LRESULT CALLBACK TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
INT_PTR CALLBACK
|
||||
TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
HDC hdc;
|
||||
PAINTSTRUCT ps;
|
||||
|
@ -444,13 +445,13 @@ BOOL OnCreate(HWND hWnd)
|
|||
/* Create tab pages */
|
||||
hTabWnd = GetDlgItem(hWnd, IDC_TAB);
|
||||
#if 1
|
||||
hApplicationPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_APPLICATION_PAGE), hWnd, (DLGPROC)ApplicationPageWndProc);
|
||||
hProcessPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PROCESS_PAGE), hWnd, (DLGPROC)ProcessPageWndProc);
|
||||
hPerformancePage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PERFORMANCE_PAGE), hWnd, (DLGPROC)PerformancePageWndProc);
|
||||
hApplicationPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_APPLICATION_PAGE), hWnd, ApplicationPageWndProc);
|
||||
hProcessPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PROCESS_PAGE), hWnd, ProcessPageWndProc);
|
||||
hPerformancePage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PERFORMANCE_PAGE), hWnd, PerformancePageWndProc);
|
||||
#else
|
||||
hApplicationPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_APPLICATION_PAGE), hTabWnd, (DLGPROC)ApplicationPageWndProc);
|
||||
hProcessPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PROCESS_PAGE), hTabWnd, (DLGPROC)ProcessPageWndProc);
|
||||
hPerformancePage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PERFORMANCE_PAGE), hTabWnd, (DLGPROC)PerformancePageWndProc);
|
||||
hApplicationPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_APPLICATION_PAGE), hTabWnd, ApplicationPageWndProc);
|
||||
hProcessPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PROCESS_PAGE), hTabWnd, ProcessPageWndProc);
|
||||
hPerformancePage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_PERFORMANCE_PAGE), hTabWnd, PerformancePageWndProc);
|
||||
#endif
|
||||
|
||||
/* Insert tabs */
|
||||
|
|
|
@ -142,7 +142,7 @@ extern HWND hApplicationPageNewTaskButton; /* Application New Task button */
|
|||
|
||||
|
||||
/* Foward declarations of functions included in this code module: */
|
||||
LRESULT CALLBACK TaskManagerWndProc(HWND, UINT, WPARAM, LPARAM);
|
||||
INT_PTR CALLBACK TaskManagerWndProc(HWND, UINT, WPARAM, LPARAM);
|
||||
BOOL OnCreate(HWND hWnd);
|
||||
void OnSize(UINT nType, int cx, int cy);
|
||||
void OnMove(UINT nType, int cx, int cy);
|
||||
|
@ -213,11 +213,11 @@ void UpdateApplicationListControlViewSetting(void);
|
|||
void RefreshPerformancePage(void);
|
||||
void RefreshProcessPage(void);
|
||||
|
||||
LRESULT CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
LRESULT CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR CALLBACK ApplicationPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
LRESULT CALLBACK ProcessListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
LRESULT CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR CALLBACK ProcessPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
INT_PTR CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue