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

Improve detection for region free app.

Browse Source
This commit is contained in:
Maschell 2021-10-16 14:10:39 +02:00
parent e90ce0ef0d
commit 2945ca6be1
2 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ConfigUtils.cpp
View File

@ -274,8 +274,6 @@ void ConfigUtils::displayMenu() {
// draw buttons // draw buttons
uint32_t index = 8 + 24 + 8 + 4; uint32_t index = 8 + 24 + 8 + 4;
DEBUG_FUNCTION_LINE("%d", selectedBtn);
DrawUtils::setFontColor(COLOR_TEXT); DrawUtils::setFontColor(COLOR_TEXT);
DrawUtils::setFontSize(24); DrawUtils::setFontSize(24);

74
src/main.cpp
View File

@ -28,7 +28,7 @@ WUPS_PLUGIN_LICENSE("GPL");
WUPS_USE_WUT_DEVOPTAB(); WUPS_USE_WUT_DEVOPTAB();
WUPS_USE_STORAGE("region_free_plugin"); WUPS_USE_STORAGE("region_free_plugin");
bool getRealProductArea(MCPRegion* out); bool getRealProductArea(MCPRegion *out);
INITIALIZE_PLUGIN() { INITIALIZE_PLUGIN() {
WHBLogUdpInit(); WHBLogUdpInit();
@ -104,6 +104,24 @@ DECL_FUNCTION(int32_t, ACPGetTitleMetaXmlByDevice, uint32_t titleid_upper, uint3
} }
ON_FUNCTIONS_PATCHED() { ON_FUNCTIONS_PATCHED() {
MCPRegion real_product_area;
auto real_product_area_valid = getRealProductArea(&real_product_area);
if(real_product_area_valid){
if(real_product_area == MCP_REGION_EUROPE){
gDefaultProductArea = MCP_REGION_EUROPE;
gDefaultLanguage = gDefaultLangForEUR;
gDefaultCountry = gDefaultCountryForEUR;
} else if(real_product_area == MCP_REGION_JAPAN){
gDefaultProductArea = MCP_REGION_JAPAN;
gDefaultLanguage = gDefaultLangForJPN;
gDefaultCountry = gDefaultCountryForJPN;
}if(real_product_area == MCP_REGION_USA){
gDefaultProductArea = MCP_REGION_USA;
gDefaultLanguage = gDefaultLangForUSA;
gDefaultCountry = gDefaultCountryForUSA;
}
}
bool forceConfigMenu = false; bool forceConfigMenu = false;
auto *acpMetaXml = (ACPMetaXml *) memalign(0x40, 0x4000); auto *acpMetaXml = (ACPMetaXml *) memalign(0x40, 0x4000);
@ -114,24 +132,28 @@ ON_FUNCTIONS_PATCHED() {
auto res = real_ACPGetLaunchMetaXml(acpMetaXml); auto res = real_ACPGetLaunchMetaXml(acpMetaXml);
if (res >= 0) { if (res >= 0) {
regionFromXML = acpMetaXml->region; regionFromXML = acpMetaXml->region;
if (OSGetTitleID() == 0x0005001010040000L || acpMetaXml->region == 1) { if (real_product_area_valid && (regionFromXML & real_product_area) == real_product_area) {
DEBUG_FUNCTION_LINE("Set default to JAPAN"); gCurrentProductArea = real_product_area;
gDefaultProductArea = MCP_REGION_JAPAN;
gDefaultLanguage = gDefaultLangForJPN;
gDefaultCountry = gDefaultCountryForJPN;
} else if (OSGetTitleID() == 0x0005001010040100L || acpMetaXml->region == 2) {
DEBUG_FUNCTION_LINE("Set default to USA");
gDefaultProductArea = MCP_REGION_USA;
gDefaultLanguage = gDefaultLangForUSA;
gDefaultCountry = gDefaultCountryForUSA;
} else if (OSGetTitleID() == 0x0005001010040200L || acpMetaXml->region == 4) {
DEBUG_FUNCTION_LINE("Set default to EUR");
gDefaultProductArea = MCP_REGION_EUROPE;
gDefaultLanguage = gDefaultLangForEUR;
gDefaultCountry = gDefaultCountryForEUR;
} else { } else {
DEBUG_FUNCTION_LINE("Unknown area %d, forcing language will be disabled", acpMetaXml->region); if (OSGetTitleID() == 0x0005001010040000L || acpMetaXml->region == 1) {
forceConfigMenu = true; DEBUG_FUNCTION_LINE("Set default to JAPAN");
gDefaultProductArea = MCP_REGION_JAPAN;
gDefaultLanguage = gDefaultLangForJPN;
gDefaultCountry = gDefaultCountryForJPN;
} else if (OSGetTitleID() == 0x0005001010040100L || acpMetaXml->region == 2) {
DEBUG_FUNCTION_LINE("Set default to USA");
gDefaultProductArea = MCP_REGION_USA;
gDefaultLanguage = gDefaultLangForUSA;
gDefaultCountry = gDefaultCountryForUSA;
} else if (OSGetTitleID() == 0x0005001010040200L || acpMetaXml->region == 4) {
DEBUG_FUNCTION_LINE("Set default to EUR");
gDefaultProductArea = MCP_REGION_EUROPE;
gDefaultLanguage = gDefaultLangForEUR;
gDefaultCountry = gDefaultCountryForEUR;
} else {
DEBUG_FUNCTION_LINE("Unknown area %08X, forcing language will be disabled", acpMetaXml->region);
forceConfigMenu = true;
}
} }
} else { } else {
forceConfigMenu = true; forceConfigMenu = true;
@ -147,14 +169,12 @@ ON_FUNCTIONS_PATCHED() {
gCurrentCountry = gDefaultCountry; gCurrentCountry = gDefaultCountry;
gCurrentProductArea = gDefaultProductArea; gCurrentProductArea = gDefaultProductArea;
MCPRegion real_product_area; if (gPreferSystemSettings && real_product_area_valid) {
if(gPreferSystemSettings && getRealProductArea(&real_product_area)){ if ((regionFromXML & real_product_area) == real_product_area) {
if((regionFromXML & real_product_area) == real_product_area){
gCurrentProductArea = real_product_area; gCurrentProductArea = real_product_area;
auto ucHandle = UCOpen(); auto ucHandle = UCOpen();
if(ucHandle >= 0){ if (ucHandle >= 0) {
DEBUG_FUNCTION_LINE("Got UCHandle %08X0", ucHandle);
UCSysConfig sysConfig; UCSysConfig sysConfig;
memset((void *) &sysConfig, 0, sizeof(sysConfig)); memset((void *) &sysConfig, 0, sizeof(sysConfig));
uint32_t data = 0xFFFFFFFF; uint32_t data = 0xFFFFFFFF;
@ -164,7 +184,7 @@ ON_FUNCTIONS_PATCHED() {
strncpy(sysConfig.name, "cafe.language", 64); strncpy(sysConfig.name, "cafe.language", 64);
int ucRes = real_UCReadSysConfig(ucHandle, 1, &sysConfig); int ucRes = real_UCReadSysConfig(ucHandle, 1, &sysConfig);
if(ucRes >= 0){ if (ucRes >= 0) {
DEBUG_FUNCTION_LINE("Force default language to system title for own region"); DEBUG_FUNCTION_LINE("Force default language to system title for own region");
gCurrentLanguage = static_cast<Lanuages>(*(uint32_t *) sysConfig.data); gCurrentLanguage = static_cast<Lanuages>(*(uint32_t *) sysConfig.data);
gDefaultLanguage = static_cast<Lanuages>(*(uint32_t *) sysConfig.data); gDefaultLanguage = static_cast<Lanuages>(*(uint32_t *) sysConfig.data);
@ -532,8 +552,8 @@ static const uint64_t
}, },
}; };
bool getRealProductArea(MCPRegion* out){ bool getRealProductArea(MCPRegion *out) {
if(out == nullptr){ if (out == nullptr) {
return false; return false;
} }
auto handle = MCP_Open(); auto handle = MCP_Open();
@ -552,7 +572,7 @@ bool getRealProductArea(MCPRegion* out){
DECL_FUNCTION(uint64_t, _SYSGetSystemApplicationTitleIdByProdArea, SYSTEM_APP_ID param_1, MCPRegion param_2) { DECL_FUNCTION(uint64_t, _SYSGetSystemApplicationTitleIdByProdArea, SYSTEM_APP_ID param_1, MCPRegion param_2) {
MCPRegion cur_product_area; MCPRegion cur_product_area;
if(!getRealProductArea(&cur_product_area)){ if (!getRealProductArea(&cur_product_area)) {
DEBUG_FUNCTION_LINE("Failed to get real region"); DEBUG_FUNCTION_LINE("Failed to get real region");
cur_product_area = param_2; cur_product_area = param_2;
} }