From 9d487bd969a7d245c8872349d6b6625a5ea8c2ec Mon Sep 17 00:00:00 2001
From: unknown <rj150@hotmail.com>
Date: Thu, 12 Nov 2015 21:52:34 -0500
Subject: [PATCH] DllConfig(hParent) should be a pointer, not a uint32_t.

---
 Source/Project64/Plugins/Plugin Base.cpp      |  2 +-
 Source/Project64/Plugins/Plugin Base.h        |  2 +-
 Source/Project64/Plugins/Plugin Class.cpp     |  2 +-
 Source/Project64/Plugins/Plugin Class.h       |  2 +-
 .../User Interface/Main Menu Class.cpp        | 20 +++++++++++++++----
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/Source/Project64/Plugins/Plugin Base.cpp b/Source/Project64/Plugins/Plugin Base.cpp
index 3f3f8df09..2ef931177 100644
--- a/Source/Project64/Plugins/Plugin Base.cpp	
+++ b/Source/Project64/Plugins/Plugin Base.cpp	
@@ -71,7 +71,7 @@ bool CPlugin::Load (const char * FileName)
     RomOpen        = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)m_hDll, "RomOpen" );
     RomClosed      = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)m_hDll, "RomClosed" );
     PluginOpened   = (void (__cdecl *)(void)) GetProcAddress( (HMODULE)m_hDll, "PluginLoaded" );
-    DllConfig      = (void (__cdecl *)(uint32_t)) GetProcAddress( (HMODULE)m_hDll, "DllConfig" );
+    DllConfig      = (void (__cdecl *)(void *)) GetProcAddress( (HMODULE)m_hDll, "DllConfig" );
     DllAbout       = (void (__cdecl *)(void *)) GetProcAddress( (HMODULE)m_hDll, "DllAbout" );
 
     SetSettingInfo3 = (void (__cdecl *)(PLUGIN_SETTINGS3 *))GetProcAddress( (HMODULE)m_hDll, "SetSettingInfo3" );
diff --git a/Source/Project64/Plugins/Plugin Base.h b/Source/Project64/Plugins/Plugin Base.h
index eaf5dcd01..4312dc8aa 100644
--- a/Source/Project64/Plugins/Plugin Base.h	
+++ b/Source/Project64/Plugins/Plugin Base.h	
@@ -30,7 +30,7 @@ public:
     void Close();
 
     void(__cdecl *DllAbout)  (void * hWnd);
-    void(__cdecl *DllConfig) (uint32_t hParent);
+    void(__cdecl *DllConfig) (void * hParent);
 
     static bool ValidPluginVersion ( PLUGIN_INFO & PluginInfo );
 
diff --git a/Source/Project64/Plugins/Plugin Class.cpp b/Source/Project64/Plugins/Plugin Class.cpp
index e614eed90..820e0cbe8 100644
--- a/Source/Project64/Plugins/Plugin Class.cpp	
+++ b/Source/Project64/Plugins/Plugin Class.cpp	
@@ -318,7 +318,7 @@ bool CPlugins::Reset(CN64System * System)
 	return true;
 }
 
-void CPlugins::ConfigPlugin(uint32_t hParent, PLUGIN_TYPE Type)
+void CPlugins::ConfigPlugin(void* hParent, PLUGIN_TYPE Type)
 {
 	switch (Type)
 	{
diff --git a/Source/Project64/Plugins/Plugin Class.h b/Source/Project64/Plugins/Plugin Class.h
index 0ce075a91..28a608b9a 100644
--- a/Source/Project64/Plugins/Plugin Class.h	
+++ b/Source/Project64/Plugins/Plugin Class.h	
@@ -104,7 +104,7 @@ public:
     void RomOpened(void);
     void RomClosed(void);
     void SetRenderWindows(RenderWindow * MainWindow, RenderWindow * SyncWindow);
-    void ConfigPlugin(uint32_t hParent, PLUGIN_TYPE Type);
+    void ConfigPlugin(void* hParent, PLUGIN_TYPE Type);
     bool CopyPlugins(const stdstr & DstDir) const;
     void CreatePlugins(void);
     bool Reset(CN64System * System);
diff --git a/Source/Project64/User Interface/Main Menu Class.cpp b/Source/Project64/User Interface/Main Menu Class.cpp
index bfdf6baa4..cae92fe2c 100644
--- a/Source/Project64/User Interface/Main Menu Class.cpp	
+++ b/Source/Project64/User Interface/Main Menu Class.cpp	
@@ -323,10 +323,22 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
             m_Gui->MakeWindowOnTop(g_Settings->LoadBool(GameRunning_CPU_Running));
         }
         break;
-    case ID_OPTIONS_CONFIG_RSP:  WriteTrace(TraceDebug, __FUNCTION__ ": ID_OPTIONS_CONFIG_RSP"); g_Plugins->ConfigPlugin((DWORD)hWnd, PLUGIN_TYPE_RSP); break;
-    case ID_OPTIONS_CONFIG_GFX:  WriteTrace(TraceDebug, __FUNCTION__ ": ID_OPTIONS_CONFIG_GFX"); g_Plugins->ConfigPlugin((DWORD)hWnd, PLUGIN_TYPE_GFX); break;
-    case ID_OPTIONS_CONFIG_AUDIO:WriteTrace(TraceDebug, __FUNCTION__ ": ID_OPTIONS_CONFIG_AUDIO"); g_Plugins->ConfigPlugin((DWORD)hWnd, PLUGIN_TYPE_AUDIO); break;
-    case ID_OPTIONS_CONFIG_CONT: WriteTrace(TraceDebug, __FUNCTION__ ": ID_OPTIONS_CONFIG_CONT"); g_Plugins->ConfigPlugin((DWORD)hWnd, PLUGIN_TYPE_CONTROLLER); break;
+    case ID_OPTIONS_CONFIG_RSP:
+        WriteTrace(TraceDebug, __FUNCTION__ ": ID_OPTIONS_CONFIG_RSP");
+        g_Plugins->ConfigPlugin(hWnd, PLUGIN_TYPE_RSP);
+        break;
+    case ID_OPTIONS_CONFIG_GFX:
+        WriteTrace(TraceDebug, __FUNCTION__ ": ID_OPTIONS_CONFIG_GFX");
+        g_Plugins->ConfigPlugin(hWnd, PLUGIN_TYPE_GFX);
+        break;
+    case ID_OPTIONS_CONFIG_AUDIO:
+        WriteTrace(TraceDebug, __FUNCTION__ ": ID_OPTIONS_CONFIG_AUDIO");
+        g_Plugins->ConfigPlugin(hWnd, PLUGIN_TYPE_AUDIO);
+        break;
+    case ID_OPTIONS_CONFIG_CONT:
+        WriteTrace(TraceDebug, __FUNCTION__ ": ID_OPTIONS_CONFIG_CONT");
+        g_Plugins->ConfigPlugin(hWnd, PLUGIN_TYPE_CONTROLLER);
+        break;
     case ID_OPTIONS_CPU_USAGE:
         WriteTrace(TraceDebug, __FUNCTION__ ": ID_OPTIONS_CPU_USAGE");
         if (g_Settings->LoadBool(UserInterface_ShowCPUPer))