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/NewXstatusNotify/src/indsnd.cpp | 4 ++-- plugins/NewXstatusNotify/src/main.cpp | 8 ++++---- plugins/NewXstatusNotify/src/options.cpp | 2 +- plugins/NewXstatusNotify/src/options.h | 4 ++-- plugins/NewXstatusNotify/src/xstatus.cpp | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'plugins/NewXstatusNotify') diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp index 8b5fe47e8f..2cbf75bd2d 100644 --- a/plugins/NewXstatusNotify/src/indsnd.cpp +++ b/plugins/NewXstatusNotify/src/indsnd.cpp @@ -63,7 +63,7 @@ wchar_t *SelectSound(HWND hwndDlg, wchar_t *buff, size_t bufflen) OPENFILENAME ofn = { 0 }; HWND hList = GetDlgItem(hwndDlg, IDC_INDSNDLIST); - ListView_GetItemText(hList, ListView_GetNextItem(hList, -1, LVNI_SELECTED), 1, buff, (DWORD)bufflen); + ListView_GetItemText(hList, ListView_GetNextItem(hList, -1, LVNI_SELECTED), 1, buff, (uint32_t)bufflen); if (!mir_wstrcmp(buff, TranslateW(DEFAULT_SOUND))) buff = nullptr; @@ -478,7 +478,7 @@ INT_PTR CALLBACK DlgProcFiltering(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam) case NM_CLICK: { NMCLISTCONTROL *nm = (NMCLISTCONTROL *)lParam; - DWORD hitFlags; + uint32_t hitFlags; // Make sure we have an extra column if (nm->iColumn == -1) diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index 27bee1fdd9..4b195b0982 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -271,11 +271,11 @@ void LogSMsgToDB(STATUSMSGINFO *smi, const wchar_t *tmplt) T2Utf blob(str); DBEVENTINFO dbei = {}; - dbei.cbBlob = (DWORD)mir_strlen(blob) + 1; + dbei.cbBlob = (uint32_t)mir_strlen(blob) + 1; dbei.pBlob = (uint8_t*)blob; dbei.eventType = EVENTTYPE_STATUSCHANGE; dbei.flags = DBEF_READ | DBEF_UTF; - dbei.timestamp = (DWORD)time(0); + dbei.timestamp = (uint32_t)time(0); dbei.szModule = MODULENAME; MEVENT hDBEvent = db_event_add(smi->hContact, &dbei); @@ -355,11 +355,11 @@ int ContactStatusChanged(MCONTACT hContact, uint16_t oldStatus, uint16_t newStat T2Utf blob(stzStatusText); DBEVENTINFO dbei = {}; - dbei.cbBlob = (DWORD)mir_strlen(blob) + 1; + dbei.cbBlob = (uint32_t)mir_strlen(blob) + 1; dbei.pBlob = (uint8_t*)blob; dbei.eventType = EVENTTYPE_STATUSCHANGE; dbei.flags = DBEF_READ | DBEF_UTF; - dbei.timestamp = (DWORD)time(0); + dbei.timestamp = (uint32_t)time(0); dbei.szModule = MODULENAME; MEVENT hDBEvent = db_event_add(hContact, &dbei); diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index 6712414044..ca81fac8ba 100644 --- a/plugins/NewXstatusNotify/src/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp @@ -412,7 +412,7 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM case WM_NOTIFY: if (((LPNMHDR)lParam)->code == PSN_APPLY) { char str[8]; - DWORD ctlColour = 0; + uint32_t ctlColour = 0; for (int i = ID_STATUS_MIN; i <= ID_STATUS_MAX2; i++) { ctlColour = SendDlgItemMessage(hwndDlg, (i + 2000), CPM_GETCOLOUR, 0, 0); StatusList[Index(i)].colorBack = SendDlgItemMessage(hwndDlg, (i + 2000), CPM_GETCOLOUR, 0, 0); diff --git a/plugins/NewXstatusNotify/src/options.h b/plugins/NewXstatusNotify/src/options.h index 41c8c2db78..1becf69abf 100644 --- a/plugins/NewXstatusNotify/src/options.h +++ b/plugins/NewXstatusNotify/src/options.h @@ -40,7 +40,7 @@ typedef struct tagOPTIONS { uint8_t PXOnConnect; uint8_t PXDisableForMusic; uint8_t PXMsgTruncate; - DWORD PXMsgLen; + uint32_t PXMsgLen; // IDD_OPT_GENERAL uint8_t FromOffline; uint8_t AutoDisable; @@ -73,7 +73,7 @@ typedef struct tagOPTIONS { // IDD_OPT_SMPOPUP uint8_t PSMsgOnConnect; uint8_t PSMsgTruncate; - DWORD PSMsgLen; + uint32_t PSMsgLen; // OTHER uint8_t TempDisabled; uint8_t PopupAutoDisabled; diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index 1338e1d031..292de34fd7 100644 --- a/plugins/NewXstatusNotify/src/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp @@ -288,11 +288,11 @@ void LogChangeToDB(XSTATUSCHANGE *xsc) T2Utf blob(stzLogText); DBEVENTINFO dbei = {}; - dbei.cbBlob = (DWORD)mir_strlen(blob) + 1; + dbei.cbBlob = (uint32_t)mir_strlen(blob) + 1; dbei.pBlob = (uint8_t*)(char*)blob; dbei.eventType = EVENTTYPE_STATUSCHANGE; dbei.flags = DBEF_READ | DBEF_UTF; - dbei.timestamp = (DWORD)time(0); + dbei.timestamp = (uint32_t)time(0); dbei.szModule = MODULENAME; MEVENT hDBEvent = db_event_add(xsc->hContact, &dbei); -- cgit v1.2.3