[PATCH v15 5/7] windows.web: JsonObject typed getters

[Olivia Ryan]

From: Olivia Ryan <[e-mail]>

---
 dlls/windows.web/json_object.c | 85 ++++++++++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 10 deletions(-)

diff --git a/dlls/windows.web/json_object.c b/dlls/windows.web/json_object.c
index 81f12e2b72d..afb0fc6e1f4 100644
--- a/dlls/windows.web/json_object.c
+++ b/dlls/windows.web/json_object.c
@@ -121,32 +121,97 @@ static HRESULT WINAPI json_object_statics_SetNamedValue( IJsonObject *iface, HST
 
 static HRESULT WINAPI json_object_statics_GetNamedObject( IJsonObject *iface, HSTRING name, IJsonObject **value )
 {
-    FIXME( "iface %p, name %s, value %p stub!\n", iface, debugstr_hstring( name ), value );
-    return E_NOTIMPL;
+    IJsonValue *internal_value;
+    JsonValueType value_type;
+    HRESULT hr;
+
+    TRACE( "iface %p, name %s, value %p.\n", iface, debugstr_hstring( name ), value );
+
+    if (!value) return E_POINTER;
+    if (FAILED(hr = IJsonObject_GetNamedValue( iface, name, &internal_value )))
+        return hr;
+
+    IJsonValue_Release( internal_value );
+    IJsonValue_get_ValueType( internal_value, &value_type );
+    if (value_type != JsonValueType_Object) return E_ILLEGAL_METHOD_CALL;
+
+    return IJsonValue_GetObject( internal_value, value );
 }
 
 static HRESULT WINAPI json_object_statics_GetNamedArray( IJsonObject *iface, HSTRING name, IJsonArray **value )
 {
-    FIXME( "iface %p, name %s, value %p stub!\n", iface, debugstr_hstring( name ), value );
-    return E_NOTIMPL;
+    IJsonValue *internal_value;
+    JsonValueType value_type;
+    HRESULT hr;
+
+    TRACE( "iface %p, name %s, value %p.\n", iface, debugstr_hstring( name ), value );
+
+    if (!value) return E_POINTER;
+    if (FAILED(hr = IJsonObject_GetNamedValue( iface, name, &internal_value )))
+        return hr;
+
+    IJsonValue_Release( internal_value );
+    IJsonValue_get_ValueType( internal_value, &value_type );
+    if (value_type != JsonValueType_Array) return E_ILLEGAL_METHOD_CALL;
+
+    return IJsonValue_GetArray( internal_value, value );
 }
 
 static HRESULT WINAPI json_object_statics_GetNamedString( IJsonObject *iface, HSTRING name, HSTRING *value )
 {
-    FIXME( "iface %p, name %s, value %p stub!\n", iface, debugstr_hstring( name ), value );
-    return E_NOTIMPL;
+    IJsonValue *internal_value;
+    JsonValueType value_type;
+    HRESULT hr;
+
+    TRACE( "iface %p, name %s, value %p.\n", iface, debugstr_hstring( name ), value );
+
+    if (!value) return E_POINTER;
+    if (FAILED(hr = IJsonObject_GetNamedValue( iface, name, &internal_value )))
+        return hr;
+
+    IJsonValue_Release( internal_value );
+    IJsonValue_get_ValueType( internal_value, &value_type );
+    if (value_type != JsonValueType_String) return E_ILLEGAL_METHOD_CALL;
+
+    return IJsonValue_GetString( internal_value, value );
 }
 
 static HRESULT WINAPI json_object_statics_GetNamedNumber( IJsonObject *iface, HSTRING name, DOUBLE *value )
 {
-    FIXME( "iface %p, name %s, value %p stub!\n", iface, debugstr_hstring( name ), value );
-    return E_NOTIMPL;
+    IJsonValue *internal_value;
+    JsonValueType value_type;
+    HRESULT hr;
+
+    TRACE( "iface %p, name %s, value %p.\n", iface, debugstr_hstring( name ), value );
+
+    if (!value) return E_POINTER;
+    if (FAILED(hr = IJsonObject_GetNamedValue( iface, name, &internal_value )))
+        return hr;
+
+    IJsonValue_Release( internal_value );
+    IJsonValue_get_ValueType( internal_value, &value_type );
+    if (value_type != JsonValueType_Number) return E_ILLEGAL_METHOD_CALL;
+
+    return IJsonValue_GetNumber( internal_value, value );
 }
 
 static HRESULT WINAPI json_object_statics_GetNamedBoolean( IJsonObject *iface, HSTRING name, boolean *value )
 {
-    FIXME( "iface %p, name %s, value %p stub!\n", iface, debugstr_hstring( name ), value );
-    return E_NOTIMPL;
+    IJsonValue *internal_value;
+    JsonValueType value_type;
+    HRESULT hr;
+
+    TRACE( "iface %p, name %s, value %p.\n", iface, debugstr_hstring( name ), value );
+
+    if (!value) return E_POINTER;
+    if (FAILED(hr = IJsonObject_GetNamedValue( iface, name, &internal_value )))
+        return hr;
+
+    IJsonValue_Release( internal_value );
+    IJsonValue_get_ValueType( internal_value, &value_type );
+    if (value_type != JsonValueType_Boolean) return E_ILLEGAL_METHOD_CALL;
+
+    return IJsonValue_GetBoolean( internal_value, value );
 }
 
 static const struct IJsonObjectVtbl json_object_statics_vtbl =
-- 
GitLab


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