x64 conversion

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@526 4f64403b-2f21-0410-a795-97e2b3489a10

1 files changed, 9 insertions, 9 deletions

diff --git a/ping/pinggraph.cpp b/ping/pinggraph.cpp
index 0ce5184..5ce66fb 100644
--- a/ping/pinggraph.cpp
+++ b/ping/pinggraph.cpp
@@ -21,7 +21,7 @@ LRESULT CALLBACK GraphWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 	switch(msg) {

 	case WM_REBUILDLIST:

 		{

-			WindowData *wd = (WindowData *)GetWindowLong(hwnd, GWL_USERDATA);

+			WindowData *wd = (WindowData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);

 

 			bool found = false;

 			EnterCriticalSection(&data_list_cs);

@@ -44,7 +44,7 @@ LRESULT CALLBACK GraphWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 		return TRUE;

 	case WM_SHOWWINDOW:

 		if(wParam == TRUE && lParam == 0) {

-			WindowData *wd = (WindowData *)GetWindowLong(hwnd, GWL_USERDATA);

+			WindowData *wd = (WindowData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);

 

 			if(wd->hwnd_chk_grid == 0) {

 				wd->hwnd_chk_grid = CreateWindow("BUTTON", Translate("Show grid lines"), WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 0, 0, 0, 0, hwnd, 0, hInst, 0);

@@ -66,7 +66,7 @@ LRESULT CALLBACK GraphWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 		break;

 	case WM_COMMAND:

 		if(HIWORD(wParam) == BN_CLICKED) {

-			WindowData *wd = (WindowData *)GetWindowLong(hwnd, GWL_USERDATA);

+			WindowData *wd = (WindowData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);

 			if((HWND)lParam == wd->hwnd_chk_grid) {

 				wd->show_grid = (SendMessage(wd->hwnd_chk_grid, BM_GETCHECK, 0, 0) == BST_CHECKED);

 			} else if((HWND)lParam == wd->hwnd_chk_stat) {

@@ -85,7 +85,7 @@ LRESULT CALLBACK GraphWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 			PAINTSTRUCT ps;

 			HDC hdc;

 			RECT r;

-			WindowData *wd = (WindowData *)GetWindowLong(hwnd, GWL_USERDATA);

+			WindowData *wd = (WindowData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);

 			if(wd && (hdc = BeginPaint(hwnd, &ps)) != 0) {

 				GetClientRect(hwnd, &r);

 				FillRect(hdc, &r, GetSysColorBrush(COLOR_WINDOW));

@@ -201,7 +201,7 @@ LRESULT CALLBACK GraphWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 

 	case WM_SIZE:

 		{

-			WindowData *wd = (WindowData *)GetWindowLong(hwnd, GWL_USERDATA);

+			WindowData *wd = (WindowData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);

 			RECT r;

 			GetClientRect(hwnd, &r);

 			if(wd->hwnd_chk_grid != 0) SetWindowPos(wd->hwnd_chk_grid, 0, r.right - 150, r.top + 10, 120, 20, SWP_NOZORDER | SWP_NOACTIVATE);

@@ -212,7 +212,7 @@ LRESULT CALLBACK GraphWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 	case WM_CLOSE:

 		{

 			KillTimer(hwnd, ID_REPAINT_TIMER);

-			WindowData *wd = (WindowData *)GetWindowLong(hwnd, GWL_USERDATA);

+			WindowData *wd = (WindowData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);

 			{

 				char buff[30];

 				sprintf(buff, "pinggraphwnd%d", wd->item_id);

@@ -222,7 +222,7 @@ LRESULT CALLBACK GraphWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 		break;

 	case WM_DESTROY:

 		{

-			WindowData *wd = (WindowData *)GetWindowLong(hwnd, GWL_USERDATA);

+			WindowData *wd = (WindowData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);

 			{

 				char buff[30];

 				sprintf(buff, "WindowHandle%d", wd->item_id);

@@ -236,7 +236,7 @@ LRESULT CALLBACK GraphWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 	return DefWindowProc(hwnd, msg, wParam, lParam);

 }

 

-int ShowGraph(WPARAM wParam, LPARAM lParam) {

+INT_PTR ShowGraph(WPARAM wParam, LPARAM lParam) {

 	char buff[30];

 	sprintf(buff, "WindowHandle%d", (DWORD)wParam);

 	HWND hGraphWnd = (HWND)DBGetContactSettingDword(0, PLUG, buff, 0);

@@ -280,7 +280,7 @@ int ShowGraph(WPARAM wParam, LPARAM lParam) {
 

 	DBWriteContactSettingDword(0, PLUG, buff, (DWORD)hGraphWnd);

 

-	SetWindowLong(hGraphWnd, GWL_USERDATA, (LONG)wd); 

+	SetWindowLongPtr(hGraphWnd, GWLP_USERDATA, (LONG_PTR)wd); 

 

 	sprintf(buff, "pinggraphwnd%d", wd->item_id);

 	Utils_RestoreWindowPosition(hGraphWnd, 0, PLUG, buff);