[PATCH v16 6/9] wintypes: Add IIterable<IKeyValuePair<HSTRING, IInspectable *>> stubs to PropertySet implementation.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/wintypes/propertyset.c       | 36 +++++++++++++++++++++++++++++++
 dlls/wintypes/tests/propertyset.c |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/dlls/wintypes/propertyset.c b/dlls/wintypes/propertyset.c
index 8bee3a5b560..5a8c2d707a5 100644
--- a/dlls/wintypes/propertyset.c
+++ b/dlls/wintypes/propertyset.c
@@ -36,6 +36,7 @@ struct propertyset
     IPropertySet IPropertySet_iface;
     IObservableMap_HSTRING_IInspectable IObservableMap_HSTRING_IInspectable_iface;
     IMap_HSTRING_IInspectable IMap_HSTRING_IInspectable_iface;
+    IIterable_IKeyValuePair_HSTRING_IInspectable IIterable_IKeyValuePair_HSTRING_IInspectable_iface;

LONG ref;
 };
@@ -75,6 +76,12 @@ static HRESULT STDMETHODCALLTYPE propertyset_QueryInterface( IPropertySet *iface
         IUnknown_AddRef( iface );
         return S_OK;
     }
+    if (IsEqualGUID( iid, &IID_IIterable_IKeyValuePair_HSTRING_IInspectable ))
+    {
+        *out = &impl->IIterable_IKeyValuePair_HSTRING_IInspectable_iface;
+        IUnknown_AddRef( iface );
+        return S_OK;
+    }

FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) );
     return E_NOINTERFACE;
@@ -250,6 +257,33 @@ const static IMap_HSTRING_IInspectableVtbl propertyset_IMap_vtbl =
     propertyset_Clear,
 };

+DEFINE_IINSPECTABLE_( iterable_kvpair_HSTRING_IInspectable,
+                      IIterable_IKeyValuePair_HSTRING_IInspectable, struct propertyset,
+                      impl_from_IIterable_IKeyValuePair_HSTRING_IInspectable,
+                      IIterable_IKeyValuePair_HSTRING_IInspectable_iface,
+                      &impl->IMap_HSTRING_IInspectable_iface );
+
+static HRESULT STDMETHODCALLTYPE
+iterable_kvpair_HSTRING_IInspectable_First( IIterable_IKeyValuePair_HSTRING_IInspectable *iface,
+                                            IIterator_IKeyValuePair_HSTRING_IInspectable **iter )
+{
+    return E_NOTIMPL;
+}
+
+const static IIterable_IKeyValuePair_HSTRING_IInspectableVtbl iterable_kvpair_HSTRING_IInspectable_vtbl =
+{
+    /* IUnknown */
+    iterable_kvpair_HSTRING_IInspectable_QueryInterface,
+    iterable_kvpair_HSTRING_IInspectable_AddRef,
+    iterable_kvpair_HSTRING_IInspectable_Release,
+    /* IInspectable */
+    iterable_kvpair_HSTRING_IInspectable_GetIids,
+    iterable_kvpair_HSTRING_IInspectable_GetRuntimeClassName,
+    iterable_kvpair_HSTRING_IInspectable_GetTrustLevel,
+    /* IIterable<IKeyValuePair<HSTRING, IInspectable*>> */
+    iterable_kvpair_HSTRING_IInspectable_First
+};
+
 HRESULT propertyset_create( IPropertySet **iface )
 {
     struct propertyset *impl;
@@ -261,6 +295,8 @@ HRESULT propertyset_create( IPropertySet **iface )
     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->IIterable_IKeyValuePair_HSTRING_IInspectable_iface.lpVtbl =
+        &iterable_kvpair_HSTRING_IInspectable_vtbl;

impl->ref = 1;
     *iface = &impl->IPropertySet_iface;
diff --git a/dlls/wintypes/tests/propertyset.c b/dlls/wintypes/tests/propertyset.c
index faa8e2ec459..d2587c4f5a7 100644
--- a/dlls/wintypes/tests/propertyset.c
+++ b/dlls/wintypes/tests/propertyset.c
@@ -412,7 +412,7 @@ static void test_IPropertySet(void)

hr = IMap_HSTRING_IInspectable_QueryInterface(
         map, &IID_IIterable_IKeyValuePair_HSTRING_IInspectable, (void **)&iterable );
-    todo_wine ok( SUCCEEDED( hr ), "QueryInterface failed, got %#lx\n", hr );
+    ok( SUCCEEDED( hr ), "QueryInterface failed, got %#lx\n", hr );
     if (SUCCEEDED( hr ))
     {
         hr = IIterable_IKeyValuePair_HSTRING_IInspectable_First( iterable, &iterator );