From c9685e47e49ffb68cbcd0ead33356ba95b59d1b6 Mon Sep 17 00:00:00 2001 From: TideOPL Date: Thu, 8 Oct 2026 19:22:23 +0100 Subject: [PATCH] fix(savedata): report a CREATE2 mount of an existing save as not created sceSaveDataMount3 with SCE_SAVE_DATA_MOUNT_MODE_CREATE2 opens a save that already exists, so its mount status is 0 rather than CREATED, as shadPS4's savedata.cpp reports. A CREATE mount still reports CREATED. --- .../prx/libSceSaveData.native/CMakeLists.txt | 9 +++ .../libs/prx/libSceSaveData.native/Export.cpp | 2 +- core/libs/tests/GuestSaveDataMountStatus.cpp | 62 +++++++++++++++++++ 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 core/libs/tests/GuestSaveDataMountStatus.cpp diff --git a/core/libs/prx/libSceSaveData.native/CMakeLists.txt b/core/libs/prx/libSceSaveData.native/CMakeLists.txt index 4279b6c0b..496c0b9bc 100644 --- a/core/libs/prx/libSceSaveData.native/CMakeLists.txt +++ b/core/libs/prx/libSceSaveData.native/CMakeLists.txt @@ -22,6 +22,15 @@ if(BUILD_TESTING) "PATH=path_list_prepend:$") endif() + add_test_executable(guest_savedata_mount_status_tests ${LIBS_INCLUDE_DIR}/tests/GuestSaveDataMountStatus.cpp) + target_include_directories(guest_savedata_mount_status_tests PRIVATE ${LIBS_INCLUDE_DIR}) + target_link_libraries(guest_savedata_mount_status_tests PRIVATE libSceSaveData.native libc) + add_test(NAME guest_savedata_mount_status COMMAND guest_savedata_mount_status_tests) + if(WIN32) + set_tests_properties(guest_savedata_mount_status PROPERTIES ENVIRONMENT_MODIFICATION + "PATH=path_list_prepend:$") + endif() + add_test_executable(guest_savedata_ps4_tests ${LIBS_INCLUDE_DIR}/tests/GuestSaveDataPs4.cpp) target_include_directories(guest_savedata_ps4_tests PRIVATE ${LIBS_INCLUDE_DIR}) target_link_libraries(guest_savedata_ps4_tests PRIVATE libSceSaveData.native libc) diff --git a/core/libs/prx/libSceSaveData.native/Export.cpp b/core/libs/prx/libSceSaveData.native/Export.cpp index cfa6c5881..f6270b5dd 100644 --- a/core/libs/prx/libSceSaveData.native/Export.cpp +++ b/core/libs/prx/libSceSaveData.native/Export.cpp @@ -482,7 +482,7 @@ static int mount3(const SaveDataMount3* mount, SaveDataMountResult* mount_result g_slots[slot].real_path = real_path; std::memcpy(mount_result->mount_point.data, mountPoint.c_str(), mountPoint.size() + 1); mount_result->required_blocks = 0; - mount_result->mount_status = (create || create2) ? 1u : 0u; + mount_result->mount_status = (create || (create2 && !exists)) ? 1u : 0u; return SAVE_DATA_OK; } diff --git a/core/libs/tests/GuestSaveDataMountStatus.cpp b/core/libs/tests/GuestSaveDataMountStatus.cpp new file mode 100644 index 000000000..c51a1cb5c --- /dev/null +++ b/core/libs/tests/GuestSaveDataMountStatus.cpp @@ -0,0 +1,62 @@ +#include "prx/libc/include/general/VabiMacros.hpp" +#include "SceTypes.hpp" +#include +#include +#include +#include +#include +#include + +extern "C" { +int APS5_VABI sceSaveDataInitialize3(const void*); +int APS5_VABI sceSaveDataMount3(const SaveDataMount3*, SaveDataMountResult*); +int APS5_VABI sceSaveDataUmount2(std::uint32_t, const SaveDataMountPoint*); +} + +namespace { + +constexpr std::uint32_t MountReadWrite = 2; +constexpr std::uint32_t MountCreate = 4; +constexpr std::uint32_t MountCreate2 = 32; + +int failures = 0; + +void Check(bool condition, const std::string& what) { + if (condition) return; + std::fprintf(stderr, "savedata mount status check failed: %s\n", what.c_str()); + ++failures; +} + +void MountAndCheck(const char* name, std::uint32_t mode, std::uint32_t expectedStatus, const std::string& what) { + SceSaveDataDirName dirName{}; + std::memcpy(dirName.data, name, std::strlen(name) + 1); + SaveDataMount3 mount{}; + mount.dir_name = &dirName; + mount.mount_mode = mode; + SaveDataMountResult result{}; + const int code = sceSaveDataMount3(&mount, &result); + Check(code == 0, what + ": mounts"); + if (code != 0) return; + Check(result.mount_status == expectedStatus, what + ": status is " + std::to_string(result.mount_status) + ", expected " + std::to_string(expectedStatus)); + Check(sceSaveDataUmount2(0, &result.mount_point) == 0, what + ": unmounts"); +} + +} + +int main() { + const auto root = std::filesystem::temp_directory_path() / ("anyps5-savedata-mount-status-" + std::to_string(std::random_device{}())); + std::filesystem::create_directories(root); + const auto previous = std::filesystem::current_path(); + std::filesystem::current_path(root); + Check(sceSaveDataInitialize3(nullptr) == 0, "SaveData initializes"); + MountAndCheck("fresh", MountReadWrite | MountCreate2, 1u, "CREATE2 of a missing save"); + MountAndCheck("fresh", MountReadWrite | MountCreate2, 0u, "CREATE2 of an existing save"); + MountAndCheck("made", MountReadWrite | MountCreate, 1u, "CREATE of a missing save"); + MountAndCheck("made", MountReadWrite, 0u, "open of an existing save"); + std::filesystem::current_path(previous); + std::error_code error; + std::filesystem::remove_all(root, error); + if (failures != 0) return 1; + std::printf("savedata mount status tests passed\n"); + return 0; +}