December 2021 - Wine-commits

Jacek Caban : winevulkan: Support prefixing function parameters.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 9aef654392756aacdce6109ccbe21ba446ee4387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aef654392756aacdce6109c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 18:40:33 2021 +0100 winevulkan: Support prefixing function parameters. To allow them being accessed from a struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 59 ++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 53d69964aaa..adc8b4b76e3 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -721,19 +721,21 @@ class VkFunction(object): return proto - def body(self): + def body(self, params_prefix=""): body = "" if not self.needs_private_thunk(): - body += " {0}".format(self.trace()) + body += " {0}".format(self.trace(params_prefix=params_prefix)) - params = ", ".join([p.variable(conv=False) for p in self.params]) + params = ", ".join([p.variable(conv=False, params_prefix=params_prefix) for p in self.params]) # Call the native Vulkan function. if self.type == "void": - body += " {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(), self.name, params) + body += " {0}{1}.p_{2}({3});\n".format(params_prefix, self.params[0].dispatch_table(), + self.name, params) else: - body += " return {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(), self.name, params) + body += " return {0}{1}.p_{2}({3});\n".format(params_prefix, self.params[0].dispatch_table(), + self.name, params) return body @@ -750,7 +752,7 @@ class VkFunction(object): return body - def body_conversion(self, conv): + def body_conversion(self, conv, params_prefix=""): body = "" # Declare a variable to hold the result for non-void functions. @@ -771,22 +773,24 @@ class VkFunction(object): body += " {0} {1}_host;\n".format(p.type, p.name) if not self.needs_private_thunk(): - body += " {0}\n".format(self.trace()) + body += " {0}\n".format(self.trace(params_prefix=params_prefix)) # Call any win_to_host conversion calls. for p in self.params: if p.needs_input_conversion() and (p.needs_unwrapping() or conv): - body += p.copy(Direction.INPUT) + body += p.copy(Direction.INPUT, prefix=params_prefix) # Build list of parameters containing converted and non-converted parameters. # The param itself knows if conversion is needed and applies it when we set conv=True. - params = ", ".join([p.variable(conv=conv) for p in self.params]) + params = ", ".join([p.variable(conv=conv, params_prefix=params_prefix) for p in self.params]) # Call the native Vulkan function. if self.type == "void": - body += " {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(), self.name, params) + body += " {0}{1}.p_{2}({3});\n".format(params_prefix, self.params[0].dispatch_table(), + self.name, params) else: - body += " result = {0}.p_{1}({2});\n".format(self.params[0].dispatch_table(), self.name, params) + body += " result = {0}{1}.p_{2}({3});\n".format(params_prefix, self.params[0].dispatch_table(), + self.name, params) body += "\n" @@ -795,12 +799,12 @@ class VkFunction(object): if not p.needs_output_conversion(): continue - body += p.copy(Direction.OUTPUT) + body += p.copy(Direction.OUTPUT, prefix=params_prefix) # Perform any required cleanups. Most of these are for array functions. for p in self.params: if p.needs_free() and (p.needs_unwrapping() or conv): - body += p.free() + body += p.free(prefix=params_prefix) # Finally return the result. if self.type != "void": @@ -872,7 +876,7 @@ class VkFunction(object): thunk += "}\n\n" return thunk - def trace(self, message=None, trace_func=None): + def trace(self, message=None, trace_func=None, params_prefix=""): """ Create a trace string including all parameters. Args: @@ -894,9 +898,9 @@ class VkFunction(object): # Second loop for parameter names and optional conversions. for param in self.params: if param.format_conv is not None: - trace += ", " + param.format_conv.format(param.name) + trace += ", " + param.format_conv.format("{0}{1}".format(params_prefix, param.name)) else: - trace += ", {0}".format(param.name) + trace += ", {0}{1}".format(params_prefix, param.name) trace += ");\n" return trace @@ -1599,17 +1603,17 @@ class VkParam(object): else: LOGGER.warn("Unhandled type: {0}".format(self.type_info)) - def copy(self, direction): + def copy(self, direction, prefix=""): if direction == Direction.INPUT: if self.is_dynamic_array(): - return " {0}_host = convert_{1}_array_win_to_host({0}, {2});\n".format(self.name, self.type, self.dyn_array_len) + return " {1}_host = convert_{2}_array_win_to_host({0}{1}, {0}{3});\n".format(prefix, self.name, self.type, self.dyn_array_len) else: - return " convert_{0}_win_to_host({1}, &{1}_host);\n".format(self.type, self.name) + return " convert_{0}_win_to_host({1}{2}, &{2}_host);\n".format(self.type, prefix, self.name) else: if self.is_dynamic_array(): LOGGER.error("Unimplemented output conversion for: {0}".format(self.name)) else: - return " convert_{0}_host_to_win(&{1}_host, {1});\n".format(self.type, self.name) + return " convert_{0}_host_to_win(&{2}_host, {1}{2});\n".format(self.type, prefix, self.name) def definition(self, postfix=None): """ Return prototype for the parameter. E.g. 'const char *foo' """ @@ -1654,13 +1658,13 @@ class VkParam(object): def format_string(self): return self.format_str - def free(self): + def free(self, prefix=""): if self.is_dynamic_array(): if self.is_struct() and self.struct.returnedonly: # For returnedonly, counts is stored in a pointer. - return " free_{0}_array({1}_host, *{2});\n".format(self.type, self.name, self.dyn_array_len) + return " free_{0}_array({1}_host, *{2}{3});\n".format(self.type, self.name, prefix, self.dyn_array_len) else: - return " free_{0}_array({1}_host, {2});\n".format(self.type, self.name, self.dyn_array_len) + return " free_{0}_array({1}_host, {2}{3});\n".format(self.type, self.name, prefix, self.dyn_array_len) else: # We are operating on a single structure. Some structs (very rare) contain dynamic members, # which would need freeing. @@ -1801,7 +1805,7 @@ class VkParam(object): LOGGER.error("Unhandled spec conversion for type: {0}".format(self.type)) - def variable(self, conv=False): + def variable(self, conv=False, params_prefix=""): """ Returns 'glue' code during generation of a function call on how to access the variable. This function handles various scenarios such as 'unwrapping' if dispatchable objects and renaming of parameters in case of win32 -> host conversion. @@ -1823,12 +1827,13 @@ class VkParam(object): return "&{0}_host".format(self.name) else: if self.object_type != None and self.type == "uint64_t": - return "wine_vk_unwrap_handle({0}, {1})".format(self.object_type, self.name) + return "wine_vk_unwrap_handle({0}{1}, {0}{2})".format(params_prefix, self.object_type, self.name) # We need to pass the native handle to the native Vulkan calls and # the wine driver's handle to calls which are wrapped by the driver. - driver_handle = self.handle.driver_handle(self.name) if self.is_handle() else None - return driver_handle if driver_handle else self.name + p = "{0}{1}".format(params_prefix, self.name) + driver_handle = self.handle.driver_handle(p) if self.is_handle() else None + return driver_handle if driver_handle else p class VkStruct(Sequence):

1 0

Jacek Caban : winevulkan: Pass Unix call arguments as a struct.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 3661194f8e8146a594673ad3682290f10fa2c096 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3661194f8e8146a594673ad3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 18:40:42 2021 +0100 winevulkan: Pass Unix call arguments as a struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 31 +- dlls/winevulkan/loader_thunks.c | 2683 ++++++++++++++++++++++---- dlls/winevulkan/loader_thunks.h | 3946 +++++++++++++++++++++++++++++++++++---- dlls/winevulkan/make_vulkan | 100 +- dlls/winevulkan/vulkan.c | 285 ++- dlls/winevulkan/vulkan_thunks.c | 3749 ++++++++++++++++++++++--------------- dlls/winevulkan/vulkan_thunks.h | 76 +- 7 files changed, 8364 insertions(+), 2506 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3661194f8e8146a59467…

1 0

Jacek Caban : winevulkan: Make Vulkan direct Unix calls more similar to __wine_unix_call interface.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 37be0989540cf84dd9336576577ae535f2b6bbb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37be0989540cf84dd9336576… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 18:41:08 2021 +0100 winevulkan: Make Vulkan direct Unix calls more similar to __wine_unix_call interface. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 10 +- dlls/winevulkan/loader_thunks.c | 812 +++++++++++++++++++-------------------- dlls/winevulkan/loader_thunks.h | 830 ++++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 59 ++- dlls/winevulkan/vulkan.c | 70 ++-- dlls/winevulkan/vulkan_loader.h | 7 + dlls/winevulkan/vulkan_thunks.c | 770 +++++++++++++++++++------------------ dlls/winevulkan/vulkan_thunks.h | 76 ++-- 8 files changed, 1317 insertions(+), 1317 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=37be0989540cf84dd933…

1 0

Jacek Caban : winevulkan: Use __wine_unix_call interface for some Vulkan functions.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: c3862f2a6121796814ae31913bfb0efeba565087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3862f2a6121796814ae3191… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 10 18:41:16 2021 +0100 winevulkan: Use __wine_unix_call interface for some Vulkan functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader.c | 4 +- dlls/winevulkan/loader_thunks.c | 478 ++++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 21 +- 3 files changed, 261 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c3862f2a6121796814ae…

1 0

Alexandre Julliard : winevulkan: Remove unnecessary '&' on function pointers.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: c2384cf23378953b6960e7044a0e467944e8814a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2384cf23378953b6960e704… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 10 20:07:37 2021 +0100 winevulkan: Remove unnecessary '&' on function pointers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 818 +++++++++++++++++++-------------------- dlls/winevulkan/make_vulkan | 14 +- dlls/winevulkan/vulkan_thunks.c | 828 ++++++++++++++++++++-------------------- 3 files changed, 830 insertions(+), 830 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2384cf23378953b6960…

1 0

Zebediah Figura : ntdll: Do not fill the IOSB in NtDeviceIoControlFile() if the NT status denotes error.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 6fe23ed8c35afc155ff88bbde2fb03376e13b5b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fe23ed8c35afc155ff88bbd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:29 2021 -0600 ntdll: Do not fill the IOSB in NtDeviceIoControlFile() if the NT status denotes error. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- dlls/ws2_32/tests/afd.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e459087af76..51c92df57e3 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5735,7 +5735,7 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT return server_ioctl_file( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); - if (status != STATUS_PENDING) io->u.Status = status; + if (status != STATUS_PENDING && !NT_ERROR(status)) io->u.Status = status; return status; } diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 9e888f1fcb9..55029bfd30d 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -688,7 +688,7 @@ static void test_poll(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); ok(ret == STATUS_INVALID_HANDLE, "got %#x\n", ret); - todo_wine ok(!io.Status, "got %#x\n", io.Status); + ok(!io.Status, "got %#x\n", io.Status); ok(!io.Information, "got %#Ix\n", io.Information); /* Test passing the same handle twice. */ @@ -1201,7 +1201,7 @@ static void test_recv(void) memset(&io, 0, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, IOCTL_AFD_RECV, NULL, 0, NULL, 0); todo_wine ok(ret == STATUS_INVALID_CONNECTION, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -1213,7 +1213,7 @@ static void test_recv(void) memset(&io, 0, sizeof(io)); ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, NULL, 0, NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); wsabufs[0].len = sizeof(buffer); @@ -1301,7 +1301,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_DEVICE_NOT_READY, "got %#x\n", ret); - todo_wine ok(!io.Status, "got status %#x\n", io.Status); + ok(!io.Status, "got status %#x\n", io.Status); ok(!io.Information, "got information %#Ix\n", io.Information); ret = send(server, "data", 5, 0); @@ -1368,7 +1368,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); + ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); params.msg_flags = AFD_MSG_OOB | AFD_MSG_NOT_OOB; @@ -1376,7 +1376,7 @@ static void test_recv(void) ret = NtDeviceIoControlFile((HANDLE)client, event, NULL, NULL, &io, IOCTL_AFD_RECV, &params, sizeof(params), NULL, 0); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - todo_wine ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); + ok(io.Status == 0xdeadbeef, "got %#x\n", io.Status); params.msg_flags = AFD_MSG_OOB;

1 0

Zebediah Figura : include: Add some structure size assertions.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 3821e0391733170906cca236a437422ee6cf40e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3821e0391733170906cca236… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:30 2021 -0600 include: Add some structure size assertions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index 3b8bdcb9e5d..1d24c679c75 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -76,6 +76,7 @@ struct afd_bind_params int unknown; struct WS(sockaddr) addr; /* variable size */ }; +C_ASSERT( sizeof(struct afd_bind_params) == 20 ); struct afd_listen_params { @@ -83,6 +84,7 @@ struct afd_listen_params int backlog; int unknown2; }; +C_ASSERT( sizeof(struct afd_listen_params) == 12 ); #define AFD_RECV_FORCE_ASYNC 0x2 @@ -138,6 +140,7 @@ struct afd_get_events_params int flags; NTSTATUS status[13]; }; +C_ASSERT( sizeof(struct afd_get_events_params) == 56 ); #define WINE_AFD_IOC(x) CTL_CODE(FILE_DEVICE_NETWORK, x, METHOD_BUFFERED, FILE_ANY_ACCESS) @@ -244,12 +247,14 @@ struct afd_create_params int family, type, protocol; unsigned int flags; }; +C_ASSERT( sizeof(struct afd_create_params) == 16 ); struct afd_accept_into_params { ULONG accept_handle; unsigned int recv_len, local_len; }; +C_ASSERT( sizeof(struct afd_accept_into_params) == 12 ); struct afd_connect_params { @@ -258,6 +263,7 @@ struct afd_connect_params /* VARARG(addr, struct WS(sockaddr), addr_len); */ /* VARARG(data, bytes); */ }; +C_ASSERT( sizeof(struct afd_connect_params) == 8 ); struct afd_recvmsg_params { @@ -297,10 +303,12 @@ struct afd_message_select_params unsigned int message; int mask; }; +C_ASSERT( sizeof(struct afd_message_select_params) == 16 ); struct afd_get_info_params { int family, type, protocol; }; +C_ASSERT( sizeof(struct afd_get_info_params) == 12 ); #endif

1 0

Zebediah Figura : ntdll: Factor out in_wow64_call().
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: 7bea24f6e12be7cbb53ef75245468331ede31152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bea24f6e12be7cbb53ef752… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:31 2021 -0600 ntdll: Factor out in_wow64_call(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/unix_private.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 9b79b712b1e..d9ce8300fa9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -342,11 +342,19 @@ static inline NTSTATUS wait_async( HANDLE handle, BOOL alertable ) return NtWaitForSingleObject( handle, alertable, NULL ); } +static inline BOOL in_wow64_call(void) +{ +#ifdef _WIN64 + return !!NtCurrentTeb()->WowTebOffset; +#endif + return FALSE; +} + static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR info ) { if (!iosb) return; -#ifdef _WIN64 - if (NtCurrentTeb()->WowTebOffset) + + if (in_wow64_call()) { struct iosb32 { @@ -357,7 +365,6 @@ static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR io->Information = info; } else -#endif { IO_STATUS_BLOCK *io = wine_server_get_ptr( iosb ); #ifdef NONAMELESSUNION @@ -371,12 +378,10 @@ static inline void set_async_iosb( client_ptr_t iosb, NTSTATUS status, ULONG_PTR static inline client_ptr_t iosb_client_ptr( IO_STATUS_BLOCK *io ) { -#ifdef _WIN64 #ifdef NONAMELESSUNION - if (io && NtCurrentTeb()->WowTebOffset) return wine_server_client_ptr( io->u.Pointer ); + if (io && in_wow64_call()) return wine_server_client_ptr( io->u.Pointer ); #else - if (io && NtCurrentTeb()->WowTebOffset) return wine_server_client_ptr( io->Pointer ); -#endif + if (io && in_wow64_call()) return wine_server_client_ptr( io->Pointer ); #endif return wine_server_client_ptr( io ); }

1 0

Zebediah Figura : ntdll: Handle WoW64 WSABUF pointers in sock_recv().
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: e3e860e53608cb6a24e971201a07351f22debf3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3e860e53608cb6a24e97120… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:32 2021 -0600 ntdll: Handle WoW64 WSABUF pointers in sock_recv(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 38 ++++++++++++++++++++++++++++---------- include/wine/afd.h | 6 ++++++ 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 59551aa51e8..221e1bf303b 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -595,7 +595,7 @@ static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) } static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, - int fd, const WSABUF *buffers, unsigned int count, WSABUF *control, + int fd, const void *buffers_ptr, unsigned int count, WSABUF *control, struct WS_sockaddr *addr, int *addr_len, DWORD *ret_flags, int unix_flags, int force_async ) { struct async_recv_ioctl *async; @@ -614,22 +614,31 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi return STATUS_INVALID_PARAMETER; } - for (i = 0; i < count; ++i) - { - if (!virtual_check_buffer_for_write( buffers[i].buf, buffers[i].len )) - return STATUS_ACCESS_VIOLATION; - } - async_size = offsetof( struct async_recv_ioctl, iov[count] ); if (!(async = (struct async_recv_ioctl *)alloc_fileio( async_size, async_recv_proc, handle ))) return STATUS_NO_MEMORY; async->count = count; - for (i = 0; i < count; ++i) + if (in_wow64_call()) { - async->iov[i].iov_base = buffers[i].buf; - async->iov[i].iov_len = buffers[i].len; + const struct afd_wsabuf_32 *buffers = buffers_ptr; + + for (i = 0; i < count; ++i) + { + async->iov[i].iov_base = ULongToPtr( buffers[i].buf ); + async->iov[i].iov_len = buffers[i].len; + } + } + else + { + const WSABUF *buffers = buffers_ptr; + + for (i = 0; i < count; ++i) + { + async->iov[i].iov_base = buffers[i].buf; + async->iov[i].iov_len = buffers[i].len; + } } async->unix_flags = unix_flags; async->control = control; @@ -637,6 +646,15 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi async->addr_len = addr_len; async->ret_flags = ret_flags; + for (i = 0; i < count; ++i) + { + if (!virtual_check_buffer_for_write( async->iov[i].iov_base, async->iov[i].iov_len )) + { + release_fileio( &async->io ); + return STATUS_ACCESS_VIOLATION; + } + } + status = try_recv( fd, async, &information ); if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW && status != STATUS_DEVICE_NOT_READY) diff --git a/include/wine/afd.h b/include/wine/afd.h index 1d24c679c75..60dd2806d9d 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -25,6 +25,12 @@ #include <winioctl.h> #include <mswsock.h> +struct afd_wsabuf_32 +{ + ULONG len; + ULONG buf; +}; + #ifdef USE_WS_PREFIX # define WS(x) WS_##x #else

1 0

Zebediah Figura : ntdll: Handle WoW64 translation in IOCTL_AFD_RECV.
by Alexandre Julliard 10 Dec '21

10 Dec '21

Module: wine Branch: master Commit: a0b57b9baa50981872bd94530829dffe8f56efc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0b57b9baa50981872bd9453… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 10 11:27:33 2021 -0600 ntdll: Handle WoW64 translation in IOCTL_AFD_RECV. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 50 +++++++++++++++++++++++++++++++++--------------- include/wine/afd.h | 8 ++++++++ 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 221e1bf303b..9cc9352403d 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1278,7 +1278,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_RECV: { - const struct afd_recv_params *params = in_buffer; + struct afd_recv_params params; int unix_flags = 0; if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) @@ -1286,33 +1286,53 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (out_size) FIXME( "unexpected output size %u\n", out_size ); - if (in_size < sizeof(struct afd_recv_params)) + if (in_wow64_call()) { - status = STATUS_INVALID_PARAMETER; - break; + const struct afd_recv_params_32 *params32 = in_buffer; + + if (in_size < sizeof(struct afd_recv_params_32)) + { + status = STATUS_INVALID_PARAMETER; + break; + } + + params.recv_flags = params32->recv_flags; + params.msg_flags = params32->msg_flags; + params.buffers = ULongToPtr( params32->buffers ); + params.count = params32->count; + } + else + { + if (in_size < sizeof(struct afd_recv_params)) + { + status = STATUS_INVALID_PARAMETER; + break; + } + + memcpy( &params, in_buffer, sizeof(params) ); } - if ((params->msg_flags & (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) == 0 || - (params->msg_flags & (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) == (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) + if ((params.msg_flags & (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) == 0 || + (params.msg_flags & (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) == (AFD_MSG_NOT_OOB | AFD_MSG_OOB)) { status = STATUS_INVALID_PARAMETER; break; } - if (params->msg_flags & ~(AFD_MSG_NOT_OOB | AFD_MSG_OOB | AFD_MSG_PEEK | AFD_MSG_WAITALL)) - FIXME( "unknown msg_flags %#x\n", params->msg_flags ); - if (params->recv_flags & ~AFD_RECV_FORCE_ASYNC) - FIXME( "unknown recv_flags %#x\n", params->recv_flags ); + if (params.msg_flags & ~(AFD_MSG_NOT_OOB | AFD_MSG_OOB | AFD_MSG_PEEK | AFD_MSG_WAITALL)) + FIXME( "unknown msg_flags %#x\n", params.msg_flags ); + if (params.recv_flags & ~AFD_RECV_FORCE_ASYNC) + FIXME( "unknown recv_flags %#x\n", params.recv_flags ); - if (params->msg_flags & AFD_MSG_OOB) + if (params.msg_flags & AFD_MSG_OOB) unix_flags |= MSG_OOB; - if (params->msg_flags & AFD_MSG_PEEK) + if (params.msg_flags & AFD_MSG_PEEK) unix_flags |= MSG_PEEK; - if (params->msg_flags & AFD_MSG_WAITALL) + if (params.msg_flags & AFD_MSG_WAITALL) FIXME( "MSG_WAITALL is not supported\n" ); - status = sock_recv( handle, event, apc, apc_user, io, fd, params->buffers, params->count, NULL, - NULL, NULL, NULL, unix_flags, !!(params->recv_flags & AFD_RECV_FORCE_ASYNC) ); + status = sock_recv( handle, event, apc, apc_user, io, fd, params.buffers, params.count, NULL, + NULL, NULL, NULL, unix_flags, !!(params.recv_flags & AFD_RECV_FORCE_ASYNC) ); break; } diff --git a/include/wine/afd.h b/include/wine/afd.h index 60dd2806d9d..9d1af44f117 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -107,6 +107,14 @@ struct afd_recv_params int msg_flags; }; +struct afd_recv_params_32 +{ + ULONG buffers; + unsigned int count; + int recv_flags; + int msg_flags; +}; + #include <pshpack4.h> struct afd_poll_params {

1 0