January 2022 - Wine-Devel - list.winehq.org

[PATCH 1/5] wined3d: Discard texture resources before unloading them in wined3d_texture_destroy_object().
by Henri Verbeet Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a638ec4eeae..34d76249084 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1507,6 +1507,16 @@ static void wined3d_texture_destroy_object(void *object) heap_free(texture->dirty_regions); } + /* Discard the contents of resources with CPU access, to avoid downloading + * them to SYSMEM on unload. */ + if (resource->access & WINED3D_RESOURCE_ACCESS_CPU) + { + for (i = 0; i < sub_count; ++i) + { + wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_DISCARDED); + wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_DISCARDED); + } + } resource->resource_ops->resource_unload(resource); } -- 2.30.2

1 0

[PATCH] d3d11/tests: Ignore random WARP failures in test_pipeline_statistics_query.
by Stefan Dösinger Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4b06ba2c4d8..0ab38e366d3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5900,6 +5900,7 @@ static void test_occlusion_query(void) static void test_pipeline_statistics_query(void) { + static const D3D11_QUERY_DATA_PIPELINE_STATISTICS zero_data = {0}; static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -5947,18 +5948,29 @@ static void test_pipeline_statistics_query(void) ID3D11DeviceContext_End(context, query); get_query_data(context, query, &data, sizeof(data)); - ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); - ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); - ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); - ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); - ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); - ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); - ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); - todo_wine - ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); - ok(!data.HSInvocations, "Got unexpected HSInvocations count: %u.\n", (unsigned int)data.HSInvocations); - ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); - ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + + /* WARP devices randomly return all-zeroed structures as if the draw did not happen. Flushing and + * sleeping a second before ending the query reduces the likelyhood of hitting the bug a lot, but + * does not eliminate it entirely. To make things work reliably ignore such broken results. */ + if (is_warp_device(device) && !memcmp(&data, &zero_data, sizeof(data))) + { + win_skip("WARP device randomly returns zeroed query results.\n"); + } + else + { + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + todo_wine + ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + ok(!data.HSInvocations, "Got unexpected HSInvocations count: %u.\n", (unsigned int)data.HSInvocations); + ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); + ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + } ID3D11DeviceContext_Begin(context, query); draw_color_quad(&test_context, &red); -- 2.34.1

3 2

[v2 PATCH 1/2] mfmediaengine: Add IMFGetService stub.
by Nikolay Sivov Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed a test failure on Windows 8 dlls/mfmediaengine/main.c | 60 ++++++++++++++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 23 +++++++++ 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5b8d91d9632..b098844a7fa 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -114,6 +114,7 @@ struct rect struct media_engine { IMFMediaEngine IMFMediaEngine_iface; + IMFGetService IMFGetService_iface; IMFAsyncCallback session_events; IMFAsyncCallback load_handler; IMFSampleGrabberSinkCallback grabber_callback; @@ -722,6 +723,11 @@ static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *ifac return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); } +static inline struct media_engine *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine, IMFGetService_iface); +} + static struct media_engine *impl_from_session_events_IMFAsyncCallback(IMFAsyncCallback *iface) { return CONTAINING_RECORD(iface, struct media_engine, session_events); @@ -1254,19 +1260,28 @@ static const IMFAsyncCallbackVtbl media_engine_load_handler_vtbl = static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) { + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFMediaEngine) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; - IMFMediaEngine_AddRef(iface); - return S_OK; + } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &engine->IMFGetService_iface; + } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; } - WARN("Unsupported interface %s.\n", debugstr_guid(riid)); - *obj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) @@ -2288,6 +2303,40 @@ static const IMFMediaEngineVtbl media_engine_vtbl = media_engine_OnVideoStreamTick, }; +static HRESULT WINAPI media_engine_gs_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct media_engine *engine = impl_from_IMFGetService(iface); + return IMFMediaEngine_QueryInterface(&engine->IMFMediaEngine_iface, riid, obj); +} + +static ULONG WINAPI media_engine_gs_AddRef(IMFGetService *iface) +{ + struct media_engine *engine = impl_from_IMFGetService(iface); + return IMFMediaEngine_AddRef(&engine->IMFMediaEngine_iface); +} + +static ULONG WINAPI media_engine_gs_Release(IMFGetService *iface) +{ + struct media_engine *engine = impl_from_IMFGetService(iface); + return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); +} + +static HRESULT WINAPI media_engine_gs_GetService(IMFGetService *iface, REFGUID service, + REFIID riid, void **object) +{ + FIXME("%p, %s, %s, %p stub.\n", iface, debugstr_guid(service), debugstr_guid(riid), object); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl media_engine_get_service_vtbl = +{ + media_engine_gs_QueryInterface, + media_engine_gs_AddRef, + media_engine_gs_Release, + media_engine_gs_GetService, +}; + static HRESULT WINAPI media_engine_grabber_callback_QueryInterface(IMFSampleGrabberSinkCallback *iface, REFIID riid, void **obj) { @@ -2442,6 +2491,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct HRESULT hr; engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + engine->IMFGetService_iface.lpVtbl = &media_engine_get_service_vtbl; engine->session_events.lpVtbl = &media_engine_session_events_vtbl; engine->load_handler.lpVtbl = &media_engine_load_handler_vtbl; engine->grabber_callback.lpVtbl = &media_engine_grabber_callback_vtbl; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 096f6e3f2a5..047a81d0d88 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -46,6 +46,21 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static void init_functions(void) { HMODULE mod = GetModuleHandleA("mfplat.dll"); @@ -197,6 +212,7 @@ static void test_CreateInstance(void) IMFDXGIDeviceManager *manager; IMFMediaEngine *media_engine; IMFAttributes *attributes; + IUnknown *unk; UINT token; HRESULT hr; @@ -227,6 +243,13 @@ static void test_CreateInstance(void) hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr); + check_interface(media_engine, &IID_IMFMediaEngine, TRUE); + + hr = IMFMediaEngine_QueryInterface(media_engine, &IID_IMFGetService, (void **)&unk); + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* supported since win10 */, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); + IMFMediaEngine_Release(media_engine); IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); -- 2.34.1

1 1

[PATCH 1/5] d3d10/effect: Add a structure to keep shader variables references.
by Nikolay Sivov Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 11 ++++++++--- dlls/d3d10/effect.c | 30 +++++++++++++++--------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index b35711b55e5..88bfd48bc3d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -263,6 +263,13 @@ enum d3d10_effect_flags D3D10_EFFECT_IS_POOL = 0x2, }; +struct d3d10_effect_var_array +{ + struct d3d10_effect_variable **v; + unsigned int current; + unsigned int count; +}; + /* ID3D10Effect */ struct d3d10_effect { @@ -287,18 +294,16 @@ struct d3d10_effect DWORD samplerstate_count; DWORD rendertargetview_count; DWORD depthstencilview_count; - DWORD used_shader_count; DWORD anonymous_shader_count; DWORD flags; - DWORD used_shader_current; DWORD anonymous_shader_current; struct wine_rb_tree types; struct d3d10_effect_variable *local_buffers; struct d3d10_effect_variable *local_variables; struct d3d10_effect_anonymous_shader *anonymous_shaders; - struct d3d10_effect_variable **used_shaders; + struct d3d10_effect_var_array shaders; struct d3d10_effect_technique *techniques; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 61b48cdeacb..d70be57e8ac 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1235,14 +1235,14 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse const char *ptr; HRESULT hr; - if (v->effect->used_shader_current >= v->effect->used_shader_count) + if (v->effect->shaders.current >= v->effect->shaders.count) { - WARN("Invalid shader? Used shader current(%u) >= used shader count(%u)\n", v->effect->used_shader_current, v->effect->used_shader_count); + WARN("Invalid effect? Used shader current(%u) >= used shader count(%u)\n", + v->effect->shaders.current, v->effect->shaders.count); return E_FAIL; } - v->effect->used_shaders[v->effect->used_shader_current] = v; - ++v->effect->used_shader_current; + v->effect->shaders.v[v->effect->shaders.current++] = v; if (offset >= data_size || !require_space(offset, 1, sizeof(dxbc_size), data_size)) { @@ -3552,7 +3552,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d return E_OUTOFMEMORY; } - if (!(e->used_shaders = heap_calloc(e->used_shader_count, sizeof(*e->used_shaders)))) + if (!(e->shaders.v = heap_calloc(e->shaders.count, sizeof(*e->shaders.v)))) { ERR("Failed to allocate used shaders memory\n"); return E_OUTOFMEMORY; @@ -3698,8 +3698,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->depthstencilview_count); TRACE("Depthstencilview count: %u\n", e->depthstencilview_count); - read_dword(&ptr, &e->used_shader_count); - TRACE("Used shader count: %u\n", e->used_shader_count); + read_dword(&ptr, &e->shaders.count); + TRACE("Used shader count: %u\n", e->shaders.count); read_dword(&ptr, &e->anonymous_shader_count); TRACE("Anonymous shader count: %u\n", e->anonymous_shader_count); @@ -3999,7 +3999,7 @@ static ULONG STDMETHODCALLTYPE d3d10_effect_Release(ID3D10Effect *iface) heap_free(This->anonymous_shaders); } - heap_free(This->used_shaders); + heap_free(This->shaders.v); wine_rb_destroy(&This->types, d3d10_effect_type_destroy, NULL); @@ -4312,9 +4312,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) if (effect->flags & D3D10_EFFECT_OPTIMIZED) return S_OK; - for (i = 0; i < effect->used_shader_count; ++i) + for (i = 0; i < effect->shaders.count; ++i) { - v = effect->used_shaders[i]; + v = effect->shaders.v[i]; if (v->u.shader.reflection) { @@ -8065,19 +8065,19 @@ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT s /* Index is used as an offset from this variable. */ - for (i = 0; i < v->effect->used_shader_count; ++i) + for (i = 0; i < v->effect->shaders.count; ++i) { - if (v == v->effect->used_shaders[i]) break; + if (v == v->effect->shaders.v[i]) break; } - if (i + shader_index >= v->effect->used_shader_count) + if (i + shader_index >= v->effect->shaders.count) { WARN("Invalid shader index %u.\n", shader_index); return E_FAIL; } - *s = &v->effect->used_shaders[i + shader_index]->u.shader; - if (basetype) *basetype = v->effect->used_shaders[i + shader_index]->type->basetype; + *s = &v->effect->shaders.v[i + shader_index]->u.shader; + if (basetype) *basetype = v->effect->shaders.v[i + shader_index]->type->basetype; return S_OK; } -- 2.34.1

3 12

[PATCH v2] bcrypt: Return BCryptSignHash len when only output is NULL.
by Hans Leidekker Jan. 20, 2022

Jan. 20, 2022

From: Piotr Kleski <piotr.kleski(a)mobica.com> v2: Replace check for input parameter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52426 Signed-off-by: Piotr Kleski <piotr.kleski(a)mobica.com> Signed-off-by: Michal Janiszewski <michal.janiszewski(a)mobica.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/gnutls.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index c880c9c1d46..26da55ee758 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -1707,7 +1707,7 @@ static NTSTATUS key_asymmetric_sign( void *args ) return STATUS_NOT_IMPLEMENTED; } - if (!params->input) + if (!params->output) { *params->ret_len = key->u.a.bitlen / 8; return STATUS_SUCCESS; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 3b32ea0349b..0f9456fee07 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -2496,6 +2496,11 @@ static void test_BCryptSignHash(void) ok(!ret, "got %08x\n", ret); ok(len == 256, "got %u\n", len); + /* test len return when only output is NULL, as described in BCryptSignHash doc */ + ret = BCryptSignHash(key, &pad, hash, sizeof(hash), NULL, 0, &len, BCRYPT_PAD_PKCS1); + ok(!ret, "got %08x\n", ret); + ok(len == 256, "got %u\n", len); + len = 0; ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1); ok(ret == STATUS_INVALID_PARAMETER || broken(ret == STATUS_INTERNAL_ERROR) /* < win7 */, "got %08x\n", ret); -- 2.30.2

1 0

[PATCH vkd3d 5/8] vkd3d-shader/hlsl: Support addition for all numeric types in fold_constants().
by Francisco Casas Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_constant_ops.c | 45 ++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index 3a778837..8279c58b 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -20,6 +20,43 @@ #include "hlsl.h" +static int constant_op2_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *tgt, + struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2) +{ + enum hlsl_base_type type = tgt->node.data_type->base_type; + uint32_t u1, u2; + + assert(type == src1->node.data_type->base_type); + assert(type == src2->node.data_type->base_type); + + for (int k = 0; k < 4; k++) + { + switch (type) + { + case HLSL_TYPE_FLOAT: + case HLSL_TYPE_HALF: + tgt->value[k].f = src1->value[k].f + src2->value[k].f; + break; + case HLSL_TYPE_DOUBLE: + tgt->value[k].d = src1->value[k].d + src2->value[k].d; + break; + case HLSL_TYPE_INT: + u1 = src1->value[k].i; + u2 = src2->value[k].i; + tgt->value[k].i = (int32_t)(u1 + u2); + break; + case HLSL_TYPE_UINT: + tgt->value[k].u = src1->value[k].u + src2->value[k].u; + break; + default: + FIXME("Fold \"%s\" for type %s.", debug_hlsl_expr_op(HLSL_OP2_ADD), + debug_hlsl_type(ctx, tgt->node.data_type)); + return 0; + } + } + return 1; +} + bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { struct hlsl_ir_constant *arg1, *arg2 = NULL, *res; @@ -49,6 +86,9 @@ bool fold_constants(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *cont switch (expr->op) { + case HLSL_OP2_ADD: + success = constant_op2_add(ctx, res, arg1, arg2); + break; default: goto fallback; } @@ -120,11 +160,6 @@ fallback: res->value[i].u = -arg1->value[i].u; break; - case HLSL_OP2_ADD: - for (i = 0; i < instr->data_type->dimx; ++i) - res->value[i].u = arg1->value[i].u + arg2->value[i].u; - break; - case HLSL_OP2_MUL: for (i = 0; i < instr->data_type->dimx; ++i) res->value[i].u = arg1->value[i].u * arg2->value[i].u; -- 2.25.1

3 6

[PATCH 1/2] mfmediaengine: Add IMFGetService stub.
by Nikolay Sivov Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 60 ++++++++++++++++++++++-- dlls/mfmediaengine/tests/mfmediaengine.c | 19 ++++++++ 2 files changed, 74 insertions(+), 5 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5b8d91d9632..b098844a7fa 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -114,6 +114,7 @@ struct rect struct media_engine { IMFMediaEngine IMFMediaEngine_iface; + IMFGetService IMFGetService_iface; IMFAsyncCallback session_events; IMFAsyncCallback load_handler; IMFSampleGrabberSinkCallback grabber_callback; @@ -722,6 +723,11 @@ static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *ifac return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); } +static inline struct media_engine *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct media_engine, IMFGetService_iface); +} + static struct media_engine *impl_from_session_events_IMFAsyncCallback(IMFAsyncCallback *iface) { return CONTAINING_RECORD(iface, struct media_engine, session_events); @@ -1254,19 +1260,28 @@ static const IMFAsyncCallbackVtbl media_engine_load_handler_vtbl = static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) { + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); if (IsEqualIID(riid, &IID_IMFMediaEngine) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; - IMFMediaEngine_AddRef(iface); - return S_OK; + } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *obj = &engine->IMFGetService_iface; + } + else + { + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; } - WARN("Unsupported interface %s.\n", debugstr_guid(riid)); - *obj = NULL; - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; } static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) @@ -2288,6 +2303,40 @@ static const IMFMediaEngineVtbl media_engine_vtbl = media_engine_OnVideoStreamTick, }; +static HRESULT WINAPI media_engine_gs_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct media_engine *engine = impl_from_IMFGetService(iface); + return IMFMediaEngine_QueryInterface(&engine->IMFMediaEngine_iface, riid, obj); +} + +static ULONG WINAPI media_engine_gs_AddRef(IMFGetService *iface) +{ + struct media_engine *engine = impl_from_IMFGetService(iface); + return IMFMediaEngine_AddRef(&engine->IMFMediaEngine_iface); +} + +static ULONG WINAPI media_engine_gs_Release(IMFGetService *iface) +{ + struct media_engine *engine = impl_from_IMFGetService(iface); + return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); +} + +static HRESULT WINAPI media_engine_gs_GetService(IMFGetService *iface, REFGUID service, + REFIID riid, void **object) +{ + FIXME("%p, %s, %s, %p stub.\n", iface, debugstr_guid(service), debugstr_guid(riid), object); + + return E_NOTIMPL; +} + +static const IMFGetServiceVtbl media_engine_get_service_vtbl = +{ + media_engine_gs_QueryInterface, + media_engine_gs_AddRef, + media_engine_gs_Release, + media_engine_gs_GetService, +}; + static HRESULT WINAPI media_engine_grabber_callback_QueryInterface(IMFSampleGrabberSinkCallback *iface, REFIID riid, void **obj) { @@ -2442,6 +2491,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct HRESULT hr; engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + engine->IMFGetService_iface.lpVtbl = &media_engine_get_service_vtbl; engine->session_events.lpVtbl = &media_engine_session_events_vtbl; engine->load_handler.lpVtbl = &media_engine_load_handler_vtbl; engine->grabber_callback.lpVtbl = &media_engine_grabber_callback_vtbl; diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 096f6e3f2a5..ea63d4e284f 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -46,6 +46,21 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); } +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + static void init_functions(void) { HMODULE mod = GetModuleHandleA("mfplat.dll"); @@ -184,6 +199,7 @@ static void test_factory(void) ok(hr == S_OK, "IMFMediaEngineClassFactory_CreateInstance failed: %#x.\n", hr); EXPECT_REF(factory, 1); + IMFMediaEngine_Release(media_engine); IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); @@ -227,6 +243,9 @@ static void test_CreateInstance(void) hr = IMFMediaEngineClassFactory_CreateInstance(factory, MF_MEDIA_ENGINE_WAITFORSTABLE_STATE, attributes, &media_engine); ok(hr == S_OK, "Failed to create media engine, hr %#x.\n", hr); + check_interface(media_engine, &IID_IMFMediaEngine, TRUE); + check_interface(media_engine, &IID_IMFGetService, TRUE); + IMFMediaEngine_Release(media_engine); IMFAttributes_Release(attributes); IMFDXGIDeviceManager_Release(manager); -- 2.34.1

3 5

[PATCH 1/7] dinput/tests: Test HID device with steering wheel and various pedal combinations.
by Rémi Bernon Jan. 20, 2022

Jan. 20, 2022

From: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/tests/joystick8.c | 212 +++++++++++++++++++++++++++++++++- 1 file changed, 210 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index dd06b1b5185..7de4ab80d6d 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -2173,6 +2173,127 @@ static BOOL test_device_types( DWORD version ) REPORT_COUNT(1, 1), INPUT(1, Data|Var|Abs|Null), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 5), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; + static const unsigned char wheel_steering_only_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Physical), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_STEERING), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 127), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_GENERIC_HATSWITCH), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 8), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 8), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs|Null), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 5), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; + static const unsigned char wheel_dualpedals_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Physical), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_STEERING), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_ACCELERATOR), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_BRAKE), + USAGE(1, HID_USAGE_GENERIC_X), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 127), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 4), + INPUT(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_GENERIC_HATSWITCH), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 8), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 8), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs|Null), + + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 5), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 8), + INPUT(1, Data|Var|Abs), + END_COLLECTION, + END_COLLECTION, + }; + static const unsigned char wheel_threepedals_desc[] = + { + USAGE_PAGE(1, HID_USAGE_PAGE_GENERIC), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Application), + USAGE(1, HID_USAGE_GENERIC_JOYSTICK), + COLLECTION(1, Physical), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_STEERING), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_ACCELERATOR), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_BRAKE), + USAGE(4, (HID_USAGE_PAGE_SIMULATION<<16)|HID_USAGE_SIMULATION_CLUTCH), + USAGE(1, HID_USAGE_GENERIC_Y), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 127), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 127), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 5), + INPUT(1, Data|Var|Abs), + + USAGE(1, HID_USAGE_GENERIC_HATSWITCH), + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, 8), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 8), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + INPUT(1, Data|Var|Abs|Null), + USAGE_PAGE(1, HID_USAGE_PAGE_BUTTON), USAGE_MINIMUM(1, 1), USAGE_MAXIMUM(1, 5), @@ -2222,6 +2343,30 @@ static BOOL test_device_types( DWORD version ) .InputReportByteLength = 5, }, }, + { + .report_desc_buf = wheel_steering_only_desc, + .report_desc_len = sizeof(wheel_steering_only_desc), + .hid_caps = + { + .InputReportByteLength = 3, + }, + }, + { + .report_desc_buf = wheel_dualpedals_desc, + .report_desc_len = sizeof(wheel_dualpedals_desc), + .hid_caps = + { + .InputReportByteLength = 6, + }, + }, + { + .report_desc_buf = wheel_threepedals_desc, + .report_desc_len = sizeof(wheel_threepedals_desc), + .hid_caps = + { + .InputReportByteLength = 7, + }, + }, }; const DIDEVCAPS expect_caps[] = { @@ -2257,6 +2402,33 @@ static BOOL test_device_types( DWORD version ) .dwPOVs = 1, .dwButtons = 5, }, + { + .dwSize = sizeof(DIDEVCAPS), + .dwFlags = DIDC_ATTACHED|DIDC_EMULATED, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID|(DI8DEVTYPEDRIVING_LIMITED << 8)|DI8DEVTYPE_DRIVING + : DIDEVTYPE_HID|(DIDEVTYPEJOYSTICK_WHEEL << 8)|DIDEVTYPE_JOYSTICK, + .dwAxes = 1, + .dwPOVs = 1, + .dwButtons = 5, + }, + { + .dwSize = sizeof(DIDEVCAPS), + .dwFlags = DIDC_ATTACHED|DIDC_EMULATED, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID|(DI8DEVTYPEDRIVING_DUALPEDALS << 8)|DI8DEVTYPE_DRIVING + : DIDEVTYPE_HID|(DIDEVTYPEJOYSTICK_WHEEL << 8)|DIDEVTYPE_JOYSTICK, + .dwAxes = 4, + .dwPOVs = 1, + .dwButtons = 5, + }, + { + .dwSize = sizeof(DIDEVCAPS), + .dwFlags = DIDC_ATTACHED|DIDC_EMULATED, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID|(DI8DEVTYPEDRIVING_THREEPEDALS << 8)|DI8DEVTYPE_DRIVING + : DIDEVTYPE_HID|(DIDEVTYPEJOYSTICK_WHEEL << 8)|DIDEVTYPE_JOYSTICK, + .dwAxes = 5, + .dwPOVs = 1, + .dwButtons = 5, + }, }; const DIDEVICEINSTANCEW expect_devinst[] = @@ -2309,6 +2481,42 @@ static BOOL test_device_types( DWORD version ) .wUsagePage = HID_USAGE_PAGE_GENERIC, .wUsage = HID_USAGE_GENERIC_JOYSTICK, }, + { + .dwSize = sizeof(DIDEVICEINSTANCEW), + .guidInstance = expect_guid_product, + .guidProduct = expect_guid_product, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID|(DI8DEVTYPEDRIVING_LIMITED << 8)|DI8DEVTYPE_DRIVING + : DIDEVTYPE_HID|(DIDEVTYPEJOYSTICK_WHEEL << 8)|DIDEVTYPE_JOYSTICK, + .tszInstanceName = L"Wine test root driver", + .tszProductName = L"Wine test root driver", + .guidFFDriver = GUID_NULL, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }, + { + .dwSize = sizeof(DIDEVICEINSTANCEW), + .guidInstance = expect_guid_product, + .guidProduct = expect_guid_product, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID|(DI8DEVTYPEDRIVING_DUALPEDALS << 8)|DI8DEVTYPE_DRIVING + : DIDEVTYPE_HID|(DIDEVTYPEJOYSTICK_WHEEL << 8)|DIDEVTYPE_JOYSTICK, + .tszInstanceName = L"Wine test root driver", + .tszProductName = L"Wine test root driver", + .guidFFDriver = GUID_NULL, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }, + { + .dwSize = sizeof(DIDEVICEINSTANCEW), + .guidInstance = expect_guid_product, + .guidProduct = expect_guid_product, + .dwDevType = version >= 0x800 ? DIDEVTYPE_HID|(DI8DEVTYPEDRIVING_THREEPEDALS << 8)|DI8DEVTYPE_DRIVING + : DIDEVTYPE_HID|(DIDEVTYPEJOYSTICK_WHEEL << 8)|DIDEVTYPE_JOYSTICK, + .tszInstanceName = L"Wine test root driver", + .tszProductName = L"Wine test root driver", + .guidFFDriver = GUID_NULL, + .wUsagePage = HID_USAGE_PAGE_GENERIC, + .wUsage = HID_USAGE_GENERIC_JOYSTICK, + }, }; C_ASSERT(ARRAY_SIZE(expect_caps) == ARRAY_SIZE(device_desc)); @@ -2349,7 +2557,7 @@ static BOOL test_device_types( DWORD version ) ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); check_member( devinst, expect_devinst[i], "%d", dwSize ); check_member_guid( devinst, expect_devinst[i], guidProduct ); - todo_wine_if( version <= 0x700 && i == 3 ) + todo_wine_if( (version <= 0x700 && i == 3) || i > 3 ) check_member( devinst, expect_devinst[i], "%#x", dwDevType ); check_member_guid( devinst, expect_devinst[i], guidFFDriver ); check_member( devinst, expect_devinst[i], "%04x", wUsagePage ); @@ -2359,7 +2567,7 @@ static BOOL test_device_types( DWORD version ) ok( hr == DI_OK, "GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps[i], "%d", dwSize ); check_member( caps, expect_caps[i], "%#x", dwFlags ); - todo_wine_if( version <= 0x700 && i == 3 ) + todo_wine_if( (version <= 0x700 && i == 3) || i > 3 ) check_member( caps, expect_caps[i], "%#x", dwDevType ); check_member( caps, expect_caps[i], "%d", dwAxes ); check_member( caps, expect_caps[i], "%d", dwButtons ); -- 2.34.1

2 8

[PATCH] mf/samplegrabber: Cancel pending sample timer.
by Nikolay Sivov Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index e0287e1e1db..e7d3be68df3 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -849,11 +849,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) if (grabber->clock) IMFPresentationClock_Release(grabber->clock); if (grabber->timer) - { - if (grabber->cancel_key) - IMFTimer_CancelTimer(grabber->timer, grabber->cancel_key); IMFTimer_Release(grabber->timer); - } if (grabber->cancel_key) IUnknown_Release(grabber->cancel_key); if (grabber->stream_event_queue) @@ -973,10 +969,21 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkById(IMFMediaSink *iface, return hr; } +static void sample_grabber_cancel_timer(struct sample_grabber *grabber) +{ + if (grabber->timer && grabber->cancel_key) + { + IMFTimer_CancelTimer(grabber->timer, grabber->cancel_key); + IUnknown_Release(grabber->cancel_key); + grabber->cancel_key = NULL; + } +} + static void sample_grabber_set_presentation_clock(struct sample_grabber *grabber, IMFPresentationClock *clock) { if (grabber->clock) { + sample_grabber_cancel_timer(grabber); IMFPresentationClock_RemoveClockStateSink(grabber->clock, &grabber->IMFClockStateSink_iface); IMFPresentationClock_Release(grabber->clock); if (grabber->timer) @@ -1122,6 +1129,9 @@ static HRESULT sample_grabber_set_state(struct sample_grabber *grabber, enum sin hr = MF_E_INVALID_STATE_TRANSITION; else { + if (state == SINK_STATE_STOPPED) + sample_grabber_cancel_timer(grabber); + if (state == SINK_STATE_RUNNING && grabber->state == SINK_STATE_STOPPED) { /* Every transition to running state sends a bunch requests to build up initial queue. */ -- 2.34.1

2 1

[PATCH] kernel32/tests: Add tests for SetCurrentConsoleFontEx
by Hugh McMaster Jan. 20, 2022

Jan. 20, 2022

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- dlls/kernel32/tests/console.c | 162 ++++++++++++++++++++++++++++++++-- 1 file changed, 156 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index e4d9d43f4c4..12924719f16 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -3558,12 +3558,46 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output) ok(cfix.dwFontSize.Y == cfi.dwFontSize.Y, "expected values to match\n"); } +static HANDLE console_event; + +static void CALLBACK console_event_hook_proc(HWINEVENTHOOK hook, DWORD event, HWND hwnd, + LONG object_id, LONG child_id, + DWORD thread_id, DWORD event_time) +{ + SetEvent(console_event); +} + +static DWORD WINAPI console_event_thread_proc(void *param) +{ + MSG msg; + HANDLE hthread_event = *(HANDLE *)param; + HWINEVENTHOOK hook; + + hook = SetWinEventHook(EVENT_CONSOLE_LAYOUT, EVENT_CONSOLE_LAYOUT, NULL, + console_event_hook_proc, 0, 0, WINEVENT_OUTOFCONTEXT); + ok(hook != 0, "SetWinEventHook failed\n"); + + SetEvent(hthread_event); + + while (GetMessageA(&msg, 0, 0, 0) > 0) + DispatchMessageA(&msg); + + ok(UnhookWinEvent(hook), "UnhookWinEvent failed\n"); + + return 0; +} + static void test_SetCurrentConsoleFontEx(HANDLE std_output) { - CONSOLE_FONT_INFOEX orig_cfix, cfix; + CONSOLE_FONT_INFOEX orig_cfix, cfix, tmp; BOOL ret; - HANDLE pipe1, pipe2; + HANDLE pipe1, pipe2, hthread, hthread_event; HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE); + DWORD hthread_id, res; + HWND hwnd = GetConsoleWindow(); + RECT r; + CONSOLE_SCREEN_BUFFER_INFO csbi; + unsigned int font_height; orig_cfix.cbSize = sizeof(CONSOLE_FONT_INFOEX); @@ -3652,26 +3686,142 @@ static void test_SetCurrentConsoleFontEx(HANDLE std_output) ok(!ret, "got %d, expected 0\n", ret); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + /* Font parameter tests */ + console_event = CreateEventA(NULL, FALSE, FALSE, "console_event"); + ok(console_event != NULL, "CreateEvent failed: %u\n", GetLastError()); + + hthread_event = CreateEventA(NULL, FALSE, FALSE, "hthread_event"); + ok(hthread_event != NULL, "CreateEvent failed: %u\n", GetLastError()); + + hthread = CreateThread(NULL, 0, console_event_thread_proc, &hthread_event, 0, &hthread_id); + ok(hthread != NULL, "CreateThread failed: %u\n", GetLastError()); + + res = WaitForSingleObject(hthread_event, INFINITE); + ok(res == WAIT_OBJECT_0, "got %u, expected WAIT_OBJECT_0\n", res); + + /* Try setting console font information for the current window size */ + cfix.cbSize = sizeof(cfix); + cfix.nFont = 0; + cfix.dwFontSize.X = 0; + cfix.FontFamily = TMPF_VECTOR | TMPF_TRUETYPE | FF_MODERN; + cfix.FontWeight = FW_NORMAL; + lstrcpyW(cfix.FaceName, L"Lucida Console"); + + tmp.cbSize = sizeof(tmp); + + /* Test font height 20 */ + cfix.dwFontSize.Y = 20; SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_input, TRUE, &cfix); - ok(!ret, "got %d, expected 0\n", ret); - todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + res = WaitForSingleObject(console_event, 1000); + todo_wine ok(res == WAIT_OBJECT_0, "(1) got %u, expected WAIT_OBJECT_0\n", res); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + GetClientRect(hwnd, &r); + GetConsoleScreenBufferInfo(std_output, &csbi); + font_height = (r.bottom - r.top) / (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); + ok(tmp.dwFontSize.Y == font_height, "got %u, expected %u\n", tmp.dwFontSize.Y, font_height); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + /* Test font height 12 */ + cfix.dwFontSize.Y = 12; SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + res = WaitForSingleObject(console_event, 1000); + todo_wine ok(res == WAIT_OBJECT_0, "(2) got %u, expected WAIT_OBJECT_0\n", res); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + GetClientRect(hwnd, &r); + GetConsoleScreenBufferInfo(std_output, &csbi); + font_height = (r.bottom - r.top) / (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); + ok(tmp.dwFontSize.Y == font_height, "got %u, expected %u\n", tmp.dwFontSize.Y, font_height); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test font height 16 */ + cfix.dwFontSize.Y = 16; SetLastError(0xdeadbeef); - ret = SetCurrentConsoleFontEx(std_output, TRUE, &cfix); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + res = WaitForSingleObject(console_event, 1000); + todo_wine ok(res == WAIT_OBJECT_0, "(3) got %u, expected WAIT_OBJECT_0\n", res); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + GetClientRect(hwnd, &r); + GetConsoleScreenBufferInfo(std_output, &csbi); + font_height = (r.bottom - r.top) / (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); + ok(tmp.dwFontSize.Y == font_height, "got %u, expected %u\n", tmp.dwFontSize.Y, font_height); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test invalid font height */ + cfix.dwFontSize.Y = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + res = WaitForSingleObject(console_event, 1000); + todo_wine ok(res == WAIT_OBJECT_0, "(4) got %u, expected WAIT_OBJECT_0\n", res); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + GetClientRect(hwnd, &r); + GetConsoleScreenBufferInfo(std_output, &csbi); + font_height = (r.bottom - r.top) / (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); + ok(tmp.dwFontSize.Y == font_height, "got %u, expected %u\n", tmp.dwFontSize.Y, font_height); + todo_wine ok(font_height == 12, "got %u, expected 12\n", font_height); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == cfix.FontWeight, "got %u, expected %u\n", tmp.FontWeight, cfix.FontWeight); + + /* Test invalid font weight */ + cfix.dwFontSize.Y = 16; + cfix.FontWeight = 0; + SetLastError(0xdeadbeef); + ret = SetCurrentConsoleFontEx(std_output, FALSE, &cfix); + todo_wine ok(ret, "got %d, expected non-zero\n", ret); + todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + res = WaitForSingleObject(console_event, 1000); + todo_wine ok(res == WAIT_OBJECT_0, "(5) got %u, expected WAIT_OBJECT_0\n", res); + + ret = GetCurrentConsoleFontEx(std_output, FALSE, &tmp); + ok(ret, "GetCurrentConsoleFontEx failed: %u\n", GetLastError()); + GetClientRect(hwnd, &r); + GetConsoleScreenBufferInfo(std_output, &csbi); + font_height = (r.bottom - r.top) / (csbi.srWindow.Bottom - csbi.srWindow.Top + 1); + ok(tmp.dwFontSize.Y == font_height, "got %u, expected %u\n", tmp.dwFontSize.Y, font_height); + todo_wine ok(tmp.FontFamily == cfix.FontFamily, "got %u, expected %u\n", tmp.FontFamily, cfix.FontFamily); + ok(tmp.FontWeight == FW_NORMAL, "got %u, expected %u\n", tmp.FontWeight, FW_NORMAL); + /* Restore original console font parameters */ SetLastError(0xdeadbeef); ret = SetCurrentConsoleFontEx(std_output, FALSE, &orig_cfix); todo_wine ok(ret, "got %d, expected non-zero\n", ret); todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + + res = WaitForSingleObject(console_event, 1000); + todo_wine ok(res == WAIT_OBJECT_0, "(5) got %u, expected WAIT_OBJECT_0\n", res); + + /* Clean up */ + PostThreadMessageA(hthread_id, WM_QUIT, 0, 0); + res = WaitForSingleObject(hthread, INFINITE); + ok(res == WAIT_OBJECT_0, "got %u, expected WAIT_OBJECT_0\n", res); + CloseHandle(hthread); + CloseHandle(hthread_event); + CloseHandle(console_event); } static void test_GetConsoleFontSize(HANDLE std_output) -- 2.34.1

1 0