DWORD -> uint32_t

5 files changed, 9 insertions, 9 deletions

diff --git a/protocols/ICQCorp/src/options.cpp b/protocols/ICQCorp/src/options.cpp
index 16fc69713a..4f940aa1eb 100644
--- a/protocols/ICQCorp/src/options.cpp
+++ b/protocols/ICQCorp/src/options.cpp
@@ -45,7 +45,7 @@ static INT_PTR CALLBACK icqOptionsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LP
 	case WM_NOTIFY:

 		switch (((LPNMHDR)lParam)->code) {

 		case PSN_APPLY:

-			g_plugin.setDword("UIN", (DWORD)GetDlgItemInt(hWnd, IDC_OPT_UIN, nullptr, FALSE));

+			g_plugin.setDword("UIN", (uint32_t)GetDlgItemInt(hWnd, IDC_OPT_UIN, nullptr, FALSE));

 			GetDlgItemTextA(hWnd, IDC_OPT_PASSWORD, str, sizeof(str));

 			g_plugin.setString("Password", str);

 			GetDlgItemTextA(hWnd, IDC_OPT_SERVER, str, sizeof(str));

diff --git a/protocols/ICQCorp/src/protocol.cpp b/protocols/ICQCorp/src/protocol.cpp
index 48afd2f717..8de3587c82 100644
--- a/protocols/ICQCorp/src/protocol.cpp
+++ b/protocols/ICQCorp/src/protocol.cpp
@@ -2104,11 +2104,11 @@ void ICQ::addFileReq(ICQUser *u, char *m, char *filename, unsigned long size, un
 	icqTransfers.push_back(transfer);

 

 	// Send chain event

-	char *szBlob = new char[sizeof(DWORD) + mir_strlen(filename) + mir_strlen(m) + 2];

+	char *szBlob = new char[sizeof(uint32_t) + mir_strlen(filename) + mir_strlen(m) + 2];

 

 	*(PDWORD)szBlob = (UINT_PTR)transfer;

-	mir_strcpy(szBlob + sizeof(DWORD), filename);

-	mir_strcpy(szBlob + sizeof(DWORD) + mir_strlen(filename) + 1, m);

+	mir_strcpy(szBlob + sizeof(uint32_t), filename);

+	mir_strcpy(szBlob + sizeof(uint32_t) + mir_strlen(filename) + 1, m);

 

 	PROTORECVEVENT pre;

 	pre.flags = 0;

diff --git a/protocols/ICQCorp/src/protocol.h b/protocols/ICQCorp/src/protocol.h
index c939b2bd46..4e23d7781c 100644
--- a/protocols/ICQCorp/src/protocol.h
+++ b/protocols/ICQCorp/src/protocol.h
@@ -133,7 +133,7 @@ const unsigned int WM_NETEVENT_TRANSFER             = WM_USER + 4;
 

 typedef struct {   //extended search result structure, used for all searches

     PROTOSEARCHRESULT hdr;

-    DWORD uin;

+    uint32_t uin;

     uint8_t auth;

 } ICQSEARCHRESULT;

 

diff --git a/protocols/ICQCorp/src/services.cpp b/protocols/ICQCorp/src/services.cpp
index 825f277f9d..2b1ae872c4 100644
--- a/protocols/ICQCorp/src/services.cpp
+++ b/protocols/ICQCorp/src/services.cpp
@@ -201,7 +201,7 @@ static INT_PTR icqRecvMessage(WPARAM, LPARAM lParam)
 	if (pre->flags & PREF_CREATEREAD) 

 		dbei.flags |= DBEF_READ;

 	dbei.eventType = EVENTTYPE_MESSAGE;

-	dbei.cbBlob = (DWORD)mir_strlen(szMsg) + 1;

+	dbei.cbBlob = (uint32_t)mir_strlen(szMsg) + 1;

 	dbei.pBlob = (uint8_t*)szMsg.get();

 	db_event_add(ccs->hContact, &dbei);

 	return 0;

@@ -365,7 +365,7 @@ static INT_PTR icqRecvFile(WPARAM, LPARAM lParam)
 	Contact_Hide(ccs->hContact, false);

 

 	PROTORECVEVENT *pre = (PROTORECVEVENT *)ccs->lParam;

-	char *szFile = pre->szMessage + sizeof(DWORD);

+	char *szFile = pre->szMessage + sizeof(uint32_t);

 	char *szDesc = szFile + mir_strlen(szFile) + 1;

 

 	DBEVENTINFO dbei = {};

@@ -373,7 +373,7 @@ static INT_PTR icqRecvFile(WPARAM, LPARAM lParam)
 	dbei.timestamp = pre->timestamp;

 	dbei.flags = pre->flags & (PREF_CREATEREAD ? DBEF_READ : 0);

 	dbei.eventType = EVENTTYPE_FILE;

-	dbei.cbBlob = sizeof(DWORD) + (DWORD)mir_strlen(szFile) + (DWORD)mir_strlen(szDesc) + 2;

+	dbei.cbBlob = sizeof(uint32_t) + (uint32_t)mir_strlen(szFile) + (uint32_t)mir_strlen(szDesc) + 2;

 	dbei.pBlob = (uint8_t*)pre->szMessage;

 	db_event_add(ccs->hContact, &dbei);

 

diff --git a/protocols/ICQCorp/src/transfer.cpp b/protocols/ICQCorp/src/transfer.cpp
index a9f7619e2b..82ca64b879 100644
--- a/protocols/ICQCorp/src/transfer.cpp
+++ b/protocols/ICQCorp/src/transfer.cpp
@@ -23,7 +23,7 @@ std::vector <ICQTransfer *> icqTransfers;
 

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

 

-void WINAPI transferTimerProc(HWND, UINT, UINT_PTR hTimer, DWORD)

+static void WINAPI transferTimerProc(HWND, UINT, UINT_PTR hTimer, DWORD)

 {

 	KillTimer(nullptr, hTimer);