GUIDs

Author: yaakovschectman

shell/platform/windows/accessibility_alert.cc

@@ -157,27 +157,24 @@ IFACEMETHODIMP AccessibilityAlert::get_accDefaultAction(VARIANT var_id,
 
 // End of IAccessible methods.
 
+
 //
-// Methods used by the ATL COM map.
+// IServiceProvider implementation.
 //
 
-// static
-STDMETHODIMP AccessibilityAlert::InternalQueryInterface(
-    void* this_ptr,
-    const _ATL_INTMAP_ENTRY* entries,
-    REFIID riid,
-    void** object) {
-  if (!object)
+IFACEMETHODIMP AccessibilityAlert::QueryService(REFGUID guidService,
+                                                REFIID riid,
+                                                void** object) {
+  if (!object) {
     return E_INVALIDARG;
-  *object = nullptr;
-  AccessibilityAlert* accessible =
-      reinterpret_cast<AccessibilityAlert*>(this_ptr);
-  if (!accessible) {
-    return E_FAIL;
   }
 
-  return CComObjectRootBase::InternalQueryInterface(this_ptr, entries, riid,
-                                                    object);
+  if (guidService == IID_IAccessible) {
+    return QueryInterface(riid, object);
+  }
+
+  *object = nullptr;
+  return E_FAIL;
 }
 
 void AccessibilityAlert::SetText(const std::wstring& text) {

shell/platform/windows/accessibility_alert.h

@@ -21,11 +21,15 @@ class AccessibilityRootNode;
 // the root AccessibilityRootNode node, and is therefore also a sibling
 // of the window's root node.
 // This node is not interactable to the user.
-class AccessibilityAlert : public CComObjectRootEx<CComMultiThreadModel>,
-                           public IDispatchImpl<IAccessible> {
+class __declspec(uuid("778c1bd8-383f-4d49-b6be-8937e12b6a32")) AccessibilityAlert : public CComObjectRootEx<CComMultiThreadModel>,
+                           public IDispatchImpl<IAccessible>,
+                           public IServiceProvider {
  public:
   BEGIN_COM_MAP(AccessibilityAlert)
+  COM_INTERFACE_ENTRY(AccessibilityAlert)
   COM_INTERFACE_ENTRY(IAccessible)
+  COM_INTERFACE_ENTRY(IDispatch)
+  COM_INTERFACE_ENTRY(IServiceProvider)
   END_COM_MAP()
   //
   // IAccessible methods.
@@ -92,14 +96,12 @@ class AccessibilityAlert : public CComObjectRootEx<CComMultiThreadModel>,
   // End of IAccessible methods.
 
   //
-  // Methods used by the ATL COM map.
+  // IServiceProvider method.
   //
 
-  // Called by BEGIN_COM_MAP() / END_COM_MAP().
-  static STDMETHODIMP InternalQueryInterface(void* this_ptr,
-                                             const _ATL_INTMAP_ENTRY* entries,
-                                             REFIID riid,
-                                             void** object);
+  IFACEMETHODIMP QueryService(REFGUID guidService,
+                              REFIID riid,
+                              void** object) override;
 
   AccessibilityAlert();
   ~AccessibilityAlert() = default;

shell/platform/windows/accessibility_root_node.h

@@ -16,7 +16,7 @@
 namespace flutter {
 
 // A parent node that wraps the window IAccessible node.
-class __declspec(uuid("12344321-1234-4321-1234-aaaaaaaaaaaa")) AccessibilityRootNode : public CComObjectRootEx<CComMultiThreadModel>,
+class __declspec(uuid("fedb8280-ea4f-47a9-98fe-5d1a557fe4b3")) AccessibilityRootNode : public CComObjectRootEx<CComMultiThreadModel>,
                               public IDispatchImpl<IAccessible>,
                               public IServiceProvider {
  public: