Skip to content

fix: handle unavailable OoT web applets without crashing #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baromas wants to merge 1 commit into
base: feat/oot-boot
Choose a base branch
from
Open

fix: handle unavailable OoT web applets without crashing #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions games/totk/runtime/applet_host.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,17 @@ static void show_error(uint32_t result) {
fprintf(stderr, "[totk] game error dialog: %04u-%04u (result %#x)\n", 2000 + (result & 0x1ff), (result >> 9) & 0x1fff, result);
}

#ifdef GAME_OOT
/* Zelda Notes requests the console web applet. OoT handles a failed Result
* without reading the return value object. */
static uint32_t show_web_page(void *result, const void *arg) {
(void)result;
(void)arg;
fprintf(stderr, "[oot] web applet unavailable\n");
return 0x2a2u; /* Generic failure, as used by the other offline applet hosts. */
}
#endif

#ifdef GAME_BOTW
/* SDK 7 (Breath of the Wild 1.6.0, botw.md). Exit requests are handled by the window (the section brackets change nothing);
video recording has no Mac counterpart; the DLC shop and the DLC-version error screen are console applets. */
Expand Down Expand Up @@ -105,6 +116,9 @@ void *runtime_applet_override(const char *name) {
{"_ZN2nn3nfp10GetTagInfoEPNS0_7TagInfoERKNS0_12DeviceHandleE", nfp_no_device},
{"_ZN2nn3nfp12GetModelInfoEPNS0_9ModelInfoERKNS0_12DeviceHandleE", nfp_no_device},
{"_ZN2nn3err9ShowErrorENS_6ResultE", show_error},
#ifdef GAME_OOT
{"_ZN2nn3web11ShowWebPageEPNS0_18WebPageReturnValueERKNS0_14ShowWebPageArgE", show_web_page},
#endif
#ifdef GAME_BOTW
{"_ZN2nn2oe31EnterExitRequestHandlingSectionEv", exit_section}, {"_ZN2nn2oe31LeaveExitRequestHandlingSectionEv", exit_section},
{"_ZN2nn2oe15EnableRecordingEv", enable_recording},
Expand Down