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

Lets use boolean return values in a few places in the iso code. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2220 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-11-19 03:09:19 +00:00
parent cebefa6130
commit 787d39c8bc
3 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
pcsx2/CDVD/IsoFileFormats.cpp
View File

@ -23,12 +23,12 @@
#include "IsoFileFormats.h" #include "IsoFileFormats.h"
static int detect(isoFile *iso) static bool detect(isoFile *iso)
{ {
u8 buf[2448]; u8 buf[2448];
u8* pbuf; u8* pbuf;
if (isoReadBlock(iso, buf, 16) == -1) return -1; if (!isoReadBlock(iso, buf, 16)) return -1;
pbuf = (( iso->flags & ISOFLAGS_BLOCKDUMP_V3 ) ? buf : (buf + 24)); pbuf = (( iso->flags & ISOFLAGS_BLOCKDUMP_V3 ) ? buf : (buf + 24));
@ -71,8 +71,8 @@ static bool tryIsoType(isoFile *iso, u32 size, u32 offset, u32 blockofs)
} }
// based on florin's CDVDbin detection code :) // based on florin's CDVDbin detection code :)
// Returns 0 if the image is valid/known/supported, or -1 if not (iso->type == ISOTYPE_ILLEGAL). // Returns true if the image is valid/known/supported, or false if not (iso->type == ISOTYPE_ILLEGAL).
int isoDetect(isoFile *iso) bool isoDetect(isoFile *iso)
{ {
char buf[32]; char buf[32];
int len; int len;
@ -91,7 +91,7 @@ int isoDetect(isoFile *iso)
_readfile(iso->handle, &iso->blocks, 4); _readfile(iso->handle, &iso->blocks, 4);
_readfile(iso->handle, &iso->blockofs, 4); _readfile(iso->handle, &iso->blockofs, 4);
_isoReadDtable(iso); _isoReadDtable(iso);
return (detect(iso) == 1) ? 0 : -1; return (detect(iso) == 1);
} }
else if (strncmp(buf, "BDV3", 4) == 0) else if (strncmp(buf, "BDV3", 4) == 0)
{ {
@ -100,29 +100,29 @@ int isoDetect(isoFile *iso)
_readfile(iso->handle, &iso->blocks, 4); _readfile(iso->handle, &iso->blocks, 4);
_readfile(iso->handle, &iso->blockofs, 4); _readfile(iso->handle, &iso->blockofs, 4);
_isoReadDtable(iso); _isoReadDtable(iso);
return (detect(iso) == 1) ? 0 : -1; return (detect(iso) == 1);
} }
else else
{ {
iso->blocks = 16; iso->blocks = 16;
} }
if (tryIsoType(iso, 2048, 0, 24)) return 0; // ISO 2048 if (tryIsoType(iso, 2048, 0, 24)) return true; // ISO 2048
if (tryIsoType(iso, 2336, 0, 16)) return 0; // RAW 2336 if (tryIsoType(iso, 2336, 0, 16)) return true; // RAW 2336
if (tryIsoType(iso, 2352, 0, 0)) return 0; // RAW 2352 if (tryIsoType(iso, 2352, 0, 0)) return true; // RAW 2352
if (tryIsoType(iso, 2448, 0, 0)) return 0; // RAWQ 2448 if (tryIsoType(iso, 2448, 0, 0)) return true; // RAWQ 2448
if (tryIsoType(iso, 2048, 150 * 2048, 24)) return 0; // NERO ISO 2048 if (tryIsoType(iso, 2048, 150 * 2048, 24)) return true; // NERO ISO 2048
if (tryIsoType(iso, 2352, 150 * 2048, 0)) return 0; // NERO RAW 2352 if (tryIsoType(iso, 2352, 150 * 2048, 0)) return true; // NERO RAW 2352
if (tryIsoType(iso, 2448, 150 * 2048, 0)) return 0; // NERO RAWQ 2448 if (tryIsoType(iso, 2448, 150 * 2048, 0)) return true; // NERO RAWQ 2448
if (tryIsoType(iso, 2048, -8, 24)) return 0; // ISO 2048 if (tryIsoType(iso, 2048, -8, 24)) return true; // ISO 2048
if (tryIsoType(iso, 2352, -8, 0)) return 0; // RAW 2352 if (tryIsoType(iso, 2352, -8, 0)) return true; // RAW 2352
if (tryIsoType(iso, 2448, -8, 0)) return 0; // RAWQ 2448 if (tryIsoType(iso, 2448, -8, 0)) return true; // RAWQ 2448
iso->offset = 0; iso->offset = 0;
iso->blocksize = CD_FRAMESIZE_RAW; iso->blocksize = CD_FRAMESIZE_RAW;
iso->blockofs = 0; iso->blockofs = 0;
iso->type = ISOTYPE_AUDIO; iso->type = ISOTYPE_AUDIO;
return 0; return true;
} }
isoFile *isoOpen(const char *filename) isoFile *isoOpen(const char *filename)
@ -142,7 +142,7 @@ isoFile *isoOpen(const char *filename)
return NULL; return NULL;
} }
if (isoDetect(iso) == -1) return NULL; if (!isoDetect(iso)) return NULL;
Console.WriteLn("detected blocksize = %u", iso->blocksize); Console.WriteLn("detected blocksize = %u", iso->blocksize);
@ -230,7 +230,7 @@ isoFile *isoCreate(const char *filename, int flags)
return iso; return iso;
} }
int isoSetFormat(isoFile *iso, uint blockofs, uint blocksize, uint blocks) bool isoSetFormat(isoFile *iso, uint blockofs, uint blocksize, uint blocks)
{ {
iso->blocksize = blocksize; iso->blocksize = blocksize;
iso->blocks = blocks; iso->blocks = blocks;
@ -242,19 +242,19 @@ int isoSetFormat(isoFile *iso, uint blockofs, uint blocksize, uint blocks)
if (iso->flags & ISOFLAGS_BLOCKDUMP_V2) if (iso->flags & ISOFLAGS_BLOCKDUMP_V2)
{ {
if (_writefile(iso->handle, "BDV2", 4) < 4) return -1; if (_writefile(iso->handle, "BDV2", 4) < 4) return false;
if (_writefile(iso->handle, &blocksize, 4) < 4) return -1; if (_writefile(iso->handle, &blocksize, 4) < 4) return false;
if (_writefile(iso->handle, &blocks, 4) < 4) return -1; if (_writefile(iso->handle, &blocks, 4) < 4) return false;
if (_writefile(iso->handle, &blockofs, 4) < 4) return -1; if (_writefile(iso->handle, &blockofs, 4) < 4) return false;
} }
else if (iso->flags & ISOFLAGS_BLOCKDUMP_V3) else if (iso->flags & ISOFLAGS_BLOCKDUMP_V3)
{ {
if (_writefile(iso->handle, "BDV3", 4) < 4) return -1; if (_writefile(iso->handle, "BDV3", 4) < 4) return false;
if (_writefile(iso->handle, &blocksize, 4) < 4) return -1; if (_writefile(iso->handle, &blocksize, 4) < 4) return false;
if (_writefile(iso->handle, &blocks, 4) < 4) return -1; if (_writefile(iso->handle, &blocks, 4) < 4) return false;
} }
return 0; return true;
} }
s32 MSFtoLSN(u8 *Time) s32 MSFtoLSN(u8 *Time)
@ -281,7 +281,7 @@ void LSNtoMSF(u8 *Time, s32 lsn)
Time[2] = itob(f); Time[2] = itob(f);
} }
int _isoReadBlock(isoFile *iso, u8 *dst, int lsn) bool _isoReadBlock(isoFile *iso, u8 *dst, int lsn)
{ {
u64 ofs = (u64)lsn * iso->blocksize + iso->offset; u64 ofs = (u64)lsn * iso->blocksize + iso->offset;
@ -293,13 +293,13 @@ int _isoReadBlock(isoFile *iso, u8 *dst, int lsn)
if (ret < iso->blocksize) if (ret < iso->blocksize)
{ {
Console.Error("read error in _isoReadBlock." ); Console.Error("read error in _isoReadBlock." );
return -1; return false;
} }
return 0; return true;
} }
int _isoReadBlockD(isoFile *iso, u8 *dst, uint lsn) bool _isoReadBlockD(isoFile *iso, u8 *dst, uint lsn)
{ {
uint ret; uint ret;
@ -313,16 +313,16 @@ int _isoReadBlockD(isoFile *iso, u8 *dst, uint lsn)
_seekfile(iso->handle, 16 + i * (iso->blocksize + 4) + 4, SEEK_SET); _seekfile(iso->handle, 16 + i * (iso->blocksize + 4) + 4, SEEK_SET);
ret = _readfile(iso->handle, dst + iso->blockofs, iso->blocksize); ret = _readfile(iso->handle, dst + iso->blockofs, iso->blocksize);
if (ret < iso->blocksize) return -1; if (ret < iso->blocksize) return false;
return 0; return true;
} }
Console.WriteLn("Block %u not found in dump", lsn); Console.WriteLn("Block %u not found in dump", lsn);
return -1; return false;
} }
int _isoReadBlockM(isoFile *iso, u8 *dst, uint lsn) bool _isoReadBlockM(isoFile *iso, u8 *dst, uint lsn)
{ {
u64 ofs; u64 ofs;
uint ret, i; uint ret, i;
@ -335,7 +335,7 @@ int _isoReadBlockM(isoFile *iso, u8 *dst, uint lsn)
} }
} }
if (i == 8) return -1; if (i == 8) return false;
ofs = (u64)(lsn - iso->multih[i].slsn) * iso->blocksize + iso->offset; ofs = (u64)(lsn - iso->multih[i].slsn) * iso->blocksize + iso->offset;
@ -348,20 +348,20 @@ int _isoReadBlockM(isoFile *iso, u8 *dst, uint lsn)
if (ret < iso->blocksize) if (ret < iso->blocksize)
{ {
Console.Error("read error in _isoReadBlockM"); Console.Error("read error in _isoReadBlockM");
return -1; return false;
} }
return 0; return true;
} }
int isoReadBlock(isoFile *iso, u8 *dst, uint lsn) bool isoReadBlock(isoFile *iso, u8 *dst, uint lsn)
{ {
int ret; bool ret;
if (lsn > iso->blocks) if (lsn > iso->blocks)
{ {
Console.WriteLn("isoReadBlock: %u > %u", lsn, iso->blocks); Console.WriteLn("isoReadBlock: %u > %u", lsn, iso->blocks);
return -1; return false;
} }
if (iso->flags & ISOFLAGS_BLOCKDUMP_V2) if (iso->flags & ISOFLAGS_BLOCKDUMP_V2)
@ -373,7 +373,7 @@ int isoReadBlock(isoFile *iso, u8 *dst, uint lsn)
else else
ret = _isoReadBlock(iso, dst, lsn); ret = _isoReadBlock(iso, dst, lsn);
if (ret < 0) return -1; if (!ret) return false;
if (iso->type == ISOTYPE_CD) if (iso->type == ISOTYPE_CD)
{ {
@ -381,36 +381,36 @@ int isoReadBlock(isoFile *iso, u8 *dst, uint lsn)
dst[15] = 2; dst[15] = 2;
} }
return 0; return true;
} }
int _isoWriteBlock(isoFile *iso, u8 *src, uint lsn) bool _isoWriteBlock(isoFile *iso, u8 *src, uint lsn)
{ {
uint ret; uint ret;
u64 ofs = (u64)lsn * iso->blocksize + iso->offset; u64 ofs = (u64)lsn * iso->blocksize + iso->offset;
_seekfile(iso->handle, ofs, SEEK_SET); _seekfile(iso->handle, ofs, SEEK_SET);
ret = _writefile(iso->handle, src + iso->blockofs, iso->blocksize); ret = _writefile(iso->handle, src + iso->blockofs, iso->blocksize);
if (ret < iso->blocksize) return -1; if (ret < iso->blocksize) return false;
return 0; return true;
} }
int _isoWriteBlockD(isoFile *iso, u8 *src, uint lsn) bool _isoWriteBlockD(isoFile *iso, u8 *src, uint lsn)
{ {
uint ret; uint ret;
ret = _writefile(iso->handle, &lsn, 4); ret = _writefile(iso->handle, &lsn, 4);
if (ret < 4) return -1; if (ret < 4) return false;
ret = _writefile(iso->handle, src + iso->blockofs, iso->blocksize); ret = _writefile(iso->handle, src + iso->blockofs, iso->blocksize);
if (ret < iso->blocksize) return -1; if (ret < iso->blocksize) return false;
return 0; return true;
} }
int isoWriteBlock(isoFile *iso, u8 *src, uint lsn) bool isoWriteBlock(isoFile *iso, u8 *src, uint lsn)
{ {
if (iso->flags & ISOFLAGS_BLOCKDUMP_V3) if (iso->flags & ISOFLAGS_BLOCKDUMP_V3)
return _isoWriteBlockD(iso, src, lsn); return _isoWriteBlockD(iso, src, lsn);

8
pcsx2/CDVD/IsoFileFormats.h
View File

@ -73,10 +73,10 @@ struct isoFile
extern isoFile *isoOpen(const char *filename); extern isoFile *isoOpen(const char *filename);
extern isoFile *isoCreate(const char *filename, int mode); extern isoFile *isoCreate(const char *filename, int mode);
extern int isoSetFormat(isoFile *iso, uint blockofs, uint blocksize, uint blocks); extern bool isoSetFormat(isoFile *iso, uint blockofs, uint blocksize, uint blocks);
extern int isoDetect(isoFile *iso); extern bool isoDetect(isoFile *iso);
extern int isoReadBlock(isoFile *iso, u8 *dst, uint lsn); extern bool isoReadBlock(isoFile *iso, u8 *dst, uint lsn);
extern int isoWriteBlock(isoFile *iso, u8 *src, uint lsn); extern bool isoWriteBlock(isoFile *iso, u8 *src, uint lsn);
extern void isoClose(isoFile *iso); extern void isoClose(isoFile *iso);
#endif /* __LIBISO_H__ */ #endif /* __LIBISO_H__ */

2
pcsx2/gui/IsoDropTarget.cpp
View File

@ -101,7 +101,7 @@ bool IsoDropTarget::OnDropFiles(wxCoord x, wxCoord y, const wxArrayString& filen
if( iso.handle == NULL ) if( iso.handle == NULL )
throw Exception::CreateStream( filenames[0] ); throw Exception::CreateStream( filenames[0] );
if( isoDetect( &iso ) == 0 ) if (isoDetect(&iso))
{ {
Console.WriteLn( L"(Drag&Drop) Found valid ISO file type!" ); Console.WriteLn( L"(Drag&Drop) Found valid ISO file type!" );