September 2021 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 absolute value instructions.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: vkd3d Branch: master Commit: 96fd5f74f9ace156d7635a4539584a8c1558e812 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=96fd5f74f9ace156d7635a4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 17 16:06:38 2021 -0500 vkd3d-shader/hlsl: Write SM4 absolute value instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 3287ec7..32b76e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -274,7 +274,6 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ - tests/abs.shader_test \ tests/cast-to-float.shader_test \ tests/cast-to-half.shader_test \ tests/cast-to-int.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 8a1d363..5aefc7e 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -982,6 +982,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, { switch (expr->op) { + case HLSL_OP1_ABS: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_ABS); + break; + case HLSL_OP1_CAST: { const struct hlsl_type *src_type = arg1->data_type;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the pow() intrinsic.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: vkd3d Branch: master Commit: 2461ad601b221e58d85da1c8d00d90fec516c3e9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2461ad601b221e58d85da1c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 20 14:20:56 2021 +0200 vkd3d-shader/hlsl: Parse the pow() intrinsic. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 23 +++++++++++++++++++++++ tests/pow.shader_test | 10 ++++++++++ 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 32b76e1..34617c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -82,6 +82,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ + tests/pow.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ @@ -297,6 +298,7 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ + tests/pow.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-1.shader_test endif diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0d53960..96473d0 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1093,7 +1093,6 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP2_MOD] = "%", [HLSL_OP2_MUL] = "*", [HLSL_OP2_NEQUAL] = "!=", - [HLSL_OP2_POW] = "pow", [HLSL_OP2_RSHIFT] = ">>", [HLSL_OP3_LERP] = "lerp", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9b579b7..ce1f1b7 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -318,7 +318,6 @@ enum hlsl_ir_expr_op HLSL_OP2_MOD, HLSL_OP2_MUL, HLSL_OP2_NEQUAL, - HLSL_OP2_POW, HLSL_OP2_RSHIFT, HLSL_OP3_LERP, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bd26603..2b381dc 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1585,6 +1585,28 @@ static bool intrinsic_max(struct hlsl_ctx *ctx, return !!add_expr(ctx, params->instrs, HLSL_OP2_MAX, args, &loc); } +static bool intrinsic_pow(struct hlsl_ctx *ctx, + const struct parse_initializer *params, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *args[3] = {0}; + struct hlsl_ir_node *log, *exp; + struct hlsl_ir_expr *mul; + + if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], loc))) + return false; + list_add_tail(params->instrs, &log->entry); + + args[0] = params->args[1]; + args[1] = log; + if (!(mul = add_expr(ctx, params->instrs, HLSL_OP2_MUL, args, &loc))) + return false; + + if (!(exp = hlsl_new_unary_expr(ctx, HLSL_OP1_EXP2, &mul->node, loc))) + return false; + list_add_tail(params->instrs, &exp->entry); + return true; +} + static bool intrinsic_saturate(struct hlsl_ctx *ctx, const struct parse_initializer *params, struct vkd3d_shader_location loc) { @@ -1605,6 +1627,7 @@ intrinsic_functions[] = {"abs", 1, true, intrinsic_abs}, {"clamp", 3, true, intrinsic_clamp}, {"max", 2, true, intrinsic_max}, + {"pow", 2, true, intrinsic_pow}, {"saturate", 1, true, intrinsic_saturate}, }; diff --git a/tests/pow.shader_test b/tests/pow.shader_test new file mode 100644 index 0000000..21011e6 --- /dev/null +++ b/tests/pow.shader_test @@ -0,0 +1,10 @@ +[pixel shader] +float4 main(uniform float2 u, uniform float2 v) : sv_target +{ + return float4(pow(u.y, 3), pow(u, v), pow(0.5, v.y)); +} + +[test] +uniform 0 float4 0.4 0.8 2.5 2.0 +draw quad +probe all rgba (0.512, 0.101192884, 0.64, 0.25) 4

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 logarithm instructions.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: vkd3d Branch: master Commit: 960a473c6d92c9362699f035e59fd75e3c6d7137 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=960a473c6d92c9362699f03… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 17 16:06:40 2021 -0500 vkd3d-shader/hlsl: Write SM4 logarithm instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 5aefc7e..ca4e7eb 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1023,6 +1023,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_LOG2: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_LOG, &expr->node, arg1, 0); + break; + case HLSL_OP1_NEG: write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); break;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 exponent instructions.
by Alexandre Julliard 20 Sep '21

20 Sep '21

Module: vkd3d Branch: master Commit: e2b57f6d2b62a2f693ae6b6a81af61284e14c816 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e2b57f6d2b62a2f693ae6b6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 17 16:06:41 2021 -0500 vkd3d-shader/hlsl: Write SM4 exponent instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 34617c6..4a2bf8e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -298,7 +298,6 @@ XFAIL_TESTS = \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/max.shader_test \ - tests/pow.shader_test \ tests/trigonometry.shader_test \ tests/writemask-assignop-1.shader_test endif diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index ca4e7eb..b347e35 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1023,6 +1023,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_OP1_EXP2: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_EXP, &expr->node, arg1, 0); + break; + case HLSL_OP1_LOG2: write_sm4_unary_op(buffer, VKD3D_SM4_OP_LOG, &expr->node, arg1, 0); break;

1 0

Alistair Leslie-Hughes : include: Avoid C++ keyword.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: f0bd0fd9830067bcbdcf0a2cd0e55a43146c08df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0bd0fd9830067bcbdcf0a2c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 17 19:07:08 2021 +1000 include: Avoid C++ keyword. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapiaut.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sapiaut.idl b/include/sapiaut.idl index 94ac72a2099..775a778f85f 100644 --- a/include/sapiaut.idl +++ b/include/sapiaut.idl @@ -463,7 +463,7 @@ interface ISpeechObjectToken : IDispatch [out,retval] BSTR* path); [hidden, id(DISPID_SOTRemoveStorageFileName)] - HRESULT RemoveStorageFileName([in] BSTR clsid, [in]BSTR key, [in] VARIANT_BOOL delete); + HRESULT RemoveStorageFileName([in] BSTR clsid, [in]BSTR key, [in] VARIANT_BOOL remove); [hidden, id(DISPID_SOTIsUISupported)] HRESULT IsUISupported( [in]const BSTR type, [in, defaultvalue(NULL)] const VARIANT *data,

1 0

Alistair Leslie-Hughes : include: Fix compiling with C++.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 16e73be10d940c9c04101a47687a6f8a385c2b0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=16e73be10d940c9c04101a47… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 17 19:07:09 2021 +1000 include: Fix compiling with C++. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sapi.idl | 127 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/include/sapi.idl b/include/sapi.idl index 5120e379450..c90d5ec145b 100644 --- a/include/sapi.idl +++ b/include/sapi.idl @@ -517,6 +517,7 @@ interface ISpEventSource; interface ISpRecoContext; interface ISpRecognizer; interface ISpStreamFormat; +interface ISpVoice; [ object, @@ -837,69 +838,6 @@ interface ISpNotifySink : IUnknown HRESULT Notify(void); } -[ - object, - uuid(6c44df74-72b9-4992-a1ec-ef996e0422d4), - pointer_default(unique), - restricted -] -interface ISpVoice : ISpEventSource -{ - HRESULT SetOutput([in] IUnknown *unk, [in] BOOL changes); - HRESULT GetOutputObjectToken([out] ISpObjectToken **token); - HRESULT GetOutputStream([out] ISpStreamFormat **stream); - - HRESULT Pause(void); - HRESULT Resume(void); - - HRESULT SetVoice([in] ISpObjectToken *token); - HRESULT GetVoice([out] ISpObjectToken **token); - - HRESULT Speak([in, string] const WCHAR *pwcs, - [in] DWORD flags, - [out] ULONG *number); - HRESULT SpeakStream([in] IStream *stream, - [in] DWORD flags, - [out] ULONG *number); - - HRESULT GetStatus( - [out] SPVOICESTATUS *status, - [out, string] WCHAR **bookmark); - - HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped); - - HRESULT SetPriority([in] SPVPRIORITY priority); - HRESULT GetPriority([out] SPVPRIORITY* priority); - - HRESULT SetAlertBoundary([in] SPEVENTENUM boundary); - HRESULT GetAlertBoundary([out] SPEVENTENUM* boundary); - - HRESULT SetRate([in] long adjust); - HRESULT GetRate([out] long *adjust); - - HRESULT SetVolume([in] USHORT volume); - HRESULT GetVolume([out] USHORT *volume); - - HRESULT WaitUntilDone([in] ULONG timeout); - - HRESULT SetSyncSpeakTimeout([in] ULONG timeout); - HRESULT GetSyncSpeakTimeout([out] ULONG *timeout); - - [local] HANDLE SpeakCompleteEvent(); - - [local] HRESULT IsUISupported( - [in] const WCHAR *type, - [in] void * extra, - [in] ULONG count, - [out] BOOL *supported); - [local] HRESULT DisplayUI( - [in] HWND parent, - [in] const WCHAR *title, - [in] const WCHAR *type, - [in] void *extra, - [in] ULONG count); -}; - [ object, uuid(5eff4aef-8487-11d2-961c-00c04f8ee628), @@ -982,6 +920,69 @@ interface ISpRecoContext : ISpEventSource HRESULT GetContextState([in] SPCONTEXTSTATE *state); }; +[ + object, + uuid(6c44df74-72b9-4992-a1ec-ef996e0422d4), + pointer_default(unique), + restricted +] +interface ISpVoice : ISpEventSource +{ + HRESULT SetOutput([in] IUnknown *unk, [in] BOOL changes); + HRESULT GetOutputObjectToken([out] ISpObjectToken **token); + HRESULT GetOutputStream([out] ISpStreamFormat **stream); + + HRESULT Pause(void); + HRESULT Resume(void); + + HRESULT SetVoice([in] ISpObjectToken *token); + HRESULT GetVoice([out] ISpObjectToken **token); + + HRESULT Speak([in, string] const WCHAR *pwcs, + [in] DWORD flags, + [out] ULONG *number); + HRESULT SpeakStream([in] IStream *stream, + [in] DWORD flags, + [out] ULONG *number); + + HRESULT GetStatus( + [out] SPVOICESTATUS *status, + [out, string] WCHAR **bookmark); + + HRESULT Skip([in,string] const WCHAR *type, [in] long items, [out] ULONG *skipped); + + HRESULT SetPriority([in] SPVPRIORITY priority); + HRESULT GetPriority([out] SPVPRIORITY* priority); + + HRESULT SetAlertBoundary([in] SPEVENTENUM boundary); + HRESULT GetAlertBoundary([out] SPEVENTENUM* boundary); + + HRESULT SetRate([in] long adjust); + HRESULT GetRate([out] long *adjust); + + HRESULT SetVolume([in] USHORT volume); + HRESULT GetVolume([out] USHORT *volume); + + HRESULT WaitUntilDone([in] ULONG timeout); + + HRESULT SetSyncSpeakTimeout([in] ULONG timeout); + HRESULT GetSyncSpeakTimeout([out] ULONG *timeout); + + [local] HANDLE SpeakCompleteEvent(); + + [local] HRESULT IsUISupported( + [in] const WCHAR *type, + [in] void * extra, + [in] ULONG count, + [out] BOOL *supported); + [local] HRESULT DisplayUI( + [in] HWND parent, + [in] const WCHAR *title, + [in] const WCHAR *type, + [in] void *extra, + [in] ULONG count); +}; + [ object, uuid(bed530be-2606-4f4d-a1c0-54c5cda5566f),

1 0

Connor McAdams : user32/tests: Fix occasional test failure in test_ShowWindow().
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: ca37d6ea6b897cd73e96349e292a33b6ec29ada9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca37d6ea6b897cd73e96349e… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 17 11:41:14 2021 -0400 user32/tests: Fix occasional test failure in test_ShowWindow(). Windows 8+ sometimes sends an optional WM_WINDOWPOSCHANGED after an optional WM_WINDOWPOSCHANGING. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 4c9f1dc6913..f2bfb81679f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13389,9 +13389,10 @@ static const struct message WmShowNoActivate_2[] = { { HCBT_ACTIVATE, hook|optional }, { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends this. */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|optional }, /* Sometimes sent on Win8+. */ { HCBT_SETFOCUS, hook|optional }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, /* Win7 sends this. */ - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, + { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, { HCBT_SETFOCUS, hook|optional },

1 0

Connor McAdams : user32/tests: Fix existing winevents in test_showwindow() message sequences.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: 804210fc77327a85feb11ceeedf06625667d41ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=804210fc77327a85feb11cee… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 17 11:41:15 2021 -0400 user32/tests: Fix existing winevents in test_showwindow() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=804210fc77327a85feb1…

1 0

Connor McAdams : user32/tests: Add missing winevents to test_showwindow() message sequences.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: a46ae113aeb2dd446c7b3e6cbe489ec7341b405e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a46ae113aeb2dd446c7b3e6c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 17 11:41:16 2021 -0400 user32/tests: Add missing winevents to test_showwindow() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 687fa3e6838..7a2c4e53e7e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -906,12 +906,15 @@ static const struct message WmShowRestoreMinimizedOverlappedSeq[] = { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_ACTIVATE, hook }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_NCACTIVATE, sent }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, WA_ACTIVE }, { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_NCPAINT, sent }, { WM_GETTEXT, sent|defwinproc|optional }, @@ -923,6 +926,9 @@ static const struct message WmShowRestoreMinimizedOverlappedSeq[] = { WM_NCCALCSIZE, sent|optional }, { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ + { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* Note this WM_ACTIVATE message even if the window is already active and focused */ { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, { WM_SYNCPAINT, sent|optional }, @@ -939,6 +945,7 @@ static const struct message WmShowNoActivateMinimizedOverlappedSeq[] = { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_NCPAINT, sent }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent }, @@ -949,6 +956,9 @@ static const struct message WmShowNoActivateMinimizedOverlappedSeq[] = { WM_NCCALCSIZE, sent|optional }, { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ + { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_SETFOCUS, hook|optional }, { WM_SETFOCUS, sent|optional }, { HCBT_ACTIVATE, hook|optional }, @@ -977,12 +987,15 @@ static const struct message WmShowRestoreActiveMinimizedOverlappedSeq[] = { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCCALCSIZE, sent|optional }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends this. */ { WM_MOVE, sent|optional }, { WM_SIZE, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends this. */ { WM_GETTEXT, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win8+ sends this. */ { WM_NCPAINT, sent }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent }, @@ -992,7 +1005,11 @@ static const struct message WmShowRestoreActiveMinimizedOverlappedSeq[] = { WM_NCCALCSIZE, sent|optional }, { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ + { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent }, /* Note this WM_ACTIVATE message even if the window is already active */ { WM_ACTIVATE, sent|wparam|lparam, WA_ACTIVE, 0 }, @@ -1011,12 +1028,15 @@ static const struct message WmShowNoActivateActiveMinimizedOverlappedSeq[] = { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_NCCALCSIZE, sent|optional }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends this. */ { WM_MOVE, sent|optional }, { WM_SIZE, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 sends this. */ { WM_GETTEXT, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win8+ sends this. */ { WM_NCPAINT, sent }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent }, @@ -1026,6 +1046,9 @@ static const struct message WmShowNoActivateActiveMinimizedOverlappedSeq[] = { WM_NCCALCSIZE, sent|optional }, { WM_NCPAINT, sent|optional }, { WM_ERASEBKGND, sent|optional }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ + { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* Following optional messages are present on XP */ { HCBT_SETFOCUS, hook|optional }, { WM_SETFOCUS, sent|optional }, @@ -18452,6 +18475,7 @@ START_TEST(msg) test_scrollwindowex(); test_messages(); test_setwindowpos(); + test_showwindow(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18462,7 +18486,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_showwindow(); invisible_parent_tests(); test_mdi_messages(); test_button_messages();

1 0

Connor McAdams : user32/tests: Fix existing winevents in invisible_parent_tests() message sequences.
by Alexandre Julliard 17 Sep '21

17 Sep '21

Module: wine Branch: master Commit: f16ee0b1bac99d118faf9a15139e6445e25fafbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f16ee0b1bac99d118faf9a15… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Sep 17 11:41:17 2021 -0400 user32/tests: Fix existing winevents in invisible_parent_tests() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7a2c4e53e7e..cdb162df765 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1519,11 +1519,11 @@ static const struct message WmShowChildInvisibleParentSeq_2[] = { { WM_GETMINMAXINFO, sent }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CHILDACTIVATE, sent }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTMOVE|SWP_STATECHANGED }, { WM_SIZE, sent|defwinproc|wparam, SIZE_MAXIMIZED }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; /* repeated ShowWindow(SW_MAXIMIZE) for child with invisible parent */ @@ -1536,13 +1536,13 @@ static const struct message WmShowChildInvisibleParentSeq_3[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMINIMIZED }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CHILDACTIVATE, sent }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* FIXME: Wine creates an icon/title window while Windows doesn't */ { WM_PARENTNOTIFY, sent|parent|wparam|optional, WM_CREATE }, { WM_GETTEXT, sent|optional }, @@ -1558,12 +1558,12 @@ static const struct message WmShowChildInvisibleParentSeq_4[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMINNOACTIVE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOACTIVATE|SWP_NOREDRAW|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc|wparam|lparam, SIZE_MINIMIZED, 0 }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_MINIMIZESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, /* FIXME: Wine creates an icon/title window while Windows doesn't */ { WM_PARENTNOTIFY, sent|parent|wparam|optional, WM_CREATE }, { WM_GETTEXT, sent|optional }, @@ -1587,14 +1587,14 @@ static const struct message WmHideChildInvisibleParentSeq[] = { /* SetWindowPos(SWP_SHOWWINDOW) for child with invisible parent */ static const struct message WmShowChildInvisibleParentSeq_6[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; /* SetWindowPos(SWP_HIDEWINDOW) for child with invisible parent */ static const struct message WmHideChildInvisibleParentSeq_2[] = { { WM_WINDOWPOSCHANGING, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, - { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOREDRAW|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; @@ -1634,7 +1634,7 @@ static const struct message WmDestroyInvisibleChildSeq[] = { { 0x0090, sent|optional }, { WM_PARENTNOTIFY, sent|parent|wparam, WM_DESTROY }, { WM_SHOWWINDOW, sent|wparam, 0 }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, { 0 } @@ -18476,6 +18476,7 @@ START_TEST(msg) test_messages(); test_setwindowpos(); test_showwindow(); + invisible_parent_tests(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18486,7 +18487,6 @@ START_TEST(msg) } hEvent_hook = 0; - invisible_parent_tests(); test_mdi_messages(); test_button_messages(); test_button_bm_get_set_image();

1 0