ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some places using 'int' instead of IntPtr. (#828)

This commit is contained in:
J.D. Purcell 2017-04-08 18:36:29 -04:00
parent b63aede96c
commit a786f73154
6 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
View File

@ -360,15 +360,13 @@ namespace BizHawk.Client.EmuHawk
ret.codec = Win32.decode_mmioFOURCC(opts.fccHandler); ret.codec = Win32.decode_mmioFOURCC(opts.fccHandler);
ret.Format = new byte[opts.cbFormat]; ret.Format = new byte[opts.cbFormat];
ret.Parms = new byte[opts.cbParms]; ret.Parms = new byte[opts.cbParms];
if(opts.lpFormat != 0) Marshal.Copy(new IntPtr(opts.lpFormat), ret.Format, 0, opts.cbFormat); if (opts.lpFormat != IntPtr.Zero) Marshal.Copy(opts.lpFormat, ret.Format, 0, opts.cbFormat);
if (opts.lpParms != 0) Marshal.Copy(new IntPtr(opts.lpParms), ret.Parms, 0, opts.cbParms); if (opts.lpParms != IntPtr.Zero) Marshal.Copy(opts.lpParms, ret.Parms, 0, opts.cbParms);
return ret; return ret;
} }
[DllImport("kernel32.dll", SetLastError = true)] [DllImport("kernel32.dll", SetLastError = true)]
public static extern bool HeapFree(IntPtr hHeap, uint dwFlags, int lpMem); public static extern bool HeapFree(IntPtr hHeap, uint dwFlags, IntPtr lpMem);
[DllImport("kernel32.dll", SetLastError = true)] [DllImport("kernel32.dll", SetLastError = true)]
public static extern IntPtr GetProcessHeap(); public static extern IntPtr GetProcessHeap();
[DllImport("kernel32.dll", SetLastError = false)] [DllImport("kernel32.dll", SetLastError = false)]
@ -377,25 +375,24 @@ namespace BizHawk.Client.EmuHawk
public static void DeallocateAVICOMPRESSOPTIONS(ref Win32.AVICOMPRESSOPTIONS opts) public static void DeallocateAVICOMPRESSOPTIONS(ref Win32.AVICOMPRESSOPTIONS opts)
{ {
//test: increase stability by never freeing anything, ever //test: increase stability by never freeing anything, ever
//if (opts.lpParms != 0) CodecToken.HeapFree(CodecToken.GetProcessHeap(), 0, opts.lpParms); //if (opts.lpParms != IntPtr.Zero) CodecToken.HeapFree(CodecToken.GetProcessHeap(), 0, opts.lpParms);
//if (opts.lpFormat != 0) CodecToken.HeapFree(CodecToken.GetProcessHeap(), 0, opts.lpFormat); //if (opts.lpFormat != IntPtr.Zero) CodecToken.HeapFree(CodecToken.GetProcessHeap(), 0, opts.lpFormat);
opts.lpParms = 0; opts.lpParms = IntPtr.Zero;
opts.lpFormat = 0; opts.lpFormat = IntPtr.Zero;
} }
public void AllocateToAVICOMPRESSOPTIONS(ref Win32.AVICOMPRESSOPTIONS opts) public void AllocateToAVICOMPRESSOPTIONS(ref Win32.AVICOMPRESSOPTIONS opts)
{ {
opts = comprOptions; opts = comprOptions;
if (opts.cbParms != 0) if (opts.cbParms != 0)
{ {
opts.lpParms = HeapAlloc(GetProcessHeap(), 0, opts.cbParms).ToInt32(); opts.lpParms = HeapAlloc(GetProcessHeap(), 0, opts.cbParms);
Marshal.Copy(Parms, 0, new IntPtr(opts.lpParms), opts.cbParms); Marshal.Copy(Parms, 0, opts.lpParms, opts.cbParms);
} }
if (opts.cbFormat != 0) if (opts.cbFormat != 0)
{ {
opts.lpFormat = HeapAlloc(GetProcessHeap(), 0, opts.cbFormat).ToInt32(); opts.lpFormat = HeapAlloc(GetProcessHeap(), 0, opts.cbFormat);
Marshal.Copy(Format, 0, new IntPtr(opts.lpFormat), opts.cbFormat); Marshal.Copy(Format, 0, opts.lpFormat, opts.cbFormat);
} }
} }

2
BizHawk.Client.EmuHawk/CustomControls/FolderBrowserDialogEx.cs
View File

@ -77,7 +77,7 @@ namespace BizHawk.Client.EmuHawk
case 1: case 1:
{ {
IntPtr str = Marshal.StringToHGlobalUni(SelectedPath); IntPtr str = Marshal.StringToHGlobalUni(SelectedPath);
Win32.SendMessage(hwnd, (0x400 + 103), 1, str.ToInt32()); Win32.SendMessage(hwnd, (0x400 + 103), (IntPtr)1, str);
Marshal.FreeHGlobal(str); Marshal.FreeHGlobal(str);
break; break;
} }

12
BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
View File

@ -499,8 +499,8 @@ namespace BizHawk.Client.EmuHawk
Win32.SendMessage( Win32.SendMessage(
this.Handle, this.Handle,
(int)ListViewMessages.LVM_SETITEMSTATE, (int)ListViewMessages.LVM_SETITEMSTATE,
index, (IntPtr)index,
ptrItem.ToInt32()); ptrItem);
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -524,8 +524,8 @@ namespace BizHawk.Client.EmuHawk
Win32.SendMessage( Win32.SendMessage(
this.Handle, this.Handle,
(int)ListViewMessages.LVM_SETITEMCOUNT, (int)ListViewMessages.LVM_SETITEMCOUNT,
this._itemCount, (IntPtr)this._itemCount,
0); IntPtr.Zero);
} }
protected void OnDispInfoNotice(ref Message m, bool useAnsi) protected void OnDispInfoNotice(ref Message m, bool useAnsi)
@ -749,14 +749,14 @@ namespace BizHawk.Client.EmuHawk
lvhti.Point.X = x; lvhti.Point.X = x;
lvhti.Point.Y = y; lvhti.Point.Y = y;
Marshal.StructureToPtr(lvhti, ptrlvhti, true); Marshal.StructureToPtr(lvhti, ptrlvhti, true);
int z = Win32.SendMessage(this.Handle, (int)ListViewMessages.LVM_HITTEST, 0, ptrlvhti.ToInt32()); int z = (int)Win32.SendMessage(this.Handle, (int)ListViewMessages.LVM_HITTEST, (IntPtr)0, ptrlvhti);
Marshal.PtrToStructure(ptrlvhti, lvhti); Marshal.PtrToStructure(ptrlvhti, lvhti);
return z; return z;
} }
public void ensureVisible(int index) public void ensureVisible(int index)
{ {
Win32.SendMessage(Handle, (int)ListViewMessages.LVM_ENSUREVISIBLE, index, 1); Win32.SendMessage(Handle, (int)ListViewMessages.LVM_ENSUREVISIBLE, (IntPtr)index, (IntPtr)1);
} }
public void ensureVisible() public void ensureVisible()

6
BizHawk.Client.EmuHawk/CustomControls/Win32.cs
View File

@ -311,9 +311,9 @@ namespace BizHawk.Client.EmuHawk
public int dwQuality; public int dwQuality;
public int dwBytesPerSecond; public int dwBytesPerSecond;
public int dwFlags; public int dwFlags;
public int lpFormat; public IntPtr lpFormat;
public int cbFormat; public int cbFormat;
public int lpParms; public IntPtr lpParms;
public int cbParms; public int cbParms;
public int dwInterleaveEvery; public int dwInterleaveEvery;
} }
@ -472,7 +472,7 @@ namespace BizHawk.Client.EmuHawk
} }
[DllImport("user32.dll", CharSet = CharSet.Auto)] [DllImport("user32.dll", CharSet = CharSet.Auto)]
public static extern int SendMessage(IntPtr hWnd, int msg, int wParam, int lParam); public static extern IntPtr SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
[DllImport("Kernel32.dll", EntryPoint = "RtlZeroMemory", SetLastError = false)] [DllImport("Kernel32.dll", EntryPoint = "RtlZeroMemory", SetLastError = false)]
public static extern void ZeroMemory(IntPtr dest, uint size); public static extern void ZeroMemory(IntPtr dest, uint size);

4
BizHawk.Client.EmuHawk/LogConsole.cs
View File

@ -159,8 +159,8 @@ namespace BizHawk.Client.EmuHawk
if (Win32.AllocConsole()) if (Win32.AllocConsole())
{ {
//set icons for the console so we can tell them apart from the main window //set icons for the console so we can tell them apart from the main window
Win32.SendMessage(Win32.GetConsoleWindow(), 0x0080/*WM_SETICON*/, 0/*ICON_SMALL*/, Properties.Resources.console16x16.GetHicon().ToInt32()); Win32.SendMessage(Win32.GetConsoleWindow(), 0x0080/*WM_SETICON*/, (IntPtr)0/*ICON_SMALL*/, Properties.Resources.console16x16.GetHicon());
Win32.SendMessage(Win32.GetConsoleWindow(), 0x0080/*WM_SETICON*/, 1/*ICON_LARGE*/, Properties.Resources.console32x32.GetHicon().ToInt32()); Win32.SendMessage(Win32.GetConsoleWindow(), 0x0080/*WM_SETICON*/, (IntPtr)1/*ICON_LARGE*/, Properties.Resources.console32x32.GetHicon());
hasConsole = true; hasConsole = true;
} }
else else

4
BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs
View File

@ -892,7 +892,7 @@ namespace BizHawk.Client.EmuHawk
{ {
groupFreeze.SuspendLayout(); groupFreeze.SuspendLayout();
Win32.SendMessage(groupFreeze.Handle, 11, 0, 0); //WM_SETREDRAW false Win32.SendMessage(groupFreeze.Handle, 11, (IntPtr)0, IntPtr.Zero); //WM_SETREDRAW false
var tp = tabctrlDetails.SelectedTab; var tp = tabctrlDetails.SelectedTab;
@ -912,7 +912,7 @@ namespace BizHawk.Client.EmuHawk
groupFreeze.ResumeLayout(); groupFreeze.ResumeLayout();
Win32.SendMessage(groupFreeze.Handle, 11, 1, 0); //WM_SETREDRAW true Win32.SendMessage(groupFreeze.Handle, 11, (IntPtr)1, IntPtr.Zero); //WM_SETREDRAW true
groupFreeze.Refresh(); groupFreeze.Refresh();
} }