mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-16 16:21:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

cellOskDialog: use atomic_op for state operations

Browse Source
This commit is contained in:
Megamouse 2019-01-12 12:53:18 +01:00
parent d7cc97433d
commit 022550a43b
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
rpcs3/Emu/Cell/Modules/cellOskDialog.cpp
View File

@ -89,15 +89,22 @@ error_code cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dia
{ {
const auto osk = wptr.lock(); const auto osk = wptr.lock();
if (osk->state.load() == OskDialogState::Abort) if (osk->state.atomic_op([&](OskDialogState& state)
{
if (state == OskDialogState::Abort)
{
return true;
}
state = OskDialogState::Close;
return false;
}))
{ {
pad::SetIntercepted(false); pad::SetIntercepted(false);
sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0); sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
return; return;
} }
osk->state = OskDialogState::Close;
const bool accepted = status == CELL_MSGDIALOG_BUTTON_OK; const bool accepted = status == CELL_MSGDIALOG_BUTTON_OK;
if (accepted) if (accepted)
@ -301,20 +308,36 @@ error_code cellOskDialogAbort()
const auto osk = fxm::get<OskDialogBase>(); const auto osk = fxm::get<OskDialogBase>();
// Check for open dialog. In this case the dialog is only "Open" if it was not aborted before. if (!osk)
if (!osk || osk->state.load() == OskDialogState::Abort)
{ {
return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED; return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
} }
// If the dialog has the Open state then it is in use. Only dialogs with the Close state can be aborted. const s32 result = osk->state.atomic_op([](OskDialogState& state)
if (osk->state.load() == OskDialogState::Open)
{ {
return CELL_SYSUTIL_ERROR_BUSY; // Check for open dialog. In this case the dialog is only "Open" if it was not aborted before.
if (state == OskDialogState::Abort)
{
return static_cast<s32>(CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED);
}
// If the dialog has the Open state then it is in use. Only dialogs with the Close state can be aborted.
if (state == OskDialogState::Open)
{
return static_cast<s32>(CELL_SYSUTIL_ERROR_BUSY);
}
state = OskDialogState::Abort;
return static_cast<s32>(CELL_OK);
});
if (result != CELL_OK)
{
return result;
} }
osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_ABORT; osk->osk_input_result = CELL_OSKDIALOG_INPUT_FIELD_RESULT_ABORT;
osk->state = OskDialogState::Abort;
osk->Close(false); osk->Close(false);
return CELL_OK; return CELL_OK;