[PATCH v8 2/8] windows.web: JsonArray element getters

[Olivia Ryan]

From: Olivia Ryan <[e-mail]>

---
 dlls/windows.web/json_array.c | 64 +++++++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 10 deletions(-)

diff --git a/dlls/windows.web/json_array.c b/dlls/windows.web/json_array.c
index d62427d92d1..097af5d168b 100644
--- a/dlls/windows.web/json_array.c
+++ b/dlls/windows.web/json_array.c
@@ -26,6 +26,8 @@ struct json_array
 {
     IJsonArray IJsonArray_iface;
     LONG ref;
+    IJsonValue **elements;
+    ULONG length;
 };
 
 static inline struct json_array *impl_from_IJsonArray( IJsonArray *iface )
@@ -66,7 +68,17 @@ static ULONG WINAPI json_array_statics_Release( IJsonArray *iface )
 {
     struct json_array *impl = impl_from_IJsonArray( iface );
     ULONG ref = InterlockedDecrement( &impl->ref );
+
     TRACE( "iface %p, ref %lu.\n", iface, ref );
+
+    if (!ref)
+    {
+        for (UINT32 i = 0; i < impl->length; i++)
+            IJsonValue_Release( impl->elements[i] );
+
+        if (impl->elements) free( impl->elements );
+        free( impl );
+    }
     return ref;
 }
 
@@ -90,32 +102,62 @@ static HRESULT WINAPI json_array_statics_GetTrustLevel( IJsonArray *iface, Trust
 
 static HRESULT WINAPI json_array_statics_GetObjectAt( IJsonArray *iface, UINT32 index, IJsonObject **value )
 {
-    FIXME( "iface %p, index %u, value %p\n", iface, index, value );
-    return E_NOTIMPL;
+    struct json_array *impl = impl_from_IJsonArray( iface );
+
+    TRACE( "iface %p, index %u, value %p\n", iface, index, value );
+
+    if (!value) return E_POINTER;
+    if (index >= impl->length) return WEB_E_JSON_VALUE_NOT_FOUND;
+
+    return IJsonValue_GetObject( impl->elements[index], value );
 }
 
 static HRESULT WINAPI json_array_statics_GetArrayAt( IJsonArray *iface, UINT32 index, IJsonArray **value )
 {
-    FIXME( "iface %p, index %u, value %p\n", iface, index, value );
-    return E_NOTIMPL;
+    struct json_array *impl = impl_from_IJsonArray( iface );
+
+    TRACE( "iface %p, index %u, value %p\n", iface, index, value );
+
+    if (!value) return E_POINTER;
+    if (index >= impl->length) return WEB_E_JSON_VALUE_NOT_FOUND;
+
+    return IJsonValue_GetArray( impl->elements[index], value );
 }
 
 static HRESULT WINAPI json_array_statics_GetStringAt( IJsonArray *iface, UINT32 index, HSTRING *value )
 {
-    FIXME( "iface %p, index %u, value %p\n", iface, index, value );
-    return E_NOTIMPL;
+    struct json_array *impl = impl_from_IJsonArray( iface );
+
+    TRACE( "iface %p, index %u, value %p\n", iface, index, value );
+
+    if (!value) return E_POINTER;
+    if (index >= impl->length) return WEB_E_JSON_VALUE_NOT_FOUND;
+
+    return IJsonValue_GetString( impl->elements[index], value );
 }
 
 static HRESULT WINAPI json_array_statics_GetNumberAt( IJsonArray *iface, UINT32 index, double *value )
 {
-    FIXME( "iface %p, index %u, value %p\n", iface, index, value );
-    return E_NOTIMPL;
+    struct json_array *impl = impl_from_IJsonArray( iface );
+
+    TRACE( "iface %p, index %u, value %p\n", iface, index, value );
+
+    if (!value) return E_POINTER;
+    if (index >= impl->length) return WEB_E_JSON_VALUE_NOT_FOUND;
+
+    return IJsonValue_GetNumber( impl->elements[index], value );
 }
 
 static HRESULT WINAPI json_array_statics_GetBooleanAt( IJsonArray *iface, UINT32 index, boolean *value )
 {
-    FIXME( "iface %p, index %u, value %p\n", iface, index, value );
-    return E_NOTIMPL;
+    struct json_array *impl = impl_from_IJsonArray( iface );
+
+    TRACE( "iface %p, index %u, value %p\n", iface, index, value );
+
+    if (!value) return E_POINTER;
+    if (index >= impl->length) return WEB_E_JSON_VALUE_NOT_FOUND;
+
+    return IJsonValue_GetBoolean( impl->elements[index], value );
 }
 
 static const struct IJsonArrayVtbl json_array_statics_vtbl =
@@ -212,6 +254,8 @@ static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInsp
 
     impl->IJsonArray_iface.lpVtbl = &json_array_statics_vtbl;
     impl->ref = 1;
+    impl->elements = NULL;
+    impl->length = 0;
 
     *instance = (IInspectable*)&impl->IJsonArray_iface;
     return S_OK;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10263