Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[Win] Check registry keys before accessing

Fixes crashes when using OpenTK over the Remote Desktop Client for Mac
(version 2010).
  • Loading branch information...
commit 1b3b510376465136adba1e4e976762426be74260 1 parent 811126c
@thefiddler thefiddler authored
View
10 Source/OpenTK/Platform/Windows/WinRawKeyboard.cs
@@ -103,10 +103,11 @@ public void RefreshDevices()
// This is a keyboard or USB keyboard device. In the latter case, discover if it really is a
// keyboard device by qeurying the registry.
RegistryKey regkey = GetRegistryKey(name);
- string deviceDesc = (string)regkey.GetValue("DeviceDesc");
+ if (regkey == null)
+ continue;
+ string deviceDesc = (string)regkey.GetValue("DeviceDesc");
string deviceClass = (string)regkey.GetValue("Class");
-
string deviceClassGUID = (string)regkey.GetValue("ClassGUID"); // for windows 8 support via OpenTK issue 3198
// making a guess at backwards compatability. Not sure what older windows returns in these cases...
@@ -205,10 +206,15 @@ public bool ProcessKeyboardEvent(RawInput rin)
static RegistryKey GetRegistryKey(string name)
{
+ if (name.Length < 4)
+ return null;
+
// remove the \??\
name = name.Substring(4);
string[] split = name.Split('#');
+ if (split.Length < 3)
+ return null;
string id_01 = split[0]; // ACPI (Class code)
string id_02 = split[1]; // PNP0303 (SubClass code)
View
13 Source/OpenTK/Platform/Windows/WinRawMouse.cs
@@ -110,11 +110,13 @@ public void RefreshDevices()
// This is a mouse or a USB mouse device. In the latter case, discover if it really is a
// mouse device by qeurying the registry.
RegistryKey regkey = FindRegistryKey(name);
- string deviceDesc = (string)regkey.GetValue("DeviceDesc");
+ if (regkey == null)
+ continue;
-
+ string deviceDesc = (string)regkey.GetValue("DeviceDesc");
string deviceClass = (string)regkey.GetValue("Class") as string;
- if(deviceClass == null){
+ if(deviceClass == null)
+ {
// Added to address OpenTK issue 3198 with mouse on Windows 8
string deviceClassGUID = (string)regkey.GetValue("ClassGUID");
RegistryKey classGUIDKey = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\Class\" + deviceClassGUID);
@@ -266,10 +268,15 @@ static string GetDeviceName(RawInputDeviceList dev)
static RegistryKey FindRegistryKey(string name)
{
+ if (name.Length < 4)
+ return null;
+
// remove the \??\
name = name.Substring(4);
string[] split = name.Split('#');
+ if (split.Length < 3)
+ return null;
string id_01 = split[0]; // ACPI (Class code)
string id_02 = split[1]; // PNP0303 (SubClass code)
Please sign in to comment.
Something went wrong with that request. Please try again.