From e4cc79387ab990c92875395ebc53bff2243cace0 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Tue, 10 Mar 2026 00:07:15 +1100 Subject: [PATCH] Remove Win32 byte types from ArchiveFile --- Minecraft.Client/Utils/ArchiveFile.cpp | 4 ++-- Minecraft.Client/Utils/ArchiveFile.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Minecraft.Client/Utils/ArchiveFile.cpp b/Minecraft.Client/Utils/ArchiveFile.cpp index 8c2754fc4..eddd8a7fa 100644 --- a/Minecraft.Client/Utils/ArchiveFile.cpp +++ b/Minecraft.Client/Utils/ArchiveFile.cpp @@ -122,7 +122,7 @@ byteArray ArchiveFile::getFile(const std::wstring &filename) memcpy( out.data, m_cachedData + data->ptr, data->filesize ); #else const unsigned int fileSize = static_cast(data->filesize); - PBYTE pbData = new BYTE[fileSize == 0 ? 1 : fileSize]; + uint8_t *pbData = new uint8_t[fileSize == 0 ? 1 : fileSize]; out = byteArray(pbData, fileSize); const PortableFileIO::BinaryReadResult readResult = PortableFileIO::ReadBinaryFileSegment( m_sourcefile.getPath(), @@ -151,7 +151,7 @@ byteArray ArchiveFile::getFile(const std::wstring &filename) unsigned int decompressedSize = dis.readInt(); dis.close(); - PBYTE uncompressedBuffer = new BYTE[decompressedSize]; + uint8_t *uncompressedBuffer = new uint8_t[decompressedSize]; Compression::getCompression()->Decompress(uncompressedBuffer, &decompressedSize, out.data+4, out.length-4); delete [] out.data; diff --git a/Minecraft.Client/Utils/ArchiveFile.h b/Minecraft.Client/Utils/ArchiveFile.h index 83ca6b160..ac2fe84d9 100644 --- a/Minecraft.Client/Utils/ArchiveFile.h +++ b/Minecraft.Client/Utils/ArchiveFile.h @@ -1,5 +1,6 @@ #pragma once +#include #include #include @@ -12,7 +13,7 @@ class ArchiveFile { protected: File m_sourcefile; - BYTE *m_cachedData; + uint8_t *m_cachedData; typedef struct _MetaData {