August 2023 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader/preproc: Expand macro arguments in macro invocations.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: vkd3d Branch: master Commit: 3a235b57f6db30d877400144f9c1082c254bbd1c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3a235b57f6db30d877400144f9c10… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 18:13:41 2023 -0500 vkd3d-shader/preproc: Expand macro arguments in macro invocations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55361 --- libs/vkd3d-shader/preproc.l | 20 ++++++++++++++++++++ tests/preproc-macro.shader_test | 6 ++++++ 2 files changed, 26 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 20bf5cb5..faeb5d7a 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -634,6 +634,26 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) switch (token) { + /* Most text gets left alone (e.g. if it contains macros, + * the macros should be evaluated later). + * Arguments are a special case, and are replaced with + * their values immediately. */ + case T_IDENTIFIER: + case T_IDENTIFIER_PAREN: + { + const struct preproc_text *expansion; + + if ((expansion = find_arg_expansion(ctx, text))) + { + preproc_push_expansion(ctx, expansion, NULL); + continue; + } + + if (current_arg) + preproc_text_add(current_arg, text); + break; + } + case T_NEWLINE: if (current_arg) preproc_text_add(current_arg, " "); diff --git a/tests/preproc-macro.shader_test b/tests/preproc-macro.shader_test index b2f2530e..8f073965 100644 --- a/tests/preproc-macro.shader_test +++ b/tests/preproc-macro.shader_test @@ -305,3 +305,9 @@ __LINE__ [preproc] #define KEY pass apple # KEY + +[preproc] +#define KEY2(x) x ## ss +#define KEY(a) KEY2(a) + +KEY(pa)

1 0

Zebediah Figura : vkd3d-shader/preproc: Separate a preproc_stringify() helper.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: vkd3d Branch: master Commit: cbb1d84069d22902243e481f8d778f2ca2ddf9ad URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cbb1d84069d22902243e481f8d778… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 18:14:23 2023 -0500 vkd3d-shader/preproc: Separate a preproc_stringify() helper. --- libs/vkd3d-shader/preproc.l | 56 ++++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index faeb5d7a..60cd662e 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -346,6 +346,34 @@ static bool preproc_push_expansion(struct preproc_ctx *ctx, return true; } +static void preproc_stringify(struct preproc_ctx *ctx, struct vkd3d_string_buffer *buffer, const char *text) +{ + const struct preproc_text *expansion; + const char *p = text + 1; + unsigned int i; + + while (*p == ' ' || *p == '\t') + ++p; + + vkd3d_string_buffer_printf(buffer, "\""); + if ((expansion = find_arg_expansion(ctx, p))) + { + for (i = 0; i < expansion->text.content_size; ++i) + { + char c = expansion->text.buffer[i]; + + if (c == '\\' || c == '"') + vkd3d_string_buffer_printf(buffer, "\\"); + vkd3d_string_buffer_printf(buffer, "%c", c); + } + } + else + { + vkd3d_string_buffer_printf(buffer, "%s", p); + } + vkd3d_string_buffer_printf(buffer, "\""); +} + int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { struct preproc_ctx *ctx = yyget_extra(scanner); @@ -463,33 +491,15 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) if (token == T_HASHSTRING) { - const struct preproc_text *expansion; - const char *p = text + 1; - unsigned int i; + struct vkd3d_string_buffer buffer; if (ctx->current_directive) return return_token(token, lval, text); - while (*p == ' ' || *p == '\t') - ++p; - - vkd3d_string_buffer_printf(&ctx->buffer, "\""); - if ((expansion = find_arg_expansion(ctx, p))) - { - for (i = 0; i < expansion->text.content_size; ++i) - { - char c = expansion->text.buffer[i]; - - if (c == '\\' || c == '"') - vkd3d_string_buffer_printf(&ctx->buffer, "\\"); - vkd3d_string_buffer_printf(&ctx->buffer, "%c", c); - } - } - else - { - vkd3d_string_buffer_printf(&ctx->buffer, "%s", p); - } - vkd3d_string_buffer_printf(&ctx->buffer, "\""); + vkd3d_string_buffer_init(&buffer); + preproc_stringify(ctx, &buffer, text); + vkd3d_string_buffer_printf(&ctx->buffer, "%s", buffer.buffer); + vkd3d_string_buffer_cleanup(&buffer); break; }

1 0

Zebediah Figura : vkd3d-shader/preproc: Stringify text immediately in macro invocations.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: vkd3d Branch: master Commit: 6fc3ae2b5c3230eecee19dd7b4e94368c1ecfa20 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6fc3ae2b5c3230eecee19dd7b4e94… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 18:15:14 2023 -0500 vkd3d-shader/preproc: Stringify text immediately in macro invocations. --- libs/vkd3d-shader/preproc.l | 15 +++++++++++++++ tests/hlsl_d3d12.c | 21 +++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 60cd662e..5e8ed2eb 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -664,6 +664,21 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) break; } + /* Stringification is another special case. Unsurprisingly, + * we need to stringify if this is an argument. More + * surprisingly, we need to stringify even if it's not. */ + case T_HASHSTRING: + { + struct vkd3d_string_buffer buffer; + + vkd3d_string_buffer_init(&buffer); + preproc_stringify(ctx, &buffer, text); + if (current_arg) + preproc_text_add(current_arg, buffer.buffer); + vkd3d_string_buffer_cleanup(&buffer); + break; + } + case T_NEWLINE: if (current_arg) preproc_text_add(current_arg, " "); diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 85a1548f..ef41235e 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -236,6 +236,27 @@ static void test_preprocess(void) "#", }, + { + "#define KEY2(x) x\n" + "#define KEY(a) KEY2(#a)\n" + "KEY(apple)", + + "\"apple\"", + }, + { + "#define KEY2(x) #x\n" + "#define KEY(a) KEY2(#a)\n" + "KEY(apple)", + + "\"\\\"apple\\\"\"", + }, + { + "#define KEY2(x) #x\n" + "#define KEY(a) KEY2(#x)\n" + "KEY(apple)", + + "\"\\\"x\\\"\"", + }, /* #pragma is preserved. */ {

1 0

Zebediah Figura : vkd3d-shader/preproc: Strip whitespace when stringifying.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: vkd3d Branch: master Commit: 250a24bd3fba3eb28a6be9fe8ca35900e8336405 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/250a24bd3fba3eb28a6be9fe8ca35… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 18:32:04 2023 -0500 vkd3d-shader/preproc: Strip whitespace when stringifying. --- libs/vkd3d-shader/preproc.l | 11 ++++++++++- tests/hlsl_d3d12.c | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 5e8ed2eb..728d6184 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -358,7 +358,16 @@ static void preproc_stringify(struct preproc_ctx *ctx, struct vkd3d_string_buffe vkd3d_string_buffer_printf(buffer, "\""); if ((expansion = find_arg_expansion(ctx, p))) { - for (i = 0; i < expansion->text.content_size; ++i) + size_t len = expansion->text.content_size; + size_t start = 0; + + while (len && strchr(" \t\r\n", expansion->text.buffer[len - 1])) + --len; + + while (start < len && strchr(" \t\r\n", expansion->text.buffer[start])) + ++start; + + for (i = start; i < len; ++i) { char c = expansion->text.buffer[i]; diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index ef41235e..ff29f1f7 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -193,6 +193,12 @@ static void test_preprocess(void) "\"apple\"", }, + { + "#define KEY(a) #a\n" + "KEY( \t\r\n apple \t\r\n )", + + "\"apple\"", + }, { "#define KEY(if) #if\n" "KEY(apple)",

1 0

Zebediah Figura : vkd3d-shader/preproc: Append spaces between tokens in macro invocations.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: vkd3d Branch: master Commit: b4bb3931c5e7e59496c07c2d4e3b6cfd3bf91cf1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b4bb3931c5e7e59496c07c2d4e3b6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jul 29 18:17:35 2023 -0500 vkd3d-shader/preproc: Append spaces between tokens in macro invocations. --- libs/vkd3d-shader/preproc.l | 3 +++ tests/preproc-macro.shader_test | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 728d6184..d360f6ca 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -746,6 +746,9 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) if (current_arg) preproc_text_add(current_arg, text); } + + if (current_arg) + preproc_text_add(current_arg, " "); break; } } diff --git a/tests/preproc-macro.shader_test b/tests/preproc-macro.shader_test index 8f073965..96e4b865 100644 --- a/tests/preproc-macro.shader_test +++ b/tests/preproc-macro.shader_test @@ -311,3 +311,9 @@ apple # KEY #define KEY(a) KEY2(a) KEY(pa) + +[preproc] +#define KEY2(x) x +#define KEY KEY2(fa il) +KEY +pass

1 0

Esme Povirk : comctl32: Add support for MSAA events on tab controls.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 35930f2d87cfc881c41aad5192032b248f9c1f96 URL: https://gitlab.winehq.org/wine/wine/-/commit/35930f2d87cfc881c41aad5192032b… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Jul 29 15:13:52 2023 -0500 comctl32: Add support for MSAA events on tab controls. --- dlls/comctl32/tab.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 8943d9dce7c..13abbd8078d 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -271,6 +271,7 @@ static inline LRESULT TAB_SetCurSel (TAB_INFO *infoPtr, INT iItem) TAB_EnsureSelectionVisible(infoPtr); TAB_InvalidateTabArea(infoPtr); + NotifyWinEvent(EVENT_OBJECT_SELECTION, infoPtr->hwnd, OBJID_CLIENT, infoPtr->iSelected + 1); } return prevItem; @@ -286,6 +287,8 @@ static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) infoPtr->iSelected = -1; TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGE); TAB_InvalidateTabArea(infoPtr); + if (!(infoPtr->dwStyle & TCS_BUTTONS)) + NotifyWinEvent(EVENT_OBJECT_SELECTION, infoPtr->hwnd, OBJID_CLIENT, 0); } } else if (iItem < infoPtr->uNumItem) { @@ -306,6 +309,7 @@ static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) InvalidateRect(infoPtr->hwnd, &r, FALSE); TAB_SendSimpleNotify(infoPtr, TCN_FOCUSCHANGE); + NotifyWinEvent(EVENT_OBJECT_FOCUS, infoPtr->hwnd, OBJID_CLIENT, iItem + 1); } } else { INT oldFocus = infoPtr->uFocus; @@ -320,6 +324,7 @@ static LRESULT TAB_SetCurFocus (TAB_INFO *infoPtr, INT iItem) infoPtr->iSelected = iItem; TAB_EnsureSelectionVisible(infoPtr); TAB_InvalidateTabArea(infoPtr); + NotifyWinEvent(EVENT_OBJECT_SELECTION, infoPtr->hwnd, OBJID_CLIENT, iItem + 1); } } } @@ -2635,6 +2640,9 @@ TAB_InsertItemT (TAB_INFO *infoPtr, INT iItem, const TCITEMW *pti, BOOL bUnicode else InvalidateRect(infoPtr->hwnd, NULL, TRUE); + /* The last item is always the "new" MSAA object. */ + NotifyWinEvent(EVENT_OBJECT_CREATE, infoPtr->hwnd, OBJID_CLIENT, infoPtr->uNumItem); + TRACE("[%p]: added item %d %s\n", infoPtr->hwnd, iItem, debugstr_w(item->pszText)); @@ -2861,6 +2869,9 @@ static LRESULT TAB_DeleteItem (TAB_INFO *infoPtr, INT iItem) /* reposition and repaint tabs */ TAB_SetItemBounds(infoPtr); + /* The last item is always the destroyed MSAA object */ + NotifyWinEvent(EVENT_OBJECT_DESTROY, infoPtr->hwnd, OBJID_CLIENT, infoPtr->uNumItem + 1); + return TRUE; }

1 0

Esme Povirk : comctl32/tests: Test MSAA events for tab controls.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 676e32583248e7432599ae6aa790886c2fa6db3e URL: https://gitlab.winehq.org/wine/wine/-/commit/676e32583248e7432599ae6aa79088… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Jul 29 14:47:00 2023 -0500 comctl32/tests: Test MSAA events for tab controls. --- dlls/comctl32/tests/msg.h | 13 +++++--- dlls/comctl32/tests/tab.c | 82 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 88 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index f6877d6a2b1..16a8f6e92eb 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -61,6 +61,8 @@ struct msg_sequence struct message *sequence; }; +static HWINEVENTHOOK hwineventhook; + static void add_message(struct msg_sequence **seq, int sequence_index, const struct message *msg) { @@ -120,7 +122,7 @@ static void dump_sequence( struct msg_sequence **seq, int sequence_index, if (expected->message == actual->message) { if ((expected->flags & defwinproc) != (actual->flags & defwinproc) && - (expected->flags & optional)) + ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hwineventhook))) { /* don't match messages if their defwinproc status differs */ expected++; @@ -140,7 +142,8 @@ static void dump_sequence( struct msg_sequence **seq, int sequence_index, } /* optional trailing messages */ - while (expected->message && expected->flags & optional) + while (expected->message && (expected->flags & optional || + ((expected->flags & winevent_hook) && !hwineventhook))) { trace_(file, line)( " %u: expected: msg %04x - actual: nothing\n", count, expected->message ); expected++; @@ -249,7 +252,7 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, if (expected->flags & id) { - if (expected->id != actual->id && expected->flags & optional) + if (expected->id != actual->id && ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hwineventhook))) { expected++; continue; @@ -321,7 +324,7 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, expected++; actual++; } - else if (expected->flags & optional) + else if ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hwineventhook)) expected++; else if (todo) { @@ -345,7 +348,7 @@ static void ok_sequence_(struct msg_sequence **seq, int sequence_index, } /* skip all optional trailing messages */ - while (expected->message && ((expected->flags & optional))) + while (expected->message && ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hwineventhook))) expected++; if (todo) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 67dea94b55c..a5c51690689 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -85,9 +85,54 @@ static HFONT hFont; static DRAWITEMSTRUCT g_drawitem; static HWND parent_wnd; static LRESULT tcn_selchanging_result; +static DWORD winevent_hook_thread_id; static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; +static void CALLBACK msg_winevent_proc(HWINEVENTHOOK hevent, + DWORD event, + HWND hwnd, + LONG object_id, + LONG child_id, + DWORD thread_id, + DWORD event_time) +{ + struct message msg = {0}; + char class_name[256]; + + ok(thread_id == winevent_hook_thread_id, "we didn't ask for events from other threads\n"); + + /* ignore window and other system events */ + if (object_id != OBJID_CLIENT) return; + + /* ignore events not from a tab control */ + if (!GetClassNameA(hwnd, class_name, ARRAY_SIZE(class_name)) || + strcmp(class_name, WC_TABCONTROLA) != 0) + return; + + msg.message = event; + msg.flags = winevent_hook|wparam|lparam; + msg.wParam = object_id; + msg.lParam = child_id; + add_message(sequences, TAB_SEQ_INDEX, &msg); +} + +static void init_winevent_hook(void) { + hwineventhook = SetWinEventHook(EVENT_MIN, EVENT_MAX, GetModuleHandleA(0), msg_winevent_proc, + 0, GetCurrentThreadId(), WINEVENT_INCONTEXT); + winevent_hook_thread_id = GetCurrentThreadId(); + if (!hwineventhook) + win_skip( "no win event hook support\n" ); +} + +static void uninit_winevent_hook(void) { + if (!hwineventhook) + return; + + UnhookWinEvent(hwineventhook); + hwineventhook = 0; +} + static const struct message empty_sequence[] = { { 0 } }; @@ -99,10 +144,28 @@ static const struct message get_row_count_seq[] = { static const struct message getset_cur_focus_seq[] = { { TCM_SETCURFOCUS, sent|lparam, 0 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 5 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_SETCURFOCUS, sent|lparam, 0 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_SETCURSEL, sent|lparam, 0 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 2 }, + { TCM_SETCURFOCUS, sent|lparam, 0 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { 0 } +}; + +static const struct message getset_cur_focus_buttons_seq[] = { + { TCM_SETCURFOCUS, sent|lparam, 0 }, + { TCM_GETITEMCOUNT, sent|defwinproc|optional }, + { TCM_GETITEMCOUNT, sent|defwinproc|optional }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 5 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { TCM_SETCURFOCUS, sent|lparam, 0 }, + { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, + { TCM_SETCURSEL, sent|lparam, 0 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 2 }, { TCM_SETCURFOCUS, sent|lparam, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { 0 } @@ -110,11 +173,14 @@ static const struct message getset_cur_focus_seq[] = { static const struct message getset_cur_sel_seq[] = { { TCM_SETCURSEL, sent|lparam, 0 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 5 }, { TCM_GETCURSEL, sent|wparam|lparam, 0, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_SETCURSEL, sent|lparam, 0 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { TCM_GETCURSEL, sent|wparam|lparam, 0, 0 }, { TCM_SETCURSEL, sent|lparam, 0 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 2 }, { TCM_SETCURSEL, sent|lparam, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { 0 } @@ -166,6 +232,7 @@ static const struct message insert_focus_seq[] = { { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_INSERTITEMA, sent|wparam, 1 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, OBJID_CLIENT, 1 }, { WM_NOTIFYFORMAT, sent|defwinproc|optional }, { WM_QUERYUISTATE, sent|defwinproc|optional }, { WM_PARENTNOTIFY, sent|defwinproc|optional }, @@ -175,11 +242,14 @@ static const struct message insert_focus_seq[] = { { WM_NOTIFYFORMAT, sent|defwinproc|optional }, { WM_QUERYUISTATE, sent|defwinproc|optional, }, { WM_PARENTNOTIFY, sent|defwinproc|optional }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, OBJID_CLIENT, 2 }, { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_SETCURFOCUS, sent|wparam|lparam, -1, 0 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_INSERTITEMA, sent|wparam, 3 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, OBJID_CLIENT, 3 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { 0 } }; @@ -188,11 +258,14 @@ static const struct message delete_focus_seq[] = { { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_DELETEITEM, sent|wparam|lparam, 1, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, OBJID_CLIENT, 2 }, { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_SETCURFOCUS, sent|wparam|lparam, -1, 0 }, + { EVENT_OBJECT_SELECTION, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_DELETEITEM, sent|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, OBJID_CLIENT, 1 }, { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { 0 } @@ -347,7 +420,8 @@ static LRESULT WINAPI tab_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_GETICON && - message != WM_DEVICECHANGE) + message != WM_DEVICECHANGE && + message != WM_GETOBJECT) { msg.message = message; msg.flags = sent|wparam|lparam; @@ -667,7 +741,7 @@ static void test_curfocus(void) todo_wine ok(ret == nTabs - 1, "Unexpected focus index %d.\n", ret); - ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_focus_seq, "TCS_BUTTONS: set focused tab sequence", FALSE); + ok_sequence(sequences, TAB_SEQ_INDEX, getset_cur_focus_buttons_seq, "TCS_BUTTONS: set focused tab sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, setfocus_parent_seq, "TCS_BUTTONS: set focused tab parent sequence", TRUE); DestroyWindow(hTab); @@ -1501,6 +1575,8 @@ START_TEST(tab) init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + init_winevent_hook(); + parent_wnd = createParentWindow(); ok(parent_wnd != NULL, "Failed to create parent window!\n"); @@ -1523,5 +1599,7 @@ START_TEST(tab) test_TCN_SELCHANGING(); test_TCM_GETROWCOUNT(); + uninit_winevent_hook(); + DestroyWindow(parent_wnd); }

1 0

Jacek Caban : win32u: Use user message packing for CB_GETCOMBOBOXINFO.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: 8561e8e9585bbf18f7cc2e208b4acb821a2438ba URL: https://gitlab.winehq.org/wine/wine/-/commit/8561e8e9585bbf18f7cc2e208b4acb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 00:14:31 2023 +0200 win32u: Use user message packing for CB_GETCOMBOBOXINFO. --- dlls/user32/winproc.c | 2 ++ dlls/win32u/message.c | 19 +++++++++++++++--- dlls/win32u/tests/win32u.c | 18 ++++++++++++++++- dlls/wow64win/user.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+), 4 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 217b02f70ad..3d8e6833602 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -857,6 +857,7 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, case WM_NEXTMENU: case WM_SIZING: case WM_MOVING: + case CB_GETCOMBOBOXINFO: break; case WM_MDIGETACTIVE: if (!*lparam) return TRUE; @@ -1001,6 +1002,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) case WM_SIZING: case WM_MOVING: case WM_MDICREATE: + case CB_GETCOMBOBOXINFO: { LRESULT *result_ptr = (LRESULT *)buffer - 1; *result_ptr = result; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 9ca3eab23b6..1dcacf66f38 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1696,6 +1696,9 @@ size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, if (!IS_INTRESOURCE(mcs->szTitle)) size += string_size( mcs->szTitle, ansi ); break; } + case CB_GETCOMBOBOXINFO: + size = sizeof(COMBOBOXINFO); + break; } return size; @@ -1782,6 +1785,9 @@ void pack_user_message( void *buffer, size_t size, UINT message, } return; } + case CB_GETCOMBOBOXINFO: + memset( buffer, 0, size ); + return; } if (size) memcpy( buffer, lparam_ptr, size ); @@ -1892,6 +1898,16 @@ static void copy_user_result( void *buffer, size_t size, LRESULT result, UINT me case WM_NEXTMENU: copy_size = sizeof(MDINEXTMENU); break; + case CB_GETCOMBOBOXINFO: + if (sizeof(void *) == 4) + { + COMBOBOXINFO *cbi = lparam_ptr; + memcpy( cbi, buffer, size ); + cbi->cbSize = sizeof(*cbi); + return; + } + copy_size = sizeof(COMBOBOXINFO); + break; default: return; } @@ -1912,9 +1928,6 @@ static void copy_reply( LRESULT result, HWND hwnd, UINT message, WPARAM wparam, switch(message) { - case CB_GETCOMBOBOXINFO: - copy_size = sizeof(COMBOBOXINFO); - break; case WM_MDIGETACTIVE: if (lparam) copy_size = sizeof(BOOL); break; diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 0acea87ac10..b82e7d80687 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1362,6 +1362,7 @@ struct lparam_hook_test const void *lparam; const void *change_lparam; const void *check_lparam; + const void *default_lparam; size_t lparam_size; size_t lparam_init_size; size_t check_size; @@ -1424,7 +1425,13 @@ static void check_params( const struct lparam_hook_test *test, UINT message, default: if (test->check_size) { - const void *expected = is_ret && test->change_lparam ? test->change_lparam : test->lparam; + const void *expected; + if (is_ret && test->change_lparam) + expected = test->change_lparam; + else if (test->default_lparam) + expected = test->default_lparam; + else + expected = test->lparam; ok( !memcmp( (const void *)lparam, expected, test->check_size ), "unexpected lparam content\n" ); } } @@ -1685,6 +1692,10 @@ static void test_wndproc_hook(void) static const MDINEXTMENU nm_in = { .hmenuIn = (HMENU)0xdeadbeef }; static const MDINEXTMENU nm_out = { .hmenuIn = (HMENU)1 }; static const MDICREATESTRUCTW mcs_in = { .x = 1, .y = 2 }; + static const COMBOBOXINFO cbi_in = {}; + static const COMBOBOXINFO cbi_out = { .hwndList = (HWND)2 }; + static const COMBOBOXINFO cbi_ret = { .hwndList = (HWND)2, + .cbSize = sizeof(void *) == 4 ? sizeof(cbi_in) : 0 }; static const struct lparam_hook_test lparam_hook_tests[] = { @@ -1914,6 +1925,11 @@ static void test_wndproc_hook(void) .lparam_size = sizeof(mcs_in), .lparam = &mcs_in, .poison_lparam = TRUE, .check_size = sizeof(mcs_in), }, + { + "CB_GETCOMBOBOXINFO", CB_GETCOMBOBOXINFO, + .lparam_size = sizeof(cbi_in), .change_lparam = &cbi_out, .default_lparam = &cbi_in, + .check_lparam = &cbi_ret, + }, /* messages that don't change lparam */ { "WM_USER", WM_USER }, { "WM_NOTIFY", WM_NOTIFY }, diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 6e86056cdb8..70f91c8210b 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -251,6 +251,17 @@ typedef struct ULONG itemData; } DRAWITEMSTRUCT32; +typedef struct +{ + DWORD cbSize; + RECT rcItem; + RECT rcButton; + DWORD stateButton; + ULONG hwndCombo; + ULONG hwndItem; + ULONG hwndList; +} COMBOBOXINFO32; + typedef struct { ULONG lParam; @@ -870,6 +881,21 @@ static size_t packed_result_32to64( UINT message, WPARAM wparam, const void *par return sizeof(*next64); } + case CB_GETCOMBOBOXINFO: + { + const COMBOBOXINFO32 *ci32 = params32; + COMBOBOXINFO *ci64 = params64; + + ci64->cbSize = sizeof(*ci32); + ci64->rcItem = ci32->rcItem; + ci64->rcButton = ci32->rcButton; + ci64->stateButton = ci32->stateButton; + ci64->hwndCombo = LongToHandle( ci32->hwndCombo ); + ci64->hwndItem = LongToHandle( ci32->hwndItem ); + ci64->hwndList = LongToHandle( ci32->hwndList ); + return sizeof(*ci64); + } + case WM_GETTEXT: case WM_ASKCBFORMATNAME: case WM_GETMINMAXINFO: @@ -3416,6 +3442,29 @@ static LRESULT message_call_32to64( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l return NtUserMessageCall( hwnd, msg, wparam, (LPARAM)&ps, result_info, type, ansi ); } + case CB_GETCOMBOBOXINFO: + { + COMBOBOXINFO32 *ci32 = (COMBOBOXINFO32 *)lparam; + COMBOBOXINFO ci; + + ci.cbSize = ci32->cbSize; + ci.rcItem = ci32->rcItem; + ci.rcButton = ci32->rcButton; + ci.stateButton = ci32->stateButton; + ci.hwndCombo = LongToHandle( ci32->hwndCombo ); + ci.hwndItem = LongToHandle( ci32->hwndItem ); + ci.hwndList = LongToHandle( ci32->hwndList ); + ret = NtUserMessageCall( hwnd, msg, wparam, (LPARAM)&ci, result_info, type, ansi ); + ci32->cbSize = ci.cbSize; + ci32->rcItem = ci.rcItem; + ci32->rcButton = ci.rcButton; + ci32->stateButton = ci.stateButton; + ci32->hwndCombo = HandleToLong( ci.hwndCombo ); + ci32->hwndItem = HandleToLong( ci.hwndItem ); + ci32->hwndList = HandleToLong( ci.hwndList ); + return ret; + } + default: return NtUserMessageCall( hwnd, msg, wparam, lparam, result_info, type, ansi ); }

1 0

Jacek Caban : win32u: Use user message packing for WM_MDIGETACTIVE.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: ad45d84a6535712d32cc7e24622e69f05c2f73d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad45d84a6535712d32cc7e24622e69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 00:26:53 2023 +0200 win32u: Use user message packing for WM_MDIGETACTIVE. --- dlls/user32/hook.c | 8 +++----- dlls/user32/user_private.h | 2 +- dlls/user32/winproc.c | 47 +++++++++++++--------------------------------- dlls/win32u/message.c | 37 ++++++++++-------------------------- dlls/win32u/tests/win32u.c | 7 ------- dlls/wow64win/user.c | 1 + 6 files changed, 28 insertions(+), 74 deletions(-)

1 0

Jacek Caban : win32u: Remove no longer needed NtUserWinProcResult.
by Alexandre Julliard 02 Aug '23

02 Aug '23

Module: wine Branch: master Commit: c1a5b42cdca2e9396ea2bbe53855d9f03899b2ff URL: https://gitlab.winehq.org/wine/wine/-/commit/c1a5b42cdca2e9396ea2bbe53855d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 19 00:28:34 2023 +0200 win32u: Remove no longer needed NtUserWinProcResult. --- dlls/user32/winproc.c | 63 +-------------------------------------------------- dlls/win32u/message.c | 21 +---------------- dlls/wow64win/user.c | 7 ------ include/ntuser.h | 3 +-- 4 files changed, 3 insertions(+), 91 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 3ebe1eb2d8c..b1193773ed2 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -926,73 +926,12 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) result = dispatch_win_proc_params( params ); - switch (params->msg) - { - case WM_NCCREATE: - case WM_CREATE: - case WM_NCCALCSIZE: - case WM_GETTEXT: - case WM_ASKCBFORMATNAME: - case WM_WININICHANGE: - case WM_SETTEXT: - case WM_DEVMODECHANGE: - case CB_DIR: - case LB_DIR: - case LB_ADDFILE: - case EM_REPLACESEL: - case WM_GETMINMAXINFO: - case WM_MEASUREITEM: - case WM_DELETEITEM: - case WM_COMPAREITEM: - case WM_WINDOWPOSCHANGING: - case WM_WINDOWPOSCHANGED: - case WM_COPYDATA: - case WM_HELP: - case WM_STYLECHANGING: - case WM_STYLECHANGED: - case WM_GETDLGCODE: - case SBM_SETSCROLLINFO: - case SBM_GETSCROLLINFO: - case SBM_GETSCROLLBARINFO: - case EM_GETSEL: - case SBM_GETRANGE: - case CB_GETEDITSEL: - case EM_GETRECT: - case LB_GETITEMRECT: - case CB_GETDROPPEDCONTROLRECT: - case EM_SETRECT: - case EM_SETRECTNP: - case EM_GETLINE: - case EM_SETTABSTOPS: - case LB_SETTABSTOPS: - case CB_ADDSTRING: - case CB_INSERTSTRING: - case CB_FINDSTRING: - case CB_FINDSTRINGEXACT: - case CB_SELECTSTRING: - case LB_ADDSTRING: - case LB_INSERTSTRING: - case LB_FINDSTRING: - case LB_FINDSTRINGEXACT: - case LB_SELECTSTRING: - case CB_GETLBTEXT: - case LB_GETTEXT: - case LB_GETSELITEMS: - case WM_NEXTMENU: - case WM_SIZING: - case WM_MOVING: - case WM_MDICREATE: - case CB_GETCOMBOBOXINFO: - case WM_MDIGETACTIVE: + if (size) { LRESULT *result_ptr = (LRESULT *)buffer - 1; *result_ptr = result; return NtCallbackReturn( result_ptr, sizeof(*result_ptr) + size, TRUE ); } - } - - NtUserMessageCall( params->hwnd, params->msg, params->wparam, params->lparam, - (void *)result, NtUserWinProcResult, FALSE ); } else { diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 80802f6425f..28a2b7d39cc 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -57,8 +57,6 @@ struct received_message_info struct received_message_info *prev; }; -#define MSG_CLIENT_MESSAGE 0xff - struct packed_hook_extra_info { user_handle_t handle; @@ -1971,7 +1969,6 @@ BOOL reply_message_result( LRESULT result ) struct user_thread_info *thread_info = get_user_thread_info(); struct received_message_info *info = thread_info->receive_info; - while (info && info->type == MSG_CLIENT_MESSAGE) info = info->prev; if (!info) return FALSE; reply_message( info, result, NULL ); return TRUE; @@ -1989,7 +1986,6 @@ static BOOL reply_winproc_result( LRESULT result, HWND hwnd, UINT message, WPARA MSG msg; if (!info) return FALSE; - if (info->type == MSG_CLIENT_MESSAGE) return TRUE; msg.hwnd = hwnd; msg.message = message; @@ -3595,8 +3591,6 @@ static BOOL broadcast_message( struct send_message_info *info, DWORD_PTR *res_pt static BOOL process_packed_message( struct send_message_info *info, LRESULT *res_ptr, BOOL ansi ) { - struct user_thread_info *thread_info = get_user_thread_info(); - struct received_message_info receive_info; struct packed_message data; size_t buffer_size = 0, i; void *buffer = NULL; @@ -3613,19 +3607,9 @@ static BOOL process_packed_message( struct send_message_info *info, LRESULT *res ptr += data.size[i]; } - receive_info.type = MSG_CLIENT_MESSAGE; - receive_info.msg.hwnd = info->hwnd; - receive_info.msg.message = info->msg; - receive_info.msg.wParam = info->wparam; - receive_info.msg.lParam = info->lparam; - receive_info.flags = 0; - receive_info.prev = thread_info->receive_info; - thread_info->receive_info = &receive_info; - *res_ptr = call_window_proc( info->hwnd, info->msg, info->wparam, info->lparam, !ansi, TRUE, info->wm_char, TRUE, buffer, buffer_size ); - if (thread_info->receive_info == &receive_info) - thread_info->receive_info = receive_info.prev; + free( buffer ); return TRUE; } @@ -4273,9 +4257,6 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa case NtUserClipboardWindowProc: return user_driver->pClipboardWindowProc( hwnd, msg, wparam, lparam ); - case NtUserWinProcResult: - return reply_winproc_result( (LRESULT)result_info, hwnd, msg, wparam, lparam ); - case NtUserGetDispatchParams: if (!hwnd) return FALSE; if (init_window_call_params( result_info, hwnd, msg, wparam, lparam, diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 28c6fa9b6d4..e593da7ba53 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3552,13 +3552,6 @@ NTSTATUS WINAPI wow64_NtUserMessageCall( UINT *args ) /* no argument conversion */ return NtUserMessageCall( hwnd, msg, wparam, lparam, result_info, type, ansi ); - case NtUserWinProcResult: - { - LONG result32 = PtrToLong( result_info ); - return message_call_32to64( hwnd, msg, wparam, lparam, - LongToPtr( result32 ), type, ansi ); - } - case NtUserImeDriverCall: { struct diff --git a/include/ntuser.h b/include/ntuser.h index 9077ebbb589..110aa3a3c54 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -306,8 +306,7 @@ enum NtUserSpyGetMsgName = 0x3003, NtUserSpyEnter = 0x0304, NtUserSpyExit = 0x0305, - NtUserWinProcResult = 0x0306, - NtUserImeDriverCall = 0x0307, + NtUserImeDriverCall = 0x0306, }; /* NtUserThunkedMenuItemInfo codes */

1 0