SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve WebView2 install handling

Browse Source 
cuts down on code and should better account for multiple instances
This commit is contained in:
pizzaboxer 2023-05-24 11:21:53 +01:00
parent c7a7feeebf
commit 54b65f8728
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Bloxstrap/Bootstrapper.cs
View File

@ -73,7 +73,6 @@ namespace Bloxstrap
private static bool FreshInstall => String.IsNullOrEmpty(App.State.Prop.VersionGuid); private static bool FreshInstall => String.IsNullOrEmpty(App.State.Prop.VersionGuid);
private static string DesktopShortcutLocation => Path.Combine(Directories.Desktop, "Play Roblox.lnk"); private static string DesktopShortcutLocation => Path.Combine(Directories.Desktop, "Play Roblox.lnk");
private static bool ShouldInstallWebView2 = false;
private string _playerLocation => Path.Combine(_versionFolder, "RobloxPlayerBeta.exe"); private string _playerLocation => Path.Combine(_versionFolder, "RobloxPlayerBeta.exe");
@ -96,15 +95,6 @@ namespace Bloxstrap
public Bootstrapper(string launchCommandLine) public Bootstrapper(string launchCommandLine)
{ {
_launchCommandLine = launchCommandLine; _launchCommandLine = launchCommandLine;
// check if the webview2 runtime needs to be installed
// webview2 can either be installed be per-user or globally, so we need to check in both hklm and hkcu
// https://learn.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#detect-if-a-suitable-webview2-runtime-is-already-installed
string hklmLocation = "SOFTWARE\\WOW6432Node\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}";
string hkcuLocation = "Software\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}";
ShouldInstallWebView2 = Registry.LocalMachine.OpenSubKey(hklmLocation) is null && Registry.CurrentUser.OpenSubKey(hkcuLocation) is null;
} }
private void SetStatus(string message) private void SetStatus(string message)
@ -192,8 +182,7 @@ namespace Bloxstrap
MigrateIntegrations(); MigrateIntegrations();
if (ShouldInstallWebView2) await InstallWebView2();
await InstallWebView2();
App.FastFlags.Save(); App.FastFlags.Save();
await ApplyModifications(); await ApplyModifications();
@ -804,7 +793,14 @@ namespace Bloxstrap
private async Task InstallWebView2() private async Task InstallWebView2()
{ {
if (!ShouldInstallWebView2) // check if the webview2 runtime needs to be installed
// webview2 can either be installed be per-user or globally, so we need to check in both hklm and hkcu
// https://learn.microsoft.com/en-us/microsoft-edge/webview2/concepts/distribution#detect-if-a-suitable-webview2-runtime-is-already-installed
using RegistryKey? hklmKey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\WOW6432Node\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}");
using RegistryKey? hkcuKey = Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\EdgeUpdate\\Clients\\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}");
if (hklmKey is not null || hkcuKey is not null)
return; return;
App.Logger.WriteLine($"[Bootstrapper::InstallWebView2] Installing runtime..."); App.Logger.WriteLine($"[Bootstrapper::InstallWebView2] Installing runtime...");