[PATCH v46 5/6] wintypes: Add stubs for IMap<HSTRING, IInspectable *> to PropertySet.

[Vibhav Pant]

From: Vibhav Pant

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

diff --git a/dlls/wintypes/propertyset.c b/dlls/wintypes/propertyset.c
index 5d96c7bb2e9..eeadb5d2435 100644
--- a/dlls/wintypes/propertyset.c
+++ b/dlls/wintypes/propertyset.c
@@ -30,6 +30,7 @@ struct propertyset
 {
     IPropertySet IPropertySet_iface;
     IObservableMap_HSTRING_IInspectable IObservableMap_HSTRING_IInspectable_iface;
+    IMap_HSTRING_IInspectable IMap_HSTRING_IInspectable_iface;
     LONG ref;
 };

@@ -59,6 +60,12 @@ static HRESULT STDMETHODCALLTYPE propertyset_QueryInterface( IPropertySet *iface
         IUnknown_AddRef( (IUnknown *)*out );
         return S_OK;
     }
+    else if (IsEqualGUID( iid, &IID_IMap_HSTRING_IInspectable ))
+    {
+        *out = &impl->IMap_HSTRING_IInspectable_iface;
+        IUnknown_AddRef( (IUnknown *)iface );
+        return S_OK;
+    }

FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) );
     return E_NOINTERFACE;
@@ -147,6 +154,71 @@ const static IObservableMap_HSTRING_IInspectableVtbl propertyset_IObservableMap_
     propertyset_IObservableMap_remove_MapChanged,
 };

+DEFINE_IINSPECTABLE( propertyset_IMap, IMap_HSTRING_IInspectable, struct propertyset,
+                     IPropertySet_iface );
+
+static HRESULT STDMETHODCALLTYPE propertyset_Lookup( IMap_HSTRING_IInspectable *iface, HSTRING key, IInspectable **value )
+{
+    FIXME( "(%p, %s, %p) stub!\n", iface, debugstr_hstring( key ), value );
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE propertyset_get_Size( IMap_HSTRING_IInspectable *iface, UINT32 *size )
+{
+    FIXME( "(%p, %p) stub!\n", iface, size );
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE propertyset_HasKey( IMap_HSTRING_IInspectable *iface, HSTRING key, boolean *exists )
+{
+    FIXME( "(%p, %s, %p) stub!\n", iface, debugstr_hstring( key ), exists );
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE propertyset_GetView( IMap_HSTRING_IInspectable *iface, IMapView_HSTRING_IInspectable **view )
+{
+    FIXME( "(%p, %p) stub!\n", iface, view );
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE propertyset_Insert( IMap_HSTRING_IInspectable *iface, HSTRING key, IInspectable *value, boolean *replaced )
+{
+    FIXME( "(%p, %s, %p, %p) stub!\n", iface, debugstr_hstring( key ), value, replaced );
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE propertyset_Remove( IMap_HSTRING_IInspectable *iface, HSTRING key )
+{
+    FIXME( "(%p, %s) stub!\n", iface, debugstr_hstring( key ) );
+    return E_NOTIMPL;
+}
+
+static HRESULT STDMETHODCALLTYPE propertyset_Clear( IMap_HSTRING_IInspectable *iface )
+{
+    FIXME( "(%p) stub!\n", iface );
+    return E_NOTIMPL;
+}
+
+const static IMap_HSTRING_IInspectableVtbl propertyset_IMap_vtbl =
+{
+    /* IUnknown */
+    propertyset_IMap_QueryInterface,
+    propertyset_IMap_AddRef,
+    propertyset_IMap_Release,
+    /* IInspectable */
+    propertyset_IMap_GetIids,
+    propertyset_IMap_GetRuntimeClassName,
+    propertyset_IMap_GetTrustLevel,
+    /* IMap<HSTRING, IInspectable*> */
+    propertyset_Lookup,
+    propertyset_get_Size,
+    propertyset_HasKey,
+    propertyset_GetView,
+    propertyset_Insert,
+    propertyset_Remove,
+    propertyset_Clear,
+};
+
 struct propertyset_factory
 {
     IActivationFactory IActivationFactory_iface;
@@ -220,6 +292,7 @@ static HRESULT STDMETHODCALLTYPE factory_ActivateInstance( IActivationFactory *i

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;
     *instance = (IInspectable *)&impl->IPropertySet_iface;
     return S_OK;
diff --git a/dlls/wintypes/tests/wintypes.c b/dlls/wintypes/tests/wintypes.c
index 701fa9a4216..3e029eda76b 100644
--- a/dlls/wintypes/tests/wintypes.c
+++ b/dlls/wintypes/tests/wintypes.c
@@ -1294,10 +1294,7 @@ static void test_IPropertySet(void)

hr = IPropertySet_QueryInterface( propset, &IID_IMap_HSTRING_IInspectable, (void **)&map );
     IPropertySet_Release( propset );
-    todo_wine
     ok( hr == S_OK, "QueryInterface failed, got %#lx\n", hr );
-    if (FAILED( hr ))
-        goto done;

hr = IMap_HSTRING_IInspectable_QueryInterface( map, &IID_IIterable_IKeyValuePair_HSTRING_IInspectable,
                                                    (void **)&iterable );