Merge pull request #5410 from RoosterDragon/IDisposable

Disposable fixup

OpenRA.Game/Download.cs

@@ -70,6 +70,7 @@ namespace OpenRA
 		{
 			Game.OnQuit -= Cancel;
 			wc.CancelAsync();
+			wc.Dispose();
 			cancelled = true;
 		}
 	}

OpenRA.Game/FileSystem/MixFile.cs

@@ -17,7 +17,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.FileSystem
 {
-	public class MixFile : IFolder
+	public sealed class MixFile : IFolder, IDisposable
 	{
 		readonly Dictionary<uint, PackageEntry> index;
 		readonly long dataStart;
@@ -258,5 +258,11 @@ namespace OpenRA.FileSystem
 					s.Write(file.Value);
 			}
 		}
+
+		public void Dispose()
+		{
+			if (s != null)
+				s.Dispose();
+		}
 	}
 }

OpenRA.Game/FileSystem/ZipFile.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -16,7 +17,7 @@ using SZipFile = ICSharpCode.SharpZipLib.Zip.ZipFile;
 
 namespace OpenRA.FileSystem
 {
-	public class ZipFile : IFolder
+	public sealed class ZipFile : IFolder, IDisposable
 	{
 		string filename;
 		SZipFile pkg;
@@ -105,6 +106,12 @@ namespace OpenRA.FileSystem
 			pkg.Close();
 			pkg = new SZipFile(new MemoryStream(File.ReadAllBytes(filename)));
 		}
+
+		public void Dispose()
+		{
+			if (pkg != null)
+				pkg.Close();
+		}
 	}
 
 	class StaticMemoryDataSource : IStaticDataSource

OpenRA.Game/Game.cs

@@ -504,6 +504,8 @@ namespace OpenRA
 			// Ensure that the active replay is properly saved
 			if (orderManager != null)
 				orderManager.Dispose();
+				
+			Renderer.Device.Dispose();
 
 			OnQuit();
 		}

OpenRA.Game/GameRules/MusicInfo.cs

@@ -31,7 +31,8 @@ namespace OpenRA.GameRules
 				return;
 
 			Exists = true;
-			Length = (int)AudLoader.SoundLength(GlobalFileSystem.Open(Filename));
+			using (var s = GlobalFileSystem.Open(Filename))
+				Length = (int)AudLoader.SoundLength(s);
 		}
 
 		public void Reload()
@@ -40,7 +41,8 @@ namespace OpenRA.GameRules
 				return;
 
 			Exists = true;
-			Length = (int)AudLoader.SoundLength(GlobalFileSystem.Open(Filename));
+			using (var s = GlobalFileSystem.Open(Filename))
+				Length = (int)AudLoader.SoundLength(s);
 		}
 	}
 }

OpenRA.Game/Graphics/Sheet.cs

@@ -40,31 +40,34 @@ namespace OpenRA.Graphics
 
 		public Sheet(string filename)
 		{
-			var bitmap = (Bitmap)Image.FromStream(GlobalFileSystem.Open(filename));
+			using (var stream = GlobalFileSystem.Open(filename))
-			Size = bitmap.Size;
+			using (var bitmap = (Bitmap)Image.FromStream(stream))
-
-			data = new byte[4*Size.Width*Size.Height];
-			var b = bitmap.LockBits(bitmap.Bounds(),
-				ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
-
-			unsafe
 			{
-				int* c = (int*)b.Scan0;
+				Size = bitmap.Size;
 
-				for (var x = 0; x < Size.Width; x++)
+				data = new byte[4 * Size.Width * Size.Height];
-					for (var y = 0; y < Size.Height; y++)
+				var b = bitmap.LockBits(bitmap.Bounds(),
+					ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
+
+				unsafe
 				{
-					var i = 4*Size.Width*y + 4*x;
+					int* c = (int*)b.Scan0;
 
-					// Convert argb to bgra
+					for (var x = 0; x < Size.Width; x++)
-					var argb = *(c + (y * b.Stride >> 2) + x);
+						for (var y = 0; y < Size.Height; y++)
-					data[i++] = (byte)(argb >> 0);
+						{
-					data[i++] = (byte)(argb >> 8);
+							var i = 4 * Size.Width * y + 4 * x;
-					data[i++] = (byte)(argb >> 16);
+
-					data[i++] = (byte)(argb >> 24);
+							// Convert argb to bgra
+							var argb = *(c + (y * b.Stride >> 2) + x);
+							data[i++] = (byte)(argb >> 0);
+							data[i++] = (byte)(argb >> 8);
+							data[i++] = (byte)(argb >> 16);
+							data[i++] = (byte)(argb >> 24);
+						}
 				}
+				bitmap.UnlockBits(b);
 			}
-			bitmap.UnlockBits(b);
 		}
 
 		public ITexture Texture

OpenRA.Game/Graphics/SpriteFont.cs

@@ -108,27 +108,29 @@ namespace OpenRA.Graphics
 				Offset = { X = face.Glyph.BitmapLeft, Y = -face.Glyph.BitmapTop }
 			};
 
-			unsafe
+			// A new bitmap is generated each time this property is accessed, so we do need to dispose it.
-			{
+			using (var bitmap = face.Glyph.Bitmap)
-				var p = (byte*)face.Glyph.Bitmap.Buffer;
+				unsafe
-				var dest = s.sheet.Data;
-				var destStride = s.sheet.Size.Width * 4;
-
-				for (var j = 0; j < s.size.Y; j++)
 				{
-					for (var i = 0; i < s.size.X; i++)
+					var p = (byte*)bitmap.Buffer;
-						if (p[i] != 0)
+					var dest = s.sheet.Data;
-						{
+					var destStride = s.sheet.Size.Width * 4;
-							var q = destStride * (j + s.bounds.Top) + 4 * (i + s.bounds.Left);
-							dest[q] = c.Second.B;
-							dest[q + 1] = c.Second.G;
-							dest[q + 2] = c.Second.R;
-							dest[q + 3] = p[i];
-						}
 
-					p += face.Glyph.Bitmap.Pitch;
+					for (var j = 0; j < s.size.Y; j++)
+					{
+						for (var i = 0; i < s.size.X; i++)
+							if (p[i] != 0)
+							{
+								var q = destStride * (j + s.bounds.Top) + 4 * (i + s.bounds.Left);
+								dest[q] = c.Second.B;
+								dest[q + 1] = c.Second.G;
+								dest[q + 2] = c.Second.R;
+								dest[q + 3] = p[i];
+							}
+
+						p += bitmap.Pitch;
+					}
 				}
-			}
 			s.sheet.CommitData();
 
 			return g;

OpenRA.Game/Graphics/SpriteLoader.cs

@@ -33,10 +33,10 @@ namespace OpenRA.Graphics
 
 		Sprite[] CacheSpriteFrames(string filename)
 		{
-			var stream = GlobalFileSystem.OpenWithExts(filename, exts);
+			using (var stream = GlobalFileSystem.OpenWithExts(filename, exts))
-			return SpriteSource.LoadSpriteSource(stream, filename).Frames
+				return SpriteSource.LoadSpriteSource(stream, filename).Frames
-				.Select(a => SheetBuilder.Add(a))
+					.Select(a => SheetBuilder.Add(a))
-				.ToArray();
+					.ToArray();
 		}
 
 		public Sprite[] LoadAllSprites(string filename) { return sprites[filename]; }

OpenRA.Game/Graphics/VoxelLoader.cs

@@ -210,8 +210,12 @@ namespace OpenRA.Graphics
 
 		Voxel LoadFile(Pair<string,string> files)
 		{
-			var vxl = new VxlReader(GlobalFileSystem.OpenWithExts(files.First, ".vxl"));
+			VxlReader vxl;
-			var hva = new HvaReader(GlobalFileSystem.OpenWithExts(files.Second, ".hva"));
+			HvaReader hva;
+			using (var s = GlobalFileSystem.OpenWithExts(files.First, ".vxl"))
+				vxl = new VxlReader(s);
+			using (var s = GlobalFileSystem.OpenWithExts(files.Second, ".hva"))
+				hva = new HvaReader(s);
 			return new Voxel(this, vxl, hva);
 		}
 

OpenRA.Game/IGraphicsDevice.cs

@@ -34,7 +34,7 @@ namespace OpenRA
 
 	public enum BlendMode { None, Alpha, Additive, Subtractive, Multiply }
 
-	public interface IGraphicsDevice
+	public interface IGraphicsDevice : IDisposable
 	{
 		IVertexBuffer<Vertex> CreateVertexBuffer(int length);
 		ITexture CreateTexture(Bitmap bitmap);
@@ -58,8 +58,6 @@ namespace OpenRA
 		void DisableDepthBuffer();
 
 		void SetBlendMode(BlendMode mode);
-
-		void Quit();
 	}
 
 	public interface IVertexBuffer<T>

OpenRA.Game/InstallUtils.cs

@@ -93,8 +93,9 @@ namespace OpenRA
 			List<string> extracted = new List<string>();
 			try
 			{
-				var z = new ZipInputStream(File.OpenRead(zipFile));
+				using (var stream = File.OpenRead(zipFile))
-				z.ExtractZip(dest, extracted, s => onProgress("Extracting " + s));
+				using (var z = new ZipInputStream(stream))
+					z.ExtractZip(dest, extracted, s => onProgress("Extracting " + s));
 			}
 			catch (SharpZipBaseException)
 			{

OpenRA.Game/MiniYaml.cs

@@ -172,13 +172,11 @@ namespace OpenRA
 
 		public static List<MiniYamlNode> FromFileInPackage(string path)
 		{
-			StreamReader reader = new StreamReader(GlobalFileSystem.Open(path));
 			List<string> lines = new List<string>();
-
+			using (var stream = GlobalFileSystem.Open(path))
-			while (!reader.EndOfStream)
+			using (var reader = new StreamReader(stream))
-				lines.Add(reader.ReadLine());
+				while (!reader.EndOfStream)
-			reader.Close();
+					lines.Add(reader.ReadLine());
-
 			return FromLines(lines.ToArray(), path);
 		}
 

OpenRA.Game/Network/Connection.cs

@@ -86,7 +86,7 @@ namespace OpenRA.Network
 			if (packet.Length == 0)
 				throw new NotImplementedException();
 			lock (this)
-				receivedPackets.Add(new ReceivedPacket { FromClient = LocalClientId, Data = packet } );
+				receivedPackets.Add(new ReceivedPacket { FromClient = LocalClientId, Data = packet });
 		}
 
 		public virtual void Receive(Action<int, byte[]> packetFn)
@@ -102,10 +102,16 @@ namespace OpenRA.Network
 				packetFn(p.FromClient, p.Data);
 		}
 
-		public virtual void Dispose() { }
+		protected virtual void Dispose(bool disposing) { }
+
+		public void Dispose()
+		{
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
 	}
 
-	class NetworkConnection : EchoConnection
+	sealed class NetworkConnection : EchoConnection
 	{
 		TcpClient socket;
 		int clientId;
@@ -193,22 +199,27 @@ namespace OpenRA.Network
 
 		bool disposed = false;
 
-		public override void Dispose()
+		protected override void Dispose(bool disposing)
 		{
-			if (disposed) return;
+			if (disposed)
+				return;
 			disposed = true;
-			GC.SuppressFinalize(this);
 
 			t.Abort();
-			if (socket != null)
+			if (disposing)
-				socket.Client.Close();
+				if (socket != null)
+					socket.Client.Close();
 			using (new PerfSample("Thread.Join"))
 			{
 				if (!t.Join(1000))
 					return;
 			}
+			base.Dispose(disposing);
 		}
 
-		~NetworkConnection() { Dispose(); }
+		~NetworkConnection()
+		{
+			Dispose(false);
+		}
 	}
 }

OpenRA.Game/Network/OrderManager.cs

@@ -15,7 +15,7 @@ using OpenRA.Primitives;
 
 namespace OpenRA.Network
 {
-	public class OrderManager : IDisposable
+	public sealed class OrderManager : IDisposable
 	{
 		readonly SyncReport syncReport;
 		readonly FrameData frameData = new FrameData();
@@ -197,22 +197,10 @@ namespace OpenRA.Network
 			++NetFrameNumber;
 		}
 
-		bool disposed;
-		protected void Dispose(bool disposing)
-		{
-			if (disposed)
-				return;
-
-			if (disposing)
-				Connection.Dispose();
-
-			disposed = true;
-		}
-
 		public void Dispose()
 		{
-			Dispose(true);
+			if (Connection != null)
-			GC.SuppressFinalize(this);
+				Connection.Dispose();
 		}
 	}
 }

OpenRA.Game/Network/ReplayConnection.cs

@@ -16,7 +16,7 @@ using OpenRA.Primitives;
 
 namespace OpenRA.Network
 {
-	public class ReplayConnection : IConnection
+	public sealed class ReplayConnection : IConnection
 	{
 		class Chunk
 		{

OpenRA.Game/Network/ReplayRecorderConnection.cs

@@ -17,7 +17,7 @@ using OpenRA.Widgets;
 
 namespace OpenRA.Network
 {
-	class ReplayRecorderConnection : IConnection, IDisposable
+	sealed class ReplayRecorderConnection : IConnection
 	{
 		public ReplayMetadata Metadata;
 
@@ -98,30 +98,24 @@ namespace OpenRA.Network
 		}
 
 		bool disposed;
-		protected void Dispose(bool disposing)
-		{
-			if (disposed)
-				return;
-
-			if (disposing)
-			{
-				if (Metadata != null)
-				{
-					if (Metadata.GameInfo != null)
-						Metadata.GameInfo.EndTimeUtc = DateTime.UtcNow;
-					Metadata.Write(writer);
-				}
-				writer.Close();
-				inner.Dispose();
-			}
-
-			disposed = true;
-		}
 
 		public void Dispose()
 		{
-			Dispose(true);
+			if (disposed)
-			GC.SuppressFinalize(this);
+				return;
+			disposed = true;
+
+			if (Metadata != null)
+			{
+				if (Metadata.GameInfo != null)
+					Metadata.GameInfo.EndTimeUtc = DateTime.UtcNow;
+				Metadata.Write(writer);
+			}
+
+			if (preStartBuffer != null)
+				preStartBuffer.Dispose();
+			writer.Close();
+			inner.Dispose();
 		}
 	}
 }

OpenRA.Game/Primitives/DisposableAction.cs

@@ -12,7 +12,7 @@ using System;
 
 namespace OpenRA.Primitives
 {
-	public class DisposableAction : IDisposable
+	public sealed class DisposableAction : IDisposable
 	{
 		public DisposableAction(Action onDispose, Action onFinalize)
 		{
@@ -26,7 +26,8 @@ namespace OpenRA.Primitives
 
 		public void Dispose()
 		{
-			if (disposed) return;
+			if (disposed)
+				return;
 			disposed = true;
 			onDispose();
 			GC.SuppressFinalize(this);

OpenRA.Game/Scripting/ScriptContext.cs

@@ -81,12 +81,11 @@ namespace OpenRA.Scripting
 		public ScriptGlobalAttribute(string name) { Name = name; }
 	}
 
-	public class ScriptContext : IDisposable
+	public sealed class ScriptContext : IDisposable
 	{
 		public World World { get; private set; }
 		public WorldRenderer WorldRenderer { get; private set; }
 
-		bool disposed;
 		readonly MemoryConstrainedLuaRuntime runtime;
 		readonly LuaFunction tick;
 
@@ -100,6 +99,8 @@ namespace OpenRA.Scripting
 		public readonly Cache<ActorInfo, Type[]> ActorCommands;
 		public readonly Type[] PlayerCommands;
 
+		bool disposed;
+
 		public ScriptContext(World world, WorldRenderer worldRenderer,
 			IEnumerable<string> scripts)
 		{
@@ -196,27 +197,13 @@ namespace OpenRA.Scripting
 				tick.Call().Dispose();
 		}
 
-		protected void Dispose(bool disposing)
+		public void Dispose()
 		{
 			if (disposed)
 				return;
-
-			if (disposing)
-				runtime.Dispose();
-
 			disposed = true;
-		}
+			if (runtime != null)
-
+				runtime.Dispose();
-		public void Dispose()
-		{
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		~ScriptContext()
-		{
-			// Dispose unmanaged resources only
-			Dispose(false);
 		}
 
 		static Type[] ExtractRequiredTypes(Type t)

OpenRA.Game/Sound.cs

@@ -39,9 +39,11 @@ namespace OpenRA
 			}
 
 			if (filename.ToLowerInvariant().EndsWith("wav"))
-				return LoadWave(new WavLoader(GlobalFileSystem.Open(filename)));
+				using (var s = GlobalFileSystem.Open(filename))
+					return LoadWave(new WavLoader(s));
 
-			return LoadSoundRaw(AudLoader.LoadSound(GlobalFileSystem.Open(filename)));
+			using (var s = GlobalFileSystem.Open(filename))
+				return LoadSoundRaw(AudLoader.LoadSound(s));
 		}
 
 		static ISoundSource LoadWave(WavLoader wave)

OpenRA.Game/Support/PerfHistory.cs

@@ -105,7 +105,7 @@ namespace OpenRA.Support
 		}
 	}
 
-	public class PerfSample : IDisposable
+	public sealed class PerfSample : IDisposable
 	{
 		readonly Stopwatch sw = Stopwatch.StartNew();
 		readonly string Item;

OpenRA.Game/Support/PerfTimer.cs

@@ -16,7 +16,7 @@ using System.Threading;
 
 namespace OpenRA.Support
 {
-	public class PerfTimer : IDisposable
+	public sealed class PerfTimer : IDisposable
 	{
 		readonly string name;
 		readonly float thresholdMs;

OpenRA.Game/Support/Program.cs

@@ -57,7 +57,7 @@ namespace OpenRA
 
 			if (Game.Settings.Debug.ShowFatalErrorDialog && !Game.Settings.Server.Dedicated)
 			{
-				Game.Renderer.Device.Quit();
+				Game.Renderer.Device.Dispose();
 				Platform.ShowFatalErrorDialog();
 			}
 		}

OpenRA.Irc/IrcClient.cs

@@ -17,7 +17,7 @@ using OpenRA.Primitives;
 
 namespace OpenRA.Irc
 {
-	public class IrcClient : IDisposable
+	public sealed class IrcClient : IDisposable
 	{
 		public static readonly IrcClient Instance = new IrcClient();
 
@@ -252,14 +252,15 @@ namespace OpenRA.Irc
 
 			ConnectionState = IrcConnectionState.Disconnecting;
 			OnDisconnecting();
-			connection.Close();
+			if (connection != null)
+				connection.Close();
 			ConnectionState = IrcConnectionState.Disconnected;
 			OnDisconnect();
 			LocalUser = null;
 			connection = null;
 		}
 
-		void IDisposable.Dispose()
+		public void Dispose()
 		{
 			Disconnect();
 		}

OpenRA.Irc/IrcConnection.cs

@@ -14,7 +14,7 @@ using System.Net.Sockets;
 
 namespace OpenRA.Irc
 {
-	public class IrcConnection : IDisposable
+	public sealed class IrcConnection : IDisposable
 	{
 		TcpClient socket;
 		Stream stream;
@@ -49,14 +49,8 @@ namespace OpenRA.Irc
 
 		public void Close()
 		{
-			CloseImpl();
+			if (disposed)
-			GC.SuppressFinalize(this);
+				return;
-		}
-
-		void CloseImpl()
-		{
-			if (disposed) return;
-
 			disposed = true;
 			if (socket != null) socket.Close();
 			if (stream != null) stream.Close();
@@ -64,16 +58,11 @@ namespace OpenRA.Irc
 			if (reader != null) reader.Close();
 		}
 
-		void IDisposable.Dispose()
+		public void Dispose()
 		{
 			Close();
 		}
 
-		~IrcConnection()
-		{
-			CloseImpl();
-		}
-
 		void CheckDisposed()
 		{
 			if (disposed)

OpenRA.Mods.RA/Move/PathSearch.cs

@@ -15,7 +15,7 @@ using OpenRA.Primitives;
 
 namespace OpenRA.Mods.RA.Move
 {
-	public class PathSearch : IDisposable
+	public sealed class PathSearch : IDisposable
 	{
 		World world;
 		public CellInfo[,] cellInfo;
@@ -291,11 +291,12 @@ namespace OpenRA.Mods.RA.Move
 		{
 			if (disposed)
 				return;
-
 			disposed = true;
-			GC.SuppressFinalize(this);
+
 			PutBackIntoPool(cellInfo);
 			cellInfo = null;
+
+			GC.SuppressFinalize(this);
 		}
 
 		~PathSearch() { Dispose(); }

OpenRA.Mods.RA/Scripting/CallLuaFunc.cs

@@ -15,7 +15,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities
 {
-	public class CallLuaFunc : Activity, IDisposable
+	public sealed class CallLuaFunc : Activity, IDisposable
 	{
 		LuaFunction function;
 
@@ -39,28 +39,11 @@ namespace OpenRA.Mods.RA.Activities
 			base.Cancel(self);
 		}
 
-		protected void Dispose(bool disposing)
-		{
-			if (function == null)
-				return;
-
-			if (disposing)
-			{
-				function.Dispose();
-				function = null;
-			}
-		}
-
 		public void Dispose()
 		{
-			Dispose(true);
+			if (function == null) return;
-			GC.SuppressFinalize(this);
+			function.Dispose();
-		}
+			function = null;
-
-		~CallLuaFunc()
-		{
-			// Dispose unmanaged resources only
-			Dispose(false);
 		}
 	}
 }

OpenRA.Mods.RA/Scripting/LuaScript.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using OpenRA.Graphics;
 using OpenRA.Scripting;
 using OpenRA.Traits;
@@ -21,7 +22,7 @@ namespace OpenRA.Mods.RA.Scripting
 		public object Create(ActorInitializer init) { return new LuaScript(this); }
 	}
 
-	public class LuaScript : ITick, IWorldLoaded
+	public sealed class LuaScript : ITick, IWorldLoaded, IDisposable
 	{
 		readonly LuaScriptInfo info;
 		ScriptContext context;
@@ -42,5 +43,11 @@ namespace OpenRA.Mods.RA.Scripting
 		{
 			context.Tick(self);
 		}
+
+		public void Dispose()
+		{
+			if (context != null)
+				context.Dispose();
+		}
 	}
 }

OpenRA.Mods.RA/Scripting/LuaScriptContext.cs

@@ -18,7 +18,7 @@ using OpenRA.Primitives;
 
 namespace OpenRA.Mods.RA.Scripting
 {
-	public class LuaScriptContext : IDisposable
+	public sealed class LuaScriptContext : IDisposable
 	{
 		public Lua Lua { get; private set; }
 		readonly Cache<string, LuaFunction> functionCache;
@@ -133,19 +133,9 @@ namespace OpenRA.Mods.RA.Scripting
 		}
 
 		public void Dispose()
-		{
-			if (Lua == null)
-				return;
-
-			GC.SuppressFinalize(this);
-			Lua.Dispose();
-			Lua = null;
-		}
-
-		~LuaScriptContext()
 		{
 			if (Lua != null)
-				Game.RunAfterTick(Dispose);
+				Lua.Dispose();
 		}
 	}
 }

OpenRA.Mods.RA/Scripting/LuaScriptInterface.cs

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.RA.Scripting
 		public object Create(ActorInitializer init) { return new LuaScriptInterface(this); }
 	}
 
-	public class LuaScriptInterface : IWorldLoaded, ITick
+	public sealed class LuaScriptInterface : IWorldLoaded, ITick, IDisposable
 	{
 		World world;
 		SpawnMapActors sma;
@@ -90,6 +90,11 @@ namespace OpenRA.Mods.RA.Scripting
 				context.InvokeLuaFunction("Tick");
 		}
 
+		public void Dispose()
+		{
+			context.Dispose();
+		}
+
 		[LuaGlobal]
 		public object New(string typeName, LuaTable args)
 		{

OpenRA.Mods.RA/Scripting/ScriptTriggers.cs

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA.Scripting
 	[Desc("Allows map scripts to attach triggers to this actor via the Triggers global.")]
 	public class ScriptTriggersInfo : TraitInfo<ScriptTriggers> { }
 
-	public class ScriptTriggers : INotifyIdle, INotifyDamage, INotifyKilled, INotifyProduction, IDisposable
+	public sealed class ScriptTriggers : INotifyIdle, INotifyDamage, INotifyKilled, INotifyProduction, IDisposable
 	{
 		public event Action<Actor> OnKilledInternal = _ => {};
 
@@ -100,37 +100,11 @@ namespace OpenRA.Mods.RA.Scripting
 			}
 		}
 
-		bool disposed;
-
-		protected void Dispose(bool disposing)
-		{
-			if (disposed)
-				return;
-
-			if (disposing)
-			{
-				var toDispose = new [] { onIdle, onDamaged, onKilled, onProduction };
-
-				foreach (var f in toDispose.SelectMany(f => f))
-					f.First.Dispose();
-
-				foreach (var l in toDispose)
-					l.Clear();
-			}
-
-			disposed = true;
-		}
-
 		public void Dispose()
 		{
-			Dispose(true);
+			var pairs = new[] { onIdle, onDamaged, onKilled, onProduction };
-			GC.SuppressFinalize(this);
+			pairs.SelectMany(l => l).Select(p => p.First).Do(f => f.Dispose());
-		}
+			pairs.Do(l => l.Clear());
-
-		~ScriptTriggers()
-		{
-			// Dispose unmanaged resources only
-			Dispose(false);
 		}
 	}
 }

OpenRA.Mods.RA/Widgets/HueSliderWidget.cs

@@ -18,7 +18,6 @@ namespace OpenRA.Mods.RA.Widgets
 {
 	public class HueSliderWidget : SliderWidget
 	{
-		Bitmap hueBitmap;
 		Sprite hueSprite;
 
 		public HueSliderWidget() {}
@@ -28,20 +27,22 @@ namespace OpenRA.Mods.RA.Widgets
 		{
 			base.Initialize(args);
 
-			hueBitmap = new Bitmap(256, 256);
+			using (var hueBitmap = new Bitmap(256, 256))
-			hueSprite = new Sprite(new Sheet(new Size(256, 256)), new Rectangle(0, 0, 256, 1), TextureChannel.Alpha);
-
-			var bitmapData = hueBitmap.LockBits(hueBitmap.Bounds(),
-				ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
-			unsafe
 			{
-				int* c = (int*)bitmapData.Scan0;
+				hueSprite = new Sprite(new Sheet(new Size(256, 256)), new Rectangle(0, 0, 256, 1), TextureChannel.Alpha);
-				for (var h = 0; h < 256; h++)
-					*(c + h) = HSLColor.FromHSV(h/255f, 1, 1).RGB.ToArgb();
-			}
-			hueBitmap.UnlockBits(bitmapData);
 
-			hueSprite.sheet.Texture.SetData(hueBitmap);
+				var bitmapData = hueBitmap.LockBits(hueBitmap.Bounds(),
+					ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+				unsafe
+				{
+					int* c = (int*)bitmapData.Scan0;
+					for (var h = 0; h < 256; h++)
+						*(c + h) = HSLColor.FromHSV(h / 255f, 1, 1).RGB.ToArgb();
+				}
+				hueBitmap.UnlockBits(bitmapData);
+
+				hueSprite.sheet.Texture.SetData(hueBitmap);
+			}
 		}
 
 		public override void Draw()

OpenRA.Mods.RA/Widgets/RadarWidget.cs

@@ -68,16 +68,18 @@ namespace OpenRA.Mods.RA.Widgets
 			mapRect = new Rectangle(previewOrigin.X, previewOrigin.Y, (int)(previewScale * width), (int)(previewScale * height));
 
 			// Only needs to be done once
-			var terrainBitmap = Minimap.TerrainBitmap(world.Map.Rules.TileSets[world.Map.Tileset], world.Map);
+			using (var terrainBitmap = Minimap.TerrainBitmap(world.Map.Rules.TileSets[world.Map.Tileset], world.Map))
-			var r = new Rectangle(0, 0, width, height);
+			{
-			var s = new Size(terrainBitmap.Width, terrainBitmap.Height);
+				var r = new Rectangle(0, 0, width, height);
-			terrainSprite = new Sprite(new Sheet(s), r, TextureChannel.Alpha);
+				var s = new Size(terrainBitmap.Width, terrainBitmap.Height);
-			terrainSprite.sheet.Texture.SetData(terrainBitmap);
+				terrainSprite = new Sprite(new Sheet(s), r, TextureChannel.Alpha);
+				terrainSprite.sheet.Texture.SetData(terrainBitmap);
 
-			// Data is set in Tick()
+				// Data is set in Tick()
-			customTerrainSprite = new Sprite(new Sheet(s), r, TextureChannel.Alpha);
+				customTerrainSprite = new Sprite(new Sheet(s), r, TextureChannel.Alpha);
-			actorSprite = new Sprite(new Sheet(s), r, TextureChannel.Alpha);
+				actorSprite = new Sprite(new Sheet(s), r, TextureChannel.Alpha);
-			shroudSprite = new Sprite(new Sheet(s), r, TextureChannel.Alpha);
+				shroudSprite = new Sprite(new Sheet(s), r, TextureChannel.Alpha);
+			}
 		}
 
 		public override string GetCursor(int2 pos)
@@ -197,14 +199,17 @@ namespace OpenRA.Mods.RA.Widgets
 			if (updateTicks <= 0)
 			{
 				updateTicks = 12;
-				customTerrainSprite.sheet.Texture.SetData(Minimap.CustomTerrainBitmap(world));
+				using (var bitmap = Minimap.CustomTerrainBitmap(world))
+					customTerrainSprite.sheet.Texture.SetData(bitmap);
 			}
 
 			if (updateTicks == 8)
-				actorSprite.sheet.Texture.SetData(Minimap.ActorsBitmap(world));
+				using (var bitmap = Minimap.ActorsBitmap(world))
+					actorSprite.sheet.Texture.SetData(bitmap);
 
 			if (updateTicks == 4)
-				shroudSprite.sheet.Texture.SetData(Minimap.ShroudBitmap(world));
+				using (var bitmap = Minimap.ShroudBitmap(world))
+					shroudSprite.sheet.Texture.SetData(bitmap);
 
 			// Enable/Disable the radar
 			var enabled = IsEnabled();

OpenRA.Renderer.Null/NullGraphicsDevice.cs

@@ -25,7 +25,7 @@ namespace OpenRA.Renderer.Null
 		}
 	}
 
-	public class NullGraphicsDevice : IGraphicsDevice
+	public sealed class NullGraphicsDevice : IGraphicsDevice
 	{
 		public Size WindowSize { get; internal set; }
 
@@ -35,7 +35,7 @@ namespace OpenRA.Renderer.Null
 			WindowSize = size;
 		}
 
-		public void Quit() { }
+		public void Dispose() { }
 
 		public void EnableScissor(int left, int top, int width, int height) { }
 		public void DisableScissor() { }

OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs

@@ -29,11 +29,12 @@ namespace OpenRA.Renderer.Sdl2
 		}
 	}
 
-	public class Sdl2GraphicsDevice : IGraphicsDevice
+	public sealed class Sdl2GraphicsDevice : IGraphicsDevice
 	{
 		Size size;
 		Sdl2Input input;
 		IntPtr context, window;
+		bool disposed;
 
 		public Size WindowSize { get { return size; } }
 
@@ -101,10 +102,21 @@ namespace OpenRA.Renderer.Sdl2
 			input = new Sdl2Input();
 		}
 
-		public virtual void Quit()
+		public void Dispose()
 		{
-			SDL.SDL_GL_DeleteContext(context);
+			if (disposed)
-			SDL.SDL_DestroyWindow(window);
+				return;
+			disposed = true;
+			if (context != IntPtr.Zero)
+			{
+				SDL.SDL_GL_DeleteContext(context);
+				context = IntPtr.Zero;
+			}
+			if (window != IntPtr.Zero)
+			{
+				SDL.SDL_DestroyWindow(window);
+				window = IntPtr.Zero;
+			}
 			SDL.SDL_Quit();
 		}
 

OpenRA.Renderer.Sdl2/Texture.cs

@@ -106,18 +106,29 @@ namespace OpenRA.Renderer.Sdl2
 
 		public void SetData(Bitmap bitmap)
 		{
+			bool allocatedBitmap = false;
 			if (!Exts.IsPowerOf2(bitmap.Width) || !Exts.IsPowerOf2(bitmap.Height))
+			{
 				bitmap = new Bitmap(bitmap, bitmap.Size.NextPowerOf2());
+				allocatedBitmap = true;
+			}
+			try
+			{
+				size = new Size(bitmap.Width, bitmap.Height);
+				var bits = bitmap.LockBits(bitmap.Bounds(),
+					ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
 
-			size = new Size(bitmap.Width, bitmap.Height);
+				PrepareTexture();
-			var bits = bitmap.LockBits(bitmap.Bounds(),
+				GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba8, bits.Width, bits.Height,
-				ImageLockMode.ReadOnly,	System.Drawing.Imaging.PixelFormat.Format32bppArgb);
+					0, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, bits.Scan0); // TODO: weird strides
-
+				ErrorHandler.CheckGlError();
-			PrepareTexture();
+				bitmap.UnlockBits(bits);
-			GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba8, bits.Width, bits.Height,
+			}
-				0, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, bits.Scan0); // TODO: weird strides
+			finally
-			ErrorHandler.CheckGlError();
+			{
-			bitmap.UnlockBits(bits);
+				if (allocatedBitmap)
+					bitmap.Dispose();
+			}
 		}
 
 		public byte[] GetData()

OpenRA.TilesetBuilder/FormBuilder.cs

@@ -51,8 +51,9 @@ namespace OpenRA.TilesetBuilder
 				this.size = TileSize;
 				surface1.TileSize = TileSize;
 
-				Bitmap fbitmap = new Bitmap(ImageFile);
+				Bitmap rbitmap;
-				Bitmap rbitmap = fbitmap.Clone(new Rectangle(0, 0, fbitmap.Width, fbitmap.Height),
+				using (var fbitmap = new Bitmap(ImageFile))
+					rbitmap = fbitmap.Clone(new Rectangle(0, 0, fbitmap.Width, fbitmap.Height),
 						fbitmap.PixelFormat);
 
 				int[] shadowIndex = { };

OpenRA.Utility/LegacyMapImporter.cs

@@ -162,7 +162,8 @@ namespace OpenRA.Utility
 			else
 			{
 				// CnC
-				UnpackCncTileData(GlobalFileSystem.Open(iniFile.Substring(0, iniFile.Length - 4) + ".bin"));
+				using (var s = GlobalFileSystem.Open(iniFile.Substring(0, iniFile.Length - 4) + ".bin"))
+					UnpackCncTileData(s);
 				ReadCncOverlay(file);
 				ReadCncTrees(file);
 			}