From c28f3b4f9dcda13d1d04168138459fff68eb042c Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Mon, 8 Jul 2024 23:00:28 +0300 Subject: [PATCH] dummy error , ime dialogs stubbed --- CMakeLists.txt | 7 ++ src/common/logging/filter.cpp | 2 + src/common/logging/types.h | 2 + src/core/libraries/dialogs/error_dialog.cpp | 71 ++++++++++++ src/core/libraries/dialogs/error_dialog.h | 23 ++++ src/core/libraries/dialogs/ime_dialog.cpp | 117 ++++++++++++++++++++ src/core/libraries/dialogs/ime_dialog.h | 31 ++++++ src/core/libraries/libs.cpp | 4 + 8 files changed, 257 insertions(+) create mode 100644 src/core/libraries/dialogs/error_dialog.cpp create mode 100644 src/core/libraries/dialogs/error_dialog.h create mode 100644 src/core/libraries/dialogs/ime_dialog.cpp create mode 100644 src/core/libraries/dialogs/ime_dialog.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 89b1f03ee..42943c4e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,6 +188,12 @@ set(LIBC_SOURCES src/core/libraries/libc/libc.cpp src/core/libraries/libc_internal/libc_internal.h ) +set(DIALOGS_LIB src/core/libraries/dialogs/error_dialog.cpp + src/core/libraries/dialogs/error_dialog.h + src/core/libraries/dialogs/ime_dialog.cpp + src/core/libraries/dialogs/ime_dialog.h +) + set(PAD_LIB src/core/libraries/pad/pad.cpp src/core/libraries/pad/pad.h ) @@ -309,6 +315,7 @@ set(CORE src/core/aerolib/stubs.cpp ${PLAYGO_LIB} ${USBD_LIB} ${MISC_LIBS} + ${DIALOGS_LIB} src/core/linker.cpp src/core/linker.h src/core/memory.cpp diff --git a/src/common/logging/filter.cpp b/src/common/logging/filter.cpp index 35159bf11..05c310a01 100644 --- a/src/common/logging/filter.cpp +++ b/src/common/logging/filter.cpp @@ -108,6 +108,8 @@ bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) { SUB(Lib, PlayGo) \ SUB(Lib, Usbd) \ SUB(Lib, Ajm) \ + SUB(Lib, ErrorDialog) \ + SUB(Lib, ImeDialog) \ CLS(Frontend) \ CLS(Render) \ SUB(Render, Vulkan) \ diff --git a/src/common/logging/types.h b/src/common/logging/types.h index d415335ba..f48bb2769 100644 --- a/src/common/logging/types.h +++ b/src/common/logging/types.h @@ -75,6 +75,8 @@ enum class Class : u8 { Lib_PlayGo, ///< The LibScePlayGo implementation. Lib_Usbd, ///< The LibSceUsbd implementation. Lib_Ajm, ///< The LibSceAjm implementation. + Lib_ErrorDialog, ///< The LibSceErrorDialog implementation. + Lib_ImeDialog, ///< The LibSceImeDialog implementation. Frontend, ///< Emulator UI Render, ///< Video Core Render_Vulkan, ///< Vulkan backend diff --git a/src/core/libraries/dialogs/error_dialog.cpp b/src/core/libraries/dialogs/error_dialog.cpp new file mode 100644 index 000000000..92463c53b --- /dev/null +++ b/src/core/libraries/dialogs/error_dialog.cpp @@ -0,0 +1,71 @@ +// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +// Generated By moduleGenerator +#include "common/logging/log.h" +#include "core/libraries/error_codes.h" +#include "core/libraries/libs.h" +#include "error_dialog.h" + +namespace Libraries::ErrorDialog { + +int PS4_SYSV_ABI sceErrorDialogClose() { + LOG_ERROR(Lib_ErrorDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceErrorDialogGetStatus() { + LOG_ERROR(Lib_ErrorDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceErrorDialogInitialize() { + LOG_ERROR(Lib_ErrorDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceErrorDialogOpen() { + LOG_ERROR(Lib_ErrorDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceErrorDialogOpenDetail() { + LOG_ERROR(Lib_ErrorDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceErrorDialogOpenWithReport() { + LOG_ERROR(Lib_ErrorDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceErrorDialogTerminate() { + LOG_ERROR(Lib_ErrorDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceErrorDialogUpdateStatus() { + LOG_ERROR(Lib_ErrorDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +void RegisterlibSceErrorDialog(Core::Loader::SymbolsResolver* sym) { + LIB_FUNCTION("ekXHb1kDBl0", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1, + sceErrorDialogClose); + LIB_FUNCTION("t2FvHRXzgqk", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1, + sceErrorDialogGetStatus); + LIB_FUNCTION("I88KChlynSs", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1, + sceErrorDialogInitialize); + LIB_FUNCTION("M2ZF-ClLhgY", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1, + sceErrorDialogOpen); + LIB_FUNCTION("jrpnVQfJYgQ", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1, + sceErrorDialogOpenDetail); + LIB_FUNCTION("wktCiyWoDTI", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1, + sceErrorDialogOpenWithReport); + LIB_FUNCTION("9XAxK2PMwk8", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1, + sceErrorDialogTerminate); + LIB_FUNCTION("WWiGuh9XfgQ", "libSceErrorDialog", 1, "libSceErrorDialog", 1, 1, + sceErrorDialogUpdateStatus); +}; + +} // namespace Libraries::ErrorDialog \ No newline at end of file diff --git a/src/core/libraries/dialogs/error_dialog.h b/src/core/libraries/dialogs/error_dialog.h new file mode 100644 index 000000000..6e34b8e36 --- /dev/null +++ b/src/core/libraries/dialogs/error_dialog.h @@ -0,0 +1,23 @@ +// 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::ErrorDialog { + +int PS4_SYSV_ABI sceErrorDialogClose(); +int PS4_SYSV_ABI sceErrorDialogGetStatus(); +int PS4_SYSV_ABI sceErrorDialogInitialize(); +int PS4_SYSV_ABI sceErrorDialogOpen(); +int PS4_SYSV_ABI sceErrorDialogOpenDetail(); +int PS4_SYSV_ABI sceErrorDialogOpenWithReport(); +int PS4_SYSV_ABI sceErrorDialogTerminate(); +int PS4_SYSV_ABI sceErrorDialogUpdateStatus(); + +void RegisterlibSceErrorDialog(Core::Loader::SymbolsResolver* sym); +} // namespace Libraries::ErrorDialog \ No newline at end of file diff --git a/src/core/libraries/dialogs/ime_dialog.cpp b/src/core/libraries/dialogs/ime_dialog.cpp new file mode 100644 index 000000000..add7e8ebb --- /dev/null +++ b/src/core/libraries/dialogs/ime_dialog.cpp @@ -0,0 +1,117 @@ +// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +// Generated By moduleGenerator +#include "common/logging/log.h" +#include "core/libraries/error_codes.h" +#include "core/libraries/libs.h" +#include "ime_dialog.h" + +namespace Libraries::ImeDialog { + +int PS4_SYSV_ABI sceImeDialogAbort() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogForceClose() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogForTestFunction() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogGetCurrentStarState() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogGetPanelPositionAndForm() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogGetPanelSize() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogGetPanelSizeExtended() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogGetResult() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogGetStatus() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogInit() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogInitInternal() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogInitInternal2() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogInitInternal3() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogSetPanelPosition() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +int PS4_SYSV_ABI sceImeDialogTerm() { + LOG_ERROR(Lib_ImeDialog, "(STUBBED) called"); + return ORBIS_OK; +} + +void RegisterlibSceImeDialog(Core::Loader::SymbolsResolver* sym) { + LIB_FUNCTION("oBmw4xrmfKs", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, sceImeDialogAbort); + LIB_FUNCTION("bX4H+sxPI-o", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogForceClose); + LIB_FUNCTION("UFcyYDf+e88", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogForTestFunction); + LIB_FUNCTION("fy6ntM25pEc", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogGetCurrentStarState); + LIB_FUNCTION("8jqzzPioYl8", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogGetPanelPositionAndForm); + LIB_FUNCTION("wqsJvRXwl58", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogGetPanelSize); + LIB_FUNCTION("CRD+jSErEJQ", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogGetPanelSizeExtended); + LIB_FUNCTION("x01jxu+vxlc", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogGetResult); + LIB_FUNCTION("IADmD4tScBY", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogGetStatus); + LIB_FUNCTION("NUeBrN7hzf0", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, sceImeDialogInit); + LIB_FUNCTION("KR6QDasuKco", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogInitInternal); + LIB_FUNCTION("oe92cnJQ9HE", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogInitInternal2); + LIB_FUNCTION("IoKIpNf9EK0", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogInitInternal3); + LIB_FUNCTION("-2WqB87KKGg", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, + sceImeDialogSetPanelPosition); + LIB_FUNCTION("gyTyVn+bXMw", "libSceImeDialog", 1, "libSceImeDialog", 1, 1, sceImeDialogTerm); +}; + +} // namespace Libraries::ImeDialog \ No newline at end of file diff --git a/src/core/libraries/dialogs/ime_dialog.h b/src/core/libraries/dialogs/ime_dialog.h new file mode 100644 index 000000000..b9cf46dcb --- /dev/null +++ b/src/core/libraries/dialogs/ime_dialog.h @@ -0,0 +1,31 @@ +// 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::ImeDialog { + +int PS4_SYSV_ABI sceImeDialogAbort(); +int PS4_SYSV_ABI sceImeDialogForceClose(); +int PS4_SYSV_ABI sceImeDialogForTestFunction(); +int PS4_SYSV_ABI sceImeDialogGetCurrentStarState(); +int PS4_SYSV_ABI sceImeDialogGetPanelPositionAndForm(); +int PS4_SYSV_ABI sceImeDialogGetPanelSize(); +int PS4_SYSV_ABI sceImeDialogGetPanelSizeExtended(); +int PS4_SYSV_ABI sceImeDialogGetResult(); +int PS4_SYSV_ABI sceImeDialogGetStatus(); +int PS4_SYSV_ABI sceImeDialogInit(); +int PS4_SYSV_ABI sceImeDialogInitInternal(); +int PS4_SYSV_ABI sceImeDialogInitInternal2(); +int PS4_SYSV_ABI sceImeDialogInitInternal3(); +int PS4_SYSV_ABI sceImeDialogSetPanelPosition(); +int PS4_SYSV_ABI sceImeDialogTerm(); + +void RegisterlibSceImeDialog(Core::Loader::SymbolsResolver* sym); +} // namespace Libraries::ImeDialog \ No newline at end of file diff --git a/src/core/libraries/libs.cpp b/src/core/libraries/libs.cpp index 00df4ddfd..82cb59b6e 100644 --- a/src/core/libraries/libs.cpp +++ b/src/core/libraries/libs.cpp @@ -33,6 +33,8 @@ #include "core/libraries/usbd/usbd.h" #include "core/libraries/videoout/video_out.h" #include "src/core/libraries/ajm/ajm.h" +#include "src/core/libraries/dialogs/error_dialog.h" +#include "src/core/libraries/dialogs/ime_dialog.h" #include "src/core/libraries/libpng/pngdec.h" namespace Libraries { @@ -71,6 +73,8 @@ void InitHLELibs(Core::Loader::SymbolsResolver* sym) { Libraries::Usbd::RegisterlibSceUsbd(sym); Libraries::Pad::RegisterlibScePad(sym); Libraries::Ajm::RegisterlibSceAjm(sym); + Libraries::ErrorDialog::RegisterlibSceErrorDialog(sym); + Libraries::ImeDialog::RegisterlibSceImeDialog(sym); } } // namespace Libraries