WORD -> uint16_t

3 files changed, 7 insertions, 7 deletions

diff --git a/plugins/Db3x_mmap/src/dbcrypt.cpp b/plugins/Db3x_mmap/src/dbcrypt.cpp
index 39f523be8e..bd8b1495f0 100644
--- a/plugins/Db3x_mmap/src/dbcrypt.cpp
+++ b/plugins/Db3x_mmap/src/dbcrypt.cpp
@@ -79,7 +79,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::StoreCryptoKey()
 

 	DBCONTACTWRITESETTING dbcws = { "CryptoEngine", "StoredKey" };

 	dbcws.value.type = DBVT_BLOB;

-	dbcws.value.cpbVal = (WORD)iKeyLength;

+	dbcws.value.cpbVal = (uint16_t)iKeyLength;

 	dbcws.value.pbVal = pKey;

 	WriteContactSetting(0, &dbcws);

 

@@ -120,7 +120,7 @@ STDMETHODIMP_(BOOL) CDb3Mmap::StoreProvider(CRYPTO_PROVIDER *pProvider)
 	DBCONTACTWRITESETTING dbcws = { "CryptoEngine", "Provider" };

 	dbcws.value.type = DBVT_BLOB;

 	dbcws.value.pbVal = (uint8_t*)pProvider->pszName;

-	dbcws.value.cpbVal = (WORD)mir_strlen(pProvider->pszName) + 1;

+	dbcws.value.cpbVal = (uint16_t)mir_strlen(pProvider->pszName) + 1;

 	WriteContactSetting(0, &dbcws);

 	return TRUE;

 }

@@ -239,7 +239,7 @@ void CDb3Mmap::ToggleSettingsEncryption(MCONTACT contactID)
 					DBCONTACTWRITESETTING dbcws = { szModule, p->szVar };

 					dbcws.value.type = DBVT_ENCRYPTED;

 					dbcws.value.pbVal = pResult;

-					dbcws.value.cpbVal = (WORD)encodedLen;

+					dbcws.value.cpbVal = (uint16_t)encodedLen;

 					WriteContactSetting(contactID, &dbcws);

 

 					mir_free(pResult);

@@ -252,7 +252,7 @@ void CDb3Mmap::ToggleSettingsEncryption(MCONTACT contactID)
 					DBCONTACTWRITESETTING dbcws = { szModule, p->szVar };

 					dbcws.value.type = DBVT_UNENCRYPTED;

 					dbcws.value.pszVal = decoded;

-					dbcws.value.cchVal = (WORD)realLen;

+					dbcws.value.cchVal = (uint16_t)realLen;

 					WriteContactSetting(contactID, &dbcws);

 				}

 			}

diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h
index 4963ab95bf..10daa4517c 100644
--- a/plugins/Db3x_mmap/src/dbintf.h
+++ b/plugins/Db3x_mmap/src/dbintf.h
@@ -150,7 +150,7 @@ struct DBEvent_094         // previous event storage format
 	// the owner of this event

 	DWORD timestamp;        // seconds since 00:00:00 01/01/1970

 	DWORD flags;            // see m_database.h, db/event/add

-	WORD  wEventType;       // module-defined event type

+	uint16_t  wEventType;       // module-defined event type

 	DWORD cbBlob;           // number of bytes in the blob

 	uint8_t  blob[1];          // the blob. module-defined formatting

 };

@@ -165,7 +165,7 @@ struct DBEvent
 	// the owner of this event

 	DWORD timestamp;        // seconds since 00:00:00 01/01/1970

 	DWORD flags;            // see m_database.h, db/event/add

-	WORD  wEventType;       // module-defined event type

+	uint16_t  wEventType;       // module-defined event type

 	DWORD cbBlob;           // number of bytes in the blob

 	uint8_t  blob[1];          // the blob. module-defined formatting

 

diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp
index e4fa495431..26c2361b5b 100644
--- a/plugins/Db3x_mmap/src/dbsettings.cpp
+++ b/plugins/Db3x_mmap/src/dbsettings.cpp
@@ -167,7 +167,7 @@ LBL_Seek:
 						if (decoded == nullptr)

 							return 1;

 

-						varLen = (WORD)realLen;

+						varLen = (uint16_t)realLen;

 						dbv->type = DBVT_UTF8;

 						if (isStatic) {

 							dbv->cchVal--;