7 files changed, 19 insertions, 19 deletions
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;