DWORD -> uint32_t

5 files changed, 11 insertions, 11 deletions

diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index 2a57485eb0..16846c02f0 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -120,10 +120,10 @@ void PushFileEvent(MCONTACT hContact, MEVENT hdbe, LPARAM lParam)
 

 static int FileEventAdded(WPARAM wParam, LPARAM lParam)

 {

-	DWORD dwSignature;

+	uint32_t dwSignature;

 

 	DBEVENTINFO dbei = {};

-	dbei.cbBlob = sizeof(DWORD);

+	dbei.cbBlob = sizeof(uint32_t);

 	dbei.pBlob = (uint8_t*)&dwSignature;

 	db_event_get(lParam, &dbei);

 	if (dbei.flags & (DBEF_SENT | DBEF_READ) || dbei.eventType != EVENTTYPE_FILE || dwSignature == 0)

@@ -381,7 +381,7 @@ static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam)
 		szDescr = pre->descr.a;

 	}

 

-	dbei.cbBlob = sizeof(DWORD);

+	dbei.cbBlob = sizeof(uint32_t);

 

 	for (int i = 0; i < pre->fileCount; i++)

 		dbei.cbBlob += (int)mir_strlen(pszFiles[i]) + 1;

@@ -391,8 +391,8 @@ static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam)
 	if ((dbei.pBlob = (uint8_t*)mir_alloc(dbei.cbBlob)) == nullptr)

 		return 0;

 

-	*(DWORD*)dbei.pBlob = 0;

-	uint8_t* p = dbei.pBlob + sizeof(DWORD);

+	*(uint32_t*)dbei.pBlob = 0;

+	uint8_t* p = dbei.pBlob + sizeof(uint32_t);

 	for (int i = 0; i < pre->fileCount; i++) {

 		mir_strcpy((char*)p, pszFiles[i]);

 		p += mir_strlen(pszFiles[i]) + 1;

diff --git a/src/core/stdfile/src/file.h b/src/core/stdfile/src/file.h
index 7b8cce531e..63a71dd8ac 100644
--- a/src/core/stdfile/src/file.h
+++ b/src/core/stdfile/src/file.h
@@ -63,7 +63,7 @@ struct FileDlgData
 	PROTOFILETRANSFERSTATUS transferStatus;

 	int *fileVirusScanned;

 	HANDLE hPreshutdownEvent;

-	DWORD dwTicks;

+	uint32_t dwTicks;

 

 	wchar_t szSavePath[MAX_PATH];

 	wchar_t szMsg[450], szFilenames[1024];

diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp
index a1e11bafb5..5bfc1f6a9f 100644
--- a/src/core/stdfile/src/filerecvdlg.cpp
+++ b/src/core/stdfile/src/filerecvdlg.cpp
@@ -35,7 +35,7 @@ static BOOL CALLBACK ClipSiblingsChildEnumProc(HWND hwnd, LPARAM)
 

 static void GetLowestExistingDirName(const wchar_t *szTestDir, wchar_t *szExistingDir, int cchExistingDir)

 {

-	DWORD dwAttributes;

+	uint32_t dwAttributes;

 	wchar_t *pszLastBackslash;

 

 	mir_wstrncpy(szExistingDir, szTestDir, cchExistingDir);

diff --git a/src/core/stdfile/src/filesenddlg.cpp b/src/core/stdfile/src/filesenddlg.cpp
index fcd8ed0b9b..fa18e1f532 100644
--- a/src/core/stdfile/src/filesenddlg.cpp
+++ b/src/core/stdfile/src/filesenddlg.cpp
@@ -73,7 +73,7 @@ static void FilenameToFileList(HWND hwndDlg, FileDlgData* dat, const wchar_t *bu
 	FreeFilesMatrix(&dat->files);

 

 	// Get the file attributes of selection

-	DWORD dwFileAttributes = GetFileAttributes(buf);

+	uint32_t dwFileAttributes = GetFileAttributes(buf);

 	if (dwFileAttributes == INVALID_FILE_ATTRIBUTES)

 		return;

 

diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp
index ed445a5907..454658c147 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -82,11 +82,11 @@ void FillSendData(FileDlgData *dat, DBEVENTINFO& dbei)
 	char *szFileNames = mir_utf8encodeW(dat->szFilenames), *szMsg = mir_utf8encodeW(dat->szMsg);
 	dbei.flags |= DBEF_UTF;
 
-	dbei.cbBlob = int(sizeof(DWORD) + mir_strlen(szFileNames) + mir_strlen(szMsg) + 2);
+	dbei.cbBlob = int(sizeof(uint32_t) + mir_strlen(szFileNames) + mir_strlen(szMsg) + 2);
 	dbei.pBlob = (uint8_t*)mir_alloc(dbei.cbBlob);
 	*(PDWORD)dbei.pBlob = 0;
-	mir_strcpy((char*)dbei.pBlob + sizeof(DWORD), szFileNames);
-	mir_strcpy((char*)dbei.pBlob + sizeof(DWORD) + mir_strlen(szFileNames) + 1, szMsg);
+	mir_strcpy((char*)dbei.pBlob + sizeof(uint32_t), szFileNames);
+	mir_strcpy((char*)dbei.pBlob + sizeof(uint32_t) + mir_strlen(szFileNames) + 1, szMsg);
 
 	mir_free(szFileNames), mir_free(szMsg);
 }