From cc8c956358e9de74f33e7497e1b172e34677491a Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Tue, 10 Mar 2026 09:46:48 +1100 Subject: [PATCH] Use standard byte types in socket queues --- Minecraft.World/Network/Socket.cpp | 6 +++--- Minecraft.World/Network/Socket.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Minecraft.World/Network/Socket.cpp b/Minecraft.World/Network/Socket.cpp index 4f1025b2a..b6d252532 100644 --- a/Minecraft.World/Network/Socket.cpp +++ b/Minecraft.World/Network/Socket.cpp @@ -147,7 +147,7 @@ void Socket::setPlayer(INetworkPlayer *player) } } -void Socket::pushDataToQueue(const BYTE * pbData, DWORD dwDataSize, bool fromHost /*= true*/) +void Socket::pushDataToQueue(const std::uint8_t *pbData, std::size_t dataSize, bool fromHost /*= true*/) { int queueIdx = SOCKET_CLIENT_END; if(!fromHost) @@ -160,7 +160,7 @@ void Socket::pushDataToQueue(const BYTE * pbData, DWORD dwDataSize, bool fromHos } EnterCriticalSection(&m_queueLockNetwork[queueIdx]); - for( unsigned int i = 0; i < dwDataSize; i++ ) + for(std::size_t i = 0; i < dataSize; ++i) { m_queueNetwork[queueIdx].push(*pbData++); } @@ -564,4 +564,4 @@ void Socket::SocketOutputStreamNetwork::writeWithFlags(byteArray b, unsigned int void Socket::SocketOutputStreamNetwork::close() { m_streamOpen = false; -} \ No newline at end of file +} diff --git a/Minecraft.World/Network/Socket.h b/Minecraft.World/Network/Socket.h index 082274c23..aed12b0b7 100644 --- a/Minecraft.World/Network/Socket.h +++ b/Minecraft.World/Network/Socket.h @@ -1,4 +1,5 @@ #pragma once +#include #include #ifndef __linux__ #include @@ -123,7 +124,7 @@ public: Socket(bool response = false); // 4J - Create a local socket, for end 0 or 1 of a connection Socket(INetworkPlayer *player, bool response = false, bool hostLocal = false); // 4J - Create a socket for an INetworkPlayer SocketAddress *getRemoteSocketAddress(); - void pushDataToQueue(const BYTE * pbData, DWORD dwDataSize, bool fromHost = true); + void pushDataToQueue(const std::uint8_t *pbData, std::size_t dataSize, bool fromHost = true); static void addIncomingSocket(Socket *socket); InputStream *getInputStream(bool isServerConnection); void setSoTimeout(int a );