Url_handler.exe: removed functions to access the registry and start NVDA. Removed shell32 and advapi32 from linked libraries, they are nolonger required

Author: jmdaweb

addon/globalPlugins/remoteClient/url_handler.cpp

@@ -2,9 +2,6 @@
 #include <string>
 #include <windows.h>
 
-std::wstring GetNVDAPath ();
-LONG GetStringRegKey(HKEY hKey, const std::wstring &strValueName, std::wstring &strValue, const std::wstring &strDefaultValue);
-
 int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR     lpCmdLine, int       nCmdShow)
 {
 	if (__argc < 2) {
@@ -24,51 +21,14 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR     lpC
 	cds.cbData = (args.length()*2)+2;
 	HWND hwnd;
 	hwnd = FindWindow(L"TeleNVDAURLHandler", NULL);
-	if (hwnd == 0) {
-		NVDAPath = GetNVDAPath();
-			ShellExecute(0, NULL, NVDAPath.c_str(), NULL, NULL, 0);
-	};
 	for (int tries = 0; tries < 300; tries++) {
-		Sleep(100);
-		hwnd = FindWindow(L"TeleNVDAURLHandler", NULL);
-		if (hwnd > 0) {
+		if (hwnd > (HWND)0) {
 			Sleep(100); /* Needed to ensure the window is fully created */
 			SendMessage(hwnd, WM_COPYDATA, 0, (LPARAM)&cds);
 			return 0;
 		};
-}
-	return 1;
-}
-
-/* Get the path to the NVDA executable if installed
-Return an empty string if the path cannot be found. */
-
-std::wstring GetNVDAPath () {
-	HKEY hKey;
-	LONG lRes = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\NVDA", 0, KEY_READ, &hKey);
-	if (lRes != ERROR_SUCCESS) {
-		return L"";
-	}
-	std::wstring result;
-	std::wstring BadValue;
-	GetStringRegKey(hKey, L"InstallDir", result, L"bad");
-	if (result == L"bad") {
-		return L"";
+		Sleep(100);
+		hwnd = FindWindow(L"TeleNVDAURLHandler", NULL);
 	}
-	result += L"\\NVDA.exe";
-	return result;
+	return 1;
 }
-
-LONG GetStringRegKey(HKEY hKey, const std::wstring &strValueName, std::wstring &strValue, const std::wstring &strDefaultValue)
-{
-	strValue = strDefaultValue;
-	WCHAR szBuffer[512];
-	DWORD dwBufferSize = sizeof(szBuffer);
-	ULONG nError;
-	nError = RegQueryValueExW(hKey, strValueName.c_str(), 0, NULL, (LPBYTE)szBuffer, &dwBufferSize);
-	if (ERROR_SUCCESS == nError)
-	{
-		strValue = szBuffer;
-	}
-	return nError;
-}

sconstruct

@@ -322,7 +322,7 @@ env.Depends(manifest, "buildVars.py")
 
 env.Depends(addon, manifest)
 
-url_handler = env.Program('addon/globalPlugins/remoteClient/url_handler.cpp', CCFLAGS='/EHsc', LIBS=['advapi32', 'shell32', 'user32'])
+url_handler = env.Program('addon/globalPlugins/remoteClient/url_handler.cpp', CCFLAGS='/EHsc', LIBS=['user32'])
 env.Depends(addon, url_handler)
 
 env.Default(addon)