diff --git a/Source/encrypt.cpp b/Source/encrypt.cpp
index 87a00a9b0..3069c296f 100644
--- a/Source/encrypt.cpp
+++ b/Source/encrypt.cpp
@@ -130,7 +130,7 @@ uint32_t PkwareCompress(byte *srcData, uint32_t size)
 	return size;
 }
 
-void PkwareDecompress(byte *inBuff, int recvSize, int maxBytes)
+void PkwareDecompress(byte *inBuff, uint32_t recvSize, int maxBytes)
 {
 	std::unique_ptr<char[]> ptr = std::make_unique<char[]>(CMP_BUFFER_SIZE);
 	std::unique_ptr<byte[]> outBuff { new byte[maxBytes] };
diff --git a/Source/encrypt.h b/Source/encrypt.h
index 6dfdbbbaf..b6ec9c793 100644
--- a/Source/encrypt.h
+++ b/Source/encrypt.h
@@ -23,6 +23,6 @@ void Decrypt(uint32_t *castBlock, uint32_t size, uint32_t key);
 void Encrypt(uint32_t *castBlock, uint32_t size, uint32_t key);
 uint32_t Hash(const char *s, int type);
 uint32_t PkwareCompress(byte *srcData, uint32_t size);
-void PkwareDecompress(byte *inBuff, int recvSize, int maxBytes);
+void PkwareDecompress(byte *inBuff, uint32_t recvSize, int maxBytes);
 
 } // namespace devilution
diff --git a/Source/msg.cpp b/Source/msg.cpp
index dce70a20d..3cc8218dd 100644
--- a/Source/msg.cpp
+++ b/Source/msg.cpp
@@ -24,7 +24,6 @@
 #include "levels/town.h"
 #include "levels/trigs.h"
 #include "lighting.h"
-#include "miniwin/miniwin.h"
 #include "missiles.h"
 #include "nthread.h"
 #include "objects.h"
@@ -241,19 +240,18 @@ void PrePacket()
 				return;
 			}
 
-			uint32_t size = ParseCmd(playerId, (TCmd *)data);
+			size_t size = ParseCmd(playerId, (TCmd *)data);
 			if (size == 0) {
 				Log("Discarding bad network message");
 				return;
 			}
-			uint32_t pktSize = size;
-			data += pktSize;
-			spaceLeft -= pktSize;
+			data += size;
+			spaceLeft -= size;
 		}
 	}
 }
 
-void SendPacket(int pnum, const void *packet, DWORD dwSize)
+void SendPacket(int pnum, const void *packet, size_t dwSize)
 {
 	TFakeCmdPlr cmd;
 
@@ -273,7 +271,7 @@ void SendPacket(int pnum, const void *packet, DWORD dwSize)
 
 int WaitForTurns()
 {
-	DWORD turns;
+	uint32_t turns;
 
 	if (sgbDeltaChunks == 0) {
 		nthread_send_and_recv_turn(0, 0);
@@ -432,7 +430,7 @@ uint32_t CompressData(byte *buffer, byte *end)
 	return pkSize + 1;
 }
 
-void DeltaImportData(_cmd_id cmd, DWORD recvOffset)
+void DeltaImportData(_cmd_id cmd, uint32_t recvOffset)
 {
 	if (sgRecvBuf[0] != byte { 0 })
 		PkwareDecompress(&sgRecvBuf[1], recvOffset, sizeof(sgRecvBuf) - 1);
@@ -455,7 +453,7 @@ void DeltaImportData(_cmd_id cmd, DWORD recvOffset)
 	sgbDeltaChanged = true;
 }
 
-DWORD OnLevelData(int pnum, const TCmd *pCmd)
+size_t OnLevelData(int pnum, const TCmd *pCmd)
 {
 	const auto &message = *reinterpret_cast<const TCmdPlrInfoHdr *>(pCmd);
 
@@ -728,7 +726,7 @@ void NetSendCmdExtra(const TCmdGItem &item)
 	NetSendHiPri(MyPlayerId, (byte *)&cmd, sizeof(cmd));
 }
 
-DWORD OnWalk(const TCmd *pCmd, Player &player)
+size_t OnWalk(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLoc *>(pCmd);
 	const Point position { message.x, message.y };
@@ -742,7 +740,7 @@ DWORD OnWalk(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnAddStrength(const TCmd *pCmd, int pnum)
+size_t OnAddStrength(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -754,7 +752,7 @@ DWORD OnAddStrength(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnAddMagic(const TCmd *pCmd, int pnum)
+size_t OnAddMagic(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -766,7 +764,7 @@ DWORD OnAddMagic(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnAddDexterity(const TCmd *pCmd, int pnum)
+size_t OnAddDexterity(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -778,7 +776,7 @@ DWORD OnAddDexterity(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnAddVitality(const TCmd *pCmd, int pnum)
+size_t OnAddVitality(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -790,7 +788,7 @@ DWORD OnAddVitality(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnGotoGetItem(const TCmd *pCmd, Player &player)
+size_t OnGotoGetItem(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam1 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -831,7 +829,7 @@ bool IsPItemValid(const TCmdPItem &message)
 	return IsItemAvailable(message.wIndx);
 }
 
-DWORD OnRequestGetItem(const TCmd *pCmd, Player &player)
+size_t OnRequestGetItem(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdGItem *>(pCmd);
 
@@ -870,7 +868,7 @@ DWORD OnRequestGetItem(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnGetItem(const TCmd *pCmd, int pnum)
+size_t OnGetItem(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdGItem *>(pCmd);
 
@@ -902,7 +900,7 @@ DWORD OnGetItem(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnGotoAutoGetItem(const TCmd *pCmd, Player &player)
+size_t OnGotoAutoGetItem(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam1 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -916,7 +914,7 @@ DWORD OnGotoAutoGetItem(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnRequestAutoGetItem(const TCmd *pCmd, Player &player)
+size_t OnRequestAutoGetItem(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdGItem *>(pCmd);
 
@@ -939,7 +937,7 @@ DWORD OnRequestAutoGetItem(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnAutoGetItem(const TCmd *pCmd, int pnum)
+size_t OnAutoGetItem(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdGItem *>(pCmd);
 
@@ -971,7 +969,7 @@ DWORD OnAutoGetItem(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnItemExtra(const TCmd *pCmd, int pnum)
+size_t OnItemExtra(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdGItem *>(pCmd);
 
@@ -988,7 +986,7 @@ DWORD OnItemExtra(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnPutItem(const TCmd *pCmd, int pnum)
+size_t OnPutItem(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdPItem *>(pCmd);
 
@@ -1019,7 +1017,7 @@ DWORD OnPutItem(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnSyncPutItem(const TCmd *pCmd, int pnum)
+size_t OnSyncPutItem(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdPItem *>(pCmd);
 
@@ -1046,7 +1044,7 @@ DWORD OnSyncPutItem(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnRespawnItem(const TCmd *pCmd, int pnum)
+size_t OnRespawnItem(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdPItem *>(pCmd);
 
@@ -1065,7 +1063,7 @@ DWORD OnRespawnItem(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnAttackTile(const TCmd *pCmd, Player &player)
+size_t OnAttackTile(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLoc *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1080,7 +1078,7 @@ DWORD OnAttackTile(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnStandingAttackTile(const TCmd *pCmd, Player &player)
+size_t OnStandingAttackTile(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLoc *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1095,7 +1093,7 @@ DWORD OnStandingAttackTile(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnRangedAttackTile(const TCmd *pCmd, Player &player)
+size_t OnRangedAttackTile(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLoc *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1110,7 +1108,7 @@ DWORD OnRangedAttackTile(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnSpellWall(const TCmd *pCmd, Player &player)
+size_t OnSpellWall(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam4 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1149,7 +1147,7 @@ DWORD OnSpellWall(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnSpellTile(const TCmd *pCmd, Player &player)
+size_t OnSpellTile(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam3 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1186,7 +1184,7 @@ DWORD OnSpellTile(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnTargetSpellTile(const TCmd *pCmd, Player &player)
+size_t OnTargetSpellTile(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam2 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1218,7 +1216,7 @@ DWORD OnTargetSpellTile(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnOperateObjectTile(const TCmd *pCmd, Player &player)
+size_t OnOperateObjectTile(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam1 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1232,7 +1230,7 @@ DWORD OnOperateObjectTile(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnDisarm(const TCmd *pCmd, Player &player)
+size_t OnDisarm(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam1 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1246,7 +1244,7 @@ DWORD OnDisarm(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnOperateObjectTelekinesis(const TCmd *pCmd, Player &player)
+size_t OnOperateObjectTelekinesis(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1258,7 +1256,7 @@ DWORD OnOperateObjectTelekinesis(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnAttackMonster(const TCmd *pCmd, Player &player)
+size_t OnAttackMonster(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1273,7 +1271,7 @@ DWORD OnAttackMonster(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnAttackPlayer(const TCmd *pCmd, Player &player)
+size_t OnAttackPlayer(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1286,7 +1284,7 @@ DWORD OnAttackPlayer(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnRangedAttackMonster(const TCmd *pCmd, Player &player)
+size_t OnRangedAttackMonster(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1299,7 +1297,7 @@ DWORD OnRangedAttackMonster(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnRangedAttackPlayer(const TCmd *pCmd, Player &player)
+size_t OnRangedAttackPlayer(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1312,7 +1310,7 @@ DWORD OnRangedAttackPlayer(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnSpellMonster(const TCmd *pCmd, Player &player)
+size_t OnSpellMonster(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam4 *>(pCmd);
 
@@ -1348,7 +1346,7 @@ DWORD OnSpellMonster(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnSpellPlayer(const TCmd *pCmd, Player &player)
+size_t OnSpellPlayer(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam4 *>(pCmd);
 
@@ -1384,7 +1382,7 @@ DWORD OnSpellPlayer(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnTargetSpellMonster(const TCmd *pCmd, Player &player)
+size_t OnTargetSpellMonster(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam3 *>(pCmd);
 
@@ -1416,7 +1414,7 @@ DWORD OnTargetSpellMonster(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnTargetSpellPlayer(const TCmd *pCmd, Player &player)
+size_t OnTargetSpellPlayer(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam3 *>(pCmd);
 
@@ -1446,7 +1444,7 @@ DWORD OnTargetSpellPlayer(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnKnockback(const TCmd *pCmd, int pnum)
+size_t OnKnockback(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1459,7 +1457,7 @@ DWORD OnKnockback(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnResurrect(const TCmd *pCmd, int pnum)
+size_t OnResurrect(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1473,7 +1471,7 @@ DWORD OnResurrect(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnHealOther(const TCmd *pCmd, const Player &caster)
+size_t OnHealOther(const TCmd *pCmd, const Player &caster)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1486,7 +1484,7 @@ DWORD OnHealOther(const TCmd *pCmd, const Player &caster)
 	return sizeof(message);
 }
 
-DWORD OnTalkXY(const TCmd *pCmd, Player &player)
+size_t OnTalkXY(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam1 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1500,7 +1498,7 @@ DWORD OnTalkXY(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnNewLevel(const TCmd *pCmd, int pnum)
+size_t OnNewLevel(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam2 *>(pCmd);
 
@@ -1523,7 +1521,7 @@ DWORD OnNewLevel(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnWarp(const TCmd *pCmd, int pnum)
+size_t OnWarp(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1536,7 +1534,7 @@ DWORD OnWarp(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnMonstDeath(const TCmd *pCmd, int pnum)
+size_t OnMonstDeath(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam1 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1556,7 +1554,7 @@ DWORD OnMonstDeath(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnKillGolem(const TCmd *pCmd, int pnum)
+size_t OnKillGolem(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdLoc *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1576,7 +1574,7 @@ DWORD OnKillGolem(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnAwakeGolem(const TCmd *pCmd, int pnum)
+size_t OnAwakeGolem(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdGolem *>(pCmd);
 	const Point position { message._mx, message._my };
@@ -1602,7 +1600,7 @@ DWORD OnAwakeGolem(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnMonstDamage(const TCmd *pCmd, int pnum)
+size_t OnMonstDamage(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdMonDamage *>(pCmd);
 
@@ -1627,7 +1625,7 @@ DWORD OnMonstDamage(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnPlayerDeath(const TCmd *pCmd, int pnum)
+size_t OnPlayerDeath(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1644,7 +1642,7 @@ DWORD OnPlayerDeath(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnPlayerDamage(const TCmd *pCmd, Player &player)
+size_t OnPlayerDamage(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdDamage *>(pCmd);
 
@@ -1658,7 +1656,7 @@ DWORD OnPlayerDamage(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnOpenDoor(const TCmd *pCmd, int pnum)
+size_t OnOpenDoor(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1674,7 +1672,7 @@ DWORD OnOpenDoor(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnCloseDoor(const TCmd *pCmd, int pnum)
+size_t OnCloseDoor(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1690,7 +1688,7 @@ DWORD OnCloseDoor(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnOperateObject(const TCmd *pCmd, int pnum)
+size_t OnOperateObject(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1706,7 +1704,7 @@ DWORD OnOperateObject(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnPlayerOperateObject(const TCmd *pCmd, int pnum)
+size_t OnPlayerOperateObject(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam2 *>(pCmd);
 
@@ -1722,7 +1720,7 @@ DWORD OnPlayerOperateObject(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnBreakObject(const TCmd *pCmd, int pnum)
+size_t OnBreakObject(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam2 *>(pCmd);
 
@@ -1739,7 +1737,7 @@ DWORD OnBreakObject(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnChangePlayerItems(const TCmd *pCmd, int pnum)
+size_t OnChangePlayerItems(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdChItem *>(pCmd);
 	Player &player = Players[pnum];
@@ -1760,7 +1758,7 @@ DWORD OnChangePlayerItems(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnDeletePlayerItems(const TCmd *pCmd, int pnum)
+size_t OnDeletePlayerItems(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdDelItem *>(pCmd);
 
@@ -1775,7 +1773,7 @@ DWORD OnDeletePlayerItems(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnPlayerLevel(const TCmd *pCmd, int pnum)
+size_t OnPlayerLevel(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1790,7 +1788,7 @@ DWORD OnPlayerLevel(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnDropItem(const TCmd *pCmd, int pnum)
+size_t OnDropItem(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdPItem *>(pCmd);
 
@@ -1803,7 +1801,7 @@ DWORD OnDropItem(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnSpawnItem(const TCmd *pCmd, int pnum)
+size_t OnSpawnItem(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdPItem *>(pCmd);
 
@@ -1822,7 +1820,7 @@ DWORD OnSpawnItem(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnSendPlayerInfo(const TCmd *pCmd, int pnum)
+size_t OnSendPlayerInfo(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdPlrInfoHdr *>(pCmd);
 
@@ -1834,7 +1832,7 @@ DWORD OnSendPlayerInfo(const TCmd *pCmd, int pnum)
 	return message.wBytes + sizeof(message);
 }
 
-DWORD OnPlayerJoinLevel(const TCmd *pCmd, int pnum)
+size_t OnPlayerJoinLevel(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam2 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1886,7 +1884,7 @@ DWORD OnPlayerJoinLevel(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnActivatePortal(const TCmd *pCmd, int pnum)
+size_t OnActivatePortal(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdLocParam3 *>(pCmd);
 	const Point position { message.x, message.y };
@@ -1924,7 +1922,7 @@ DWORD OnActivatePortal(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnDeactivatePortal(const TCmd *pCmd, int pnum)
+size_t OnDeactivatePortal(const TCmd *pCmd, int pnum)
 {
 	if (gbBufferMsgs == 1) {
 		SendPacket(pnum, pCmd, sizeof(*pCmd));
@@ -1938,7 +1936,7 @@ DWORD OnDeactivatePortal(const TCmd *pCmd, int pnum)
 	return sizeof(*pCmd);
 }
 
-DWORD OnRestartTown(const TCmd *pCmd, int pnum)
+size_t OnRestartTown(const TCmd *pCmd, int pnum)
 {
 	if (gbBufferMsgs == 1) {
 		SendPacket(pnum, pCmd, sizeof(*pCmd));
@@ -1953,7 +1951,7 @@ DWORD OnRestartTown(const TCmd *pCmd, int pnum)
 	return sizeof(*pCmd);
 }
 
-DWORD OnSetStrength(const TCmd *pCmd, int pnum)
+size_t OnSetStrength(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1968,7 +1966,7 @@ DWORD OnSetStrength(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnSetDexterity(const TCmd *pCmd, int pnum)
+size_t OnSetDexterity(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1983,7 +1981,7 @@ DWORD OnSetDexterity(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnSetMagic(const TCmd *pCmd, int pnum)
+size_t OnSetMagic(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -1998,7 +1996,7 @@ DWORD OnSetMagic(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnSetVitality(const TCmd *pCmd, int pnum)
+size_t OnSetVitality(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -2013,7 +2011,7 @@ DWORD OnSetVitality(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnString(const TCmd *pCmd, Player &player)
+size_t OnString(const TCmd *pCmd, Player &player)
 {
 	auto *p = (TCmdString *)pCmd;
 
@@ -2024,14 +2022,14 @@ DWORD OnString(const TCmd *pCmd, Player &player)
 	return len + 2; // length of string + nul terminator + sizeof(p->bCmd)
 }
 
-DWORD OnFriendlyMode(const TCmd *pCmd, Player &player) // NOLINT(misc-unused-parameters)
+size_t OnFriendlyMode(const TCmd *pCmd, Player &player) // NOLINT(misc-unused-parameters)
 {
 	player.friendlyMode = !player.friendlyMode;
 	force_redraw = 255;
 	return sizeof(*pCmd);
 }
 
-DWORD OnSyncQuest(const TCmd *pCmd, int pnum)
+size_t OnSyncQuest(const TCmd *pCmd, int pnum)
 {
 	const auto &message = *reinterpret_cast<const TCmdQuest *>(pCmd);
 
@@ -2046,7 +2044,7 @@ DWORD OnSyncQuest(const TCmd *pCmd, int pnum)
 	return sizeof(message);
 }
 
-DWORD OnCheatExperience(const TCmd *pCmd, int pnum) // NOLINT(misc-unused-parameters)
+size_t OnCheatExperience(const TCmd *pCmd, int pnum) // NOLINT(misc-unused-parameters)
 {
 #ifdef _DEBUG
 	if (gbBufferMsgs == 1)
@@ -2062,7 +2060,7 @@ DWORD OnCheatExperience(const TCmd *pCmd, int pnum) // NOLINT(misc-unused-parame
 	return sizeof(*pCmd);
 }
 
-DWORD OnCheatSpellLevel(const TCmd *pCmd, int pnum) // NOLINT(misc-unused-parameters)
+size_t OnCheatSpellLevel(const TCmd *pCmd, int pnum) // NOLINT(misc-unused-parameters)
 {
 #ifdef _DEBUG
 	if (gbBufferMsgs == 1) {
@@ -2075,12 +2073,12 @@ DWORD OnCheatSpellLevel(const TCmd *pCmd, int pnum) // NOLINT(misc-unused-parame
 	return sizeof(*pCmd);
 }
 
-DWORD OnDebug(const TCmd *pCmd)
+size_t OnDebug(const TCmd *pCmd)
 {
 	return sizeof(*pCmd);
 }
 
-DWORD OnNova(const TCmd *pCmd, Player &player)
+size_t OnNova(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdLoc *>(pCmd);
 	const Point position { message.x, message.y };
@@ -2100,7 +2098,7 @@ DWORD OnNova(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnSetShield(const TCmd *pCmd, Player &player)
+size_t OnSetShield(const TCmd *pCmd, Player &player)
 {
 	if (gbBufferMsgs != 1)
 		player.pManaShield = true;
@@ -2108,7 +2106,7 @@ DWORD OnSetShield(const TCmd *pCmd, Player &player)
 	return sizeof(*pCmd);
 }
 
-DWORD OnRemoveShield(const TCmd *pCmd, Player &player)
+size_t OnRemoveShield(const TCmd *pCmd, Player &player)
 {
 	if (gbBufferMsgs != 1)
 		player.pManaShield = false;
@@ -2116,7 +2114,7 @@ DWORD OnRemoveShield(const TCmd *pCmd, Player &player)
 	return sizeof(*pCmd);
 }
 
-DWORD OnSetReflect(const TCmd *pCmd, Player &player)
+size_t OnSetReflect(const TCmd *pCmd, Player &player)
 {
 	const auto &message = *reinterpret_cast<const TCmdParam1 *>(pCmd);
 
@@ -2126,7 +2124,7 @@ DWORD OnSetReflect(const TCmd *pCmd, Player &player)
 	return sizeof(message);
 }
 
-DWORD OnNakrul(const TCmd *pCmd)
+size_t OnNakrul(const TCmd *pCmd)
 {
 	if (gbBufferMsgs != 1) {
 		if (currlevel == 24) {
@@ -2140,7 +2138,7 @@ DWORD OnNakrul(const TCmd *pCmd)
 	return sizeof(*pCmd);
 }
 
-DWORD OnOpenHive(const TCmd *pCmd, int pnum)
+size_t OnOpenHive(const TCmd *pCmd, int pnum)
 {
 	if (gbBufferMsgs != 1) {
 		AddMissile({ 0, 0 }, { 0, 0 }, Direction::South, MIS_HIVEEXP2, TARGET_MONSTERS, pnum, 0, 0);
@@ -2151,7 +2149,7 @@ DWORD OnOpenHive(const TCmd *pCmd, int pnum)
 	return sizeof(*pCmd);
 }
 
-DWORD OnOpenCrypt(const TCmd *pCmd)
+size_t OnOpenCrypt(const TCmd *pCmd)
 {
 	if (gbBufferMsgs != 1) {
 		TownOpenGrave();
@@ -2957,7 +2955,7 @@ void delta_close_portal(int pnum)
 	sgbDeltaChanged = true;
 }
 
-uint32_t ParseCmd(int pnum, const TCmd *pCmd)
+size_t ParseCmd(int pnum, const TCmd *pCmd)
 {
 	sbLastCmd = pCmd->bCmd;
 	if (sgwPackPlrOffsetTbl[pnum] != 0 && sbLastCmd != CMD_ACK_PLRINFO && sbLastCmd != CMD_SEND_PLRINFO)
diff --git a/Source/msg.h b/Source/msg.h
index 847b67552..3c2520cc2 100644
--- a/Source/msg.h
+++ b/Source/msg.h
@@ -752,6 +752,6 @@ void NetSendCmdDamage(bool bHiPri, uint8_t bPlr, uint32_t dwDam);
 void NetSendCmdMonDmg(bool bHiPri, uint16_t wMon, uint32_t dwDam);
 void NetSendCmdString(uint32_t pmask, const char *pszStr);
 void delta_close_portal(int pnum);
-uint32_t ParseCmd(int pnum, const TCmd *pCmd);
+size_t ParseCmd(int pnum, const TCmd *pCmd);
 
 } // namespace devilution
diff --git a/Source/multi.cpp b/Source/multi.cpp
index eea277b8a..ce74e4699 100644
--- a/Source/multi.cpp
+++ b/Source/multi.cpp
@@ -311,7 +311,7 @@ void BeginTimeout()
 void HandleAllPackets(int pnum, const byte *data, size_t size)
 {
 	for (unsigned offset = 0; offset < size;) {
-		int messageSize = ParseCmd(pnum, reinterpret_cast<const TCmd *>(&data[offset]));
+		size_t messageSize = ParseCmd(pnum, reinterpret_cast<const TCmd *>(&data[offset]));
 		if (messageSize == 0) {
 			break;
 		}