diff --git a/Dockerfile b/Dockerfile index 4780dd2..c18b074 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM wiiuenv/devkitppc:20211106 +FROM wiiuenv/devkitppc:20211229 COPY --from=wiiuenv/libwupsbackend:20211001 /artifacts $DEVKITPRO -COPY --from=wiiuenv/librpxloader:20210924 /artifacts $DEVKITPRO -COPY --from=wiiuenv/wiiupluginsystem:20211001 /artifacts $DEVKITPRO +COPY --from=wiiuenv/librpxloader:20211002 /artifacts $DEVKITPRO +COPY --from=wiiuenv/wiiupluginsystem:20220123 /artifacts $DEVKITPRO WORKDIR project \ No newline at end of file diff --git a/src/utils/TcpReceiver.cpp b/src/utils/TcpReceiver.cpp index 6b26b29..e762581 100644 --- a/src/utils/TcpReceiver.cpp +++ b/src/utils/TcpReceiver.cpp @@ -1,23 +1,23 @@ #include #include #include -#include +#include #include #include #include #include - #include #include +#include +#include +#include #include "TcpReceiver.h" #include "fs/FSUtils.h" #include "utils/net.h" #include "utils/utils.h" #include -#include -#include #include #define RPX_TEMP_PATH "fs:/vol/external01/wiiu/apps/" @@ -28,11 +28,6 @@ #define WUHB_TEMP_FILE_EX "wiiu/apps/temp.wuhb" #define WUHB_TEMP_FILE_2_EX "wiiu/apps/temp2.wuhb" -extern "C" { -uint64_t _SYSGetSystemApplicationTitleId(int32_t); -void _SYSLaunchTitleWithStdArgsInNoSplash(uint64_t, uint32_t); -} - TcpReceiver::TcpReceiver(int32_t port) : CThread(CThread::eAttributeAffCore1, 16, 0x20000), exitRequested(false), serverPort(port), serverSocket(-1) { @@ -284,7 +279,7 @@ int32_t TcpReceiver::loadToMemory(int32_t clientSocket, uint32_t ipAddress) { free(loadAddress); free(inflatedData); - _SYSLaunchTitleWithStdArgsInNoSplash(OSGetTitleID(), 0); + _SYSLaunchTitleWithStdArgsInNoSplash(OSGetTitleID(), nullptr); return fileSize; } else { DEBUG_FUNCTION_LINE("Failed to parse plugin"); @@ -319,8 +314,8 @@ int32_t TcpReceiver::loadToMemory(int32_t clientSocket, uint32_t ipAddress) { DEBUG_FUNCTION_LINE("Starting a homebrew title!"); RL_LoadFromSDOnNextLaunch(file_path); - uint64_t titleID = _SYSGetSystemApplicationTitleId(8); - _SYSLaunchTitleWithStdArgsInNoSplash(titleID, 0); + uint64_t titleID = _SYSGetSystemApplicationTitleId(SYSTEM_APP_ID_HEALTH_AND_SAFETY); + _SYSLaunchTitleWithStdArgsInNoSplash(titleID, nullptr); return fileSize; }