From 76ad0164caac312bd2f12d85032010396497e87f Mon Sep 17 00:00:00 2001
From: James Teh <jteh@mozilla.com>
Date: Fri, 5 Nov 2021 06:25:44 +0000
Subject: [PATCH] Bug 1736742 part 1: Add missing a11y COM interfaces to Appx
 Manifest. r=nalexander

Differential Revision: https://phabricator.services.mozilla.com/D129949
---
 .../windows/msix/AppxManifest.xml.in          |  6 ++++
 python/mozbuild/mozbuild/repackaging/msix.py  | 30 +++++++++++--------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/browser/installer/windows/msix/AppxManifest.xml.in b/browser/installer/windows/msix/AppxManifest.xml.in
index 57d2bdc170fb..4569d4b60327 100644
--- a/browser/installer/windows/msix/AppxManifest.xml.in
+++ b/browser/installer/windows/msix/AppxManifest.xml.in
@@ -81,6 +81,12 @@
                        Path="VFS\ProgramFiles\@APPX_INSTDIR@\AccessibleMarshal.dll" />
         <com:Interface Id="@MOZ_IGECKOBACKCHANNEL_IID@"
                        ProxyStubClsid="@MOZ_IGECKOBACKCHANNEL_IID@" />
+        <com:Interface Id="@MOZ_IHANDLERCONTROL_IID@"
+                       ProxyStubClsid="@MOZ_IGECKOBACKCHANNEL_IID@"
+                       AsynchronousInterface="@MOZ_ASYNCIHANDLERCONTROL_IID@" />
+        <com:Interface Id="@MOZ_ASYNCIHANDLERCONTROL_IID@"
+                       ProxyStubClsid="@MOZ_IGECKOBACKCHANNEL_IID@"
+                       SynchronousInterface="@MOZ_IHANDLERCONTROL_IID@" />
         <com:Interface Id="4e747be5-2052-4265-8af0-8ecad7aad1c0"
                        ProxyStubClsid="1814ceeb-49e2-407f-af99-fa755a7d2607" />
         <com:Interface Id="1814ceeb-49e2-407f-af99-fa755a7d2607"
diff --git a/python/mozbuild/mozbuild/repackaging/msix.py b/python/mozbuild/mozbuild/repackaging/msix.py
index 34e010a30023..cbe692c3c3da 100644
--- a/python/mozbuild/mozbuild/repackaging/msix.py
+++ b/python/mozbuild/mozbuild/repackaging/msix.py
@@ -404,20 +404,26 @@ def repackage_msix(
         # Release (official) and Beta share branding.  Differentiate Beta a little bit.
         brandFullName += " Beta"
 
-    # We don't have a build at repackage-time to gives us this value, and the
+    # We don't have a build at repackage-time to give us these values, and the
     # source of truth is a branding-specific `configure.sh` shell script that we
     # can't easily evaluate completely here.  Instead, we take the last value
     # from `configure.sh`.
-    lines = [
-        line
-        for line in open(mozpath.join(branding, "configure.sh")).readlines()
-        if "MOZ_IGECKOBACKCHANNEL_IID" in line
-    ]
-    MOZ_IGECKOBACKCHANNEL_IID = lines[-1]
-    _, _, MOZ_IGECKOBACKCHANNEL_IID = MOZ_IGECKOBACKCHANNEL_IID.partition("=")
-    MOZ_IGECKOBACKCHANNEL_IID = MOZ_IGECKOBACKCHANNEL_IID.strip()
-    if MOZ_IGECKOBACKCHANNEL_IID.startswith(('"', "'")):
-        MOZ_IGECKOBACKCHANNEL_IID = MOZ_IGECKOBACKCHANNEL_IID[1:-1]
+    brandingUuids = {}
+    lines = open(mozpath.join(branding, "configure.sh")).readlines()
+    for key in (
+        "MOZ_IGECKOBACKCHANNEL_IID",
+        "MOZ_IHANDLERCONTROL_IID",
+        "MOZ_ASYNCIHANDLERCONTROL_IID",
+    ):
+        for line in reversed(lines):
+            if key not in line:
+                continue
+            _, _, uuid = line.partition("=")
+            uuid = uuid.strip()
+            if uuid.startswith(('"', "'")):
+                uuid = uuid[1:-1]
+            brandingUuids[key] = uuid
+            break
 
     # The convention is $MOZBUILD_STATE_PATH/cache/$FEATURE.
     output_dir = mozpath.normsep(
@@ -618,8 +624,8 @@ def repackage_msix(
         "APPX_VERSION": version,
         "MOZ_APP_DISPLAYNAME": displayname,
         "MOZ_APP_NAME": app_name,
-        "MOZ_IGECKOBACKCHANNEL_IID": MOZ_IGECKOBACKCHANNEL_IID,
     }
+    defines.update(brandingUuids)
 
     m.add_preprocess(
         mozpath.join(template, "AppxManifest.xml.in"),