From: Vibhav Pant vibhavp@gmail.com
--- dlls/wintypes/propertyset.c | 121 +++++++++++++++++++++++++++++- dlls/wintypes/tests/propertyset.c | 12 +-- 2 files changed, 126 insertions(+), 7 deletions(-)
diff --git a/dlls/wintypes/propertyset.c b/dlls/wintypes/propertyset.c index 8eb22eb04c4..4281986b6f6 100644 --- a/dlls/wintypes/propertyset.c +++ b/dlls/wintypes/propertyset.c @@ -30,6 +30,123 @@
WINE_DEFAULT_DEBUG_CHANNEL( wintypes );
+struct kvpair +{ + IKeyValuePair_HSTRING_IInspectable iface; + + LONG ref; +}; + +static inline struct kvpair * +impl_from_IKeyValuePair_HSTRING_IInspectable( IKeyValuePair_HSTRING_IInspectable *iface ) +{ + return CONTAINING_RECORD( iface, struct kvpair, iface ); +} + +static HRESULT STDMETHODCALLTYPE kvpair_QueryInterface( IKeyValuePair_HSTRING_IInspectable *iface, + REFIID iid, void **out ) +{ + TRACE("(%p, %p, %p)\n", iface, debugstr_guid( iid ), out ); + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IKeyValuePair_HSTRING_IInspectable )) + { + *out = iface; + IUnknown_AddRef( iface ); + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE kvpair_AddRef( IKeyValuePair_HSTRING_IInspectable *iface ) +{ + struct kvpair *impl; + + TRACE( "(%p)\n", iface ); + + impl = impl_from_IKeyValuePair_HSTRING_IInspectable( iface ); + return InterlockedIncrement( &impl->ref ); +} + +static ULONG STDMETHODCALLTYPE kvpair_Release( IKeyValuePair_HSTRING_IInspectable *iface ) +{ + struct kvpair *impl; + ULONG ref; + + TRACE( "(%p)\n", iface ); + + impl = impl_from_IKeyValuePair_HSTRING_IInspectable( iface ); + ref = InterlockedDecrement( &impl->ref ); + if (!ref) + free( impl ); + + return ref; +} + +static HRESULT STDMETHODCALLTYPE kvpair_GetIIDs( IKeyValuePair_HSTRING_IInspectable *iface, + ULONG *iid_count, IID **iids ) +{ + FIXME( "(%p, %p, %p) stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE +kvpair_GetRuntimeClassName( IKeyValuePair_HSTRING_IInspectable *iface, HSTRING *class_name ) +{ + FIXME( "(%p, %p) stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE kvpair_GetTrustLevel( IKeyValuePair_HSTRING_IInspectable *iface, + TrustLevel *trust_level ) +{ + FIXME( "(%p, %p) stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE kvpair_get_Key( IKeyValuePair_HSTRING_IInspectable *iface, + HSTRING *key ) +{ + FIXME( "(%p, %p) stub!\n", iface, key ); + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE kvpair_get_Value( IKeyValuePair_HSTRING_IInspectable *iface, + IInspectable **value ) +{ + FIXME( "(%p, %p) stub!\n", iface, value ); + return E_NOTIMPL; +} + +const static IKeyValuePair_HSTRING_IInspectableVtbl kvpair_vtbl = +{ + kvpair_QueryInterface, + kvpair_AddRef, + kvpair_Release, + kvpair_GetIIDs, + kvpair_GetRuntimeClassName, + kvpair_GetTrustLevel, + kvpair_get_Key, + kvpair_get_Value, +}; + +static HRESULT kvpair_create( IKeyValuePair_HSTRING_IInspectable **kvpair ) +{ + struct kvpair *impl; + + TRACE( "(%p)\n", kvpair ); + + impl = calloc( 1, sizeof( *impl ) ); + if (!impl) + return E_OUTOFMEMORY; + + impl->iface.lpVtbl = &kvpair_vtbl; + impl->ref = 1; + *kvpair = &impl->iface; + return S_OK; +} + struct iterator_kvpair_HSTRING_IInspectable { IIterator_IKeyValuePair_HSTRING_IInspectable iface; @@ -105,8 +222,8 @@ static HRESULT STDMETHODCALLTYPE iterator_kvpair_HSTRING_IInspectable_get_Current( IIterator_IKeyValuePair_HSTRING_IInspectable *iface, IKeyValuePair_HSTRING_IInspectable **kvpair ) { - FIXME( "(%p, %p) stub!\n", iface, kvpair ); - return E_NOTIMPL; + FIXME( "(%p, %p) semi-stub!\n", iface, kvpair ); + return kvpair_create( kvpair ); }
static HRESULT STDMETHODCALLTYPE iterator_kvpair_HSTRING_IInspectable_HasCurrent( diff --git a/dlls/wintypes/tests/propertyset.c b/dlls/wintypes/tests/propertyset.c index 6268a211ead..531c3a9b142 100644 --- a/dlls/wintypes/tests/propertyset.c +++ b/dlls/wintypes/tests/propertyset.c @@ -425,18 +425,19 @@ static void test_IPropertySet(void) {
IKeyValuePair_HSTRING_IInspectable *kvpair; - HSTRING key; + HSTRING key = NULL; IInspectable *value; hr = IIterator_IKeyValuePair_HSTRING_IInspectable_get_Current( iterator, &kvpair ); - todo_wine ok( SUCCEEDED( hr ), "get_Current failed, got %#lx\n", hr ); + ok( SUCCEEDED( hr ), "get_Current failed, got %#lx\n", hr ); hr = IKeyValuePair_HSTRING_IInspectable_get_Key( kvpair, &key ); todo_wine ok( SUCCEEDED( hr ), "get_Key failed, got %#lx\n", hr ); WindowsDeleteString( key ); hr = IKeyValuePair_HSTRING_IInspectable_get_Value( kvpair, &value ); todo_wine ok( SUCCEEDED( hr ), "get_Value failed, got %#lx\n", hr ); - IInspectable_Release( value ); + if (SUCCEEDED( hr )) IInspectable_Release( value ); hr = IIterator_IKeyValuePair_HSTRING_IInspectable_MoveNext( iterator, &valid ); todo_wine ok( SUCCEEDED( hr ), "MoveNext failed, got %#lx\n", hr ); + if (FAILED( hr )) break; size--; } todo_wine ok( size == 0, "%d != 0\n", size ); @@ -512,16 +513,17 @@ static void test_IPropertySet(void) HSTRING key; IInspectable *value; hr = IIterator_IKeyValuePair_HSTRING_IInspectable_get_Current( iterator, &kvpair ); - todo_wine ok( SUCCEEDED( hr ), "get_Current failed, got %#lx\n", hr ); + ok( SUCCEEDED( hr ), "get_Current failed, got %#lx\n", hr ); if (FAILED( hr )) break; hr = IKeyValuePair_HSTRING_IInspectable_get_Key( kvpair, &key ); todo_wine ok( SUCCEEDED( hr ), "get_Key failed, got %#lx\n", hr ); WindowsDeleteString( key ); hr = IKeyValuePair_HSTRING_IInspectable_get_Value( kvpair, &value ); todo_wine ok( SUCCEEDED( hr ), "get_Value failed, got %#lx\n", hr ); - IInspectable_Release( value ); + if (SUCCEEDED( hr )) IInspectable_Release( value ); hr = IIterator_IKeyValuePair_HSTRING_IInspectable_MoveNext( iterator, &valid ); todo_wine ok( SUCCEEDED( hr ), "MoveNext failed, got %#lx\n", hr ); + if (FAILED( hr )) break; size--; } todo_wine ok( size == 0, "%d != 0\n", size );