Browse Source

Minor cleanup

pull/7028/head
Max Katz 5 years ago
parent
commit
0647aab21e
  1. 7
      src/Windows/Avalonia.Win32/SystemDialogImpl.cs
  2. 2
      src/Windows/Avalonia.Win32/Win32Com/win32.idl

7
src/Windows/Avalonia.Win32/SystemDialogImpl.cs

@ -170,11 +170,6 @@ namespace Avalonia.Win32
}); });
} }
private unsafe IShellItem GetShellItemFromPtr(IntPtr ptr)
{
return MicroComRuntime.CreateProxyFor<IShellItem>(ptr, true);
}
private unsafe string? GetAbsoluteFilePath(IShellItem shellItem) private unsafe string? GetAbsoluteFilePath(IShellItem shellItem)
{ {
var pszString = new IntPtr(shellItem.GetDisplayName(SIGDN_FILESYSPATH)); var pszString = new IntPtr(shellItem.GetDisplayName(SIGDN_FILESYSPATH));
@ -214,7 +209,7 @@ namespace Avalonia.Win32
{ {
var filterStr = new UnmanagedMethods.COMDLG_FILTERSPEC var filterStr = new UnmanagedMethods.COMDLG_FILTERSPEC
{ {
pszName = filter.Name, pszName = filter.Name ?? string.Empty,
pszSpec = string.Join(";", filter.Extensions.Select(e => "*." + e)) pszSpec = string.Join(";", filter.Extensions.Select(e => "*." + e))
}; };

2
src/Windows/Avalonia.Win32/Win32Com/win32.idl

@ -24,9 +24,9 @@
@clr-map UINT64 ulong @clr-map UINT64 ulong
@clr-map DOUBLE double @clr-map DOUBLE double
@clr-map GUID System.Guid @clr-map GUID System.Guid
@clr-map WCHAR System.Char
@clr-map REFGUID System.Guid* @clr-map REFGUID System.Guid*
@clr-map REFIID System.Guid* @clr-map REFIID System.Guid*
@clr-map WCHAR System.Char
[flags] [flags]
enum FILEOPENDIALOGOPTIONS enum FILEOPENDIALOGOPTIONS

Loading…
Cancel
Save