wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Jeremy White : Add the In-Reply-To id to References.
by Alexandre Julliard 05 May '22

05 May '22

Module: tools Branch: master Commit: 754130bc4af8d8f99e4a3e9285042fb5a7b7f5ce URL: https://source.winehq.org/git/tools.git/?a=commit;h=754130bc4af8d8f99e4a3e9… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue May 3 15:11:34 2022 -0500 Add the In-Reply-To id to References. It does no harm, and may help some utilities such as the winehq patch tracker to keep patches together. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 6aa16be..15fa5dd 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -357,7 +357,7 @@ def process_commented_on(event): mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) mail['Message-ID'] = create_message_id(mr_iid, mr_version, note_id=note_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) - mail['References'] = create_reference(mr_id, gitlab_hostname) + mail['References'] = create_reference(mr_id, gitlab_hostname) + " " + mail['In-Reply-To'] mail['Date'] = email.utils.format_datetime(parse_gitlab_datetime(date)) mail.set_payload(f"{body}\n\n-- \n{mr_url}") @@ -388,7 +388,7 @@ def process_closed(event): mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) + f" - {action_name}" mail['Message-ID'] = create_message_id(mr_iid, mr_version, event_id=event_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) - mail['References'] = create_reference(mr_id, gitlab_hostname) + mail['References'] = create_reference(mr_id, gitlab_hostname) + " " + mail['In-Reply-To'] mail['Date'] = email.utils.format_datetime(parse_gitlab_datetime(date)) mail.set_payload(f"\nThis merge request was {action_name} by {event['author']['name']}.\n-- \n{mr_url}") @@ -620,7 +620,7 @@ def process_mr(mr, update_db): fixup_date(mail, date) fixup_version(mail, version) create_headers_from_mr(mail, mr) - mail['References'] = create_reference(mr['id'], gitlab_hostname) + mail['References'] = create_reference(mr['id'], gitlab_hostname) + " " + mail['In-Reply-To'] log(f"MR{iid}v{version} - sent email") send_email(mail) if update_db:

1 0

Jeremy White : Make event subjects match the MR cover letter.
by Alexandre Julliard 05 May '22

05 May '22

Module: tools Branch: master Commit: 58a574fcad7161adf6213c0fed85fdabfda2134b URL: https://source.winehq.org/git/tools.git/?a=commit;h=58a574fcad7161adf6213c0… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue May 3 14:30:45 2022 -0500 Make event subjects match the MR cover letter. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- gitlab/gitlab-to-mail/gitlabtomail.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gitlab/gitlab-to-mail/gitlabtomail.py b/gitlab/gitlab-to-mail/gitlabtomail.py index 45f829f..6aa16be 100755 --- a/gitlab/gitlab-to-mail/gitlabtomail.py +++ b/gitlab/gitlab-to-mail/gitlabtomail.py @@ -349,9 +349,12 @@ def process_commented_on(event): log("comment was originally from the mailing list.") return + patches = split_mbox_into_messages(fetch_mr_patches(mr_iid)) + nr_patches = len(patches) + mail = email.message.Message() mail['From'] = email.utils.formataddr((author, settings.BRIDGE_FROM_EMAIL)) - mail['Subject'] = f"Re: {BRIDGE_TAG_FULL}MR{mr_iid}v{mr_version} - {title}" + mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) mail['Message-ID'] = create_message_id(mr_iid, mr_version, note_id=note_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) mail['References'] = create_reference(mr_id, gitlab_hostname) @@ -377,9 +380,12 @@ def process_closed(event): action_name = event['action_name'] event_id = event['id'] + patches = split_mbox_into_messages(fetch_mr_patches(mr_iid)) + nr_patches = len(patches) + mail = email.message.Message() mail['From'] = email.utils.formataddr((author, settings.BRIDGE_FROM_EMAIL)) - mail['Subject'] = f"{BRIDGE_TAG_FULL}MR{mr_iid}v{mr_version} - {title} - {action_name}" + mail['Subject'] = "Re: " + cover_subject(mr_version, nr_patches, mr_iid, title) + f" - {action_name}" mail['Message-ID'] = create_message_id(mr_iid, mr_version, event_id=event_id) mail['In-Reply-To'] = create_message_id(mr_iid, mr_version) mail['References'] = create_reference(mr_id, gitlab_hostname) @@ -518,6 +524,12 @@ def get_changes(iid, version, versionid, old_versionid, mr): return "\n" + version_string + changes +def cover_subject(mr_version, nr_patches, mr_iid, title): + vstring = "" + if mr_version > 1: + vstring = f" v{mr_version}" + return f"[PATCH{BRIDGE_TAG_INFIX}{vstring} 0/{nr_patches}] MR{mr_iid}: {title}" + def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): author_name = f"{mr['author']['name']} (@{mr['author']['username']})" title = mr['title'] @@ -525,10 +537,8 @@ def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): mail = email.message.Message() mail['From'] = email.utils.formataddr((author_name, settings.BRIDGE_FROM_EMAIL)) - vstring = "" changes = "" if mr_version > 1: - vstring = f" v{mr_version}" if len(versions) > 1: # The versions array seems to be most recent first, while mr_version # is the positive version number. TODO: this assumes that the @@ -539,7 +549,7 @@ def create_cover(mr_id, mr_iid, mr_version, versions, nr_patches, mr): if changes is None: return None - mail['Subject'] = f"[PATCH{BRIDGE_TAG_INFIX}{vstring} 0/{nr_patches}] MR{mr_iid}: {title}" + mail['Subject'] = cover_subject(mr_version, nr_patches, mr_iid, title) mail['Message-ID'] = create_message_id(mr_iid, mr_version) mail['References'] = create_reference(mr_id, gitlab_hostname)

1 0

Brendan Shanks : include: Add WINE_ALLOC_SIZE attribute to heap_calloc().
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 1c4131ba788579f511318270410734d73575caa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c4131ba788579f511318270… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 28 21:13:16 2022 -0700 include: Add WINE_ALLOC_SIZE attribute to heap_calloc(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/heap.h | 2 +- include/winnt.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/heap.h b/include/wine/heap.h index 97d3a5662be..fb687c92393 100644 --- a/include/wine/heap.h +++ b/include/wine/heap.h @@ -46,7 +46,7 @@ static inline void heap_free(void *mem) HeapFree(GetProcessHeap(), 0, mem); } -static inline void *heap_calloc(SIZE_T count, SIZE_T size) +static inline void * __WINE_ALLOC_SIZE(1,2) heap_calloc(SIZE_T count, SIZE_T size) { SIZE_T len = count * size; diff --git a/include/winnt.h b/include/winnt.h index e853ddbc7ae..79df4259f59 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -199,9 +199,9 @@ extern "C" { #endif #if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) -#define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) +#define __WINE_ALLOC_SIZE(...) __attribute__((__alloc_size__(__VA_ARGS__))) #else -#define __WINE_ALLOC_SIZE(x) +#define __WINE_ALLOC_SIZE(...) #endif /* Anonymous union/struct handling */

1 0

Brendan Shanks : wrc: Support function macros where varargs are the only argument.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: f214d0c44e08b1e454b7f02df7638a13dff1c5b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f214d0c44e08b1e454b7f02d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 28 21:13:15 2022 -0700 wrc: Support function macros where varargs are the only argument. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/ppl.l | 4 ++-- tools/wrc/ppy.y | 11 ++++++----- tools/wrc/wpp.c | 5 +++-- tools/wrc/wpp_private.h | 3 ++- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/wrc/ppl.l b/tools/wrc/ppl.l index 35c3fd6fb44..4748d735fa2 100644 --- a/tools/wrc/ppl.l +++ b/tools/wrc/ppl.l @@ -1071,9 +1071,9 @@ static void expand_macro(macexpstackentry_t *mep) assert(ppp->type == def_macro); assert(ppp->expanding == 0); - if((ppp->nargs >= 0 && nargs != ppp->nargs) || (ppp->nargs < 0 && nargs < -ppp->nargs)) + if((!ppp->variadic && nargs != ppp->nargs) || (ppp->variadic && nargs < ppp->nargs)) { - ppy_error("Too %s macro arguments (%d)", nargs < abs(ppp->nargs) ? "few" : "many", nargs); + ppy_error("Too %s macro arguments (%d)", nargs < ppp->nargs ? "few" : "many", nargs); return; } diff --git a/tools/wrc/ppy.y b/tools/wrc/ppy.y index ac4423d724f..ce3c409e735 100644 --- a/tools/wrc/ppy.y +++ b/tools/wrc/ppy.y @@ -112,6 +112,7 @@ static char *merge_text(char *s1, char *s2); */ static char **macro_args; /* Macro parameters array while parsing */ static int nmacro_args; +static int macro_variadic; /* Macro arguments end with (or consist entirely of) '...' */ %} @@ -267,7 +268,7 @@ preprocessor | tUNDEF tIDENT tNL { pp_del_define($2); free($2); } | tDEFINE opt_text tNL { pp_add_define($1, $2); free($1); free($2); } | tMACRO res_arg allmargs tMACROEND opt_mtexts tNL { - pp_add_macro($1, macro_args, nmacro_args, $5); + pp_add_macro($1, macro_args, nmacro_args, macro_variadic, $5); } | tLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } | tGCCLINE tSINT tDQSTRING tNL { if($3) fprintf(ppy_out, "# %d %s\n", $2 , $3); free($3); } @@ -305,16 +306,16 @@ text : tLITERAL { $$ = $1; } | text tSQSTRING { $$ = merge_text($1, $2); } ; -res_arg : /* Empty */ { macro_args = NULL; nmacro_args = 0; } +res_arg : /* Empty */ { macro_args = NULL; nmacro_args = 0; macro_variadic = 0; } ; -allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; } +allmargs: /* Empty */ { $$ = 0; macro_args = NULL; nmacro_args = 0; macro_variadic = 0; } | emargs { $$ = nmacro_args; } ; emargs : margs { $$ = $1; } - | margs ',' tELLIPSIS { nmacro_args *= -1; } - | tELLIPSIS { macro_args = NULL; nmacro_args = 0; } + | margs ',' tELLIPSIS { macro_variadic = 1; } + | tELLIPSIS { macro_args = NULL; nmacro_args = 0; macro_variadic = 1; } ; margs : margs ',' tIDENT { $$ = add_new_marg($3); } diff --git a/tools/wrc/wpp.c b/tools/wrc/wpp.c index d8d5052870a..57baf44862b 100644 --- a/tools/wrc/wpp.c +++ b/tools/wrc/wpp.c @@ -239,7 +239,7 @@ pp_entry_t *pp_add_define(const char *def, const char *text) return ppp; } -pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, mtext_t *exp) +pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, int variadic, mtext_t *exp) { int idx; pp_entry_t *ppp; @@ -258,13 +258,14 @@ pp_entry_t *pp_add_macro(char *id, char *args[], int nargs, mtext_t *exp) ppp->type = def_macro; ppp->margs = args; ppp->nargs = nargs; + ppp->variadic = variadic; ppp->subst.mtext= exp; ppp->filename = xstrdup(pp_status.input ? pp_status.input : "<internal or cmdline>"); ppp->linenumber = pp_status.input ? pp_status.line_number : 0; list_add_head( &pp_defines[idx], &ppp->entry ); if(pp_status.debug) { - fprintf(stderr, "Added macro (%s, %d) <%s(%d)> to <", pp_status.input, pp_status.line_number, ppp->ident, nargs); + fprintf(stderr, "Added macro (%s, %d) <%s(%d%s)> to <", pp_status.input, pp_status.line_number, ppp->ident, nargs, variadic ? ",va" : ""); for(; exp; exp = exp->next) { switch(exp->type) diff --git a/tools/wrc/wpp_private.h b/tools/wrc/wpp_private.h index 435dbcc005a..9d92fa02fbb 100644 --- a/tools/wrc/wpp_private.h +++ b/tools/wrc/wpp_private.h @@ -80,6 +80,7 @@ typedef struct pp_entry { char *ident; /* The key */ char **margs; /* Macro arguments array or NULL if none */ int nargs; + int variadic; union { mtext_t *mtext; /* The substitution sequence or NULL if none */ char *text; @@ -156,7 +157,7 @@ typedef struct cval { pp_entry_t *pplookup(const char *ident); pp_entry_t *pp_add_define(const char *def, const char *text); -pp_entry_t *pp_add_macro(char *ident, char *args[], int nargs, mtext_t *exp); +pp_entry_t *pp_add_macro(char *ident, char *args[], int nargs, int variadic, mtext_t *exp); void pp_del_define(const char *name); void *pp_open_include(const char *name, int type, const char *parent_name, char **newpath); void pp_push_if(pp_if_state_t s);

1 0

Zebediah Figura : ws2_32/tests: Add some more tests for reset TCP connections.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: d280e8b9b78914a4509df426ede115ae8dabbd92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d280e8b9b78914a4509df426… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:28 2022 -0500 ws2_32/tests: Add some more tests for reset TCP connections. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 114 +++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 155 +++++++++++++++++++++++++++++++++++++---------- 2 files changed, 237 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d280e8b9b78914a4509d…

1 0

Zebediah Figura : server: Clear only returned events in IOCTL_AFD_GET_EVENTS.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 683d46a2cdf08d999f07d13e048ac6bca98b46fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=683d46a2cdf08d999f07d13e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:27 2022 -0500 server: Clear only returned events in IOCTL_AFD_GET_EVENTS. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 6 +++--- server/sock.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c88016c5404..7bc2b2474ca 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5659,7 +5659,7 @@ static void test_connect_events(struct event_test_ctx *ctx) if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); else - check_events_todo(ctx, FD_CONNECT, 0, 200); + check_events(ctx, FD_CONNECT, 0, 200); closesocket(client); closesocket(server); @@ -5896,7 +5896,7 @@ static void test_read_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); - check_events_todo_event(ctx, FD_READ, FD_WRITE, 200); + check_events(ctx, FD_READ, FD_WRITE, 200); check_events(ctx, 0, 0, 0); ret = sync_recv(server, buffer, 5, 0); @@ -6111,7 +6111,7 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); - check_events_todo_event(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); closesocket(server); } diff --git a/server/sock.c b/server/sock.c index 9f9b9bdfcd9..29dd1ca7fa8 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2516,7 +2516,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) for (i = 0; i < ARRAY_SIZE( params.status ); ++i) params.status[i] = sock_get_ntstatus( sock->errors[i] ); - sock->pending_events = 0; + sock->pending_events &= ~sock->mask; sock_reselect( sock ); set_reply_data( &params, sizeof(params) );

1 0

Zebediah Figura : server: Send AFD_POLL_READ messages before AFD_POLL_WRITE.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: ad078be430615b9ae6911b61d6fdc8e1bf5bf6ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad078be430615b9ae6911b61… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:26 2022 -0500 server: Send AFD_POLL_READ messages before AFD_POLL_WRITE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f85b79611bd..c88016c5404 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5896,7 +5896,7 @@ static void test_read_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); - check_events_todo(ctx, FD_READ, FD_WRITE, 200); + check_events_todo_event(ctx, FD_READ, FD_WRITE, 200); check_events(ctx, 0, 0, 0); ret = sync_recv(server, buffer, 5, 0); diff --git a/server/sock.c b/server/sock.c index a9d8d2ca2bd..9f9b9bdfcd9 100644 --- a/server/sock.c +++ b/server/sock.c @@ -505,8 +505,8 @@ static const enum afd_poll_bit event_bitorder[] = AFD_POLL_BIT_CONNECT_ERR, AFD_POLL_BIT_ACCEPT, AFD_POLL_BIT_OOB, - AFD_POLL_BIT_WRITE, AFD_POLL_BIT_READ, + AFD_POLL_BIT_WRITE, AFD_POLL_BIT_RESET, AFD_POLL_BIT_HUP, AFD_POLL_BIT_CLOSE,

1 0

Zebediah Figura : ws2_32/tests: Add more tests for selecting for events after they are signaled.
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 934023d15ef05afdf3e800a032ef4edaf8f9f605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=934023d15ef05afdf3e800a0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:25 2022 -0500 ws2_32/tests: Add more tests for selecting for events after they are signaled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5b3cc75f18c..f85b79611bd 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -219,6 +219,17 @@ static void check_poll_(int line, SOCKET s, short mask, short expect, BOOL todo) todo_wine_if (todo) ok_(__FILE__, line)(pollfd.revents == expect, "got wrong events %#x\n", pollfd.revents); } +static DWORD WINAPI poll_async_thread(void *arg) +{ + WSAPOLLFD *pollfd = arg; + int ret; + + ret = pWSAPoll(pollfd, 1, 500); + ok(ret == (pollfd->revents ? 1 : 0), "WSAPoll() returned %d\n", ret); + + return 0; +} + static void set_so_opentype ( BOOL overlapped ) { int optval = !overlapped, newval, len = sizeof (int); @@ -5740,6 +5751,26 @@ static void test_write_events(struct event_test_ctx *ctx) closesocket(server); closesocket(client); + /* Select on a subset not containing FD_WRITE first. */ + + tcp_socketpair(&client, &server); + set_blocking(client, FALSE); + + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + select_events(ctx, client, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ); + if (!ctx->is_message) + check_events(ctx, FD_CONNECT, 0, 200); + check_events(ctx, 0, 0, 0); + + select_events(ctx, client, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events(ctx, FD_WRITE, 0, 200); + check_events(ctx, 0, 0, 0); + + closesocket(client); + closesocket(server); + /* Despite the documentation, and unlike FD_ACCEPT and FD_RECV, calling * send() doesn't clear the FD_WRITE bit. */ @@ -5763,9 +5794,11 @@ static void test_read_events(struct event_test_ctx *ctx) OVERLAPPED overlapped = {0}; SOCKET server, client; DWORD size, flags = 0; + WSAPOLLFD pollfd; unsigned int i; char buffer[8]; WSABUF wsabuf; + HANDLE thread; int ret; overlapped.hEvent = CreateEventA(NULL, TRUE, FALSE, NULL); @@ -5844,6 +5877,31 @@ static void test_read_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); + /* Send data while we're polling for data but not selecting for FD_READ. */ + + pollfd.fd = server; + pollfd.events = POLLIN; + thread = CreateThread(NULL, 0, poll_async_thread, &pollfd, 0, NULL); + + select_events(ctx, server, 0); + ret = send(client, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + ret = WaitForSingleObject(thread, 1000); + ok(!ret, "wait timed out\n"); + CloseHandle(thread); + + /* And check events, to show that WSAEnumNetworkEvents() should not clear + * events we are not currently selecting for. */ + check_events(ctx, 0, 0, 0); + + select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events_todo(ctx, FD_READ, FD_WRITE, 200); + check_events(ctx, 0, 0, 0); + + ret = sync_recv(server, buffer, 5, 0); + ok(ret == 5, "got %d\n", ret); + /* Send data while there is a pending WSARecv(). */ select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ);

1 0

Zebediah Figura : ws2_32/tests: Test that sockets returned from accept() don't return FD_CONNECT from WSAEnumNetworkEvents().
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: a321a6721704183ff4495bb01545a3068c68f514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a321a6721704183ff4495bb0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 3 17:56:24 2022 -0500 ws2_32/tests: Test that sockets returned from accept() don't return FD_CONNECT from WSAEnumNetworkEvents(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 3 +++ 2 files changed, 15 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 43c401c940a..184c7e0725a 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1819,6 +1819,18 @@ static void test_get_events(void) ok(!ret, "got error %lu\n", GetLastError()); ok(!events.lNetworkEvents, "got events %#lx\n", events.lNetworkEvents); + ret = WSAEventSelect(server, event, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + ok(!ret, "got error %lu\n", GetLastError()); + + memset(&params, 0xcc, sizeof(params)); + memset(&io, 0xcc, sizeof(io)); + ret = NtDeviceIoControlFile((HANDLE)server, NULL, NULL, NULL, &io, + IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); + ok(!ret, "got %#x\n", ret); + ok(params.flags == AFD_POLL_WRITE, "got flags %#x\n", params.flags); + for (i = 0; i < ARRAY_SIZE(params.status); ++i) + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + closesocket(client); closesocket(server); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f17b4bb0ffa..5b3cc75f18c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5599,6 +5599,9 @@ static void test_connect_events(struct event_test_ctx *ctx) server = accept(listener, NULL, NULL); ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + select_events(ctx, server, FD_ACCEPT | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); + check_events(ctx, FD_WRITE, 0, 200); + closesocket(client); closesocket(server);

1 0

Eric Pouech : dbghelp: Introduce symt_find_symbol_at().
by Alexandre Julliard 04 May '22

04 May '22

Module: wine Branch: master Commit: 99c78180979b32678bbd9395d00739108d73a87a URL: https://source.winehq.org/git/wine.git/?a=commit;h=99c78180979b32678bbd9395… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Apr 29 11:08:31 2022 +0200 dbghelp: Introduce symt_find_symbol_at(). To be used in place of symt_find_nearest(). symt_find_symbol_at() ensures that the address passed is within the boundaries of the returned symbol (while find_nearest() doesn't). This fixes erroneous backtraces in debugger like: $ ./wine winedbg notepad WineDbg starting on pid 0104 RtlDefaultNpAcl () at Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731 0x00000170054805 ntdll+0x54805 [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731]: ret 1731 } Wine-dbg>bt Backtrace: =>0 0x00000170054805 RtlDefaultNpAcl+0x2d5(pAcl=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\sec.c:1731] in ntdll (0x000001700701a4) 1 0x0000017002d6c4 __wine_pop_frame(pAcl=<internal error>) [Z:\home\eric\work\wine\include\wine\exception.h:273] in ntdll (0x000001700701a4) 2 0x0000017002d6c4 process_breakpoint+0x84() [Z:\home\eric\work\wine\dlls\ntdll\loader.c:3912] in ntdll (0x000001700701a4) 3 0x000001700354c9 LdrInitializeThunk+0x509(context=<register R13 not accessible in this frame>, unknown2=<internal error>, unknown3=<internal error>, unknown4=<internal error>) [Z:\home\eric\work\wine\dlls\ntdll\loader.c:4200] in ntdll (0x000001700701a4) where RtlDefaultNpAcl() has nothing to do here (it's the symbol below RIP and we don't have a symbol with debug information for that address). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 2 +- dlls/dbghelp/dbghelp_private.h | 2 ++ dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 8 ++++---- dlls/dbghelp/symbol.c | 24 +++++++++++++++++++----- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 6d775b633f8..c154d8d9713 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -672,7 +672,7 @@ BOOL WINAPI SymSetScopeFromAddr(HANDLE hProcess, ULONG64 addr) if (!module_init_pair(&pair, hProcess, addr)) return FALSE; pair.pcs->localscope_pc = addr; - if ((sym = symt_find_nearest(pair.effective, addr)) != NULL && sym->symt.tag == SymTagFunction) + if ((sym = symt_find_symbol_at(pair.effective, addr)) != NULL && sym->symt.tag == SymTagFunction) pair.pcs->localscope_symt = &sym->symt; else pair.pcs->localscope_symt = NULL; diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index c9de237c4b9..507724414a5 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -811,6 +811,8 @@ extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) DECLS extern void symbol_setname(SYMBOL_INFO* si, const char* name) DECLSPEC_HIDDEN; extern struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; +extern struct symt_ht* + symt_find_symbol_at(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; extern struct symt_module* symt_new_module(struct module* module) DECLSPEC_HIDDEN; extern struct symt_compiland* diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0076b19e5cb..b81f83ac90b 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2584,7 +2584,7 @@ static void dwarf2_set_line_number(struct module* module, ULONG_PTR address, TRACE("%s %Ix %s %u\n", debugstr_w(module->modulename), address, debugstr_a(source_get(module, *psrc)), line); - symt = symt_find_nearest(module, address); + symt = symt_find_symbol_at(module, address); if (symt_check_tag(&symt->symt, SymTagFunction)) { func = (struct symt_function*)symt; diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 28b6bd12f2e..22ab1ecb230 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1461,7 +1461,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B */ if (!func || addr >= func->address + func->size) { - func = (struct symt_function*)symt_find_nearest(msc_dbg->module, addr); + func = (struct symt_function*)symt_find_symbol_at(msc_dbg->module, addr); /* FIXME: at least labels support line numbers */ if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) { @@ -1534,7 +1534,7 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const lines = CV_RECORD_AFTER(files_hdr); for (i = 0; i < files_hdr->nLines; i++) { - func = (struct symt_function*)symt_find_nearest(msc_dbg->module, lineblk_base + lines[i].offset); + func = (struct symt_function*)symt_find_symbol_at(msc_dbg->module, lineblk_base + lines[i].offset); /* FIXME: at least labels support line numbers */ if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) { @@ -1619,7 +1619,7 @@ static inline void codeview_add_variable(const struct msc_debug_info* msc_dbg, loc.kind = in_tls ? loc_tlsrel : loc_absolute; loc.reg = 0; loc.offset = in_tls ? offset : codeview_get_address(msc_dbg, segment, offset); - if (force || in_tls || !symt_find_nearest(msc_dbg->module, loc.offset)) + if (force || in_tls || !symt_find_symbol_at(msc_dbg->module, loc.offset)) { symt_new_global_variable(msc_dbg->module, compiland, name, is_local, loc, 0, @@ -2501,7 +2501,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, if (!top_func) { ULONG_PTR parent_addr = codeview_get_address(msc_dbg, sym->sepcode_v3.sectParent, sym->sepcode_v3.offParent); - struct symt_ht* parent = symt_find_nearest(msc_dbg->module, parent_addr); + struct symt_ht* parent = symt_find_symbol_at(msc_dbg->module, parent_addr); if (symt_check_tag(&parent->symt, SymTagFunction)) { struct symt_function* pfunc = (struct symt_function*)parent; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 64f376b42f0..a81feb56b8d 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1027,7 +1027,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON if (symt_get_info(module, symt, TI_GET_TYPE, &type_index) && symt_get_info(module, symt_index2ptr(module, type_index), TI_GET_LENGTH, size)) return; - *size = 0x1000; /* arbitrary value */ + *size = 1; /* no size info */ } /* needed by symt_find_nearest */ @@ -1104,6 +1104,20 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) return module->addr_sorttab[low]; } +struct symt_ht* symt_find_symbol_at(struct module* module, DWORD_PTR addr) +{ + struct symt_ht* nearest = symt_find_nearest(module, addr); + if (nearest) + { + ULONG64 symaddr, symsize; + symt_get_address(&nearest->symt, &symaddr); + symt_get_length(module, &nearest->symt, &symsize); + if (addr < symaddr || addr >= symaddr + symsize) + nearest = NULL; + } + return nearest; +} + static BOOL symt_enum_locals_helper(struct module_pair* pair, const WCHAR* match, const struct sym_enum* se, struct symt_function* func, const struct vector* v) @@ -1262,7 +1276,7 @@ struct symt* symt_get_upper_inlined(struct symt_inlinesite* inlined) /* lookup in module for an inline site (from addr and inline_ctx) */ struct symt_inlinesite* symt_find_inlined_site(struct module* module, DWORD64 addr, DWORD inline_ctx) { - struct symt_ht* symt = symt_find_nearest(module, addr); + struct symt_ht* symt = symt_find_symbol_at(module, addr); if (symt_check_tag(&symt->symt, SymTagFunction)) { @@ -1284,7 +1298,7 @@ DWORD symt_get_inlinesite_depth(HANDLE hProcess, DWORD64 addr) if (module_init_pair(&pair, hProcess, addr)) { - struct symt_ht* symt = symt_find_nearest(pair.effective, addr); + struct symt_ht* symt = symt_find_symbol_at(pair.effective, addr); if (symt_check_tag(&symt->symt, SymTagFunction)) { struct symt_inlinesite* inlined = symt_find_lowest_inlined((struct symt_function*)symt, addr); @@ -1518,7 +1532,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, struct symt_ht* sym; if (!module_init_pair(&pair, hProcess, Address)) return FALSE; - if ((sym = symt_find_nearest(pair.effective, Address)) == NULL) return FALSE; + if ((sym = symt_find_symbol_at(pair.effective, Address)) == NULL) return FALSE; symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); if (Displacement) @@ -1905,7 +1919,7 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr, struct symt_ht* symt; if (!module_init_pair(&pair, hProcess, addr)) return FALSE; - if ((symt = symt_find_nearest(pair.effective, addr)) == NULL) return FALSE; + if ((symt = symt_find_symbol_at(pair.effective, addr)) == NULL) return FALSE; if (symt->symt.tag != SymTagFunction && symt->symt.tag != SymTagInlineSite) return FALSE; return get_line_from_function(&pair, (struct symt_function*)symt, addr, pdwDisplacement, intl);

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
91
Older →

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 May 2022