diff options
author | George Hazan <ghazan@miranda.im> | 2021-12-26 20:31:39 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2021-12-26 20:31:39 +0300 |
commit | cddcd7483a7c472598af098e759e5d309024f606 (patch) | |
tree | b0a227d6e087c41958cc84d27bc323353248aae5 /src/core | |
parent | 1039b2829a264280493ba0fa979214fe024dc70c (diff) |
DWORD -> uint32_t
Diffstat (limited to 'src/core')
27 files changed, 58 insertions, 58 deletions
diff --git a/src/core/stdautoaway/src/idle.cpp b/src/core/stdautoaway/src/idle.cpp index ff793f4ede..94641ac40a 100644 --- a/src/core/stdautoaway/src/idle.cpp +++ b/src/core/stdautoaway/src/idle.cpp @@ -31,7 +31,7 @@ int IdleOptInit(WPARAM wParam, LPARAM); static int IdleObject_IsUserIdle() { if (g_plugin.bIdleMethod) { - DWORD dwTick = Miranda_GetIdle(); + uint32_t dwTick = Miranda_GetIdle(); return GetTickCount() - dwTick > (g_plugin.iIdleTime1st * 60 * 1000); } diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h index 4471a6ddf2..b44077e280 100644 --- a/src/core/stdautoaway/src/stdafx.h +++ b/src/core/stdautoaway/src/stdafx.h @@ -80,7 +80,7 @@ struct CMPlugin : public PLUGIN<CMPlugin> CMOption<uint8_t> bIdlePrivate, bIdleSoundsOff, bIdleOnTerminal, bIdleStatusLock;
CMOption<uint8_t> bAAEnable;
CMOption<uint16_t> bAAStatus;
- CMOption<DWORD> iIdleTime1st;
+ CMOption<uint32_t> iIdleTime1st;
};
void IdleObject_Destroy();
diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp index 0f3c6032de..d6d0f29663 100644 --- a/src/core/stdaway/src/sendmsg.cpp +++ b/src/core/stdaway/src/sendmsg.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
-DWORD protoModeMsgFlags;
+uint32_t protoModeMsgFlags;
static HWND hwndStatusMsg;
const wchar_t* GetDefaultMessage(int status)
@@ -133,7 +133,7 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar }
if (wParam == 127 && GetKeyState(VK_CONTROL) & 0x8000) //ctrl-backspace
{
- DWORD start, end;
+ uint32_t start, end;
SendMessage(hwnd, EM_GETSEL, (WPARAM)&end, 0);
SendMessage(hwnd, WM_KEYDOWN, VK_LEFT, 0);
SendMessage(hwnd, EM_GETSEL, (WPARAM)&start, 0);
diff --git a/src/core/stdaway/src/stdafx.h b/src/core/stdaway/src/stdafx.h index 1e9dc9a08f..f3749e104a 100644 --- a/src/core/stdaway/src/stdafx.h +++ b/src/core/stdaway/src/stdafx.h @@ -68,7 +68,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MODULENAME "SRAway"
-extern DWORD protoModeMsgFlags;
+extern uint32_t protoModeMsgFlags;
int AwayMsgOptInitialise(WPARAM wParam, LPARAM);
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index 24ebb16c9f..a0bce51c75 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. struct CheckBoxToStyleEx_t
{
int id;
- DWORD flag;
+ uint32_t flag;
int not;
}
@@ -53,7 +53,7 @@ static const checkBoxToStyleEx[] = struct CheckBoxValues_t
{
- DWORD style;
+ uint32_t style;
wchar_t* szDescr;
}
static const greyoutValues[] =
@@ -69,7 +69,7 @@ static const greyoutValues[] = { PF2_INVISIBLE, LPGENW("Invisible") }
};
-static void FillCheckBoxTree(HWND hwndTree, const struct CheckBoxValues_t *values, int nValues, DWORD style)
+static void FillCheckBoxTree(HWND hwndTree, const struct CheckBoxValues_t *values, int nValues, uint32_t style)
{
TVINSERTSTRUCT tvis;
tvis.hParent = nullptr;
@@ -84,9 +84,9 @@ static void FillCheckBoxTree(HWND hwndTree, const struct CheckBoxValues_t *value }
}
-static DWORD MakeCheckBoxTreeFlags(HWND hwndTree)
+static uint32_t MakeCheckBoxTreeFlags(HWND hwndTree)
{
- DWORD flags = 0;
+ uint32_t flags = 0;
TVITEM tvi;
tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_STATE;
@@ -130,7 +130,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), GWL_STYLE,
GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES);
{
- DWORD exStyle = db_get_dw(0, "CLC", "ExStyle", Clist_GetDefaultExStyle());
+ uint32_t exStyle = db_get_dw(0, "CLC", "ExStyle", Clist_GetDefaultExStyle());
for (auto &it : checkBoxToStyleEx)
CheckDlgButton(hwndDlg, it.id, (exStyle & it.flag) ^ (it.flag * it.not) ? BST_CHECKED : BST_UNCHECKED);
}
@@ -217,14 +217,14 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam case 0:
if (((LPNMHDR)lParam)->code == PSN_APPLY) {
- DWORD exStyle = 0;
+ uint32_t exStyle = 0;
for (auto &it : checkBoxToStyleEx)
if ((IsDlgButtonChecked(hwndDlg, it.id) == 0) == it.not)
exStyle |= it.flag;
db_set_dw(0, "CLC", "ExStyle", exStyle);
{
- DWORD fullGreyoutFlags = MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS));
+ uint32_t fullGreyoutFlags = MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS));
db_set_dw(0, "CLC", "FullGreyoutFlags", fullGreyoutFlags);
if (IsDlgButtonChecked(hwndDlg, IDC_GREYOUT))
db_set_dw(0, "CLC", "GreyoutFlags", fullGreyoutFlags);
diff --git a/src/core/stdclist/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp index f967443e37..5aa308ab60 100644 --- a/src/core/stdclist/src/clcpaint.cpp +++ b/src/core/stdclist/src/clcpaint.cpp @@ -91,7 +91,7 @@ static void __inline SetHotTrackColour(HDC hdc, struct ClcData *dat) void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint)
{
- DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE);
+ uint32_t style = GetWindowLongPtr(hwnd, GWL_STYLE);
int status = Clist_GetGeneralizedStatus();
// yes I know about GetSysColorBrush()
COLORREF tmpbkcolour = style & CLS_CONTACTLIST ? (dat->bUseWindowsColours ? GetSysColor(COLOR_3DFACE) : dat->bkColour) : dat->bkColour;
diff --git a/src/core/stdcrypt/src/stdcrypt.h b/src/core/stdcrypt/src/stdcrypt.h index 03a10bcd83..6a0e240b45 100644 --- a/src/core/stdcrypt/src/stdcrypt.h +++ b/src/core/stdcrypt/src/stdcrypt.h @@ -29,8 +29,8 @@ with this program; if not, write to the Free Software Foundation, Inc., struct ExternalKey
{
uint8_t m_key[KEY_LENGTH];
- DWORD m_crc32;
- uint8_t slack[BLOCK_SIZE - sizeof(DWORD)];
+ uint32_t m_crc32;
+ uint8_t slack[BLOCK_SIZE - sizeof(uint32_t)];
};
struct CStdCrypt : public MICryptoEngine, public MZeroedObject
diff --git a/src/core/stdcrypt/src/utils.cpp b/src/core/stdcrypt/src/utils.cpp index bb334edbdb..ab8dbfb95a 100644 --- a/src/core/stdcrypt/src/utils.cpp +++ b/src/core/stdcrypt/src/utils.cpp @@ -31,7 +31,7 @@ bool getRandomBytes(uint8_t *buf, size_t bufLen) ::CryptAcquireContext(&hProvider, nullptr, MS_STRONG_PROV, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT) ||
::CryptAcquireContext(&hProvider, nullptr, nullptr, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
{
- ::CryptGenRandom(hProvider, DWORD(bufLen), buf);
+ ::CryptGenRandom(hProvider, uint32_t(bufLen), buf);
::CryptReleaseContext(hProvider, 0);
}
// no luck? try to use Windows NT RTL
@@ -41,7 +41,7 @@ bool getRandomBytes(uint8_t *buf, size_t bufLen) if (fnGetRandom == nullptr)
return false;
- fnGetRandom(buf, DWORD(bufLen));
+ fnGetRandom(buf, uint32_t(bufLen));
}
return true;
}
diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp index 2a57485eb0..16846c02f0 100644 --- a/src/core/stdfile/src/file.cpp +++ b/src/core/stdfile/src/file.cpp @@ -120,10 +120,10 @@ void PushFileEvent(MCONTACT hContact, MEVENT hdbe, LPARAM lParam) static int FileEventAdded(WPARAM wParam, LPARAM lParam)
{
- DWORD dwSignature;
+ uint32_t dwSignature;
DBEVENTINFO dbei = {};
- dbei.cbBlob = sizeof(DWORD);
+ dbei.cbBlob = sizeof(uint32_t);
dbei.pBlob = (uint8_t*)&dwSignature;
db_event_get(lParam, &dbei);
if (dbei.flags & (DBEF_SENT | DBEF_READ) || dbei.eventType != EVENTTYPE_FILE || dwSignature == 0)
@@ -381,7 +381,7 @@ static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam) szDescr = pre->descr.a;
}
- dbei.cbBlob = sizeof(DWORD);
+ dbei.cbBlob = sizeof(uint32_t);
for (int i = 0; i < pre->fileCount; i++)
dbei.cbBlob += (int)mir_strlen(pszFiles[i]) + 1;
@@ -391,8 +391,8 @@ static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam) if ((dbei.pBlob = (uint8_t*)mir_alloc(dbei.cbBlob)) == nullptr)
return 0;
- *(DWORD*)dbei.pBlob = 0;
- uint8_t* p = dbei.pBlob + sizeof(DWORD);
+ *(uint32_t*)dbei.pBlob = 0;
+ uint8_t* p = dbei.pBlob + sizeof(uint32_t);
for (int i = 0; i < pre->fileCount; i++) {
mir_strcpy((char*)p, pszFiles[i]);
p += mir_strlen(pszFiles[i]) + 1;
diff --git a/src/core/stdfile/src/file.h b/src/core/stdfile/src/file.h index 7b8cce531e..63a71dd8ac 100644 --- a/src/core/stdfile/src/file.h +++ b/src/core/stdfile/src/file.h @@ -63,7 +63,7 @@ struct FileDlgData PROTOFILETRANSFERSTATUS transferStatus;
int *fileVirusScanned;
HANDLE hPreshutdownEvent;
- DWORD dwTicks;
+ uint32_t dwTicks;
wchar_t szSavePath[MAX_PATH];
wchar_t szMsg[450], szFilenames[1024];
diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp index a1e11bafb5..5bfc1f6a9f 100644 --- a/src/core/stdfile/src/filerecvdlg.cpp +++ b/src/core/stdfile/src/filerecvdlg.cpp @@ -35,7 +35,7 @@ static BOOL CALLBACK ClipSiblingsChildEnumProc(HWND hwnd, LPARAM) static void GetLowestExistingDirName(const wchar_t *szTestDir, wchar_t *szExistingDir, int cchExistingDir)
{
- DWORD dwAttributes;
+ uint32_t dwAttributes;
wchar_t *pszLastBackslash;
mir_wstrncpy(szExistingDir, szTestDir, cchExistingDir);
diff --git a/src/core/stdfile/src/filesenddlg.cpp b/src/core/stdfile/src/filesenddlg.cpp index fcd8ed0b9b..fa18e1f532 100644 --- a/src/core/stdfile/src/filesenddlg.cpp +++ b/src/core/stdfile/src/filesenddlg.cpp @@ -73,7 +73,7 @@ static void FilenameToFileList(HWND hwndDlg, FileDlgData* dat, const wchar_t *bu FreeFilesMatrix(&dat->files);
// Get the file attributes of selection
- DWORD dwFileAttributes = GetFileAttributes(buf);
+ uint32_t dwFileAttributes = GetFileAttributes(buf);
if (dwFileAttributes == INVALID_FILE_ATTRIBUTES)
return;
diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp index ed445a5907..454658c147 100644 --- a/src/core/stdfile/src/filexferdlg.cpp +++ b/src/core/stdfile/src/filexferdlg.cpp @@ -82,11 +82,11 @@ void FillSendData(FileDlgData *dat, DBEVENTINFO& dbei) char *szFileNames = mir_utf8encodeW(dat->szFilenames), *szMsg = mir_utf8encodeW(dat->szMsg); dbei.flags |= DBEF_UTF; - dbei.cbBlob = int(sizeof(DWORD) + mir_strlen(szFileNames) + mir_strlen(szMsg) + 2); + dbei.cbBlob = int(sizeof(uint32_t) + mir_strlen(szFileNames) + mir_strlen(szMsg) + 2); dbei.pBlob = (uint8_t*)mir_alloc(dbei.cbBlob); *(PDWORD)dbei.pBlob = 0; - mir_strcpy((char*)dbei.pBlob + sizeof(DWORD), szFileNames); - mir_strcpy((char*)dbei.pBlob + sizeof(DWORD) + mir_strlen(szFileNames) + 1, szMsg); + mir_strcpy((char*)dbei.pBlob + sizeof(uint32_t), szFileNames); + mir_strcpy((char*)dbei.pBlob + sizeof(uint32_t) + mir_strlen(szFileNames) + 1, szMsg); mir_free(szFileNames), mir_free(szMsg); } diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index 62936a6fdb..cd1be53735 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -197,7 +197,7 @@ class COptMainDlg : public CDlgBase return res; } - void FillBranch(HTREEITEM hParent, branch_t *branch, int nValues, DWORD defaultval) + void FillBranch(HTREEITEM hParent, branch_t *branch, int nValues, uint32_t defaultval) { int iState; @@ -235,7 +235,7 @@ class COptMainDlg : public CDlgBase iState |= branch->iMode; if (iState & GC_EVENT_ADDSTATUS) iState |= GC_EVENT_REMOVESTATUS; - db_set_dw(0, CHAT_MODULE, branch->szDBName, (DWORD)iState); + db_set_dw(0, CHAT_MODULE, branch->szDBName, (uint32_t)iState); } else db_set_b(0, CHAT_MODULE, branch->szDBName, bChecked); } diff --git a/src/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp index 50c9302f36..c6d5103d7b 100644 --- a/src/core/stdmsg/src/cmdlist.cpp +++ b/src/core/stdmsg/src/cmdlist.cpp @@ -93,7 +93,7 @@ void msgQueue_processack(MCONTACT hContact, int id, BOOL success, LPARAM lParam) dbei.flags = DBEF_SENT | DBEF_UTF | (p->flags & PREF_RTL ? DBEF_RTL : 0);
dbei.szModule = Proto_GetBaseAccountName(hContact);
dbei.timestamp = time(0);
- dbei.cbBlob = (DWORD)(mir_strlen(p->szMsg) + 1);
+ dbei.cbBlob = (uint32_t)(mir_strlen(p->szMsg) + 1);
dbei.pBlob = (uint8_t*)p->szMsg;
dbei.szId = (char *)lParam;
diff --git a/src/core/stdmsg/src/globals.h b/src/core/stdmsg/src/globals.h index 12d06a65cf..0d33315663 100644 --- a/src/core/stdmsg/src/globals.h +++ b/src/core/stdmsg/src/globals.h @@ -57,9 +57,9 @@ struct GlobalMessageData CMOption<bool> bLimitAvatarHeight;
CMOption<uint16_t> iAvatarHeight;
- CMOption<DWORD> popupFlags;
- CMOption<DWORD> msgTimeout;
- CMOption<DWORD> nFlashMax;
+ CMOption<uint32_t> popupFlags;
+ CMOption<uint32_t> msgTimeout;
+ CMOption<uint32_t> nFlashMax;
CMOption<uint8_t> iGap;
CMOption<uint8_t> iLoadHistory;
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 12746815e4..946ca9c72b 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -172,11 +172,11 @@ bool CMsgDialog::OnInitDialog() case LOADHISTORY_TIME:
DBEVENTINFO dbei = {};
if (m_hDbEventFirst == 0)
- dbei.timestamp = (DWORD)time(0);
+ dbei.timestamp = (uint32_t)time(0);
else
db_event_get(m_hDbEventFirst, &dbei);
- DWORD firstTime = dbei.timestamp - 60 * g_dat.nLoadTime;
+ uint32_t firstTime = dbei.timestamp - 60 * g_dat.nLoadTime;
while (MEVENT hPrevEvent = pCursor.FetchNext()) {
dbei.cbBlob = 0;
db_event_get(hPrevEvent, &dbei);
@@ -1427,7 +1427,7 @@ void CMsgDialog::NotifyTyping(int mode) if (!m_szProto)
return;
- DWORD typeCaps = CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_4, 0);
+ uint32_t typeCaps = CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_4, 0);
if (!(typeCaps & PF4_SUPPORTTYPING))
return;
@@ -1440,7 +1440,7 @@ void CMsgDialog::NotifyTyping(int mode) Chat_DoEventHook(m_si, GC_USER_TYPNOTIFY, 0, 0, m_nTypeMode);
}
else {
- DWORD protoCaps = CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_1, 0);
+ uint32_t protoCaps = CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_1, 0);
if (protoCaps & PF1_VISLIST && db_get_w(m_hContact, m_szProto, "ApparentMode", 0) == ID_STATUS_OFFLINE)
return;
diff --git a/src/core/stdmsg/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp index 73315ce746..147b107caf 100644 --- a/src/core/stdmsg/src/msglog.cpp +++ b/src/core/stdmsg/src/msglog.cpp @@ -306,7 +306,7 @@ static bool CreateRTFFromDbEvent(LogStreamData *dat) case EVENTTYPE_FILE:
{
- char *filename = (char*)dbei.pBlob + sizeof(DWORD);
+ char *filename = (char*)dbei.pBlob + sizeof(uint32_t);
char *descr = filename + mir_strlen(filename) + 1;
SetToStyle(MSGFONTID_NOTICE, buf);
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 6bf23d43fa..cda2453b64 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -128,7 +128,7 @@ void RegisterSRMMFonts(void) struct CheckBoxValues_t
{
- DWORD style;
+ uint32_t style;
wchar_t* szDescr;
}
statusValues[] =
@@ -153,7 +153,7 @@ class COptionMainDlg : public CDlgBase CCtrlTreeView tree;
- void FillCheckBoxTree(DWORD style)
+ void FillCheckBoxTree(uint32_t style)
{
TVINSERTSTRUCT tvis;
tvis.hParent = nullptr;
@@ -168,9 +168,9 @@ class COptionMainDlg : public CDlgBase }
}
- DWORD MakeCheckBoxTreeFlags()
+ uint32_t MakeCheckBoxTreeFlags()
{
- DWORD flags = 0;
+ uint32_t flags = 0;
TVITEMEX tvi;
tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_IMAGE;
@@ -242,7 +242,7 @@ public: {
FillCheckBoxTree(g_dat.popupFlags);
- DWORD msgTimeout = g_dat.msgTimeout;
+ uint32_t msgTimeout = g_dat.msgTimeout;
edtSecs.SetInt((msgTimeout >= 5000) ? msgTimeout / 1000 : 5);
chkCascade.Enable(!g_dat.bSavePerContact);
@@ -254,7 +254,7 @@ public: {
g_dat.popupFlags = MakeCheckBoxTreeFlags();
- DWORD msgTimeout = edtSecs.GetInt() * 1000;
+ uint32_t msgTimeout = edtSecs.GetInt() * 1000;
if (msgTimeout < 5000)
msgTimeout = 5000;
g_dat.msgTimeout = msgTimeout;
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h index 304ada7afb..eac5d63eea 100644 --- a/src/core/stdmsg/src/msgs.h +++ b/src/core/stdmsg/src/msgs.h @@ -73,7 +73,7 @@ class CMsgDialog : public CSrmmBaseDialog void OnType(CTimer *);
CTabbedWindow *m_pOwner;
- DWORD m_nFlash = 0;
+ uint32_t m_nFlash = 0;
char *m_szProto = nullptr;
// splitters
@@ -95,7 +95,7 @@ class CMsgDialog : public CSrmmBaseDialog HFONT m_hFont = nullptr;
int m_limitAvatarH = 0;
- DWORD m_lastMessage = 0;
+ uint32_t m_lastMessage = 0;
HANDLE m_hTimeZone = 0;
uint16_t m_wStatus = ID_STATUS_OFFLINE, m_wOldStatus = ID_STATUS_OFFLINE;
uint16_t m_wMinute = 0;
diff --git a/src/core/stdpopup/src/options.cpp b/src/core/stdpopup/src/options.cpp index adc8283b4e..40c51c372d 100644 --- a/src/core/stdpopup/src/options.cpp +++ b/src/core/stdpopup/src/options.cpp @@ -458,9 +458,9 @@ static INT_PTR CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam mir_snprintf(setting, "%s/Timeout", pc->pszName); g_plugin.setWord(setting, pc->iSeconds); mir_snprintf(setting, "%s/TextCol", pc->pszName); - g_plugin.setDword(setting, (DWORD)pc->colorText); + g_plugin.setDword(setting, (uint32_t)pc->colorText); mir_snprintf(setting, "%s/BgCol", pc->pszName); - g_plugin.setDword(setting, (DWORD)pc->colorBack); + g_plugin.setDword(setting, (uint32_t)pc->colorBack); } return TRUE; } diff --git a/src/core/stdpopup/src/popwin.cpp b/src/core/stdpopup/src/popwin.cpp index a314f61730..a9fd8ee2d9 100644 --- a/src/core/stdpopup/src/popwin.cpp +++ b/src/core/stdpopup/src/popwin.cpp @@ -3,7 +3,7 @@ #define ID_CLOSETIMER 0x0101 #define ID_MOVETIMER 0x0102 -DWORD pop_start_x, pop_start_y; +uint32_t pop_start_x, pop_start_y; int global_mouse_in = 0; void trimW(wchar_t *str) @@ -222,7 +222,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa if (pwd->custom_col) { pwd->bkBrush = CreateSolidBrush(pd->colorBack); - DWORD darkBg = pd->colorBack - ((pd->colorBack >> 2) & 0x3f3f3f); // 3/4 of current individual RGB components + uint32_t darkBg = pd->colorBack - ((pd->colorBack >> 2) & 0x3f3f3f); // 3/4 of current individual RGB components pwd->barBrush = CreateSolidBrush(darkBg); // make sidebar a dark version of the bg pwd->underlineBrush = CreateSolidBrush(pd->colorBack); // make sidebar a dark version of the bg } diff --git a/src/core/stdpopup/src/services.cpp b/src/core/stdpopup/src/services.cpp index e6a1be8e7b..b743e173df 100644 --- a/src/core/stdpopup/src/services.cpp +++ b/src/core/stdpopup/src/services.cpp @@ -306,9 +306,9 @@ static INT_PTR RegisterPopupClass(WPARAM, LPARAM lParam) pc->iSeconds = g_plugin.getWord(setting, pc->iSeconds); if (pc->iSeconds == (uint16_t)-1) pc->iSeconds = -1; mir_snprintf(setting, "%s/TextCol", pc->pszName); - pc->colorText = (COLORREF)g_plugin.getDword(setting, (DWORD)pc->colorText); + pc->colorText = (COLORREF)g_plugin.getDword(setting, (uint32_t)pc->colorText); mir_snprintf(setting, "%s/BgCol", pc->pszName); - pc->colorBack = (COLORREF)g_plugin.getDword(setting, (DWORD)pc->colorBack); + pc->colorBack = (COLORREF)g_plugin.getDword(setting, (uint32_t)pc->colorBack); arClasses.insert(pc); return (INT_PTR)pc; diff --git a/src/core/stdpopup/src/yapp_history.h b/src/core/stdpopup/src/yapp_history.h index 89c7957166..f824862bf7 100644 --- a/src/core/stdpopup/src/yapp_history.h +++ b/src/core/stdpopup/src/yapp_history.h @@ -36,7 +36,7 @@ struct PopupHistoryData { - DWORD flags; //PHDF_* flags + uint32_t flags; //PHDF_* flags wchar_t *messageW; wchar_t *titleW; time_t timestamp; diff --git a/src/core/stdpopup/src/yapp_history_dlg.cpp b/src/core/stdpopup/src/yapp_history_dlg.cpp index 0e51efb3af..ff8fd4122b 100644 --- a/src/core/stdpopup/src/yapp_history_dlg.cpp +++ b/src/core/stdpopup/src/yapp_history_dlg.cpp @@ -306,7 +306,7 @@ IEVIEWEVENTDATA *CreateAndFillEventData(PopupHistoryData *popupItem) eventData->szNick.w = popupItem->titleW; eventData->szText.w = popupItem->messageW; - eventData->time = (DWORD)popupItem->timestamp; + eventData->time = (uint32_t)popupItem->timestamp; eventData->next = nullptr; } diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp index 1ff026c4c3..025502f5fb 100644 --- a/src/core/stduserinfo/src/userinfo.cpp +++ b/src/core/stduserinfo/src/userinfo.cpp @@ -47,7 +47,7 @@ struct DetailsPageData : public MNonCopyable HTREEITEM hItem;
HPLUGIN pPlugin;
int changed;
- DWORD dwFlags;
+ uint32_t dwFlags;
wchar_t *pwszTitle, *pwszTab;
~DetailsPageData()
diff --git a/src/core/stduseronline/src/useronline.cpp b/src/core/stduseronline/src/useronline.cpp index 173269f7f4..1c85295e37 100644 --- a/src/core/stduseronline/src/useronline.cpp +++ b/src/core/stduseronline/src/useronline.cpp @@ -47,7 +47,7 @@ static int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam) }
if ((newStatus == ID_STATUS_ONLINE || newStatus == ID_STATUS_FREECHAT) && oldStatus != ID_STATUS_ONLINE && oldStatus != ID_STATUS_FREECHAT) {
- DWORD ticked = g_plugin.getDword(cws->szModule, GetTickCount());
+ uint32_t ticked = g_plugin.getDword(cws->szModule, GetTickCount());
// only play the sound (or show event) if this event happens at least 10 secs after the proto went from offline
if (GetTickCount() - ticked > (1000 * 10)) {
wchar_t tooltip[256];
|