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

Zebediah Figura : user32: Blit the right bitmap when stretching monochrome icons in CopyImage().
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: d2259665b43817d13abe3c522ad69911467edd87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2259665b43817d13abe3c52… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 24 17:11:06 2021 -0500 user32: Blit the right bitmap when stretching monochrome icons in CopyImage(). Fixes: beb70a79e1d92ddb10a552dcc6c06a4139365566 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index a923f2f8315..a225303f80f 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -3024,7 +3024,7 @@ HANDLE WINAPI CopyImage( HANDLE hnd, UINT type, INT desiredx, release_user_handle_ptr( icon ); return 0; } - stretch_bitmap( info.hbmColor, frame->color, desiredx, desiredy * 2, + stretch_bitmap( info.hbmMask, frame->mask, desiredx, desiredy * 2, frame->width, frame->height * 2 ); }

1 0

Zebediah Figura : ws2_32/tests: Add some tests for opening the Afd device.
by Alexandre Julliard May 25, 2021

May 25, 2021

Module: wine Branch: master Commit: 4fe9055499315eca14fe9b0cfc06aa0b768b714a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fe9055499315eca14fe9b0c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 24 23:13:39 2021 -0500 ws2_32/tests: Add some tests for opening the Afd device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index da42f878367..a02b4f3da27 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -39,6 +39,43 @@ static void set_blocking(SOCKET s, ULONG blocking) ok(!ret, "got error %u\n", WSAGetLastError()); } +static void test_open_device(void) +{ + OBJECT_BASIC_INFORMATION info; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + IO_STATUS_BLOCK io; + HANDLE handle; + SOCKET s; + int ret; + + RtlInitUnicodeString(&string, L"\\Device\\Afd"); + InitializeObjectAttributes(&attr, &string, 0, NULL, NULL); + ret = NtOpenFile(&handle, SYNCHRONIZE, &attr, &io, 0, 0); + ok(!ret, "got %#x\n", ret); + CloseHandle(handle); + + RtlInitUnicodeString(&string, L"\\Device\\Afd\\"); + InitializeObjectAttributes(&attr, &string, 0, NULL, NULL); + ret = NtOpenFile(&handle, SYNCHRONIZE, &attr, &io, 0, 0); + ok(!ret, "got %#x\n", ret); + CloseHandle(handle); + + RtlInitUnicodeString(&string, L"\\Device\\Afd\\foobar"); + InitializeObjectAttributes(&attr, &string, 0, NULL, NULL); + ret = NtOpenFile(&handle, SYNCHRONIZE, &attr, &io, 0, 0); + todo_wine ok(!ret, "got %#x\n", ret); + CloseHandle(handle); + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ret = NtQueryObject((HANDLE)s, ObjectBasicInformation, &info, sizeof(info), NULL); + ok(!ret, "got %#x\n", ret); + todo_wine ok(info.Attributes == OBJ_INHERIT, "got attributes %#x\n", info.Attributes); + todo_wine ok(info.GrantedAccess == (FILE_GENERIC_READ | FILE_GENERIC_WRITE | WRITE_DAC), "got access %#x\n", info.GrantedAccess); + + closesocket(s); +} + static void test_recv(void) { const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; @@ -397,6 +434,7 @@ START_TEST(afd) WSAStartup(MAKEWORD(2, 2), &data); + test_open_device(); test_recv(); WSACleanup();

1 0

Zebediah Figura : d3d11/tests: Add a couple of extra tests for SRV/RTV conflict.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 1a9400bcc9745e70dfe5e0518a4b22f6935b30be URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a9400bcc9745e70dfe5e051… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 24 11:05:48 2021 -0500 d3d11/tests: Add a couple of extra tests for SRV/RTV conflict. 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/d3d11/tests/d3d11.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 421ad465d35..18c36a5908e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -32351,6 +32351,15 @@ static void test_deferred_context_state(void) ID3D11DeviceContext_PSGetShaderResources(deferred, 0, 1, &ret_srv); ok(!ret_srv, "Got unexpected SRV %p.\n", ret_srv); + ID3D11DeviceContext_PSSetShaderResources(deferred, 0, 1, &srv); + ID3D11DeviceContext_PSGetShaderResources(deferred, 0, 1, &ret_srv); + ok(!ret_srv, "Got unexpected SRV %p.\n", ret_srv); + + ID3D11DeviceContext_PSSetShaderResources(immediate, 0, 1, &srv); + ID3D11DeviceContext_PSGetShaderResources(immediate, 0, 1, &ret_srv); + ok(ret_srv == srv, "Got unexpected SRV %p.\n", ret_srv); + ID3D11ShaderResourceView_Release(ret_srv); + ID3D11ShaderResourceView_Release(srv); ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture);

1 0

Hans Leidekker : webservices: Buffer whole messages to be sent.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: be940a00d9cd626edb4c49de30b5d8d7f0fd88bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=be940a00d9cd626edb4c49de… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 24 15:53:48 2021 +0200 webservices: Buffer whole messages to be sent. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 132 ++++++++++++++++++++++++++++++--------------- 1 file changed, 89 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be940a00d9cd626edb4c…

1 0

Ziqing Hui : windowscodecs/tests: Introduce create_and_init_encoder.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 4da05a4f6d0201db37c2a412e7ec43e186a880ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da05a4f6d0201db37c2a412… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon May 24 10:58:18 2021 +0800 windowscodecs/tests: Introduce create_and_init_encoder. We can't reuse same encoder object for all images. So we should create a new encoder object for each test. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 77 ++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 30 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 52828e6bf43..bd7672a558f 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -546,6 +546,39 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES return hr; } +static void release_encoder(IWICBitmapEncoder *encoder, IWICDdsEncoder *dds_encoder, IWICStream *stream) +{ + if (dds_encoder) IWICDdsEncoder_Release(dds_encoder); + if (stream) IWICStream_Release(stream); + if (encoder) IWICBitmapEncoder_Release(encoder); +} + +static HRESULT create_and_init_encoder(BYTE *image_buffer, UINT buffer_size, + IWICBitmapEncoder **encoder, IWICDdsEncoder **dds_encoder, IWICStream **stream) +{ + HRESULT hr; + + *encoder = create_encoder(); + if (!*encoder) goto fail; + + *stream = create_stream(image_buffer, buffer_size); + if (!*stream) goto fail; + + hr = IWICBitmapEncoder_Initialize(*encoder, (IStream *)*stream, WICBitmapEncoderNoCache); + ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); + if (hr != S_OK) goto fail; + + hr = IWICBitmapEncoder_QueryInterface(*encoder, &IID_IWICDdsEncoder, (void **)dds_encoder); + ok(hr == S_OK, "QueryInterface failed, hr %#x\n", hr); + if (hr != S_OK) goto fail; + + return S_OK; + +fail: + release_encoder(*encoder, *dds_encoder, *stream); + return E_FAIL; +} + static BOOL is_compressed(DXGI_FORMAT format) { UINT i; @@ -1310,18 +1343,25 @@ end: if (encoder) IWICBitmapEncoder_Release(encoder); } -static void test_dds_encoder_params(IWICBitmapEncoder *encoder, IWICDdsEncoder *dds_encoder) +static void test_dds_encoder_params(void) { WICDdsParameters params, params_set = { 4, 4, 4, 3, 1, DXGI_FORMAT_BC1_UNORM, WICDdsTexture3D, WICDdsAlphaModePremultiplied }; + IWICDdsEncoder *dds_encoder = NULL; + IWICBitmapEncoder *encoder = NULL; + IWICStream *stream = NULL; + BYTE buffer[1024]; HRESULT hr; + hr = create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + if (hr != S_OK) goto end; + hr = IWICDdsEncoder_GetParameters(dds_encoder, NULL); ok(hr == E_INVALIDARG, "GetParameters got unexpected hr %#x\n", hr); hr = IWICDdsEncoder_GetParameters(dds_encoder, &params); ok(hr == S_OK, "GetParameters failed, hr %#x\n", hr); - if (hr != S_OK) return; + if (hr != S_OK) goto end; /* default DDS parameters for encoder */ ok(params.Width == 1, "Got unexpected Width %u\n", params.Width); @@ -1338,7 +1378,7 @@ static void test_dds_encoder_params(IWICBitmapEncoder *encoder, IWICDdsEncoder * hr = IWICDdsEncoder_SetParameters(dds_encoder, &params_set); ok(hr == S_OK, "SetParameters failed, hr %#x\n", hr); - if (hr != S_OK) return; + if (hr != S_OK) goto end; IWICDdsEncoder_GetParameters(dds_encoder, &params); @@ -1358,38 +1398,15 @@ static void test_dds_encoder_params(IWICBitmapEncoder *encoder, IWICDdsEncoder * "Expected Dimension %u, got %#x\n", params_set.Dimension, params.Dimension); ok(params.AlphaMode == params_set.AlphaMode, "Expected AlphaMode %u, got %#x\n", params_set.AlphaMode, params.AlphaMode); + +end: + release_encoder(encoder, dds_encoder, stream); } static void test_dds_encoder(void) { - IWICDdsEncoder *dds_encoder = NULL; - IWICBitmapEncoder *encoder = NULL; - IWICStream *stream = NULL; - BYTE buffer[1024]; - HRESULT hr; - test_dds_encoder_initialize(); - - encoder = create_encoder(); - if (!encoder) goto end; - - stream = create_stream(buffer, sizeof(buffer)); - if (!stream) goto end; - - hr = IWICBitmapEncoder_Initialize(encoder, (IStream *)stream, WICBitmapEncoderNoCache); - ok(hr == S_OK, "Initialize failed, hr %#x\n", hr); - if (hr != S_OK) goto end; - - hr = IWICBitmapEncoder_QueryInterface(encoder, &IID_IWICDdsEncoder, (void **)&dds_encoder); - ok(hr == S_OK, "QueryInterface failed, hr %#x\n", hr); - if (hr != S_OK) goto end; - - test_dds_encoder_params(encoder, dds_encoder); - -end: - if (dds_encoder) IWICDdsEncoder_Release(dds_encoder); - if (stream) IWICStream_Release(stream); - if (encoder) IWICBitmapEncoder_Release(encoder); + test_dds_encoder_params(); } START_TEST(ddsformat)

1 0

Hans Leidekker : webservices: Properly initialize messages.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: ff5982fcf10624f76c7099d57901e04715b921d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5982fcf10624f76c7099d5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 24 15:53:49 2021 +0200 webservices: Properly initialize messages. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 6 +++- dlls/webservices/msg.c | 35 ++++++++++---------- dlls/webservices/tests/msg.c | 79 ++++++++++++++++++++++++++++++++++++-------- 3 files changed, 88 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff5982fcf10624f76c70…

1 0

Zebediah Figura : d3d11/tests: Add some tests for Map() on deferred contexts.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 7f181bba1d55c4dc226a49f3a9f89c99b1d4a74f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f181bba1d55c4dc226a49f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 24 11:05:50 2021 -0500 d3d11/tests: Add some tests for Map() on deferred contexts. 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/d3d11/tests/d3d11.c | 239 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 239 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f181bba1d55c4dc226a…

1 0

Zebediah Figura : d3d11/tests: Add some tests for UpdateSubresource() on a deferred context.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 94eb8d36461f6eb380b95e58629ad4871e5efef4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94eb8d36461f6eb380b95e58… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 24 11:05:51 2021 -0500 d3d11/tests: Add some tests for UpdateSubresource() on a deferred context. 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/d3d11/tests/d3d11.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9315da55641..a88b2511d3d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -32927,6 +32927,51 @@ static void test_deferred_context_map(void) ID3D11Buffer_Release(buffer2); ID3D11Buffer_Release(buffer); + + /* Test UpdateSubresource. */ + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = i; + + buffer_desc.ByteWidth = sizeof(data); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer2); + ok(hr == S_OK, "Failed to create buffer, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(data); ++i) + data[i] = 2 * i; + ID3D11DeviceContext_UpdateSubresource(deferred, (ID3D11Resource *)buffer, 0, NULL, data, 0, 0); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + get_buffer_readback(buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == i, "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + ID3D11DeviceContext_ExecuteCommandList(immediate, list, TRUE); + + get_buffer_readback(buffer, &rb); + for (i = 0; i < ARRAY_SIZE(data); ++i) + { + value = get_readback_float(&rb, i, 0); + ok(value == 2 * i, "Got unexpected value %.8e at %u.\n", value, i); + } + release_resource_readback(&rb); + + ID3D11CommandList_Release(list); + + ID3D11Buffer_Release(buffer2); + ID3D11Buffer_Release(buffer); + ID3D11DeviceContext_Release(deferred); release_test_context(&test_context); }

1 0

Zebediah Figura : wined3d: Check for SRV/RTV binding conflicts per wined3d_state.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 57fc75b3ef547275342e76366da641bbc512bf4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=57fc75b3ef547275342e7636… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 24 11:05:49 2021 -0500 wined3d: Check for SRV/RTV binding conflicts per wined3d_state. 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/context.c | 19 ++++++- dlls/wined3d/device.c | 23 +++++--- dlls/wined3d/resource.c | 1 - dlls/wined3d/wined3d_private.h | 125 +++++++++-------------------------------- 4 files changed, 61 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57fc75b3ef547275342e…

1 0

Ziqing Hui : windowscodecs/tests: Add more test data for IWICDdsEncoder_SetParameters.
by Alexandre Julliard May 24, 2021

May 24, 2021

Module: wine Branch: master Commit: 90b6051f4e81f077713d8164e9397a3ce73541be URL: https://source.winehq.org/git/wine.git/?a=commit;h=90b6051f4e81f077713d8164… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon May 24 10:58:32 2021 +0800 windowscodecs/tests: Add more test data for IWICDdsEncoder_SetParameters. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index bd7672a558f..f369569104a 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1352,6 +1352,7 @@ static void test_dds_encoder_params(void) IWICStream *stream = NULL; BYTE buffer[1024]; HRESULT hr; + UINT i; hr = create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); if (hr != S_OK) goto end; @@ -1399,6 +1400,14 @@ static void test_dds_encoder_params(void) ok(params.AlphaMode == params_set.AlphaMode, "Expected AlphaMode %u, got %#x\n", params_set.AlphaMode, params.AlphaMode); + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + hr = IWICDdsEncoder_SetParameters(dds_encoder, &test_data[i].expected_parameters); + todo_wine_if(test_data[i].init_hr != S_OK) + ok((hr == S_OK && test_data[i].init_hr == S_OK) || hr == WINCODEC_ERR_BADHEADER, + "Test %u: SetParameters got unexpected hr %#x\n", i, hr); + } + end: release_encoder(encoder, dds_encoder, stream); }

1 0