wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Claire Girka : mmdevapi: Override product strings for DualSense controller audio devices.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 67f9c76386c8f67363f1fa90d7f7ac0ac84fdcd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67f9c76386c8f67363f1fa90… Author: Claire Girka <claire(a)sitedethib.com> Date: Wed Jun 29 12:09:01 2022 +0200 mmdevapi: Override product strings for DualSense controller audio devices. Some games expect the DualSense audio device (used for haptic feedback and controller speaker) to be called “Wireless Controller”. --- dlls/mmdevapi/devenum.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 053275cac45..bfeb3f3ecd8 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -255,6 +255,30 @@ static HRESULT set_driver_prop_value(GUID *id, const EDataFlow flow, const PROPE return hr; } +struct product_name_overrides +{ + const WCHAR *id; + const WCHAR *product; +}; + +static const struct product_name_overrides product_name_overrides[] = +{ + /* Sony controllers */ + { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, +}; + +static const WCHAR *find_product_name_override(const WCHAR *device_id) +{ + const WCHAR *match_id = wcschr( device_id, '\\' ) + 1; + DWORD i; + + for (i = 0; i < ARRAY_SIZE(product_name_overrides); ++i) + if (!wcsnicmp( product_name_overrides[i].id, match_id, 17 )) + return product_name_overrides[i].product; + + return NULL; +} + /* Creates or updates the state of a device * If GUID is null, a random guid will be assigned * and the device will be created @@ -321,6 +345,21 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.vt = VT_LPWSTR; pv.pwszVal = name; + + if (SUCCEEDED(set_driver_prop_value(id, flow, &devicepath_key))) { + PROPVARIANT pv2; + + PropVariantInit(&pv2); + + if (SUCCEEDED(MMDevice_GetPropValue(id, flow, &devicepath_key, &pv2)) && pv2.vt == VT_LPWSTR) { + const WCHAR *override; + if ((override = find_product_name_override(pv2.pwszVal)) != NULL) + pv.pwszVal = (WCHAR*) override; + } + + PropVariantClear(&pv2); + } + MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); @@ -328,8 +367,6 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.pwszVal = guidstr; MMDevice_SetPropValue(id, flow, &deviceinterface_key, &pv); - set_driver_prop_value(id, flow, &devicepath_key); - if (FAILED(set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_FormFactor))) { pv.vt = VT_UI4;

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.219.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: fda62d4b195422cfa3b221ba16e8c3ee610277ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=fda62d4b195422cfa3b221ba… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Jun 30 14:31:26 2022 +0200 winevulkan: Update to VK spec version 1.3.219. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/loader_thunks.c | 20 ++++++++++++ dlls/winevulkan/loader_thunks.h | 16 +++++++++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 52 +++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 4 +++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 72 ++++++++++++++++++++++++++++++++++++++++- 7 files changed, 165 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fda62d4b195422cfa3b2…

1 0

Hugh McMaster : regedit: Allow renaming of values in root keys.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: ab03ecf7bc592bb63ef4cc1662a7741b02ec1522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab03ecf7bc592bb63ef4cc16… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 30 21:08:54 2022 +1000 regedit: Allow renaming of values in root keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/framewnd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 83e4ec89ee0..c9eb2c4c469 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -946,9 +946,10 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_EDIT_RENAME: { WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - if (keyPath == 0 || *keyPath == 0) { + if (!keyPath) { MessageBeep(MB_ICONHAND); - } else if (GetFocus() == g_pChildWnd->hTreeWnd) { + break; + } else if (*keyPath && GetFocus() == g_pChildWnd->hTreeWnd) { StartKeyRename(g_pChildWnd->hTreeWnd); } else if (GetFocus() == g_pChildWnd->hListWnd) { StartValueRename(g_pChildWnd->hListWnd);

1 0

Hans Leidekker : secur32: Return a SECBUFFER_MISSING buffer from the handshake if the input message is incomplete.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 0a10bfc8b17234db6aff130ce0448a62c3fb6a1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a10bfc8b17234db6aff130c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 29 13:54:57 2022 +0200 secur32: Return a SECBUFFER_MISSING buffer from the handshake if the input message is incomplete. --- dlls/secur32/schannel.c | 25 +++++++++++++++++++++++-- dlls/secur32/tests/schannel.c | 21 ++++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 7dc9bd1d21a..70018e57f7e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -747,6 +747,18 @@ static inline BOOL is_dtls_context(const struct schan_context *ctx) return ctx->header_size == HEADER_SIZE_DTLS; } +static void fill_missing_sec_buffer(SecBufferDesc *input, DWORD size) +{ + int idx = schan_find_sec_buffer_idx(input, 0, SECBUFFER_EMPTY); + if (idx == -1) WARN("no empty buffer\n"); + else + { + SecBuffer *buffer = &input->pBuffers[idx]; + buffer->BufferType = SECBUFFER_MISSING; + buffer->cbBuffer = size; + } +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -887,7 +899,15 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( buffer = &pInput->pBuffers[idx]; ptr = buffer->pvBuffer; - while (buffer->cbBuffer > expected_size + ctx->header_size) + if (buffer->cbBuffer < ctx->header_size) + { + TRACE("Expected at least %Iu bytes, but buffer only contains %lu bytes.\n", + ctx->header_size, buffer->cbBuffer); + fill_missing_sec_buffer(pInput, ctx->header_size - buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; + } + + while (buffer->cbBuffer >= expected_size + ctx->header_size) { record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); @@ -899,7 +919,8 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( if (!expected_size) { TRACE("Expected at least %Iu bytes, but buffer only contains %lu bytes.\n", - max(ctx->header_size + 1, record_size), buffer->cbBuffer); + max(ctx->header_size, record_size), buffer->cbBuffer); + fill_missing_sec_buffer(pInput, record_size - buffer->cbBuffer); return SEC_E_INCOMPLETE_MESSAGE; } diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index c68474e9eae..8322b5a80a5 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1132,8 +1132,10 @@ static void test_communication(void) ok( context2.dwLower == 0xdeadbeef, "Did not expect dwLower to be set on new context\n"); ok( context2.dwUpper == 0xdeadbeef, "Did not expect dwUpper to be set on new context\n"); - buffers[1].cBuffers = 1; + buffers[1].cBuffers = 2; buffers[1].pBuffers[0].cbBuffer = 0; + buffers[1].pBuffers[1].cbBuffer = 0; + buffers[1].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, @@ -1141,6 +1143,10 @@ static void test_communication(void) ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#lx.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + ok(buffers[1].pBuffers[1].cbBuffer == 5 || + broken(buffers[1].pBuffers[1].cbBuffer == 0), /* < win10 */ "Wrong buffer size.\n"); + ok(buffers[1].pBuffers[1].BufferType == SECBUFFER_MISSING || + broken(buffers[1].pBuffers[1].BufferType == SECBUFFER_EMPTY), /* < win10 */ "Wrong buffer type.\n"); buf = &buffers[1].pBuffers[0]; buf->cbBuffer = buf_size; @@ -1149,6 +1155,8 @@ static void test_communication(void) return; buffers[1].pBuffers[0].cbBuffer = 4; + buffers[1].pBuffers[1].cbBuffer = 0; + buffers[1].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); @@ -1156,9 +1164,15 @@ static void test_communication(void) "Got unexpected status %#lx.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + ok(buffers[1].pBuffers[1].cbBuffer == 1 || + broken(buffers[1].pBuffers[1].cbBuffer == 0), /* < win10 */ "Wrong buffer size.\n"); + ok(buffers[1].pBuffers[1].BufferType == SECBUFFER_MISSING || + broken(buffers[1].pBuffers[1].BufferType == SECBUFFER_EMPTY), /* < win10 */ "Wrong buffer type.\n"); context2.dwLower = context2.dwUpper = 0xdeadbeef; buffers[1].pBuffers[0].cbBuffer = 5; + buffers[1].pBuffers[1].cbBuffer = 0; + buffers[1].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, &context2, &buffers[0], &attrs, NULL); @@ -1166,9 +1180,14 @@ static void test_communication(void) "Got unexpected status %#lx.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + ok(buffers[1].pBuffers[1].cbBuffer > 5 || + broken(buffers[1].pBuffers[1].cbBuffer == 0), /* < win10 */ "Wrong buffer size\n" ); + ok(buffers[1].pBuffers[1].BufferType == SECBUFFER_MISSING || + broken(buffers[1].pBuffers[1].BufferType == SECBUFFER_EMPTY), /* < win10 */ "Wrong buffer type.\n"); ok( context2.dwLower == 0xdeadbeef, "Did not expect dwLower to be set on new context\n"); ok( context2.dwUpper == 0xdeadbeef, "Did not expect dwUpper to be set on new context\n"); + buffers[1].cBuffers = 1; buffers[1].pBuffers[0].cbBuffer = ret; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS,

1 0

Hans Leidekker : wininet: Remove assertion that is no longer valid in Windows 10.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: fc701aa14ce8c1d7aeb3b3d9b35edd1cd860c9ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc701aa14ce8c1d7aeb3b3d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:55:52 2022 +0200 wininet: Remove assertion that is no longer valid in Windows 10. --- dlls/wininet/netconnection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index f89493967a2..a3ca03d3ef1 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -500,7 +500,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); - assert(in_bufs[1].BufferType == SECBUFFER_EMPTY); + in_bufs[1].BufferType = SECBUFFER_EMPTY; if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { BYTE *new_read_buf;

1 0

Hans Leidekker : winhttp: Remove assertion that is no longer valid in Windows 10.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 80a2c664411120ada327d2bac8e7390016e63979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80a2c664411120ada327d2ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:52:03 2022 +0200 winhttp: Remove assertion that is no longer valid in Windows 10. --- dlls/winhttp/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 40c9f3c8534..be776ae2971 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -350,7 +350,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur } assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); - assert(in_bufs[1].BufferType == SECBUFFER_EMPTY); + in_bufs[1].BufferType = SECBUFFER_EMPTY; if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { BYTE *new_read_buf;

1 0

Ziqing Hui : d2d1/tests: Test value size checking for custom properties.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 34a701f29eee4cb0e353e6a5a38787ec6774f9d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34a701f29eee4cb0e353e6a5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 22 18:50:01 2022 +0800 d2d1/tests: Test value size checking for custom properties. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3d517983e69..78f255c1f99 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10690,7 +10690,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_set_integer(IUnknown *iface, const { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); - if (!data || data_size != sizeof(effect_impl->integer)) + if (!data) return E_INVALIDARG; effect_impl->integer = *((UINT *)data); @@ -10703,7 +10703,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_integer(const IUnknown *iface, { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); - if (!data || data_size != sizeof(effect_impl->integer)) + if (!data) return E_INVALIDARG; *((UINT *)data) = effect_impl->integer; @@ -10718,7 +10718,7 @@ static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, { struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); - if (!data || data_size != sizeof(effect_impl->effect_context)) + if (!data) return E_INVALIDARG; *((ID2D1EffectContext **)data) = effect_impl->effect_context; @@ -11247,6 +11247,12 @@ static void test_effect_properties(BOOL d3d11) ok(index == 1, "Got unexpected index %u.\n", index); effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, + L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValueByName(effect, + L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValueByName(effect, L"Context", D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -11254,6 +11260,10 @@ static void test_effect_properties(BOOL d3d11) "Got unexpected effect context %p.\n", effect_context); effect_context = (ID2D1EffectContext *)0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValue(effect, 0, D2D1_PROPERTY_TYPE_IUNKNOWN, (BYTE *)&effect_context, sizeof(effect_context)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(effect_context != NULL && effect_context != (ID2D1EffectContext *)0xdeadbeef, @@ -11263,16 +11273,28 @@ static void test_effect_properties(BOOL d3d11) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); integer = 0xdeadbeef; + hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValueByName(effect, L"Integer", D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(integer == 10, "Got unexpected integer %u.", integer); integer = 0xdeadbeef; + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_GetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(integer == 10, "Got unexpected integer %u.", integer); integer = 20; + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) - 1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer) + 1); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Effect_SetValue(effect, 1, D2D1_PROPERTY_TYPE_UINT32, (BYTE *)&integer, sizeof(integer)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); integer = 0xdeadbeef;

1 0

Ziqing Hui : d2d1/tests: Add tests for GetPropertyCount().
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 5a58ea8c2a98ce8b8b91c257b495541db363e70e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a58ea8c2a98ce8b8b91c257… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Jun 30 11:19:17 2022 +0300 d2d1/tests: Add tests for GetPropertyCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a43843bb8ca..3d517983e69 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11238,6 +11238,9 @@ static void test_effect_properties(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + count = ID2D1Effect_GetPropertyCount(effect); + ok(count == 2, "Got unexpected property count %u.\n", count); + index = ID2D1Effect_GetPropertyIndex(effect, L"Context"); ok(index == 0, "Got unexpected index %u.\n", index); index = ID2D1Effect_GetPropertyIndex(effect, L"Integer"); @@ -11322,10 +11325,10 @@ static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; D2D1_BITMAP_PROPERTIES1 bitmap_desc; + unsigned int i, x, y, w, h, count; D2D_RECT_F output_bounds = {0}; struct d2d1_test_context ctx; ID2D1DeviceContext *context; - unsigned int i, x, y, w, h; D2D1_SIZE_U input_size; ID2D1Factory1 *factory; D2D1_POINT_2F offset; @@ -11404,6 +11407,9 @@ static void test_effect_2d_affine(BOOL d3d11) check_system_properties(effect, TRUE); + count = ID2D1Effect_GetPropertyCount(effect); + todo_wine ok(count == 4, "Got unexpected property count %u.\n", count); + for (i = 0; i < ARRAY_SIZE(effect_2d_affine_tests); ++i) { const struct effect_2d_affine_test *test = &effect_2d_affine_tests[i]; @@ -11474,11 +11480,11 @@ static void test_effect_crop(BOOL d3d11) D2D_RECT_F output_bounds; D2D1_SIZE_U input_size; ID2D1Factory1 *factory; + unsigned int count, i; ID2D1Bitmap1 *bitmap; DWORD image[16 * 16]; ID2D1Effect *effect; ID2D1Image *output; - unsigned int i; HRESULT hr; const struct crop_effect_test @@ -11516,6 +11522,9 @@ static void test_effect_crop(BOOL d3d11) check_system_properties(effect, TRUE); + count = ID2D1Effect_GetPropertyCount(effect); + todo_wine ok(count == 2, "Got unexpected property count %u.\n", count); + for (i = 0; i < ARRAY_SIZE(crop_effect_tests); ++i) { const struct crop_effect_test *test = &crop_effect_tests[i]; @@ -11565,10 +11574,10 @@ static void test_effect_grayscale(BOOL d3d11) ID2D1DeviceContext *context; D2D1_SIZE_U input_size; ID2D1Factory3 *factory; + unsigned int count, i; ID2D1Bitmap1 *bitmap; ID2D1Effect *effect; ID2D1Image *output; - unsigned int i; HRESULT hr; const DWORD test_pixels[] = {0xffffffff, 0x12345678, 0x89abcdef, 0x77777777, 0xdeadbeef}; @@ -11591,6 +11600,9 @@ static void test_effect_grayscale(BOOL d3d11) check_system_properties(effect, TRUE); + count = ID2D1Effect_GetPropertyCount(effect); + ok(!count, "Got unexpected property count %u.\n", count); + for (i = 0; i < ARRAY_SIZE(test_pixels); ++i) { DWORD pixel = test_pixels[i];

1 0

Ziqing Hui : d2d1/tests: Add tests for system properties attributes.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 3462a31bd9bd1dd3d6817485e35cc7d90f3eec3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3462a31bd9bd1dd3d6817485… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 22 16:44:59 2022 +0800 d2d1/tests: Add tests for system properties attributes. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 332fd02a07f..a43843bb8ca 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10322,7 +10322,85 @@ static void test_mt_factory(BOOL d3d11) ID2D1Factory_Release(factory); } -static void test_effect(BOOL d3d11) +#define check_system_properties(effect, is_builtin) check_system_properties_(__LINE__, effect, is_builtin) +static void check_system_properties_(unsigned int line, ID2D1Effect *effect, BOOL is_builtin) +{ + UINT i, value_size, str_size; + WCHAR name[32], buffer[256]; + D2D1_PROPERTY_TYPE type; + HRESULT hr; + + static const struct system_property_test + { + UINT32 index; + const WCHAR *name; + D2D1_PROPERTY_TYPE type; + UINT32 value_size; + } + system_property_tests[] = + { + {D2D1_PROPERTY_CLSID, L"CLSID", D2D1_PROPERTY_TYPE_CLSID, sizeof(CLSID)}, + {D2D1_PROPERTY_DISPLAYNAME, L"DisplayName", D2D1_PROPERTY_TYPE_STRING }, + {D2D1_PROPERTY_AUTHOR, L"Author", D2D1_PROPERTY_TYPE_STRING }, + {D2D1_PROPERTY_CATEGORY, L"Category", D2D1_PROPERTY_TYPE_STRING }, + {D2D1_PROPERTY_DESCRIPTION, L"Description", D2D1_PROPERTY_TYPE_STRING }, + {D2D1_PROPERTY_INPUTS, L"Inputs", D2D1_PROPERTY_TYPE_ARRAY, sizeof(UINT32)}, + {D2D1_PROPERTY_CACHED, L"Cached", D2D1_PROPERTY_TYPE_BOOL, sizeof(BOOL)}, + {D2D1_PROPERTY_PRECISION, L"Precision", D2D1_PROPERTY_TYPE_ENUM, sizeof(UINT32)}, + {D2D1_PROPERTY_MIN_INPUTS, L"MinInputs", D2D1_PROPERTY_TYPE_UINT32, sizeof(UINT32)}, + {D2D1_PROPERTY_MAX_INPUTS, L"MaxInputs", D2D1_PROPERTY_TYPE_UINT32, sizeof(UINT32)}, + }; + + hr = ID2D1Effect_GetPropertyName(effect, 0xdeadbeef, name, sizeof(name)); + ok_(__FILE__, line)(hr == D2DERR_INVALID_PROPERTY, "GetPropertyName() got unexpected hr %#lx for 0xdeadbeef.\n", hr); + type = ID2D1Effect_GetType(effect, 0xdeadbeef); + ok_(__FILE__, line)(type == D2D1_PROPERTY_TYPE_UNKNOWN, "Got unexpected property type %#x for 0xdeadbeef.\n", type); + value_size = ID2D1Effect_GetValueSize(effect, 0xdeadbeef); + ok_(__FILE__, line)(value_size == 0, "Got unexpected value size %u for 0xdeadbeef.\n", value_size); + + for (i = 0; i < ARRAY_SIZE(system_property_tests); ++i) + { + const struct system_property_test *test = &system_property_tests[i]; + winetest_push_context("Property %u", i); + + name[0] = 0; + hr = ID2D1Effect_GetPropertyName(effect, test->index, name, sizeof(name)); + todo_wine_if((is_builtin && (test->type == D2D1_PROPERTY_TYPE_ARRAY || test->type == D2D1_PROPERTY_TYPE_STRING))) + { + ok_(__FILE__, line)(hr == S_OK, "Failed to get property name, hr %#lx\n", hr); + ok_(__FILE__, line)(!wcscmp(name, test->name), "Got unexpected property name %s, expected %s.\n", + debugstr_w(name), debugstr_w(test->name)); + } + + type = D2D1_PROPERTY_TYPE_UNKNOWN; + type = ID2D1Effect_GetType(effect, test->index); + todo_wine_if((is_builtin && (test->type == D2D1_PROPERTY_TYPE_ARRAY || test->type == D2D1_PROPERTY_TYPE_STRING))) + ok_(__FILE__, line)(type == test->type, "Got unexpected property type %#x, expected %#x.\n", + type, test->type); + + value_size = 0; + value_size = ID2D1Effect_GetValueSize(effect, test->index); + if (test->value_size != 0) + { + todo_wine_if(is_builtin && test->type == D2D1_PROPERTY_TYPE_ARRAY) + ok_(__FILE__, line)(value_size == test->value_size, "Got unexpected value size %u, expected %u.\n", + value_size, test->value_size); + } + else if (test->type == D2D1_PROPERTY_TYPE_STRING) + { + hr = ID2D1Effect_GetValue(effect, test->index, D2D1_PROPERTY_TYPE_STRING, (BYTE *)buffer, sizeof(buffer)); + todo_wine_if(is_builtin) + ok_(__FILE__, line)(hr == S_OK, "Failed to get value, hr %#lx.\n", hr); + str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR); + todo_wine_if(is_builtin || buffer[0] == 0) + ok_(__FILE__, line)(value_size == str_size, "Got unexpected value size %u, expected %u.\n", + value_size, str_size); + } + winetest_pop_context(); + } +} + +static void test_builtin_effect(BOOL d3d11) { unsigned int i, j, min_inputs, max_inputs, str_size, input_count; D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -10384,6 +10462,7 @@ static void test_effect(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(context, test->clsid, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + /* Test output image pointer */ hr = ID2D1Effect_QueryInterface(effect, &IID_ID2D1Image, (void **)&image_a); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ID2D1Effect_GetOutput(effect, &image_b); @@ -10391,6 +10470,7 @@ static void test_effect(BOOL d3d11) ID2D1Image_Release(image_b); ID2D1Image_Release(image_a); + /* Test GetValue() */ hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#lx.\n", hr); @@ -10447,10 +10527,12 @@ static void test_effect(BOOL d3d11) ok(max_inputs == test->max_inputs, "Got unexpected max inputs %u, expected %u.\n", max_inputs, test->max_inputs); + /* Test default input count */ input_count = ID2D1Effect_GetInputCount(effect); ok(input_count == test->default_input_count, "Got unexpected input count %u, expected %u.\n", input_count, test->default_input_count); + /* Test SetInputCount() */ input_count = (test->max_inputs < 16 ? test->max_inputs : 16); for (j = 0; j < input_count + 4; ++j) { @@ -10463,6 +10545,7 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } + /* Test GetInput() before any input is set */ input_count = ID2D1Effect_GetInputCount(effect); for (j = 0; j < input_count + 4; ++j) { @@ -10472,6 +10555,7 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } + /* Test GetInput() after an input is set */ set_size_u(&size, 1, 1); bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; @@ -10498,6 +10582,7 @@ static void test_effect(BOOL d3d11) winetest_pop_context(); } + /* Test setting inputs with out-of-bounds index */ for (j = input_count; j < input_count + 4; ++j) { winetest_push_context("Input %u", j); @@ -11053,6 +11138,8 @@ static void test_effect_properties(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(ctx.context, &CLSID_TestEffect, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_system_properties(effect, FALSE); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -11315,6 +11402,8 @@ static void test_effect_2d_affine(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D12DAffineTransform, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_system_properties(effect, TRUE); + for (i = 0; i < ARRAY_SIZE(effect_2d_affine_tests); ++i) { const struct effect_2d_affine_test *test = &effect_2d_affine_tests[i]; @@ -11425,6 +11514,8 @@ static void test_effect_crop(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Crop, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_system_properties(effect, TRUE); + for (i = 0; i < ARRAY_SIZE(crop_effect_tests); ++i) { const struct crop_effect_test *test = &crop_effect_tests[i]; @@ -11498,6 +11589,8 @@ static void test_effect_grayscale(BOOL d3d11) hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Grayscale, &effect); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + check_system_properties(effect, TRUE); + for (i = 0; i < ARRAY_SIZE(test_pixels); ++i) { DWORD pixel = test_pixels[i]; @@ -12351,7 +12444,7 @@ START_TEST(d2d1) queue_test(test_effect_register); queue_test(test_effect_context); queue_test(test_effect_properties); - queue_test(test_effect); + queue_test(test_builtin_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); queue_test(test_effect_grayscale);

1 0

Nikolay Sivov : d2d1/effect: Initial implementation of subproperties.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 7b15245d431fdcca458fb785009cce6c344dc225 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b15245d431fdcca458fb785… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 30 04:13:54 2022 +0300 d2d1/effect: Initial implementation of subproperties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 8 ++ dlls/d2d1/effect.c | 359 ++++++++++++++++++++++++++++++++++++++--------- dlls/d2d1/factory.c | 51 ++++++- dlls/d2d1/tests/d2d1.c | 57 +++++++- 4 files changed, 405 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b15245d431fdcca458f…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022