Merge branch 'main' into http-part2

CMakeLists.txt

@@ -578,6 +578,8 @@ set(MISC_LIBS  src/core/libraries/screenshot/screenshot.cpp
                src/core/libraries/screenshot/screenshot.h
                src/core/libraries/move/move.cpp
                src/core/libraries/move/move.h
+               src/core/libraries/ulobjmgr/ulobjmgr.cpp
+               src/core/libraries/ulobjmgr/ulobjmgr.h
 )
 
 set(DEV_TOOLS src/core/devtools/layer.cpp

src/core/libraries/kernel/file_system.cpp

@@ -190,16 +190,16 @@ s32 PS4_SYSV_ABI sceKernelOpen(const char* path, s32 flags, /* SceKernelMode*/ u
 }
 
 s32 PS4_SYSV_ABI close(s32 fd) {
-    if (fd < 3) {
-        // This is technically possible, but it's usually caused by some stubbed function instead.
-        LOG_WARNING(Kernel_Fs, "called on an std handle, fd = {}", fd);
-    }
     auto* h = Common::Singleton<Core::FileSys::HandleTable>::Instance();
     auto* file = h->GetFile(fd);
     if (file == nullptr) {
         *__Error() = POSIX_EBADF;
         return -1;
     }
+    if (fd < 3) {
+        // This is technically possible, but it's usually caused by some stubbed function instead.
+        LOG_WARNING(Kernel_Fs, "called on an std handle, fd = {}", fd);
+    }
     if (file->type == Core::FileSys::FileType::Regular) {
         file->f.Close();
     }

src/core/libraries/libs.cpp

@@ -50,6 +50,7 @@
 #include "core/libraries/system/sysmodule.h"
 #include "core/libraries/system/systemservice.h"
 #include "core/libraries/system/userservice.h"
+#include "core/libraries/ulobjmgr/ulobjmgr.h"
 #include "core/libraries/usbd/usbd.h"
 #include "core/libraries/videodec/videodec.h"
 #include "core/libraries/videodec/videodec2.h"
@@ -116,6 +117,7 @@ void InitHLELibs(Core::Loader::SymbolsResolver* sym) {
     Libraries::Zlib::RegisterlibSceZlib(sym);
     Libraries::Hmd::RegisterlibSceHmd(sym);
     Libraries::DiscMap::RegisterlibSceDiscMap(sym);
+    Libraries::Ulobjmgr::RegisterlibSceUlobjmgr(sym);
 }
 
 } // namespace Libraries

src/core/libraries/ulobjmgr/ulobjmgr.cpp

@@ -0,0 +1,45 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "common/logging/log.h"
+#include "core/libraries/error_codes.h"
+#include "core/libraries/kernel/posix_error.h"
+#include "core/libraries/libs.h"
+#include "core/libraries/ulobjmgr/ulobjmgr.h"
+
+namespace Libraries::Ulobjmgr {
+
+s32 PS4_SYSV_ABI Func_046DBA8411A2365C(u64 arg0, s32 arg1, u32* arg2) {
+    if (arg0 == 0 || arg1 == 0 || arg2 == nullptr) {
+        return POSIX_EINVAL;
+    }
+    *arg2 = 0;
+    return ORBIS_OK;
+}
+
+s32 PS4_SYSV_ABI Func_1D9F50D9CFB8054E() {
+    return ORBIS_OK;
+}
+
+s32 PS4_SYSV_ABI Func_4A67FE7D435B94F7(u32 arg0) {
+    if (arg0 >= 0x4000) {
+        return POSIX_EINVAL;
+    }
+    return ORBIS_OK;
+}
+
+s32 PS4_SYSV_ABI Func_4B07893BBB77A649(u64 arg0) {
+    if (arg0 == 0) {
+        return POSIX_EINVAL;
+    }
+    return ORBIS_OK;
+}
+
+void RegisterlibSceUlobjmgr(Core::Loader::SymbolsResolver* sym) {
+    LIB_FUNCTION("BG26hBGiNlw", "ulobjmgr", 1, "ulobjmgr", 1, 1, Func_046DBA8411A2365C);
+    LIB_FUNCTION("HZ9Q2c+4BU4", "ulobjmgr", 1, "ulobjmgr", 1, 1, Func_1D9F50D9CFB8054E);
+    LIB_FUNCTION("Smf+fUNblPc", "ulobjmgr", 1, "ulobjmgr", 1, 1, Func_4A67FE7D435B94F7);
+    LIB_FUNCTION("SweJO7t3pkk", "ulobjmgr", 1, "ulobjmgr", 1, 1, Func_4B07893BBB77A649);
+};
+
+} // namespace Libraries::Ulobjmgr

src/core/libraries/ulobjmgr/ulobjmgr.h

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "common/types.h"
+
+namespace Core::Loader {
+class SymbolsResolver;
+}
+
+namespace Libraries::Ulobjmgr {
+void RegisterlibSceUlobjmgr(Core::Loader::SymbolsResolver* sym);
+} // namespace Libraries::Ulobjmgr