sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor fixes to Gdi32

nullableenabled
David Hall 2023-09-06 17:05:33 -06:00
parent fa796733ad
commit 8eab47487b
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PInvoke/Gdi32/WinGdi.Bitmap.cs
View File

@ -592,7 +592,7 @@ public static partial class Gdi32
// BITMAPINFOHEADER *pbmih, DWORD flInit, const VOID *pjBits, const BITMAPINFO *pbmi, UINT iUsage );
[DllImport(Lib.Gdi32, SetLastError = false, ExactSpelling = true)]
[PInvokeData("wingdi.h", MSDNShortId = "e9a5b525-a6b6-4309-9e53-69d274b85783")]
public static extern SafeHBITMAP CreateDIBitmap(HDC hdc, in BITMAPINFOHEADER pbmih, CBM flInit, [In, Optional] byte[]? pjBits, in BITMAPINFO pbmi, DIBColorMode iUsage);
public static extern SafeHBITMAP CreateDIBitmap(HDC hdc, in BITMAPINFOHEADER pbmih, CBM flInit, [In, Optional] byte[]? pjBits, [In, Optional] SafeBITMAPINFO pbmi, DIBColorMode iUsage);
/// <summary>
/// The <c>CreateDIBitmap</c> function creates a compatible bitmap (DDB) from a DIB and, optionally, sets the bitmap bits.

2
PInvoke/Gdi32/WinGdi.Metafile.cs
View File

@ -880,7 +880,7 @@ public static partial class Gdi32
[DllImport(Lib.Gdi32, SetLastError = true, ExactSpelling = true)]
[PInvokeData("wingdi.h", MSDNShortId = "bef5f43e-219a-4f8a-986d-290e29e17c4e")]
[return: MarshalAs(UnmanagedType.Bool)]
public static extern bool EnumEnhMetaFile([Optional] HDC hdc, HENHMETAFILE hmf, EnhMetaFileProc proc, [Optional] IntPtr param, [In, Optional] PRECT lpRect);
public static extern bool EnumEnhMetaFile([Optional] HDC hdc, HENHMETAFILE hmf, EnhMetaFileProc proc, [Optional] IntPtr param, [In, Optional] PRECT? lpRect);
/// <summary>
/// <para>

4
UnitTests/PInvoke/Gdi32/BitmapTests.cs
View File

@ -1,6 +1,4 @@
using NUnit.Framework;
using System;
using System.Runtime.InteropServices;
using static Vanara.PInvoke.Gdi32;
using static Vanara.PInvoke.Kernel32;
using static Vanara.PInvoke.User32;
@ -94,7 +92,7 @@ public class BitmapTests
hbmp = CreateDIBitmap(hdc, bmi.bmiHeader, CBM.CBM_INIT, default, bmi, DIBColorMode.DIB_PAL_COLORS);
Assert.That(hbmp, ResultIs.ValidHandle);
hbmp = CreateDIBitmap(hdc, bmi.bmiHeader, CBM.CBM_INIT, default, default, DIBColorMode.DIB_PAL_COLORS);
hbmp = CreateDIBitmap(hdc, bmi.bmiHeader, CBM.CBM_INIT, default, SafeBITMAPINFO.Null, DIBColorMode.DIB_PAL_COLORS);
Assert.That(hbmp, ResultIs.ValidHandle);
//hbmp = CreateDIBitmap(hdc, bmi.bmiHeader, 0, (IntPtr)0xc0000000, bmi, DIBColorMode.DIB_PAL_COLORS);

3
UnitTests/PInvoke/Gdi32/Gdi32Tests.cs
View File

@ -1,8 +1,5 @@
using NUnit.Framework;
using System;
using System.Linq;
using System.Runtime.InteropServices;
using Vanara.InteropServices;
using static Vanara.PInvoke.Gdi32;
namespace Vanara.PInvoke.Tests;