Clear errors, fixed unload on linux

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1566 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-17 17:49:38 +00:00
parent fb3c13588b
commit 62d44c9166
8 changed files with 28 additions and 14 deletions

View File

@ -124,7 +124,7 @@ int DynamicLibrary::Unload()
if( ! (library_file.find("OGL.") != std::string::npos) && !PowerPC::CPU_POWERDOWN) if( ! (library_file.find("OGL.") != std::string::npos) && !PowerPC::CPU_POWERDOWN)
retval = FreeLibrary(library); retval = FreeLibrary(library);
#else #else
retval = dlclose(library); retval = dlclose(library)?0:1;
#endif #endif
if (!retval) { if (!retval) {
LOG(MASTER_LOG, "Error unloading DLL %s: %s", library_file.c_str(), LOG(MASTER_LOG, "Error unloading DLL %s: %s", library_file.c_str(),

View File

@ -75,6 +75,14 @@ EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
// //
EXPORT void CALL DllConfig(HWND _hParent); EXPORT void CALL DllConfig(HWND _hParent);
// __________________________________________________________________________________________________
// Function: DllDebugger
// Purpose: Open the debugger
// input: a handle to the window that calls this function
// output: none
//
EXPORT void CALL DllDebugger(HWND _hParent, bool Show);
// __________________________________________________________________________________________________ // __________________________________________________________________________________________________
// Function: // Function:
// Purpose: // Purpose:

View File

@ -45,6 +45,14 @@ EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
// //
EXPORT void CALL DllConfig(HWND _hParent); EXPORT void CALL DllConfig(HWND _hParent);
// __________________________________________________________________________________________________
// Function: DllDebugger
// Purpose: Open the debugger
// input: a handle to the window that calls this function
// output: none
//
EXPORT void CALL DllDebugger(HWND _hParent, bool Show);
// __________________________________________________________________________________________________ // __________________________________________________________________________________________________
// Function: // Function:
// Purpose: // Purpose:

View File

@ -71,9 +71,8 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
#endif #endif
void DllDebugger(HWND _hParent)
{ void DllDebugger(HWND _hParent, bool Show) {
// TODO: implement
} }
void GetDllInfo(PLUGIN_INFO* _PluginInfo) void GetDllInfo(PLUGIN_INFO* _PluginInfo)

View File

@ -175,6 +175,8 @@ void DllConfig(HWND _hParent)
SaveConfig(); SaveConfig();
} }
void DllDebugger(HWND _hParent, bool Show) {
}
void PAD_Initialize(SPADInitialize _PADInitialize) void PAD_Initialize(SPADInitialize _PADInitialize)
{ {

View File

@ -101,16 +101,7 @@ extern "C" void GetDllInfo (PLUGIN_INFO* _PluginInfo)
#endif #endif
} }
void DllDebugger(HWND _hParent, bool Show) {
extern "C" void DllAbout(HWND _hParent)
{
#if defined(HAVE_WX) && HAVE_WX
wxAboutDialogInfo info;
info.SetName(_T("Wiimote plug-in"));
info.AddDeveloper(_T("masken (masken3@gmail.com)"));
info.SetDescription(_T("Wiimote plug-in"));
wxAboutBox(info);
#endif
} }
extern "C" void DllConfig(HWND _hParent) extern "C" void DllConfig(HWND _hParent)

View File

@ -188,6 +188,9 @@ void DllConfig(HWND _hParent)
#endif #endif
} }
void DllDebugger(HWND _hParent, bool Show) {
}
// Init PAD (start emulation) // Init PAD (start emulation)
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void PAD_Initialize(SPADInitialize _PADInitialize) void PAD_Initialize(SPADInitialize _PADInitialize)

View File

@ -182,6 +182,9 @@ void DllConfig(HWND _hParent)
#endif #endif
} }
void DllDebugger(HWND _hParent, bool Show) {
}
// Init PAD (start emulation) // Init PAD (start emulation)
// ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯
void PAD_Initialize(SPADInitialize _PADInitialize) void PAD_Initialize(SPADInitialize _PADInitialize)