diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Images/dstar.ico b/pc/CODEC2 GUI/CODEC2 GUI/Images/dstar.ico index 822a59e..2983c40 100644 Binary files a/pc/CODEC2 GUI/CODEC2 GUI/Images/dstar.ico and b/pc/CODEC2 GUI/CODEC2 GUI/Images/dstar.ico differ diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs b/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs index 5b2c9b1..2e26e65 100644 --- a/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs +++ b/pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.0.4")] -[assembly: AssemblyFileVersion("1.4.0.4")] +[assembly: AssemblyVersion("1.4.0.5")] +[assembly: AssemblyFileVersion("1.4.0.5")] diff --git a/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss b/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss index ee79d94..bec2819 100644 --- a/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss +++ b/pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss @@ -4,9 +4,9 @@ ; Author: Mark Hanson, AA3RK ; -#define MyAppName "FlexRadio DSTAR Waveform" -#define MyAppVersion "0.0.4" -#define MyAppVersionWithV "v0.0.4" +#define MyAppName "SmartSDR DSTAR Waveform" +#define MyAppVersion "1.5.0.5" +#define MyAppVersionWithV "v1.5.0.5" #define MyAppPublisher "FlexRadio Systems" #define MyAppURL "http://www.flexradio.com/" #define MyAppExeName "ThumbDV_DSTAR_GUI.exe" @@ -23,9 +23,9 @@ AppSupportURL={#MyAppURL} AppUpdatesURL={#MyAppURL} DefaultDirName={pf}\{#MyAppPublisher}\{#MyAppName} {#MyAppVersionWithV} DisableDirPage=yes -DefaultGroupName=FlexRadio DSTAR Waveform +DefaultGroupName=DSTAR Waveform DisableProgramGroupPage=yes -OutputBaseFilename=FlexRadioDSTARWaveform_Installer +OutputBaseFilename=DSTAR_Waveform_Installer SetupIconFile=..\CODEC2 GUI\Images\dstar.ico Compression=lzma SolidCompression=yes @@ -54,3 +54,75 @@ Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: [Run] Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent +[Code] + +const +// constants for Firewall access exception + NET_FW_ACTION_ALLOW = 1; + NET_FW_IP_PROTOCOL_TCP = 6; + NET_FW_IP_PROTOCOL_UDP = 17; + + NET_FW_SCOPE_ALL = 0; + NET_FW_IP_VERSION_ANY = 2; + NET_FW_PROFILE_DOMAIN = 0; + NET_FW_PROFILE_STANDARD = 1; + + +//=========================================================================== +procedure SetFirewallExceptionVista(AppName,FileName:string); +//=========================================================================== +//create SmartSDR wirewall in-bound exception for Vista and greater + +var + FirewallRule: Variant; + FirewallPolicy: Variant; + +begin + try + FirewallRule := CreateOleObject('HNetCfg.FWRule'); + FirewallRule.Name := AppName; + FirewallRule.Description := 'UDP In-bound Firewall rule for SmartSDR DSTAR Waveform'; + FirewallRule.ApplicationName := FileName; + FirewallRule.Protocol := NET_FW_IP_PROTOCOL_UDP; + FirewallRule.EdgeTraversal := True; + FirewallRule.Action := NET_FW_ACTION_ALLOW; + FirewallRule.Enabled := True; + // FirewallRule.InterfaceTypes := 'All'; + FirewallPolicy := CreateOleObject('HNetCfg.FwPolicy2'); + FirewallPolicy.Rules.Add(FirewallRule); + except + end; + + try + FirewallRule := CreateOleObject('HNetCfg.FWRule'); + FirewallRule.Name := AppName; + FirewallRule.Description := 'TCP In-bound Firewall rule for SmartSDR DSTAR Waveform'; + FirewallRule.ApplicationName := FileName; + FirewallRule.Protocol := NET_FW_IP_PROTOCOL_TCP; + FirewallRule.EdgeTraversal := True; + FirewallRule.Action := NET_FW_ACTION_ALLOW; + FirewallRule.Enabled := True; + // FirewallRule.InterfaceTypes := 'All'; + FirewallPolicy := CreateOleObject('HNetCfg.FwPolicy2'); + FirewallPolicy.Rules.Add(FirewallRule); + except + end; +end; + + +//=========================================================================== +procedure CurStepChanged(CurStep: TSetupStep); +//=========================================================================== +// runs after setup completes DSTAR Waveform + +begin + if (CurStep=ssInstall) then + begin + + // Add Vista and greater Firewall rules + SetFirewallExceptionVista('{#SetupSetting("AppVerName")}', ExpandConstant('{app}')+'\{#MyAppExeName}'); + + end; +end; + +