From 263990471dfd375089cf7044d660a0aec62c5fb8 Mon Sep 17 00:00:00 2001
From: Rozhuk Ivan <rozhuk.im@gmail.com>
Date: Wed, 12 Mar 2014 13:26:44 +0000
Subject: Some fixes for x64: SetWindowLong -> SetWindowLongPtr, GetWindowLong
-> GetWindowLongPtr
git-svn-id: http://svn.miranda-ng.org/main/trunk@8572 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp | 9 +++++----
plugins/Clist_mw/src/clc.cpp | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
(limited to 'plugins/Clist_mw/src')
diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
index b6b51de7c7..64b23ae937 100644
--- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp
@@ -910,7 +910,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam, LPARAM lParam)
switch(LOWORD(wParam) & ~FO_UNICODETEXT) {
case FO_FLAGS:{
int flag = lParam;
- int style;
+ LONG_PTR style;
Frames[pos].dwFlags = flag;
Frames[pos].visible = FALSE;
@@ -936,7 +936,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam, LPARAM lParam)
style = (int)GetWindowLongPtr(Frames[pos].hWnd,GWL_STYLE);
style |= WS_BORDER;
if (flag&F_NOBORDER) {style &= (~WS_BORDER);}
- SetWindowLongPtr(Frames[pos].hWnd,GWL_STYLE,(LONG)style);
+ SetWindowLongPtr(Frames[pos].hWnd,GWL_STYLE,(LONG_PTR)style);
ulockfrm();
CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);
return 0;
@@ -1418,7 +1418,8 @@ static int UpdateTBToolTip(int framepos)
//wparam = (CLISTFrame*)clfrm
INT_PTR CLUIFramesAddFrame(WPARAM wParam, LPARAM lParam)
{
- int style,retval;
+ int retval;
+ LONG_PTR style;
CLISTFrame *clfrm = (CLISTFrame *)wParam;
if (pcli->hwndContactList == 0) return -1;
@@ -2634,7 +2635,7 @@ INT_PTR CLUIFrameSetFloat(WPARAM wParam, LPARAM lParam)
}
else {
RECT recttb,rectw,border;
- int temp;
+ LONG_PTR temp;
int neww,newh;
BOOLEAN locked;
diff --git a/plugins/Clist_mw/src/clc.cpp b/plugins/Clist_mw/src/clc.cpp
index eb93367b70..7f2c6c618d 100644
--- a/plugins/Clist_mw/src/clc.cpp
+++ b/plugins/Clist_mw/src/clc.cpp
@@ -136,7 +136,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
switch (msg) {
case WM_CREATE:
dat = (struct ClcData*)mir_calloc( sizeof(struct ClcData));
- SetWindowLongPtr(hwnd,0,(LPARAM)dat);
+ SetWindowLongPtr(hwnd,0,(LONG_PTR)dat);
InitDisplayNameCache(&dat->lCLCContactsCache);
break;
--
cgit v1.2.3