The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-12-25 02:31:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix 7z lockup, better 7z error message

Browse Source
This commit is contained in:
dborth 2009-07-09 21:51:19 +00:00
parent 0f9ce7ec3b
commit 32525770c2
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/ngc/filebrowser.cpp
View File

@ -494,8 +494,12 @@ int BrowserLoadFile(int method)
SNESROMSize = LoadSzFile(szpath, (unsigned char *)Memory.ROM);
break;
}
if(SNESROMSize <= 0)
{
browser.selIndex = 0;
BrowserChangeFolder(method);
}
}
inSz = false;
if (SNESROMSize <= 0)
{

8
source/ngc/gcunzip.cpp
View File

@ -267,7 +267,7 @@ typedef struct _SzFileInStream
} SzFileInStream;
// 7zip error list
static char szerrormsg[][50] = {
static char szerrormsg[][100] = {
"File is corrupt.", // 7z: Data error
"Archive contains too many files.", // 7z: Out of memory
"File is corrupt (CRC mismatch).", // 7z: CRC Error
@ -275,7 +275,7 @@ static char szerrormsg[][50] = {
"File is corrupt.", // 7z: Fail
"Failed to read file data.", // 7z: Data read failure
"File is corrupt.", // 7z: Archive error
"File uses too high of compression settings.", // 7z: Dictionary too large
"File uses too high of compression settings (dictionary size is too large).", // 7z: Dictionary too large
};
static SZ_RESULT SzRes;
@ -453,7 +453,7 @@ int SzParse(char * filepath, int method)
ResetBrowser();
// add '..' folder in case the user wants exit the 7z
strncpy(browserList[0].displayname, "..", 2);
sprintf(browserList[0].displayname, "Up One Level");
browserList[0].isdir = 1;
browserList[0].offset = fileoff;
browserList[0].length = filelen;
@ -501,6 +501,8 @@ int SzParse(char * filepath, int method)
}
}
CancelAction();
// close file
switch (method)
{

2
source/sz/7zDecode.c
View File

@ -236,7 +236,7 @@ SZ_RESULT SzDecode2(const CFileSize *packSizes, const CFolder *folder,
if (state.Dictionary == 0)
{
allocMain->Free(state.Probs);
return SZE_OUTOFMEMORY;
return SZE_OUTOFMEMORYDIC;
}
}
LzmaDecoderInit(&state);