LegacyConsole/4jcraft
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-21 19:15:36 +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

68
Minecraft.Client/Platform/Windows64/Windows64_Minecraft.cpp
View File

@@ -37,7 +37,7 @@
#include "../../../Minecraft.World/Level/Storage/OldChunkStorage.h"
HINSTANCE hMyInst;
LRESULT CALLBACK DlgProc(HWND hWndDlg, UINT Msg, WPARAM wParam, LPARAM lParam);
LRESULT CALLBACK DlgProc(HWND hWndDlg, uint32_t Msg, WPARAM wParam, LPARAM lParam);
char chGlobalText[256];
uint16_t ui16GlobalText[256];
@@ -55,7 +55,7 @@ uint16_t ui16GlobalText[256];
// #define PROFILE_VERSION 3 // new version for the interim bug fix 166 TU
#define NUM_PROFILE_VALUES 5
#define NUM_PROFILE_SETTINGS 4
DWORD dwProfileSettingsA[NUM_PROFILE_VALUES] = {
uint32_t dwProfileSettingsA[NUM_PROFILE_VALUES] = {
0, 0, 0, 0, 0
};
@@ -66,7 +66,7 @@ DWORD dwProfileSettingsA[NUM_PROFILE_VALUES] = {
// running for a long time.
//-------------------------------------------------------------------------------------
bool g_bWidescreen = TRUE;
bool g_bWidescreen = true;
int g_iScreenWidth = 1920;
int g_iScreenHeight = 1080;
@@ -398,7 +398,7 @@ ID3D11DepthStencilView* g_pDepthStencilView = nullptr;
ID3D11Texture2D* g_pDepthStencilBuffer = nullptr;
//
// FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM)
// FUNCTION: WndProc(HWND, uint32_t, WPARAM, LPARAM)
//
// PURPOSE: Processes messages for the main window.
//
@@ -407,7 +407,7 @@ ID3D11Texture2D* g_pDepthStencilBuffer = nullptr;
// WM_DESTROY - post a quit message and return
//
//
LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
LRESULT CALLBACK WndProc(HWND hWnd, uint32_t message, WPARAM wParam,
LPARAM lParam) {
int wmId, wmEvent;
PAINTSTRUCT ps;
@@ -481,7 +481,7 @@ bool InitInstance(HINSTANCE hInstance, int nCmdShow) {
RECT wr = {0, 0, g_iScreenWidth,
g_iScreenHeight}; // set the size, but not the position
AdjustWindowRect(&wr, WS_OVERLAPPEDWINDOW, FALSE); // adjust the size
AdjustWindowRect(&wr, WS_OVERLAPPEDWINDOW, false); // adjust the size
g_hWnd = CreateWindow("MinecraftClass", "Minecraft", WS_OVERLAPPEDWINDOW,
CW_USEDEFAULT, 0,
@@ -490,13 +490,13 @@ bool InitInstance(HINSTANCE hInstance, int nCmdShow) {
nullptr, nullptr, hInstance, nullptr);
if (!g_hWnd) {
return FALSE;
return false;
}
ShowWindow(g_hWnd, nCmdShow);
UpdateWindow(g_hWnd);
return TRUE;
return true;
}
// 4J Stu - These functions are referenced from the Windows Input library
@@ -520,10 +520,10 @@ void SeedEditBox() {
}
//---------------------------------------------------------------------------
LRESULT CALLBACK DlgProc(HWND hWndDlg, UINT Msg, WPARAM wParam, LPARAM lParam) {
LRESULT CALLBACK DlgProc(HWND hWndDlg, uint32_t Msg, WPARAM wParam, LPARAM lParam) {
switch (Msg) {
case WM_INITDIALOG:
return TRUE;
return true;
case WM_COMMAND:
switch (wParam) {
@@ -531,30 +531,30 @@ LRESULT CALLBACK DlgProc(HWND hWndDlg, UINT Msg, WPARAM wParam, LPARAM lParam) {
// Set the text
GetDlgItemText(hWndDlg, IDC_EDIT, chGlobalText, 256);
EndDialog(hWndDlg, 0);
return TRUE;
return true;
}
break;
}
return FALSE;
return false;
}
//--------------------------------------------------------------------------------------
// Create Direct3D device and swap chain
//--------------------------------------------------------------------------------------
HRESULT InitDevice() {
HRESULT hr = S_OK;
int32_t InitDevice() {
int32_t hr = S_OK;
RECT rc;
GetClientRect(g_hWnd, &rc);
UINT width = rc.right - rc.left;
UINT height = rc.bottom - rc.top;
uint32_t width = rc.right - rc.left;
uint32_t height = rc.bottom - rc.top;
// app.DebugPrintf("width: %d, height: %d\n", width, height);
width = g_iScreenWidth;
height = g_iScreenHeight;
app.DebugPrintf("width: %d, height: %d\n", width, height);
UINT createDeviceFlags = 0;
uint32_t createDeviceFlags = 0;
#if defined(_DEBUG)
createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG;
#endif
@@ -564,14 +564,14 @@ HRESULT InitDevice() {
D3D_DRIVER_TYPE_WARP,
D3D_DRIVER_TYPE_REFERENCE,
};
UINT numDriverTypes = ARRAYSIZE(driverTypes);
uint32_t numDriverTypes = ARRAYSIZE(driverTypes);
D3D_FEATURE_LEVEL featureLevels[] = {
D3D_FEATURE_LEVEL_11_0,
D3D_FEATURE_LEVEL_10_1,
D3D_FEATURE_LEVEL_10_0,
};
UINT numFeatureLevels = ARRAYSIZE(featureLevels);
uint32_t numFeatureLevels = ARRAYSIZE(featureLevels);
DXGI_SWAP_CHAIN_DESC sd;
ZeroMemory(&sd, sizeof(sd));
@@ -585,9 +585,9 @@ HRESULT InitDevice() {
sd.OutputWindow = g_hWnd;
sd.SampleDesc.Count = 1;
sd.SampleDesc.Quality = 0;
sd.Windowed = TRUE;
sd.Windowed = true;
for (UINT driverTypeIndex = 0; driverTypeIndex < numDriverTypes;
for (uint32_t driverTypeIndex = 0; driverTypeIndex < numDriverTypes;
driverTypeIndex++) {
g_driverType = driverTypes[driverTypeIndex];
hr = D3D11CreateDeviceAndSwapChain(
@@ -639,8 +639,8 @@ HRESULT InitDevice() {
// Setup the viewport
D3D11_VIEWPORT vp;
vp.Width = (FLOAT)width;
vp.Height = (FLOAT)height;
vp.Width = (float)width;
vp.Height = (float)height;
vp.MinDepth = 0.0f;
vp.MaxDepth = 1.0f;
vp.TopLeftX = 0;
@@ -704,7 +704,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
// Perform application initialization:
if (!InitInstance(hInstance, nCmdShow)) {
return FALSE;
return false;
}
hMyInst = hInstance;
@@ -933,9 +933,9 @@ volatile size_t sizeCheckMin = 1160;
volatile size_t sizeCheckMax = 1160;
volatile int sectCheck = 48;
CRITICAL_SECTION memCS;
DWORD tlsIdx;
uint32_t tlsIdx;
void* XMemAlloc(size_t dwSize, DWORD dwAllocAttributes) {
void* XMemAlloc(size_t dwSize, uint32_t dwAllocAttributes) {
if (!trackStarted) {
void* p = XMemAllocDefault(dwSize, dwAllocAttributes);
size_t realSize = XMemSizeDefault(p, dwAllocAttributes);
@@ -976,22 +976,22 @@ void* XMemAlloc(size_t dwSize, DWORD dwAllocAttributes) {
void* operator new(size_t size) {
return (unsigned char*)XMemAlloc(
size, MAKE_XALLOC_ATTRIBUTES(
0, FALSE, TRUE, FALSE, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT,
XALLOC_MEMPROTECT_READWRITE, FALSE, XALLOC_MEMTYPE_HEAP));
0, false, true, false, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT,
XALLOC_MEMPROTECT_READWRITE, false, XALLOC_MEMTYPE_HEAP));
}
void operator delete(void* p) {
XMemFree(p, MAKE_XALLOC_ATTRIBUTES(
0, FALSE, TRUE, FALSE, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT,
XALLOC_MEMPROTECT_READWRITE, FALSE, XALLOC_MEMTYPE_HEAP));
0, false, true, false, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT,
XALLOC_MEMPROTECT_READWRITE, false, XALLOC_MEMTYPE_HEAP));
}
void WINAPI XMemFree(void* pAddress, DWORD dwAllocAttributes) {
void WINAPI XMemFree(void* pAddress, uint32_t dwAllocAttributes) {
bool special = false;
if (dwAllocAttributes == 0) {
dwAllocAttributes = MAKE_XALLOC_ATTRIBUTES(
0, FALSE, TRUE, FALSE, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT,
XALLOC_MEMPROTECT_READWRITE, FALSE, XALLOC_MEMTYPE_HEAP);
0, false, true, false, 0, XALLOC_PHYSICAL_ALIGNMENT_DEFAULT,
XALLOC_MEMPROTECT_READWRITE, false, XALLOC_MEMTYPE_HEAP);
special = true;
}
if (!trackStarted) {
@@ -1018,7 +1018,7 @@ void WINAPI XMemFree(void* pAddress, DWORD dwAllocAttributes) {
LeaveCriticalSection(&memCS);
}
size_t WINAPI XMemSize(void* pAddress, DWORD dwAllocAttributes) {
size_t WINAPI XMemSize(void* pAddress, uint32_t dwAllocAttributes) {
if (trackStarted) {
return XMemSizeDefault(pAddress, dwAllocAttributes) - 16;
} else {