dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-04 05:45:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use g_fxo for cellWebBrowser

Browse Source 
Rename browser_t -> browser_info
This commit is contained in:
Nekotekina 2019-08-21 23:11:34 +03:00
parent 2b55bde104
commit 8cf025bf71
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/Cell/Modules/cellWebBrowser.cpp
View File

@ -6,7 +6,7 @@
extern logs::channel cellSysutil; extern logs::channel cellSysutil;
struct browser_t struct browser_info
{ {
vm::ptr<CellWebBrowserSystemCallback> system_cb; vm::ptr<CellWebBrowserSystemCallback> system_cb;
vm::ptr<void> userData; vm::ptr<void> userData;
@ -215,7 +215,7 @@ error_code cellWebBrowserInitialize(vm::ptr<CellWebBrowserSystemCallback> system
{ {
cellSysutil.todo("cellWebBrowserInitialize(system_cb=*0x%x, container=0x%x)", system_cb, container); cellSysutil.todo("cellWebBrowserInitialize(system_cb=*0x%x, container=0x%x)", system_cb, container);
const auto browser = fxm::make_always<browser_t>(); const auto browser = g_fxo->get<browser_info>();
browser->system_cb = system_cb; browser->system_cb = system_cb;
sysutil_register_cb([=](ppu_thread& ppu) -> s32 sysutil_register_cb([=](ppu_thread& ppu) -> s32
@ -246,10 +246,10 @@ void cellWebBrowserShutdown()
{ {
cellSysutil.todo("cellWebBrowserShutdown()"); cellSysutil.todo("cellWebBrowserShutdown()");
const auto browser = g_fxo->get<browser_info>();
sysutil_register_cb([=](ppu_thread& ppu) -> s32 sysutil_register_cb([=](ppu_thread& ppu) -> s32
{ {
const auto browser = fxm::get_always<browser_t>();
browser->system_cb(ppu, CELL_SYSUTIL_WEBBROWSER_SHUTDOWN_FINISHED, browser->userData); browser->system_cb(ppu, CELL_SYSUTIL_WEBBROWSER_SHUTDOWN_FINISHED, browser->userData);
return CELL_OK; return CELL_OK;
}); });