From 62f73668855e4c7be66288b49b202d91911bd967 Mon Sep 17 00:00:00 2001 From: Emmet Young Date: Sat, 6 Oct 2012 23:57:18 +1000 Subject: [PATCH] Change all plugin files to use the ValidPluginVersion from Plugin List.cpp --- Source/Project64/Plugins/Audio Plugin.cpp | 14 +---- Source/Project64/Plugins/Audio Plugin.h | 1 - .../Project64/Plugins/Controller Plugin.cpp | 13 +---- Source/Project64/Plugins/Controller Plugin.h | 1 - Source/Project64/Plugins/GFX plugin.cpp | 14 +---- Source/Project64/Plugins/GFX plugin.h | 1 - Source/Project64/Plugins/Plugin List.cpp | 54 +++++-------------- Source/Project64/Plugins/Plugin List.h | 2 +- Source/Project64/Plugins/RSP Plugin.cpp | 15 +----- Source/Project64/Plugins/RSP Plugin.h | 1 - 10 files changed, 18 insertions(+), 98 deletions(-) diff --git a/Source/Project64/Plugins/Audio Plugin.cpp b/Source/Project64/Plugins/Audio Plugin.cpp index 93f05976a..b9f1ee189 100644 --- a/Source/Project64/Plugins/Audio Plugin.cpp +++ b/Source/Project64/Plugins/Audio Plugin.cpp @@ -46,7 +46,7 @@ void CAudioPlugin::Init ( const char * FileName ) if (GetDllInfo == NULL) { UnloadPlugin(); return; } GetDllInfo(&m_PluginInfo); - if (!ValidPluginVersion(&m_PluginInfo)) { UnloadPlugin(); return; } + if (!CPluginList::ValidPluginVersion(m_PluginInfo)) { UnloadPlugin(); return; } //Find entries for functions in DLL void (__cdecl *InitFunc) ( void ); @@ -247,18 +247,6 @@ void CAudioPlugin::GameReset(void) } } -bool CAudioPlugin::ValidPluginVersion(PLUGIN_INFO * PluginInfo) { - switch (PluginInfo->Type) { - case PLUGIN_TYPE_AUDIO: - if (PluginInfo->MemoryBswaped == FALSE) { return FALSE; } - if (PluginInfo->Version == 0x0101) { return TRUE; } - if (PluginInfo->Version == 0x0102) { return TRUE; } - break; - } - return FALSE; -} - - void CAudioPlugin::UnloadPlugin(void) { if (m_hAudioThread) { diff --git a/Source/Project64/Plugins/Audio Plugin.h b/Source/Project64/Plugins/Audio Plugin.h index f00749435..2f1b6b107 100644 --- a/Source/Project64/Plugins/Audio Plugin.h +++ b/Source/Project64/Plugins/Audio Plugin.h @@ -30,7 +30,6 @@ private: void Init ( const char * FileName ); void UnloadPlugin ( void ); - bool ValidPluginVersion ( PLUGIN_INFO * PluginInfo ); void (__cdecl *CloseDLL) ( void ); void (__cdecl *RomOpen) ( void ); diff --git a/Source/Project64/Plugins/Controller Plugin.cpp b/Source/Project64/Plugins/Controller Plugin.cpp index 6755dcf54..e8e131bd2 100644 --- a/Source/Project64/Plugins/Controller Plugin.cpp +++ b/Source/Project64/Plugins/Controller Plugin.cpp @@ -50,7 +50,7 @@ void CControl_Plugin::Init ( const char * FileName ) if (GetDllInfo == NULL) { UnloadPlugin(); return; } GetDllInfo(&m_PluginInfo); - if (!ValidPluginVersion(&m_PluginInfo)) { UnloadPlugin(); return; } + if (!CPluginList::ValidPluginVersion(m_PluginInfo)) { UnloadPlugin(); return; } //Find entries for functions in DLL void (__cdecl *InitFunc) ( void ); @@ -238,17 +238,6 @@ void CControl_Plugin::GameReset(void) } } -bool CControl_Plugin::ValidPluginVersion(PLUGIN_INFO * PluginInfo) { - switch (PluginInfo->Type) { - case PLUGIN_TYPE_CONTROLLER: - if (PluginInfo->Version == 0x0100) { return TRUE; } - if (PluginInfo->Version == 0x0101) { return TRUE; } - if (PluginInfo->Version == 0x0102) { return TRUE; } - break; - } - return FALSE; -} - void CControl_Plugin::UnloadPlugin(void) { if (m_AllocatedControllers) { for (int count = 0; count < sizeof(m_Controllers) / sizeof(m_Controllers[0]); count++) { diff --git a/Source/Project64/Plugins/Controller Plugin.h b/Source/Project64/Plugins/Controller Plugin.h index 058bd5a5a..264342f98 100644 --- a/Source/Project64/Plugins/Controller Plugin.h +++ b/Source/Project64/Plugins/Controller Plugin.h @@ -100,7 +100,6 @@ private: CONTROL m_PluginControllers[4]; void UnloadPlugin ( void ); - bool ValidPluginVersion ( PLUGIN_INFO * PluginInfo ); void (__cdecl *CloseDLL) ( void ); void (__cdecl *RomOpen) ( void ); diff --git a/Source/Project64/Plugins/GFX plugin.cpp b/Source/Project64/Plugins/GFX plugin.cpp index 155a525cd..77acf0609 100644 --- a/Source/Project64/Plugins/GFX plugin.cpp +++ b/Source/Project64/Plugins/GFX plugin.cpp @@ -54,7 +54,7 @@ void CGfxPlugin::Init ( const char * FileName ) if (GetDllInfo == NULL) { UnloadPlugin(); return; } GetDllInfo(&m_PluginInfo); - if (!ValidPluginVersion(&m_PluginInfo)) { UnloadPlugin(); return; } + if (!CPluginList::ValidPluginVersion(m_PluginInfo)) { UnloadPlugin(); return; } //Find entries for functions in DLL BOOL (__cdecl *InitFunc) ( void * Gfx_Info ); @@ -321,18 +321,6 @@ void CGfxPlugin::GameReset(void) } } -bool CGfxPlugin::ValidPluginVersion(PLUGIN_INFO * PluginInfo) { - switch (PluginInfo->Type) { - case PLUGIN_TYPE_GFX: - if (PluginInfo->MemoryBswaped == FALSE) { return FALSE; } - if (PluginInfo->Version == 0x0102) { return TRUE; } - if (PluginInfo->Version == 0x0103) { return TRUE; } - if (PluginInfo->Version == 0x0104) { return TRUE; } - break; - } - return FALSE; -} - void CGfxPlugin::UnloadPlugin(void) { if (m_hDll != NULL ) { FreeLibrary((HMODULE)m_hDll); diff --git a/Source/Project64/Plugins/GFX plugin.h b/Source/Project64/Plugins/GFX plugin.h index 81ef34cc2..537bf9a6c 100644 --- a/Source/Project64/Plugins/GFX plugin.h +++ b/Source/Project64/Plugins/GFX plugin.h @@ -72,7 +72,6 @@ private: void Init ( const char * FileName ); void UnloadPlugin ( void ); - bool ValidPluginVersion ( PLUGIN_INFO * PluginInfo ); GFXDEBUG_INFO m_GFXDebug; void * m_hDll; diff --git a/Source/Project64/Plugins/Plugin List.cpp b/Source/Project64/Plugins/Plugin List.cpp index 5c2331f9e..489222998 100644 --- a/Source/Project64/Plugins/Plugin List.cpp +++ b/Source/Project64/Plugins/Plugin List.cpp @@ -104,27 +104,25 @@ void CPluginList::AddPluginFromDir ( CPath Dir) } bool CPluginList::ValidPluginVersion ( PLUGIN_INFO & PluginInfo ) { - if (!PluginInfo.MemoryBswaped) - { - return false; - } - switch (PluginInfo.Type) { case PLUGIN_TYPE_RSP: - if (PluginInfo.Version == 0x0001) { return true; } - if (PluginInfo.Version == 0x0100) { return true; } - if (PluginInfo.Version == 0x0101) { return true; } - if (PluginInfo.Version == 0x0102) { return true; } + if (!PluginInfo.MemoryBswaped) { return false; } + if (PluginInfo.Version == 0x0001) { return true; } + if (PluginInfo.Version == 0x0100) { return true; } + if (PluginInfo.Version == 0x0101) { return true; } + if (PluginInfo.Version == 0x0102) { return true; } break; case PLUGIN_TYPE_GFX: - if (PluginInfo.Version == 0x0102) { return true; } - if (PluginInfo.Version == 0x0103) { return true; } - if (PluginInfo.Version == 0x0104) { return true; } + if (!PluginInfo.MemoryBswaped) { return false; } + if (PluginInfo.Version == 0x0102) { return true; } + if (PluginInfo.Version == 0x0103) { return true; } + if (PluginInfo.Version == 0x0104) { return true; } break; case PLUGIN_TYPE_AUDIO: - if (PluginInfo.Version == 0x0101) { return true; } - if (PluginInfo.Version == 0x0102) { return true; } + if (!PluginInfo.MemoryBswaped) { return false; } + if (PluginInfo.Version == 0x0101) { return true; } + if (PluginInfo.Version == 0x0102) { return true; } break; case PLUGIN_TYPE_CONTROLLER: if (PluginInfo.Version == 0x0100) { return true; } @@ -136,7 +134,7 @@ bool CPluginList::ValidPluginVersion ( PLUGIN_INFO & PluginInfo ) { } -#ifdef tofix +#ifdef toremove CPluginList::CPluginList (CSettings * Settings) { _Settings = Settings; } @@ -245,30 +243,4 @@ PluginList CPluginList::GetPluginList (void) { return Plugins; } -bool CPluginList::ValidPluginVersion ( PLUGIN_INFO * PluginInfo ) { - switch (PluginInfo->Type) { - case PLUGIN_TYPE_RSP: - if (PluginInfo->Version == 0x0001) { return TRUE; } - if (PluginInfo->Version == 0x0100) { return TRUE; } - if (PluginInfo->Version == 0x0101) { return TRUE; } - if (PluginInfo->Version == 0x0102) { return TRUE; } - break; - case PLUGIN_TYPE_GFX: - if (PluginInfo->Version == 0x0102) { return TRUE; } - if (PluginInfo->Version == 0x0103) { return TRUE; } - if (PluginInfo->Version == 0x0104) { return TRUE; } - break; - case PLUGIN_TYPE_AUDIO: - if (PluginInfo->Version == 0x0101) { return TRUE; } - if (PluginInfo->Version == 0x0102) { return TRUE; } - break; - case PLUGIN_TYPE_CONTROLLER: - if (PluginInfo->Version == 0x0100) { return TRUE; } - if (PluginInfo->Version == 0x0101) { return TRUE; } - if (PluginInfo->Version == 0x0102) { return TRUE; } - break; - } - return FALSE; -} - #endif \ No newline at end of file diff --git a/Source/Project64/Plugins/Plugin List.h b/Source/Project64/Plugins/Plugin List.h index 0ee72b785..510510bc0 100644 --- a/Source/Project64/Plugins/Plugin List.h +++ b/Source/Project64/Plugins/Plugin List.h @@ -17,7 +17,6 @@ private: CPath m_PluginDir; void AddPluginFromDir ( CPath Dir); - bool ValidPluginVersion ( PLUGIN_INFO & PluginInfo ); public: CPluginList(bool bAutoFill = true); @@ -26,4 +25,5 @@ public: bool LoadList ( void ); int GetPluginCount ( void ) const; const PLUGIN * GetPluginInfo ( int indx ) const; + static bool ValidPluginVersion ( PLUGIN_INFO & PluginInfo ); }; diff --git a/Source/Project64/Plugins/RSP Plugin.cpp b/Source/Project64/Plugins/RSP Plugin.cpp index 8ee1442ca..6afbc0662 100644 --- a/Source/Project64/Plugins/RSP Plugin.cpp +++ b/Source/Project64/Plugins/RSP Plugin.cpp @@ -28,7 +28,7 @@ CRSP_Plugin::CRSP_Plugin ( const char * FileName) { if (GetDllInfo == NULL) { UnloadPlugin(); return; } GetDllInfo(&m_PluginInfo); - if (!ValidPluginVersion(&m_PluginInfo)) { UnloadPlugin(); return; } + if (!CPluginList::ValidPluginVersion(m_PluginInfo)) { UnloadPlugin(); return; } //Find entries for functions in DLL void (__cdecl *InitFunc)( void ); @@ -294,16 +294,3 @@ void CRSP_Plugin::UnloadPlugin(void) { InitiateDebugger = NULL; } -bool CRSP_Plugin::ValidPluginVersion(PLUGIN_INFO * PluginInfo) { - switch (PluginInfo->Type) { - case PLUGIN_TYPE_RSP: - if (PluginInfo->MemoryBswaped == FALSE) { return FALSE; } - if (PluginInfo->Version == 0x0001) { return TRUE; } - if (PluginInfo->Version == 0x0100) { return TRUE; } - if (PluginInfo->Version == 0x0101) { return TRUE; } - if (PluginInfo->Version == 0x0102) { return TRUE; } - break; - } - return FALSE; -} - diff --git a/Source/Project64/Plugins/RSP Plugin.h b/Source/Project64/Plugins/RSP Plugin.h index f4dddc63f..059cd7ee4 100644 --- a/Source/Project64/Plugins/RSP Plugin.h +++ b/Source/Project64/Plugins/RSP Plugin.h @@ -39,7 +39,6 @@ typedef struct { PLUGIN_INFO m_PluginInfo; void UnloadPlugin ( void ); - bool ValidPluginVersion ( PLUGIN_INFO * PluginInfo ); bool Initiate_1_0 ( CPlugins * Plugins, CN64System * System ); void (__cdecl *CloseDLL) ( void );