修复悬浮条条件下拉显示与设置页遮挡误报

- 下拉建议框:DisplayMember 保证编辑区始终是实际进程名/窗口类/标题,
  下拉列表用 OwnerDraw 显示友好描述;不再在选择提交时清空 SelectedIndex,
  避免原生 CBN_SELCHANGE 把输入框覆盖为空
- 检测显示条件忽略本工具自身窗口(设置窗口正在遮挡目标),
  并在结果里点名具体遮挡窗口;运行时判断保持严格
- 补 STA 回归:原生鼠标/键盘选择、刷新、保存重载,以及遮挡窗口分类

Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
zimoyin
2026-10-13 14:43:28 +08:00
parent 05353928e6
commit 4f53047429
8 changed files with 525 additions and 36 deletions
+2
View File
@@ -18,6 +18,8 @@ namespace PacsWinUia.RegressionTests
PersistenceTests.Register(tests);
TreeRefreshTests.Register(tests);
FloatingConditionsTests.Register(tests);
SettingsComboBoxTests.Register(tests);
WindowVisibilityTests.Register(tests);
int passed = 0;
foreach (var test in tests)
{
+2
View File
@@ -33,6 +33,8 @@
<Compile Include="PersistenceTests.cs" />
<Compile Include="TreeRefreshTests.cs" />
<Compile Include="FloatingConditionsTests.cs" />
<Compile Include="SettingsComboBoxTests.cs" />
<Compile Include="WindowVisibilityTests.cs" />
<Compile Include="..\..\src\pacs_win_uia\UI\ControlTreeReconciler.cs"><Link>ControlTreeReconciler.cs</Link></Compile>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+243
View File
@@ -0,0 +1,243 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using System.Windows.Forms;
using pacs_win_uia.Models;
using pacs_win_uia.Services;
using pacs_win_uia.UI;
namespace PacsWinUia.RegressionTests
{
// Runs on Program.Main's STA thread. All HWND messages address this test's controls only.
// No UIA, user settings, target enumeration, SendInput or process termination is involved.
internal static class SettingsComboBoxTests
{
public static void Register(IList<KeyValuePair<string, Action>> tests)
{
tests.Add(new KeyValuePair<string, Action>(
"Floating suggestions native mouse/keyboard selection, refresh and persistence",
SelectionRefreshAndPersistence));
}
private static void SelectionRefreshAndPersistence()
{
Check.Equal(ApartmentState.STA, Thread.CurrentThread.GetApartmentState(), "WinForms requires STA");
using (var temporary = new TemporaryDirectory())
{
var settings = AppSettings.CreateDefault();
settings.FloatingButton.Bars = new List<FloatingBarDefinition>
{
new FloatingBarDefinition { Name = "Selection test", Enabled = false },
new FloatingBarDefinition { Name = "Manual input test", Enabled = false,
ProcessName = "other.exe", WindowClass = "OtherClass", WindowTitleKeyword = "Other title" }
};
var store = new AppSettingsStore(temporary.File("preferred.json"), temporary.File("fallback.json"));
using (var form = new SettingsForm(settings, store, null))
{
// OnLoad normally enumerates real windows asynchronously. Disable that in this
// isolated fixture and supply deterministic snapshots instead; never call Load().
Field("_refreshingSuggestions").SetValue(form, true);
form.Show();
foreach (Control control in form.Controls)
if (control is TabControl) ((TabControl)control).SelectedIndex = 2;
Application.DoEvents();
ComboBox process = PrivateCombo(form, "_barProcess");
ComboBox windowClass = PrivateCombo(form, "_barClass");
ComboBox title = PrivateCombo(form, "_barTitle");
SetSuggestions(form,
Window(1, "fixture.exe", "ClassA", "Window A"),
Window(2, "fixture.exe", "ClassB", "Window B"),
Window(3, "second.exe", "SecondClass", "Second window"));
InvokePrivate(form, "RebuildWindowSuggestions", true);
Check.Equal(3, process.Items.Count, "Multiple process suggestions");
NativeMouseSelect(process, 1, "fixture.exe", form);
NativeMouseSelect(windowClass, 0, "ClassA", form);
NativeMouseSelect(title, 1, "Window B", form);
NativeKeyboardSelect(windowClass, "ClassB", form);
// Both selection methods must leave the native EDIT and managed Text identical.
AssertText(process, "fixture.exe", "process retained");
AssertText(windowClass, "ClassB", "class retained");
AssertText(title, "Window B", "title retained");
InvokePrivate(form, "RebuildWindowSuggestions", true);
AssertText(process, "fixture.exe", "selected process after refresh");
AssertText(windowClass, "ClassB", "selected class after refresh");
AssertText(title, "Window B", "selected title after refresh");
var bars = (ListBox)Field("_barList").GetValue(form);
bars.SelectedIndex = 1;
AssertText(process, "other.exe", "switch bar process");
process.Text = "manual.exe";
windowClass.Text = "ManualClass";
title.Text = "Manual title";
title.Select(2, 4);
InvokePrivate(form, "RebuildWindowSuggestions", true);
AssertText(process, "manual.exe", "manual process after refresh");
AssertText(windowClass, "ManualClass", "manual class after refresh");
AssertText(title, "Manual title", "manual title after refresh");
bars.SelectedIndex = 0;
AssertText(process, "fixture.exe", "switch back process");
AssertText(windowClass, "ClassB", "switch back class");
AssertText(title, "Window B", "switch back title");
SaveScreenshot(form, "selected-values");
InvokePrivate(form, "Save");
}
AppSettings reloaded = store.Load();
AssertBar(reloaded.FloatingButton.Bars[0], "fixture.exe", "ClassB", "Window B");
AssertBar(reloaded.FloatingButton.Bars[1], "manual.exe", "ManualClass", "Manual title");
}
}
private static void AssertBar(FloatingBarDefinition bar, string process, string windowClass, string title)
{
Check.Equal(process, bar.ProcessName, "Saved process");
Check.Equal(windowClass, bar.WindowClass, "Saved class");
Check.Equal(title, bar.WindowTitleKeyword, "Saved title");
}
private static NativeWindowInfo Window(int handle, string process, string windowClass, string title)
{
return new NativeWindowInfo(new IntPtr(handle))
{ ProcessId = handle + 100, ProcessName = process, ClassName = windowClass, Title = title, IsVisible = true };
}
private static void NativeMouseSelect(ComboBox box, int index, string expected, SettingsForm form)
{
int commits = 0, closes = 0;
EventHandler committed = delegate { commits++; };
EventHandler closed = delegate { closes++; };
box.SelectionChangeCommitted += committed;
box.DropDownClosed += closed;
try
{
box.Focus();
box.DroppedDown = true;
Application.DoEvents();
ComboInfo info = GetInfo(box);
var rect = new NativeRect();
SendMessageRect(info.List, 0x198 /* LB_GETITEMRECT */, new IntPtr(index), ref rect);
IntPtr point = new IntPtr(((rect.Top + (rect.Bottom - rect.Top) / 2) << 16) | 20);
// Actual list-window input: native code generates CBN_SELENDOK/SELCHANGE/CLOSEUP.
SendMessage(info.List, 0x200 /* WM_MOUSEMOVE */, IntPtr.Zero, point);
SendMessage(info.List, 0x201 /* WM_LBUTTONDOWN */, new IntPtr(1), point);
SendMessage(info.List, 0x202 /* WM_LBUTTONUP */, IntPtr.Zero, point);
Check.True(commits > 0, "Native mouse did not commit selection");
Check.True(closes > 0, "Native mouse did not close dropdown");
VerifySettled(box, expected, form, "mouse");
}
finally
{
box.SelectionChangeCommitted -= committed;
box.DropDownClosed -= closed;
}
}
private static void NativeKeyboardSelect(ComboBox box, string expected, SettingsForm form)
{
int changes = 0;
EventHandler changed = delegate { changes++; };
box.SelectedIndexChanged += changed;
try
{
box.Focus();
// Native arrow-key selection with the list closed (also used by keyboard-only users).
SendMessage(box.Handle, 0x100 /* WM_KEYDOWN */, new IntPtr((int)Keys.Down), IntPtr.Zero);
SendMessage(box.Handle, 0x101 /* WM_KEYUP */, new IntPtr((int)Keys.Down), IntPtr.Zero);
Check.True(changes > 0, "Native keyboard did not select an item");
VerifySettled(box, expected, form, "keyboard");
}
finally { box.SelectedIndexChanged -= changed; }
}
private static void VerifySettled(ComboBox box, string expected, SettingsForm form, string phase)
{
try
{
AssertText(box, expected, phase + " immediately after native close/selection");
Application.DoEvents();
AssertText(box, expected, phase + " after DoEvents");
((Control)Field("_barName").GetValue(form)).Focus();
Application.DoEvents();
AssertText(box, expected, phase + " after focus loss");
}
catch
{
SaveScreenshot(form, "failure-" + phase);
throw;
}
}
private static void AssertText(ComboBox box, string expected, string phase)
{
var text = new StringBuilder(4096);
GetWindowText(GetInfo(box).Edit, text, text.Capacity);
Check.Equal(expected, text.ToString(), phase + ": native EDIT text");
Check.Equal(expected, box.Text, phase + ": ComboBox.Text");
}
private static void SaveScreenshot(Form form, string name)
{
string directory = Environment.GetEnvironmentVariable("PACS_REGRESSION_SCREENSHOTS");
if (string.IsNullOrEmpty(directory)) return;
Directory.CreateDirectory(directory);
using (var bitmap = new Bitmap(form.Width, form.Height))
{
form.DrawToBitmap(bitmap, new Rectangle(Point.Empty, bitmap.Size));
string file = Path.Combine(directory, name + ".png");
bitmap.Save(file, System.Drawing.Imaging.ImageFormat.Png);
Console.WriteLine("Screenshot: " + file);
}
}
private static FieldInfo Field(string name)
{
return typeof(SettingsForm).GetField(name, BindingFlags.Instance | BindingFlags.NonPublic);
}
private static ComboBox PrivateCombo(SettingsForm form, string field)
{
return (ComboBox)Field(field).GetValue(form);
}
private static void SetSuggestions(SettingsForm form, params NativeWindowInfo[] windows)
{
Field("_suggestedWindows").SetValue(form, new List<NativeWindowInfo>(windows));
}
private static void InvokePrivate(SettingsForm form, string method, params object[] arguments)
{
typeof(SettingsForm).GetMethod(method, BindingFlags.Instance | BindingFlags.NonPublic).Invoke(form, arguments);
}
private static ComboInfo GetInfo(ComboBox box)
{
var info = new ComboInfo { Size = Marshal.SizeOf(typeof(ComboInfo)) };
Check.True(GetComboBoxInfo(box.Handle, ref info), "GetComboBoxInfo failed");
return info;
}
[StructLayout(LayoutKind.Sequential)]
private struct NativeRect { public int Left, Top, Right, Bottom; }
[StructLayout(LayoutKind.Sequential)]
private struct ComboInfo
{
public int Size;
public NativeRect ItemRect, ButtonRect;
public int ButtonState;
public IntPtr Combo, Edit, List;
}
[DllImport("user32.dll")]
private static extern bool GetComboBoxInfo(IntPtr handle, ref ComboInfo info);
[DllImport("user32.dll", CharSet = CharSet.Unicode)]
private static extern int GetWindowText(IntPtr handle, StringBuilder text, int length);
[DllImport("user32.dll", CharSet = CharSet.Unicode)]
private static extern IntPtr SendMessage(IntPtr handle, int message, IntPtr wParam, IntPtr lParam);
[DllImport("user32.dll", EntryPoint = "SendMessageW")]
private static extern IntPtr SendMessageRect(IntPtr handle, int message, IntPtr wParam, ref NativeRect rect);
}
}
+78
View File
@@ -0,0 +1,78 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using pacs_win_uia.Models;
using pacs_win_uia.Services;
namespace PacsWinUia.RegressionTests
{
/// <summary>
/// Coverage for the occlusion diagnostic used by 设置 → 悬浮按钮 → 检测显示条件.
/// The tool's own windows must not be reported as occluders there (the settings dialog itself
/// covers the target while the operator is configuring), while foreign windows still must be.
/// No UIA and no target manipulation: real Win32 windows of this test process only.
/// </summary>
internal static class WindowVisibilityTests
{
public static void Register(IList<KeyValuePair<string, Action>> tests)
{
tests.Add(new KeyValuePair<string, Action>("Own-process detection classifies tool windows", OwnProcess));
tests.Add(new KeyValuePair<string, Action>("Occluder message names the blocker and never blames the tool wrongly", OccluderMessages));
}
private static void OwnProcess()
{
Check.True(!WindowVisibility.IsOwnProcessWindow(IntPtr.Zero), "Zero handle is not an own window");
using (var form = new Form())
{
form.CreateControl();
IntPtr handle = form.Handle;
Check.True(handle != IntPtr.Zero, "Test form has no handle");
Check.True(WindowVisibility.IsOwnProcessWindow(handle), "Own form was not recognised as own process");
}
// WindowEnumerationResult always excludes this process, so anything it returns is foreign.
IList<NativeWindowInfo> foreign = new NativeWindowService().EnumerateTopLevelWindows(false);
if (foreign.Count == 0)
{
Console.WriteLine(" (no foreign window available on this desktop; foreign half skipped)");
return;
}
Check.True(!WindowVisibility.IsOwnProcessWindow(foreign[0].Handle),
"Foreign window was classified as own process");
}
private static void OccluderMessages()
{
Check.Equal<string>(null, WindowVisibility.DescribeOccluders(null, 0, false), "Empty occluder list");
Check.Equal<string>(null, WindowVisibility.DescribeOccluders(new List<IntPtr>(), 0, false), "No occluders");
using (var own = new Form())
{
own.CreateControl();
int pid = System.Diagnostics.Process.GetCurrentProcess().Id;
string ownOnly = WindowVisibility.DescribeOccluders(new List<IntPtr> { own.Handle }, pid, true);
Check.True(ownOnly != null && ownOnly.Contains("本工具"), "Own-window occluder not named as tool window");
Check.True(ownOnly.Contains("设置页自检"), "Own-window occluder message does not explain the diagnostic case");
IList<NativeWindowInfo> foreign = new NativeWindowService().EnumerateTopLevelWindows(false);
if (foreign.Count == 0)
{
Console.WriteLine(" (no foreign window available on this desktop; mixed half skipped)");
return;
}
string mixed = WindowVisibility.DescribeOccluders(
new List<IntPtr> { own.Handle, foreign[0].Handle }, pid, false);
Check.True(mixed != null && mixed.Contains("遮挡窗口"), "Mixed occluder list missing header");
Check.True(mixed.Contains("其中 1 个是本工具窗口"), "Mixed occluder list did not count own windows");
string foreignOnly = WindowVisibility.DescribeOccluders(
new List<IntPtr> { foreign[0].Handle }, pid, true);
Check.True(foreignOnly != null && !foreignOnly.Contains("本工具自己的窗口"),
"Foreign occluder was blamed on the tool");
}
}
}
}