SDK 0.2.3

1 files changed, 350 insertions, 350 deletions

diff --git a/LibOVR/Src/OVR_Win32_DeviceStatus.cpp b/LibOVR/Src/OVR_Win32_DeviceStatus.cpp
index 80ec4f9..89e2601 100644
--- a/LibOVR/Src/OVR_Win32_DeviceStatus.cpp
+++ b/LibOVR/Src/OVR_Win32_DeviceStatus.cpp
@@ -1,350 +1,350 @@
-/************************************************************************************

-

-Filename    :   OVR_Win32_DeviceStatus.cpp

-Content     :   Win32 implementation of DeviceStatus.

-Created     :   January 24, 2013

-Authors     :   Lee Cooper

-

-Copyright   :   Copyright 2013 Oculus VR, Inc. All Rights reserved.

-

-Use of this software is subject to the terms of the Oculus license

-agreement provided at the time of installation or download, or which

-otherwise accompanies this software in either electronic or hard copy form.

-

-*************************************************************************************/

-

-#include "OVR_Win32_DeviceStatus.h"

-

-#include "OVR_Win32_HIDDevice.h"

-

-#include "Kernel/OVR_Log.h"

-

-#include <dbt.h>

-

-namespace OVR { namespace Win32 {

-

-static TCHAR windowClassName[] = TEXT("LibOVR_DeviceStatus_WindowClass");

-

-//-------------------------------------------------------------------------------------

-DeviceStatus::DeviceStatus(Notifier* const pClient)

-	: pNotificationClient(pClient), LastTimerId(0)

-{	

-}

-

-bool DeviceStatus::Initialize()

-{

-

-	WNDCLASS wndClass;

-	wndClass.style         = CS_HREDRAW | CS_VREDRAW;

-	wndClass.lpfnWndProc   = WindowsMessageCallback;

-	wndClass.cbClsExtra    = 0;

-	wndClass.cbWndExtra    = 0;

-	wndClass.hInstance     = 0;

-	wndClass.hIcon         = LoadIcon(NULL, IDI_APPLICATION);

-	wndClass.hCursor       = LoadCursor(NULL, IDC_ARROW);

-	wndClass.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1);

-	wndClass.lpszMenuName  = NULL;

-	wndClass.lpszClassName = windowClassName;

-

-	if (!RegisterClass(&wndClass))

-	{

-		OVR_ASSERT_LOG(false, ("Failed to register window class."));

-		return false;

-	}

-

-    // We're going to create a 'message-only' window. This will be hidden, can't be enumerated etc.

-    // To do this we supply 'HWND_MESSAGE' as the hWndParent.

-    // http://msdn.microsoft.com/en-us/library/ms632599%28VS.85%29.aspx#message_only

-	hMessageWindow = CreateWindow(	windowClassName,

-									windowClassName,

-									WS_OVERLAPPEDWINDOW,

-									CW_USEDEFAULT,

-									CW_USEDEFAULT,

-									CW_USEDEFAULT,

-									CW_USEDEFAULT,

-									HWND_MESSAGE,

-									NULL,

-									0,

-									this);	// Pass this object via the CREATESTRUCT mechanism 

-                                            // so that we can attach it to the window user data.

-

-    if (hMessageWindow == NULL)

-	{

-		OVR_ASSERT_LOG(false, ("Failed to create window."));

-		return false;

-	}

-

-    // According to MS, topmost windows receive WM_DEVICECHANGE faster.

-	::SetWindowPos(hMessageWindow, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);

-	UpdateWindow(hMessageWindow);

-

-

-	// Register notification for additional HID messages.

-    HIDDeviceManager* hidDeviceManager = new HIDDeviceManager(NULL);

-	HidGuid = hidDeviceManager->GetHIDGuid();

-    hidDeviceManager->Release();

-

-	DEV_BROADCAST_DEVICEINTERFACE notificationFilter;

-

-	ZeroMemory(&notificationFilter, sizeof(notificationFilter));

-	notificationFilter.dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE);

-	notificationFilter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;

-	//notificationFilter.dbcc_classguid = hidguid;

-

-    // We need DEVICE_NOTIFY_ALL_INTERFACE_CLASSES to detect

-    // HDMI plug/unplug events.

-	hDeviceNotify = RegisterDeviceNotification(	

-        hMessageWindow,

-		&notificationFilter,

-		DEVICE_NOTIFY_ALL_INTERFACE_CLASSES|DEVICE_NOTIFY_WINDOW_HANDLE);

-

-	if (hDeviceNotify == NULL)

-	{

-		OVR_ASSERT_LOG(false, ("Failed to register for device notifications."));

-		return false;

-	}

-

-	return true;

-}

-

-void DeviceStatus::ShutDown()

-{

-	OVR_ASSERT(hMessageWindow);

-

-	if (!UnregisterDeviceNotification(hDeviceNotify))

-	{

-		OVR_ASSERT_LOG(false, ("Failed to unregister device notification."));

-	}

-

-	PostMessage(hMessageWindow, WM_CLOSE, 0, 0);

-

-	while (hMessageWindow != NULL)

-	{

-		ProcessMessages();

-		Sleep(1);

-	}

-

-    if (!UnregisterClass(windowClassName, NULL))

-    {

-        OVR_ASSERT_LOG(false, ("Failed to unregister window class."));

-    }

-}

-

-DeviceStatus::~DeviceStatus()

-{    

-	OVR_ASSERT_LOG(hMessageWindow == NULL, ("Need to call 'ShutDown' from DeviceManagerThread."));

-}

-

-void DeviceStatus::ProcessMessages()

-{

-	OVR_ASSERT_LOG(hMessageWindow != NULL, ("Need to call 'Initialize' before first use."));

-

-	MSG msg;

-

-	// Note WM_DEVICECHANGED messages are dispatched but not retrieved by PeekMessage.

-    // I think this is because they are pending, non-queued messages.

-	while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) 

-	{

-		TranslateMessage(&msg);

-		DispatchMessage(&msg);

-	}

-}

-

-bool DeviceStatus::MessageCallback(WORD messageType, const String& devicePath)

-{

-	bool rv = true;

-	if (messageType == DBT_DEVICEARRIVAL)

-	{

-		rv = pNotificationClient->OnMessage(Notifier::DeviceAdded, devicePath);

-	}

-	else if (messageType == DBT_DEVICEREMOVECOMPLETE)

-	{

-		pNotificationClient->OnMessage(Notifier::DeviceRemoved, devicePath);

-	}

-	else

-	{

-		OVR_ASSERT(0);

-	}

-	return rv;

-}

-

-void DeviceStatus::CleanupRecoveryTimer(UPInt index)

-{

-    ::KillTimer(hMessageWindow, RecoveryTimers[index].TimerId);

-    RecoveryTimers.RemoveAt(index);

-}

-    

-DeviceStatus::RecoveryTimerDesc* 

-DeviceStatus::FindRecoveryTimer(UINT_PTR timerId, UPInt* pindex)

-{

-    for (UPInt i = 0, n = RecoveryTimers.GetSize(); i < n; ++i)

-    {

-        RecoveryTimerDesc* pdesc = &RecoveryTimers[i];

-        if (pdesc->TimerId == timerId)

-        {

-            *pindex = i;

-            return pdesc;

-        }

-    }

-    return NULL;

-}

-

-void DeviceStatus::FindAndCleanupRecoveryTimer(const String& devicePath)

-{

-    for (UPInt i = 0, n = RecoveryTimers.GetSize(); i < n; ++i)

-    {

-        RecoveryTimerDesc* pdesc = &RecoveryTimers[i];

-        if (pdesc->DevicePath.CompareNoCase(devicePath))

-        {

-            CleanupRecoveryTimer(i);

-            break;

-        }

-    }

-}

-

-LRESULT CALLBACK DeviceStatus::WindowsMessageCallback(  HWND hwnd, 

-                                                        UINT message, 

-                                                        WPARAM wParam, 

-                                                        LPARAM lParam)

-{

-	switch (message)

-	{

-	case WM_CREATE:

-		{

-			// Setup window user data with device status object pointer.

-			LPCREATESTRUCT create_struct = reinterpret_cast<LPCREATESTRUCT>(lParam);

-			void *lpCreateParam = create_struct->lpCreateParams;

-			DeviceStatus *pDeviceStatus = reinterpret_cast<DeviceStatus*>(lpCreateParam);

-

-			SetWindowLongPtr(hwnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(pDeviceStatus));

-		}

-		return 0;	// Return 0 for successfully handled WM_CREATE.

-

-	case WM_DEVICECHANGE:

-		{

-			WORD loword = LOWORD(wParam);

-

-			if (loword != DBT_DEVICEARRIVAL &&

-				loword != DBT_DEVICEREMOVECOMPLETE) 

-			{

-				// Ignore messages other than device arrive and remove complete 

-                // (we're not handling intermediate ones).

-				return TRUE;	// Grant WM_DEVICECHANGE request.

-			}

-

-			DEV_BROADCAST_DEVICEINTERFACE* hdr;

-			hdr = (DEV_BROADCAST_DEVICEINTERFACE*) lParam;

-

-			if (hdr->dbcc_devicetype != DBT_DEVTYP_DEVICEINTERFACE) 

-			{

-				// Ignore non interface device messages.

-				return TRUE;	// Grant WM_DEVICECHANGE request.

-			}

-

-			LONG_PTR userData = GetWindowLongPtr(hwnd, GWLP_USERDATA);

-			OVR_ASSERT(userData != NULL);

-

-			// Call callback on device messages object with the device path.

-			DeviceStatus* pDeviceStatus = (DeviceStatus*) userData;

-			String devicePath(hdr->dbcc_name);

-

-            // check if HID device caused the event...

-            if (pDeviceStatus->HidGuid == hdr->dbcc_classguid)

-            {

-                // check if recovery timer is already running; stop it and 

-                // remove it, if so.

-                pDeviceStatus->FindAndCleanupRecoveryTimer(devicePath);

-

-                if (!pDeviceStatus->MessageCallback(loword, devicePath))

-                {

-                    // hmmm.... unsuccessful

-                    if (loword == DBT_DEVICEARRIVAL)

-                    {

-                        // Windows sometimes may return errors ERROR_SHARING_VIOLATION and

-                        // ERROR_FILE_NOT_FOUND when trying to open an USB device via

-                        // CreateFile. Need to start a recovery timer that will try to 

-                        // re-open the device again.

-                        OVR_DEBUG_LOG(("Adding failed, recovering through a timer..."));

-                        UINT_PTR tid = ::SetTimer(hwnd, ++pDeviceStatus->LastTimerId, 

-                            USBRecoveryTimeInterval, NULL);

-                        RecoveryTimerDesc rtDesc;

-                        rtDesc.TimerId = tid;

-                        rtDesc.DevicePath = devicePath;

-                        rtDesc.NumAttempts= 0;

-                        pDeviceStatus->RecoveryTimers.PushBack(rtDesc);

-                        // wrap around the timer counter, avoid timerId == 0...

-                        if (pDeviceStatus->LastTimerId + 1 == 0)

-                            pDeviceStatus->LastTimerId = 0;

-                    }

-                }

-            }

-            // Check if Oculus HDMI device was plugged/unplugged, preliminary

-            // filtering. (is there any way to get GUID? !AB)

-            //else if (strstr(devicePath.ToCStr(), "DISPLAY#"))

-            else if (strstr(devicePath.ToCStr(), "#OVR00"))

-            {

-                pDeviceStatus->MessageCallback(loword, devicePath);

-            }

-		}

-		return TRUE;	// Grant WM_DEVICECHANGE request.

-

-	case WM_TIMER:

-		{

-			if (wParam != 0)

-			{

-				LONG_PTR userData = GetWindowLongPtr(hwnd, GWLP_USERDATA);

-				OVR_ASSERT(userData != NULL);

-

-				// Call callback on device messages object with the device path.

-				DeviceStatus* pDeviceStatus = (DeviceStatus*) userData;

-

-                // Check if we have recovery timer running (actually, we must be!)

-                UPInt rtIndex;

-                RecoveryTimerDesc* prtDesc = pDeviceStatus->FindRecoveryTimer(wParam, &rtIndex);

-				if (prtDesc)

-				{

-					if (pDeviceStatus->MessageCallback(DBT_DEVICEARRIVAL, prtDesc->DevicePath))

-					{

-                        OVR_DEBUG_LOG(("Recovered, adding is successful, cleaning up the timer..."));

-                        // now it is successful, kill the timer and cleanup

-                        pDeviceStatus->CleanupRecoveryTimer(rtIndex);

-					}

-                    else

-                    {

-                        if (++prtDesc->NumAttempts >= MaxUSBRecoveryAttempts)

-                        {

-                            OVR_DEBUG_LOG(("Failed to recover USB after %d attempts, path = '%s', aborting...",

-                                prtDesc->NumAttempts, prtDesc->DevicePath.ToCStr()));

-                            pDeviceStatus->CleanupRecoveryTimer(rtIndex);

-                        }

-                        else

-                        {

-                            OVR_DEBUG_LOG(("Failed to recover USB, %d attempts, path = '%s'",

-                                prtDesc->NumAttempts, prtDesc->DevicePath.ToCStr()));

-                        }

-                    }

-				}

-			}

-		}

-		return 0;

-

-	case WM_CLOSE:

-		{

-			LONG_PTR userData = GetWindowLongPtr(hwnd, GWLP_USERDATA);

-			OVR_ASSERT(userData != NULL);

-			DeviceStatus* pDeviceStatus = (DeviceStatus*) userData;

-			pDeviceStatus->hMessageWindow = NULL;

-

-			DestroyWindow(hwnd);

-		}

-		return 0;	// We processed the WM_CLOSE message.

-

-	case WM_DESTROY:

-		PostQuitMessage(0);

-		return 0;	// We processed the WM_DESTROY message.

-	}

-

-	return DefWindowProc(hwnd, message, wParam, lParam);

-}

-

-}} // namespace OVR::Win32

+/************************************************************************************
+
+Filename    :   OVR_Win32_DeviceStatus.cpp
+Content     :   Win32 implementation of DeviceStatus.
+Created     :   January 24, 2013
+Authors     :   Lee Cooper
+
+Copyright   :   Copyright 2013 Oculus VR, Inc. All Rights reserved.
+
+Use of this software is subject to the terms of the Oculus license
+agreement provided at the time of installation or download, or which
+otherwise accompanies this software in either electronic or hard copy form.
+
+*************************************************************************************/
+
+#include "OVR_Win32_DeviceStatus.h"
+
+#include "OVR_Win32_HIDDevice.h"
+
+#include "Kernel/OVR_Log.h"
+
+#include <dbt.h>
+
+namespace OVR { namespace Win32 {
+
+static TCHAR windowClassName[] = TEXT("LibOVR_DeviceStatus_WindowClass");
+
+//-------------------------------------------------------------------------------------
+DeviceStatus::DeviceStatus(Notifier* const pClient)
+	: pNotificationClient(pClient), LastTimerId(0)
+{	
+}
+
+bool DeviceStatus::Initialize()
+{
+
+	WNDCLASS wndClass;
+	wndClass.style         = CS_HREDRAW | CS_VREDRAW;
+	wndClass.lpfnWndProc   = WindowsMessageCallback;
+	wndClass.cbClsExtra    = 0;
+	wndClass.cbWndExtra    = 0;
+	wndClass.hInstance     = 0;
+	wndClass.hIcon         = LoadIcon(NULL, IDI_APPLICATION);
+	wndClass.hCursor       = LoadCursor(NULL, IDC_ARROW);
+	wndClass.hbrBackground = (HBRUSH) (COLOR_WINDOW + 1);
+	wndClass.lpszMenuName  = NULL;
+	wndClass.lpszClassName = windowClassName;
+
+	if (!RegisterClass(&wndClass))
+	{
+		OVR_ASSERT_LOG(false, ("Failed to register window class."));
+		return false;
+	}
+
+    // We're going to create a 'message-only' window. This will be hidden, can't be enumerated etc.
+    // To do this we supply 'HWND_MESSAGE' as the hWndParent.
+    // http://msdn.microsoft.com/en-us/library/ms632599%28VS.85%29.aspx#message_only
+	hMessageWindow = CreateWindow(	windowClassName,
+									windowClassName,
+									WS_OVERLAPPEDWINDOW,
+									CW_USEDEFAULT,
+									CW_USEDEFAULT,
+									CW_USEDEFAULT,
+									CW_USEDEFAULT,
+									HWND_MESSAGE,
+									NULL,
+									0,
+									this);	// Pass this object via the CREATESTRUCT mechanism 
+                                            // so that we can attach it to the window user data.
+
+    if (hMessageWindow == NULL)
+	{
+		OVR_ASSERT_LOG(false, ("Failed to create window."));
+		return false;
+	}
+
+    // According to MS, topmost windows receive WM_DEVICECHANGE faster.
+	::SetWindowPos(hMessageWindow, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE|SWP_NOSIZE);
+	UpdateWindow(hMessageWindow);
+
+
+	// Register notification for additional HID messages.
+    HIDDeviceManager* hidDeviceManager = new HIDDeviceManager(NULL);
+	HidGuid = hidDeviceManager->GetHIDGuid();
+    hidDeviceManager->Release();
+
+	DEV_BROADCAST_DEVICEINTERFACE notificationFilter;
+
+	ZeroMemory(&notificationFilter, sizeof(notificationFilter));
+	notificationFilter.dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE);
+	notificationFilter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
+	//notificationFilter.dbcc_classguid = hidguid;
+
+    // We need DEVICE_NOTIFY_ALL_INTERFACE_CLASSES to detect
+    // HDMI plug/unplug events.
+	hDeviceNotify = RegisterDeviceNotification(	
+        hMessageWindow,
+		&notificationFilter,
+		DEVICE_NOTIFY_ALL_INTERFACE_CLASSES|DEVICE_NOTIFY_WINDOW_HANDLE);
+
+	if (hDeviceNotify == NULL)
+	{
+		OVR_ASSERT_LOG(false, ("Failed to register for device notifications."));
+		return false;
+	}
+
+	return true;
+}
+
+void DeviceStatus::ShutDown()
+{
+	OVR_ASSERT(hMessageWindow);
+
+	if (!UnregisterDeviceNotification(hDeviceNotify))
+	{
+		OVR_ASSERT_LOG(false, ("Failed to unregister device notification."));
+	}
+
+	PostMessage(hMessageWindow, WM_CLOSE, 0, 0);
+
+	while (hMessageWindow != NULL)
+	{
+		ProcessMessages();
+		Sleep(1);
+	}
+
+    if (!UnregisterClass(windowClassName, NULL))
+    {
+        OVR_ASSERT_LOG(false, ("Failed to unregister window class."));
+    }
+}
+
+DeviceStatus::~DeviceStatus()
+{    
+	OVR_ASSERT_LOG(hMessageWindow == NULL, ("Need to call 'ShutDown' from DeviceManagerThread."));
+}
+
+void DeviceStatus::ProcessMessages()
+{
+	OVR_ASSERT_LOG(hMessageWindow != NULL, ("Need to call 'Initialize' before first use."));
+
+	MSG msg;
+
+	// Note WM_DEVICECHANGED messages are dispatched but not retrieved by PeekMessage.
+    // I think this is because they are pending, non-queued messages.
+	while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) 
+	{
+		TranslateMessage(&msg);
+		DispatchMessage(&msg);
+	}
+}
+
+bool DeviceStatus::MessageCallback(WORD messageType, const String& devicePath)
+{
+	bool rv = true;
+	if (messageType == DBT_DEVICEARRIVAL)
+	{
+		rv = pNotificationClient->OnMessage(Notifier::DeviceAdded, devicePath);
+	}
+	else if (messageType == DBT_DEVICEREMOVECOMPLETE)
+	{
+		pNotificationClient->OnMessage(Notifier::DeviceRemoved, devicePath);
+	}
+	else
+	{
+		OVR_ASSERT(0);
+	}
+	return rv;
+}
+
+void DeviceStatus::CleanupRecoveryTimer(UPInt index)
+{
+    ::KillTimer(hMessageWindow, RecoveryTimers[index].TimerId);
+    RecoveryTimers.RemoveAt(index);
+}
+    
+DeviceStatus::RecoveryTimerDesc* 
+DeviceStatus::FindRecoveryTimer(UINT_PTR timerId, UPInt* pindex)
+{
+    for (UPInt i = 0, n = RecoveryTimers.GetSize(); i < n; ++i)
+    {
+        RecoveryTimerDesc* pdesc = &RecoveryTimers[i];
+        if (pdesc->TimerId == timerId)
+        {
+            *pindex = i;
+            return pdesc;
+        }
+    }
+    return NULL;
+}
+
+void DeviceStatus::FindAndCleanupRecoveryTimer(const String& devicePath)
+{
+    for (UPInt i = 0, n = RecoveryTimers.GetSize(); i < n; ++i)
+    {
+        RecoveryTimerDesc* pdesc = &RecoveryTimers[i];
+        if (pdesc->DevicePath.CompareNoCase(devicePath))
+        {
+            CleanupRecoveryTimer(i);
+            break;
+        }
+    }
+}
+
+LRESULT CALLBACK DeviceStatus::WindowsMessageCallback(  HWND hwnd, 
+                                                        UINT message, 
+                                                        WPARAM wParam, 
+                                                        LPARAM lParam)
+{
+	switch (message)
+	{
+	case WM_CREATE:
+		{
+			// Setup window user data with device status object pointer.
+			LPCREATESTRUCT create_struct = reinterpret_cast<LPCREATESTRUCT>(lParam);
+			void *lpCreateParam = create_struct->lpCreateParams;
+			DeviceStatus *pDeviceStatus = reinterpret_cast<DeviceStatus*>(lpCreateParam);
+
+			SetWindowLongPtr(hwnd, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(pDeviceStatus));
+		}
+		return 0;	// Return 0 for successfully handled WM_CREATE.
+
+	case WM_DEVICECHANGE:
+		{
+			WORD loword = LOWORD(wParam);
+
+			if (loword != DBT_DEVICEARRIVAL &&
+				loword != DBT_DEVICEREMOVECOMPLETE) 
+			{
+				// Ignore messages other than device arrive and remove complete 
+                // (we're not handling intermediate ones).
+				return TRUE;	// Grant WM_DEVICECHANGE request.
+			}
+
+			DEV_BROADCAST_DEVICEINTERFACE* hdr;
+			hdr = (DEV_BROADCAST_DEVICEINTERFACE*) lParam;
+
+			if (hdr->dbcc_devicetype != DBT_DEVTYP_DEVICEINTERFACE) 
+			{
+				// Ignore non interface device messages.
+				return TRUE;	// Grant WM_DEVICECHANGE request.
+			}
+
+			LONG_PTR userData = GetWindowLongPtr(hwnd, GWLP_USERDATA);
+			OVR_ASSERT(userData != NULL);
+
+			// Call callback on device messages object with the device path.
+			DeviceStatus* pDeviceStatus = (DeviceStatus*) userData;
+			String devicePath(hdr->dbcc_name);
+
+            // check if HID device caused the event...
+            if (pDeviceStatus->HidGuid == hdr->dbcc_classguid)
+            {
+                // check if recovery timer is already running; stop it and 
+                // remove it, if so.
+                pDeviceStatus->FindAndCleanupRecoveryTimer(devicePath);
+
+                if (!pDeviceStatus->MessageCallback(loword, devicePath))
+                {
+                    // hmmm.... unsuccessful
+                    if (loword == DBT_DEVICEARRIVAL)
+                    {
+                        // Windows sometimes may return errors ERROR_SHARING_VIOLATION and
+                        // ERROR_FILE_NOT_FOUND when trying to open an USB device via
+                        // CreateFile. Need to start a recovery timer that will try to 
+                        // re-open the device again.
+                        OVR_DEBUG_LOG(("Adding failed, recovering through a timer..."));
+                        UINT_PTR tid = ::SetTimer(hwnd, ++pDeviceStatus->LastTimerId, 
+                            USBRecoveryTimeInterval, NULL);
+                        RecoveryTimerDesc rtDesc;
+                        rtDesc.TimerId = tid;
+                        rtDesc.DevicePath = devicePath;
+                        rtDesc.NumAttempts= 0;
+                        pDeviceStatus->RecoveryTimers.PushBack(rtDesc);
+                        // wrap around the timer counter, avoid timerId == 0...
+                        if (pDeviceStatus->LastTimerId + 1 == 0)
+                            pDeviceStatus->LastTimerId = 0;
+                    }
+                }
+            }
+            // Check if Oculus HDMI device was plugged/unplugged, preliminary
+            // filtering. (is there any way to get GUID? !AB)
+            //else if (strstr(devicePath.ToCStr(), "DISPLAY#"))
+            else if (strstr(devicePath.ToCStr(), "#OVR00"))
+            {
+                pDeviceStatus->MessageCallback(loword, devicePath);
+            }
+		}
+		return TRUE;	// Grant WM_DEVICECHANGE request.
+
+	case WM_TIMER:
+		{
+			if (wParam != 0)
+			{
+				LONG_PTR userData = GetWindowLongPtr(hwnd, GWLP_USERDATA);
+				OVR_ASSERT(userData != NULL);
+
+				// Call callback on device messages object with the device path.
+				DeviceStatus* pDeviceStatus = (DeviceStatus*) userData;
+
+                // Check if we have recovery timer running (actually, we must be!)
+                UPInt rtIndex;
+                RecoveryTimerDesc* prtDesc = pDeviceStatus->FindRecoveryTimer(wParam, &rtIndex);
+				if (prtDesc)
+				{
+					if (pDeviceStatus->MessageCallback(DBT_DEVICEARRIVAL, prtDesc->DevicePath))
+					{
+                        OVR_DEBUG_LOG(("Recovered, adding is successful, cleaning up the timer..."));
+                        // now it is successful, kill the timer and cleanup
+                        pDeviceStatus->CleanupRecoveryTimer(rtIndex);
+					}
+                    else
+                    {
+                        if (++prtDesc->NumAttempts >= MaxUSBRecoveryAttempts)
+                        {
+                            OVR_DEBUG_LOG(("Failed to recover USB after %d attempts, path = '%s', aborting...",
+                                prtDesc->NumAttempts, prtDesc->DevicePath.ToCStr()));
+                            pDeviceStatus->CleanupRecoveryTimer(rtIndex);
+                        }
+                        else
+                        {
+                            OVR_DEBUG_LOG(("Failed to recover USB, %d attempts, path = '%s'",
+                                prtDesc->NumAttempts, prtDesc->DevicePath.ToCStr()));
+                        }
+                    }
+				}
+			}
+		}
+		return 0;
+
+	case WM_CLOSE:
+		{
+			LONG_PTR userData = GetWindowLongPtr(hwnd, GWLP_USERDATA);
+			OVR_ASSERT(userData != NULL);
+			DeviceStatus* pDeviceStatus = (DeviceStatus*) userData;
+			pDeviceStatus->hMessageWindow = NULL;
+
+			DestroyWindow(hwnd);
+		}
+		return 0;	// We processed the WM_CLOSE message.
+
+	case WM_DESTROY:
+		PostQuitMessage(0);
+		return 0;	// We processed the WM_DESTROY message.
+	}
+
+	return DefWindowProc(hwnd, message, wParam, lParam);
+}
+
+}} // namespace OVR::Win32