Skip to content

preserve extra info across PeekMessage (#5838) #6014

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
merged 1 commit into from
Feb 7, 2022
Merged

preserve extra info across PeekMessage (#5838) #6014

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/Shared/MS/Win32/UnsafeNativeMethodsOther.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,11 @@ internal unsafe static extern SafeFileHandle CreateFile(


#if BASE_NATIVEMETHODS

[DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
internal static extern IntPtr GetMessageExtraInfo();

[DllImport(ExternDll.User32, CharSet = CharSet.Auto)]
internal static extern IntPtr SetMessageExtraInfo(IntPtr lParam);
#endif

#if BASE_NATIVEMETHODS
Expand Down
6 changes: 6 additions & 0 deletions src/Microsoft.DotNet.Wpf/src/WindowsBase/System/Windows/Threading/Dispatcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2419,8 +2419,14 @@ internal bool CriticalRequestProcessing(bool force)
}
else if (_postedProcessingType == PROCESS_FOREGROUND)
{
// Preserve the thread's current "extra message info"
// (PeekMessage overwrites it).
IntPtr extraInformation = UnsafeNativeMethods.GetMessageExtraInfo();

MSG msg = new MSG();
UnsafeNativeMethods.PeekMessage(ref msg, new HandleRef(this, _window.Value.Handle), _msgProcessQueue, _msgProcessQueue, NativeMethods.PM_REMOVE);

UnsafeNativeMethods.SetMessageExtraInfo(extraInformation);
}
_postedProcessingType = PROCESS_NONE;
}
Expand Down