wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Alexandre Julliard : winebuild: Unify the strarray implementation with the one from makedep.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: d6d5a217219222ed5f953cca3c662f48b46cdf46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d5a217219222ed5f953cca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 11:35:48 2021 +0200 winebuild: Unify the strarray implementation with the one from makedep. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/build.h | 10 +-- tools/winebuild/import.c | 78 ++++++++++++----------- tools/winebuild/main.c | 6 +- tools/winebuild/res32.c | 15 +++-- tools/winebuild/spec32.c | 2 +- tools/winebuild/utils.c | 163 ++++++++++++++++++++++------------------------- 6 files changed, 135 insertions(+), 139 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6d5a217219222ed5f95…

1 0

Alexandre Julliard : makefiles: Use explicit header path for sanity checks.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 8ec232132853ee9efae4c5bde9fce665d9846ca1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ec232132853ee9efae4c5bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 14:44:50 2021 +0200 makefiles: Use explicit header path for sanity checks. This makes it possible to use a local config.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9110035d633..6e10e4d3be4 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -907,26 +907,6 @@ static struct file *add_file( const char *name ) */ static void add_dependency( struct file *file, const char *name, enum incl_type type ) { - /* enforce some rules for the Wine tree */ - - if (!strcmp( name, "config.h" )) - { - if (strendswith( file->name, ".h" )) - fatal_error( "config.h must not be included by a header file\n" ); - if (file->deps_count) - fatal_error( "config.h must be included before anything else\n" ); - } - else if (!strcmp( name, "wine/port.h" )) - { - if (strendswith( file->name, ".h" )) - fatal_error( "wine/port.h must not be included by a header file\n" ); - if (!file->deps_count) fatal_error( "config.h must be included before wine/port.h\n" ); - if (file->deps_count > 1) - fatal_error( "wine/port.h must be included before everything except config.h\n" ); - if (strcmp( file->deps[0].name, "config.h" )) - fatal_error( "config.h must be included before wine/port.h\n" ); - } - if (file->deps_count >= file->deps_size) { file->deps_size *= 2; @@ -1630,9 +1610,6 @@ static void add_all_includes( struct makefile *make, struct incl_file *parent, s { unsigned int i; - parent->files_count = 0; - parent->files_size = file->deps_count; - parent->files = xmalloc( parent->files_size * sizeof(*parent->files) ); for (i = 0; i < file->deps_count; i++) { switch (file->deps[i].type) @@ -2094,7 +2071,22 @@ static void get_dependencies( struct incl_file *file, struct incl_file *source ) return; /* library is imported only when building a typelib */ file->owner = source; strarray_add( &source->dependencies, file->filename ); + + /* sanity checks */ + if ((!strcmp( file->filename, "include/config.h" ) && file != source->files[0]) || + (!strcmp( file->filename, "include/wine/port.h" ) && file != source->files[1])) + { + input_file_name = source->filename; + input_line = 0; + for (i = 0; i < source->file->deps_count; i++) + { + if (!strcmp( source->file->deps[i].name, file->name )) + input_line = source->file->deps[i].line; + } + fatal_error( "%s must be included before other headers\n", file->name ); + } } + for (i = 0; i < file->files_count; i++) get_dependencies( file->files[i], source ); }

1 0

Alexandre Julliard : makefiles: Allow including files with relative paths.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 3c81449d16c8bd2f824c8c16622857f7fff772a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c81449d16c8bd2f824c8c16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 12:42:45 2021 +0200 makefiles: Allow including files with relative paths. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 2 -- dlls/shell32/shell32.rc | 4 ++-- tools/makedep.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 8a37ee4822a..eeb6cd63d60 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -3,8 +3,6 @@ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32 DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus -# AUTHORS file is in the top-level directory -EXTRAINCL = -I$(top_srcdir) C_SRCS = \ appbar.c \ diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index f7f8eea2da5..f899a27f12c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1101,8 +1101,8 @@ IDR_AVI_FILENUKE AVI resources/searching.avi /* @makedep: resources/searching.avi */ IDR_AVI_FILEDELETE AVI resources/searching.avi -/* @makedep: AUTHORS */ -AUTHORS RCDATA AUTHORS +/* @makedep: ../../AUTHORS */ +AUTHORS RCDATA ../../AUTHORS /* @makedep: shell32.manifest */ 124 RT_MANIFEST shell32.manifest diff --git a/tools/makedep.c b/tools/makedep.c index 46aea32440a..9110035d633 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -909,9 +909,6 @@ static void add_dependency( struct file *file, const char *name, enum incl_type { /* enforce some rules for the Wine tree */ - if (!memcmp( name, "../", 3 )) - fatal_error( "#include directive with relative path not allowed\n" ); - if (!strcmp( name, "config.h" )) { if (strendswith( file->name, ".h" )) @@ -1456,6 +1453,7 @@ static struct file *open_global_file( const struct makefile *make, const char *p */ static struct file *open_global_header( const struct makefile *make, const char *path, char **filename ) { + if (!strncmp( path, "../", 3 )) return NULL; return open_global_file( make, strmake( "include/%s", path ), filename ); }

1 0

Alexandre Julliard : ntdll: Copy __wine_setjmpex/longjmp implementation to avoid importing winecrt0.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 15d5cb225642f1ec087b505004ba7852d0ae7e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15d5cb225642f1ec087b5050… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 23 10:37:32 2021 +0200 ntdll: Copy __wine_setjmpex/longjmp implementation to avoid importing winecrt0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/unix/signal_arm.c | 34 ++++++++++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 49 +++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 31 ++++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 64 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 179 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15d5cb225642f1ec087b…

1 0

Connor McAdams : user32/tests: Add missing winevents to test_restore_messages() message sequence.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: f4fdb721bf0ad69c73e0a7a2316ed08d5d5a6deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4fdb721bf0ad69c73e0a7a2… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 22 21:01:54 2021 -0400 user32/tests: Add missing winevents to test_restore_messages() message sequence. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 900b31584d8..6825c1d74d4 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18333,6 +18333,7 @@ static void test_DoubleSetCapture(void) static const struct message WmRestoreMinimizedSeq[] = { { HCBT_ACTIVATE, hook }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|wparam, 1 }, @@ -18352,16 +18353,20 @@ static const struct message WmRestoreMinimizedSeq[] = { WM_WINDOWPOSCHANGING, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent|wparam|defwinproc, 1 }, + { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ERASEBKGND, sent|defwinproc }, { WM_WINDOWPOSCHANGED, sent|wparam|defwinproc, SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|defwinproc }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_NCCALCSIZE, sent|wparam|defwinproc|optional, 1 }, { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, { WM_ERASEBKGND, sent|defwinproc|optional }, { HCBT_SETFOCUS, hook }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_ACTIVATE, sent|wparam|defwinproc, 1 }, { WM_PAINT, sent| optional }, @@ -18570,6 +18575,13 @@ START_TEST(msg) test_quit_message(); test_notify_message(); test_SetActiveWindow(); + test_restore_messages(); + test_invalid_window(); + + if (!pTrackMouseEvent) + win_skip("TrackMouseEvent is not available\n"); + else + test_TrackMouseEvent(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18580,14 +18592,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_restore_messages(); - test_invalid_window(); - - if (!pTrackMouseEvent) - win_skip("TrackMouseEvent is not available\n"); - else - test_TrackMouseEvent(); - test_SetWindowRgn(); test_sys_menu(); test_dialog_messages();

1 0

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

23 Sep '21

Module: wine Branch: master Commit: 9196caea07e9b2e95b00412c92c22bb0a8f7c974 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9196caea07e9b2e95b00412c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 22 21:01:53 2021 -0400 user32/tests: Add missing winevents to test_SetActiveWindow() 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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index cda14b7275d..900b31584d8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14565,6 +14565,7 @@ static const struct message SetActiveWindowSeq0[] = { WM_NCACTIVATE, sent|wparam, 0 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, @@ -14582,6 +14583,7 @@ static const struct message SetActiveWindowSeq0[] = { WM_IME_SETCONTEXT, sent|optional }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc|optional }, { WM_GETTEXT, sent|optional }, { 0 } @@ -14599,6 +14601,7 @@ static const struct message SetActiveWindowSeq2[] = { WM_NCACTIVATE, sent|wparam, 0 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, @@ -14615,6 +14618,7 @@ static const struct message SetActiveWindowSeq2[] = { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { WM_GETTEXT, sent|optional }, { 0 } @@ -14624,6 +14628,7 @@ static const struct message SetActiveWindowSeq2[] = static const struct message SetActiveWindowSeq3[] = { { HCBT_ACTIVATE, hook }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, @@ -14636,6 +14641,7 @@ static const struct message SetActiveWindowSeq3[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { 0 } }; @@ -14646,6 +14652,7 @@ static const struct message SetActiveWindowSeq4[] = { WM_NCACTIVATE, sent|wparam, 0 }, { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam, 0 }, + { EVENT_SYSTEM_FOREGROUND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_QUERYNEWPALETTE, sent|wparam|lparam|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE }, @@ -14660,6 +14667,7 @@ static const struct message SetActiveWindowSeq4[] = { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc }, { 0 } }; @@ -18561,6 +18569,7 @@ START_TEST(msg) test_edit_messages(); test_quit_message(); test_notify_message(); + test_SetActiveWindow(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18571,7 +18580,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_SetActiveWindow(); test_restore_messages(); test_invalid_window();

1 0

Connor McAdams : user32/tests: Add missing winevents to test_quit_message() message sequence.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 37b2e37edf0dc992fd7642c1ee88378e70870963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b2e37edf0dc992fd7642c1… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 22 21:01:52 2021 -0400 user32/tests: Add missing winevents to test_quit_message() message sequence. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 53bd2068348..cda14b7275d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12918,11 +12918,14 @@ static INT_PTR CALLBACK wm_quit_dlg_proc(HWND hwnd, UINT message, WPARAM wp, LPA static const struct message WmQuitDialogSeq[] = { { HCBT_CREATEWND, hook }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_SETFONT, sent }, { WM_INITDIALOG, sent }, { WM_CHANGEUISTATE, sent|optional }, + { EVENT_SYSTEM_DIALOGEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_DESTROYWND, hook }, { 0x0090, sent|optional }, /* Vista */ + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, { 0 } @@ -18556,6 +18559,8 @@ START_TEST(msg) test_DispatchMessage(); test_SendMessageTimeout(); test_edit_messages(); + test_quit_message(); + test_notify_message(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18566,8 +18571,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_quit_message(); - test_notify_message(); test_SetActiveWindow(); test_restore_messages(); test_invalid_window();

1 0

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

23 Sep '21

Module: wine Branch: master Commit: 1e43edd8009e4581b17f140859a213a8aca056f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e43edd8009e4581b17f1408… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 22 21:01:51 2021 -0400 user32/tests: Add missing winevents to test_edit_messages() 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e2a260ac9d9..53bd2068348 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11862,7 +11862,10 @@ static const struct message sl_edit_invisible[] = { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, /* Sent for IME. */ { WM_KILLFOCUS, sent|parent }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, { 0 } }; @@ -11877,6 +11880,7 @@ static const struct message ml_edit_setfocus[] = { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 11 }, { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, OBJID_CARET, 0 }, { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, { 0 } }; @@ -18551,6 +18555,7 @@ START_TEST(msg) test_DestroyWindow(); test_DispatchMessage(); test_SendMessageTimeout(); + test_edit_messages(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18561,7 +18566,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_edit_messages(); test_quit_message(); test_notify_message(); test_SetActiveWindow();

1 0

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

23 Sep '21

Module: wine Branch: master Commit: 8502b6817f4580ec55d5f6c75d543b67cd01efaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8502b6817f4580ec55d5f6c7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 22 21:01:50 2021 -0400 user32/tests: Fix existing winevents in test_edit_messages() 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 | 54 ++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ba5ef5f4c82..e2a260ac9d9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11844,14 +11844,14 @@ static const struct message sl_edit_setfocus[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 10 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 15 }, { WM_CTLCOLOREDIT, sent|parent }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 11 }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, { 0 } }; @@ -11860,7 +11860,7 @@ static const struct message sl_edit_invisible[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, /* Sent for IME. */ { WM_KILLFOCUS, sent|parent }, { WM_SETFOCUS, sent }, { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, @@ -11871,22 +11871,22 @@ static const struct message ml_edit_setfocus[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 10 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 11 }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, { 0 } }; static const struct message sl_edit_killfocus[] = { { HCBT_SETFOCUS, hook }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|wparam, 0 }, - { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_KILLFOCUS) }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 1 }, @@ -11895,7 +11895,7 @@ static const struct message sl_edit_killfocus[] = static const struct message sl_edit_lbutton_dblclk[] = { { WM_LBUTTONDBLCLK, sent }, - { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { 0 } }; static const struct message sl_edit_lbutton_down[] = @@ -11904,52 +11904,52 @@ static const struct message sl_edit_lbutton_down[] = { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 10 }, { WM_CTLCOLOREDIT, sent|parent }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 11 }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, - { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { WM_CTLCOLOREDIT, sent|parent|optional }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 11 }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { 0 } }; static const struct message ml_edit_lbutton_down[] = { { WM_LBUTTONDOWN, sent|wparam|lparam, 0, 0 }, - { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { HCBT_SETFOCUS, hook }, { WM_IME_SETCONTEXT, sent|wparam|defwinproc|optional, 1 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 2 }, - { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|wparam|defwinproc, 0 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 10 }, { WM_IME_NOTIFY, sent|wparam|defwinproc|optional, 11 }, - { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { WM_COMMAND, sent|parent|wparam, MAKEWPARAM(ID_EDIT, EN_SETFOCUS) }, { 0 } }; static const struct message sl_edit_lbutton_up[] = { { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, - { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, - { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|defwinproc }, - { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, OBJID_CARET, 0 }, + { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CARET, 0 }, { 0 } }; static const struct message ml_edit_lbutton_up[] = { { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 }, - { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|defwinproc }, { 0 } };

1 0

Rémi Bernon : winebus.sys: Handle feature and output reports in hid_device.
by Alexandre Julliard 23 Sep '21

23 Sep '21

Module: wine Branch: master Commit: 78f67d5c088c9ef5a58de691287629fcf764a00e URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f67d5c088c9ef5a58de691… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 23 08:55:30 2021 +0200 winebus.sys: Handle feature and output reports in hid_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 51 ++++++++++++---------------------------- dlls/winebus.sys/bus_udev.c | 23 +++++------------- dlls/winebus.sys/hid.c | 25 ++++++++++++++++---- dlls/winebus.sys/unix_private.h | 13 +++++++---- dlls/winebus.sys/unixlib.c | 52 +++++++---------------------------------- 5 files changed, 58 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78f67d5c088c9ef5a58d…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021