[PATCH v2 1/2] include: Add missing required iface and retval for IMapView<K, V>.

Rémi Bernon rbernon at codeweavers.com
Mon Feb 21 12:38:56 CST 2022


From: Bernhard Kölbl <besentv at gmail.com>

In windows.foundation.collections.idl.

Signed-off-by: Bernhard Kölbl <besentv at gmail.com>
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---

v2: Add missing retval attributes, reword the commit title accordingly.

 include/windows.foundation.collections.idl | 35 ++++++++++++++--------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl
index a2d2d75ec4f..d69c27f6bbd 100644
--- a/include/windows.foundation.collections.idl
+++ b/include/windows.foundation.collections.idl
@@ -74,18 +74,6 @@ cpp_quote("#endif")
 
         namespace Collections
         {
-            [
-                contract(Windows.Foundation.FoundationContract, 1.0),
-                uuid(e480ce40-a338-4ada-adcf-272272e48cb9)
-            ]
-            interface IMapView<K, V> : IInspectable
-            {
-                HRESULT Lookup([in] K key, [out] V *value);
-                [propget] HRESULT Size([out] unsigned int *size);
-                HRESULT HasKey([in] K key, [out] boolean *found);
-                HRESULT Split([out] IMapView<K, V> **first, [out] IMapView<K, V> **second);
-            }
-
             [
                 contract(Windows.Foundation.FoundationContract, 1.0),
                 uuid(6a79e863-4300-459a-9966-cbb660963ee1)
@@ -107,6 +95,29 @@ cpp_quote("#endif")
                 HRESULT First([out, retval] Windows.Foundation.Collections.IIterator<T> **value);
             }
 
+            [
+                contract(Windows.Foundation.FoundationContract, 1.0),
+                uuid(02b51929-c1c4-4a7e-8940-0312b5c18500)
+            ]
+            interface IKeyValuePair<K, V> : IInspectable
+            {
+                [propget] HRESULT Key([out, retval] K *key);
+                [propget] HRESULT Value([out, retval] V *value);
+            }
+
+            [
+                contract(Windows.Foundation.FoundationContract, 1.0),
+                uuid(e480ce40-a338-4ada-adcf-272272e48cb9)
+            ]
+            interface IMapView<K, V> : IInspectable
+                requires IIterable<IKeyValuePair<K, V> *>
+            {
+                HRESULT Lookup([in] K key, [out, retval] V *value);
+                [propget] HRESULT Size([out, retval] unsigned int *size);
+                HRESULT HasKey([in] K key, [out, retval] boolean *found);
+                HRESULT Split([out] IMapView<K, V> **first, [out] IMapView<K, V> **second);
+            }
+
             [
                 contract(Windows.Foundation.FoundationContract, 1.0),
                 uuid(bbe1fa4c-b0e3-4583-baef-1f1b2e483e56)
-- 
2.34.1




More information about the wine-devel mailing list