- Wine-Commits - list.winehq.org

Francisco Casas : vkd3d-shader/tpf: Make sm4_src_register.mod a vkd3d_shader_src_modifier enum.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: vkd3d Branch: master Commit: 32f03468fc02dcd6015d9557786423d346646d99 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/32f03468fc02dcd6015d955778642… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Aug 31 17:27:13 2023 -0400 vkd3d-shader/tpf: Make sm4_src_register.mod a vkd3d_shader_src_modifier enum. --- libs/vkd3d-shader/tpf.c | 57 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 63771736..0b68f0f1 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3628,7 +3628,7 @@ struct sm4_instruction struct vkd3d_shader_register reg; enum vkd3d_sm4_swizzle_type swizzle_type; DWORD swizzle; - unsigned int mod; + enum vkd3d_shader_src_modifier modifiers; } srcs[5]; unsigned int src_count; @@ -3897,7 +3897,7 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm const struct vkd3d_sm4_register_type_info *register_type_info; struct vkd3d_bytecode_buffer *buffer = tpf->buffer; uint32_t sm4_reg_type, reg_dim; - uint32_t token = 0; + uint32_t token = 0, mod_token = 0; unsigned int j; register_type_info = get_info_from_vkd3d_register_type(&tpf->lookup, src->reg.type); @@ -3921,13 +3921,44 @@ static void sm4_write_src_register(const struct tpf_writer *tpf, const struct sm token |= (uint32_t)src->swizzle_type << VKD3D_SM4_SWIZZLE_TYPE_SHIFT; token |= swizzle_to_sm4(src->swizzle) << VKD3D_SM4_SWIZZLE_SHIFT; } - if (src->mod) - token |= VKD3D_SM4_EXTENDED_OPERAND; - put_u32(buffer, token); - if (src->mod) - put_u32(buffer, (src->mod << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) - | VKD3D_SM4_EXTENDED_OPERAND_MODIFIER); + switch (src->modifiers) + { + case VKD3DSPSM_NONE: + mod_token = VKD3D_SM4_REGISTER_MODIFIER_NONE; + break; + + case VKD3DSPSM_ABS: + mod_token = (VKD3D_SM4_REGISTER_MODIFIER_ABS << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) + | VKD3D_SM4_EXTENDED_OPERAND_MODIFIER; + break; + + case VKD3DSPSM_NEG: + mod_token = (VKD3D_SM4_REGISTER_MODIFIER_NEGATE << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) + | VKD3D_SM4_EXTENDED_OPERAND_MODIFIER; + break; + + case VKD3DSPSM_ABSNEG: + mod_token = (VKD3D_SM4_REGISTER_MODIFIER_ABS_NEGATE << VKD3D_SM4_REGISTER_MODIFIER_SHIFT) + | VKD3D_SM4_EXTENDED_OPERAND_MODIFIER; + break; + + default: + ERR("Unhandled register modifier %#x.\n", src->modifiers); + vkd3d_unreachable(); + break; + } + + if (src->modifiers) + { + token |= VKD3D_SM4_EXTENDED_OPERAND; + put_u32(buffer, token); + put_u32(buffer, mod_token); + } + else + { + put_u32(buffer, token); + } for (j = 0; j < src->reg.idx_count; ++j) { @@ -3962,7 +3993,7 @@ static uint32_t sm4_src_register_order(const struct sm4_src_register *src) if (src->reg.type == VKD3DSPR_IMMCONST) order += src->reg.dimension == VSIR_DIMENSION_VEC4 ? 4 : 1; order += src->reg.idx_count; - if (src->mod) + if (src->modifiers) ++order; return order; } @@ -4280,7 +4311,7 @@ static void write_sm4_ret(const struct tpf_writer *tpf) } static void write_sm4_unary_op(const struct tpf_writer *tpf, enum vkd3d_sm4_opcode opcode, - const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src, unsigned int src_mod) + const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src, enum vkd3d_shader_src_modifier src_mod) { struct sm4_instruction instr; @@ -4291,7 +4322,7 @@ static void write_sm4_unary_op(const struct tpf_writer *tpf, enum vkd3d_sm4_opco instr.dst_count = 1; sm4_src_from_node(&instr.srcs[0], src, instr.dsts[0].write_mask); - instr.srcs[0].mod = src_mod; + instr.srcs[0].modifiers = src_mod; instr.src_count = 1; write_sm4_instruction(tpf, &instr); @@ -4776,7 +4807,7 @@ static void write_sm4_expr(const struct tpf_writer *tpf, const struct hlsl_ir_ex switch (dst_type->base_type) { case HLSL_TYPE_FLOAT: - write_sm4_unary_op(tpf, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_ABS); + write_sm4_unary_op(tpf, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3DSPSM_ABS); break; default: @@ -4857,7 +4888,7 @@ static void write_sm4_expr(const struct tpf_writer *tpf, const struct hlsl_ir_ex switch (dst_type->base_type) { case HLSL_TYPE_FLOAT: - write_sm4_unary_op(tpf, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); + write_sm4_unary_op(tpf, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3DSPSM_NEG); break; case HLSL_TYPE_INT:

1 0

Andrey Gusev : vkd3d: Add ID3D12GraphicsCommandList4 interface stub.
by Alexandre Julliard Oct. 3, 2023

Oct. 3, 2023

Module: vkd3d Branch: master Commit: 679203f7172788724fd7e582f4e8f2d8ddfe5e59 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/679203f7172788724fd7e582f4e8f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Oct 2 12:55:34 2023 +0300 vkd3d: Add ID3D12GraphicsCommandList4 interface stub. --- libs/vkd3d/command.c | 332 +++++++++++++++++++++++++++------------------ libs/vkd3d/device.c | 4 +- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 206 insertions(+), 132 deletions(-)

1 0

Alistair Leslie-Hughes : d3dxof: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

Module: wine Branch: master Commit: 209b2c23c5e302ed9211d67ab044386d3fe0bef4 URL: https://gitlab.winehq.org/wine/wine/-/commit/209b2c23c5e302ed9211d67ab04438… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 2 19:42:17 2023 +1100 d3dxof: Remove DECLSPEC_HIDDEN usage. --- dlls/d3dxof/d3dxof_private.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index babc37085e8..9f208dfc9cb 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -160,12 +160,12 @@ typedef struct { LONG ref; } IDirectXFileSaveObjectImpl; -HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT IDirectXFileImpl_Create(IUnknown *pUnkOuter, LPVOID *ppObj); -HRESULT parse_header(parse_buffer *buf, BYTE **decomp_buffer_ptr) DECLSPEC_HIDDEN; -BOOL parse_object(parse_buffer * buf) DECLSPEC_HIDDEN; -BOOL parse_templates(parse_buffer * buf, BOOL templates_only) DECLSPEC_HIDDEN; +HRESULT parse_header(parse_buffer *buf, BYTE **decomp_buffer_ptr); +BOOL parse_object(parse_buffer * buf); +BOOL parse_templates(parse_buffer * buf, BOOL templates_only); -int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer) DECLSPEC_HIDDEN; +int mszip_decompress(int inlen, int outlen, char* inbuffer, char* outbuffer); #endif /* __D3DXOF_PRIVATE_INCLUDED__ */

1 0

Mohamad Al-Jaf : windows.storage.applicationdata: Implement IApplicationDataStatics::get_Current().
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

Module: wine Branch: master Commit: ab9e29b0a7b11bf9d52b11015fb383497089f909 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab9e29b0a7b11bf9d52b11015fb383… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Aug 5 20:17:52 2023 -0400 windows.storage.applicationdata: Implement IApplicationDataStatics::get_Current(). Needed for Minecraft Windows 10. --- dlls/windows.applicationmodel/tests/application.c | 9 +- .../applicationdata.c | 189 ++++++++++++++++++++- dlls/windows.storage.applicationdata/tests/data.c | 2 +- 3 files changed, 193 insertions(+), 7 deletions(-) diff --git a/dlls/windows.applicationmodel/tests/application.c b/dlls/windows.applicationmodel/tests/application.c index 5dcd5a19121..ee357ecb264 100644 --- a/dlls/windows.applicationmodel/tests/application.c +++ b/dlls/windows.applicationmodel/tests/application.c @@ -85,12 +85,13 @@ static void test_ApplicationDataStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IApplicationDataStatics_get_Current( application_data_statics, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); hr = IApplicationDataStatics_get_Current( application_data_statics, &application_data ); - todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); - todo_wine ok( application_data != NULL, "got NULL application_data %p.\n", application_data ); - if (application_data) IApplicationData_Release( application_data ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + ok( application_data != NULL, "got NULL application_data %p.\n", application_data ); + ref = IApplicationData_Release( application_data ); + ok( ref == 1, "got ref %ld.\n", ref ); ref = IApplicationDataStatics_Release( application_data_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); diff --git a/dlls/windows.storage.applicationdata/applicationdata.c b/dlls/windows.storage.applicationdata/applicationdata.c index 6296253eee1..dbe42b3a8d6 100644 --- a/dlls/windows.storage.applicationdata/applicationdata.c +++ b/dlls/windows.storage.applicationdata/applicationdata.c @@ -115,14 +115,199 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; -DEFINE_IINSPECTABLE( application_data_statics, IApplicationDataStatics, struct application_data_statics, IActivationFactory_iface ) +struct application_data +{ + IApplicationData IApplicationData_iface; + LONG ref; +}; -static HRESULT WINAPI application_data_statics_get_Current( IApplicationDataStatics *iface, IApplicationData **value ) +static inline struct application_data *impl_from_IApplicationData( IApplicationData *iface ) +{ + return CONTAINING_RECORD( iface, struct application_data, IApplicationData_iface ); +} + +static HRESULT WINAPI application_data_QueryInterface( IApplicationData *iface, REFIID iid, void **out ) +{ + struct application_data *impl = impl_from_IApplicationData( 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_IApplicationData )) + { + *out = &impl->IApplicationData_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 application_data_AddRef( IApplicationData *iface ) +{ + struct application_data *impl = impl_from_IApplicationData( iface ); + ULONG ref = InterlockedIncrement( &impl->ref ); + TRACE( "iface %p increasing refcount to %lu.\n", iface, ref ); + return ref; +} + +static ULONG WINAPI application_data_Release( IApplicationData *iface ) +{ + struct application_data *impl = impl_from_IApplicationData( iface ); + ULONG ref = InterlockedDecrement( &impl->ref ); + + TRACE( "iface %p decreasing refcount to %lu.\n", iface, ref ); + + if (!ref) free( impl ); + return ref; +} + +static HRESULT WINAPI application_data_GetIids( IApplicationData *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 application_data_GetRuntimeClassName( IApplicationData *iface, HSTRING *class_name ) +{ + FIXME( "iface %p, class_name %p stub!\n", iface, class_name ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_GetTrustLevel( IApplicationData *iface, TrustLevel *trust_level ) +{ + FIXME( "iface %p, trust_level %p stub!\n", iface, trust_level ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_get_Version( IApplicationData *iface, UINT32 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_SetVersionAsync( IApplicationData *iface, UINT32 version, IApplicationDataSetVersionHandler *handler, + IAsyncAction **operation ) +{ + FIXME( "iface %p, version %d, handler %p, operation %p stub!\n", iface, version, handler, operation ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_ClearAllAsync( IApplicationData *iface, IAsyncAction **operation ) +{ + FIXME( "iface %p, operation %p stub!\n", iface, operation ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_ClearAsync( IApplicationData *iface, ApplicationDataLocality locality, IAsyncAction **operation ) +{ + FIXME( "iface %p, %d locality, operation %p stub!\n", iface, locality, operation ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_get_LocalSettings( IApplicationData *iface, IApplicationDataContainer **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_get_RoamingSettings( IApplicationData *iface, IApplicationDataContainer **value ) { FIXME( "iface %p, value %p stub!\n", iface, value ); return E_NOTIMPL; } +static HRESULT WINAPI application_data_get_LocalFolder( IApplicationData *iface, IStorageFolder **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_get_RoamingFolder( IApplicationData *iface, IStorageFolder **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_get_TemporaryFolder( IApplicationData *iface, IStorageFolder **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_add_DataChanged( IApplicationData *iface, ITypedEventHandler_ApplicationData_IInspectable *handler, + EventRegistrationToken *token ) +{ + FIXME( "iface %p, handler %p, token %p stub!\n", iface, handler, token ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_remove_DataChanged( IApplicationData *iface, EventRegistrationToken token ) +{ + FIXME( "iface %p, token %#I64x stub!\n", iface, token.value ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_SignalDataChanged( IApplicationData *iface ) +{ + FIXME( "iface %p stub!\n", iface ); + return E_NOTIMPL; +} + +static HRESULT WINAPI application_data_get_RoamingStorageQuota( IApplicationData *iface, UINT64 *value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IApplicationDataVtbl application_data_vtbl = +{ + application_data_QueryInterface, + application_data_AddRef, + application_data_Release, + /* IInspectable methods */ + application_data_GetIids, + application_data_GetRuntimeClassName, + application_data_GetTrustLevel, + /* IApplicationData methods */ + application_data_get_Version, + application_data_SetVersionAsync, + application_data_ClearAllAsync, + application_data_ClearAsync, + application_data_get_LocalSettings, + application_data_get_RoamingSettings, + application_data_get_LocalFolder, + application_data_get_RoamingFolder, + application_data_get_TemporaryFolder, + application_data_add_DataChanged, + application_data_remove_DataChanged, + application_data_SignalDataChanged, + application_data_get_RoamingStorageQuota, +}; + +DEFINE_IINSPECTABLE( application_data_statics, IApplicationDataStatics, struct application_data_statics, IActivationFactory_iface ) + +static HRESULT WINAPI application_data_statics_get_Current( IApplicationDataStatics *iface, IApplicationData **value ) +{ + struct application_data *impl; + + TRACE( "iface %p, value %p\n", iface, value ); + + if (!value) return E_INVALIDARG; + if (!(impl = calloc( 1, sizeof(*impl) ))) return E_OUTOFMEMORY; + + impl->IApplicationData_iface.lpVtbl = &application_data_vtbl; + impl->ref = 1; + + *value = &impl->IApplicationData_iface; + TRACE( "created IApplicationData %p.\n", *value ); + return S_OK; +} + static const struct IApplicationDataStaticsVtbl application_data_statics_vtbl = { application_data_statics_QueryInterface, diff --git a/dlls/windows.storage.applicationdata/tests/data.c b/dlls/windows.storage.applicationdata/tests/data.c index 2dd832b2f15..18145a4b14d 100644 --- a/dlls/windows.storage.applicationdata/tests/data.c +++ b/dlls/windows.storage.applicationdata/tests/data.c @@ -75,7 +75,7 @@ static void test_ApplicationDataStatics(void) ok( hr == S_OK, "got hr %#lx.\n", hr ); hr = IApplicationDataStatics_get_Current( application_data_statics, NULL ); - todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); hr = IApplicationDataStatics_get_Current( application_data_statics, &application_data ); todo_wine ok( hr == 0x80073d54, "got hr %#lx.\n", hr ); todo_wine ok( !application_data, "got application_data %p.\n", application_data );

1 0

Mohamad Al-Jaf : windows.storage.applicationdata: Add IApplicationDataStatics stub interface.
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

Module: wine Branch: master Commit: f36a84d7728f99a1d7c002864dc3476c52d2ca84 URL: https://gitlab.winehq.org/wine/wine/-/commit/f36a84d7728f99a1d7c002864dc347… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Aug 5 19:47:50 2023 -0400 windows.storage.applicationdata: Add IApplicationDataStatics stub interface. --- .../applicationdata.c | 30 +++++++++++++++++ dlls/windows.storage.applicationdata/private.h | 38 ++++++++++++++++++++++ dlls/windows.storage.applicationdata/tests/data.c | 6 ++++ 3 files changed, 74 insertions(+) diff --git a/dlls/windows.storage.applicationdata/applicationdata.c b/dlls/windows.storage.applicationdata/applicationdata.c index 3c70a63e94b..6296253eee1 100644 --- a/dlls/windows.storage.applicationdata/applicationdata.c +++ b/dlls/windows.storage.applicationdata/applicationdata.c @@ -25,6 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(data); struct application_data_statics { IActivationFactory IActivationFactory_iface; + IApplicationDataStatics IApplicationDataStatics_iface; LONG ref; }; @@ -49,6 +50,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IApplicationDataStatics )) + { + *out = &impl->IApplicationDataStatics_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -107,9 +115,31 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +DEFINE_IINSPECTABLE( application_data_statics, IApplicationDataStatics, struct application_data_statics, IActivationFactory_iface ) + +static HRESULT WINAPI application_data_statics_get_Current( IApplicationDataStatics *iface, IApplicationData **value ) +{ + FIXME( "iface %p, value %p stub!\n", iface, value ); + return E_NOTIMPL; +} + +static const struct IApplicationDataStaticsVtbl application_data_statics_vtbl = +{ + application_data_statics_QueryInterface, + application_data_statics_AddRef, + application_data_statics_Release, + /* IInspectable methods */ + application_data_statics_GetIids, + application_data_statics_GetRuntimeClassName, + application_data_statics_GetTrustLevel, + /* IApplicationDataStatics methods */ + application_data_statics_get_Current, +}; + static struct application_data_statics application_data_statics = { {&factory_vtbl}, + {&application_data_statics_vtbl}, 1, }; diff --git a/dlls/windows.storage.applicationdata/private.h b/dlls/windows.storage.applicationdata/private.h index 1bfaf012b85..6eebc9b25be 100644 --- a/dlls/windows.storage.applicationdata/private.h +++ b/dlls/windows.storage.applicationdata/private.h @@ -37,4 +37,42 @@ extern IActivationFactory *application_data_factory; +#define DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from, iface_mem, expr ) \ + static inline impl_type *impl_from( iface_type *iface ) \ + { \ + return CONTAINING_RECORD( iface, impl_type, iface_mem ); \ + } \ + static HRESULT WINAPI pfx##_QueryInterface( iface_type *iface, REFIID iid, void **out ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_QueryInterface( (IInspectable *)(expr), iid, out ); \ + } \ + static ULONG WINAPI pfx##_AddRef( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_AddRef( (IInspectable *)(expr) ); \ + } \ + static ULONG WINAPI pfx##_Release( iface_type *iface ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_Release( (IInspectable *)(expr) ); \ + } \ + static HRESULT WINAPI pfx##_GetIids( iface_type *iface, ULONG *iid_count, IID **iids ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetIids( (IInspectable *)(expr), iid_count, iids ); \ + } \ + static HRESULT WINAPI pfx##_GetRuntimeClassName( iface_type *iface, HSTRING *class_name ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetRuntimeClassName( (IInspectable *)(expr), class_name ); \ + } \ + static HRESULT WINAPI pfx##_GetTrustLevel( iface_type *iface, TrustLevel *trust_level ) \ + { \ + impl_type *impl = impl_from( iface ); \ + return IInspectable_GetTrustLevel( (IInspectable *)(expr), trust_level ); \ + } +#define DEFINE_IINSPECTABLE( pfx, iface_type, impl_type, base_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, &impl->base_iface ) + #endif diff --git a/dlls/windows.storage.applicationdata/tests/data.c b/dlls/windows.storage.applicationdata/tests/data.c index 1e2a5383358..4365671e63d 100644 --- a/dlls/windows.storage.applicationdata/tests/data.c +++ b/dlls/windows.storage.applicationdata/tests/data.c @@ -48,6 +48,7 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) static void test_ApplicationDataStatics(void) { static const WCHAR *application_data_statics_name = L"Windows.Storage.ApplicationData"; + IApplicationDataStatics *application_data_statics; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -69,6 +70,11 @@ static void test_ApplicationDataStatics(void) check_interface( factory, &IID_IInspectable ); check_interface( factory, &IID_IAgileObject ); + hr = IActivationFactory_QueryInterface( factory, &IID_IApplicationDataStatics, (void **)&application_data_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + ref = IApplicationDataStatics_Release( application_data_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory ); ok( ref == 1, "got ref %ld.\n", ref ); }

1 0

Mohamad Al-Jaf : windows.storage.applicationdata: Add stub DLL.
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

Module: wine Branch: master Commit: 2f3aa0e2f6dce9b9b9223e87268819f14410a9da URL: https://gitlab.winehq.org/wine/wine/-/commit/2f3aa0e2f6dce9b9b9223e87268819… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Jul 27 22:38:39 2023 -0400 windows.storage.applicationdata: Add stub DLL. --- configure | 3 + configure.ac | 2 + dlls/windows.storage.applicationdata/Makefile.in | 9 ++ .../applicationdata.c | 116 +++++++++++++++++++++ dlls/windows.storage.applicationdata/classes.idl | 23 ++++ dlls/windows.storage.applicationdata/main.c | 46 ++++++++ dlls/windows.storage.applicationdata/private.h | 40 +++++++ .../tests/Makefile.in | 5 + dlls/windows.storage.applicationdata/tests/data.c | 86 +++++++++++++++ .../windows.storage.applicationdata.spec | 4 + 10 files changed, 334 insertions(+)

1 0

Mohamad Al-Jaf : windows.storage.applicationdata/tests: Add IApplicationDataStatics::get_Current() tests.
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

Module: wine Branch: master Commit: c4d5e8ded56128f00d5586e7a2211b509837541b URL: https://gitlab.winehq.org/wine/wine/-/commit/c4d5e8ded56128f00d5586e7a2211b… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Aug 5 20:16:59 2023 -0400 windows.storage.applicationdata/tests: Add IApplicationDataStatics::get_Current() tests. --- dlls/windows.applicationmodel/tests/application.c | 43 +++++++++++++++++++++++ dlls/windows.applicationmodel/tests/model.c | 1 + dlls/windows.storage.applicationdata/tests/data.c | 8 +++++ 3 files changed, 52 insertions(+) diff --git a/dlls/windows.applicationmodel/tests/application.c b/dlls/windows.applicationmodel/tests/application.c index 68abcc14450..5dcd5a19121 100644 --- a/dlls/windows.applicationmodel/tests/application.c +++ b/dlls/windows.applicationmodel/tests/application.c @@ -55,6 +55,48 @@ static void check_interface_( unsigned int line, void *obj, const IID *iid ) IUnknown_Release( unk ); } +static void test_ApplicationDataStatics(void) +{ + static const WCHAR *application_data_statics_name = L"Windows.Storage.ApplicationData"; + IApplicationDataStatics *application_data_statics; + IApplicationData *application_data; + IActivationFactory *factory; + HSTRING str; + HRESULT hr; + LONG ref; + + hr = WindowsCreateString( application_data_statics_name, wcslen( application_data_statics_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 ); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip( "%s runtimeclass not registered, skipping tests.\n", wine_dbgstr_w( application_data_statics_name ) ); + return; + } + + check_interface( factory, &IID_IUnknown ); + check_interface( factory, &IID_IInspectable ); + check_interface( factory, &IID_IAgileObject ); + + hr = IActivationFactory_QueryInterface( factory, &IID_IApplicationDataStatics, (void **)&application_data_statics ); + ok( hr == S_OK, "got hr %#lx.\n", hr ); + + hr = IApplicationDataStatics_get_Current( application_data_statics, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + hr = IApplicationDataStatics_get_Current( application_data_statics, &application_data ); + todo_wine ok( hr == S_OK, "got hr %#lx.\n", hr ); + todo_wine ok( application_data != NULL, "got NULL application_data %p.\n", application_data ); + if (application_data) IApplicationData_Release( application_data ); + + ref = IApplicationDataStatics_Release( application_data_statics ); + ok( ref == 2, "got ref %ld.\n", ref ); + ref = IActivationFactory_Release( factory ); + ok( ref == 1, "got ref %ld.\n", ref ); +} + static void test_PackageStatics(void) { static const WCHAR *package_statics_name = L"Windows.ApplicationModel.Package"; @@ -143,6 +185,7 @@ int main( int argc, char const *argv[] ) hr = RoInitialize( RO_INIT_MULTITHREADED ); ok( hr == S_OK, "RoInitialize failed, hr %#lx\n", hr ); + test_ApplicationDataStatics(); test_PackageStatics(); RoUninitialize(); diff --git a/dlls/windows.applicationmodel/tests/model.c b/dlls/windows.applicationmodel/tests/model.c index b603e4c551e..0bd5050432b 100644 --- a/dlls/windows.applicationmodel/tests/model.c +++ b/dlls/windows.applicationmodel/tests/model.c @@ -571,6 +571,7 @@ static void test_PackageStatics(void) hr = IPackageStatics_get_Current( package_statics, &package ); todo_wine ok( hr == 0x80073d54, "got hr %#lx.\n", hr ); todo_wine ok( !package, "got package %p.\n", package ); + if (package) IPackage_Release( package ); ref = IPackageStatics_Release( package_statics ); ok( ref == 2, "got ref %ld.\n", ref ); diff --git a/dlls/windows.storage.applicationdata/tests/data.c b/dlls/windows.storage.applicationdata/tests/data.c index 4365671e63d..2dd832b2f15 100644 --- a/dlls/windows.storage.applicationdata/tests/data.c +++ b/dlls/windows.storage.applicationdata/tests/data.c @@ -49,6 +49,7 @@ static void test_ApplicationDataStatics(void) { static const WCHAR *application_data_statics_name = L"Windows.Storage.ApplicationData"; IApplicationDataStatics *application_data_statics; + IApplicationData *application_data = NULL; IActivationFactory *factory; HSTRING str; HRESULT hr; @@ -73,6 +74,13 @@ static void test_ApplicationDataStatics(void) hr = IActivationFactory_QueryInterface( factory, &IID_IApplicationDataStatics, (void **)&application_data_statics ); ok( hr == S_OK, "got hr %#lx.\n", hr ); + hr = IApplicationDataStatics_get_Current( application_data_statics, NULL ); + todo_wine ok( hr == E_INVALIDARG, "got hr %#lx.\n", hr ); + hr = IApplicationDataStatics_get_Current( application_data_statics, &application_data ); + todo_wine ok( hr == 0x80073d54, "got hr %#lx.\n", hr ); + todo_wine ok( !application_data, "got application_data %p.\n", application_data ); + if (application_data) IApplicationData_Release( application_data ); + ref = IApplicationDataStatics_Release( application_data_statics ); ok( ref == 2, "got ref %ld.\n", ref ); ref = IActivationFactory_Release( factory );

1 0

Connor McAdams : uiautomationcore: Add support for raising events passed to our IProxyProviderWinEventSink interface.
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

Module: wine Branch: master Commit: 60ff77754a4bf6326747f990c998c7c88fffda08 URL: https://gitlab.winehq.org/wine/wine/-/commit/60ff77754a4bf6326747f990c998c7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 27 14:17:46 2023 -0400 uiautomationcore: Add support for raising events passed to our IProxyProviderWinEventSink interface. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 33 ++++------- dlls/uiautomationcore/uia_event.c | 91 +++++++++++++++++++++++++----- 2 files changed, 90 insertions(+), 34 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for marking the root IAccessible as known on non-root IAccessibles upon proxy provider creation.
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

Module: wine Branch: master Commit: 0254db3492b410e855528789b0a4cb852b1be773 URL: https://gitlab.winehq.org/wine/wine/-/commit/0254db3492b410e855528789b0a4cb… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Sep 25 12:33:07 2023 -0400 uiautomationcore: Add support for marking the root IAccessible as known on non-root IAccessibles upon proxy provider creation. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 2 +- dlls/uiautomationcore/uia_event.c | 2 +- dlls/uiautomationcore/uia_private.h | 4 ++-- dlls/uiautomationcore/uia_provider.c | 25 ++++++++++++++----------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 36157ee70ba..1ff3e1a9a46 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -3013,7 +3013,7 @@ static SAFEARRAY WINAPI *default_uia_provider_callback(HWND hwnd, enum ProviderT if (FAILED(hr) || !acc) break; - hr = create_msaa_provider(acc, CHILDID_SELF, hwnd, TRUE, &elprov); + hr = create_msaa_provider(acc, CHILDID_SELF, hwnd, TRUE, TRUE, &elprov); if (FAILED(hr)) WARN("Failed to create MSAA proxy provider with hr %#lx\n", hr); diff --git a/dlls/uiautomationcore/uia_event.c b/dlls/uiautomationcore/uia_event.c index 8edbc70f54f..f5bb5656876 100644 --- a/dlls/uiautomationcore/uia_event.c +++ b/dlls/uiautomationcore/uia_event.c @@ -564,7 +564,7 @@ static HRESULT create_msaa_provider_from_hwnd(HWND hwnd, int in_child_id, IRawEl } } - hr = create_msaa_provider(acc, child_id, hwnd, in_child_id == CHILDID_SELF, &elprov); + hr = create_msaa_provider(acc, child_id, hwnd, TRUE, in_child_id == CHILDID_SELF, &elprov); IAccessible_Release(acc); if (FAILED(hr)) return hr; diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 7ac2335dd77..abd03ce308e 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -243,8 +243,8 @@ HRESULT create_base_hwnd_provider(HWND hwnd, IRawElementProviderSimple **elprov) void uia_stop_provider_thread(void) DECLSPEC_HIDDEN; void uia_provider_thread_remove_node(HUIANODE node) DECLSPEC_HIDDEN; LRESULT uia_lresult_from_node(HUIANODE huianode) DECLSPEC_HIDDEN; -HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL known_root_acc, - IRawElementProviderSimple **elprov) DECLSPEC_HIDDEN; +HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL root_acc_known, + BOOL is_root_acc, IRawElementProviderSimple **elprov) DECLSPEC_HIDDEN; /* uia_utils.c */ HRESULT register_interface_in_git(IUnknown *iface, REFIID riid, DWORD *ret_cookie) DECLSPEC_HIDDEN; diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 22eba343511..917d21d8a82 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -855,7 +855,7 @@ static HRESULT WINAPI msaa_fragment_Navigate(IRawElementProviderFragment *iface, else acc = msaa_prov->acc; - hr = create_msaa_provider(acc, CHILDID_SELF, NULL, FALSE, &elprov); + hr = create_msaa_provider(acc, CHILDID_SELF, NULL, FALSE, FALSE, &elprov); if (SUCCEEDED(hr)) { struct msaa_provider *prov = impl_from_msaa_provider(elprov); @@ -886,7 +886,7 @@ static HRESULT WINAPI msaa_fragment_Navigate(IRawElementProviderFragment *iface, if (FAILED(hr) || !acc) break; - hr = create_msaa_provider(acc, child_id, NULL, FALSE, &elprov); + hr = create_msaa_provider(acc, child_id, NULL, FALSE, FALSE, &elprov); if (SUCCEEDED(hr)) { struct msaa_provider *prov = impl_from_msaa_provider(elprov); @@ -936,7 +936,7 @@ static HRESULT WINAPI msaa_fragment_Navigate(IRawElementProviderFragment *iface, if (FAILED(hr) || !acc) break; - hr = create_msaa_provider(acc, child_id, NULL, FALSE, &elprov); + hr = create_msaa_provider(acc, child_id, NULL, FALSE, FALSE, &elprov); if (SUCCEEDED(hr)) { struct msaa_provider *prov = impl_from_msaa_provider(elprov); @@ -1031,7 +1031,7 @@ static HRESULT WINAPI msaa_fragment_get_FragmentRoot(IRawElementProviderFragment if (FAILED(hr) || !acc) return hr; - hr = create_msaa_provider(acc, CHILDID_SELF, msaa_prov->hwnd, TRUE, &elprov); + hr = create_msaa_provider(acc, CHILDID_SELF, msaa_prov->hwnd, TRUE, TRUE, &elprov); IAccessible_Release(acc); if (FAILED(hr)) return hr; @@ -1154,7 +1154,7 @@ static HRESULT msaa_acc_get_focus(struct msaa_provider *prov, struct msaa_provid } } - hr = create_msaa_provider(focus_acc, focus_cid, hwnd, FALSE, &elprov); + hr = create_msaa_provider(focus_acc, focus_cid, hwnd, FALSE, FALSE, &elprov); IAccessible_Release(focus_acc); if (SUCCEEDED(hr)) *out_prov = impl_from_msaa_provider(elprov); @@ -1176,7 +1176,7 @@ static HRESULT WINAPI msaa_fragment_root_GetFocus(IRawElementProviderFragmentRoo if (V_I4(&msaa_prov->cid) != CHILDID_SELF) return S_OK; - hr = create_msaa_provider(msaa_prov->acc, CHILDID_SELF, msaa_prov->hwnd, FALSE, &elprov); + hr = create_msaa_provider(msaa_prov->acc, CHILDID_SELF, msaa_prov->hwnd, FALSE, FALSE, &elprov); if (FAILED(hr)) return hr; @@ -1440,8 +1440,8 @@ static const IProxyProviderWinEventHandlerVtbl msaa_winevent_handler_vtbl = { msaa_winevent_handler_RespondToWinEvent, }; -HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL known_root_acc, - IRawElementProviderSimple **elprov) +HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL root_acc_known, + BOOL is_root_acc, IRawElementProviderSimple **elprov) { struct msaa_provider *msaa_prov = calloc(1, sizeof(*msaa_prov)); @@ -1470,8 +1470,11 @@ HRESULT create_msaa_provider(IAccessible *acc, LONG child_id, HWND hwnd, BOOL kn else msaa_prov->hwnd = hwnd; - if (known_root_acc) - msaa_prov->root_acc_check_ran = msaa_prov->is_root_acc = TRUE; + if (root_acc_known) + { + msaa_prov->root_acc_check_ran = TRUE; + msaa_prov->is_root_acc = is_root_acc; + } *elprov = &msaa_prov->IRawElementProviderSimple_iface; @@ -1515,7 +1518,7 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, LONG child_id, DWORD if (!hwnd) return E_FAIL; - return create_msaa_provider(acc, child_id, hwnd, FALSE, elprov); + return create_msaa_provider(acc, child_id, hwnd, FALSE, FALSE, elprov); } static HRESULT uia_get_hr_for_last_error(void)

1 0

Connor McAdams : uiautomationcore: Pass WinEvent data to IProxyProviderWinEventHandler::RespondToWinEvent.
by Alexandre Julliard Oct. 2, 2023

Oct. 2, 2023

Module: wine Branch: master Commit: 7aaf77a514df071f6229950dfce30b9ee61e3ee5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7aaf77a514df071f6229950dfce30b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 14 15:07:59 2023 -0400 uiautomationcore: Pass WinEvent data to IProxyProviderWinEventHandler::RespondToWinEvent. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 16 +++- dlls/uiautomationcore/uia_classes.idl | 3 + dlls/uiautomationcore/uia_client.c | 44 ++++++++++ dlls/uiautomationcore/uia_event.c | 133 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_private.h | 3 + 5 files changed, 192 insertions(+), 7 deletions(-)

1 0