July 2024 - Wine-Commits - list.winehq.org

Mohamad Al-Jaf : windows.web: Add IJsonValueStatics stub interface.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: f98929e5eb6f85e6adea30159f272fa4574ecb6c URL: https://gitlab.winehq.org/wine/wine/-/commit/f98929e5eb6f85e6adea30159f272f… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Jul 3 01:59:54 2024 -0400 windows.web: Add IJsonValueStatics stub interface. --- dlls/windows.web/Makefile.in | 1 + dlls/windows.web/json_value.c | 174 ++++++++++++++++++++++++++++++++++++++++++ dlls/windows.web/main.c | 2 + dlls/windows.web/private.h | 39 ++++++++++ dlls/windows.web/tests/web.c | 35 +++++++++ 5 files changed, 251 insertions(+)

1 0

Mohamad Al-Jaf : windows.web/tests: Add IJsonValueStatics::CreateStringValue() tests.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 4e5c578869614b1837cd3d85718cc274d03b837c URL: https://gitlab.winehq.org/wine/wine/-/commit/4e5c578869614b1837cd3d85718cc2… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Jul 4 00:43:06 2024 -0400 windows.web/tests: Add IJsonValueStatics::CreateStringValue() tests. --- dlls/windows.web/tests/web.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/windows.web/tests/web.c b/dlls/windows.web/tests/web.c index 15d0d3c8b35..5bb81d44d13 100644 --- a/dlls/windows.web/tests/web.c +++ b/dlls/windows.web/tests/web.c @@ -95,6 +95,7 @@ static void test_JsonValueStatics(void) static const WCHAR *json_value_statics_name = L"Windows.Data.Json.JsonValue"; IJsonValueStatics *json_value_statics = (void *)0xdeadbeef; IActivationFactory *factory = (void *)0xdeadbeef; + IJsonValue *json_value = (void *)0xdeadbeef; HSTRING str; HRESULT hr; LONG ref; @@ -118,6 +119,21 @@ static void test_JsonValueStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IJsonValueStatics, (void **)&json_value_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IJsonValueStatics_CreateStringValue( json_value_statics, NULL, (IJsonValue **)&json_value ); + todo_wine + ok( hr == S_OK, "got hr %#lx.\n", hr ); + if (hr == S_OK) IJsonValue_Release( json_value ); + hr = WindowsCreateString( L"Wine", wcslen( L"Wine" ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IJsonValueStatics_CreateStringValue( json_value_statics, str, NULL ); + todo_wine + ok( hr == E_POINTER, "got hr %#lx.\n", hr ); + hr = IJsonValueStatics_CreateStringValue( json_value_statics, str, (IJsonValue **)&json_value ); + todo_wine + ok( hr == S_OK, "got hr %#lx.\n", hr ); + if (hr == S_OK) IJsonValue_Release( json_value ); + WindowsDeleteString( str ); + ref = IJsonValueStatics_Release( json_value_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Mohamad Al-Jaf : include: Add IJsonValueStatics interface definition.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: 4c81ee3f8af256ab6001aab6bef8503d328ac3d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/4c81ee3f8af256ab6001aab6bef850… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Jul 3 23:33:31 2024 -0400 include: Add IJsonValueStatics interface definition. --- include/windows.data.json.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/windows.data.json.idl b/include/windows.data.json.idl index 483d8dce721..c37c0a59b88 100644 --- a/include/windows.data.json.idl +++ b/include/windows.data.json.idl @@ -114,6 +114,20 @@ namespace Windows.Data.Json { HRESULT GetObject([out, retval] Windows.Data.Json.JsonObject **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Data.Json.JsonValue), + uuid(5f6b544a-2f53-48e1-91a3-f78b50a6345c) + ] + interface IJsonValueStatics : IInspectable + { + HRESULT Parse([in] HSTRING input, [out, retval] Windows.Data.Json.JsonValue **value); + HRESULT TryParse([in] HSTRING input, [out] Windows.Data.Json.JsonValue **result, [out, retval] boolean *succeeded); + HRESULT CreateBooleanValue([in] boolean input, [out, retval] Windows.Data.Json.JsonValue **value); + HRESULT CreateNumberValue([in] DOUBLE input, [out, retval] Windows.Data.Json.JsonValue **value); + HRESULT CreateStringValue([in] HSTRING input, [out, retval] Windows.Data.Json.JsonValue **value); + } + [ activatable(Windows.Foundation.UniversalApiContract, 1.0), contract(Windows.Foundation.UniversalApiContract, 1.0),

1 0

Mohamad Al-Jaf : windows.web: Implement IActivationFactory::ActivateInstance().
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: c490335df41a00b2ef1a1db3996b40d1c7b31a1c URL: https://gitlab.winehq.org/wine/wine/-/commit/c490335df41a00b2ef1a1db3996b40… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Jul 3 01:43:41 2024 -0400 windows.web: Implement IActivationFactory::ActivateInstance(). --- dlls/windows.web/json_object.c | 144 ++++++++++++++++++++++++++++++++++++++++- dlls/windows.web/tests/web.c | 15 ++++- 2 files changed, 156 insertions(+), 3 deletions(-) diff --git a/dlls/windows.web/json_object.c b/dlls/windows.web/json_object.c index b8d56d41052..38c899288b7 100644 --- a/dlls/windows.web/json_object.c +++ b/dlls/windows.web/json_object.c @@ -22,6 +22,136 @@ WINE_DEFAULT_DEBUG_CHANNEL(web); +struct json_object +{ + IJsonObject IJsonObject_iface; + LONG ref; +}; + +static inline struct json_object *impl_from_IJsonObject( IJsonObject *iface ) +{ + return CONTAINING_RECORD( iface, struct json_object, IJsonObject_iface ); +} + +static HRESULT WINAPI json_object_statics_QueryInterface( IJsonObject *iface, REFIID iid, void **out ) +{ + struct json_object *impl = impl_from_IJsonObject( iface ); + + TRACE( "iface %p, iid %s, out %p.\n", iface, debugstr_guid( iid ), out ); + + if (IsEqualGUID( iid, &IID_IUnknown ) || + IsEqualGUID( iid, &IID_IInspectable ) || + IsEqualGUID( iid, &IID_IAgileObject ) || + IsEqualGUID( iid, &IID_IJsonObject )) + { + *out = &impl->IJsonObject_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI json_object_statics_AddRef( IJsonObject *iface ) +{ + struct json_object *impl = impl_from_IJsonObject( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p, ref %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI json_object_statics_Release( IJsonObject *iface ) +{ + struct json_object *impl = impl_from_IJsonObject( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p, ref %lu.\n", iface, ref ); + + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI json_object_statics_GetIids( IJsonObject *iface, ULONG *iid_count, IID **iids ) +{ + FIXME( "iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_object_statics_GetRuntimeClassName( IJsonObject *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_object_statics_GetTrustLevel( IJsonObject *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_object_statics_GetNamedValue( IJsonObject *iface, HSTRING name, IJsonValue **value ) +{ + FIXME( "iface %p, name %s, value %p stub!\n", iface, debugstr_hstring( name ), value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_object_statics_SetNamedValue( IJsonObject *iface, HSTRING name, IJsonValue *value ) +{ + FIXME( "iface %p, name %s, value %p stub!\n", iface, debugstr_hstring( name ), value ); + return E_NOTIMPL; +} + +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; +} + +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; +} + +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; +} + +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; +} + +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; +} + +static const struct IJsonObjectVtbl json_object_statics_vtbl = +{ + json_object_statics_QueryInterface, + json_object_statics_AddRef, + json_object_statics_Release, + /* IInspectable methods */ + json_object_statics_GetIids, + json_object_statics_GetRuntimeClassName, + json_object_statics_GetTrustLevel, + /* IJsonObject methods */ + json_object_statics_GetNamedValue, + json_object_statics_SetNamedValue, + json_object_statics_GetNamedObject, + json_object_statics_GetNamedArray, + json_object_statics_GetNamedString, + json_object_statics_GetNamedNumber, + json_object_statics_GetNamedBoolean, +}; + struct json_object_statics { IActivationFactory IActivationFactory_iface; @@ -90,8 +220,18 @@ static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLev static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { - FIXME( "iface %p, instance %p stub!\n", iface, instance ); - return E_NOTIMPL; + struct json_object *impl; + + TRACE( "iface %p, instance %p.\n", iface, instance ); + + *instance = NULL; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + + impl->IJsonObject_iface.lpVtbl = &json_object_statics_vtbl; + impl->ref = 1; + + *instance = (IInspectable *)&impl->IJsonObject_iface; + return S_OK; } static const struct IActivationFactoryVtbl factory_vtbl = diff --git a/dlls/windows.web/tests/web.c b/dlls/windows.web/tests/web.c index ab63861132a..4d876b52669 100644 --- a/dlls/windows.web/tests/web.c +++ b/dlls/windows.web/tests/web.c @@ -49,6 +49,7 @@ static void test_JsonObjectStatics(void) { static const WCHAR *json_object_name = L"Windows.Data.Json.JsonObject"; IActivationFactory *factory = (void *)0xdeadbeef; + IInspectable *inspectable = (void *)0xdeadbeef; IJsonObject *json_object = (void *)0xdeadbeef; HSTRING str; HRESULT hr; @@ -56,7 +57,6 @@ static void test_JsonObjectStatics(void) hr = WindowsCreateString( json_object_name, wcslen( json_object_name ), &str ); ok( hr == S_OK, "got hr %#lx.\n", hr ); - hr = RoGetActivationFactory( str, &IID_IActivationFactory, (void **)&factory ); WindowsDeleteString( str ); ok( hr == S_OK || broken( hr == REGDB_E_CLASSNOTREG ), "got hr %#lx.\n", hr ); @@ -73,6 +73,19 @@ static void test_JsonObjectStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IJsonObject, (void **)&json_object ); ok( hr == E_NOINTERFACE, "got hr %#lx.\n", hr ); + hr = WindowsCreateString( json_object_name, wcslen( json_object_name ), &str ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = RoActivateInstance( str, &inspectable ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + WindowsDeleteString( str ); + + hr = IInspectable_QueryInterface( inspectable, &IID_IJsonObject, (void **)&json_object ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + check_interface( inspectable, &IID_IAgileObject ); + + IJsonObject_Release( json_object ); + IInspectable_Release( inspectable ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Mohamad Al-Jaf : windows.web: Add stub DLL.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: dbdc0dce468bfd152e21b2c8533f774c4b75a456 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbdc0dce468bfd152e21b2c8533f77… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Jul 3 01:10:28 2024 -0400 windows.web: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.web/Makefile.in | 7 +++ dlls/windows.web/classes.idl | 23 ++++++++ dlls/windows.web/json_object.c | 116 +++++++++++++++++++++++++++++++++++++ dlls/windows.web/main.c | 46 +++++++++++++++ dlls/windows.web/private.h | 40 +++++++++++++ dlls/windows.web/tests/Makefile.in | 5 ++ dlls/windows.web/tests/web.c | 90 ++++++++++++++++++++++++++++ dlls/windows.web/windows.web.spec | 6 ++ 10 files changed, 338 insertions(+)

1 0

Mohamad Al-Jaf : include: Add windows.data.json.idl file.
by Alexandre Julliard July 5, 2024

July 5, 2024

Module: wine Branch: master Commit: c03035d3423a851ff31df62bf2e41c9a4f533c9f URL: https://gitlab.winehq.org/wine/wine/-/commit/c03035d3423a851ff31df62bf2e41c… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Jul 3 00:44:34 2024 -0400 include: Add windows.data.json.idl file. --- include/Makefile.in | 1 + include/windows.data.json.idl | 162 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 163 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index d52afd06926..bbf28cfc87e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -830,6 +830,7 @@ SOURCES = \ windows.applicationmodel.background.idl \ windows.applicationmodel.core.idl \ windows.applicationmodel.idl \ + windows.data.json.idl \ windows.devices.bluetooth.idl \ windows.devices.enumeration.idl \ windows.devices.geolocation.idl \ diff --git a/include/windows.data.json.idl b/include/windows.data.json.idl new file mode 100644 index 00000000000..483d8dce721 --- /dev/null +++ b/include/windows.data.json.idl @@ -0,0 +1,162 @@ +/* + * Copyright (C) 2024 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; + +namespace Windows.Data.Json { + typedef enum JsonValueType JsonValueType; + + interface IJsonArray; + interface IJsonArrayStatics; + interface IJsonObject; + interface IJsonObjectStatics; + interface IJsonObjectWithDefaultValues; + interface IJsonValue; + interface IJsonValueStatics; + interface IJsonValueStatics2; + + runtimeclass JsonArray; + runtimeclass JsonObject; + runtimeclass JsonValue; + + declare { + interface Windows.Foundation.Collections.IKeyValuePair<HSTRING, Windows.Data.Json.IJsonValue *>; + interface Windows.Foundation.Collections.IIterable<Windows.Data.Json.IJsonValue *>; + interface Windows.Foundation.Collections.IIterable<Windows.Foundation.Collections.IKeyValuePair<HSTRING, Windows.Data.Json.IJsonValue *> *>; + interface Windows.Foundation.Collections.IIterator<Windows.Data.Json.IJsonValue *>; + interface Windows.Foundation.Collections.IIterator<Windows.Foundation.Collections.IKeyValuePair<HSTRING, Windows.Data.Json.IJsonValue *> *>; + interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Data.Json.IJsonValue *>; + interface Windows.Foundation.Collections.IMap<HSTRING, Windows.Data.Json.IJsonValue *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Data.Json.IJsonValue *>; + interface Windows.Foundation.Collections.IVector<Windows.Data.Json.IJsonValue *>; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0) + ] + enum JsonValueType + { + Null = 0, + Boolean = 1, + Number = 2, + String = 3, + Array = 4, + Object = 5, + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Data.Json.JsonArray), + uuid(08c1ddb6-0cbd-4a9a-b5d3-2f852dc37e81) + ] + interface IJsonArray : IInspectable + requires Windows.Data.Json.IJsonValue + { + HRESULT GetObjectAt([in] UINT32 index, [out, retval] Windows.Data.Json.JsonObject **value); + HRESULT GetArrayAt([in] UINT32 index, [out, retval] Windows.Data.Json.JsonArray **value); + HRESULT GetStringAt([in] UINT32 index, [out, retval] HSTRING *value); + HRESULT GetNumberAt([in] UINT32 index, [out, retval] DOUBLE *value); + HRESULT GetBooleanAt([in] UINT32 index, [out, retval] boolean *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Data.Json.JsonObject), + uuid(064e24dd-29c2-4f83-9ac1-9ee11578beb3) + ] + interface IJsonObject : IInspectable + requires Windows.Data.Json.IJsonValue + { + HRESULT GetNamedValue([in] HSTRING name, [out, retval] Windows.Data.Json.JsonValue **value); + HRESULT SetNamedValue([in] HSTRING name, [in] Windows.Data.Json.IJsonValue *value); + HRESULT GetNamedObject([in] HSTRING name, [out, retval] Windows.Data.Json.JsonObject **value); + HRESULT GetNamedArray([in] HSTRING name, [out, retval] Windows.Data.Json.JsonArray **value); + HRESULT GetNamedString([in] HSTRING name, [out, retval] HSTRING *value); + HRESULT GetNamedNumber([in] HSTRING name, [out, retval] DOUBLE *value); + HRESULT GetNamedBoolean([in] HSTRING name, [out, retval] boolean *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(a3219ecb-f0b3-4dcd-beee-19d48cd3ed1e) + ] + interface IJsonValue : IInspectable + { + [propget] HRESULT ValueType([out, retval] Windows.Data.Json.JsonValueType *value); + HRESULT Stringify([out, retval] HSTRING *value); + HRESULT GetString([out, retval] HSTRING *value); + HRESULT GetNumber([out, retval] DOUBLE *value); + HRESULT GetBoolean([out, retval] boolean *value); + HRESULT GetArray([out, retval] Windows.Data.Json.JsonArray **value); + HRESULT GetObject([out, retval] Windows.Data.Json.JsonObject **value); + } + + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Data.Json.IJsonArrayStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass JsonArray + { + [default] interface Windows.Data.Json.IJsonArray; + interface Windows.Data.Json.IJsonValue; + interface Windows.Foundation.Collections.IVector<Windows.Data.Json.IJsonValue *>; + interface Windows.Foundation.Collections.IIterable<Windows.Data.Json.IJsonValue *>; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Foundation.IStringable; + } + + [ + activatable(Windows.Foundation.UniversalApiContract, 1.0), + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Data.Json.IJsonObjectStatics, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass JsonObject + { + [default] interface Windows.Data.Json.IJsonObject; + interface Windows.Data.Json.IJsonValue; + interface Windows.Foundation.Collections.IMap<HSTRING, Windows.Data.Json.IJsonValue *>; + interface Windows.Foundation.Collections.IIterable<Windows.Foundation.Collections.IKeyValuePair<HSTRING, Windows.Data.Json.IJsonValue *> *>; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Data.Json.IJsonObjectWithDefaultValues; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Foundation.IStringable; + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + static(Windows.Data.Json.IJsonValueStatics, Windows.Foundation.UniversalApiContract, 1.0), + static(Windows.Data.Json.IJsonValueStatics2, Windows.Foundation.UniversalApiContract, 1.0), + threading(both) + ] + runtimeclass JsonValue + { + [default] interface Windows.Data.Json.IJsonValue; + [contract(Windows.Foundation.UniversalApiContract, 1.0)] interface Windows.Foundation.IStringable; + } +}

1 0

Connor McAdams : d3dx9: Use d3dx_image structure inside of D3DXCreateVolumeTextureFromFileInMemoryEx().
by Alexandre Julliard July 4, 2024

July 4, 2024

Module: wine Branch: master Commit: c9e6f6f84f661bdd190f4475296a7ce1d3885516 URL: https://gitlab.winehq.org/wine/wine/-/commit/c9e6f6f84f661bdd190f4475296a7c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 09:41:59 2024 -0400 d3dx9: Use d3dx_image structure inside of D3DXCreateVolumeTextureFromFileInMemoryEx(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 2 - dlls/d3dx9_36/surface.c | 52 ------------------------- dlls/d3dx9_36/tests/texture.c | 88 +++++++++++++++++++++---------------------- dlls/d3dx9_36/texture.c | 47 ++++++++++++++++++++--- 4 files changed, 85 insertions(+), 104 deletions(-)

1 0

Connor McAdams : d3dx9: Add support for mipmap generation to D3DXCreateVolumeTextureFromFileInMemoryEx().
by Alexandre Julliard July 4, 2024

July 4, 2024

Module: wine Branch: master Commit: 797df8df394d81a165328f9ac6b4039253a78718 URL: https://gitlab.winehq.org/wine/wine/-/commit/797df8df394d81a165328f9ac6b403… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 09:45:46 2024 -0400 d3dx9: Add support for mipmap generation to D3DXCreateVolumeTextureFromFileInMemoryEx(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/texture.c | 12 +++++------- dlls/d3dx9_36/texture.c | 13 +++++++------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index e7362923c80..47ac46e9d3b 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2550,16 +2550,14 @@ static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *dev D3DX_DEFAULT, D3DX_FILTER_POINT, 0, &img_info, NULL, &texture); ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr); - check_texture_mip_levels(texture, 3, TRUE); + check_texture_mip_levels(texture, 3, FALSE); check_image_info(&img_info, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_BMP, FALSE); check_volume_texture_level_desc(texture, 0, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 4, 4, 1, FALSE); - check_volume_texture_level_desc(texture, 1, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 2, 2, 1, TRUE); - check_volume_texture_level_desc(texture, 2, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 1, 1, 1, TRUE); + check_volume_texture_level_desc(texture, 1, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 2, 2, 1, FALSE); + check_volume_texture_level_desc(texture, 2, D3DFMT_A8R8G8B8, D3DUSAGE_DYNAMIC, D3DPOOL_DEFAULT, 1, 1, 1, FALSE); for (mip_level = 0; mip_level < 3; ++mip_level) { - BOOL todo = !!mip_level; - IDirect3DVolumeTexture9_GetLevelDesc(texture, mip_level, &desc); get_texture_volume_readback(device, texture, mip_level, &volume_rb); for (z = 0; z < desc.Depth; ++z) @@ -2571,9 +2569,9 @@ static void test_D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *dev for (x = 0; x < desc.Width; ++x) { if (desc.Width == 1 || x < (desc.Width / 2)) - check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[0], todo); + check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[0], FALSE); else - check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[1], todo); + check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, expected_color[1], FALSE); } } } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 6f936b4d922..b42c9db3f2d 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1154,12 +1154,6 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic goto err; } - if (mip_levels > image_info.MipLevels) - { - FIXME("Generation of mipmaps for volume textures is not implemented yet.\n"); - mip_levels = image_info.MipLevels; - } - dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { @@ -1214,6 +1208,13 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic goto err; } + hr = D3DXFilterTexture((IDirect3DBaseTexture9 *)tex, palette, loaded_miplevels - 1, mip_filter); + if (FAILED(hr)) + { + FIXME("Texture filtering failed.\n"); + goto err; + } + /* Move the data to the actual texture if necessary. */ if (staging_tex) {

1 0

Connor McAdams : d3dx9: Cleanup texture value argument handling in D3DXCreateVolumeTextureFromFileInMemoryEx().
by Alexandre Julliard July 4, 2024

July 4, 2024

Module: wine Branch: master Commit: 438fba77d7957c744be9eefb707f81b3bd2d992f URL: https://gitlab.winehq.org/wine/wine/-/commit/438fba77d7957c744be9eefb707f81… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 09:31:59 2024 -0400 d3dx9: Cleanup texture value argument handling in D3DXCreateVolumeTextureFromFileInMemoryEx(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/texture.c | 72 ++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 09219d8073b..b968fb35aec 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1098,13 +1098,8 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic HRESULT hr; D3DCAPS9 caps; D3DXIMAGE_INFO image_info; - BOOL dynamic_texture; - BOOL file_width = FALSE; - BOOL file_height = FALSE; - BOOL file_depth = FALSE; - BOOL file_format = FALSE; - BOOL file_mip_levels = FALSE; IDirect3DVolumeTexture9 *tex, *staging_tex; + BOOL dynamic_texture, format_specified = FALSE; TRACE("device %p, data %p, data_size %u, width %u, height %u, depth %u, mip_levels %u, " "usage %#lx, format %#x, pool %#x, filter %#lx, mip_filter %#lx, color_key 0x%08lx, " @@ -1122,53 +1117,18 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic if (image_info.ImageFileFormat != D3DXIFF_DDS) return D3DXERR_INVALIDDATA; - if (width == 0 || width == D3DX_DEFAULT_NONPOW2) - width = image_info.Width; - if (width == D3DX_DEFAULT) - width = make_pow2(image_info.Width); - - if (height == 0 || height == D3DX_DEFAULT_NONPOW2) - height = image_info.Height; - if (height == D3DX_DEFAULT) - height = make_pow2(image_info.Height); - - if (depth == 0 || depth == D3DX_DEFAULT_NONPOW2) - depth = image_info.Depth; - if (depth == D3DX_DEFAULT) - depth = make_pow2(image_info.Depth); - - if (format == D3DFMT_UNKNOWN || format == D3DX_DEFAULT) - format = image_info.Format; - - if (width == D3DX_FROM_FILE) - { - file_width = TRUE; - width = image_info.Width; - } - - if (height == D3DX_FROM_FILE) - { - file_height = TRUE; - height = image_info.Height; - } - - if (depth == D3DX_FROM_FILE) - { - file_depth = TRUE; - depth = image_info.Depth; - } - - if (format == D3DFMT_FROM_FILE) - { - file_format = TRUE; - format = image_info.Format; - } + /* Handle default values. */ + if (!width || width == D3DX_DEFAULT_NONPOW2 || width == D3DX_FROM_FILE || width == D3DX_DEFAULT) + width = (width == D3DX_DEFAULT) ? make_pow2(image_info.Width) : image_info.Width; + if (!height || height == D3DX_DEFAULT_NONPOW2 || height == D3DX_FROM_FILE || height == D3DX_DEFAULT) + height = (height == D3DX_DEFAULT) ? make_pow2(image_info.Height) : image_info.Height; + if (!depth || depth == D3DX_DEFAULT_NONPOW2 || depth == D3DX_FROM_FILE || depth == D3DX_DEFAULT) + depth = (depth == D3DX_DEFAULT) ? make_pow2(image_info.Depth) : image_info.Depth; - if (mip_levels == D3DX_FROM_FILE) - { - file_mip_levels = TRUE; - mip_levels = image_info.MipLevels; - } + format_specified = (format != D3DFMT_UNKNOWN && format != D3DX_DEFAULT); + if (format == D3DFMT_FROM_FILE || format == D3DFMT_UNKNOWN || format == D3DX_DEFAULT) + format = image_info.Format; + mip_levels = (mip_levels == D3DX_FROM_FILE) ? image_info.MipLevels : mip_levels; hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, &mip_levels, usage, &format, pool); if (FAILED(hr)) @@ -1177,12 +1137,8 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic goto err; } - if ((file_width && width != image_info.Width) - || (file_height && height != image_info.Height) - || (file_depth && depth != image_info.Depth) - || (file_format && format != image_info.Format) - || (file_mip_levels && mip_levels != image_info.MipLevels)) - return D3DERR_NOTAVAILABLE; + if (color_key && !format_specified) + format = get_alpha_replacement_format(format); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); if (FAILED(hr))

1 0

Connor McAdams : d3dx9: Refactor texture creation and cleanup in D3DXCreateVolumeTextureFromFileInMemoryEx().
by Alexandre Julliard July 4, 2024

July 4, 2024

Module: wine Branch: master Commit: 935c324d3a233e038bae299cb020b7d4aba0a3f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/935c324d3a233e038bae299cb020b7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 09:28:46 2024 -0400 d3dx9: Refactor texture creation and cleanup in D3DXCreateVolumeTextureFromFileInMemoryEx(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/texture.c | 59 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8314146a264..09219d8073b 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1104,7 +1104,7 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic BOOL file_depth = FALSE; BOOL file_format = FALSE; BOOL file_mip_levels = FALSE; - IDirect3DVolumeTexture9 *tex, *buftex; + IDirect3DVolumeTexture9 *tex, *staging_tex; TRACE("device %p, data %p, data_size %u, width %u, height %u, depth %u, mip_levels %u, " "usage %#lx, format %#x, pool %#x, filter %#lx, mip_filter %#lx, color_key 0x%08lx, " @@ -1115,6 +1115,7 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic if (!device || !data || !data_size || !volume_texture) return D3DERR_INVALIDCALL; + staging_tex = tex = *volume_texture = NULL; hr = D3DXGetImageInfoFromFileInMemory(data, data_size, &image_info); if (FAILED(hr)) return hr; @@ -1170,7 +1171,11 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic } hr = D3DXCheckVolumeTextureRequirements(device, &width, &height, &depth, &mip_levels, usage, &format, pool); - if (FAILED(hr)) return hr; + if (FAILED(hr)) + { + FIXME("Couldn't find suitable texture parameters.\n"); + goto err; + } if ((file_width && width != image_info.Width) || (file_height && height != image_info.Height) @@ -1181,7 +1186,10 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); if (FAILED(hr)) - return D3DERR_INVALIDCALL; + { + hr = D3DERR_INVALIDCALL; + goto err; + } if (mip_levels > image_info.MipLevels) { @@ -1192,41 +1200,54 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage & D3DUSAGE_DYNAMIC); if (pool == D3DPOOL_DEFAULT && !dynamic_texture) { - hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, 0, format, D3DPOOL_SYSTEMMEM, &buftex); - tex = buftex; + TRACE("Creating staging texture.\n"); + hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, 0, format, D3DPOOL_SYSTEMMEM, &staging_tex); + tex = staging_tex; } else { hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, usage, format, pool, &tex); - buftex = NULL; } - if (FAILED(hr)) return hr; + if (FAILED(hr)) + { + FIXME("Texture creation failed.\n"); + goto err; + } + + TRACE("Texture created correctly. Now loading the texture data into it.\n"); hr = load_volume_texture_from_dds(tex, data, palette, filter, color_key, &image_info); if (FAILED(hr)) { - IDirect3DVolumeTexture9_Release(tex); - return hr; + FIXME("Texture loading failed.\n"); + goto err; } - if (buftex) + /* Move the data to the actual texture if necessary. */ + if (staging_tex) { - hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, usage, format, pool, &tex); + hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, usage, format, pool, volume_texture); if (FAILED(hr)) - { - IDirect3DVolumeTexture9_Release(buftex); - return hr; - } + goto err; - IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)buftex, (IDirect3DBaseTexture9 *)tex); - IDirect3DVolumeTexture9_Release(buftex); + IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)staging_tex, (IDirect3DBaseTexture9 *)(*volume_texture)); + IDirect3DVolumeTexture9_Release(staging_tex); + } + else + { + *volume_texture = tex; } if (info) *info = image_info; - *volume_texture = tex; - return D3D_OK; + return hr; + +err: + if (tex) + IDirect3DVolumeTexture9_Release(tex); + + return hr; } static inline void fill_texture(const struct pixel_format_desc *format, BYTE *pos, const D3DXVECTOR4 *value)

1 0