From 0647aab21eba05895cd44d7c137efed5d846f489 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Sun, 28 Nov 2021 02:49:45 -0500 Subject: [PATCH] Minor cleanup --- src/Windows/Avalonia.Win32/SystemDialogImpl.cs | 7 +------ src/Windows/Avalonia.Win32/Win32Com/win32.idl | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs index 6a609273a5..29844368db 100644 --- a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs +++ b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs @@ -170,11 +170,6 @@ namespace Avalonia.Win32 }); } - private unsafe IShellItem GetShellItemFromPtr(IntPtr ptr) - { - return MicroComRuntime.CreateProxyFor(ptr, true); - } - private unsafe string? GetAbsoluteFilePath(IShellItem shellItem) { var pszString = new IntPtr(shellItem.GetDisplayName(SIGDN_FILESYSPATH)); @@ -214,7 +209,7 @@ namespace Avalonia.Win32 { var filterStr = new UnmanagedMethods.COMDLG_FILTERSPEC { - pszName = filter.Name, + pszName = filter.Name ?? string.Empty, pszSpec = string.Join(";", filter.Extensions.Select(e => "*." + e)) }; diff --git a/src/Windows/Avalonia.Win32/Win32Com/win32.idl b/src/Windows/Avalonia.Win32/Win32Com/win32.idl index 4a39782e02..904ac41ff2 100644 --- a/src/Windows/Avalonia.Win32/Win32Com/win32.idl +++ b/src/Windows/Avalonia.Win32/Win32Com/win32.idl @@ -24,9 +24,9 @@ @clr-map UINT64 ulong @clr-map DOUBLE double @clr-map GUID System.Guid -@clr-map WCHAR System.Char @clr-map REFGUID System.Guid* @clr-map REFIID System.Guid* +@clr-map WCHAR System.Char [flags] enum FILEOPENDIALOGOPTIONS