summaryrefslogtreecommitdiff
path: root/plugins/Mwclist
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Mwclist')
-rw-r--r--plugins/Mwclist/CLUIFrames/cluiframes.c40
-rw-r--r--plugins/Mwclist/CLUIFrames/statusbar.c2
-rw-r--r--plugins/Mwclist/clc.c6
-rw-r--r--plugins/Mwclist/clcitems.c4
-rw-r--r--plugins/Mwclist/clcopts.c4
-rw-r--r--plugins/Mwclist/clcpaint.c2
-rw-r--r--plugins/Mwclist/clcutils.c6
-rw-r--r--plugins/Mwclist/clui.c4
-rw-r--r--plugins/Mwclist/cluiopts.c12
-rw-r--r--plugins/Mwclist/groupmenu.c12
10 files changed, 46 insertions, 46 deletions
diff --git a/plugins/Mwclist/CLUIFrames/cluiframes.c b/plugins/Mwclist/CLUIFrames/cluiframes.c
index c6c7ba08e9..53dda27d3e 100644
--- a/plugins/Mwclist/CLUIFrames/cluiframes.c
+++ b/plugins/Mwclist/CLUIFrames/cluiframes.c
@@ -1055,7 +1055,7 @@ INT_PTR CLUIFramesGetFrameOptions(WPARAM wParam,LPARAM lParam)
if(Frames[pos].Locked) retval|=F_LOCKED;
if(Frames[pos].TitleBar.ShowTitleBar) retval|=F_SHOWTB;
if(Frames[pos].TitleBar.ShowTitleBarTip) retval|=F_SHOWTBTIP;
- if (!(GetWindowLong(Frames[pos].hWnd,GWL_STYLE)&WS_BORDER)) retval|=F_NOBORDER;
+ if (!(GetWindowLongPtr(Frames[pos].hWnd,GWL_STYLE)&WS_BORDER)) retval|=F_NOBORDER;
break;
case FO_NAME:
@@ -1071,11 +1071,11 @@ INT_PTR CLUIFramesGetFrameOptions(WPARAM wParam,LPARAM lParam)
break;
case FO_TBSTYLE:
- retval=GetWindowLong(Frames[pos].TitleBar.hwnd,GWL_STYLE);
+ retval=GetWindowLongPtr(Frames[pos].TitleBar.hwnd,GWL_STYLE);
break;
case FO_TBEXSTYLE:
- retval=GetWindowLong(Frames[pos].TitleBar.hwnd,GWL_EXSTYLE);
+ retval=GetWindowLongPtr(Frames[pos].TitleBar.hwnd,GWL_EXSTYLE);
break;
case FO_ICON:
@@ -1140,10 +1140,10 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam,LPARAM lParam)
SendMessage(Frames[pos].TitleBar.hwndTip,TTM_ACTIVATE,(WPARAM)Frames[pos].TitleBar.ShowTitleBarTip,0);
- style=(int)GetWindowLong(Frames[pos].hWnd,GWL_STYLE);
+ style=(int)GetWindowLongPtr(Frames[pos].hWnd,GWL_STYLE);
style|=WS_BORDER;
if(flag&F_NOBORDER) {style&=(~WS_BORDER);}
- SetWindowLong(Frames[pos].hWnd,GWL_STYLE,(LONG)style);
+ SetWindowLongPtr(Frames[pos].hWnd,GWL_STYLE,(LONG)style);
ulockfrm();
CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0);
return 0;
@@ -1173,12 +1173,12 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam,LPARAM lParam)
return 0;
case FO_TBSTYLE:
- SetWindowLong(Frames[pos].TitleBar.hwnd,GWL_STYLE,lParam);
+ SetWindowLongPtr(Frames[pos].TitleBar.hwnd,GWL_STYLE,lParam);
ulockfrm();
return 0;
case FO_TBEXSTYLE:
- SetWindowLong(Frames[pos].TitleBar.hwnd,GWL_EXSTYLE,lParam);
+ SetWindowLongPtr(Frames[pos].TitleBar.hwnd,GWL_EXSTYLE,lParam);
ulockfrm();
return 0;
@@ -1785,8 +1785,8 @@ SetWindowPos(Frames[nFramescount].TitleBar.hwndTip, HWND_TOPMOST,0, 0, 0, 0,
SendMessage(Frames[nFramescount].TitleBar.hwndTip,TTM_ACTIVATE,(WPARAM)Frames[nFramescount].TitleBar.ShowTitleBarTip,0);
- Frames[nFramescount].oldstyles=GetWindowLong(Frames[nFramescount].hWnd,GWL_STYLE);
- Frames[nFramescount].TitleBar.oldstyles=GetWindowLong(Frames[nFramescount].TitleBar.hwnd,GWL_STYLE);
+ Frames[nFramescount].oldstyles=GetWindowLongPtr(Frames[nFramescount].hWnd,GWL_STYLE);
+ Frames[nFramescount].TitleBar.oldstyles=GetWindowLongPtr(Frames[nFramescount].TitleBar.hwnd,GWL_STYLE);
//Frames[nFramescount].FloatingPos.x=
retval=Frames[nFramescount].id;
@@ -1794,10 +1794,10 @@ SendMessage(Frames[nFramescount].TitleBar.hwndTip,TTM_ACTIVATE,(WPARAM)Frames[nF
nFramescount++;
CLUIFramesLoadFrameSettings(id2pos(retval));
- style=GetWindowLong(Frames[nFramescount-1].hWnd,GWL_STYLE);
+ style=GetWindowLongPtr(Frames[nFramescount-1].hWnd,GWL_STYLE);
style&=(~WS_BORDER);
style|=((Frames[nFramescount-1].UseBorder)?WS_BORDER:0);
- SetWindowLong(Frames[nFramescount-1].hWnd,GWL_STYLE,style);
+ SetWindowLongPtr(Frames[nFramescount-1].hWnd,GWL_STYLE,style);
if (Frames[nFramescount-1].order==0){Frames[nFramescount-1].order=nFramescount;}
@@ -2213,7 +2213,7 @@ void DrawBackGroundTTB(HWND hwnd,HDC mhdc)
int y;
PAINTSTRUCT paintst={0};
HBITMAP hBmpOsb,hOldBmp;
- DWORD style=GetWindowLong(hwnd,GWL_STYLE);
+ DWORD style=GetWindowLongPtr(hwnd,GWL_STYLE);
int grey=0;
HFONT oFont;
HBRUSH hBrushAlternateGrey=NULL;
@@ -3151,8 +3151,8 @@ INT_PTR CLUIFrameSetFloat(WPARAM wParam,LPARAM lParam)
//parent=GetParent(Frames[wParam].hWnd);
if (frame->floating)
{
- //SetWindowLong(frame->hWnd,GWL_STYLE,Frames[wParam].oldstyles);
- //SetWindowLong(frame->TitleBar.hwnd,GWL_STYLE,Frames[wParam].TitleBar.oldstyles);
+ //SetWindowLongPtr(frame->hWnd,GWL_STYLE,Frames[wParam].oldstyles);
+ //SetWindowLongPtr(frame->TitleBar.hwnd,GWL_STYLE,Frames[wParam].TitleBar.oldstyles);
SetParent(frame->hWnd,pcli->hwndContactList);
SetParent(frame->TitleBar.hwnd,pcli->hwndContactList);
frame->floating=FALSE;
@@ -3166,8 +3166,8 @@ INT_PTR CLUIFrameSetFloat(WPARAM wParam,LPARAM lParam)
int neww,newh;
BOOLEAN locked;
- frame->oldstyles=GetWindowLong(frame->hWnd,GWL_STYLE);
- frame->TitleBar.oldstyles=GetWindowLong(frame->TitleBar.hwnd,GWL_STYLE);
+ frame->oldstyles=GetWindowLongPtr(frame->hWnd,GWL_STYLE);
+ frame->TitleBar.oldstyles=GetWindowLongPtr(frame->TitleBar.hwnd,GWL_STYLE);
locked=frame->Locked;
frame->Locked=FALSE;
frame->minmaxenabled=FALSE;
@@ -3220,12 +3220,12 @@ INT_PTR CLUIFrameSetFloat(WPARAM wParam,LPARAM lParam)
SetWindowText(frame->ContainerWnd,frame->TitleBar.tbname);
- temp=GetWindowLong(frame->ContainerWnd,GWL_EXSTYLE);
+ temp=GetWindowLongPtr(frame->ContainerWnd,GWL_EXSTYLE);
temp|=WS_EX_TOOLWINDOW|WS_EX_TOPMOST ;
- SetWindowLong(frame->ContainerWnd,GWL_EXSTYLE,temp);
+ SetWindowLongPtr(frame->ContainerWnd,GWL_EXSTYLE,temp);
- //SetWindowLong(frame->hWnd,GWL_STYLE,WS_POPUP|(frame->oldstyles&(~WS_CHILD)));
- //SetWindowLong(frame->TitleBar.hwnd,GWL_STYLE,WS_POPUP|(frame->TitleBar.oldstyles&(~WS_CHILD)));
+ //SetWindowLongPtr(frame->hWnd,GWL_STYLE,WS_POPUP|(frame->oldstyles&(~WS_CHILD)));
+ //SetWindowLongPtr(frame->TitleBar.hwnd,GWL_STYLE,WS_POPUP|(frame->TitleBar.oldstyles&(~WS_CHILD)));
frame->floating=TRUE;
frame->Locked=locked;
diff --git a/plugins/Mwclist/CLUIFrames/statusbar.c b/plugins/Mwclist/CLUIFrames/statusbar.c
index f761c5cb18..a682c9a632 100644
--- a/plugins/Mwclist/CLUIFrames/statusbar.c
+++ b/plugins/Mwclist/CLUIFrames/statusbar.c
@@ -137,7 +137,7 @@ void DrawBackGround(HWND hwnd,HDC mhdc)
int y;
PAINTSTRUCT paintst={0};
HBITMAP hBmpOsb,holdbmp;
- DWORD style=GetWindowLong(hwnd,GWL_STYLE);
+ DWORD style=GetWindowLongPtr(hwnd,GWL_STYLE);
int grey=0;
HFONT oFont;
HBRUSH hBrushAlternateGrey=NULL;
diff --git a/plugins/Mwclist/clc.c b/plugins/Mwclist/clc.c
index 45bb1100b4..6de26b6148 100644
--- a/plugins/Mwclist/clc.c
+++ b/plugins/Mwclist/clc.c
@@ -137,7 +137,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
switch (msg) {
case WM_CREATE:
dat = (struct ClcData*)mir_calloc( sizeof(struct ClcData));
- SetWindowLong(hwnd,0,(LPARAM)dat);
+ SetWindowLongPtr(hwnd,0,(LPARAM)dat);
InitDisplayNameCache(&dat->lCLCContactsCache);
break;
@@ -156,7 +156,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
if(szProto==NULL) status=ID_STATUS_OFFLINE;
else status=cacheEntry->status;
- shouldShow=(GetWindowLong(hwnd,GWL_STYLE)&CLS_SHOWHIDDEN || !cacheEntry->Hidden) && (!pcli->pfnIsHiddenMode(dat,status)||cacheEntry->noHiddenOffline || CallService(MS_CLIST_GETCONTACTICON,wParam,0)!=LOWORD(lParam)); //this means an offline msg is flashing, so the contact should be shown
+ shouldShow=(GetWindowLongPtr(hwnd,GWL_STYLE)&CLS_SHOWHIDDEN || !cacheEntry->Hidden) && (!pcli->pfnIsHiddenMode(dat,status)||cacheEntry->noHiddenOffline || CallService(MS_CLIST_GETCONTACTICON,wParam,0)!=LOWORD(lParam)); //this means an offline msg is flashing, so the contact should be shown
if (!FindItem(hwnd,dat,(HANDLE)wParam,&contact,&group,NULL)) {
if(shouldShow && CallService(MS_DB_CONTACT_IS, wParam, 0)) {
if(dat->selection>=0 && GetRowByIndex(dat,dat->selection,&selcontact,NULL)!=-1)
@@ -174,7 +174,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
}
else {
//item in list already
- DWORD style=GetWindowLong(hwnd,GWL_STYLE);
+ DWORD style=GetWindowLongPtr(hwnd,GWL_STYLE);
if(contact->iImage== (WORD)lParam) break;
if (sortByStatus) dat->NeedResort=1;
diff --git a/plugins/Mwclist/clcitems.c b/plugins/Mwclist/clcitems.c
index f2aec5029e..8c2e20efb3 100644
--- a/plugins/Mwclist/clcitems.c
+++ b/plugins/Mwclist/clcitems.c
@@ -195,7 +195,7 @@ void AddContactToTree(HWND hwnd,struct ClcData *dat,HANDLE hContact,int updateTo
struct ClcGroup *group;
struct ClcContact * cont;
pdisplayNameCacheEntry cacheEntry;
- DWORD style=GetWindowLong(hwnd,GWL_STYLE);
+ DWORD style=GetWindowLongPtr(hwnd,GWL_STYLE);
WORD status;
char *szProto;
@@ -322,7 +322,7 @@ void DeleteItemFromTree(HWND hwnd,HANDLE hItem)
void RebuildEntireList(HWND hwnd,struct ClcData *dat)
{
// char *szProto;
- DWORD style=GetWindowLong(hwnd,GWL_STYLE);
+ DWORD style=GetWindowLongPtr(hwnd,GWL_STYLE);
HANDLE hContact;
struct ClcContact * cont;
struct ClcGroup *group;
diff --git a/plugins/Mwclist/clcopts.c b/plugins/Mwclist/clcopts.c
index bea2252081..ce349cac5e 100644
--- a/plugins/Mwclist/clcopts.c
+++ b/plugins/Mwclist/clcopts.c
@@ -229,8 +229,8 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam
{
case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);
- SetWindowLong(GetDlgItem(hwndDlg,IDC_GREYOUTOPTS),GWL_STYLE,GetWindowLong(GetDlgItem(hwndDlg,IDC_GREYOUTOPTS),GWL_STYLE)|TVS_NOHSCROLL|TVS_CHECKBOXES);
- SetWindowLong(GetDlgItem(hwndDlg,IDC_HIDEOFFLINEOPTS),GWL_STYLE,GetWindowLong(GetDlgItem(hwndDlg,IDC_HIDEOFFLINEOPTS),GWL_STYLE)|TVS_NOHSCROLL|TVS_CHECKBOXES);
+ SetWindowLongPtr(GetDlgItem(hwndDlg,IDC_GREYOUTOPTS),GWL_STYLE,GetWindowLongPtr(GetDlgItem(hwndDlg,IDC_GREYOUTOPTS),GWL_STYLE)|TVS_NOHSCROLL|TVS_CHECKBOXES);
+ SetWindowLongPtr(GetDlgItem(hwndDlg,IDC_HIDEOFFLINEOPTS),GWL_STYLE,GetWindowLongPtr(GetDlgItem(hwndDlg,IDC_HIDEOFFLINEOPTS),GWL_STYLE)|TVS_NOHSCROLL|TVS_CHECKBOXES);
{ int i;
DWORD exStyle=DBGetContactSettingDword(NULL,"CLC","ExStyle",pcli->pfnGetDefaultExStyle());
for(i=0;i < SIZEOF(checkBoxToStyleEx); i++)
diff --git a/plugins/Mwclist/clcpaint.c b/plugins/Mwclist/clcpaint.c
index 670da591f0..db10a510dd 100644
--- a/plugins/Mwclist/clcpaint.c
+++ b/plugins/Mwclist/clcpaint.c
@@ -150,7 +150,7 @@ void InternalPaintClc(HWND hwnd,struct ClcData *dat,HDC hdc,RECT *rcPaint)
struct ClcContact *Drawing;
struct ClcGroup *group;
HBITMAP hBmpOsb;
- DWORD style=GetWindowLong(hwnd,GWL_STYLE);
+ DWORD style=GetWindowLongPtr(hwnd,GWL_STYLE);
int status=GetGeneralisedStatus();
int grey=0,groupCountsFontTopShift;
HBRUSH hBrushAlternateGrey=NULL;
diff --git a/plugins/Mwclist/clcutils.c b/plugins/Mwclist/clcutils.c
index 35ddf0ccdc..151654ed3b 100644
--- a/plugins/Mwclist/clcutils.c
+++ b/plugins/Mwclist/clcutils.c
@@ -36,7 +36,7 @@ int HitTest(HWND hwnd,struct ClcData *dat,int testx,int testy,struct ClcContact
HDC hdc;
HFONT oldfont;
RECT clRect;
- DWORD style=GetWindowLong(hwnd,GWL_STYLE);
+ DWORD style=GetWindowLongPtr(hwnd,GWL_STYLE);
if(flags) *flags=0;
GetClientRect(hwnd,&clRect);
@@ -236,7 +236,7 @@ void RecalcScrollBar(HWND hwnd,struct ClcData *dat)
ShowScrollBar(hwnd,SB_VERT,sbar? FALSE : TRUE);
if (!sbar) {
- if ( GetWindowLong(hwnd,GWL_STYLE)&CLS_CONTACTLIST ) {
+ if ( GetWindowLongPtr(hwnd,GWL_STYLE)&CLS_CONTACTLIST ) {
if ( dat->noVScrollbar==0 ) SetScrollInfo(hwnd,SB_VERT,&si,TRUE);
else SetScrollInfo(hwnd,SB_VERT,&si,FALSE);
}
@@ -286,7 +286,7 @@ void LoadClcOptions(HWND hwnd,struct ClcData *dat)
{
int i;
- dat->style=GetWindowLong(hwnd,GWL_STYLE);
+ dat->style=GetWindowLongPtr(hwnd,GWL_STYLE);
dat->MetaIgnoreEmptyExtra=DBGetContactSettingByte(NULL,"CLC","MetaIgnoreEmptyExtra",1);
saveLoadClcOptions( hwnd, dat );
diff --git a/plugins/Mwclist/clui.c b/plugins/Mwclist/clui.c
index 358da9ef83..d770e3547f 100644
--- a/plugins/Mwclist/clui.c
+++ b/plugins/Mwclist/clui.c
@@ -573,7 +573,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
hMsgGetProfile = RegisterWindowMessageA( "Miranda::GetProfile" ); // don't localise
if ( DBGetContactSettingByte( NULL, "CList", "Transparent", 0 )) {
- SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
+ SetWindowLongPtr(hwnd, GWL_EXSTYLE, GetWindowLongPtr(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED);
if ( MySetLayeredWindowAttributes )
MySetLayeredWindowAttributes(hwnd, RGB(0,0,0), (BYTE)DBGetContactSettingByte(NULL,"CList","Alpha",SETTING_ALPHA_DEFAULT), LWA_ALPHA);
}
@@ -704,7 +704,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
maxHeight=DBGetContactSettingByte(NULL,"CLUI","MaxSizeHeight",75);
GetWindowRect(hwnd,&rcWindow);
GetWindowRect(pcli->hwndContactTree,&rcTree);
- winstyle=GetWindowLong(pcli->hwndContactTree,GWL_STYLE);
+ winstyle=GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE);
SystemParametersInfo(SPI_GETWORKAREA,0,&rcWorkArea,FALSE);
lastreqh=nmc->pt.y;
diff --git a/plugins/Mwclist/cluiopts.c b/plugins/Mwclist/cluiopts.c
index 68ff31ca78..04bf352aa0 100644
--- a/plugins/Mwclist/cluiopts.c
+++ b/plugins/Mwclist/cluiopts.c
@@ -247,11 +247,11 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
p.length = sizeof(p);
GetWindowPlacement(pcli->hwndContactList,&p);
ShowWindow(pcli->hwndContactList,SW_HIDE);
- SetWindowLong(pcli->hwndContactList,GWL_EXSTYLE,GetWindowLong(pcli->hwndContactList,GWL_EXSTYLE)|WS_EX_TOOLWINDOW|WS_EX_WINDOWEDGE);
+ SetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE,GetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE)|WS_EX_TOOLWINDOW|WS_EX_WINDOWEDGE);
SetWindowPlacement(pcli->hwndContactList,&p);
}
else
- SetWindowLong(pcli->hwndContactList,GWL_EXSTYLE,GetWindowLong(pcli->hwndContactList,GWL_EXSTYLE)&~WS_EX_TOOLWINDOW);
+ SetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE,GetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE)&~WS_EX_TOOLWINDOW);
if (IsDlgButtonChecked(hwndDlg,IDC_ONDESKTOP)) {
HWND hProgMan=FindWindowA("Progman",NULL);
@@ -265,9 +265,9 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
DBWriteContactSettingByte(NULL,"CLUI","ClientAreaDrag",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_CLIENTDRAG));
if(IsDlgButtonChecked(hwndDlg,IDC_SHOWCAPTION))
- SetWindowLong(pcli->hwndContactList,GWL_STYLE,GetWindowLong(pcli->hwndContactList,GWL_STYLE)|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX);
+ SetWindowLongPtr(pcli->hwndContactList,GWL_STYLE,GetWindowLongPtr(pcli->hwndContactList,GWL_STYLE)|WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX);
else
- SetWindowLong(pcli->hwndContactList,GWL_STYLE,GetWindowLong(pcli->hwndContactList,GWL_STYLE)&~(WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX));
+ SetWindowLongPtr(pcli->hwndContactList,GWL_STYLE,GetWindowLongPtr(pcli->hwndContactList,GWL_STYLE)&~(WS_CAPTION|WS_SYSMENU|WS_MINIMIZEBOX));
if (!IsDlgButtonChecked(hwndDlg,IDC_SHOWMAINMENU)) SetMenu(pcli->hwndContactList,NULL);
else SetMenu(pcli->hwndContactList,hMenuMain);
@@ -297,11 +297,11 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
DBWriteContactSettingByte(NULL,"CList","WindowShadow",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_DROPSHADOW));
DBWriteContactSettingByte(NULL,"CList","OnDesktop",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_ONDESKTOP));
if(IsDlgButtonChecked(hwndDlg,IDC_TRANSPARENT)) {
- SetWindowLong(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLong(pcli->hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED);
+ SetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED);
if(MySetLayeredWindowAttributes) MySetLayeredWindowAttributes(pcli->hwndContactList, RGB(0,0,0), (BYTE)DBGetContactSettingByte(NULL,"CList","AutoAlpha",SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA);
}
else {
- SetWindowLong(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLong(pcli->hwndContactList, GWL_EXSTYLE) & ~WS_EX_LAYERED);
+ SetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE) & ~WS_EX_LAYERED);
}
SendMessage(pcli->hwndContactTree,WM_SIZE,0,0); //forces it to send a cln_listsizechanged
diff --git a/plugins/Mwclist/groupmenu.c b/plugins/Mwclist/groupmenu.c
index ae79c6ca60..d087b43754 100644
--- a/plugins/Mwclist/groupmenu.c
+++ b/plugins/Mwclist/groupmenu.c
@@ -207,7 +207,7 @@ return(0);
INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam)
{
- int newVal=!(GetWindowLong(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYGROUPS);
+ int newVal=!(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYGROUPS);
DBWriteContactSettingByte(NULL,"CList","HideEmptyGroups",(BYTE)newVal);
SendMessage(pcli->hwndContactTree,CLM_SETHIDEEMPTYGROUPS,newVal,0);
return 0;
@@ -215,7 +215,7 @@ INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam)
INT_PTR UseGroupsHelper(WPARAM wParam,LPARAM lParam)
{
- int newVal=!(GetWindowLong(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS);
+ int newVal=!(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS);
DBWriteContactSettingByte(NULL,"CList","UseGroups",(BYTE)newVal);
SendMessage(pcli->hwndContactTree,CLM_SETUSEGROUPS,newVal,0);
return 0;
@@ -248,12 +248,12 @@ static int OnBuildGroupMenu(WPARAM wParam,LPARAM lParam)
ZeroMemory(&mi,sizeof(mi));
mi.cbSize = sizeof(mi);
- mi.flags = CMIM_FLAGS | (GetWindowLong(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYGROUPS?CMIF_CHECKED:0);
+ mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYGROUPS?CMIF_CHECKED:0);
CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hHideEmptyGroupsMenuItem, (LPARAM)&mi);
ZeroMemory(&mi,sizeof(mi));
mi.cbSize = sizeof(mi);
- mi.flags = CMIM_FLAGS | (GetWindowLong(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS?0:CMIF_CHECKED);
+ mi.flags = CMIM_FLAGS | (GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USEGROUPS?0:CMIF_CHECKED);
CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hDisableGroupsMenuItem, (LPARAM)&mi);
return 0;
@@ -624,7 +624,7 @@ return(0);
/*
int HideSubGroupsHelper(WPARAM wParam,LPARAM lParam)
{
- int newVal=!(GetWindowLong(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYSubGroupS);
+ int newVal=!(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_HIDEEMPTYSubGroupS);
DBWriteContactSettingByte(NULL,"CList","HideEmptySubGroups",(BYTE)newVal);
SendMessage(pcli->hwndContactTree,CLM_SETHIDEEMPTYSubGroupS,newVal,0);
return 0;
@@ -632,7 +632,7 @@ int HideSubGroupsHelper(WPARAM wParam,LPARAM lParam)
int UseSubGroupsHelper(WPARAM wParam,LPARAM lParam)
{
- int newVal=!(GetWindowLong(pcli->hwndContactTree,GWL_STYLE)&CLS_USESubGroupS);
+ int newVal=!(GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE)&CLS_USESubGroupS);
DBWriteContactSettingByte(NULL,"CList","UseSubGroups",(BYTE)newVal);
SendMessage(pcli->hwndContactTree,CLM_SETUSESubGroupS,newVal,0);
return 0;