From 263990471dfd375089cf7044d660a0aec62c5fb8 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan 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_modern/src/CLUIFrames/cluiframes.cpp | 13 +++++++------ plugins/Clist_modern/src/modern_aniavatars.cpp | 4 ++-- plugins/Clist_modern/src/modern_clui.cpp | 12 ++++++------ plugins/Clist_modern/src/modern_tbbutton.cpp | 4 ++-- plugins/Clist_modern/src/modern_viewmodebar.cpp | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) (limited to 'plugins/Clist_modern/src') diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp index 3b2ed38cb0..5fe47ff34e 100644 --- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp @@ -1219,13 +1219,13 @@ static int _us_DoSetFrameOptions(WPARAM wParam, LPARAM lParam) SendMessageA(fw.TitleBar.hwndTip,TTM_ACTIVATE,(WPARAM)fw.TitleBar.ShowTitleBarTip,0); { - int style = (int)GetWindowLongPtr(fw.hWnd,GWL_STYLE); + LONG_PTR style = GetWindowLongPtr(fw.hWnd,GWL_STYLE); style &= (~WS_BORDER); if (!(lParam & F_NOBORDER ) && !g_CluiData.fLayered ) style |= WS_BORDER; - SetWindowLongPtr(fw.hWnd,GWL_STYLE,(long)style); - SetWindowLongPtr(fw.TitleBar.hwnd,GWL_STYLE,(long)style& ~(WS_VSCROLL | WS_HSCROLL)); + SetWindowLongPtr(fw.hWnd,GWL_STYLE,style); + SetWindowLongPtr(fw.TitleBar.hwnd,GWL_STYLE,style& ~(WS_VSCROLL | WS_HSCROLL)); } CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0); @@ -1778,7 +1778,8 @@ static HFONT CLUILoadTitleBarFont() //wparam = (CLISTFrame*)clfrm static int _us_DoAddFrame(WPARAM wParam, LPARAM lParam) { - int style,retval; + int retval; + LONG_PTR style; //char * CustomName = NULL; CLISTFrame *clfrm = (CLISTFrame *)wParam; @@ -2679,7 +2680,7 @@ void DrawBackGround(HWND hwnd,HDC mhdc, HBITMAP hBmpBackground, COLORREF bkColou int y; PAINTSTRUCT paintst = {0}; HBITMAP hBmpOsb,hOldBmp; - DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE); + LONG_PTR style = GetWindowLongPtr(hwnd,GWL_STYLE); int grey = 0; HFONT oFont; HBRUSH hBrushAlternateGrey = NULL; @@ -3704,7 +3705,7 @@ static int _us_DoSetFrameFloat(WPARAM wParam, LPARAM lParam) else { RECT recttb,rectw,border; - int temp; + LONG_PTR temp; int neww,newh; BOOLEAN locked; diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp index 32a95990bc..b1a2b7052a 100644 --- a/plugins/Clist_modern/src/modern_aniavatars.cpp +++ b/plugins/Clist_modern/src/modern_aniavatars.cpp @@ -803,7 +803,7 @@ static void _AniAva_RenderAvatar(ANIAVA_WINDOWINFO * dat, HDC hdcParent /*= NULL } } else if (!UpdateLayeredWindow(dat->hWindow, hDC_animation, &ptWnd, &szWnd, copyFromDC, &pt_from, RGB(0, 0, 0), &bf, ULW_ALPHA )) { - LONG exStyle; + LONG_PTR exStyle; exStyle = GetWindowLongPtr(dat->hWindow,GWL_EXSTYLE); exStyle |= WS_EX_LAYERED; SetWindowLongPtr(dat->hWindow,GWL_EXSTYLE,exStyle); @@ -1029,7 +1029,7 @@ static LRESULT CALLBACK _AniAva_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR SetWindowLongPtr(hwnd,GWLP_USERDATA,(LONG_PTR)dat); dat->hWindow = hwnd; //change layered mode - LONG exStyle = GetWindowLongPtr(dat->hWindow, GWL_EXSTYLE); + LONG_PTR exStyle = GetWindowLongPtr(dat->hWindow, GWL_EXSTYLE); exStyle |= WS_EX_LAYERED; SetWindowLongPtr(dat->hWindow, GWL_EXSTYLE, exStyle); exStyle = GetWindowLongPtr(dat->hWindow, GWL_STYLE); diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index a8a1a8c884..cb51119ca8 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -584,7 +584,7 @@ void CLUI_UpdateLayeredMode() ShowWindow(pcli->hwndContactList,SW_HIDE); //change layered mode - LONG exStyle = GetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE); + LONG_PTR exStyle = GetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE); if (tLayeredFlag) exStyle |= WS_EX_LAYERED; else @@ -630,11 +630,11 @@ extern int CLUIFrames_UpdateBorders(); void CLUI_ChangeWindowMode() { BOOL storedVisMode = FALSE; - LONG style,styleEx; - LONG oldStyle,oldStyleEx; - LONG styleMask = WS_CLIPCHILDREN|WS_BORDER|WS_CAPTION|WS_MINIMIZEBOX|WS_POPUPWINDOW|WS_CLIPCHILDREN|WS_THICKFRAME|WS_SYSMENU; - LONG styleMaskEx = WS_EX_TOOLWINDOW|WS_EX_LAYERED; - LONG curStyle,curStyleEx; + LONG_PTR style,styleEx; + LONG_PTR oldStyle,oldStyleEx; + LONG_PTR styleMask = WS_CLIPCHILDREN|WS_BORDER|WS_CAPTION|WS_MINIMIZEBOX|WS_POPUPWINDOW|WS_CLIPCHILDREN|WS_THICKFRAME|WS_SYSMENU; + LONG_PTR styleMaskEx = WS_EX_TOOLWINDOW|WS_EX_LAYERED; + LONG_PTR curStyle,curStyleEx; if (!pcli->hwndContactList) return; g_mutex_bChangingMode = TRUE; diff --git a/plugins/Clist_modern/src/modern_tbbutton.cpp b/plugins/Clist_modern/src/modern_tbbutton.cpp index f7cc630d3b..d22cf76aab 100644 --- a/plugins/Clist_modern/src/modern_tbbutton.cpp +++ b/plugins/Clist_modern/src/modern_tbbutton.cpp @@ -428,8 +428,8 @@ static LRESULT CALLBACK ToolbarButtonProc(HWND hwndDlg, UINT msg, WPARAM wParam return 1; case MBM_UPDATETRANSPARENTFLAG: - LONG flag = GetWindowLongPtr(hwndDlg, GWL_EXSTYLE); - LONG oldFlag = flag; + LONG_PTR flag = GetWindowLongPtr(hwndDlg, GWL_EXSTYLE); + LONG_PTR oldFlag = flag; if (lParam == 2) lParam = (g_CluiData.fDisableSkinEngine) ? 0 : 1; flag &= ~WS_EX_TRANSPARENT; diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index 014d00b4ed..82f50a24bc 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -699,7 +699,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP FillDialog(hwndDlg); EnableWindow(GetDlgItem(hwndDlg, IDC_ADDVIEWMODE), FALSE); { - LONG style = GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST),GWL_STYLE); + LONG_PTR style = GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST),GWL_STYLE); style &= (~CLS_SHOWHIDDEN); SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST),GWL_STYLE,style); } -- cgit v1.2.3