Skip to content

Commit 8781bfa

Browse files
authored
Code Quality: Merged all interop into Win32PInvoke (#15209)
1 parent 24a7c17 commit 8781bfa

40 files changed

+1088
-1135
lines changed

src/Files.App/Data/Models/ItemViewModel.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using Windows.Storage.FileProperties;
2121
using Windows.Storage.Search;
2222
using static Files.App.Helpers.Win32PInvoke;
23-
using static Files.App.Helpers.NativeFindStorageItemHelper;
23+
using static Files.App.Helpers.Win32Helper;
2424
using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
2525
using FileAttributes = System.IO.FileAttributes;
2626

@@ -680,7 +680,7 @@ void ClearDisplay()
680680
DirectoryInfoUpdated?.Invoke(this, EventArgs.Empty);
681681
}
682682

683-
if (NativeWinApiHelper.IsHasThreadAccessPropertyPresent && dispatcherQueue.HasThreadAccess)
683+
if (Win32Helper.IsHasThreadAccessPropertyPresent && dispatcherQueue.HasThreadAccess)
684684
ClearDisplay();
685685
else
686686
await dispatcherQueue.EnqueueOrInvokeAsync(ClearDisplay);
@@ -768,7 +768,7 @@ void OrderEntries()
768768
folderSettings.SortDirectoriesAlongsideFiles, folderSettings.SortFilesFirst));
769769
}
770770

771-
if (NativeWinApiHelper.IsHasThreadAccessPropertyPresent && dispatcherQueue.HasThreadAccess)
771+
if (Win32Helper.IsHasThreadAccessPropertyPresent && dispatcherQueue.HasThreadAccess)
772772
return Task.Run(OrderEntries);
773773

774774
OrderEntries();
@@ -1865,8 +1865,8 @@ await dispatcherQueue.EnqueueOrInvokeAsync(() =>
18651865
private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStatus)
18661866
{
18671867
Debug.WriteLine($"WatchForDirectoryChanges: {path}");
1868-
var hWatchDir = NativeFileOperationsHelper.CreateFileFromApp(path, 1, 1 | 2 | 4,
1869-
IntPtr.Zero, 3, (uint)NativeFileOperationsHelper.File_Attributes.BackupSemantics | (uint)NativeFileOperationsHelper.File_Attributes.Overlapped, IntPtr.Zero);
1868+
var hWatchDir = Win32PInvoke.CreateFileFromApp(path, 1, 1 | 2 | 4,
1869+
IntPtr.Zero, 3, (uint)Win32PInvoke.File_Attributes.BackupSemantics | (uint)Win32PInvoke.File_Attributes.Overlapped, IntPtr.Zero);
18701870
if (hWatchDir.ToInt64() == -1)
18711871
return;
18721872

@@ -1974,13 +1974,13 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
19741974

19751975
private void WatchForGitChanges()
19761976
{
1977-
var hWatchDir = NativeFileOperationsHelper.CreateFileFromApp(
1977+
var hWatchDir = Win32PInvoke.CreateFileFromApp(
19781978
GitDirectory!,
19791979
1,
19801980
1 | 2 | 4,
19811981
IntPtr.Zero,
19821982
3,
1983-
(uint)NativeFileOperationsHelper.File_Attributes.BackupSemantics | (uint)NativeFileOperationsHelper.File_Attributes.Overlapped,
1983+
(uint)Win32PInvoke.File_Attributes.BackupSemantics | (uint)Win32PInvoke.File_Attributes.Overlapped,
19841984
IntPtr.Zero);
19851985

19861986
if (hWatchDir.ToInt64() == -1)
@@ -2226,7 +2226,7 @@ private async Task AddFileOrFolderAsync(ListedItem? item)
22262226
if (UserSettingsService.FoldersSettingsService.AreAlternateStreamsVisible)
22272227
{
22282228
// New file added, enumerate ADS
2229-
foreach (var ads in NativeFileOperationsHelper.GetAlternateStreams(item.ItemPath))
2229+
foreach (var ads in Win32Helper.GetAlternateStreams(item.ItemPath))
22302230
{
22312231
var adsItem = Win32StorageEnumerator.GetAlternateStream(ads, item);
22322232
filesAndFolders.Add(adsItem);

src/Files.App/Extensions/Win32FindDataExtensions.cs

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

4-
using static Files.App.Helpers.NativeFindStorageItemHelper;
4+
using static Files.App.Helpers.Win32Helper;
55

66
namespace Files.App.Extensions
77
{
88
public static class Win32FindDataExtensions
99
{
1010
private const long MAX_DWORD = 4294967295;
1111

12-
public static long GetSize(this WIN32_FIND_DATA findData)
12+
public static long GetSize(this Win32PInvoke.WIN32_FIND_DATA findData)
1313
{
1414
long fDataFSize = findData.nFileSizeLow;
1515

src/Files.App/Helpers/Environment/ElevationHelpers.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ namespace Files.App.Helpers
88
{
99
public static class ElevationHelpers
1010
{
11-
[DllImport("shell32.dll", EntryPoint = "#865", CharSet = CharSet.Unicode, SetLastError = true)]
12-
[return: MarshalAs(UnmanagedType.Bool)] private static extern bool _IsElevationRequired([MarshalAs(UnmanagedType.LPWStr)] string pszPath);
13-
1411
public static bool IsElevationRequired(string filePath)
1512
{
1613
if (string.IsNullOrEmpty(filePath))
1714
return false;
1815

19-
return _IsElevationRequired(filePath);
16+
return Win32PInvoke._IsElevationRequired(filePath);
2017
}
2118

2219
public static bool IsAppRunAsAdmin()

0 commit comments

Comments
 (0)