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

CDVD: Use wxFFile API to handle NVM file 

Nicer, exception safe, less compilation warning :)

v2: check fp is properly open in write mode
This commit is contained in:
Gregory Hainaut 2016-08-15 12:54:12 +02:00
parent 5c7e2432bd
commit 534e01e2d6
1 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
pcsx2/CDVD/CDVD.cpp
View File

@ -122,63 +122,69 @@ static void cdvdGetMechaVer(u8* ver)
NVMLayout* getNvmLayout() NVMLayout* getNvmLayout()
{ {
NVMLayout* nvmLayout = NULL; NVMLayout* nvmLayout = NULL;
if(nvmlayouts[1].biosVer <= BiosVersion) if(nvmlayouts[1].biosVer <= BiosVersion)
nvmLayout = &nvmlayouts[1]; nvmLayout = &nvmlayouts[1];
else else
nvmLayout = &nvmlayouts[0]; nvmLayout = &nvmlayouts[0];
return nvmLayout; return nvmLayout;
} }
// Throws Exception::CannotCreateStream if the file cannot be opened for reading, or cannot // Throws Exception::CannotCreateStream if the file cannot be opened for reading, or cannot
// be created for some reason. // be created for some reason.
FILE* _cdvdOpenNVM() static void cdvdNVM(u8 *buffer, int offset, size_t bytes, bool read)
{ {
wxFileName nvmfile(EmuConfig.BiosFilename); wxFileName nvmfile(EmuConfig.BiosFilename);
nvmfile.SetExt( L"nvm" ); nvmfile.SetExt(L"nvm");
const wxString fname( nvmfile.GetFullPath() ); const wxString fname(nvmfile.GetFullPath());
// if file doesn't exist, create empty one // Likely a bad idea to go further
FILE* fd = wxFopen(fname, L"r+b"); if (nvmfile.IsDir())
if (fd == NULL) throw Exception::CannotCreateStream(fname);
{
Console.Warning("NVM File Not Found, Creating Blank File"); if (Path::GetFileSize(fname) < 1024) {
fd = wxFopen(fname, L"wb"); Console.Warning("NVM File Not Found, creating substitute...");
if (fd == NULL)
wxFFile fp(fname, L"wb");
if (!fp.IsOpened())
throw Exception::CannotCreateStream(fname); throw Exception::CannotCreateStream(fname);
for (int i=0; i<1024; i++) fputc(0, fd); u8 zero[1024] = {0};
fp.Write(zero, sizeof(zero));
//Write NVM ILink area with dummy data (Age of Empires 2) //Write NVM ILink area with dummy data (Age of Empires 2)
NVMLayout* nvmLayout = getNvmLayout(); NVMLayout* nvmLayout = getNvmLayout();
u8 ILinkID_Data[8] = { 0x00, 0xAC, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x86 }; u8 ILinkID_Data[8] = { 0x00, 0xAC, 0xFF, 0xFF, 0xFF, 0xFF, 0xB9, 0x86 };
fseek(fd, *(s32*)(((u8*)nvmLayout)+offsetof(NVMLayout, ilinkId)), SEEK_SET); fp.Seek(*(s32*)(((u8*)nvmLayout) + offsetof(NVMLayout, ilinkId)));
fwrite(ILinkID_Data, 1, 8, fd); fp.Write(ILinkID_Data, sizeof(ILinkID_Data));
} }
return fd;
wxFFile fp(fname, L"r+b");
if (!fp.IsOpened())
throw Exception::CannotCreateStream(fname);
fp.Seek(offset);
size_t ret;
if (read)
ret = fp.Read(buffer, bytes);
else
ret = fp.Write(buffer, bytes);
if (ret != bytes)
Console.Error(L"Failed to %s %s. Did only %zu/%zu bytes",
read ? L"read from" : L"write to", WX_STR(fname), ret, bytes);
} }
//
// the following 'cdvd' functions all return 0 if successful
//
static void cdvdReadNVM(u8 *dst, int offset, int bytes) { static void cdvdReadNVM(u8 *dst, int offset, int bytes) {
FILE* fd = _cdvdOpenNVM(); cdvdNVM(dst, offset, bytes, true);
fseek(fd, offset, SEEK_SET);
fread(dst, 1, bytes, fd);
fclose(fd);
} }
static void cdvdWriteNVM(const u8 *src, int offset, int bytes) { static void cdvdWriteNVM(const u8 *src, int offset, int bytes) {
FILE* fd = _cdvdOpenNVM(); cdvdNVM(const_cast<u8*>(src), offset, bytes, false);
fseek(fd, offset, SEEK_SET);
fwrite(src, 1, bytes, fd);
fclose(fd);
} }
void getNvmData(u8* buffer, s32 offset, s32 size, s32 fmtOffset) void getNvmData(u8* buffer, s32 offset, s32 size, s32 fmtOffset)