From 05ee5bc0efda6260b79557311c6b3f9a59ae87eb Mon Sep 17 00:00:00 2001 From: lx-s Date: Wed, 3 Aug 2022 10:42:32 +0200 Subject: [PATCH] Removed automatic dependency detection in InnoSetup, because of Windows Defender.. --- Dist/InnoSetup/info-before.txt | 9 +++++++++ Dist/InnoSetup/winmute-setup.iss | 21 ++++++--------------- 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 Dist/InnoSetup/info-before.txt diff --git a/Dist/InnoSetup/info-before.txt b/Dist/InnoSetup/info-before.txt new file mode 100644 index 0000000..b58329c --- /dev/null +++ b/Dist/InnoSetup/info-before.txt @@ -0,0 +1,9 @@ +Please make sure that the latest Microsoft Visual C++ runtime is installed on your system. + +To run WinMute, both x86 and x64 runtime files are needed. + +You can download it here: https://docs.microsoft.com/cpp/windows/latest-supported-vc-redist + +Direct-Links: +x86: https://aka.ms/vs/17/release/vc_redist.x86.exe +x64: https://aka.ms/vs/17/release/vc_redist.x64.exe \ No newline at end of file diff --git a/Dist/InnoSetup/winmute-setup.iss b/Dist/InnoSetup/winmute-setup.iss index b06801b..99f8ac8 100644 --- a/Dist/InnoSetup/winmute-setup.iss +++ b/Dist/InnoSetup/winmute-setup.iss @@ -1,6 +1,3 @@ -#define public Dependency_NoExampleSetup -#include "CodeDependencies.iss" - #define MyAppName "WinMute" #define MyAppVersion "2.1.1.0" #define MyAppPublisher "LX-Systems" @@ -19,10 +16,11 @@ AppUpdatesURL={#MyAppURL} DefaultDirName={autopf}\{#MyAppPublisher}\{#MyAppName} DisableProgramGroupPage=yes LicenseFile=..\bin\license.txt +InfoBeforeFile=info-before.txt PrivilegesRequiredOverridesAllowed=dialog PrivilegesRequired=lowest OutputDir=..\bin\ -OutputBaseFilename=winmute-setup +OutputBaseFilename=WinMute-Setup SetupIconFile=..\..\WinMute\icons\app.ico ArchitecturesInstallIn64BitMode=x64 Compression=lzma @@ -38,12 +36,12 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{ Name: "autostart" ; Description: "Start WinMute when you log on" ; GroupDescription: "Autostart"; Flags: unchecked [Files] -Source: "..\bin\{#MyAppExeName}"; DestDir: "{app}"; Check: Dependency_IsX64; Flags: ignoreversion +Source: "..\bin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion Source: "..\bin\changelog.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "..\bin\license.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "..\bin\liesmich.html"; DestDir: "{app}"; Flags: ignoreversion Source: "..\bin\readme.html"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\bin\ScreensaverNotify.dll"; DestDir: "{app}"; Check: Dependency_IsX64; Flags: ignoreversion +Source: "..\bin\ScreensaverNotify.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\bin\ScreensaverNotify32.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\bin\ScreensaverProxy32.exe"; DestDir: "{app}"; Flags: ignoreversion @@ -54,17 +52,10 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de [Registry] Root: HKCU; Subkey: "Software\lx-systems"; Flags: uninsdeletekeyifempty Root: HKCU; Subkey: "Software\lx-systems\WinMute"; Flags: uninsdeletekey -Root: HKCU; Subkey: "Software\lx-systems\WinMute"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}\{#MyAppExeName}" +Root: HKCU; Subkey: "Software\lx-systems\WinMute"; ValueType: string; ValueName: "InstallPath"; ValueData: "{app}" Root: HKCU; Subkey: "Software\lx-systems\WinMute\BluetoothDevices"; Flags: uninsdeletekey Root: HKCU; Subkey: "Software\lx-systems\WinMute\WifiNetworks"; Flags: uninsdeletekey -Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "LX-Systems WinMute"; ValueData: "{app}"; Tasks: autostart +Root: HKCU; Subkey: "Software\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "LX-Systems WinMute"; ValueData: "{app}\{#MyAppExeName}"; Tasks: autostart [Run] Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent - -[Code] -function InitializeSetup: Boolean; -begin - Dependency_AddVC2015To2022; - Result := True; -end; -- 2.43.0