Merge pull request #20 from jpflouret/main

Feature: Add connection status to RdpGamepadReceiver

Author: jpflouret

RdpGamepadViGEm/RdpGamepadProcessor.cpp

@@ -8,8 +8,9 @@
 #include "ViGEmInterface.h"
 #include <RdpGamepadProtocol.h>
 
-RdpGamepadProcessor::RdpGamepadProcessor()
-	: mRdpGamepadChannel(new RdpGamepad::RdpGamepadVirtualChannel())
+RdpGamepadProcessor::RdpGamepadProcessor(std::function<void()> ConnectionStateCallback)
+	: mConnectionStateCallback(std::move(ConnectionStateCallback))
+	, mRdpGamepadChannel(new RdpGamepad::RdpGamepadVirtualChannel())
 	, mViGEmClient(std::make_shared<ViGEmClient>())
 {}
 
@@ -31,6 +32,12 @@ void RdpGamepadProcessor::Stop()
 	mThread.join();
 }
 
+bool RdpGamepadProcessor::IsConnected() const
+{
+	std::unique_lock<std::mutex> lock{mMutex};
+	return mRdpGamepadConnected;
+}
+
 void RdpGamepadProcessor::Run()
 {
 	static constexpr int PollFrequency = 16; // ms
@@ -40,12 +47,19 @@ void RdpGamepadProcessor::Run()
 	DueTime.QuadPart = -1;
 
 	TimerEvent = CreateWaitableTimerEx(NULL, NULL, 0, TIMER_ALL_ACCESS);
+	if (TimerEvent == nullptr)
+	{
+		RdpGamepadTidy();
+		return;
+	}
+
 	SetWaitableTimer(TimerEvent, &DueTime, PollFrequency, NULL, NULL, false);
 
 	std::unique_lock<std::mutex> lock{mMutex};
 	while (mKeepRunning)
 	{
 		mMutex.unlock();
+		TriggerConnectionStateCallback();
 		const unsigned long WaitResult = WaitForSingleObject(TimerEvent, PollFrequency * 2);
 		mMutex.lock();
 
@@ -62,10 +76,15 @@ void RdpGamepadProcessor::Run()
 
 void RdpGamepadProcessor::RdpGamepadTidy()
 {
+	bool bWasConnected = mRdpGamepadConnected;
 	mViGEmTarget360 = nullptr;
 	mRdpGamepadChannel->Close();
 	mRdpGamepadConnected = false;
 	mRdpGamepadPollTicks = 0;
+	if (bWasConnected)
+	{
+		mConnectionStateCallbackPending = true;
+	}
 }
 
 void RdpGamepadProcessor::RdpGamepadProcess()
@@ -101,6 +120,7 @@ void RdpGamepadProcessor::RdpGamepadProcess()
 		//assert(mViGEmTarget360 == nullptr)
 		mViGEmTarget360 = mViGEmClient->CreateController();
 		mRdpGamepadConnected = true;
+		mConnectionStateCallbackPending = true;
 	}
 
 	// Request controller state and update vibration
@@ -154,3 +174,12 @@ void RdpGamepadProcessor::RdpGamepadProcess()
 		RdpGamepadTidy();
 	}
 }
+
+void RdpGamepadProcessor::TriggerConnectionStateCallback()
+{
+	if (mConnectionStateCallbackPending && mConnectionStateCallback)
+	{
+		mConnectionStateCallback();
+		mConnectionStateCallbackPending = false;
+	}
+}

RdpGamepadViGEm/RdpGamepadProcessor.h

@@ -14,25 +14,29 @@ class ViGEmTarget360;
 class RdpGamepadProcessor
 {
 public:
-	RdpGamepadProcessor();
+	explicit RdpGamepadProcessor(std::function<void()> ConnectionStateCallback);
 	~RdpGamepadProcessor();
 
 	void Start();
 	void Stop();
+	bool IsConnected() const;
 
 private:
+	std::function<void()> mConnectionStateCallback;
 	std::unique_ptr<RdpGamepad::RdpGamepadVirtualChannel> mRdpGamepadChannel;
 	std::shared_ptr<ViGEmClient> mViGEmClient;
 	std::shared_ptr<ViGEmTarget360> mViGEmTarget360;
 	std::thread mThread;
-	std::mutex mMutex;
+	mutable std::mutex mMutex;
 	unsigned int mRdpGamepadOpenRetry = 0;
 	unsigned int mRdpGamepadPollTicks = 0;
 	unsigned int mLastGetStateResponseTicks = 0;
 	bool mRdpGamepadConnected = false;
 	bool mKeepRunning = false;
+	bool mConnectionStateCallbackPending = false;
 
 	void Run();
 	void RdpGamepadTidy();
 	void RdpGamepadProcess();
+	void TriggerConnectionStateCallback();
 };

RdpGamepadViGEm/RdpGamepadViGEmApp.cpp

@@ -9,11 +9,13 @@
 #include <shellapi.h>
 
 static constexpr UINT RDPGAMEPAD_NOTIFY_MESSAGE = WM_APP + 100;
+static constexpr UINT RDPGAMEPAD_CONNECTION_UPDATE_MESSAGE = WM_APP + 101;
 
 class RdpGamepadViGEmApp
 {
 public:
 	RdpGamepadViGEmApp()
+		: mRdpProcessor(std::bind(&RdpGamepadViGEmApp::ConnectionStateChanged, this))
 	{
 		mRdpProcessor.Start();
 	}
@@ -41,6 +43,7 @@ class RdpGamepadViGEmApp
 		HideNotifyIcon();
 		ReleaseSingleAppMutex();
 
+		mWnd = nullptr;
 		return ret;
 	}
 
@@ -73,6 +76,7 @@ class RdpGamepadViGEmApp
 	{
 		ReleaseMutex(mGlobalMutex);
 		CloseHandle(mGlobalMutex);
+		mGlobalMutex = nullptr;
 	}
 
 	void RegisterWindowClass()
@@ -126,7 +130,15 @@ class RdpGamepadViGEmApp
 												 GetSystemMetrics(SM_CXSMICON),
 												 GetSystemMetrics(SM_CYSMICON),
 												 LR_DEFAULTCOLOR);
-		StringCchCopy(mNotifyIconData.szTip, ARRAYSIZE(mNotifyIconData.szTip), L"Microsoft Remote Desktop Gamepad Receiver");
+
+		UpdateToolTip();
+	}
+
+	void UpdateToolTip()
+	{
+		LPCWSTR szTip = mRdpProcessor.IsConnected() ? L"Microsoft Remote Desktop Gamepad Receiver - Connected"
+													: L"Microsoft Remote Desktop Gamepad Receiver - Disconnected";
+		StringCchCopy(mNotifyIconData.szTip, ARRAYSIZE(mNotifyIconData.szTip), szTip);
 	}
 
 	void ShowNotifyIcon()
@@ -140,6 +152,19 @@ class RdpGamepadViGEmApp
 		Shell_NotifyIcon(NIM_DELETE, &mNotifyIconData);
 	}
 
+	void UpdateNotifyIcon()
+	{
+		Shell_NotifyIcon(NIM_MODIFY, &mNotifyIconData);
+	}
+
+	void ConnectionStateChanged()
+	{
+		if (mWnd != nullptr)
+		{
+			PostMessage(mWnd, RDPGAMEPAD_CONNECTION_UPDATE_MESSAGE, 0, 0);
+		}
+	}
+
 	void ShowPopupMenu()
 	{
 		HMENU hMenu = LoadMenu(mInstance, MAKEINTRESOURCE(IDR_POPUPMENU));
@@ -198,6 +223,11 @@ class RdpGamepadViGEmApp
 			}
 			break;
 
+		case RDPGAMEPAD_CONNECTION_UPDATE_MESSAGE:
+			UpdateToolTip();
+			UpdateNotifyIcon();
+			break;
+
 		case WM_DESTROY:
 			HideNotifyIcon();
 			PostQuitMessage(0);
@@ -220,7 +250,7 @@ class RdpGamepadViGEmApp
 	}
 };
 
-int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
+int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR lpCmdLine, _In_ int nShowCmd)
 {
 	RdpGamepadViGEmApp TheApp;
 	return TheApp.Run(hInstance);

Setup/RdpGamepadClientInstall.iss

@@ -7,7 +7,7 @@
 #define MyAppPublisher "Microsoft Corporation"
 #define MyAppPublisherURL "https://www.microsoft.com"
 #define MyAppURL "https://github.com/Microsoft/RdpGamepad"
-#define MyAppVersion "1.0.1"
+#define MyAppVersion "1.0.2"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.

Setup/RdpGamepadReceiverInstall.iss

@@ -7,7 +7,7 @@
 #define MyAppPublisher "Microsoft Corporation"
 #define MyAppPublisherURL "https://www.microsoft.com"
 #define MyAppURL "https://github.com/Microsoft/RdpGamepad"
-#define MyAppVersion "1.0.1"
+#define MyAppVersion "1.0.2"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.