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/Common/Common.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="Common"
 	ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
 	RootNamespace="Common"
@@ -267,7 +267,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../PluginSpecs"
+				AdditionalIncludeDirectories="../../PluginSpecs;..\Core\Src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"

Source/Core/Common/Src/DynamicLibrary.cpp

@@ -56,26 +56,32 @@ std::string GetLastErrorAsString()
 }
 #endif
 
-bool DynamicLibrary::Load(const char* filename)
+// ------------------------------------------------------------------
+/* Loading means loading the dll with LoadLibrary() to get an instance to the dll.
+   This is done when Dolphin is started to determine which dlls are good, and
+   before opening the Config and Debugging windowses from Plugin.cpp and
+   before opening the dll for running the emulation in Video_...cpp in Core. */
+// -----------------------
+int DynamicLibrary::Load(const char* filename)
 {
 	if (!filename || strlen(filename) == 0)
 	{
 		LOG(MASTER_LOG, "Missing filename of dynamic library to load");
-		return false;
+		return 0;
 	}
 	LOG(MASTER_LOG, "Trying to load library %s", filename);
 
 	if (IsLoaded())
 	{
 		LOG(MASTER_LOG, "Trying to load already loaded library %s", filename);
-		return false;
+		return 2;
 	}
 
 #ifdef _WIN32
 	library = LoadLibrary(filename);
 	if (!library) {
 		LOG(MASTER_LOG, "Error loading DLL %s: %s", filename, GetLastErrorAsString().c_str());
-		return false;
+		return 0;
 	}
 #else
 	library = dlopen(filename, RTLD_NOW | RTLD_LOCAL);
@@ -90,7 +96,7 @@ bool DynamicLibrary::Load(const char* filename)
 	}
 #endif
 	library_file = filename;
-	return true;
+	return 1;
 }
 
 

Source/Core/Common/Src/DynamicLibrary.h

@@ -29,14 +29,12 @@ class DynamicLibrary
 	public:
 
 		DynamicLibrary();
-		bool Load(const char* filename);
+		int Load(const char* filename);
 		void Unload();
 		void* Get(const char* funcname) const;
 
-
 		bool IsLoaded() const {return(library != 0);}
 
-
 	private:
 		std::string library_file;
 #ifdef _WIN32

Source/Core/Common/Src/Plugin.cpp

@@ -15,6 +15,16 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+
+
+// =======================================================
+// File description
+// -------------
+/* This file is a simpler version of Plugin_...cpp found in Core. This file only loads
+   the config and debugging windowses and works with all plugins. */
+// =============
+
+
 #include "Plugin.h"
 
 namespace Common
@@ -24,7 +34,7 @@ DynamicLibrary CPlugin::m_hInstLib;
 void(__cdecl * CPlugin::m_GetDllInfo)   (PLUGIN_INFO * _PluginInfo) = 0;
 //void(__cdecl * CPlugin::m_DllAbout)     (HWND _hParent) = 0;
 void(__cdecl * CPlugin::m_DllConfig)    (HWND _hParent) = 0;
-void(__cdecl * CPlugin::m_DllDebugger)    (HWND _hParent) = 0;
+void(__cdecl * CPlugin::m_DllDebugger)    (HWND _hParent, bool Show) = 0;
 
 void
 CPlugin::Release(void)
@@ -42,9 +52,9 @@ CPlugin::Load(const char* _szName)
 {
 	if (m_hInstLib.Load(_szName))
 	{
-		m_GetDllInfo = (void (__cdecl*)(PLUGIN_INFO*))m_hInstLib.Get("GetDllInfo");
-		m_DllConfig = (void (__cdecl*)(HWND))m_hInstLib.Get("DllConfig");
-		m_DllDebugger = (void (__cdecl*)(HWND))m_hInstLib.Get("DllDebugger");
+		m_GetDllInfo = (void (__cdecl*)(PLUGIN_INFO*)) m_hInstLib.Get("GetDllInfo");
+		m_DllConfig = (void (__cdecl*)(HWND)) m_hInstLib.Get("DllConfig");
+		m_DllDebugger = (void (__cdecl*)(HWND, bool)) m_hInstLib.Get("DllDebugger");
 		return(true);
 	}
 
@@ -80,11 +90,11 @@ void CPlugin::Config(HWND _hwnd)
 //	}
 //}
 
-void CPlugin::Debug(HWND _hwnd)
+void CPlugin::Debug(HWND _hwnd, bool Show)
 {
 	if (m_DllDebugger != 0)
 	{
-		m_DllDebugger(_hwnd);
+		m_DllDebugger(_hwnd, Show);
 	}
 }
 } // end of namespace Common

Source/Core/Common/Src/Plugin.h

@@ -35,7 +35,7 @@ class CPlugin
 
 		static void Config(HWND _hwnd);
 		static void About(HWND _hwnd);
-		static void Debug(HWND _hwnd);
+		static void Debug(HWND _hwnd, bool Show);
 
 
 	private:
@@ -44,7 +44,7 @@ class CPlugin
 
 		static void (__cdecl * m_GetDllInfo)(PLUGIN_INFO* _PluginInfo);
 		static void (__cdecl * m_DllConfig)(HWND _hParent);
-		static void (__cdecl * m_DllDebugger)(HWND _hParent);
+		static void (__cdecl * m_DllDebugger)(HWND _hParent, bool Show);
 };
 } // end of namespace Common