From b4ad2f40d91fbb5e4e4dc0d880f274f8cc88231a Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Fri, 10 Mar 2017 08:22:45 -0600
Subject: [PATCH] snes c# cleanup

---
 BizHawk.Common/IPC/SharedMemoryBlock.cs       | 21 +++++++------------
 .../Consoles/Nintendo/SNES/LibsnesApi.cs      |  5 +++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/BizHawk.Common/IPC/SharedMemoryBlock.cs b/BizHawk.Common/IPC/SharedMemoryBlock.cs
index 785924e0a4..72a591efa8 100644
--- a/BizHawk.Common/IPC/SharedMemoryBlock.cs
+++ b/BizHawk.Common/IPC/SharedMemoryBlock.cs
@@ -1,5 +1,5 @@
 using System;
-using System.IO.MemoryMappedFiles;
+using System.Runtime.InteropServices;
 
 namespace BizHawk.Common
 {
@@ -8,26 +8,21 @@ namespace BizHawk.Common
 		public string Name;
 		public string BlockName;
 		public int Size;
-		public MemoryMappedFile mmf;
-		public MemoryMappedViewAccessor mmva;
 		public byte* Ptr;
+		byte[] bytes;
+		GCHandle handle;
 
 		public void Allocate()
 		{
-			//we can't allocate 0 bytes here.. so just allocate 1 byte here if 0 was requested. it should be OK, and we dont have to handle cases where blocks havent been allocated
-			int sizeToAlloc = Size;
-			if (sizeToAlloc == 0) sizeToAlloc = 1;
-			mmf = MemoryMappedFile.CreateNew(BlockName, sizeToAlloc);
-			mmva = mmf.CreateViewAccessor();
-			mmva.SafeMemoryMappedViewHandle.AcquirePointer(ref Ptr);
+			bytes = new byte[Size];
+			handle = GCHandle.Alloc(bytes, GCHandleType.Pinned);
+			Ptr = (byte*)handle.AddrOfPinnedObject();
 		}
 
 		public void Dispose()
 		{
-			if (mmf == null) return;
-			mmva.Dispose();
-			mmf.Dispose();
-			mmf = null;
+			handle.Free();
+			bytes = null;
 		}
 	}
 }
\ No newline at end of file
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
index cdc470593a..f5d874439d 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/SNES/LibsnesApi.cs
@@ -69,8 +69,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.SNES
 		{
 			instanceDll.Dispose();
 
-			foreach (var smb in DeallocatedMemoryBlocks.Values)
-				smb.Dispose();
+			foreach (var smb in DeallocatedMemoryBlocks.Values) smb.Dispose();
+			foreach (var smb in SharedMemoryBlocks.Values) smb.Dispose();
+			SharedMemoryBlocks.Clear();
 			DeallocatedMemoryBlocks.Clear();
 		}