backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

purge unused winapi stubs

Browse source
This commit is contained in:
Tropical 2026-04-01 00:56:17 -05:00
parent f047de62e2
commit 181b697327
3 changed files with 3 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp
View file

@ -109,7 +109,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type,
SKIN_BOX* pSkinBox = new SKIN_BOX; SKIN_BOX* pSkinBox = new SKIN_BOX;
memset(pSkinBox, 0, sizeof(SKIN_BOX)); memset(pSkinBox, 0, sizeof(SKIN_BOX));
swscanf_s(value.c_str(), L"%9ls%f%f%f%f%f%f%f%f", wchBodyPart, 10, swscanf(value.c_str(), L"%9ls%f%f%f%f%f%f%f%f", wchBodyPart, 10,
&pSkinBox->fX, &pSkinBox->fY, &pSkinBox->fZ, &pSkinBox->fX, &pSkinBox->fY, &pSkinBox->fZ,
&pSkinBox->fW, &pSkinBox->fH, &pSkinBox->fD, &pSkinBox->fW, &pSkinBox->fH, &pSkinBox->fD,
&pSkinBox->fU, &pSkinBox->fV); &pSkinBox->fU, &pSkinBox->fV);
@ -132,7 +132,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type,
m_AdditionalBoxes.push_back(pSkinBox); m_AdditionalBoxes.push_back(pSkinBox);
} break; } break;
case DLCManager::e_DLCParamType_Anim: { case DLCManager::e_DLCParamType_Anim: {
swscanf_s(value.c_str(), L"%X", &m_uiAnimOverrideBitmask, swscanf(value.c_str(), L"%X", &m_uiAnimOverrideBitmask,
sizeof(unsigned int)); sizeof(unsigned int));
uint32_t skinId = app.getSkinIdFromPath(m_path); uint32_t skinId = app.getSkinIdFromPath(m_path);
app.SetAnimOverrideBitmask(skinId, m_uiAnimOverrideBitmask); app.SetAnimOverrideBitmask(skinId, m_uiAnimOverrideBitmask);

153
minecraft/Minecraft.Client/Linux/Stubs/winapi_stubs.h
View file

@ -172,32 +172,6 @@ typedef struct _MEMORYSTATUS {
size_t dwAvailVirtual; size_t dwAvailVirtual;
} MEMORYSTATUS, *LPMEMORYSTATUS; } MEMORYSTATUS, *LPMEMORYSTATUS;
typedef struct _WIN32_FIND_DATAA {
DWORD dwFileAttributes;
FILETIME ftCreationTime;
FILETIME ftLastAccessTime;
FILETIME ftLastWriteTime;
DWORD nFileSizeHigh;
DWORD nFileSizeLow;
DWORD dwReserved0;
DWORD dwReserved1;
char cFileName[MAX_PATH];
char cAlternateFileName[14];
} WIN32_FIND_DATAA, *PWIN32_FIND_DATAA, *LPWIN32_FIND_DATAA;
typedef WIN32_FIND_DATAA WIN32_FIND_DATA;
typedef PWIN32_FIND_DATAA PWIN32_FIND_DATA;
typedef LPWIN32_FIND_DATAA LPWIN32_FIND_DATA;
typedef struct _WIN32_FILE_ATTRIBUTE_DATA {
DWORD dwFileAttributes;
FILETIME ftCreationTime;
FILETIME ftLastAccessTime;
FILETIME ftLastWriteTime;
DWORD nFileSizeHigh;
DWORD nFileSizeLow;
} WIN32_FILE_ATTRIBUTE_DATA, *LPWIN32_FILE_ATTRIBUTE_DATA;
typedef enum _GET_FILEEX_INFO_LEVELS { typedef enum _GET_FILEEX_INFO_LEVELS {
GetFileExInfoStandard, GetFileExInfoStandard,
GetFileExMaxInfoLevel GetFileExMaxInfoLevel
@ -381,57 +355,6 @@ static inline bool ReadFile(HANDLE hFile, void* lpBuffer,
return n >= 0; return n >= 0;
} }
static inline bool WriteFile(HANDLE hFile, const void* lpBuffer,
DWORD nNumberOfBytesToWrite,
DWORD* lpNumberOfBytesWritten,
void* lpOverlapped) {
ssize_t n = write((int)(intptr_t)hFile, lpBuffer, nNumberOfBytesToWrite);
if (lpNumberOfBytesWritten) *lpNumberOfBytesWritten = n >= 0 ? (DWORD)n : 0;
return n >= 0;
}
static inline DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove,
LONG* lpDistanceToMoveHigh,
DWORD dwMoveMethod) {
off_t offset = lDistanceToMove;
if (lpDistanceToMoveHigh) offset |= ((off_t)*lpDistanceToMoveHigh << 32);
off_t result = lseek((int)(intptr_t)hFile, offset, dwMoveMethod);
if (result == (off_t)-1) {
if (lpDistanceToMoveHigh) *lpDistanceToMoveHigh = -1;
return INVALID_SET_FILE_POINTER;
}
if (lpDistanceToMoveHigh) *lpDistanceToMoveHigh = (LONG)(result >> 32);
return (DWORD)(result & 0xFFFFFFFF);
}
static inline bool CreateDirectoryA(const char* lpPathName,
void* lpSecurityAttributes) {
return mkdir(lpPathName, 0755) == 0;
}
static inline bool CreateDirectory(const char* lpPathName,
void* lpSecurityAttributes) {
return CreateDirectoryA(lpPathName, lpSecurityAttributes);
}
static inline bool DeleteFileA(const char* lpFileName) {
return unlink(lpFileName) == 0;
}
static inline bool DeleteFile(const char* lpFileName) {
return DeleteFileA(lpFileName);
}
static inline bool MoveFileA(const char* lpExistingFileName,
const char* lpNewFileName) {
return rename(lpExistingFileName, lpNewFileName) == 0;
}
static inline bool MoveFile(const char* lpExistingFileName,
const char* lpNewFileName) {
return MoveFileA(lpExistingFileName, lpNewFileName);
}
// internal helper: convert FILETIME (100ns since 1601) to time_t (seconds since // internal helper: convert FILETIME (100ns since 1601) to time_t (seconds since
// 1970) // 1970)
static inline time_t _FileTimeToTimeT(const FILETIME& ft) { static inline time_t _FileTimeToTimeT(const FILETIME& ft) {
@ -467,15 +390,6 @@ static inline void _FillSystemTime(const struct tm* tm, long tv_nsec,
lpSystemTime->wMilliseconds = (WORD)(tv_nsec / 1000000); // ns to ms lpSystemTime->wMilliseconds = (WORD)(tv_nsec / 1000000); // ns to ms
} }
// https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-getsystemtime
static inline void GetSystemTime(LPSYSTEMTIME lpSystemTime) {
struct timespec ts;
_CurrentTimeSpec(&ts);
struct tm tm;
gmtime_r(&ts.tv_sec, &tm); // UTC
_FillSystemTime(&tm, ts.tv_nsec, 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;
@ -485,27 +399,6 @@ static inline void GetLocalTime(LPSYSTEMTIME lpSystemTime) {
_FillSystemTime(&tm, ts.tv_nsec, lpSystemTime); _FillSystemTime(&tm, ts.tv_nsec, lpSystemTime);
} }
// https://learn.microsoft.com/en-us/windows/win32/api/timezoneapi/nf-timezoneapi-systemtimetofiletime
static inline bool SystemTimeToFileTime(const SYSTEMTIME* lpSystemTime,
LPFILETIME lpFileTime) {
struct tm tm = {};
tm.tm_year = lpSystemTime->wYear - 1900;
tm.tm_mon = lpSystemTime->wMonth - 1;
tm.tm_mday = lpSystemTime->wDay;
tm.tm_hour = lpSystemTime->wHour;
tm.tm_min = lpSystemTime->wMinute;
tm.tm_sec = lpSystemTime->wSecond;
time_t t = timegm(&tm);
if (t == (time_t)-1) return false;
uint64_t ft = ((uint64_t)t + 11644473600ULL) * 10000000ULL;
ft += lpSystemTime->wMilliseconds * 10000ULL;
lpFileTime->dwLowDateTime = (DWORD)(ft & 0xFFFFFFFF);
lpFileTime->dwHighDateTime = (DWORD)(ft >> 32);
return true;
}
// https://learn.microsoft.com/en-us/windows/win32/api/timezoneapi/nf-timezoneapi-filetimetosystemtime // https://learn.microsoft.com/en-us/windows/win32/api/timezoneapi/nf-timezoneapi-filetimetosystemtime
static inline bool FileTimeToSystemTime(const FILETIME* lpFileTime, static inline bool FileTimeToSystemTime(const FILETIME* lpFileTime,
LPSYSTEMTIME lpSystemTime) { LPSYSTEMTIME lpSystemTime) {
@ -519,30 +412,6 @@ static inline bool FileTimeToSystemTime(const FILETIME* lpFileTime,
_FillSystemTime(&tm, remainder_ns, lpSystemTime); _FillSystemTime(&tm, remainder_ns, lpSystemTime);
return true; return true;
} }
static inline DWORD GetTickCount() {
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
// milliseconds
return (long long)ts.tv_sec * 1000 + (long long)ts.tv_nsec / 1000000;
}
static inline bool QueryPerformanceFrequency(LARGE_INTEGER* lpFrequency) {
// nanoseconds
lpFrequency->QuadPart = 1000000000;
return false;
}
static inline bool QueryPerformanceCounter(LARGE_INTEGER* lpPerformanceCount) {
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
// nanoseconds
lpPerformanceCount->QuadPart =
((long long)ts.tv_sec * 1000000000) + (long long)ts.tv_nsec;
return true;
}
// 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) {
@ -805,23 +674,6 @@ static inline HANDLE GetCurrentThread() {
return (HANDLE)(unsigned long)pthread_self(); return (HANDLE)(unsigned long)pthread_self();
} }
template <size_t N>
static inline int sprintf_s(char (&buf)[N], const char* fmt, ...) {
va_list args;
va_start(args, fmt);
int ret = vsnprintf(buf, N, fmt, args);
va_end(args);
return ret;
}
static inline int sprintf_s(char* buf, size_t sz, const char* fmt, ...) {
va_list args;
va_start(args, fmt); // fucking horrid
int ret = vsnprintf(buf, sz, fmt, args);
va_end(args);
return ret;
}
template <size_t N> template <size_t N>
static inline int swprintf_s(wchar_t (&buf)[N], const wchar_t* fmt, ...) { static inline int swprintf_s(wchar_t (&buf)[N], const wchar_t* fmt, ...) {
va_list args; va_list args;
@ -879,11 +731,6 @@ static inline bool VirtualFree(void* lpAddress, size_t dwSize,
return true; return true;
} }
#define swscanf_s swscanf
#define sscanf_s sscanf
#define _wcsicmp wcscasecmp #define _wcsicmp wcscasecmp
#define _stricmp strcasecmp
#define _strnicmp strncasecmp
#define _wcsnicmp wcsncasecmp
#endif // WINAPISTUBS_H #endif // WINAPISTUBS_H

2
minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
View file

@ -1197,7 +1197,7 @@ bool ConsoleSaveFileSplit::GetNumericIdentifierFromName(
} }
} }
// Get x/z coords // Get x/z coords
swscanf_s(body, L"%d.%d.mcr", &x, &z); swscanf(body, L"%d.%d.mcr", &x, &z);
// Pack full id // Pack full id
// 4jcraft added cast to unsigned // 4jcraft added cast to unsigned