From 3a98ff640c0579ad29197f25ee07bf6bc68f6397 Mon Sep 17 00:00:00 2001 From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com> Date: Mon, 16 Mar 2026 04:49:34 +1100 Subject: [PATCH] Remove WinAPI primitives from common app helpers --- 4J.Storage/4J_Storage.h | 2 +- Minecraft.Client/Platform/Common/Consoles_App.cpp | 6 +++--- Minecraft.Client/Platform/Common/Consoles_App.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/4J.Storage/4J_Storage.h b/4J.Storage/4J_Storage.h index c5680846c..31da79d91 100644 --- a/4J.Storage/4J_Storage.h +++ b/4J.Storage/4J_Storage.h @@ -329,7 +329,7 @@ public: C4JStorage::ETMSStatus WriteTMSFile( int iPad, C4JStorage::eGlobalStorage eStorageFacility, C4JStorage::eTMS_FileType eFileType, CHAR* pchFilePath, CHAR* pchBuffer, - DWORD dwBufferSize, TMSCLIENT_CALLBACK Func, LPVOID lpParam); + unsigned int dwBufferSize, TMSCLIENT_CALLBACK Func, LPVOID lpParam); HRESULT GetUserQuotaInfo(int iPad, TMSCLIENT_CALLBACK Func, LPVOID lpParam); #endif diff --git a/Minecraft.Client/Platform/Common/Consoles_App.cpp b/Minecraft.Client/Platform/Common/Consoles_App.cpp index 33d0f34f5..31356c7ae 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.cpp +++ b/Minecraft.Client/Platform/Common/Consoles_App.cpp @@ -5285,8 +5285,8 @@ int CMinecraftApp::DLCMountedCallback(void *pParam,int iPad,std::uint32_t dwErr, m_Time.qwAppTime.QuadPart += qwDeltaTime.QuadPart; m_Time.qwTime.QuadPart = qwNewTime.QuadPart; - m_Time.fElapsedTime = m_Time.fSecsPerTick * ((FLOAT)(qwDeltaTime.QuadPart)); - m_Time.fAppTime = m_Time.fSecsPerTick * ((FLOAT)(m_Time.qwAppTime.QuadPart)); + m_Time.fElapsedTime = m_Time.fSecsPerTick * static_cast(qwDeltaTime.QuadPart); + m_Time.fAppTime = m_Time.fSecsPerTick * static_cast(m_Time.qwAppTime.QuadPart); } @@ -6099,7 +6099,7 @@ std::wstring CMinecraftApp::FormatHTMLString(int iPad, const std::wstring &desc, #endif // _XBOX // Fix for #8903 - UI: Localization: KOR/JPN/CHT: Button Icons are rendered with padding space, which looks no good - DWORD dwLanguage = XGetLanguage( ); + std::uint32_t dwLanguage = XGetLanguage( ); switch(dwLanguage) { case XC_LANGUAGE_KOREAN: diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h index e044f7a19..c96534ec5 100644 --- a/Minecraft.Client/Platform/Common/Consoles_App.h +++ b/Minecraft.Client/Platform/Common/Consoles_App.h @@ -291,7 +291,7 @@ public: static void NotificationsCallback(void *pParam,std::uint32_t dwNotification, unsigned int uiParam); // for the ethernet being disconnected - static void LiveLinkChangeCallback(void *pParam,BOOL bConnected); + static void LiveLinkChangeCallback(void *pParam, bool bConnected); bool GetLiveLinkRequired() {return m_bLiveLinkRequired;} void SetLiveLinkRequired(bool required) {m_bLiveLinkRequired=required;}