dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-06-05 07:45:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

more fixup

Browse Source
This commit is contained in:
georgemoralis 2026-04-07 12:26:08 +03:00
parent f97afb03fc
commit 71dadac5d0
4 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/libraries/np/np_profile_dialog.cpp
View File

@ -12,19 +12,24 @@ namespace Libraries::Np::NpProfileDialog {
static auto g_status = Libraries::CommonDialog::Status::NONE; static auto g_status = Libraries::CommonDialog::Status::NONE;
Libraries::CommonDialog::Error PS4_SYSV_ABI sceNpProfileDialogOpen() { Libraries::CommonDialog::Error PS4_SYSV_ABI sceNpProfileDialogOpen(void* param) {
if (g_status != Libraries::CommonDialog::Status::INITIALIZED && if (g_status != Libraries::CommonDialog::Status::INITIALIZED &&
g_status != Libraries::CommonDialog::Status::FINISHED) { g_status != Libraries::CommonDialog::Status::FINISHED) {
LOG_INFO(Lib_MsgDlg, "called without initialize"); LOG_INFO(Lib_NpProfileDialog, "called without initialize");
return Libraries::CommonDialog::Error::INVALID_STATE; return Libraries::CommonDialog::Error::INVALID_STATE;
} }
LOG_ERROR(Lib_NpProfileDialog, "(STUBBED) called"); LOG_ERROR(Lib_NpProfileDialog, "(STUBBED) called"); // TODO open ui dialog
g_status = Libraries::CommonDialog::Status::RUNNING;
return Libraries::CommonDialog::Error::OK; return Libraries::CommonDialog::Error::OK;
} }
s32 PS4_SYSV_ABI sceNpProfileDialogClose() { Libraries::CommonDialog::Error PS4_SYSV_ABI sceNpProfileDialogClose() {
LOG_ERROR(Lib_NpProfileDialog, "(STUBBED) called"); LOG_DEBUG(Lib_NpProfileDialog, "called");
return ORBIS_OK; if (g_status != Libraries::CommonDialog::Status::RUNNING) {
return Libraries::CommonDialog::Error::NOT_RUNNING;
}
LOG_INFO(Lib_NpProfileDialog, "TODO: close npprofile ui dialog"); // TODO close Ui dialog
return Libraries::CommonDialog::Error::OK;
} }
s32 PS4_SYSV_ABI sceNpProfileDialogGetResult() { s32 PS4_SYSV_ABI sceNpProfileDialogGetResult() {
@ -33,7 +38,7 @@ s32 PS4_SYSV_ABI sceNpProfileDialogGetResult() {
} }
Libraries::CommonDialog::Status PS4_SYSV_ABI sceNpProfileDialogGetStatus() { Libraries::CommonDialog::Status PS4_SYSV_ABI sceNpProfileDialogGetStatus() {
LOG_TRACE(Lib_MsgDlg, "called status={}", magic_enum::enum_name(g_status)); LOG_TRACE(Lib_NpProfileDialog, "called status={}", magic_enum::enum_name(g_status));
return g_status; return g_status;
} }
@ -58,9 +63,9 @@ s32 PS4_SYSV_ABI sceNpProfileDialogOpenA() {
return ORBIS_OK; return ORBIS_OK;
} }
Libraries::CommonDialog::Error sceNpProfileDialogTerminate() { Libraries::CommonDialog::Error PS4_SYSV_ABI sceNpProfileDialogTerminate() {
if (g_status == Libraries::CommonDialog::Status::RUNNING) { if (g_status == Libraries::CommonDialog::Status::RUNNING) {
LOG_ERROR(Lib_NpProfileDialog, "CloseProfile Dialog unimplemented"); sceNpProfileDialogClose();
} }
if (g_status == Libraries::CommonDialog::Status::NONE) { if (g_status == Libraries::CommonDialog::Status::NONE) {
return Libraries::CommonDialog::Error::NOT_INITIALIZED; return Libraries::CommonDialog::Error::NOT_INITIALIZED;
@ -71,7 +76,11 @@ Libraries::CommonDialog::Error sceNpProfileDialogTerminate() {
} }
Libraries::CommonDialog::Status PS4_SYSV_ABI sceNpProfileDialogUpdateStatus() { Libraries::CommonDialog::Status PS4_SYSV_ABI sceNpProfileDialogUpdateStatus() {
LOG_TRACE(Lib_MsgDlg, "called status={}", magic_enum::enum_name(g_status)); if (g_status == Libraries::CommonDialog::Status::RUNNING) {
g_status = Libraries::CommonDialog::Status::FINISHED; // TODO removed it when implementing
// real dialog
}
LOG_TRACE(Lib_NpProfileDialog, "called status={}", magic_enum::enum_name(g_status));
return g_status; return g_status;
} }

4
src/core/libraries/np/np_profile_dialog.h
View File

@ -12,8 +12,8 @@ class SymbolsResolver;
namespace Libraries::Np::NpProfileDialog { namespace Libraries::Np::NpProfileDialog {
Libraries::CommonDialog::Error PS4_SYSV_ABI sceNpProfileDialogOpen(); Libraries::CommonDialog::Error PS4_SYSV_ABI sceNpProfileDialogOpen(void* param);
s32 PS4_SYSV_ABI sceNpProfileDialogClose(); Libraries::CommonDialog::Error PS4_SYSV_ABI sceNpProfileDialogClose();
s32 PS4_SYSV_ABI sceNpProfileDialogGetResult(); s32 PS4_SYSV_ABI sceNpProfileDialogGetResult();
Libraries::CommonDialog::Status PS4_SYSV_ABI sceNpProfileDialogGetStatus(); Libraries::CommonDialog::Status PS4_SYSV_ABI sceNpProfileDialogGetStatus();
Libraries::CommonDialog::Error PS4_SYSV_ABI sceNpProfileDialogInitialize(); Libraries::CommonDialog::Error PS4_SYSV_ABI sceNpProfileDialogInitialize();

18
src/core/libraries/web_browser_dialog/webbrowserdialog.cpp
View File

@ -11,9 +11,13 @@ namespace Libraries::WebBrowserDialog {
static auto g_status = Libraries::CommonDialog::Status::NONE; static auto g_status = Libraries::CommonDialog::Status::NONE;
s32 PS4_SYSV_ABI sceWebBrowserDialogClose() { Libraries::CommonDialog::Error PS4_SYSV_ABI sceWebBrowserDialogClose() {
LOG_ERROR(Lib_WebBrowserDialog, "(STUBBED) called"); LOG_ERROR(Lib_WebBrowserDialog, "(STUBBED) called");
return ORBIS_OK; if (g_status != Libraries::CommonDialog::Status::RUNNING) {
return Libraries::CommonDialog::Error::NOT_RUNNING;
}
LOG_INFO(Lib_NpProfileDialog, "TODO: close npprofile ui dialog"); // TODO close Ui dialog
return Libraries::CommonDialog::Error::OK;
} }
s32 PS4_SYSV_ABI sceWebBrowserDialogGetEvent() { s32 PS4_SYSV_ABI sceWebBrowserDialogGetEvent() {
@ -58,7 +62,8 @@ Libraries::CommonDialog::Error PS4_SYSV_ABI sceWebBrowserDialogOpen() {
LOG_INFO(Lib_MsgDlg, "called without initialize"); LOG_INFO(Lib_MsgDlg, "called without initialize");
return Libraries::CommonDialog::Error::INVALID_STATE; return Libraries::CommonDialog::Error::INVALID_STATE;
} }
LOG_ERROR(Lib_WebBrowserDialog, "(STUBBED) called"); LOG_ERROR(Lib_WebBrowserDialog, "(STUBBED) called"); // TODO open ui dialog
g_status = Libraries::CommonDialog::Status::RUNNING;
return Libraries::CommonDialog::Error::OK; return Libraries::CommonDialog::Error::OK;
} }
@ -84,8 +89,7 @@ s32 PS4_SYSV_ABI sceWebBrowserDialogSetZoom() {
Libraries::CommonDialog::Error PS4_SYSV_ABI sceWebBrowserDialogTerminate() { Libraries::CommonDialog::Error PS4_SYSV_ABI sceWebBrowserDialogTerminate() {
if (g_status == Libraries::CommonDialog::Status::RUNNING) { if (g_status == Libraries::CommonDialog::Status::RUNNING) {
LOG_ERROR(Lib_WebBrowserDialog, sceWebBrowserDialogClose();
"CloseWebBrowser Dialog unimplemented"); // sceWebBrowserDialogClose();
} }
if (g_status == Libraries::CommonDialog::Status::NONE) { if (g_status == Libraries::CommonDialog::Status::NONE) {
return Libraries::CommonDialog::Error::NOT_INITIALIZED; return Libraries::CommonDialog::Error::NOT_INITIALIZED;
@ -97,6 +101,10 @@ Libraries::CommonDialog::Error PS4_SYSV_ABI sceWebBrowserDialogTerminate() {
Libraries::CommonDialog::Status PS4_SYSV_ABI sceWebBrowserDialogUpdateStatus() { Libraries::CommonDialog::Status PS4_SYSV_ABI sceWebBrowserDialogUpdateStatus() {
LOG_TRACE(Lib_MsgDlg, "called status={}", magic_enum::enum_name(g_status)); LOG_TRACE(Lib_MsgDlg, "called status={}", magic_enum::enum_name(g_status));
if (g_status == Libraries::CommonDialog::Status::RUNNING) {
g_status = Libraries::CommonDialog::Status::FINISHED; // TODO removed it when implementing
// real dialog
}
return g_status; return g_status;
} }

2
src/core/libraries/web_browser_dialog/webbrowserdialog.h
View File

@ -12,7 +12,7 @@ class SymbolsResolver;
namespace Libraries::WebBrowserDialog { namespace Libraries::WebBrowserDialog {
s32 PS4_SYSV_ABI sceWebBrowserDialogClose(); Libraries::CommonDialog::Error PS4_SYSV_ABI sceWebBrowserDialogClose();
s32 PS4_SYSV_ABI sceWebBrowserDialogGetEvent(); s32 PS4_SYSV_ABI sceWebBrowserDialogGetEvent();
s32 PS4_SYSV_ABI sceWebBrowserDialogGetResult(); s32 PS4_SYSV_ABI sceWebBrowserDialogGetResult();
Libraries::CommonDialog::Status PS4_SYSV_ABI sceWebBrowserDialogGetStatus(); Libraries::CommonDialog::Status PS4_SYSV_ABI sceWebBrowserDialogGetStatus();