Skip to content

Commit 011cd9d

Browse files
0x5bfa0x5bfa
committed
Init
1 parent 6b5bf5b commit 011cd9d

File tree

17 files changed

+422
-143
lines changed

17 files changed

+422
-143
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ 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; }
4447
}
4548

4649
public static unsafe partial class CLSID

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,3 +225,8 @@ QITIPF_FLAGS
225225
GetKeyboardState
226226
MapVirtualKey
227227
GetKeyboardLayout
228+
HKEY_CLASSES_ROOT
229+
HKEY_CURRENT_USER
230+
RegOpenKeyEx
231+
RegEnumKeyEx
232+
RegGetValue

‎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/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: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
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+
/// <remarks>
10+
/// This class maps to an undocumented struct, SHELLNEW_ITEM.
11+
/// </remarks>
12+
// TODO: Should this class be a record instead?
13+
public partial class ShellNewItem
14+
{
15+
/// <summary>
16+
/// Gets the type of a new shell item.
17+
/// </summary>
18+
public ShellNewItemType Type { get; set; } = ShellNewItemType.Invalid;
19+
20+
/// <summary>
21+
/// Gets string file extension (e.g. ".txt").
22+
/// </summary>
23+
public string? Extension { get; set; }
24+
25+
/// <summary>
26+
/// Gets string description as a string.
27+
/// </summary>
28+
public string? Description { get; set; }
29+
30+
/// <summary>
31+
/// Gets icon data as a byte array.
32+
/// </summary>
33+
public byte[]? Icon { get; set; }
34+
}
35+
}

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright (c) Files Community
2+
// Licensed under the MIT License.
3+
4+
namespace Files.App.Storage
5+
{
6+
public enum ShellNewItemType // Exactly maps to an undocumented enum, SHELLNEW_TYPE
7+
{
8+
Invalid = -1,
9+
Command = 1,
10+
Data = 2,
11+
FileName = 4,
12+
NullFile = 8
13+
}
14+
}

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

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
// Copyright (c) Files Community
2+
// Licensed under the MIT License.
3+
4+
using Windows.Win32;
5+
using Windows.Win32.Foundation;
6+
using Windows.Win32.System.Registry;
7+
8+
namespace Files.App.Storage
9+
{
10+
public static partial class ShellNewManager
11+
{
12+
public const string CachedShellNewItemsRegistryPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Discardable\\PostSetup\\ShellNew";
13+
14+
public static IEnumerable<ShellNewItem> GetItems()
15+
{
16+
var cachedItems = GetItemsFromCache();
17+
if (cachedItems.Any())
18+
{
19+
foreach (var item in cachedItems)
20+
yield return item;
21+
22+
yield break;
23+
}
24+
25+
foreach (var item in GetItemsFromAssoc())
26+
yield return item;
27+
}
28+
29+
private static IEnumerable<ShellNewItem> GetItemsFromCache()
30+
{
31+
bool fRes = WindowsStorableHelpers.GetRegistryValue(HKEY.HKEY_CURRENT_USER, CachedShellNewItemsRegistryPath, "Classes", REG_ROUTINE_FLAGS.RRF_RT_REG_MULTI_SZ, out string? cachedExtensions);
32+
if (!fRes)
33+
{
34+
yield break;
35+
}
36+
37+
// TODO: Access each cached extension and get the ShellNewItem properties
38+
}
39+
40+
private static IEnumerable<ShellNewItem> GetItemsFromAssoc()
41+
{
42+
var newMenuItems = new List<ShellNewItem>();
43+
string[] extensionsExcluded = [".contact", ".library-ms", ".url", ".lnk"];
44+
45+
// Get a handle of HKEY_CLASSES_ROOT
46+
bool fRes = WindowsStorableHelpers.OpenRegistryKey(HKEY.HKEY_CLASSES_ROOT, string.Empty, REG_SAM_FLAGS.KEY_READ, out HKEY hKey);
47+
if (!fRes)
48+
{
49+
if (!hKey.IsNull) PInvoke.RegCloseKey(hKey);
50+
yield break;
51+
}
52+
53+
foreach (string keyName in WindowsStorableHelpers.EnumerateRegistryKeyNames(hKey).Where(x => x.StartsWith('.') &&
54+
!extensionsExcluded.Contains(x, StringComparer.OrdinalIgnoreCase)))
55+
{
56+
fRes = WindowsStorableHelpers.OpenRegistryKey(HKEY.HKEY_CLASSES_ROOT, keyName, REG_SAM_FLAGS.KEY_READ, out HKEY hSubKey);
57+
if (!fRes)
58+
{
59+
if (!hKey.IsNull) PInvoke.RegCloseKey(hKey);
60+
if (!hSubKey.IsNull) PInvoke.RegCloseKey(hSubKey);
61+
yield break;
62+
}
63+
64+
// TODO: Get an entry
65+
yield return new();
66+
}
67+
68+
// TODO: Add .txt if necessary
69+
70+
if (!hKey.IsNull) PInvoke.RegCloseKey(hKey);
71+
72+
}
73+
}
74+
}

‎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 sealed 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)

0 commit comments

Comments
 (0)