Skip to content

fix(win32): PInvoke cleanup #1569

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

Merged
pomianowski merged 15 commits into from
Nov 12, 2025
Merged

fix(win32): PInvoke cleanup #1569

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
18ea8e1
Remove unused pinvoke.
Nuklon Nov 10, 2025
e26ae6f
Initial changes to CsWin32.
Nuklon Nov 10, 2025
0499faf
Move all of UxTheme to CsWin32.
Nuklon Nov 10, 2025
2e0ea00
Formatting...
Nuklon Nov 10, 2025
24d001d
Initial User32 bits.
Nuklon Nov 10, 2025
bcd6105
Convert User32 to CsWin32.
Nuklon Nov 10, 2025
10cf177
Remove a bit more.
Nuklon Nov 10, 2025
bb68cb2
Initial DwmApi changes.
Nuklon Nov 10, 2025
3e37fe1
Finalize DwnApi Interop.
Nuklon Nov 10, 2025
dd51a7c
Shell to CsWin32.
Nuklon Nov 10, 2025
5e951e8
Another from User32.
Nuklon Nov 10, 2025
00a8e81
Fix titlebar coloring.
Nuklon Nov 10, 2025
31040ba
Replace the rest with CsWin32.
Nuklon Nov 10, 2025
3074b04
This is no longer used now.
Nuklon Nov 10, 2025
f361df1
Formatting.
Nuklon Nov 10, 2025
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
Prev Previous commit
Next Next commit
Move all of UxTheme to CsWin32.
  • Loading branch information
@Nuklon
Nuklon committed Nov 10, 2025
commit 0499faf45eee76b6abfbdf40b11c976a3cf370cb
40 changes: 18 additions & 22 deletions src/Wpf.Ui/Interop/UnsafeNativeMethods.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ public static bool RemoveWindowCaption(Window window)
return RemoveWindowCaption(windowHandle);
}

public static bool RemoveWindowCaption(IntPtr hWnd)
public static unsafe bool RemoveWindowCaption(IntPtr hWnd)
{
if (hWnd == IntPtr.Zero)
{
Expand All @@ -533,21 +533,17 @@ public static bool RemoveWindowCaption(IntPtr hWnd)
{
return false;
}

var wtaOptions = new UxTheme.WTA_OPTIONS()
var wtaOptions = new WTA_OPTIONS()
{
dwFlags = UxTheme.WTNCA.NODRAWCAPTION,
dwMask = UxTheme.WTNCA.VALIDBITS,
dwFlags = PInvoke.WTNCA_NODRAWCAPTION,
dwMask = PInvoke.WTNCA_NODRAWCAPTION | PInvoke.WTNCA_NODRAWICON | PInvoke.WTNCA_NOMIRRORHELP | PInvoke.WTNCA_NOSYSMENU,
};

UxTheme.SetWindowThemeAttribute(
hWnd,
UxTheme.WINDOWTHEMEATTRIBUTETYPE.WTA_NONCLIENT,
ref wtaOptions,
(uint)Marshal.SizeOf(typeof(UxTheme.WTA_OPTIONS))
);

return true;
return PInvoke.SetWindowThemeAttribute(new HWND(hWnd),
WINDOWTHEMEATTRIBUTETYPE.WTA_NONCLIENT,
&wtaOptions,
(uint)sizeof(WTA_OPTIONS)) == Windows.Win32.Foundation.HRESULT.S_OK;
}

public static bool ExtendClientAreaIntoTitleBar(Window window)
Expand All @@ -562,7 +558,7 @@ public static bool ExtendClientAreaIntoTitleBar(Window window)
return ExtendClientAreaIntoTitleBar(windowHandle);
}

public static bool ExtendClientAreaIntoTitleBar(IntPtr hWnd)
public static unsafe bool ExtendClientAreaIntoTitleBar(IntPtr hWnd)
{
/*
* !! EXPERIMENTAl !!
Expand All @@ -580,17 +576,17 @@ public static bool ExtendClientAreaIntoTitleBar(IntPtr hWnd)
}

// #1 Remove titlebar elements
var wtaOptions = new UxTheme.WTA_OPTIONS()
var wtaOptions = new WTA_OPTIONS()
{
dwFlags = UxTheme.WTNCA.NODRAWCAPTION | UxTheme.WTNCA.NODRAWICON | UxTheme.WTNCA.NOSYSMENU,
dwMask = UxTheme.WTNCA.VALIDBITS,
dwFlags = PInvoke.WTNCA_NODRAWCAPTION | PInvoke.WTNCA_NODRAWICON | PInvoke.WTNCA_NOSYSMENU,
dwMask = PInvoke.WTNCA_NODRAWCAPTION | PInvoke.WTNCA_NODRAWICON | PInvoke.WTNCA_NOMIRRORHELP | PInvoke.WTNCA_NOSYSMENU
};

Interop.UxTheme.SetWindowThemeAttribute(
hWnd,
UxTheme.WINDOWTHEMEATTRIBUTETYPE.WTA_NONCLIENT,
ref wtaOptions,
(uint)Marshal.SizeOf(typeof(UxTheme.WTA_OPTIONS))
PInvoke.SetWindowThemeAttribute(
new HWND(hWnd),
WINDOWTHEMEATTRIBUTETYPE.WTA_NONCLIENT,
&wtaOptions,
(uint)sizeof(WTA_OPTIONS)
);

DisplayDpi windowDpi = DpiHelper.GetWindowDpi(hWnd);
Expand Down
124 changes: 0 additions & 124 deletions src/Wpf.Ui/Interop/UxTheme.cs
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion src/Wpf.Ui/NativeMethods.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
S_OK
DwmIsCompositionEnabled
DwmExtendFrameIntoClientArea
DwmExtendFrameIntoClientArea
SetWindowThemeAttribute
WTA_OPTIONS
WTNCA_*