Added setlocal and enclocal declarations to NVDARemoteCertificate.cmd…

…. Windows service manager now will try to run as administrator and prompt for required privileges

windows/NVDARemoteCertificate.cmd

@@ -1,6 +1,7 @@
 @echo off
 title NVDA Remote Server self-signed certificate generator
 cd %~dp0
+setlocal
 set OPENSSL_CONF=%~dp0openssl.cnf
 openssl genrsa -out key.key 4096
 openssl req -new -key key.key -out cert.csr
@@ -10,6 +11,7 @@ copy key.key + cert.crt server.pem
 del key.key
 del cert.csr
 del cert.crt
+endlocal
 echo Certificate successfully created
 echo You must restart the server for the changes to take effect. Press any key to exit.
 pause

windows/service_manager.cmd

@@ -1,5 +1,12 @@
 @echo off
 title NVDARemote server service manager
+fltmc 1>nul 2>nul || (
+cd /d "%~dp0"
+cmd /u /c echo Set UAC = CreateObject^("Shell.Application"^) : UAC.ShellExecute "cmd.exe", "/c cd ""%~dp0"" && ""%~dpnx0""", "", "runas", 1 > "%temp%\GetAdmin.vbs"
+cscript "%temp%\GetAdmin.vbs"
+del /f /q "%temp%\GetAdmin.vbs" 1>nul 2>nul
+exit
+)
 :menu
 cls
 echo Welcome to the NVDARemote server service manager.