From cddcd7483a7c472598af098e759e5d309024f606 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 20:31:39 +0300 Subject: DWORD -> uint32_t --- plugins/Dbx_mdbx/src/dbevents.cpp | 4 ++-- plugins/Dbx_mdbx/src/dbintf.h | 2 +- plugins/Dbx_mdbx/src/dbsettings.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Dbx_mdbx') diff --git a/plugins/Dbx_mdbx/src/dbevents.cpp b/plugins/Dbx_mdbx/src/dbevents.cpp index 18b59b6606..98707f4415 100644 --- a/plugins/Dbx_mdbx/src/dbevents.cpp +++ b/plugins/Dbx_mdbx/src/dbevents.cpp @@ -310,14 +310,14 @@ BOOL CDbxMDBX::GetEvent(MEVENT hDbEvent, DBEVENTINFO *dbei) dbei->flags = dbe->flags; dbei->eventType = dbe->wEventType; - DWORD cbBlob = dbe->cbBlob; + uint32_t cbBlob = dbe->cbBlob; size_t bytesToCopy = cbBlob; if (dbei->cbBlob == -1) dbei->pBlob = (uint8_t*)mir_calloc(cbBlob + 2); else if (dbei->cbBlob < cbBlob) bytesToCopy = dbei->cbBlob; - dbei->cbBlob = (DWORD)cbBlob; + dbei->cbBlob = (uint32_t)cbBlob; if (bytesToCopy && dbei->pBlob) { uint8_t *pSrc = (uint8_t*)dbe + sizeof(DBEvent); if (dbe->flags & DBEF_ENCRYPTED) { diff --git a/plugins/Dbx_mdbx/src/dbintf.h b/plugins/Dbx_mdbx/src/dbintf.h index b85559e33d..aa09105efa 100644 --- a/plugins/Dbx_mdbx/src/dbintf.h +++ b/plugins/Dbx_mdbx/src/dbintf.h @@ -99,7 +99,7 @@ struct DBSettingValue { uint8_t bVal; uint16_t wVal; - DWORD dwVal; + uint32_t dwVal; char szVal[]; struct diff --git a/plugins/Dbx_mdbx/src/dbsettings.cpp b/plugins/Dbx_mdbx/src/dbsettings.cpp index 737a2d607b..2018bb10be 100644 --- a/plugins/Dbx_mdbx/src/dbsettings.cpp +++ b/plugins/Dbx_mdbx/src/dbsettings.cpp @@ -55,7 +55,7 @@ void CDbxMDBX::FillSettings() switch (iType) { case DBVT_BYTE: dbv->bVal = *pBlob; break; case DBVT_WORD: dbv->wVal = *(uint16_t*)pBlob; break; - case DBVT_DWORD: dbv->dVal = *(DWORD*)pBlob; break; + case DBVT_DWORD: dbv->dVal = *(uint32_t*)pBlob; break; case DBVT_UTF8: case DBVT_ASCIIZ: @@ -118,7 +118,7 @@ BOOL CDbxMDBX::WriteContactSettingWorker(MCONTACT contactID, DBCONTACTWRITESETTI switch (dbcws.value.type) { case DBVT_BYTE: *pBlob = dbcws.value.bVal; break; case DBVT_WORD: *(uint16_t*)pBlob = dbcws.value.wVal; break; - case DBVT_DWORD: *(DWORD*)pBlob = dbcws.value.dVal; break; + case DBVT_DWORD: *(uint32_t*)pBlob = dbcws.value.dVal; break; case DBVT_ASCIIZ: case DBVT_UTF8: -- cgit v1.2.3