mirror of
https://github.com/RPCSX/rpcsx.git
synced 2026-04-05 14:37:08 +00:00
Abstract class for MsgDialog interface
This commit is contained in:
Nekotekina
parent
cfb41c4dab
commit
00205bfa58
8 changed files with 227 additions and 237 deletions
|
|
@ -5,52 +5,32 @@
|
|||
#include "Emu/SysCalls/Callback.h"
|
||||
#include "Emu/SysCalls/CB_FUNC.h"
|
||||
|
||||
#include "Utilities/Log.h"
|
||||
#include "Utilities/rMsgBox.h"
|
||||
#include "Emu/SysCalls/lv2/sys_time.h"
|
||||
#include "cellSysutil.h"
|
||||
#include "cellMsgDialog.h"
|
||||
|
||||
extern Module cellSysutil;
|
||||
|
||||
enum MsgDialogState
|
||||
std::unique_ptr<MsgDialogInstance> g_msg_dialog;
|
||||
|
||||
MsgDialogInstance::MsgDialogInstance()
|
||||
: state(msgDialogNone)
|
||||
{
|
||||
msgDialogNone,
|
||||
msgDialogOpen,
|
||||
msgDialogClose,
|
||||
msgDialogAbort,
|
||||
};
|
||||
|
||||
std::atomic<MsgDialogState> g_msg_dialog_state(msgDialogNone);
|
||||
u64 g_msg_dialog_status;
|
||||
u64 g_msg_dialog_wait_until;
|
||||
u32 g_msg_dialog_progress_bar_count;
|
||||
|
||||
MsgDialogCreateCb MsgDialogCreate = nullptr;
|
||||
MsgDialogDestroyCb MsgDialogDestroy = nullptr;
|
||||
MsgDialogProgressBarSetMsgCb MsgDialogProgressBarSetMsg = nullptr;
|
||||
MsgDialogProgressBarResetCb MsgDialogProgressBarReset = nullptr;
|
||||
MsgDialogProgressBarIncCb MsgDialogProgressBarInc = nullptr;
|
||||
|
||||
void SetMsgDialogCallbacks(MsgDialogCreateCb ccb, MsgDialogDestroyCb dcb, MsgDialogProgressBarSetMsgCb pbscb, MsgDialogProgressBarResetCb pbrcb, MsgDialogProgressBarIncCb pbicb)
|
||||
{
|
||||
MsgDialogCreate = ccb;
|
||||
MsgDialogDestroy = dcb;
|
||||
MsgDialogProgressBarSetMsg = pbscb;
|
||||
MsgDialogProgressBarReset = pbrcb;
|
||||
MsgDialogProgressBarInc = pbicb;
|
||||
}
|
||||
|
||||
void MsgDialogClose()
|
||||
MsgDialogInstance::~MsgDialogInstance()
|
||||
{
|
||||
g_msg_dialog_state = msgDialogClose;
|
||||
g_msg_dialog_wait_until = get_system_time();
|
||||
}
|
||||
|
||||
s32 cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgDialogCallback> callback, u32 userData, u32 extParam)
|
||||
void MsgDialogInstance::Close()
|
||||
{
|
||||
cellSysutil.Warning("cellMsgDialogOpen2(type=0x%x, msgString_addr=0x%x, callback_addr=0x%x, userData=0x%x, extParam=0x%x)",
|
||||
type, msgString.addr(), callback.addr(), userData, extParam);
|
||||
state = msgDialogClose;
|
||||
wait_until = get_system_time();
|
||||
}
|
||||
|
||||
s32 cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgDialogCallback> callback, vm::ptr<void> userData, vm::ptr<void> extParam)
|
||||
{
|
||||
cellSysutil.Warning("cellMsgDialogOpen2(type=0x%x, msgString=*0x%x, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", type, msgString, callback, userData, extParam);
|
||||
|
||||
if (!msgString || strlen(msgString.get_ptr()) >= 0x200 || type & -0x33f8)
|
||||
{
|
||||
|
|
@ -107,18 +87,24 @@ s32 cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgD
|
|||
}
|
||||
|
||||
MsgDialogState old = msgDialogNone;
|
||||
if (!g_msg_dialog_state.compare_exchange_strong(old, msgDialogOpen))
|
||||
if (!g_msg_dialog->state.compare_exchange_strong(old, msgDialogOpen))
|
||||
{
|
||||
return CELL_SYSUTIL_ERROR_BUSY;
|
||||
}
|
||||
|
||||
g_msg_dialog_wait_until = get_system_time() + 31536000000000ull; // some big value
|
||||
g_msg_dialog->wait_until = get_system_time() + 31536000000000ull; // some big value
|
||||
|
||||
switch (type & CELL_MSGDIALOG_TYPE_PROGRESSBAR)
|
||||
{
|
||||
case CELL_MSGDIALOG_TYPE_PROGRESSBAR_DOUBLE: g_msg_dialog_progress_bar_count = 2; break;
|
||||
case CELL_MSGDIALOG_TYPE_PROGRESSBAR_SINGLE: g_msg_dialog_progress_bar_count = 1; break;
|
||||
default: g_msg_dialog_progress_bar_count = 0; break;
|
||||
case CELL_MSGDIALOG_TYPE_PROGRESSBAR_DOUBLE: g_msg_dialog->progress_bar_count = 2; break;
|
||||
case CELL_MSGDIALOG_TYPE_PROGRESSBAR_SINGLE: g_msg_dialog->progress_bar_count = 1; break;
|
||||
default: g_msg_dialog->progress_bar_count = 0; break;
|
||||
}
|
||||
|
||||
switch (type & CELL_MSGDIALOG_TYPE_SE_MUTE) // TODO
|
||||
{
|
||||
case CELL_MSGDIALOG_TYPE_SE_MUTE_OFF: break;
|
||||
case CELL_MSGDIALOG_TYPE_SE_MUTE_ON: break;
|
||||
}
|
||||
|
||||
std::string msg = msgString.get_ptr();
|
||||
|
|
@ -127,24 +113,18 @@ s32 cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgD
|
|||
{
|
||||
switch (type & CELL_MSGDIALOG_TYPE_SE_TYPE)
|
||||
{
|
||||
case CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL: LOG_WARNING(HLE, "%s", msg.c_str()); break;
|
||||
case CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR: LOG_ERROR(HLE, "%s", msg.c_str()); break;
|
||||
case CELL_MSGDIALOG_TYPE_SE_TYPE_NORMAL: cellSysutil.Warning("%s", msg.c_str()); break;
|
||||
case CELL_MSGDIALOG_TYPE_SE_TYPE_ERROR: cellSysutil.Error("%s", msg.c_str()); break;
|
||||
}
|
||||
|
||||
switch (type & CELL_MSGDIALOG_TYPE_SE_MUTE) // TODO
|
||||
{
|
||||
case CELL_MSGDIALOG_TYPE_SE_MUTE_OFF: break;
|
||||
case CELL_MSGDIALOG_TYPE_SE_MUTE_ON: break;
|
||||
}
|
||||
|
||||
g_msg_dialog_status = CELL_MSGDIALOG_BUTTON_NONE;
|
||||
g_msg_dialog->status = CELL_MSGDIALOG_BUTTON_NONE;
|
||||
|
||||
volatile bool m_signal = false;
|
||||
CallAfter([type, msg, &m_signal]()
|
||||
{
|
||||
if (Emu.IsStopped()) return;
|
||||
|
||||
MsgDialogCreate(type, msg.c_str(), g_msg_dialog_status);
|
||||
g_msg_dialog->Create(type, msg.c_str());
|
||||
|
||||
m_signal = true;
|
||||
});
|
||||
|
|
@ -159,20 +139,21 @@ s32 cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgD
|
|||
std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack
|
||||
}
|
||||
|
||||
while (g_msg_dialog_state == msgDialogOpen || (s64)(get_system_time() - g_msg_dialog_wait_until) < 0)
|
||||
while (g_msg_dialog->state == msgDialogOpen || (s64)(get_system_time() - g_msg_dialog->wait_until) < 0)
|
||||
{
|
||||
if (Emu.IsStopped())
|
||||
{
|
||||
g_msg_dialog_state = msgDialogAbort;
|
||||
g_msg_dialog->state = msgDialogAbort;
|
||||
break;
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(1)); // hack
|
||||
}
|
||||
|
||||
if (callback && (g_msg_dialog_state != msgDialogAbort))
|
||||
if (callback && (g_msg_dialog->state != msgDialogAbort))
|
||||
{
|
||||
const s32 status = (s32)g_msg_dialog_status;
|
||||
Emu.GetCallbackManager().Register([callback, userData, status](PPUThread& PPU) -> s32
|
||||
const s32 status = g_msg_dialog->status;
|
||||
|
||||
Emu.GetCallbackManager().Register([=](PPUThread& PPU) -> s32
|
||||
{
|
||||
callback(PPU, status, userData);
|
||||
return CELL_OK;
|
||||
|
|
@ -181,116 +162,93 @@ s32 cellMsgDialogOpen2(u32 type, vm::ptr<const char> msgString, vm::ptr<CellMsgD
|
|||
|
||||
CallAfter([]()
|
||||
{
|
||||
MsgDialogDestroy();
|
||||
|
||||
g_msg_dialog_state = msgDialogNone;
|
||||
g_msg_dialog->Destroy();
|
||||
g_msg_dialog->state = msgDialogNone;
|
||||
});
|
||||
});
|
||||
|
||||
return CELL_OK;
|
||||
}
|
||||
|
||||
s32 cellMsgDialogOpenErrorCode(u32 errorCode, vm::ptr<CellMsgDialogCallback> callback, u32 userData, u32 extParam)
|
||||
s32 cellMsgDialogOpenErrorCode(PPUThread& CPU, u32 errorCode, vm::ptr<CellMsgDialogCallback> callback, vm::ptr<void> userData, vm::ptr<void> extParam)
|
||||
{
|
||||
cellSysutil.Warning("cellMsgDialogOpenErrorCode(errorCode=0x%x, callback_addr=0x%x, userData=0x%x, extParam=%d)",
|
||||
errorCode, callback.addr(), userData, extParam);
|
||||
cellSysutil.Warning("cellMsgDialogOpenErrorCode(errorCode=0x%x, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", errorCode, callback, userData, extParam);
|
||||
|
||||
std::string error;
|
||||
|
||||
std::string errorMessage;
|
||||
switch (errorCode)
|
||||
{
|
||||
// Generic errors
|
||||
case 0x80010001: errorMessage = "The resource is temporarily unavailable."; break;
|
||||
case 0x80010002: errorMessage = "Invalid argument or flag."; break;
|
||||
case 0x80010003: errorMessage = "The feature is not yet implemented."; break;
|
||||
case 0x80010004: errorMessage = "Memory allocation failed."; break;
|
||||
case 0x80010005: errorMessage = "The resource with the specified identifier does not exist."; break;
|
||||
case 0x80010006: errorMessage = "The file does not exist."; break;
|
||||
case 0x80010007: errorMessage = "The file is in unrecognized format / The file is not a valid ELF file."; break;
|
||||
case 0x80010008: errorMessage = "Resource deadlock is avoided."; break;
|
||||
case 0x80010009: errorMessage = "Operation not permitted."; break;
|
||||
case 0x8001000A: errorMessage = "The device or resource is busy."; break;
|
||||
case 0x8001000B: errorMessage = "The operation is timed out."; break;
|
||||
case 0x8001000C: errorMessage = "The operation is aborted."; break;
|
||||
case 0x8001000D: errorMessage = "Invalid memory access."; break;
|
||||
case 0x8001000F: errorMessage = "State of the target thread is invalid."; break;
|
||||
case 0x80010010: errorMessage = "Alignment is invalid."; break;
|
||||
case 0x80010011: errorMessage = "Shortage of the kernel resources."; break;
|
||||
case 0x80010012: errorMessage = "The file is a directory."; break;
|
||||
case 0x80010013: errorMessage = "Operation cancelled."; break;
|
||||
case 0x80010014: errorMessage = "Entry already exists."; break;
|
||||
case 0x80010015: errorMessage = "Port is already connected."; break;
|
||||
case 0x80010016: errorMessage = "Port is not connected."; break;
|
||||
case 0x80010017: errorMessage = "Failure in authorizing SELF. Program authentication fail."; break;
|
||||
case 0x80010018: errorMessage = "The file is not MSELF."; break;
|
||||
case 0x80010019: errorMessage = "System version error."; break;
|
||||
case 0x8001001A: errorMessage = "Fatal system error occurred while authorizing SELF. SELF auth failure."; break;
|
||||
case 0x8001001B: errorMessage = "Math domain violation."; break;
|
||||
case 0x8001001C: errorMessage = "Math range violation."; break;
|
||||
case 0x8001001D: errorMessage = "Illegal multi-byte sequence in input."; break;
|
||||
case 0x8001001E: errorMessage = "File position error."; break;
|
||||
case 0x8001001F: errorMessage = "Syscall was interrupted."; break;
|
||||
case 0x80010020: errorMessage = "File too large."; break;
|
||||
case 0x80010021: errorMessage = "Too many links."; break;
|
||||
case 0x80010022: errorMessage = "File table overflow."; break;
|
||||
case 0x80010023: errorMessage = "No space left on device."; break;
|
||||
case 0x80010024: errorMessage = "Not a TTY."; break;
|
||||
case 0x80010025: errorMessage = "Broken pipe."; break;
|
||||
case 0x80010026: errorMessage = "Read-only filesystem."; break;
|
||||
case 0x80010027: errorMessage = "Illegal seek."; break;
|
||||
case 0x80010028: errorMessage = "Arg list too long."; break;
|
||||
case 0x80010029: errorMessage = "Access violation."; break;
|
||||
case 0x8001002A: errorMessage = "Invalid file descriptor."; break;
|
||||
case 0x8001002B: errorMessage = "Filesystem mounting failed."; break;
|
||||
case 0x8001002C: errorMessage = "Too many files open."; break;
|
||||
case 0x8001002D: errorMessage = "No device."; break;
|
||||
case 0x8001002E: errorMessage = "Not a directory."; break;
|
||||
case 0x8001002F: errorMessage = "No such device or IO."; break;
|
||||
case 0x80010030: errorMessage = "Cross-device link error."; break;
|
||||
case 0x80010031: errorMessage = "Bad Message."; break;
|
||||
case 0x80010032: errorMessage = "In progress."; break;
|
||||
case 0x80010033: errorMessage = "Message size error."; break;
|
||||
case 0x80010034: errorMessage = "Name too long."; break;
|
||||
case 0x80010035: errorMessage = "No lock."; break;
|
||||
case 0x80010036: errorMessage = "Not empty."; break;
|
||||
case 0x80010037: errorMessage = "Not supported."; break;
|
||||
case 0x80010038: errorMessage = "File-system specific error."; break;
|
||||
case 0x80010039: errorMessage = "Overflow occured."; break;
|
||||
case 0x8001003A: errorMessage = "Filesystem not mounted."; break;
|
||||
case 0x8001003B: errorMessage = "Not SData."; break;
|
||||
case 0x8001003C: errorMessage = "Incorrect version in sys_load_param."; break;
|
||||
case 0x8001003D: errorMessage = "Pointer is null."; break;
|
||||
case 0x8001003E: errorMessage = "Pointer is null."; break;
|
||||
default: errorMessage = "An error has occurred."; break;
|
||||
case 0x80010001: error = "The resource is temporarily unavailable."; break;
|
||||
case 0x80010002: error = "Invalid argument or flag."; break;
|
||||
case 0x80010003: error = "The feature is not yet implemented."; break;
|
||||
case 0x80010004: error = "Memory allocation failed."; break;
|
||||
case 0x80010005: error = "The resource with the specified identifier does not exist."; break;
|
||||
case 0x80010006: error = "The file does not exist."; break;
|
||||
case 0x80010007: error = "The file is in unrecognized format / The file is not a valid ELF file."; break;
|
||||
case 0x80010008: error = "Resource deadlock is avoided."; break;
|
||||
case 0x80010009: error = "Operation not permitted."; break;
|
||||
case 0x8001000A: error = "The device or resource is busy."; break;
|
||||
case 0x8001000B: error = "The operation is timed out."; break;
|
||||
case 0x8001000C: error = "The operation is aborted."; break;
|
||||
case 0x8001000D: error = "Invalid memory access."; break;
|
||||
case 0x8001000F: error = "State of the target thread is invalid."; break;
|
||||
case 0x80010010: error = "Alignment is invalid."; break;
|
||||
case 0x80010011: error = "Shortage of the kernel resources."; break;
|
||||
case 0x80010012: error = "The file is a directory."; break;
|
||||
case 0x80010013: error = "Operation cancelled."; break;
|
||||
case 0x80010014: error = "Entry already exists."; break;
|
||||
case 0x80010015: error = "Port is already connected."; break;
|
||||
case 0x80010016: error = "Port is not connected."; break;
|
||||
case 0x80010017: error = "Failure in authorizing SELF. Program authentication fail."; break;
|
||||
case 0x80010018: error = "The file is not MSELF."; break;
|
||||
case 0x80010019: error = "System version error."; break;
|
||||
case 0x8001001A: error = "Fatal system error occurred while authorizing SELF. SELF auth failure."; break;
|
||||
case 0x8001001B: error = "Math domain violation."; break;
|
||||
case 0x8001001C: error = "Math range violation."; break;
|
||||
case 0x8001001D: error = "Illegal multi-byte sequence in input."; break;
|
||||
case 0x8001001E: error = "File position error."; break;
|
||||
case 0x8001001F: error = "Syscall was interrupted."; break;
|
||||
case 0x80010020: error = "File too large."; break;
|
||||
case 0x80010021: error = "Too many links."; break;
|
||||
case 0x80010022: error = "File table overflow."; break;
|
||||
case 0x80010023: error = "No space left on device."; break;
|
||||
case 0x80010024: error = "Not a TTY."; break;
|
||||
case 0x80010025: error = "Broken pipe."; break;
|
||||
case 0x80010026: error = "Read-only filesystem."; break;
|
||||
case 0x80010027: error = "Illegal seek."; break;
|
||||
case 0x80010028: error = "Arg list too long."; break;
|
||||
case 0x80010029: error = "Access violation."; break;
|
||||
case 0x8001002A: error = "Invalid file descriptor."; break;
|
||||
case 0x8001002B: error = "Filesystem mounting failed."; break;
|
||||
case 0x8001002C: error = "Too many files open."; break;
|
||||
case 0x8001002D: error = "No device."; break;
|
||||
case 0x8001002E: error = "Not a directory."; break;
|
||||
case 0x8001002F: error = "No such device or IO."; break;
|
||||
case 0x80010030: error = "Cross-device link error."; break;
|
||||
case 0x80010031: error = "Bad Message."; break;
|
||||
case 0x80010032: error = "In progress."; break;
|
||||
case 0x80010033: error = "Message size error."; break;
|
||||
case 0x80010034: error = "Name too long."; break;
|
||||
case 0x80010035: error = "No lock."; break;
|
||||
case 0x80010036: error = "Not empty."; break;
|
||||
case 0x80010037: error = "Not supported."; break;
|
||||
case 0x80010038: error = "File-system specific error."; break;
|
||||
case 0x80010039: error = "Overflow occured."; break;
|
||||
case 0x8001003A: error = "Filesystem not mounted."; break;
|
||||
case 0x8001003B: error = "Not SData."; break;
|
||||
case 0x8001003C: error = "Incorrect version in sys_load_param."; break;
|
||||
case 0x8001003D: error = "Pointer is null."; break;
|
||||
case 0x8001003E: error = "Pointer is null."; break;
|
||||
default: error = "An error has occurred."; break;
|
||||
}
|
||||
|
||||
char errorCodeHex[12];
|
||||
#if __STDC_WANT_SECURE_LIB__ && !_WIN32_WCE
|
||||
sprintf_s(errorCodeHex, "\n(%08x)", errorCode);
|
||||
#else
|
||||
sprintf(errorCodeHex, "\n(%08x)", errorCode);
|
||||
#endif
|
||||
errorMessage.append(errorCodeHex);
|
||||
error.append(fmt::format("\n(%08x)", errorCode));
|
||||
|
||||
u64 status;
|
||||
int res = rMessageBox(errorMessage, "Error", rICON_ERROR | rOK);
|
||||
switch (res)
|
||||
{
|
||||
case rOK: status = CELL_MSGDIALOG_BUTTON_OK; break;
|
||||
default:
|
||||
if (res)
|
||||
{
|
||||
status = CELL_MSGDIALOG_BUTTON_INVALID;
|
||||
break;
|
||||
}
|
||||
vm::stackvar<char> message(CPU, error.size() + 1);
|
||||
|
||||
status = CELL_MSGDIALOG_BUTTON_NONE;
|
||||
break;
|
||||
}
|
||||
memcpy(message.get_ptr(), error.c_str(), message.size());
|
||||
|
||||
if (callback)
|
||||
callback((s32)status, userData);
|
||||
|
||||
return CELL_OK;
|
||||
return cellMsgDialogOpen2(CELL_MSGDIALOG_DIALOG_TYPE_ERROR | CELL_MSGDIALOG_TYPE_BUTTON_TYPE_OK, message, callback, userData, extParam);
|
||||
}
|
||||
|
||||
s32 cellMsgDialogClose(float delay)
|
||||
|
|
@ -298,7 +256,8 @@ s32 cellMsgDialogClose(float delay)
|
|||
cellSysutil.Warning("cellMsgDialogClose(delay=%f)", delay);
|
||||
|
||||
MsgDialogState old = msgDialogOpen;
|
||||
if (!g_msg_dialog_state.compare_exchange_strong(old, msgDialogClose))
|
||||
|
||||
if (!g_msg_dialog->state.compare_exchange_strong(old, msgDialogClose))
|
||||
{
|
||||
if (old == msgDialogNone)
|
||||
{
|
||||
|
|
@ -310,8 +269,7 @@ s32 cellMsgDialogClose(float delay)
|
|||
}
|
||||
}
|
||||
|
||||
if (delay < 0.0f) delay = 0.0f;
|
||||
g_msg_dialog_wait_until = get_system_time() + (u64)(delay * 1000);
|
||||
g_msg_dialog->wait_until = get_system_time() + static_cast<u64>(std::max<float>(delay, 0.0f) * 1000);
|
||||
return CELL_OK;
|
||||
}
|
||||
|
||||
|
|
@ -320,7 +278,8 @@ s32 cellMsgDialogAbort()
|
|||
cellSysutil.Warning("cellMsgDialogAbort()");
|
||||
|
||||
MsgDialogState old = msgDialogOpen;
|
||||
if (!g_msg_dialog_state.compare_exchange_strong(old, msgDialogAbort))
|
||||
|
||||
if (!g_msg_dialog->state.compare_exchange_strong(old, msgDialogAbort))
|
||||
{
|
||||
if (old == msgDialogNone)
|
||||
{
|
||||
|
|
@ -332,21 +291,21 @@ s32 cellMsgDialogAbort()
|
|||
}
|
||||
}
|
||||
|
||||
g_msg_dialog_wait_until = get_system_time();
|
||||
g_msg_dialog->wait_until = get_system_time();
|
||||
|
||||
return CELL_OK;
|
||||
}
|
||||
|
||||
s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::ptr<const char> msgString)
|
||||
{
|
||||
cellSysutil.Warning("cellMsgDialogProgressBarSetMsg(progressBarIndex=%d, msgString_addr=0x%x ['%s'])",
|
||||
progressBarIndex, msgString.addr(), msgString.get_ptr());
|
||||
cellSysutil.Warning("cellMsgDialogProgressBarSetMsg(progressBarIndex=%d, msgString=*0x%x)", progressBarIndex, msgString);
|
||||
|
||||
if (g_msg_dialog_state != msgDialogOpen)
|
||||
if (g_msg_dialog->state != msgDialogOpen)
|
||||
{
|
||||
return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
|
||||
}
|
||||
|
||||
if (progressBarIndex >= g_msg_dialog_progress_bar_count)
|
||||
if (progressBarIndex >= g_msg_dialog->progress_bar_count)
|
||||
{
|
||||
return CELL_MSGDIALOG_ERROR_PARAM;
|
||||
}
|
||||
|
|
@ -355,8 +314,9 @@ s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::ptr<const char> msg
|
|||
|
||||
CallAfter([text, progressBarIndex]()
|
||||
{
|
||||
MsgDialogProgressBarSetMsg(progressBarIndex, text.c_str());
|
||||
g_msg_dialog->ProgressBarSetMsg(progressBarIndex, text.c_str());
|
||||
});
|
||||
|
||||
return CELL_OK;
|
||||
}
|
||||
|
||||
|
|
@ -364,20 +324,21 @@ s32 cellMsgDialogProgressBarReset(u32 progressBarIndex)
|
|||
{
|
||||
cellSysutil.Warning("cellMsgDialogProgressBarReset(progressBarIndex=%d)", progressBarIndex);
|
||||
|
||||
if (g_msg_dialog_state != msgDialogOpen)
|
||||
if (g_msg_dialog->state != msgDialogOpen)
|
||||
{
|
||||
return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
|
||||
}
|
||||
|
||||
if (progressBarIndex >= g_msg_dialog_progress_bar_count)
|
||||
if (progressBarIndex >= g_msg_dialog->progress_bar_count)
|
||||
{
|
||||
return CELL_MSGDIALOG_ERROR_PARAM;
|
||||
}
|
||||
|
||||
CallAfter([=]()
|
||||
{
|
||||
MsgDialogProgressBarReset(progressBarIndex);
|
||||
g_msg_dialog->ProgressBarReset(progressBarIndex);
|
||||
});
|
||||
|
||||
return CELL_OK;
|
||||
}
|
||||
|
||||
|
|
@ -385,19 +346,31 @@ s32 cellMsgDialogProgressBarInc(u32 progressBarIndex, u32 delta)
|
|||
{
|
||||
cellSysutil.Warning("cellMsgDialogProgressBarInc(progressBarIndex=%d, delta=%d)", progressBarIndex, delta);
|
||||
|
||||
if (g_msg_dialog_state != msgDialogOpen)
|
||||
if (g_msg_dialog->state != msgDialogOpen)
|
||||
{
|
||||
return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
|
||||
}
|
||||
|
||||
if (progressBarIndex >= g_msg_dialog_progress_bar_count)
|
||||
if (progressBarIndex >= g_msg_dialog->progress_bar_count)
|
||||
{
|
||||
return CELL_MSGDIALOG_ERROR_PARAM;
|
||||
}
|
||||
|
||||
CallAfter([=]()
|
||||
{
|
||||
MsgDialogProgressBarInc(progressBarIndex, delta);
|
||||
g_msg_dialog->ProgressBarInc(progressBarIndex, delta);
|
||||
});
|
||||
|
||||
return CELL_OK;
|
||||
}
|
||||
|
||||
void cellSysutil_MsgDialog_init()
|
||||
{
|
||||
REG_FUNC(cellSysutil, cellMsgDialogOpen2);
|
||||
REG_FUNC(cellSysutil, cellMsgDialogOpenErrorCode);
|
||||
REG_FUNC(cellSysutil, cellMsgDialogProgressBarSetMsg);
|
||||
REG_FUNC(cellSysutil, cellMsgDialogProgressBarReset);
|
||||
REG_FUNC(cellSysutil, cellMsgDialogProgressBarInc);
|
||||
REG_FUNC(cellSysutil, cellMsgDialogClose);
|
||||
REG_FUNC(cellSysutil, cellMsgDialogAbort);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue