DWORD -> uint32_t

4 files changed, 8 insertions, 8 deletions

diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp
index 77ad692cf1..bc4d7655f1 100644
--- a/protocols/EmLanProto/src/amdproto.cpp
+++ b/protocols/EmLanProto/src/amdproto.cpp
@@ -44,7 +44,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC
 

 //////////////////////////////////////////////////////////////////////////

 

-BOOL APIENTRY DllMain(HINSTANCE hInstDLL, DWORD reason, LPVOID)

+BOOL APIENTRY DllMain(HINSTANCE hInstDLL, uint32_t reason, LPVOID)

 {

 	if (reason == DLL_PROCESS_ATTACH) {

 		EMLOG("EmLan Started");

diff --git a/protocols/EmLanProto/src/get_time.cpp b/protocols/EmLanProto/src/get_time.cpp
index 6ffccc5047..bb8f71915c 100644
--- a/protocols/EmLanProto/src/get_time.cpp
+++ b/protocols/EmLanProto/src/get_time.cpp
@@ -28,9 +28,9 @@ static int IsLeapYear(int year)
 	return 1;

 }

 

-static DWORD YMDHMSToTime(int year,int month,int day,int hour,int minute,int second)

+static uint32_t YMDHMSToTime(int year,int month,int day,int hour,int minute,int second)

 {

-	DWORD ret=0;

+	uint32_t ret=0;

 	int i;

 

 	for(i=1970;i<year;i++) ret+=365+IsLeapYear(i);

@@ -41,7 +41,7 @@ static DWORD YMDHMSToTime(int year,int month,int day,int hour,int minute,int sec
 	return ret+3600*hour+60*minute+second;

 }

 

-DWORD get_time()

+uint32_t get_time()

 {

 	SYSTEMTIME stime;

 	GetSystemTime(&stime);

diff --git a/protocols/EmLanProto/src/get_time.h b/protocols/EmLanProto/src/get_time.h
index 9f5676c5d3..a9d1eb9743 100644
--- a/protocols/EmLanProto/src/get_time.h
+++ b/protocols/EmLanProto/src/get_time.h
@@ -20,6 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef __GET_TIME_H__

 #define __GET_TIME_H__

 

-DWORD get_time();

+uint32_t get_time();

 

 #endif //__GET_TIME_H__

diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp
index 4833b0356a..f04313ad9e 100644
--- a/protocols/EmLanProto/src/mlan.cpp
+++ b/protocols/EmLanProto/src/mlan.cpp
@@ -328,7 +328,7 @@ void CMLan::RecvMessageUrl(CCSDATA *ccs)
 	dbei.szModule = MODULENAME;
 	dbei.timestamp = pre->timestamp;
 	dbei.flags = DBEF_UTF + ((pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0);
-	dbei.cbBlob = (DWORD)mir_strlen(szMessage) + 1;
+	dbei.cbBlob = (uint32_t)mir_strlen(szMessage) + 1;
 	dbei.pBlob = (uint8_t*)szMessage.get();
 	db_event_add(ccs->hContact, &dbei);
 }
@@ -904,7 +904,7 @@ void CMLan::RecvFile(CCSDATA *ccs)
 
 	Contact_Hide(ccs->hContact, false);
 
-	char *szFile = pre->szMessage + sizeof(DWORD);
+	char *szFile = pre->szMessage + sizeof(uint32_t);
 	char *szDesc = szFile + mir_strlen(szFile) + 1;
 
 	DBEVENTINFO dbei = {};
@@ -912,7 +912,7 @@ void CMLan::RecvFile(CCSDATA *ccs)
 	dbei.timestamp = pre->timestamp;
 	dbei.flags = pre->flags & (PREF_CREATEREAD ? DBEF_READ : 0);
 	dbei.eventType = EVENTTYPE_FILE;
-	dbei.cbBlob = DWORD(sizeof(DWORD) + mir_strlen(szFile) + mir_strlen(szDesc) + 2);
+	dbei.cbBlob = uint32_t(sizeof(uint32_t) + mir_strlen(szFile) + mir_strlen(szDesc) + 2);
 	dbei.pBlob = (uint8_t*)pre->szMessage;
 	db_event_add(ccs->hContact, &dbei);
 }