Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for IFileOpenDialog #5319

Merged
merged 25 commits into from
Jan 26, 2022
Merged

Add support for IFileOpenDialog #5319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c4993cb
Add support for IFileOpenDialog
kant2002 Jul 22, 2021
f0d3117
Hello global usings!
kant2002 Jul 22, 2021
ce62802
Add missing COM Wrapper instantiation
kant2002 Jul 24, 2021
7d6b39e
Add support for IShellItem RCW
kant2002 Jul 27, 2021
88ae627
Change code style
kant2002 Aug 23, 2021
96b0680
Remove explicit namespace prefixes from types
kant2002 Aug 25, 2021
07b46bf
Update src/System.Windows.Forms.Primitives/src/Interop/WinFormsComWra…
kant2002 Sep 8, 2021
de55bc2
Apply PR feedback
kant2002 Dec 2, 2021
eba90af
Fix compilation errors
kant2002 Dec 2, 2021
a49372f
Make internal and sort
kant2002 Jan 15, 2022
e000a59
Remove BOM
kant2002 Jan 15, 2022
9522d13
Show fixed for scopes
kant2002 Jan 15, 2022
a2699c9
Remove not needed property
kant2002 Jan 15, 2022
6bfe9a1
Use Interop.HRESULT instead of int
kant2002 Jan 15, 2022
d60192d
Apply PR feedback
kant2002 Jan 18, 2022
265439e
Free string
kant2002 Jan 18, 2022
22486b6
Fix compilation error
kant2002 Jan 18, 2022
520d250
Remove else
kant2002 Jan 18, 2022
d2166bb
Apply formatting
kant2002 Jan 18, 2022
a7afcb8
Apply PR feedback
kant2002 Jan 18, 2022
d06f15e
Change all fields to properties
kant2002 Jan 19, 2022
84ef51c
MArshal out values even in case of error
kant2002 Jan 19, 2022
c7ce986
PR feedback
kant2002 Jan 19, 2022
ac142c4
Handle empty array marshalling
kant2002 Jan 21, 2022
e15e540
Perform unwrapping of CCW to IntPtr inside ComWrapper
kant2002 Jan 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/System.Windows.Forms.Primitives/src/Interop/Interop.IID.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,22 @@ internal static class IID
// 618736E0-3C3D-11CF-810C-00AA00389B71
public static Guid IAccessible = new Guid(0x618736E0, 0x3C3D, 0x11CF, 0x81, 0x0C, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should have a follow up issue/PR to get this one fixed. Part of the idea here with using static properties is to avoid accidentally modifying these values. :)


// D57C7288-D4AD-4768-BE02-9D969532D960
internal static Guid IFileOpenDialog { get; } = new(0xD57C7288, 0xD4AD, 0x4768, 0xBE, 0x02, 0x9D, 0x96, 0x95, 0x32, 0xD9, 0x60);

// 973510DB-7D7F-452B-8975-74A85828D354
internal static Guid IFileDialogEvents { get; } = new(0x973510DB, 0x7D7F, 0x452B, 0x89, 0x75, 0x74, 0xA8, 0x58, 0x28, 0xD3, 0x54);

// 00000109-0000-0000-C000-000000000046
public static Guid IPersistStream = new Guid(0x00000109, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
public static Guid IPersistStream { get; } = new(0x00000109, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);

// 7BF80980-BF32-101A-8BBB-00AA00300CAB
public static Guid IPicture = new Guid(0x7BF80980, 0xBF32, 0x101A, 0x8B, 0xBB, 0x00, 0xAA, 0x00, 0x30, 0x0C, 0xAB);
public static Guid IPicture { get; } = new(0x7BF80980, 0xBF32, 0x101A, 0x8B, 0xBB, 0x00, 0xAA, 0x00, 0x30, 0x0C, 0xAB);

// 43826D1E-E718-42EE-BC55-A1E261C37BFE
internal static Guid IShellItem { get; } = new(0x43826D1E, 0xE718, 0x42EE, 0xBC, 0x55, 0xA1, 0xE2, 0x61, 0xC3, 0x7B, 0xFE);

// 0000000C-0000-0000-C000-000000000046
public static Guid IStream = new Guid(0x0000000C, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
public static Guid IStream { get; } = new(0x0000000C, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
}
}
8 changes: 8 additions & 0 deletions src/System.Windows.Forms.Primitives/src/Interop/Ole32/Interop.CoCreateInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,13 @@ internal static partial class Ole32
CLSCTX dwClsContext,
ref Guid riid,
[MarshalAs(UnmanagedType.Interface)] out object ppv);

[DllImport(Libraries.Ole32, ExactSpelling = true)]
public static extern HRESULT CoCreateInstance(
ref Guid rclsid,
IntPtr punkOuter,
CLSCTX dwClsContext,
ref Guid riid,
out IntPtr ppv);
}
}
6 changes: 3 additions & 3 deletions src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.COMDLG_FILTERSPEC.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ internal partial class Interop
{
internal static partial class Shell32
{
[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
[StructLayout(LayoutKind.Sequential)]
public struct COMDLG_FILTERSPEC
{
public string? pszName;
public string? pszSpec;
public IntPtr pszName;
public IntPtr pszSpec;
}
}
}
8 changes: 4 additions & 4 deletions src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ public interface IFileDialog
IShellItem psi);

void GetFolder(
out IShellItem ppsi);
out IShellItem? ppsi);

[PreserveSig]
HRESULT GetCurrentSelection(
out IShellItem ppsi);
out IShellItem? ppsi);

void SetFileName(
[MarshalAs(UnmanagedType.LPWStr)] string pszName);

void GetFileName(
[MarshalAs(UnmanagedType.LPWStr)] out string pszName);
[MarshalAs(UnmanagedType.LPWStr)] out string? pszName);

void SetTitle(
[MarshalAs(UnmanagedType.LPWStr)] string pszTitle);
Expand All @@ -73,7 +73,7 @@ public interface IFileDialog
[MarshalAs(UnmanagedType.LPWStr)] string pszLabel);

void GetResult(
out IShellItem ppsi);
out IShellItem? ppsi);

[PreserveSig]
HRESULT AddPlace(
Expand Down
12 changes: 6 additions & 6 deletions src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IFileOpenDialog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@ public interface IFileOpenDialog : IFileDialog
IShellItem psi);

void GetFolder(
out IShellItem ppsi);
out IShellItem? ppsi);

[PreserveSig]
HRESULT GetCurrentSelection(
out IShellItem ppsi);
out IShellItem? ppsi);

void SetFileName(
[MarshalAs(UnmanagedType.LPWStr)] string pszName);

void GetFileName(
[MarshalAs(UnmanagedType.LPWStr)] out string pszName);
[MarshalAs(UnmanagedType.LPWStr)] out string? pszName);

void SetTitle(
[MarshalAs(UnmanagedType.LPWStr)] string pszTitle);
Expand All @@ -74,7 +74,7 @@ public interface IFileOpenDialog : IFileDialog
[MarshalAs(UnmanagedType.LPWStr)] string pszLabel);

void GetResult(
out IShellItem ppsi);
out IShellItem? ppsi);

[PreserveSig]
HRESULT AddPlace(
Expand All @@ -98,11 +98,11 @@ public interface IFileOpenDialog : IFileDialog
IntPtr pFilter);

void GetResults(
out IShellItemArray ppenum);
out IShellItemArray? ppenum);

[PreserveSig]
HRESULT GetSelectedItems(
out IShellItemArray ppsai);
out IShellItemArray? ppsai);
}
#pragma warning restore CS0108
}
Expand Down
4 changes: 2 additions & 2 deletions src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.IShellItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ public interface IShellItem

[PreserveSig]
HRESULT GetParent(
out IShellItem ppsi);
out IShellItem? ppsi);

[PreserveSig]
HRESULT GetDisplayName(
SIGDN sigdnName,
[MarshalAs(UnmanagedType.LPWStr)] out string ppszName);
[MarshalAs(UnmanagedType.LPWStr)] out string? ppszName);

[PreserveSig]
HRESULT GetAttributes(
Expand Down
19 changes: 19 additions & 0 deletions src/System.Windows.Forms.Primitives/src/Interop/Shell32/Interop.SHCreateShellItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ internal static partial class Shell32
[DllImport(Libraries.Shell32, ExactSpelling = true)]
public static extern HRESULT SHCreateShellItem(IntPtr pidlParent, IntPtr psfParent, IntPtr pidl, out IShellItem ppsi);

[DllImport(Libraries.Shell32, EntryPoint = "SHCreateShellItem", ExactSpelling = true)]
public static extern HRESULT SHCreateShellItemViaComWrappers(IntPtr pidlParent, IntPtr psfParent, IntPtr pidl, out IntPtr ppsi);

public static IShellItem GetShellItemForPath(string path)
{
if (SHParseDisplayName(path, IntPtr.Zero, out IntPtr pidl, 0, out uint _).Succeeded())
Expand All @@ -24,5 +27,21 @@ public static IShellItem GetShellItemForPath(string path)

throw new FileNotFoundException();
}

public static IShellItem GetShellItemForPathViaComWrappers(string path)
{
if (SHParseDisplayName(path, IntPtr.Zero, out IntPtr pidl, 0, out uint _).Succeeded())
{
// No parent specified
if (SHCreateShellItemViaComWrappers(IntPtr.Zero, IntPtr.Zero, pidl, out IntPtr ret).Succeeded())
{
var obj = WinFormsComWrappers.Instance
.GetOrCreateObjectForComInstance(ret, CreateObjectFlags.None);
return (IShellItem)obj;
}
}

throw new FileNotFoundException();
}
}
}