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

Mohamad Al-Jaf : windows.web: Add stub DLL.
by Alexandre Julliard 05 Jul '24

05 Jul '24

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 : windows.web: Implement IActivationFactory::ActivateInstance().
by Alexandre Julliard 05 Jul '24

05 Jul '24

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 : include: Add IJsonValueStatics interface definition.
by Alexandre Julliard 05 Jul '24

05 Jul '24

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: Add IJsonValueStatics stub interface.
by Alexandre Julliard 05 Jul '24

05 Jul '24

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 05 Jul '24

05 Jul '24

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 : windows.web: Implement IJsonValueStatics::CreateStringValue().
by Alexandre Julliard 05 Jul '24

05 Jul '24

Module: wine Branch: master Commit: a584b81436381e627e83dcd793d8d602cf568701 URL: https://gitlab.winehq.org/wine/wine/-/commit/a584b81436381e627e83dcd793d8d6… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Jul 3 02:13:11 2024 -0400 windows.web: Implement IJsonValueStatics::CreateStringValue(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56914 --- dlls/windows.web/json_value.c | 157 +++++++++++++++++++++++++++++++++++++++++- dlls/windows.web/tests/web.c | 6 +- 2 files changed, 157 insertions(+), 6 deletions(-) diff --git a/dlls/windows.web/json_value.c b/dlls/windows.web/json_value.c index 98d41d2c7cf..87b3365f199 100644 --- a/dlls/windows.web/json_value.c +++ b/dlls/windows.web/json_value.c @@ -115,6 +115,142 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +struct json_value +{ + IJsonValue IJsonValue_iface; + LONG ref; + + HSTRING string_value; +}; + +static inline struct json_value *impl_from_IJsonValue( IJsonValue *iface ) +{ + return CONTAINING_RECORD( iface, struct json_value, IJsonValue_iface ); +} + +static HRESULT WINAPI json_value_QueryInterface( IJsonValue *iface, REFIID iid, void **out ) +{ + struct json_value *impl = impl_from_IJsonValue( 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_IJsonValue )) + { + *out = &impl->IJsonValue_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_value_AddRef( IJsonValue *iface ) +{ + struct json_value *impl = impl_from_IJsonValue( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI json_value_Release( IJsonValue *iface ) +{ + struct json_value *impl = impl_from_IJsonValue( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) + { + WindowsDeleteString( impl->string_value ); + free( impl ); + } + return ref; +} + +static HRESULT WINAPI json_value_GetIids( IJsonValue *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_value_GetRuntimeClassName( IJsonValue *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetTrustLevel( IJsonValue *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_get_ValueType( IJsonValue *iface, JsonValueType *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_Stringify( IJsonValue *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetString( IJsonValue *iface, HSTRING *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetNumber( IJsonValue *iface, DOUBLE *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetBoolean( IJsonValue *iface, boolean *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetArray( IJsonValue *iface, IJsonArray **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI json_value_GetObject( IJsonValue *iface, IJsonObject **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IJsonValueVtbl json_value_vtbl = +{ + json_value_QueryInterface, + json_value_AddRef, + json_value_Release, + /* IInspectable methods */ + json_value_GetIids, + json_value_GetRuntimeClassName, + json_value_GetTrustLevel, + /* IJsonValue methods */ + json_value_get_ValueType, + json_value_Stringify, + json_value_GetString, + json_value_GetNumber, + json_value_GetBoolean, + json_value_GetArray, + json_value_GetObject, +}; + DEFINE_IINSPECTABLE( json_value_statics, IJsonValueStatics, struct json_value_statics, IActivationFactory_iface ) static HRESULT WINAPI json_value_statics_Parse( IJsonValueStatics *iface, HSTRING input, IJsonValue **value ) @@ -143,8 +279,25 @@ static HRESULT WINAPI json_value_statics_CreateNumberValue( IJsonValueStatics *i static HRESULT WINAPI json_value_statics_CreateStringValue( IJsonValueStatics *iface, HSTRING input, IJsonValue **value ) { - FIXME( "iface %p, input %s, value %p stub!\n", iface, debugstr_hstring( input ), value ); - return E_NOTIMPL; + struct json_value *impl; + HRESULT hr; + + TRACE( "iface %p, input %s, value %p\n", iface, debugstr_hstring( input ), value ); + + if (!value) return E_POINTER; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + + impl->IJsonValue_iface.lpVtbl = &json_value_vtbl; + impl->ref = 1; + if (FAILED(hr = WindowsDuplicateString( input, &impl->string_value ))) + { + free( impl ); + return hr; + } + + *value = &impl->IJsonValue_iface; + TRACE( "created IJsonValue %p.\n", *value ); + return S_OK; } static const struct IJsonValueStaticsVtbl json_value_statics_vtbl = diff --git a/dlls/windows.web/tests/web.c b/dlls/windows.web/tests/web.c index 5bb81d44d13..649a1b066ed 100644 --- a/dlls/windows.web/tests/web.c +++ b/dlls/windows.web/tests/web.c @@ -120,20 +120,18 @@ static void test_JsonValueStatics(void) 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 = IJsonValue_Release( json_value ); + ok( ref == 0, "got ref %ld.\n", ref ); ref = IJsonValueStatics_Release( json_value_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Shaun Ren : dinput: Call handle_foreground_lost() synchronously in cbt_hook_proc().
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: 90020391014b34dc06b382d9d5c97f474221deb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/90020391014b34dc06b382d9d5c97f… Author: Shaun Ren <sren(a)codeweavers.com> Date: Fri Jun 28 19:50:11 2024 -0400 dinput: Call handle_foreground_lost() synchronously in cbt_hook_proc(). mouse_unacquire() needs to be called on the same thread as mouse_acquire(), otherwise the cursor hidden by mouse_unacquire() will not be restored. --- dlls/dinput/dinput_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index b27339901e5..8f22b6c3057 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -48,7 +48,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #define INPUT_THREAD_NOTIFY (WM_USER + 0x10) #define NOTIFY_THREAD_STOP 0 #define NOTIFY_REFRESH_DEVICES 1 -#define NOTIFY_FOREGROUND_LOST 2 struct input_thread_state { @@ -174,8 +173,8 @@ static LRESULT CALLBACK cbt_hook_proc( int code, WPARAM wparam, LPARAM lparam ) if (code == HCBT_ACTIVATE && di_em_win) { CBTACTIVATESTRUCT *data = (CBTACTIVATESTRUCT *)lparam; - SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_FOREGROUND_LOST, - (LPARAM)data->hWndActive ); + handle_foreground_lost( data->hWndActive ); + SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); } return CallNextHookEx( 0, code, wparam, lparam ); @@ -334,9 +333,6 @@ static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR case NOTIFY_THREAD_STOP: state->running = FALSE; break; - case NOTIFY_FOREGROUND_LOST: - handle_foreground_lost( (HWND)lparam ); - /* fallthrough */ case NOTIFY_REFRESH_DEVICES: while (state->devices_count--) dinput_device_internal_release( state->devices[state->devices_count] ); input_thread_update_device_list( state );

1 0

Connor McAdams : d3dx9/tests: Move the images used across multiple test files into a shared header.
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: d4090df3f4806034060ded3e819f90197334f08a URL: https://gitlab.winehq.org/wine/wine/-/commit/d4090df3f4806034060ded3e819f90… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Jun 7 09:07:37 2024 -0400 d3dx9/tests: Move the images used across multiple test files into a shared header. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/d3dx9_test_images.h | 381 ++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/surface.c | 267 +--------------------- dlls/d3dx9_36/tests/texture.c | 186 +--------------- dlls/d3dx9_36/tests/volume.c | 18 +- 4 files changed, 384 insertions(+), 468 deletions(-)

1 0

Connor McAdams : d3dx9/tests: Add more D3DXLoadVolumeFromFileInMemory() tests.
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: 83ba4c0955227eb25129381e87ca29244e505858 URL: https://gitlab.winehq.org/wine/wine/-/commit/83ba4c0955227eb25129381e87ca29… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 08:08:30 2024 -0400 d3dx9/tests: Add more D3DXLoadVolumeFromFileInMemory() tests. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/tests/d3dx9_test_images.h | 56 +++++++++- dlls/d3dx9_36/tests/texture.c | 31 ------ dlls/d3dx9_36/tests/volume.c | 175 ++++++++++++++++++++++++++++++++ 3 files changed, 230 insertions(+), 32 deletions(-)

1 0

Connor McAdams : d3dx9: Use shared code in D3DXLoadVolumeFromFileInMemory().
by Alexandre Julliard 04 Jul '24

04 Jul '24

Module: wine Branch: master Commit: de286c6b65491ac142a7a65375915e80e7113f7a URL: https://gitlab.winehq.org/wine/wine/-/commit/de286c6b65491ac142a7a65375915e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Jun 19 08:52:59 2024 -0400 d3dx9: Use shared code in D3DXLoadVolumeFromFileInMemory(). Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/d3dx9_36/d3dx9_private.h | 3 --- dlls/d3dx9_36/surface.c | 18 -------------- dlls/d3dx9_36/tests/volume.c | 56 +++++++++++++++++++------------------------ dlls/d3dx9_36/volume.c | 43 ++++++++++++++++----------------- 4 files changed, 46 insertions(+), 74 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 701afffd046..26e4a1560d6 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -174,9 +174,6 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info); -HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, - const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key, - const D3DXIMAGE_INFO *src_info); HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info); HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLOCKED_RECT *lock, diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 3e0b880eec4..a97112a3562 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -566,24 +566,6 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur return D3D_OK; } -HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, - const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key, - const D3DXIMAGE_INFO *src_info) -{ - UINT row_pitch, slice_pitch; - const struct dds_header *header = src_data; - const BYTE *pixels = (BYTE *)(header + 1); - - if (src_info->ResourceType != D3DRTYPE_VOLUMETEXTURE) - return D3DXERR_INVALIDDATA; - - if (FAILED(d3dx_calculate_pixels_size(src_info->Format, src_info->Width, src_info->Height, &row_pitch, &slice_pitch))) - return E_NOTIMPL; - - return D3DXLoadVolumeFromMemory(dst_volume, dst_palette, dst_box, pixels, src_info->Format, - row_pitch, slice_pitch, NULL, src_box, filter, color_key); -} - HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info) { diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 83d832b08c7..9ffc487078c 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -362,25 +362,22 @@ static void test_D3DXLoadVolumeFromFileInMemory(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, 0, &volume); hr = D3DXLoadVolumeFromFileInMemory(volume, NULL, NULL, dds_24bit_8_8, sizeof(dds_24bit_8_8), NULL, D3DX_FILTER_POINT, 0, &img_info); - todo_wine ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - { - check_image_info(&img_info, 8, 8, 1, 4, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, FALSE); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + check_image_info(&img_info, 8, 8, 1, 4, D3DFMT_R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_DDS, FALSE); - IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &desc); - get_texture_volume_readback(device, volume_texture, 0, &volume_rb); - for (z = 0; z < desc.Depth; ++z) + IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &desc); + get_texture_volume_readback(device, volume_texture, 0, &volume_rb); + for (z = 0; z < desc.Depth; ++z) + { + for (y = 0; y < desc.Height; ++y) { - for (y = 0; y < desc.Height; ++y) + for (x = 0; x < desc.Width; ++x) { - for (x = 0; x < desc.Width; ++x) - { - check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, 0xffff0000, FALSE); - } + check_volume_readback_pixel_4bpp(&volume_rb, x, y, z, 0xffff0000, FALSE); } } - release_volume_readback(&volume_rb); } + release_volume_readback(&volume_rb); IDirect3DVolume9_Release(volume); IDirect3DVolumeTexture9_Release(volume_texture); @@ -393,30 +390,27 @@ static void test_D3DXLoadVolumeFromFileInMemory(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_GetVolumeLevel(volume_texture, 0, &volume); hr = D3DXLoadVolumeFromFileInMemory(volume, NULL, NULL, bmp_32bpp_4_4_argb, sizeof(bmp_32bpp_4_4_argb), NULL, D3DX_FILTER_POINT, 0, &img_info); - todo_wine ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - if (SUCCEEDED(hr)) - { - check_image_info(&img_info, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_BMP, FALSE); + ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); + check_image_info(&img_info, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DRTYPE_TEXTURE, D3DXIFF_BMP, FALSE); - IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &desc); - get_texture_volume_readback(device, volume_texture, 0, &volume_rb); - for (z = 0; z < desc.Depth; ++z) + IDirect3DVolumeTexture9_GetLevelDesc(volume_texture, 0, &desc); + get_texture_volume_readback(device, volume_texture, 0, &volume_rb); + for (z = 0; z < desc.Depth; ++z) + { + for (y = 0; y < desc.Height; ++y) { - for (y = 0; y < desc.Height; ++y) + const uint32_t *expected_color = &bmp_32bpp_4_4_argb_expected[(y < (desc.Height / 2)) ? 0 : 2]; + + for (x = 0; x < desc.Width; ++x) { - const uint32_t *expected_color = &bmp_32bpp_4_4_argb_expected[(y < (desc.Height / 2)) ? 0 : 2]; - - for (x = 0; x < desc.Width; ++x) - { - if (x < (desc.Width / 2)) - 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], FALSE); - } + if (x < (desc.Width / 2)) + 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], FALSE); } } - release_volume_readback(&volume_rb); } + release_volume_readback(&volume_rb); IDirect3DVolume9_Release(volume); IDirect3DVolumeTexture9_Release(volume_texture); diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 0006a521532..06cae72c51e 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -168,6 +168,8 @@ HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume, cons { HRESULT hr; D3DBOX box; + struct d3dx_image image; + struct d3dx_pixels pixels; D3DXIMAGE_INFO image_info; TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_data %p, src_data_size %u, src_box %p, " @@ -175,46 +177,43 @@ HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume, cons dst_volume, dst_palette, dst_box, src_data, src_data_size, src_box, filter, color_key, src_info); - if (!dst_volume || !src_data) + if (!dst_volume || !src_data || !src_data_size) return D3DERR_INVALIDCALL; - if (FAILED(hr = D3DXGetImageInfoFromFileInMemory(src_data, src_data_size, &image_info))) - return hr; + hr = d3dx_image_init(src_data, src_data_size, &image, 0, 0); + if (FAILED(hr)) + return D3DXERR_INVALIDDATA; + d3dximage_info_from_d3dx_image(&image_info, &image); if (src_box) { if (src_box->Right > image_info.Width || src_box->Bottom > image_info.Height || src_box->Back > image_info.Depth) - return D3DERR_INVALIDCALL; + { + hr = D3DERR_INVALIDCALL; + goto exit; + } box = *src_box; } else { - box.Left = 0; - box.Top = 0; - box.Right = image_info.Width; - box.Bottom = image_info.Height; - box.Front = 0; - box.Back = image_info.Depth; - - } - - if (image_info.ImageFileFormat != D3DXIFF_DDS) - { - FIXME("File format %#x is not supported yet\n", image_info.ImageFileFormat); - return E_NOTIMPL; + set_d3dbox(&box, 0, 0, image_info.Width, image_info.Height, 0, image_info.Depth); } - hr = load_volume_from_dds(dst_volume, dst_palette, dst_box, src_data, &box, - filter, color_key, &image_info); - if (FAILED(hr)) return hr; + hr = d3dx_image_get_pixels(&image, 0, &pixels); + if (FAILED(hr)) + goto exit; - if (src_info) + hr = D3DXLoadVolumeFromMemory(dst_volume, dst_palette, dst_box, pixels.data, image_info.Format, + pixels.row_pitch, pixels.slice_pitch, pixels.palette, &box, filter, color_key); + if (SUCCEEDED(hr) && src_info) *src_info = image_info; - return D3D_OK; +exit: + d3dx_image_cleanup(&image); + return FAILED(hr) ? hr : D3D_OK; } HRESULT WINAPI D3DXLoadVolumeFromVolume(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette,

1 0