LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-04 03:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace remaining WinAPI types with standard C++ equivalents

Browse Source 
DWORD→uint32_t, BYTE→uint8_t, HRESULT→int32_t, HANDLE→void*, UINT→uint32_t, INT→int32_t, WORD→uint16_t, LONG→int32_t, SHORT→int16_t, LONGLONG→int64_t, ULONG_PTR→uintptr_t, PBYTE→uint8_t*, LPWSTR/PWSTR→wchar_t*, FLOAT→float, CHAR→char, boolean→bool, CONST→const, TRUE→true, FALSE→false across 176 files (excluding vendor libs and Linux stubs).
This commit is contained in:
MatthewBeshay
2026-03-30 17:36:15 +11:00
parent b28650976d
commit 28d68befd4
175 changed files with 4220 additions and 4220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Minecraft.Client/Platform/Common/GameRules/LevelGenerationOptions.cpp
View File

@@ -195,7 +195,7 @@ void LevelGenerationOptions::addAttribute(const std::wstring& attributeName,
if (attributeValue.compare(L"true") == 0) m_useFlatWorld = true;
app.DebugPrintf(
"LevelGenerationOptions: Adding parameter flatworld=%s\n",
m_useFlatWorld ? "TRUE" : "FALSE");
m_useFlatWorld ? "true" : "false");
} else if (attributeName.compare(L"saveName") == 0) {
std::wstring string(getString(attributeValue));
if (!string.empty())
@@ -233,7 +233,7 @@ void LevelGenerationOptions::addAttribute(const std::wstring& attributeName,
if (attributeValue.compare(L"true") == 0) setSrc(eSrc_tutorial);
app.DebugPrintf(
"LevelGenerationOptions: Adding parameter isTutorial=%s\n",
isTutorial() ? "TRUE" : "FALSE");
isTutorial() ? "true" : "false");
} else if (attributeName.compare(L"baseSaveName") == 0) {
setBaseSavePath(attributeValue);
app.DebugPrintf(
@@ -487,8 +487,8 @@ void LevelGenerationOptions::loadBaseSaveData() {
}
}
int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr,
DWORD dwLicenceMask) {
int LevelGenerationOptions::packMounted(void* pParam, int iPad, uint32_t dwErr,
uint32_t dwLicenceMask) {
LevelGenerationOptions* lgo = (LevelGenerationOptions*)pParam;
lgo->m_bLoadingData = false;
if (dwErr != ERROR_SUCCESS) {
@@ -497,7 +497,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr,
dwErr);
} else {
app.DebugPrintf("Mounted DLC for LGO, attempting to load data\n");
DWORD dwFilesProcessed = 0;
uint32_t dwFilesProcessed = 0;
int gameRulesCount = lgo->m_parentDLCPack->getDLCItemsCount(
DLCManager::e_DLCType_GameRulesHeader);
for (int i = 0; i < gameRulesCount; ++i) {
@@ -513,7 +513,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr,
#if defined(_UNICODE)
std::wstring path = grf.getPath();
const wchar_t* pchFilename = path.c_str();
HANDLE fileHandle = CreateFile(
void* fileHandle = CreateFile(
pchFilename, // file name
GENERIC_READ, // access mode
0, // share mode // TODO 4J Stu - Will we need to share
@@ -527,7 +527,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr,
);
#else
const char* pchFilename = wstringtofilename(grf.getPath());
HANDLE fileHandle = CreateFile(
void* fileHandle = CreateFile(
pchFilename, // file name
GENERIC_READ, // access mode
0, // share mode // TODO 4J Stu - Will we need to share
@@ -542,12 +542,12 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr,
#endif
if (fileHandle != INVALID_HANDLE_VALUE) {
DWORD dwFileSize = grf.length();
DWORD bytesRead;
PBYTE pbData = (PBYTE) new BYTE[dwFileSize];
uint32_t dwFileSize = grf.length();
uint32_t bytesRead;
uint8_t* pbData = (uint8_t*) new uint8_t[dwFileSize];
bool bSuccess = ReadFile(fileHandle, pbData, dwFileSize,
&bytesRead, nullptr);
if (bSuccess == FALSE) {
if (bSuccess == false) {
app.FatalLoadError();
}
CloseHandle(fileHandle);
@@ -571,7 +571,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr,
#if defined(_UNICODE)
std::wstring path = save.getPath();
const wchar_t* pchFilename = path.c_str();
HANDLE fileHandle = CreateFile(
void* fileHandle = CreateFile(
pchFilename, // file name
GENERIC_READ, // access mode
0, // share mode // TODO 4J Stu - Will we need to share
@@ -585,7 +585,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr,
);
#else
const char* pchFilename = wstringtofilename(save.getPath());
HANDLE fileHandle = CreateFile(
void* fileHandle = CreateFile(
pchFilename, // file name
GENERIC_READ, // access mode
0, // share mode // TODO 4J Stu - Will we need to share
@@ -600,11 +600,11 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr,
#endif
if (fileHandle != INVALID_HANDLE_VALUE) {
DWORD bytesRead, dwFileSize = GetFileSize(fileHandle, nullptr);
PBYTE pbData = (PBYTE) new BYTE[dwFileSize];
uint32_t bytesRead, dwFileSize = GetFileSize(fileHandle, nullptr);
uint8_t* pbData = (uint8_t*) new uint8_t[dwFileSize];
bool bSuccess = ReadFile(fileHandle, pbData, dwFileSize,
&bytesRead, nullptr);
if (bSuccess == FALSE) {
if (bSuccess == false) {
app.FatalLoadError();
}
CloseHandle(fileHandle);
@@ -615,7 +615,7 @@ int LevelGenerationOptions::packMounted(void* pParam, int iPad, DWORD dwErr,
}
}
}
DWORD result = StorageManager.UnmountInstalledDLC("WPACK");
uint32_t result = StorageManager.UnmountInstalledDLC("WPACK");
}
lgo->setLoadedData();