More fix for x64

Also fix dbeditor from 8572 commit



git-svn-id: http://svn.miranda-ng.org/main/trunk@8584 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

10 files changed, 11 insertions, 11 deletions

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index ffe515943c..3929feb23a 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -70,7 +70,7 @@ static VOID NTAPI ShowContactMenu(ULONG_PTR wParam)
 {

 	POINT pt;

 	HWND hMenuWnd = CreateWindowEx(WS_EX_TOOLWINDOW, _T("static"), _T(MOD_NAME)_T("_MenuWindow"), 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, NULL, g_hInstance, NULL);

-	SetWindowLongPtr(hMenuWnd, GWLP_WNDPROC, (LONG_PTR)(WNDPROC)MenuWndProc);

+	SetWindowLongPtr(hMenuWnd, GWLP_WNDPROC, (LONG_PTR)MenuWndProc);

 	HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT, (WPARAM)wParam, 0);

 	GetCursorPos(&pt);

 	SetForegroundWindow(hMenuWnd);

diff --git a/plugins/Clist_blind/src/clcpaint.cpp b/plugins/Clist_blind/src/clcpaint.cpp
index 8f223484a3..2e041b0765 100644
--- a/plugins/Clist_blind/src/clcpaint.cpp
+++ b/plugins/Clist_blind/src/clcpaint.cpp
@@ -144,7 +144,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
 	int y, indent, index, fontHeight;

 	struct ClcGroup *group;

 	HFONT hOldFont;

-	DWORD_PTR style = GetWindowLongPtr(hwnd, GWL_STYLE);

+	LONG_PTR style = GetWindowLongPtr(hwnd, GWL_STYLE);

 	int status = GetGeneralisedStatus();

 	int grey = 0, groupCountsFontTopShift;

 	HBRUSH hBrushAlternateGrey = NULL;

diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index 5fe47ff34e..8c01776ff0 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -3976,7 +3976,7 @@ int CLUIFrames_UpdateBorders()
 {

 	for (int i = 0; i < g_nFramesCount; i++) {

 		if (!g_pfwFrames[i].floating) {

-			DWORD style = (int)GetWindowLongPtr(g_pfwFrames[i].hWnd, GWL_STYLE) & (~WS_BORDER);

+			LONG_PTR style = GetWindowLongPtr(g_pfwFrames[i].hWnd, GWL_STYLE) & (~WS_BORDER);

 			if (!g_CluiData.fLayered && g_pfwFrames[i].UseBorder) style |= WS_BORDER;

 			SetWindowLongPtr(g_pfwFrames[i].hWnd, GWL_STYLE, style);

 			CLUIFramesModifyMainMenuItems(g_pfwFrames[i].id, 0);

diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
index 64b23ae937..78f99a494e 100644
--- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
@@ -933,7 +933,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam, LPARAM lParam)
 

 		SendMessage(Frames[pos].TitleBar.hwndTip,TTM_ACTIVATE,(WPARAM)Frames[pos].TitleBar.ShowTitleBarTip,0);

 

-		style = (int)GetWindowLongPtr(Frames[pos].hWnd,GWL_STYLE);

+		style = GetWindowLongPtr(Frames[pos].hWnd,GWL_STYLE);

 		style |= WS_BORDER;

 		if (flag&F_NOBORDER) {style &= (~WS_BORDER);}

 			SetWindowLongPtr(Frames[pos].hWnd,GWL_STYLE,(LONG_PTR)style);

diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp
index 235b64b129..e040ac7197 100644
--- a/plugins/DbEditorPP/src/settinglist.cpp
+++ b/plugins/DbEditorPP/src/settinglist.cpp
@@ -230,7 +230,7 @@ void PopulateSettings(HWND hwnd2Settings, MCONTACT hContact, char* module)
 

 	info->hContact = hContact;

 	info->module = mir_tstrdup(module);

-	SetWindowLongPtr(hwnd2Settings,GWLP_USERDATA, 0);

+	SetWindowLongPtr(hwnd2Settings,GWLP_USERDATA, (LONG_PTR)info);

 

 	// icons

 	if (himl2)

diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp
index 0f00c8b0b9..24f6cf68d4 100644
--- a/plugins/MyDetails/src/mydetails.cpp
+++ b/plugins/MyDetails/src/mydetails.cpp
@@ -141,7 +141,7 @@ static INT_PTR CALLBACK DlgProcSetNickname(HWND hwndDlg, UINT msg, WPARAM wParam
 				TCHAR tmp[MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE];

 				GetDlgItemText(hwndDlg, IDC_NICKNAME, tmp, SIZEOF(tmp));

 

-				int proto_num = (int)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

+				LONG_PTR proto_num = GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 				if (proto_num == -1)

 					protocols->SetNicks(tmp);

 				else

diff --git a/plugins/NewAwaySysMod/src/Notification.cpp b/plugins/NewAwaySysMod/src/Notification.cpp
index 5e7b12eedc..258cdcfccc 100644
--- a/plugins/NewAwaySysMod/src/Notification.cpp
+++ b/plugins/NewAwaySysMod/src/Notification.cpp
@@ -54,7 +54,7 @@ static VOID CALLBACK ShowContactMenu(MCONTACT hContact)
 {

 	POINT pt;

 	HWND hMenuWnd = CreateWindowEx(WS_EX_TOOLWINDOW, _T("static"), _T(MOD_NAME)_T("_MenuWindow"), 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, NULL, g_hInstance, NULL);

-	SetWindowLongPtr(hMenuWnd, GWLP_WNDPROC, (LONG_PTR)(WNDPROC)MenuWndProc);

+	SetWindowLongPtr(hMenuWnd, GWLP_WNDPROC, (LONG_PTR)MenuWndProc);

 	HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDCONTACT, hContact, 0);

 	GetCursorPos(&pt);

 	SetForegroundWindow(hMenuWnd);

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 00536e4e68..d8cc03f78c 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -101,7 +101,7 @@ static INT_PTR GetWindowData(WPARAM wParam, LPARAM lParam)
 		mwod->hwndWindow = hwnd;

 		mwod->local = GetParent(GetParent(hwnd));

 		SendMessage(hwnd, DM_GETWINDOWSTATE, 0, 0);

-		mwod->uState = (int)GetWindowLongPtr(hwnd, DWLP_MSGRESULT);

+		mwod->uState = GetWindowLongPtr(hwnd, DWLP_MSGRESULT);

 		return 0;

 	}

 	else

@@ -112,7 +112,7 @@ static INT_PTR GetWindowData(WPARAM wParam, LPARAM lParam)
 			mwod->hwndWindow = si->hWnd;

 			mwod->local = GetParent(GetParent(si->hWnd));

 			SendMessage(si->hWnd, DM_GETWINDOWSTATE, 0, 0);

-			mwod->uState = (int)GetWindowLongPtr(si->hWnd, DWLP_MSGRESULT);

+			mwod->uState = GetWindowLongPtr(si->hWnd, DWLP_MSGRESULT);

 			return 0;

 		}

 		else {

diff --git a/protocols/SkypeClassic/src/gchat.cpp b/protocols/SkypeClassic/src/gchat.cpp
index 923f7f1979..cefd1c891f 100644
--- a/protocols/SkypeClassic/src/gchat.cpp
+++ b/protocols/SkypeClassic/src/gchat.cpp
@@ -339,7 +339,7 @@ INT_PTR CALLBACK InputBoxDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		switch ( LOWORD( wParam )) {

 		case IDOK:

 		{	

-			GetDlgItemText(hwndDlg, IDC_TEXT, (TCHAR*)GetWindowLongPtr(hwndDlg, DWLP_USER), MAX_BUF-1*sizeof(TCHAR));

+			GetDlgItemText(hwndDlg, IDC_TEXT, (TCHAR*)GetWindowLongPtr(hwndDlg, DWLP_USER), (MAX_BUF-1)*sizeof(TCHAR));

 			EndDialog(hwndDlg, 1);

 			break;

 		}

diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index 7878af85e4..cda6fa9ffe 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -1222,7 +1222,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 			SendMessage(GetDlgItem(hwndDlg, IDC_LOG), EM_SETBKGNDCOLOR , 0, g_Settings.crLogBackground);

 

 			if (g_Settings.bTabsEnable) {

-				int mask = (int)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_TAB), GWL_STYLE);

+				LONG_PTR mask = GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_TAB), GWL_STYLE);

 				if (g_Settings.TabsAtBottom)

 					mask |= TCS_BOTTOM;

 				else