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/BasicHistory/src/BasicHistory.cpp | 2 +- plugins/BasicHistory/src/BinaryExport.cpp | 2 +- plugins/BasicHistory/src/BinaryExport.h | 2 +- plugins/BasicHistory/src/DatExport.cpp | 16 ++++++++-------- plugins/BasicHistory/src/EventList.cpp | 12 ++++++------ plugins/BasicHistory/src/EventList.h | 8 ++++---- plugins/BasicHistory/src/ExportManager.cpp | 2 +- plugins/BasicHistory/src/ExportManager.h | 4 ++-- plugins/BasicHistory/src/HistoryWindow.cpp | 4 ++-- plugins/BasicHistory/src/IImport.h | 2 +- plugins/BasicHistory/src/ImageDataObject.h | 3 +-- plugins/BasicHistory/src/Options.cpp | 8 ++++---- plugins/BasicHistory/src/RichHtmlExport.cpp | 4 ++-- plugins/BasicHistory/src/Scheduler.cpp | 8 ++++---- plugins/BasicHistory/src/SearchContext.h | 4 ++-- 15 files changed, 40 insertions(+), 41 deletions(-) (limited to 'plugins/BasicHistory/src') diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index 5639b63c86..5f7b929e6e 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -187,7 +187,7 @@ int ModulesLoaded(WPARAM, LPARAM) wchar_t ftpExe[MAX_PATH]; if (SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_PROGRAM_FILES, nullptr, SHGFP_TYPE_CURRENT, ftpExe))) { wcscat_s(ftpExe, L"\\WinSCP\\WinSCP.exe"); - DWORD atr = GetFileAttributes(ftpExe); + uint32_t atr = GetFileAttributes(ftpExe); if (atr == INVALID_FILE_ATTRIBUTES || atr & FILE_ATTRIBUTE_DIRECTORY) { #ifdef _WIN64 if (SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_PROGRAM_FILESX86, nullptr, SHGFP_TYPE_CURRENT, ftpExe))) { diff --git a/plugins/BasicHistory/src/BinaryExport.cpp b/plugins/BasicHistory/src/BinaryExport.cpp index 791be5f2b6..1eadefd459 100644 --- a/plugins/BasicHistory/src/BinaryExport.cpp +++ b/plugins/BasicHistory/src/BinaryExport.cpp @@ -39,7 +39,7 @@ struct BinaryFileHeader struct BinaryFileMessageHeader { - DWORD timestamp; + uint32_t timestamp; uint16_t eventType; uint16_t flags; }; diff --git a/plugins/BasicHistory/src/BinaryExport.h b/plugins/BasicHistory/src/BinaryExport.h index 917e27787f..3f4744c582 100644 --- a/plugins/BasicHistory/src/BinaryExport.h +++ b/plugins/BasicHistory/src/BinaryExport.h @@ -42,6 +42,6 @@ private: unsigned int codepage; inline void WriteString(const std::wstring &str); inline bool ReadString(std::wstring &str); - DWORD lTime; + uint32_t lTime; }; diff --git a/plugins/BasicHistory/src/DatExport.cpp b/plugins/BasicHistory/src/DatExport.cpp index d21f66e0c5..fd3718c334 100644 --- a/plugins/BasicHistory/src/DatExport.cpp +++ b/plugins/BasicHistory/src/DatExport.cpp @@ -40,15 +40,15 @@ struct MCHeader typedef struct { int cbSize; //size of the structure in bytes - DWORD szModule; //pointer to name of the module that 'owns' this + uint32_t szModule; //pointer to name of the module that 'owns' this //event, ie the one that is in control of the data format - DWORD timestamp; //seconds since 00:00, 01/01/1970. Gives us times until + uint32_t timestamp; //seconds since 00:00, 01/01/1970. Gives us times until //2106 unless you use the standard C library which is //signed and can only do until 2038. In GMT. - DWORD flags; //the omnipresent flags + uint32_t flags; //the omnipresent flags uint16_t eventType; //module-defined event type field - DWORD cbBlob; //size of pBlob in bytes - DWORD pBlob; //pointer to buffer containing module-defined event data + uint32_t cbBlob; //size of pBlob in bytes + uint32_t pBlob; //pointer to buffer containing module-defined event data } DBEVENTINFO86; @@ -153,7 +153,7 @@ bool DatExport::GetEventList(std::vector& eventList) DBEVENTINFO info = {}; info.szModule = Proto_GetBaseAccountName(hContact); wchar_t _str[MAXSELECTSTR + 8]; // for safety reason - std::multimap sortedEvents; + std::multimap sortedEvents; while (dataSize > 0) { messageHeader.cbSize = 0; IMP_FILE.read((char*)&messageHeader, sizeof(DBEVENTINFO86)); @@ -184,14 +184,14 @@ bool DatExport::GetEventList(std::vector& eventList) info.pBlob = (uint8_t*)memBuf.c_str(); HistoryEventList::GetObjectDescription(&info, _str, MAXSELECTSTR); exMsg.message = _str; - sortedEvents.insert(std::pair(messageHeader.timestamp, exMsg)); + sortedEvents.insert(std::pair(messageHeader.timestamp, exMsg)); dataSize -= messageHeader.cbSize + messageHeader.cbBlob; } memBuf.resize(0); memBuf.shrink_to_fit(); - for (std::multimap::iterator it = sortedEvents.begin(); it != sortedEvents.end(); ++it) + for (std::multimap::iterator it = sortedEvents.begin(); it != sortedEvents.end(); ++it) eventList.push_back(it->second); return true; diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp index 39ff4ff4ca..a891e88976 100644 --- a/plugins/BasicHistory/src/EventList.cpp +++ b/plugins/BasicHistory/src/EventList.cpp @@ -214,7 +214,7 @@ void HistoryEventList::GetTempList(std::list& tempList, bool noF ti.isExternal = true; for (int i = 0; i < (int)m_importedMessages.size(); ++i) { if (noFilter || CanShowHistory(m_importedMessages[i])) { - DWORD ts = m_importedMessages[i].timestamp; + uint32_t ts = m_importedMessages[i].timestamp; while (itL != tempList.end() && itL->timestamp < ts)++itL; if (itL == tempList.end() || itL->timestamp > ts) { ti.exIdx = i; @@ -258,13 +258,13 @@ void HistoryEventList::RefreshEventList() m_eventList.clear(); m_eventList.push_back(std::deque()); - DWORD lastTime = MAXDWORD; - DWORD groupTime = Options::instance->groupTime * 60 * 60; + uint32_t lastTime = MAXDWORD; + uint32_t groupTime = Options::instance->groupTime * 60 * 60; int maxMess = Options::instance->groupMessagesNumber; int limitator = 0; EventIndex ei; for (std::list::iterator itL = nrTempList.begin(); itL != nrTempList.end(); ++itL) { - DWORD tm = isNewOnTop ? lastTime - itL->timestamp : itL->timestamp - lastTime; + uint32_t tm = isNewOnTop ? lastTime - itL->timestamp : itL->timestamp - lastTime; if (m_isFlat || tm < groupTime && limitator < maxMess) { lastTime = itL->timestamp; ei.isExternal = itL->isExternal; @@ -474,7 +474,7 @@ bool HistoryEventList::GetEventIcon(bool isMe, int eventType, int &id) void HistoryEventList::ImportMessages(const std::vector& messages) { - DWORD lastTime = 0; + uint32_t lastTime = 0; m_importedMessages.clear(); for (int i = 0; i < (int)messages.size(); ++i) { if (messages[i].timestamp >= lastTime) { @@ -522,7 +522,7 @@ void HistoryEventList::MargeMessages(const std::vector bool HistoryEventList::GetEventData(const EventIndex& ev, EventData& data) { if (!ev.isExternal) { - DWORD newBlobSize = db_event_getBlobSize(ev.hEvent); + uint32_t newBlobSize = db_event_getBlobSize(ev.hEvent); if (newBlobSize > m_oldBlobSize) { m_dbei.pBlob = (uint8_t*)mir_realloc(m_dbei.pBlob, newBlobSize); m_oldBlobSize = newBlobSize; diff --git a/plugins/BasicHistory/src/EventList.h b/plugins/BasicHistory/src/EventList.h index df8db5fbc3..299039d7be 100644 --- a/plugins/BasicHistory/src/EventList.h +++ b/plugins/BasicHistory/src/EventList.h @@ -34,7 +34,7 @@ public: { bool isMe; uint16_t eventType; - DWORD timestamp; + uint32_t timestamp; }; struct EventIndex { @@ -53,7 +53,7 @@ private: int m_defFilter; std::wstring m_filterName; std::vector m_importedMessages; - DWORD m_oldBlobSize; + uint32_t m_oldBlobSize; struct EventTempIndex { @@ -63,7 +63,7 @@ private: int exIdx; }; bool isExternal; - DWORD timestamp; + uint32_t timestamp; }; struct ImportDiscData @@ -89,7 +89,7 @@ protected: bool m_isWnd; bool m_isFlat; int m_deltaTime; - DWORD m_now; + uint32_t m_now; DBEVENTINFO m_dbei; virtual void AddGroup(bool isMe, const std::wstring &time, const std::wstring &user, const std::wstring &eventText, int ico) = 0; diff --git a/plugins/BasicHistory/src/ExportManager.cpp b/plugins/BasicHistory/src/ExportManager.cpp index 5eda574647..524ecb650e 100644 --- a/plugins/BasicHistory/src/ExportManager.cpp +++ b/plugins/BasicHistory/src/ExportManager.cpp @@ -369,7 +369,7 @@ void ExportManager::DeleteExportedEvents() DeleteEvent(m_eventList[j][i]); } -void ExportManager::SetDeleteWithoutExportEvents(int deltaTime, DWORD now) +void ExportManager::SetDeleteWithoutExportEvents(int deltaTime, uint32_t now) { m_exp = nullptr; m_deltaTime = deltaTime; diff --git a/plugins/BasicHistory/src/ExportManager.h b/plugins/BasicHistory/src/ExportManager.h index 212f76f2ea..c66a0f998b 100644 --- a/plugins/BasicHistory/src/ExportManager.h +++ b/plugins/BasicHistory/src/ExportManager.h @@ -33,7 +33,7 @@ protected: public: ExportManager(HWND _hwnd, MCONTACT _hContact, int filter); - void SetAutoExport(const std::wstring _file, int deltaTime, DWORD now) + void SetAutoExport(const std::wstring _file, int deltaTime, uint32_t now) { m_file = _file; m_deltaTime = deltaTime; @@ -51,7 +51,7 @@ public: } bool Export(IExport::ExportType type); - void SetDeleteWithoutExportEvents(int deltaTime, DWORD now); + void SetDeleteWithoutExportEvents(int deltaTime, uint32_t now); void DeleteExportedEvents(); int Import(IImport::ImportType type, const std::vector &contacts); bool Import(IImport::ImportType type, std::vector &eventList, std::wstring *err = nullptr, bool *differentContact = nullptr, std::vector *contacts = nullptr); diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index 97471870c4..fd6d57ace6 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -1612,11 +1612,11 @@ void HistoryWindow::FindToolbarClicked(LPNMTOOLBAR lpnmTB) AppendMenu(hPopupMenu, searcher.IsAllUsers() ? MF_STRING | MF_CHECKED : MF_STRING, IDM_ALLUSERS, TranslateT("All contacts")); AppendMenu(hPopupMenu, MFT_SEPARATOR, 0, nullptr); HMENU hFilterMenu = CreatePopupMenu(); - DWORD filter = GetFilterNr(); + uint32_t filter = GetFilterNr(); AppendMenu(hFilterMenu, filter == 0 ? MF_STRING | MF_CHECKED : MF_STRING, IDM_FILTERDEF, TranslateT("Default history events")); AppendMenu(hFilterMenu, filter == 1 ? MF_STRING | MF_CHECKED : MF_STRING, IDM_FILTERALL, TranslateT("All events")); for (size_t i = 0; i < Options::instance->customFilters.size(); ++i) { - DWORD flags = MF_STRING; + uint32_t flags = MF_STRING; if (filter - 2 == i) flags |= MF_CHECKED; diff --git a/plugins/BasicHistory/src/IImport.h b/plugins/BasicHistory/src/IImport.h index a33f2f3931..7208dfc141 100644 --- a/plugins/BasicHistory/src/IImport.h +++ b/plugins/BasicHistory/src/IImport.h @@ -31,7 +31,7 @@ public: struct ExternalMessage { - DWORD timestamp; + uint32_t timestamp; uint16_t eventType; uint16_t flags; std::wstring message; diff --git a/plugins/BasicHistory/src/ImageDataObject.h b/plugins/BasicHistory/src/ImageDataObject.h index 2e0ef3dd3f..9a980e823a 100644 --- a/plugins/BasicHistory/src/ImageDataObject.h +++ b/plugins/BasicHistory/src/ImageDataObject.h @@ -113,8 +113,7 @@ public: return E_NOTIMPL; } - STDMETHOD(DAdvise)(FORMATETC*, DWORD, IAdviseSink*, - DWORD*) { + STDMETHOD(DAdvise)(FORMATETC*, DWORD, IAdviseSink*, DWORD*) { return E_NOTIMPL; } diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index d51ae87aa0..b055c91188 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -159,7 +159,7 @@ struct FontOptionsList uint8_t defStyle; char defSize; wchar_t* szBackgroundName; - DWORD flags; + uint32_t flags; }; struct ColorOptionsList @@ -450,7 +450,7 @@ void Options::Save() g_plugin.setByte("defFilter", defFilter < 2 ? defFilter : 2); if (defFilter >= 2) g_plugin.setWString("defFilterStr", customFilters[defFilter - 2].name.c_str()); - g_plugin.setDword("customFiltersCount", (DWORD)customFilters.size()); + g_plugin.setDword("customFiltersCount", (uint32_t)customFilters.size()); for (int i = 0; i < (int)customFilters.size(); ++i) { char buf[256]; mir_snprintf(buf, "filterName_%d", i); @@ -774,7 +774,7 @@ bool CheckFile(HWND hwndEdit) { wchar_t buf[MAX_PATH]; Edit_GetText(hwndEdit, buf, MAX_PATH); - DWORD atr = GetFileAttributes(buf); + uint32_t atr = GetFileAttributes(buf); if (atr == INVALID_FILE_ATTRIBUTES || atr & FILE_ATTRIBUTE_DIRECTORY) { MessageBox(GetParent(hwndEdit), TranslateT("File does not exist. Enter correct file path."), TranslateT("Invalid file"), MB_OK | MB_ICONERROR); SetFocus(hwndEdit); @@ -1896,6 +1896,6 @@ INT_PTR CALLBACK Options::DlgProcOptsTask(HWND hwndDlg, UINT msg, WPARAM wParam, bool Options::FTPAvail() { - DWORD atr = GetFileAttributes(instance->ftpExePath.c_str()); + uint32_t atr = GetFileAttributes(instance->ftpExePath.c_str()); return !(atr == INVALID_FILE_ATTRIBUTES || atr & FILE_ATTRIBUTE_DIRECTORY); } diff --git a/plugins/BasicHistory/src/RichHtmlExport.cpp b/plugins/BasicHistory/src/RichHtmlExport.cpp index a1c01a9d1c..682b7240f1 100644 --- a/plugins/BasicHistory/src/RichHtmlExport.cpp +++ b/plugins/BasicHistory/src/RichHtmlExport.cpp @@ -149,8 +149,8 @@ typedef struct uint8_t bReserved; // Reserved ( must be 0) uint16_t wPlanes; // Color Planes uint16_t wBitCount; // Bits per pixel - DWORD dwBytesInRes; // How many bytes in this resource? - DWORD dwImageOffset; // Where in the file is this image? + uint32_t dwBytesInRes; // How many bytes in this resource? + uint32_t dwImageOffset; // Where in the file is this image? } ICONDIRENTRY, *LPICONDIRENTRY; typedef struct diff --git a/plugins/BasicHistory/src/Scheduler.cpp b/plugins/BasicHistory/src/Scheduler.cpp index ad53e27731..553171710a 100644 --- a/plugins/BasicHistory/src/Scheduler.cpp +++ b/plugins/BasicHistory/src/Scheduler.cpp @@ -238,7 +238,7 @@ bool DoTask(TaskOptions& to) return true; } - DWORD now = time(0); + uint32_t now = time(0); long long int t = to.eventDeltaTime * 60; if (to.eventUnit > TaskOptions::Minute) t *= 60LL; @@ -708,7 +708,7 @@ void SchedulerThreadFunc(void*) } while (!finishThread) { - DWORD timeWait; + uint32_t timeWait; time_t now = time(0); while (nextExportTime <= now) if (!ExecuteCurrentTask(now)) @@ -1218,7 +1218,7 @@ bool FtpGetFiles(const std::wstring& dir, const std::list& files, DeleteFile(script.c_str()); for (std::list::const_iterator it = localFiles.begin(); it != localFiles.end(); ++it) { - DWORD atr = GetFileAttributes(it->c_str()); + uint32_t atr = GetFileAttributes(it->c_str()); if (atr == INVALID_FILE_ATTRIBUTES || atr & FILE_ATTRIBUTE_DIRECTORY) return true; } @@ -1233,7 +1233,7 @@ void CreatePath(const wchar_t *szDir) { if (!szDir) return; - DWORD dwAttributes; + uint32_t dwAttributes; wchar_t *pszLastBackslash, szTestDir[MAX_PATH]; mir_wstrncpy(szTestDir, szDir, _countof(szTestDir)); diff --git a/plugins/BasicHistory/src/SearchContext.h b/plugins/BasicHistory/src/SearchContext.h index cab81a213c..466a05a267 100644 --- a/plugins/BasicHistory/src/SearchContext.h +++ b/plugins/BasicHistory/src/SearchContext.h @@ -34,7 +34,7 @@ public: struct MessageData { - MessageData(const std::wstring& _description, int _startPos, int _endPos, bool _isMe, DWORD _timestamp) + MessageData(const std::wstring& _description, int _startPos, int _endPos, bool _isMe, uint32_t _timestamp) :description(_description) { startPos = _startPos; @@ -47,7 +47,7 @@ public: int startPos; int endPos; bool isMe; - DWORD timestamp; + uint32_t timestamp; }; std::vector currentGroup; -- cgit v1.2.3