The-Homebrew-Cloud/tcpgecko
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow disabling SD cheats (this fixes e.g. Sm4sh from crashing)

Browse Source
This commit is contained in:
BullyWiiPlaza 2017-09-14 18:06:19 +02:00
parent ed5585bb50
commit c431bce8dc
8 changed files with 139 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dynamic_libs/sys_functions.h
View File

@ -31,13 +31,15 @@ extern "C" {
void InitSysFunctionPointers(void);
extern void (*_SYSLaunchTitleByPathFromLauncher)(const char *path, int len, int zero);
extern int (* SYSRelaunchTitle)(int argc, char* argv);
extern int (* SYSLaunchMenu)(void);
extern int (* SYSCheckTitleExists)(u64 titleId);
extern int (*SYSRelaunchTitle)(int argc, char *argv);
extern int (*SYSLaunchMenu)(void);
extern int (*SYSCheckTitleExists)(u64 titleId);
#ifdef __cplusplus
}
#endif
#endif // __SYS_FUNCTIONS_H_
#endif

109
src/main.cpp
View File

@ -20,11 +20,9 @@
#include "patcher/function_patcher_gx2.h"
#include "patcher/function_patcher_coreinit.h"
#include "utils/sd_ip_reader.hpp"
#include "fs/sd_fat_devoptab.h"
bool isCodeHandlerInstalled;
#define PRINT_TEXT2(x, y, ...) { snprintf(messageBuffer, 80, __VA_ARGS__); OSScreenPutFontEx(0, x, y, messageBuffer); OSScreenPutFontEx(1, x, y, messageBuffer); }
bool isCodeHandlerInstalled = false;
bool areSDCheatsEnabled = false;
typedef enum {
EXIT,
@ -36,16 +34,38 @@ void applyFunctionPatches() {
patchIndividualMethodHooks(method_hooks_coreinit, method_hooks_size_coreinit, method_calls_coreinit);
}
bool isSDAccessEnabled() {
int result = mount_sd_fat("sd");
if (result < 0) {
return false;
void installCodeHandler() {
unsigned int physicalCodeHandlerAddress = (unsigned int) OSEffectiveToPhysical(
(void *) CODE_HANDLER_INSTALL_ADDRESS);
SC0x25_KernelCopyData((u32) physicalCodeHandlerAddress, (unsigned int) codeHandler, codeHandlerLength);
DCFlushRange((const void *) CODE_HANDLER_INSTALL_ADDRESS, (u32) codeHandlerLength);
isCodeHandlerInstalled = true;
}
unmount_sd_fat("sd");
unsigned char *screenBuffer;
return true;
#define PRINT_TEXT(x, y, ...) { snprintf(messageBuffer, 80, __VA_ARGS__); OSScreenPutFontEx(0, x, y, messageBuffer); OSScreenPutFontEx(1, x, y, messageBuffer); }
void initializeScreen() {
// Init screen and screen buffers
OSScreenInit();
unsigned int screenBuffer0Size = OSScreenGetBufferSizeEx(0);
unsigned int screenBuffer1Size = OSScreenGetBufferSizeEx(1);
screenBuffer = (unsigned char *) MEM1_alloc(screenBuffer0Size + screenBuffer1Size, 0x40);
OSScreenSetBufferEx(0, screenBuffer);
OSScreenSetBufferEx(1, (screenBuffer + screenBuffer0Size));
OSScreenEnableEx(0, 1);
OSScreenEnableEx(1, 1);
}
void install() {
installCodeHandler();
initializeUDPLog();
log_print("Patching functions\n");
applyFunctionPatches();
}
/* Entry point */
@ -99,49 +119,38 @@ int Menu_Main(void) {
// PatchMethodHooks();
memoryInitialize();
VPADInit();
// Init screen and screen buffers
OSScreenInit();
int screenBuffer0Size = OSScreenGetBufferSizeEx(0);
int screenBuffer1Size = OSScreenGetBufferSizeEx(1);
unsigned char *screenBuffer = (unsigned char *) MEM1_alloc(screenBuffer0Size + screenBuffer1Size, 0x40);
OSScreenSetBufferEx(0, screenBuffer);
OSScreenSetBufferEx(1, (screenBuffer + screenBuffer0Size));
OSScreenEnableEx(0, 1);
OSScreenEnableEx(1, 1);
initializeScreen();
char messageBuffer[80];
int launchMethod;
int update_screen = 1;
int shouldUpdateScreen = 1;
s32 vpadError = -1;
VPADData vpad_data;
while (true) {
VPADRead(0, &vpad_data, 1, &vpadError);
if (update_screen) {
if (shouldUpdateScreen) {
OSScreenClearBufferEx(0, 0);
OSScreenClearBufferEx(1, 0);
InitSocketFunctionPointers();
// Build the IP address message
char ipAddressMessageBuffer[64];
InitSocketFunctionPointers();
__os_snprintf(ipAddressMessageBuffer, 64, "Your Wii U's IP address: %i.%i.%i.%i",
(hostIpAddress >> 24) & 0xFF, (hostIpAddress >> 16) & 0xFF, (hostIpAddress >> 8) & 0xFF,
hostIpAddress & 0xFF);
PRINT_TEXT2(14, 1, "-- TCP Gecko Installer --")
PRINT_TEXT2(7, 2, ipAddressMessageBuffer)
PRINT_TEXT2(0, 5, "Press A to install TCP Gecko (with built-in code handler)...")
PRINT_TEXT(14, 1, "-- TCP Gecko Installer --")
PRINT_TEXT(7, 2, ipAddressMessageBuffer)
PRINT_TEXT(0, 5, "Press A to install TCP Gecko (with built-in code handler)...")
PRINT_TEXT(0, 6, "Press X to install TCP Gecko (with code handler and SD cheats)...")
PRINT_TEXT2(0, 8, "Note:")
PRINT_TEXT2(0, 9, "* You can enable loading SD cheats with Mocha SD access")
PRINT_TEXT2(0, 10, "* Generate and store GCTUs to your SD card with JGecko U")
PRINT_TEXT(0, 8, "Note:")
PRINT_TEXT(0, 9, "* You can enable loading SD cheats with Mocha SD access")
PRINT_TEXT(0, 10, "* Generate and store GCTUs to your SD card with JGecko U")
// testMount();
/*if (isSDAccessEnabled()) {
@ -150,7 +159,7 @@ int Menu_Main(void) {
PRINT_TEXT2(0, 8, "No SD card access: Please run Mocha SD Access by maschell for SD cheat support...")
}*/
PRINT_TEXT2(0, 17, "Press Home to exit...")
PRINT_TEXT(0, 17, "Press Home to exit...")
OSScreenFlipBuffersEx(0);
OSScreenFlipBuffersEx(1);
@ -163,27 +172,22 @@ int Menu_Main(void) {
launchMethod = EXIT;
break;
}
// A Button pressed
if (pressedButtons & VPAD_BUTTON_A) {
unsigned int physicalCodeHandlerAddress = (unsigned int) OSEffectiveToPhysical(
(void *) CODE_HANDLER_INSTALL_ADDRESS);
SC0x25_KernelCopyData((u32) physicalCodeHandlerAddress, (unsigned int) codeHandler, codeHandlerLength);
DCFlushRange((const void *) CODE_HANDLER_INSTALL_ADDRESS, (u32) codeHandlerLength);
isCodeHandlerInstalled = true;
} else if (pressedButtons & VPAD_BUTTON_A) {
install();
launchMethod = TCP_GECKO;
initializeUDPLog();
log_print("Patching functions\n");
applyFunctionPatches();
break;
} else if (pressedButtons & VPAD_BUTTON_X) {
install();
launchMethod = TCP_GECKO;
areSDCheatsEnabled = true;
break;
}
// Button pressed?
update_screen = (pressedButtons & (VPAD_BUTTON_LEFT | VPAD_BUTTON_RIGHT | VPAD_BUTTON_UP | VPAD_BUTTON_DOWN))
? 1 : 0;
shouldUpdateScreen = (pressedButtons &
(VPAD_BUTTON_LEFT | VPAD_BUTTON_RIGHT | VPAD_BUTTON_UP | VPAD_BUTTON_DOWN)) ? 1 : 0;
usleep(20 * 1000);
}
@ -191,16 +195,17 @@ int Menu_Main(void) {
asm volatile ("mr 2, %0" : : "r" (old_sdata2_start));
MEM1_free(screenBuffer);
screenBuffer = NULL;
memoryRelease();
if (launchMethod == EXIT) {
// RestoreInstructions();
// Exit the installer
return EXIT_SUCCESS;
} else {
// Launch system menu
SYSLaunchMenu();
}
// For each title load, relaunch the TCP Gecko
return EXIT_RELAUNCH_ON_LOAD;
}

1
src/main.h
View File

@ -13,6 +13,7 @@ extern "C" {
int Menu_Main(void);
extern bool isCodeHandlerInstalled;
extern bool areSDCheatsEnabled;
#ifdef __cplusplus
}

4
src/system/address.cpp
View File

@ -5,11 +5,11 @@ int validateAddressRange(int starting_address, int ending_address) {
return __OSValidateAddressSpaceRange(1, (void *) starting_address, ending_address - starting_address + 1);
}
bool isValidDataAddress(int address) {
/*bool isValidDataAddress(int address) {
return OSIsAddressValid((const void *) address)
&& address >= 0x10000000
&& address < 0x50000000;
}
}*/
int roundUpToAligned(int number) {
return (number + 3) & ~0x03;

2
src/system/memory.h
View File

@ -39,4 +39,4 @@ void MEMBucket_free(void *ptr);
}
#endif
#endif // __MEMORY_H_
#endif

39
src/tcp_gecko.cpp
View File

@ -1,5 +1,5 @@
#include "tcp_gecko.h"
#include <iosuhax.h>
// #include <iosuhax.h>
#include <stdarg.h>
#include <stdlib.h>
#include <stdio.h>
@ -91,7 +91,7 @@ struct pygecko_bss_t {
#define VERSION_HASH 0x7FB223
ZEXTERN int ZEXPORT
/*ZEXTERN int ZEXPORT
deflateEnd OF((z_streamp
strm));
ZEXTERN int ZEXPORT
@ -103,7 +103,7 @@ ZEXTERN int ZEXPORT
deflate OF((z_streamp
strm,
int flush
));
));*/
// ########## Being socket_functions.h ############
@ -547,7 +547,7 @@ static int processCommands(struct pygecko_bss_t *bss, int clientfd) {
break;
}
case COMMAND_READ_MEMORY_COMPRESSED: {
/*case COMMAND_READ_MEMORY_COMPRESSED: {
// Receive the starting address and length
ret = recvwait(bss, clientfd, buffer, sizeof(int) * 2);
CHECK_ERROR(ret < 0)
@ -585,7 +585,7 @@ static int processCommands(struct pygecko_bss_t *bss, int clientfd) {
ret = sendwait(bss, clientfd, buffer, 4 + deflatedSize);
ASSERT_FUNCTION_SUCCEEDED(ret, "sendwait (Compressed data)")
break;
break;*/
// https://www.gamedev.net/resources/_/technical/game-programming/in-memory-data-compression-and-decompression-r2279
/*
@ -620,7 +620,7 @@ static int processCommands(struct pygecko_bss_t *bss, int clientfd) {
OSFreeToSystem(compressedBuffer);
break;*/
}
// }
case COMMAND_KERNEL_WRITE: {
ret = recvwait(bss, clientfd, buffer, sizeof(int) * 2);
CHECK_ERROR(ret < 0)
@ -1098,6 +1098,10 @@ static int processCommands(struct pygecko_bss_t *bss, int clientfd) {
}
int destinationAddress = baseAddress;
#define INVALID_ADDRESS -1
if ((bool) OSIsAddressValid((const void *) destinationAddress)) {
// Apply pointer offsets
for (offsetIndex = 0; offsetIndex < offsetsCount; offsetIndex++) {
int pointerValue = *(int *) destinationAddress;
@ -1105,15 +1109,19 @@ static int processCommands(struct pygecko_bss_t *bss, int clientfd) {
destinationAddress = pointerValue + offset;
// Validate the pointer address
bool isValidDestinationAddress = isValidDataAddress(destinationAddress);
bool isValidDestinationAddress = (bool) OSIsAddressValid((const void *) destinationAddress);
// Bail out if invalid
if (!isValidDestinationAddress) {
destinationAddress = -1;
destinationAddress = INVALID_ADDRESS;
break;
}
}
} else if (offsetsCount > 0) {
// Following pointers failed
destinationAddress = INVALID_ADDRESS;
}
// Return the destination address
((int *) buffer)[0] = destinationAddress;
@ -1128,14 +1136,14 @@ static int processCommands(struct pygecko_bss_t *bss, int clientfd) {
break;
}
case COMMAND_REMOTE_PROCEDURE_CALL: {
long long (*fun)(int, int, int, int, int, int, int, int);
long long (*function)(int, int, int, int, int, int, int, int);
int r3, r4, r5, r6, r7, r8, r9, r10;
long long result;
ret = recvwait(bss, clientfd, buffer, 4 + 8 * 4);
CHECK_ERROR(ret < 0);
fun = (long long int (*)(int, int, int, int, int, int, int, int)) ((void **) buffer)[0];
function = (long long int (*)(int, int, int, int, int, int, int, int)) ((void **) buffer)[0];
r3 = ((int *) buffer)[1];
r4 = ((int *) buffer)[2];
r5 = ((int *) buffer)[3];
@ -1145,7 +1153,7 @@ static int processCommands(struct pygecko_bss_t *bss, int clientfd) {
r9 = ((int *) buffer)[7];
r10 = ((int *) buffer)[8];
result = fun(r3, r4, r5, r6, r7, r8, r9, r10);
result = function(r3, r4, r5, r6, r7, r8, r9, r10);
((long long *) buffer)[0] = result;
ret = sendwait(bss, clientfd, buffer, 8);
@ -1487,7 +1495,7 @@ static s32 startTCPGeckoThread(s32 argc, void *argv) {
bss = (struct pygecko_bss_t *) memalign(0x40, sizeof(struct pygecko_bss_t));
if (bss == 0)
return 0;
return (s32) 0;
memset(bss, 0, sizeof(struct pygecko_bss_t));
if (OSCreateThread(&bss->thread, (s32 (*)(s32, void *)) runTCPGeckoServer, 1, bss,
@ -1518,13 +1526,15 @@ static s32 startTCPGeckoThread(s32 argc, void *argv) {
executeAssembly();
}
if (areSDCheatsEnabled) {
considerApplyingSDCheats();
}
}
} else {
log_print("Code handler not installed...\n");
}
return 0;
return (s32) 0;
}
void startTCPGecko() {
@ -1542,7 +1552,8 @@ void startTCPGecko() {
int status = OSCreateThread(thread, startTCPGeckoThread, (s32) 1,
NULL, (s32)(stack + sizeof(stack)),
sizeof(stack), 0,
(OS_THREAD_ATTR_AFFINITY_CORE1 | OS_THREAD_ATTR_PINNED_AFFINITY | OS_THREAD_ATTR_DETACH));
(OS_THREAD_ATTR_AFFINITY_CORE1 | OS_THREAD_ATTR_PINNED_AFFINITY |
OS_THREAD_ATTR_DETACH));
ASSERT_INTEGER(status, 1, "Creating TCP Gecko thread")
// OSSetThreadName(thread, "TCP Gecko");
OSResumeThread(thread);

4
src/title.c
View File

@ -2,7 +2,7 @@
#include "title.h"
bool isRunningTitleID(unsigned long long int japaneseTitleID) {
unsigned long long int currentTitleID = (unsigned long long int) OSGetTitleID();
u64 currentTitleID = OSGetTitleID();
return currentTitleID == japaneseTitleID // JAP
|| currentTitleID == japaneseTitleID + 0x100 // USA
|| currentTitleID == japaneseTitleID + 0x200; // EUR
@ -12,6 +12,6 @@ bool isRunningAllowedTitleID() {
return OSGetTitleID != 0
&& !isRunningTitleID(TITLE_ID_MII_VERSE)
&& !isRunningTitleID(TITLE_ID_MII_MAKER)
&& !isRunningTitleID(TITLE_ID_BAYONETTA_2)
// && !isRunningTitleID(TITLE_ID_BAYONETTA_2)
&& !isRunningTitleID(TITLE_ID_INTERNET_BROWSER);
}

BIN
tcpgecko.elf
View File

Binary file not shown.