Calibrated emulated Wiimote aiming in widescreen mode. Added config menu to Wiimote. Added hide cursor option to OpenGL plugin. Added custom Wii settings and moved SYSCONF to User/Config (it will be copied by the game to Wii/shared2/sys when a game is run). Made the DSP and Video debugging windowses run on the same dll instance as the main instance.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1188 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Core/Src/Core.cpp

@@ -152,6 +152,7 @@ bool Init(const SCoreStartupParameter _CoreParameter)
 	DisplayMessage("CPU: " + cpu_info.Summarize(), 8000);
 	DisplayMessage(_CoreParameter.m_strFilename, 3000);
 
+	//PluginVideo::DllDebugger(NULL);
 
 	//RegisterPanicAlertHandler(PanicAlertToVideo);
 

Source/Core/Core/Src/Plugins/Plugin_DSP.cpp

@@ -15,6 +15,7 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#include "Common.h"
 #include "DynamicLibrary.h"
 #include "Plugin_DSP.h"
 
@@ -45,6 +46,11 @@ bool IsLoaded()
     return plugin.IsLoaded();
 }
 
+void Debug(HWND _hwnd, bool Show)
+{
+    DllDebugger(_hwnd, Show);
+}
+
 void UnloadPlugin()
 {
     plugin.Unload();
@@ -68,7 +74,9 @@ void UnloadPlugin()
 
 bool LoadPlugin(const char *_Filename)
 {
-    if (plugin.Load(_Filename)) 
+	int ret = plugin.Load(_Filename); // we may have alredy loaded this to open the debugger
+
+    if (ret == 1) 
     {
         GetDllInfo               = reinterpret_cast<TGetDllInfo>               (plugin.Get("GetDllInfo"));
         DllConfig                = reinterpret_cast<TDllConfig>                (plugin.Get("DllConfig"));
@@ -97,7 +105,8 @@ bool LoadPlugin(const char *_Filename)
             (DSP_Update != 0) &&
             (DSP_SendAIBuffer != 0) &&
 			(DSP_DoState != 0))
-        {
+        {			
+			//PanicAlert("return true: %i", ret);
             return true;
         }
         else
@@ -106,8 +115,13 @@ bool LoadPlugin(const char *_Filename)
             return false;
         }
     }
-
-    return false;
+	else if (ret == 2)
+	{
+		//PanicAlert("return true: %i", ret);
+		return true;
+	}
+	else if (ret == 0)
+		return false;
 }
 
 }  // namespace

Source/Core/Core/Src/Plugins/Plugin_DSP.h

@@ -30,7 +30,7 @@ void UnloadPlugin();
 typedef void (__cdecl* TGetDllInfo)(PLUGIN_INFO*);
 //typedef void (__cdecl* TDllAbout)(HWND);
 typedef void (__cdecl* TDllConfig)(HWND);
-typedef void (__cdecl* TDllDebugger)(HWND);
+typedef void (__cdecl* TDllDebugger)(HWND, bool);
 typedef void (__cdecl* TDSP_Initialize)(DSPInitialize);
 typedef void (__cdecl* TDSP_Shutdown)();
 typedef void (__cdecl* TDSP_WriteMailBox)(BOOL _CPUMailbox, unsigned short);

Source/Core/Core/Src/Plugins/Plugin_Video.cpp

@@ -18,6 +18,9 @@
 #include "Common.h"
 #include "DynamicLibrary.h"
 #include "Plugin_Video.h"
+#include "Plugin.h"
+
+extern DynamicLibrary Common::CPlugin;
 
 namespace PluginVideo
 {
@@ -25,7 +28,7 @@ namespace PluginVideo
 // Function Pointer
 TGetDllInfo         GetDllInfo            = 0;
 TDllConfig          DllConfig             = 0;
-TDllDebugger        DllDebugger            = 0;
+TDllDebugger        DllDebugger           = 0;
 TVideo_Initialize   Video_Initialize      = 0;
 TVideo_Prepare      Video_Prepare         = 0;
 TVideo_Shutdown     Video_Shutdown        = 0;
@@ -36,10 +39,15 @@ TVideo_EnterLoop    Video_EnterLoop       = 0;
 TVideo_AddMessage   Video_AddMessage      = 0;
 TVideo_DoState      Video_DoState         = 0;
 TVideo_Stop         Video_Stop            = 0;
-    
+
 // Library Instance
 DynamicLibrary plugin;
 
+void Debug(HWND _hwnd, bool Show)
+{
+    DllDebugger(_hwnd, Show);
+}
+
 bool IsLoaded()
 {
 	return plugin.IsLoaded();
@@ -47,6 +55,8 @@ bool IsLoaded()
 
 void UnloadPlugin()
 {
+	//PanicAlert("Video UnloadPlugin");
+
     // set Functions to 0
     GetDllInfo = 0;
     DllConfig = 0;
@@ -65,7 +75,9 @@ void UnloadPlugin()
 
 bool LoadPlugin(const char *_Filename)
 {
-	if (plugin.Load(_Filename))
+	int ret = plugin.Load(_Filename);
+
+	if (ret == 1)
 	{
 		GetDllInfo         = reinterpret_cast<TGetDllInfo>         (plugin.Get("GetDllInfo"));
 		DllConfig          = reinterpret_cast<TDllConfig>          (plugin.Get("DllConfig"));
@@ -79,10 +91,11 @@ bool LoadPlugin(const char *_Filename)
 		Video_EnterLoop    = reinterpret_cast<TVideo_EnterLoop>    (plugin.Get("Video_EnterLoop"));
 		Video_AddMessage   = reinterpret_cast<TVideo_AddMessage>   (plugin.Get("Video_AddMessage"));
 		Video_DoState      = reinterpret_cast<TVideo_DoState>      (plugin.Get("Video_DoState"));
-                Video_Stop         = reinterpret_cast<TVideo_Stop>         (plugin.Get("Video_Stop"));
+        Video_Stop         = reinterpret_cast<TVideo_Stop>         (plugin.Get("Video_Stop"));
 		if ((GetDllInfo != 0) &&
 			//(DllAbout != 0) &&
 			(DllConfig != 0) &&
+			(DllDebugger != 0) &&
 			(Video_Initialize != 0) &&
 			(Video_Prepare != 0) &&
 			(Video_Shutdown != 0) &&
@@ -92,8 +105,9 @@ bool LoadPlugin(const char *_Filename)
 			(Video_Screenshot != 0) &&
 			(Video_AddMessage != 0) &&
 			(Video_DoState != 0) && 
-                        (Video_Stop != 0))
+            (Video_Stop != 0))
 		{
+			//PanicAlert("return true: %i", ret);
 			return true;
 		}
 		else
@@ -102,7 +116,16 @@ bool LoadPlugin(const char *_Filename)
 			return false;
 		}
 	}
-	return false;
+	else if(ret == 2)
+	{
+		//PanicAlert("return true: %i", ret);
+		return true;
+	}
+	else if(ret == 0)
+	{
+		//PanicAlert("return false: %i", ret);
+		return false;
+	}
 }
 
 

Source/Core/Core/Src/Plugins/Plugin_Video.h

@@ -34,7 +34,7 @@ void UnloadPlugin();
 typedef void (__cdecl* TGetDllInfo)(PLUGIN_INFO*);
 //typedef void (__cdecl* TDllAbout)(HWND);
 typedef void (__cdecl* TDllConfig)(HWND);
-typedef void (__cdecl* TDllDebugger)(HWND);
+typedef void (__cdecl* TDllDebugger)(HWND, bool);
 typedef void (__cdecl* TVideo_Initialize)(SVideoInitialize*);
 typedef void (__cdecl* TVideo_Prepare)();
 typedef void (__cdecl* TVideo_Shutdown)();