Skip to content

Commit fd4a670

Browse files
0x5bfa0x5bfa
authored
Code Quality: Disabled emitting marshals (#16016)
1 parent a011f5d commit fd4a670

17 files changed

+248
-172
lines changed

‎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.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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,13 @@ MONITORENUMPROC
111111
EnumDisplayMonitors
112112
MONITORINFOEXW
113113
GetMonitorInfo
114+
CLASS_E_CLASSNOTAVAILABLE
115+
E_INVALIDARG
116+
RoInitialize
117+
RoRegisterActivationFactories
118+
RoRevokeActivationFactories
119+
WindowsCreateString
120+
WindowsDeleteString
121+
IPreviewHandler
122+
AssocQueryString
123+
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.

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

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

‎src/Files.App/Data/Items/WindowEx.cs

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public unsafe WindowEx(int minWidth = 400, int minHeight = 300)
9696
MinWidth = minWidth;
9797
MinHeight = minHeight;
9898
IsMaximizable = true;
99-
IsMinimizable = true;
99+
IsMinimizable = true;
100100

101101
RestoreWindowPlacementData();
102102

@@ -237,7 +237,8 @@ private IPropertySet GetDataStore(out bool oldDataExists, bool useNewStore = tru
237237
private unsafe List<Tuple<string, Rect>> GetAllMonitorInfo()
238238
{
239239
List<Tuple<string, Rect>> monitors = [];
240-
MONITORENUMPROC callback = new((HMONITOR monitor, HDC deviceContext, RECT* rect, LPARAM data) =>
240+
241+
MONITORENUMPROC monitorEnumProc = new((HMONITOR monitor, HDC deviceContext, RECT* rect, LPARAM data) =>
241242
{
242243
MONITORINFOEXW info = default;
243244
info.monitorInfo.cbSize = (uint)Marshal.SizeOf<MONITORINFOEXW>();
@@ -251,9 +252,12 @@ private unsafe List<Tuple<string, Rect>> GetAllMonitorInfo()
251252
return true;
252253
});
253254

255+
var pMonitorEnumProc = Marshal.GetFunctionPointerForDelegate(monitorEnumProc);
256+
var pfnMonitorEnumProc = (delegate* unmanaged[Stdcall]<HMONITOR, HDC, RECT*, LPARAM, BOOL>)pMonitorEnumProc;
257+
254258
LPARAM lParam = default;
255-
bool ok = PInvoke.EnumDisplayMonitors(new(nint.Zero), (RECT*)null, callback, lParam);
256-
if (!ok)
259+
BOOL fRes = PInvoke.EnumDisplayMonitors(new(nint.Zero), (RECT*)null, pfnMonitorEnumProc, lParam);
260+
if (!fRes)
257261
Marshal.ThrowExceptionForHR(Marshal.GetLastWin32Error());
258262

259263
return monitors;
@@ -276,7 +280,10 @@ private LRESULT NewWindowProc(HWND param0, uint param1, WPARAM param2, LPARAM pa
276280
}
277281
}
278282

279-
return PInvoke.CallWindowProc(_oldWndProc, param0, param1, param2, param3);
283+
var pWindProc = Marshal.GetFunctionPointerForDelegate(_oldWndProc);
284+
var pfnWndProc = (delegate* unmanaged[Stdcall]<HWND, uint, WPARAM, LPARAM, LRESULT>)pWindProc;
285+
286+
return PInvoke.CallWindowProc(pfnWndProc, param0, param1, param2, param3);
280287
}
281288
}
282289
}

0 commit comments

Comments
 (0)