DWORD -> uint32_t

6 files changed, 10 insertions, 10 deletions

diff --git a/plugins/FavContacts/src/contact_cache.cpp b/plugins/FavContacts/src/contact_cache.cpp
index 2416ed0c00..80ae06d330 100644
--- a/plugins/FavContacts/src/contact_cache.cpp
+++ b/plugins/FavContacts/src/contact_cache.cpp
@@ -155,8 +155,8 @@ wchar_t *nb_stristr(wchar_t *str, wchar_t *substr)
 	wchar_t *str_up = NEWWSTR_ALLOCA(str);

 	wchar_t *substr_up = NEWWSTR_ALLOCA(substr);

 

-	CharUpperBuff(str_up, (DWORD)mir_wstrlen(str_up));

-	CharUpperBuff(substr_up, (DWORD)mir_wstrlen(substr_up));

+	CharUpperBuff(str_up, (uint32_t)mir_wstrlen(str_up));

+	CharUpperBuff(substr_up, (uint32_t)mir_wstrlen(substr_up));

 

 	wchar_t *p = wcsstr(str_up, substr_up);

 	return p ? (str + (p - str_up)) : nullptr;

diff --git a/plugins/FavContacts/src/cserver.cpp b/plugins/FavContacts/src/cserver.cpp
index b2577c8ecf..317cb1a019 100644
--- a/plugins/FavContacts/src/cserver.cpp
+++ b/plugins/FavContacts/src/cserver.cpp
@@ -34,7 +34,7 @@ void CServer::Stop()
 	closesocket(m_socket);

 }

 

-DWORD CServer::ConnectionAcceptThread()

+uint32_t CServer::ConnectionAcceptThread()

 {

 	while (1) {

 		SOCKET s = accept(m_socket, nullptr, nullptr);

@@ -45,7 +45,7 @@ DWORD CServer::ConnectionAcceptThread()
 	return 0;

 }

 

-DWORD CServer::ConnectionProcessThread(SOCKET s)

+uint32_t CServer::ConnectionProcessThread(SOCKET s)

 {

 	CSocket sock(s);

 	IConnectionProcessor *processor = m_connectionProcessorFactory->Create(&sock);

diff --git a/plugins/FavContacts/src/cserver.h b/plugins/FavContacts/src/cserver.h
index f96c87b2c1..659ad704f8 100644
--- a/plugins/FavContacts/src/cserver.h
+++ b/plugins/FavContacts/src/cserver.h
@@ -20,8 +20,8 @@ private:
 	SOCKET m_socket;

 	IConnectionProcessorFactory *m_connectionProcessorFactory;

 

-	DWORD ConnectionAcceptThread();

-	DWORD ConnectionProcessThread(SOCKET s);

+	uint32_t ConnectionAcceptThread();

+	uint32_t ConnectionProcessThread(SOCKET s);

 

 	static void GlobalConnectionAcceptThread(void *arg);

 

diff --git a/plugins/FavContacts/src/favlist.h b/plugins/FavContacts/src/favlist.h
index eeaea0d6ea..588731662b 100644
--- a/plugins/FavContacts/src/favlist.h
+++ b/plugins/FavContacts/src/favlist.h
@@ -5,7 +5,7 @@ struct TContactInfo
 {

 private:

 	MCONTACT hContact;

-	DWORD status;

+	uint32_t status;

 	wchar_t *name;

 	wchar_t *group;

 	bool bManual;

diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp
index de3817148a..0f4f13e3c4 100644
--- a/plugins/FavContacts/src/menu.cpp
+++ b/plugins/FavContacts/src/menu.cpp
@@ -486,7 +486,7 @@ int ShowMenu(bool centered)
 

 		AppendMenu(hMenu, MF_OWNERDRAW, ++idItem, (LPCTSTR)hContact);

 

-		mis.itemData = (DWORD)hContact;

+		mis.itemData = (uint32_t)hContact;

 		mis.itemID = idItem;

 		MenuMeasureItem(&mis);

 		szColumn.cx = max(szColumn.cx, (int)mis.itemWidth);

diff --git a/plugins/FavContacts/src/options.cpp b/plugins/FavContacts/src/options.cpp
index 2ad1d715dd..d4078e5573 100644
--- a/plugins/FavContacts/src/options.cpp
+++ b/plugins/FavContacts/src/options.cpp
@@ -138,13 +138,13 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 

 				mis.CtlID = 0;

 				mis.CtlType = ODT_MENU;

-				mis.itemData = (DWORD)hSelectedContact;

+				mis.itemData = (uint32_t)hSelectedContact;

 				MenuMeasureItem(&mis, &options);

 				dis.rcItem.bottom = dis.rcItem.top + mis.itemHeight;

 

 				dis.CtlID = 0;

 				dis.CtlType = ODT_MENU;

-				dis.itemData = (DWORD)hSelectedContact;

+				dis.itemData = (uint32_t)hSelectedContact;

 				MenuDrawItem(&dis, &options);

 

 				RECT rc = lpdis->rcItem;