DWORD -> uint32_t

2 files changed, 10 insertions, 10 deletions

diff --git a/protocols/YAMN/src/mails/decode.cpp b/protocols/YAMN/src/mails/decode.cpp
index 39e04a0ba9..e0070658eb 100644
--- a/protocols/YAMN/src/mails/decode.cpp
+++ b/protocols/YAMN/src/mails/decode.cpp
@@ -198,7 +198,7 @@ int ConvertStringToUnicode(char *stream,unsigned int cp,wchar_t **out);
 // cp- codepage of input string
 // storeto- pointer to memory that contains unicode string
 // mode- MIME_PLAIN or MIME_MAIL (MIME_MAIL deletes '"' from start and end of string)
-void ConvertCodedStringToUnicode(char *stream,wchar_t **storeto,DWORD cp,int mode);
+void ConvertCodedStringToUnicode(char *stream,wchar_t **storeto,uint32_t cp,int mode);
 
 //--------------------------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------------------
@@ -390,7 +390,7 @@ int ConvertStringToUnicode(char *stream,unsigned int cp,wchar_t **out)
 	int streamlen,Index;
 
 	//codepages, which require to have set 0 in dwFlags parameter when calling MultiByteToWideChar
-	DWORD CodePagesZeroFlags[]={50220,50221,50222,50225,50227,50229,52936,54936,57002,57003,57004,57005,57006,57007,57008,57009,57010,57011,65000,65001};
+	uint32_t CodePagesZeroFlags[]={50220,50221,50222,50225,50227,50229,52936,54936,57002,57003,57004,57005,57006,57007,57008,57009,57010,57011,65000,65001};
 
 	if ((cp != CP_ACP) && (cp != CP_OEMCP) && (cp != CP_MACCP) && (cp != CP_THREAD_ACP) && (cp != CP_SYMBOL) && (cp != CP_UTF7) && (cp != CP_UTF8) && !GetCPInfo(cp,&CPInfo))
 		cp=CP_ACP;
@@ -439,7 +439,7 @@ int ConvertStringToUnicode(char *stream,unsigned int cp,wchar_t **out)
 	return 1;
 }
 
-void ConvertCodedStringToUnicode(char *stream,wchar_t **storeto,DWORD cp,int mode)
+void ConvertCodedStringToUnicode(char *stream,wchar_t **storeto,uint32_t cp,int mode)
 {
 	char *start=stream,*finder,*finderend;
 	char Encoding=0;
@@ -472,7 +472,7 @@ void ConvertCodedStringToUnicode(char *stream,wchar_t **storeto,DWORD cp,int mod
 					default:
 						goto NotEncoded;
 				}
-				if (-1==(cp=(DWORD)GetCharsetFromString(finder,finderend-finder)))
+				if (-1==(cp=(uint32_t)GetCharsetFromString(finder,finderend-finder)))
 					cp=CP_ACP;
 				if (Encoding != 0)
 				{
diff --git a/protocols/YAMN/src/mails/mails.cpp b/protocols/YAMN/src/mails/mails.cpp
index 7345a46dfc..d0dbba76ab 100644
--- a/protocols/YAMN/src/mails/mails.cpp
+++ b/protocols/YAMN/src/mails/mails.cpp
@@ -89,7 +89,7 @@ HYAMNMAIL WINAPI CreateNewDeleteQueueFcn(HYAMNMAIL From);
 // FlagsNotSet- ...and must not have set these flags...
 // FlagsToSetRemove- ...to set/remove these flags (see mode)
 // mode- nonzero to set, else remove
-void WINAPI SetRemoveFlagsInQueueFcn(HYAMNMAIL From,DWORD FlagsSet,DWORD FlagsNotSet,DWORD FlagsToSetRemove,int mode);
+void WINAPI SetRemoveFlagsInQueueFcn(HYAMNMAIL From,uint32_t FlagsSet,uint32_t FlagsNotSet,uint32_t FlagsToSetRemove,int mode);
 
 struct CExportedFunctions MailExportedFcn[]=
 {
@@ -119,7 +119,7 @@ struct CExportedServices MailExportedSvc[]=
 INT_PTR CreateAccountMailSvc(WPARAM wParam,LPARAM lParam)
 {
 	CAccount *Account=(CAccount *)wParam;
-	DWORD MailVersion=(DWORD)lParam;
+	uint32_t MailVersion=(uint32_t)lParam;
 	HYAMNMAIL NewMail;
 
 //test if we are going to initialize members of suitable structure (structures of plugin and YAMN must match)
@@ -194,7 +194,7 @@ void WINAPI AppendQueueFcn(HYAMNMAIL first,HYAMNMAIL second)
 INT_PTR LoadMailDataSvc(WPARAM wParam,LPARAM lParam)
 {
 	HYAMNMAIL Mail=(HYAMNMAIL)wParam;
-	DWORD MailVersion=(DWORD)lParam;
+	uint32_t MailVersion=(uint32_t)lParam;
 
 	if (MailVersion != YAMN_MAILDATAVERSION)
 		return NULL;
@@ -210,7 +210,7 @@ INT_PTR UnloadMailDataSvc(WPARAM, LPARAM)
 
 INT_PTR SaveMailDataSvc(WPARAM, LPARAM lParam)
 {
-	DWORD MailVersion=(DWORD)lParam;
+	uint32_t MailVersion=(uint32_t)lParam;
 
 	if (MailVersion != YAMN_MAILDATAVERSION)
 		return (INT_PTR)-1;
@@ -324,7 +324,7 @@ void WINAPI DeleteMessagesToEndFcn(CAccount *Account,HYAMNMAIL From)
 
 void WINAPI DeleteMessageFromQueueFcn(HYAMNMAIL *From,HYAMNMAIL Which,int mode=0)
 {
-	DWORD Number=Which->Number;
+	uint32_t Number=Which->Number;
 	HYAMNMAIL Parser;
 
 	if (*From==Which)
@@ -477,7 +477,7 @@ HYAMNMAIL WINAPI CreateNewDeleteQueueFcn(HYAMNMAIL From)
 	return FirstMail;
 }
 
-void WINAPI SetRemoveFlagsInQueueFcn(HYAMNMAIL From,DWORD FlagsSet,DWORD FlagsNotSet,DWORD FlagsToSetRemove,int mode)
+void WINAPI SetRemoveFlagsInQueueFcn(HYAMNMAIL From,uint32_t FlagsSet,uint32_t FlagsNotSet,uint32_t FlagsToSetRemove,int mode)
 {
 	HYAMNMAIL msgq;