mirrors/PersistentWindows
1
0
Fork 0
mirror of https://github.com/kangyu-california/PersistentWindows.git synced 2025-05-11 04:55:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve handle conflict for core window

Browse source
This commit is contained in:
Kang Yu 2024-09-22 16:16:06 -07:00
parent a541eb0a6c
commit cf5e26af87
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Ninjacrab.PersistentWindows.Solution/Common/PersistentWindowProcessor.cs
View file

@ -1229,10 +1229,10 @@ namespace PersistentWindows.Common
}
}
private void InheritKilledWindow(IntPtr hwnd, IntPtr kid)
private void InheritKilledWindow(IntPtr hwnd, IntPtr realHwnd, IntPtr kid)
{
uint pid;
User32.GetWindowThreadProcessId(hwnd, out pid);
User32.GetWindowThreadProcessId(realHwnd, out pid);
foreach (var display_key in deadApps.Keys)
{
@ -1284,18 +1284,25 @@ namespace PersistentWindows.Common
if (string.IsNullOrEmpty(className))
return IntPtr.Zero;
if (!windowProcessName.ContainsKey(hwnd))
return IntPtr.Zero;
string procName = windowProcessName[hwnd];
string title = GetWindowTitle(hwnd);
string procName;
string title;
if (className.Equals("ApplicationFrameWindow"))
{
//retrieve info about windows core app hidden under top window
IntPtr realHwnd = GetCoreAppWindow(hwnd);
if (!windowProcessName.ContainsKey(realHwnd))
return IntPtr.Zero;
procName = windowProcessName[realHwnd];
className = GetWindowClassName(realHwnd);
title = GetWindowTitle(realHwnd);
}
else
{
if (!windowProcessName.ContainsKey(hwnd))
return IntPtr.Zero;
procName = windowProcessName[hwnd];
title = GetWindowTitle(hwnd);
}
if (!string.IsNullOrEmpty(className))
{
@ -2942,7 +2949,7 @@ namespace PersistentWindows.Common
}
else
{
InheritKilledWindow(hwnd, kid);
InheritKilledWindow(hwnd, realHwnd, kid);
if (hwnd != kid)
{
Log.Error($"Inherit position data from killed window 0x{kid.ToString("X")} for {curDisplayMetrics.Title}");