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

Re-fixed bios skip hack, and fixed stack overflow when using CDVD plugins. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1802 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-09-09 17:15:54 +00:00
parent 7f0039d646
commit 87d038949e
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/CDVD/CDVD.cpp
View File

@ -78,7 +78,7 @@ FILE *_cdvdOpenMechaVer()
wxFileName mecfile(EmuConfig.BiosFilename); wxFileName mecfile(EmuConfig.BiosFilename);
mecfile.SetExt( L"mec" ); mecfile.SetExt( L"mec" );
wxCharBuffer file( mecfile.GetFullPath().ToUTF8() ); const wxCharBuffer file( mecfile.GetFullPath().ToUTF8() );
// if file doesnt exist, create empty one // if file doesnt exist, create empty one
fd = fopen(file.data(), "r+b"); fd = fopen(file.data(), "r+b");
@ -118,7 +118,7 @@ FILE *_cdvdOpenNVM()
wxFileName nvmfile(EmuConfig.BiosFilename); wxFileName nvmfile(EmuConfig.BiosFilename);
nvmfile.SetExt( L"nvm" ); nvmfile.SetExt( L"nvm" );
wxCharBuffer file( nvmfile.GetFullPath().ToUTF8() ); const wxCharBuffer file( nvmfile.GetFullPath().ToUTF8() );
// if file doesnt exist, create empty one // if file doesnt exist, create empty one
fd = fopen(file.data(), "r+b"); fd = fopen(file.data(), "r+b");

10
pcsx2/PluginManager.cpp
View File

@ -365,16 +365,9 @@ static s32 CALLBACK CDVD_getDualInfo(s32* dualType, u32* layer1Start)
return 1; return 1;
} }
static void CALLBACK CDVDplugin_Close()
{
g_plugins->Close( PluginId_CDVD );
}
CDVD_API CDVDapi_Plugin = CDVD_API CDVDapi_Plugin =
{ {
CDVDplugin_Close, // All of these are filled by the plugin manager
// The rest are filled in by the plugin manager
NULL NULL
}; };
@ -383,6 +376,7 @@ CDVD_API* CDVD = NULL;
static const LegacyApi_ReqMethod s_MethMessReq_CDVD[] = static const LegacyApi_ReqMethod s_MethMessReq_CDVD[] =
{ {
{ "CDVDopen", (vMeth**)&CDVDapi_Plugin.open, NULL }, { "CDVDopen", (vMeth**)&CDVDapi_Plugin.open, NULL },
{ "CDVDclose", (vMeth**)&CDVDapi_Plugin.close, NULL },
{ "CDVDreadTrack", (vMeth**)&CDVDapi_Plugin.readTrack, NULL }, { "CDVDreadTrack", (vMeth**)&CDVDapi_Plugin.readTrack, NULL },
{ "CDVDgetBuffer", (vMeth**)&CDVDapi_Plugin.getBuffer, NULL }, { "CDVDgetBuffer", (vMeth**)&CDVDapi_Plugin.getBuffer, NULL },
{ "CDVDreadSubQ", (vMeth**)&CDVDapi_Plugin.readSubQ, NULL }, { "CDVDreadSubQ", (vMeth**)&CDVDapi_Plugin.readSubQ, NULL },

6
pcsx2/gui/MainMenuClicks.cpp
View File

@ -106,9 +106,11 @@ void MainEmuFrame::Menu_BootCdvd_Click( wxCommandEvent &event )
} }
SysEndExecution(); SysEndExecution();
InitPlugins();
EmuConfig.SkipBiosSplash = GetMenuBar()->IsChecked( MenuId_SkipBiosToggle ); g_Conf->EmuOptions.SkipBiosSplash = GetMenuBar()->IsChecked( MenuId_SkipBiosToggle );
wxGetApp().SaveSettings();
InitPlugins();
CDVDsys_SetFile( CDVDsrc_Iso, g_Conf->CurrentIso ); CDVDsys_SetFile( CDVDsrc_Iso, g_Conf->CurrentIso );
SysExecute( new AppEmuThread(), g_Conf->CdvdSource ); SysExecute( new AppEmuThread(), g_Conf->CdvdSource );