The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-11-26 04:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix bug w/ reading files < 2048 bytes

Browse Source
This commit is contained in:
dborth 2009-01-02 22:26:58 +00:00
parent 59b7c2f6d3
commit 874525235d
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/ngc/fileop.cpp
View File

@ -442,13 +442,12 @@ LoadFile (char * rbuffer, char *filepath, u32 length, int method, bool silent)
fstat(file->_file, &fileinfo); fstat(file->_file, &fileinfo);
size = fileinfo.st_size; size = fileinfo.st_size;
memcpy (rbuffer, zipbuffer, 2048); // copy what we already read memcpy (rbuffer, zipbuffer, readsize); // copy what we already read
ShowProgress ("Loading...", 2048, length); u32 offset = readsize;
u32 offset = 2048;
while(offset < size) while(offset < size)
{ {
ShowProgress ("Loading...", offset, size);
readsize = fread (rbuffer + offset, 1, (1024*512), file); // read in 512K chunks readsize = fread (rbuffer + offset, 1, (1024*512), file); // read in 512K chunks
if(readsize <= 0 || readsize > (1024*512)) if(readsize <= 0 || readsize > (1024*512))
@ -456,7 +455,6 @@ LoadFile (char * rbuffer, char *filepath, u32 length, int method, bool silent)
if(readsize > 0) if(readsize > 0)
offset += readsize; offset += readsize;
ShowProgress ("Loading...", offset, length);
} }
if(offset != size) // # bytes read doesn't match # expected if(offset != size) // # bytes read doesn't match # expected

2
source/ngc/menudraw.cpp
View File

@ -810,6 +810,8 @@ ShowProgress (const char *msg, int done, int total)
return; return;
else if(done > total) // this shouldn't happen else if(done > total) // this shouldn't happen
done = total; done = total;
else if(total < (256*1024)) // don't bother showing progress for small files
return;
int xpos, ypos; int xpos, ypos;
int i; int i;

5
source/ngc/video.cpp
View File

@ -277,9 +277,8 @@ void InitialiseVideo ()
switch (vmode->viTVMode >> 2) switch (vmode->viTVMode >> 2)
{ {
case VI_PAL: // 576 lines (PAL 50Hz) case VI_PAL:
// force PAL60 // 576 lines (PAL 50hz)
//vmode = &TVEurgb60Hz480IntDf;
break; break;
case VI_NTSC: case VI_NTSC: