The-Homebrew-Cloud/homebrew_on_menu_plugin
2
0
Fork 0
mirror of https://github.com/wiiu-env/homebrew_on_menu_plugin.git synced 2024-11-22 02:29:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the latest lib versions

Browse Source
This commit is contained in:
Maschell 2022-09-04 00:02:35 +02:00
parent 2cb4b11005
commit f291cad893
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -1,9 +1,9 @@
FROM wiiuenv/devkitppc:20220806 FROM wiiuenv/devkitppc:20220806
COPY --from=wiiuenv/wiiupluginsystem:20220826 /artifacts $DEVKITPRO COPY --from=wiiuenv/wiiupluginsystem:20220826 /artifacts $DEVKITPRO
COPY --from=wiiuenv/librpxloader:20220825 /artifacts $DEVKITPRO COPY --from=wiiuenv/librpxloader:20220903 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libsdutils:20220724 /artifacts $DEVKITPRO COPY --from=wiiuenv/libsdutils:20220903 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libwuhbutils:20220724 /artifacts $DEVKITPRO COPY --from=wiiuenv/libwuhbutils:20220903 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libcontentredirection:20220724 /artifacts $DEVKITPRO COPY --from=wiiuenv/libcontentredirection:20220903 /artifacts $DEVKITPRO
WORKDIR project WORKDIR project

18
src/main.cpp
View File

@ -70,22 +70,22 @@ INITIALIZE_PLUGIN() {
// Use libwuhbutils. // Use libwuhbutils.
WUHBUtilsStatus error; WUHBUtilsStatus error;
if ((error = WUHBUtils_Init()) != WUHB_UTILS_RESULT_SUCCESS) { if ((error = WUHBUtils_InitLibrary()) != WUHB_UTILS_RESULT_SUCCESS) {
DEBUG_FUNCTION_LINE_ERR("Homebrew on Menu Plugin: Failed to init WUHBUtils. Error %d", error); DEBUG_FUNCTION_LINE_ERR("Homebrew on Menu Plugin: Failed to init WUHBUtils. Error %s [%d]", WUHBUtils_GetStatusStr(error), error);
OSFatal("Homebrew on Menu Plugin: Failed to init WUHBUtils."); OSFatal("Homebrew on Menu Plugin: Failed to init WUHBUtils.");
} }
// Use libcontentredirection. // Use libcontentredirection.
ContentRedirectionStatus error2; ContentRedirectionStatus error2;
if ((error2 = ContentRedirection_Init()) != CONTENT_REDIRECTION_RESULT_SUCCESS) { if ((error2 = ContentRedirection_InitLibrary()) != CONTENT_REDIRECTION_RESULT_SUCCESS) {
DEBUG_FUNCTION_LINE_ERR("Homebrew on Menu Plugin: Failed to init ContentRedirection. Error %d", error2); DEBUG_FUNCTION_LINE_ERR("Homebrew on Menu Plugin: Failed to init ContentRedirection. Error %s [%d]", ContentRedirection_GetStatusStr(error2), error2);
OSFatal("Homebrew on Menu Plugin: Failed to init ContentRedirection."); OSFatal("Homebrew on Menu Plugin: Failed to init ContentRedirection.");
} }
// Use librpxloader. // Use librpxloader.
RPXLoaderStatus error3; RPXLoaderStatus error3;
if ((error3 = RPXLoader_InitLibrary()) != RPX_LOADER_RESULT_SUCCESS) { if ((error3 = RPXLoader_InitLibrary()) != RPX_LOADER_RESULT_SUCCESS) {
DEBUG_FUNCTION_LINE_ERR("Homebrew on Menu Plugin: Failed to init RPXLoader. Error %d", error3); DEBUG_FUNCTION_LINE_ERR("Homebrew on Menu Plugin: Failed to init RPXLoader. Error %s [%d]", RPXLoader_GetStatusStr(error3), error3);
OSFatal("Homebrew on Menu Plugin: Failed to init RPXLoader."); OSFatal("Homebrew on Menu Plugin: Failed to init RPXLoader.");
} }
@ -128,6 +128,7 @@ void hideHomebrewChanged(ConfigItemBoolean *item, bool newValue) {
WUPS_GET_CONFIG() { WUPS_GET_CONFIG() {
// We open the storage so we can persist the configuration the user did. // We open the storage so we can persist the configuration the user did.
WUPSStorageError storageRes; WUPSStorageError storageRes;
DEBUG_FUNCTION_LINE_ERR("In WUPS_GET_CONFIG");
if ((storageRes = WUPS_OpenStorage()) != WUPS_STORAGE_ERROR_SUCCESS) { if ((storageRes = WUPS_OpenStorage()) != WUPS_STORAGE_ERROR_SUCCESS) {
DEBUG_FUNCTION_LINE_ERR("Failed to open storage %s (%d)", WUPS_GetStorageStatusStr(storageRes), storageRes); DEBUG_FUNCTION_LINE_ERR("Failed to open storage %s (%d)", WUPS_GetStorageStatusStr(storageRes), storageRes);
return 0; return 0;
@ -196,8 +197,7 @@ ON_APPLICATION_START() {
OSGetTitleID() == 0x0005001010040200L) { // Wii U Menu EUR OSGetTitleID() == 0x0005001010040200L) { // Wii U Menu EUR
gInWiiUMenu = true; gInWiiUMenu = true;
if (SDUtils_Init() >= 0) { if (SDUtils_InitLibrary() == SDUTILS_RESULT_SUCCESS) {
DEBUG_FUNCTION_LINE("SDUtils_Init done");
sSDUtilsInitDone = true; sSDUtilsInitDone = true;
sTitleRebooting = false; sTitleRebooting = false;
if (SDUtils_AddAttachHandler(SDAttachedHandler) != SDUTILS_RESULT_SUCCESS) { if (SDUtils_AddAttachHandler(SDAttachedHandler) != SDUTILS_RESULT_SUCCESS) {
@ -210,7 +210,7 @@ ON_APPLICATION_START() {
DEBUG_FUNCTION_LINE_ERR("IsSdCardMounted failed"); DEBUG_FUNCTION_LINE_ERR("IsSdCardMounted failed");
} }
} else { } else {
DEBUG_FUNCTION_LINE_ERR("Failed to init SDUtils. Make sure to have the SDHotSwapModule loaded!"); DEBUG_FUNCTION_LINE_WARN("Failed to init SDUtils. Make sure to have the SDHotSwapModule loaded!");
} }
} else { } else {
gInWiiUMenu = false; gInWiiUMenu = false;
@ -229,7 +229,7 @@ ON_APPLICATION_ENDS() {
if (sSDUtilsInitDone) { if (sSDUtilsInitDone) {
SDUtils_RemoveAttachHandler(SDAttachedHandler); SDUtils_RemoveAttachHandler(SDAttachedHandler);
SDUtils_RemoveCleanUpHandlesHandler(SDCleanUpHandlesHandler); SDUtils_RemoveCleanUpHandlesHandler(SDCleanUpHandlesHandler);
SDUtils_DeInit(); SDUtils_DeInitLibrary();
sSDUtilsInitDone = false; sSDUtilsInitDone = false;
} }
sSDIsMounted = false; sSDIsMounted = false;

2
src/utils/logger.h
View File

@ -35,6 +35,7 @@ extern "C" {
#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) LOG(WHBLogWritef, FMT, ##ARGS) #define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) LOG(WHBLogWritef, FMT, ##ARGS)
#define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...) LOG_EX(WHBLogPrintf, "##ERROR## ", "", FMT, ##ARGS) #define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...) LOG_EX(WHBLogPrintf, "##ERROR## ", "", FMT, ##ARGS)
#define DEBUG_FUNCTION_LINE_WARN(FMT, ARGS...) LOG_EX(WHBLogPrintf, "##WARN ## ", "", FMT, ##ARGS)
#else #else
@ -45,6 +46,7 @@ extern "C" {
#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) while (0) #define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) while (0)
#define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...) LOG_EX(OSReport, "##ERROR## ", "\n", FMT, ##ARGS) #define DEBUG_FUNCTION_LINE_ERR(FMT, ARGS...) LOG_EX(OSReport, "##ERROR## ", "\n", FMT, ##ARGS)
#define DEBUG_FUNCTION_LINE_WARN(FMT, ARGS...) LOG_EX(OSReport, "##WARN ## ", "\n", FMT, ##ARGS)
#endif #endif