EXTERMINATE SPACES
This commit is contained in:
parent
8f7b01bffe
commit
3ea71a2dda
|
@ -389,7 +389,8 @@ namespace BizHawk.BizInvoke
|
|||
|
||||
il.Emit(OpCodes.Ldarg_0);
|
||||
il.Emit(OpCodes.Ldfld, field);
|
||||
il.EmitCalli(OpCodes.Calli,
|
||||
il.EmitCalli(
|
||||
OpCodes.Calli,
|
||||
nativeCall,
|
||||
returnType == typeof(bool) ? typeof(byte) : returnType, // undo winapi style bool garbage
|
||||
paramLoadInfos.Select(p => p.NativeType).ToArray());
|
||||
|
|
|
@ -61,8 +61,11 @@ namespace BizHawk.BizInvoke
|
|||
AllocationType flAllocationType, MemoryProtection flProtect);
|
||||
|
||||
[DllImport("kernel32.dll", SetLastError = true)]
|
||||
public static extern bool VirtualProtect(UIntPtr lpAddress, UIntPtr dwSize,
|
||||
MemoryProtection flNewProtect, out MemoryProtection lpflOldProtect);
|
||||
public static extern bool VirtualProtect(
|
||||
UIntPtr lpAddress,
|
||||
UIntPtr dwSize,
|
||||
MemoryProtection flNewProtect,
|
||||
out MemoryProtection lpflOldProtect);
|
||||
|
||||
[Flags]
|
||||
public enum AllocationType : uint
|
||||
|
@ -123,9 +126,13 @@ namespace BizHawk.BizInvoke
|
|||
public static extern bool UnmapViewOfFile(IntPtr lpBaseAddress);
|
||||
|
||||
[DllImport("kernel32.dll")]
|
||||
public static extern IntPtr MapViewOfFileEx(IntPtr hFileMappingObject,
|
||||
FileMapAccessType dwDesiredAccess, uint dwFileOffsetHigh, uint dwFileOffsetLow,
|
||||
UIntPtr dwNumberOfBytesToMap, IntPtr lpBaseAddress);
|
||||
public static extern IntPtr MapViewOfFileEx(
|
||||
IntPtr hFileMappingObject,
|
||||
FileMapAccessType dwDesiredAccess,
|
||||
uint dwFileOffsetHigh,
|
||||
uint dwFileOffsetLow,
|
||||
UIntPtr dwNumberOfBytesToMap,
|
||||
IntPtr lpBaseAddress);
|
||||
|
||||
[Flags]
|
||||
public enum FileMapAccessType : uint
|
||||
|
|
|
@ -65,12 +65,11 @@ namespace BizHawk.Bizware.BizwareGL
|
|||
|
||||
float[][] colorMatrixElements =
|
||||
{
|
||||
new float[] {r, 0, 0, 0, 0},
|
||||
new float[] {0, g, 0, 0, 0},
|
||||
new float[] {0, 0, b, 0, 0},
|
||||
new float[] {0, 0, 0, a, 0},
|
||||
new float[] {0, 0, 0, 0, 1}
|
||||
|
||||
new float[] { r, 0, 0, 0, 0 },
|
||||
new float[] { 0, g, 0, 0, 0 },
|
||||
new float[] { 0, 0, b, 0, 0 },
|
||||
new float[] { 0, 0, 0, a, 0 },
|
||||
new float[] { 0, 0, 0, 0, 1 },
|
||||
};
|
||||
|
||||
var colorMatrix = new ColorMatrix(colorMatrixElements);
|
||||
|
|
|
@ -241,10 +241,10 @@ namespace BizHawk.Bizware.OpenTK3
|
|||
else { v0 = art.v0; v1 = art.v1; }
|
||||
|
||||
float[] data = new float[32] {
|
||||
x,y, u0,v0, CornerColors[0].X, CornerColors[0].Y, CornerColors[0].Z, CornerColors[0].W,
|
||||
x+art.Width,y, u1,v0, CornerColors[1].X, CornerColors[1].Y, CornerColors[1].Z, CornerColors[1].W,
|
||||
x,y+art.Height, u0,v1, CornerColors[2].X, CornerColors[2].Y, CornerColors[2].Z, CornerColors[2].W,
|
||||
x+art.Width,y+art.Height, u1,v1, CornerColors[3].X, CornerColors[3].Y, CornerColors[3].Z, CornerColors[3].W,
|
||||
x,y, u0,v0, CornerColors[0].X, CornerColors[0].Y, CornerColors[0].Z, CornerColors[0].W,
|
||||
x+art.Width,y, u1,v0, CornerColors[1].X, CornerColors[1].Y, CornerColors[1].Z, CornerColors[1].W,
|
||||
x,y+art.Height, u0,v1, CornerColors[2].X, CornerColors[2].Y, CornerColors[2].Z, CornerColors[2].W,
|
||||
x+art.Width,y+art.Height, u1,v1, CornerColors[3].X, CornerColors[3].Y, CornerColors[3].Z, CornerColors[3].W,
|
||||
};
|
||||
|
||||
Texture2d tex = art.BaseTexture;
|
||||
|
|
|
@ -395,7 +395,7 @@ namespace BizHawk.Bizware.OpenTK3
|
|||
|
||||
public void SetPipelineUniform(PipelineUniform uniform, bool value)
|
||||
{
|
||||
GL.Uniform1((int)uniform.Sole.Opaque, value ? 1 : 0);
|
||||
GL.Uniform1((int) uniform.Sole.Opaque, value ? 1 : 0);
|
||||
}
|
||||
|
||||
public unsafe void SetPipelineUniformMatrix(PipelineUniform uniform, Matrix4 mat, bool transpose)
|
||||
|
|
|
@ -13,7 +13,7 @@ namespace BizHawk.Client.DiscoHawk
|
|||
|
||||
private void richTextBox1_LinkClicked(object sender, LinkClickedEventArgs e)
|
||||
{
|
||||
System.Diagnostics.Process.Start(e.LinkText);
|
||||
System.Diagnostics.Process.Start(e.LinkText);
|
||||
}
|
||||
|
||||
private void button1_Click(object sender, EventArgs e)
|
||||
|
|
|
@ -184,10 +184,10 @@ namespace BizHawk.Client.EmuHawk
|
|||
{
|
||||
// this writer will never support this capability
|
||||
|
||||
// but it needs to for syncless recorder, otherwise it won't work at all
|
||||
if (W is SynclessRecorder)
|
||||
// but it needs to for syncless recorder, otherwise it won't work at all
|
||||
if (W is SynclessRecorder)
|
||||
{
|
||||
W.SetFrame(frame);
|
||||
W.SetFrame(frame);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -402,12 +402,12 @@ namespace BizHawk.Client.EmuHawk
|
|||
|
||||
try
|
||||
{
|
||||
File.Move(fpSource, fpTarget);
|
||||
File.Move(fpSource, fpTarget);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// sometimes moves fail. especially in newer versions of windows with explorers more fragile than your great-grandma.
|
||||
// I am embarrassed that I know that. about windows, not your great-grandma.
|
||||
// sometimes moves fail. especially in newer versions of windows with explorers more fragile than your great-grandma.
|
||||
// I am embarrassed that I know that. about windows, not your great-grandma.
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -295,8 +295,7 @@ namespace BizHawk.Client.EmuHawk
|
|||
{
|
||||
Path = Path.GetDirectoryName(path),
|
||||
Filter = Path.GetFileName(path),
|
||||
NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite
|
||||
| NotifyFilters.FileName | NotifyFilters.DirectoryName,
|
||||
NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite | NotifyFilters.FileName | NotifyFilters.DirectoryName,
|
||||
EnableRaisingEvents = true
|
||||
};
|
||||
|
||||
|
|
|
@ -278,7 +278,7 @@ namespace BizHawk.Emulation.DiscSystem
|
|||
|
||||
private long readCounter;
|
||||
private RiffChunk ReadChunk(BinaryReader br)
|
||||
{
|
||||
{
|
||||
RiffChunk ret;
|
||||
string tag = ReadTag(br); readCounter += 4;
|
||||
uint size = br.ReadUInt32(); readCounter += 4;
|
||||
|
|
|
@ -747,8 +747,7 @@ namespace BizHawk.Emulation.DiscSystem
|
|||
blobstrings.Add(t);
|
||||
}
|
||||
|
||||
var tBlobs = (from a in tr.ImageFileNamePaths
|
||||
select a).ToList();
|
||||
var tBlobs = (from a in tr.ImageFileNamePaths select a).ToList();
|
||||
|
||||
if (tBlobs.Count < 1)
|
||||
throw new MDSParseException("BLOB Error!");
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
var q = new SubchannelQ
|
||||
{
|
||||
q_status = SubchannelQ.ComputeStatus(kADR, (EControlQ)m_te.control),
|
||||
q_status = SubchannelQ.ComputeStatus(kADR, (EControlQ) m_te.control),
|
||||
q_tno = BCD2.FromDecimal(0), //unknown with mednadisc
|
||||
q_index = BCD2.FromDecimal(i),
|
||||
min = BCD2.FromDecimal(0), //unknown with mednadisc
|
||||
|
|
|
@ -235,10 +235,8 @@ namespace BizHawk.Emulation.DiscSystem
|
|||
EControlQ control = ses.LeadoutTrack.Control;
|
||||
|
||||
//ehhh? CDI?
|
||||
//if(toc.tracks[toc.last_track].valid)
|
||||
// control |= toc.tracks[toc.last_track].control & 0x4;
|
||||
//else if(toc.disc_type == DISC_TYPE_CD_I)
|
||||
// control |= 0x4;
|
||||
// if(toc.tracks[toc.last_track].valid) control |= toc.tracks[toc.last_track].control & 0x4;
|
||||
// else if(toc.disc_type == DISC_TYPE_CD_I) control |= 0x4;
|
||||
control |= (EControlQ)(((int)ses.LastInformationTrack.Control) & 4);
|
||||
|
||||
SubchannelQ sq = new SubchannelQ();
|
||||
|
|
Loading…
Reference in New Issue