From e90616b16c592f25d417b67106a8f485278999cf Mon Sep 17 00:00:00 2001
From: notaxeltv <notaxeltv@gmail.com>
Date: Wed, 14 Oct 2026 23:35:41 +0200
Subject: [PATCH] feat(libc): ignore name in
 _Cnd_init_with_default_name_override

Absent PPSA34015 import; forward to _Cnd_init like Ampr's named init.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 core/libs/prx/libc/CMakeLists.txt             | 12 ++++++
 core/libs/prx/libc/src/Threads.cpp            |  4 ++
 .../tests/GuestLibcCndInitDefaultName.cpp     | 42 +++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 core/libs/tests/GuestLibcCndInitDefaultName.cpp

diff --git a/core/libs/prx/libc/CMakeLists.txt b/core/libs/prx/libc/CMakeLists.txt
index 02162709a58..7817307f16f 100644
--- a/core/libs/prx/libc/CMakeLists.txt
+++ b/core/libs/prx/libc/CMakeLists.txt
@@ -692,6 +692,18 @@ if(BUILD_TESTING)
     endif()
 endif()
 
+add_test_executable(guest_libc_cnd_init_default_name_tests EXCLUDE_FROM_ALL ${LIBS_INCLUDE_DIR}/tests/GuestLibcCndInitDefaultName.cpp)
+target_include_directories(guest_libc_cnd_init_default_name_tests PRIVATE ${LIBS_INCLUDE_DIR})
+target_link_libraries(guest_libc_cnd_init_default_name_tests PRIVATE libc)
+configure_windows_unwind(guest_libc_cnd_init_default_name_tests)
+if(BUILD_TESTING)
+    set_target_properties(guest_libc_cnd_init_default_name_tests PROPERTIES EXCLUDE_FROM_ALL FALSE)
+    add_test(NAME guest_libc_cnd_init_default_name COMMAND guest_libc_cnd_init_default_name_tests)
+    if(WIN32)
+        set_tests_properties(guest_libc_cnd_init_default_name PROPERTIES ENVIRONMENT_MODIFICATION "PATH=path_list_prepend:$<TARGET_FILE_DIR:libc>")
+    endif()
+endif()
+
 add_test_executable(guest_libc_cnd_timed_wait_tests EXCLUDE_FROM_ALL ${LIBS_INCLUDE_DIR}/tests/GuestLibcCndTimedWait.cpp)
 target_include_directories(guest_libc_cnd_timed_wait_tests PRIVATE ${LIBS_INCLUDE_DIR})
 target_link_libraries(guest_libc_cnd_timed_wait_tests PRIVATE libc)
diff --git a/core/libs/prx/libc/src/Threads.cpp b/core/libs/prx/libc/src/Threads.cpp
index b1d85f9fafe..28abb1454b7 100644
--- a/core/libs/prx/libc/src/Threads.cpp
+++ b/core/libs/prx/libc/src/Threads.cpp
@@ -187,6 +187,10 @@ int APS5_VABI _Cnd_init_nid_postfix(void** handle) {
     return threadSuccess;
 }
 
+int APS5_VABI _Cnd_init_with_default_name_override_nid_postfix(void** handle, const char*) {
+    return _Cnd_init_nid_postfix(handle);
+}
+
 void APS5_VABI _Cnd_destroy_nid_postfix(void** handle) {
     if (!handle)
         throw std::invalid_argument("_Cnd_destroy: null condition handle pointer");
diff --git a/core/libs/tests/GuestLibcCndInitDefaultName.cpp b/core/libs/tests/GuestLibcCndInitDefaultName.cpp
new file mode 100644
index 00000000000..6d5d0463988
--- /dev/null
+++ b/core/libs/tests/GuestLibcCndInitDefaultName.cpp
@@ -0,0 +1,42 @@
+#include "prx/libc/include/general/VabiMacros.hpp"
+#include <cstdlib>
+#include <stdexcept>
+
+extern "C" {
+int APS5_VABI _Cnd_init_with_default_name_override_nid_postfix(void** handle, const char* name);
+void APS5_VABI _Cnd_destroy_nid_postfix(void** handle);
+int APS5_VABI _Cnd_signal_nid_postfix(void** handle);
+}
+
+static void Require(bool value) { if (!value) std::abort(); }
+
+template<typename TException, typename TCall>
+static void RequireThrows(TCall call) {
+    try {
+        call();
+    } catch (const TException&) {
+        return;
+    }
+    std::abort();
+}
+
+constexpr int success = 0;
+
+int main() {
+    void* condition = nullptr;
+    Require(_Cnd_init_with_default_name_override_nid_postfix(&condition, "GameCond") == success);
+    Require(condition != nullptr);
+    Require(_Cnd_signal_nid_postfix(&condition) == success);
+    _Cnd_destroy_nid_postfix(&condition);
+    Require(condition == nullptr);
+
+    void* unnamed = nullptr;
+    Require(_Cnd_init_with_default_name_override_nid_postfix(&unnamed, nullptr) == success);
+    Require(unnamed != nullptr);
+    _Cnd_destroy_nid_postfix(&unnamed);
+
+    RequireThrows<std::invalid_argument>([] {
+        _Cnd_init_with_default_name_override_nid_postfix(nullptr, "NullHandle");
+    });
+    return 0;
+}