The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-01 00:55:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

-fixed gamercards for sure now

Browse Source 
-updated gamecube installer, compression+32k align works fine, just 
compression still doesnt work properly with audio streaming games
This commit is contained in:
fix94.1 2012-02-24 21:08:24 +00:00
parent 02ea975071
commit 925900a393
3 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
source/loader/gc_disc.cpp
View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2012 * Copyright (C) 2012
* by OverjoY for Wiiflow * by OverjoY and FIX94 for Wiiflow
* *
* This software is provided 'as-is', without any express or implied * This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any * warranty. In no event will the authors be held liable for any
@ -107,7 +107,7 @@ s32 GCDump::__DiscWrite(char * path, u32 offset, u32 length, progress_callback_t
else if( ret > 1 ) else if( ret > 1 )
return 0; return 0;
fwrite(ReadBuffer, 1, toread, f); fwrite(ReadBuffer, 1, toread, f);
wrote += toread; wrote += toread;
@ -122,41 +122,49 @@ s32 GCDump::__DiscWrite(char * path, u32 offset, u32 length, progress_callback_t
return wrote; return wrote;
} }
s32 GCDump::__DiscWriteAligned(char * path, u32 offset, u32 length) s32 GCDump::__DiscWriteAligned(char * path, u32 offset, u32 length, int *alignment)
{ {
u8 *ReadBuffer = (u8 *)memalign(32, gc_readsize+4); u8 *ReadBuffer = (u8 *)memalign(32, gc_readsize+4);
u32 toread = 0; u32 toread = 0;
u32 wrote = 0; u32 wrote = 0;
*alignment = 32768;
FILE *f = fopen(path, "ab"); FILE *f = fopen(path, "ab");
while(length) while(length)
{ {
toread = gc_readsize; toread = gc_readsize;
if(toread > length) if (toread > length)
toread = length; toread = length;
s32 ret = __DiscReadRaw(ReadBuffer, offset, (toread+31)&(~31)); s32 ret = __DiscReadRaw(ReadBuffer, offset, (toread+31)&(~31));
if( ret == 1 ) if (ret == 1)
memset(ReadBuffer, 0, gc_readsize); memset(ReadBuffer, 0, gc_readsize);
else if (ret > 1)
return 0;
if( ret > 1 )
return -1; if (aligned)
if(aligned)
{ {
fwrite(ReadBuffer, 1, (toread+31)&(~31), f); fwrite(ReadBuffer, 1, (toread+32767)&(~32767), f);
wrote += (toread+31)&(~31); wrote += (toread+32767)&(~32767);
offset += toread;
length -= toread;
} }
else else
{ {
fwrite(ReadBuffer, 1, (toread+3)&(~3), f); for(unsigned int align = 0x8000; align > 2; align/=2)
wrote += (toread+3)&(~3); {
if((offset & (align-1)) == 0)
{
fwrite(ReadBuffer, 1, (toread+(align-1))&(~(align-1)), f);
wrote += (toread+(align-1))&(~(align-1));
offset += toread;
length -= toread;
*alignment = (int)align;
break;
}
}
} }
offset += toread;
length -= toread;
} }
fclose(f); fclose(f);
free(ReadBuffer); free(ReadBuffer);
return wrote; return wrote;
@ -255,8 +263,10 @@ s32 GCDump::DumpGame(progress_callback_t spinner, void *spinner_data)
gprintf("Writing %s\n", gamepath); gprintf("Writing %s\n", gamepath);
if(compressed) if(compressed)
{ {
ret = __DiscWriteAligned(gamepath, 0, GamePartOffset); int alignment;
ret = __DiscWriteAligned(gamepath, 0, GamePartOffset, &alignment);
wrote += ret; wrote += ret;
u32 i; u32 i;
@ -269,8 +279,8 @@ s32 GCDump::DumpGame(progress_callback_t spinner, void *spinner_data)
} }
else else
{ {
ret = __DiscWriteAligned(gamepath, fst[i].FileOffset, fst[i].FileLength); ret = __DiscWriteAligned(gamepath, fst[i].FileOffset, fst[i].FileLength, &alignment);
gprintf("Writing: %d/%d: %s from 0x%08x to 0x%08x\n", i, FSTEnt, FSTNameOff + fst[i].NameOffset, fst[i].FileOffset, wrote); gprintf("Writing: %d/%d: %s from 0x%08x to 0x%08x(%i)\n", i, FSTEnt, FSTNameOff + fst[i].NameOffset, fst[i].FileOffset, wrote, alignment);
if( ret >= 0 ) if( ret >= 0 )
{ {
fst[i].FileOffset = wrote; fst[i].FileOffset = wrote;
@ -369,7 +379,7 @@ s32 GCDump::CheckSpace(u32 *needed, bool comp)
size += (fst[i].FileLength+31)&(~31); size += (fst[i].FileLength+31)&(~31);
} }
} }
free(FSTBuffer); free(FSTBuffer);
} }
*needed = size/0x8000; *needed = size/0x8000;
gprintf("Free space needed on SD: %d bytes (%x blocks)\n", size, size/0x8000); gprintf("Free space needed on SD: %d bytes (%x blocks)\n", size, size/0x8000);

4
source/loader/gc_disc.hpp
View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2012 * Copyright (C) 2012
* by OverjoY for Wiiflow * by OverjoY and FIX94 for Wiiflow
* *
* This software is provided 'as-is', without any express or implied * This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any * warranty. In no event will the authors be held liable for any
@ -84,6 +84,6 @@ private:
} FST; } FST;
s32 __DiscReadRaw(void *outbuf, u32 offset, u32 length); s32 __DiscReadRaw(void *outbuf, u32 offset, u32 length);
s32 __DiscWrite(char * path, u32 offset, u32 length, progress_callback_t spinner , void *spinner_data); s32 __DiscWrite(char * path, u32 offset, u32 length, progress_callback_t spinner , void *spinner_data);
s32 __DiscWriteAligned(char * path, u32 offset, u32 length); s32 __DiscWriteAligned(char * path, u32 offset, u32 length, int *alignment);
}; };
#endif #endif

25
source/network/gcard.c
View File

@ -19,9 +19,9 @@ int amount_of_providers = 0;
u8 register_card_provider(const char *url, const char *key) u8 register_card_provider(const char *url, const char *key)
{ {
if (strlen(url) > 0 && strlen(key) > 0) if (strlen(url) > 0 && strlen(key) > 0 && strstr(url, "{KEY}") != NULL && strstr(url, "{ID6}") != NULL)
{ {
providers = (struct provider *) realloc(providers, (amount_of_providers + 1) * sizeof(struct provider));; providers = (struct provider *) realloc(providers, (amount_of_providers + 1) * sizeof(struct provider));
memset(&providers[amount_of_providers], 0, sizeof(struct provider)); memset(&providers[amount_of_providers], 0, sizeof(struct provider));
strncpy((char *) providers[amount_of_providers].url, url, 128); strncpy((char *) providers[amount_of_providers].url, url, 128);
strncpy((char *) providers[amount_of_providers].key, key, 48); strncpy((char *) providers[amount_of_providers].key, key, 48);
@ -35,12 +35,8 @@ u8 register_card_provider(const char *url, const char *key)
u8 has_enabled_providers() u8 has_enabled_providers()
{ {
int i; if (amount_of_providers != 0 && providers != NULL)
for (i = 0; i < amount_of_providers && providers != NULL; i++) return 1;
{
if (strlen(providers[i].url) > 0 && strlen(providers[i].key) > 0)
return 1;
}
return 0; return 0;
} }
@ -53,15 +49,12 @@ void add_game_to_card(const char *gameid)
for (i = 0; i < amount_of_providers && providers != NULL; i++) for (i = 0; i < amount_of_providers && providers != NULL; i++)
{ {
if (strlen(providers[i].url) > 0 && strlen(providers[i].key) > 0) strcpy(url, (char *) providers[i].url);
{ str_replace(url, (char *) "{KEY}", (char *) providers[i].key, MAX_URL_SIZE);
strcpy(url, (char *) providers[i].url); str_replace(url, (char *) "{ID6}", (char *) gameid, MAX_URL_SIZE);
str_replace(url, (char *) "{KEY}", (char *) providers[i].key, MAX_URL_SIZE);
str_replace(url, (char *) "{ID6}", (char *) gameid, MAX_URL_SIZE);
gprintf("Gamertag URL:\n%s\n",(char*)url); gprintf("Gamertag URL:\n%s\n",(char*)url);
downloadfile(NULL, 0, (char *) url, NULL, NULL); downloadfile(NULL, 0, (char *) url, NULL, NULL);
}
} }
SAFE_FREE(url); SAFE_FREE(url);
} }