From 4f5695d4afa113d46cee3551919aa469df2aaff7 Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Mon, 16 Mar 2026 04:55:38 +1100
Subject: [PATCH] Use standard wait result types in C4JThread

---
 Minecraft.World/Util/C4JThread.cpp | 18 +++++++++---------
 Minecraft.World/Util/C4JThread.h   | 10 +++++-----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Minecraft.World/Util/C4JThread.cpp b/Minecraft.World/Util/C4JThread.cpp
index dbf88da0d..54e856a2a 100644
--- a/Minecraft.World/Util/C4JThread.cpp
+++ b/Minecraft.World/Util/C4JThread.cpp
@@ -383,7 +383,7 @@ void C4JThread::SetPriority(int priority) {
 #endif  // __PS3__
 }
 
-DWORD C4JThread::WaitForCompletion(int timeoutMs) {
+std::uint32_t C4JThread::WaitForCompletion(int timeoutMs) {
 #ifdef __PS3__
     if (timeoutMs == INFINITE) timeoutMs = SYS_NO_TIMEOUT;
     return m_completionFlag->WaitForSignal(timeoutMs);
@@ -543,7 +543,7 @@ void C4JThread::Event::Clear() {
 #endif  //__PS3__
 }
 
-DWORD C4JThread::Event::WaitForSignal(int timeoutMs) {
+std::uint32_t C4JThread::Event::WaitForSignal(int timeoutMs) {
 #ifdef __PS3__
     if (timeoutMs == INFINITE) timeoutMs = SYS_NO_TIMEOUT;
     int timoutMicrosecs = timeoutMs * 1000;
@@ -685,8 +685,8 @@ void C4JThread::EventArray::ClearAll() {
     for (int i = 0; i < m_size; i++) Clear(i);
 }
 
-DWORD C4JThread::EventArray::WaitForSingle(int index, int timeoutMs) {
-    DWORD retVal;
+std::uint32_t C4JThread::EventArray::WaitForSingle(int index, int timeoutMs) {
+    std::uint32_t retVal;
 #ifdef __PS3__
     int timeoutMicrosecs;
     if (timeoutMs == INFINITE)
@@ -777,8 +777,8 @@ DWORD C4JThread::EventArray::WaitForSingle(int index, int timeoutMs) {
     return retVal;
 }
 
-DWORD C4JThread::EventArray::WaitForAll(int timeoutMs) {
-    DWORD retVal;
+std::uint32_t C4JThread::EventArray::WaitForAll(int timeoutMs) {
+    std::uint32_t retVal;
 #ifdef __PS3__
     if (timeoutMs == INFINITE) timeoutMs = SYS_NO_TIMEOUT;
     int timoutMicrosecs = timeoutMs * 1000;
@@ -871,7 +871,7 @@ DWORD C4JThread::EventArray::WaitForAll(int timeoutMs) {
     return retVal;
 }
 
-DWORD C4JThread::EventArray::WaitForAny(int timeoutMs) {
+std::uint32_t C4JThread::EventArray::WaitForAny(int timeoutMs) {
 #ifdef __PS3__
     if (timeoutMs == INFINITE) timeoutMs = SYS_NO_TIMEOUT;
     int timoutMicrosecs = timeoutMs * 1000;
@@ -1015,7 +1015,7 @@ void C4JThread::EventQueue::threadPoll() {
     if (m_threadInitFunc) m_threadInitFunc();
 
     while (ShutdownManager::ShouldRun(ShutdownManager::eEventQueueThreads)) {
-        DWORD err = m_startEvent->WaitForAny(INFINITE);
+        std::uint32_t err = m_startEvent->WaitForAny(INFINITE);
         if (err == WAIT_OBJECT_0) {
             bool bListEmpty = true;
             do {
@@ -1060,4 +1060,4 @@ void C4JThread::PopAffinity() {
     assert(err == SCE_OK);
 }
 
-#endif  // __ORBIS__
\ No newline at end of file
+#endif  // __ORBIS__
diff --git a/Minecraft.World/Util/C4JThread.h b/Minecraft.World/Util/C4JThread.h
index cf0d6e43e..725fe5db3 100644
--- a/Minecraft.World/Util/C4JThread.h
+++ b/Minecraft.World/Util/C4JThread.h
@@ -64,7 +64,7 @@ public:
         ~Event();
         void Set();
         void Clear();
-        DWORD WaitForSignal(int timeoutMs);
+        std::uint32_t WaitForSignal(int timeoutMs);
 
     private:
         EMode m_mode;
@@ -89,9 +89,9 @@ public:
         void Clear(int index);
         void SetAll();
         void ClearAll();
-        DWORD WaitForAll(int timeoutMs);
-        DWORD WaitForAny(int timeoutMs);
-        DWORD WaitForSingle(int index, int timeoutMs);
+        std::uint32_t WaitForAll(int timeoutMs);
+        std::uint32_t WaitForAny(int timeoutMs);
+        std::uint32_t WaitForSingle(int index, int timeoutMs);
 #ifdef __PS3__
         void Cancel();
 #endif
@@ -153,7 +153,7 @@ public:
     bool hasStarted() { return m_hasStarted; }
     void SetProcessor(int proc);
     void SetPriority(int priority);
-    DWORD WaitForCompletion(int timeoutMs);
+    std::uint32_t WaitForCompletion(int timeoutMs);
     int GetExitCode();
     char* getName() { return m_threadName; }
     static void Sleep(int millisecs);