Merge pull request #2246 from skidau/sdl-init-crash

Use WindowFromPoint to track the mouse in DInput

Source/Core/Core/Core.cpp

@@ -26,7 +26,6 @@
 #include "Core/CoreTiming.h"
 #include "Core/DSPEmulator.h"
 #include "Core/Host.h"
-#include "Core/HotkeyManager.h"
 #include "Core/MemTools.h"
 #include "Core/Movie.h"
 #include "Core/NetPlayProto.h"
@@ -97,7 +96,6 @@ static bool s_is_stopping = false;
 static bool s_hardware_initialized = false;
 static bool s_is_started = false;
 static void* s_window_handle = nullptr;
-static bool s_window_handle_changed = false;
 static std::string s_state_filename;
 static std::thread s_emu_thread;
 static StoppedCallbackFunc s_on_stopped_callback = nullptr;
@@ -230,12 +228,7 @@ bool Init()
 		     !!SConfig::GetInstance().m_SYSCONF->GetData<u8>("IPL.AR"));
 	}
 
-	s_window_handle_changed = false;
-	if (s_window_handle != Host_GetRenderHandle())
-	{
-		s_window_handle = Host_GetRenderHandle();
-		s_window_handle_changed = true;
-	}
+	s_window_handle = Host_GetRenderHandle();
 
 	// Start the emu thread
 	s_emu_thread = std::thread(EmuThread);
@@ -437,11 +430,6 @@ void EmuThread()
 	else
 	{
 		// Update references in case controllers were refreshed
-		if (s_window_handle_changed)
-		{
-			g_controller_interface.Initialize(s_window_handle);
-			HotkeyManagerEmu::LoadConfig();
-		}
 		Pad::LoadConfig();
 		Keyboard::LoadConfig();
 	}
@@ -456,10 +444,9 @@ void EmuThread()
 
 		// Activate Wiimotes which don't have source set to "None"
 		for (unsigned int i = 0; i != MAX_BBMOTES; ++i)
-		{
 			if (g_wiimote_sources[i])
 				GetUsbPointer()->AccessWiiMote(i | 0x100)->Activate(true);
-		}
+
 	}
 
 	AudioCommon::InitSoundStream();
@@ -570,8 +557,7 @@ void EmuThread()
 
 	if (init_controllers)
 	{
-		if (core_parameter.bWii)
-			Wiimote::Shutdown();
+		Wiimote::Shutdown();
 		Keyboard::Shutdown();
 		Pad::Shutdown();
 		init_controllers = false;

Source/Core/Core/HotkeyManager.h

@@ -39,4 +39,6 @@ namespace HotkeyManagerEmu
 	bool IsEnabled();
 	void Enable(bool enable_toggle);
 	bool IsPressed(int Id, bool held);
+
+	static bool enabled;
 }

Source/Core/DolphinWX/InputConfigDiag.cpp

@@ -1060,9 +1060,6 @@ GamepadPage::GamepadPage(wxWindow* parent, InputConfig& config, const unsigned i
 	mapping->Add(dio, 1, wxEXPAND|wxLEFT|wxTOP|wxBOTTOM, 5);
 	mapping->Add(control_group_sizer, 0, wxLEFT|wxEXPAND, 5);
 
-	wxCommandEvent event;
-	RefreshDevices(event);
-
 	UpdateGUI();
 
 	SetSizerAndFit(mapping); // needed

Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp

@@ -44,7 +44,7 @@ ControllerInterface g_controller_interface;
 void ControllerInterface::Initialize(void* const hwnd)
 {
 	if (m_is_init)
-		DeInit();
+		return;
 
 	m_hwnd = hwnd;
 
@@ -102,11 +102,6 @@ void ControllerInterface::Shutdown()
 		delete d;
 	}
 
-	DeInit();
-}
-
-void ControllerInterface::DeInit()
-{
 	m_devices.clear();
 
 #ifdef CIFACE_USE_XINPUT

Source/Core/InputCommon/ControllerInterface/ControllerInterface.h

@@ -117,9 +117,6 @@ public:
 	void Initialize(void* const hwnd);
 	void Reinitialize();
 	void Shutdown();
-
-	void DeInit();
-
 	bool IsInit() const { return m_is_init; }
 
 	void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const;

Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp

@@ -31,11 +31,11 @@ static const struct
 };
 
 // lil silly
-static HWND hwnd;
+static HWND m_hwnd;
 
 void InitKeyboardMouse(IDirectInput8* const idi8, std::vector<Core::Device*>& devices, HWND _hwnd)
 {
-	hwnd = _hwnd;
+	m_hwnd = _hwnd;
 
 	// mouse and keyboard are a combined device, to allow shift+click and stuff
 	// if that's dumb, I will make a VirtualDevice class that just uses ranges of inputs/outputs from other devices
@@ -124,10 +124,11 @@ void GetMousePos(ControlState* const x, ControlState* const y)
 {
 	POINT point = { 1, 1 };
 	GetCursorPos(&point);
-	// Get the cursor position relative to the upper left corner of the rendering window
+	// Get the cursor position relative to the upper left corner of the current window (separate or render to main)
+	HWND hwnd = WindowFromPoint(point);
 	ScreenToClient(hwnd, &point);
 
-	// Get the size of the rendering window. (In my case Rect.top and Rect.left was zero.)
+	// Get the size of the current window. (In my case Rect.top and Rect.left was zero.)
 	RECT rect;
 	GetClientRect(hwnd, &rect);
 	// Width and height is the size of the rendering window