From 62d44c91666e894a0807b6ba80dc527d29609da0 Mon Sep 17 00:00:00 2001 From: nakeee Date: Wed, 17 Dec 2008 17:49:38 +0000 Subject: [PATCH] Clear errors, fixed unload on linux git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1566 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/DynamicLibrary.cpp | 2 +- Source/PluginSpecs/pluginspecs_pad.h | 8 ++++++++ Source/PluginSpecs/pluginspecs_wiimote.h | 8 ++++++++ Source/Plugins/Plugin_DSP_NULL/Src/main.cpp | 5 ++--- Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp | 2 ++ Source/Plugins/Plugin_Wiimote/Src/main.cpp | 11 +---------- Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp | 3 +++ Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp | 3 +++ 8 files changed, 28 insertions(+), 14 deletions(-) diff --git a/Source/Core/Common/Src/DynamicLibrary.cpp b/Source/Core/Common/Src/DynamicLibrary.cpp index 63feb2de89..fa4b361677 100644 --- a/Source/Core/Common/Src/DynamicLibrary.cpp +++ b/Source/Core/Common/Src/DynamicLibrary.cpp @@ -124,7 +124,7 @@ int DynamicLibrary::Unload() if( ! (library_file.find("OGL.") != std::string::npos) && !PowerPC::CPU_POWERDOWN) retval = FreeLibrary(library); #else - retval = dlclose(library); + retval = dlclose(library)?0:1; #endif if (!retval) { LOG(MASTER_LOG, "Error unloading DLL %s: %s", library_file.c_str(), diff --git a/Source/PluginSpecs/pluginspecs_pad.h b/Source/PluginSpecs/pluginspecs_pad.h index d6bca534e5..131451a6cf 100644 --- a/Source/PluginSpecs/pluginspecs_pad.h +++ b/Source/PluginSpecs/pluginspecs_pad.h @@ -75,6 +75,14 @@ EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo); // 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: // Purpose: diff --git a/Source/PluginSpecs/pluginspecs_wiimote.h b/Source/PluginSpecs/pluginspecs_wiimote.h index e9c9accabf..5f9ce6a0d5 100644 --- a/Source/PluginSpecs/pluginspecs_wiimote.h +++ b/Source/PluginSpecs/pluginspecs_wiimote.h @@ -45,6 +45,14 @@ EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo); // 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: // Purpose: diff --git a/Source/Plugins/Plugin_DSP_NULL/Src/main.cpp b/Source/Plugins/Plugin_DSP_NULL/Src/main.cpp index 1fcf631f92..ad3dc3023d 100644 --- a/Source/Plugins/Plugin_DSP_NULL/Src/main.cpp +++ b/Source/Plugins/Plugin_DSP_NULL/Src/main.cpp @@ -71,9 +71,8 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle #endif -void DllDebugger(HWND _hParent) -{ - // TODO: implement + +void DllDebugger(HWND _hParent, bool Show) { } void GetDllInfo(PLUGIN_INFO* _PluginInfo) diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp index 1421b39701..b0ccb9bb80 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp @@ -175,6 +175,8 @@ void DllConfig(HWND _hParent) SaveConfig(); } +void DllDebugger(HWND _hParent, bool Show) { +} void PAD_Initialize(SPADInitialize _PADInitialize) { diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.cpp b/Source/Plugins/Plugin_Wiimote/Src/main.cpp index 56ab2a1aa8..cbc035fafd 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/main.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/main.cpp @@ -101,16 +101,7 @@ extern "C" void GetDllInfo (PLUGIN_INFO* _PluginInfo) #endif } - -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 +void DllDebugger(HWND _hParent, bool Show) { } extern "C" void DllConfig(HWND _hParent) diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp index 15b20a4698..c18eb5e5ce 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.cpp @@ -188,6 +188,9 @@ void DllConfig(HWND _hParent) #endif } +void DllDebugger(HWND _hParent, bool Show) { +} + // Init PAD (start emulation) // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ void PAD_Initialize(SPADInitialize _PADInitialize) diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp index d8886d6aa9..516f2ba3c3 100644 --- a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp +++ b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp @@ -182,6 +182,9 @@ void DllConfig(HWND _hParent) #endif } +void DllDebugger(HWND _hParent, bool Show) { +} + // Init PAD (start emulation) // ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ void PAD_Initialize(SPADInitialize _PADInitialize)