Skip to content

Commit adbdef5

Browse files
0x5bfa0x5bfa
committed
Update
1 parent 778d9ff commit adbdef5

7 files changed

+79
-75
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ namespace Windows.Win32.System.WinRT
1111
{
1212
public unsafe struct IStorageProviderQuotaUI : IComIID
1313
{
14+
#pragma warning disable CS0649 // Field 'field' is never assigned to, and will always have its default value 'value'
1415
private void** lpVtbl;
16+
#pragma warning restore CS0649 // Field 'field' is never assigned to, and will always have its default value 'value'
1517

1618
[MethodImpl(MethodImplOptions.AggressiveInlining)]
1719
public HRESULT GetQuotaTotalInBytes(ulong* value)

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

+2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ namespace Windows.Win32.System.WinRT
1111
{
1212
public unsafe struct IStorageProviderStatusUI : IComIID
1313
{
14+
#pragma warning disable CS0649 // Field 'field' is never assigned to, and will always have its default value 'value'
1415
private void** lpVtbl;
16+
#pragma warning restore CS0649 // Field 'field' is never assigned to, and will always have its default value 'value'
1517

1618
[MethodImpl(MethodImplOptions.AggressiveInlining)]
1719
public HRESULT GetQuotaUI(IStorageProviderQuotaUI** result)

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

+2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ namespace Windows.Win32.System.WinRT
1111
{
1212
public unsafe struct IStorageProviderStatusUISource : IComIID
1313
{
14+
#pragma warning disable CS0649 // Field 'field' is never assigned to, and will always have its default value 'value'
1415
private void** lpVtbl;
16+
#pragma warning restore CS0649 // Field 'field' is never assigned to, and will always have its default value 'value'
1517

1618
[MethodImpl(MethodImplOptions.AggressiveInlining)]
1719
public HRESULT GetStatusUI(IStorageProviderStatusUI** result)

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

+2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ namespace Windows.Win32.System.WinRT
1111
{
1212
public unsafe struct IStorageProviderStatusUISourceFactory : IComIID
1313
{
14+
#pragma warning disable CS0649 // Field 'field' is never assigned to, and will always have its default value 'value'
1415
private void** lpVtbl;
16+
#pragma warning restore CS0649 // Field 'field' is never assigned to, and will always have its default value 'value'
1517

1618
[MethodImpl(MethodImplOptions.AggressiveInlining)]
1719
public HRESULT GetStatusUISource(nint syncRootId, IStorageProviderStatusUISource** result)

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,12 @@ public static unsafe partial class IID
2121

2222
[GuidRVAGen.Guid("947AAB5F-0A5C-4C13-B4D6-4BF7836FC9F8")]
2323
public static partial Guid* IID_IFileOperation { get; }
24-
25-
[GuidRVAGen.Guid("D57C7288-D4AD-4768-BE02-9D969532D960")]
26-
public static partial Guid* IID_IFileOpenDialog { get; }
2724
}
2825

2926
public static unsafe partial class CLSID
3027
{
3128
[GuidRVAGen.Guid("3AD05575-8857-4850-9277-11B85BDB8E09")]
3229
public static partial Guid* CLSID_FileOperation { get; }
33-
34-
[GuidRVAGen.Guid("DC1C5A9C-E88A-4DDE-A5A1-60F82A20AEF7")]
35-
public static partial Guid* CLSID_FileOpenDialog { get; }
3630
}
3731

3832
public static unsafe partial class BHID
@@ -46,5 +40,7 @@ public static unsafe partial class BHID
4640

4741
public static unsafe partial class FOLDERID
4842
{
43+
[GuidRVAGen.Guid("B7534046-3ECB-4C18-BE4E-64CD4CB7D6AC")]
44+
public static partial Guid* FOLDERID_RecycleBinFolder { get; }
4945
}
5046
}

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

+68-67
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,24 @@
11
// Copyright (c) Files Community
22
// Licensed under the MIT License.
33

4-
WNDPROC
5-
WNDCLASSEXW
4+
// Methods
5+
66
RegisterClassEx
77
CreateWindowEx
88
DestroyWindow
99
GetModuleHandle
10-
RECT
11-
NOTIFYICONIDENTIFIER
1210
Shell_NotifyIconGetRect
1311
RegisterWindowMessage
14-
NOTIFYICONDATAW
1512
Shell_NotifyIcon
1613
GetCursorPos
1714
DestroyMenu
1815
AppendMenu
1916
CreatePopupMenu
2017
SetForegroundWindow
2118
TrackPopupMenuEx
22-
TRACK_POPUP_MENU_FLAGS
2319
GetSystemMetricsForDpi
2420
DefWindowProc
25-
SYSTEM_METRICS_INDEX
2621
GetDpiForWindow
27-
HWND
28-
LRESULT
29-
WPARAM
30-
LPARAM
31-
WM_*
3222
SetForegroundWindow
3323
GetForegroundWindow
3424
GetCurrentThreadId
@@ -45,29 +35,14 @@ RemoveDirectoryFromApp
4535
GetKeyState
4636
CreateDirectoryFromApp
4737
WNetCancelConnection2
48-
NET_USE_CONNECT_FLAGS
49-
NETRESOURCEW
5038
WNetAddConnection3
51-
CREDENTIALW
5239
CredWrite
5340
WNetConnectionDialog1
54-
CONNECTDLGSTRUCTW
5541
DwmSetWindowAttribute
56-
WIN32_ERROR
5742
CoCreateInstance
58-
FileOpenDialog
59-
IFileOpenDialog
6043
SHCreateItemFromParsingName
61-
FileSaveDialog
62-
IFileSaveDialog
63-
D3D_DRIVER_TYPE
64-
D3D_FEATURE_LEVEL
65-
ID3D11Device
66-
ID3D11DeviceContext
6744
D3D11CreateDevice
68-
IDXGIDevice
6945
DCompositionCreateDevice
70-
IDCompositionDevice
7146
GetNamedSecurityInfo
7247
ConvertSidToStringSid
7348
ConvertStringSidToSid
@@ -76,99 +51,125 @@ GetAclInformation
7651
IsValidAcl
7752
GetAce
7853
SetEntriesInAcl
79-
ACL_SIZE_INFORMATION
8054
DeleteAce
81-
EXPLICIT_ACCESS
82-
ACCESS_ALLOWED_ACE
8355
LookupAccountSid
8456
GetComputerName
8557
AddAccessAllowedAceEx
8658
LocalAlloc
8759
InitializeAcl
8860
AddAce
8961
LocalFree
90-
IDesktopWallpaper
91-
DesktopWallpaper
9262
SHCreateShellItemArrayFromIDLists
9363
ILCreateFromPath
9464
CLSIDFromString
9565
FindWindow
9666
SendMessage
9767
IsWindowVisible
98-
COPYDATASTRUCT
99-
WINDOW_LONG_PTR_INDEX
10068
GetDpiForWindow
10169
CallWindowProc
102-
MINMAXINFO
103-
SUBCLASSPROC
10470
SetWindowPlacement
10571
GetWindowPlacement
106-
WINDOWPLACEMENT
10772
GetSystemMetrics
108-
MONITORENUMPROC
10973
EnumDisplayMonitors
110-
MONITORINFOEXW
11174
GetMonitorInfo
112-
CLASS_E_CLASSNOTAVAILABLE
113-
E_INVALIDARG
11475
RoInitialize
11576
RoRegisterActivationFactories
11677
RoRevokeActivationFactories
11778
WindowsCreateString
11879
WindowsDeleteString
119-
IPreviewHandler
12080
AssocQueryString
12181
GetModuleHandle
12282
SHEmptyRecycleBin
12383
SHFileOperation
12484
SHGetFolderPath
125-
SHGFP_TYPE
12685
SHGetKnownFolderItem
127-
SHQUERYRBINFO
12886
SHQueryRecycleBin
129-
FileOperation
130-
IFileOperation
131-
IShellItem2
13287
PSGetPropertyKeyFromName
13388
ShellExecuteEx
13489
CoTaskMemFree
13590
QueryDosDevice
13691
DeviceIoControl
137-
GetLastError
13892
CreateFile
13993
GetVolumeInformation
140-
COMPRESSION_FORMAT
141-
FILE_ACCESS_RIGHTS
14294
FindFirstFileEx
14395
FindNextFile
14496
CreateFile
14597
GetFileSizeEx
146-
WIN32_FIND_DATAW
147-
FILE_ACCESS_RIGHTS
14898
SHAddToRecentDocs
149-
SHARD
150-
BHID_EnumItems
151-
FOLDERID_RecycleBinFolder
15299
CoTaskMemFree
153100
SHGetIDListFromObject
154101
SHCreateItemFromIDList
155-
BHID_SFUIObject
102+
UnregisterClass
103+
104+
105+
// Structs
106+
107+
WNDPROC
108+
WNDCLASSEXW
109+
RECT
110+
NOTIFYICONIDENTIFIER
111+
NOTIFYICONDATAW
112+
HWND
113+
LRESULT
114+
WPARAM
115+
LPARAM
116+
NETRESOURCEW
117+
CREDENTIALW
118+
CONNECTDLGSTRUCTW
119+
WIN32_ERROR
120+
ACL_SIZE_INFORMATION
121+
ACCESS_ALLOWED_ACE
122+
COPYDATASTRUCT
123+
MINMAXINFO
124+
SUBCLASSPROC
125+
WINDOWPLACEMENT
126+
MONITORENUMPROC
127+
MONITORINFOEXW
128+
SHQUERYRBINFO
129+
WIN32_FIND_DATAW
130+
WINDOWPOS
131+
132+
133+
// COM interfaces & classes
134+
135+
IFileOpenDialog
136+
IFileSaveDialog
137+
ID3D11Device
138+
ID3D11DeviceContext
139+
IDXGIDevice
140+
IDCompositionDevice
141+
IDesktopWallpaper
142+
IPreviewHandler
143+
IFileOperation
144+
IShellItem2
156145
IContextMenu
157-
CMF_NORMAL
158-
CMF_OPTIMIZEFORINVOKE
159-
CMF_EXTENDEDVERBS
160-
CMF_DEFAULTONLY
161146
IApplicationDestinations
162-
ApplicationDestinations
163147
IApplicationDocumentLists
148+
149+
FileOpenDialog
150+
FileSaveDialog
151+
DesktopWallpaper
152+
FileOperation
153+
ApplicationDestinations
164154
ApplicationDocumentLists
165155
IApplicationActivationManager
156+
157+
158+
// Constants & Enums
159+
160+
WM_*
161+
CMF_*
162+
FSCTL_*
163+
CLASS_E_CLASSNOTAVAILABLE
164+
E_INVALIDARG
165+
SHARD
166166
MENU_ITEM_TYPE
167167
COMPRESSION_FORMAT
168-
FSCTL_SET_COMPRESSION
169-
FSCTL_DISMOUNT_VOLUME
170-
FSCTL_LOCK_VOLUME
171168
FILE_FILE_COMPRESSION
172-
WM_WINDOWPOSCHANGING
173-
WINDOWPOS
174-
UnregisterClass
169+
FILE_ACCESS_RIGHTS
170+
SHGFP_TYPE
171+
WINDOW_LONG_PTR_INDEX
172+
D3D_DRIVER_TYPE
173+
D3D_FEATURE_LEVEL
174+
TRACK_POPUP_MENU_FLAGS
175+
SYSTEM_METRICS_INDEX

‎src/Files.App/Services/Storage/StorageTrashBinService.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ private unsafe bool RestoreAllTrashesInternal()
102102
{
103103
// Get IShellItem for Recycle Bin folder
104104
using ComPtr<IShellItem> pRecycleBinFolderShellItem = default;
105-
var recycleBinFolderId = PInvoke.FOLDERID_RecycleBinFolder;
106-
HRESULT hr = PInvoke.SHGetKnownFolderItem(&recycleBinFolderId, KNOWN_FOLDER_FLAG.KF_FLAG_DEFAULT, HANDLE.Null, IID.IID_IShellItem, (void**)pRecycleBinFolderShellItem.GetAddressOf());
105+
HRESULT hr = PInvoke.SHGetKnownFolderItem(FOLDERID.FOLDERID_RecycleBinFolder, KNOWN_FOLDER_FLAG.KF_FLAG_DEFAULT, HANDLE.Null, IID.IID_IShellItem, (void**)pRecycleBinFolderShellItem.GetAddressOf());
107106

108107
// Get IEnumShellItems for Recycle Bin folder
109108
using ComPtr<IEnumShellItems> pEnumShellItems = default;

0 commit comments

Comments
 (0)