ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2002 from flagrama/fix-7z 

Fix Opening 7zip files
This commit is contained in:
zilmar 2021-03-06 10:57:41 +10:30 committed by GitHub
parent b35d59408a bc130baa3a
commit e2f648be46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Source/Project64-core/N64System/N64RomClass.cpp
View File

@ -510,18 +510,16 @@ bool CN64Rom::LoadN64Image(const char * FileLoc, bool LoadBootCodeOnly)
//this should be a 7zip file //this should be a 7zip file
char * SubFile = strstr(const_cast<char*>(FullPath.c_str()), "?"); char * SubFile = strstr(const_cast<char*>(FullPath.c_str()), "?");
if (SubFile == NULL) if (SubFile != NULL)
{
//Pop up a dialog and select file
//allocate memory for sub name and copy selected file name to var
WriteTrace(TraceN64System, TraceDebug, "Done (res: false)");
return false; //remove once dialog is done
}
else
{ {
*SubFile = '\0'; *SubFile = '\0';
SubFile += 1; SubFile += 1;
} }
//else load first found file until dialog is implemented
//{
//Pop up a dialog and select file
//allocate memory for sub name and copy selected file name to var
//}
C7zip ZipFile(FullPath.c_str()); C7zip ZipFile(FullPath.c_str());
ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB, this); ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB, this);
@ -565,6 +563,11 @@ bool CN64Rom::LoadN64Image(const char * FileLoc, bool LoadBootCodeOnly)
if (!IsValidRomImage(m_ROMImage)) if (!IsValidRomImage(m_ROMImage))
{ {
if (i < ZipFile.NumFiles() - 1)
{
UnallocateRomImage();
continue;
}
SetError(MSG_FAIL_IMAGE); SetError(MSG_FAIL_IMAGE);
WriteTrace(TraceN64System, TraceDebug, "Done (res: false)"); WriteTrace(TraceN64System, TraceDebug, "Done (res: false)");
return false; return false;
@ -703,17 +706,16 @@ bool CN64Rom::LoadN64ImageIPL(const char * FileLoc, bool LoadBootCodeOnly)
//this should be a 7zip file //this should be a 7zip file
char * SubFile = strstr(const_cast<char*>(FullPath.c_str()), "?"); char * SubFile = strstr(const_cast<char*>(FullPath.c_str()), "?");
if (SubFile == NULL) if (SubFile != NULL)
{
//Pop up a dialog and select file
//allocate memory for sub name and copy selected file name to var
return false; //remove once dialog is done
}
else
{ {
*SubFile = '\0'; *SubFile = '\0';
SubFile += 1; SubFile += 1;
} }
//else load first found file until dialog is implemented
//{
//Pop up a dialog and select file
//allocate memory for sub name and copy selected file name to var
//}
C7zip ZipFile(FullPath.c_str()); C7zip ZipFile(FullPath.c_str());
ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB, this); ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB, this);
@ -742,6 +744,7 @@ bool CN64Rom::LoadN64ImageIPL(const char * FileLoc, bool LoadBootCodeOnly)
if (!AllocateRomImage(RomFileSize)) if (!AllocateRomImage(RomFileSize))
{ {
WriteTrace(TraceN64System, TraceDebug, "Done (res: false)");
return false; return false;
} }
@ -750,12 +753,19 @@ bool CN64Rom::LoadN64ImageIPL(const char * FileLoc, bool LoadBootCodeOnly)
if (!ZipFile.GetFile(i, m_ROMImage, RomFileSize)) if (!ZipFile.GetFile(i, m_ROMImage, RomFileSize))
{ {
SetError(MSG_FAIL_IMAGE_IPL); SetError(MSG_FAIL_IMAGE_IPL);
WriteTrace(TraceN64System, TraceDebug, "Done (res: false)");
return false; return false;
} }
if (!IsValidRomImage(m_ROMImage)) if (!IsValidRomImage(m_ROMImage))
{ {
if (i < ZipFile.NumFiles() - 1)
{
UnallocateRomImage();
continue;
}
SetError(MSG_FAIL_IMAGE_IPL); SetError(MSG_FAIL_IMAGE_IPL);
WriteTrace(TraceN64System, TraceDebug, "Done (res: false)");
return false; return false;
} }
g_Notify->DisplayMessage(5, MSG_BYTESWAP); g_Notify->DisplayMessage(5, MSG_BYTESWAP);
@ -769,6 +779,7 @@ bool CN64Rom::LoadN64ImageIPL(const char * FileLoc, bool LoadBootCodeOnly)
if (!Loaded7zFile) if (!Loaded7zFile)
{ {
SetError(MSG_7Z_FILE_NOT_FOUND); SetError(MSG_7Z_FILE_NOT_FOUND);
WriteTrace(TraceN64System, TraceDebug, "Done (res: false)");
return false; return false;
} }
} }

4
Source/Project64-core/RomList/RomList.cpp
View File

@ -231,7 +231,7 @@ void CRomList::FillRomList(strlist & FileList, const char * Directory)
} }
WriteTrace(TraceUserInterface, TraceDebug, "7"); WriteTrace(TraceUserInterface, TraceDebug, "7");
memset(&RomInfo, 0, sizeof(ROM_INFO)); memset(&RomInfo, 0, sizeof(ROM_INFO));
stdstr_f zipFileName("%s?%s", (LPCSTR)SearchPath, FileName.c_str()); stdstr_f zipFileName("%s?%s", (LPCSTR)SearchDir, FileName.c_str());
ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB, this); ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB, this);
strncpy(RomInfo.szFullFileName, zipFileName.c_str(), sizeof(RomInfo.szFullFileName) - 1); strncpy(RomInfo.szFullFileName, zipFileName.c_str(), sizeof(RomInfo.szFullFileName) - 1);
@ -310,7 +310,7 @@ void CRomList::FillRomList(strlist & FileList, const char * Directory)
} }
catch (...) catch (...)
{ {
WriteTrace(TraceUserInterface, TraceError, "exception processing %s", (LPCSTR)SearchPath); WriteTrace(TraceUserInterface, TraceError, "exception processing %s", (LPCSTR)SearchDir);
} }
} }
#endif #endif