Use the LoggingModule if possible

This commit is contained in:
Maschell 2021-11-06 23:26:13 +01:00
parent 7fe0fce93d
commit 0ac1752560
2 changed files with 12 additions and 4 deletions

View File

@ -1,8 +1,8 @@
FROM wiiuenv/devkitppc:20210920 FROM wiiuenv/devkitppc:20211106
COPY --from=wiiuenv/librpxloader:20211002 /artifacts $DEVKITPRO COPY --from=wiiuenv/librpxloader:20211002 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libfunctionpatcher:20210924 /artifacts $DEVKITPRO COPY --from=wiiuenv/libfunctionpatcher:20210924 /artifacts $DEVKITPRO
COPY --from=wiiuenv/wiiumodulesystem:20210924 /artifacts $DEVKITPRO COPY --from=wiiuenv/wiiumodulesystem:20211031 /artifacts $DEVKITPRO
COPY --from=wiiuenv/libromfs_wiiu:20210924 /artifacts $DEVKITPRO COPY --from=wiiuenv/libromfs_wiiu:20210924 /artifacts $DEVKITPRO
WORKDIR project WORKDIR project

View File

@ -1,5 +1,7 @@
#include <wums.h> #include <wums.h>
#include <cstring> #include <cstring>
#include <whb/log_cafe.h>
#include <whb/log_module.h>
#include <whb/log_udp.h> #include <whb/log_udp.h>
#include <coreinit/debug.h> #include <coreinit/debug.h>
#include <coreinit/title.h> #include <coreinit/title.h>
@ -22,7 +24,10 @@ WUMS_MODULE_EXPORT_NAME("homebrew_rpx_loader");
WUMS_USE_WUT_DEVOPTAB(); WUMS_USE_WUT_DEVOPTAB();
WUMS_INITIALIZE() { WUMS_INITIALIZE() {
WHBLogUdpInit(); if (!WHBLogModuleInit()) {
WHBLogCafeInit();
WHBLogUdpInit();
}
DEBUG_FUNCTION_LINE("Patch functions"); DEBUG_FUNCTION_LINE("Patch functions");
// we only patch static functions, we don't need re-patch them and every launch // we only patch static functions, we don't need re-patch them and every launch
FunctionPatcherPatchFunction(fs_file_function_replacements, fs_file_function_replacements_size); FunctionPatcherPatchFunction(fs_file_function_replacements, fs_file_function_replacements_size);
@ -62,7 +67,10 @@ WUMS_APPLICATION_STARTS() {
gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced = false; gReplacementInfo.rpxReplacementInfo.willRPXBeReplaced = false;
gReplacementInfo.rpxReplacementInfo.isRPXReplaced = true; gReplacementInfo.rpxReplacementInfo.isRPXReplaced = true;
} }
WHBLogUdpInit(); if (!WHBLogModuleInit()) {
WHBLogCafeInit();
WHBLogUdpInit();
}
if (gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) { if (gReplacementInfo.contentReplacementInfo.mode == CONTENTREDIRECT_FROM_PATH) {
auto fsClient = (FSClient *) memalign(0x20, sizeof(FSClient)); auto fsClient = (FSClient *) memalign(0x20, sizeof(FSClient));
auto fsCmd = (FSCmdBlock *) memalign(0x20, sizeof(FSCmdBlock)); auto fsCmd = (FSCmdBlock *) memalign(0x20, sizeof(FSCmdBlock));