May 2021 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d11/tests: Add some tests for copying between depth/stencil and colour formats.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: a1bcc9b7ad6284d8c4cce5ef5963147754e7ec7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1bcc9b7ad6284d8c4cce5ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 6 16:59:16 2021 +0200 d3d11/tests: Add some tests for copying between depth/stencil and colour formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index df13d446de5..989347ccac5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -28184,6 +28184,8 @@ static void test_format_compatibility(void) DXGI_FORMAT dst_format; size_t texel_size; BOOL success; + BOOL src_ds; + BOOL dst_ds; } test_data[] = { @@ -28213,6 +28215,10 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + {DXGI_FORMAT_D16_UNORM, DXGI_FORMAT_R16_UNORM, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_D16_UNORM, 2, TRUE, FALSE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, DXGI_FORMAT_R16_TYPELESS, 2, TRUE, FALSE, TRUE}, }; static const DWORD initial_data[16] = {0}; static const DWORD bitmap_data[] = @@ -28235,7 +28241,6 @@ static void test_format_compatibility(void) texture_desc.ArraySize = 1; texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; - texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; texture_desc.CPUAccessFlags = 0; texture_desc.MiscFlags = 0; @@ -28247,7 +28252,8 @@ static void test_format_compatibility(void) texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); texture_desc.Format = test_data[i].src_format; - texture_desc.Usage = D3D11_USAGE_IMMUTABLE; + texture_desc.Usage = test_data[i].src_ds ? D3D11_USAGE_DEFAULT : D3D11_USAGE_IMMUTABLE; + texture_desc.BindFlags = test_data[i].src_ds ? D3D11_BIND_DEPTH_STENCIL : D3D11_BIND_SHADER_RESOURCE; resource_data.pSysMem = bitmap_data; resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; @@ -28258,6 +28264,7 @@ static void test_format_compatibility(void) texture_desc.Format = test_data[i].dst_format; texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = test_data[i].dst_ds ? D3D11_BIND_DEPTH_STENCIL : D3D11_BIND_SHADER_RESOURCE; resource_data.pSysMem = initial_data; @@ -28282,10 +28289,11 @@ static void test_format_compatibility(void) x = j % 4; y = j / 4; colour = get_readback_color(&rb, x, y, 0); - expected = test_data[i].success && x >= texel_dwords && y - ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + expected = test_data[i].success && !test_data[i].src_ds && !test_data[i].dst_ds + && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + todo_wine_if((test_data[i].src_ds || test_data[i].dst_ds) && colour) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -28298,8 +28306,9 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_ds || test_data[i].dst_ds) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb);

1 0

Francois Gouget : ntdll/tests: Fix the speilling of an ok() message.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: c021db5a41dd0e7b41d4e5cc3378a127f2b80e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c021db5a41dd0e7b41d4e5cc… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 6 19:14:49 2021 +0200 ntdll/tests: Fix the speilling of an ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 7d9ca47be12..fb7d48e7fe1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2593,7 +2593,7 @@ static void test_get_next_thread(void) thread = CreateThread( NULL, 0, test_get_next_thread_proc, event, 0, &thread_id ); status = pNtGetNextThread(hprocess, NULL, THREAD_QUERY_LIMITED_INFORMATION, OBJ_INHERIT, 0, NULL); - ok(status == STATUS_ACCESS_VIOLATION, "Got unexected status %#x.\n", status); + ok(status == STATUS_ACCESS_VIOLATION, "Got unexpected status %#x.\n", status); found = FALSE; prev = NULL;

1 0

Nikolay Sivov : mf/evr: Post sink marker events.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 4992fddc00e72d841cfcc609f5e0d336fd133be1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4992fddc00e72d841cfcc609… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 6 16:08:49 2021 +0300 mf/evr: Post sink marker events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 046f5cb3ca3..64489ac4c58 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -439,12 +439,12 @@ static void video_stream_end_of_stream(struct video_stream *stream) } static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTREAMSINK_MARKER_TYPE marker_type, - const PROPVARIANT *marker_value, const PROPVARIANT *context_value) + const PROPVARIANT *marker_value, const PROPVARIANT *context) { struct video_stream *stream = impl_from_IMFStreamSink(iface); HRESULT hr = S_OK; - TRACE("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context_value); + TRACE("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context); EnterCriticalSection(&stream->cs); if (!stream->parent) @@ -453,6 +453,7 @@ static HRESULT WINAPI video_stream_sink_PlaceMarker(IMFStreamSink *iface, MFSTRE { if (marker_type == MFSTREAMSINK_MARKER_ENDOFSEGMENT) video_stream_end_of_stream(stream); + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkMarker, &GUID_NULL, S_OK, context); } LeaveCriticalSection(&stream->cs);

1 0

Zebediah Figura : msi: Write "Clients" value as REG_MULTI_SZ in PublishProduct.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 1951853d06144e67b8a3d9d63c835e06a7232588 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1951853d06144e67b8a3d9d6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:44 2021 -0500 msi: Write "Clients" value as REG_MULTI_SZ in PublishProduct. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cc5d56fdc2b..bcb1a4f578e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4042,7 +4042,7 @@ static UINT msi_publish_product_properties(MSIPACKAGE *package, HKEY hkey) msi_reg_set_val_dword(hkey, L"Assignment", 0); msi_reg_set_val_dword(hkey, L"AdvertiseFlags", 0x184); msi_reg_set_val_dword(hkey, INSTALLPROPERTY_INSTANCETYPEW, 0); - msi_reg_set_val_str(hkey, L"Clients", L":"); + msi_reg_set_val_multi_str(hkey, L"Clients", L":\0"); if (!(guids = msi_get_package_code(package->db))) return ERROR_OUTOFMEMORY; if ((ptr = wcschr(guids, ';'))) *ptr = 0;

1 0

Zebediah Figura : server: Map EINPROGRESS to STATUS_DEVICE_NOT_READY.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 15aceec06730ec0307ad63a233cd71cb2eb15232 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15aceec06730ec0307ad63a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:49 2021 -0500 server: Map EINPROGRESS to STATUS_DEVICE_NOT_READY. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 4 ++-- server/trace.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 08399644a07..36fda31f9c1 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1221,8 +1221,8 @@ static unsigned int sock_get_error( int err ) case EFAULT: return WSAEFAULT; case EINVAL: return WSAEINVAL; case EMFILE: return WSAEMFILE; + case EINPROGRESS: case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; case EALREADY: return WSAEALREADY; case ENOTSOCK: return WSAENOTSOCK; case EDESTADDRREQ: return WSAEDESTADDRREQ; @@ -1290,8 +1290,8 @@ static int sock_get_ntstatus( int err ) case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES; + case EINPROGRESS: case EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; - case EINPROGRESS: return STATUS_PENDING; case EALREADY: return STATUS_NETWORK_BUSY; case ENOTSOCK: return STATUS_OBJECT_TYPE_MISMATCH; case EDESTADDRREQ: return STATUS_INVALID_PARAMETER; diff --git a/server/trace.c b/server/trace.c index cd41d63d8c9..0fccf47d16a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5424,7 +5424,6 @@ static const struct { "WSAEFAULT", 0xc0010000 | WSAEFAULT }, { "WSAEHOSTDOWN", 0xc0010000 | WSAEHOSTDOWN }, { "WSAEHOSTUNREACH", 0xc0010000 | WSAEHOSTUNREACH }, - { "WSAEINPROGRESS", 0xc0010000 | WSAEINPROGRESS }, { "WSAEINTR", 0xc0010000 | WSAEINTR }, { "WSAEINVAL", 0xc0010000 | WSAEINVAL }, { "WSAEISCONN", 0xc0010000 | WSAEISCONN },

1 0

Zebediah Figura : ws2_32: Map ENOTCONN to STATUS_INVALID_CONNECTION.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: cbd4f85ad389f4ee409109807f26304bae243ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd4f85ad389f4ee40910980… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:44 2021 -0500 ws2_32: Map ENOTCONN to STATUS_INVALID_CONNECTION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfc3bea8ea3..9eeb506f985 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -833,7 +833,7 @@ static NTSTATUS sock_get_ntstatus( int err ) case EADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case ECONNREFUSED: return STATUS_CONNECTION_REFUSED; case ESHUTDOWN: return STATUS_PIPE_DISCONNECTED; - case ENOTCONN: return STATUS_CONNECTION_DISCONNECTED; + case ENOTCONN: return STATUS_INVALID_CONNECTION; case ETIMEDOUT: return STATUS_IO_TIMEOUT; case ENETUNREACH: return STATUS_NETWORK_UNREACHABLE; case ENETDOWN: return STATUS_NETWORK_BUSY; @@ -960,7 +960,7 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) case WSAEADDRNOTAVAIL: return STATUS_INVALID_PARAMETER; case WSAECONNREFUSED: return STATUS_CONNECTION_REFUSED; case WSAESHUTDOWN: return STATUS_PIPE_DISCONNECTED; - case WSAENOTCONN: return STATUS_CONNECTION_DISCONNECTED; + case WSAENOTCONN: return STATUS_INVALID_CONNECTION; case WSAETIMEDOUT: return STATUS_IO_TIMEOUT; case WSAENETUNREACH: return STATUS_NETWORK_UNREACHABLE; case WSAENETDOWN: return STATUS_NETWORK_BUSY; @@ -985,7 +985,7 @@ static DWORD NtStatusToWSAError( DWORD status ) case STATUS_NETWORK_BUSY: return WSAEALREADY; case STATUS_NETWORK_UNREACHABLE: return WSAENETUNREACH; case STATUS_CONNECTION_REFUSED: return WSAECONNREFUSED; - case STATUS_CONNECTION_DISCONNECTED: return WSAENOTCONN; + case STATUS_INVALID_CONNECTION: return WSAENOTCONN; case STATUS_CONNECTION_RESET: return WSAECONNRESET; case STATUS_CONNECTION_ABORTED: return WSAECONNABORTED; case STATUS_CANCELLED: return WSA_OPERATION_ABORTED;

1 0

Zebediah Figura : wined3d: Wait for the resource to become idle in wined3d_cs_map().
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 3f3caa338079d22bd20326d92c921d697360d67e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f3caa338079d22bd20326d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 22:23:11 2021 -0500 wined3d: Wait for the resource to become idle in wined3d_cs_map(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 ++ dlls/wined3d/device.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d70792084e8..8a78ad13dd2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2303,6 +2303,8 @@ static HRESULT wined3d_cs_map(struct wined3d_device_context *context, struct win * increasing the map count would be visible to applications. */ wined3d_not_from_cs(cs); + wined3d_resource_wait_idle(resource); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP); op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8f9ca725fd5..085ff70ad76 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5373,7 +5373,6 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, } flags = sanitise_map_flags(resource, flags); - wined3d_resource_wait_idle(resource); return context->ops->map(context, resource, sub_resource_idx, map_desc, box, flags); }

1 0

Zebediah Figura : ws2_32: Map EFAULT to STATUS_ACCESS_VIOLATION.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 44c395d616d9bb668713ca8b9e4c168af945aadc URL: https://source.winehq.org/git/wine.git/?a=commit;h=44c395d616d9bb668713ca8b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:46 2021 -0500 ws2_32: Map EFAULT to STATUS_ACCESS_VIOLATION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9eeb506f985..ff89ffb2d4b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -812,7 +812,7 @@ static NTSTATUS sock_get_ntstatus( int err ) case EBUSY: return STATUS_DEVICE_BUSY; case EPERM: case EACCES: return STATUS_ACCESS_DENIED; - case EFAULT: return STATUS_NO_MEMORY; + case EFAULT: return STATUS_ACCESS_VIOLATION; case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES; @@ -940,7 +940,7 @@ static NTSTATUS sock_error_to_ntstatus( DWORD err ) case 0: return STATUS_SUCCESS; case WSAEBADF: return STATUS_INVALID_HANDLE; case WSAEACCES: return STATUS_ACCESS_DENIED; - case WSAEFAULT: return STATUS_NO_MEMORY; + case WSAEFAULT: return STATUS_ACCESS_VIOLATION; case WSAEINVAL: return STATUS_INVALID_PARAMETER; case WSAEMFILE: return STATUS_TOO_MANY_OPENED_FILES; case WSAEWOULDBLOCK: return STATUS_DEVICE_NOT_READY; @@ -992,7 +992,7 @@ static DWORD NtStatusToWSAError( DWORD status ) case STATUS_SHARING_VIOLATION: return WSAEADDRINUSE; case STATUS_IO_TIMEOUT: case STATUS_TIMEOUT: return WSAETIMEDOUT; - case STATUS_NO_MEMORY: return WSAEFAULT; + case STATUS_ACCESS_VIOLATION: return WSAEFAULT; case STATUS_ACCESS_DENIED: return WSAEACCES; case STATUS_TOO_MANY_OPENED_FILES: return WSAEMFILE; case STATUS_DEVICE_NOT_READY: return WSAEWOULDBLOCK;

1 0

Zebediah Figura : server: Map EFAULT to STATUS_ACCESS_VIOLATION.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 523032e6f1806ce5593103d37f467d28908797e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=523032e6f1806ce5593103d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 5 21:41:47 2021 -0500 server: Map EFAULT to STATUS_ACCESS_VIOLATION. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index cb2a1095496..08399644a07 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1286,7 +1286,7 @@ static int sock_get_ntstatus( int err ) case EBUSY: return STATUS_DEVICE_BUSY; case EPERM: case EACCES: return STATUS_ACCESS_DENIED; - case EFAULT: return STATUS_NO_MEMORY; + case EFAULT: return STATUS_ACCESS_VIOLATION; case EINVAL: return STATUS_INVALID_PARAMETER; case ENFILE: case EMFILE: return STATUS_TOO_MANY_OPENED_FILES;

1 0

Zebediah Figura : msi/tests: Pass an empty string to check_reg_str() instead of special-casing NULL.
by Alexandre Julliard May 6, 2021

May 6, 2021

Module: wine Branch: master Commit: 2052d03fdf82ea9112c6ce3719936e245834eeb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2052d03fdf82ea9112c6ce37… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 2 21:42:43 2021 -0500 msi/tests: Pass an empty string to check_reg_str() instead of special-casing NULL. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 265 ++++++++++++++++++++++++------------------------ 1 file changed, 130 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2052d03fdf82ea9112c6…

1 0