From cddcd7483a7c472598af098e759e5d309024f606 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 20:31:39 +0300 Subject: DWORD -> uint32_t --- plugins/HistoryStats/src/_consts.h | 4 +-- plugins/HistoryStats/src/bandctrl.cpp | 4 +-- plugins/HistoryStats/src/bandctrl.h | 4 +-- plugins/HistoryStats/src/bandctrldefs.h | 2 +- plugins/HistoryStats/src/bandctrlimpl.cpp | 4 +-- plugins/HistoryStats/src/column.h | 4 +-- plugins/HistoryStats/src/column_chatduration.cpp | 4 +-- plugins/HistoryStats/src/column_chatduration.h | 2 +- plugins/HistoryStats/src/column_split.cpp | 4 +-- plugins/HistoryStats/src/column_split.h | 10 ++++---- plugins/HistoryStats/src/column_splittimeline.cpp | 22 ++++++++-------- plugins/HistoryStats/src/column_splittimeline.h | 8 +++--- plugins/HistoryStats/src/column_timeline.cpp | 4 +-- plugins/HistoryStats/src/column_timeline.h | 4 +-- plugins/HistoryStats/src/contact.cpp | 8 +++--- plugins/HistoryStats/src/contact.h | 28 ++++++++++---------- plugins/HistoryStats/src/dlgfilterwords.cpp | 2 +- plugins/HistoryStats/src/dlgoption.cpp | 2 +- plugins/HistoryStats/src/dlgoption_subcolumns.cpp | 2 +- plugins/HistoryStats/src/dlgoption_subexclude.cpp | 2 +- plugins/HistoryStats/src/dlgoption_subglobal.cpp | 2 +- plugins/HistoryStats/src/main.cpp | 2 +- plugins/HistoryStats/src/message.h | 6 ++--- plugins/HistoryStats/src/mirandacontact.cpp | 6 ++--- plugins/HistoryStats/src/mu_common.cpp | 12 ++++----- plugins/HistoryStats/src/mu_common.h | 10 ++++---- plugins/HistoryStats/src/optionsctrl.cpp | 26 +++++++++---------- plugins/HistoryStats/src/optionsctrl.h | 22 ++++++++-------- plugins/HistoryStats/src/optionsctrldefs.h | 26 +++++++++---------- plugins/HistoryStats/src/optionsctrlimpl.cpp | 14 +++++----- plugins/HistoryStats/src/optionsctrlimpl.h | 28 ++++++++++---------- .../HistoryStats/src/optionsctrlimpl_button.cpp | 4 +-- plugins/HistoryStats/src/optionsctrlimpl_check.cpp | 2 +- plugins/HistoryStats/src/optionsctrlimpl_color.cpp | 4 +-- plugins/HistoryStats/src/optionsctrlimpl_combo.cpp | 4 +-- .../HistoryStats/src/optionsctrlimpl_datetime.cpp | 8 +++--- plugins/HistoryStats/src/optionsctrlimpl_edit.cpp | 4 +-- plugins/HistoryStats/src/optionsctrlimpl_group.cpp | 2 +- plugins/HistoryStats/src/optionsctrlimpl_item.cpp | 2 +- plugins/HistoryStats/src/optionsctrlimpl_radio.cpp | 2 +- plugins/HistoryStats/src/settings.cpp | 8 +++--- plugins/HistoryStats/src/settings.h | 10 ++++---- plugins/HistoryStats/src/settingsserializer.h | 2 +- plugins/HistoryStats/src/statistic.cpp | 30 +++++++++++----------- plugins/HistoryStats/src/statistic.h | 26 +++++++++---------- plugins/HistoryStats/src/utils.cpp | 8 +++--- plugins/HistoryStats/src/utils.h | 14 +++++----- 47 files changed, 204 insertions(+), 204 deletions(-) (limited to 'plugins/HistoryStats') diff --git a/plugins/HistoryStats/src/_consts.h b/plugins/HistoryStats/src/_consts.h index a9d8d5a4ed..c9a75972be 100644 --- a/plugins/HistoryStats/src/_consts.h +++ b/plugins/HistoryStats/src/_consts.h @@ -185,8 +185,8 @@ namespace con #endif // min/max time - const DWORD MinDateTime = 0x00000000; - const DWORD MaxDateTime = 0xFFFFFFFF; + const uint32_t MinDateTime = 0x00000000; + const uint32_t MaxDateTime = 0xFFFFFFFF; // default colors for html output const COLORREF ColorOut = RGB(0xE8, 0x64, 0x1B); diff --git a/plugins/HistoryStats/src/bandctrl.cpp b/plugins/HistoryStats/src/bandctrl.cpp index 2240b1f55c..c853976388 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, INT_PTR dwData, const wchar_t *szTooltip, const wchar_t *szText) +HANDLE BandCtrl::addButton(uint32_t dwFlags, HICON hIcon, INT_PTR dwData, const wchar_t *szTooltip, const wchar_t *szText) { BCBUTTON bcb; @@ -33,7 +33,7 @@ void BandCtrl::checkButton(HANDLE hButton, bool bCheck) SendMessage(m_hBandWnd, BCM_CHECKBUTTON, reinterpret_cast(hButton), BOOL_(bCheck)); } -DWORD BandCtrl::getButtonData(HANDLE hButton) +uint32_t BandCtrl::getButtonData(HANDLE hButton) { return SendMessage(m_hBandWnd, BCM_GETBUTTONDATA, reinterpret_cast(hButton), 0); } diff --git a/plugins/HistoryStats/src/bandctrl.h b/plugins/HistoryStats/src/bandctrl.h index a94544b358..d95e31019f 100644 --- a/plugins/HistoryStats/src/bandctrl.h +++ b/plugins/HistoryStats/src/bandctrl.h @@ -25,10 +25,10 @@ public: public: void setLayout(int nLayout); - HANDLE addButton(DWORD dwFlags, HICON hIcon, INT_PTR dwData, const wchar_t* szTooltip = nullptr, const wchar_t* szText = nullptr); + HANDLE addButton(uint32_t dwFlags, HICON hIcon, INT_PTR dwData, const wchar_t* szTooltip = nullptr, const wchar_t* szText = nullptr); bool isButtonChecked(HANDLE hButton); void checkButton(HANDLE hButton, bool bCheck); - DWORD getButtonData(HANDLE hButton); + uint32_t getButtonData(HANDLE hButton); void setButtonData(HANDLE hButton, INT_PTR dwData); bool isButtonVisisble(HANDLE hButton); void showButton(HANDLE hButton, bool bShow); diff --git a/plugins/HistoryStats/src/bandctrldefs.h b/plugins/HistoryStats/src/bandctrldefs.h index 1be373dcfa..9c1fb32700 100644 --- a/plugins/HistoryStats/src/bandctrldefs.h +++ b/plugins/HistoryStats/src/bandctrldefs.h @@ -42,7 +42,7 @@ public: }; struct BCBUTTON { - DWORD dwFlags; + uint32_t dwFlags; HICON hIcon; const wchar_t *m_szText; const wchar_t *m_szTooltip; diff --git a/plugins/HistoryStats/src/bandctrlimpl.cpp b/plugins/HistoryStats/src/bandctrlimpl.cpp index f9f953fcc3..11faf8b4f5 100644 --- a/plugins/HistoryStats/src/bandctrlimpl.cpp +++ b/plugins/HistoryStats/src/bandctrlimpl.cpp @@ -431,12 +431,12 @@ HICON BandCtrlImpl::convertToGray(HICON hIcon) uint8_t* pLine = pBits + y * bmp.bmWidthBytes; for (int x = 0; x < bmp.bmWidth; ++x) { - DWORD color = reinterpret_cast(pLine)[x]; + uint32_t color = reinterpret_cast(pLine)[x]; uint8_t gray = (77 * GetBValue(color) + 150 * GetGValue(color) + 28 * GetRValue(color)) / 255; color = (color & 0xFF000000) | RGB(gray, gray, gray); - reinterpret_cast(pLine)[x] = color; + reinterpret_cast(pLine)[x] = color; } } diff --git a/plugins/HistoryStats/src/column.h b/plugins/HistoryStats/src/column.h index 6586beacb5..495c65b5f3 100644 --- a/plugins/HistoryStats/src/column.h +++ b/plugins/HistoryStats/src/column.h @@ -186,7 +186,7 @@ public: void contactDataPrepare(Contact& contact) const { impl_contactDataPrepare(contact); } void contactDataFree(Contact& contact) const { impl_contactDataFree(contact); } void contactDataAcquireMessage(Contact& contact, Message& msg) { impl_contactDataAcquireMessage(contact, msg); } - void contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD duration) { impl_contactDataAcquireChat(contact, bOutgoing, localTimestampStarted, duration); } + void contactDataAcquireChat(Contact& contact, bool bOutgoing, uint32_t localTimestampStarted, uint32_t duration) { impl_contactDataAcquireChat(contact, bOutgoing, localTimestampStarted, duration); } void contactDataMerge(Contact& contact, const Contact& include) const { impl_contactDataMerge(contact, include); } void contactDataTransform(Contact& contact) const { impl_contactDataTransform(contact); } void contactDataTransformCleanup(Contact& contact) const { impl_contactDataTransformCleanup(contact); } @@ -308,7 +308,7 @@ protected: * on previously defined slot. * [virtual/default: do nothing] */ - virtual void impl_contactDataAcquireChat(Contact&, bool, DWORD, DWORD) { } + virtual void impl_contactDataAcquireChat(Contact&, bool, uint32_t, uint32_t) { } /*** VIRTUAL/ABSTRACT *** DATA POSTPROCESSING ***/ diff --git a/plugins/HistoryStats/src/column_chatduration.cpp b/plugins/HistoryStats/src/column_chatduration.cpp index fba75dbfc4..3e6b0cae76 100644 --- a/plugins/HistoryStats/src/column_chatduration.cpp +++ b/plugins/HistoryStats/src/column_chatduration.cpp @@ -98,7 +98,7 @@ void ColChatDuration::impl_columnDataAfterOmit() // AFTER, i.e. contacts are trimmed to what user will see if (m_bGraph) { - static DWORD (Contact::*getChatDurX[4])() const = { + static uint32_t (Contact::*getChatDurX[4])() const = { &Contact::getChatDurMin, &Contact::getChatDurAvg, &Contact::getChatDurMax, @@ -127,7 +127,7 @@ void ColChatDuration::impl_columnDataAfterOmit() void ColChatDuration::impl_outputRenderRow(ext::ostream& tos, const Contact& contact, DisplayType display) { - static DWORD (Contact::*getChatDurX[4])() const = { + static uint32_t (Contact::*getChatDurX[4])() const = { &Contact::getChatDurMin, &Contact::getChatDurAvg, &Contact::getChatDurMax, diff --git a/plugins/HistoryStats/src/column_chatduration.h b/plugins/HistoryStats/src/column_chatduration.h index 95e8e237ce..ac6a014562 100644 --- a/plugins/HistoryStats/src/column_chatduration.h +++ b/plugins/HistoryStats/src/column_chatduration.h @@ -19,7 +19,7 @@ private: OptionsCtrl::Check m_hGraph; OptionsCtrl::Check m_hDetail; - DWORD m_nMaxForGraph; + uint32_t m_nMaxForGraph; ext::string m_CSS; diff --git a/plugins/HistoryStats/src/column_split.cpp b/plugins/HistoryStats/src/column_split.cpp index 7b6c7b8b6b..1866d0f765 100644 --- a/plugins/HistoryStats/src/column_split.cpp +++ b/plugins/HistoryStats/src/column_split.cpp @@ -192,7 +192,7 @@ void ColSplit::impl_contactDataFree(Contact& contact) const } } -void ColSplit::addToSlot(Contact& contact, DWORD localTimestamp, int toAdd) +void ColSplit::addToSlot(Contact& contact, uint32_t localTimestamp, int toAdd) { if (toAdd > 0) { @@ -217,7 +217,7 @@ void ColSplit::impl_contactDataAcquireMessage(Contact& contact, Message& msg) } } -void ColSplit::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD) +void ColSplit::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, uint32_t localTimestampStarted, uint32_t) { if (m_nSource == 2 && (!bOutgoing && m_nSourceType == 0 || bOutgoing && m_nSourceType == 1 || m_nSourceType == 2)) { diff --git a/plugins/HistoryStats/src/column_split.h b/plugins/HistoryStats/src/column_split.h index 4dbe77fe3d..88284554f4 100644 --- a/plugins/HistoryStats/src/column_split.h +++ b/plugins/HistoryStats/src/column_split.h @@ -37,13 +37,13 @@ private: OptionsCtrl::Radio m_hGraphAlign; ext::string m_CSS; - DWORD m_nTimeDiv; - DWORD m_nTimeMod; - DWORD m_nTimeOffset; + uint32_t m_nTimeDiv; + uint32_t m_nTimeMod; + uint32_t m_nTimeOffset; private: SplitParams getParams() const; - void addToSlot(Contact& contact, DWORD localTimestamp, int toAdd); + void addToSlot(Contact& contact, uint32_t localTimestamp, int toAdd); public: explicit ColSplit(); @@ -64,7 +64,7 @@ protected: virtual void impl_contactDataPrepare(Contact& contact) const; virtual void impl_contactDataFree(Contact& contact) const; virtual void impl_contactDataAcquireMessage(Contact& contact, Message& msg); - virtual void impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD duration); + virtual void impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, uint32_t localTimestampStarted, uint32_t duration); virtual void impl_contactDataMerge(Contact& contact, const Contact& include) const; virtual StyleList impl_outputGetAdditionalStyles(IDProvider& idp); virtual void impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) const; diff --git a/plugins/HistoryStats/src/column_splittimeline.cpp b/plugins/HistoryStats/src/column_splittimeline.cpp index ad1a6b5915..8737fe7879 100644 --- a/plugins/HistoryStats/src/column_splittimeline.cpp +++ b/plugins/HistoryStats/src/column_splittimeline.cpp @@ -205,7 +205,7 @@ void ColSplitTimeline::impl_contactDataFree(Contact& contact) const } } -void ColSplitTimeline::addToSlot(Contact& contact, bool bOutgoing, DWORD localTimestamp, int toAdd) +void ColSplitTimeline::addToSlot(Contact& contact, bool bOutgoing, uint32_t localTimestamp, int toAdd) { if (toAdd > 0) { @@ -229,7 +229,7 @@ void ColSplitTimeline::impl_contactDataAcquireMessage(Contact& contact, Message& } } -void ColSplitTimeline::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD) +void ColSplitTimeline::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, uint32_t localTimestampStarted, uint32_t) { if (m_nSource == 2) { @@ -311,7 +311,7 @@ void ColSplitTimeline::impl_columnDataAfterOmit() if (l.size() > 0) { - DWORD nFirstTime = con::MaxDateTime, nLastTime = con::MinDateTime; + uint32_t nFirstTime = con::MaxDateTime, nLastTime = con::MinDateTime; citer_each_(Statistic::ContactListC, c, l) { @@ -435,11 +435,11 @@ void ColSplitTimeline::outputRenderRowInOut(ext::ostream& tos, const Contact& co for (int partBlock = 0; partBlock < params.blocks_in_column; ++partBlock) { int part_top = 0; - DWORD block_time = m_nBlockOffset + curBlock + partBlock; + uint32_t block_time = m_nBlockOffset + curBlock + partBlock; for (int curCol = 0; curCol < params.columns_to_group; ++curCol) { - DWORD cur_time = block_time + curCol * params.blocks_in_column; + uint32_t cur_time = block_time + curCol * params.blocks_in_column; TimelineMap::const_iterator i = pData->find(cur_time); @@ -484,11 +484,11 @@ void ColSplitTimeline::outputRenderRowInOut(ext::ostream& tos, const Contact& co for (int partBlock = 0; partBlock < params.blocks_in_column; ++partBlock) { int part_top = 0; - DWORD block_time = m_nBlockOffset + curBlock + partBlock; + uint32_t block_time = m_nBlockOffset + curBlock + partBlock; for (int curCol = 0; curCol < params.columns_to_group; ++curCol) { - DWORD cur_time = block_time + curCol * params.blocks_in_column; + uint32_t cur_time = block_time + curCol * params.blocks_in_column; TimelineMap::const_iterator i = pData->find(cur_time); @@ -510,11 +510,11 @@ void ColSplitTimeline::outputRenderRowInOut(ext::ostream& tos, const Contact& co for (int partBlock = 0; partBlock < params.blocks_in_column; ++partBlock) { int part_top = 0; - DWORD block_time = m_nBlockOffset + curBlock + partBlock; + uint32_t block_time = m_nBlockOffset + curBlock + partBlock; for (int curCol = 0; curCol < params.columns_to_group; ++curCol) { - DWORD cur_time = block_time + curCol * params.blocks_in_column; + uint32_t cur_time = block_time + curCol * params.blocks_in_column; TimelineMap::const_iterator i = pData->find(cur_time); @@ -581,11 +581,11 @@ void ColSplitTimeline::outputRenderRowRatio(ext::ostream& tos, const Contact& co { int part_in = 0; int part_out = 0; - DWORD block_time = m_nBlockOffset + curBlock + partBlock; + uint32_t block_time = m_nBlockOffset + curBlock + partBlock; for (int curCol = 0; curCol < params.columns_to_group; ++curCol) { - DWORD cur_time = block_time + curCol * params.blocks_in_column; + uint32_t cur_time = block_time + curCol * params.blocks_in_column; TimelineMap::const_iterator i = pData->find(cur_time); diff --git a/plugins/HistoryStats/src/column_splittimeline.h b/plugins/HistoryStats/src/column_splittimeline.h index 4b28d74646..89fc04e4bb 100644 --- a/plugins/HistoryStats/src/column_splittimeline.h +++ b/plugins/HistoryStats/src/column_splittimeline.h @@ -47,8 +47,8 @@ private: OptionsCtrl::Edit m_hCustomGroup; OptionsCtrl::Check m_hTopPerColumn; - DWORD m_nTimeDiv; - DWORD m_nTimeOffset; + uint32_t m_nTimeDiv; + uint32_t m_nTimeOffset; int m_nTimelineWidth; int m_nBlockOffset; int m_nNumBlocks; @@ -67,7 +67,7 @@ private: } SplitParams getParams() const; - void addToSlot(Contact& contact, bool bOutgoing, DWORD localTimestamp, int toAdd); + void addToSlot(Contact& contact, bool bOutgoing, uint32_t localTimestamp, int toAdd); void outputRenderRowInOut(ext::ostream& tos, const Contact& contact, DisplayType display); void outputRenderRowRatio(ext::ostream& tos, const Contact& contact, DisplayType display); @@ -91,7 +91,7 @@ protected: virtual void impl_contactDataPrepare(Contact& contact) const; virtual void impl_contactDataFree(Contact& contact) const; virtual void impl_contactDataAcquireMessage(Contact& contact, Message& msg); - virtual void impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD duration); + virtual void impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, uint32_t localTimestampStarted, uint32_t duration); virtual void impl_contactDataMerge(Contact& contact, const Contact& include) const; virtual void impl_columnDataAfterOmit(); virtual void impl_outputRenderHeader(ext::ostream& tos, int row, int rowSpan) const; diff --git a/plugins/HistoryStats/src/column_timeline.cpp b/plugins/HistoryStats/src/column_timeline.cpp index 1c4b5ce657..1910701edd 100644 --- a/plugins/HistoryStats/src/column_timeline.cpp +++ b/plugins/HistoryStats/src/column_timeline.cpp @@ -117,7 +117,7 @@ void ColTimeline::impl_contactDataFree(Contact& contact) const } } -void ColTimeline::addToSlot(Contact& contact, bool bOutgoing, DWORD localTimestamp, int toAdd) +void ColTimeline::addToSlot(Contact& contact, bool bOutgoing, uint32_t localTimestamp, int toAdd) { if (toAdd > 0) { @@ -141,7 +141,7 @@ void ColTimeline::impl_contactDataAcquireMessage(Contact& contact, Message& msg) } } -void ColTimeline::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD) +void ColTimeline::impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, uint32_t localTimestampStarted, uint32_t) { if (m_nSource == 2) { diff --git a/plugins/HistoryStats/src/column_timeline.h b/plugins/HistoryStats/src/column_timeline.h index fb0b9c5b85..751b296ce1 100644 --- a/plugins/HistoryStats/src/column_timeline.h +++ b/plugins/HistoryStats/src/column_timeline.h @@ -43,7 +43,7 @@ private: return 0; } - void addToSlot(Contact& contact, bool bOutgoing, DWORD localTimestamp, int toAdd); + void addToSlot(Contact& contact, bool bOutgoing, uint32_t localTimestamp, int toAdd); void outputRenderRowInOut(ext::ostream& tos, const Contact& contact, DisplayType display); void outputRenderRowRatio(ext::ostream& tos, const Contact& contact, DisplayType display); @@ -66,7 +66,7 @@ protected: virtual void impl_contactDataPrepare(Contact& contact) const; virtual void impl_contactDataFree(Contact& contact) const; virtual void impl_contactDataAcquireMessage(Contact& contact, Message& msg); - virtual void impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD duration); + virtual void impl_contactDataAcquireChat(Contact& contact, bool bOutgoing, uint32_t localTimestampStarted, uint32_t duration); virtual void impl_contactDataMerge(Contact& contact, const Contact& include) const; virtual void impl_columnDataAfterOmit(); virtual StyleList impl_outputGetAdditionalStyles(IDProvider& idp); diff --git a/plugins/HistoryStats/src/contact.cpp b/plugins/HistoryStats/src/contact.cpp index 35d4f4dfd6..cd96f3c224 100644 --- a/plugins/HistoryStats/src/contact.cpp +++ b/plugins/HistoryStats/src/contact.cpp @@ -27,7 +27,7 @@ Contact::Contact(Statistic* pStatistic, int nSlots, const ext::string& nick, con m_Slots.resize(nSlots, NULL); } -void Contact::updateTime(DWORD msgTime) +void Contact::updateTime(uint32_t msgTime) { if (!m_bFirstLastTimeValid) { m_FirstTime = msgTime; @@ -40,7 +40,7 @@ void Contact::updateTime(DWORD msgTime) } } -void Contact::updateChatDur(DWORD timeDelta) +void Contact::updateChatDur(uint32_t timeDelta) { m_bChatDurValid = true; @@ -52,7 +52,7 @@ void Contact::updateChatDur(DWORD timeDelta) double Contact::getAvg(int nTotal) const { - DWORD dwHistTime = m_pStatistic->getLastTime() - getFirstTime(); + uint32_t dwHistTime = m_pStatistic->getLastTime() - getFirstTime(); if (dwHistTime < m_pStatistic->getAverageMinTime()) dwHistTime = m_pStatistic->getAverageMinTime(); @@ -73,7 +73,7 @@ void Contact::addMessage(Message& msg) updateTime(msg.getTimestamp()); } -void Contact::addChat(bool bOutgoing, DWORD, DWORD duration) +void Contact::addChat(bool bOutgoing, uint32_t, uint32_t duration) { if (bOutgoing) m_Chats.out++; diff --git a/plugins/HistoryStats/src/contact.h b/plugins/HistoryStats/src/contact.h index 592b739969..4da79c71a7 100644 --- a/plugins/HistoryStats/src/contact.h +++ b/plugins/HistoryStats/src/contact.h @@ -29,12 +29,12 @@ private: InOut m_Messages; InOut m_Chats; bool m_bChatDurValid; - DWORD m_ChatDurMin; - DWORD m_ChatDurMax; - DWORD m_ChatDurSum; + uint32_t m_ChatDurMin; + uint32_t m_ChatDurMax; + uint32_t m_ChatDurSum; bool m_bFirstLastTimeValid; - DWORD m_FirstTime; - DWORD m_LastTime; + uint32_t m_FirstTime; + uint32_t m_LastTime; InOut m_Files; int m_NumContacts; int m_NumSubcontacts; @@ -43,8 +43,8 @@ private: Statistic* m_pStatistic; private: - void updateTime(DWORD msgTime); - void updateChatDur(DWORD timeDelta); + void updateTime(uint32_t msgTime); + void updateChatDur(uint32_t timeDelta); double getAvg(int nTotal) const; public: @@ -79,18 +79,18 @@ public: // chat duration bool isChatDurValid() const { return m_bChatDurValid; } - DWORD getChatDurMin() const { return m_ChatDurMin; } - DWORD getChatDurAvg() const { return getTotalChats() ? m_ChatDurSum / getTotalChats() : 0; } - DWORD getChatDurMax() const { return m_ChatDurMax; } + uint32_t getChatDurMin() const { return m_ChatDurMin; } + uint32_t getChatDurAvg() const { return getTotalChats() ? m_ChatDurSum / getTotalChats() : 0; } + uint32_t getChatDurMax() const { return m_ChatDurMax; } int getChatDurMinForSort() const { return m_bChatDurValid ? getChatDurMin() : -1; } int getChatDurAvgForSort() const { return m_bChatDurValid ? getChatDurAvg() : -1; } int getChatDurMaxForSort() const { return m_bChatDurValid ? getChatDurMax() : -1; } - DWORD getChatDurSum() const { return m_ChatDurSum; } + uint32_t getChatDurSum() const { return m_ChatDurSum; } // first/last time bool isFirstLastTimeValid() const { return m_bFirstLastTimeValid; } - DWORD getFirstTime() const { return m_FirstTime; } - DWORD getLastTime() const { return m_LastTime; } + uint32_t getFirstTime() const { return m_FirstTime; } + uint32_t getLastTime() const { return m_LastTime; } // files and URLs int getOutFiles() const { return m_Files.out; } @@ -105,7 +105,7 @@ public: void beginMessages() { } void endMessages() { } void addMessage(Message& msg); - void addChat(bool bOutgoing, DWORD localTimestampStarted, DWORD duration); + void addChat(bool bOutgoing, uint32_t localTimestampStarted, uint32_t duration); void addEvent(uint16_t eventType, bool bOutgoing); void merge(const Contact& other); diff --git a/plugins/HistoryStats/src/dlgfilterwords.cpp b/plugins/HistoryStats/src/dlgfilterwords.cpp index 0b3ca5fdde..b48650fa79 100644 --- a/plugins/HistoryStats/src/dlgfilterwords.cpp +++ b/plugins/HistoryStats/src/dlgfilterwords.cpp @@ -88,7 +88,7 @@ void DlgFilterWords::onWMInitDialog() array_each_(i, columnBand) { HICON hIcon = reinterpret_cast(LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(columnBand[i].iconId), IMAGE_ICON, OS::smIconCX(), OS::smIconCY(), 0)); - DWORD dwFlags = (columnBand[i].bDisabled ? BandCtrl::BCF_DISABLED : 0); + uint32_t dwFlags = (columnBand[i].bDisabled ? BandCtrl::BCF_DISABLED : 0); m_hActionButtons[i] = m_Band.addButton(dwFlags, hIcon, i, TranslateW(columnBand[i].szTooltip)); diff --git a/plugins/HistoryStats/src/dlgoption.cpp b/plugins/HistoryStats/src/dlgoption.cpp index 2d16102d54..6768166f4f 100644 --- a/plugins/HistoryStats/src/dlgoption.cpp +++ b/plugins/HistoryStats/src/dlgoption.cpp @@ -110,7 +110,7 @@ void DlgOption::onWMInitDialog() array_each_(i, pageBand) { HICON hIcon = reinterpret_cast(LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(pageBand[i].iconId), IMAGE_ICON, 32, 32, 0)); - DWORD dwFlags = 0; + uint32_t dwFlags = 0; dwFlags |= pageBand[i].bRight ? BandCtrl::BCF_RIGHT : 0; dwFlags |= (i == m_nCurPage) ? BandCtrl::BCF_CHECKED : 0; diff --git a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp index 0e0e1cfe1c..f18094597e 100644 --- a/plugins/HistoryStats/src/dlgoption_subcolumns.cpp +++ b/plugins/HistoryStats/src/dlgoption_subcolumns.cpp @@ -178,7 +178,7 @@ void DlgOption::SubColumns::onWMInitDialog() array_each_(i, columnBand) { HICON hIcon = reinterpret_cast(LoadImage(g_plugin.getInst(), MAKEINTRESOURCE(columnBand[i].iconId), IMAGE_ICON, OS::smIconCX(), OS::smIconCY(), 0)); - DWORD dwFlags = + uint32_t dwFlags = (columnBand[i].bRight ? BandCtrl::BCF_RIGHT : 0) | (columnBand[i].bDropDown ? BandCtrl::BCF_DROPDOWN : 0) | (columnBand[i].bDisabled ? BandCtrl::BCF_DISABLED : 0); diff --git a/plugins/HistoryStats/src/dlgoption_subexclude.cpp b/plugins/HistoryStats/src/dlgoption_subexclude.cpp index 6319c414e2..c0c1b9d7e7 100644 --- a/plugins/HistoryStats/src/dlgoption_subexclude.cpp +++ b/plugins/HistoryStats/src/dlgoption_subexclude.cpp @@ -64,7 +64,7 @@ BOOL DlgOption::SubExclude::handleMsg(UINT msg, WPARAM, LPARAM lParam) if (pNM->iColumn == -1) break; - DWORD dwHitFlags = 0; + uint32_t dwHitFlags = 0; HANDLE hItem = reinterpret_cast(SendMessage(hCList, CLM_HITTEST, reinterpret_cast(&dwHitFlags), MAKELPARAM(pNM->pt.x, pNM->pt.y))); if (!hItem || !(dwHitFlags & CLCHT_ONITEMEXTRA)) break; diff --git a/plugins/HistoryStats/src/dlgoption_subglobal.cpp b/plugins/HistoryStats/src/dlgoption_subglobal.cpp index ec47eccc58..6841378dd1 100644 --- a/plugins/HistoryStats/src/dlgoption_subglobal.cpp +++ b/plugins/HistoryStats/src/dlgoption_subglobal.cpp @@ -170,7 +170,7 @@ BOOL DlgOption::SubGlobal::handleMsg(UINT msg, WPARAM wParam, LPARAM lParam) NMTREEVIEW* pNM = reinterpret_cast(lParam); if (p->code == NM_DBLCLK) { - DWORD dwPoint = GetMessagePos(); + uint32_t dwPoint = GetMessagePos(); POINTS pts = MAKEPOINTS(dwPoint); TVHITTESTINFO tvhti = { { pts.x, pts.y } }; diff --git a/plugins/HistoryStats/src/main.cpp b/plugins/HistoryStats/src/main.cpp index d871dff4c9..d53556d5aa 100644 --- a/plugins/HistoryStats/src/main.cpp +++ b/plugins/HistoryStats/src/main.cpp @@ -214,7 +214,7 @@ static INT_PTR MenuHistoryPaste(WPARAM wParam, LPARAM lParam) mu::db::setSafetyMode(false); // copy history - DWORD dwCountSuccess = 0, dwCountFailRead = 0, dwCountFailAdd = 0; + uint32_t dwCountSuccess = 0, dwCountFailRead = 0, dwCountFailAdd = 0; DBEVENTINFO dbe; int blobBuffer = 4096; HANDLE hEvent = mu::db_event::findFirst(g_hHistoryCopyContact); diff --git a/plugins/HistoryStats/src/message.h b/plugins/HistoryStats/src/message.h index 39e8af549e..e074a5fe97 100644 --- a/plugins/HistoryStats/src/message.h +++ b/plugins/HistoryStats/src/message.h @@ -26,7 +26,7 @@ private: private: bool m_bOutgoing; - DWORD m_Timestamp; + uint32_t m_Timestamp; size_t m_nLength; const void* m_RawSource; int m_Available; @@ -50,7 +50,7 @@ public: } // assigning data - void assignInfo(bool bOutgoing, DWORD localTimestamp) + void assignInfo(bool bOutgoing, uint32_t localTimestamp) { m_bOutgoing = bOutgoing; m_Timestamp = localTimestamp; @@ -85,7 +85,7 @@ public: return m_bOutgoing; } - DWORD getTimestamp() + uint32_t getTimestamp() { return m_Timestamp; } diff --git a/plugins/HistoryStats/src/mirandacontact.cpp b/plugins/HistoryStats/src/mirandacontact.cpp index 81f86461ed..5e070fe315 100644 --- a/plugins/HistoryStats/src/mirandacontact.cpp +++ b/plugins/HistoryStats/src/mirandacontact.cpp @@ -165,7 +165,7 @@ void MirandaContactTolerantMerge::fillQueue() while (!m_CIs.empty() && (m_EIs.size() < 2 || (m_EIs.back().dbe.timestamp - m_EIs.front().dbe.timestamp) <= timestampTol)) { // find oldest next event in chains int nNext = 0; - DWORD timestampFirst = m_CIs.front().ei.dbe.timestamp; + uint32_t timestampFirst = m_CIs.front().ei.dbe.timestamp; for (int i = 1; i < m_CIs.size(); ++i) { if (m_CIs[i].ei.dbe.timestamp < timestampFirst) { @@ -230,7 +230,7 @@ void MirandaContactStrictMerge::fillQueue() while (!m_CIs.empty() && (m_EIs.size() < 2 || (m_EIs.back().dbe.timestamp - m_EIs.front().dbe.timestamp) <= timestampTol)) { // find oldest next event in chains int nNext = 0; - DWORD timestampFirst = m_CIs.front().ei.dbe.timestamp; + uint32_t timestampFirst = m_CIs.front().ei.dbe.timestamp; for (int i = 1; i < m_CIs.size(); ++i) { if (m_CIs[i].ei.dbe.timestamp < timestampFirst) { @@ -291,7 +291,7 @@ void MirandaContactNoMerge::fillQueue() while (!m_CIs.empty() && m_EIs.size() < 1) { // find oldest next event in chains int nNext = 0; - DWORD timestampFirst = m_CIs.front().ei.dbe.timestamp; + uint32_t timestampFirst = m_CIs.front().ei.dbe.timestamp; for (int i = 1; i < m_CIs.size(); ++i) { if (m_CIs[i].ei.dbe.timestamp < timestampFirst) { diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 10c5eadb61..a3669107e3 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -15,7 +15,7 @@ namespace mu namespace clist { - HGENMENU addMainMenuItem(const wchar_t* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, HGENMENU hRoot) + HGENMENU addMainMenuItem(const wchar_t* pszName, uint32_t flags, int position, HICON hIcon, const char* pszService, HGENMENU hRoot) { // TODO: support for unicode-core with unicode-aware CList CMenuItem mi(&g_plugin); @@ -29,7 +29,7 @@ namespace mu return Menu_AddMainMenuItem(&mi); } - HGENMENU addContactMenuItem(const wchar_t* pszName, DWORD flags, int position, HICON hIcon, const char* pszService) + HGENMENU addContactMenuItem(const wchar_t* pszName, uint32_t flags, int position, HICON hIcon, const char* pszService) { // TODO: support for unicode-core with unicode-aware CList CMenuItem mi(&g_plugin); @@ -78,9 +78,9 @@ namespace mu namespace protosvc { - DWORD getCaps(const char* szProto, int flagNum) + uint32_t getCaps(const char* szProto, int flagNum) { - return (DWORD)CallProtoService(szProto, PS_GETCAPS, static_cast(flagNum), 0); + return (uint32_t)CallProtoService(szProto, PS_GETCAPS, static_cast(flagNum), 0); } HICON loadIcon(const char* szProto, int whichIcon) @@ -105,13 +105,13 @@ namespace mu void unload() {} - DWORD getMinimalMirandaVersion() + uint32_t getMinimalMirandaVersion() { // MEMO: version dependency check return PLUGIN_MAKE_VERSION(0, 6, 7, 0); } - bool isMirandaVersionOk(DWORD version) + bool isMirandaVersionOk(uint32_t version) { return (version >= getMinimalMirandaVersion()); } diff --git a/plugins/HistoryStats/src/mu_common.h b/plugins/HistoryStats/src/mu_common.h index 635b398a86..74169d4e92 100644 --- a/plugins/HistoryStats/src/mu_common.h +++ b/plugins/HistoryStats/src/mu_common.h @@ -13,8 +13,8 @@ namespace mu namespace clist { - HGENMENU addMainMenuItem(const wchar_t* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, HGENMENU hRoot = nullptr); - HGENMENU addContactMenuItem(const wchar_t* pszName, DWORD flags, int position, HICON hIcon, const char* pszService); + HGENMENU addMainMenuItem(const wchar_t* pszName, uint32_t flags, int position, HICON hIcon, const char* pszService, HGENMENU hRoot = nullptr); + HGENMENU addContactMenuItem(const wchar_t* pszName, uint32_t flags, int position, HICON hIcon, const char* pszService); } /* @@ -34,7 +34,7 @@ namespace mu namespace protosvc { - DWORD getCaps(const char* szProto, int flagNum); + uint32_t getCaps(const char* szProto, int flagNum); //int getName(const char* szProto, int cchName, char* szName); HICON loadIcon(const char* szProto, int whichIcon); } @@ -64,8 +64,8 @@ namespace mu bool load(); void unload(); - DWORD getMinimalMirandaVersion(); - bool isMirandaVersionOk(DWORD version); + uint32_t getMinimalMirandaVersion(); + bool isMirandaVersionOk(uint32_t version); bool isMirandaUnicode(); /* diff --git a/plugins/HistoryStats/src/optionsctrl.cpp b/plugins/HistoryStats/src/optionsctrl.cpp index c2b6e2738f..07f89d9d53 100644 --- a/plugins/HistoryStats/src/optionsctrl.cpp +++ b/plugins/HistoryStats/src/optionsctrl.cpp @@ -7,7 +7,7 @@ * OptionsCtrl */ -HANDLE OptionsCtrl::insertGroup(HANDLE hParent, const wchar_t* szLabel, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) +HANDLE OptionsCtrl::insertGroup(HANDLE hParent, const wchar_t* szLabel, uint32_t dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCGROUP ocg; ocg.dwFlags = dwFlags; @@ -17,7 +17,7 @@ HANDLE OptionsCtrl::insertGroup(HANDLE hParent, const wchar_t* szLabel, DWORD dw return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTGROUP, reinterpret_cast(hParent), reinterpret_cast(&ocg))); } -HANDLE OptionsCtrl::insertCheck(HANDLE hParent, const wchar_t* szLabel, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) +HANDLE OptionsCtrl::insertCheck(HANDLE hParent, const wchar_t* szLabel, uint32_t dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCCHECK occ; occ.dwFlags = dwFlags; @@ -27,7 +27,7 @@ HANDLE OptionsCtrl::insertCheck(HANDLE hParent, const wchar_t* szLabel, DWORD dw return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTCHECK, reinterpret_cast(hParent), reinterpret_cast(&occ))); } -HANDLE OptionsCtrl::insertRadio(HANDLE hParent, HANDLE hSibling, const wchar_t* szLabel, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) +HANDLE OptionsCtrl::insertRadio(HANDLE hParent, HANDLE hSibling, const wchar_t* szLabel, uint32_t dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCRADIO ocr; ocr.dwFlags = dwFlags; @@ -38,7 +38,7 @@ HANDLE OptionsCtrl::insertRadio(HANDLE hParent, HANDLE hSibling, const wchar_t* return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTRADIO, reinterpret_cast(hParent), reinterpret_cast(&ocr))); } -HANDLE OptionsCtrl::insertEdit(HANDLE hParent, const wchar_t* szLabel, const wchar_t* szEdit /* = L"" */, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) +HANDLE OptionsCtrl::insertEdit(HANDLE hParent, const wchar_t* szLabel, const wchar_t* szEdit /* = L"" */, uint32_t dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCEDIT oce; oce.dwFlags = dwFlags; @@ -49,7 +49,7 @@ HANDLE OptionsCtrl::insertEdit(HANDLE hParent, const wchar_t* szLabel, const wch return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTEDIT, reinterpret_cast(hParent), reinterpret_cast(&oce))); } -HANDLE OptionsCtrl::insertCombo(HANDLE hParent, const wchar_t* szLabel, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) +HANDLE OptionsCtrl::insertCombo(HANDLE hParent, const wchar_t* szLabel, uint32_t dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCCOMBO occ; occ.dwFlags = dwFlags; @@ -59,7 +59,7 @@ HANDLE OptionsCtrl::insertCombo(HANDLE hParent, const wchar_t* szLabel, DWORD dw return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTCOMBO, reinterpret_cast(hParent), reinterpret_cast(&occ))); } -HANDLE OptionsCtrl::insertButton(HANDLE hParent, const wchar_t* szLabel, const wchar_t* szButton, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) +HANDLE OptionsCtrl::insertButton(HANDLE hParent, const wchar_t* szLabel, const wchar_t* szButton, uint32_t dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCBUTTON ocb; ocb.dwFlags = dwFlags; @@ -70,7 +70,7 @@ HANDLE OptionsCtrl::insertButton(HANDLE hParent, const wchar_t* szLabel, const w return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTBUTTON, reinterpret_cast(hParent), reinterpret_cast(&ocb))); } -HANDLE OptionsCtrl::insertDateTime(HANDLE hParent, const wchar_t* szLabel, DWORD dwDateTime, const wchar_t* szFormat /* = L"%Y-%m-%d" */, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) +HANDLE OptionsCtrl::insertDateTime(HANDLE hParent, const wchar_t* szLabel, uint32_t dwDateTime, const wchar_t* szFormat /* = L"%Y-%m-%d" */, uint32_t dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCDATETIME ocdt; ocdt.dwFlags = dwFlags; @@ -82,7 +82,7 @@ HANDLE OptionsCtrl::insertDateTime(HANDLE hParent, const wchar_t* szLabel, DWORD return reinterpret_cast(SendMessage(m_hOptWnd, OCM_INSERTDATETIME, reinterpret_cast(hParent), reinterpret_cast(&ocdt))); } -HANDLE OptionsCtrl::insertColor(HANDLE hParent, const wchar_t* szLabel, COLORREF crColor /* = 0 */, DWORD dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) +HANDLE OptionsCtrl::insertColor(HANDLE hParent, const wchar_t* szLabel, COLORREF crColor /* = 0 */, uint32_t dwFlags /* = 0 */, INT_PTR dwData /* = 0 */) { OCCOLOR occ; occ.dwFlags = dwFlags; @@ -113,7 +113,7 @@ void OptionsCtrl::enableItem(HANDLE hItem, bool bEnable) SendMessage(m_hOptWnd, OCM_ENABLEITEM, reinterpret_cast(hItem), BOOL_(bEnable)); } -DWORD OptionsCtrl::getItemData(HANDLE hItem) +uint32_t OptionsCtrl::getItemData(HANDLE hItem) { return SendMessage(m_hOptWnd, OCM_GETITEMDATA, reinterpret_cast(hItem), 0); } @@ -248,10 +248,10 @@ void OptionsCtrl::setDateTimeNone(HANDLE hDateTime) SendMessage(m_hOptWnd, OCM_SETDATETIMENONE, reinterpret_cast(hDateTime), 0); } -DWORD OptionsCtrl::getDateTime(HANDLE hDateTime, bool* pbNone /* = NULL */) +uint32_t OptionsCtrl::getDateTime(HANDLE hDateTime, bool* pbNone /* = NULL */) { BOOL bMyNone = FALSE; - DWORD dwResult = SendMessage(m_hOptWnd, OCM_GETDATETIME, reinterpret_cast(hDateTime), reinterpret_cast(&bMyNone)); + uint32_t dwResult = SendMessage(m_hOptWnd, OCM_GETDATETIME, reinterpret_cast(hDateTime), reinterpret_cast(&bMyNone)); if (pbNone) *pbNone = bool_(bMyNone); @@ -259,7 +259,7 @@ DWORD OptionsCtrl::getDateTime(HANDLE hDateTime, bool* pbNone /* = NULL */) return dwResult; } -void OptionsCtrl::setDateTime(HANDLE hDateTime, DWORD dwDateTime) +void OptionsCtrl::setDateTime(HANDLE hDateTime, uint32_t dwDateTime) { SendMessage(m_hOptWnd, OCM_SETDATETIME, reinterpret_cast(hDateTime), dwDateTime); } @@ -268,7 +268,7 @@ void OptionsCtrl::setDateTime(HANDLE hDateTime, DWORD dwDateTime) ext::string OptionsCtrl::getDateTimeStr(HANDLE hDateTime) { bool bNone = false; - DWORD dwTimestamp = getDateTime(hDateTime, &bNone); + uint32_t dwTimestamp = getDateTime(hDateTime, &bNone); return bNone ? L"" : utils::formatDate(dwTimestamp); } diff --git a/plugins/HistoryStats/src/optionsctrl.h b/plugins/HistoryStats/src/optionsctrl.h index 13889ed564..4128e6f899 100644 --- a/plugins/HistoryStats/src/optionsctrl.h +++ b/plugins/HistoryStats/src/optionsctrl.h @@ -39,19 +39,19 @@ public: operator HWND() { return m_hOptWnd; } public: - HANDLE insertGroup(HANDLE hParent, const wchar_t* szLabel, DWORD dwFlags = 0, INT_PTR dwData = 0); - HANDLE insertCheck(HANDLE hParent, const wchar_t* szLabel, DWORD dwFlags = 0, INT_PTR dwData = 0); - HANDLE insertRadio(HANDLE hParent, HANDLE hSibling, const wchar_t* szLabel, DWORD dwFlags = 0, INT_PTR dwData = 0); - HANDLE insertEdit(HANDLE hParent, const wchar_t* szLabel, const wchar_t* szEdit = L"", DWORD dwFlags = 0, INT_PTR dwData = 0); - HANDLE insertCombo(HANDLE hParent, const wchar_t* szLabel, DWORD dwFlags = 0, INT_PTR dwData = 0); - HANDLE insertButton(HANDLE hParent, const wchar_t* szLabel, const wchar_t* szButton, DWORD dwFlags = 0, INT_PTR dwData = 0); - HANDLE insertDateTime(HANDLE hParent, const wchar_t* szLabel, DWORD dwDateTime, const wchar_t* szFormat = L"%Y-%m-%d", DWORD dwFlags = 0, INT_PTR dwData = 0); - HANDLE insertColor(HANDLE hParent, const wchar_t* szLabel, COLORREF crColor = 0, DWORD dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertGroup(HANDLE hParent, const wchar_t* szLabel, uint32_t dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertCheck(HANDLE hParent, const wchar_t* szLabel, uint32_t dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertRadio(HANDLE hParent, HANDLE hSibling, const wchar_t* szLabel, uint32_t dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertEdit(HANDLE hParent, const wchar_t* szLabel, const wchar_t* szEdit = L"", uint32_t dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertCombo(HANDLE hParent, const wchar_t* szLabel, uint32_t dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertButton(HANDLE hParent, const wchar_t* szLabel, const wchar_t* szButton, uint32_t dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertDateTime(HANDLE hParent, const wchar_t* szLabel, uint32_t dwDateTime, const wchar_t* szFormat = L"%Y-%m-%d", uint32_t dwFlags = 0, INT_PTR dwData = 0); + HANDLE insertColor(HANDLE hParent, const wchar_t* szLabel, COLORREF crColor = 0, uint32_t dwFlags = 0, INT_PTR dwData = 0); const wchar_t* getItemLabel(HANDLE hItem); void setItemLabel(HANDLE hItem, const wchar_t* szLabel); bool isItemEnabled(HANDLE hItem); void enableItem(HANDLE hItem, bool bEnable); - DWORD getItemData(HANDLE hItem); + uint32_t getItemData(HANDLE hItem); void setItemData(HANDLE hItem, INT_PTR dwData); bool isItemChecked(HANDLE hItem); void checkItem(HANDLE hItem, bool bCheck); @@ -78,8 +78,8 @@ public: void setScrollPos(int nBar, int nPos); bool isDateTimeNone(HANDLE hDateTime); void setDateTimeNone(HANDLE hDateTime); - DWORD getDateTime(HANDLE hDateTime, bool* pbNone = nullptr); - void setDateTime(HANDLE hDateTime, DWORD dwDateTime); + uint32_t getDateTime(HANDLE hDateTime, bool* pbNone = nullptr); + void setDateTime(HANDLE hDateTime, uint32_t dwDateTime); ext::string getDateTimeStr(HANDLE hDateTime); void setDateTimeStr(HANDLE hDateTime, const ext::string& strDateTime); COLORREF getColor(HANDLE hColor); diff --git a/plugins/HistoryStats/src/optionsctrldefs.h b/plugins/HistoryStats/src/optionsctrldefs.h index 7b24009cdf..90218bfb7a 100644 --- a/plugins/HistoryStats/src/optionsctrldefs.h +++ b/plugins/HistoryStats/src/optionsctrldefs.h @@ -38,7 +38,7 @@ public: OCM_DELETEALLITEMS = WM_USER + 24, // (#, #) -> # OCM_GETSELECTION = WM_USER + 25, // (#, #) -> HANDLE hItem OCM_SELECTITEM = WM_USER + 26, // (HANDLE hItem, #) -> # - OCM_GETITEM = WM_USER + 27, // (HANDLE hItem, DWORD dwFlag = OCGI_*) -> HANDLE hItem + OCM_GETITEM = WM_USER + 27, // (HANDLE hItem, uint32_t dwFlag = OCGI_*) -> HANDLE hItem OCM_DELETEITEM = WM_USER + 28, // (HANDLE hItem, #) -> # OCM_MOVEITEM = WM_USER + 29, // (HANDLE* phItem, HANDLE hInsertAfter) -> # OCM_GETSCROLLPOS = WM_USER + 30, // (int nBar, #) -> int nPos @@ -46,8 +46,8 @@ public: OCM_INSERTDATETIME = WM_USER + 32, // (HANDLE hParent, OCDATETIME* pDateTime) -> HANDLE hDateTime [DateTime] OCM_ISDATETIMENONE = WM_USER + 33, // (HANDLE hDateTime, #) -> BOOL bNone [DateTime] OCM_SETDATETIMENONE = WM_USER + 34, // (HANDLE hDateTime, #) -> # [DateTime] - OCM_GETDATETIME = WM_USER + 35, // (HANDLE hDateTime, BOOL* pbNone) -> DWORD dwDateTime [DateTime] - OCM_SETDATETIME = WM_USER + 36, // (HANDLE hDateTime, DWORD dwDateTime) -> # [DateTime] + OCM_GETDATETIME = WM_USER + 35, // (HANDLE hDateTime, BOOL* pbNone) -> uint32_t dwDateTime [DateTime] + OCM_SETDATETIME = WM_USER + 36, // (HANDLE hDateTime, uint32_t dwDateTime) -> # [DateTime] OCM_INSERTCOLOR = WM_USER + 37, // (HANDLE hParent, OCCOLOR* pColor) -> HANDLE hColor [Color] OCM_GETITEMCOLOR = WM_USER + 38, // (HANDLE hColor, #) -> COLORREF crColor [Color] OCM_SETITEMCOLOR = WM_USER + 39, // (HANDLE hColor, COLORREF crColor) -> # [Color] @@ -88,54 +88,54 @@ public: }; struct OCGROUP { - DWORD dwFlags; + uint32_t dwFlags; wchar_t* szLabel; INT_PTR dwData; }; struct OCCHECK { - DWORD dwFlags; + uint32_t dwFlags; wchar_t* szLabel; INT_PTR dwData; }; struct OCRADIO { - DWORD dwFlags; + uint32_t dwFlags; wchar_t* szLabel; INT_PTR dwData; HANDLE hSibling; }; struct OCEDIT { - DWORD dwFlags; + uint32_t dwFlags; wchar_t* szLabel; INT_PTR dwData; wchar_t* szEdit; }; struct OCCOMBO { - DWORD dwFlags; + uint32_t dwFlags; wchar_t* szLabel; INT_PTR dwData; }; struct OCBUTTON { - DWORD dwFlags; + uint32_t dwFlags; wchar_t* szLabel; INT_PTR dwData; wchar_t* szButton; }; struct OCDATETIME { - DWORD dwFlags; + uint32_t dwFlags; wchar_t* szLabel; INT_PTR dwData; wchar_t* szFormat; - DWORD dwDateTime; + uint32_t dwDateTime; }; struct OCCOLOR { - DWORD dwFlags; + uint32_t dwFlags; wchar_t* szLabel; INT_PTR dwData; COLORREF crColor; @@ -152,7 +152,7 @@ public: HANDLE hItem; INT_PTR dwData; HANDLE hDropTarget; - DWORD dwDropTargetData; + uint32_t dwDropTargetData; BOOL bAbove; }; }; diff --git a/plugins/HistoryStats/src/optionsctrlimpl.cpp b/plugins/HistoryStats/src/optionsctrlimpl.cpp index b9a7927f95..a4c12ad133 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl.cpp @@ -426,7 +426,7 @@ OptionsCtrlImpl::~OptionsCtrlImpl() LRESULT OptionsCtrlImpl::onWMCreate(CREATESTRUCT* pCS) { - DWORD dwStyle = 0; + uint32_t dwStyle = 0; if (!(pCS->style & OCS_ALLOWDRAGDROP)) dwStyle |= TVS_DISABLEDRAGDROP; @@ -477,7 +477,7 @@ void OptionsCtrlImpl::onWMDestroy() void OptionsCtrlImpl::onNMClick() { - DWORD dwPoint = GetMessagePos(); + uint32_t dwPoint = GetMessagePos(); POINTS pts = MAKEPOINTS(dwPoint); TVHITTESTINFO hti = { { pts.x, pts.y } }; @@ -861,7 +861,7 @@ void OptionsCtrlImpl::onOCMEnableItem(HTREEITEM hItem, bool bEnable) getItem(hItem)->setEnabled(bEnable); } -DWORD OptionsCtrlImpl::onOCMGetItemData(HTREEITEM hItem) +uint32_t OptionsCtrlImpl::onOCMGetItemData(HTREEITEM hItem) { return getItem(hItem)->m_dwData; } @@ -1002,7 +1002,7 @@ void OptionsCtrlImpl::onOCMSelectItem(HTREEITEM hItem) TreeView_SelectItem(m_hTree, hItem); } -HTREEITEM OptionsCtrlImpl::onOCMGetItem(HTREEITEM hItem, DWORD dwFlag) +HTREEITEM OptionsCtrlImpl::onOCMGetItem(HTREEITEM hItem, uint32_t dwFlag) { switch (dwFlag) { case OCGI_FIRST: @@ -1072,7 +1072,7 @@ void OptionsCtrlImpl::onOCMSetDateTimeNone(HTREEITEM hDateTime) reinterpret_cast(pDateTime)->setNone(); } -DWORD OptionsCtrlImpl::onOCMGetDateTime(HTREEITEM hDateTime, BOOL* pbNone) +uint32_t OptionsCtrlImpl::onOCMGetDateTime(HTREEITEM hDateTime, BOOL* pbNone) { Item* pDateTime = getItem(hDateTime); @@ -1084,7 +1084,7 @@ DWORD OptionsCtrlImpl::onOCMGetDateTime(HTREEITEM hDateTime, BOOL* pbNone) return reinterpret_cast(pDateTime)->getTimestamp(); } -void OptionsCtrlImpl::onOCMSetDateTime(HTREEITEM hDateTime, DWORD dwTimestamp) +void OptionsCtrlImpl::onOCMSetDateTime(HTREEITEM hDateTime, uint32_t dwTimestamp) { Item* pDateTime = getItem(hDateTime); @@ -1111,7 +1111,7 @@ void OptionsCtrlImpl::onOCMSetItemColor(HTREEITEM hColor, COLORREF crColor) reinterpret_cast(pColor)->setColor(crColor); } -void OptionsCtrlImpl::insertItem(Item* pParent, Item* pItem, const wchar_t* szNodeText, DWORD dwFlags, int iImage) +void OptionsCtrlImpl::insertItem(Item* pParent, Item* pItem, const wchar_t* szNodeText, uint32_t dwFlags, int iImage) { assert(!pParent || pParent->m_hItem); assert(pItem); diff --git a/plugins/HistoryStats/src/optionsctrlimpl.h b/plugins/HistoryStats/src/optionsctrlimpl.h index 97d27a92a2..9ec79b6941 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl.h +++ b/plugins/HistoryStats/src/optionsctrlimpl.h @@ -76,7 +76,7 @@ private: INT_PTR m_dwData; protected: - explicit Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const wchar_t* szLabel, DWORD dwFlags, INT_PTR dwData); + explicit Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const wchar_t* szLabel, uint32_t dwFlags, INT_PTR dwData); void enableChilds(bool bEnable); @@ -102,7 +102,7 @@ private: bool m_bDrawLine; public: - explicit Group(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, DWORD dwFlags, INT_PTR dwData); + explicit Group(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, uint32_t 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 wchar_t* szLabel, DWORD dwFlags, INT_PTR dwData); + explicit Check(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, uint32_t dwFlags, INT_PTR dwData); virtual void onToggle(); @@ -171,7 +171,7 @@ private: void updateItem(); public: - explicit Radio(OptionsCtrlImpl* pCtrl, Item* pParent, Radio* pSibling, const wchar_t* szLabel, DWORD dwFlags, INT_PTR dwData); + explicit Radio(OptionsCtrlImpl* pCtrl, Item* pParent, Radio* pSibling, const wchar_t* szLabel, uint32_t 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 wchar_t* szLabel, const wchar_t* szEdit, DWORD dwFlags, INT_PTR dwData); + explicit Edit(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, const wchar_t* szEdit, uint32_t 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 wchar_t* szLabel, DWORD dwFlags, INT_PTR dwData); + explicit Combo(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, uint32_t 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 wchar_t* szLabel, const wchar_t* szButton, DWORD dwFlags, INT_PTR dwData); + explicit Button(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, const wchar_t* szButton, uint32_t 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 wchar_t* szLabel, const wchar_t* szFormat, time_t timestamp, DWORD dwFlags, INT_PTR dwData); + explicit DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, const wchar_t* szFormat, time_t timestamp, uint32_t 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 wchar_t* szLabel, COLORREF crColor, DWORD dwFlags, INT_PTR dwData); + explicit Color(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, COLORREF crColor, uint32_t dwFlags, INT_PTR dwData); virtual void onToggle() { onActivate(); } virtual void onSelect(); @@ -406,7 +406,7 @@ private: void onOCMSetItemLabel(HTREEITEM hItem, const wchar_t* szLabel); bool onOCMIsItemEnabled(HTREEITEM hItem); void onOCMEnableItem(HTREEITEM hItem, bool bEnable); - DWORD onOCMGetItemData(HTREEITEM hItem); + uint32_t onOCMGetItemData(HTREEITEM hItem); void onOCMSetItemData(HTREEITEM hItem, INT_PTR dwData); bool onOCMIsItemChecked(HTREEITEM hItem); void onOCMCheckItem(HTREEITEM hItem, bool bCheck); @@ -423,18 +423,18 @@ private: void onOCMDeleteAllItems(); HTREEITEM onOCMGetSelection(); void onOCMSelectItem(HTREEITEM hItem); - HTREEITEM onOCMGetItem(HTREEITEM hItem, DWORD dwFlag); + HTREEITEM onOCMGetItem(HTREEITEM hItem, uint32_t dwFlag); void onOCMDeleteItem(HTREEITEM hItem); void onOCMMoveItem(HTREEITEM& hItem, HTREEITEM hInsertAfter); bool onOCMIsDateTimeNone(HTREEITEM hDateTime); void onOCMSetDateTimeNone(HTREEITEM hDateTime); - DWORD onOCMGetDateTime(HTREEITEM hDateTime, BOOL* pbNone); - void onOCMSetDateTime(HTREEITEM hDateTime, DWORD dwTimestamp); + uint32_t onOCMGetDateTime(HTREEITEM hDateTime, BOOL* pbNone); + void onOCMSetDateTime(HTREEITEM hDateTime, uint32_t dwTimestamp); COLORREF onOCMGetItemColor(HTREEITEM hColor); void onOCMSetItemColor(HTREEITEM hColor, COLORREF crColor); private: - void insertItem(Item* pParent, Item* pItem, const wchar_t* szNodeText, DWORD dwFlags, int iImage); + void insertItem(Item* pParent, Item* pItem, const wchar_t* szNodeText, uint32_t dwFlags, int iImage); void setModified(Item* pItem, bool bModified = true); bool isItemValid(HTREEITEM hItem); Item* getItem(HTREEITEM hItem); diff --git a/plugins/HistoryStats/src/optionsctrlimpl_button.cpp b/plugins/HistoryStats/src/optionsctrlimpl_button.cpp index 3c29971d7e..d3d5df9106 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 wchar_t* szLabel, const wchar_t* szButton, DWORD dwFlags, INT_PTR dwData) +OptionsCtrlImpl::Button::Button(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, const wchar_t* szButton, uint32_t dwFlags, INT_PTR dwData) : Item(pCtrl, itButton, szLabel, dwFlags, dwData) , m_hButtonWnd(nullptr) , m_strButton(szButton) @@ -42,7 +42,7 @@ void OptionsCtrlImpl::Button::onSelect() HWND hTempWnd; - DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON | BS_TEXT | BS_CENTER | BS_VCENTER; + uint32_t dwStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON | BS_TEXT | BS_CENTER | BS_VCENTER; if (hTempWnd = CreateWindowEx( 0, WC_BUTTON, m_strButton.c_str(), dwStyle, diff --git a/plugins/HistoryStats/src/optionsctrlimpl_check.cpp b/plugins/HistoryStats/src/optionsctrlimpl_check.cpp index 8776224299..b2c439c101 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_check.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_check.cpp @@ -25,7 +25,7 @@ void OptionsCtrlImpl::Check::updateItem() enableChilds(getChildEnable()); } -OptionsCtrlImpl::Check::Check(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, DWORD dwFlags, INT_PTR dwData) : +OptionsCtrlImpl::Check::Check(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, uint32_t dwFlags, INT_PTR dwData) : Item(pCtrl, itCheck, szLabel, dwFlags, dwData) { m_bChecked = bool_(dwFlags & OCF_CHECKED); diff --git a/plugins/HistoryStats/src/optionsctrlimpl_color.cpp b/plugins/HistoryStats/src/optionsctrlimpl_color.cpp index 171945b028..b7f9267840 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 wchar_t* szLabel, COLORREF crColor, DWORD dwFlags, INT_PTR dwData) +OptionsCtrlImpl::Color::Color(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, COLORREF crColor, uint32_t dwFlags, INT_PTR dwData) : Item(pCtrl, itColor, szLabel, dwFlags, dwData) , m_hColorWnd(nullptr) , m_crColor(crColor) @@ -51,7 +51,7 @@ void OptionsCtrlImpl::Color::onSelect() HWND hTempWnd; - DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP; + uint32_t dwStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP; if (hTempWnd = CreateWindowEx( 0, _A2W(WNDCLASS_COLOURPICKER), nullptr, dwStyle, diff --git a/plugins/HistoryStats/src/optionsctrlimpl_combo.cpp b/plugins/HistoryStats/src/optionsctrlimpl_combo.cpp index 8affd38574..663b4962fe 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 wchar_t* szLabel, DWORD dwFlags, INT_PTR dwData) +OptionsCtrlImpl::Combo::Combo(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, uint32_t dwFlags, INT_PTR dwData) : Item(pCtrl, itCombo, szLabel, dwFlags, dwData), m_hComboWnd(nullptr), m_nSelected(-1) { m_bDisableChildsOnIndex0 = bool_(dwFlags & OCF_DISABLECHILDSONINDEX0); @@ -83,7 +83,7 @@ void OptionsCtrlImpl::Combo::onSelect() HWND hTempWnd; - DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST; + uint32_t dwStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST; if (hTempWnd = CreateWindowEx( WS_EX_CLIENTEDGE, WC_COMBOBOX, L"", dwStyle, diff --git a/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp b/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp index 54c3ee7380..3befd6ee67 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_datetime.cpp @@ -109,8 +109,8 @@ SYSTEMTIME OptionsCtrlImpl::DateTime::toSystemTime(time_t timestamp) FILETIME ft; LONGLONG ll = Int32x32To64(timestamp, 10000000) + 116444736000000000; - ft.dwLowDateTime = static_cast(ll); - ft.dwHighDateTime = static_cast(ll >> 32); + ft.dwLowDateTime = static_cast(ll); + ft.dwHighDateTime = static_cast(ll >> 32); FileTimeToSystemTime(&ft, &st); @@ -180,7 +180,7 @@ ext::string OptionsCtrlImpl::DateTime::getCombinedText() return strTemp; } -OptionsCtrlImpl::DateTime::DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, const wchar_t* szFormat, time_t timestamp, DWORD dwFlags, INT_PTR dwData) +OptionsCtrlImpl::DateTime::DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, const wchar_t* szFormat, time_t timestamp, uint32_t dwFlags, INT_PTR dwData) : Item(pCtrl, itDateTime, szLabel, dwFlags, dwData), m_hDateTimeWnd(nullptr), m_strFormat(szFormat), m_timestamp(timestamp) { m_bDisableChildsOnNone = bool_(dwFlags & OCF_DISABLECHILDSONNONE); @@ -216,7 +216,7 @@ void OptionsCtrlImpl::DateTime::onSelect() HWND hTempWnd; - DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | (m_bAllowNone ? DTS_SHOWNONE : 0); + uint32_t dwStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | (m_bAllowNone ? DTS_SHOWNONE : 0); if (hTempWnd = CreateWindowEx( WS_EX_CLIENTEDGE, DATETIMEPICK_CLASS, L"", dwStyle, diff --git a/plugins/HistoryStats/src/optionsctrlimpl_edit.cpp b/plugins/HistoryStats/src/optionsctrlimpl_edit.cpp index d44346a126..b868de5440 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 wchar_t* szLabel, const wchar_t* szEdit, DWORD dwFlags, INT_PTR dwData) +OptionsCtrlImpl::Edit::Edit(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, const wchar_t* szEdit, uint32_t dwFlags, INT_PTR dwData) : Item(pCtrl, itEdit, szLabel, dwFlags, dwData), m_hEditWnd(nullptr) { m_strEdit = szEdit; @@ -75,7 +75,7 @@ void OptionsCtrlImpl::Edit::onSelect() } HWND hTempWnd; - DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL; + uint32_t dwStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_LEFT | ES_AUTOHSCROLL; if (m_bNumber) { diff --git a/plugins/HistoryStats/src/optionsctrlimpl_group.cpp b/plugins/HistoryStats/src/optionsctrlimpl_group.cpp index 2d36374668..f1496b7cfa 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 wchar_t* szLabel, DWORD dwFlags, INT_PTR dwData) +OptionsCtrlImpl::Group::Group(OptionsCtrlImpl* pCtrl, Item* pParent, const wchar_t* szLabel, uint32_t 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 faf8ec18e0..2afba7746f 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl_item.cpp +++ b/plugins/HistoryStats/src/optionsctrlimpl_item.cpp @@ -5,7 +5,7 @@ * OptionsCtrlImpl::Item */ -OptionsCtrlImpl::Item::Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const wchar_t* szLabel, DWORD dwFlags, INT_PTR dwData) : +OptionsCtrlImpl::Item::Item(OptionsCtrlImpl* pCtrl, ItemType ItemType, const wchar_t* szLabel, uint32_t dwFlags, INT_PTR dwData) : m_pCtrl(pCtrl), m_hItem(nullptr), m_nRef(1), m_ItemType(ItemType), m_strLabel(szLabel), m_dwData(dwData) { m_bEnabled = !(dwFlags & OCF_DISABLED); diff --git a/plugins/HistoryStats/src/optionsctrlimpl_radio.cpp b/plugins/HistoryStats/src/optionsctrlimpl_radio.cpp index a8fc86ae86..5909a6e907 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 wchar_t* szLabel, DWORD dwFlags, INT_PTR dwData) +OptionsCtrlImpl::Radio::Radio(OptionsCtrlImpl* pCtrl, Item* pParent, Radio* pSibling, const wchar_t* szLabel, uint32_t dwFlags, INT_PTR dwData) : Item(pCtrl, itRadio, szLabel, dwFlags, dwData) { m_bDisableChildsOnUncheck = bool_(dwFlags & OCF_DISABLECHILDSONUNCHECK); diff --git a/plugins/HistoryStats/src/settings.cpp b/plugins/HistoryStats/src/settings.cpp index 08f1518ea7..2d28b1d212 100644 --- a/plugins/HistoryStats/src/settings.cpp +++ b/plugins/HistoryStats/src/settings.cpp @@ -478,7 +478,7 @@ Settings& Settings::operator =(const Settings& other) return *this; } -ext::string Settings::getOutputFile(DWORD timeStarted) const +ext::string Settings::getOutputFile(uint32_t timeStarted) const { ext::string strFile = m_OutputFile; @@ -492,7 +492,7 @@ ext::string Settings::getOutputFile(DWORD timeStarted) const return strFile; } -ext::string Settings::getOutputPrefix(DWORD timeStarted) const +ext::string Settings::getOutputPrefix(uint32_t timeStarted) const { if (m_OutputExtraToFolder && !m_OutputExtraFolder.empty()) { ext::string extraFolder = m_OutputExtraFolder; @@ -522,12 +522,12 @@ bool Settings::isPNGOutputActiveAndAvailable() const return (m_GraphicsMode == gmPNG); } -DWORD Settings::getIgnoreBefore() const +uint32_t Settings::getIgnoreBefore() const { return utils::parseDate(m_IgnoreBefore); } -DWORD Settings::getIgnoreAfter() const +uint32_t Settings::getIgnoreAfter() const { return utils::parseDate(m_IgnoreAfter); } diff --git a/plugins/HistoryStats/src/settings.h b/plugins/HistoryStats/src/settings.h index 77cafca6e7..705ac05f23 100644 --- a/plugins/HistoryStats/src/settings.h +++ b/plugins/HistoryStats/src/settings.h @@ -204,7 +204,7 @@ public: static const wchar_t* getDefaultFilterWords(); public: - const DWORD m_VersionCurrent; + const uint32_t m_VersionCurrent; private: // column settings @@ -297,11 +297,11 @@ public: bool manageFilterWords(HWND hParent, Column* pCol); const Filter* getFilter(const ext::string& strID) const; - ext::string getOutputFile(DWORD timeStarted) const; - ext::string getOutputPrefix(DWORD timeStarted) const; + ext::string getOutputFile(uint32_t timeStarted) const; + ext::string getOutputPrefix(uint32_t timeStarted) const; bool isPNGOutputActiveAndAvailable() const; - DWORD getIgnoreBefore() const; - DWORD getIgnoreAfter() const; + uint32_t getIgnoreBefore() const; + uint32_t getIgnoreAfter() const; void ensureConstraints(); diff --git a/plugins/HistoryStats/src/settingsserializer.h b/plugins/HistoryStats/src/settingsserializer.h index 3b1fc2269a..c39bdc5e52 100644 --- a/plugins/HistoryStats/src/settingsserializer.h +++ b/plugins/HistoryStats/src/settingsserializer.h @@ -11,7 +11,7 @@ class SettingsSerializer , private pattern::NotCopyable { private: - DWORD m_VersionInDB; + uint32_t m_VersionInDB; MirandaSettings m_DB; public: diff --git a/plugins/HistoryStats/src/statistic.cpp b/plugins/HistoryStats/src/statistic.cpp index 4ef53b9379..79c2eeac1e 100644 --- a/plugins/HistoryStats/src/statistic.cpp +++ b/plugins/HistoryStats/src/statistic.cpp @@ -119,7 +119,7 @@ const Contact& Statistic::getContact(int index) const return *m_Contacts[index]; } -DWORD Statistic::getFirstTime() +uint32_t Statistic::getFirstTime() { if (!m_bHistoryTimeAvailable) { // put _all_ available contacts (including omitted/total) in one list @@ -137,7 +137,7 @@ DWORD Statistic::getFirstTime() l.push_back(&getTotals()); if (l.size() > 0) { - DWORD nFirstTime = con::MaxDateTime, nLastTime = con::MinDateTime; + uint32_t nFirstTime = con::MaxDateTime, nLastTime = con::MinDateTime; citer_each_(Statistic::ContactListC, c, l) { @@ -163,7 +163,7 @@ DWORD Statistic::getFirstTime() return m_nFirstTime; } -DWORD Statistic::getLastTime() +uint32_t Statistic::getLastTime() { if (!m_bHistoryTimeAvailable) // trigger calculation getFirstTime(); @@ -171,7 +171,7 @@ DWORD Statistic::getLastTime() return m_nLastTime; } -DWORD Statistic::getHistoryTime() +uint32_t Statistic::getHistoryTime() { if (!m_bHistoryTimeAvailable) // trigger calculation getFirstTime(); @@ -253,7 +253,7 @@ void Statistic::handleAddMessage(Contact& contact, Message& msg) } } -void Statistic::handleAddChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD duration) +void Statistic::handleAddChat(Contact& contact, bool bOutgoing, uint32_t localTimestampStarted, uint32_t duration) { if (duration >= m_Settings.m_ChatSessionMinDur) { contact.addChat(bOutgoing, localTimestampStarted, duration); @@ -392,8 +392,8 @@ bool Statistic::stepReadDB() curContact.beginMessages(); // init data for chat detection - DWORD lastAddedTime = 0; - DWORD chatStartTime = 0; + uint32_t lastAddedTime = 0; + uint32_t chatStartTime = 0; bool bChatOutgoing = false; Message curMsg(m_Settings.m_FilterRawRTF && RTFFilter::available(), m_Settings.m_FilterBBCodes); @@ -407,7 +407,7 @@ bool Statistic::stepReadDB() // filter logged status messages from tabSRMM if (dbei.eventType == etMessage) { // convert to local time (everything in this plugin is done in local time) - DWORD localTimestamp = TimeZone_ToLocal(dbei.timestamp); + uint32_t localTimestamp = TimeZone_ToLocal(dbei.timestamp); if (localTimestamp >= m_TimeMin && localTimestamp <= m_TimeMax) { if (dbei.flags & DBEF_UTF) { @@ -445,7 +445,7 @@ bool Statistic::stepReadDB() handleAddMessage(curContact, curMsg); // handle chats - if (localTimestamp - lastAddedTime >= (DWORD)m_Settings.m_ChatSessionTimeout || lastAddedTime == 0) { + if (localTimestamp - lastAddedTime >= (uint32_t)m_Settings.m_ChatSessionTimeout || lastAddedTime == 0) { // new chat started if (chatStartTime != 0) handleAddChat(curContact, bChatOutgoing, chatStartTime, lastAddedTime - chatStartTime); @@ -595,15 +595,15 @@ bool Statistic::stepSortContacts() break; case Settings::skChatDurationTotal: - pCmp = new ContactCompare(pPrev, &Contact::getChatDurSum); + pCmp = new ContactCompare(pPrev, &Contact::getChatDurSum); break; case Settings::skTimeOfFirstMessage: - pCmp = new ContactCompare(pPrev, &Contact::getFirstTime); + pCmp = new ContactCompare(pPrev, &Contact::getFirstTime); break; case Settings::skTimeOfLastMessage: - pCmp = new ContactCompare(pPrev, &Contact::getLastTime); + pCmp = new ContactCompare(pPrev, &Contact::getLastTime); break; case Settings::skBytesOutAvg: @@ -701,11 +701,11 @@ bool Statistic::stepOmitContacts() if (m_Settings.m_OmitByValue) { static const struct { - int type; // 0 = int, 1 = double, 2 = DWORD + int type; // 0 = int, 1 = double, 2 = uint32_t double factor; // factor to multiply function output with int (Contact::*int_fn)() const; double (Contact::*double_fn)() const; - DWORD(Contact::*DWORD_fn)() const; + uint32_t(Contact::*DWORD_fn)() const; } valueMap[] = { { 0, 1.0, &Contact::getInBytes, nullptr, nullptr }, { 0, 1.0, &Contact::getOutBytes, nullptr, nullptr }, @@ -1235,7 +1235,7 @@ bool Statistic::createStatistics() if (bDone) break; - DWORD result = MsgWaitForMultipleObjects(1, &hThread, FALSE, INFINITE, QS_ALLINPUT); + uint32_t result = MsgWaitForMultipleObjects(1, &hThread, FALSE, INFINITE, QS_ALLINPUT); if (result == WAIT_OBJECT_0 + 1) // there is a message in the queue continue; diff --git a/plugins/HistoryStats/src/statistic.h b/plugins/HistoryStats/src/statistic.h index 9c387af846..9897bf6732 100644 --- a/plugins/HistoryStats/src/statistic.h +++ b/plugins/HistoryStats/src/statistic.h @@ -84,12 +84,12 @@ private: m_bResult; // result of calculations // start time for statistics - DWORD m_TimeStarted; - DWORD m_MSecStarted; + uint32_t m_TimeStarted; + uint32_t m_MSecStarted; // minimum/maximum date/time to include - DWORD m_TimeMin; - DWORD m_TimeMax; + uint32_t m_TimeMin; + uint32_t m_TimeMax; // error processing and the like ext::string m_ErrorText; @@ -113,11 +113,11 @@ private: // first/last message bool m_bHistoryTimeAvailable; - DWORD m_nFirstTime; - DWORD m_nLastTime; + uint32_t m_nFirstTime; + uint32_t m_nLastTime; // misc data - DWORD m_AverageMinTime; + uint32_t m_AverageMinTime; private: // contact handling @@ -129,10 +129,10 @@ private: Contact& addContact(const ext::string& nick, const ext::string& protoDisplayName, const ext::string& groupName, int nSources); // misc routines - DWORD getTimeStarted() { return m_TimeStarted; } + uint32_t getTimeStarted() { return m_TimeStarted; } bool shouldTerminate() { return (WaitForSingleObject(m_hCancelEvent, 0) == WAIT_OBJECT_0) || bool_(Miranda_IsTerminated()); } void handleAddMessage(Contact& contact, Message& msg); - void handleAddChat(Contact& contact, bool bOutgoing, DWORD localTimestampStarted, DWORD duration); + void handleAddChat(Contact& contact, bool bOutgoing, uint32_t localTimestampStarted, uint32_t duration); // progress dialog handling static INT_PTR CALLBACK staticProgressProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); @@ -172,10 +172,10 @@ public: const Contact& getOmitted() const { assert(m_pOmitted); return *m_pOmitted; } bool hasTotals() const { return (m_pTotals != nullptr) && m_Settings.m_CalcTotals; } // MEMO: only makes sense after 'calc totals'-step bool hasOmitted() const { return (m_pOmitted != nullptr) && m_Settings.m_OmitContacts && m_Settings.m_OmittedInExtraRow && m_bActuallyOmitted; } // MEMO: only makes sense after 'omit'-step - DWORD getFirstTime(); // MEMO: only makes sense after 'calc totals'-step - DWORD getLastTime(); // MEMO: only makes sense after 'calc totals'-step - DWORD getHistoryTime(); // MEMO: only makes sense after 'calc totals'-step - DWORD getAverageMinTime() { return m_AverageMinTime; } + uint32_t getFirstTime(); // MEMO: only makes sense after 'calc totals'-step + uint32_t getLastTime(); // MEMO: only makes sense after 'calc totals'-step + uint32_t getHistoryTime(); // MEMO: only makes sense after 'calc totals'-step + uint32_t getAverageMinTime() { return m_AverageMinTime; } // file management ext::string createFile(const ext::string& desiredName); diff --git a/plugins/HistoryStats/src/utils.cpp b/plugins/HistoryStats/src/utils.cpp index 71a7f78de3..740763958e 100644 --- a/plugins/HistoryStats/src/utils.cpp +++ b/plugins/HistoryStats/src/utils.cpp @@ -23,7 +23,7 @@ ext::string utils::tmStructToString(const tm& value, const wchar_t* format) return (ext::strfunc::ftime(temp, 100, format, &value) > 0) ? temp : L""; } -ext::string utils::durationToString(DWORD value) +ext::string utils::durationToString(uint32_t value) { wchar_t temp[100] = { 0 }; @@ -38,7 +38,7 @@ ext::string utils::durationToString(DWORD value) return temp; } -DWORD utils::parseDate(const ext::string& date) +uint32_t utils::parseDate(const ext::string& date) { if (date.length() != 10 || date[4] != '-' || date[7] != '-') return 0; @@ -367,7 +367,7 @@ ext::string utils::toUpperCase(const ext::string& text) return ret_str; } -DWORD utils::dottedToVersion(ext::string version) +uint32_t utils::dottedToVersion(ext::string version) { union { @@ -392,7 +392,7 @@ DWORD utils::dottedToVersion(ext::string version) return res.combined; } -ext::string utils::versionToDotted(DWORD version) +ext::string utils::versionToDotted(uint32_t version) { wchar_t temp[16] = { 0 }; diff --git a/plugins/HistoryStats/src/utils.h b/plugins/HistoryStats/src/utils.h index 7e07ba6cbb..ad1e0afc70 100644 --- a/plugins/HistoryStats/src/utils.h +++ b/plugins/HistoryStats/src/utils.h @@ -9,11 +9,11 @@ namespace utils // time formatting ext::string timestampToString(time_t value, const wchar_t* format); ext::string tmStructToString(const tm& value, const wchar_t* format); - inline ext::string timestampToDateTime(DWORD value) { return timestampToString(value, L"%c"); } - inline ext::string timestampToDate(DWORD value) { return timestampToString(value, L"%x"); } - inline ext::string timestampToTime(DWORD value) { return timestampToString(value, L"%X"); } - ext::string durationToString(DWORD value); - DWORD parseDate(const ext::string& date); + inline ext::string timestampToDateTime(uint32_t value) { return timestampToString(value, L"%c"); } + inline ext::string timestampToDate(uint32_t value) { return timestampToString(value, L"%x"); } + inline ext::string timestampToTime(uint32_t value) { return timestampToString(value, L"%X"); } + ext::string durationToString(uint32_t value); + uint32_t parseDate(const ext::string& date); inline ext::string formatDate(time_t timeValue) { return timestampToString(timeValue, L"%Y-%m-%d"); } // number formatting @@ -39,8 +39,8 @@ namespace utils ext::string toUpperCase(const ext::string& text); // version conversion - DWORD dottedToVersion(ext::string version); - ext::string versionToDotted(DWORD version); + uint32_t dottedToVersion(ext::string version); + ext::string versionToDotted(uint32_t version); // character conversion (wide, ansi, utf8) ext::a::string convertWToA(const wchar_t* str, size_t len); -- cgit v1.2.3