Skip to content

Commit fa8533d

Browse files
0x5bfa0x5bfa
committed
Updated
1 parent 3d470ff commit fa8533d

File tree

11 files changed

+135
-196
lines changed

11 files changed

+135
-196
lines changed

‎src/Files.App.CsWin32/ComPtr`1.cs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,6 @@ public void Attach(T* other)
6464
return (T**)Unsafe.AsPointer(ref Unsafe.AsRef(in this));
6565
}
6666

67-
[MethodImpl(MethodImplOptions.AggressiveInlining)]
68-
[Obsolete("Use `HRESULT As<U>(U** other)` instead.")]
69-
public readonly ComPtr<U> As<U>() where U : unmanaged, IComIID
70-
{
71-
ComPtr<U> ptr = default;
72-
((IUnknown*)_ptr)->QueryInterface((Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in U.Guid)), (void**)ptr.GetAddressOf());
73-
return ptr;
74-
}
75-
7667
[MethodImpl(MethodImplOptions.AggressiveInlining)]
7768
public readonly HRESULT As<U>(U** other) where U : unmanaged, IComIID
7869
{
@@ -91,22 +82,6 @@ public readonly HRESULT CoCreateInstance(Guid* rclsid, IUnknown* pUnkOuter = nul
9182
return PInvoke.CoCreateInstance(rclsid, pUnkOuter, dwClsContext, (Guid*)Unsafe.AsPointer(ref Unsafe.AsRef(in T.Guid)), (void**)this.GetAddressOf());
9283
}
9384

94-
// Conversion operators
95-
96-
[MethodImpl(MethodImplOptions.AggressiveInlining)]
97-
public static implicit operator ComPtr<T>(T* other)
98-
{
99-
ComPtr<T> ptr = default;
100-
ptr.Attach(other);
101-
return ptr;
102-
}
103-
104-
[MethodImpl(MethodImplOptions.AggressiveInlining)]
105-
public static implicit operator T*(ComPtr<T> other)
106-
{
107-
return other._ptr;
108-
}
109-
11085
// Disposer
11186

11287
[MethodImpl(MethodImplOptions.AggressiveInlining)]

‎src/Files.App.CsWin32/ManualGuid.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ public static Guid* IID_IStorageProviderStatusUISourceFactory
4141

4242
[GuidRVAGen.Guid("00021500-0000-0000-C000-000000000046")]
4343
public static partial Guid* IID_IQueryInfo { get; }
44+
45+
[GuidRVAGen.Guid("BCC18B79-BA16-442F-80C4-8A59C30C463B")]
46+
public static partial Guid* IID_IShellItemImageFactory { get; }
47+
48+
[GuidRVAGen.Guid("000214F9-0000-0000-C000-000000000046")]
49+
public static partial Guid* IID_IShellLinkW { get; }
4450
}
4551

4652
public static unsafe partial class CLSID

‎src/Files.App.Storage/Storables/HomeFolder/HomeFolder.cs

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace Files.App.Storage.Storables
99
{
10-
public partial class HomeFolder : IHomeFolder
10+
public unsafe partial class HomeFolder : IHomeFolder
1111
{
1212
public string Id => "Home"; // Will be "files://Home" in the future.
1313

@@ -48,38 +48,36 @@ public IAsyncEnumerable<IStorableChild> GetQuickAccessFolderAsync(CancellationTo
4848
/// <inheritdoc/>
4949
public IAsyncEnumerable<IStorableChild> GetLogicalDrivesAsync(CancellationToken cancellationToken = default)
5050
{
51-
return GetLogicalDrives().ToAsyncEnumerable();
51+
var availableDrives = PInvoke.GetLogicalDrives();
52+
if (availableDrives is 0)
53+
return Enumerable.Empty<IStorableChild>().ToAsyncEnumerable();
5254

53-
IEnumerable<IStorableChild> GetLogicalDrives()
54-
{
55-
var availableDrives = PInvoke.GetLogicalDrives();
56-
if (availableDrives is 0)
57-
yield break;
58-
59-
int count = BitOperations.PopCount(availableDrives);
60-
var driveLetters = new char[count];
55+
int count = BitOperations.PopCount(availableDrives);
56+
var driveLetters = new char[count];
6157

62-
count = 0;
63-
char driveLetter = 'A';
64-
while (availableDrives is not 0)
65-
{
66-
if ((availableDrives & 1) is not 0)
67-
driveLetters[count++] = driveLetter;
58+
count = 0;
59+
char driveLetter = 'A';
60+
while (availableDrives is not 0)
61+
{
62+
if ((availableDrives & 1) is not 0)
63+
driveLetters[count++] = driveLetter;
6864

69-
availableDrives >>= 1;
70-
driveLetter++;
71-
}
65+
availableDrives >>= 1;
66+
driveLetter++;
67+
}
7268

73-
foreach (char letter in driveLetters)
74-
{
75-
cancellationToken.ThrowIfCancellationRequested();
69+
List<IStorableChild> driveItems = [];
70+
foreach (char letter in driveLetters)
71+
{
72+
cancellationToken.ThrowIfCancellationRequested();
7673

77-
if (WindowsStorable.TryParse($"{letter}:\\") is not IWindowsStorable driveRoot)
78-
throw new InvalidOperationException();
74+
if (WindowsStorable.TryParse($"{letter}:\\") is not IWindowsStorable driveRoot)
75+
throw new InvalidOperationException();
7976

80-
yield return new WindowsFolder(driveRoot.ThisPtr);
81-
}
77+
driveItems.Add(new WindowsFolder(driveRoot.ThisPtr));
8278
}
79+
80+
return driveItems.ToAsyncEnumerable();
8381
}
8482

8583
/// <inheritdoc/>

‎src/Files.App.Storage/Storables/WindowsStorage/IWindowsStorable.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
// Copyright (c) Files Community
22
// Licensed under the MIT License.
33

4-
using Windows.Win32;
54
using Windows.Win32.UI.Shell;
65

76
namespace Files.App.Storage
87
{
9-
public interface IWindowsStorable : IStorableChild, IEquatable<IWindowsStorable>, IDisposable
8+
public unsafe interface IWindowsStorable : IStorableChild, IEquatable<IWindowsStorable>, IDisposable
109
{
11-
ComPtr<IShellItem> ThisPtr { get; }
10+
IShellItem* ThisPtr { get; }
1211
}
1312
}

‎src/Files.App.Storage/Storables/WindowsStorage/WindowsBulkOperations.cs

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ namespace Files.App.Storage
1212
/// <summary>
1313
/// Handles bulk file operations in Windows, such as copy, move, delete, create, and rename, supporting progress tracking and event notifications.
1414
/// </summary>
15-
public sealed partial class WindowsBulkOperations : IDisposable
15+
public unsafe partial class WindowsBulkOperations : IDisposable
1616
{
1717
// Fields
1818

19-
private readonly ComPtr<IFileOperation> _pFileOperation;
20-
private readonly ComPtr<IFileOperationProgressSink> _pProgressSink;
19+
private readonly IFileOperation* _pFileOperation;
20+
private readonly IFileOperationProgressSink* _pProgressSink;
2121
private readonly uint _progressSinkCookie;
2222

2323
// Events
@@ -70,24 +70,20 @@ public sealed partial class WindowsBulkOperations : IDisposable
7070
/// <param name="flags">Defines the behavior of the file operation, such as allowing undo and suppressing directory confirmation.</param>
7171
public unsafe WindowsBulkOperations(HWND ownerHWnd = default, FILEOPERATION_FLAGS flags = FILEOPERATION_FLAGS.FOF_ALLOWUNDO | FILEOPERATION_FLAGS.FOF_NOCONFIRMMKDIR)
7272
{
73-
var clsid = typeof(FileOperation).GUID;
74-
var iid = typeof(IFileOperation).GUID;
73+
IFileOperation* pFileOperation = null;
7574

76-
HRESULT hr = PInvoke.CoCreateInstance(
77-
&clsid,
78-
null,
79-
CLSCTX.CLSCTX_LOCAL_SERVER,
80-
&iid,
81-
(void**)_pFileOperation.GetAddressOf())
82-
.ThrowIfFailedOnDebug();
75+
HRESULT hr = PInvoke.CoCreateInstance(CLSID.CLSID_FileOperation, null, CLSCTX.CLSCTX_LOCAL_SERVER, IID.IID_IFileOperation, (void**)&pFileOperation);
76+
hr.ThrowIfFailedOnDebug();
77+
78+
_pFileOperation = pFileOperation;
8379

8480
if (ownerHWnd != default)
85-
hr = _pFileOperation.Get()->SetOwnerWindow(ownerHWnd).ThrowIfFailedOnDebug();
81+
hr = _pFileOperation->SetOwnerWindow(ownerHWnd).ThrowIfFailedOnDebug();
8682

87-
hr = _pFileOperation.Get()->SetOperationFlags(flags).ThrowIfFailedOnDebug();
83+
hr = _pFileOperation->SetOperationFlags(flags).ThrowIfFailedOnDebug();
8884

89-
_pProgressSink.Attach((IFileOperationProgressSink*)WindowsBulkOperationsSink.Create(this));
90-
hr = _pFileOperation.Get()->Advise(_pProgressSink.Get(), out var progressSinkCookie).ThrowIfFailedOnDebug();
85+
_pProgressSink = (IFileOperationProgressSink*)WindowsBulkOperationsSink.Create(this);
86+
hr = _pFileOperation->Advise(_pProgressSink, out var progressSinkCookie).ThrowIfFailedOnDebug();
9187
_progressSinkCookie = progressSinkCookie;
9288
}
9389

@@ -101,7 +97,7 @@ public unsafe WindowsBulkOperations(HWND ownerHWnd = default, FILEOPERATION_FLAG
10197
public unsafe HRESULT QueueCopyOperation(WindowsStorable targetItem, WindowsFolder destinationFolder, string? copyName)
10298
{
10399
fixed (char* pszCopyName = copyName)
104-
return _pFileOperation.Get()->CopyItem(targetItem.ThisPtr.Get(), destinationFolder.ThisPtr.Get(), pszCopyName, _pProgressSink.Get());
100+
return _pFileOperation->CopyItem(targetItem.ThisPtr, destinationFolder.ThisPtr, pszCopyName, _pProgressSink);
105101
}
106102

107103
/// <summary>
@@ -111,7 +107,7 @@ public unsafe HRESULT QueueCopyOperation(WindowsStorable targetItem, WindowsFold
111107
/// <returns>If this method succeeds, it returns <see cref="HRESULT.S_OK"/>. Otherwise, it returns an <see cref="HRESULT"/> error code.</returns>
112108
public unsafe HRESULT QueueDeleteOperation(WindowsStorable targetItem)
113109
{
114-
return _pFileOperation.Get()->DeleteItem(targetItem.ThisPtr.Get(), _pProgressSink.Get());
110+
return _pFileOperation->DeleteItem(targetItem.ThisPtr, _pProgressSink);
115111
}
116112

117113
/// <summary>
@@ -124,7 +120,7 @@ public unsafe HRESULT QueueDeleteOperation(WindowsStorable targetItem)
124120
public unsafe HRESULT QueueMoveOperation(WindowsStorable targetItem, WindowsFolder destinationFolder, string? newName)
125121
{
126122
fixed (char* pszNewName = newName)
127-
return _pFileOperation.Get()->MoveItem(targetItem.ThisPtr.Get(), destinationFolder.ThisPtr.Get(), pszNewName, null);
123+
return _pFileOperation->MoveItem(targetItem.ThisPtr, destinationFolder.ThisPtr, pszNewName, null);
128124
}
129125

130126
/// <summary>
@@ -138,7 +134,7 @@ public unsafe HRESULT QueueMoveOperation(WindowsStorable targetItem, WindowsFold
138134
public unsafe HRESULT QueueCreateOperation(WindowsFolder destinationFolder, FILE_FLAGS_AND_ATTRIBUTES fileAttributes, string name, string? templateName)
139135
{
140136
fixed (char* pszName = name, pszTemplateName = templateName)
141-
return _pFileOperation.Get()->NewItem(destinationFolder.ThisPtr.Get(), (uint)fileAttributes, pszName, pszTemplateName, _pProgressSink.Get());
137+
return _pFileOperation->NewItem(destinationFolder.ThisPtr, (uint)fileAttributes, pszName, pszTemplateName, _pProgressSink);
142138
}
143139

144140
/// <summary>
@@ -150,7 +146,7 @@ public unsafe HRESULT QueueCreateOperation(WindowsFolder destinationFolder, FILE
150146
public unsafe HRESULT QueueRenameOperation(WindowsStorable targetItem, string newName)
151147
{
152148
fixed (char* pszNewName = newName)
153-
return _pFileOperation.Get()->RenameItem(targetItem.ThisPtr.Get(), pszNewName, _pProgressSink.Get());
149+
return _pFileOperation->RenameItem(targetItem.ThisPtr, pszNewName, _pProgressSink);
154150
}
155151

156152
/// <summary>
@@ -159,19 +155,19 @@ public unsafe HRESULT QueueRenameOperation(WindowsStorable targetItem, string ne
159155
/// <returns>If this method succeeds, it returns <see cref="HRESULT.S_OK"/>. Otherwise, it returns an <see cref="HRESULT"/> error code.</returns>
160156
public unsafe HRESULT PerformAllOperations()
161157
{
162-
return _pFileOperation.Get()->PerformOperations();
158+
return _pFileOperation->PerformOperations();
163159
}
164160

165161
// Disposer
166162

167163
/// <inheritdoc/>
168164
public unsafe void Dispose()
169165
{
170-
if (!_pProgressSink.IsNull)
171-
_pFileOperation.Get()->Unadvise(_progressSinkCookie);
166+
if (_pProgressSink is not null)
167+
_pFileOperation->Unadvise(_progressSinkCookie);
172168

173-
_pFileOperation.Dispose();
174-
_pProgressSink.Dispose();
169+
_pFileOperation->Release();
170+
_pProgressSink->Release();
175171
}
176172
}
177173
}

‎src/Files.App.Storage/Storables/WindowsStorage/WindowsFile.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
namespace Files.App.Storage
99
{
1010
[DebuggerDisplay("{" + nameof(ToString) + "()}")]
11-
public sealed class WindowsFile : WindowsStorable, IWindowsFile
11+
public unsafe class WindowsFile : WindowsStorable, IWindowsFile
1212
{
13-
public WindowsFile(ComPtr<IShellItem> nativeObject)
13+
public WindowsFile(IShellItem* ptr)
1414
{
15-
ThisPtr = nativeObject;
15+
ThisPtr = ptr;
1616
}
1717

1818
public Task<Stream> OpenStreamAsync(FileAccess accessMode, CancellationToken cancellationToken = default)

‎src/Files.App.Storage/Storables/WindowsStorage/WindowsFolder.cs

Lines changed: 27 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Files Community
22
// Licensed under the MIT License.
33

4-
using System.Runtime.CompilerServices;
54
using Windows.Win32;
65
using Windows.Win32.Foundation;
76
using Windows.Win32.System.SystemServices;
@@ -10,80 +9,62 @@
109
namespace Files.App.Storage
1110
{
1211
[DebuggerDisplay("{" + nameof(ToString) + "()}")]
13-
public sealed class WindowsFolder : WindowsStorable, IWindowsFolder
12+
public unsafe class WindowsFolder : WindowsStorable, IWindowsFolder
1413
{
15-
public WindowsFolder(ComPtr<IShellItem> nativeObject)
14+
public WindowsFolder(IShellItem* ptr)
1615
{
17-
ThisPtr = nativeObject;
18-
}
19-
20-
public unsafe WindowsFolder(IShellItem* nativeObject)
21-
{
22-
ComPtr<IShellItem> ptr = default;
23-
ptr.Attach(nativeObject);
2416
ThisPtr = ptr;
2517
}
2618

27-
public unsafe WindowsFolder(Guid folderId)
19+
public WindowsFolder(Guid folderId)
2820
{
29-
ComPtr<IShellItem> pItem = default;
21+
IShellItem* pShellItem = default;
3022

31-
HRESULT hr = PInvoke.SHGetKnownFolderItem(&folderId, KNOWN_FOLDER_FLAG.KF_FLAG_DEFAULT, HANDLE.Null, IID.IID_IShellItem, (void**)pItem.GetAddressOf());
23+
HRESULT hr = PInvoke.SHGetKnownFolderItem(&folderId, KNOWN_FOLDER_FLAG.KF_FLAG_DEFAULT, HANDLE.Null, IID.IID_IShellItem, (void**)&pShellItem);
3224
if (hr.Failed)
3325
{
3426
fixed (char* pszShellPath = $"Shell:::{folderId:B}")
35-
hr = PInvoke.SHCreateItemFromParsingName(pszShellPath, null, IID.IID_IShellItem, (void**)pItem.GetAddressOf());
27+
hr = PInvoke.SHCreateItemFromParsingName(pszShellPath, null, IID.IID_IShellItem, (void**)&pShellItem);
3628

3729
// Invalid FOLDERID; this should never happen.
3830
hr.ThrowOnFailure();
3931
}
4032

41-
ThisPtr = pItem;
33+
ThisPtr = pShellItem;
4234
}
4335

4436
public IAsyncEnumerable<IStorableChild> GetItemsAsync(StorableType type = StorableType.All, CancellationToken cancellationToken = default)
4537
{
46-
return GetItems().ToAsyncEnumerable();
38+
using ComPtr<IEnumShellItems> pEnumShellItems = default;
4739

48-
unsafe IEnumerable<IStorableChild> GetItems()
49-
{
50-
ComPtr<IEnumShellItems> pEnumShellItems = default;
51-
GetEnumerator();
40+
HRESULT hr = ThisPtr->BindToHandler(null, BHID.BHID_EnumItems, IID.IID_IEnumShellItems, (void**)pEnumShellItems.GetAddressOf());
41+
if (hr.ThrowIfFailedOnDebug().Failed)
42+
return Enumerable.Empty<IStorableChild>().ToAsyncEnumerable();
5243

53-
ComPtr<IShellItem> pShellItem = default;
54-
while (GetNext() && !pShellItem.IsNull)
55-
{
56-
cancellationToken.ThrowIfCancellationRequested();
57-
var isFolder = pShellItem.HasShellAttributes(SFGAO_FLAGS.SFGAO_FOLDER);
44+
List<IStorableChild> childItems = [];
5845

59-
if (type is StorableType.File && !isFolder)
60-
{
61-
yield return new WindowsFile(pShellItem);
62-
}
63-
else if (type is StorableType.Folder && isFolder)
64-
{
65-
yield return new WindowsFolder(pShellItem);
66-
}
67-
else
68-
{
69-
continue;
70-
}
71-
}
46+
IShellItem* pChildShellItem = null;
47+
while (pEnumShellItems.Get()->Next(1, &pChildShellItem).Succeeded && pChildShellItem is not null)
48+
{
49+
cancellationToken.ThrowIfCancellationRequested();
7250

73-
yield break;
51+
bool isFolder = pChildShellItem->GetAttributes(SFGAO_FLAGS.SFGAO_FOLDER, out var returnedAttributes).Succeeded && returnedAttributes == SFGAO_FLAGS.SFGAO_FOLDER;
7452

75-
unsafe void GetEnumerator()
53+
if (type is StorableType.File && !isFolder)
7654
{
77-
HRESULT hr = ThisPtr.Get()->BindToHandler(null, BHID.BHID_EnumItems, IID.IID_IEnumShellItems, (void**)pEnumShellItems.GetAddressOf());
78-
hr.ThrowIfFailedOnDebug();
55+
childItems.Add(new WindowsFile(pChildShellItem));
7956
}
80-
81-
unsafe bool GetNext()
57+
else if (type is StorableType.Folder && isFolder)
8258
{
83-
HRESULT hr = pEnumShellItems.Get()->Next(1, pShellItem.GetAddressOf());
84-
return hr.ThrowIfFailedOnDebug() == HRESULT.S_OK;
59+
childItems.Add(new WindowsFolder(pChildShellItem));
60+
}
61+
else
62+
{
63+
continue;
8564
}
8665
}
66+
67+
return childItems.ToAsyncEnumerable();
8768
}
8869
}
8970
}

0 commit comments

Comments
 (0)