Skip to content

Commit e3fee27

Browse files
0x5bfa0x5bfa
committed
Merge remote-tracking branch 'upstream/main' into 5bfa/CQ-PreviewHandlerVanaraRemoval
2 parents 4a8038c + 5db3b84 commit e3fee27

File tree

97 files changed

+2043
-1203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2043
-1203
lines changed

‎.github/NOTICE.md‎

Lines changed: 1 addition & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -199,35 +199,6 @@ The above copyright notice and this permission notice shall be included in all c
199199
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
200200
```
201201

202-
## INI File Parser
203-
204-
**Source**: [https://github.com/rickyah/ini-parser](https://github.com/rickyah/ini-parser)
205-
206-
### License
207-
208-
```
209-
The MIT License (MIT)
210-
211-
Copyright (c) 2008 Ricardo Amores Hernández
212-
213-
Permission is hereby granted, free of charge, to any person obtaining a copy of
214-
this software and associated documentation files (the "Software"), to deal in
215-
the Software without restriction, including without limitation the rights to
216-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
217-
the Software, and to permit persons to whom the Software is furnished to do so,
218-
subject to the following conditions:
219-
220-
The above copyright notice and this permission notice shall be included in all
221-
copies or substantial portions of the Software.
222-
223-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
224-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
225-
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
226-
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
227-
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
228-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
229-
```
230-
231202
## SevenZipSharp
232203

233204
**Source**: [https://github.com/files-community/SevenZipSharp](https://github.com/files-community/SevenZipSharp)
@@ -645,36 +616,6 @@ A "contributor" is any person that distributes its contribution under this licen
645616
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
646617
```
647618

648-
## WinUIEx
649-
650-
**Source**: [https://github.com/dotMorten/WinUIEx](https://github.com/dotMorten/WinUIEx)
651-
652-
### License
653-
654-
```
655-
MIT License
656-
657-
Copyright (c) 2021 Morten Nielsen
658-
659-
Permission is hereby granted, free of charge, to any person obtaining a copy
660-
of this software and associated documentation files (the "Software"), to deal
661-
in the Software without restriction, including without limitation the rights
662-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
663-
copies of the Software, and to permit persons to whom the Software is
664-
furnished to do so, subject to the following conditions:
665-
666-
The above copyright notice and this permission notice shall be included in all
667-
copies or substantial portions of the Software.
668-
669-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
670-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
671-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
672-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
673-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
674-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
675-
SOFTWARE.
676-
```
677-
678619
## libgit2sharp
679620

680621
**Source**: [https://github.com/libgit2/libgit2sharp](https://github.com/libgit2/libgit2sharp)
@@ -732,4 +673,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
732673
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
733674
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
734675
DEALINGS IN THE SOFTWARE.
735-
```
676+
```

‎Files.sln‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App.UITests", "tests\
4949
EndProject
5050
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Files.App.Controls", "src\Files.App.Controls\Files.App.Controls.csproj", "{83FF8729-CC76-43E2-976F-47F0A187FC7E}"
5151
EndProject
52+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Files.App.CsWin32", "src\Files.App.CsWin32\Files.App.CsWin32.csproj", "{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}"
53+
EndProject
5254
Global
5355
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5456
Debug|arm64 = Debug|arm64
@@ -566,6 +568,36 @@ Global
566568
{83FF8729-CC76-43E2-976F-47F0A187FC7E}.Store|arm64.ActiveCfg = Store|arm64
567569
{83FF8729-CC76-43E2-976F-47F0A187FC7E}.Store|x64.ActiveCfg = Store|x64
568570
{83FF8729-CC76-43E2-976F-47F0A187FC7E}.Store|x86.ActiveCfg = Store|x86
571+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|arm64.ActiveCfg = Debug|arm64
572+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|arm64.Build.0 = Debug|arm64
573+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x64.ActiveCfg = Debug|x64
574+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x64.Build.0 = Debug|x64
575+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x86.ActiveCfg = Debug|x86
576+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Debug|x86.Build.0 = Debug|x86
577+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|arm64.ActiveCfg = Preview|arm64
578+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|arm64.Build.0 = Preview|arm64
579+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x64.ActiveCfg = Preview|x64
580+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x64.Build.0 = Preview|x64
581+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x86.ActiveCfg = Preview|x86
582+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Preview|x86.Build.0 = Preview|x86
583+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|arm64.ActiveCfg = Release|arm64
584+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|arm64.Build.0 = Release|arm64
585+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x64.ActiveCfg = Release|x64
586+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x64.Build.0 = Release|x64
587+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x86.ActiveCfg = Release|x86
588+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Release|x86.Build.0 = Release|x86
589+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|arm64.ActiveCfg = Stable|arm64
590+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|arm64.Build.0 = Stable|arm64
591+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x64.ActiveCfg = Stable|x64
592+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x64.Build.0 = Stable|x64
593+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x86.ActiveCfg = Stable|x86
594+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Stable|x86.Build.0 = Stable|x86
595+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|arm64.ActiveCfg = Store|arm64
596+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|arm64.Build.0 = Store|arm64
597+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x64.ActiveCfg = Store|x64
598+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x64.Build.0 = Store|x64
599+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x86.ActiveCfg = Store|x86
600+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A}.Store|x86.Build.0 = Store|x86
569601
EndGlobalSection
570602
GlobalSection(SolutionProperties) = preSolution
571603
HideSolutionNode = FALSE
@@ -589,6 +621,7 @@ Global
589621
{B3FE3F3B-CECC-4918-B72B-5488C3774125} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
590622
{6F5B1C76-6FA1-49C0-9AF5-672BEDF6900B} = {481DE2EA-E6CE-4A9C-A220-3B543B95AAA1}
591623
{83FF8729-CC76-43E2-976F-47F0A187FC7E} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
624+
{4803E2CB-3E27-447D-94FC-45B5F96E4F7A} = {A188C26B-E731-4E0B-9D17-D21CEBD9B43F}
592625
EndGlobalSection
593626
GlobalSection(ExtensibilityGlobals) = postSolution
594627
SolutionGuid = {0E62043C-A7A1-4982-9EC9-4CDB2939B776}

‎src/Files.App (Package)/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Identity
1717
Name="FilesDev"
1818
Publisher="CN=Files"
19-
Version="3.6.0.0" />
19+
Version="3.6.1.0" />
2020

2121
<Properties>
2222
<DisplayName>Files - Dev</DisplayName>

‎src/Files.App.CsWin32/Files.App.CsWin32.csproj‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!-- Copyright (c) 2024 Files Community. Licensed under the MIT License. See the LICENSE. -->
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
4+
<PropertyGroup>
5+
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
6+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
7+
<Nullable>enable</Nullable>
8+
<IsTrimmable>true</IsTrimmable>
9+
<Configurations>Debug;Release;Stable;Preview;Store</Configurations>
10+
<Platforms>x86;x64;arm64</Platforms>
11+
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
12+
<DefineConstants Condition="'$(Configuration)' == 'Debug'">TRACE;DEBUG;NETFX_CORE</DefineConstants>
13+
<DefineConstants Condition="'$(Configuration)' != 'Debug'">TRACE;RELEASE;NETFX_CORE</DefineConstants>
14+
<Optimize Condition="'$(Configuration)' != 'Debug'">true</Optimize>
15+
</PropertyGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106" PrivateAssets="all" />
19+
</ItemGroup>
20+
21+
</Project>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"$schema": "https://aka.ms/CsWin32.schema.json",
3+
"allowMarshaling": false,
4+
"public": true
5+
}

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,26 @@ FindWindow
112112
SendMessage
113113
IsWindowVisible
114114
COPYDATASTRUCT
115+
SetWindowLongPtr
116+
GetDpiForWindow
117+
CallWindowProc
118+
MINMAXINFO
119+
SUBCLASSPROC
120+
SetWindowPlacement
121+
GetWindowPlacement
122+
WINDOWPLACEMENT
123+
GetSystemMetrics
124+
MONITORENUMPROC
125+
EnumDisplayMonitors
126+
MONITORINFOEXW
127+
GetMonitorInfo
128+
CLASS_E_CLASSNOTAVAILABLE
129+
E_INVALIDARG
130+
RoInitialize
131+
RoRegisterActivationFactories
132+
RoRevokeActivationFactories
133+
WindowsCreateString
134+
WindowsDeleteString
135+
IPreviewHandler
136+
AssocQueryString
137+
GetModuleHandle

‎src/Files.App.CsWin32/Windows.Win32.MONITORENUMPROC.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) 2024 Files Community
2+
// Licensed under the MIT License. See the LICENSE.
3+
4+
using System.Runtime.InteropServices;
5+
using Windows.Win32.Foundation;
6+
7+
namespace Windows.Win32.Graphics.Gdi;
8+
9+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
10+
public unsafe delegate BOOL MONITORENUMPROC([In] HMONITOR param0, [In] HDC param1, [In][Out] RECT* param2, [In] LPARAM param3);

‎src/Files.App.CsWin32/Windows.Win32.WNDPROC.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Copyright (c) 2024 Files Community
2+
// Licensed under the MIT License. See the LICENSE.
3+
4+
using System.Runtime.InteropServices;
5+
using Windows.Win32.Foundation;
6+
7+
namespace Windows.Win32.UI.WindowsAndMessaging;
8+
9+
[UnmanagedFunctionPointer(CallingConvention.Winapi)]
10+
public delegate LRESULT WNDPROC(HWND hWnd, uint msg, WPARAM wParam, LPARAM lParam);

‎src/Files.App.Server/Files.App.Server.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
<Manifest Include="app.manifest" />
4141
<TrimmerRootAssembly Include="Files.App.Server" />
4242
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
43-
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106" PrivateAssets="all" />
4443
</ItemGroup>
4544

4645
<ItemGroup>
@@ -52,6 +51,7 @@
5251
</ItemGroup>
5352

5453
<ItemGroup>
54+
<ProjectReference Include="..\Files.App.CsWin32\Files.App.CsWin32.csproj" />
5555
<ProjectReference Include="..\Files.Core.SourceGenerator\Files.Core.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="False" />
5656
<ProjectReference Include="..\Files.Shared\Files.Shared.csproj" />
5757
</ItemGroup>

‎src/Files.App.Server/NativeMethods.json‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)