libretro/beetle-psx-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-psx-libretro.git synced 2024-11-23 08:49:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Start using log_cb instead of going through MDFN_Error

Browse Source
This commit is contained in:
twinaphex 2016-08-14 14:55:16 +02:00
parent be2f7e95cb
commit 0072138d23
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libretro.cpp
View File

@ -1102,10 +1102,10 @@ static bool TestMagicCD(std::vector<CDIF *> *CDInterfaces)
static const char *CalcDiscSCEx_BySYSTEMCNF(CDIF *c, unsigned *rr)
{
const char *ret = NULL;
Stream *fp = NULL;
uint8_t pvd[2048];
uint32_t rdel, rdel_len;
const char *ret = NULL;
Stream *fp = NULL;
unsigned pvd_search_count = 0;
fp = c->MakeStream(0, ~0U);
@ -1114,22 +1114,39 @@ static const char *CalcDiscSCEx_BySYSTEMCNF(CDIF *c, unsigned *rr)
do
{
if((pvd_search_count++) == 32)
throw MDFN_Error(0, "PVD search count limit met.");
{
log_cb(RETRO_LOG_ERROR, "PVD search count limit met.\n");
ret = NULL;
goto Breakout;
}
fp->read(pvd, 2048);
if(memcmp(&pvd[1], "CD001", 5))
throw MDFN_Error(0, "Not ISO-9660");
{
log_cb(RETRO_LOG_ERROR, "Not ISO-9660\n");
ret = NULL;
goto Breakout;
}
if(pvd[0] == 0xFF)
throw MDFN_Error(0, "Missing Primary Volume Descriptor");
{
log_cb(RETRO_LOG_ERROR, "Missing Primary Volume Descriptor\n");
ret = NULL;
goto Breakout;
}
} while(pvd[0] != 0x01);
//[156 ... 189], 34 bytes
uint32_t rdel = MDFN_de32lsb(&pvd[0x9E]);
uint32_t rdel_len = MDFN_de32lsb(&pvd[0xA6]);
if(rdel_len >= (1024 * 1024 * 10)) // Arbitrary sanity check.
throw MDFN_Error(0, "Root directory table too large");
/*[156 ... 189], 34 bytes */
rdel = MDFN_de32lsb(&pvd[0x9E]);
rdel_len = MDFN_de32lsb(&pvd[0xA6]);
if(rdel_len >= (1024 * 1024 * 10)) /* Arbitrary sanity check. */
{
log_cb(RETRO_LOG_ERROR, "Root directory table too large\n");
ret = NULL;
goto Breakout;
}
fp->seek((int64)rdel * 2048, SEEK_SET);
//printf("%08x, %08x\n", rdel * 2048, rdel_len);

6
mednafen/cdrom/cdromif.cpp
View File

@ -228,7 +228,7 @@ bool CDIF_Queue::Read(CDIF_Message *message, bool blocking)
if(ret && message->message == CDIF_MSG_FATAL_ERROR)
{
MDFN_Error(0, "%s", message->str_message.c_str());
log_cb(RETRO_LOG_ERROR, "%s\n", message->str_message.c_str());
return false;
}
@ -264,7 +264,7 @@ bool CDIF_MT::RT_EjectDisc(bool eject_status, bool skip_actual_eject)
if(disc_toc.first_track < 1 || disc_toc.last_track > 99 || disc_toc.first_track > disc_toc.last_track)
{
MDFN_Error(0, _("TOC first(%d)/last(%d) track numbers bad."), disc_toc.first_track, disc_toc.last_track);
log_cb(RETRO_LOG_ERROR, "TOC first(%d)/last(%d) track numbers bad.\n", disc_toc.first_track, disc_toc.last_track);
return false;
}
}
@ -663,7 +663,7 @@ bool CDIF_ST::Eject(bool eject_status)
if(disc_toc.first_track < 1 || disc_toc.last_track > 99 || disc_toc.first_track > disc_toc.last_track)
{
MDFN_Error(0, _("TOC first(%d)/last(%d) track numbers bad."), disc_toc.first_track, disc_toc.last_track);
log_cb(RETRO_LOG_ERROR, "TOC first(%d)/last(%d) track numbers bad.\n", disc_toc.first_track, disc_toc.last_track);
return false;
}
}