diff --git a/Minecraft.Client/Platform/Common/XML/ATGXmlParser.cpp b/Minecraft.Client/Platform/Common/XML/ATGXmlParser.cpp index 56a654683..0a835c367 100644 --- a/Minecraft.Client/Platform/Common/XML/ATGXmlParser.cpp +++ b/Minecraft.Client/Platform/Common/XML/ATGXmlParser.cpp @@ -45,7 +45,7 @@ XMLParser::~XMLParser() // Name: XMLParser::FillBuffer // Desc: Reads a block from the current open file //------------------------------------------------------------------------------------- -VOID XMLParser::FillBuffer() +void XMLParser::FillBuffer() { DWORD NChars; @@ -83,7 +83,7 @@ VOID XMLParser::FillBuffer() // Name: XMLParser::SkipNextAdvance // Desc: Puts the last character read back on the input stream //------------------------------------------------------------------------------------- -VOID XMLParser::SkipNextAdvance() +void XMLParser::SkipNextAdvance() { m_bSkipNextAdvance = TRUE; } @@ -715,7 +715,7 @@ HRESULT XMLParser::AdvanceComment() // Name: XMLParser::RegisterSAXCallbackInterface // Desc: Registers callback interface //------------------------------------------------------------------------------------- -VOID XMLParser::RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ) +void XMLParser::RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ) { m_pISAXCallback = pISAXCallback; } @@ -946,9 +946,9 @@ HRESULT XMLParser::ParseXMLBuffer( CONST CHAR *strBuffer, UINT uBufferSize ) // Logs an error through the callback interface //------------------------------------------------------------------------------------- #ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation -VOID XMLParser::Error( HRESULT hErr, _In_z_ _Printf_format_string_ CONST CHAR* strFormat, ... ) +void XMLParser::Error( HRESULT hErr, _In_z_ _Printf_format_string_ CONST CHAR* strFormat, ... ) #else -VOID XMLParser::Error( HRESULT hErr, CONST CHAR* strFormat, ... ) +void XMLParser::Error( HRESULT hErr, CONST CHAR* strFormat, ... ) #endif { CONST INT MAX_OUTPUT_STR = 160; diff --git a/Minecraft.Client/Platform/Common/XML/ATGXmlParser.h b/Minecraft.Client/Platform/Common/XML/ATGXmlParser.h index 3369a4174..e5767d15a 100644 --- a/Minecraft.Client/Platform/Common/XML/ATGXmlParser.h +++ b/Minecraft.Client/Platform/Common/XML/ATGXmlParser.h @@ -65,9 +65,9 @@ public: virtual HRESULT CDATAData( CONST WCHAR *strCDATA, UINT CDATALen, bool bMore ) = 0; virtual HRESULT CDATAEnd( ) = 0; - virtual VOID Error( HRESULT hError, CONST CHAR *strMessage ) = 0; + virtual void Error( HRESULT hError, CONST CHAR *strMessage ) = 0; - virtual VOID SetParseProgress( DWORD dwProgress ) { } + virtual void SetParseProgress( DWORD dwProgress ) { } const CHAR* GetFilename() { return m_strFilename; } UINT GetLineNumber() { return m_LineNum; } @@ -88,7 +88,7 @@ public: ~XMLParser(); // Register an interface inheiriting from ISAXCallback - VOID RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ); + void RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ); // Get the registered interface ISAXCallback* GetSAXCallbackInterface(); @@ -112,7 +112,7 @@ private: HRESULT MainParseLoop(); HRESULT AdvanceCharacter( bool bOkToFail = FALSE ); - VOID SkipNextAdvance(); + void SkipNextAdvance(); HRESULT ConsumeSpace(); HRESULT ConvertEscape(); @@ -122,12 +122,12 @@ private: HRESULT AdvanceCDATA(); HRESULT AdvanceComment(); - VOID FillBuffer(); + void FillBuffer(); #ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation - VOID Error( HRESULT hRet, _In_z_ _Printf_format_string_ CONST CHAR* strFormat, ... ); + void Error( HRESULT hRet, _In_z_ _Printf_format_string_ CONST CHAR* strFormat, ... ); #else - VOID Error( HRESULT hRet, CONST CHAR* strFormat, ... ); + void Error( HRESULT hRet, CONST CHAR* strFormat, ... ); #endif ISAXCallback* m_pISAXCallback; diff --git a/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h b/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h index fd681ee4b..cc993dbb9 100644 --- a/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h +++ b/Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h @@ -90,7 +90,7 @@ public: virtual HRESULT CDATAEnd( ){ return S_OK; }; - virtual VOID Error( HRESULT hError, CONST CHAR *strMessage ) { app.DebugPrintf("Error when Parsing xuids.XML\n"); }; + virtual void Error( HRESULT hError, CONST CHAR *strMessage ) { app.DebugPrintf("Error when Parsing xuids.XML\n"); }; }; @@ -171,7 +171,7 @@ public: virtual HRESULT CDATAEnd( ){ return S_OK; }; - virtual VOID Error( HRESULT hError, CONST CHAR *strMessage ) { app.DebugPrintf("Error when Parsing xuids.XML\n"); }; + virtual void Error( HRESULT hError, CONST CHAR *strMessage ) { app.DebugPrintf("Error when Parsing xuids.XML\n"); }; }; @@ -323,7 +323,7 @@ public: virtual HRESULT CDATAEnd( ){ return S_OK; }; - virtual VOID Error( HRESULT hError, CONST CHAR *strMessage ) { app.DebugPrintf("Error when Parsing DLC.XML\n"); }; + virtual void Error( HRESULT hError, CONST CHAR *strMessage ) { app.DebugPrintf("Error when Parsing DLC.XML\n"); }; }; diff --git a/Minecraft.Client/Platform/Extrax64Stubs.cpp b/Minecraft.Client/Platform/Extrax64Stubs.cpp index 00386e8d5..73d681b41 100644 --- a/Minecraft.Client/Platform/Extrax64Stubs.cpp +++ b/Minecraft.Client/Platform/Extrax64Stubs.cpp @@ -30,7 +30,7 @@ CXuiStringTable StringTable; ATG::XMLParser::XMLParser() {} ATG::XMLParser::~XMLParser() {} HRESULT ATG::XMLParser::ParseXMLBuffer( CONST CHAR* strBuffer, UINT uBufferSize ) { return S_OK; } -VOID ATG::XMLParser::RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ) {} +void ATG::XMLParser::RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ) {} #endif #if !defined(__linux__) @@ -185,9 +185,9 @@ DWORD XUserAreUsersFriends( DWORD dwUserIndex, PPlayerUID pXuids, DWORD dwXuidCo HRESULT XMemDecompress( XMEMDECOMPRESSION_CONTEXT Context, - VOID *pDestination, + void *pDestination, SIZE_T *pDestSize, - VOID *pSource, + void *pSource, SIZE_T SrcSize ) { @@ -216,9 +216,9 @@ HRESULT XMemDecompress( HRESULT XMemCompress( XMEMCOMPRESSION_CONTEXT Context, - VOID *pDestination, + void *pDestination, SIZE_T *pDestSize, - VOID *pSource, + void *pSource, SIZE_T SrcSize ) { @@ -247,7 +247,7 @@ HRESULT XMemCompress( HRESULT XMemCreateCompressionContext( XMEMCODEC_TYPE CodecType, - CONST VOID *pCodecParams, + CONST void *pCodecParams, DWORD Flags, XMEMCOMPRESSION_CONTEXT *pContext ) @@ -268,7 +268,7 @@ HRESULT XMemCreateCompressionContext( HRESULT XMemCreateDecompressionContext( XMEMCODEC_TYPE CodecType, - CONST VOID *pCodecParams, + CONST void *pCodecParams, DWORD Flags, XMEMDECOMPRESSION_CONTEXT *pContext ) diff --git a/Minecraft.Client/Platform/Linux/Stubs/winapi_stubs.h b/Minecraft.Client/Platform/Linux/Stubs/winapi_stubs.h index 178f7346f..b5fe646ba 100644 --- a/Minecraft.Client/Platform/Linux/Stubs/winapi_stubs.h +++ b/Minecraft.Client/Platform/Linux/Stubs/winapi_stubs.h @@ -32,7 +32,6 @@ typedef unsigned int* LPDWORD; typedef char CHAR; typedef uintptr_t ULONG_PTR; typedef long LONG; -typedef void VOID; typedef ULONGLONG PlayerUID; typedef DWORD WORD; typedef DWORD* PDWORD; @@ -211,8 +210,8 @@ typedef enum _GET_FILEEX_INFO_LEVELS { GetFileExMaxInfoLevel } GET_FILEEX_INFO_LEVELS; -typedef VOID* XMEMCOMPRESSION_CONTEXT; -typedef VOID* XMEMDECOMPRESSION_CONTEXT; +typedef void* XMEMCOMPRESSION_CONTEXT; +typedef void* XMEMDECOMPRESSION_CONTEXT; // internal search state for FindFirstFile/FindNextFile typedef struct _LINUXSTUBS_FIND_HANDLE { @@ -296,12 +295,12 @@ static inline ULONG TryEnterCriticalSection( } // https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-globalmemorystatus -static inline VOID GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) { +static inline void GlobalMemoryStatus(LPMEMORYSTATUS lpBuffer) { // TODO: Parse /proc/meminfo and set lpBuffer based on that. Probably will // also need another different codepath for macOS too. } -static inline DWORD GetLastError(VOID) { return errno; } +static inline DWORD GetLastError(void) { return errno; } #ifdef __LP64__ static inline int64_t InterlockedCompareExchangeRelease64( @@ -681,7 +680,7 @@ static inline void _FillSystemTime(const struct tm* tm, long tv_nsec, } // https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getsystemtime -static inline VOID GetSystemTime(LPSYSTEMTIME lpSystemTime) { +static inline void GetSystemTime(LPSYSTEMTIME lpSystemTime) { struct timespec ts; _CurrentTimeSpec(&ts); struct tm tm; @@ -690,7 +689,7 @@ static inline VOID GetSystemTime(LPSYSTEMTIME lpSystemTime) { } // https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getlocaltime -static inline VOID GetLocalTime(LPSYSTEMTIME lpSystemTime) { +static inline void GetLocalTime(LPSYSTEMTIME lpSystemTime) { struct timespec ts; _CurrentTimeSpec(&ts); struct tm tm; @@ -758,18 +757,18 @@ static inline bool QueryPerformanceCounter(LARGE_INTEGER* lpPerformanceCount) { } // https://learn.microsoft.com/en-us/windows/win32/api/debugapi/nf-debugapi-outputdebugstringa -static inline VOID OutputDebugStringA(const char* lpOutputString) { +static inline void OutputDebugStringA(const char* lpOutputString) { if (!lpOutputString) return; fputs(lpOutputString, stderr); } // https://learn.microsoft.com/en-us/windows/win32/api/debugapi/nf-debugapi-outputdebugstringw -static inline VOID OutputDebugStringW(LPCWSTR lpOutputString) { +static inline void OutputDebugStringW(LPCWSTR lpOutputString) { if (!lpOutputString) return; fprintf(stderr, "%ls", lpOutputString); } -static inline VOID OutputDebugString(const char* lpOutputString) { +static inline void OutputDebugString(const char* lpOutputString) { return OutputDebugStringA(lpOutputString); } diff --git a/Minecraft.Client/Platform/Windows64/XML/ATGXmlParser.h b/Minecraft.Client/Platform/Windows64/XML/ATGXmlParser.h index 3369a4174..e5767d15a 100644 --- a/Minecraft.Client/Platform/Windows64/XML/ATGXmlParser.h +++ b/Minecraft.Client/Platform/Windows64/XML/ATGXmlParser.h @@ -65,9 +65,9 @@ public: virtual HRESULT CDATAData( CONST WCHAR *strCDATA, UINT CDATALen, bool bMore ) = 0; virtual HRESULT CDATAEnd( ) = 0; - virtual VOID Error( HRESULT hError, CONST CHAR *strMessage ) = 0; + virtual void Error( HRESULT hError, CONST CHAR *strMessage ) = 0; - virtual VOID SetParseProgress( DWORD dwProgress ) { } + virtual void SetParseProgress( DWORD dwProgress ) { } const CHAR* GetFilename() { return m_strFilename; } UINT GetLineNumber() { return m_LineNum; } @@ -88,7 +88,7 @@ public: ~XMLParser(); // Register an interface inheiriting from ISAXCallback - VOID RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ); + void RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ); // Get the registered interface ISAXCallback* GetSAXCallbackInterface(); @@ -112,7 +112,7 @@ private: HRESULT MainParseLoop(); HRESULT AdvanceCharacter( bool bOkToFail = FALSE ); - VOID SkipNextAdvance(); + void SkipNextAdvance(); HRESULT ConsumeSpace(); HRESULT ConvertEscape(); @@ -122,12 +122,12 @@ private: HRESULT AdvanceCDATA(); HRESULT AdvanceComment(); - VOID FillBuffer(); + void FillBuffer(); #ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation - VOID Error( HRESULT hRet, _In_z_ _Printf_format_string_ CONST CHAR* strFormat, ... ); + void Error( HRESULT hRet, _In_z_ _Printf_format_string_ CONST CHAR* strFormat, ... ); #else - VOID Error( HRESULT hRet, CONST CHAR* strFormat, ... ); + void Error( HRESULT hRet, CONST CHAR* strFormat, ... ); #endif ISAXCallback* m_pISAXCallback; diff --git a/Minecraft.World/Platform/x64headers/extraX64.h b/Minecraft.World/Platform/x64headers/extraX64.h index 4d3402f43..c515a1f97 100644 --- a/Minecraft.World/Platform/x64headers/extraX64.h +++ b/Minecraft.World/Platform/x64headers/extraX64.h @@ -271,26 +271,26 @@ public: HRESULT Load(LPCWSTR szId); }; -typedef VOID* XMEMDECOMPRESSION_CONTEXT; -typedef VOID* XMEMCOMPRESSION_CONTEXT; +typedef void* XMEMDECOMPRESSION_CONTEXT; +typedef void* XMEMCOMPRESSION_CONTEXT; typedef enum _XMEMCODEC_TYPE { XMEMCODEC_DEFAULT = 0, XMEMCODEC_LZX = 1 } XMEMCODEC_TYPE; -HRESULT XMemDecompress(XMEMDECOMPRESSION_CONTEXT Context, VOID* pDestination, - SIZE_T* pDestSize, VOID* pSource, SIZE_T SrcSize); +HRESULT XMemDecompress(XMEMDECOMPRESSION_CONTEXT Context, void* pDestination, + SIZE_T* pDestSize, void* pSource, SIZE_T SrcSize); -HRESULT XMemCompress(XMEMCOMPRESSION_CONTEXT Context, VOID* pDestination, - SIZE_T* pDestSize, VOID* pSource, SIZE_T SrcSize); +HRESULT XMemCompress(XMEMCOMPRESSION_CONTEXT Context, void* pDestination, + SIZE_T* pDestSize, void* pSource, SIZE_T SrcSize); HRESULT XMemCreateCompressionContext(XMEMCODEC_TYPE CodecType, - const VOID* pCodecParams, DWORD Flags, + const void* pCodecParams, DWORD Flags, XMEMCOMPRESSION_CONTEXT* pContext); HRESULT XMemCreateDecompressionContext(XMEMCODEC_TYPE CodecType, - const VOID* pCodecParams, DWORD Flags, + const void* pCodecParams, DWORD Flags, XMEMDECOMPRESSION_CONTEXT* pContext); typedef struct _XMEMCODEC_PARAMETERS_LZX {