Release 1.25

Extract processor architecture to a variable in installer scripts
Fix notification timer stopping permanently when the screen is locked while a notification is visible
2024-11-25 23:42:46 +01:00 · 2022-11-20 14:38:40 +01:00 · 2022-11-20 14:38:40 +01:00 · 2022-11-20 14:38:40 +01:00 · 2022-11-20 13:33:51 +01:00
8 changed files with 40 additions and 30 deletions
--- a/Version.cs
+++ b/Version.cs
@ -6,6 +6,6 @@

 namespace TweetDuck {
 	internal static class Version {
-		public const string Tag = "1.24";
+		public const string Tag = "1.25";
 	}
 }
--- a/bld/gen_full.iss
+++ b/bld/gen_full.iss
@ -1,18 +1,21 @@
 ; Script generated by the Inno Script Studio Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

+#define MyAppID "8C25A716-7E11-4AAD-9992-8B5D0C78AE06"
+
 #define MyAppName "TweetDuck"
 #define MyAppPublisher "chylex"
 #define MyAppURL "https://tweetduck.chylex.com"
 #define MyAppShortURL "https://td.chylex.com"
 #define MyAppExeName "TweetDuck.exe"

-#define MyAppVersion GetFileVersion("..\windows\TweetDuck\bin\x86\Release\TweetDuck.exe")
+#define MyAppArchitecture "x86"
+#define MyAppVersion GetFileVersion("..\windows\TweetDuck\bin\" + MyAppArchitecture + "\Release\TweetDuck.exe")

 #include ReadReg(HKLM, "Software\Mitrich Software\Inno Download Plugin", "InstallDir") + "\idp.iss"

 [Setup]
-AppId={{8C25A716-7E11-4AAD-9992-8B5D0C78AE06}
+AppId={{{#MyAppID}}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 AppVerName={#MyAppName} {#MyAppVersion}
@ -43,8 +46,8 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalTasks}"; Flags: unchecked

 [Files]
-Source: "..\windows\TweetDuck\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\windows\TweetDuck\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs

 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Check: TDIsUninstallable
--- a/bld/gen_port.iss
+++ b/bld/gen_port.iss
@ -1,18 +1,21 @@
 ; Script generated by the Inno Script Studio Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

+#define MyAppID "8C25A716-7E11-4AAD-9992-8B5D0C78AE06"
+
 #define MyAppName "TweetDuck"
 #define MyAppPublisher "chylex"
 #define MyAppURL "https://tweetduck.chylex.com"
 #define MyAppShortURL "https://td.chylex.com"
 #define MyAppExeName "TweetDuck.exe"

-#define MyAppVersion GetFileVersion("..\windows\TweetDuck\bin\x86\Release\TweetDuck.exe")
+#define MyAppArchitecture "x86"
+#define MyAppVersion GetFileVersion("..\windows\TweetDuck\bin\" + MyAppArchitecture + "\Release\TweetDuck.exe")

 #include ReadReg(HKLM, "Software\Mitrich Software\Inno Download Plugin", "InstallDir") + "\idp.iss"

 [Setup]
-AppId={{8C25A716-7E11-4AAD-9992-8B5D0C78AE06}
+AppId={{{#MyAppID}}
 AppName={#MyAppName} Portable
 AppVersion={#MyAppVersion}
 AppVerName={#MyAppName} {#MyAppVersion}
@ -40,8 +43,8 @@ MinVersion=0,6.1
 Name: "english"; MessagesFile: "compiler:Default.isl"

 [Files]
-Source: "..\windows\TweetDuck\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\windows\TweetDuck\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs

 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall shellexec skipifsilent
--- a/bld/gen_upd.iss
+++ b/bld/gen_upd.iss
@ -1,15 +1,17 @@
 ; Script generated by the Inno Script Studio Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

+#define MyAppID "8C25A716-7E11-4AAD-9992-8B5D0C78AE06"
+
 #define MyAppName "TweetDuck"
 #define MyAppPublisher "chylex"
 #define MyAppURL "https://tweetduck.chylex.com"
 #define MyAppShortURL "https://td.chylex.com"
 #define MyAppExeName "TweetDuck.exe"

-#define MyAppID "8C25A716-7E11-4AAD-9992-8B5D0C78AE06"
-#define MyAppVersion GetFileVersion("..\windows\TweetDuck\bin\x86\Release\TweetDuck.exe")
-#define CefVersion GetFileVersion("..\windows\TweetDuck\bin\x86\Release\libcef.dll")
+#define MyAppArchitecture "x86"
+#define MyAppVersion GetFileVersion("..\windows\TweetDuck\bin\" + MyAppArchitecture + "\Release\TweetDuck.exe")
+#define CefVersion GetFileVersion("..\windows\TweetDuck\bin\" + MyAppArchitecture + "\Release\libcef.dll")

 #include ReadReg(HKLM, "Software\Mitrich Software\Inno Download Plugin", "InstallDir") + "\idp.iss"

@ -43,13 +45,13 @@ MinVersion=0,6.1
 Name: "english"; MessagesFile: "compiler:Default.isl"

 [Files]
-Source: "..\windows\TweetDuck\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\windows\TweetDuck\bin\x86\Release\TweetDuck.*"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\windows\TweetDuck\bin\x86\Release\TweetImpl.*"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\windows\TweetDuck\bin\x86\Release\TweetLib.*"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\windows\TweetDuck\bin\x86\Release\guide\*.*"; DestDir: "{app}\guide"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "..\windows\TweetDuck\bin\x86\Release\resources\*.*"; DestDir: "{app}\resources"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "..\windows\TweetDuck\bin\x86\Release\plugins\*.*"; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\TweetDuck.*"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\TweetImpl.*"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\TweetLib.*"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\guide\*.*"; DestDir: "{app}\guide"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\resources\*.*"; DestDir: "{app}\resources"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "..\windows\TweetDuck\bin\{#MyAppArchitecture}\Release\plugins\*.*"; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs

 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Check: TDIsUninstallable
--- a/windows/TweetDuck.Browser/TweetDuck.Browser.csproj
+++ b/windows/TweetDuck.Browser/TweetDuck.Browser.csproj
@ -11,7 +11,6 @@
  
  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <UseWindowsForms>true</UseWindowsForms>
    <RootNamespace>TweetDuck.Browser</RootNamespace>
    <AssemblyName>TweetDuck.Browser</AssemblyName>
    <ApplicationIcon>..\TweetDuck\Resources\Images\icon.ico</ApplicationIcon>
@ -33,14 +32,14 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="CefSharp.WinForms.NETCore" Version="107.1.90" />
+    <PackageReference Include="CefSharp.Common.NETCore" Version="107.1.90" />
  </ItemGroup>
  
  <ItemGroup>
    <Compile Include="..\..\Version.cs" Link="Version.cs" />
  </ItemGroup>
  
-  <Target Name="CopyResources" AfterTargets="Build">
+  <Target Name="MakeBrowserProcessLargeAddressAware" AfterTargets="Build">
    <Exec Command="call &quot;$(DevEnvDir)\..\..\VC\Auxiliary\Build\vcvars32.bat&quot; &amp; editbin /largeaddressaware /TSAWARE &quot;$(TargetDir)TweetDuck.Browser.exe&quot;" ContinueOnError="false" />
  </Target>
  
--- a/windows/TweetDuck/Browser/Notification/FormNotificationTweet.cs
+++ b/windows/TweetDuck/Browser/Notification/FormNotificationTweet.cs
@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
+using TweetDuck.Controls;
 using TweetDuck.Management;
 using TweetDuck.Utils;
 using TweetLib.Browser.Interfaces;
@ -53,12 +54,12 @@ protected override bool CanDragWindow {
 			}
 		}

-		private void WindowsSessionManager_LockStateChanged(object? sender, EventArgs e) {
-			if (WindowsSessionManager.IsLocked) {
-				PauseNotification(NotificationPauseReason.WindowsSessionLocked);
+		private void WindowsSessionManager_LockStateChanged(object? sender, bool isLocked) {
+			if (isLocked) {
+				this.InvokeAsyncSafe(() => PauseNotification(NotificationPauseReason.WindowsSessionLocked));
 			}
 			else {
-				ResumeNotification(NotificationPauseReason.WindowsSessionLocked);
+				this.InvokeAsyncSafe(() => ResumeNotification(NotificationPauseReason.WindowsSessionLocked));
 			}
 		}

--- a/windows/TweetDuck/Management/WindowsSessionManager.cs
+++ b/windows/TweetDuck/Management/WindowsSessionManager.cs
@ -4,8 +4,7 @@

 namespace TweetDuck.Management {
 	static class WindowsSessionManager {
-		public static bool IsLocked { get; private set; } = false;
-		public static event EventHandler? LockStateChanged;
+		public static event EventHandler<bool>? LockStateChanged;

 		public static void Register() {
 			Win.Application.ApplicationExit += OnApplicationExit;
@ -27,8 +26,7 @@ private static void OnSessionSwitch(object? sender, SessionSwitchEventArgs e) {
 		}

 		private static void SetLocked(bool newState) {
-			IsLocked = newState;
-			LockStateChanged?.Invoke(null, EventArgs.Empty);
+			LockStateChanged?.Invoke(null, newState);
 		}
 	}
 }
--- a/windows/TweetDuck/TweetDuck.csproj
+++ b/windows/TweetDuck/TweetDuck.csproj
@ -84,6 +84,10 @@
    <PreBuildEvent>powershell -NoProfile -Command "$ErrorActionPreference = 'SilentlyContinue'; (Get-Process TweetDuck.Browser | Where-Object {$_.Path -eq '$(TargetDir)TweetDuck.Browser.exe'}).Kill(); Exit 0"</PreBuildEvent>
  </PropertyGroup>
  
+  <Target Name="MakeBrowserProcessLargeAddressAware" AfterTargets="Build">
+    <Exec Command="call &quot;$(DevEnvDir)\..\..\VC\Auxiliary\Build\vcvars32.bat&quot; &amp; editbin /largeaddressaware /TSAWARE &quot;$(TargetDir)TweetDuck.Browser.exe&quot;" ContinueOnError="false" />
+  </Target>
+  
  <Target Name="CopyResources" AfterTargets="Build">
    <ItemGroup>
      <LocalesToDelete Include="$(TargetDir)locales\*.pak" Exclude="$(TargetDir)locales\en-US.pak" Visible="false" />
Author	SHA1	Message	Date
chylex	da54af221c	Release 1.25	2022-11-20 14:38:40 +01:00
chylex	6c8d518e0d	Extract processor architecture to a variable in installer scripts	2022-11-20 14:38:40 +01:00
chylex	697f4f1569	Fix notification timer stopping permanently when the screen is locked while a notification is visible	2022-11-20 14:38:40 +01:00
chylex	15d4ec3228	Fix subprocess crashing because MSBuild is somehow copying wrong (not Large Address Aware) exe Closes #342	2022-11-20 13:33:51 +01:00