From 81198cc89f315b4644e0db3bbdf9354ed7d6a822 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Sun, 10 Jun 2012 17:28:38 +0000
Subject: [PATCH] Hex Editor - add a save as binary option (in addition to the
 text option)

---
 .../BizHawk.MultiClient.csproj                |   1 +
 .../Properties/Resources.Designer.cs          |   9 +++-
 BizHawk.MultiClient/Properties/Resources.resx |   3 ++
 BizHawk.MultiClient/images/Paste.png          | Bin 0 -> 730 bytes
 .../tools/HexEditor.Designer.cs               |  33 ++++++++----
 BizHawk.MultiClient/tools/HexEditor.cs        |  49 ++++++++++++++++--
 6 files changed, 80 insertions(+), 15 deletions(-)
 create mode 100644 BizHawk.MultiClient/images/Paste.png

diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index fe940cacfc..c0c4df3150 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -751,6 +751,7 @@
     <None Include="images\Import.png" />
     <None Include="images\atari_controller.png" />
     <Content Include="images\logo.ico" />
+    <None Include="images\Paste.png" />
     <Content Include="output\gamedb.txt" />
     <Content Include="output\gamedb_neshomebrew.txt" />
     <Content Include="output\gamedb_pce_cd.txt" />
diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs
index 58fac28b3c..0ccfe50454 100644
--- a/BizHawk.MultiClient/Properties/Resources.Designer.cs
+++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.1
+//     Runtime Version:4.0.30319.269
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -444,6 +444,13 @@ namespace BizHawk.MultiClient.Properties {
             }
         }
         
+        internal static System.Drawing.Bitmap Paste {
+            get {
+                object obj = ResourceManager.GetObject("Paste", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         internal static System.Drawing.Bitmap Pause {
             get {
                 object obj = ResourceManager.GetObject("Pause", resourceCulture);
diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx
index a175c61606..c0474edc94 100644
--- a/BizHawk.MultiClient/Properties/Resources.resx
+++ b/BizHawk.MultiClient/Properties/Resources.resx
@@ -819,4 +819,7 @@
   <data name="TurboFastForward" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\TurboFastForward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Paste" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\Paste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/BizHawk.MultiClient/images/Paste.png b/BizHawk.MultiClient/images/Paste.png
new file mode 100644
index 0000000000000000000000000000000000000000..95d9df6220dc0605db1d483399bedc011b3a35f8
GIT binary patch
literal 730
zcmV<00ww*4P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;P)S5VRCwB?lTAoeVHAd+JL(uNB`Hg2RYYPDSX7G&
z35m=Sgci9fQi{lkh@cjc5J4#Y5VTW>j21}}LNOsF2(~bapoLMQiKdP^dgspfd+&TL
z)X2(OcvgqQ;o+PY9?v<)N-Fnn!``l&&X|z2FL~YbvHVV3*SqBa-qT07F9OYrgY-l{
zHFbx`LohQv$NjqriZ_%I&&wyY7ND~6%B@$6`!S%o>Tn6w)$6IMT0>63TH?7OP1m|U
z1+!Dc<8daw^iaEdl)CL53=Rw=e!U<D5c3?6rR~8B%C;3_mCuF7($ZDlBs;g}kkSQo
zC%PFP7{u6UX$ILSJKs4+AU!%e`mrWU6o!ORL}Vj8;w1fiHWxx_F1-{GMiI_AFg|A+
zwvd?_W%9%01*RjE7HbSSSq;Ec%Kr^uL$XGIoCG;eK{QTDp`~^D2}T=~)hMk|N+G3W
z-7fVfAW}YFFoF|fI5~z6^D)|Rx#1`PCX5im;tR#4>-RWv;;MVzcEg(on2<>N#DXCZ
z-*IXJJ(oo3`IFn8^#WjxVNZD}QfbcBALn50N%yj&)yp;35=ns<e8Z^;j1ZUzl+xHR
zOU;3D(t*OyXwrcqGJ@uo7DAC?-`@Rh;e~)4HI9`EtwWRssT3Ju=<M#Ff5RB8F`TYH
z#qh`o0PQX3$+b2lHk07%=h-FUNGb6%iXCMeNoN#77=$)xV<}o)L~<(m(}l{1Zz~eR
zLuL4ZU@GO4oJp~%Lg5R|o4)t|l*wDp#$#ui+(=*he{J+us`HNl09=V<Wj|!*r2qf`
M07*qoM6N<$g42CEg#Z8m

literal 0
HcmV?d00001

diff --git a/BizHawk.MultiClient/tools/HexEditor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor.Designer.cs
index 08f6aeaab3..6f9e7995c0 100644
--- a/BizHawk.MultiClient/tools/HexEditor.Designer.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.Designer.cs
@@ -33,11 +33,13 @@
 			this.menuStrip1 = new System.Windows.Forms.MenuStrip();
 			this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.dumpToFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.saveAsBinaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
 			this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
 			this.findToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
 			this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.memoryDomainsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -68,7 +70,6 @@
 			this.MemoryViewerBox = new System.Windows.Forms.GroupBox();
 			this.vScrollBar1 = new System.Windows.Forms.VScrollBar();
 			this.AddressesLabel = new System.Windows.Forms.Label();
-			this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
 			this.menuStrip1.SuspendLayout();
 			this.ViewerContextMenuStrip.SuspendLayout();
 			this.MemoryViewerBox.SuspendLayout();
@@ -91,6 +92,7 @@
 			// 
 			this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.dumpToFileToolStripMenuItem,
+            this.saveAsBinaryToolStripMenuItem,
             this.toolStripSeparator1,
             this.exitToolStripMenuItem});
 			this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
@@ -99,22 +101,28 @@
 			// 
 			// dumpToFileToolStripMenuItem
 			// 
-			this.dumpToFileToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
 			this.dumpToFileToolStripMenuItem.Name = "dumpToFileToolStripMenuItem";
-			this.dumpToFileToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
-			this.dumpToFileToolStripMenuItem.Text = "&Dump to file...";
+			this.dumpToFileToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.dumpToFileToolStripMenuItem.Text = "Save as text...";
 			this.dumpToFileToolStripMenuItem.Click += new System.EventHandler(this.dumpToFileToolStripMenuItem_Click);
 			// 
+			// saveAsBinaryToolStripMenuItem
+			// 
+			this.saveAsBinaryToolStripMenuItem.Name = "saveAsBinaryToolStripMenuItem";
+			this.saveAsBinaryToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
+			this.saveAsBinaryToolStripMenuItem.Text = "Save as binary...";
+			this.saveAsBinaryToolStripMenuItem.Click += new System.EventHandler(this.saveAsBinaryToolStripMenuItem_Click);
+			// 
 			// toolStripSeparator1
 			// 
 			this.toolStripSeparator1.Name = "toolStripSeparator1";
-			this.toolStripSeparator1.Size = new System.Drawing.Size(146, 6);
+			this.toolStripSeparator1.Size = new System.Drawing.Size(154, 6);
 			// 
 			// exitToolStripMenuItem
 			// 
 			this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
 			this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
-			this.exitToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
+			this.exitToolStripMenuItem.Size = new System.Drawing.Size(157, 22);
 			this.exitToolStripMenuItem.Text = "E&xit";
 			this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
 			// 
@@ -131,6 +139,7 @@
 			// 
 			// copyToolStripMenuItem
 			// 
+			this.copyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate;
 			this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
 			this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
 			this.copyToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
@@ -139,12 +148,18 @@
 			// 
 			// pasteToolStripMenuItem
 			// 
+			this.pasteToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Paste;
 			this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
 			this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
 			this.pasteToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
 			this.pasteToolStripMenuItem.Text = "&Paste";
 			this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
 			// 
+			// toolStripSeparator6
+			// 
+			this.toolStripSeparator6.Name = "toolStripSeparator6";
+			this.toolStripSeparator6.Size = new System.Drawing.Size(149, 6);
+			// 
 			// findToolStripMenuItem1
 			// 
 			this.findToolStripMenuItem1.Name = "findToolStripMenuItem1";
@@ -411,11 +426,6 @@
 			this.AddressesLabel.MouseLeave += new System.EventHandler(this.AddressesLabel_MouseLeave);
 			this.AddressesLabel.MouseMove += new System.Windows.Forms.MouseEventHandler(this.AddressesLabel_MouseMove);
 			// 
-			// toolStripSeparator6
-			// 
-			this.toolStripSeparator6.Name = "toolStripSeparator6";
-			this.toolStripSeparator6.Size = new System.Drawing.Size(149, 6);
-			// 
 			// HexEditor
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -485,5 +495,6 @@
 		private System.Windows.Forms.ToolStripMenuItem pasteToolStripMenuItem;
 		private System.Windows.Forms.ToolStripMenuItem findToolStripMenuItem1;
 		private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+		private System.Windows.Forms.ToolStripMenuItem saveAsBinaryToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index 28f873773d..b556a5e28e 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -750,10 +750,10 @@ namespace BizHawk.MultiClient
 
 		private void dumpToFileToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			SaveAs();
+			SaveAsText();
 		}
 
-		private void SaveAs()
+		private void SaveAsText()
 		{
 			var file = GetSaveFileFromUser();
 			if (file != null)
@@ -776,6 +776,23 @@ namespace BizHawk.MultiClient
 			}
 		}
 
+		private void SaveAsBinary()
+		{
+			var file = GetBinarySaveFileFromUser();
+			if (file != null)
+			{
+				using(BinaryWriter binWriter = new BinaryWriter(File.Open(file.FullName, FileMode.Create)))
+				{
+					byte[] dump = new byte[Domain.Size];
+
+					for (int x = 0; x < Domain.Size; x++)
+					{
+						binWriter.Write(Domain.PeekByte(x));
+					}
+				}
+			}
+		}
+
 		private FileInfo GetSaveFileFromUser()
 		{
 			var sfd = new SaveFileDialog();
@@ -799,6 +816,29 @@ namespace BizHawk.MultiClient
 			return file;
 		}
 
+		private FileInfo GetBinarySaveFileFromUser()
+		{
+			var sfd = new SaveFileDialog();
+
+			if (!(Global.Emulator is NullEmulator))
+				sfd.FileName = PathManager.FilesystemSafeName(Global.Game);
+			else
+				sfd.FileName = "MemoryDump";
+
+
+			sfd.InitialDirectory = PathManager.GetPlatformBase(Global.Emulator.SystemId);
+
+			sfd.Filter = "Binary (*.bin)|*.bin|All Files|*.*";
+			sfd.RestoreDirectory = true;
+			Global.Sound.StopSound();
+			var result = sfd.ShowDialog();
+			Global.Sound.StartSound();
+			if (result != DialogResult.OK)
+				return null;
+			var file = new FileInfo(sfd.FileName);
+			return file;
+		}
+
 		public void ResetScrollBar()
 		{
 			vScrollBar1.Value = 0;
@@ -1400,6 +1440,9 @@ namespace BizHawk.MultiClient
 			Find();
 		}
 
-		
+		private void saveAsBinaryToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			SaveAsBinary();
+		}
 	}
 }