backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-07-23 23:17:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOID -> void

Browse source
This commit is contained in:
Tropical 2026-03-30 00:22:02 -05:00
parent a518b51754
commit be2c65486d
7 changed files with 46 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Minecraft.Client/Platform/Common/XML/ATGXmlParser.cpp
View file

@ -45,7 +45,7 @@ XMLParser::~XMLParser()
// Name: XMLParser::FillBuffer // Name: XMLParser::FillBuffer
// Desc: Reads a block from the current open file // Desc: Reads a block from the current open file
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
VOID XMLParser::FillBuffer() void XMLParser::FillBuffer()
{ {
DWORD NChars; DWORD NChars;
@ -83,7 +83,7 @@ VOID XMLParser::FillBuffer()
// Name: XMLParser::SkipNextAdvance // Name: XMLParser::SkipNextAdvance
// Desc: Puts the last character read back on the input stream // Desc: Puts the last character read back on the input stream
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
VOID XMLParser::SkipNextAdvance() void XMLParser::SkipNextAdvance()
{ {
m_bSkipNextAdvance = TRUE; m_bSkipNextAdvance = TRUE;
} }
@ -715,7 +715,7 @@ HRESULT XMLParser::AdvanceComment()
// Name: XMLParser::RegisterSAXCallbackInterface // Name: XMLParser::RegisterSAXCallbackInterface
// Desc: Registers callback interface // Desc: Registers callback interface
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
VOID XMLParser::RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ) void XMLParser::RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback )
{ {
m_pISAXCallback = pISAXCallback; m_pISAXCallback = pISAXCallback;
} }
@ -946,9 +946,9 @@ HRESULT XMLParser::ParseXMLBuffer( CONST CHAR *strBuffer, UINT uBufferSize )
// Logs an error through the callback interface // Logs an error through the callback interface
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
#ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation #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 #else
VOID XMLParser::Error( HRESULT hErr, CONST CHAR* strFormat, ... ) void XMLParser::Error( HRESULT hErr, CONST CHAR* strFormat, ... )
#endif #endif
{ {
CONST INT MAX_OUTPUT_STR = 160; CONST INT MAX_OUTPUT_STR = 160;

14
Minecraft.Client/Platform/Common/XML/ATGXmlParser.h
View file

@ -65,9 +65,9 @@ public:
virtual HRESULT CDATAData( CONST WCHAR *strCDATA, UINT CDATALen, bool bMore ) = 0; virtual HRESULT CDATAData( CONST WCHAR *strCDATA, UINT CDATALen, bool bMore ) = 0;
virtual HRESULT CDATAEnd( ) = 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; } const CHAR* GetFilename() { return m_strFilename; }
UINT GetLineNumber() { return m_LineNum; } UINT GetLineNumber() { return m_LineNum; }
@ -88,7 +88,7 @@ public:
~XMLParser(); ~XMLParser();
// Register an interface inheiriting from ISAXCallback // Register an interface inheiriting from ISAXCallback
VOID RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ); void RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback );
// Get the registered interface // Get the registered interface
ISAXCallback* GetSAXCallbackInterface(); ISAXCallback* GetSAXCallbackInterface();
@ -112,7 +112,7 @@ private:
HRESULT MainParseLoop(); HRESULT MainParseLoop();
HRESULT AdvanceCharacter( bool bOkToFail = FALSE ); HRESULT AdvanceCharacter( bool bOkToFail = FALSE );
VOID SkipNextAdvance(); void SkipNextAdvance();
HRESULT ConsumeSpace(); HRESULT ConsumeSpace();
HRESULT ConvertEscape(); HRESULT ConvertEscape();
@ -122,12 +122,12 @@ private:
HRESULT AdvanceCDATA(); HRESULT AdvanceCDATA();
HRESULT AdvanceComment(); HRESULT AdvanceComment();
VOID FillBuffer(); void FillBuffer();
#ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation #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 #else
VOID Error( HRESULT hRet, CONST CHAR* strFormat, ... ); void Error( HRESULT hRet, CONST CHAR* strFormat, ... );
#endif #endif
ISAXCallback* m_pISAXCallback; ISAXCallback* m_pISAXCallback;

6
Minecraft.Client/Platform/Common/XML/xmlFilesCallback.h
View file

@ -90,7 +90,7 @@ public:
virtual HRESULT CDATAEnd( ){ return S_OK; }; 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 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 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"); };
}; };

14
Minecraft.Client/Platform/Extrax64Stubs.cpp
View file

@ -30,7 +30,7 @@ CXuiStringTable StringTable;
ATG::XMLParser::XMLParser() {} ATG::XMLParser::XMLParser() {}
ATG::XMLParser::~XMLParser() {} ATG::XMLParser::~XMLParser() {}
HRESULT ATG::XMLParser::ParseXMLBuffer( CONST CHAR* strBuffer, UINT uBufferSize ) { return S_OK; } 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 #endif
#if !defined(__linux__) #if !defined(__linux__)
@ -185,9 +185,9 @@ DWORD XUserAreUsersFriends( DWORD dwUserIndex, PPlayerUID pXuids, DWORD dwXuidCo
HRESULT XMemDecompress( HRESULT XMemDecompress(
XMEMDECOMPRESSION_CONTEXT Context, XMEMDECOMPRESSION_CONTEXT Context,
VOID *pDestination, void *pDestination,
SIZE_T *pDestSize, SIZE_T *pDestSize,
VOID *pSource, void *pSource,
SIZE_T SrcSize SIZE_T SrcSize
) )
{ {
@ -216,9 +216,9 @@ HRESULT XMemDecompress(
HRESULT XMemCompress( HRESULT XMemCompress(
XMEMCOMPRESSION_CONTEXT Context, XMEMCOMPRESSION_CONTEXT Context,
VOID *pDestination, void *pDestination,
SIZE_T *pDestSize, SIZE_T *pDestSize,
VOID *pSource, void *pSource,
SIZE_T SrcSize SIZE_T SrcSize
) )
{ {
@ -247,7 +247,7 @@ HRESULT XMemCompress(
HRESULT XMemCreateCompressionContext( HRESULT XMemCreateCompressionContext(
XMEMCODEC_TYPE CodecType, XMEMCODEC_TYPE CodecType,
CONST VOID *pCodecParams, CONST void *pCodecParams,
DWORD Flags, DWORD Flags,
XMEMCOMPRESSION_CONTEXT *pContext XMEMCOMPRESSION_CONTEXT *pContext
) )
@ -268,7 +268,7 @@ HRESULT XMemCreateCompressionContext(
HRESULT XMemCreateDecompressionContext( HRESULT XMemCreateDecompressionContext(
XMEMCODEC_TYPE CodecType, XMEMCODEC_TYPE CodecType,
CONST VOID *pCodecParams, CONST void *pCodecParams,
DWORD Flags, DWORD Flags,
XMEMDECOMPRESSION_CONTEXT *pContext XMEMDECOMPRESSION_CONTEXT *pContext
) )

19
Minecraft.Client/Platform/Linux/Stubs/winapi_stubs.h
View file

@ -32,7 +32,6 @@ typedef unsigned int* LPDWORD;
typedef char CHAR; typedef char CHAR;
typedef uintptr_t ULONG_PTR; typedef uintptr_t ULONG_PTR;
typedef long LONG; typedef long LONG;
typedef void VOID;
typedef ULONGLONG PlayerUID; typedef ULONGLONG PlayerUID;
typedef DWORD WORD; typedef DWORD WORD;
typedef DWORD* PDWORD; typedef DWORD* PDWORD;
@ -211,8 +210,8 @@ typedef enum _GET_FILEEX_INFO_LEVELS {
GetFileExMaxInfoLevel GetFileExMaxInfoLevel
} GET_FILEEX_INFO_LEVELS; } GET_FILEEX_INFO_LEVELS;
typedef VOID* XMEMCOMPRESSION_CONTEXT; typedef void* XMEMCOMPRESSION_CONTEXT;
typedef VOID* XMEMDECOMPRESSION_CONTEXT; typedef void* XMEMDECOMPRESSION_CONTEXT;
// internal search state for FindFirstFile/FindNextFile // internal search state for FindFirstFile/FindNextFile
typedef struct _LINUXSTUBS_FIND_HANDLE { 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 // 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 // TODO: Parse /proc/meminfo and set lpBuffer based on that. Probably will
// also need another different codepath for macOS too. // also need another different codepath for macOS too.
} }
static inline DWORD GetLastError(VOID) { return errno; } static inline DWORD GetLastError(void) { return errno; }
#ifdef __LP64__ #ifdef __LP64__
static inline int64_t InterlockedCompareExchangeRelease64( 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 // 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; struct timespec ts;
_CurrentTimeSpec(&ts); _CurrentTimeSpec(&ts);
struct tm tm; 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 // 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; struct timespec ts;
_CurrentTimeSpec(&ts); _CurrentTimeSpec(&ts);
struct tm tm; 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 // 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; if (!lpOutputString) return;
fputs(lpOutputString, stderr); fputs(lpOutputString, stderr);
} }
// https://learn.microsoft.com/en-us/windows/win32/api/debugapi/nf-debugapi-outputdebugstringw // 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; if (!lpOutputString) return;
fprintf(stderr, "%ls", lpOutputString); fprintf(stderr, "%ls", lpOutputString);
} }
static inline VOID OutputDebugString(const char* lpOutputString) { static inline void OutputDebugString(const char* lpOutputString) {
return OutputDebugStringA(lpOutputString); return OutputDebugStringA(lpOutputString);
} }

14
Minecraft.Client/Platform/Windows64/XML/ATGXmlParser.h
View file

@ -65,9 +65,9 @@ public:
virtual HRESULT CDATAData( CONST WCHAR *strCDATA, UINT CDATALen, bool bMore ) = 0; virtual HRESULT CDATAData( CONST WCHAR *strCDATA, UINT CDATALen, bool bMore ) = 0;
virtual HRESULT CDATAEnd( ) = 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; } const CHAR* GetFilename() { return m_strFilename; }
UINT GetLineNumber() { return m_LineNum; } UINT GetLineNumber() { return m_LineNum; }
@ -88,7 +88,7 @@ public:
~XMLParser(); ~XMLParser();
// Register an interface inheiriting from ISAXCallback // Register an interface inheiriting from ISAXCallback
VOID RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback ); void RegisterSAXCallbackInterface( ISAXCallback *pISAXCallback );
// Get the registered interface // Get the registered interface
ISAXCallback* GetSAXCallbackInterface(); ISAXCallback* GetSAXCallbackInterface();
@ -112,7 +112,7 @@ private:
HRESULT MainParseLoop(); HRESULT MainParseLoop();
HRESULT AdvanceCharacter( bool bOkToFail = FALSE ); HRESULT AdvanceCharacter( bool bOkToFail = FALSE );
VOID SkipNextAdvance(); void SkipNextAdvance();
HRESULT ConsumeSpace(); HRESULT ConsumeSpace();
HRESULT ConvertEscape(); HRESULT ConvertEscape();
@ -122,12 +122,12 @@ private:
HRESULT AdvanceCDATA(); HRESULT AdvanceCDATA();
HRESULT AdvanceComment(); HRESULT AdvanceComment();
VOID FillBuffer(); void FillBuffer();
#ifdef _Printf_format_string_ // VC++ 2008 and later support this annotation #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 #else
VOID Error( HRESULT hRet, CONST CHAR* strFormat, ... ); void Error( HRESULT hRet, CONST CHAR* strFormat, ... );
#endif #endif
ISAXCallback* m_pISAXCallback; ISAXCallback* m_pISAXCallback;

16
Minecraft.World/Platform/x64headers/extraX64.h
View file

@ -271,26 +271,26 @@ public:
HRESULT Load(LPCWSTR szId); HRESULT Load(LPCWSTR szId);
}; };
typedef VOID* XMEMDECOMPRESSION_CONTEXT; typedef void* XMEMDECOMPRESSION_CONTEXT;
typedef VOID* XMEMCOMPRESSION_CONTEXT; typedef void* XMEMCOMPRESSION_CONTEXT;
typedef enum _XMEMCODEC_TYPE { typedef enum _XMEMCODEC_TYPE {
XMEMCODEC_DEFAULT = 0, XMEMCODEC_DEFAULT = 0,
XMEMCODEC_LZX = 1 XMEMCODEC_LZX = 1
} XMEMCODEC_TYPE; } XMEMCODEC_TYPE;
HRESULT XMemDecompress(XMEMDECOMPRESSION_CONTEXT Context, VOID* pDestination, HRESULT XMemDecompress(XMEMDECOMPRESSION_CONTEXT Context, void* pDestination,
SIZE_T* pDestSize, VOID* pSource, SIZE_T SrcSize); SIZE_T* pDestSize, void* pSource, SIZE_T SrcSize);
HRESULT XMemCompress(XMEMCOMPRESSION_CONTEXT Context, VOID* pDestination, HRESULT XMemCompress(XMEMCOMPRESSION_CONTEXT Context, void* pDestination,
SIZE_T* pDestSize, VOID* pSource, SIZE_T SrcSize); SIZE_T* pDestSize, void* pSource, SIZE_T SrcSize);
HRESULT XMemCreateCompressionContext(XMEMCODEC_TYPE CodecType, HRESULT XMemCreateCompressionContext(XMEMCODEC_TYPE CodecType,
const VOID* pCodecParams, DWORD Flags, const void* pCodecParams, DWORD Flags,
XMEMCOMPRESSION_CONTEXT* pContext); XMEMCOMPRESSION_CONTEXT* pContext);
HRESULT XMemCreateDecompressionContext(XMEMCODEC_TYPE CodecType, HRESULT XMemCreateDecompressionContext(XMEMCODEC_TYPE CodecType,
const VOID* pCodecParams, DWORD Flags, const void* pCodecParams, DWORD Flags,
XMEMDECOMPRESSION_CONTEXT* pContext); XMEMDECOMPRESSION_CONTEXT* pContext);
typedef struct _XMEMCODEC_PARAMETERS_LZX { typedef struct _XMEMCODEC_PARAMETERS_LZX {