Skip to content

Commit acb2e07

Browse files
0x5bfa0x5bfa
committed
Init
1 parent 6b5bf5b commit acb2e07

20 files changed

+482
-151
lines changed

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ 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("000214E8-0000-0000-C000-000000000046")]
49+
public static partial Guid* IID_IShellExtInit { get; }
50+
51+
[GuidRVAGen.Guid("000214F4-0000-0000-C000-000000000046")]
52+
public static partial Guid* IID_IContextMenu2 { get; }
4453
}
4554

4655
public static unsafe partial class CLSID
@@ -59,6 +68,9 @@ public static unsafe partial class CLSID
5968

6069
[GuidRVAGen.Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C")]
6170
public static partial Guid* CLSID_ApplicationActivationManager { get; }
71+
72+
[GuidRVAGen.Guid("D969A300-E7FF-11d0-A93B-00A0C90F2719")]
73+
public static partial Guid* CLSID_NewMenu { get; }
6274
}
6375

6476
public static unsafe partial class BHID

‎src/Files.App.CsWin32/NativeMethods.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,3 +225,13 @@ QITIPF_FLAGS
225225
GetKeyboardState
226226
MapVirtualKey
227227
GetKeyboardLayout
228+
HKEY_CLASSES_ROOT
229+
HKEY_CURRENT_USER
230+
RegOpenKeyEx
231+
RegEnumKeyEx
232+
RegGetValue
233+
IShellExtInit
234+
IContextMenu2
235+
GetSubMenu
236+
GetMenuItemCount
237+
GetMenuItemInfo

‎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> items = [];
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+
items.Add(new WindowsFolder(driveRoot.ThisPtr));
8278
}
79+
80+
return items.ToAsyncEnumerable();
8381
}
8482

8583
/// <inheritdoc/>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright (c) Files Community
2+
// Licensed under the MIT License.
3+
4+
namespace Files.App.Storage
5+
{
6+
public enum ContextMenuType
7+
{
8+
Normal = 0x00000000,
9+
10+
Disabled = 0x00000003,
11+
12+
Checked = 0x00000008,
13+
14+
Highlighted = 0x00000080,
15+
16+
Default = 0x00001000,
17+
}
18+
}

‎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 : IDisposable
8+
public unsafe interface IWindowsStorable : IDisposable
109
{
11-
ComPtr<IShellItem> ThisPtr { get; }
10+
IShellItem* ThisPtr { get; }
1211
}
1312
}

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Copyright (c) Files Community
2+
// Licensed under the MIT License.
3+
4+
namespace Files.App.Storage
5+
{
6+
/// <summary>
7+
/// Represents a ShellNew item with its type, file extension, description, and icon.
8+
/// </summary>
9+
public partial class ShellNewItem
10+
{
11+
public ContextMenuType Type { get; set; } = ContextMenuType.Normal;
12+
13+
public uint Id { get; set; }
14+
15+
public byte[]? Icon { get; set; }
16+
17+
public string? Name { get; set; }
18+
}
19+
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public unsafe WindowsBulkOperations(HWND ownerHWnd = default, FILEOPERATION_FLAG
101101
public unsafe HRESULT QueueCopyOperation(WindowsStorable targetItem, WindowsFolder destinationFolder, string? copyName)
102102
{
103103
fixed (char* pszCopyName = copyName)
104-
return _pFileOperation.Get()->CopyItem(targetItem.ThisPtr.Get(), destinationFolder.ThisPtr.Get(), pszCopyName, _pProgressSink.Get());
104+
return _pFileOperation.Get()->CopyItem(targetItem.ThisPtr, destinationFolder.ThisPtr, pszCopyName, _pProgressSink.Get());
105105
}
106106

107107
/// <summary>
@@ -111,7 +111,7 @@ public unsafe HRESULT QueueCopyOperation(WindowsStorable targetItem, WindowsFold
111111
/// <returns>If this method succeeds, it returns <see cref="HRESULT.S_OK"/>. Otherwise, it returns an <see cref="HRESULT"/> error code.</returns>
112112
public unsafe HRESULT QueueDeleteOperation(WindowsStorable targetItem)
113113
{
114-
return _pFileOperation.Get()->DeleteItem(targetItem.ThisPtr.Get(), _pProgressSink.Get());
114+
return _pFileOperation.Get()->DeleteItem(targetItem.ThisPtr, _pProgressSink.Get());
115115
}
116116

117117
/// <summary>
@@ -124,7 +124,7 @@ public unsafe HRESULT QueueDeleteOperation(WindowsStorable targetItem)
124124
public unsafe HRESULT QueueMoveOperation(WindowsStorable targetItem, WindowsFolder destinationFolder, string? newName)
125125
{
126126
fixed (char* pszNewName = newName)
127-
return _pFileOperation.Get()->MoveItem(targetItem.ThisPtr.Get(), destinationFolder.ThisPtr.Get(), pszNewName, null);
127+
return _pFileOperation.Get()->MoveItem(targetItem.ThisPtr, destinationFolder.ThisPtr, pszNewName, null);
128128
}
129129

130130
/// <summary>
@@ -138,7 +138,7 @@ public unsafe HRESULT QueueMoveOperation(WindowsStorable targetItem, WindowsFold
138138
public unsafe HRESULT QueueCreateOperation(WindowsFolder destinationFolder, FILE_FLAGS_AND_ATTRIBUTES fileAttributes, string name, string? templateName)
139139
{
140140
fixed (char* pszName = name, pszTemplateName = templateName)
141-
return _pFileOperation.Get()->NewItem(destinationFolder.ThisPtr.Get(), (uint)fileAttributes, pszName, pszTemplateName, _pProgressSink.Get());
141+
return _pFileOperation.Get()->NewItem(destinationFolder.ThisPtr, (uint)fileAttributes, pszName, pszTemplateName, _pProgressSink.Get());
142142
}
143143

144144
/// <summary>
@@ -150,7 +150,7 @@ public unsafe HRESULT QueueCreateOperation(WindowsFolder destinationFolder, FILE
150150
public unsafe HRESULT QueueRenameOperation(WindowsStorable targetItem, string newName)
151151
{
152152
fixed (char* pszNewName = newName)
153-
return _pFileOperation.Get()->RenameItem(targetItem.ThisPtr.Get(), pszNewName, _pProgressSink.Get());
153+
return _pFileOperation.Get()->RenameItem(targetItem.ThisPtr, pszNewName, _pProgressSink.Get());
154154
}
155155

156156
/// <summary>

‎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, IChildFile
11+
public unsafe class WindowsFile : WindowsStorable, IChildFile
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: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,40 @@
1010
namespace Files.App.Storage
1111
{
1212
[DebuggerDisplay("{" + nameof(ToString) + "()}")]
13-
public sealed class WindowsFolder : WindowsStorable, IChildFolder
13+
public unsafe class WindowsFolder : WindowsStorable, IChildFolder
1414
{
15-
public WindowsFolder(ComPtr<IShellItem> nativeObject)
15+
internal IContextMenu* NewMenuPtr
1616
{
17-
ThisPtr = nativeObject;
17+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
18+
get;
19+
20+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
21+
set;
22+
}
23+
24+
internal IContextMenu* ContextMenuPtr
25+
{
26+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
27+
get;
28+
29+
[MethodImpl(MethodImplOptions.AggressiveInlining)]
30+
set;
1831
}
1932

20-
public unsafe WindowsFolder(IShellItem* nativeObject)
33+
public WindowsFolder(IShellItem* ptr)
2134
{
22-
ComPtr<IShellItem> ptr = default;
23-
ptr.Attach(nativeObject);
2435
ThisPtr = ptr;
2536
}
2637

27-
public unsafe WindowsFolder(Guid folderId)
38+
public WindowsFolder(Guid folderId)
2839
{
29-
ComPtr<IShellItem> pItem = default;
40+
IShellItem* pItem = default;
3041

31-
HRESULT hr = PInvoke.SHGetKnownFolderItem(&folderId, KNOWN_FOLDER_FLAG.KF_FLAG_DEFAULT, HANDLE.Null, IID.IID_IShellItem, (void**)pItem.GetAddressOf());
42+
HRESULT hr = PInvoke.SHGetKnownFolderItem(&folderId, KNOWN_FOLDER_FLAG.KF_FLAG_DEFAULT, HANDLE.Null, IID.IID_IShellItem, (void**)&pItem);
3243
if (hr.Failed)
3344
{
3445
fixed (char* pszShellPath = $"Shell:::{folderId:B}")
35-
hr = PInvoke.SHCreateItemFromParsingName(pszShellPath, null, IID.IID_IShellItem, (void**)pItem.GetAddressOf());
46+
hr = PInvoke.SHCreateItemFromParsingName(pszShellPath, null, IID.IID_IShellItem, (void**)&pItem);
3647

3748
// Invalid FOLDERID; this should never happen.
3849
hr.ThrowOnFailure();
@@ -43,47 +54,35 @@ public unsafe WindowsFolder(Guid folderId)
4354

4455
public IAsyncEnumerable<IStorableChild> GetItemsAsync(StorableType type = StorableType.All, CancellationToken cancellationToken = default)
4556
{
46-
return GetItems().ToAsyncEnumerable();
57+
ComPtr<IEnumShellItems> pEnumShellItems = default;
58+
HRESULT hr = ThisPtr->BindToHandler(null, BHID.BHID_EnumItems, IID.IID_IEnumShellItems, (void**)pEnumShellItems.GetAddressOf());
59+
if (hr.ThrowIfFailedOnDebug().Failed)
60+
return Enumerable.Empty<IStorableChild>().ToAsyncEnumerable();
4761

48-
unsafe IEnumerable<IStorableChild> GetItems()
62+
List<IStorableChild> items = [];
63+
IShellItem* pShellItem = default;
64+
while (pEnumShellItems.Get()->Next(1, &pShellItem).Succeeded && pShellItem is not null)
4965
{
50-
ComPtr<IEnumShellItems> pEnumShellItems = default;
51-
GetEnumerator();
66+
cancellationToken.ThrowIfCancellationRequested();
5267

53-
ComPtr<IShellItem> pShellItem = default;
54-
while (GetNext() && !pShellItem.IsNull)
55-
{
56-
cancellationToken.ThrowIfCancellationRequested();
57-
var isFolder = pShellItem.HasShellAttributes(SFGAO_FLAGS.SFGAO_FOLDER);
68+
var isFolder = pShellItem->GetAttributes(SFGAO_FLAGS.SFGAO_FOLDER, out var returnedAttributes).Succeeded &&
69+
returnedAttributes == SFGAO_FLAGS.SFGAO_FOLDER;
5870

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+
if (type is StorableType.File && !isFolder)
72+
{
73+
items.Add(new WindowsFile(pShellItem));
7174
}
72-
73-
yield break;
74-
75-
unsafe void GetEnumerator()
75+
else if (type is StorableType.Folder && isFolder)
7676
{
77-
HRESULT hr = ThisPtr.Get()->BindToHandler(null, BHID.BHID_EnumItems, IID.IID_IEnumShellItems, (void**)pEnumShellItems.GetAddressOf());
78-
hr.ThrowIfFailedOnDebug();
77+
items.Add(new WindowsFolder(pShellItem));
7978
}
80-
81-
unsafe bool GetNext()
79+
else
8280
{
83-
HRESULT hr = pEnumShellItems.Get()->Next(1, pShellItem.GetAddressOf());
84-
return hr.ThrowIfFailedOnDebug() == HRESULT.S_OK;
81+
continue;
8582
}
8683
}
84+
85+
return items.ToAsyncEnumerable();
8786
}
8887
}
8988
}

0 commit comments

Comments
 (0)