The-Homebrew-Cloud/Any-Region-Changer-ModMii-Edition
2
0
Fork 0
mirror of https://github.com/modmii/Any-Region-Changer-ModMii-Edition.git synced 2024-06-02 15:28:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Run automattic code formatting

Browse Source
This commit is contained in:
TheShadowEevee 2022-04-20 20:38:39 -05:00
parent ccbdddd2f2
commit 08c9eb7710
No known key found for this signature in database
GPG Key ID: 7A8AA92B3BAFAB75
14 changed files with 1742 additions and 1387 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
source/detect_settings.c
View File

@ -34,22 +34,25 @@ distribution.
#include "wiibasics.h"
#include "detect_settings.h"
u16 get_installed_title_version(u64 title) {
u16 get_installed_title_version(u64 title)
{
s32 ret, fd;
static char filepath[256] ATTRIBUTE_ALIGN(32);
// Check to see if title exists
if (ES_GetDataDir(title, filepath) >= 0 ) {
if (ES_GetDataDir(title, filepath) >= 0)
{
u32 tmd_size;
static u8 tmd_buf[MAX_SIGNED_TMD_SIZE] ATTRIBUTE_ALIGN(32);
ret = ES_GetStoredTMDSize(title, &tmd_size);
if (ret < 0){
if (ret < 0)
{
// If we fail to use the ES function, try reading manually
// This is a workaround added since some IOS (like 21) don't like our
// call to ES_GetStoredTMDSize
//printf("Error! ES_GetStoredTMDSize: %d\n", ret);
// printf("Error! ES_GetStoredTMDSize: %d\n", ret);
sprintf(filepath, "/title/%08lx/%08lx/content/title.tmd", TITLE_UPPER(title), TITLE_LOWER(title));
@ -69,7 +72,7 @@ u16 get_installed_title_version(u64 title) {
return 0;
}
ret = ISFS_Read(fd,tmd_buf,2);
ret = ISFS_Read(fd, tmd_buf, 2);
if (ret < 0)
{
printf("Error! ISFS_Read (ret = %ld)\n", ret);
@ -84,41 +87,45 @@ u16 get_installed_title_version(u64 title) {
}
return be16(tmd_buf);
} else {
}
else
{
// Normal versions of IOS won't have a problem, so we do things the "right" way.
// Some of this code adapted from bushing's title_lister.c
signed_blob *s_tmd = (signed_blob *)tmd_buf;
ret = ES_GetStoredTMD(title, s_tmd, tmd_size);
if (ret < 0){
if (ret < 0)
{
printf("Error! ES_GetStoredTMD: %ld\n", ret);
return -1;
}
tmd *t = SIGNATURE_PAYLOAD(s_tmd);
return t->title_version;
}
}
return 0;
}
u64 get_title_ios(u64 title) {
u64 get_title_ios(u64 title)
{
s32 ret, fd;
static char filepath[256] ATTRIBUTE_ALIGN(32);
// Check to see if title exists
if (ES_GetDataDir(title, filepath) >= 0 ) {
if (ES_GetDataDir(title, filepath) >= 0)
{
u32 tmd_size;
static u8 tmd_buf[MAX_SIGNED_TMD_SIZE] ATTRIBUTE_ALIGN(32);
ret = ES_GetStoredTMDSize(title, &tmd_size);
if (ret < 0){
if (ret < 0)
{
// If we fail to use the ES function, try reading manually
// This is a workaround added since some IOS (like 21) don't like our
// call to ES_GetStoredTMDSize
//printf("Error! ES_GetStoredTMDSize: %d\n", ret);
// printf("Error! ES_GetStoredTMDSize: %d\n", ret);
sprintf(filepath, "/title/%08lx/%08lx/content/title.tmd", TITLE_UPPER(title), TITLE_LOWER(title));
@ -138,7 +145,7 @@ u64 get_title_ios(u64 title) {
return 0;
}
ret = ISFS_Read(fd,tmd_buf,8);
ret = ISFS_Read(fd, tmd_buf, 8);
if (ret < 0)
{
printf("Error! ISFS_Read (ret = %ld)\n", ret);
@ -153,21 +160,22 @@ u64 get_title_ios(u64 title) {
}
return be64(tmd_buf);
} else {
}
else
{
// Normal versions of IOS won't have a problem, so we do things the "right" way.
// Some of this code adapted from bushing's title_lister.c
signed_blob *s_tmd = (signed_blob *)tmd_buf;
ret = ES_GetStoredTMD(title, s_tmd, tmd_size);
if (ret < 0){
if (ret < 0)
{
printf("Error! ES_GetStoredTMD: %ld\n", ret);
return -1;
}
tmd *t = SIGNATURE_PAYLOAD(s_tmd);
return t->sys_version;
}
}
return 0;
}
@ -180,10 +188,9 @@ char get_sysmenu_region(void)
static u8 fbuffer[0x500] ATTRIBUTE_ALIGN(32);
static tikview viewdata[0x10] ATTRIBUTE_ALIGN(32);
u32 views;
static u64 tid ATTRIBUTE_ALIGN(32) = TITLE_ID(1,2);
static u64 tid ATTRIBUTE_ALIGN(32) = TITLE_ID(1, 2);
u8 region, match[] = "FINAL";
/*ret = ES_SetUID(TITLE_ID(1,2));
if (ret){
printf("Error! ES_GetSetUID %d\n", ret);
@ -211,17 +218,21 @@ char get_sysmenu_region(void)
}*/
ret = ES_GetNumTicketViews(tid, &views);
if (ret < 0) {
if (ret < 0)
{
printf(" Error! ES_GetNumTickets (ret = %ld)\n", ret);
wait_anyKey();
return ret;
}
if (!views) {
if (!views)
{
printf(" No tickets found!\n");
wait_anyKey();
return 0;
} else if (views > 16) {
}
else if (views > 16)
{
printf(" Too many ticket views! (views = %ld)\n", views);
wait_anyKey();
return 0;
@ -245,9 +256,10 @@ char get_sysmenu_region(void)
cfd = ret;
region = 0;
while (!region){
while (!region)
{
int i;
ret = ES_ReadContent(cfd,fbuffer,0x500);
ret = ES_ReadContent(cfd, fbuffer, 0x500);
if (ret < 0)
{
printf("Error! ES_ReadContent (ret = %ld)\n", ret);
@ -255,15 +267,17 @@ char get_sysmenu_region(void)
return 0;
}
for(i=0;i<0x500;i++) {
if (fbuffer[i] == 'F'){
if (!memcmp(&fbuffer[i], match, 6)){
region = fbuffer[i+6];
for (i = 0; i < 0x500; i++)
{
if (fbuffer[i] == 'F')
{
if (!memcmp(&fbuffer[i], match, 6))
{
region = fbuffer[i + 6];
break;
}
}
}
}
ret = ES_CloseContent(cfd);
if (ret < 0)
@ -273,7 +287,8 @@ char get_sysmenu_region(void)
return 0;
}
switch (region){
switch (region)
{
case 'U':
case 'E':
case 'J':

6
source/detect_settings.h
View File

@ -29,13 +29,13 @@ distribution.
#ifndef __SYSMENU_DETECT_H_
#define __SYSMENU_DETECT_H_
//Get the title version of a given title
// Get the title version of a given title
u16 get_installed_title_version(u64 title);
//Get the IOS version of a given title
// Get the IOS version of a given title
u64 get_title_ios(u64 title);
//Get the region that the System menu is currently using
// Get the region that the System menu is currently using
char get_sysmenu_region(void);
#endif

42
source/gecko.c
View File

@ -10,7 +10,6 @@
//#include "fat2.h"
//#include "install.h"
/* init-globals */
static bool geckoinit = false;
char DirPath[64] = "Fat:/debug";
@ -26,16 +25,16 @@ void gprintf(const char *format, ...)
if (!geckoinit)
return;
char * tmp = NULL;
char *tmp = NULL;
va_list va;
va_start(va, format);
if((vasprintf(&tmp, format, va) >= 0) && tmp)
if ((vasprintf(&tmp, format, va) >= 0) && tmp)
{
usb_sendbuffer(1, tmp, strlen(tmp));
}
va_end(va);
if(tmp)
if (tmp)
free(tmp);
}
@ -51,35 +50,38 @@ bool InitGecko()
return false;
}
void gecko_log(const char *format, ...) {
//ret = Fat_MakeDir(DirPath);
//void *f = NULL;
void gecko_log(const char *format, ...)
{
// ret = Fat_MakeDir(DirPath);
// void *f = NULL;
gprintf("\n\n Fat Make Dir ret[%i] \n\n", ret);
if (!geckoinit)
return;
char * tmp = NULL;
char *tmp = NULL;
va_list va;
va_start(va, format);
if((vasprintf(&tmp, format, va) >= 0) && tmp)
if ((vasprintf(&tmp, format, va) >= 0) && tmp)
{
sprintf(SavePath, "%s/debug.log", DirPath);
//f = &tmp;
//Fat_SaveFilelog(SavePath, f, strlen(tmp));
// f = &tmp;
// Fat_SaveFilelog(SavePath, f, strlen(tmp));
// usb_sendbuffer(1, tmp, strlen(tmp));
}
va_end(va);
//if(tmp)
// if(tmp)
// free(tmp);
tmp = NULL;
//f = NULL;
// f = NULL;
}
char ascii2(char s)
{
if (s < 0x20) return '.';
if (s > 0x7E) return '.';
if (s < 0x20)
return '.';
if (s > 0x7E)
return '.';
return s;
}
@ -87,7 +89,7 @@ void hexdump2(void *d, int len)
{
u8 *data;
int i, off;
data = (u8*) d;
data = (u8 *)d;
gprintf("\n 0 1 2 3 4 5 6 7 8 9 A B C D E F 0123456789ABCDEF");
gprintf("\n==== =============================================== ================\n");
@ -98,20 +100,22 @@ void hexdump2(void *d, int len)
for (i = 0; i < 16; i++)
if ((i + off) >= len)
gprintf(" ");
else gprintf("%02x ", data[off + i]);
else
gprintf("%02x ", data[off + i]);
gprintf(" ");
for (i = 0; i < 16; i++)
if ((i + off) >= len)
gprintf(" ");
else gprintf("%c", ascii2(data[off + i]));
else
gprintf("%c", ascii2(data[off + i]));
gprintf("\n");
}
}
static ssize_t __out_write(struct _reent *r, int fd, const char *ptr, size_t len)
{
if(geckoinit && ptr)
if (geckoinit && ptr)
{
usb_sendbuffer(1, ptr, len);
}

15
source/gecko.h
View File

@ -9,22 +9,21 @@ extern "C"
char ascii2(char s);
//#ifndef NO_DEBUG
//use this just like printf();
//#ifndef NO_DEBUG
// use this just like printf();
void gprintf(const char *str, ...);
bool InitGecko();
void hexdump2(void *d, int len);
void USBGeckoOutput();
void gecko_log(const char *str, ...);
//#else
//#define gprintf(...)
//#define InitGecko() false
//#define hexdump( x, y )
//#endif /* NO_DEBUG */
//#else
//#define gprintf(...)
//#define InitGecko() false
//#define hexdump( x, y )
//#endif /* NO_DEBUG */
#ifdef __cplusplus
}
#endif
#endif

120
source/id.c
View File

@ -37,12 +37,10 @@ distribution.
#include "sha1.h"
#include "certs_dat.h"
/* Debug functions adapted from libogc's es.c */
//#define DEBUG_ES
//#define DEBUG_IDENT
#define ISALIGNED(x) ((((u32)x)&0x1F)==0)
#define ISALIGNED(x) ((((u32)x) & 0x1F) == 0)
static u8 su_tmd[0x208] ATTRIBUTE_ALIGN(32);
static u8 su_tik[STD_SIGNED_TIK_SIZE] ATTRIBUTE_ALIGN(32);
@ -54,37 +52,45 @@ s32 __sanity_check_certlist(const signed_blob *certs, u32 certsize)
int count = 0;
signed_blob *end;
if(!certs || !certsize) return 0;
if (!certs || !certsize)
return 0;
end = (signed_blob*)(((u8*)certs) + certsize);
while(certs != end) {
end = (signed_blob *)(((u8 *)certs) + certsize);
while (certs != end)
{
#ifdef DEBUG_ES
printf("Checking certificate at %p\n",certs);
printf("Checking certificate at %p\n", certs);
#endif
certs = ES_NextCert(certs);
if(!certs) return 0;
if (!certs)
return 0;
count++;
}
#ifdef DEBUG_ES
printf("Num of certificates: %d\n",count);
printf("Num of certificates: %d\n", count);
#endif
return count;
}
#endif
void zero_sig(signed_blob *sig) {
void zero_sig(signed_blob *sig)
{
u8 *sig_ptr = (u8 *)sig;
memset(sig_ptr + 4, 0, SIGNATURE_SIZE(sig)-4);
memset(sig_ptr + 4, 0, SIGNATURE_SIZE(sig) - 4);
}
void brute_tmd(tmd *p_tmd) {
void brute_tmd(tmd *p_tmd)
{
u16 fill;
for(fill=0; fill<65535; fill++) {
p_tmd->fill2=fill;
for (fill = 0; fill < 65535; fill++)
{
p_tmd->fill2 = fill;
sha1 hash;
// debug_printf("SHA1(%p, %x, %p)\n", p_tmd, TMD_SIZE(p_tmd), hash);
SHA1((u8 *)p_tmd, TMD_SIZE(p_tmd), hash);;
SHA1((u8 *)p_tmd, TMD_SIZE(p_tmd), hash);
;
if (hash[0]==0) {
if (hash[0] == 0)
{
// debug_printf("setting fill3 to %04hx\n", fill);
return;
}
@ -93,49 +99,53 @@ void brute_tmd(tmd *p_tmd) {
exit(4);
}
void brute_tik(tik *p_tik) {
void brute_tik(tik *p_tik)
{
u16 fill;
for(fill=0; fill<65535; fill++) {
p_tik->padding=fill;
for (fill = 0; fill < 65535; fill++)
{
p_tik->padding = fill;
sha1 hash;
// debug_printf("SHA1(%p, %x, %p)\n", p_tmd, TMD_SIZE(p_tmd), hash);
SHA1((u8 *)p_tik, sizeof(tik), hash);
if (hash[0]==0) return;
if (hash[0] == 0)
return;
}
printf("Unable to fix tik :(\n");
exit(5);
}
void forge_tmd(signed_blob *s_tmd) {
// debug_printf("forging tmd sig");
void forge_tmd(signed_blob *s_tmd)
{
// debug_printf("forging tmd sig");
zero_sig(s_tmd);
brute_tmd(SIGNATURE_PAYLOAD(s_tmd));
}
void forge_tik(signed_blob *s_tik) {
// debug_printf("forging tik sig");
void forge_tik(signed_blob *s_tik)
{
// debug_printf("forging tik sig");
zero_sig(s_tik);
brute_tik(SIGNATURE_PAYLOAD(s_tik));
}
void Make_SUID(void) {
void Make_SUID(void)
{
signed_blob *s_tmd, *s_tik;
tmd *p_tmd;
tik *p_tik;
memset(su_tmd, 0, sizeof su_tmd);
memset(su_tik, 0, sizeof su_tik);
s_tmd = (signed_blob*)&su_tmd[0];
s_tik = (signed_blob*)&su_tik[0];
s_tmd = (signed_blob *)&su_tmd[0];
s_tik = (signed_blob *)&su_tik[0];
*s_tmd = *s_tik = 0x10001;
p_tmd = (tmd*)SIGNATURE_PAYLOAD(s_tmd);
p_tik = (tik*)SIGNATURE_PAYLOAD(s_tik);
p_tmd = (tmd *)SIGNATURE_PAYLOAD(s_tmd);
p_tik = (tik *)SIGNATURE_PAYLOAD(s_tik);
strcpy(p_tmd->issuer, "Root-CA00000001-CP00000004");
p_tmd->title_id = TITLE_ID(1,2);
p_tmd->title_id = TITLE_ID(1, 2);
p_tmd->num_contents = 1;
@ -143,21 +153,23 @@ void Make_SUID(void) {
strcpy(p_tik->issuer, "Root-CA00000001-XS00000003");
p_tik->ticketid = 0x000038A45236EE5FLL;
p_tik->titleid = TITLE_ID(1,2);
p_tik->titleid = TITLE_ID(1, 2);
memset(p_tik->cidx_mask, 0xFF, 0x20);
forge_tik(s_tik);
su_id_filled = 1;
}
s32 Identify(const u8 *certs, u32 certs_size, const u8 *idtmd, u32 idtmd_size, const u8 *idticket, u32 idticket_size) {
s32 Identify(const u8 *certs, u32 certs_size, const u8 *idtmd, u32 idtmd_size, const u8 *idticket, u32 idticket_size)
{
s32 ret;
u32 keyid = 0;
ret = ES_Identify((signed_blob*)certs, certs_size, (signed_blob*)idtmd, idtmd_size, (signed_blob*)idticket, idticket_size, &keyid);
if (ret < 0){
switch(ret){
ret = ES_Identify((signed_blob *)certs, certs_size, (signed_blob *)idtmd, idtmd_size, (signed_blob *)idticket, idticket_size, &keyid);
if (ret < 0)
{
switch (ret)
{
case ES_EINVAL:
printf("Error! ES_Identify (ret = %ld;) Data invalid!\n", ret);
break;
@ -176,11 +188,14 @@ s32 Identify(const u8 *certs, u32 certs_size, const u8 *idtmd, u32 idtmd_size, c
}
#ifdef DEBUG_IDENT
printf("\tTicket: %u Std: %u Max: %u\n", idticket_size, STD_SIGNED_TIK_SIZE, MAX_SIGNED_TMD_SIZE);
printf("\tTMD invalid? %d %d %d Tik invalid? %d %d\n", !(signed_blob*)idtmd, !idtmd_size, !IS_VALID_SIGNATURE((signed_blob*)idtmd), !(signed_blob*)idticket, !IS_VALID_SIGNATURE((signed_blob*)idticket));
printf("\tCerts: Sane? %d\n", __sanity_check_certlist((signed_blob*)certs, certs_size));
if (!ISALIGNED(certs)) printf("\tCertificate data is not aligned!\n");
if (!ISALIGNED(idtmd)) printf("\tTMD data is not aligned!\n");
if (!ISALIGNED(idticket)) printf("\tTicket data is not aligned!\n");
printf("\tTMD invalid? %d %d %d Tik invalid? %d %d\n", !(signed_blob *)idtmd, !idtmd_size, !IS_VALID_SIGNATURE((signed_blob *)idtmd), !(signed_blob *)idticket, !IS_VALID_SIGNATURE((signed_blob *)idticket));
printf("\tCerts: Sane? %d\n", __sanity_check_certlist((signed_blob *)certs, certs_size));
if (!ISALIGNED(certs))
printf("\tCertificate data is not aligned!\n");
if (!ISALIGNED(idtmd))
printf("\tTMD data is not aligned!\n");
if (!ISALIGNED(idticket))
printf("\tTicket data is not aligned!\n");
#endif
}
else
@ -188,8 +203,8 @@ s32 Identify(const u8 *certs, u32 certs_size, const u8 *idtmd, u32 idtmd_size, c
return ret;
}
s32 Identify_SU(void) {
s32 Identify_SU(void)
{
if (!su_id_filled)
Make_SUID();
@ -198,10 +213,11 @@ s32 Identify_SU(void) {
return Identify(certs_dat, certs_dat_size, su_tmd, sizeof su_tmd, su_tik, sizeof su_tik);
}
s32 Identify_SysMenu(void) {
s32 Identify_SysMenu(void)
{
s32 ret;
u32 sysmenu_tmd_size, sysmenu_ticket_size;
//static u8 certs[0xA00] ATTRIBUTE_ALIGN(32);
// static u8 certs[0xA00] ATTRIBUTE_ALIGN(32);
static u8 sysmenu_tmd[MAX_SIGNED_TMD_SIZE] ATTRIBUTE_ALIGN(32);
static u8 sysmenu_ticket[STD_SIGNED_TIK_SIZE] ATTRIBUTE_ALIGN(32);
@ -213,15 +229,17 @@ s32 Identify_SysMenu(void) {
}*/
printf("\nPulling Sysmenu TMD...");
ret = ISFS_ReadFileToArray ("/title/00000001/00000002/content/title.tmd", sysmenu_tmd, MAX_SIGNED_TMD_SIZE, &sysmenu_tmd_size);
if (ret < 0) {
ret = ISFS_ReadFileToArray("/title/00000001/00000002/content/title.tmd", sysmenu_tmd, MAX_SIGNED_TMD_SIZE, &sysmenu_tmd_size);
if (ret < 0)
{
printf("\tReading TMD failed!\n");
return -1;
}
printf("\nPulling Sysmenu Ticket...");
ret = ISFS_ReadFileToArray ("/ticket/00000001/00000002.tik", sysmenu_ticket, STD_SIGNED_TIK_SIZE, &sysmenu_ticket_size);
if (ret < 0) {
ret = ISFS_ReadFileToArray("/ticket/00000001/00000002.tik", sysmenu_ticket, STD_SIGNED_TIK_SIZE, &sysmenu_ticket_size);
if (ret < 0)
{
printf("\tReading TMD failed!\n");
return -1;
}

215
source/main.c
View File

@ -59,7 +59,8 @@ char regions[][ITEMS] = {"Japan ", "USA ", "Europe ", "Korea "};
char vmodes[][ITEMS] = {"NTSC ", "PAL ", "MPAL "};
char eulas[][ITEMS] = {"Unread ", "Read "};
void draw_credits() {
void draw_credits()
{
ClearScreen();
PrintBanner();
Console_SetPosition(3, 0);
@ -75,12 +76,13 @@ void draw_credits() {
printf("\t- TheShadowEevee - KR region support \n");
printf("\t- To Many Coders To Thank For The Great Code I Used ..... \n");
printf("\n");
Console_SetPosition(26,0);
Console_SetPosition(26, 0);
ClearLine();
Console_SetPosition(26, 20);
printf("Press Any Button To Return ..... ");
}
void Draw_Disclaimer() {
void Draw_Disclaimer()
{
ClearScreen();
PrintBanner();
printf("\n\t This software comes supplied with absolutely no warranty.\n");
@ -100,67 +102,89 @@ void Draw_Disclaimer() {
printf("\n\n\n\n\t\t\t\t[A] Continue [Home] Exit\n");
wait_key(WPAD_BUTTON_A);
}
void handleError(const char* string, int errorval){
void handleError(const char *string, int errorval)
{
printf("Unexpected Error: %s Value: %d\n", string, errorval);
printf("Press any key to quit\n");
wait_anyKey();
exit(0);
}
void getSettings(void){
void getSettings(void)
{
int ret;
lang = SYSCONF_GetLanguage();
area = SYSCONF_GetArea();
game = SYSCONF_GetRegion();
video = SYSCONF_GetVideo();
eula = SYSCONF_GetEULA();
if (lang < 0 || area < 0 || game < 0 || video < 0 || (eula != SYSCONF_ENOENT && eula < 0)){
if (lang < 0 || area < 0 || game < 0 || video < 0 || (eula != SYSCONF_ENOENT && eula < 0))
{
printf("Error getting settings! %d, %d, %d, %d, %d\n", lang, area, game, video, eula);
wait_anyKey();
exit(1);
}
if (SYSCONF_GetLength("IPL.SADR") != SADR_LENGTH) handleError("IPL.SADR Length Incorrect", SYSCONF_GetLength("IPL.SADR"));
if (SYSCONF_GetLength("IPL.SADR") != SADR_LENGTH)
handleError("IPL.SADR Length Incorrect", SYSCONF_GetLength("IPL.SADR"));
ret = SYSCONF_Get("IPL.SADR", sadr, SADR_LENGTH);
if (ret < 0 ) handleError("SYSCONF_Get IPL.SADR", ret);
if (ret < 0)
handleError("SYSCONF_Get IPL.SADR", ret);
country = sadr[0];
gprintf("\n\ncountry[%i] \n\n", country);
}
void saveSettings(void){
void saveSettings(void)
{
Console_SetPosition(24, 0);
int ret = 0;
if (lang != SYSCONF_GetLanguage()) ret = SYSCONF_SetLanguage(lang);
if (ret) handleError("SYSCONF_SetLanguage", ret);
if (area != SYSCONF_GetArea()) ret = SYSCONF_SetArea(area);
if (ret) handleError("SYSCONF_SetArea", ret);
if(game != SYSCONF_GetRegion()) ret = SYSCONF_SetRegion(game);
if (ret) handleError("SYSCONF_SetRegion", ret);
if (video != SYSCONF_GetVideo()) ret = SYSCONF_SetVideo(video);
if (ret) handleError("SYSCONF_SetVideo", ret);
if (eula != SYSCONF_GetEULA()) ret = SYSCONF_SetEULA(eula);
if (ret) handleError("SYSCONF_SetEULA", ret);
if (lang != SYSCONF_GetLanguage())
ret = SYSCONF_SetLanguage(lang);
if (ret)
handleError("SYSCONF_SetLanguage", ret);
if (area != SYSCONF_GetArea())
ret = SYSCONF_SetArea(area);
if (ret)
handleError("SYSCONF_SetArea", ret);
if (game != SYSCONF_GetRegion())
ret = SYSCONF_SetRegion(game);
if (ret)
handleError("SYSCONF_SetRegion", ret);
if (video != SYSCONF_GetVideo())
ret = SYSCONF_SetVideo(video);
if (ret)
handleError("SYSCONF_SetVideo", ret);
if (eula != SYSCONF_GetEULA())
ret = SYSCONF_SetEULA(eula);
if (ret)
handleError("SYSCONF_SetEULA", ret);
if (country != sadr[0]){
if (country != sadr[0])
{
memset(sadr, 0, SADR_LENGTH);
sadr[0] = country;
ret = SYSCONF_Set("IPL.SADR", sadr, SADR_LENGTH);
if (ret) handleError("SYSCONF_Set IPL.SADR", ret);
if (ret)
handleError("SYSCONF_Set IPL.SADR", ret);
}
//wait_anyKey();
// wait_anyKey();
printf("Saving...");
ret = SYSCONF_SaveChanges();
if (ret < 0) handleError("SYSCONF_SaveChanges", ret);
else printf("OK!\n");
if (ret < 0)
handleError("SYSCONF_SaveChanges", ret);
else
printf("OK!\n");
printf("Press any key to continue .....");
wait_anyKey();
}
void updateSelected(int delta){
if (selected + delta >= ITEMS || selected + delta < 0) return;
void updateSelected(int delta)
{
if (selected + delta >= ITEMS || selected + delta < 0)
return;
if (delta != 0){
if (delta != 0)
{
// Remove the cursor from the last selected item
page_contents[selected][1] = ' ';
page_contents[selected][45] = ' ';
@ -175,14 +199,15 @@ void updateSelected(int delta){
page_contents[selected][57] = '>';
}
void updatePage(void){
void updatePage(void)
{
sprintf(page_contents[0], " %-40s %10s \n", "Language Setting:", languages[lang]);
sprintf(page_contents[1], " %-40s %10s \n", "Console Area Setting:", areas[area]);
sprintf(page_contents[2], " %-40s %10s \n", "Game Region Setting:", regions[game]);
sprintf(page_contents[3], " %-40s %10s \n", "Console Video Mode:", vmodes[video]);
sprintf(page_contents[4], " %-40s %10d \n", "Shop Country Code:", country);
sprintf(page_contents[5], " %-40s %10s \n", "Services EULA:", (eula == SYSCONF_ENOENT)?"Disabled":eulas[eula]);
sprintf(page_contents[5], " %-40s %10s \n", "Services EULA:", (eula == SYSCONF_ENOENT) ? "Disabled" : eulas[eula]);
sprintf(page_contents[6], " %-40s %10s \n", "Revert Settings", "Revert ");
sprintf(page_contents[7], " %-40s %10s \n", "Save Settings", "Save ");
sprintf(page_contents[8], " %-40s %10s \n", "Auto Fix Settings ", "Fix ");
@ -191,9 +216,11 @@ void updatePage(void){
updateSelected(0);
}
char AREAtoSysMenuRegion(int area){
char AREAtoSysMenuRegion(int area)
{
// Data based on my own tests with AREA/Sysmenu
switch (area){
switch (area)
{
case 0:
case 5:
case 6:
@ -215,8 +242,9 @@ char AREAtoSysMenuRegion(int area){
}
//---------------------------------------------------------------------------------
int main(int argc, char **argv) {
//---------------------------------------------------------------------------------
int main(int argc, char **argv)
{
//---------------------------------------------------------------------------------
int ret = 0, i;
u16 sysmenu_version;
char sysmenu_region;
@ -225,34 +253,39 @@ int main(int argc, char **argv) {
int Current_Ios = 0;
ret = IOS_ReloadIOS(236);
if(ret != 0) {
if (ret != 0)
{
ret = IOS_ReloadIOS(249);
if(ret != 0) {
if (ret != 0)
{
IosPatch_FULL(true, true, false, false, 58);
}
}
basicInit();
miscInit();
if(InitGecko())
if (InitGecko())
USBGeckoOutput();
Current_Ios = IOS_GetVersion();
gprintf("\n\ncurrent_ios [%i] \n\n", Current_Ios);
sysmenu_version = get_installed_title_version(TITLE_ID(1,2));
sysmenu_version = get_installed_title_version(TITLE_ID(1, 2));
sysmenu_region = get_sysmenu_region();
gprintf("\n\nsysmenu_version[%u] sysmenu_region[%c] \n\n", sysmenu_version, sysmenu_region);
gprintf("Init SYSCONF...");
ret = SYSCONF_Init();
if (ret < 0) handleError("SYSCONF_Init", ret);
else gprintf("OK!\n");
if (ret < 0)
handleError("SYSCONF_Init", ret);
else
gprintf("OK!\n");
getSettings();
region = game;
Draw_Disclaimer();
updatePage();
while(1) {
while (1)
{
PrintBanner();
printf("\n------------------------------------------------------------------------");
@ -288,62 +321,88 @@ int main(int argc, char **argv) {
if (buttons & WPAD_BUTTON_UP)
updateSelected(-1);
if (buttons & WPAD_BUTTON_LEFT){
switch(selected){
if (buttons & WPAD_BUTTON_LEFT)
{
switch (selected)
{
case 0:
if (--lang < 0) lang = 6;
if (--lang < 0)
lang = 6;
break;
case 1:
if (--area < 0) area = 11;
if (--area < 0)
area = 11;
break;
case 2:
if (--game < 0) game = 3;
if (--game < 0)
game = 3;
break;
case 3:
if (--video < 0) video = 2;
if (--video < 0)
video = 2;
break;
case 4:
if (country == 1) country = 136;
else if (country == 49) country = 1;
else if (country == 110) country = 49;
else if (country == 136) country = 110;
if (eula >= 0) eula = 0;
if (country == 1)
country = 136;
else if (country == 49)
country = 1;
else if (country == 110)
country = 49;
else if (country == 136)
country = 110;
if (eula >= 0)
eula = 0;
break;
case 5:
if (eula >= 0) eula = !eula;
if (eula >= 0)
eula = !eula;
break;
}
}
if (buttons & WPAD_BUTTON_RIGHT){
switch(selected){
if (buttons & WPAD_BUTTON_RIGHT)
{
switch (selected)
{
case 0:
if (++lang == 7) lang = 0;
if (++lang == 7)
lang = 0;
break;
case 1:
if (++area == 12) area = 0;
if (++area == 12)
area = 0;
break;
case 2:
if (++game == 4) game = 0;
if (++game == 4)
game = 0;
break;
case 3:
if (++video == 3) video = 0;
if (++video == 3)
video = 0;
break;
case 4:
if (country == 1) country = 49;
else if (country == 49) country = 110;
else if (country == 110) country = 136;
else if (country == 136) country = 1;
if (eula >= 0) eula = 0;
if (country == 1)
country = 49;
else if (country == 49)
country = 110;
else if (country == 110)
country = 136;
else if (country == 136)
country = 1;
if (eula >= 0)
eula = 0;
break;
case 5:
if (eula >= 0) eula = !eula;
if (eula >= 0)
eula = !eula;
break;
}
}
if (buttons & WPAD_BUTTON_A){
switch(selected){
if (buttons & WPAD_BUTTON_A)
{
switch (selected)
{
case 6:
getSettings();
break;
@ -351,28 +410,32 @@ int main(int argc, char **argv) {
saveSettings();
break;
case 8:
if(sysmenu_region == 85) { // usa
if (sysmenu_region == 85)
{ // usa
lang = 1;
area = 1;
game = 1;
video = 0;
country = 49;
}
else if(sysmenu_region == 74) { // jpn
else if (sysmenu_region == 74)
{ // jpn
lang = 0;
area = 0;
game = 0;
video = 0;
country = 1;
}
else if(sysmenu_region == 69) { // EUR/PAL
else if (sysmenu_region == 69)
{ // EUR/PAL
lang = 1;
area = 2;
game = 2;
video = 1;
country = 110;
}
else if(sysmenu_region == 255) { // KOR
else if (sysmenu_region == 255)
{ // KOR
lang = 1;
area = 7;
game = 3;
@ -390,19 +453,21 @@ int main(int argc, char **argv) {
}
}
if (buttons & WPAD_BUTTON_B) {
if (buttons & WPAD_BUTTON_B)
{
selected = 9;
}
if (buttons & WPAD_BUTTON_1) {
if (buttons & WPAD_BUTTON_1)
{
draw_credits();
wait_anyKey();
}
updatePage();
if(needbreak)
if (needbreak)
break;
}
Console_SetPosition(26,30);
Console_SetPosition(26, 30);
Console_SetColors(BLACK, 0, GREEN, 0);
printf("Exiting");
miscDeInit();

44
source/runtimeiospatch.h
View File

@ -30,7 +30,7 @@
/**
*Returns true when HW_AHBPROT access can be applied
*/
#define AHBPROT_DISABLED (*(vu32*)0xcd800064 == 0xFFFFFFFF)
#define AHBPROT_DISABLED (*(vu32 *)0xcd800064 == 0xFFFFFFFF)
//==============================================================================
// Error code definitions:
@ -42,15 +42,16 @@
// C++ header
//==============================================================================
#ifdef __cplusplus
extern "C" {
extern "C"
{
#endif
/* __cplusplus */
/* __cplusplus */
//==============================================================================
// Patchsets:
//==============================================================================
/*
Wii:
//==============================================================================
// Patchsets:
//==============================================================================
/*
Wii:
* DI Readlimit
* ISFS Permissions
* ES SetUID
@ -59,7 +60,7 @@ Wii:
* New Hash Check (aka New Trucha)
* SSL patches
Sciifii:
Sciifii:
* MEM2 Prot
* ES OpenTitleContent 1 & 2
* ES ReadContent Prot
@ -67,16 +68,15 @@ Sciifii:
* ES TitleVersionCheck
* ES TitleDeleteCheck
vWii:
vWii:
* Kill Anti-SystemTitle-Install 1, 2, 3, 4 & 5
*/
*/
//==============================================================================
// Functions:
//==============================================================================
//==============================================================================
// Functions:
//==============================================================================
/**
/**
* This function can be used to keep HW_AHBPROT access when going to reload IOS
* @param verbose Flag determing whether or not to print messages on-screen
* @example
@ -93,10 +93,9 @@ vWii:
* > 0 : Success - return equals to number of applied patches
* ERROR_AHBPROT : Error - No HW_AHBPROT access
*/
s32 IosPatch_AHBPROT(bool verbose);
s32 IosPatch_AHBPROT(bool verbose);
/**
/**
* This function applies patches on current IOS
* @see Patchsets
* @param wii Flag determing whether or not to apply Wii patches.
@ -109,10 +108,9 @@ s32 IosPatch_AHBPROT(bool verbose);
* ERROR_AHBPROT : Error - No HW_AHBPROT access
* ERROR_PATCH : Error - Patching HW_AHBPROT access failed
*/
s32 IosPatch_RUNTIME(bool wii, bool sciifii, bool vwii, bool verbose);
s32 IosPatch_RUNTIME(bool wii, bool sciifii, bool vwii, bool verbose);
/**
/**
* This function combines IosPatch_AHBPROT + IOS_ReloadIOS + IosPatch_RUNTIME
* @see Patchsets
* @param wii Flag determing whether or not to apply Wii patches.
@ -126,7 +124,7 @@ s32 IosPatch_RUNTIME(bool wii, bool sciifii, bool vwii, bool verbose);
* ERROR_AHBPROT : Error - No HW_AHBPROT access
* ERROR_PATCH : Error - Patching HW_AHBPROT access failed
*/
s32 IosPatch_FULL(bool wii, bool sciifii, bool vwii, bool verbose, int IOS);
s32 IosPatch_FULL(bool wii, bool sciifii, bool vwii, bool verbose, int IOS);
//==============================================================================
// C++ footer

190
source/sha1.c
View File

@ -24,38 +24,46 @@ A million repetitions of "a"
/* blk0() and blk() perform the initial expand. */
/* I got the idea of expanding during the round function from SSLeay */
#ifdef LITTLE_ENDIAN
#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
|(rol(block->l[i],8)&0x00FF00FF))
#define blk0(i) (block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) | (rol(block->l[i], 8) & 0x00FF00FF))
#else
#define blk0(i) block->l[i]
#endif
#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
^block->l[(i+2)&15]^block->l[i&15],1))
#define blk(i) (block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15], 1))
/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
#define R0(v, w, x, y, z, i) \
z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + rol(v, 5); \
w = rol(w, 30);
#define R1(v, w, x, y, z, i) \
z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + rol(v, 5); \
w = rol(w, 30);
#define R2(v, w, x, y, z, i) \
z += (w ^ x ^ y) + blk(i) + 0x6ED9EBA1 + rol(v, 5); \
w = rol(w, 30);
#define R3(v, w, x, y, z, i) \
z += (((w | x) & y) | (w & x)) + blk(i) + 0x8F1BBCDC + rol(v, 5); \
w = rol(w, 30);
#define R4(v, w, x, y, z, i) \
z += (w ^ x ^ y) + blk(i) + 0xCA62C1D6 + rol(v, 5); \
w = rol(w, 30);
/* Hash a single 512-bit block. This is the core of the algorithm. */
void SHA1Transform(unsigned long state[5], unsigned char buffer[64])
{
unsigned long a, b, c, d, e;
typedef union {
unsigned long a, b, c, d, e;
typedef union
{
unsigned char c[64];
unsigned long l[16];
} CHAR64LONG16;
CHAR64LONG16* block;
} CHAR64LONG16;
CHAR64LONG16 *block;
#ifdef SHA1HANDSOFF
static unsigned char workspace[64];
block = (CHAR64LONG16*)workspace;
static unsigned char workspace[64];
block = (CHAR64LONG16 *)workspace;
memcpy(block, buffer, 64);
#else
block = (CHAR64LONG16*)buffer;
block = (CHAR64LONG16 *)buffer;
#endif
/* Copy context->state[] to working vars */
a = state[0];
@ -64,26 +72,86 @@ static unsigned char workspace[64];
d = state[3];
e = state[4];
/* 4 rounds of 20 operations each. Loop unrolled. */
R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
R0(a, b, c, d, e, 0);
R0(e, a, b, c, d, 1);
R0(d, e, a, b, c, 2);
R0(c, d, e, a, b, 3);
R0(b, c, d, e, a, 4);
R0(a, b, c, d, e, 5);
R0(e, a, b, c, d, 6);
R0(d, e, a, b, c, 7);
R0(c, d, e, a, b, 8);
R0(b, c, d, e, a, 9);
R0(a, b, c, d, e, 10);
R0(e, a, b, c, d, 11);
R0(d, e, a, b, c, 12);
R0(c, d, e, a, b, 13);
R0(b, c, d, e, a, 14);
R0(a, b, c, d, e, 15);
R1(e, a, b, c, d, 16);
R1(d, e, a, b, c, 17);
R1(c, d, e, a, b, 18);
R1(b, c, d, e, a, 19);
R2(a, b, c, d, e, 20);
R2(e, a, b, c, d, 21);
R2(d, e, a, b, c, 22);
R2(c, d, e, a, b, 23);
R2(b, c, d, e, a, 24);
R2(a, b, c, d, e, 25);
R2(e, a, b, c, d, 26);
R2(d, e, a, b, c, 27);
R2(c, d, e, a, b, 28);
R2(b, c, d, e, a, 29);
R2(a, b, c, d, e, 30);
R2(e, a, b, c, d, 31);
R2(d, e, a, b, c, 32);
R2(c, d, e, a, b, 33);
R2(b, c, d, e, a, 34);
R2(a, b, c, d, e, 35);
R2(e, a, b, c, d, 36);
R2(d, e, a, b, c, 37);
R2(c, d, e, a, b, 38);
R2(b, c, d, e, a, 39);
R3(a, b, c, d, e, 40);
R3(e, a, b, c, d, 41);
R3(d, e, a, b, c, 42);
R3(c, d, e, a, b, 43);
R3(b, c, d, e, a, 44);
R3(a, b, c, d, e, 45);
R3(e, a, b, c, d, 46);
R3(d, e, a, b, c, 47);
R3(c, d, e, a, b, 48);
R3(b, c, d, e, a, 49);
R3(a, b, c, d, e, 50);
R3(e, a, b, c, d, 51);
R3(d, e, a, b, c, 52);
R3(c, d, e, a, b, 53);
R3(b, c, d, e, a, 54);
R3(a, b, c, d, e, 55);
R3(e, a, b, c, d, 56);
R3(d, e, a, b, c, 57);
R3(c, d, e, a, b, 58);
R3(b, c, d, e, a, 59);
R4(a, b, c, d, e, 60);
R4(e, a, b, c, d, 61);
R4(d, e, a, b, c, 62);
R4(c, d, e, a, b, 63);
R4(b, c, d, e, a, 64);
R4(a, b, c, d, e, 65);
R4(e, a, b, c, d, 66);
R4(d, e, a, b, c, 67);
R4(c, d, e, a, b, 68);
R4(b, c, d, e, a, 69);
R4(a, b, c, d, e, 70);
R4(e, a, b, c, d, 71);
R4(d, e, a, b, c, 72);
R4(c, d, e, a, b, 73);
R4(b, c, d, e, a, 74);
R4(a, b, c, d, e, 75);
R4(e, a, b, c, d, 76);
R4(d, e, a, b, c, 77);
R4(c, d, e, a, b, 78);
R4(b, c, d, e, a, 79);
/* Add the working vars back into context.state[] */
state[0] += a;
state[1] += b;
@ -94,10 +162,9 @@ static unsigned char workspace[64];
a = b = c = d = e = 0;
}
/* SHA1Init - Initialize new context */
void SHA1Init(SHA1_CTX* context)
void SHA1Init(SHA1_CTX *context)
{
/* SHA1 initialization constants */
context->state[0] = 0x67452301;
@ -108,48 +175,51 @@ void SHA1Init(SHA1_CTX* context)
context->count[0] = context->count[1] = 0;
}
/* Run your data through this. */
void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int len)
void SHA1Update(SHA1_CTX *context, unsigned char *data, unsigned int len)
{
unsigned int i, j;
unsigned int i, j;
j = (context->count[0] >> 3) & 63;
if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
if ((context->count[0] += len << 3) < (len << 3))
context->count[1]++;
context->count[1] += (len >> 29);
if ((j + len) > 63) {
memcpy(&context->buffer[j], data, (i = 64-j));
if ((j + len) > 63)
{
memcpy(&context->buffer[j], data, (i = 64 - j));
SHA1Transform(context->state, context->buffer);
for ( ; i + 63 < len; i += 64) {
for (; i + 63 < len; i += 64)
{
SHA1Transform(context->state, &data[i]);
}
j = 0;
}
else i = 0;
else
i = 0;
memcpy(&context->buffer[j], &data[i], len - i);
}
/* Add padding and return the message digest. */
void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
void SHA1Final(unsigned char digest[20], SHA1_CTX *context)
{
unsigned long i, j;
unsigned char finalcount[8];
unsigned long i, j;
unsigned char finalcount[8];
for (i = 0; i < 8; i++) {
finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
>> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
for (i = 0; i < 8; i++)
{
finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] >> ((3 - (i & 3)) * 8)) & 255); /* Endian independent */
}
SHA1Update(context, (unsigned char *)"\200", 1);
while ((context->count[0] & 504) != 448) {
while ((context->count[0] & 504) != 448)
{
SHA1Update(context, (unsigned char *)"\0", 1);
}
SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */
for (i = 0; i < 20; i++) {
digest[i] = (unsigned char)
((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
for (i = 0; i < 20; i++)
{
digest[i] = (unsigned char)((context->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255);
}
/* Wipe variables */
i = j = 0;
@ -162,11 +232,11 @@ unsigned char finalcount[8];
#endif
}
void SHA1(unsigned char *ptr, unsigned int size, unsigned char *outbuf) {
void SHA1(unsigned char *ptr, unsigned int size, unsigned char *outbuf)
{
SHA1_CTX ctx;
SHA1Init(&ctx);
SHA1Update(&ctx, ptr, size);
SHA1Final(outbuf, &ctx);
}

9
source/sha1.h
View File

@ -1,12 +1,13 @@
typedef struct {
typedef struct
{
unsigned long state[5];
unsigned long count[2];
unsigned char buffer[64];
} SHA1_CTX;
void SHA1Transform(unsigned long state[5], unsigned char buffer[64]);
void SHA1Init(SHA1_CTX* context);
void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int len);
void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
void SHA1Init(SHA1_CTX *context);
void SHA1Update(SHA1_CTX *context, unsigned char *data, unsigned int len);
void SHA1Final(unsigned char digest[20], SHA1_CTX *context);
void SHA1(unsigned char *ptr, unsigned int size, unsigned char *outbuf);

583
source/sysconf.c
View File

File diff suppressed because it is too large Load Diff

183
source/sysconf.h
View File

@ -50,33 +50,38 @@ distribution.
//#define DEBUG_SYSCONF
#ifdef __cplusplus
extern "C" {
extern "C"
{
#endif /* __cplusplus */
enum {
enum
{
SYSCONF_BIGARRAY = 1,
SYSCONF_SMALLARRAY,
SYSCONF_BYTE,
SYSCONF_SHORT,
SYSCONF_LONG,
SYSCONF_BOOL = 7
};
};
enum {
enum
{
SYSCONF_VIDEO_NTSC = 0,
SYSCONF_VIDEO_PAL,
SYSCONF_VIDEO_MPAL
};
};
enum {
enum
{
SYSCONF_REGION_JP = 0,
SYSCONF_REGION_US,
SYSCONF_REGION_EU,
SYSCONF_REGION_KR,
SYSCONF_REGION_CN
};
};
enum {
enum
{
SYSCONF_AREA_JPN = 0,
SYSCONF_AREA_USA,
SYSCONF_AREA_EUR,
@ -89,26 +94,30 @@ enum {
SYSCONF_AREA_ASI,
SYSCONF_AREA_LTN,
SYSCONF_AREA_SAF
};
};
enum {
enum
{
SYSCONF_SHUTDOWN_STANDBY = 0,
SYSCONF_SHUTDOWN_IDLE
};
};
enum {
enum
{
SYSCONF_LED_OFF = 0,
SYSCONF_LED_DIM,
SYSCONF_LED_BRIGHT
};
};
enum {
enum
{
SYSCONF_SOUND_MONO = 0,
SYSCONF_SOUND_STEREO,
SYSCONF_SOUND_SURROUND
};
};
enum {
enum
{
SYSCONF_LANG_JAPANESE = 0,
SYSCONF_LANG_ENGLISH,
SYSCONF_LANG_GERMAN,
@ -116,97 +125,97 @@ enum {
SYSCONF_LANG_SPANISH,
SYSCONF_LANG_ITALIAN,
SYSCONF_LANG_DUTCH
};
};
enum {
enum
{
SYSCONF_ASPECT_4_3 = 0,
SYSCONF_ASPECT_16_9
};
};
enum {
enum
{
SYSCONF_SENSORBAR_BOTTOM = 0,
SYSCONF_SENSORBAR_TOP
};
};
typedef struct _sysconf_pad_device sysconf_pad_device;
typedef struct _sysconf_pad_device sysconf_pad_device;
struct _sysconf_pad_device {
struct _sysconf_pad_device
{
u8 bdaddr[6];
char name[0x40];
} ATTRIBUTE_PACKED;
} ATTRIBUTE_PACKED;
#ifdef DEBUG_SYSCONF
void SYSCONF_DumpBuffer(void);
void SYSCONF_DumpTxtBuffer(void);
void SYSCONF_DumpEncryptedTxtBuffer(void);
void SYSCONF_PrintAllSettings(void);
void SYSCONF_DumpBuffer(void);
void SYSCONF_DumpTxtBuffer(void);
void SYSCONF_DumpEncryptedTxtBuffer(void);
void SYSCONF_PrintAllSettings(void);
#endif /* DEBUG_SYSCONF */
s32 SYSCONF_Init(void);
/* SYSCONF configuation */
s32 SYSCONF_GetLength(const char *name);
s32 SYSCONF_GetType(const char *name);
s32 SYSCONF_Get(const char *name, void *buffer, u32 length);
s32 SYSCONF_GetShutdownMode(void);
s32 SYSCONF_GetIdleLedMode(void);
s32 SYSCONF_GetProgressiveScan(void);
s32 SYSCONF_GetEuRGB60(void);
s32 SYSCONF_GetIRSensitivity(void);
s32 SYSCONF_GetSensorBarPosition(void);
s32 SYSCONF_GetPadSpeakerVolume(void);
s32 SYSCONF_GetPadMotorMode(void);
s32 SYSCONF_GetSoundMode(void);
s32 SYSCONF_GetLanguage(void);
s32 SYSCONF_GetCounterBias(u32 *bias);
s32 SYSCONF_GetScreenSaverMode(void);
s32 SYSCONF_GetDisplayOffsetH(s8 *offset);
s32 SYSCONF_GetPadDevices(sysconf_pad_device *devs, int count);
s32 SYSCONF_GetNickName(u8 *nickname);
s32 SYSCONF_GetAspectRatio(void);
s32 SYSCONF_GetEULA(void);
s32 SYSCONF_GetParentalPassword(s8 *password);
s32 SYSCONF_GetParentalAnswer(s8 *answer);
s32 SYSCONF_GetWiiConnect24(void);
/* setting.txt configuration */
s32 SYSCONF_GetRegion(void);
s32 SYSCONF_GetArea(void);
s32 SYSCONF_GetVideo(void);
s32 SYSCONF_Init(void);
/* SYSCONF configuation */
s32 SYSCONF_GetLength(const char *name);
s32 SYSCONF_GetType(const char *name);
s32 SYSCONF_Get(const char *name, void *buffer, u32 length);
s32 SYSCONF_GetShutdownMode(void);
s32 SYSCONF_GetIdleLedMode(void);
s32 SYSCONF_GetProgressiveScan(void);
s32 SYSCONF_GetEuRGB60(void);
s32 SYSCONF_GetIRSensitivity(void);
s32 SYSCONF_GetSensorBarPosition(void);
s32 SYSCONF_GetPadSpeakerVolume(void);
s32 SYSCONF_GetPadMotorMode(void);
s32 SYSCONF_GetSoundMode(void);
s32 SYSCONF_GetLanguage(void);
s32 SYSCONF_GetCounterBias(u32 *bias);
s32 SYSCONF_GetScreenSaverMode(void);
s32 SYSCONF_GetDisplayOffsetH(s8 *offset);
s32 SYSCONF_GetPadDevices(sysconf_pad_device *devs, int count);
s32 SYSCONF_GetNickName(u8 *nickname);
s32 SYSCONF_GetAspectRatio(void);
s32 SYSCONF_GetEULA(void);
s32 SYSCONF_GetParentalPassword(s8 *password);
s32 SYSCONF_GetParentalAnswer(s8 *answer);
s32 SYSCONF_GetWiiConnect24(void);
/* setting.txt configuration */
s32 SYSCONF_GetRegion(void);
s32 SYSCONF_GetArea(void);
s32 SYSCONF_GetVideo(void);
/* Set functions */
s32 SYSCONF_SaveChanges(void);
s32 SYSCONF_Set(const char *name, const void *value, u32 length);
/* Set functions */
s32 SYSCONF_SaveChanges(void);
s32 SYSCONF_Set(const char *name, const void *value, u32 length);
s32 SYSCONF_SetShutdownMode(u8 value);
s32 SYSCONF_SetIdleLedMode(u8 value);
s32 SYSCONF_SetProgressiveScan(u8 value);
s32 SYSCONF_SetEuRGB60(u8 value);
s32 SYSCONF_SetIRSensitivity(u32 value);
s32 SYSCONF_SetSensorBarPosition(u8 value);
s32 SYSCONF_SetPadSpeakerVolume(u8 value);
s32 SYSCONF_SetPadMotorMode(u8 value);
s32 SYSCONF_SetSoundMode(u8 value);
s32 SYSCONF_SetLanguage(u8 value);
s32 SYSCONF_SetCounterBias(u32 bias);
s32 SYSCONF_SetScreenSaverMode(u8 value);
s32 SYSCONF_SetDisplayOffsetH(s8 offset);
s32 SYSCONF_SetPadDevices(const sysconf_pad_device *devs, u8 count);
s32 SYSCONF_SetNickName(const u8 *nickname, u16 length);
s32 SYSCONF_SetAspectRatio(u8 value);
s32 SYSCONF_SetEULA(u8 value);
s32 SYSCONF_SetParentalPassword(const s8 *password, u32 length);
s32 SYSCONF_SetParentalAnswer(const s8 *answer, u32 length);
s32 SYSCONF_SetWiiConnect24(u32 value);
s32 SYSCONF_SetShutdownMode(u8 value);
s32 SYSCONF_SetIdleLedMode(u8 value);
s32 SYSCONF_SetProgressiveScan(u8 value);
s32 SYSCONF_SetEuRGB60(u8 value);
s32 SYSCONF_SetIRSensitivity(u32 value);
s32 SYSCONF_SetSensorBarPosition(u8 value);
s32 SYSCONF_SetPadSpeakerVolume(u8 value);
s32 SYSCONF_SetPadMotorMode(u8 value);
s32 SYSCONF_SetSoundMode(u8 value);
s32 SYSCONF_SetLanguage(u8 value);
s32 SYSCONF_SetCounterBias(u32 bias);
s32 SYSCONF_SetScreenSaverMode(u8 value);
s32 SYSCONF_SetDisplayOffsetH(s8 offset);
s32 SYSCONF_SetPadDevices(const sysconf_pad_device *devs, u8 count);
s32 SYSCONF_SetNickName(const u8 *nickname, u16 length);
s32 SYSCONF_SetAspectRatio(u8 value);
s32 SYSCONF_SetEULA(u8 value);
s32 SYSCONF_SetParentalPassword(const s8 *password, u32 length);
s32 SYSCONF_SetParentalAnswer(const s8 *answer, u32 length);
s32 SYSCONF_SetWiiConnect24(u32 value);
s32 SYSCONF_SetRegion(s32 value);
s32 SYSCONF_SetArea(s32 value);
s32 SYSCONF_SetVideo(s32 value);
s32 SYSCONF_SetRegion(s32 value);
s32 SYSCONF_SetArea(s32 value);
s32 SYSCONF_SetVideo(s32 value);
#ifdef __cplusplus
}
}
#endif /* __cplusplus */
#endif

186
source/wiibasics.c
View File

@ -38,7 +38,6 @@ distribution.
#define MAX_WIIMOTES 4
static void *xfb = NULL;
static GXRModeObj *rmode = NULL;
int ConsoleRows;
@ -58,7 +57,8 @@ u64 be64(const u8 *p)
return ((u64)be32(p) << 32) | be32(p + 4);
}
u32 getTitleIDUID(u64 titleID){
u32 getTitleIDUID(u64 titleID)
{
s32 ret, i;
static u8 uid_buffer[0x1000] ATTRIBUTE_ALIGN(32);
u32 size;
@ -66,14 +66,15 @@ u32 getTitleIDUID(u64 titleID){
if (ret < 0)
return 0;
for(i = 0; i < size; i+=12)
for (i = 0; i < size; i += 12)
if (be64(&uid_buffer[i]) == titleID)
return be32(&uid_buffer[i+8]);
return be32(&uid_buffer[i + 8]);
return 0;
}
u64 getUIDTitleID(u32 uid){
u64 getUIDTitleID(u32 uid)
{
s32 ret, i;
static u8 uid_buffer[0x1000] ATTRIBUTE_ALIGN(32);
u32 size;
@ -81,13 +82,12 @@ u64 getUIDTitleID(u32 uid){
if (ret < 0)
return 0;
for(i = 8; i < size; i+=12)
for (i = 8; i < size; i += 12)
if (be32(&uid_buffer[i]) == uid)
return be64(&uid_buffer[i-8]);
return be64(&uid_buffer[i - 8]);
return 0;
}
/* Basic init taken pretty directly from the libOGC examples */
void basicInit(void)
{
@ -98,18 +98,16 @@ void basicInit(void)
// This will correspond to the settings in the Wii menu
rmode = VIDEO_GetPreferredMode(NULL);
//rmode->viWidth = 678;
//rmode->viXOrigin = (VI_MAX_WIDTH_PAL - 678)/2;
// rmode->viWidth = 678;
// rmode->viXOrigin = (VI_MAX_WIDTH_PAL - 678)/2;
GX_AdjustForOverscan(rmode, rmode, 32, 24);
// Allocate memory for the display in the uncached region
xfb = MEM_K0_TO_K1(SYS_AllocateFramebuffer(rmode));
// Initialise the console, required for printf
console_init(xfb,0,0,rmode->fbWidth,rmode->xfbHeight,rmode->fbWidth*VI_DISPLAY_PIX_SZ);
console_init(xfb, 0, 0, rmode->fbWidth, rmode->xfbHeight, rmode->fbWidth * VI_DISPLAY_PIX_SZ);
// Set up the video registers with the chosen mode
VIDEO_Configure(rmode);
@ -125,52 +123,58 @@ void basicInit(void)
// Wait for Video setup to complete
VIDEO_WaitVSync();
if(rmode->viTVMode&VI_NON_INTERLACE) VIDEO_WaitVSync();
if (rmode->viTVMode & VI_NON_INTERLACE)
VIDEO_WaitVSync();
// The console understands VT terminal escape codes
// This positions the cursor on row 2, column 0
// we can use variables for this with format codes too
// e.g. printf ("\x1b[%d;%dH", row, column );
//printf("\x1b[2;0H");
// printf("\x1b[2;0H");
CON_GetMetrics(&ConsoleCols, &ConsoleRows);
}
void ClearScreen() {
void ClearScreen()
{
/* Clear console */
printf("\x1b[2J");
fflush(stdout);
}
void ClearLine() {
void ClearLine()
{
printf("\r\x1b[2K\r");
fflush(stdout);
}
void PrintCenter(char *text, int width) {
void PrintCenter(char *text, int width)
{
int textLen = strlen(text);
int leftPad = (width - textLen) / 2;
int rightPad = (width - textLen) - leftPad;
printf("%*s%s%*s", leftPad, " ", text, rightPad, " ");
}
void Console_SetFgColor(u8 color, u8 bold) {
void Console_SetFgColor(u8 color, u8 bold)
{
printf("\x1b[%u;%dm", color + 30, bold);
}
void Console_SetBgColor(u8 color, u8 bold) {
void Console_SetBgColor(u8 color, u8 bold)
{
printf("\x1b[%u;%dm", color + 40, bold);
}
void Console_SetColors(u8 bgColor, u8 bgBold, u8 fgColor, u8 fgBold) {
void Console_SetColors(u8 bgColor, u8 bgBold, u8 fgColor, u8 fgBold)
{
Console_SetBgColor(bgColor, bgBold);
Console_SetFgColor(fgColor, fgBold);
}
void Console_SetPosition(u8 row, u8 column) {
void Console_SetPosition(u8 row, u8 column)
{
// The console understands VT terminal escape codes
// This positions the cursor on row 2, column 0
// we can use variables for this with format codes too
// e.g. printf ("\x1b[%d;%dH", row, column );
printf("\x1b[%u;%uH", row, column);
}
void PrintBanner() {
void PrintBanner()
{
ClearScreen();
Console_SetColors(GREEN, 0, WHITE, 2);
char text[ConsoleCols];
@ -191,23 +195,28 @@ void miscInit(void)
fflush(stdout);
ret = ISFS_Initialize();
if (ret < 0) {
if (ret < 0)
{
gprintf("\nError! ISFS_Initialize (ret = %d)\n", ret);
wait_anyKey();
exit(0);
} else {
}
else
{
gprintf("OK!\n");
}
//IdentSysMenu();
// IdentSysMenu();
}
void IdentSysMenu(void){
void IdentSysMenu(void)
{
int ret;
Identify_SysMenu();
ret = ES_SetUID(TITLE_ID(1, 2));
if (ret < 0){
if (ret < 0)
{
printf("SetUID fail %d", ret);
wait_anyKey();
exit(1);
@ -218,11 +227,14 @@ void IdentSysMenu(void){
ISFS_Deinitialize();
ret = ISFS_Initialize();
if (ret < 0) {
if (ret < 0)
{
printf("\nError! ISFS_Initialize (ret = %d)\n", ret);
wait_anyKey();
exit(1);
} else {
}
else
{
printf("OK!\n");
}
}
@ -239,15 +251,18 @@ u32 getButtons(void)
return WPAD_ButtonsDown(0);
}
u32 wait_anyKey(void) {
u32 wait_anyKey(void)
{
u32 pressed;
while(!(pressed = getButtons())) {
while (!(pressed = getButtons()))
{
VIDEO_WaitVSync();
}
if (pressed & WPAD_BUTTON_HOME) {
Console_SetPosition(26,0);
if (pressed & WPAD_BUTTON_HOME)
{
Console_SetPosition(26, 0);
ClearLine();
Console_SetPosition(26,30);
Console_SetPosition(26, 30);
Console_SetColors(BLACK, 0, GREEN, 0);
printf("Exiting");
exit(0);
@ -255,40 +270,47 @@ u32 wait_anyKey(void) {
return pressed;
}
u32 wait_key(u32 button) {
u32 wait_key(u32 button)
{
u32 pressed;
do {
do
{
VIDEO_WaitVSync();
pressed = getButtons();
if (pressed & WPAD_BUTTON_HOME) {
Console_SetPosition(26,0);
if (pressed & WPAD_BUTTON_HOME)
{
Console_SetPosition(26, 0);
ClearLine();
Console_SetPosition(26,30);
Console_SetPosition(26, 30);
Console_SetColors(BLACK, 0, GREEN, 0);
printf("Exiting");
exit(0);
}
} while(!(pressed & button));
} while (!(pressed & button));
return pressed;
}
char charASCII(u8 c) {
char charASCII(u8 c)
{
if (c < 0x20 || c > 0x7E)
return '.';
else
return (char)c;
}
void hex_print_array16(const u8 *array, u32 size){
void hex_print_array16(const u8 *array, u32 size)
{
u32 offset = 0;
u32 page_size = 0x100;
char line[17];
line[16] = 0;
if (size > page_size)
printf("Page 1 of %lu", (size / page_size)+1);
while (offset < size){
if (!(offset % 16)) printf("\n0x%08lX: ", offset);
printf("Page 1 of %lu", (size / page_size) + 1);
while (offset < size)
{
if (!(offset % 16))
printf("\n0x%08lX: ", offset);
printf("%02X", array[offset]);
@ -300,7 +322,8 @@ void hex_print_array16(const u8 *array, u32 size){
if (!(offset % 16))
printf(line);
if (!(offset % page_size) && offset < size){
if (!(offset % page_size) && offset < size)
{
u32 pressed;
printf("\n\tPress a key for next page or B for finish\n");
pressed = wait_anyKey();
@ -312,24 +335,26 @@ void hex_print_array16(const u8 *array, u32 size){
}
}
bool yes_or_no(void){
bool yes_or_no(void)
{
bool yes = 0;
u32 buttons = 0;
do {
do
{
yes = buttons & WPAD_BUTTON_LEFT;
if(yes)
if (yes)
printf("\r\x1b[K <\x1b[30m\x1b[47;1m Yes \x1b[37;1m\x1b[40m> No ");
else
printf("\r\x1b[K Yes <\x1b[30m\x1b[47;1m No \x1b[37;1m\x1b[40m> ");
} while ((buttons = wait_key(WPAD_BUTTON_A | WPAD_BUTTON_LEFT | WPAD_BUTTON_RIGHT))
&& (!(buttons & WPAD_BUTTON_A)));
} while ((buttons = wait_key(WPAD_BUTTON_A | WPAD_BUTTON_LEFT | WPAD_BUTTON_RIGHT)) && (!(buttons & WPAD_BUTTON_A)));
printf("\n");
return yes;
}
/* Reads a file from ISFS to an array in memory */
s32 ISFS_ReadFileToArray (const char *filepath, u8 *filearray, u32 max_size, u32 *file_size) {
s32 ISFS_ReadFileToArray(const char *filepath, u8 *filearray, u32 max_size, u32 *file_size)
{
s32 ret, fd;
static fstats filestats ATTRIBUTE_ALIGN(32);
@ -381,7 +406,8 @@ s32 ISFS_ReadFileToArray (const char *filepath, u8 *filearray, u32 max_size, u32
}
/* Writes from an array in memory to a file with ISFS */
s32 ISFS_WriteFileFromArray (const char *filepath, const u8 *filearray, u32 array_size, u32 ownerID, u16 groupID, u8 attr, u8 own_perm, u8 group_perm, u8 other_perm){
s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array_size, u32 ownerID, u16 groupID, u8 attr, u8 own_perm, u8 group_perm, u8 other_perm)
{
s32 ret, fd = 0, out;
u64 currentTid;
u32 realownid;
@ -392,7 +418,8 @@ s32 ISFS_WriteFileFromArray (const char *filepath, const u8 *filearray, u32 arra
out = 0;
ret = ISFS_Open(filepath, ISFS_OPEN_WRITE);
if (ret == -102){
if (ret == -102)
{
printf("\tMaking file writable...\n");
ret = ISFS_SetAttr(filepath, ownerID, groupID, attr, 3, 3, 3);
@ -404,20 +431,23 @@ s32 ISFS_WriteFileFromArray (const char *filepath, const u8 *filearray, u32 arra
}
return ISFS_WriteFileFromArray(filepath, filearray, array_size, ownerID, groupID, attr, own_perm, group_perm, other_perm);
} else if (ret == -106){
}
else if (ret == -106)
{
printf("\tCreating file...\n");
ret = ISFS_CreateFile(filepath, attr, 3, 3, 3);
if (ret < 0){
if (ret < 0)
{
printf("Error! ISFS_CreateFile (ret = %ld)\n", ret);
out = -1;
goto cleanup;
}
return ISFS_WriteFileFromArray(filepath, filearray, array_size, ownerID, groupID, attr, own_perm, group_perm, other_perm);
} else if (ret <= 0) {
}
else if (ret <= 0)
{
printf("Error! ISFS_Open WRITE (ret = %ld)\n", ret);
out = -1;
goto cleanup;
@ -426,7 +456,8 @@ s32 ISFS_WriteFileFromArray (const char *filepath, const u8 *filearray, u32 arra
fd = ret;
ret = ISFS_Seek(fd, 0, 0);
if (ret < 0) {
if (ret < 0)
{
printf("Error! ISFS_Seek (ret = %ld)\n", ret);
out = -1;
goto cleanup;
@ -486,17 +517,20 @@ s32 ISFS_WriteFileFromArray (const char *filepath, const u8 *filearray, u32 arra
out = -1;
}
if (realownid != ownerID){
if (realownid != ownerID)
{
ret = ES_GetTitleID(&currentTid);
if (ret){
if (ret)
{
printf("Fail GetTitleID %ld", ret);
if(wait_key(WPAD_BUTTON_A | WPAD_BUTTON_B) & WPAD_BUTTON_B)
if (wait_key(WPAD_BUTTON_A | WPAD_BUTTON_B) & WPAD_BUTTON_B)
goto cleanup;
}
ret = ES_SetUID(getUIDTitleID(ownerID));
if (ret){
if (ret)
{
printf("Couldn't set OwnerID, using current owner ID\n");
if(wait_key(WPAD_BUTTON_A | WPAD_BUTTON_B) & WPAD_BUTTON_B)
if (wait_key(WPAD_BUTTON_A | WPAD_BUTTON_B) & WPAD_BUTTON_B)
goto cleanup;
ownerID = realownid;
}
@ -510,17 +544,20 @@ s32 ISFS_WriteFileFromArray (const char *filepath, const u8 *filearray, u32 arra
goto cleanup;
}
if (realownid != ownerID){
if (realownid != ownerID)
{
ret = ES_SetUID(currentTid);
if (ret){
if (ret)
{
printf("Fail SetUID %ld", ret);
if(wait_key(WPAD_BUTTON_A | WPAD_BUTTON_B) & WPAD_BUTTON_B)
if (wait_key(WPAD_BUTTON_A | WPAD_BUTTON_B) & WPAD_BUTTON_B)
goto cleanup;
}
}
cleanup:
if (fd) {
cleanup:
if (fd)
{
ret = ISFS_Close(fd);
if (ret < 0)
{
@ -529,5 +566,4 @@ s32 ISFS_WriteFileFromArray (const char *filepath, const u8 *filearray, u32 arra
}
}
return out;
}

7
source/wiibasics.h
View File

@ -29,9 +29,8 @@ distribution.
#ifndef _WII_BASICS_H_
#define _WII_BASICS_H_
// Turn upper and lower into a full title ID
#define TITLE_ID(x,y) (((u64)(x) << 32) | (y))
#define TITLE_ID(x, y) (((u64)(x) << 32) | (y))
// Get upper or lower half of a title ID
#define TITLE_UPPER(x) ((u32)((x) >> 32))
// Turn upper and lower into a full title ID
@ -84,10 +83,10 @@ u32 wait_key(u32 button);
void hex_print_array16(const u8 *array, u32 size);
/* Reads a file from ISFS to an array in memory */
s32 ISFS_ReadFileToArray (const char *filepath, u8 *filearray, u32 max_size, u32 *file_size);
s32 ISFS_ReadFileToArray(const char *filepath, u8 *filearray, u32 max_size, u32 *file_size);
/* Writes from an array in memory to a file with ISFS */
s32 ISFS_WriteFileFromArray (const char *filepath, const u8 *filearray, u32 array_size, u32 ownerID, u16 groupID, u8 attr, u8 own_perm, u8 group_perm, u8 other_perm);
s32 ISFS_WriteFileFromArray(const char *filepath, const u8 *filearray, u32 array_size, u32 ownerID, u16 groupID, u8 attr, u8 own_perm, u8 group_perm, u8 other_perm);
bool yes_or_no();
void ClearScreen();