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

Zebediah Figura : ws2_32: Add a FIXME for unhandled flags in select().
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: feb97eaaea40b9ec749397ddb385a8c4dc7ca854 URL: https://gitlab.winehq.org/wine/wine/-/commit/feb97eaaea40b9ec749397ddb385a8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 15 18:43:03 2022 -0500 ws2_32: Add a FIXME for unhandled flags in select(). --- dlls/ws2_32/socket.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b0f90cccbe3..493ea3299a9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2839,6 +2839,9 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, if (flags & except_flags) ret_count += add_fd_to_set( s, except_ptr ); + + if (flags & ~(read_flags | write_flags | except_flags | AFD_POLL_CLOSE)) + FIXME( "not reporting AFD flags %#x\n", flags ); } }

1 0

Zebediah Figura : server: Properly implement AFD_POLL_RESET.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 7961e00e7429a4cd950a493ab9ff72448808d588 URL: https://gitlab.winehq.org/wine/wine/-/commit/7961e00e7429a4cd950a493ab9ff72… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 15 18:44:06 2022 -0500 server: Properly implement AFD_POLL_RESET. --- dlls/ws2_32/tests/afd.c | 17 ++++++++--------- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 34 +++++++++++++++++++++++++++++++--- 3 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index eb525c78c54..21e7a50aef3 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -162,8 +162,7 @@ static void check_poll_(int line, SOCKET s, HANDLE event, int mask, int expect, ok_(__FILE__, line)(out_params.count == 1, "got count %u\n", out_params.count); ok_(__FILE__, line)(out_params.sockets[0].socket == s, "got socket %#Ix\n", out_params.sockets[0].socket); todo_wine_if (todo) ok_(__FILE__, line)(out_params.sockets[0].flags == expect, "got flags %#x\n", out_params.sockets[0].flags); - todo_wine_if (expect & AFD_POLL_RESET) - ok_(__FILE__, line)(!out_params.sockets[0].status, "got status %#x\n", out_params.sockets[0].status); + ok_(__FILE__, line)(!out_params.sockets[0].status, "got status %#x\n", out_params.sockets[0].status); } static void test_poll(void) @@ -1407,10 +1406,10 @@ static void test_poll_reset(void) ok(io.Information == offsetof(struct afd_poll_params, sockets[1]), "got %#Ix\n", io.Information); ok(out_params->count == 1, "got count %u\n", out_params->count); ok(out_params->sockets[0].socket == client, "got socket %#Ix\n", out_params->sockets[0].socket); - todo_wine ok(out_params->sockets[0].flags == AFD_POLL_RESET, "got flags %#x\n", out_params->sockets[0].flags); - todo_wine ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); + ok(out_params->sockets[0].flags == AFD_POLL_RESET, "got flags %#x\n", out_params->sockets[0].flags); + ok(!out_params->sockets[0].status, "got status %#x\n", out_params->sockets[0].status); - check_poll_todo(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_RESET); + check_poll(client, event, AFD_POLL_WRITE | AFD_POLL_CONNECT | AFD_POLL_RESET); closesocket(client); CloseHandle(event); @@ -2042,9 +2041,9 @@ static void test_get_events_reset(void) ret = NtDeviceIoControlFile((HANDLE)client, NULL, NULL, NULL, &io, IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); ok(!ret, "got %#x\n", ret); - todo_wine ok(params.flags == (AFD_POLL_RESET | AFD_POLL_CONNECT | AFD_POLL_WRITE), "got flags %#x\n", params.flags); + ok(params.flags == (AFD_POLL_RESET | AFD_POLL_CONNECT | AFD_POLL_WRITE), "got flags %#x\n", params.flags); for (i = 0; i < ARRAY_SIZE(params.status); ++i) - todo_wine_if (i == AFD_POLL_BIT_HUP) ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); closesocket(client); @@ -2060,9 +2059,9 @@ static void test_get_events_reset(void) ret = NtDeviceIoControlFile((HANDLE)server, NULL, NULL, NULL, &io, IOCTL_AFD_GET_EVENTS, NULL, 0, &params, sizeof(params)); ok(!ret, "got %#x\n", ret); - todo_wine ok(params.flags == (AFD_POLL_RESET | AFD_POLL_WRITE), "got flags %#x\n", params.flags); + ok(params.flags == (AFD_POLL_RESET | AFD_POLL_WRITE), "got flags %#x\n", params.flags); for (i = 0; i < ARRAY_SIZE(params.status); ++i) - todo_wine_if (i == AFD_POLL_BIT_HUP) ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); + ok(!params.status[i], "got status[%u] %#x\n", i, params.status[i]); closesocket(server); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 576fe1cee6a..3e6faaffa4c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12861,7 +12861,7 @@ static void test_tcp_reset(void) len = sizeof(error); ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&error, &len); ok(!ret, "got error %u\n", WSAGetLastError()); - todo_wine ok(!error, "got error %u\n", error); + ok(!error, "got error %u\n", error); wsabuf.buf = buffer; wsabuf.len = sizeof(buffer); diff --git a/server/sock.c b/server/sock.c index 53553ab8ee7..7d7e470be28 100644 --- a/server/sock.c +++ b/server/sock.c @@ -232,6 +232,7 @@ struct sock unsigned int aborted : 1; /* did we get a POLLERR or irregular POLLHUP? */ unsigned int nonblocking : 1; /* is the socket nonblocking? */ unsigned int bound : 1; /* is the socket bound? */ + unsigned int reset : 1; /* did we get a TCP reset? */ }; static void sock_dump( struct object *obj, int verbose ); @@ -667,7 +668,12 @@ static inline int sock_error( struct sock *sock ) case SOCK_CONNECTED: case SOCK_CONNECTIONLESS: - if (error) + if (error == ECONNRESET || error == EPIPE) + { + sock->reset = 1; + error = 0; + } + else if (error) sock->errors[AFD_POLL_BIT_HUP] = error; else error = sock->errors[AFD_POLL_BIT_HUP]; @@ -897,6 +903,8 @@ static int get_poll_flags( struct sock *sock, int event ) flags |= AFD_POLL_HUP; if (event & POLLERR) flags |= AFD_POLL_CONNECT_ERR; + if (sock->reset) + flags |= AFD_POLL_RESET; return flags; } @@ -1081,6 +1089,15 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) async_terminate( sock->connect_req->async, status ); } + if (sock->reset) + { + async_wake_up( &sock->read_q, STATUS_CONNECTION_RESET ); + async_wake_up( &sock->write_q, STATUS_CONNECTION_RESET ); + + if (sock->accept_recv_req && sock->accept_recv_req->iosb->status == STATUS_PENDING) + async_terminate( sock->accept_recv_req->async, STATUS_CONNECTION_RESET ); + } + return event; } @@ -1116,6 +1133,9 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs case SOCK_CONNECTED: case SOCK_CONNECTIONLESS: + if (sock->reset) + post_socket_event( sock, AFD_POLL_BIT_RESET ); + if (event & POLLIN) post_socket_event( sock, AFD_POLL_BIT_READ ); @@ -1171,6 +1191,9 @@ static void sock_poll_event( struct fd *fd, int event ) case SOCK_CONNECTED: case SOCK_CONNECTIONLESS: + if (sock->reset) + event &= ~(POLLIN | POLLERR | POLLHUP); + if (sock->type == WS_SOCK_STREAM && (event & POLLIN)) { char dummy; @@ -1189,7 +1212,11 @@ static void sock_poll_event( struct fd *fd, int event ) event &= ~POLLIN; /* EAGAIN can happen if an async recv() falls between the server's poll() call and the invocation of this routine */ - if ( errno != EAGAIN ) + if (errno == ECONNRESET || errno == EPIPE) + { + sock->reset = 1; + } + else if (errno != EAGAIN) { error = errno; event |= POLLERR; @@ -1312,7 +1339,7 @@ static int sock_get_poll_events( struct fd *fd ) return -1; } - if (sock->aborted) + if (sock->aborted || sock->reset) return -1; if (sock->accept_recv_req) @@ -1517,6 +1544,7 @@ static struct sock *create_socket(void) sock->aborted = 0; sock->nonblocking = 0; sock->bound = 0; + sock->reset = 0; sock->rcvbuf = 0; sock->sndbuf = 0; sock->rcvtimeo = 0;

1 0

Zebediah Figura : ws2_32: Map AFD_POLL_RESET to the "read" set in select().
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: cac21259cae742faa2b1fe39dcaceaacb1f2573f URL: https://gitlab.winehq.org/wine/wine/-/commit/cac21259cae742faa2b1fe39dcacea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 15 18:42:40 2022 -0500 ws2_32: Map AFD_POLL_RESET to the "read" set in select(). --- dlls/ws2_32/socket.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d3c93e15a47..b0f90cccbe3 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2709,6 +2709,10 @@ static int add_fd_to_set( SOCKET fd, struct fd_set *set ) int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, fd_set *except_ptr, const struct timeval *timeout) { + static const int read_flags = AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP | AFD_POLL_RESET; + static const int write_flags = AFD_POLL_WRITE; + static const int except_flags = AFD_POLL_OOB | AFD_POLL_CONNECT_ERR; + struct fd_set *read_input = NULL; struct afd_poll_params *params; unsigned int poll_count = 0; @@ -2760,7 +2764,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, for (i = 0; i < read_ptr->fd_count; ++i) { params->sockets[params->count].socket = read_ptr->fd_array[i]; - params->sockets[params->count].flags = AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP; + params->sockets[params->count].flags = read_flags; ++params->count; poll_socket = read_ptr->fd_array[i]; } @@ -2771,7 +2775,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, for (i = 0; i < write_ptr->fd_count; ++i) { params->sockets[params->count].socket = write_ptr->fd_array[i]; - params->sockets[params->count].flags = AFD_POLL_WRITE; + params->sockets[params->count].flags = write_flags; ++params->count; poll_socket = write_ptr->fd_array[i]; } @@ -2782,7 +2786,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, for (i = 0; i < except_ptr->fd_count; ++i) { params->sockets[params->count].socket = except_ptr->fd_array[i]; - params->sockets[params->count].flags = AFD_POLL_OOB | AFD_POLL_CONNECT_ERR; + params->sockets[params->count].flags = except_flags; ++params->count; poll_socket = except_ptr->fd_array[i]; } @@ -2819,8 +2823,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, { for (j = 0; j < read_input->fd_count; ++j) { - if (read_input->fd_array[j] == s - && (flags & (AFD_POLL_READ | AFD_POLL_ACCEPT | AFD_POLL_HUP | AFD_POLL_CLOSE))) + if (read_input->fd_array[j] == s && (flags & (read_flags | AFD_POLL_CLOSE))) { ret_count += add_fd_to_set( s, read_ptr ); flags &= ~AFD_POLL_CLOSE; @@ -2831,10 +2834,10 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, if (flags & AFD_POLL_CLOSE) status = STATUS_INVALID_HANDLE; - if (flags & AFD_POLL_WRITE) + if (flags & write_flags) ret_count += add_fd_to_set( s, write_ptr ); - if (flags & (AFD_POLL_OOB | AFD_POLL_CONNECT_ERR)) + if (flags & except_flags) ret_count += add_fd_to_set( s, except_ptr ); } }

1 0

Zebediah Figura : ws2_32: Map AFD_POLL_RESET to both POLLHUP and POLLERR.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: wine Branch: master Commit: 21dfab61fbcae6cac4dcd6527ffe3ebb6927c400 URL: https://gitlab.winehq.org/wine/wine/-/commit/21dfab61fbcae6cac4dcd6527ffe3e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 15 20:07:20 2022 -0500 ws2_32: Map AFD_POLL_RESET to both POLLHUP and POLLERR. --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 493ea3299a9..9d51fef1adb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2974,7 +2974,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) revents |= POLLRDBAND; if (params->sockets[j].flags & AFD_POLL_WRITE) revents |= POLLWRNORM; - if (params->sockets[j].flags & AFD_POLL_HUP) + if (params->sockets[j].flags & (AFD_POLL_RESET | AFD_POLL_HUP)) revents |= POLLHUP; if (params->sockets[j].flags & (AFD_POLL_RESET | AFD_POLL_CONNECT_ERR)) revents |= POLLERR; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b0f07b9ab58..576fe1cee6a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -12871,7 +12871,7 @@ static void test_tcp_reset(void) todo_wine ok(ret == -1, "got %d\n", ret); todo_wine ok(WSAGetLastError() == WSAECONNRESET, "got error %u\n", WSAGetLastError()); - check_poll_todo(client, POLLERR | POLLHUP | POLLWRNORM); + check_poll(client, POLLERR | POLLHUP | POLLWRNORM); FD_ZERO(&readfds); FD_ZERO(&writefds);

1 0

Alexandre Julliard : Merge branch 'msvc' into 'master'
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: vkd3d Branch: master Commit: 6281436244dab3555e9b6efb1d428a23331e02c7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6281436244dab3555e9b6efb1d428… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 25 20:46:37 2022 +0000 Merge branch 'msvc' into 'master' vkd3d-shader: Initialize counter_var_info unconditionally. See merge request wine/vkd3d!1 ---

1 0

Stefan Dösinger : vkd3d-shader: Initialize counter_var_info unconditionally.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: vkd3d Branch: master Commit: aae4e31ba8dfdf8f6457e052afdc324bb02561e5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aae4e31ba8dfdf8f6457e052afdc3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 17 17:15:22 2022 +0300 vkd3d-shader: Initialize counter_var_info unconditionally. --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 776533cb..c519a2ba 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5962,7 +5962,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, enum vkd3d_data_type resource_data_type, unsigned int structure_stride, bool raw) { - struct vkd3d_descriptor_variable_info var_info, counter_var_info; + struct vkd3d_descriptor_variable_info var_info, counter_var_info = {0}; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; SpvStorageClass storage_class = SpvStorageClassUniformConstant; uint32_t counter_type_id, type_id, var_id, counter_var_id = 0;

1 0

Jeremy White : gitlab: Import email with a policy to fix UTF-8 From lines.
by Alexandre Julliard July 25, 2022

July 25, 2022

Module: tools Branch: master Commit: 26274c42d71f248d1aeff74f47c41fd0fb44e703 URL: https://gitlab.winehq.org/winehq/tools/-/commit/26274c42d71f248d1aeff74f47c… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Jul 25 14:23:59 2022 -0500 gitlab: Import email with a policy to fix UTF-8 From lines. Should adress email glitches like this one: https://gitlab.winehq.org/wine/wine/-/merge_requests/487#note_4680 --- gitlab/gitlab-to-mail/mailtogitlab.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab/gitlab-to-mail/mailtogitlab.py b/gitlab/gitlab-to-mail/mailtogitlab.py index bc9944a5..ccb0eebe 100755 --- a/gitlab/gitlab-to-mail/mailtogitlab.py +++ b/gitlab/gitlab-to-mail/mailtogitlab.py @@ -1,6 +1,6 @@ #!/usr/bin/env -S python3 -B -from email import message_from_binary_file +from email import message_from_binary_file, policy from urllib.parse import urljoin import re @@ -148,7 +148,7 @@ def post_discussion_note(mr_iid, note, replyto): def main(): - mail = message_from_binary_file(sys.stdin.buffer) + mail = message_from_binary_file(sys.stdin.buffer, policy=email.policy.default) if not (mr_iid_and_note := parse(mail)): return try:

1 0

Nikolay Sivov : user32: Remove some dead code from unpack_dde_message() (Coverity).
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: 7b77b4e3b4ea732ed592ac15f000875f5d1f1daa URL: https://gitlab.winehq.org/wine/wine/-/commit/7b77b4e3b4ea732ed592ac15f00087… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 22 21:59:10 2022 +0300 user32: Remove some dead code from unpack_dde_message() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/message.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 71c0f339b54..65aa93d858c 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -491,7 +491,6 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam ULONGLONG hpack; /* hMem is being passed */ if (size != sizeof(hpack)) return FALSE; - if (!size) return FALSE; uiLo = *lparam; memcpy( &hpack, buffer, size ); hMem = unpack_ptr( hpack ); @@ -533,7 +532,6 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam case WM_DDE_EXECUTE: if (size) { - if (!size) return FALSE; if (!(hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_DDESHARE, size ))) return FALSE; if ((ptr = GlobalLock( hMem ))) {

1 0

Zebediah Figura : wined3d: Do not try to unmap already unmapped BOs in wined3d_buffer_update_sub_resource().
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: f0706faae677b2fa5551a046606447d18144cfb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0706faae677b2fa5551a046606447… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 20 13:30:23 2022 -0500 wined3d: Do not try to unmap already unmapped BOs in wined3d_buffer_update_sub_resource(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53372 --- dlls/wined3d/buffer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2131123bf44..a3c725136dd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1185,7 +1185,8 @@ void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wi */ range.offset = offset; range.size = size; - wined3d_context_unmap_bo_address(context, (const struct wined3d_bo_address *)&upload_bo->addr, 1, &range); + if (upload_bo->addr.buffer_object->map_ptr) + wined3d_context_unmap_bo_address(context, (const struct wined3d_bo_address *)&upload_bo->addr, 1, &range); } else {

1 0

Zebediah Figura : wined3d: Redirect vkd3d log output to the Unix stderr.
by Alexandre Julliard July 22, 2022

July 22, 2022

Module: wine Branch: master Commit: c94be0460c87a12c8171b2932c5cdff6593c0b90 URL: https://gitlab.winehq.org/wine/wine/-/commit/c94be0460c87a12c8171b2932c5cdf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri May 27 12:13:47 2022 -0500 wined3d: Redirect vkd3d log output to the Unix stderr. --- configure | 10 +++++----- configure.ac | 4 ++-- dlls/wined3d/wined3d_main.c | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 73bfc9d6d98..8d36a4f7fa5 100755 --- a/configure +++ b/configure @@ -13004,8 +13004,8 @@ then : fi if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_serialize_versioned_root_signature in MinGW -lvkd3d" >&5 -printf %s "checking for vkd3d_serialize_versioned_root_signature in MinGW -lvkd3d... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for vkd3d_set_log_callback in MinGW -lvkd3d" >&5 +printf %s "checking for vkd3d_set_log_callback in MinGW -lvkd3d... " >&6; } if test ${ac_cv_mingw_lib_vkd3d+y} then : printf %s "(cached) " >&6 @@ -13022,11 +13022,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -char vkd3d_serialize_versioned_root_signature (); +char vkd3d_set_log_callback (); int main (void) { -return vkd3d_serialize_versioned_root_signature (); +return vkd3d_set_log_callback (); ; return 0; } @@ -13111,7 +13111,7 @@ CPPFLAGS=$ac_save_CPPFLAGS if test "x$VKD3D_PE_LIBS" = "x" then - as_fn_append wine_notices "|libvkd3d ${notice_platform}MinGW development files not found; using bundled version." + as_fn_append wine_notices "|libvkd3d ${notice_platform}MinGW development files not found (or too old); using bundled version." fi if ${ZLIB_PE_CFLAGS:+false} : diff --git a/configure.ac b/configure.ac index 5ea0d9120f0..dd4abd39e32 100644 --- a/configure.ac +++ b/configure.ac @@ -1107,7 +1107,7 @@ then WINE_CHECK_MINGW_HEADER(vkd3d_shader.h) if test "$ac_cv_mingw_header_vkd3d_h" = "yes" -a "$ac_cv_mingw_header_vkd3d_shader_h" = "yes" then - WINE_CHECK_MINGW_LIB(vkd3d,vkd3d_serialize_versioned_root_signature,[:],[:],[$VKD3D_PE_LIBS]) + WINE_CHECK_MINGW_LIB(vkd3d,vkd3d_set_log_callback,[:],[:],[$VKD3D_PE_LIBS]) WINE_CHECK_MINGW_LIB(vkd3d-shader,vkd3d_shader_compile,[:],[:],[$VKD3D_PE_LIBS]) if test "$ac_cv_mingw_lib_vkd3d" = "no" -o "$ac_cv_mingw_lib_vkd3d_shader" = "no" then @@ -1120,7 +1120,7 @@ then fi]) if test "x$VKD3D_PE_LIBS" = "x" then - WINE_NOTICE([libvkd3d ${notice_platform}MinGW development files not found; using bundled version.]) + WINE_NOTICE([libvkd3d ${notice_platform}MinGW development files not found (or too old); using bundled version.]) fi WINE_MINGW_PACKAGE_FLAGS(ZLIB,[zlib],[-lz], diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 35973e210b0..4b718746b6a 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -22,8 +22,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define VKD3D_NO_VULKAN_H +#define VKD3D_NO_WIN32_TYPES #include "initguid.h" #include "wined3d_private.h" +#include "d3d12.h" +#include <vkd3d.h> WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -247,6 +251,14 @@ BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size) return TRUE; } +static void vkd3d_log_callback(const char *fmt, va_list args) +{ + char buffer[1024]; + + vsnprintf(buffer, sizeof(buffer), fmt, args); + __wine_dbg_output(buffer); +} + static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { DWORD wined3d_context_tls_idx; @@ -459,6 +471,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (appkey) RegCloseKey( appkey ); if (hkey) RegCloseKey( hkey ); + vkd3d_set_log_callback(vkd3d_log_callback); + return TRUE; }

1 0