From c10b1a1706239816a0a70a2b680c5a8b7c065a51 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Tue, 10 Mar 2026 00:46:41 +1100 Subject: [PATCH] Remove DWORD sizes from DLC payload APIs --- .../Platform/Common/DLC/DLCAudioFile.cpp | 14 +++++++------- .../Platform/Common/DLC/DLCAudioFile.h | 8 ++++---- .../Platform/Common/DLC/DLCCapeFile.cpp | 4 ++-- .../Platform/Common/DLC/DLCCapeFile.h | 2 +- .../Platform/Common/DLC/DLCColourTableFile.cpp | 4 ++-- .../Platform/Common/DLC/DLCColourTableFile.h | 2 +- Minecraft.Client/Platform/Common/DLC/DLCFile.h | 4 ++-- .../Platform/Common/DLC/DLCGameRulesFile.cpp | 10 +++++----- .../Platform/Common/DLC/DLCGameRulesFile.h | 6 +++--- .../Platform/Common/DLC/DLCGameRulesHeader.cpp | 16 ++++++++-------- .../Platform/Common/DLC/DLCGameRulesHeader.h | 8 ++++---- .../Platform/Common/DLC/DLCLocalisationFile.cpp | 4 ++-- .../Platform/Common/DLC/DLCLocalisationFile.h | 4 ++-- .../Platform/Common/DLC/DLCSkinFile.cpp | 4 ++-- .../Platform/Common/DLC/DLCSkinFile.h | 2 +- .../Platform/Common/DLC/DLCTextureFile.cpp | 10 +++++----- .../Platform/Common/DLC/DLCTextureFile.h | 6 +++--- .../Platform/Common/DLC/DLCUIDataFile.cpp | 10 +++++----- .../Platform/Common/DLC/DLCUIDataFile.h | 6 +++--- .../Textures/Packs/DLCTexturePack.cpp | 14 +++++++------- 20 files changed, 69 insertions(+), 69 deletions(-) diff --git a/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp index 92a5003c4..b25c0bec2 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.cpp @@ -9,20 +9,20 @@ DLCAudioFile::DLCAudioFile(const std::wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path) { m_pbData = NULL; - m_dwBytes = 0; + m_dataBytes = 0; } -void DLCAudioFile::addData(uint8_t *pbData, DWORD dwBytes) +void DLCAudioFile::addData(uint8_t *pbData, std::uint32_t dataBytes) { m_pbData = pbData; - m_dwBytes = dwBytes; + m_dataBytes = dataBytes; - processDLCDataFile(pbData,dwBytes); + processDLCDataFile(pbData,dataBytes); } -uint8_t *DLCAudioFile::getData(DWORD &dwBytes) +uint8_t *DLCAudioFile::getData(std::uint32_t &dataBytes) { - dwBytes = m_dwBytes; + dataBytes = m_dataBytes; return m_pbData; } @@ -120,7 +120,7 @@ void DLCAudioFile::addParameter(EAudioType type, EAudioParameterType ptype, cons } } -bool DLCAudioFile::processDLCDataFile(uint8_t *pbData, DWORD dwLength) +bool DLCAudioFile::processDLCDataFile(uint8_t *pbData, std::uint32_t dataLength) { std::unordered_map parameterMapping; unsigned int uiCurrentByte=0; diff --git a/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.h b/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.h index 8276ebc6c..c3296a807 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCAudioFile.h @@ -32,10 +32,10 @@ public: DLCAudioFile(const std::wstring &path); - virtual void addData(uint8_t *pbData, DWORD dwBytes); - virtual uint8_t *getData(DWORD &dwBytes); + virtual void addData(uint8_t *pbData, std::uint32_t dataBytes); + virtual uint8_t *getData(std::uint32_t &dataBytes); - bool processDLCDataFile(uint8_t *pbData, DWORD dwLength); + bool processDLCDataFile(uint8_t *pbData, std::uint32_t dataLength); int GetCountofType(DLCAudioFile::EAudioType ptype); std::wstring &GetSoundName(int iIndex); @@ -43,7 +43,7 @@ private: using DLCFile::addParameter; uint8_t *m_pbData; - DWORD m_dwBytes; + std::uint32_t m_dataBytes; static const int CURRENT_AUDIO_VERSION_NUM=1; //std::unordered_map m_parameters; std::vector m_parameters[e_AudioType_Max]; diff --git a/Minecraft.Client/Platform/Common/DLC/DLCCapeFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCCapeFile.cpp index 35f58ad1f..da72eec4b 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCCapeFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCCapeFile.cpp @@ -6,7 +6,7 @@ DLCCapeFile::DLCCapeFile(const std::wstring &path) : DLCFile(DLCManager::e_DLCTy { } -void DLCCapeFile::addData(uint8_t *pbData, DWORD dwBytes) +void DLCCapeFile::addData(uint8_t *pbData, std::uint32_t dataBytes) { - app.AddMemoryTextureFile(m_path,pbData,dwBytes); + app.AddMemoryTextureFile(m_path,pbData,dataBytes); } diff --git a/Minecraft.Client/Platform/Common/DLC/DLCCapeFile.h b/Minecraft.Client/Platform/Common/DLC/DLCCapeFile.h index dde0617ab..df7e51ca8 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCCapeFile.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCCapeFile.h @@ -6,5 +6,5 @@ class DLCCapeFile : public DLCFile public: DLCCapeFile(const std::wstring &path); - virtual void addData(uint8_t *pbData, DWORD dwBytes); + virtual void addData(uint8_t *pbData, std::uint32_t dataBytes); }; diff --git a/Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.cpp index 239a3fb99..3922bae69 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.cpp @@ -19,8 +19,8 @@ DLCColourTableFile::~DLCColourTableFile() } } -void DLCColourTableFile::addData(uint8_t *pbData, DWORD dwBytes) +void DLCColourTableFile::addData(uint8_t *pbData, std::uint32_t dataBytes) { ColourTable *defaultColourTable = Minecraft::GetInstance()->skins->getDefault()->getColourTable(); - m_colourTable = new ColourTable(defaultColourTable, pbData, dwBytes); + m_colourTable = new ColourTable(defaultColourTable, pbData, dataBytes); } diff --git a/Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.h b/Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.h index 97d5723ea..8ae18dcad 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCColourTableFile.h @@ -12,7 +12,7 @@ public: DLCColourTableFile(const std::wstring &path); ~DLCColourTableFile(); - virtual void addData(uint8_t *pbData, DWORD dwBytes); + virtual void addData(uint8_t *pbData, std::uint32_t dataBytes); ColourTable *getColourTable() { return m_colourTable; } }; diff --git a/Minecraft.Client/Platform/Common/DLC/DLCFile.h b/Minecraft.Client/Platform/Common/DLC/DLCFile.h index 0a91a650e..9e6482250 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCFile.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCFile.h @@ -17,8 +17,8 @@ public: std::wstring getPath() { return m_path; } DWORD getSkinID() { return m_dwSkinId; } - virtual void addData(uint8_t *pbData, DWORD dwBytes) {} - virtual uint8_t *getData(DWORD &dwBytes) { dwBytes = 0; return NULL; } + virtual void addData(uint8_t *pbData, std::uint32_t dataBytes) {} + virtual uint8_t *getData(std::uint32_t &dataBytes) { dataBytes = 0; return NULL; } virtual void addParameter(DLCManager::EDLCParameterType type, const std::wstring &value) {} virtual std::wstring getParameterAsString(DLCManager::EDLCParameterType type) { return L""; } diff --git a/Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.cpp index b7550abe2..754aca694 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.cpp @@ -5,17 +5,17 @@ DLCGameRulesFile::DLCGameRulesFile(const std::wstring &path) : DLCGameRules(DLCManager::e_DLCType_GameRules,path) { m_pbData = NULL; - m_dwBytes = 0; + m_dataBytes = 0; } -void DLCGameRulesFile::addData(uint8_t *pbData, DWORD dwBytes) +void DLCGameRulesFile::addData(uint8_t *pbData, std::uint32_t dataBytes) { m_pbData = pbData; - m_dwBytes = dwBytes; + m_dataBytes = dataBytes; } -uint8_t *DLCGameRulesFile::getData(DWORD &dwBytes) +uint8_t *DLCGameRulesFile::getData(std::uint32_t &dataBytes) { - dwBytes = m_dwBytes; + dataBytes = m_dataBytes; return m_pbData; } diff --git a/Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.h b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.h index aebb0ebd3..8e3ff0abf 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesFile.h @@ -5,11 +5,11 @@ class DLCGameRulesFile : public DLCGameRules { private: uint8_t *m_pbData; - DWORD m_dwBytes; + std::uint32_t m_dataBytes; public: DLCGameRulesFile(const std::wstring &path); - virtual void addData(uint8_t *pbData, DWORD dwBytes); - virtual uint8_t *getData(DWORD &dwBytes); + virtual void addData(uint8_t *pbData, std::uint32_t dataBytes); + virtual uint8_t *getData(std::uint32_t &dataBytes); }; diff --git a/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.cpp b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.cpp index f0c9f2a67..a9c4805d9 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.cpp @@ -12,7 +12,7 @@ DLCGameRulesHeader::DLCGameRulesHeader(const std::wstring &path) : DLCGameRules(DLCManager::e_DLCType_GameRulesHeader,path) { m_pbData = NULL; - m_dwBytes = 0; + m_dataBytes = 0; m_hasData = false; @@ -21,14 +21,14 @@ DLCGameRulesHeader::DLCGameRulesHeader(const std::wstring &path) : DLCGameRules( lgo = NULL; } -void DLCGameRulesHeader::addData(uint8_t *pbData, DWORD dwBytes) +void DLCGameRulesHeader::addData(uint8_t *pbData, std::uint32_t dataBytes) { m_pbData = pbData; - m_dwBytes = dwBytes; + m_dataBytes = dataBytes; #if 0 - byteArray data(m_pbData, m_dwBytes); + byteArray data(m_pbData, m_dataBytes); ByteArrayInputStream bais(data); DataInputStream dis(&bais); @@ -73,13 +73,13 @@ void DLCGameRulesHeader::addData(uint8_t *pbData, DWORD dwBytes) #endif } -uint8_t *DLCGameRulesHeader::getData(DWORD &dwBytes) +uint8_t *DLCGameRulesHeader::getData(std::uint32_t &dataBytes) { - dwBytes = m_dwBytes; + dataBytes = m_dataBytes; return m_pbData; } -void DLCGameRulesHeader::setGrfData(uint8_t *fData, DWORD fSize, StringTable *st) +void DLCGameRulesHeader::setGrfData(uint8_t *fData, std::uint32_t dataSize, StringTable *st) { if (!m_hasData) { @@ -87,6 +87,6 @@ void DLCGameRulesHeader::setGrfData(uint8_t *fData, DWORD fSize, StringTable *st //app.m_gameRules.loadGameRules(lgo, fData, fSize); - app.m_gameRules.readRuleFile(lgo, fData, fSize, st); + app.m_gameRules.readRuleFile(lgo, fData, dataSize, st); } } diff --git a/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.h b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.h index b8c0bdb9e..dfd70dc98 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCGameRulesHeader.h @@ -9,7 +9,7 @@ private: // GR-Header uint8_t *m_pbData; - DWORD m_dwBytes; + std::uint32_t m_dataBytes; bool m_hasData; @@ -33,10 +33,10 @@ public: public: DLCGameRulesHeader(const std::wstring &path); - virtual void addData(uint8_t *pbData, DWORD dwBytes); - virtual uint8_t *getData(DWORD &dwBytes); + virtual void addData(uint8_t *pbData, std::uint32_t dataBytes); + virtual uint8_t *getData(std::uint32_t &dataBytes); - void setGrfData(uint8_t *fData, DWORD fSize, StringTable *); + void setGrfData(uint8_t *fData, std::uint32_t dataSize, StringTable *); virtual bool ready() { return m_hasData; } }; diff --git a/Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.cpp index 870e07117..1c53207ff 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.cpp @@ -8,7 +8,7 @@ DLCLocalisationFile::DLCLocalisationFile(const std::wstring &path) : DLCFile(DLC m_strings = NULL; } -void DLCLocalisationFile::addData(uint8_t *pbData, DWORD dwBytes) +void DLCLocalisationFile::addData(uint8_t *pbData, std::uint32_t dataBytes) { - m_strings = new StringTable(pbData, dwBytes); + m_strings = new StringTable(pbData, dataBytes); } diff --git a/Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.h b/Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.h index d4194687a..77e160cce 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCLocalisationFile.h @@ -10,9 +10,9 @@ private: public: DLCLocalisationFile(const std::wstring &path); - DLCLocalisationFile(uint8_t *pbData, DWORD dwBytes); // when we load in a texture pack details file from TMS++ + DLCLocalisationFile(uint8_t *pbData, std::uint32_t dataBytes); // when we load in a texture pack details file from TMS++ - virtual void addData(uint8_t *pbData, DWORD dwBytes); + virtual void addData(uint8_t *pbData, std::uint32_t dataBytes); StringTable *getStringTable() { return m_strings; } }; diff --git a/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp index 87fb2adfa..171ecffa0 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.cpp @@ -16,9 +16,9 @@ DLCSkinFile::DLCSkinFile(const std::wstring &path) : DLCFile(DLCManager::e_DLCTy m_uiAnimOverrideBitmask=0L; } -void DLCSkinFile::addData(uint8_t *pbData, DWORD dwBytes) +void DLCSkinFile::addData(uint8_t *pbData, std::uint32_t dataBytes) { - app.AddMemoryTextureFile(m_path,pbData,dwBytes); + app.AddMemoryTextureFile(m_path,pbData,dataBytes); } void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type, const std::wstring &value) diff --git a/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.h b/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.h index 36fd7e242..d0c0f7f05 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCSkinFile.h @@ -17,7 +17,7 @@ public: DLCSkinFile(const std::wstring &path); - virtual void addData(uint8_t *pbData, DWORD dwBytes); + virtual void addData(uint8_t *pbData, std::uint32_t dataBytes); virtual void addParameter(DLCManager::EDLCParameterType type, const std::wstring &value); virtual std::wstring getParameterAsString(DLCManager::EDLCParameterType type); diff --git a/Minecraft.Client/Platform/Common/DLC/DLCTextureFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCTextureFile.cpp index 81d32b806..029f41b5a 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCTextureFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCTextureFile.cpp @@ -8,19 +8,19 @@ DLCTextureFile::DLCTextureFile(const std::wstring &path) : DLCFile(DLCManager::e m_animString = L""; m_pbData = NULL; - m_dwBytes = 0; + m_dataBytes = 0; } -void DLCTextureFile::addData(uint8_t *pbData, DWORD dwBytes) +void DLCTextureFile::addData(uint8_t *pbData, std::uint32_t dataBytes) { //app.AddMemoryTextureFile(m_path,pbData,dwBytes); m_pbData = pbData; - m_dwBytes = dwBytes; + m_dataBytes = dataBytes; } -uint8_t *DLCTextureFile::getData(DWORD &dwBytes) +uint8_t *DLCTextureFile::getData(std::uint32_t &dataBytes) { - dwBytes = m_dwBytes; + dataBytes = m_dataBytes; return m_pbData; } diff --git a/Minecraft.Client/Platform/Common/DLC/DLCTextureFile.h b/Minecraft.Client/Platform/Common/DLC/DLCTextureFile.h index 7e5bff9fc..4a64870e9 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCTextureFile.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCTextureFile.h @@ -9,13 +9,13 @@ private: std::wstring m_animString; uint8_t *m_pbData; - DWORD m_dwBytes; + std::uint32_t m_dataBytes; public: DLCTextureFile(const std::wstring &path); - virtual void addData(uint8_t *pbData, DWORD dwBytes); - virtual uint8_t *getData(DWORD &dwBytes); + virtual void addData(uint8_t *pbData, std::uint32_t dataBytes); + virtual uint8_t *getData(std::uint32_t &dataBytes); virtual void addParameter(DLCManager::EDLCParameterType type, const std::wstring &value); diff --git a/Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.cpp b/Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.cpp index aa6f0dbe1..b96ba31cc 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.cpp @@ -5,7 +5,7 @@ DLCUIDataFile::DLCUIDataFile(const std::wstring &path) : DLCFile(DLCManager::e_DLCType_UIData,path) { m_pbData = NULL; - m_dwBytes = 0; + m_dataBytes = 0; m_canDeleteData = false; } @@ -18,15 +18,15 @@ DLCUIDataFile::~DLCUIDataFile() } } -void DLCUIDataFile::addData(uint8_t *pbData, DWORD dwBytes,bool canDeleteData) +void DLCUIDataFile::addData(uint8_t *pbData, std::uint32_t dataBytes,bool canDeleteData) { m_pbData = pbData; - m_dwBytes = dwBytes; + m_dataBytes = dataBytes; m_canDeleteData = canDeleteData; } -uint8_t *DLCUIDataFile::getData(DWORD &dwBytes) +uint8_t *DLCUIDataFile::getData(std::uint32_t &dataBytes) { - dwBytes = m_dwBytes; + dataBytes = m_dataBytes; return m_pbData; } diff --git a/Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.h b/Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.h index fa0d2fc6b..e77ccd138 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.h +++ b/Minecraft.Client/Platform/Common/DLC/DLCUIDataFile.h @@ -5,7 +5,7 @@ class DLCUIDataFile : public DLCFile { private: uint8_t *m_pbData; - DWORD m_dwBytes; + std::uint32_t m_dataBytes; bool m_canDeleteData; public: @@ -15,6 +15,6 @@ public: using DLCFile::addData; using DLCFile::addParameter; - virtual void addData(uint8_t *pbData, DWORD dwBytes,bool canDeleteData = false); - virtual uint8_t *getData(DWORD &dwBytes); + virtual void addData(uint8_t *pbData, std::uint32_t dataBytes,bool canDeleteData = false); + virtual uint8_t *getData(std::uint32_t &dataBytes); }; diff --git a/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp b/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp index b0a958d2a..1c1160d7f 100644 --- a/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp +++ b/Minecraft.Client/Textures/Packs/DLCTexturePack.cpp @@ -86,9 +86,9 @@ void DLCTexturePack::loadIcon() if(m_dlcInfoPack->doesPackContainFile(DLCManager::e_DLCType_Texture, L"icon.png")) { DLCTextureFile *textureFile = (DLCTextureFile *)m_dlcInfoPack->getFile(DLCManager::e_DLCType_Texture, L"icon.png"); - DWORD iconSize = 0; + std::uint32_t iconSize = 0; m_iconData = textureFile->getData(iconSize); - m_iconSize = static_cast(iconSize); + m_iconSize = iconSize; } else { @@ -101,9 +101,9 @@ void DLCTexturePack::loadComparison() if(m_dlcInfoPack->doesPackContainFile(DLCManager::e_DLCType_Texture, L"comparison.png")) { DLCTextureFile *textureFile = (DLCTextureFile *)m_dlcInfoPack->getFile(DLCManager::e_DLCType_Texture, L"comparison.png"); - DWORD comparisonSize = 0; + std::uint32_t comparisonSize = 0; m_comparisonData = textureFile->getData(comparisonSize); - m_comparisonSize = static_cast(comparisonSize); + m_comparisonSize = comparisonSize; } } @@ -222,7 +222,7 @@ void DLCTexturePack::loadColourTable() { DLCUIDataFile *dataFile = (DLCUIDataFile *)m_dlcDataPack->getFile(DLCManager::e_DLCType_UIData, L"TexturePack.xzp"); - DWORD dwSize = 0; + std::uint32_t dwSize = 0; uint8_t *pbData = dataFile->getData(dwSize); const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string @@ -480,7 +480,7 @@ void DLCTexturePack::loadUI() { DLCUIDataFile *dataFile = (DLCUIDataFile *)m_dlcDataPack->getFile(DLCManager::e_DLCType_UIData, L"TexturePack.xzp"); - DWORD dwSize = 0; + std::uint32_t dwSize = 0; uint8_t *pbData = dataFile->getData(dwSize); const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string @@ -554,7 +554,7 @@ std::wstring DLCTexturePack::getXuiRootPath() { DLCUIDataFile *dataFile = (DLCUIDataFile *)m_dlcDataPack->getFile(DLCManager::e_DLCType_UIData, L"TexturePack.xzp"); - DWORD dwSize = 0; + std::uint32_t dwSize = 0; uint8_t *pbData = dataFile->getData(dwSize); const DWORD LOCATOR_SIZE = 256; // Use this to allocate space to hold a ResourceLocator string