Skip to content

Correct warnings in vcredist code #392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Shivansps merged 1 commit into from
Apr 26, 2026
Merged

Correct warnings in vcredist code #392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions Knossos.NET/ViewModels/Templates/Tasks/InstallBuild.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ private async Task<bool> InstallVCRedist(bool is86 = false) {
else { fileUrl = "https://aka.ms/vc14/vc_redist.x64.exe"; }
var result = await fileTask.DownloadFile(fileUrl, path, "Downloading VCRedist", false, null, cancellationTokenSource); // Start and await to finish
//Always check for cancel before executing the file
if (cancellationTokenSource.IsCancellationRequested)
if (cancellationTokenSource != null && cancellationTokenSource.IsCancellationRequested)
{
throw new TaskCanceledException();
}
Expand All @@ -55,7 +55,7 @@ private async Task<bool> InstallVCRedist(bool is86 = false) {
Arguments = "/install /quiet /norestart",
Verb = "runas",
UseShellExecute = true
}).WaitForExit();
})?.WaitForExit();
break; // Success!
}
catch (System.ComponentModel.Win32Exception ex) when (ex.NativeErrorCode == 32) // Error code for "File in use"
Expand All @@ -74,6 +74,7 @@ private async Task<bool> InstallVCRedist(bool is86 = false) {
throw new Exception("Error while downloading file: " + fileUrl);
}
}

public async Task<FsoBuild?> InstallBuild(FsoBuild build, FsoBuildItemViewModel sender, CancellationTokenSource? cancelSource = null, Mod? modJson = null, List<ModPackage>? modifyPkgs = null, bool cleanupOldVersions = false)
{
string? modPath = null;
Expand Down Expand Up @@ -498,28 +499,28 @@ private async Task<bool> InstallVCRedist(bool is86 = false) {
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
bool installx86 = false;
bool install64 = false;
//Determine the cpu arch for vcredist that we need to download, if we need to download, from the FSO build arch NOT the host cpu arch.
foreach (var ex in newBuild.executables)
{
if (ex.arch == FsoExecArch.x86 || ex.arch == FsoExecArch.x86_avx || ex.arch == FsoExecArch.x86_avx2)
bool install64 = false;
//Determine the cpu arch for vcredist that we need to download, if we need to download, from the FSO build arch NOT the host cpu arch.
foreach (var ex in newBuild.executables)
{
installx86 = true;
}
if (ex.arch == FsoExecArch.arm64 || ex.arch == FsoExecArch.x64 || ex.arch == FsoExecArch.x64_avx || ex.arch == FsoExecArch.x64_avx2)
{
install64 = true;
if (ex.arch == FsoExecArch.x86 || ex.arch == FsoExecArch.x86_avx || ex.arch == FsoExecArch.x86_avx2)
{
installx86 = true;
}
if (ex.arch == FsoExecArch.arm64 || ex.arch == FsoExecArch.x64 || ex.arch == FsoExecArch.x64_avx || ex.arch == FsoExecArch.x64_avx2)
{
install64 = true;
}
}
}
if (installx86)
{
string keyPath = @"SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86";
using (RegistryKey key = Registry.LocalMachine.OpenSubKey(keyPath))
using (RegistryKey? key = Registry.LocalMachine.OpenSubKey(keyPath))
{
if (key != null)
{
// 'Bld' is a DWORD representing the build version
object bldValue = key.GetValue("Bld");
object? bldValue = key.GetValue("Bld");
if (bldValue != null && int.TryParse(bldValue.ToString(), out int bld))
{
// Example: 2022 runtimes typically have build numbers > 30000
Expand All @@ -531,12 +532,12 @@ private async Task<bool> InstallVCRedist(bool is86 = false) {
if (install64)
{
string keyPath = @"SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64";
using (RegistryKey key = Registry.LocalMachine.OpenSubKey(keyPath))
using (RegistryKey? key = Registry.LocalMachine.OpenSubKey(keyPath))
{
if (key != null)
{
// 'Bld' is a DWORD representing the build version
object bldValue = key.GetValue("Bld");
object? bldValue = key.GetValue("Bld");
if (bldValue != null && int.TryParse(bldValue.ToString(), out int bld))
{
// Example: 2022 runtimes typically have build numbers > 30000
Expand Down