Skip to content

Fix DwmIsCompositionEnabled crash on Mono/wine-mono #11567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
williamzujkowski wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −4
Open

Fix DwmIsCompositionEnabled crash on Mono/wine-mono #11567

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Standard/NativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2506,9 +2506,8 @@ public static IntPtr CreateWindowEx(
[DllImport("dwmapi.dll", EntryPoint = "DwmExtendFrameIntoClientArea", PreserveSig = true, SetLastError = true)]
private static extern HRESULT _DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS pMarInset);

[DllImport("dwmapi.dll", EntryPoint = "DwmIsCompositionEnabled", PreserveSig = false)]
[return: MarshalAs(UnmanagedType.Bool)]
private static extern bool _DwmIsCompositionEnabled();
[DllImport("dwmapi.dll", EntryPoint = "DwmIsCompositionEnabled", PreserveSig = true)]
private static extern HRESULT _DwmIsCompositionEnabled([Out, MarshalAs(UnmanagedType.Bool)] out bool pfEnabled);

[DllImport("dwmapi.dll", EntryPoint = "DwmGetColorizationColor", PreserveSig = true)]
private static extern HRESULT _DwmGetColorizationColor(out uint pcrColorization, [Out, MarshalAs(UnmanagedType.Bool)] out bool pfOpaqueBlend);
Expand Down Expand Up @@ -2564,7 +2563,12 @@ public static bool DwmIsCompositionEnabled()
{
return false;
}
return _DwmIsCompositionEnabled();

// Use PreserveSig = true with explicit out parameter to avoid
// marshalling issues on Mono/wine-mono, which does not support
// PreserveSig = false for DllImports. See dotnet/wpf#4166.
HRESULT hr = _DwmIsCompositionEnabled(out bool enabled);
return hr == HRESULT.S_OK && enabled;
}

[DllImport("dwmapi.dll")]
Expand Down