From 478546433290ac9a0c125637edd016918c8c3db3 Mon Sep 17 00:00:00 2001 From: Matt <97983689+bluepilledgreat@users.noreply.github.com> Date: Thu, 23 Jan 2025 22:55:37 +0000 Subject: [PATCH 1/8] fix client-version fallback not handling channel errors (#4378) --- Bloxstrap/RobloxInterfaces/Deployment.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Bloxstrap/RobloxInterfaces/Deployment.cs b/Bloxstrap/RobloxInterfaces/Deployment.cs index da88c14..5be0d21 100644 --- a/Bloxstrap/RobloxInterfaces/Deployment.cs +++ b/Bloxstrap/RobloxInterfaces/Deployment.cs @@ -176,7 +176,15 @@ App.Logger.WriteLine(LOG_IDENT, "Failed to contact clientsettingscdn! Falling back to clientsettings..."); App.Logger.WriteException(LOG_IDENT, ex); - clientVersion = await Http.GetJson("https://clientsettings.roblox.com" + path); + try + { + clientVersion = await Http.GetJson("https://clientsettings.roblox.com" + path); + } + catch (HttpRequestException httpEx) + when (!isDefaultChannel && BadChannelCodes.Contains(httpEx.StatusCode)) + { + throw new InvalidChannelException(httpEx.StatusCode); + } } // check if channel is behind LIVE From 7977dba498c1755efdd0243d9b0006c6b2db9fda Mon Sep 17 00:00:00 2001 From: Matt <97983689+bluepilledgreat@users.noreply.github.com> Date: Sat, 1 Mar 2025 13:59:42 +0000 Subject: [PATCH 2/8] Add Windows 7 & 8.1 deprecation message (#4365) * add windows 7 & 8.1 deprecation message * remove deprecation bypass setting --- Bloxstrap/App.xaml.cs | 19 +++++++++++++++++++ Bloxstrap/Bootstrapper.cs | 2 ++ Bloxstrap/Resources/Strings.Designer.cs | 9 +++++++++ Bloxstrap/Resources/Strings.resx | 3 +++ 4 files changed, 33 insertions(+) diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs index 5083121..691d868 100644 --- a/Bloxstrap/App.xaml.cs +++ b/Bloxstrap/App.xaml.cs @@ -181,6 +181,22 @@ namespace Bloxstrap } } + public static void AssertWindowsOSVersion() + { + const string LOG_IDENT = "App::AssertWindowsOSVersion"; + + int major = Environment.OSVersion.Version.Major; + if (major < 10) // Windows 10 and newer only + { + Logger.WriteLine(LOG_IDENT, $"Detected unsupported Windows version ({Environment.OSVersion.Version})."); + + if (!LaunchSettings.QuietFlag.Active) + Frontend.ShowMessageBox(Strings.App_OSDeprecation_Win7_81, MessageBoxImage.Error); + + Terminate(ErrorCode.ERROR_INVALID_FUNCTION); + } + } + protected override void OnStartup(StartupEventArgs e) { const string LOG_IDENT = "App::OnStartup"; @@ -213,6 +229,8 @@ namespace Bloxstrap #endif } + Logger.WriteLine(LOG_IDENT, $"OSVersion: {Environment.OSVersion}"); + Logger.WriteLine(LOG_IDENT, $"Loaded from {Paths.Process}"); Logger.WriteLine(LOG_IDENT, $"Temp path is {Paths.Temp}"); Logger.WriteLine(LOG_IDENT, $"WindowsStartMenu path is {Paths.WindowsStartMenu}"); @@ -292,6 +310,7 @@ namespace Bloxstrap { Logger.Initialize(true); Logger.WriteLine(LOG_IDENT, "Not installed, launching the installer"); + AssertWindowsOSVersion(); // prevent new installs from unsupported operating systems LaunchHandler.LaunchInstaller(); } else diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index ea0cd74..e42ff98 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -179,6 +179,8 @@ namespace Bloxstrap } #endif + App.AssertWindowsOSVersion(); + // ensure only one instance of the bootstrapper is running at the time // so that we don't have stuff like two updates happening simultaneously diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index fd14b8f..d1277a1 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -151,6 +151,15 @@ namespace Bloxstrap.Resources { } } + /// + /// Looks up a localized string similar to Roblox no longer supports Windows 7 or 8.1. To continue playing Roblox, please upgrade to Windows 10 or newer.. + /// + public static string App_OSDeprecation_Win7_81 { + get { + return ResourceManager.GetString("App.OSDeprecation.Win7_81", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bloxstrap was unable to automatically update to version {0}. Please update it manually by downloading and running it from the website.. /// diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index c8a5479..4f3dadb 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -1267,4 +1267,7 @@ Please close any applications that may be using Roblox's files, and relaunch.All Bloxstrap logs Label that appears next to a checkbox + + Roblox no longer supports Windows 7 or 8.1. To continue playing Roblox, please upgrade to Windows 10 or newer. + \ No newline at end of file From 1258dc3589979857a6e4e757b2f0f06bb8e9bd0f Mon Sep 17 00:00:00 2001 From: Matt <97983689+bluepilledgreat@users.noreply.github.com> Date: Sat, 1 Mar 2025 15:44:06 +0000 Subject: [PATCH 3/8] remove behind production check for channels (#4730) --- Bloxstrap/Bootstrapper.cs | 8 -------- Bloxstrap/Models/APIs/Roblox/ClientVersion.cs | 2 -- Bloxstrap/RobloxInterfaces/Deployment.cs | 9 --------- 3 files changed, 19 deletions(-) diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index e42ff98..da21e53 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -305,14 +305,6 @@ namespace Bloxstrap clientVersion = await Deployment.GetInfo(); } - if (clientVersion.IsBehindDefaultChannel) - { - App.Logger.WriteLine(LOG_IDENT, $"Resetting channel from {Deployment.Channel} because it's behind production"); - - Deployment.Channel = Deployment.DefaultChannel; - clientVersion = await Deployment.GetInfo(); - } - key.SetValueSafe("www.roblox.com", Deployment.IsDefaultChannel ? "" : Deployment.Channel); _latestVersionGuid = clientVersion.VersionGuid; diff --git a/Bloxstrap/Models/APIs/Roblox/ClientVersion.cs b/Bloxstrap/Models/APIs/Roblox/ClientVersion.cs index 9fa405e..5e584f4 100644 --- a/Bloxstrap/Models/APIs/Roblox/ClientVersion.cs +++ b/Bloxstrap/Models/APIs/Roblox/ClientVersion.cs @@ -12,7 +12,5 @@ public string BootstrapperVersion { get; set; } = null!; public DateTime? Timestamp { get; set; } - - public bool IsBehindDefaultChannel { get; set; } } } diff --git a/Bloxstrap/RobloxInterfaces/Deployment.cs b/Bloxstrap/RobloxInterfaces/Deployment.cs index 5be0d21..10fae6c 100644 --- a/Bloxstrap/RobloxInterfaces/Deployment.cs +++ b/Bloxstrap/RobloxInterfaces/Deployment.cs @@ -187,15 +187,6 @@ } } - // check if channel is behind LIVE - if (!isDefaultChannel) - { - var defaultClientVersion = await GetInfo(DefaultChannel); - - if (Utilities.CompareVersions(clientVersion.Version, defaultClientVersion.Version) == VersionComparison.LessThan) - clientVersion.IsBehindDefaultChannel = true; - } - ClientVersionCache[cacheKey] = clientVersion; } From f0df6153e369170bd01cee475ec1f405a3920d2a Mon Sep 17 00:00:00 2001 From: Ryan Luu Date: Sat, 1 Mar 2025 07:46:24 -0800 Subject: [PATCH 4/8] Add repro section to bug report (#3765) --- .github/ISSUE_TEMPLATE/bug_report.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 00cd191..a52add6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -45,6 +45,16 @@ body: description: Provide a comprehensive description of the problem you're facing. Don't forget to attach any additional resources you may have, such as log files and screenshots. validations: required: true + - type: textarea + id: repro-steps + attributes: + label: How do you reproduce the problem? + description: Include the steps to reproduce the problem from start to finish. Include details such as FastFlags you added and settings you changed. + placeholder: | + 1. Go to '...' + 2. Click on '...' + 3. Scroll down to '...' + 4. See error - type: textarea id: log attributes: From 12af23b261cc2083ba96006d5141103b2185e3d5 Mon Sep 17 00:00:00 2001 From: Matt <97983689+bluepilledgreat@users.noreply.github.com> Date: Sun, 2 Mar 2025 13:06:48 +0000 Subject: [PATCH 5/8] bump package versions (#4739) --- Bloxstrap/Bloxstrap.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj index 9c9b70c..6b065ac 100644 --- a/Bloxstrap/Bloxstrap.csproj +++ b/Bloxstrap/Bloxstrap.csproj @@ -49,10 +49,10 @@ - + - - + + all From 552f2a52a6a8e21a892a7b0bea11c1a5f799a566 Mon Sep 17 00:00:00 2001 From: bluepilledgreat <97983689+bluepilledgreat@users.noreply.github.com> Date: Sun, 2 Mar 2025 13:07:52 +0000 Subject: [PATCH 6/8] bump version --- Bloxstrap/Bloxstrap.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj index 6b065ac..8e88aa5 100644 --- a/Bloxstrap/Bloxstrap.csproj +++ b/Bloxstrap/Bloxstrap.csproj @@ -7,8 +7,8 @@ true True Bloxstrap.ico - 2.8.6 - 2.8.6 + 2.9.0 + 2.9.0 app.manifest true false From 2acd0162fbd740f94cc65c10c93d9824e744aead Mon Sep 17 00:00:00 2001 From: Matt <97983689+bluepilledgreat@users.noreply.github.com> Date: Tue, 11 Mar 2025 10:14:44 +0000 Subject: [PATCH 7/8] Fix font related crashes (#4729) * don't crash if mod or package extraction fails * add to strings --- Bloxstrap/Bootstrapper.cs | 52 ++++++++++++++++++++----- Bloxstrap/Resources/Strings.Designer.cs | 36 +++++++++++++++++ Bloxstrap/Resources/Strings.resx | 12 ++++++ Bloxstrap/UI/Frontend.cs | 12 ++++++ 4 files changed, 103 insertions(+), 9 deletions(-) diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index da21e53..bc6e36d 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -58,6 +58,7 @@ namespace Bloxstrap private double _taskbarProgressIncrement; private double _taskbarProgressMaximum; private long _totalDownloadedBytes = 0; + private bool _packageExtractionSuccess = true; private bool _mustUpgrade => String.IsNullOrEmpty(AppData.State.VersionGuid) || !File.Exists(AppData.ExecutablePath); private bool _noConnection = false; @@ -78,7 +79,15 @@ namespace Bloxstrap // https://github.com/icsharpcode/SharpZipLib/blob/master/src/ICSharpCode.SharpZipLib/Zip/FastZip.cs/#L669-L680 // exceptions don't get thrown if we define events without actually binding to the failure events. probably a bug. ¯\_(ツ)_/¯ - _fastZipEvents.FileFailure += (_, e) => throw e.Exception; + _fastZipEvents.FileFailure += (_, e) => + { + // only give a pass to font files (no idea whats wrong with them) + if (!e.Name.EndsWith(".ttf")) + throw e.Exception; + + App.Logger.WriteLine("FastZipEvents::OnFileFailure", $"Failed to extract {e.Name}"); + _packageExtractionSuccess = false; + }; _fastZipEvents.DirectoryFailure += (_, e) => throw e.Exception; _fastZipEvents.ProcessFile += (_, e) => e.ContinueRunning = !_cancelTokenSource.IsCancellationRequested; @@ -223,6 +232,8 @@ namespace Bloxstrap } } + bool allModificationsApplied = true; + if (!_noConnection) { if (AppData.State.VersionGuid != _latestVersionGuid || _mustUpgrade) @@ -233,7 +244,7 @@ namespace Bloxstrap // we require deployment details for applying modifications for a worst case scenario, // where we'd need to restore files from a package that isn't present on disk and needs to be redownloaded - await ApplyModifications(); + allModificationsApplied = await ApplyModifications(); } // check registry entries for every launch, just in case the stock bootstrapper changes it back @@ -247,7 +258,15 @@ namespace Bloxstrap await mutex.ReleaseAsync(); if (!App.LaunchSettings.NoLaunchFlag.Active && !_cancelTokenSource.IsCancellationRequested) + { + // show some balloon tips + if (!_packageExtractionSuccess) + Frontend.ShowBalloonTip(Strings.Bootstrapper_ExtractionFailed_Title, Strings.Bootstrapper_ExtractionFailed_Message, ToolTipIcon.Warning); + else if (!allModificationsApplied) + Frontend.ShowBalloonTip(Strings.Bootstrapper_ModificationsFailed_Title, Strings.Bootstrapper_ModificationsFailed_Message, ToolTipIcon.Warning); + StartRoblox(); + } await mutex.ReleaseAsync(); @@ -921,10 +940,12 @@ namespace Bloxstrap _isInstalling = false; } - private async Task ApplyModifications() + private async Task ApplyModifications() { const string LOG_IDENT = "Bootstrapper::ApplyModifications"; + bool success = true; + SetStatus(Strings.Bootstrapper_Status_ApplyingModifications); // handle file mods @@ -1000,7 +1021,7 @@ namespace Bloxstrap foreach (string file in Directory.GetFiles(Paths.Modifications, "*.*", SearchOption.AllDirectories)) { if (_cancelTokenSource.IsCancellationRequested) - return; + return true; // get relative directory path string relativeFile = file.Substring(Paths.Modifications.Length + 1); @@ -1032,10 +1053,18 @@ namespace Bloxstrap Directory.CreateDirectory(Path.GetDirectoryName(fileVersionFolder)!); Filesystem.AssertReadOnly(fileVersionFolder); - File.Copy(fileModFolder, fileVersionFolder, true); - Filesystem.AssertReadOnly(fileVersionFolder); - - App.Logger.WriteLine(LOG_IDENT, $"{relativeFile} has been copied to the version folder"); + try + { + File.Copy(fileModFolder, fileVersionFolder, true); + Filesystem.AssertReadOnly(fileVersionFolder); + App.Logger.WriteLine(LOG_IDENT, $"{relativeFile} has been copied to the version folder"); + } + catch (Exception ex) + { + App.Logger.WriteLine(LOG_IDENT, $"Failed to apply modification ({relativeFile})"); + App.Logger.WriteException(LOG_IDENT, ex); + success = false; + } } // the manifest is primarily here to keep track of what files have been @@ -1082,7 +1111,7 @@ namespace Bloxstrap if (package is not null) { if (_cancelTokenSource.IsCancellationRequested) - return; + return true; await DownloadPackage(package); ExtractPackage(package, entry.Value); @@ -1093,6 +1122,11 @@ namespace Bloxstrap App.State.Save(); App.Logger.WriteLine(LOG_IDENT, $"Finished checking file mods"); + + if (!success) + App.Logger.WriteLine(LOG_IDENT, "Failed to apply all modifications"); + + return success; } private async Task DownloadPackage(Package package) diff --git a/Bloxstrap/Resources/Strings.Designer.cs b/Bloxstrap/Resources/Strings.Designer.cs index d1277a1..e80603d 100644 --- a/Bloxstrap/Resources/Strings.Designer.cs +++ b/Bloxstrap/Resources/Strings.Designer.cs @@ -178,6 +178,24 @@ namespace Bloxstrap.Resources { } } + /// + /// Looks up a localized string similar to Some content may be missing. Force a Roblox reinstallation in settings to fix this.. + /// + public static string Bootstrapper_ExtractionFailed_Message { + get { + return ResourceManager.GetString("Bootstrapper.ExtractionFailed.Message", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to extract all files. + /// + public static string Bootstrapper_ExtractionFailed_Title { + get { + return ResourceManager.GetString("Bootstrapper.ExtractionFailed.Title", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bloxstrap tried to upgrade Roblox but can't because Roblox's files are still in use. /// @@ -207,6 +225,24 @@ namespace Bloxstrap.Resources { } } + /// + /// Looks up a localized string similar to Not all modifications will be present in the current launch.. + /// + public static string Bootstrapper_ModificationsFailed_Message { + get { + return ResourceManager.GetString("Bootstrapper.ModificationsFailed.Message", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Failed to apply all modifications. + /// + public static string Bootstrapper_ModificationsFailed_Title { + get { + return ResourceManager.GetString("Bootstrapper.ModificationsFailed.Title", resourceCulture); + } + } + /// /// Looks up a localized string similar to Bloxstrap does not have enough disk space to download and install Roblox. Please free up some disk space and try again.. /// diff --git a/Bloxstrap/Resources/Strings.resx b/Bloxstrap/Resources/Strings.resx index 4f3dadb..9048916 100644 --- a/Bloxstrap/Resources/Strings.resx +++ b/Bloxstrap/Resources/Strings.resx @@ -1270,4 +1270,16 @@ Please close any applications that may be using Roblox's files, and relaunch. Roblox no longer supports Windows 7 or 8.1. To continue playing Roblox, please upgrade to Windows 10 or newer. + + Failed to extract all files + + + Some content may be missing. Force a Roblox reinstallation in settings to fix this. + + + Failed to apply all modifications + + + Not all modifications will be present in the current launch. + \ No newline at end of file diff --git a/Bloxstrap/UI/Frontend.cs b/Bloxstrap/UI/Frontend.cs index cb069fc..d195906 100644 --- a/Bloxstrap/UI/Frontend.cs +++ b/Bloxstrap/UI/Frontend.cs @@ -83,5 +83,17 @@ namespace Bloxstrap.UI return messagebox.Result; })); } + + public static void ShowBalloonTip(string title, string message, System.Windows.Forms.ToolTipIcon icon = System.Windows.Forms.ToolTipIcon.None, int timeout = 5) + { + var notifyIcon = new System.Windows.Forms.NotifyIcon + { + Icon = Properties.Resources.IconBloxstrap, + Text = App.ProjectName, + Visible = true + }; + + notifyIcon.ShowBalloonTip(timeout, title, message, icon); + } } } From 33243bfd0a942de4ad151343f468e9d77e5fc1d3 Mon Sep 17 00:00:00 2001 From: Matt <97983689+bluepilledgreat@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:00:23 +0000 Subject: [PATCH 8/8] Improve version cleanup (#4810) * more safely delete the roblox instance * assertreadonly the whole directory --- Bloxstrap/Bootstrapper.cs | 30 +++++++++++++++++++++++++++++- Bloxstrap/Utility/Filesystem.cs | 10 ++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index bc6e36d..3bf0cff 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -662,7 +662,28 @@ namespace Bloxstrap #endregion #region Roblox Install - private void CleanupVersionsFolder() + private static bool TryDeleteRobloxInDirectory(string dir) + { + string clientPath = Path.Combine(dir, "RobloxPlayerBeta.exe"); + if (!File.Exists(dir)) + { + clientPath = Path.Combine(dir, "RobloxStudioBeta.exe"); + if (!File.Exists(dir)) + return true; // ok??? + } + + try + { + File.Delete(clientPath); + return true; + } + catch (Exception) + { + return false; + } + } + + public static void CleanupVersionsFolder() { const string LOG_IDENT = "Bootstrapper::CleanupVersionsFolder"; @@ -672,6 +693,13 @@ namespace Bloxstrap if (dirName != App.State.Prop.Player.VersionGuid && dirName != App.State.Prop.Studio.VersionGuid) { + Filesystem.AssertReadOnlyDirectory(dir); + + // check if it's still being used first + // we dont want to accidentally delete the files of a running roblox instance + if (!TryDeleteRobloxInDirectory(dir)) + continue; + try { Directory.Delete(dir, true); diff --git a/Bloxstrap/Utility/Filesystem.cs b/Bloxstrap/Utility/Filesystem.cs index 77bd284..13a9d7f 100644 --- a/Bloxstrap/Utility/Filesystem.cs +++ b/Bloxstrap/Utility/Filesystem.cs @@ -31,5 +31,15 @@ namespace Bloxstrap.Utility fileInfo.IsReadOnly = false; App.Logger.WriteLine("Filesystem::AssertReadOnly", $"The following file was set as read-only: {filePath}"); } + + internal static void AssertReadOnlyDirectory(string directoryPath) + { + var directory = new DirectoryInfo(directoryPath) { Attributes = FileAttributes.Normal }; + + foreach (var info in directory.GetFileSystemInfos("*", SearchOption.AllDirectories)) + info.Attributes = FileAttributes.Normal; + + App.Logger.WriteLine("Filesystem::AssertReadOnlyDirectory", $"The following directory was set as read-only: {directoryPath}"); + } } }