December 2021 - Wine-devel - list.winehq.org

[PATCH vkd3d v3 11/12] vkd3d-shader/hlsl: Handle mipmap level for texture arrays in sm4 ld instruction.
by Francisco Casas 17 Dec '21

17 Dec '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 1b8d9c25..f5c3dd6d 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1287,6 +1287,7 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf { struct sm4_instruction instr; unsigned int writemask; + unsigned int dim_count; memset(&instr, 0, sizeof(instr)); instr.opcode = VKD3D_SM4_OP_LD; @@ -1299,23 +1300,11 @@ static void write_sm4_ld(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf /* Mipmap level is in the last component in the IR, but needs to be in the W * component in the instruction. */ - switch (resource_type->sampler_dim) - { - case HLSL_SAMPLER_DIM_1D: - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); - break; - - case HLSL_SAMPLER_DIM_2D: - instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); - break; - - case HLSL_SAMPLER_DIM_3D: - case HLSL_SAMPLER_DIM_CUBE: - break; - - default: - assert(0); - } + dim_count = sampler_dim_count(resource_type->sampler_dim); + if (dim_count == 1) + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, X, X, Y), 4); + if (dim_count == 2) + instr.srcs[0].swizzle = hlsl_combine_swizzles(instr.srcs[0].swizzle, HLSL_SWIZZLE(X, Y, X, Z), 4); sm4_register_from_deref(ctx, &instr.srcs[1].reg, &writemask, &instr.srcs[1].swizzle_type, resource, resource_type); -- 2.25.1

1 0

[PATCH vkd3d v3 08/12] vkd3d-shader/hlsl: Account for new texture dimension types when writing sm4 definitions.
by Francisco Casas 17 Dec '21

17 Dec '21

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index cefe173d..1b8d9c25 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -424,6 +424,7 @@ static D3D_RESOURCE_RETURN_TYPE sm4_resource_format(const struct hlsl_type *type static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *type) { + assert(type->base_type == HLSL_TYPE_TEXTURE); /* for now, until other resources are handled. */ switch (type->sampler_dim) { case HLSL_SAMPLER_DIM_1D: @@ -434,6 +435,16 @@ static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *typ return D3D_SRV_DIMENSION_TEXTURE3D; case HLSL_SAMPLER_DIM_CUBE: return D3D_SRV_DIMENSION_TEXTURECUBE; + case HLSL_SAMPLER_DIM_1DARRAY: + return D3D_SRV_DIMENSION_TEXTURE1DARRAY; + case HLSL_SAMPLER_DIM_2DARRAY: + return D3D_SRV_DIMENSION_TEXTURE2DARRAY; + case HLSL_SAMPLER_DIM_2DMS: + return D3D_SRV_DIMENSION_TEXTURE2DMS; + case HLSL_SAMPLER_DIM_2DMSARRAY: + return D3D_SRV_DIMENSION_TEXTURE2DMSARRAY; + case HLSL_SAMPLER_DIM_CUBEARRAY: + return D3D_SRV_DIMENSION_TEXTURECUBEARRAY; default: assert(0); return D3D_SRV_DIMENSION_UNKNOWN; @@ -711,6 +722,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_type *type) { + assert(type->base_type == HLSL_TYPE_TEXTURE); /* for now, until other resources are handled. */ switch (type->sampler_dim) { case HLSL_SAMPLER_DIM_1D: @@ -721,6 +733,16 @@ static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_typ return VKD3D_SM4_RESOURCE_TEXTURE_3D; case HLSL_SAMPLER_DIM_CUBE: return VKD3D_SM4_RESOURCE_TEXTURE_CUBE; + case HLSL_SAMPLER_DIM_1DARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_1DARRAY; + case HLSL_SAMPLER_DIM_2DARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY; + case HLSL_SAMPLER_DIM_2DMS: + return VKD3D_SM4_RESOURCE_TEXTURE_2DMS; + case HLSL_SAMPLER_DIM_2DMSARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_2DMSARRAY; + case HLSL_SAMPLER_DIM_CUBEARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_CUBEARRAY; default: assert(0); return 0; -- 2.25.1

1 0

[PATCH v2] ntdll: Don't set socket IO status after queuing async.
by Paul Gofman 17 Dec '21

17 Dec '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 222236-222237. Currently NtDeviceIoControlFile() always sets the io comletion status after sock_ioctl(). This may happen after the application has received and processed the completion already and rightfully freed or reused IOSB (OVERLAPPED) pointer and result in data corruption. Fixes random crashes in Forza Horizon 4 when connected to online. v2: - Process IOCTL_AFD_WINE_TRANSMIT, IOCTL_AFD_WINE_COMPLETE_ASYNC, IOCTL_AFD_WINE_FIONREAD, IOCTL_AFD_WINE_SIOCATMARK, IOCTL_AFD_WINE_GET_INTERFACE_LIST, IOCTL_AFD_WINE_KEEPALIVE_VALS similarly; - Fix fd leaks; - Fix double fd close. dlls/ntdll/unix/file.c | 1 + dlls/ntdll/unix/socket.c | 135 ++++++++++++++++++++++----------------- 2 files changed, 79 insertions(+), 57 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 51c92df57e3..07bfa6c22c4 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -5712,6 +5712,7 @@ NTSTATUS WINAPI NtDeviceIoControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUT case FILE_DEVICE_BEEP: case FILE_DEVICE_NETWORK: status = sock_ioctl( handle, event, apc, apc_context, io, code, in_buffer, in_size, out_buffer, out_size ); + if (status != STATUS_NOT_SUPPORTED && status != STATUS_BAD_DEVICE_TYPE) return status; break; case FILE_DEVICE_DISK: case FILE_DEVICE_CD_ROM: diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 92374e39db7..f82c7ae1ddf 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1106,6 +1106,7 @@ static NTSTATUS sock_transmit( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, * actually currently impossible to get STATUS_SUCCESS. The server will * either return STATUS_PENDING or an error code, and in neither case * should the iosb be filled. */ + if (!status) FIXME( "Unhandled success status." ); } SERVER_END_REQ; @@ -1142,7 +1143,11 @@ static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, int level, ret = getsockopt( fd, level, option, out_buffer, &len ); if (needs_close) close( fd ); if (ret) return sock_errno_to_status( errno ); - if (io) io->Information = len; + if (io) + { + io->Status = STATUS_SUCCESS; + io->Information = len; + } return STATUS_SUCCESS; } @@ -1159,7 +1164,9 @@ static NTSTATUS do_setsockopt( HANDLE handle, IO_STATUS_BLOCK *io, int level, ret = setsockopt( fd, level, option, optval, optlen ); if (needs_close) close( fd ); - return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + if (ret) return sock_errno_to_status( errno ); + if (io) io->Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } @@ -1287,10 +1294,10 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc unix_flags |= MSG_PEEK; 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) ); - break; + if (needs_close) close( fd ); + return status; } case IOCTL_AFD_WINE_RECVMSG: @@ -1314,12 +1321,12 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc unix_flags |= MSG_PEEK; if (*ws_flags & WS_MSG_WAITALL) FIXME( "MSG_WAITALL is not supported\n" ); - status = sock_recv( handle, event, apc, apc_user, io, fd, u64_to_user_ptr(params->buffers_ptr), params->count, u64_to_user_ptr(params->control_ptr), u64_to_user_ptr(params->addr_ptr), u64_to_user_ptr(params->addr_len_ptr), ws_flags, unix_flags, params->force_async ); - break; + if (needs_close) close( fd ); + return status; } case IOCTL_AFD_WINE_SENDMSG: @@ -1342,10 +1349,10 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc WARN( "ignoring MSG_PARTIAL\n" ); if (params->ws_flags & ~(WS_MSG_OOB | WS_MSG_PARTIAL)) FIXME( "unknown flags %#x\n", params->ws_flags ); - status = sock_send( handle, event, apc, apc_user, io, fd, u64_to_user_ptr( params->buffers_ptr ), params->count, u64_to_user_ptr( params->addr_ptr ), params->addr_len, unix_flags, params->force_async ); - break; + if (needs_close) close( fd ); + return status; } case IOCTL_AFD_WINE_TRANSMIT: @@ -1360,9 +1367,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc status = STATUS_BUFFER_TOO_SMALL; break; } - status = sock_transmit( handle, event, apc, apc_user, io, fd, params ); - break; + if (needs_close) close( fd ); + return status; } case IOCTL_AFD_WINE_COMPLETE_ASYNC: @@ -1372,7 +1379,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc status = *(NTSTATUS *)in_buffer; complete_async( handle, event, apc, apc_user, io, status, 0 ); - break; + return status; } case IOCTL_AFD_WINE_FIONREAD: @@ -1396,9 +1403,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (!getsockopt( fd, SOL_SOCKET, SO_ACCEPTCONN, &value, &len ) && value) { *(int *)out_buffer = 0; - status = STATUS_SUCCESS; - complete_async( handle, event, apc, apc_user, io, status, 0 ); - break; + if (needs_close) close( fd ); + complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); + return STATUS_SUCCESS; } } #endif @@ -1409,9 +1416,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } *(int *)out_buffer = value; - status = STATUS_SUCCESS; - complete_async( handle, event, apc, apc_user, io, status, 0 ); - break; + if (needs_close) close( fd ); + complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); + return STATUS_SUCCESS; } case IOCTL_AFD_WINE_SIOCATMARK: @@ -1448,9 +1455,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc /* windows is reversed with respect to unix */ *(int *)out_buffer = !value; } - status = STATUS_SUCCESS; - complete_async( handle, event, apc, apc_user, io, status, 0 ); - break; + if (needs_close) close( fd ); + complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); + return STATUS_SUCCESS; } case IOCTL_AFD_WINE_GET_INTERFACE_LIST: @@ -1461,9 +1468,6 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc unsigned int count = 0; ULONG ret_size; - if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) - return status; - if (getifaddrs( &ifaddrs ) < 0) { status = sock_errno_to_status( errno ); @@ -1478,10 +1482,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc ret_size = count * sizeof(*info); if (out_size < ret_size) { - status = STATUS_PENDING; - complete_async( handle, event, apc, apc_user, io, STATUS_BUFFER_TOO_SMALL, 0 ); freeifaddrs( ifaddrs ); - break; + complete_async( handle, event, apc, apc_user, io, STATUS_BUFFER_TOO_SMALL, 0 ); + return STATUS_PENDING; } memset( out_buffer, 0, ret_size ); @@ -1530,8 +1533,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } freeifaddrs( ifaddrs ); - status = STATUS_PENDING; complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, ret_size ); + return STATUS_PENDING; #else FIXME( "Interface list queries are currently not supported on this platform.\n" ); status = STATUS_NOT_SUPPORTED; @@ -1584,9 +1587,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #endif } - status = STATUS_SUCCESS; - complete_async( handle, event, apc, apc_user, io, status, 0 ); - break; + if (needs_close) close( fd ); + complete_async( handle, event, apc, apc_user, io, STATUS_SUCCESS, 0 ); + return STATUS_SUCCESS; } case IOCTL_AFD_WINE_GETPEERNAME: @@ -1638,7 +1641,6 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return status; ret = getsockopt( fd, SOL_SOCKET, SO_LINGER, &unix_linger, &len ); - if (needs_close) close( fd ); if (!ret) { ws_linger->l_onoff = unix_linger.l_onoff; @@ -1646,7 +1648,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc io->Information = sizeof(*ws_linger); } - return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + status = ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + break; } case IOCTL_AFD_WINE_SET_SO_LINGER: @@ -1674,8 +1677,6 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc * most programmers assume, anyway */ case IOCTL_AFD_WINE_SET_SO_REUSEADDR: { - int fd, needs_close = FALSE; - NTSTATUS status; int ret; if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) @@ -1685,8 +1686,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef __APPLE__ if (!ret) ret = setsockopt( fd, SOL_SOCKET, SO_REUSEPORT, in_buffer, in_size ); #endif - if (needs_close) close( fd ); - return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + status = ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + break; } case IOCTL_AFD_WINE_SET_IP_ADD_MEMBERSHIP: @@ -1725,10 +1726,16 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc ret = 0; /* fake success */ } #endif - if (needs_close) close( fd ); - if (ret) return sock_errno_to_status( errno ); - io->Information = len; - return STATUS_SUCCESS; + if (ret) + { + status = sock_errno_to_status( errno ); + } + else + { + io->Information = len; + status = STATUS_SUCCESS; + } + break; } case IOCTL_AFD_WINE_SET_IP_DONTFRAGMENT: @@ -1746,7 +1753,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (!once++) FIXME( "IP_DONTFRAGMENT is not supported on this platform\n" ); - return STATUS_SUCCESS; /* fake success */ + status = STATUS_SUCCESS; /* fake success */ + break; } #endif @@ -1931,10 +1939,16 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc ret = 0; /* fake success */ } #endif - if (needs_close) close( fd ); - if (ret) return sock_errno_to_status( errno ); - io->Information = len; - return STATUS_SUCCESS; + if (ret) + { + status = sock_errno_to_status( errno ); + } + else + { + io->Information = len; + status = STATUS_SUCCESS; + } + break; } case IOCTL_AFD_WINE_SET_IPV6_DONTFRAG: @@ -2070,10 +2084,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IPV6_V6ONLY: { - int fd, needs_close = FALSE; union unix_sockaddr addr; socklen_t len = sizeof(addr); - NTSTATUS status; int ret; if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) @@ -2083,12 +2095,13 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc { /* changing IPV6_V6ONLY succeeds on an unbound IPv4 socket */ WARN( "ignoring IPV6_V6ONLY on an unbound IPv4 socket\n" ); - return STATUS_SUCCESS; + status = STATUS_SUCCESS; + break; } ret = setsockopt( fd, IPPROTO_IPV6, IPV6_V6ONLY, in_buffer, in_size ); - if (needs_close) close( fd ); - return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + status = ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + break; } #ifdef SOL_IPX @@ -2100,7 +2113,6 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #elif defined(SO_DEFAULT_HEADERS) case IOCTL_AFD_WINE_GET_IPX_PTYPE: { - int fd, needs_close = FALSE; struct ipx value; socklen_t len = sizeof(value); int ret; @@ -2109,10 +2121,16 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return status; ret = getsockopt( fd, 0, SO_DEFAULT_HEADERS, &value, &len ); - if (needs_close) close( fd ); - if (ret) return sock_errno_to_status( errno ); - *(DWORD *)out_buffer = value.ipx_pt; - return STATUS_SUCCESS; + if (ret) + { + status = sock_errno_to_status( errno ); + } + else + { + *(DWORD *)out_buffer = value.ipx_pt; + status = STATUS_SUCCESS; + } + break; } case IOCTL_AFD_WINE_SET_IPX_PTYPE: @@ -2134,7 +2152,6 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc socklen_t len = sizeof(buffer); DEVICELIST *ws_list = out_buffer; int fd, needs_close = FALSE; - NTSTATUS status; unsigned int i; int ret; @@ -2164,7 +2181,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc ws_dev->irdaDeviceHints2 = unix_dev->hints[1]; ws_dev->irdaCharSet = unix_dev->charset; } - return STATUS_SUCCESS; + status = STATUS_SUCCESS; + break; } #endif @@ -2192,5 +2210,8 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } if (needs_close) close( fd ); + + if (status != STATUS_PENDING && !NT_ERROR(status)) io->Status = status; + return status; } -- 2.33.1

2 1

[PATCH v2] wined3d: Add WINED3DFMT_R11G11B10_FLOAT vertex format.
by Andrey Gusev 17 Dec '21

17 Dec '21

Used by Dark Souls: Remastered. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/tests/d3d11.c | 2 ++ dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 5 files changed, 9 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a4729f9d2d3..a1c4be46b7f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -12370,6 +12370,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, @@ -13649,6 +13650,7 @@ static void test_format_support(void) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT}, + {DXGI_FORMAT_R11G11B10_FLOAT}, {DXGI_FORMAT_R16_FLOAT}, }; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 53087684acf..5a8affbf75a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18549,6 +18549,7 @@ static void test_create_input_layout(void) DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_R11G11B10_FLOAT, DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32_UINT, DXGI_FORMAT_R32_SINT, @@ -20623,6 +20624,7 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level) static const struct format_support vertex_buffers[] = { {DXGI_FORMAT_R8G8_UINT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R11G11B10_FLOAT, D3D_FEATURE_LEVEL_10_0}, {DXGI_FORMAT_R16_FLOAT, D3D_FEATURE_LEVEL_10_0}, }; diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 6cc2f0cd9a8..5511a70a8ff 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -159,6 +159,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_vertex_buffer_object", ARB_VERTEX_BUFFER_OBJECT }, {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM }, {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER }, + {"GL_ARB_vertex_type_10f_11f_11f_rev", ARB_VERTEX_TYPE_10F_11F_11F_REV}, {"GL_ARB_vertex_type_2_10_10_10_rev", ARB_VERTEX_TYPE_2_10_10_10_REV}, {"GL_ARB_viewport_array", ARB_VIEWPORT_ARRAY }, {"GL_ARB_texture_barrier", ARB_TEXTURE_BARRIER }, @@ -3385,6 +3386,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, {ARB_QUERY_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 4)}, {ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, MAKEDWORD_VERSION(4, 4)}, + {ARB_VERTEX_TYPE_10F_11F_11F_REV, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ef2e28b545a..5e375f43a48 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -709,6 +709,8 @@ static const struct wined3d_format_vertex_info format_vertex_info[] = {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N, GL_SHORT}, {WINED3DFMT_R16G16_UNORM, WINED3D_FFP_EMIT_USHORT2N, GL_UNSIGNED_SHORT}, {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N, GL_UNSIGNED_SHORT}, + {WINED3DFMT_R11G11B10_FLOAT, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_10F_11F_11F_REV, + ARB_VERTEX_TYPE_10F_11F_11F_REV}, {WINED3DFMT_R10G10B10X2_UINT, WINED3D_FFP_EMIT_UDEC3, GL_UNSIGNED_SHORT}, {WINED3DFMT_R10G10B10X2_SNORM, WINED3D_FFP_EMIT_DEC3N, GL_SHORT}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3D_FFP_EMIT_INVALID, GL_UNSIGNED_INT_2_10_10_10_REV, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 2dbc56ab79d..7b6fa50c5f0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -143,6 +143,7 @@ enum wined3d_gl_extension ARB_VERTEX_BUFFER_OBJECT, ARB_VERTEX_PROGRAM, ARB_VERTEX_SHADER, + ARB_VERTEX_TYPE_10F_11F_11F_REV, ARB_VERTEX_TYPE_2_10_10_10_REV, ARB_VIEWPORT_ARRAY, ARB_TEXTURE_BARRIER, -- 2.33.1

3 2

[PATCH] server/console: ensure conhost has created the TTY input stream before waiting
by Eric Pouech 17 Dec '21

17 Dec '21

some PE executables (like mingw's gdb port) just do something like: - WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), INFINITE) and hang for ever (the read operations are done *after* the wait operation succeeds) (of course, the real wait operation is more complex, but the problematic part boils down to that) this hangs for ever because conhost's main input thread hasn't been started yet this patch sends once a peek IOCTL before waiting, hence ensuring conhost's main input stream has been started this lets i686 and x64_86 mingw's gdb port to accept user's input (this is second attempt to fix this bug, based on Jacek's feedback on first try) A+ Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- server/console.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/server/console.c b/server/console.c index 977c428cf9f..b4ef1d21874 100644 --- a/server/console.c +++ b/server/console.c @@ -136,6 +136,7 @@ struct console_server struct list read_queue; /* blocking read queue */ int busy; /* flag if server processing an ioctl */ int term_fd; /* UNIX terminal fd */ + int once_input; /* flag if input thread has already been requested */ struct termios termios; /* original termios */ }; @@ -892,6 +893,7 @@ static struct object *create_console_server( void ) server->console = NULL; server->busy = 0; server->term_fd = -1; + server->once_input = 0; list_init( &server->queue ); list_init( &server->read_queue ); server->fd = alloc_pseudo_fd( &console_server_fd_ops, &server->obj, FILE_SYNCHRONOUS_IO_NONALERT ); @@ -1310,11 +1312,19 @@ static void console_input_dump( struct object *obj, int verbose ) static int console_input_add_queue( struct object *obj, struct wait_queue_entry *entry ) { + struct console_server* server; if (!current->process->console) { set_error( STATUS_ACCESS_DENIED ); return 0; } + server = current->process->console->server; + /* before waiting, ensure conhost's input thread has been started */ + if ( server && !server->once_input ) + { + queue_host_ioctl( server, IOCTL_CONDRV_PEEK, 0, NULL, NULL); + server->once_input = 1; + } return add_queue( &current->process->console->obj, entry ); }

2 5

[PATCH] wined3d: Release the allocator lock on error in wined3d_allocator_chunk_vk_map().
by Henri Verbeet 17 Dec '21

17 Dec '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Ideally we'd never get there, of course. dlls/wined3d/context_vk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 06162d0c0e8..fd6d810f0e2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -273,6 +273,7 @@ void *wined3d_allocator_chunk_vk_map(struct wined3d_allocator_chunk_vk *chunk_vk chunk_vk->vk_memory, 0, VK_WHOLE_SIZE, 0, &chunk_vk->c.map_ptr))) < 0) { ERR("Failed to map chunk memory, vr %s.\n", wined3d_debug_vkresult(vr)); + wined3d_allocator_chunk_vk_unlock(chunk_vk); return NULL; } -- 2.30.2

1 0

[PATCH 1/3] winepulse.drv: Stop writing the same data again on underflow.
by Rémi Bernon 17 Dec '21

17 Dec '21

Data in [lcl_offs_bytes;lcl_offs_bytes+held_bytes] is the data we've received from the client and that we consider being used by pulse, regardless of how we write it to it. A subset of this is [pa_offs_bytes;pa_offs_bytes+pa_held_bytes], which is the data we have received from the client but not yet written to pulse. If pulsed has underflown it means that it has used all the data we've written already, and resetting pa_offs_bytes and pa_held_bytes like here will only make us write the same data again (in addition to silence) to mend the underflow, ending up with potentially duplicate audio frames being played. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52225 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index bce70ac358c..c329e8c423c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -260,9 +260,6 @@ static void pulse_underflow_callback(pa_stream *s, void *userdata) struct pulse_stream *stream = userdata; WARN("%p: Underflow\n", userdata); stream->just_underran = TRUE; - /* re-sync */ - stream->pa_offs_bytes = stream->lcl_offs_bytes; - stream->pa_held_bytes = stream->held_bytes; } static void pulse_started_callback(pa_stream *s, void *userdata) -- 2.34.0

2 6

[PATCH v2] winmm: Instanciate DirectInput8 class using CoCreateInstance.
by Rémi Bernon 17 Dec '21

17 Dec '21

Instead of linking with dinput8.dll and creating the class at load time, which causes some native hooks to fail loading. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52222 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Reset dinput to NULL in case of creation failure, so that we don't release it or call CoUninitialize twice. dlls/winmm/Makefile.in | 2 +- dlls/winmm/joystick.c | 30 ++++++++++++++++++++++++++---- dlls/winmm/winemm.h | 1 - dlls/winmm/winmm.c | 2 -- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 5439ae21678..3036526c14e 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm -IMPORTS = uuid user32 advapi32 ole32 msacm32 dinput8 +IMPORTS = uuid user32 advapi32 ole32 msacm32 C_SRCS = \ driver.c \ diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 5f5683e3e35..d055b3c9deb 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -152,11 +152,28 @@ static BOOL CALLBACK enum_instances( const DIDEVICEINSTANCEW *instance, void *co return DIENUM_CONTINUE; } -void joystick_load( HINSTANCE instance ) +static BOOL WINAPI joystick_load( INIT_ONCE *once, void *param, void **context ) { - HRESULT hr = DirectInput8Create( instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, - (void **)&dinput, NULL ); - if (FAILED(hr)) WARN( "could not create dinput instance, hr %#x\n", hr ); + HRESULT hr; + + CoInitialize( NULL ); + + hr = CoCreateInstance( &CLSID_DirectInput8, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectInput8W, + (void **)&dinput ); + if (FAILED(hr)) goto failed; + + hr = IDirectInput8_Initialize( dinput, hWinMM32Instance, DIRECTINPUT_VERSION ); + if (FAILED(hr)) goto failed; + + return TRUE; + +failed: + if (dinput) IDirectInput8_Release( dinput ); + dinput = NULL; + + WARN( "Could not create dinput instance, hr %#x\n", hr ); + CoUninitialize(); + return FALSE; } void joystick_unload() @@ -173,15 +190,20 @@ void joystick_unload() } IDirectInput8_Release( dinput ); + CoUninitialize(); } static void find_joysticks(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + IDirectInputDevice8W *device; HANDLE event; DWORD index; HRESULT hr; + InitOnceExecuteOnce( &init_once, joystick_load, NULL, NULL ); + if (!dinput) return; index = 0; diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 3459c2a85ef..52cab64b1c5 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -153,7 +153,6 @@ MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DE void WINMM_DeleteWaveform(void) DECLSPEC_HIDDEN; -void joystick_load( HMODULE instance ) DECLSPEC_HIDDEN; void joystick_unload( void ) DECLSPEC_HIDDEN; /* Global variables */ diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index aab8bfb51a9..aa2dd50c4c1 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -144,8 +144,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) if (!WINMM_CreateIData(hInstDLL)) return FALSE; - - joystick_load( hInstDLL ); break; case DLL_PROCESS_DETACH: if(fImpLoad) -- 2.34.0

2 2

[PATCH 1/2] ntdll: use proper names for magic constants
by Eric Pouech 17 Dec '21

17 Dec '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdll/unix/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 23aa340359e..99c8e37053c 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -444,7 +444,7 @@ static NTSTATUS spawn_process( const RTL_USER_PROCESS_PARAMETERS *params, int so if (!(pid = fork())) /* grandchild */ { if (params->ConsoleFlags || - params->ConsoleHandle == (HANDLE)1 /* KERNEL32_CONSOLE_ALLOC */ || + params->ConsoleHandle == CONSOLE_HANDLE_ALLOC || (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { setsid();

3 4

[PATCH] ntdll: Don't use inline assembly in do_cpuid.
by Jacek Caban 17 Dec '21

17 Dec '21

Avoids problems on old GCC. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51862 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-)

2 1