[PATCH v16 5/9] wintypes: Add IObservableMap<HSTRING, IInspectable *> and stubs to PropertySet implementation.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/wintypes/propertyset.c       | 43 ++++++++++++++++++++++++++++++-
 dlls/wintypes/tests/propertyset.c |  2 +-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/dlls/wintypes/propertyset.c b/dlls/wintypes/propertyset.c
index 21142840c77..8bee3a5b560 100644
--- a/dlls/wintypes/propertyset.c
+++ b/dlls/wintypes/propertyset.c
@@ -30,9 +30,11 @@

WINE_DEFAULT_DEBUG_CHANNEL( wintypes );

+
 struct propertyset
 {
     IPropertySet IPropertySet_iface;
+    IObservableMap_HSTRING_IInspectable IObservableMap_HSTRING_IInspectable_iface;
     IMap_HSTRING_IInspectable IMap_HSTRING_IInspectable_iface;

LONG ref;
@@ -61,6 +63,12 @@ static HRESULT STDMETHODCALLTYPE propertyset_QueryInterface( IPropertySet *iface
         IUnknown_AddRef( iface );
         return S_OK;
     }
+    if (IsEqualGUID( iid, &IID_IObservableMap_HSTRING_IInspectable ))
+    {
+        *out = &impl->IObservableMap_HSTRING_IInspectable_iface;
+        IUnknown_AddRef( iface );
+        return S_OK;
+    }
     if (IsEqualGUID( iid, &IID_IMap_HSTRING_IInspectable ))
     {
         *out = &impl->IMap_HSTRING_IInspectable_iface;
@@ -131,6 +139,39 @@ const static IPropertySetVtbl propertyset_vtbl =
     propertyset_GetTrustLevel,
 };

+DEFINE_IINSPECTABLE( propertyset_IObservableMap, IObservableMap_HSTRING_IInspectable,
+                     struct propertyset, IPropertySet_iface );
+
+static HRESULT STDMETHODCALLTYPE propertyset_IObservableMap_add_MapChanged(
+    IObservableMap_HSTRING_IInspectable *iface,
+    IMapChangedEventHandler_HSTRING_IInspectable *handler, EventRegistrationToken *token )
+{
+    FIXME( "(%p, %p, %p) stub!\n", iface, handler, token );
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE propertyset_IObservableMap_remove_MapChanged(
+    IObservableMap_HSTRING_IInspectable *iface, EventRegistrationToken token )
+{
+    FIXME( "(%p, %I64d)stub!\n", iface, token.value );
+    return E_NOTIMPL;
+}
+
+const static IObservableMap_HSTRING_IInspectableVtbl propertyset_IObservableMap_vtbl =
+{
+    /* IUnknown */
+    propertyset_IObservableMap_QueryInterface,
+    propertyset_IObservableMap_AddRef,
+    propertyset_IObservableMap_Release,
+    /* IInspectable */
+    propertyset_IObservableMap_GetIids,
+    propertyset_IObservableMap_GetRuntimeClassName,
+    propertyset_IObservableMap_GetTrustLevel,
+    /* IObservableMap<HSTRING, IInspectable*> */
+    propertyset_IObservableMap_add_MapChanged,
+    propertyset_IObservableMap_remove_MapChanged,
+};
+
 DEFINE_IINSPECTABLE( propertyset_IMap, IMap_HSTRING_IInspectable, struct propertyset,
                      IPropertySet_iface );

@@ -218,10 +259,10 @@ HRESULT propertyset_create( IPropertySet **iface )
         return E_OUTOFMEMORY;

impl->IPropertySet_iface.lpVtbl = &propertyset_vtbl;
+    impl->IObservableMap_HSTRING_IInspectable_iface.lpVtbl = &propertyset_IObservableMap_vtbl;
     impl->IMap_HSTRING_IInspectable_iface.lpVtbl = &propertyset_IMap_vtbl;

impl->ref = 1;
-
     *iface = &impl->IPropertySet_iface;
     return S_OK;
 }
diff --git a/dlls/wintypes/tests/propertyset.c b/dlls/wintypes/tests/propertyset.c
index d5d99b12ed7..faa8e2ec459 100644
--- a/dlls/wintypes/tests/propertyset.c
+++ b/dlls/wintypes/tests/propertyset.c
@@ -286,7 +286,7 @@ static void test_IPropertySet(void)
     hr = IPropertySet_QueryInterface( propset, &IID_IObservableMap_HSTRING_IInspectable,
                                       (void *)&observable_map );
     IPropertySet_Release(propset);
-    todo_wine ok(SUCCEEDED(hr), "QueryInterface failed, got %#lx\n", hr);
+    ok(SUCCEEDED(hr), "QueryInterface failed, got %#lx\n", hr);

#define EVENT_HANDLER_CREATE(t, c)                                               \
     do                                                                           \