Clean up rest of the code

Shprrr · Shprrr · commit d5e17ccfa4e4 · 2023-05-31T08:12:44.000-04:00
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 A port of Kawa's original Sappy 2006 ([Original code](https://github.com/Touched/Sappy)) to C#. The original code is in VB6 so the goal is to port the application to a more recent framework.
 
 ## Development Stages
-- [ ] 1. Compile ported code to C#.
+- [x] 1. Compile ported code to C#.
 - [ ] 2. Fix bugs to make it work.
 - [ ] 3. Refactor code for newer patterns and more perfomance.
 - [ ] 4. Adding new features (if any).
diff --git a/SappySharp/App.xaml.cs b/SappySharp/App.xaml.cs
@@ -7,8 +7,8 @@ namespace SappySharp;
 /// </summary>
 public partial class App : Application
 {
-    public App()
+    public App()
     {
-        modSappy.Main();
+        modSappy.MainStart();
     }
 }
diff --git a/SappySharp/Classes/gCommonDialog.cs b/SappySharp/Classes/gCommonDialog.cs
@@ -75,6 +75,7 @@
 using static SappySharp.Classes.cRegistry;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 using System.Drawing;
+using System.Drawing.Printing;
 
 namespace SappySharp.Classes;
 
@@ -910,7 +911,7 @@ bool VBChooseFont(ref Font CurFont, ref int PrinterDC, ref int Color, ref int fl
         if (PrinterDC == -1)
         {
             PrinterDC = 0;
-            if ((flags & (int)EChooseFont.CF_PrinterFonts) != 0) PrinterDC = Printer.hdc;
+            if ((flags & (int)EChooseFont.CF_PrinterFonts) != 0) PrinterDC = (int)new PrinterSettings().CreateMeasurementGraphics().GetHdc();
         }
         else
         {
diff --git a/SappySharp/Classes/pcMemDC.cs b/SappySharp/Classes/pcMemDC.cs
@@ -73,6 +73,7 @@
 using static SappySharp.Classes.pcMemDC;
 using static SappySharp.Classes.cVBALImageList;
 using static SappySharp.Classes.cRegistry;
+using stdole;
 
 namespace SappySharp.Classes;
 
@@ -152,8 +153,10 @@ public void Draw(int hDC, int xSrc = 0, int ySrc = 0, int WidthSrc = 0, int Heig
     }
     public void CreateFromPicture(IPicture sPic)
     {
+        dynamic getObject = null;
         BITMAP tB = null;
-        GetObjectAPI(sPic.Handle, Len(tB), tB);
+        GetObjectAPI(sPic.Handle, Len(tB), ref getObject);
+        tB = getObject;
         Width = tB.bmWidth;
         Height = tB.bmHeight;
         int lhDCC = CreateDCAsNull("DISPLAY", 0, 0, 0);
diff --git a/SappySharp/Forms/frmMidiMapper.xaml b/SappySharp/Forms/frmMidiMapper.xaml
@@ -18,10 +18,10 @@
                 HorizontalAlignment="Left" Content="[5007] Listen" Click="Command1_Click" />
         <Grid x:Name="Picture1_1" Margin="8,32,0,0" Width="345" Height="217" VerticalAlignment="Top" HorizontalAlignment="Left">
             <ListBox x:Name="lstDrums" Margin="0,16,0,0" Padding="2,2,2,2" Width="169" Height="169" VerticalAlignment="Top"
-                    HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" Selected="lstDrums_Click"
+                    HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" SelectionChanged="lstDrums_Click"
                     MouseDoubleClick="lstDrums_DblClick" />
             <ListBox x:Name="lstDrumR" Margin="176,16,0,0" Padding="2,2,2,2" Width="169" Height="169" VerticalAlignment="Top"
-                    HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" Selected="lstDrumR_Click"
+                    HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" SelectionChanged="lstDrumR_Click"
                     MouseDoubleClick="lstDrumR_DblClick" />
             <Label x:Name="Label5" Margin="176,0,0,0" Padding="2,2,2,2" Width="169" Height="17" VerticalAlignment="Top"
                     HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" Content="[5003] Remap to" />
@@ -32,10 +32,10 @@
             <TextBox x:Name="txtTranspose" Margin="128,192,0,0" Padding="2,2,2,2" Width="41" Height="19" VerticalAlignment="Top"
                     HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" Text="0" LostFocus="txtTranspose_LostFocus" />
             <ListBox x:Name="lstInsts" Margin="0,16,0,0" Padding="2,2,2,2" Width="169" Height="169" VerticalAlignment="Top"
-                    HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" Selected="lstInsts_Click"
+                    HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" SelectionChanged="lstInsts_Click"
                     MouseDoubleClick="lstInsts_DblClick" />
             <ListBox x:Name="lstRemapTo" Margin="176,16,0,0" Padding="2,2,2,2" Width="169" Height="169" VerticalAlignment="Top"
-                    HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" Selected="lstRemapTo_Click"
+                    HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" SelectionChanged="lstRemapTo_Click"
                     MouseDoubleClick="lstRemapTo_DblClick" />
             <Label x:Name="Label3" Margin="0,192,0,0" Padding="2,2,2,2" Width="121" Height="17" VerticalAlignment="Top"
                     HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" Content="[5006] Transpose" />
diff --git a/SappySharp/Forms/frmOptions.xaml b/SappySharp/Forms/frmOptions.xaml
@@ -6,7 +6,7 @@
     <Grid>
         <Grid x:Name="picPage_3" Margin="128,96,0,0" Width="393" Height="89" VerticalAlignment="Top" HorizontalAlignment="Left">
             <ComboBox x:Name="cbxPresets" Margin="240,56,0,0" Padding="2,2,2,2" Width="145" Height="22" VerticalAlignment="Top"
-                    HorizontalAlignment="Left" Selected="cbxPresets_Click" />
+                    HorizontalAlignment="Left" SelectionChanged="cbxPresets_Click" />
             <usercontrols:RenderingControl x:Name="picSkin_2" Margin="136,64,0,0" Width="16" Height="16" VerticalAlignment="Top"
                     HorizontalAlignment="Left" MouseUp="picSkin_Click" Rendering="picSkin_Rendering" />
             <usercontrols:RenderingControl x:Name="picSkin_1" Margin="112,64,0,0" Width="16" Height="16" VerticalAlignment="Top"
diff --git a/SappySharp/Forms/frmOptions.xaml.cs b/SappySharp/Forms/frmOptions.xaml.cs
@@ -73,6 +73,7 @@
 using static SappySharp.Classes.pcMemDC;
 using static SappySharp.Classes.cVBALImageList;
 using static SappySharp.Classes.cRegistry;
+using stdole;
 
 namespace SappySharp.Forms;
 
@@ -178,6 +179,20 @@ private void Command1_Click()
         Unload();
     }
 
+    internal class AxHostConverter : System.Windows.Forms.AxHost
+    {
+        private AxHostConverter() : base("") { }
+
+        public static IPictureDisp ImageToPictureDisp(System.Drawing.Image image)
+        {
+            return (IPictureDisp)GetIPictureDispFromPicture(image);
+        }
+
+        public static System.Drawing.Image PictureDispToImage(IPictureDisp pictureDisp)
+        {
+            return GetPictureFromIPicture(pictureDisp);
+        }
+    }
     private void Form_Load(object sender, RoutedEventArgs e) { Form_Load(); }
     private void Form_Load()
     {
@@ -204,8 +219,8 @@ private void Form_Load()
 
         SetCaptions(this);
         Title = Properties.Resources._6000;
-        Picture1.Source = frmSappy.instance.imlStatusbar.ItemPicture(3);
-        Picture2.Source = frmSappy.instance.imlStatusbar.ItemPicture(4);
+        Picture1.Source = ConvertBitmap((System.Drawing.Bitmap)AxHostConverter.PictureDispToImage((IPictureDisp)frmSappy.instance.imlStatusbar.ItemPicture(3)));
+        Picture2.Source = ConvertBitmap((System.Drawing.Bitmap)AxHostConverter.PictureDispToImage((IPictureDisp)frmSappy.instance.imlStatusbar.ItemPicture(4)));
 
         txtXFile.Text = GetSetting("XML File");
         if (txtXFile.Text == "") txtXFile.Text = "sappy.xml";
@@ -264,7 +279,7 @@ private void Form_Resize(object sender, SizeChangedEventArgs e)
         }
     }
 
-    private void Form_Unload(ref int Cancel)
+    private void Form_Unload(object sender, RoutedEventArgs e)
     {
         //DetachMessage(this, hwnd, WM_MOUSEWHEEL);
     }
diff --git a/SappySharp/Forms/frmSappy.xaml b/SappySharp/Forms/frmSappy.xaml
@@ -49,7 +49,7 @@
                 <Button x:Name="cmdSpeed_0" Margin="248,35,0,0" Padding="2,2,2,2" Width="13" Height="13" VerticalAlignment="Top"
                         HorizontalAlignment="Left" Content="&lt;" Tag="[NoLocal]" Click="cmdSpeed_Click" />
                 <ComboBox x:Name="cbxSongs" Margin="128,8,0,0" Padding="2,2,2,2" Width="161" Height="22" VerticalAlignment="Top"
-                        HorizontalAlignment="Left" Tag="[NoLocal]" SelectionChanged="cbxSongs_SelectionChanged" />
+                        HorizontalAlignment="Left" Tag="[NoLocal]" SelectionChanged="cbxSongs_Change" />
                 <usercontrols:VolumeSlider x:Name="VolumeSlider1" Margin="152,56,0,0" Width="65" Height="25"
                         VerticalAlignment="Top" HorizontalAlignment="Left" Change="VolumeSlider1_Change" />
                 <Button x:Name="cmdSpeed_1" Margin="260,35,0,0" Padding="2,2,2,2" Width="13" Height="13" VerticalAlignment="Top"
diff --git a/SappySharp/Forms/frmSappy.xaml.cs b/SappySharp/Forms/frmSappy.xaml.cs
@@ -969,6 +969,12 @@ private void Form_Resize(object sender, SizeChangedEventArgs e)
         picChannels.Height = Height - picChannels.Margin.Top - picStatusbar.Height;
     }
 
+    private void Form_Unload(object sender, RoutedEventArgs e)
+    {
+        int cancel = e.Handled ? 1 : 0;
+        Form_Unload(ref cancel);
+        e.Handled = cancel != 0;
+    }
     private void Form_Unload(ref int Cancel)
     {
         // TODO: (NOT SUPPORTED): On Error Resume Next
diff --git a/SappySharp/Forms/frmSelectMidiOut.xaml b/SappySharp/Forms/frmSelectMidiOut.xaml
@@ -7,7 +7,7 @@
         <Button x:Name="Command1" Margin="152,112,0,0" Padding="2,2,2,2" Width="89" Height="25" VerticalAlignment="Top"
                 HorizontalAlignment="Left" Content="[4]" Click="Command1_Click" />
         <ListBox x:Name="List1" Margin="8,8,0,0" Padding="2,2,2,2" Width="233" Height="89" VerticalAlignment="Top"
-                HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" Selected="List1_Click" />
+                HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" SelectionChanged="List1_Click" />
         <Label x:Name="Label1" Margin="8,104,0,0" Padding="2,2,2,2" Width="137" Height="33" VerticalAlignment="Top"
                 HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" Content="Blah" />
     </Grid>
diff --git a/SappySharp/Forms/frmTakeSamp.xaml b/SappySharp/Forms/frmTakeSamp.xaml
@@ -23,7 +23,7 @@
         <Button x:Name="Command2" Margin="256,240,0,0" Padding="2,2,2,2" Width="81" Height="25" VerticalAlignment="Top"
                 HorizontalAlignment="Left" Content="[5]" Click="Command2_Click" />
         <ComboBox x:Name="cboSaveAs" Margin="136,8,0,0" Padding="2,2,2,2" Width="201" Height="21" VerticalAlignment="Top"
-                HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" Selected="cboSaveAs_Click" />
+                HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" SelectionChanged="cboSaveAs_Click" />
         <TextBox x:Name="txtNamePat" Margin="136,32,0,0" Padding="2,2,2,2" Width="201" Height="19" VerticalAlignment="Top"
                 HorizontalAlignment="Left" FontFamily="Calibri" FontSize="10" />
         <Button x:Name="Command1" Margin="168,240,0,0" Padding="2,2,2,2" Width="81" Height="25" VerticalAlignment="Top"
diff --git a/SappySharp/Modules/modSappy.cs b/SappySharp/Modules/modSappy.cs
@@ -225,7 +225,7 @@ public class tagInitCommonControlsEx
     [LibraryImport("gdi32.dll")]
     public static partial int GetPixel(int hdc, int x, int y);
 
-    public static void Main()
+    public static void MainStart()
     {
         System.Reflection.AssemblyName assemblyName = Application.ResourceAssembly.GetName();
         Trace("This is " + assemblyName.Name + " version " + assemblyName.Version.Major + "." + assemblyName.Version.Minor + "." + assemblyName.Version.Revision);
diff --git a/SappySharp/Themes/Generic.xaml b/SappySharp/Themes/Generic.xaml
@@ -0,0 +1,3 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:SappySharp">
+</ResourceDictionary>
diff --git a/SappySharp/UserControls/RenderingControl.cs b/SappySharp/UserControls/RenderingControl.cs
@@ -3,16 +3,11 @@
 
 namespace SappySharp.UserControls;
 
-public partial class RenderingControl : ItemsControl
+public class RenderingControl : ItemsControl
 {
     public delegate void DrawingEventHandler(object sender, DrawingContext e);
     public event DrawingEventHandler Rendering;
 
-    public RenderingControl()
-    {
-        InitializeComponent();
-    }
-
     protected override void OnRender(DrawingContext drawingContext)
     {
         Rendering?.Invoke(this, drawingContext);
diff --git a/SappySharp/UserControls/RenderingControl.xaml b/SappySharp/UserControls/RenderingControl.xaml

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ namespace SappySharp;`
`7`	`7`	`/// </summary>`
`8`	`8`	`public partial class App : Application`
`9`	`9`	`{`
`10`		`- public App()`
	`10`	`+ public App()`
`11`	`11`	`{`
`12`		`- modSappy.Main();`
	`12`	`+ modSappy.MainStart();`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@`
`75`	`75`	`using static SappySharp.Classes.cRegistry;`
`76`	`76`	`using static System.Runtime.InteropServices.JavaScript.JSType;`
`77`	`77`	`using System.Drawing;`
	`78`	`+using System.Drawing.Printing;`
`78`	`79`
`79`	`80`	`namespace SappySharp.Classes;`
`80`	`81`
`@@ -910,7 +911,7 @@ bool VBChooseFont(ref Font CurFont, ref int PrinterDC, ref int Color, ref int fl`
`910`	`911`	`if (PrinterDC == -1)`
`911`	`912`	`{`
`912`	`913`	`PrinterDC = 0;`
`913`		`- if ((flags & (int)EChooseFont.CF_PrinterFonts) != 0) PrinterDC = Printer.hdc;`
	`914`	`+ if ((flags & (int)EChooseFont.CF_PrinterFonts) != 0) PrinterDC = (int)new PrinterSettings().CreateMeasurementGraphics().GetHdc();`
`914`	`915`	`}`
`915`	`916`	`else`
`916`	`917`	`{`
Original file line number	Diff line number	Diff line change
`@@ -969,6 +969,12 @@ private void Form_Resize(object sender, SizeChangedEventArgs e)`
`969`	`969`	`picChannels.Height = Height - picChannels.Margin.Top - picStatusbar.Height;`
`970`	`970`	`}`
`971`	`971`
	`972`	`+ private void Form_Unload(object sender, RoutedEventArgs e)`
	`973`	`+ {`
	`974`	`+ int cancel = e.Handled ? 1 : 0;`
	`975`	`+ Form_Unload(ref cancel);`
	`976`	`+ e.Handled = cancel != 0;`
	`977`	`+ }`
`972`	`978`	`private void Form_Unload(ref int Cancel)`
`973`	`979`	`{`
`974`	`980`	`// TODO: (NOT SUPPORTED): On Error Resume Next`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ public class tagInitCommonControlsEx`
`225`	`225`	`[LibraryImport("gdi32.dll")]`
`226`	`226`	`public static partial int GetPixel(int hdc, int x, int y);`
`227`	`227`
`228`		`- public static void Main()`
	`228`	`+ public static void MainStart()`
`229`	`229`	`{`
`230`	`230`	`System.Reflection.AssemblyName assemblyName = Application.ResourceAssembly.GetName();`
`231`	`231`	`Trace("This is " + assemblyName.Name + " version " + assemblyName.Version.Major + "." + assemblyName.Version.Minor + "." + assemblyName.Version.Revision);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"`
	`2`	`+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:SappySharp">`
	`3`	`+</ResourceDictionary>`