Code optimization and bug fixes.

tests/menu_integration.py

@@ -56,7 +56,12 @@ if args.extension_endpoint:
 xml = '<node><interface name="' + interface + '"><method name="PresentAccessibleEvent">'
 for index, kind in enumerate(["s"] * 7 + ["i", "i", "s"]):
     xml += f'<arg name="arg{index}" type="{kind}" direction="in"/>'
-xml += '<arg type="b" direction="out"/></method></interface></node>'
+xml += '<arg type="b" direction="out"/></method>'
+for method, inputs in (("SpeakText", "sb"), ("CancelSpeech", "")):
+    xml += '<method name="' + method + '">'
+    xml += ''.join('<arg type="' + kind + '" direction="in"/>' for kind in inputs)
+    xml += '<arg type="b" direction="out"/></method>'
+xml += '</interface></node>'
 events = []
 
 def record(connection, sender, path, iface, method, parameters, invocation):
@@ -317,7 +322,7 @@ with tempfile.TemporaryDirectory(prefix="wine-access-menus-") as temporary:
             history_actions = [e[2] for e in text_events
                                if e[0] == history_focus and e[1] == "text"]
             assert history_actions == ["history north", "history south", "history north", "blank",
-                                       "history north", "history south", "history north", "h", "blank", "blank"], \
+                                       "history north", "history south", "history north", "h", "blank", "blank", "n"], \
                 f"command history missing, reordered, duplicated or leaked: {history_actions!r}"
             if args.fixture == "winforms":
                 assert any(e[2] == "Email" and e[3] == "edit" and e[4] == "alpha beta"