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

Added nullability to ComDlg32

nullableenabled
David Hall 2023-09-06 21:19:10 -06:00
parent 039c96229b
commit 575d6f923f
3 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PInvoke/ComDlg32/ComDlg32.Funcs.cs
View File

@ -1,7 +1,3 @@
using System;
using System.Runtime.InteropServices;
using System.Text;
namespace Vanara.PInvoke;
/// <summary>Items from the ComDlg32.dll</summary>
@ -1163,11 +1159,11 @@ public static partial class ComDlg32
public static extern HWND FindText(ref FINDREPLACE Arg1);
/// <summary>Retrieves the name of the specified file.</summary>
/// <param name="arg1">
/// <param name="lpszPath">
/// <para>Type: <c>LPCTSTR</c></para>
/// <para>The name and location of a file.</para>
/// </param>
/// <param name="Buf">
/// <param name="lpszTitle">
/// <para>Type: <c>LPTSTR</c></para>
/// <para>The buffer that receives the name of the file.</para>
/// </param>
@ -1207,7 +1203,7 @@ public static partial class ComDlg32
// cchSize );
[DllImport(Lib_ComDlg32, SetLastError = false, CharSet = CharSet.Auto)]
[PInvokeData("commdlg.h", MSDNShortId = "NF:commdlg.GetFileTitleA")]
public static extern short GetFileTitle([MarshalAs(UnmanagedType.LPTStr)] string arg1, [MarshalAs(UnmanagedType.LPTStr)] StringBuilder Buf, ushort cchSize);
public static extern short GetFileTitle([MarshalAs(UnmanagedType.LPTStr)] string lpszPath, [MarshalAs(UnmanagedType.LPTStr)] StringBuilder? lpszTitle, ushort cchSize);
/// <summary>
/// <para>

31
PInvoke/ComDlg32/ComDlg32.cs
View File

@ -1,8 +1,3 @@
using System;
using System.Runtime.InteropServices;
using Vanara.Extensions;
using Vanara.InteropServices;
using static Vanara.PInvoke.Kernel32;
using static Vanara.PInvoke.User32;
@ -1787,7 +1782,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.FunctionPtr)]
public LPFRHOOKPROC lpfnHook;
public LPFRHOOKPROC? lpfnHook;
/// <summary>
/// <para>Type: <c>LPCTSTR</c></para>
@ -1798,7 +1793,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.LPTStr)]
public string lpTemplateName;
public string? lpTemplateName;
}
/// <summary>
@ -1961,7 +1956,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.LPTStr)]
public string lpstrFilter;
public string? lpstrFilter;
/// <summary>
/// <para>Type: <c>LPTSTR</c></para>
@ -2409,7 +2404,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.FunctionPtr)]
public LPOFNHOOKPROC lpfnHook;
public LPOFNHOOKPROC? lpfnHook;
/// <summary>
/// <para>Type: <c>LPCTSTR</c></para>
@ -2423,7 +2418,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.LPTStr)]
public string lpTemplateName;
public string? lpTemplateName;
/// <summary>
/// <para>Type: <c>void*</c></para>
@ -2717,7 +2712,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.FunctionPtr)]
public LPPAGEPAINTHOOK lpfnPagePaintHook;
public LPPAGEPAINTHOOK? lpfnPagePaintHook;
/// <summary>
/// <para>Type: <c>LPCTSTR</c></para>
@ -2729,7 +2724,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.LPTStr)]
public string lpPageSetupTemplateName;
public string? lpPageSetupTemplateName;
/// <summary>
/// <para>Type: <c>HGLOBAL</c></para>
@ -3122,7 +3117,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.FunctionPtr)]
public LPPRINTHOOKPROC lpfnPrintHook;
public LPPRINTHOOKPROC? lpfnPrintHook;
/// <summary>
/// <para>Type: <c>LPSETUPHOOKPROC</c></para>
@ -3132,7 +3127,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.FunctionPtr)]
public LPSETUPHOOKPROC lpfnSetupHook;
public LPSETUPHOOKPROC? lpfnSetupHook;
/// <summary>
/// <para>Type: <c>LPCTSTR</c></para>
@ -3143,7 +3138,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.LPTStr)]
public string lpPrintTemplateName;
public string? lpPrintTemplateName;
/// <summary>
/// <para>Type: <c>LPCTSTR</c></para>
@ -3154,7 +3149,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.LPTStr)]
public string lpSetupTemplateName;
public string? lpSetupTemplateName;
/// <summary>
/// <para>Type: <c>HGLOBAL</c></para>
@ -3559,7 +3554,7 @@ public static partial class ComDlg32
/// </para>
/// </summary>
[MarshalAs(UnmanagedType.LPTStr)]
public string lpPrintTemplateName;
public string? lpPrintTemplateName;
/// <summary>
/// <para>Type: <c>LPUNKNOWN</c></para>
@ -3576,7 +3571,7 @@ public static partial class ComDlg32
/// <para>If you do not want to retrieve any of the callback information, set <c>lpCallback</c> to <c>NULL</c>.</para>
/// </summary>
[MarshalAs(UnmanagedType.IUnknown)]
public object lpCallback;
public object? lpCallback;
/// <summary>
/// <para>Type: <c>DWORD</c></para>

2
UnitTests/PInvoke/ComDlg32/ComDlg32Tests.cs
View File

@ -48,7 +48,7 @@ public class ComDlg32Tests
Flags = OFN.OFN_PATHMUSTEXIST | OFN.OFN_FILEMUSTEXIST
};
Assert.That(GetOpenFileName(ref ofn), Is.True);
Assert.That(ofn.lpstrFilter.Length, Is.GreaterThan(0));
Assert.That(ofn.lpstrFilter?.Length ?? 0, Is.GreaterThan(0));
}
[Test]