Fix logoff sound not playing

SystemEvents.SessionEnded is too late. FormClosing seems to work a lot better.

Unsubscribe SystemEvents.SessionSwitch since the documentation states that one should do so.

Give the form an icon and a title bar text so when the shutdown block reason is shown, the user sees what program it's from.

Author: shuuryou

src/soundrestore/AssemblyInfo.cs

@@ -10,5 +10,5 @@
 [assembly: AssemblyCopyright("Copyright © TAKEMURA Kiriko 2020")]
 [assembly: ComVisible(false)]
 [assembly: Guid("b3839d3a-3aec-4b0f-bad1-587d521bbf8e")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]

src/soundrestore/DummyForm.Designer.cs

@@ -71,21 +71,23 @@ public DummyForm()
 		{
 			InitializeComponent();
 
-			SystemEvents.SessionEnded += new SessionEndedEventHandler(SystemEvents_SessionEnded);
 			SystemEvents.SessionSwitch += new SessionSwitchEventHandler(SystemEvents_SessionSwitch);
 		}
 
-		private void DummyForm_Shown(object sender, EventArgs e)
+		protected override void Dispose(bool disposing)
 		{
-			Hide();
-			Play(Sound.Logon);
+			if (disposing && (components != null))
+			{
+				SystemEvents.SessionSwitch -= SystemEvents_SessionSwitch;
+				components.Dispose();
+			}
+			base.Dispose(disposing);
 		}
 
-		private void SystemEvents_SessionEnded(object sender, SessionEndedEventArgs e)
+		private void DummyForm_Shown(object sender, EventArgs e)
 		{
-			ShutdownBlockReasonCreate(this.Handle, "Playing shutdown sound");
-			Play(Sound.Logoff);
-			ShutdownBlockReasonDestroy(this.Handle);
+			Hide();
+			Play(Sound.Logon);
 		}
 
 		private void SystemEvents_SessionSwitch(object sender, SessionSwitchEventArgs e)
@@ -138,5 +140,15 @@ private void Play(Sound what)
 					"Cannot play system sound: {0}", e), EventLogEntryType.Error);
 			}
 		}
+
+		private void DummyForm_FormClosing(object sender, FormClosingEventArgs e)
+		{
+			if (e.CloseReason != CloseReason.WindowsShutDown)
+				return;
+
+			ShutdownBlockReasonCreate(this.Handle, "Playing shutdown sound");
+			Play(Sound.Logoff);
+			ShutdownBlockReasonDestroy(this.Handle);
+		}
 	}
 }