Bug fixes and reorganization of code.

tests/menu_integration.py

@@ -121,14 +121,19 @@ with tempfile.TemporaryDirectory(prefix="wine-access-menus-") as temporary:
                        for e in events), "collapsed tree selection missing"
             assert any(e[2] == "All music" and "expanded" in e[5] for e in events), "tree expansion missing"
             assert any(e[2] == "Artist & album β" and e[3] == "tree item" for e in events), "tree navigation missing"
-            assert any(e[1] == "focus" and e[2] == "Named native button" and e[3] == "button"
+            assert any(e[1] == "focus" and e[2] == "Named & native button" and e[3] == "button"
                        for e in events), "named generic MSAA client hid button role"
-            for value in ("by artist", "by year"):
-                assert any(e[2] == "View" and e[3] == "combo box" and e[4] == value
+            for value in ("artist & album", "year && date"):
+                assert any(e[2] == "View & sort" and e[3] == "combo box" and e[4] == value
                            for e in events), f"combo label/role/value missing: {value}"
+            assert any(e[4] == "search & find" for e in events), "edit value changed"
             if not args.is32Bit:
-                assert any(e[2] == "Filter" and e[3] == "edit" and e[4] == "search"
-                           for e in events), "late native edit label missing"
+                assert any(e[2] == "Filter & query" and e[3] == "edit" and e[4] == "search & find"
+                           for e in events), "late native edit label/value missing"
+            assert any(e[3] == "list" and e[4] == "Rock & roll && blues"
+                       for e in events), "list box lost literal ampersands"
+            controlEvents = [e for e in events if e[3] in ("page tab", "tree item", "button", "combo box", "edit")]
+            assert controlEvents and all(e[9] == "Wine & controls fixture" for e in controlEvents), "window title changed"
             assert any(e[2] == "" and e[3] == "page tab" and e[7:9] == (0, 0)
                        for e in events), "empty tabs retained stale caption"
             assert any(e[2] == "" and e[3] == "tree" for e in events), "empty tree retained stale item"