March 2022 - Wine-Devel - list.winehq.org

[PATCH 1/4] windows.media.speech: Import DEFINE_INSPECTABLE macros.
by Bernhard Kölbl March 10, 2022

March 10, 2022

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/private.h | 42 +++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h index b1df726413d..2694b23beab 100644 --- a/dlls/windows.media.speech/private.h +++ b/dlls/windows.media.speech/private.h @@ -46,4 +46,46 @@ extern IActivationFactory *synthesizer_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 ) +#define DEFINE_IINSPECTABLE_OUTER( pfx, iface_type, impl_type, outer_iface ) \ + DEFINE_IINSPECTABLE_( pfx, iface_type, impl_type, impl_from_##iface_type, iface_type##_iface, impl->outer_iface ) + #endif -- 2.35.1

3 9

[PATCH 8/8] win32u: Move NtUserUpdateLayeredWindow implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 15 +------- dlls/user32/win.c | 49 +++---------------------- dlls/win32u/driver.c | 7 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 4 +++ dlls/win32u/window.c | 70 ++++++++++++++++++++++++++++++++++++ dlls/win32u/wrappers.c | 9 +++++ include/ntuser.h | 3 ++ 9 files changed, 100 insertions(+), 60 deletions(-)

2 1

[PATCH 7/8] win32u: Move NtUserSetLayeredWindowAttributes implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

2 1

[PATCH 6/8] win32u: Move WM_WINE_UPDATEWINDOWSTATE implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 3 --- dlls/user32/user_main.c | 2 ++ dlls/user32/user_private.h | 1 - dlls/user32/win.c | 2 +- dlls/win32u/message.c | 11 ++++++++++ dlls/win32u/ntuser_private.h | 4 ++++ dlls/win32u/sysparams.c | 42 ++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 3 +++ dlls/win32u/window.c | 26 ++++++++++++++++++++++ 9 files changed, 89 insertions(+), 5 deletions(-)

2 1

[PATCH 5/8] win32u: Move GetWindowPlacement and MonitorFromWindow implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/sysparams.c | 19 +--- dlls/user32/winpos.c | 80 +--------------- dlls/win32u/region.c | 2 +- dlls/win32u/sysparams.c | 23 ++++- dlls/win32u/win32u_private.h | 6 +- dlls/win32u/window.c | 174 +++++++++++++++++++++++++++++++++-- include/ntuser.h | 2 + 7 files changed, 201 insertions(+), 105 deletions(-)

2 1

[PATCH 3/8] win32u: Move NtUserMoveWindow implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

2 1

[PATCH 4/8] win32u: Move NtUserWindowFromPoint implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

2 1

[PATCH 2/8] win32u: Move NtUserSetWindowRgn implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

2 1

[PATCH 1/8] win32u: Move NtUserGetWindowRgnEx implementation from user32.
by Jacek Caban March 10, 2022

March 10, 2022

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/winpos.c | 45 ++------------------------------------ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 48 +++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 ++++++++ include/ntuser.h | 1 + 7 files changed, 63 insertions(+), 44 deletions(-)

2 1

[PATCH vkd3d 1/8] vkd3d-shader/hlsl: Write SM4 uint bitwise AND.
by Giovanni Mascellani March 10, 2022

March 10, 2022

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 6996bb2d..69d02911 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1621,6 +1621,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, write_sm4_binary_op_with_two_destinations(buffer, VKD3D_SM4_OP_IMUL, &expr->node, 1, arg1, arg2); break; + case HLSL_OP2_BIT_AND: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_AND, &expr->node, arg1, arg2); + break; + default: hlsl_fixme(ctx, &expr->node.loc, "SM4 uint \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); break; -- 2.35.1

1 7