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

Undid changes to params of INamespaceWalkCB and INamespaceWalkCB2

master
David Hall 2024-06-17 13:40:53 -04:00
parent 45f4493f7a
commit 4620e983be
2 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PInvoke/Shell32/ShObjIdl.INamespaceWalk.cs
View File

@ -256,7 +256,7 @@ public static partial class Shell32
// https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-founditem HRESULT // https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-founditem HRESULT
// FoundItem( IShellFolder *psf, PCUITEMID_CHILD pidl ); // FoundItem( IShellFolder *psf, PCUITEMID_CHILD pidl );
[PreserveSig] [PreserveSig]
HRESULT FoundItem([In] IShellFolder psf, [In] PIDL pidl); HRESULT FoundItem([In] IShellFolder psf, [In] IntPtr pidl);
/// <summary> /// <summary>
/// Called when a folder is about to be entered during a namespace walk. Use this method for any initialization of the retrieved item. /// Called when a folder is about to be entered during a namespace walk. Use this method for any initialization of the retrieved item.
@ -276,7 +276,7 @@ public static partial class Shell32
// https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-enterfolder HRESULT // https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-enterfolder HRESULT
// EnterFolder( IShellFolder *psf, PCUITEMID_CHILD pidl ); // EnterFolder( IShellFolder *psf, PCUITEMID_CHILD pidl );
[PreserveSig] [PreserveSig]
HRESULT EnterFolder([In] IShellFolder psf, [In] PIDL pidl); HRESULT EnterFolder([In] IShellFolder psf, [In] IntPtr pidl);
/// <summary> /// <summary>
/// Called after a namespace walk through a folder. Use this method to perform any necessary cleanup following the actions /// Called after a namespace walk through a folder. Use this method to perform any necessary cleanup following the actions
@ -297,7 +297,7 @@ public static partial class Shell32
// https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-leavefolder HRESULT // https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-leavefolder HRESULT
// LeaveFolder( IShellFolder *psf, PCUITEMID_CHILD pidl ); // LeaveFolder( IShellFolder *psf, PCUITEMID_CHILD pidl );
[PreserveSig] [PreserveSig]
HRESULT LeaveFolder([In] IShellFolder psf, [In] PIDL pidl); HRESULT LeaveFolder([In] IShellFolder psf, [In] IntPtr pidl);
/// <summary> /// <summary>
/// Initializes the window title and cancel button text of the progress dialog box displayed during the namespace walk. /// Initializes the window title and cancel button text of the progress dialog box displayed during the namespace walk.
@ -355,7 +355,7 @@ public static partial class Shell32
// https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-founditem HRESULT // https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-founditem HRESULT
// FoundItem( IShellFolder *psf, PCUITEMID_CHILD pidl ); // FoundItem( IShellFolder *psf, PCUITEMID_CHILD pidl );
[PreserveSig] [PreserveSig]
new HRESULT FoundItem([In] IShellFolder psf, [In] PIDL pidl); new HRESULT FoundItem([In] IShellFolder psf, [In] IntPtr pidl);
/// <summary> /// <summary>
/// Called when a folder is about to be entered during a namespace walk. Use this method for any initialization of the retrieved item. /// Called when a folder is about to be entered during a namespace walk. Use this method for any initialization of the retrieved item.
@ -375,7 +375,7 @@ public static partial class Shell32
// https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-enterfolder HRESULT // https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-enterfolder HRESULT
// EnterFolder( IShellFolder *psf, PCUITEMID_CHILD pidl ); // EnterFolder( IShellFolder *psf, PCUITEMID_CHILD pidl );
[PreserveSig] [PreserveSig]
new HRESULT EnterFolder([In] IShellFolder psf, [In] PIDL pidl); new HRESULT EnterFolder([In] IShellFolder psf, [In] IntPtr pidl);
/// <summary> /// <summary>
/// Called after a namespace walk through a folder. Use this method to perform any necessary cleanup following the actions /// Called after a namespace walk through a folder. Use this method to perform any necessary cleanup following the actions
@ -396,7 +396,7 @@ public static partial class Shell32
// https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-leavefolder HRESULT // https://docs.microsoft.com/en-us/windows/desktop/api/shobjidl_core/nf-shobjidl_core-inamespacewalkcb-leavefolder HRESULT
// LeaveFolder( IShellFolder *psf, PCUITEMID_CHILD pidl ); // LeaveFolder( IShellFolder *psf, PCUITEMID_CHILD pidl );
[PreserveSig] [PreserveSig]
new HRESULT LeaveFolder([In] IShellFolder psf, [In] PIDL pidl); new HRESULT LeaveFolder([In] IShellFolder psf, [In] IntPtr pidl);
/// <summary> /// <summary>
/// Initializes the window title and cancel button text of the progress dialog box displayed during the namespace walk. /// Initializes the window title and cancel button text of the progress dialog box displayed during the namespace walk.

67
UnitTests/PInvoke/Shell32/ExplorerTests.cs
View File

@ -16,7 +16,7 @@ public class ExplorerTests
using var pFolder = ComReleaserFactory.Create((IShellFolder2)new MyDocuments()); using var pFolder = ComReleaserFactory.Create((IShellFolder2)new MyDocuments());
INamespaceWalk walk = new(); INamespaceWalk walk = new();
WalkerCallback callback = new("Progress Title", "Cancel"); WalkerCallback callback = new("Progress Title", "Cancel");
List<string> mycnt = new(); List<string> mycnt = [];
callback.ItemFound += (f, p) => mycnt.Add(pFolder.Item.GetDisplayNameOf(SHGDNF.SHGDN_FORPARSING, p) ?? ""); callback.ItemFound += (f, p) => mycnt.Add(pFolder.Item.GetDisplayNameOf(SHGDNF.SHGDN_FORPARSING, p) ?? "");
Assert.That(walk.Walk(pFolder.Item, NAMESPACEWALKFLAG.NSWF_NONE_IMPLIES_ALL | NAMESPACEWALKFLAG.NSWF_DONT_ACCUMULATE_RESULT | NAMESPACEWALKFLAG.NSWF_SHOW_PROGRESS, 0, callback), ResultIs.Successful); Assert.That(walk.Walk(pFolder.Item, NAMESPACEWALKFLAG.NSWF_NONE_IMPLIES_ALL | NAMESPACEWALKFLAG.NSWF_DONT_ACCUMULATE_RESULT | NAMESPACEWALKFLAG.NSWF_SHOW_PROGRESS, 0, callback), ResultIs.Successful);
Assert.That(mycnt.Count, Is.GreaterThan(0)); Assert.That(mycnt.Count, Is.GreaterThan(0));
@ -40,24 +40,12 @@ public class ExplorerTests
using var pFolder = ComReleaserFactory.Create((IShellFolder2)new MyDocuments()); using var pFolder = ComReleaserFactory.Create((IShellFolder2)new MyDocuments());
ShellNamespaceWalker walker = new(pFolder.Item, 0, NAMESPACEWALKFLAG.NSWF_NONE_IMPLIES_ALL | NAMESPACEWALKFLAG.NSWF_DONT_ACCUMULATE_RESULT); ShellNamespaceWalker walker = new(pFolder.Item, 0, NAMESPACEWALKFLAG.NSWF_NONE_IMPLIES_ALL | NAMESPACEWALKFLAG.NSWF_DONT_ACCUMULATE_RESULT);
var items = walker.ToArray(); var items = walker.ToArray();
Assert.That(items, Has.Length.GreaterThanOrEqualTo(30)); Assert.That(items, Has.Length.GreaterThanOrEqualTo(1));
items.WriteValues(); items.WriteValues();
} }
public class ShellNamespaceWalker(object objToWalk, int depth, NAMESPACEWALKFLAG flags) : IEnumerable<IShellItem>, IAsyncEnumerable<IShellItem>
public class ShellNamespaceWalker : IEnumerable<IShellItem>, IAsyncEnumerable<IShellItem>
{ {
private readonly object objToWalk;
private readonly int depth;
private readonly NAMESPACEWALKFLAG flags;
public ShellNamespaceWalker(object objToWalk, int depth, NAMESPACEWALKFLAG flags)
{
this.objToWalk = objToWalk;
this.depth = depth;
this.flags = flags;
}
IAsyncEnumerator<IShellItem> IAsyncEnumerable<IShellItem>.GetAsyncEnumerator(CancellationToken cancellationToken) => throw new NotImplementedException(); IAsyncEnumerator<IShellItem> IAsyncEnumerable<IShellItem>.GetAsyncEnumerator(CancellationToken cancellationToken) => throw new NotImplementedException();
IEnumerator<IShellItem> IEnumerable<IShellItem>.GetEnumerator() IEnumerator<IShellItem> IEnumerable<IShellItem>.GetEnumerator()
@ -83,34 +71,37 @@ public class ExplorerTests
IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable<IShellItem>)this).GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable<IShellItem>)this).GetEnumerator();
} }
class WalkerCallback : INamespaceWalkCB2, IActionProgress private class WalkerCallback(string progressDlgTitle = "", string progressDlgCancelText = "Cancel") : INamespaceWalkCB2, IActionProgress
{ {
private readonly string cancel;
private readonly string title;
public WalkerCallback(string progressDlgTitle = "", string progressDlgCancelText = "Cancel")
{
cancel = progressDlgCancelText;
title = progressDlgTitle;
}
public event Action<IShellFolder, PIDL>? ItemFound;
public event Action<IShellFolder, PIDL>? FolderEntered;
public event Action<IShellFolder, PIDL>? FolderLeft;
public event Action<HRESULT>? Completed; public event Action<HRESULT>? Completed;
public HRESULT FoundItem([In] IShellFolder psf, [In] IntPtr pidl) { ItemFound?.Invoke(psf, new PIDL(pidl, true)); return HRESULT.S_OK; } public event Action<IShellFolder, PIDL>? FolderEntered;
public HRESULT EnterFolder([In] IShellFolder psf, [In] IntPtr pidl) { FolderEntered?.Invoke(psf, new PIDL(pidl, true)); return HRESULT.S_OK; }
public HRESULT LeaveFolder([In] IShellFolder psf, [In] IntPtr pidl) { FolderLeft?.Invoke(psf, new PIDL(pidl, true)); return HRESULT.S_OK; } public event Action<IShellFolder, PIDL>? FolderLeft;
public HRESULT InitializeProgressDialog([MarshalAs(UnmanagedType.LPWStr), Out] out string ppszTitle, [MarshalAs(UnmanagedType.LPWStr), Out] out string ppszCancel)
{ ppszTitle = title; ppszCancel = cancel; return HRESULT.S_OK; } public event Action<IShellFolder, PIDL>? ItemFound;
public HRESULT WalkComplete(HRESULT hr) { Completed?.Invoke(hr); return HRESULT.S_OK; }
public void Begin(SPACTION action, SPBEGINF flags) { } public void Begin(SPACTION action, SPBEGINF flags) { }
public void UpdateProgress(ulong ulCompleted, ulong ulTotal) { }
public void UpdateText(SPTEXT sptext, [In, MarshalAs(UnmanagedType.LPWStr)] string pszText, [MarshalAs(UnmanagedType.Bool)] bool fMayCompact) { }
public bool QueryCancel() => false;
public void ResetCancel() { }
public void End() { } public void End() { }
public HRESULT EnterFolder([In] IShellFolder psf, [In] IntPtr pidl) { FolderEntered?.Invoke(psf, new PIDL(pidl, true)); return HRESULT.S_OK; }
public HRESULT FoundItem([In] IShellFolder psf, [In] IntPtr pidl) { ItemFound?.Invoke(psf, new PIDL(pidl, true)); return HRESULT.S_OK; }
public HRESULT InitializeProgressDialog([MarshalAs(UnmanagedType.LPWStr), Out] out string ppszTitle, [MarshalAs(UnmanagedType.LPWStr), Out] out string ppszCancel)
{ ppszTitle = progressDlgTitle; ppszCancel = progressDlgCancelText; return HRESULT.S_OK; }
public HRESULT LeaveFolder([In] IShellFolder psf, [In] IntPtr pidl) { FolderLeft?.Invoke(psf, new PIDL(pidl, true)); return HRESULT.S_OK; }
public bool QueryCancel() => false;
public void ResetCancel() { }
public void UpdateProgress(ulong ulCompleted, ulong ulTotal) { }
public void UpdateText(SPTEXT sptext, [In, MarshalAs(UnmanagedType.LPWStr)] string pszText, [MarshalAs(UnmanagedType.Bool)] bool fMayCompact) { }
public HRESULT WalkComplete(HRESULT hr) { Completed?.Invoke(hr); return HRESULT.S_OK; }
} }
} }