From 0632516c419ddb5f830fd6c15bbc0f42a33d20d5 Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 4 Oct 2012 11:45:30 +1000 Subject: [PATCH] Clean up controller plugin --- .../Project64/Plugins/Controller Plugin.cpp | 93 +++++++++++-------- Source/Project64/Plugins/Controller Plugin.h | 51 +++++----- 2 files changed, 81 insertions(+), 63 deletions(-) diff --git a/Source/Project64/Plugins/Controller Plugin.cpp b/Source/Project64/Plugins/Controller Plugin.cpp index bf0800e4a..6755dcf54 100644 --- a/Source/Project64/Plugins/Controller Plugin.cpp +++ b/Source/Project64/Plugins/Controller Plugin.cpp @@ -2,33 +2,51 @@ void FixUPXIssue ( BYTE * ProgramLocation ); -CControl_Plugin::CControl_Plugin ( const char * FileName) { +CControl_Plugin::CControl_Plugin ( const char * FileName) : + m_hDll(NULL), + m_Initilized(false), + m_RomOpen(false), + m_AllocatedControllers(false), + Config(NULL), + WM_KeyDown(NULL), + WM_KeyUp(NULL), + RumbleCommand(NULL), + GetKeys(NULL), + ReadController(NULL), + ControllerCommand(NULL), + CloseDLL(NULL), + RomOpen(NULL), + RomClosed(NULL), + PluginOpened(NULL), + SetSettingInfo(NULL), + SetSettingInfo2(NULL) +{ + memset(&m_PluginInfo,0,sizeof(m_PluginInfo)); + memset(&m_PluginControllers,0,sizeof(m_PluginControllers)); + memset(&m_Controllers,0,sizeof(m_Controllers)); + + Init(FileName); +} + +void CControl_Plugin::Init ( const char * FileName ) +{ //Make sure all parts of the class are initialized - m_Initilized = false; - m_RomOpen = false; - m_AllocatedControllers = false; - hDll = NULL; - _Notify = NULL; - m_Controllers[0] = NULL; - m_Controllers[1] = NULL; - m_Controllers[2] = NULL; - m_Controllers[3] = NULL; UnloadPlugin(); //Try to load the DLL library UINT LastErrorMode = SetErrorMode( SEM_FAILCRITICALERRORS ); - hDll = LoadLibrary(FileName); + m_hDll = LoadLibrary(FileName); SetErrorMode(LastErrorMode); - if (hDll == NULL) { + if (m_hDll == NULL) { UnloadPlugin(); return; } - FixUPXIssue((BYTE *)hDll); + FixUPXIssue((BYTE *)m_hDll); //Get DLL information void (__cdecl *GetDllInfo) ( PLUGIN_INFO * PluginInfo ); - GetDllInfo = (void (__cdecl *)(PLUGIN_INFO *))GetProcAddress( (HMODULE)hDll, "GetDllInfo" ); + GetDllInfo = (void (__cdecl *)(PLUGIN_INFO *))GetProcAddress( (HMODULE)m_hDll, "GetDllInfo" ); if (GetDllInfo == NULL) { UnloadPlugin(); return; } GetDllInfo(&m_PluginInfo); @@ -36,26 +54,26 @@ CControl_Plugin::CControl_Plugin ( const char * FileName) { //Find entries for functions in DLL void (__cdecl *InitFunc) ( void ); - Config = (void (__cdecl *)(DWORD))GetProcAddress( (HMODULE)hDll, "DllConfig" ); - ControllerCommand = (void (__cdecl *)(int,BYTE *))GetProcAddress( (HMODULE)hDll, "ControllerCommand" ); - GetKeys = (void (__cdecl *)(int,BUTTONS*)) GetProcAddress( (HMODULE)hDll, "GetKeys" ); - ReadController = (void (__cdecl *)(int,BYTE *))GetProcAddress( (HMODULE)hDll, "ReadController" ); - WM_KeyDown = (void (__cdecl *)(DWORD,DWORD))GetProcAddress( (HMODULE)hDll, "WM_KeyDown" ); - WM_KeyUp = (void (__cdecl *)(DWORD,DWORD))GetProcAddress( (HMODULE)hDll, "WM_KeyUp" ); - InitFunc = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)hDll, "InitiateControllers" ); - RomOpen = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)hDll, "RomOpen" ); - RomClosed = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)hDll, "RomClosed" ); - CloseDLL = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)hDll, "CloseDLL" ); - RumbleCommand = (void (__cdecl *)(int, BOOL))GetProcAddress( (HMODULE)hDll, "RumbleCommand" ); + Config = (void (__cdecl *)(DWORD))GetProcAddress( (HMODULE)m_hDll, "DllConfig" ); + ControllerCommand = (void (__cdecl *)(int,BYTE *))GetProcAddress( (HMODULE)m_hDll, "ControllerCommand" ); + GetKeys = (void (__cdecl *)(int,BUTTONS*)) GetProcAddress( (HMODULE)m_hDll, "GetKeys" ); + ReadController = (void (__cdecl *)(int,BYTE *))GetProcAddress( (HMODULE)m_hDll, "ReadController" ); + WM_KeyDown = (void (__cdecl *)(DWORD,DWORD))GetProcAddress( (HMODULE)m_hDll, "WM_KeyDown" ); + WM_KeyUp = (void (__cdecl *)(DWORD,DWORD))GetProcAddress( (HMODULE)m_hDll, "WM_KeyUp" ); + InitFunc = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)m_hDll, "InitiateControllers" ); + RomOpen = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)m_hDll, "RomOpen" ); + RomClosed = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)m_hDll, "RomClosed" ); + CloseDLL = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)m_hDll, "CloseDLL" ); + RumbleCommand = (void (__cdecl *)(int, BOOL))GetProcAddress( (HMODULE)m_hDll, "RumbleCommand" ); //version 101 functions - PluginOpened = (void (__cdecl *)(void))GetProcAddress( (HMODULE)hDll, "PluginLoaded" ); + PluginOpened = (void (__cdecl *)(void))GetProcAddress( (HMODULE)m_hDll, "PluginLoaded" ); //Make sure dll had all needed functions if (InitFunc == NULL) { UnloadPlugin(); return; } if (CloseDLL == NULL) { UnloadPlugin(); return; } - SetSettingInfo2 = (void (__cdecl *)(PLUGIN_SETTINGS2 *))GetProcAddress( (HMODULE)hDll, "SetSettingInfo2" ); + SetSettingInfo2 = (void (__cdecl *)(PLUGIN_SETTINGS2 *))GetProcAddress( (HMODULE)m_hDll, "SetSettingInfo2" ); if (SetSettingInfo2) { PLUGIN_SETTINGS2 info; @@ -63,7 +81,7 @@ CControl_Plugin::CControl_Plugin ( const char * FileName) { SetSettingInfo2(&info); } - SetSettingInfo = (void (__cdecl *)(PLUGIN_SETTINGS *))GetProcAddress( (HMODULE)hDll, "SetSettingInfo" ); + SetSettingInfo = (void (__cdecl *)(PLUGIN_SETTINGS *))GetProcAddress( (HMODULE)m_hDll, "SetSettingInfo" ); if (SetSettingInfo) { PLUGIN_SETTINGS info; @@ -124,7 +142,7 @@ bool CControl_Plugin::Initiate ( CN64System * System, CMainGui * RenderWindow ) //Get DLL information void (__cdecl *GetDllInfo) ( PLUGIN_INFO * PluginInfo ); - GetDllInfo = (void (__cdecl *)(PLUGIN_INFO *))GetProcAddress( (HMODULE)hDll, "GetDllInfo" ); + GetDllInfo = (void (__cdecl *)(PLUGIN_INFO *))GetProcAddress( (HMODULE)m_hDll, "GetDllInfo" ); if (GetDllInfo == NULL) { return false; } PLUGIN_INFO PluginInfo; @@ -135,7 +153,7 @@ bool CControl_Plugin::Initiate ( CN64System * System, CMainGui * RenderWindow ) if (PluginInfo.Version == 0x0100) { //Get Function from DLL void (__cdecl *InitiateControllers_1_0)( HWND hMainWindow, CONTROL Controls[4] ); - InitiateControllers_1_0 = (void (__cdecl *)(HWND, CONTROL *))GetProcAddress( (HMODULE)hDll, "InitiateControllers" ); + InitiateControllers_1_0 = (void (__cdecl *)(HWND, CONTROL *))GetProcAddress( (HMODULE)m_hDll, "InitiateControllers" ); if (InitiateControllers_1_0 == NULL) { return false; } InitiateControllers_1_0((HWND)RenderWindow->m_hMainWindow,m_PluginControllers); m_Initilized = true; @@ -156,7 +174,7 @@ bool CControl_Plugin::Initiate ( CN64System * System, CMainGui * RenderWindow ) //Get Function from DLL void (__cdecl *InitiateControllers_1_1)( CONTROL_INFO * ControlInfo ); - InitiateControllers_1_1 = (void (__cdecl *)(CONTROL_INFO *))GetProcAddress( (HMODULE)hDll, "InitiateControllers" ); + InitiateControllers_1_1 = (void (__cdecl *)(CONTROL_INFO *))GetProcAddress( (HMODULE)m_hDll, "InitiateControllers" ); if (InitiateControllers_1_1 == NULL) { return false; } CONTROL_INFO ControlInfo; @@ -239,9 +257,9 @@ void CControl_Plugin::UnloadPlugin(void) { } } memset(&m_PluginInfo,0,sizeof(m_PluginInfo)); - if (hDll != NULL ) { - FreeLibrary((HMODULE)hDll); - hDll = NULL; + if (m_hDll != NULL ) { + FreeLibrary((HMODULE)m_hDll); + m_hDll = NULL; } m_AllocatedControllers = false; m_Controllers[0] = NULL; @@ -267,12 +285,7 @@ void CControl_Plugin::UpdateKeys (void) { if (!m_Controllers[cont]->m_RawData) { GetKeys(cont,&m_Controllers[cont]->m_Buttons); } else { - if (_Notify) - { - _Notify->BreakPoint(__FILE__,__LINE__); - } else { - _asm int 3 - } + _Notify->BreakPoint(__FILE__,__LINE__); } } if (ReadController) { ReadController(-1,NULL); } diff --git a/Source/Project64/Plugins/Controller Plugin.h b/Source/Project64/Plugins/Controller Plugin.h index ca5a0d481..058bd5a5a 100644 --- a/Source/Project64/Plugins/Controller Plugin.h +++ b/Source/Project64/Plugins/Controller Plugin.h @@ -59,29 +59,8 @@ public: inline PluginType Plugin (void) const { return static_cast(m_PlugType); } }; -class CControl_Plugin { - friend CC_Core; - - CNotification * _Notify; - void * hDll; - bool m_Initilized, m_RomOpen, m_AllocatedControllers; - PLUGIN_INFO m_PluginInfo; - - //What the diffent controls are set up as - CONTROL m_PluginControllers[4]; - - void UnloadPlugin ( void ); - bool ValidPluginVersion ( PLUGIN_INFO * PluginInfo ); - - void (__cdecl *CloseDLL) ( void ); - void (__cdecl *RomOpen) ( void ); - void (__cdecl *RomClosed) ( void ); - void (__cdecl *PluginOpened) ( void ); - void (__cdecl *SetSettingInfo) ( PLUGIN_SETTINGS * info ); - void (__cdecl *SetSettingInfo2) ( PLUGIN_SETTINGS2 * info ); - - CCONTROL * m_Controllers[4]; - +class CControl_Plugin +{ public: CControl_Plugin ( const char * FileName ); ~CControl_Plugin ( void ); @@ -105,4 +84,30 @@ public: inline bool Initilized ( void ) const { return m_Initilized; } inline CCONTROL const * Controller (int control) { return m_Controllers[control]; } inline CONTROL * PluginControllers ( void ) { return m_PluginControllers; } + +private: + CControl_Plugin(void); // Disable default constructor + CControl_Plugin(const CControl_Plugin&); // Disable copy constructor + CControl_Plugin& operator=(const CControl_Plugin&); // Disable assignment + + void Init ( const char * FileName ); + + void * m_hDll; + bool m_Initilized, m_RomOpen, m_AllocatedControllers; + PLUGIN_INFO m_PluginInfo; + + //What the different controls are set up as + CONTROL m_PluginControllers[4]; + + void UnloadPlugin ( void ); + bool ValidPluginVersion ( PLUGIN_INFO * PluginInfo ); + + void (__cdecl *CloseDLL) ( void ); + void (__cdecl *RomOpen) ( void ); + void (__cdecl *RomClosed) ( void ); + void (__cdecl *PluginOpened) ( void ); + void (__cdecl *SetSettingInfo) ( PLUGIN_SETTINGS * info ); + void (__cdecl *SetSettingInfo2) ( PLUGIN_SETTINGS2 * info ); + + CCONTROL * m_Controllers[4]; };