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

wxgui: minor plugin binding fixes; this gets Linux booting to the point that it gives me the standard "OpenGL Fail" error (co-linux limitation) 

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1750 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2009-09-06 01:06:44 +00:00
parent 867a57935e
commit 5e35a50bc9
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pcsx2/PluginManager.cpp
View File

@ -266,6 +266,9 @@ static const LegacyApi_OptMethod s_MethMessOpt_GS[] =
// ----------------------------------------------------------------------------
// PAD Mess!
// ----------------------------------------------------------------------------
static s32 CALLBACK PAD_queryMtap( u8 slot ) { return 0; }
static s32 CALLBACK PAD_setSlot(u8 port, u8 slot) { return 0; }
static const LegacyApi_ReqMethod s_MethMessReq_PAD[] =
{
{ "PADopen", (vMeth**)&PADopen, NULL },
@ -277,8 +280,8 @@ static const LegacyApi_ReqMethod s_MethMessReq_PAD[] =
// fixme - Following functions are new as of some revison post-0.9.6, and
// are for multitap support only. They should either be optional or offer
// NOP fallbacks, to allow older plugins to retain functionality.
{ "PADsetSlot", (vMeth**)&PADsetSlot, NULL },
{ "PADqueryMtap", (vMeth**)&PADqueryMtap, NULL },
{ "PADsetSlot", (vMeth**)&PADsetSlot, (vMeth*)PAD_setSlot },
{ "PADqueryMtap", (vMeth**)&PADqueryMtap, (vMeth*)PAD_queryMtap },
{ NULL },
};
@ -419,7 +422,6 @@ static const LegacyApi_ReqMethod s_MethMessReq_SPU2[] =
{ "SPU2writeDMA7Mem", (vMeth**)&SPU2writeDMA7Mem, NULL },
{ "SPU2interruptDMA4", (vMeth**)&SPU2interruptDMA4,NULL },
{ "SPU2interruptDMA7", (vMeth**)&SPU2interruptDMA7,NULL },
{ "SPU2setDMABaseAddr", (vMeth**)&SPU2setDMABaseAddr,NULL },
{ "SPU2ReadMemAddr", (vMeth**)&SPU2ReadMemAddr, NULL },
{ "SPU2irqCallback", (vMeth**)&SPU2irqCallback, NULL },
@ -431,6 +433,7 @@ static const LegacyApi_OptMethod s_MethMessOpt_SPU2[] =
{ "SPU2setClockPtr", (vMeth**)&SPU2setClockPtr },
{ "SPU2async", (vMeth**)&SPU2async },
{ "SPU2WriteMemAddr", (vMeth**)&SPU2WriteMemAddr },
{ "SPU2setDMABaseAddr", (vMeth**)&SPU2setDMABaseAddr},
{ "SPU2setupRecording", (vMeth**)&SPU2setupRecording},
{ NULL }
@ -634,7 +637,9 @@ void PluginManager::BindCommon( PluginsEnum_t pid )
if( *target == NULL )
{
throw Exception::PluginLoadError( pid, m_info[pid].Filename,
wxLt( "Configured plugin is not a PCSX2 plugin, or is for an older unsupported version of PCSX2." ) );
wxsFormat( L"\nMethod binding failure on: %s\n", current->GetMethodName( pid ).c_str() ),
_( "Configured plugin is not a PCSX2 plugin, or is for an older unsupported version of PCSX2." )
);
}
target++;
@ -659,7 +664,9 @@ void PluginManager::BindRequired( PluginsEnum_t pid )
if( *(current->Dest) == NULL )
{
throw Exception::PluginLoadError( pid, m_info[pid].Filename,
wxLt( "Configured plugin is not a valid PCSX2 plugin, or is for an older unsupported version of PCSX2." ) );
wxsFormat( L"\nMethod binding failure on: %s\n", current->GetMethodName().c_str() ),
_( "Configured plugin is not a valid PCSX2 plugin, or is for an older unsupported version of PCSX2." )
);
}
current++;
@ -705,7 +712,7 @@ static bool OpenPlugin_GS()
}
if( !mtgsThread->IsSelf() ) return true; // already opened?
return !GSopen( (void*)&pDsp, "PCSX2", renderswitch ? 2 : 1 );
// Note: renderswitch is us abusing the isMultiThread parameter for that so
@ -784,7 +791,7 @@ void PluginManager::Open()
const PluginInfo* pi = tbl_PluginInfo-1;
while( ++pi, pi->shortname != NULL )
g_plugins->Open( pi->id );
cdvdDetectDisk();
}

14
pcsx2/gui/main.cpp
View File

@ -85,7 +85,7 @@ sptr AppEmuThread::ExecuteTask()
GetPluginManager().Close();
bool result = Msgbox::OkCancel( ex.FormatDisplayMessage() +
_("\n\nPress Ok to go to the BIOS Configuration Panel.") );
if( result )
{
wxGetApp().PostMenuAction( MenuId_Config_BIOS );
@ -95,7 +95,7 @@ sptr AppEmuThread::ExecuteTask()
else
{
// Probably a plugin. Find out which one!
const PluginInfo* pi = tbl_PluginInfo-1;
while( ++pi, pi->shortname != NULL )
{
@ -107,7 +107,7 @@ sptr AppEmuThread::ExecuteTask()
{
bool result = Msgbox::OkCancel( ex.FormatDisplayMessage() +
_("\n\nPress Ok to go to the Plugin Configuration Panel.") );
if( result )
{
g_Conf->SettingsTabName = L"Plugins";
@ -126,7 +126,7 @@ sptr AppEmuThread::ExecuteTask()
GetPluginManager().Close();
Msgbox::Alert( ex.FormatDisplayMessage() );
}
return 0;
}
@ -189,7 +189,7 @@ void Pcsx2App::ReadUserModeSettings()
IniLoader loader( *conf_usermode );
g_Conf->LoadSaveUserMode( loader, groupname );
if( !wxFile::Exists( g_Conf->FullPathToConfig() ) )
{
// user wiped their pcsx2.ini -- needs a reconfiguration via wizard!
@ -220,7 +220,7 @@ void Pcsx2App::OnInitCmdLine( wxCmdLineParser& parser )
parser.AddOption( L"bootmode", wxEmptyString, L"0 - quick (default), 1 - bios, 2 - load elf", wxCMD_LINE_VAL_NUMBER );
parser.AddOption( wxEmptyString,L"cfg", L"configuration file override", wxCMD_LINE_VAL_STRING );
parser.AddSwitch( L"forcewiz", wxEmptyString, L"Forces PCSX2 to start the First-time Wizard" );
parser.AddOption( wxEmptyString, L"cdvd", L"specify the CDVD plugin for this session only." );
@ -369,6 +369,8 @@ void Pcsx2App::HandleEvent(wxEvtHandler *handler, wxEventFunction func, wxEvent&
// ----------------------------------------------------------------------------
catch( Exception::PluginError& ex )
{
Console::Error( ex.FormatDiagnosticMessage() );
Msgbox::Alert( ex.FormatDisplayMessage() );
}
// ----------------------------------------------------------------------------
catch( Exception::RuntimeError& ex )