Merge pull request #634 from Yozer/master

cboulay · web-flow · commit 5b93f52f9a5d · 2019-09-06T17:30:15.000-04:00
Fixed ps move pairing on Windows 10 1903 and later.

Oops I pressed the wrong button last time.
diff --git a/src/psmoveservice/Platform/BluetoothRequestsWin32.cpp b/src/psmoveservice/Platform/BluetoothRequestsWin32.cpp
@@ -1544,18 +1544,11 @@ patch_registry(const BLUETOOTH_ADDRESS *move_addr, const BLUETOOTH_ADDRESS *radi
     HKEY hKey;
     if (success)
     {
-        LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, sub_key, 0, KEY_READ | KEY_QUERY_VALUE | KEY_WOW64_64KEY | KEY_ALL_ACCESS, &hKey);
+        DWORD lpdwDisposition;
+        LONG result = RegCreateKeyEx(HKEY_LOCAL_MACHINE, sub_key, 0, nullptr, 0, KEY_READ | KEY_QUERY_VALUE | KEY_WOW64_64KEY | KEY_ALL_ACCESS, NULL, &hKey, &lpdwDisposition);
         if (result != ERROR_SUCCESS) 
         {
-            if (result == ERROR_FILE_NOT_FOUND) 
-            {
-                SERVER_MT_LOG_ERROR("AsyncBluetoothPairDeviceRequest") << "Failed to open registry key, it does not yet exist";
-            }
-            else
-            {
-                SERVER_MT_LOG_ERROR("AsyncBluetoothPairDeviceRequest") << "Failed to open registry key";
-            }
-
+            SERVER_MT_LOG_ERROR("AsyncBluetoothPairDeviceRequest") << "Failed to create registry key";
             success= false;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1544,18 +1544,11 @@ patch_registry(const BLUETOOTH_ADDRESS move_addr, const BLUETOOTH_ADDRESS radi`
`1544`	`1544`	`HKEY hKey;`
`1545`	`1545`	`if (success)`
`1546`	`1546`	`{`
`1547`		`- LONG result = RegOpenKeyEx(HKEY_LOCAL_MACHINE, sub_key, 0, KEY_READ \| KEY_QUERY_VALUE \| KEY_WOW64_64KEY \| KEY_ALL_ACCESS, &hKey);`
	`1547`	`+ DWORD lpdwDisposition;`
	`1548`	`+ LONG result = RegCreateKeyEx(HKEY_LOCAL_MACHINE, sub_key, 0, nullptr, 0, KEY_READ \| KEY_QUERY_VALUE \| KEY_WOW64_64KEY \| KEY_ALL_ACCESS, NULL, &hKey, &lpdwDisposition);`
`1548`	`1549`	`if (result != ERROR_SUCCESS)`
`1549`	`1550`	`{`
`1550`		`- if (result == ERROR_FILE_NOT_FOUND)`
`1551`		`- {`
`1552`		`- SERVER_MT_LOG_ERROR("AsyncBluetoothPairDeviceRequest") << "Failed to open registry key, it does not yet exist";`
`1553`		`- }`
`1554`		`- else`
`1555`		`- {`
`1556`		`- SERVER_MT_LOG_ERROR("AsyncBluetoothPairDeviceRequest") << "Failed to open registry key";`
`1557`		`- }`
`1558`		`-`
	`1551`	`+ SERVER_MT_LOG_ERROR("AsyncBluetoothPairDeviceRequest") << "Failed to create registry key";`
`1559`	`1552`	`success= false;`
`1560`	`1553`	`}`
`1561`	`1554`	`}`