From 009c7a01b9399f14be5c85b9343c3063b12e5c7e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 11 Mar 2014 18:30:49 +0000 Subject: SetWindowLong -> SetWindowLongPtr; GetWindowLong -> GetWindowLongPtr; LONG -> LONG_PTR git-svn-id: http://svn.miranda-ng.org/main/trunk@8559 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryStats/src/bandctrl.cpp | 4 ++-- plugins/HistoryStats/src/bandctrl.h | 4 ++-- plugins/HistoryStats/src/bandctrldefs.h | 8 ++++---- plugins/HistoryStats/src/bandctrlimpl.cpp | 4 ++-- plugins/HistoryStats/src/bandctrlimpl.h | 2 +- plugins/HistoryStats/src/dlgconfigure.cpp | 4 ++-- plugins/HistoryStats/src/dlgfilterwords.cpp | 12 +++++------ plugins/HistoryStats/src/dlgfilterwords.h | 8 ++++---- plugins/HistoryStats/src/dlgoption.cpp | 8 ++++---- plugins/HistoryStats/src/dlgoption.h | 14 ++++++------- plugins/HistoryStats/src/dlgoption_subbase.cpp | 4 ++-- plugins/HistoryStats/src/dlgoption_subcolumns.cpp | 14 ++++++------- plugins/HistoryStats/src/dlgoption_subexclude.cpp | 2 +- plugins/HistoryStats/src/dlgoption_subglobal.cpp | 4 ++-- plugins/HistoryStats/src/optionsctrl.cpp | 18 ++++++++-------- plugins/HistoryStats/src/optionsctrl.h | 18 ++++++++-------- plugins/HistoryStats/src/optionsctrldefs.h | 24 +++++++++++----------- plugins/HistoryStats/src/optionsctrlimpl.cpp | 10 ++++----- plugins/HistoryStats/src/optionsctrlimpl.h | 22 ++++++++++---------- .../HistoryStats/src/optionsctrlimpl_button.cpp | 2 +- plugins/HistoryStats/src/optionsctrlimpl_check.cpp | 13 +++--------- plugins/HistoryStats/src/optionsctrlimpl_color.cpp | 2 +- plugins/HistoryStats/src/optionsctrlimpl_combo.cpp | 2 +- .../HistoryStats/src/optionsctrlimpl_datetime.cpp | 2 +- plugins/HistoryStats/src/optionsctrlimpl_edit.cpp | 2 +- plugins/HistoryStats/src/optionsctrlimpl_group.cpp | 2 +- plugins/HistoryStats/src/optionsctrlimpl_item.cpp | 8 ++------ plugins/HistoryStats/src/optionsctrlimpl_radio.cpp | 2 +- plugins/HistoryStats/src/statistic.cpp | 4 ++-- plugins/HistoryStats/src/version.h | 2 +- .../AdvancedAutoAway/advancedautoaway.cpp | 1 - 31 files changed, 107 insertions(+), 119 deletions(-) diff --git a/plugins/HistoryStats/src/bandctrl.cpp b/plugins/HistoryStats/src/bandctrl.cpp index 1629c6a638..a377717efb 100644 --- a/plugins/HistoryStats/src/bandctrl.cpp +++ b/plugins/HistoryStats/src/bandctrl.cpp @@ -10,7 +10,7 @@ void BandCtrl::setLayout(int nLayout) SendMessage(m_hBandWnd, BCM_SETLAYOUT, nLayout, 0); } -HANDLE BandCtrl::addButton(DWORD dwFlags, HICON hIcon, DWORD dwData, const TCHAR* szTooltip /* = NULL */, const TCHAR* szText /* = NULL */) +HANDLE BandCtrl::addButton(DWORD dwFlags, HICON hIcon, INT_PTR dwData, const TCHAR* szTooltip /* = NULL */, const TCHAR* szText /* = NULL */) { BCBUTTON bcb; @@ -38,7 +38,7 @@ DWORD BandCtrl::getButtonData(HANDLE hButton) return SendMessage(m_hBandWnd, BCM_GETBUTTONDATA, reinterpret_cast(hButton), 0); } -void BandCtrl::setButtonData(HANDLE hButton, DWORD dwData) +void BandCtrl::setButtonData(HANDLE hButton, INT_PTR dwData) { SendMessage(m_hBandWnd, BCM_SETBUTTONDATA, reinterpret_cast(hButton), dwData); } diff --git a/plugins/HistoryStats/src/bandctrl.h b/plugins/HistoryStats/src/bandctrl.h index b5bda28340..6cc1346549 100644 --- a/plugins/HistoryStats/src/bandctrl.h +++ b/plugins/HistoryStats/src/bandctrl.h @@ -25,11 +25,11 @@ public: public: void setLayout(int nLayout); - HANDLE addButton(DWORD dwFlags, HICON hIcon, DWORD dwData, const TCHAR* szTooltip = NULL, const TCHAR* szText = NULL); + HANDLE addButton(DWORD dwFlags, HICON hIcon, INT_PTR dwData, const TCHAR* szTooltip = NULL, const TCHAR* szText = NULL); bool isButtonChecked(HANDLE hButton); void checkButton(HANDLE hButton, bool bCheck); DWORD getButtonData(HANDLE hButton); - void setButtonData(HANDLE hButton, DWORD dwData); + void setButtonData(HANDLE hButton, INT_PTR dwData); bool isButtonVisisble(HANDLE hButton); void showButton(HANDLE hButton, bool bShow); RECT getButtonRect(HANDLE hButton); diff --git a/plugins/HistoryStats/src/bandctrldefs.h b/plugins/HistoryStats/src/bandctrldefs.h index 60d6bbbc76..61af8d5f86 100644 --- a/plugins/HistoryStats/src/bandctrldefs.h +++ b/plugins/HistoryStats/src/bandctrldefs.h @@ -15,8 +15,8 @@ public: BCM_ADDBUTTON = WM_USER + 1, // (#, BCBUTTON* pButton) -> HANDLE hButton BCM_ISBUTTONCHECKED = WM_USER + 2, // (HANDLE hButton, #) -> BOOL bChecked BCM_CHECKBUTTON = WM_USER + 3, // (HANDLE hButton, BOOL bCheck) -> # - BCM_GETBUTTONDATA = WM_USER + 4, // (HANDLE hButton, #) -> DWORD dwData - BCM_SETBUTTONDATA = WM_USER + 5, // (HANDLE hButton, DWORD dwData) -> # + BCM_GETBUTTONDATA = WM_USER + 4, // (HANDLE hButton, #) -> INT_PTR dwData + BCM_SETBUTTONDATA = WM_USER + 5, // (HANDLE hButton, INT_PTR dwData) -> # BCM_ISBUTTONVISIBLE = WM_USER + 6, // (HANDLE hButton, #) -> BOOL bVisible BCM_SHOWBUTTON = WM_USER + 7, // (HANDLE hButton, BOOL bShow) -> # BCM_GETBUTTONRECT = WM_USER + 8, // (HANDLE hButton, RECT* pRect) -> # @@ -46,13 +46,13 @@ public: HICON hIcon; TCHAR* szText; TCHAR* szTooltip; - DWORD dwData; + INT_PTR dwData; }; struct NMBANDCTRL { NMHDR hdr; HANDLE hButton; - DWORD dwData; + INT_PTR dwData; }; }; diff --git a/plugins/HistoryStats/src/bandctrlimpl.cpp b/plugins/HistoryStats/src/bandctrlimpl.cpp index dd9b28dead..8445debf64 100644 --- a/plugins/HistoryStats/src/bandctrlimpl.cpp +++ b/plugins/HistoryStats/src/bandctrlimpl.cpp @@ -19,12 +19,12 @@ LRESULT CALLBACK BandCtrlImpl::staticWndProc(HWND hWnd, UINT msg, WPARAM wParam, switch (msg) { case WM_NCCREATE: pCtrl = new BandCtrlImpl(hWnd, reinterpret_cast(reinterpret_cast(lParam)->hMenu)); - SetWindowLong(hWnd, 0, reinterpret_cast(pCtrl)); + SetWindowLongPtr(hWnd, 0, reinterpret_cast(pCtrl)); return TRUE; case WM_DESTROY: delete pCtrl; - SetWindowLong(hWnd, 0, 0); + SetWindowLongPtr(hWnd, 0, 0); return 0; case WM_GETDLGCODE: diff --git a/plugins/HistoryStats/src/bandctrlimpl.h b/plugins/HistoryStats/src/bandctrlimpl.h index 4696325246..9b2b6e708c 100644 --- a/plugins/HistoryStats/src/bandctrlimpl.h +++ b/plugins/HistoryStats/src/bandctrlimpl.h @@ -24,7 +24,7 @@ private: bool bChecked; bool bVisible; bool bDropDown; - DWORD dwData; + INT_PTR dwData; RECT rItem; UINT uTTId; bool bEnabled; diff --git a/plugins/HistoryStats/src/dlgconfigure.cpp b/plugins/HistoryStats/src/dlgconfigure.cpp index 33af5a88b1..55382f7e32 100644 --- a/plugins/HistoryStats/src/dlgconfigure.cpp +++ b/plugins/HistoryStats/src/dlgconfigure.cpp @@ -20,13 +20,13 @@ INT_PTR CALLBACK DlgConfigure::staticConfigureProc(HWND hDlg, UINT msg, WPARAM w switch (msg) { case WM_INITDIALOG: pDlg = new DlgConfigure(hDlg); - SetWindowLong(hDlg, DWLP_USER, reinterpret_cast(pDlg)); + SetWindowLongPtr(hDlg, DWLP_USER, reinterpret_cast(pDlg)); pDlg->onWMInitDialog(); return TRUE; case WM_DESTROY: delete pDlg; - SetWindowLong(hDlg, DWLP_USER, 0); + SetWindowLongPtr(hDlg, DWLP_USER, 0); break; case PSM_CHANGED: diff --git a/plugins/HistoryStats/src/dlgfilterwords.cpp b/plugins/HistoryStats/src/dlgfilterwords.cpp index f2d159d8e4..4f8682183c 100644 --- a/plugins/HistoryStats/src/dlgfilterwords.cpp +++ b/plugins/HistoryStats/src/dlgfilterwords.cpp @@ -13,7 +13,7 @@ INT_PTR CALLBACK DlgFilterWords::staticDlgProc(HWND hDlg, UINT msg, WPARAM wPara switch (msg) { case WM_INITDIALOG: pDlg = reinterpret_cast(lParam); - SetWindowLong(hDlg, DWLP_USER, reinterpret_cast(pDlg)); + SetWindowLongPtr(hDlg, DWLP_USER, reinterpret_cast(pDlg)); pDlg->m_hWnd = hDlg; pDlg->onWMInitDialog(); return TRUE; @@ -21,7 +21,7 @@ INT_PTR CALLBACK DlgFilterWords::staticDlgProc(HWND hDlg, UINT msg, WPARAM wPara case WM_DESTROY: pDlg->onWMDestroy(); pDlg->m_hWnd = NULL; - SetWindowLong(hDlg, DWLP_USER, 0); + SetWindowLongPtr(hDlg, DWLP_USER, 0); return TRUE; case WM_COMMAND: @@ -136,7 +136,7 @@ void DlgFilterWords::onWMDestroy() m_Sets.deleteAllItems(); } -void DlgFilterWords::onBandClicked(HANDLE hButton, DWORD dwData) +void DlgFilterWords::onBandClicked(HANDLE hButton, INT_PTR dwData) { switch (dwData) { case saAdd: @@ -185,7 +185,7 @@ void DlgFilterWords::onSetDel() } } -void DlgFilterWords::onSetItemModified(HANDLE hItem, DWORD dwData) +void DlgFilterWords::onSetItemModified(HANDLE hItem, INT_PTR dwData) { if (m_bColProvided) { Filter* pFilter = reinterpret_cast(dwData); @@ -201,7 +201,7 @@ void DlgFilterWords::onSetItemModified(HANDLE hItem, DWORD dwData) } } -void DlgFilterWords::onSetSelChanging(HANDLE hItem, DWORD dwData) +void DlgFilterWords::onSetSelChanging(HANDLE hItem, INT_PTR dwData) { if (hItem) { Filter* pFilter = reinterpret_cast(dwData); @@ -251,7 +251,7 @@ void DlgFilterWords::onSetSelChanging(HANDLE hItem, DWORD dwData) } } -void DlgFilterWords::onSetSelChanged(HANDLE hItem, DWORD dwData) +void DlgFilterWords::onSetSelChanged(HANDLE hItem, INT_PTR dwData) { BOOL bEnable = hItem ? TRUE : FALSE; diff --git a/plugins/HistoryStats/src/dlgfilterwords.h b/plugins/HistoryStats/src/dlgfilterwords.h index 23fb6a5a9c..13a4e4671a 100644 --- a/plugins/HistoryStats/src/dlgfilterwords.h +++ b/plugins/HistoryStats/src/dlgfilterwords.h @@ -43,12 +43,12 @@ private: private: void onWMInitDialog(); void onWMDestroy(); - void onBandClicked(HANDLE hButton, DWORD dwData); + void onBandClicked(HANDLE hButton, INT_PTR dwData); void onSetAdd(); void onSetDel(); - void onSetItemModified(HANDLE hItem, DWORD dwData); - void onSetSelChanging(HANDLE hItem, DWORD dwData); - void onSetSelChanged(HANDLE hItem, DWORD dwData); + void onSetItemModified(HANDLE hItem, INT_PTR dwData); + void onSetSelChanging(HANDLE hItem, INT_PTR dwData); + void onSetSelChanged(HANDLE hItem, INT_PTR dwData); void clearFilters(); diff --git a/plugins/HistoryStats/src/dlgoption.cpp b/plugins/HistoryStats/src/dlgoption.cpp index fb4820f956..b5dc1a43de 100644 --- a/plugins/HistoryStats/src/dlgoption.cpp +++ b/plugins/HistoryStats/src/dlgoption.cpp @@ -16,13 +16,13 @@ INT_PTR CALLBACK DlgOption::staticDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LP switch (msg) { case WM_INITDIALOG: pDlg = new DlgOption(hDlg); - SetWindowLong(hDlg, DWLP_USER, reinterpret_cast(pDlg)); + SetWindowLongPtr(hDlg, DWLP_USER, reinterpret_cast(pDlg)); pDlg->onWMInitDialog(); return TRUE; case WM_DESTROY: delete pDlg; - SetWindowLong(hDlg, DWLP_USER, 0); + SetWindowLongPtr(hDlg, DWLP_USER, 0); break; case WM_WINDOWPOSCHANGED: @@ -171,7 +171,7 @@ void DlgOption::onRunStats() Statistic::run(*g_pSettings, Statistic::fromOptions, g_hInst, m_hWnd); } -void DlgOption::onBandClicked(HANDLE hButton, DWORD dwData) +void DlgOption::onBandClicked(HANDLE hButton, INT_PTR dwData) { if (dwData >= opFirstPage && dwData <= opLastPage && dwData != m_nCurPage) { if (m_nCurPage != dwData) { @@ -190,7 +190,7 @@ void DlgOption::onBandClicked(HANDLE hButton, DWORD dwData) onRunStats(); } -void DlgOption::onBandDropDown(HANDLE hButton, DWORD dwData) +void DlgOption::onBandDropDown(HANDLE hButton, INT_PTR dwData) { if (dwData == opCreate || dwData == opCreateWarn) { // determine position for popup menu diff --git a/plugins/HistoryStats/src/dlgoption.h b/plugins/HistoryStats/src/dlgoption.h index d5d60b43d4..ab3b866d70 100644 --- a/plugins/HistoryStats/src/dlgoption.h +++ b/plugins/HistoryStats/src/dlgoption.h @@ -238,16 +238,16 @@ private: void rearrangeControls(); void toggleInfo(); void addCol(int nCol); - void onColSelChanging(HANDLE hItem, DWORD dwData); - void onColSelChanged(HANDLE hItem, DWORD dwData); + void onColSelChanging(HANDLE hItem, INT_PTR dwData); + void onColSelChanged(HANDLE hItem, INT_PTR dwData); void onColItemDropped(HANDLE hItem, HANDLE hDropTarget, BOOL bAbove); - void onBandClicked(HANDLE hButton, DWORD dwData); - void onBandDropDown(HANDLE hButton, DWORD dwData); + void onBandClicked(HANDLE hButton, INT_PTR dwData); + void onBandDropDown(HANDLE hButton, INT_PTR dwData); void onAdd(); void onDel(); void onMoveUp(); void onMoveDown(); - void onColumnButton(HANDLE hButton, DWORD dwData); + void onColumnButton(HANDLE hButton, INT_PTR dwData); public: bool configHasConflicts(HelpVec* pHelp); @@ -331,8 +331,8 @@ private: private: void onWMInitDialog(); void onRunStats(); - void onBandClicked(HANDLE hButton, DWORD dwData); - void onBandDropDown(HANDLE hButton, DWORD dwData); + void onBandClicked(HANDLE hButton, INT_PTR dwData); + void onBandDropDown(HANDLE hButton, INT_PTR dwData); void onProblemInfo(); void rearrangeControls(); diff --git a/plugins/HistoryStats/src/dlgoption_subbase.cpp b/plugins/HistoryStats/src/dlgoption_subbase.cpp index 2b9a3935e8..820ed37645 100644 --- a/plugins/HistoryStats/src/dlgoption_subbase.cpp +++ b/plugins/HistoryStats/src/dlgoption_subbase.cpp @@ -14,7 +14,7 @@ INT_PTR CALLBACK DlgOption::SubBase::staticDlgProc(HWND hDlg, UINT msg, WPARAM w switch (msg) { case WM_INITDIALOG: pDlg = reinterpret_cast(lParam); - SetWindowLong(hDlg, DWLP_USER, reinterpret_cast(pDlg)); + SetWindowLongPtr(hDlg, DWLP_USER, reinterpret_cast(pDlg)); pDlg->m_hWnd = hDlg; pDlg->onWMInitDialog(); pDlg->loadSettings(); @@ -23,7 +23,7 @@ INT_PTR CALLBACK DlgOption::SubBase::staticDlgProc(HWND hDlg, UINT msg, WPARAM w case WM_DESTROY: pDlg->onWMDestroy(); delete pDlg; - SetWindowLong(hDlg, DWLP_USER, 0); + SetWindowLongPtr(hDlg, DWLP_USER, 0); return TRUE; } diff --git a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp index a1f84e054c..5b99629068 100644 --- a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp +++ b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp @@ -146,7 +146,7 @@ BOOL DlgOption::SubColumns::handleMsg(UINT msg, WPARAM wParam, LPARAM lParam) if (pNM->hdr.code == TVN_ITEMEXPANDING) { if (pNM->action == TVE_COLLAPSE || pNM->action == TVE_COLLAPSERESET || (pNM->action == TVE_TOGGLE && pNM->itemNew.state & TVIS_EXPANDED)) { - SetWindowLong(getHWnd(), DWLP_MSGRESULT, TRUE); + SetWindowLongPtr(getHWnd(), DWLP_MSGRESULT, TRUE); return TRUE; } } @@ -202,7 +202,7 @@ void DlgOption::SubColumns::onWMInitDialog() // int column info HWND hInfo = GetDlgItem(getHWnd(), IDC_INFO); - SetWindowLong(hInfo, GWL_STYLE, GetWindowLong(hInfo, GWL_STYLE) | TVS_NOHSCROLL); + SetWindowLongPtr(hInfo, GWL_STYLE, GetWindowLongPtr(hInfo, GWL_STYLE) | TVS_NOHSCROLL); m_bShowInfo = g_pSettings->getShowColumnInfo(); toggleInfo(); @@ -340,7 +340,7 @@ void DlgOption::SubColumns::addCol(int nCol) } } -void DlgOption::SubColumns::onColSelChanging(HANDLE hItem, DWORD dwData) +void DlgOption::SubColumns::onColSelChanging(HANDLE hItem, INT_PTR dwData) { if (hItem) { Column* pCol = reinterpret_cast(m_Columns.getItemData(hItem)); @@ -374,7 +374,7 @@ void DlgOption::SubColumns::onColSelChanging(HANDLE hItem, DWORD dwData) TreeView_DeleteAllItems(hInfo); } -void DlgOption::SubColumns::onColSelChanged(HANDLE hItem, DWORD dwData) +void DlgOption::SubColumns::onColSelChanged(HANDLE hItem, INT_PTR dwData) { m_Options.setRedraw(false); m_Options.deleteAllItems(); @@ -511,7 +511,7 @@ void DlgOption::SubColumns::onColItemDropped(HANDLE hItem, HANDLE hDropTarget, B getParent()->settingsChanged(); } -void DlgOption::SubColumns::onBandClicked(HANDLE hButton, DWORD dwData) +void DlgOption::SubColumns::onBandClicked(HANDLE hButton, INT_PTR dwData) { switch (dwData) { case caAdd: @@ -532,7 +532,7 @@ void DlgOption::SubColumns::onBandClicked(HANDLE hButton, DWORD dwData) } } -void DlgOption::SubColumns::onBandDropDown(HANDLE hButton, DWORD dwData) +void DlgOption::SubColumns::onBandDropDown(HANDLE hButton, INT_PTR dwData) { if (dwData == caAdd) { // determine position for popup menu @@ -635,7 +635,7 @@ void DlgOption::SubColumns::onMoveDown() getParent()->settingsChanged(); } -void DlgOption::SubColumns::onColumnButton(HANDLE hButton, DWORD dwData) +void DlgOption::SubColumns::onColumnButton(HANDLE hButton, INT_PTR dwData) { if (dwData == Settings::biFilterWords) { HANDLE hSel = m_Columns.getSelection(); diff --git a/plugins/HistoryStats/src/dlgoption_subexclude.cpp b/plugins/HistoryStats/src/dlgoption_subexclude.cpp index e639610717..dd031b2c4f 100644 --- a/plugins/HistoryStats/src/dlgoption_subexclude.cpp +++ b/plugins/HistoryStats/src/dlgoption_subexclude.cpp @@ -203,7 +203,7 @@ void DlgOption::SubExclude::customizeList(HWND hCList) for (int i = 0; i <= FONTID_MAX; ++i) SendMessage(hCList, CLM_SETTEXTCOLOR, i, GetSysColor(COLOR_WINDOWTEXT)); - SetWindowLong(hCList, GWL_STYLE, GetWindowLong(hCList, GWL_STYLE) | CLS_SHOWHIDDEN); + SetWindowLongPtr(hCList, GWL_STYLE, GetWindowLongPtr(hCList, GWL_STYLE) | CLS_SHOWHIDDEN); } void DlgOption::SubExclude::updateAllGroups(HWND hCList, HANDLE hFirstItem, HANDLE hParentItem) diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp index 1b4dbbe6ee..c34752dbdc 100644 --- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp +++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp @@ -191,7 +191,7 @@ BOOL DlgOption::SubGlobal::handleMsg(UINT msg, WPARAM wParam, LPARAM lParam) else if (p->code == TVN_ITEMEXPANDING) { if (pNM->action == TVE_COLLAPSE || pNM->action == TVE_COLLAPSERESET || (pNM->action == TVE_TOGGLE && pNM->itemNew.state & TVIS_EXPANDED)) { - SetWindowLong(getHWnd(), DWLP_MSGRESULT, TRUE); + SetWindowLongPtr(getHWnd(), DWLP_MSGRESULT, TRUE); return TRUE; } } @@ -346,7 +346,7 @@ void DlgOption::SubGlobal::initSupportInfo() HWND hInfo = GetDlgItem(getHWnd(), IDC_INFO); - SetWindowLong(hInfo, GWL_STYLE, GetWindowLong(hInfo, GWL_STYLE) | TVS_NOHSCROLL); + SetWindowLongPtr(hInfo, GWL_STYLE, GetWindowLong(hInfo, GWL_STYLE) | TVS_NOHSCROLL); SendMessage(hInfo, WM_SETREDRAW, FALSE, 0); diff --git a/plugins/HistoryStats/src/optionsctrl.cpp b/plugins/HistoryStats/src/optionsctrl.cpp index 5fa9ab6d6a..a203a577a5 100644 --- a/plugins/HistoryStats/src/optionsctrl.cpp +++ b/plugins/HistoryStats/src/optionsctrl.cpp @@ -7,7 +7,7 @@ * OptionsCtrl */ -HANDLE OptionsCtrl::insertGroup(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags /* = 0 */, DWORD dwData /* = 0 */) +HANDLE OptionsCtrl::insertGroup(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCGROUP ocg; ocg.dwFlags = dwFlags; @@ -17,7 +17,7 @@ HANDLE OptionsCtrl::insertGroup(HANDLE hParent, const TCHAR* szLabel, DWORD dwFl return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTGROUP, reinterpret_cast(hParent), reinterpret_cast(&ocg))); } -HANDLE OptionsCtrl::insertCheck(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags /* = 0 */, DWORD dwData /* = 0 */) +HANDLE OptionsCtrl::insertCheck(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCCHECK occ; occ.dwFlags = dwFlags; @@ -27,7 +27,7 @@ HANDLE OptionsCtrl::insertCheck(HANDLE hParent, const TCHAR* szLabel, DWORD dwFl return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTCHECK, reinterpret_cast(hParent), reinterpret_cast(&occ))); } -HANDLE OptionsCtrl::insertRadio(HANDLE hParent, HANDLE hSibling, const TCHAR* szLabel, DWORD dwFlags /* = 0 */, DWORD dwData /* = 0 */) +HANDLE OptionsCtrl::insertRadio(HANDLE hParent, HANDLE hSibling, const TCHAR* szLabel, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCRADIO ocr; ocr.dwFlags = dwFlags; @@ -38,7 +38,7 @@ HANDLE OptionsCtrl::insertRadio(HANDLE hParent, HANDLE hSibling, const TCHAR* sz return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTRADIO, reinterpret_cast(hParent), reinterpret_cast(&ocr))); } -HANDLE OptionsCtrl::insertEdit(HANDLE hParent, const TCHAR* szLabel, const TCHAR* szEdit /* = _T("") */, DWORD dwFlags /* = 0 */, DWORD dwData /* = 0 */) +HANDLE OptionsCtrl::insertEdit(HANDLE hParent, const TCHAR* szLabel, const TCHAR* szEdit /* = _T("") */, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCEDIT oce; oce.dwFlags = dwFlags; @@ -49,7 +49,7 @@ HANDLE OptionsCtrl::insertEdit(HANDLE hParent, const TCHAR* szLabel, const TCHAR return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTEDIT, reinterpret_cast(hParent), reinterpret_cast(&oce))); } -HANDLE OptionsCtrl::insertCombo(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags /* = 0 */, DWORD dwData /* = 0 */) +HANDLE OptionsCtrl::insertCombo(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCCOMBO occ; occ.dwFlags = dwFlags; @@ -59,7 +59,7 @@ HANDLE OptionsCtrl::insertCombo(HANDLE hParent, const TCHAR* szLabel, DWORD dwFl return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTCOMBO, reinterpret_cast(hParent), reinterpret_cast(&occ))); } -HANDLE OptionsCtrl::insertButton(HANDLE hParent, const TCHAR* szLabel, const TCHAR* szButton, DWORD dwFlags /* = 0 */, DWORD dwData /* = 0 */) +HANDLE OptionsCtrl::insertButton(HANDLE hParent, const TCHAR* szLabel, const TCHAR* szButton, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCBUTTON ocb; ocb.dwFlags = dwFlags; @@ -70,7 +70,7 @@ HANDLE OptionsCtrl::insertButton(HANDLE hParent, const TCHAR* szLabel, const TCH return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTBUTTON, reinterpret_cast(hParent), reinterpret_cast(&ocb))); } -HANDLE OptionsCtrl::insertDateTime(HANDLE hParent, const TCHAR* szLabel, DWORD dwDateTime, const TCHAR* szFormat /* = _T("%Y-%m-%d") */, DWORD dwFlags /* = 0 */, DWORD dwData /* = 0 */) +HANDLE OptionsCtrl::insertDateTime(HANDLE hParent, const TCHAR* szLabel, DWORD dwDateTime, const TCHAR* szFormat /* = _T("%Y-%m-%d") */, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCDATETIME ocdt; ocdt.dwFlags = dwFlags; @@ -82,7 +82,7 @@ HANDLE OptionsCtrl::insertDateTime(HANDLE hParent, const TCHAR* szLabel, DWORD d return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTDATETIME, reinterpret_cast(hParent), reinterpret_cast(&ocdt))); } -HANDLE OptionsCtrl::insertColor(HANDLE hParent, const TCHAR* szLabel, COLORREF crColor /* = 0 */, DWORD dwFlags /* = 0 */, DWORD dwData /* = 0 */) +HANDLE OptionsCtrl::insertColor(HANDLE hParent, const TCHAR* szLabel, COLORREF crColor /* = 0 */, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCCOLOR occ; occ.dwFlags = dwFlags; @@ -118,7 +118,7 @@ DWORD OptionsCtrl::getItemData(HANDLE hItem) return SendMessage(m_hOptWnd, OCM_GETITEMDATA, reinterpret_cast(hItem), 0); } -void OptionsCtrl::setItemData(HANDLE hItem, DWORD dwData) +void OptionsCtrl::setItemData(HANDLE hItem, INT_PTR dwData) { SendMessage(m_hOptWnd, OCM_SETITEMDATA, reinterpret_cast(hItem), dwData); } diff --git a/plugins/HistoryStats/src/optionsctrl.h b/plugins/HistoryStats/src/optionsctrl.h index 9f45c7b048..7743c1baf3 100644 --- a/plugins/HistoryStats/src/optionsctrl.h +++ b/plugins/HistoryStats/src/optionsctrl.h @@ -39,20 +39,20 @@ public: operator HWND() { return m_hOptWnd; } public: - HANDLE insertGroup(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags = 0, DWORD dwData = 0); - HANDLE insertCheck(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags = 0, DWORD dwData = 0); - HANDLE insertRadio(HANDLE hParent, HANDLE hSibling, const TCHAR* szLabel, DWORD dwFlags = 0, DWORD dwData = 0); - HANDLE insertEdit(HANDLE hParent, const TCHAR* szLabel, const TCHAR* szEdit = _T(""), DWORD dwFlags = 0, DWORD dwData = 0); - HANDLE insertCombo(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags = 0, DWORD dwData = 0); - HANDLE insertButton(HANDLE hParent, const TCHAR* szLabel, const TCHAR* szButton, DWORD dwFlags = 0, DWORD dwData = 0); - HANDLE insertDateTime(HANDLE hParent, const TCHAR* szLabel, DWORD dwDateTime, const TCHAR* szFormat = _T("%Y-%m-%d"), DWORD dwFlags = 0, DWORD dwData = 0); - HANDLE insertColor(HANDLE hParent, const TCHAR* szLabel, COLORREF crColor = 0, DWORD dwFlags = 0, DWORD dwData = 0); + HANDLE insertGroup(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertCheck(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertRadio(HANDLE hParent, HANDLE hSibling, const TCHAR* szLabel, DWORD dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertEdit(HANDLE hParent, const TCHAR* szLabel, const TCHAR* szEdit = _T(""), DWORD dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertCombo(HANDLE hParent, const TCHAR* szLabel, DWORD dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertButton(HANDLE hParent, const TCHAR* szLabel, const TCHAR* szButton, DWORD dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertDateTime(HANDLE hParent, const TCHAR* szLabel, DWORD dwDateTime, const TCHAR* szFormat = _T("%Y-%m-%d"), DWORD dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertColor(HANDLE hParent, const TCHAR* szLabel, COLORREF crColor = 0, DWORD dwFlags = 0, INT_PTR dwData = 0); const TCHAR* getItemLabel(HANDLE hItem); void setItemLabel(HANDLE hItem, const TCHAR* szLabel); bool isItemEnabled(HANDLE hItem); void enableItem(HANDLE hItem, bool bEnable); DWORD getItemData(HANDLE hItem); - void setItemData(HANDLE hItem, DWORD dwData); + void setItemData(HANDLE hItem, INT_PTR dwData); bool isItemChecked(HANDLE hItem); void checkItem(HANDLE hItem, bool bCheck); int getRadioChecked(HANDLE hRadio); diff --git a/plugins/HistoryStats/src/optionsctrldefs.h b/plugins/HistoryStats/src/optionsctrldefs.h index 2b6bbe3f33..fd9f220ed1 100644 --- a/plugins/HistoryStats/src/optionsctrldefs.h +++ b/plugins/HistoryStats/src/optionsctrldefs.h @@ -21,8 +21,8 @@ public: OCM_SETITEMLABEL = WM_USER + 7, // (HANDLE hItem, const TCHAR* szLabel) -> # OCM_ISITEMENABLED = WM_USER + 8, // (HANDLE hItem, #) -> BOOL bEnabled OCM_ENABLEITEM = WM_USER + 9, // (HANDLE hItem, BOOL bEnable) -> # - OCM_GETITEMDATA = WM_USER + 10, // (HANDLE hItem, #) -> DWORD dwData - OCM_SETITEMDATA = WM_USER + 11, // (HANDLE hItem, DWORD dwData) -> # + OCM_GETITEMDATA = WM_USER + 10, // (HANDLE hItem, #) -> INT_PTR dwData + OCM_SETITEMDATA = WM_USER + 11, // (HANDLE hItem, INT_PTR dwData) -> # OCM_ISITEMCHECKED = WM_USER + 12, // (HANDLE hItem, #) -> BOOL bChecked [Check/Radio] OCM_CHECKITEM = WM_USER + 13, // (HANDLE hItem, BOOL bCheck) -> # [Check/Radio (ignores bCheck)] OCM_GETRADIOCHECKED = WM_USER + 14, // (HANDLE hRadio, #) -> int nChecked [Radio] @@ -90,46 +90,46 @@ public: struct OCGROUP { DWORD dwFlags; TCHAR* szLabel; - DWORD dwData; + INT_PTR dwData; }; struct OCCHECK { DWORD dwFlags; TCHAR* szLabel; - DWORD dwData; + INT_PTR dwData; }; struct OCRADIO { DWORD dwFlags; TCHAR* szLabel; - DWORD dwData; + INT_PTR dwData; HANDLE hSibling; }; struct OCEDIT { DWORD dwFlags; TCHAR* szLabel; - DWORD dwData; + INT_PTR dwData; TCHAR* szEdit; }; struct OCCOMBO { DWORD dwFlags; TCHAR* szLabel; - DWORD dwData; + INT_PTR dwData; }; struct OCBUTTON { DWORD dwFlags; TCHAR* szLabel; - DWORD dwData; + INT_PTR dwData; TCHAR* szButton; }; struct OCDATETIME { DWORD dwFlags; TCHAR* szLabel; - DWORD dwData; + INT_PTR dwData; TCHAR* szFormat; DWORD dwDateTime; }; @@ -137,20 +137,20 @@ public: struct OCCOLOR { DWORD dwFlags; TCHAR* szLabel; - DWORD dwData; + INT_PTR dwData; COLORREF crColor; }; struct NMOPTIONSCTRL { NMHDR hdr; HANDLE hItem; - DWORD dwData; + INT_PTR dwData; }; struct NMOPTIONSCTRLDROP { NMHDR hdr; HANDLE hItem; - DWORD dwData; + INT_PTR dwData; HANDLE hDropTarget; DWORD dwDropTargetData; BOOL bAbove; diff --git a/plugins/HistoryStats/src/optionsctrlimpl.cpp b/plugins/HistoryStats/src/optionsctrlimpl.cpp index 445fc10340..b986888864 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl.cpp @@ -26,7 +26,7 @@ LRESULT CALLBACK OptionsCtrlImpl::staticWndProc(HWND hWnd, UINT msg, WPARAM wPar pCS->dwExStyle &= ~(WS_EX_CLIENTEDGE | WS_EX_STATICEDGE | WS_EX_WINDOWEDGE); pCtrl = new OptionsCtrlImpl(hWnd, reinterpret_cast(pCS->hMenu)); - SetWindowLong(hWnd, 0, reinterpret_cast(pCtrl)); + SetWindowLongPtr(hWnd, 0, reinterpret_cast(pCtrl)); } return pCtrl ? TRUE : FALSE; @@ -36,7 +36,7 @@ LRESULT CALLBACK OptionsCtrlImpl::staticWndProc(HWND hWnd, UINT msg, WPARAM wPar case WM_DESTROY: pCtrl->onWMDestroy(); delete pCtrl; - SetWindowLong(hWnd, 0, 0); + SetWindowLongPtr(hWnd, 0, 0); return 0; case WM_SETFOCUS: @@ -448,7 +448,7 @@ LRESULT OptionsCtrlImpl::onWMCreate(CREATESTRUCT* pCS) return -1; // subclass tree view - m_pfnOldTreeProc = reinterpret_cast(SetWindowLong(m_hTree, GWLP_WNDPROC, reinterpret_cast(staticTreeProc))); + m_pfnOldTreeProc = reinterpret_cast(SetWindowLongPtr(m_hTree, GWLP_WNDPROC, reinterpret_cast(staticTreeProc))); // create/set state icons staticInitStateImages(); @@ -466,7 +466,7 @@ void OptionsCtrlImpl::onWMDestroy() staticFreeStateImages(); // undo subclassing of tree view - SetWindowLong(m_hTree, GWLP_WNDPROC, reinterpret_cast(m_pfnOldTreeProc)); + SetWindowLongPtr(m_hTree, GWLP_WNDPROC, reinterpret_cast(m_pfnOldTreeProc)); m_pfnOldTreeProc = NULL; // destroy tree view before invalidating 'this' @@ -865,7 +865,7 @@ DWORD OptionsCtrlImpl::onOCMGetItemData(HTREEITEM hItem) return getItem(hItem)->m_dwData; } -void OptionsCtrlImpl::onOCMSetItemData(HTREEITEM hItem, DWORD dwData) +void OptionsCtrlImpl::onOCMSetItemData(HTREEITEM hItem, INT_PTR dwData) { getItem(hItem)->m_dwData = dwData; } diff --git a/plugins/HistoryStats/src/optionsctrlimpl.h b/plugins/HistoryStats/src/optionsctrlimpl.h index 7ad304ce85..9ee6474022 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl.h +++ b/plugins/HistoryStats/src/optionsctrlimpl.h @@ -73,10 +73,10 @@ private: bool m_bEnabled; bool m_bDisableChilds; ext::string m_strLabel; - DWORD m_dwData; + INT_PTR m_dwData; protected: - explicit Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData); + explicit Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const TCHAR* szLabel, DWORD dwFlags, INT_PTR dwData); void enableChilds(bool bEnable); @@ -102,7 +102,7 @@ private: bool m_bDrawLine; public: - explicit Group(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData); + explicit Group(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, INT_PTR dwData); virtual void setEnabled(bool bEnable); virtual void childAdded(Item* pChild); @@ -122,7 +122,7 @@ private: void updateItem(); public: - explicit Check(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData); + explicit Check(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, INT_PTR dwData); virtual void onToggle(); @@ -171,7 +171,7 @@ private: void updateItem(); public: - explicit Radio(OptionsCtrlImpl* pCtrl, Item* pParent, Radio* pSibling, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData); + explicit Radio(OptionsCtrlImpl* pCtrl, Item* pParent, Radio* pSibling, const TCHAR* szLabel, DWORD dwFlags, INT_PTR dwData); virtual ~Radio(); virtual void onToggle(); @@ -196,7 +196,7 @@ private: ext::string getCombinedText(); public: - explicit Edit(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szEdit, DWORD dwFlags, DWORD dwData); + explicit Edit(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szEdit, DWORD dwFlags, INT_PTR dwData); virtual void onToggle() { onActivate(); } virtual void onSelect(); @@ -230,7 +230,7 @@ private: ext::string getCombinedText(); public: - explicit Combo(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData); + explicit Combo(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, INT_PTR dwData); virtual void onToggle() { onActivate(); } virtual void onSelect(); @@ -256,7 +256,7 @@ private: HWND m_hButtonWnd; public: - explicit Button(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szButton, DWORD dwFlags, DWORD dwData); + explicit Button(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szButton, DWORD dwFlags, INT_PTR dwData); virtual void onToggle() { onActivate(); } virtual void onSelect(); @@ -294,7 +294,7 @@ private: ext::string getCombinedText(); public: - explicit DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szFormat, DWORD dwTimestamp, DWORD dwFlags, DWORD dwData); + explicit DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szFormat, DWORD dwTimestamp, DWORD dwFlags, INT_PTR dwData); virtual void onToggle() { onActivate(); } virtual void onSelect(); @@ -325,7 +325,7 @@ private: COLORREF getColorValue(); public: - explicit Color(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, COLORREF crColor, DWORD dwFlags, DWORD dwData); + explicit Color(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, COLORREF crColor, DWORD dwFlags, INT_PTR dwData); virtual void onToggle() { onActivate(); } virtual void onSelect(); @@ -407,7 +407,7 @@ private: bool onOCMIsItemEnabled(HTREEITEM hItem); void onOCMEnableItem(HTREEITEM hItem, bool bEnable); DWORD onOCMGetItemData(HTREEITEM hItem); - void onOCMSetItemData(HTREEITEM hItem, DWORD dwData); + void onOCMSetItemData(HTREEITEM hItem, INT_PTR dwData); bool onOCMIsItemChecked(HTREEITEM hItem); void onOCMCheckItem(HTREEITEM hItem, bool bCheck); int onOCMGetRadioChecked(HTREEITEM hRadio); diff --git a/plugins/HistoryStats/src/optionsctrlimpl_button.cpp b/plugins/HistoryStats/src/optionsctrlimpl_button.cpp index b6951f3295..63176f146a 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_button.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_button.cpp @@ -7,7 +7,7 @@ * OptionsCtrlImpl::Button */ -OptionsCtrlImpl::Button::Button(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szButton, DWORD dwFlags, DWORD dwData) +OptionsCtrlImpl::Button::Button(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szButton, DWORD dwFlags, INT_PTR dwData) : Item(pCtrl, itButton, szLabel, dwFlags, dwData) , m_hButtonWnd(NULL) , m_strButton(szButton) diff --git a/plugins/HistoryStats/src/optionsctrlimpl_check.cpp b/plugins/HistoryStats/src/optionsctrlimpl_check.cpp index 21d9677636..b70ebcc0e8 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_check.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_check.cpp @@ -22,13 +22,11 @@ void OptionsCtrlImpl::Check::updateItem() m_pCtrl->setStateImage(m_hItem, m_bEnabled ? (m_bChecked ? siCheckC : siCheckU) : (m_bChecked ? siCheckCG : siCheckUG)); if (m_bDisableChilds || m_bDisableChildsOnUncheck) - { enableChilds(getChildEnable()); - } } -OptionsCtrlImpl::Check::Check(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData) - : Item(pCtrl, itCheck, szLabel, dwFlags, dwData) +OptionsCtrlImpl::Check::Check(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, INT_PTR dwData) : + Item(pCtrl, itCheck, szLabel, dwFlags, dwData) { m_bChecked = bool_(dwFlags & OCF_CHECKED); m_bDisableChildsOnUncheck = bool_(dwFlags & OCF_DISABLECHILDSONUNCHECK); @@ -36,15 +34,12 @@ OptionsCtrlImpl::Check::Check(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR pCtrl->insertItem(pParent, this, szLabel, dwFlags, getStateImage()); if (pParent) - { pParent->childAdded(this); - } } void OptionsCtrlImpl::Check::onToggle() { - if (m_bEnabled) - { + if (m_bEnabled) { setChecked(!m_bChecked); m_pCtrl->setModified(this); } @@ -53,7 +48,5 @@ void OptionsCtrlImpl::Check::onToggle() void OptionsCtrlImpl::Check::childAdded(Item* pChild) { if (m_bDisableChilds || m_bDisableChildsOnUncheck) - { pChild->setEnabled(getChildEnable()); - } } diff --git a/plugins/HistoryStats/src/optionsctrlimpl_color.cpp b/plugins/HistoryStats/src/optionsctrlimpl_color.cpp index 0ed7e5abe4..acaf2ca817 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_color.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_color.cpp @@ -12,7 +12,7 @@ COLORREF OptionsCtrlImpl::Color::getColorValue() return SendMessage(m_hColorWnd, CPM_GETCOLOUR, 0, 0); } -OptionsCtrlImpl::Color::Color(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, COLORREF crColor, DWORD dwFlags, DWORD dwData) +OptionsCtrlImpl::Color::Color(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, COLORREF crColor, DWORD dwFlags, INT_PTR dwData) : Item(pCtrl, itColor, szLabel, dwFlags, dwData) , m_hColorWnd(NULL) , m_crColor(crColor) diff --git a/plugins/HistoryStats/src/optionsctrlimpl_combo.cpp b/plugins/HistoryStats/src/optionsctrlimpl_combo.cpp index e75a635e14..304ec8e9d4 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_combo.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_combo.cpp @@ -46,7 +46,7 @@ ext::string OptionsCtrlImpl::Combo::getCombinedText() } } -OptionsCtrlImpl::Combo::Combo(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData) +OptionsCtrlImpl::Combo::Combo(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, INT_PTR dwData) : Item(pCtrl, itCombo, szLabel, dwFlags, dwData), m_hComboWnd(NULL), m_nSelected(-1) { m_bDisableChildsOnIndex0 = bool_(dwFlags & OCF_DISABLECHILDSONINDEX0); diff --git a/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp b/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp index 161e21f64c..ee71a916e1 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp @@ -183,7 +183,7 @@ ext::string OptionsCtrlImpl::DateTime::getCombinedText() return strTemp; } -OptionsCtrlImpl::DateTime::DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szFormat, DWORD dwTimestamp, DWORD dwFlags, DWORD dwData) +OptionsCtrlImpl::DateTime::DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szFormat, DWORD dwTimestamp, DWORD dwFlags, INT_PTR dwData) : Item(pCtrl, itDateTime, szLabel, dwFlags, dwData), m_hDateTimeWnd(NULL), m_strFormat(szFormat), m_dwTimestamp(dwTimestamp) { m_bDisableChildsOnNone = bool_(dwFlags & OCF_DISABLECHILDSONNONE); diff --git a/plugins/HistoryStats/src/optionsctrlimpl_edit.cpp b/plugins/HistoryStats/src/optionsctrlimpl_edit.cpp index 17b0a93b44..a70cb0d4b5 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_edit.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_edit.cpp @@ -38,7 +38,7 @@ ext::string OptionsCtrlImpl::Edit::getCombinedText() } } -OptionsCtrlImpl::Edit::Edit(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szEdit, DWORD dwFlags, DWORD dwData) +OptionsCtrlImpl::Edit::Edit(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szEdit, DWORD dwFlags, INT_PTR dwData) : Item(pCtrl, itEdit, szLabel, dwFlags, dwData), m_hEditWnd(NULL) { m_strEdit = szEdit; diff --git a/plugins/HistoryStats/src/optionsctrlimpl_group.cpp b/plugins/HistoryStats/src/optionsctrlimpl_group.cpp index 9f99930a3a..46a5b7b927 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_group.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_group.cpp @@ -5,7 +5,7 @@ * OptionsCtrlImpl::Group */ -OptionsCtrlImpl::Group::Group(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData) +OptionsCtrlImpl::Group::Group(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, DWORD dwFlags, INT_PTR dwData) : Item(pCtrl, itGroup, szLabel, dwFlags, dwData) { m_bDrawLine = bool_(dwFlags & OCF_DRAWLINE); diff --git a/plugins/HistoryStats/src/optionsctrlimpl_item.cpp b/plugins/HistoryStats/src/optionsctrlimpl_item.cpp index 998496bbc9..01df06d643 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_item.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_item.cpp @@ -5,8 +5,8 @@ * OptionsCtrlImpl::Item */ -OptionsCtrlImpl::Item::Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData) - : m_pCtrl(pCtrl), m_hItem(NULL), m_nRef(1), m_ItemType(ItemType), m_strLabel(szLabel), m_dwData(dwData) +OptionsCtrlImpl::Item::Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const TCHAR* szLabel, DWORD dwFlags, INT_PTR dwData) : + m_pCtrl(pCtrl), m_hItem(NULL), m_nRef(1), m_ItemType(ItemType), m_strLabel(szLabel), m_dwData(dwData) { m_bEnabled = !(dwFlags & OCF_DISABLED); m_bDisableChilds = !(dwFlags & OCF_NODISABLECHILDS); @@ -15,15 +15,11 @@ OptionsCtrlImpl::Item::Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const TCH void OptionsCtrlImpl::Item::enableChilds(bool bEnable) { HTREEITEM hChild = TreeView_GetChild(m_pCtrl->m_hTree, m_hItem); - while (hChild) { Item* pItem = m_pCtrl->getItem(hChild); - if (pItem) - { pItem->setEnabled(bEnable); - } hChild = TreeView_GetNextSibling(m_pCtrl->m_hTree, hChild); } diff --git a/plugins/HistoryStats/src/optionsctrlimpl_radio.cpp b/plugins/HistoryStats/src/optionsctrlimpl_radio.cpp index 0a9c085960..ab1f165fed 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_radio.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_radio.cpp @@ -74,7 +74,7 @@ void OptionsCtrlImpl::Radio::updateItem() } } -OptionsCtrlImpl::Radio::Radio(OptionsCtrlImpl* pCtrl, Item* pParent, Radio* pSibling, const TCHAR* szLabel, DWORD dwFlags, DWORD dwData) +OptionsCtrlImpl::Radio::Radio(OptionsCtrlImpl* pCtrl, Item* pParent, Radio* pSibling, const TCHAR* szLabel, DWORD dwFlags, INT_PTR dwData) : Item(pCtrl, itRadio, szLabel, dwFlags, dwData) { m_bDisableChildsOnUncheck = bool_(dwFlags & OCF_DISABLECHILDSONUNCHECK); diff --git a/plugins/HistoryStats/src/statistic.cpp b/plugins/HistoryStats/src/statistic.cpp index 0a8e8b4a35..134781c888 100644 --- a/plugins/HistoryStats/src/statistic.cpp +++ b/plugins/HistoryStats/src/statistic.cpp @@ -287,7 +287,7 @@ void Statistic::handleAddChat(Contact& contact, bool bOutgoing, DWORD localTimes INT_PTR CALLBACK Statistic::staticProgressProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { - Statistic* pStats = reinterpret_cast(GetWindowLong(hDlg, GWLP_USERDATA)); + Statistic* pStats = reinterpret_cast(GetWindowLongPtr(hDlg, GWLP_USERDATA)); switch (msg) { case WM_INITDIALOG: @@ -1255,7 +1255,7 @@ bool Statistic::createStatistics() return false; } - SetWindowLong(m_hWndProgress, GWLP_USERDATA, reinterpret_cast(this)); + SetWindowLongPtr(m_hWndProgress, GWLP_USERDATA, reinterpret_cast(this)); // Init progress dialog. utils::centerDialog(m_hWndProgress); diff --git a/plugins/HistoryStats/src/version.h b/plugins/HistoryStats/src/version.h index 58b412b072..f038e8a7f3 100644 --- a/plugins/HistoryStats/src/version.h +++ b/plugins/HistoryStats/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 2 #define __RELEASE_NUM 0 -#define __BUILD_NUM 1 +#define __BUILD_NUM 2 #include diff --git a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp index 2e5051d89b..567feaea6d 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/advancedautoaway.cpp @@ -80,7 +80,6 @@ static UINT_PTR hAutoAwayTimer; // prototypes extern DWORD StatusModeToProtoFlag(int status); extern int InitCommonStatus(); -void LoadOptions(TAAAProtoSetting** loadSettings, BOOL override); static int HookWindowsHooks(int hookMiranda, int hookAll); static int UnhookWindowsHooks(); static LRESULT CALLBACK MouseHookFunction(int code, WPARAM wParam, LPARAM lParam); -- cgit v1.2.3