stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-02-21 11:20:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove the need for ZeroMemory

Browse source
This commit is contained in:
Magnus Norddahl 2020-09-11 22:39:18 +02:00
parent e62c8bdad4
commit 0d07050bcb
3 changed files with 13 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/Data/TEXTURESImage.cs
View file

@ -116,7 +116,7 @@ namespace CodeImp.DoomBuilder.Data
bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb); bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
BitmapData bitmapdata = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb); BitmapData bitmapdata = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
PixelColor* pixels = (PixelColor*)bitmapdata.Scan0.ToPointer(); PixelColor* pixels = (PixelColor*)bitmapdata.Scan0.ToPointer();
General.ZeroMemory(new IntPtr(pixels), width * height * sizeof(PixelColor)); General.ZeroPixels(pixels, width * height);
bitmap.UnlockBits(bitmapdata); bitmap.UnlockBits(bitmapdata);
g = Graphics.FromImage(bitmap); g = Graphics.FromImage(bitmap);
} }

2
Source/Core/Data/TextureImage.cs
View file

@ -88,7 +88,7 @@ namespace CodeImp.DoomBuilder.Data
bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb); bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
bitmapdata = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb); bitmapdata = bitmap.LockBits(new Rectangle(0, 0, width, height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
pixels = (PixelColor*)bitmapdata.Scan0.ToPointer(); pixels = (PixelColor*)bitmapdata.Scan0.ToPointer();
General.ZeroMemory(new IntPtr(pixels), width * height * sizeof(PixelColor)); General.ZeroPixels(pixels, width * height);
} }
catch(Exception e) catch(Exception e)
{ {

40
Source/Core/General/General.cs
View file

@ -47,25 +47,30 @@ namespace CodeImp.DoomBuilder
{ {
public static class General public static class General
{ {
#region ================== API Declarations #region ================== API Declarations
#if NO_WIN32 #if NO_WIN32
internal static bool LockWindowUpdate(IntPtr hwnd) { return true; } internal static bool LockWindowUpdate(IntPtr hwnd) { return true; }
internal static bool MessageBeep(MessageBeepType type) { return true; } internal static bool MessageBeep(MessageBeepType type) { return true; }
internal static void ZeroMemory(IntPtr dest, int size) { }
internal static int SendMessage(IntPtr hwnd, uint Msg, IntPtr wParam, IntPtr lParam) { return 0; } internal static int SendMessage(IntPtr hwnd, uint Msg, IntPtr wParam, IntPtr lParam) { return 0; }
internal static int PostMessage(IntPtr hwnd, uint Msg, IntPtr wParam, IntPtr lParam) { return 0; } internal static int PostMessage(IntPtr hwnd, uint Msg, IntPtr wParam, IntPtr lParam) { return 0; }
internal unsafe static void ZeroPixels(PixelColor* pixels, int size)
{
var transparent = new PixelColor(0,0,0,0);
for (int i = 0; i < size; i++)
pixels[i] = transparent;
}
#else #else
[DllImport("user32.dll")] [DllImport("user32.dll")]
internal static extern bool LockWindowUpdate(IntPtr hwnd); internal static extern bool LockWindowUpdate(IntPtr hwnd);
[DllImport("kernel32.dll", EntryPoint = "RtlZeroMemory", SetLastError = false)] [DllImport("kernel32.dll", EntryPoint = "RtlZeroMemory", SetLastError = false)]
internal static extern void ZeroMemory(IntPtr dest, int size); static extern void ZeroMemory(IntPtr dest, int size);
//[DllImport("kernel32.dll", EntryPoint = "RtlMoveMemory", SetLastError = false)] internal unsafe static void ZeroPixels(PixelColor* pixels, int size) { ZeroMemory(new IntPtr(pixels), size * sizeof(PixelColor)); }
//internal static extern unsafe void CopyMemory(void* dst, void* src, uint length);
[DllImport("user32.dll", EntryPoint = "SendMessage", SetLastError = true, CallingConvention = CallingConvention.StdCall)] [DllImport("user32.dll", EntryPoint = "SendMessage", SetLastError = true, CallingConvention = CallingConvention.StdCall)]
internal static extern int SendMessage(IntPtr hwnd, uint Msg, IntPtr wParam, IntPtr lParam); internal static extern int SendMessage(IntPtr hwnd, uint Msg, IntPtr wParam, IntPtr lParam);
@ -76,31 +81,8 @@ namespace CodeImp.DoomBuilder
[DllImport("user32.dll", SetLastError = true)] [DllImport("user32.dll", SetLastError = true)]
internal static extern bool MessageBeep(MessageBeepType type); internal static extern bool MessageBeep(MessageBeepType type);
//[DllImport("kernel32.dll")]
//internal extern static IntPtr LoadLibrary(string filename);
//[DllImport("kernel32.dll")]
//internal extern static bool FreeLibrary(IntPtr moduleptr);
//[DllImport("user32.dll")]
/*internal static extern IntPtr CreateWindowEx(uint exstyle, string classname, string windowname, uint style,
int x, int y, int width, int height, IntPtr parentptr, int menu,
IntPtr instanceptr, string param);*/
//[DllImport("user32.dll")]
//internal static extern bool DestroyWindow(IntPtr windowptr);
//[DllImport("user32.dll")]
//internal static extern int SetWindowPos(IntPtr windowptr, int insertafterptr, int x, int y, int cx, int cy, int flags);
[DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
private static extern uint GetShortPathName([MarshalAs(UnmanagedType.LPTStr)] string longpath, [MarshalAs(UnmanagedType.LPTStr)]StringBuilder shortpath, uint buffersize); private static extern uint GetShortPathName([MarshalAs(UnmanagedType.LPTStr)] string longpath, [MarshalAs(UnmanagedType.LPTStr)]StringBuilder shortpath, uint buffersize);
//[DllImport("user32.dll")]
//internal static extern int SetScrollInfo(IntPtr windowptr, int bar, IntPtr scrollinfo, bool redraw);
//[DllImport("user32.dll")]
//internal static extern int GetScrollInfo(IntPtr windowptr, int bar, IntPtr scrollinfo);
#endif #endif
#endregion #endregion