Do not dispose platform structs (fix #74)

SupinePandora43 · Sep 8, 2023 · e00ddc5 · e00ddc5
1 parent 4d06b37
commit e00ddc5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 42 deletions.
diff --git a/src/UltralightNet/Platform/Clipboard.cs b/src/UltralightNet/Platform/Clipboard.cs
@@ -19,7 +19,7 @@ public unsafe struct ULClipboard
 #endif
 		}
 	}
-	public interface IClipboard : IDisposable
+	public interface IClipboard
 	{
 		void Clear();
 		string ReadPlainText();
@@ -75,12 +75,8 @@ public void Dispose()
 					foreach (var handle in handles) if (handle.IsAllocated) handle.Free();
 				}
 
-				try { instance.Dispose(); }
-				finally
-				{
-					GC.SuppressFinalize(this);
-					IsDisposed = true;
-				}
+				GC.SuppressFinalize(this);
+				IsDisposed = true;
 			}
 			~Wrapper() => Dispose();
 		}

diff --git a/src/UltralightNet/Platform/Filesystem.cs b/src/UltralightNet/Platform/Filesystem.cs
@@ -20,7 +20,7 @@ public unsafe struct ULFileSystem
 #endif
 		}
 	}
-	public interface IFileSystem : IDisposable
+	public interface IFileSystem
 	{
 		bool FileExists(string path);
 		string GetFileMimeType(string path);
@@ -78,12 +78,8 @@ public void Dispose()
 					foreach (var handle in handles) if (handle.IsAllocated) handle.Free();
 				}
 
-				try { instance.Dispose(); }
-				finally
-				{
-					GC.SuppressFinalize(this);
-					IsDisposed = true;
-				}
+				GC.SuppressFinalize(this);
+				IsDisposed = true;
 			}
 			~Wrapper() => Dispose();
 		}

diff --git a/src/UltralightNet/Platform/FontLoader.cs b/src/UltralightNet/Platform/FontLoader.cs
@@ -19,7 +19,7 @@ public unsafe struct ULFontLoader
 #endif
 		}
 	}
-	public interface IFontLoader : IDisposable
+	public interface IFontLoader
 	{
 		string GetFallbackFont();
 		string GetFallbackFontForCharacters(string text, int weight, bool italic);
@@ -75,12 +75,8 @@ public void Dispose()
 					foreach (var handle in handles) if (handle.IsAllocated) handle.Free();
 				}
 
-				try { instance.Dispose(); }
-				finally
-				{
-					GC.SuppressFinalize(this);
-					IsDisposed = true;
-				}
+				GC.SuppressFinalize(this);
+				IsDisposed = true;
 			}
 			~Wrapper() => Dispose();
 		}

diff --git a/src/UltralightNet/Platform/GPUDriver.cs b/src/UltralightNet/Platform/GPUDriver.cs
@@ -32,7 +32,7 @@ public unsafe struct ULGPUDriver
 		}
 	}
 
-	public interface IGPUDriver : IDisposable
+	public interface IGPUDriver
 	{
 		uint NextTextureId();
 		void CreateTexture(uint textureId, ULBitmap bitmap);
@@ -149,12 +149,8 @@ public void Dispose()
 					foreach (var handle in handles) if (handle.IsAllocated) handle.Free();
 				}
 
-				try { instance.Dispose(); }
-				finally
-				{
-					GC.SuppressFinalize(this);
-					IsDisposed = true;
-				}
+				GC.SuppressFinalize(this);
+				IsDisposed = true;
 			}
 			~Wrapper() => Dispose();
 		}

diff --git a/src/UltralightNet/Platform/Logger.cs b/src/UltralightNet/Platform/Logger.cs
@@ -17,7 +17,7 @@ public unsafe struct ULLogger
 #endif
 		}
 	}
-	public interface ILogger : IDisposable
+	public interface ILogger
 	{
 		void LogMessage(ULLogLevel logLevel, string message);
 
@@ -60,12 +60,8 @@ public void Dispose()
 				if (IsDisposed) return;
 				if (handle.IsAllocated) handle.Free();
 
-				try { instance.Dispose(); }
-				finally
-				{
-					GC.SuppressFinalize(this);
-					IsDisposed = true;
-				}
+				GC.SuppressFinalize(this);
+				IsDisposed = true;
 			}
 			~Wrapper() => Dispose();
 		}

diff --git a/src/UltralightNet/Platform/SurfaceDefinition.cs b/src/UltralightNet/Platform/SurfaceDefinition.cs
@@ -25,7 +25,7 @@ public unsafe struct ULSurfaceDefinition
 #endif
 		}
 	}
-	public interface ISurfaceDefinition : IDisposable
+	public interface ISurfaceDefinition
 	{
 		nint Create(uint width, uint height);
 		void Destroy(nint id);
@@ -100,12 +100,8 @@ public void Dispose()
 					foreach (var handle in handles) if (handle.IsAllocated) handle.Free();
 				}
 
-				try { instance.Dispose(); }
-				finally
-				{
-					GC.SuppressFinalize(this);
-					IsDisposed = true;
-				}
+				GC.SuppressFinalize(this);
+				IsDisposed = true;
 			}
 			~Wrapper() => Dispose();
 		}