DWORD -> uint32_t

21 files changed, 175 insertions, 175 deletions

diff --git a/src/mir_core/src/Windows/CCtrlClc.cpp b/src/mir_core/src/Windows/CCtrlClc.cpp
index 8dfbfc5f06..ae9c80dbba 100644
--- a/src/mir_core/src/Windows/CCtrlClc.cpp
+++ b/src/mir_core/src/Windows/CCtrlClc.cpp
@@ -77,7 +77,7 @@ void CCtrlClc::EnsureVisible(HANDLE hItem, bool partialOk)
 {	SendMessage(m_hwnd, CLM_ENSUREVISIBLE, (WPARAM)hItem, partialOk ? TRUE : FALSE);
 }
 
-void CCtrlClc::Expand(HANDLE hItem, DWORD flags)
+void CCtrlClc::Expand(HANDLE hItem, uint32_t flags)
 {	SendMessage(m_hwnd, CLM_EXPAND, (WPARAM)hItem, flags);
 }
 
@@ -105,7 +105,7 @@ HWND CCtrlClc::GetEditControl() const
 {	return (HWND)SendMessage(m_hwnd, CLM_GETEDITCONTROL, 0, 0);
 }
 
-DWORD CCtrlClc::GetExpand(HANDLE hItem) const
+uint32_t CCtrlClc::GetExpand(HANDLE hItem) const
 {	return SendMessage(m_hwnd, CLM_GETEXPAND, (WPARAM)hItem, 0);
 }
 
@@ -130,7 +130,7 @@ HANDLE CCtrlClc::GetSelection() const
 {	return (HANDLE)SendMessage(m_hwnd, CLM_GETSELECTION, 0, 0);
 }
 
-HANDLE CCtrlClc::HitTest(int x, int y, DWORD *hitTest) const
+HANDLE CCtrlClc::HitTest(int x, int y, uint32_t *hitTest) const
 {	return (HANDLE)SendMessage(m_hwnd, CLM_HITTEST, (WPARAM)hitTest, MAKELPARAM(x,y));
 }
 
@@ -182,15 +182,15 @@ void CCtrlClc::SetUseGroups(bool state)
 {	SendMessage(m_hwnd, CLM_SETUSEGROUPS, state ? 1 : 0, 0);
 }
 
-void CCtrlClc::SetOfflineModes(DWORD modes)
+void CCtrlClc::SetOfflineModes(uint32_t modes)
 {	SendMessage(m_hwnd, CLM_SETOFFLINEMODES, modes, 0);
 }
 
-DWORD CCtrlClc::GetExStyle() const
+uint32_t CCtrlClc::GetExStyle() const
 {	return SendMessage(m_hwnd, CLM_GETEXSTYLE, 0, 0);
 }
 
-void CCtrlClc::SetExStyle(DWORD exStyle)
+void CCtrlClc::SetExStyle(uint32_t exStyle)
 {	SendMessage(m_hwnd, CLM_SETEXSTYLE, (WPARAM)exStyle, 0);
 }
 
@@ -202,6 +202,6 @@ int CCtrlClc::GetItemType(HANDLE hItem) const
 {	return SendMessage(m_hwnd, CLM_GETITEMTYPE, (WPARAM)hItem, 0);
 }
 
-HANDLE CCtrlClc::GetNextItem(HANDLE hItem, DWORD flags) const
+HANDLE CCtrlClc::GetNextItem(HANDLE hItem, uint32_t flags) const
 {	return (HANDLE)SendMessage(m_hwnd, CLM_GETNEXTITEM, (WPARAM)flags, (LPARAM)hItem);
 }
diff --git a/src/mir_core/src/Windows/CCtrlColor.cpp b/src/mir_core/src/Windows/CCtrlColor.cpp
index 47a49308df..de7371ef96 100644
--- a/src/mir_core/src/Windows/CCtrlColor.cpp
+++ b/src/mir_core/src/Windows/CCtrlColor.cpp
@@ -50,12 +50,12 @@ void CCtrlColor::OnReset()
 		SetColor(LoadInt());
 }
 
-DWORD CCtrlColor::GetColor()
+uint32_t CCtrlColor::GetColor()
 {
    return ::SendMessage(m_hwnd, CPM_GETCOLOUR, 0, 0);
 }
 
-void CCtrlColor::SetColor(DWORD dwValue)
+void CCtrlColor::SetColor(uint32_t dwValue)
 {
    ::SendMessage(m_hwnd, CPM_SETCOLOUR, 0, dwValue);
 }
diff --git a/src/mir_core/src/Windows/CCtrlData.cpp b/src/mir_core/src/Windows/CCtrlData.cpp
index ed6f1f194f..a2cd052054 100644
--- a/src/mir_core/src/Windows/CCtrlData.cpp
+++ b/src/mir_core/src/Windows/CCtrlData.cpp
@@ -41,7 +41,7 @@ void CCtrlData::OnInit()
 	OnReset();
 }
 
-void CCtrlData::CreateDbLink(const char* szModuleName, const char* szSetting, uint8_t type, DWORD iValue)
+void CCtrlData::CreateDbLink(const char* szModuleName, const char* szSetting, uint8_t type, uint32_t iValue)
 {
 	m_dbLink = new CDbLink(szModuleName, szSetting, type, iValue);
 }
diff --git a/src/mir_core/src/Windows/CCtrlListView.cpp b/src/mir_core/src/Windows/CCtrlListView.cpp
index e6ca1276ce..7f0d188b1c 100644
--- a/src/mir_core/src/Windows/CCtrlListView.cpp
+++ b/src/mir_core/src/Windows/CCtrlListView.cpp
@@ -210,7 +210,7 @@ void CCtrlListView::GetCaretPos(CContextMenuPos &pos) const
 }
 
 // classic api
-DWORD CCtrlListView::ApproximateViewRect(int cx, int cy, int iCount)
+uint32_t CCtrlListView::ApproximateViewRect(int cx, int cy, int iCount)
 {	return ListView_ApproximateViewRect(m_hwnd, cx, cy, iCount);
 }
 void CCtrlListView::Arrange(UINT code)
@@ -270,7 +270,7 @@ int CCtrlListView::GetCountPerPage() const
 HWND CCtrlListView::GetEditControl() const
 {	return ListView_GetEditControl(m_hwnd);
 }
-DWORD CCtrlListView::GetExtendedListViewStyle() const
+uint32_t CCtrlListView::GetExtendedListViewStyle() const
 {	return ListView_GetExtendedListViewStyle(m_hwnd);
 }
 void CCtrlListView::GetGroupMetrics(LVGROUPMETRICS *pGroupMetrics) const
@@ -285,7 +285,7 @@ HCURSOR CCtrlListView::GetHotCursor() const
 INT CCtrlListView::GetHotItem() const
 {	return ListView_GetHotItem(m_hwnd);
 }
-DWORD CCtrlListView::GetHoverTime() const
+uint32_t CCtrlListView::GetHoverTime() const
 {	return ListView_GetHoverTime(m_hwnd);
 }
 HIMAGELIST CCtrlListView::GetImageList(int iImageList) const
@@ -315,7 +315,7 @@ void CCtrlListView::GetItemPosition(int i, POINT *ppt) const
 void CCtrlListView::GetItemRect(int i, RECT *prc, int code) const
 {	ListView_GetItemRect(m_hwnd, i, prc, code);
 }
-DWORD CCtrlListView::GetItemSpacing(BOOL fSmall) const
+uint32_t CCtrlListView::GetItemSpacing(BOOL fSmall) const
 {	return ListView_GetItemSpacing(m_hwnd, fSmall);
 }
 UINT CCtrlListView::GetItemState(int i, UINT mask) const
@@ -372,7 +372,7 @@ int CCtrlListView::GetTopIndex() const
 BOOL CCtrlListView::GetUnicodeFormat() const
 {	return ListView_GetUnicodeFormat(m_hwnd);
 }
-DWORD CCtrlListView::GetView() const
+uint32_t CCtrlListView::GetView() const
 {	return ListView_GetView(m_hwnd);
 }
 BOOL CCtrlListView::GetViewRect(RECT *prc) const
@@ -444,10 +444,10 @@ BOOL CCtrlListView::SetColumnOrderArray(int iCount, int *lpiArray)
 BOOL CCtrlListView::SetColumnWidth(int iCol, int cx)
 {	return ListView_SetColumnWidth(m_hwnd, iCol, cx);
 }
-void CCtrlListView::SetExtendedListViewStyle(DWORD dwExStyle)
+void CCtrlListView::SetExtendedListViewStyle(uint32_t dwExStyle)
 {	ListView_SetExtendedListViewStyle(m_hwnd, dwExStyle);
 }
-void CCtrlListView::SetExtendedListViewStyleEx(DWORD dwExMask, DWORD dwExStyle)
+void CCtrlListView::SetExtendedListViewStyleEx(uint32_t dwExMask, uint32_t dwExStyle)
 {	ListView_SetExtendedListViewStyleEx(m_hwnd, dwExMask, dwExStyle);
 }
 int CCtrlListView::SetGroupInfo(int iGroupId, PLVGROUP pgrp)
@@ -462,10 +462,10 @@ HCURSOR CCtrlListView::SetHotCursor(HCURSOR hCursor)
 INT CCtrlListView::SetHotItem(INT iIndex)
 {	return ListView_SetHotItem(m_hwnd, iIndex);
 }
-void CCtrlListView::SetHoverTime(DWORD dwHoverTime)
+void CCtrlListView::SetHoverTime(uint32_t dwHoverTime)
 {	ListView_SetHoverTime(m_hwnd, dwHoverTime);
 }
-DWORD CCtrlListView::SetIconSpacing(int cx, int cy)
+uint32_t CCtrlListView::SetIconSpacing(int cx, int cy)
 {	return ListView_SetIconSpacing(m_hwnd, cx, cy);
 }
 HIMAGELIST CCtrlListView::SetImageList(HIMAGELIST himl, int iImageList)
@@ -486,7 +486,7 @@ BOOL CCtrlListView::SetItem(const LVITEM *pitem)
 void CCtrlListView::SetItemCount(int cItems)
 {	ListView_SetItemCount(m_hwnd, cItems);
 }
-void CCtrlListView::SetItemCountEx(int cItems, DWORD dwFlags)
+void CCtrlListView::SetItemCountEx(int cItems, uint32_t dwFlags)
 {	ListView_SetItemCountEx(m_hwnd, cItems, dwFlags);
 }
 BOOL CCtrlListView::SetItemPosition(int i, int x, int y)
@@ -528,7 +528,7 @@ HWND CCtrlListView::SetToolTips(HWND ToolTip)
 BOOL CCtrlListView::SetUnicodeFormat(BOOL fUnicode)
 {	return ListView_SetUnicodeFormat(m_hwnd, fUnicode);
 }
-int CCtrlListView::SetView(DWORD iView)
+int CCtrlListView::SetView(uint32_t iView)
 {	return ListView_SetView(m_hwnd, iView);
 }
 void CCtrlListView::SetWorkAreas(INT nWorkAreas, LPRECT lprc)
diff --git a/src/mir_core/src/Windows/CCtrlRichEdit.cpp b/src/mir_core/src/Windows/CCtrlRichEdit.cpp
index 3f0f96fc1c..0614be90ba 100644
--- a/src/mir_core/src/Windows/CCtrlRichEdit.cpp
+++ b/src/mir_core/src/Windows/CCtrlRichEdit.cpp
@@ -68,7 +68,7 @@ int CCtrlRichEdit::SetRichTextRtf(const char *text)
 
 static DWORD CALLBACK MessageStreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb)
 {
-	static DWORD dwRead;
+	static uint32_t dwRead;
 	char **ppText = (char **)dwCookie;
 
 	if (*ppText == nullptr) {
@@ -92,7 +92,7 @@ static DWORD CALLBACK MessageStreamCallback(DWORD_PTR dwCookie, LPBYTE pbBuff, L
 char* CCtrlRichEdit::GetRichTextRtf(bool bText, bool bSelection) const
 {
 	char *pszText = nullptr;
-	DWORD dwFlags = SF_USECODEPAGE | (CP_UTF8 << 16);
+	uint32_t dwFlags = SF_USECODEPAGE | (CP_UTF8 << 16);
 	if (bText)
 		dwFlags |= SF_TEXT;
 	else
diff --git a/src/mir_core/src/Windows/CCtrlTreeView.cpp b/src/mir_core/src/Windows/CCtrlTreeView.cpp
index 08b4d57d7b..0ed9057275 100644
--- a/src/mir_core/src/Windows/CCtrlTreeView.cpp
+++ b/src/mir_core/src/Windows/CCtrlTreeView.cpp
@@ -608,7 +608,7 @@ void CCtrlTreeView::EnsureVisible(HTREEITEM hItem)
 {	TreeView_EnsureVisible(m_hwnd, hItem);
 }
 
-void CCtrlTreeView::Expand(HTREEITEM hItem, DWORD flag)
+void CCtrlTreeView::Expand(HTREEITEM hItem, uint32_t flag)
 {	TreeView_Expand(m_hwnd, hItem, flag);
 }
 
@@ -616,7 +616,7 @@ COLORREF CCtrlTreeView::GetBkColor() const
 {	return TreeView_GetBkColor(m_hwnd);
 }
 
-DWORD CCtrlTreeView::GetCheckState(HTREEITEM hItem) const
+uint32_t CCtrlTreeView::GetCheckState(HTREEITEM hItem) const
 {	return TreeView_GetCheckState(m_hwnd, hItem);
 }
 
@@ -664,7 +664,7 @@ void CCtrlTreeView::GetItemRect(HTREEITEM hItem, RECT *rcItem, BOOL fItemRect) c
 {	TreeView_GetItemRect(m_hwnd, hItem, rcItem, fItemRect);
 }
 
-DWORD CCtrlTreeView::GetItemState(HTREEITEM hItem, DWORD stateMask) const
+uint32_t CCtrlTreeView::GetItemState(HTREEITEM hItem, uint32_t stateMask) const
 {	return TreeView_GetItemState(m_hwnd, hItem, stateMask);
 }
 
@@ -676,7 +676,7 @@ COLORREF CCtrlTreeView::GetLineColor() const
 {	return TreeView_GetLineColor(m_hwnd);
 }
 
-HTREEITEM CCtrlTreeView::GetNextItem(HTREEITEM hItem, DWORD flag) const
+HTREEITEM CCtrlTreeView::GetNextItem(HTREEITEM hItem, uint32_t flag) const
 {	return TreeView_GetNextItem(m_hwnd, hItem, flag);
 }
 
@@ -704,7 +704,7 @@ HTREEITEM CCtrlTreeView::GetRoot() const
 {	return TreeView_GetRoot(m_hwnd);
 }
 
-DWORD CCtrlTreeView::GetScrollTime() const
+uint32_t CCtrlTreeView::GetScrollTime() const
 {	return TreeView_GetScrollTime(m_hwnd);
 }
 
@@ -736,7 +736,7 @@ HTREEITEM CCtrlTreeView::InsertItem(TVINSERTSTRUCT *tvis)
 {	return TreeView_InsertItem(m_hwnd, tvis);
 }
 
-void CCtrlTreeView::Select(HTREEITEM hItem, DWORD flag)
+void CCtrlTreeView::Select(HTREEITEM hItem, uint32_t flag)
 {	TreeView_Select(m_hwnd, hItem, flag);
 }
 
@@ -756,7 +756,7 @@ COLORREF CCtrlTreeView::SetBkColor(COLORREF clBack)
 {	return TreeView_SetBkColor(m_hwnd, clBack);
 }
 
-void CCtrlTreeView::SetCheckState(HTREEITEM hItem, DWORD state)
+void CCtrlTreeView::SetCheckState(HTREEITEM hItem, uint32_t state)
 {	TreeView_SetCheckState(m_hwnd, hItem, state);
 }
 
@@ -784,7 +784,7 @@ void CCtrlTreeView::SetItemHeight(short cyItem)
 {	TreeView_SetItemHeight(m_hwnd, cyItem);
 }
 
-void CCtrlTreeView::SetItemState(HTREEITEM hItem, DWORD state, DWORD stateMask)
+void CCtrlTreeView::SetItemState(HTREEITEM hItem, uint32_t state, uint32_t stateMask)
 {	TreeView_SetItemState(m_hwnd, hItem, state, stateMask);
 }
 
diff --git a/src/mir_core/src/Windows/CDbLink.cpp b/src/mir_core/src/Windows/CDbLink.cpp
index 4712550170..157c85ff52 100644
--- a/src/mir_core/src/Windows/CDbLink.cpp
+++ b/src/mir_core/src/Windows/CDbLink.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 /////////////////////////////////////////////////////////////////////////////////////////
 // CDbLink class
 
-CDbLink::CDbLink(const char *szModule, const char *szSetting, uint8_t type, DWORD iValue)
+CDbLink::CDbLink(const char *szModule, const char *szSetting, uint8_t type, uint32_t iValue)
 	: CDataLink(type)
 {
 	m_szModule = mir_strdup(szModule);
@@ -54,7 +54,7 @@ CDbLink::~CDbLink()
 		db_free(&dbv);
 }
 
-DWORD CDbLink::LoadInt()
+uint32_t CDbLink::LoadInt()
 {
 	switch (m_type) {
 		case DBVT_BYTE:  return db_get_b(0, m_szModule, m_szSetting, m_iDefault);
@@ -64,7 +64,7 @@ DWORD CDbLink::LoadInt()
 	}
 }
 
-void CDbLink::SaveInt(DWORD value)
+void CDbLink::SaveInt(uint32_t value)
 {
 	switch (m_type) {
 		case DBVT_BYTE:  db_set_b(0, m_szModule, m_szSetting, (uint8_t)value); break;
diff --git a/src/mir_core/src/Windows/CDlgBase.cpp b/src/mir_core/src/Windows/CDlgBase.cpp
index 2a1dfd4140..9048faf9fa 100644
--- a/src/mir_core/src/Windows/CDlgBase.cpp
+++ b/src/mir_core/src/Windows/CDlgBase.cpp
@@ -151,7 +151,7 @@ void CDlgBase::Show(int nCmdShow)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-void CDlgBase::CreateLink(CCtrlData& ctrl, const char *szSetting, uint8_t type, DWORD iValue)
+void CDlgBase::CreateLink(CCtrlData& ctrl, const char *szSetting, uint8_t type, uint32_t iValue)
 {
 	ctrl.CreateDbLink(m_pPlugin.getModule(), szSetting, type, iValue);
 }
diff --git a/src/mir_core/src/Windows/langpack.cpp b/src/mir_core/src/Windows/langpack.cpp
index e43a2c1b33..c509acfcda 100644
--- a/src/mir_core/src/Windows/langpack.cpp
+++ b/src/mir_core/src/Windows/langpack.cpp
@@ -41,7 +41,7 @@ static BOOL bModuleInitialized = FALSE;
 
 struct LangPackEntry
 {
-	DWORD englishHash;
+	uint32_t englishHash;
 	char *szLocal;
 	char *utfLocal;
 	wchar_t *wszLocal;
@@ -413,7 +413,7 @@ MIR_CORE_DLL(int) LoadLangPack(const wchar_t *ptszLangPack)
 	langPack.flags = 0;
 
 	// exists & not a directory?
-	DWORD dwAttrib = GetFileAttributes(tszFullPath);
+	uint32_t dwAttrib = GetFileAttributes(tszFullPath);
 	if (dwAttrib == INVALID_FILE_ATTRIBUTES || (dwAttrib & FILE_ATTRIBUTE_DIRECTORY))
 		return 3;
 
@@ -621,7 +621,7 @@ MIR_CORE_DLL(void) Langpack_SortDuplicates(void)
 		return;
 
 	LangPackEntry *s = g_pEntries + 1, *d = s, *pLast = g_pEntries;
-	DWORD dwSavedHash = g_pEntries->englishHash;
+	uint32_t dwSavedHash = g_pEntries->englishHash;
 	bool bSortNeeded = false;
 
 	for (int i = 1; i < g_entryCount; i++, s++) {
diff --git a/src/mir_core/src/Windows/miranda.cpp b/src/mir_core/src/Windows/miranda.cpp
index ba7ac7bf96..15bd65d660 100644
--- a/src/mir_core/src/Windows/miranda.cpp
+++ b/src/mir_core/src/Windows/miranda.cpp
@@ -43,7 +43,7 @@ HINSTANCE g_hInst = nullptr;
 
 HCURSOR g_hCursorNS, g_hCursorWE;
 HANDLE hThreadQueueEmpty;
-DWORD mir_tls = 0;
+uint32_t mir_tls = 0;
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
@@ -133,7 +133,7 @@ MIR_CORE_DLL(void) UnloadCoreModule(void)
 /////////////////////////////////////////////////////////////////////////////////////////
 // entry point
 
-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID)
+BOOL WINAPI DllMain(HINSTANCE hinstDLL, uint32_t fdwReason, LPVOID)
 {
 	if (fdwReason == DLL_PROCESS_ATTACH) {
 		g_hInst = hinstDLL;
diff --git a/src/mir_core/src/Windows/path.cpp b/src/mir_core/src/Windows/path.cpp
index a09c44a1cb..18c012a77b 100644
--- a/src/mir_core/src/Windows/path.cpp
+++ b/src/mir_core/src/Windows/path.cpp
@@ -102,7 +102,7 @@ MIR_CORE_DLL(int) CreateDirectoryTree(const char *szDir)
 	if (szDir == nullptr)
 		return 1;
 
-	DWORD dwAttributes = GetFileAttributesA(szDir);
+	uint32_t dwAttributes = GetFileAttributesA(szDir);
 	if (dwAttributes != INVALID_FILE_ATTRIBUTES && (dwAttributes & FILE_ATTRIBUTE_DIRECTORY))
 		return 0;
 
@@ -191,7 +191,7 @@ MIR_CORE_DLL(int) CreateDirectoryTreeW(const wchar_t *szDir)
 	if (szDir == nullptr)
 		return 1;
 
-	DWORD dwAttributes = GetFileAttributesW(szDir);
+	uint32_t dwAttributes = GetFileAttributesW(szDir);
 	if (dwAttributes != INVALID_FILE_ATTRIBUTES && (dwAttributes & FILE_ATTRIBUTE_DIRECTORY))
 		return 0;
 
diff --git a/src/mir_core/src/Windows/resizer.cpp b/src/mir_core/src/Windows/resizer.cpp
index 1c4ed5631e..46e4b48e85 100644
--- a/src/mir_core/src/Windows/resizer.cpp
+++ b/src/mir_core/src/Windows/resizer.cpp
@@ -28,20 +28,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 struct START_OF_DLGITEMTEMPLATEEX
 {
-	DWORD  helpID;
-	DWORD  exStyle;
-	DWORD  style;
+	uint32_t  helpID;
+	uint32_t  exStyle;
+	uint32_t  style;
 	short  x, y, cx, cy;
-	DWORD  id;
+	uint32_t  id;
 };
 
 struct START_OF_DLGTEMPLATEEX
 {
 	uint16_t   dlgVer;
 	uint16_t   signature;
-	DWORD  helpID;
-	DWORD  exStyle;
-	DWORD  style;
+	uint32_t  helpID;
+	uint32_t  exStyle;
+	uint32_t  style;
 	uint16_t   cDlgItems;
 	short  x, y, cx, cy;
 };
diff --git a/src/mir_core/src/Windows/threads.cpp b/src/mir_core/src/Windows/threads.cpp
index fdd9f5e85f..1134533877 100644
--- a/src/mir_core/src/Windows/threads.cpp
+++ b/src/mir_core/src/Windows/threads.cpp
@@ -42,7 +42,7 @@ static int MirandaWaitForMutex(HANDLE hEvent)
 {
 	// will get WAIT_IO_COMPLETE for QueueUserAPC() which isnt a result
 	for (;;) {
-		DWORD rc = MsgWaitForMultipleObjectsEx(1, &hEvent, INFINITE, QS_ALLINPUT, MWMO_ALERTABLE);
+		uint32_t rc = MsgWaitForMultipleObjectsEx(1, &hEvent, INFINITE, QS_ALLINPUT, MWMO_ALERTABLE);
 		if (rc == WAIT_OBJECT_0 + 1) {
 			MSG msg;
 			while (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) {
@@ -63,7 +63,7 @@ static int MirandaWaitForMutex(HANDLE hEvent)
 /////////////////////////////////////////////////////////////////////////////////////////
 // exception handling
 
-static DWORD __cdecl sttDefaultFilter(DWORD, EXCEPTION_POINTERS*)
+static uint32_t __cdecl sttDefaultFilter(uint32_t, EXCEPTION_POINTERS*)
 {
 	return EXCEPTION_EXECUTE_HANDLER;
 }
@@ -88,7 +88,7 @@ MIR_CORE_DLL(pfnExceptionFilter) SetExceptionFilter(pfnExceptionFilter _mirandaE
 
 struct THREAD_WAIT_ENTRY
 {
-	DWORD dwThreadId;	// valid if hThread isn't signalled
+	uint32_t dwThreadId;	// valid if hThread isn't signalled
 	HANDLE hThread;
 	HINSTANCE hOwner;
 	void *pObject, *pEntryPoint;
@@ -146,7 +146,7 @@ MIR_CORE_DLL(HANDLE) mir_forkthread(void(__cdecl *threadcode)(void*), void *arg)
 /////////////////////////////////////////////////////////////////////////////////////////
 // forkthreadex - starts a new thread with the extended info and returns the thread id
 
-DWORD WINAPI forkthreadex_r(void * arg)
+DWORD WINAPI forkthreadex_r(void *arg)
 {
 	struct FORK_ARG *fa = (struct FORK_ARG *)arg;
 	pThreadFuncEx threadcode = fa->threadcodeex;
@@ -249,7 +249,7 @@ MIR_CORE_DLL(void) KillObjectThreads(void* owner)
 	if (owner == nullptr)
 		return;
 
-	DWORD dwTicks = GetTickCount() + 6000;
+	uint32_t dwTicks = GetTickCount() + 6000;
 	HANDLE hThread = mir_forkthread(KillObjectThreadsWorker, owner);
 	while (GetTickCount() < dwTicks) {
 		int res = MsgWaitForMultipleObjectsEx(1, &hThread, 50, QS_ALLPOSTMESSAGE | QS_ALLINPUT, MWMO_ALERTABLE);
@@ -350,7 +350,7 @@ MIR_CORE_DLL(INT_PTR) Thread_Push(HINSTANCE hInst, void* pOwner)
 
 MIR_CORE_DLL(INT_PTR) Thread_Pop()
 {
-	DWORD dwThreadId = GetCurrentThreadId();
+	uint32_t dwThreadId = GetCurrentThreadId();
 
 	mir_cslock lck(csThreads);
 	THREAD_WAIT_ENTRY *p = threads.find((THREAD_WAIT_ENTRY*)&dwThreadId);
@@ -372,15 +372,15 @@ MIR_CORE_DLL(INT_PTR) Thread_Pop()
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-const DWORD MS_VC_EXCEPTION=0x406D1388;
+const uint32_t MS_VC_EXCEPTION=0x406D1388;
 
 #pragma pack(push,8)
 typedef struct tagTHREADNAME_INFO
 {
-	DWORD dwType; // Must be 0x1000.
+	uint32_t dwType; // Must be 0x1000.
 	LPCSTR szName; // Pointer to name (in user addr space).
-	DWORD dwThreadID; // Thread ID (-1=caller thread).
-	DWORD dwFlags; // Reserved for future use, must be zero.
+	uint32_t dwThreadID; // Thread ID (-1=caller thread).
+	uint32_t dwFlags; // Reserved for future use, must be zero.
 } THREADNAME_INFO;
 #pragma pack(pop)
 
diff --git a/src/mir_core/src/Windows/timezones.cpp b/src/mir_core/src/Windows/timezones.cpp
index 8de5704d30..1627c40ad6 100644
--- a/src/mir_core/src/Windows/timezones.cpp
+++ b/src/mir_core/src/Windows/timezones.cpp
@@ -27,7 +27,7 @@ simple UTC offsets.
 
 #include "../stdafx.h"
 
-typedef DWORD 	(WINAPI *pfnGetDynamicTimeZoneInformation_t)(DYNAMIC_TIME_ZONE_INFORMATION *pdtzi);
+typedef uint32_t 	(WINAPI *pfnGetDynamicTimeZoneInformation_t)(DYNAMIC_TIME_ZONE_INFORMATION *pdtzi);
 static pfnGetDynamicTimeZoneInformation_t pfnGetDynamicTimeZoneInformation;
 
 struct REG_TZI_FORMAT
@@ -58,7 +58,7 @@ struct MIM_TIMEZONE
 
 struct TZ_INT_INFO
 {
-	DWORD timestamp;  // last time updated
+	uint32_t timestamp;  // last time updated
 	MIM_TIMEZONE myTZ;   // set to my own timezone
 };
 
@@ -71,7 +71,7 @@ static LIST<MIM_TIMEZONE>     g_timezonesBias(55, MIM_TIMEZONE::compareBias);
 void UnixTimeToFileTime(mir_time ts, LPFILETIME pft)
 {
 	unsigned __int64 ll = UInt32x32To64(ts, 10000000) + 116444736000000000i64;
-	pft->dwLowDateTime = (DWORD)ll;
+	pft->dwLowDateTime = (uint32_t)ll;
 	pft->dwHighDateTime = ll >> 32;
 }
 
@@ -89,7 +89,7 @@ void FormatTime(const SYSTEMTIME *st, const wchar_t *szFormat, wchar_t *szDest,
 	CMStringW tszTemp;
 
 	for (const wchar_t* pFormat = szFormat; *pFormat; ++pFormat) {
-		DWORD fmt = 0;
+		uint32_t fmt = 0;
 		bool date = false, iso = false;
 		switch (*pFormat) {
 		case 't':
@@ -211,7 +211,7 @@ static bool IsSameTime(MIM_TIMEZONE *tz)
 	return st.wHour == stl.wHour && st.wMinute == stl.wMinute;
 }
 
-MIR_CORE_DLL(HANDLE) TimeZone_CreateByName(LPCTSTR tszName, DWORD dwFlags)
+MIR_CORE_DLL(HANDLE) TimeZone_CreateByName(LPCTSTR tszName, uint32_t dwFlags)
 {
 	if (tszName == nullptr)
 		return (dwFlags & (TZF_DIFONLY | TZF_KNOWNONLY)) ? nullptr : &myInfo.myTZ;
@@ -232,7 +232,7 @@ MIR_CORE_DLL(HANDLE) TimeZone_CreateByName(LPCTSTR tszName, DWORD dwFlags)
 	return tz;
 }
 
-MIR_CORE_DLL(HANDLE) TimeZone_CreateByContact(MCONTACT hContact, LPCSTR szModule, DWORD dwFlags)
+MIR_CORE_DLL(HANDLE) TimeZone_CreateByContact(MCONTACT hContact, LPCSTR szModule, uint32_t dwFlags)
 {
 	if (hContact == NULL && szModule == nullptr)
 		return (dwFlags & (TZF_DIFONLY | TZF_KNOWNONLY)) ? nullptr : &myInfo.myTZ;
@@ -300,7 +300,7 @@ MIR_CORE_DLL(void) TimeZone_StoreByContact(MCONTACT hContact, LPCSTR szModule, H
 	}
 }
 
-MIR_CORE_DLL(int) TimeZone_PrintDateTime(HANDLE hTZ, LPCTSTR szFormat, LPTSTR szDest, size_t cbDest, DWORD dwFlags)
+MIR_CORE_DLL(int) TimeZone_PrintDateTime(HANDLE hTZ, LPCTSTR szFormat, LPTSTR szDest, size_t cbDest, uint32_t dwFlags)
 {
 	MIM_TIMEZONE *tz = (MIM_TIMEZONE*)hTZ;
 	if (tz == nullptr && (dwFlags & (TZF_DIFONLY | TZF_KNOWNONLY)))
@@ -317,7 +317,7 @@ MIR_CORE_DLL(int) TimeZone_PrintDateTime(HANDLE hTZ, LPCTSTR szFormat, LPTSTR sz
 	return 0;
 }
 
-MIR_CORE_DLL(int) TimeZone_GetSystemTime(HANDLE hTZ, mir_time ts, SYSTEMTIME *dest, DWORD dwFlags)
+MIR_CORE_DLL(int) TimeZone_GetSystemTime(HANDLE hTZ, mir_time ts, SYSTEMTIME *dest, uint32_t dwFlags)
 {
 	if (dest == nullptr)
 		return 2;
@@ -345,7 +345,7 @@ MIR_CORE_DLL(int) TimeZone_GetSystemTime(HANDLE hTZ, mir_time ts, SYSTEMTIME *de
 	return 0;
 }
 
-MIR_CORE_DLL(int) TimeZone_PrintTimeStamp(HANDLE hTZ, mir_time ts, LPCTSTR szFormat, LPTSTR szDest, size_t cbDest, DWORD dwFlags)
+MIR_CORE_DLL(int) TimeZone_PrintTimeStamp(HANDLE hTZ, mir_time ts, LPCTSTR szFormat, LPTSTR szDest, size_t cbDest, uint32_t dwFlags)
 {
 	SYSTEMTIME st;
 	if (!TimeZone_GetSystemTime(hTZ, ts, &st, dwFlags))
@@ -384,7 +384,7 @@ struct ListMessages
 static const ListMessages lbMessages = { LB_ADDSTRING, LB_GETCURSEL, LB_SETCURSEL, LB_GETITEMDATA, LB_SETITEMDATA };
 static const ListMessages cbMessages = { CB_ADDSTRING, CB_GETCURSEL, CB_SETCURSEL, CB_GETITEMDATA, CB_SETITEMDATA };
 
-static const ListMessages* GetListMessages(HWND hWnd, DWORD dwFlags)
+static const ListMessages* GetListMessages(HWND hWnd, uint32_t dwFlags)
 {
 	if (hWnd == nullptr)
 		return nullptr;
@@ -407,7 +407,7 @@ static const ListMessages* GetListMessages(HWND hWnd, DWORD dwFlags)
 
 ///////////////////////////////////////////////////////////////////////////////
 
-MIR_CORE_DLL(int) TimeZone_SelectListItem(MCONTACT hContact, LPCSTR szModule, HWND hWnd, DWORD dwFlags)
+MIR_CORE_DLL(int) TimeZone_SelectListItem(MCONTACT hContact, LPCSTR szModule, HWND hWnd, uint32_t dwFlags)
 {
 	const ListMessages *lstMsg = GetListMessages(hWnd, dwFlags);
 	if (lstMsg == nullptr)
@@ -444,7 +444,7 @@ MIR_CORE_DLL(int) TimeZone_SelectListItem(MCONTACT hContact, LPCSTR szModule, HW
 	return iSelection;
 }
 
-MIR_CORE_DLL(int) TimeZone_PrepareList(MCONTACT hContact, LPCSTR szModule, HWND hWnd, DWORD dwFlags)
+MIR_CORE_DLL(int) TimeZone_PrepareList(MCONTACT hContact, LPCSTR szModule, HWND hWnd, uint32_t dwFlags)
 {
 	const ListMessages *lstMsg = GetListMessages(hWnd, dwFlags);
 	if (lstMsg == nullptr)
@@ -460,7 +460,7 @@ MIR_CORE_DLL(int) TimeZone_PrepareList(MCONTACT hContact, LPCSTR szModule, HWND
 	return TimeZone_SelectListItem(hContact, szModule, hWnd, dwFlags);
 }
 
-MIR_CORE_DLL(void) TimeZone_StoreListResult(MCONTACT hContact, LPCSTR szModule, HWND hWnd, DWORD dwFlags)
+MIR_CORE_DLL(void) TimeZone_StoreListResult(MCONTACT hContact, LPCSTR szModule, HWND hWnd, uint32_t dwFlags)
 {
 	if (szModule == nullptr) szModule = "UserInfo";
 
@@ -478,7 +478,7 @@ MIR_CORE_DLL(void) TimeZone_StoreListResult(MCONTACT hContact, LPCSTR szModule,
 
 ///////////////////////////////////////////////////////////////////////////////
 
-MIR_CORE_DLL(DWORD) TimeZone_ToLocal(DWORD timeVal)
+MIR_CORE_DLL(uint32_t) TimeZone_ToLocal(uint32_t timeVal)
 {
 	return TimeZone_UtcToLocal(nullptr, (mir_time)timeVal);
 }
@@ -499,7 +499,7 @@ MIR_CORE_DLL(wchar_t*) TimeZone_ToStringW(mir_time timeVal, const wchar_t *wszFo
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void GetLocalizedString(HKEY hSubKey, const wchar_t *szName, wchar_t *szBuf, DWORD cbLen)
+void GetLocalizedString(HKEY hSubKey, const wchar_t *szName, wchar_t *szBuf, uint32_t cbLen)
 {
 	DWORD dwLength = cbLen * sizeof(wchar_t);
 	RegQueryValueEx(hSubKey, szName, nullptr, nullptr, (unsigned char *)szBuf, &dwLength);
@@ -549,7 +549,7 @@ void InitTimeZones(void)
 		pfnGetDynamicTimeZoneInformation = (pfnGetDynamicTimeZoneInformation_t)GetProcAddress(GetModuleHandle(L"kernel32"), "GetDynamicTimeZoneInformation");
 
 	if (ERROR_SUCCESS == RegOpenKeyEx(HKEY_LOCAL_MACHINE, tszKey, 0, KEY_ENUMERATE_SUB_KEYS, &hKey)) {
-		DWORD	dwIndex = 0;
+		uint32_t	dwIndex = 0;
 		HKEY	hSubKey;
 		wchar_t	tszName[MIM_TZ_NAMELEN];
 
diff --git a/src/mir_core/src/Windows/winver.cpp b/src/mir_core/src/Windows/winver.cpp
index d519d10478..17103958d0 100644
--- a/src/mir_core/src/Windows/winver.cpp
+++ b/src/mir_core/src/Windows/winver.cpp
@@ -33,7 +33,7 @@ static int dwWinVer;
 
 void InitWinver()
 {
-	DWORD dwVer = LOWORD(GetVersion());
+	uint32_t dwVer = LOWORD(GetVersion());
 	dwWinVer = MAKEWORD(HIBYTE(dwVer), LOBYTE(dwVer));
 }
 
@@ -152,7 +152,7 @@ MIR_CORE_DLL(BOOL) OS_GetShortString(char *buf, size_t bufSize)
 #define PRODUCT_PROFESSIONAL_WMC                  0x00000067
 #endif
 
-typedef BOOL(WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
+typedef BOOL(WINAPI *PGPI)(uint32_t, uint32_t, uint32_t, uint32_t, PDWORD);
 typedef LPCSTR(WINAPI *WGV)(void);
 
 MIR_CORE_DLL(BOOL) OS_GetDisplayString(char *buf, size_t bufSize)
diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp
index 439f5313c4..bb07b04741 100644
--- a/src/mir_core/src/db.cpp
+++ b/src/mir_core/src/db.cpp
@@ -134,7 +134,7 @@ MIR_CORE_DLL(int) db_get_w(MCONTACT hContact, const char *szModule, const char *
 	return errorValue;
 }
 
-MIR_CORE_DLL(DWORD) db_get_dw(MCONTACT hContact, const char *szModule, const char *szSetting, DWORD errorValue)
+MIR_CORE_DLL(uint32_t) db_get_dw(MCONTACT hContact, const char *szModule, const char *szSetting, uint32_t errorValue)
 {
 	if (g_pCurrDb != nullptr) {
 		DBVARIANT dbv;
@@ -302,7 +302,7 @@ MIR_CORE_DLL(INT_PTR) db_set_w(MCONTACT hContact, const char *szModule, const ch
 	return g_pCurrDb->WriteContactSetting(hContact, &cws);
 }
 
-MIR_CORE_DLL(INT_PTR) db_set_dw(MCONTACT hContact, const char *szModule, const char *szSetting, DWORD val)
+MIR_CORE_DLL(INT_PTR) db_set_dw(MCONTACT hContact, const char *szModule, const char *szSetting, uint32_t val)
 {
 	if (g_pCurrDb == nullptr) return 1;
 
diff --git a/src/mir_core/src/memory.cpp b/src/mir_core/src/memory.cpp
index 3e3d7be69d..fbe05ac6c4 100644
--- a/src/mir_core/src/memory.cpp
+++ b/src/mir_core/src/memory.cpp
@@ -30,14 +30,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 static int CheckBlock(void* blk)
 {
 	int result = FALSE;
-	char* p = (char*)blk - sizeof(DWORD)*2;
-	DWORD size, *b, *e;
+	char* p = (char*)blk - sizeof(uint32_t)*2;
+	uint32_t size, *b, *e;
 
 	__try
 	{
-		size = *(DWORD*)p;
-		b = (DWORD*)&p[ sizeof(DWORD) ];
-		e = (DWORD*)&p[ sizeof(DWORD)*2 + size ];
+		size = *(uint32_t*)p;
+		b = (uint32_t*)&p[ sizeof(uint32_t) ];
+		e = (uint32_t*)&p[ sizeof(uint32_t)*2 + size ];
 
 		if (*b != BLOCK_ALLOCED || *e != BLOCK_ALLOCED)
 		{
@@ -73,7 +73,7 @@ MIR_C_CORE_DLL(void*) mir_alloc(size_t size)
 	if (size == 0)
 		return nullptr;
 
-	char *p = (char*)malloc(size + sizeof(DWORD)* 3);
+	char *p = (char*)malloc(size + sizeof(uint32_t)* 3);
 	if (p == nullptr) {
       #ifdef _MSC_VER
          OutputDebugStringA("memory overflow\n");
@@ -84,10 +84,10 @@ MIR_C_CORE_DLL(void*) mir_alloc(size_t size)
 		return nullptr;
 	}
 
-	*(DWORD*)p = (DWORD)size;
-	*(DWORD*)&p[sizeof(DWORD)] = BLOCK_ALLOCED;
-	*(DWORD*)&p[size + sizeof(DWORD)*2] = BLOCK_ALLOCED;
-	return p + sizeof(DWORD)* 2;
+	*(uint32_t*)p = (uint32_t)size;
+	*(uint32_t*)&p[sizeof(uint32_t)] = BLOCK_ALLOCED;
+	*(uint32_t*)&p[size + sizeof(uint32_t)*2] = BLOCK_ALLOCED;
+	return p + sizeof(uint32_t)* 2;
 }
 
 /******************************************************************************/
@@ -109,11 +109,11 @@ MIR_C_CORE_DLL(void*) mir_realloc(void* ptr, size_t size)
 	if (ptr != nullptr) {
 		if (!CheckBlock(ptr))
 			return nullptr;
-		p = (char*)ptr - sizeof(DWORD)*2;
+		p = (char*)ptr - sizeof(uint32_t)*2;
 	}
 	else p = nullptr;
 
-	p = (char*)realloc(p, size + sizeof(DWORD)*3);
+	p = (char*)realloc(p, size + sizeof(uint32_t)*3);
 	if (p == nullptr) {
       #ifdef _MSC_VER
          OutputDebugStringA("memory overflow\n");
@@ -124,10 +124,10 @@ MIR_C_CORE_DLL(void*) mir_realloc(void* ptr, size_t size)
 		return nullptr;
 	}
 
-	*(DWORD*)p = (DWORD)size;
-	*(DWORD*)&p[sizeof(DWORD)] = BLOCK_ALLOCED;
-	*(DWORD*)&p[size + sizeof(DWORD)*2] = BLOCK_ALLOCED;
-	return p + sizeof(DWORD)*2;
+	*(uint32_t*)p = (uint32_t)size;
+	*(uint32_t*)&p[sizeof(uint32_t)] = BLOCK_ALLOCED;
+	*(uint32_t*)&p[size + sizeof(uint32_t)*2] = BLOCK_ALLOCED;
+	return p + sizeof(uint32_t)*2;
 }
 
 /******************************************************************************/
@@ -135,18 +135,18 @@ MIR_C_CORE_DLL(void*) mir_realloc(void* ptr, size_t size)
 MIR_C_CORE_DLL(void) mir_free(void* ptr)
 {
 	char* p;
-	DWORD size;
+	uint32_t size;
 
 	if (ptr == nullptr)
 		return;
 	if (!CheckBlock(ptr))
 		return;
 
-	p = (char*)ptr - sizeof(DWORD)*2;
-	size = *(DWORD*)p;
+	p = (char*)ptr - sizeof(uint32_t)*2;
+	size = *(uint32_t*)p;
 
-	*(DWORD*)&p[sizeof(DWORD)] = BLOCK_FREED;
-	*(DWORD*)&p[size + sizeof(DWORD)*2] = BLOCK_FREED;
+	*(uint32_t*)&p[sizeof(uint32_t)] = BLOCK_FREED;
+	*(uint32_t*)&p[size + sizeof(uint32_t)*2] = BLOCK_FREED;
 	free(p);
 }
 
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 15d6529d8e..b9c1d532ca 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -477,7 +477,7 @@ mir_wstrcmpi                  @280
 ??0CDataLink@@QAE@ABV0@@Z @636 NONAME

 ??0CDataLink@@QAE@E@Z @637 NONAME

 ??0CDbLink@@QAE@ABV0@@Z @638 NONAME

-??0CDbLink@@QAE@PBD0EK@Z @639 NONAME

+??0CDbLink@@QAE@PBD0EI@Z @639 NONAME

 ??0CDbLink@@QAE@PBD0EPA_W@Z @640 NONAME

 ??0CDlgBase@@QAE@ABV0@@Z @641 NONAME

 ??0CDlgBase@@QAE@AAVCMPluginBase@@H@Z @642 NONAME

@@ -527,14 +527,14 @@ mir_wstrcmpi                  @280
 ?AddString@CCtrlCombo@@QAEHPB_WJ@Z @706 NONAME

 ?AddString@CCtrlListBox@@QAEHPB_WJ@Z @707 NONAME

 ?AddStringA@CCtrlCombo@@QAEHPBDJ@Z @708 NONAME

-?ApproximateViewRect@CCtrlListView@@QAEKHHH@Z @709 NONAME

+?ApproximateViewRect@CCtrlListView@@QAEIHHH@Z @709 NONAME

 ?Arrange@CCtrlListView@@QAEXI@Z @710 NONAME

 ?AutoRebuild@CCtrlClc@@QAEXXZ @712 NONAME

 ?CancelEditLabel@CCtrlListView@@QAEXXZ @713 NONAME

 ?Close@CDlgBase@@QAEXXZ @714 NONAME

 ?Create@CDlgBase@@QAEXXZ @715 NONAME

 ?CreateDbLink@CCtrlData@@QAEXPAVCDataLink@@@Z @716 NONAME

-?CreateDbLink@CCtrlData@@QAEXPBD0EK@Z @717 NONAME

+?CreateDbLink@CCtrlData@@QAEXPBD0EI@Z @717 NONAME

 ?CreateDbLink@CCtrlData@@QAEXPBD0PA_W@Z @718 NONAME

 ?CreateDragImage@CCtrlListView@@QAEPAU_IMAGELIST@@HPAUtagPOINT@@@Z @719 NONAME

 ?CreateDragImage@CCtrlTreeView@@QAEPAU_IMAGELIST@@PAU_TREEITEM@@@Z @720 NONAME

@@ -566,8 +566,8 @@ mir_wstrcmpi                  @280
 ?EnsureVisible@CCtrlClc@@QAEXPAX_N@Z @749 NONAME

 ?EnsureVisible@CCtrlListView@@QAEHHH@Z @750 NONAME

 ?EnsureVisible@CCtrlTreeView@@QAEXPAU_TREEITEM@@@Z @751 NONAME

-?Expand@CCtrlClc@@QAEXPAXK@Z @752 NONAME

-?Expand@CCtrlTreeView@@QAEXPAU_TREEITEM@@K@Z @753 NONAME

+?Expand@CCtrlClc@@QAEXPAXI@Z @752 NONAME

+?Expand@CCtrlTreeView@@QAEXPAU_TREEITEM@@I@Z @753 NONAME

 ?FindContact@CCtrlClc@@QAEPAXI@Z @754 NONAME

 ?FindGroup@CCtrlClc@@QAEPAXH@Z @756 NONAME

 ?FindItem@CCtrlListView@@QAEHHPBUtagLVFINDINFOW@@@Z @757 NONAME

@@ -582,7 +582,7 @@ mir_wstrcmpi                  @280
 ?GetCallbackMask@CCtrlListView@@QBEIXZ @766 NONAME

 ?GetCheck@CCtrlClc@@QBE_NPAX@Z @767 NONAME

 ?GetCheckState@CCtrlListView@@QBEHI@Z @768 NONAME

-?GetCheckState@CCtrlTreeView@@QBEKPAU_TREEITEM@@@Z @769 NONAME

+?GetCheckState@CCtrlTreeView@@QBEIPAU_TREEITEM@@@Z @769 NONAME

 ?GetChild@CCtrlTreeView@@QBEPAU_TREEITEM@@PAU2@@Z @770 NONAME

 ?GetColumn@CCtrlListView@@QBEXHPAUtagLVCOLUMNW@@@Z @771 NONAME

 ?GetColumnOrderArray@CCtrlListView@@QBEXHPAH@Z @772 NONAME

@@ -602,9 +602,9 @@ mir_wstrcmpi                  @280
 ?GetEditControl@CCtrlClc@@QBEPAUHWND__@@XZ @786 NONAME

 ?GetEditControl@CCtrlListView@@QBEPAUHWND__@@XZ @787 NONAME

 ?GetEditControl@CCtrlTreeView@@QBEPAUHWND__@@XZ @788 NONAME

-?GetExStyle@CCtrlClc@@QBEKXZ @789 NONAME

-?GetExpand@CCtrlClc@@QBEKPAX@Z @790 NONAME

-?GetExtendedListViewStyle@CCtrlListView@@QBEKXZ @791 NONAME

+?GetExStyle@CCtrlClc@@QBEIXZ @789 NONAME

+?GetExpand@CCtrlClc@@QBEIPAX@Z @790 NONAME

+?GetExtendedListViewStyle@CCtrlListView@@QBEIXZ @791 NONAME

 ?GetExtraColumns@CCtrlClc@@QBEHXZ @792 NONAME

 ?GetExtraImage@CCtrlClc@@QBEEPAXH@Z @793 NONAME

 ?GetExtraImageList@CCtrlClc@@QBEPAU_IMAGELIST@@XZ @794 NONAME

@@ -615,7 +615,7 @@ mir_wstrcmpi                  @280
 ?GetHideOfflineRoot@CCtrlClc@@QBE_NXZ @799 NONAME

 ?GetHotCursor@CCtrlListView@@QBEPAUHICON__@@XZ @800 NONAME

 ?GetHotItem@CCtrlListView@@QBEHXZ @801 NONAME

-?GetHoverTime@CCtrlListView@@QBEKXZ @802 NONAME

+?GetHoverTime@CCtrlListView@@QBEIXZ @802 NONAME

 ?GetHwnd@CCtrlBase@@QBEPAUHWND__@@XZ @803 NONAME

 ?GetHwnd@CDlgBase@@QBEPAUHWND__@@XZ @804 NONAME

 ?GetISearchString@CCtrlListView@@QBEHPAD@Z @805 NONAME

@@ -639,9 +639,9 @@ mir_wstrcmpi                  @280
 ?GetItemPosition@CCtrlListView@@QBEXHPAUtagPOINT@@@Z @823 NONAME

 ?GetItemRect@CCtrlListView@@QBEXHPAUtagRECT@@H@Z @824 NONAME

 ?GetItemRect@CCtrlTreeView@@QBEXPAU_TREEITEM@@PAUtagRECT@@H@Z @825 NONAME

-?GetItemSpacing@CCtrlListView@@QBEKH@Z @826 NONAME

+?GetItemSpacing@CCtrlListView@@QBEIH@Z @826 NONAME

 ?GetItemState@CCtrlListView@@QBEIHI@Z @827 NONAME

-?GetItemState@CCtrlTreeView@@QBEKPAU_TREEITEM@@K@Z @828 NONAME

+?GetItemState@CCtrlTreeView@@QBEIPAU_TREEITEM@@I@Z @828 NONAME

 ?GetItemText@CCtrlCombo@@QBEPA_WH@Z @829 NONAME

 ?GetItemText@CCtrlCombo@@QBEPA_WHPA_WH@Z @830 NONAME

 ?GetItemText@CCtrlListBox@@QBEPA_WH@Z @831 NONAME

@@ -650,9 +650,9 @@ mir_wstrcmpi                  @280
 ?GetItemType@CCtrlClc@@QBEHPAX@Z @834 NONAME

 ?GetLastVisible@CCtrlTreeView@@QBEPAU_TREEITEM@@XZ @835 NONAME

 ?GetLineColor@CCtrlTreeView@@QBEKXZ @837 NONAME

-?GetNextItem@CCtrlClc@@QBEPAXPAXK@Z @838 NONAME

+?GetNextItem@CCtrlClc@@QBEPAXPAXI@Z @838 NONAME

 ?GetNextItem@CCtrlListView@@QBEHHI@Z @839 NONAME

-?GetNextItem@CCtrlTreeView@@QBEPAU_TREEITEM@@PAU2@K@Z @840 NONAME

+?GetNextItem@CCtrlTreeView@@QBEPAU_TREEITEM@@PAU2@I@Z @840 NONAME

 ?GetNextSibling@CCtrlTreeView@@QBEPAU_TREEITEM@@PAU2@@Z @841 NONAME

 ?GetNextVisible@CCtrlTreeView@@QBEPAU_TREEITEM@@PAU2@@Z @842 NONAME

 ?GetNumberOfWorkAreas@CCtrlListView@@QBEHPAI@Z @843 NONAME

@@ -663,7 +663,7 @@ mir_wstrcmpi                  @280
 ?GetPrevSibling@CCtrlTreeView@@QBEPAU_TREEITEM@@PAU2@@Z @848 NONAME

 ?GetPrevVisible@CCtrlTreeView@@QBEPAU_TREEITEM@@PAU2@@Z @849 NONAME

 ?GetRoot@CCtrlTreeView@@QBEPAU_TREEITEM@@XZ @851 NONAME

-?GetScrollTime@CCtrlTreeView@@QBEKXZ @852 NONAME

+?GetScrollTime@CCtrlTreeView@@QBEIXZ @852 NONAME

 ?GetSel@CCtrlListBox@@QBE_NH@Z @853 NONAME

 ?GetSelCount@CCtrlListBox@@QBEHXZ @854 NONAME

 ?GetSelItems@CCtrlListBox@@QBEPAHPAHH@Z @855 NONAME

@@ -690,7 +690,7 @@ mir_wstrcmpi                  @280
 ?GetTopIndex@CCtrlListView@@QBEHXZ @877 NONAME

 ?GetUnicodeFormat@CCtrlListView@@QBEHXZ @878 NONAME

 ?GetUnicodeFormat@CCtrlTreeView@@QBEHXZ @879 NONAME

-?GetView@CCtrlListView@@QBEKXZ @880 NONAME

+?GetView@CCtrlListView@@QBEIXZ @880 NONAME

 ?GetViewRect@CCtrlListView@@QBEHPAUtagRECT@@@Z @881 NONAME

 ?GetVisibleCount@CCtrlTreeView@@QBEIXZ @882 NONAME

 ?GetWorkAreas@CCtrlListView@@QBEXHPAUtagRECT@@@Z @883 NONAME

@@ -698,7 +698,7 @@ mir_wstrcmpi                  @280
 ?GlobalDlgResizer@CDlgBase@@CAHPAUHWND__@@JPAUUTILRESIZECONTROL@@@Z @885 NONAME

 ?GlobalSubclassWndProc@CCtrlBase@@CGJPAUHWND__@@IIJ@Z @886 NONAME

 ?HasGroup@CCtrlListView@@QAEHH@Z @887 NONAME

-?HitTest@CCtrlClc@@QBEPAXHHPAK@Z @888 NONAME

+?HitTest@CCtrlClc@@QBEPAXHHPAI@Z @888 NONAME

 ?HitTest@CCtrlListView@@QBEHPAUtagLVHITTESTINFO@@@Z @889 NONAME

 ?HitTest@CCtrlTreeView@@QBEPAU_TREEITEM@@PAUtagTVHITTESTINFO@@@Z @890 NONAME

 ?InsertColumn@CCtrlListView@@QAEHHPBUtagLVCOLUMNW@@@Z @891 NONAME

@@ -712,8 +712,8 @@ mir_wstrcmpi                  @280
 ?IsChanged@CCtrlBase@@QBE_NXZ @899 NONAME

 ?IsGroupViewEnabled@CCtrlListView@@QAEHXZ @900 NONAME

 ?IsInitialized@CDlgBase@@QBE_NXZ @901 NONAME

-?LoadInt@CCtrlData@@IAEKXZ @902 NONAME

-?LoadInt@CDbLink@@UAEKXZ @903 NONAME

+?LoadInt@CCtrlData@@IAEIXZ @902 NONAME

+?LoadInt@CDbLink@@UAEIXZ @903 NONAME

 ?LoadText@CCtrlData@@IAEPB_WXZ @904 NONAME

 ?LoadText@CDbLink@@UAEPA_WXZ @905 NONAME

 ?MakeFlat@CCtrlMButton@@QAEXXZ @906 NONAME

@@ -764,12 +764,12 @@ mir_wstrcmpi                  @280
 ?ResetContent@CCtrlCombo@@QAEXXZ @956 NONAME

 ?ResetContent@CCtrlListBox@@QAEXXZ @957 NONAME

 ?Resizer@CDlgBase@@MAEHPAUUTILRESIZECONTROL@@@Z @958 NONAME

-?SaveInt@CCtrlData@@IAEXK@Z @959 NONAME

-?SaveInt@CDbLink@@UAEXK@Z @960 NONAME

+?SaveInt@CCtrlData@@IAEXI@Z @959 NONAME

+?SaveInt@CDbLink@@UAEXI@Z @960 NONAME

 ?SaveText@CCtrlData@@IAEXPA_W@Z @961 NONAME

 ?SaveText@CDbLink@@UAEXPA_W@Z @962 NONAME

 ?Scroll@CCtrlListView@@QAEHHH@Z @963 NONAME

-?Select@CCtrlTreeView@@QAEXPAU_TREEITEM@@K@Z @964 NONAME

+?Select@CCtrlTreeView@@QAEXPAU_TREEITEM@@I@Z @964 NONAME

 ?SelectDropTarget@CCtrlTreeView@@QAEXPAU_TREEITEM@@@Z @965 NONAME

 ?SelectItem@CCtrlClc@@QAEXPAX@Z @966 NONAME

 ?SelectItem@CCtrlTreeView@@QAEXPAU_TREEITEM@@@Z @967 NONAME

@@ -784,15 +784,15 @@ mir_wstrcmpi                  @280
 ?SetCallbackMask@CCtrlListView@@QAEHI@Z @977 NONAME

 ?SetCheck@CCtrlClc@@QAEXPAX_N@Z @978 NONAME

 ?SetCheckState@CCtrlListView@@QAEXIH@Z @979 NONAME

-?SetCheckState@CCtrlTreeView@@QAEXPAU_TREEITEM@@K@Z @980 NONAME

+?SetCheckState@CCtrlTreeView@@QAEXPAU_TREEITEM@@I@Z @980 NONAME

 ?SetColumn@CCtrlListView@@QAEHHPAUtagLVCOLUMNW@@@Z @981 NONAME

 ?SetColumnOrderArray@CCtrlListView@@QAEHHPAH@Z @982 NONAME

 ?SetColumnWidth@CCtrlListView@@QAEHHH@Z @983 NONAME

 ?SetCurSel@CCtrlCombo@@QAEHH@Z @984 NONAME

 ?SetCurSel@CCtrlListBox@@QAEHH@Z @985 NONAME

-?SetExStyle@CCtrlClc@@QAEXK@Z @986 NONAME

-?SetExtendedListViewStyle@CCtrlListView@@QAEXK@Z @987 NONAME

-?SetExtendedListViewStyleEx@CCtrlListView@@QAEXKK@Z @988 NONAME

+?SetExStyle@CCtrlClc@@QAEXI@Z @986 NONAME

+?SetExtendedListViewStyle@CCtrlListView@@QAEXI@Z @987 NONAME

+?SetExtendedListViewStyleEx@CCtrlListView@@QAEXII@Z @988 NONAME

 ?SetExtraColumns@CCtrlClc@@QAEXH@Z @989 NONAME

 ?SetExtraImage@CCtrlClc@@QAEXPAXHH@Z @990 NONAME

 ?SetExtraImageList@CCtrlClc@@QAEXPAU_IMAGELIST@@@Z @991 NONAME

@@ -803,8 +803,8 @@ mir_wstrcmpi                  @280
 ?SetHideOfflineRoot@CCtrlClc@@QAEX_N@Z @997 NONAME

 ?SetHotCursor@CCtrlListView@@QAEPAUHICON__@@PAU2@@Z @998 NONAME

 ?SetHotItem@CCtrlListView@@QAEHH@Z @999 NONAME

-?SetHoverTime@CCtrlListView@@QAEXK@Z @1000 NONAME

-?SetIconSpacing@CCtrlListView@@QAEKHH@Z @1001 NONAME

+?SetHoverTime@CCtrlListView@@QAEXI@Z @1000 NONAME

+?SetIconSpacing@CCtrlListView@@QAEIHH@Z @1001 NONAME

 ?SetImageList@CCtrlListView@@QAEPAU_IMAGELIST@@PAU2@H@Z @1002 NONAME

 ?SetImageList@CCtrlTreeView@@QAEXPAU_IMAGELIST@@H@Z @1003 NONAME

 ?SetIndent@CCtrlTreeView@@QAEXH@Z @1005 NONAME

@@ -818,18 +818,18 @@ mir_wstrcmpi                  @280
 ?SetItem@CCtrlListView@@QAEXHHPB_WH@Z @1013 NONAME

 ?SetItem@CCtrlTreeView@@QAEXPAUtagTVITEMEXW@@@Z @1014 NONAME

 ?SetItemCount@CCtrlListView@@QAEXH@Z @1015 NONAME

-?SetItemCountEx@CCtrlListView@@QAEXHK@Z @1016 NONAME

+?SetItemCountEx@CCtrlListView@@QAEXHI@Z @1016 NONAME

 ?SetItemData@CCtrlCombo@@QAEXHJ@Z @1017 NONAME

 ?SetItemData@CCtrlListBox@@QAEXHJ@Z @1018 NONAME

 ?SetItemHeight@CCtrlTreeView@@QAEXF@Z @1019 NONAME

 ?SetItemPosition32@CCtrlListView@@QAEXHHH@Z @1020 NONAME

 ?SetItemPosition@CCtrlListView@@QAEHHHH@Z @1021 NONAME

 ?SetItemState@CCtrlListView@@QAEXHII@Z @1022 NONAME

-?SetItemState@CCtrlTreeView@@QAEXPAU_TREEITEM@@KK@Z @1023 NONAME

+?SetItemState@CCtrlTreeView@@QAEXPAU_TREEITEM@@II@Z @1023 NONAME

 ?SetItemText@CCtrlClc@@QAEXPAXPAD@Z @1024 NONAME

 ?SetItemText@CCtrlListView@@QAEXHHPB_W@Z @1025 NONAME

 ?SetLineColor@CCtrlTreeView@@QAEKK@Z @1027 NONAME

-?SetOfflineModes@CCtrlClc@@QAEXK@Z @1028 NONAME

+?SetOfflineModes@CCtrlClc@@QAEXI@Z @1028 NONAME

 ?SetOutlineColor@CCtrlListView@@QAEKK@Z @1029 NONAME

 ?SetScrollTime@CCtrlTreeView@@QAEXI@Z @1030 NONAME

 ?SetSel@CCtrlListBox@@QAEXH_N@Z @1031 NONAME

@@ -848,7 +848,7 @@ mir_wstrcmpi                  @280
 ?SetUnicodeFormat@CCtrlListView@@QAEHH@Z @1046 NONAME

 ?SetUnicodeFormat@CCtrlTreeView@@QAEHH@Z @1047 NONAME

 ?SetUseGroups@CCtrlClc@@QAEX_N@Z @1048 NONAME

-?SetView@CCtrlListView@@QAEHK@Z @1049 NONAME

+?SetView@CCtrlListView@@QAEHI@Z @1049 NONAME

 ?SetWorkAreas@CCtrlListView@@QAEXHPAUtagRECT@@@Z @1050 NONAME

 ?Show@CDlgBase@@QAEXH@Z @1051 NONAME

 ?ShowDropdown@CCtrlCombo@@QAEX_N@Z @1052 NONAME

@@ -1040,7 +1040,7 @@ IsTerminalDisconnected @1245
 CallObjectEventHook @1259

 ?db_get_sm@@YG?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@IPBD00@Z @1682 NONAME

 ?db_get_wsm@@YG?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@IPBD0PB_W@Z @1683 NONAME

-?CreateLink@CDlgBase@@IAEXAAVCCtrlData@@PBDEK@Z @1262 NONAME

+?CreateLink@CDlgBase@@IAEXAAVCCtrlData@@PBDEI@Z @1262 NONAME

 ?CreateLink@CDlgBase@@IAEXAAVCCtrlData@@PBDPA_W@Z @1263 NONAME

 ?CheckRowCount@CCtrlPages@@AAEXXZ @1264 NONAME

 ?VerifyControls@CDlgBase@@AAE_NP8CCtrlBase@@AE_NXZ@Z @1265 NONAME

@@ -1485,11 +1485,11 @@ TimeZone_GetSystemTime @1692
 ??0CCtrlColor@@QAE@PAVCDlgBase@@H@Z @1707 NONAME

 ??1CCtrlColor@@UAE@XZ @1708 NONAME

 ??_7CCtrlColor@@6B@ @1709 NONAME

-?GetColor@CCtrlColor@@QAEKXZ @1710 NONAME

+?GetColor@CCtrlColor@@QAEIXZ @1710 NONAME

 ?OnApply@CCtrlColor@@UAE_NXZ @1711 NONAME

 ?OnCommand@CCtrlColor@@UAEHPAUHWND__@@GG@Z @1712 NONAME

 ?OnReset@CCtrlColor@@UAEXXZ @1713 NONAME

-?SetColor@CCtrlColor@@QAEXK@Z @1714 NONAME

+?SetColor@CCtrlColor@@QAEXI@Z @1714 NONAME

 ??0CCtrlSlider@@QAE@PAVCDlgBase@@HHH@Z @1715 NONAME

 ??1CCtrlSlider@@UAE@XZ @1716 NONAME

 ??_7CCtrlSlider@@6B@ @1717 NONAME

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index a99babbccb..a25eee9663 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -477,7 +477,7 @@ mir_wstrcmpi                  @280
 ??0CDataLink@@QEAA@AEBV0@@Z @636 NONAME

 ??0CDataLink@@QEAA@E@Z @637 NONAME

 ??0CDbLink@@QEAA@AEBV0@@Z @638 NONAME

-??0CDbLink@@QEAA@PEBD0EK@Z @639 NONAME

+??0CDbLink@@QEAA@PEBD0EI@Z @639 NONAME

 ??0CDbLink@@QEAA@PEBD0EPEA_W@Z @640 NONAME

 ??0CDlgBase@@QEAA@AEBV0@@Z @641 NONAME

 ??0CDlgBase@@QEAA@AEAVCMPluginBase@@H@Z @642 NONAME

@@ -527,14 +527,14 @@ mir_wstrcmpi                  @280
 ?AddString@CCtrlCombo@@QEAAHPEB_W_J@Z @706 NONAME

 ?AddString@CCtrlListBox@@QEAAHPEB_W_J@Z @707 NONAME

 ?AddStringA@CCtrlCombo@@QEAAHPEBD_J@Z @708 NONAME

-?ApproximateViewRect@CCtrlListView@@QEAAKHHH@Z @709 NONAME

+?ApproximateViewRect@CCtrlListView@@QEAAIHHH@Z @709 NONAME

 ?Arrange@CCtrlListView@@QEAAXI@Z @710 NONAME

 ?AutoRebuild@CCtrlClc@@QEAAXXZ @712 NONAME

 ?CancelEditLabel@CCtrlListView@@QEAAXXZ @713 NONAME

 ?Close@CDlgBase@@QEAAXXZ @714 NONAME

 ?Create@CDlgBase@@QEAAXXZ @715 NONAME

 ?CreateDbLink@CCtrlData@@QEAAXPEAVCDataLink@@@Z @716 NONAME

-?CreateDbLink@CCtrlData@@QEAAXPEBD0EK@Z @717 NONAME

+?CreateDbLink@CCtrlData@@QEAAXPEBD0EI@Z @717 NONAME

 ?CreateDbLink@CCtrlData@@QEAAXPEBD0PEA_W@Z @718 NONAME

 ?CreateDragImage@CCtrlListView@@QEAAPEAU_IMAGELIST@@HPEAUtagPOINT@@@Z @719 NONAME

 ?CreateDragImage@CCtrlTreeView@@QEAAPEAU_IMAGELIST@@PEAU_TREEITEM@@@Z @720 NONAME

@@ -566,8 +566,8 @@ mir_wstrcmpi                  @280
 ?EnsureVisible@CCtrlClc@@QEAAXPEAX_N@Z @749 NONAME

 ?EnsureVisible@CCtrlListView@@QEAAHHH@Z @750 NONAME

 ?EnsureVisible@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@@Z @751 NONAME

-?Expand@CCtrlClc@@QEAAXPEAXK@Z @752 NONAME

-?Expand@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@K@Z @753 NONAME

+?Expand@CCtrlClc@@QEAAXPEAXI@Z @752 NONAME

+?Expand@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@I@Z @753 NONAME

 ?FindContact@CCtrlClc@@QEAAPEAXI@Z @754 NONAME

 ?FindGroup@CCtrlClc@@QEAAPEAXH@Z @756 NONAME

 ?FindItem@CCtrlListView@@QEAAHHPEBUtagLVFINDINFOW@@@Z @757 NONAME

@@ -582,7 +582,7 @@ mir_wstrcmpi                  @280
 ?GetCallbackMask@CCtrlListView@@QEBAIXZ @766 NONAME

 ?GetCheck@CCtrlClc@@QEBA_NPEAX@Z @767 NONAME

 ?GetCheckState@CCtrlListView@@QEBAHI@Z @768 NONAME

-?GetCheckState@CCtrlTreeView@@QEBAKPEAU_TREEITEM@@@Z @769 NONAME

+?GetCheckState@CCtrlTreeView@@QEBAIPEAU_TREEITEM@@@Z @769 NONAME

 ?GetChild@CCtrlTreeView@@QEBAPEAU_TREEITEM@@PEAU2@@Z @770 NONAME

 ?GetColumn@CCtrlListView@@QEBAXHPEAUtagLVCOLUMNW@@@Z @771 NONAME

 ?GetColumnOrderArray@CCtrlListView@@QEBAXHPEAH@Z @772 NONAME

@@ -602,9 +602,9 @@ mir_wstrcmpi                  @280
 ?GetEditControl@CCtrlClc@@QEBAPEAUHWND__@@XZ @786 NONAME

 ?GetEditControl@CCtrlListView@@QEBAPEAUHWND__@@XZ @787 NONAME

 ?GetEditControl@CCtrlTreeView@@QEBAPEAUHWND__@@XZ @788 NONAME

-?GetExStyle@CCtrlClc@@QEBAKXZ @789 NONAME

-?GetExpand@CCtrlClc@@QEBAKPEAX@Z @790 NONAME

-?GetExtendedListViewStyle@CCtrlListView@@QEBAKXZ @791 NONAME

+?GetExStyle@CCtrlClc@@QEBAIXZ @789 NONAME

+?GetExpand@CCtrlClc@@QEBAIPEAX@Z @790 NONAME

+?GetExtendedListViewStyle@CCtrlListView@@QEBAIXZ @791 NONAME

 ?GetExtraColumns@CCtrlClc@@QEBAHXZ @792 NONAME

 ?GetExtraImage@CCtrlClc@@QEBAEPEAXH@Z @793 NONAME

 ?GetExtraImageList@CCtrlClc@@QEBAPEAU_IMAGELIST@@XZ @794 NONAME

@@ -615,7 +615,7 @@ mir_wstrcmpi                  @280
 ?GetHideOfflineRoot@CCtrlClc@@QEBA_NXZ @799 NONAME

 ?GetHotCursor@CCtrlListView@@QEBAPEAUHICON__@@XZ @800 NONAME

 ?GetHotItem@CCtrlListView@@QEBAHXZ @801 NONAME

-?GetHoverTime@CCtrlListView@@QEBAKXZ @802 NONAME

+?GetHoverTime@CCtrlListView@@QEBAIXZ @802 NONAME

 ?GetHwnd@CCtrlBase@@QEBAPEAUHWND__@@XZ @803 NONAME

 ?GetHwnd@CDlgBase@@QEBAPEAUHWND__@@XZ @804 NONAME

 ?GetISearchString@CCtrlListView@@QEBAHPEAD@Z @805 NONAME

@@ -639,9 +639,9 @@ mir_wstrcmpi                  @280
 ?GetItemPosition@CCtrlListView@@QEBAXHPEAUtagPOINT@@@Z @823 NONAME

 ?GetItemRect@CCtrlListView@@QEBAXHPEAUtagRECT@@H@Z @824 NONAME

 ?GetItemRect@CCtrlTreeView@@QEBAXPEAU_TREEITEM@@PEAUtagRECT@@H@Z @825 NONAME

-?GetItemSpacing@CCtrlListView@@QEBAKH@Z @826 NONAME

+?GetItemSpacing@CCtrlListView@@QEBAIH@Z @826 NONAME

 ?GetItemState@CCtrlListView@@QEBAIHI@Z @827 NONAME

-?GetItemState@CCtrlTreeView@@QEBAKPEAU_TREEITEM@@K@Z @828 NONAME

+?GetItemState@CCtrlTreeView@@QEBAIPEAU_TREEITEM@@I@Z @828 NONAME

 ?GetItemText@CCtrlCombo@@QEBAPEA_WH@Z @829 NONAME

 ?GetItemText@CCtrlCombo@@QEBAPEA_WHPEA_WH@Z @830 NONAME

 ?GetItemText@CCtrlListBox@@QEBAPEA_WH@Z @831 NONAME

@@ -650,9 +650,9 @@ mir_wstrcmpi                  @280
 ?GetItemType@CCtrlClc@@QEBAHPEAX@Z @834 NONAME

 ?GetLastVisible@CCtrlTreeView@@QEBAPEAU_TREEITEM@@XZ @835 NONAME

 ?GetLineColor@CCtrlTreeView@@QEBAKXZ @837 NONAME

-?GetNextItem@CCtrlClc@@QEBAPEAXPEAXK@Z @838 NONAME

+?GetNextItem@CCtrlClc@@QEBAPEAXPEAXI@Z @838 NONAME

 ?GetNextItem@CCtrlListView@@QEBAHHI@Z @839 NONAME

-?GetNextItem@CCtrlTreeView@@QEBAPEAU_TREEITEM@@PEAU2@K@Z @840 NONAME

+?GetNextItem@CCtrlTreeView@@QEBAPEAU_TREEITEM@@PEAU2@I@Z @840 NONAME

 ?GetNextSibling@CCtrlTreeView@@QEBAPEAU_TREEITEM@@PEAU2@@Z @841 NONAME

 ?GetNextVisible@CCtrlTreeView@@QEBAPEAU_TREEITEM@@PEAU2@@Z @842 NONAME

 ?GetNumberOfWorkAreas@CCtrlListView@@QEBAHPEAI@Z @843 NONAME

@@ -663,7 +663,7 @@ mir_wstrcmpi                  @280
 ?GetPrevSibling@CCtrlTreeView@@QEBAPEAU_TREEITEM@@PEAU2@@Z @848 NONAME

 ?GetPrevVisible@CCtrlTreeView@@QEBAPEAU_TREEITEM@@PEAU2@@Z @849 NONAME

 ?GetRoot@CCtrlTreeView@@QEBAPEAU_TREEITEM@@XZ @851 NONAME

-?GetScrollTime@CCtrlTreeView@@QEBAKXZ @852 NONAME

+?GetScrollTime@CCtrlTreeView@@QEBAIXZ @852 NONAME

 ?GetSel@CCtrlListBox@@QEBA_NH@Z @853 NONAME

 ?GetSelCount@CCtrlListBox@@QEBAHXZ @854 NONAME

 ?GetSelItems@CCtrlListBox@@QEBAPEAHPEAHH@Z @855 NONAME

@@ -690,7 +690,7 @@ mir_wstrcmpi                  @280
 ?GetTopIndex@CCtrlListView@@QEBAHXZ @877 NONAME

 ?GetUnicodeFormat@CCtrlListView@@QEBAHXZ @878 NONAME

 ?GetUnicodeFormat@CCtrlTreeView@@QEBAHXZ @879 NONAME

-?GetView@CCtrlListView@@QEBAKXZ @880 NONAME

+?GetView@CCtrlListView@@QEBAIXZ @880 NONAME

 ?GetViewRect@CCtrlListView@@QEBAHPEAUtagRECT@@@Z @881 NONAME

 ?GetVisibleCount@CCtrlTreeView@@QEBAIXZ @882 NONAME

 ?GetWorkAreas@CCtrlListView@@QEBAXHPEAUtagRECT@@@Z @883 NONAME

@@ -698,7 +698,7 @@ mir_wstrcmpi                  @280
 ?GlobalDlgResizer@CDlgBase@@CAHPEAUHWND__@@_JPEAUUTILRESIZECONTROL@@@Z @885 NONAME

 ?GlobalSubclassWndProc@CCtrlBase@@CA_JPEAUHWND__@@I_K_J@Z @886 NONAME

 ?HasGroup@CCtrlListView@@QEAAHH@Z @887 NONAME

-?HitTest@CCtrlClc@@QEBAPEAXHHPEAK@Z @888 NONAME

+?HitTest@CCtrlClc@@QEBAPEAXHHPEAI@Z @888 NONAME

 ?HitTest@CCtrlListView@@QEBAHPEAUtagLVHITTESTINFO@@@Z @889 NONAME

 ?HitTest@CCtrlTreeView@@QEBAPEAU_TREEITEM@@PEAUtagTVHITTESTINFO@@@Z @890 NONAME

 ?InsertColumn@CCtrlListView@@QEAAHHPEBUtagLVCOLUMNW@@@Z @891 NONAME

@@ -712,8 +712,8 @@ mir_wstrcmpi                  @280
 ?IsChanged@CCtrlBase@@QEBA_NXZ @899 NONAME

 ?IsGroupViewEnabled@CCtrlListView@@QEAAHXZ @900 NONAME

 ?IsInitialized@CDlgBase@@QEBA_NXZ @901 NONAME

-?LoadInt@CCtrlData@@IEAAKXZ @902 NONAME

-?LoadInt@CDbLink@@UEAAKXZ @903 NONAME

+?LoadInt@CCtrlData@@IEAAIXZ @902 NONAME

+?LoadInt@CDbLink@@UEAAIXZ @903 NONAME

 ?LoadText@CCtrlData@@IEAAPEB_WXZ @904 NONAME

 ?LoadText@CDbLink@@UEAAPEA_WXZ @905 NONAME

 ?MakeFlat@CCtrlMButton@@QEAAXXZ @906 NONAME

@@ -764,12 +764,12 @@ mir_wstrcmpi                  @280
 ?ResetContent@CCtrlCombo@@QEAAXXZ @956 NONAME

 ?ResetContent@CCtrlListBox@@QEAAXXZ @957 NONAME

 ?Resizer@CDlgBase@@MEAAHPEAUUTILRESIZECONTROL@@@Z @958 NONAME

-?SaveInt@CCtrlData@@IEAAXK@Z @959 NONAME

-?SaveInt@CDbLink@@UEAAXK@Z @960 NONAME

+?SaveInt@CCtrlData@@IEAAXI@Z @959 NONAME

+?SaveInt@CDbLink@@UEAAXI@Z @960 NONAME

 ?SaveText@CCtrlData@@IEAAXPEA_W@Z @961 NONAME

 ?SaveText@CDbLink@@UEAAXPEA_W@Z @962 NONAME

 ?Scroll@CCtrlListView@@QEAAHHH@Z @963 NONAME

-?Select@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@K@Z @964 NONAME

+?Select@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@I@Z @964 NONAME

 ?SelectDropTarget@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@@Z @965 NONAME

 ?SelectItem@CCtrlClc@@QEAAXPEAX@Z @966 NONAME

 ?SelectItem@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@@Z @967 NONAME

@@ -784,15 +784,15 @@ mir_wstrcmpi                  @280
 ?SetCallbackMask@CCtrlListView@@QEAAHI@Z @977 NONAME

 ?SetCheck@CCtrlClc@@QEAAXPEAX_N@Z @978 NONAME

 ?SetCheckState@CCtrlListView@@QEAAXIH@Z @979 NONAME

-?SetCheckState@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@K@Z @980 NONAME

+?SetCheckState@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@I@Z @980 NONAME

 ?SetColumn@CCtrlListView@@QEAAHHPEAUtagLVCOLUMNW@@@Z @981 NONAME

 ?SetColumnOrderArray@CCtrlListView@@QEAAHHPEAH@Z @982 NONAME

 ?SetColumnWidth@CCtrlListView@@QEAAHHH@Z @983 NONAME

 ?SetCurSel@CCtrlCombo@@QEAAHH@Z @984 NONAME

 ?SetCurSel@CCtrlListBox@@QEAAHH@Z @985 NONAME

-?SetExStyle@CCtrlClc@@QEAAXK@Z @986 NONAME

-?SetExtendedListViewStyle@CCtrlListView@@QEAAXK@Z @987 NONAME

-?SetExtendedListViewStyleEx@CCtrlListView@@QEAAXKK@Z @988 NONAME

+?SetExStyle@CCtrlClc@@QEAAXI@Z @986 NONAME

+?SetExtendedListViewStyle@CCtrlListView@@QEAAXI@Z @987 NONAME

+?SetExtendedListViewStyleEx@CCtrlListView@@QEAAXII@Z @988 NONAME

 ?SetExtraColumns@CCtrlClc@@QEAAXH@Z @989 NONAME

 ?SetExtraImage@CCtrlClc@@QEAAXPEAXHH@Z @990 NONAME

 ?SetExtraImageList@CCtrlClc@@QEAAXPEAU_IMAGELIST@@@Z @991 NONAME

@@ -803,8 +803,8 @@ mir_wstrcmpi                  @280
 ?SetHideOfflineRoot@CCtrlClc@@QEAAX_N@Z @997 NONAME

 ?SetHotCursor@CCtrlListView@@QEAAPEAUHICON__@@PEAU2@@Z @998 NONAME

 ?SetHotItem@CCtrlListView@@QEAAHH@Z @999 NONAME

-?SetHoverTime@CCtrlListView@@QEAAXK@Z @1000 NONAME

-?SetIconSpacing@CCtrlListView@@QEAAKHH@Z @1001 NONAME

+?SetHoverTime@CCtrlListView@@QEAAXI@Z @1000 NONAME

+?SetIconSpacing@CCtrlListView@@QEAAIHH@Z @1001 NONAME

 ?SetImageList@CCtrlListView@@QEAAPEAU_IMAGELIST@@PEAU2@H@Z @1002 NONAME

 ?SetImageList@CCtrlTreeView@@QEAAXPEAU_IMAGELIST@@H@Z @1003 NONAME

 ?SetIndent@CCtrlTreeView@@QEAAXH@Z @1005 NONAME

@@ -818,18 +818,18 @@ mir_wstrcmpi                  @280
 ?SetItem@CCtrlListView@@QEAAXHHPEB_WH@Z @1013 NONAME

 ?SetItem@CCtrlTreeView@@QEAAXPEAUtagTVITEMEXW@@@Z @1014 NONAME

 ?SetItemCount@CCtrlListView@@QEAAXH@Z @1015 NONAME

-?SetItemCountEx@CCtrlListView@@QEAAXHK@Z @1016 NONAME

+?SetItemCountEx@CCtrlListView@@QEAAXHI@Z @1016 NONAME

 ?SetItemData@CCtrlCombo@@QEAAXH_J@Z @1017 NONAME

 ?SetItemData@CCtrlListBox@@QEAAXH_J@Z @1018 NONAME

 ?SetItemHeight@CCtrlTreeView@@QEAAXF@Z @1019 NONAME

 ?SetItemPosition32@CCtrlListView@@QEAAXHHH@Z @1020 NONAME

 ?SetItemPosition@CCtrlListView@@QEAAHHHH@Z @1021 NONAME

 ?SetItemState@CCtrlListView@@QEAAXHII@Z @1022 NONAME

-?SetItemState@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@KK@Z @1023 NONAME

+?SetItemState@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@II@Z @1023 NONAME

 ?SetItemText@CCtrlClc@@QEAAXPEAXPEAD@Z @1024 NONAME

 ?SetItemText@CCtrlListView@@QEAAXHHPEB_W@Z @1025 NONAME

 ?SetLineColor@CCtrlTreeView@@QEAAKK@Z @1027 NONAME

-?SetOfflineModes@CCtrlClc@@QEAAXK@Z @1028 NONAME

+?SetOfflineModes@CCtrlClc@@QEAAXI@Z @1028 NONAME

 ?SetOutlineColor@CCtrlListView@@QEAAKK@Z @1029 NONAME

 ?SetScrollTime@CCtrlTreeView@@QEAAXI@Z @1030 NONAME

 ?SetSel@CCtrlListBox@@QEAAXH_N@Z @1031 NONAME

@@ -848,7 +848,7 @@ mir_wstrcmpi                  @280
 ?SetUnicodeFormat@CCtrlListView@@QEAAHH@Z @1046 NONAME

 ?SetUnicodeFormat@CCtrlTreeView@@QEAAHH@Z @1047 NONAME

 ?SetUseGroups@CCtrlClc@@QEAAX_N@Z @1048 NONAME

-?SetView@CCtrlListView@@QEAAHK@Z @1049 NONAME

+?SetView@CCtrlListView@@QEAAHI@Z @1049 NONAME

 ?SetWorkAreas@CCtrlListView@@QEAAXHPEAUtagRECT@@@Z @1050 NONAME

 ?Show@CDlgBase@@QEAAXH@Z @1051 NONAME

 ?ShowDropdown@CCtrlCombo@@QEAAX_N@Z @1052 NONAME

@@ -1040,7 +1040,7 @@ IsTerminalDisconnected @1245
 CallObjectEventHook @1259

 ?db_get_sm@@YA?AV?$CMStringT@DV?$ChTraitsCRT@D@@@@IPEBD00@Z @1682 NONAME

 ?db_get_wsm@@YA?AV?$CMStringT@_WV?$ChTraitsCRT@_W@@@@IPEBD0PEB_W@Z @1683 NONAME

-?CreateLink@CDlgBase@@IEAAXAEAVCCtrlData@@PEBDEK@Z @1262 NONAME

+?CreateLink@CDlgBase@@IEAAXAEAVCCtrlData@@PEBDEI@Z @1262 NONAME

 ?CreateLink@CDlgBase@@IEAAXAEAVCCtrlData@@PEBDPEA_W@Z @1263 NONAME

 ?CheckRowCount@CCtrlPages@@AEAAXXZ @1264 NONAME

 ?VerifyControls@CDlgBase@@AEAA_NP8CCtrlBase@@EAA_NXZ@Z @1265 NONAME

@@ -1485,11 +1485,11 @@ TimeZone_GetSystemTime @1692
 ??0CCtrlColor@@QEAA@PEAVCDlgBase@@H@Z @1707 NONAME

 ??1CCtrlColor@@UEAA@XZ @1708 NONAME

 ??_7CCtrlColor@@6B@ @1709 NONAME

-?GetColor@CCtrlColor@@QEAAKXZ @1710 NONAME

+?GetColor@CCtrlColor@@QEAAIXZ @1710 NONAME

 ?OnApply@CCtrlColor@@UEAA_NXZ @1711 NONAME

 ?OnCommand@CCtrlColor@@UEAAHPEAUHWND__@@GG@Z @1712 NONAME

 ?OnReset@CCtrlColor@@UEAAXXZ @1713 NONAME

-?SetColor@CCtrlColor@@QEAAXK@Z @1714 NONAME

+?SetColor@CCtrlColor@@QEAAXI@Z @1714 NONAME

 ??0CCtrlSlider@@QEAA@PEAVCDlgBase@@HHH@Z @1715 NONAME

 ??1CCtrlSlider@@UEAA@XZ @1716 NONAME

 ??_7CCtrlSlider@@6B@ @1717 NONAME

diff --git a/src/mir_core/src/miranda.h b/src/mir_core/src/miranda.h
index 32ea470e58..a9be2ed2c3 100644
--- a/src/mir_core/src/miranda.h
+++ b/src/mir_core/src/miranda.h
@@ -70,7 +70,7 @@ struct THook : public MZeroedObject
 	int  subscriberCount;
 	THookSubscriber* subscriber;
 	MIRANDAHOOK pfnHook;
-	DWORD secretSignature = HOOK_SECRET_SIGNATURE;
+	uint32_t secretSignature = HOOK_SECRET_SIGNATURE;
 	mir_cs csHook;
 };
 
@@ -84,10 +84,10 @@ char* LangPackTranslateString(const MUUID *pUuid, const char *szEnglish, const i
 /////////////////////////////////////////////////////////////////////////////////////////
 // threads.cpp
 
-extern DWORD mir_tls;
+extern uint32_t mir_tls;
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // utils.cpp
 
-typedef BOOL(MIR_SYSCALL *PGENRANDOM)(void*, DWORD);
+typedef BOOL(MIR_SYSCALL *PGENRANDOM)(void*, uint32_t);
 extern PGENRANDOM pfnRtlGenRandom;
diff --git a/src/mir_core/src/modules.cpp b/src/mir_core/src/modules.cpp
index 68d2457778..37b3b8786a 100644
--- a/src/mir_core/src/modules.cpp
+++ b/src/mir_core/src/modules.cpp
@@ -46,7 +46,7 @@ struct THookToMainThreadItem
 
 struct TService
 {
-	DWORD nameHash;
+	uint32_t nameHash;
 	HINSTANCE hOwner;
 	union
 	{
@@ -76,7 +76,7 @@ TServiceToMainThreadItem;
 // other static variables
 static BOOL bServiceMode = FALSE;
 static mir_cs csHooks, csServices;
-static DWORD  mainThreadId;
+static uint32_t  mainThreadId;
 static int    sttHookId = 1;
 
 /////////////////////////////////////////////////////////////////////////////////////////