From 05c4aa50176a94666b0e57542b676835088dafb4 Mon Sep 17 00:00:00 2001 From: ikki84 Date: Tue, 7 Feb 2017 07:00:19 -0300 Subject: [PATCH] cellMsgDialogOpen: Go further using cellMsgDialogOpen2. (#2345) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Notes: Needs proper implementation (!) The functions shows similarities but the bits in argument "type" may vary a little. Comparing both functions but testing in NPJA00014 I believe it could be acceptable until it be implemented properly Feel free to reject if it´s not allowed Update cellMsgDialog.cpp --- rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp index 07e930b604..c3e460d146 100644 --- a/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMsgDialog.cpp @@ -14,11 +14,6 @@ MsgDialogBase::~MsgDialogBase() { } -s32 cellMsgDialogOpen() -{ - fmt::throw_exception("Unimplemented" HERE); -} - s32 cellMsgDialogOpen2(u32 type, vm::cptr msgString, vm::ptr callback, vm::ptr userData, vm::ptr extParam) { cellSysutil.warning("cellMsgDialogOpen2(type=0x%x, msgString=%s, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", type, msgString, callback, userData, extParam); @@ -124,6 +119,13 @@ s32 cellMsgDialogOpen2(u32 type, vm::cptr msgString, vm::ptr msgString, vm::ptr callback, vm::ptr userData, vm::ptr extParam) +{ + //Note: This function needs proper implementation, solve first argument "type" conflict with MsgDialogOpen2 in cellMsgDialog.h. + cellSysutil.todo("cellMsgDialogOpen(type=0x%x, msgString=%s, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", type, msgString, callback, userData, extParam); + return cellMsgDialogOpen2(type, msgString, callback, userData, extParam); +} + s32 cellMsgDialogOpenErrorCode(ppu_thread& ppu, u32 errorCode, vm::ptr callback, vm::ptr userData, vm::ptr extParam) { cellSysutil.warning("cellMsgDialogOpenErrorCode(errorCode=0x%x, callback=*0x%x, userData=*0x%x, extParam=*0x%x)", errorCode, callback, userData, extParam);