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

fix crash loading tasproj with bitmap thumbnails caused by 43cb50d5c3

This commit is contained in:
zeromus 2017-06-27 17:14:15 -05:00
parent 6a66f36048
commit 00968423a0
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
BizHawk.Client.Common/QuickBmpFile.cs
View File

@ -16,24 +16,23 @@ namespace BizHawk.Client.Common
#region Structs #region Structs
[StructLayout(LayoutKind.Sequential, Pack = 1)] [StructLayout(LayoutKind.Sequential, Pack = 1)]
private class Bitmapfileheader private class BITMAPFILEHEADER
{ {
public readonly uint bfSize;
public ushort bfType; public ushort bfType;
public uint bfSize;
public ushort bfReserved1; public ushort bfReserved1;
public ushort bfReserved2; public ushort bfReserved2;
public uint bfOffBits; public uint bfOffBits;
public Bitmapfileheader() public BITMAPFILEHEADER()
{ {
bfSize = (uint)Marshal.SizeOf(this); bfSize = (uint)Marshal.SizeOf(this);
} }
public static Bitmapfileheader FromStream(Stream s) public static BITMAPFILEHEADER FromStream(Stream s)
{ {
var ret = GetObject<Bitmapfileheader>(s); var ret = GetObject<BITMAPFILEHEADER>(s);
if (ret.bfSize != Marshal.SizeOf(typeof(Bitmapfileheader))) if (ret.bfSize != Marshal.SizeOf(typeof(BITMAPFILEHEADER)))
{ {
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
@ -42,10 +41,11 @@ namespace BizHawk.Client.Common
} }
} }
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential, Pack = 1)]
private class Bitmapinfoheader private class BITMAPINFOHEADER
{ {
public readonly uint biSize; public uint biSize;
public int biWidth; public int biWidth;
public int biHeight; public int biHeight;
public ushort biPlanes; public ushort biPlanes;
@ -57,15 +57,15 @@ namespace BizHawk.Client.Common
public uint biClrUsed; public uint biClrUsed;
public uint biClrImportant; public uint biClrImportant;
public Bitmapinfoheader() public BITMAPINFOHEADER()
{ {
biSize = (uint)Marshal.SizeOf(this); biSize = (uint)Marshal.SizeOf(this);
} }
public static Bitmapinfoheader FromStream(Stream s) public static BITMAPINFOHEADER FromStream(Stream s)
{ {
var ret = GetObject<Bitmapinfoheader>(s); var ret = GetObject<BITMAPINFOHEADER>(s);
if (ret.biSize != Marshal.SizeOf(typeof(Bitmapinfoheader))) if (ret.biSize != Marshal.SizeOf(typeof(BITMAPINFOHEADER)))
{ {
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
@ -244,8 +244,8 @@ namespace BizHawk.Client.Common
public static unsafe bool Load(IVideoProvider v, Stream s) public static unsafe bool Load(IVideoProvider v, Stream s)
{ {
var bf = Bitmapfileheader.FromStream(s); var bf = BITMAPFILEHEADER.FromStream(s);
var bi = Bitmapinfoheader.FromStream(s); var bi = BITMAPINFOHEADER.FromStream(s);
if (bf.bfType != 0x4d42 if (bf.bfType != 0x4d42
|| bf.bfOffBits != bf.bfSize + bi.biSize || bf.bfOffBits != bf.bfSize + bi.biSize
|| bi.biPlanes != 1 || bi.biPlanes != 1
@ -295,8 +295,8 @@ namespace BizHawk.Client.Common
public static unsafe void Save(IVideoProvider v, Stream s, int w, int h) public static unsafe void Save(IVideoProvider v, Stream s, int w, int h)
{ {
var bf = new Bitmapfileheader(); var bf = new BITMAPFILEHEADER();
var bi = new Bitmapinfoheader(); var bi = new BITMAPINFOHEADER();
bf.bfType = 0x4d42; bf.bfType = 0x4d42;
bf.bfOffBits = bf.bfSize + bi.biSize; bf.bfOffBits = bf.bfSize + bi.biSize;