July 2022 - Wine-GitLab - list.winehq.org

Re: [PATCH 0/4] MR384: winsock: Support fallback to ICMP over SOCK_DGRAM on Linux
by Paul Gofman (＠gofman) July 9, 2022

July 9, 2022

Thanks for all the detailed comments. But I suppose before going into these details and improving the neats it would be great to hear from Zebediah or Alexandre if this MR is a go in principle. As it is not apparent to me from the initial Zeb's comment. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/384#note_3817

1 0

Re: [PATCH 0/4] MR384: winsock: Support fallback to ICMP over SOCK_DGRAM on Linux
by Jinoh Kang (＠iamahuman) July 9, 2022

July 9, 2022

Jinoh Kang (@iamahuman) commented about server/protocol.def: > - int force_async; /* Force asynchronous mode? */ > + async_data_t async; /* async I/O parameters */ > + int force_async; /* Force asynchronous mode? */ > @REPLY > obj_handle_t wait; /* handle to wait on for blocking send */ > unsigned int options; /* device open options */ > int nonblocking; /* is socket non-blocking? */ > + int fixup_type; /* socket protocol fixup */ > +(a)END > + > + > +/* Store info needed for protocol fixup */ > +(a)REQ(socket_fixup_send_data) > + obj_handle_t handle; /* socket handle */ > + unsigned short icmp_id; /* ICMP packet id */ > + unsigned short icmp_seq; /* ICMP packed sequence */ Instead of re-aligning tabbing of `@REQ(send_socket)`, maybe we can also use `int` or `short` here. Although `unsigned short` makes more sense if we're going to restrict the scope of the two new server calls only to ICMP packets. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/384#note_3814

1 0

Re: [PATCH 0/4] MR384: winsock: Support fallback to ICMP over SOCK_DGRAM on Linux
by Jinoh Kang (＠iamahuman) July 9, 2022

July 9, 2022

Jinoh Kang (@iamahuman) commented about dlls/ntdll/unix/socket.c: > wait_handle = wine_server_ptr_handle( reply->wait ); > options = reply->options; > nonblocking = reply->nonblocking; > + fixup_type = reply->fixup_type; > } > SERVER_END_REQ; > > + if (fixup_type == SOCK_PROT_FIXUP_ICMP_OVER_DGRAM && async->count > + && (!status || status == STATUS_ALERTED || status == STATUS_PENDING)) We can just write `!NT_ERROR(status)`. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/384#note_3813

1 0

Re: [PATCH 0/4] MR384: winsock: Support fallback to ICMP over SOCK_DGRAM on Linux
by Jinoh Kang (＠iamahuman) July 9, 2022

July 9, 2022

Jinoh Kang (@iamahuman) commented about server/sock.c: > struct fd *fd; > > if (!sock) return; > + > + if (sock->fixup_type != req->fixup_type) > + { > + /* Protocol fixup information should be reflected in client's async data before the > + * async is delivered to process. So let the client set up the info and restart the > + * call. */ > + reply->fixup_type = sock->fixup_type; > + set_error( STATUS_MORE_PROCESSING_REQUIRED ); > + release_object( sock ); > + return; > + } > + We can save the `fixup_type` round trip in the optimal case by returning `STATUS_MORE_PROCESSING_REQUIRED` _only_ when the async would otherwise enter the pending state (i.e. final `status` is `STATUS_PENDING`), and setting `reply->fixup_type` in all cases (specifically, `status == STATUS_ALERTED`). Not sure if this improvement would be worth it, though, especially since 1) it doesn't eliminate `STATUS_MORE_PROCESSING_REQUIRED` (the raison d'��tre of which being that can't pass extra info via `APC_ASYNC_IO`, and we can't normally synchronize with the APC either, since it's asynchronous by nature) completely, and thus doesn't help simplify the patch, 2) not many tools rely on ICMP packet performace (save for a few network testing tools), and 3) server calls make us lose in the first place. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/384#note_3812

1 0

Re: [PATCH 0/4] MR384: winsock: Support fallback to ICMP over SOCK_DGRAM on Linux
by Jinoh Kang (＠iamahuman) July 9, 2022

July 9, 2022

Jinoh Kang (@iamahuman) commented about dlls/ws2_32/socket.c: > } > > > -static BOOL protocol_matches_filter( const int *filter, int protocol ) > +static BOOL protocol_matches_filter( const int *filter, unsigned int index ) Would it be more clear to accept `const WSAPROTOCOL_INFOW *` instead of an index into the `supported_protocols` array? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/384#note_3811

1 0

Re: [PATCH 0/4] MR384: winsock: Support fallback to ICMP over SOCK_DGRAM on Linux
by Jinoh Kang (＠iamahuman) July 9, 2022

July 9, 2022

Jinoh Kang (@iamahuman) commented about dlls/ws2_32/tests/sock.c: > + sum += s; > + carry = s > sum; > + count -= 2; > + } > + sum += carry; /* This won't produce another carry */ > + sum = (sum & 0xffff) + (sum >> 16); > + > + if (count) sum += *data; /* LE-only */ > + > + sum = (sum & 0xffff) + (sum >> 16); > + /* fold in any carry */ > + sum = (sum & 0xffff) + (sum >> 16); > + > + check = ~sum; > + return check; > +} It's much simpler to implement 1's complement checksum without the use of an explicit `carry` variable. How about the following: ```suggestion:-25+0 static UINT16 chksum(BYTE *data, unsigned int count) { UINT16 *ptr = (UINT16 *)data, *end = ptr + count / 2; unsigned int sum = 0; while (ptr != end) { sum += *ptr++; sum = (sum & 0xffff) + (sum >> 16); } if (count % 2) { sum += *(BYTE *)ptr; /* LE-only */ sum = (sum & 0xffff) + (sum >> 16); } return ~sum; } ``` Note that `sum` is in range `[0, 0xfffe]` at the start of each iteration. After addition, the range extends to `[0, 0x1fffd]`; however, since `0xfffd + 0x1 = 0xfffe`, the range folds back to `[0, 0xfffe]`. Ditto for tests in ntdll. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/384#note_3810

1 0

Re: [PATCH v3 0/3] MR405: winegstreamer: More wg_transform fixes for CoD: BO3, Mortal Kombat 11 and Shadow Warrior 2. - approved
by Alexandre Julliard (＠julliard) July 8, 2022

July 8, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/405

1 0

Re: [PATCH v5 0/4] MR375: ntdll: Fixes for runtime 64-bit shift functions. - approved
by Alexandre Julliard (＠julliard) July 8, 2022

July 8, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/375

1 0

Re: [PATCH v2 0/1] MR404: mscms: Merge the profile and transform handle tables. - approved
by Alexandre Julliard (＠julliard) July 8, 2022

July 8, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/404

1 0

Re: [PATCH v2 0/2] MR403: ddraw/tests: Build without -DWINE_NO_LONG_TYPES. - approved
by Alexandre Julliard (＠julliard) July 8, 2022

July 8, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/403

1 0