- wine-devel - winehq.org

[PATCH 2/2] msvcp140_atomic_wait: Implement __std_parallel_algorithms_hw_threads.
by Daniel Lehman 25 Jan '22

25 Jan '22

2 1

[PATCH 1/2] winevulkan: Update to VK spec version 1.3.204.
by Georg Lehmann 25 Jan '22

25 Jan '22

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index e548025a6ad..33c4495d8aa 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.203" +VK_XML_VERSION = "1.3.204" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.35.0

1 1

[PATCH 1/9] winhttp: Return ERROR_INVALID_OPERATION when websocket is in the wrong state.
by Paul Gofman 25 Jan '22

25 Jan '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The main idea behind this series is to address a few things regarind socket shutdown and close: - avoid directly sending shutdown frame from WinHttpWebSocketClose() which doesn't cope nicely with sync / async send duality; - address the case of closing websocket which has receive waiting. - changing the socket status right away before the close or shutdown operation is complete through the queue (which is needed to straigten up the above and the following later bit which didn't fit in this series). In theory we could maybe cancel socket I/O on the socket to abort receive instead of teaching socket receive to read the close status but that seems harder to synchronize and I suppose that would complicate the things considerably without a clear advantage. The remaining part of WinHttpWebSocketClose() changes which didn't fit in in this patch series concerns the way the callback is sent when receive operation is pending during WinHttpWebSocketClose() call. Windows always calls the callback synchronously during WinHttpWebSocketClose() with dwResult 0 and dwError ERROR_WINHTTP_OPERATION_CANCELLED, the async receive thread does not call any callback in this case. dlls/winhttp/request.c | 10 +++++----- dlls/winhttp/tests/notification.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 31e65a68359..fc2c06bd11f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3324,7 +3324,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ if (socket->state != SOCKET_STATE_OPEN) { release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + return ERROR_INVALID_OPERATION; } if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) @@ -3625,7 +3625,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D if (socket->state > SOCKET_STATE_SHUTDOWN) { release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + return ERROR_INVALID_OPERATION; } if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) @@ -3704,7 +3704,7 @@ DWORD WINAPI WinHttpWebSocketShutdown( HINTERNET hsocket, USHORT status, void *r if (socket->state >= SOCKET_STATE_SHUTDOWN) { release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + return ERROR_INVALID_OPERATION; } if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) @@ -3814,7 +3814,7 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if (socket->state >= SOCKET_STATE_CLOSED) { release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + return ERROR_INVALID_OPERATION; } if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) @@ -3859,7 +3859,7 @@ DWORD WINAPI WinHttpWebSocketQueryCloseStatus( HINTERNET hsocket, USHORT *status if (socket->state < SOCKET_STATE_CLOSED) { release_object( &socket->hdr ); - return ERROR_WINHTTP_INCORRECT_HANDLE_STATE; + return ERROR_INVALID_OPERATION; } *status = socket->status; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index e919159ba98..0c3ff98c342 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -816,6 +816,12 @@ static void test_websocket(BOOL secure) ok( err == ERROR_SUCCESS, "got %u\n", err ); WaitForSingleObject( info.wait, INFINITE ); + err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); + ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, + (void*)"hello", sizeof("hello") ); + ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + setup_test( &info, winhttp_websocket_receive, __LINE__ ); buffer[0] = 0; size = 0xdeadbeef; @@ -838,8 +844,15 @@ static void test_websocket(BOOL secure) ok( type == 0xdeadbeef, "got %u\n", type ); ok( buffer[0] == 'h', "unexpected data\n" ); + close_status = 0xdead; + size = sizeof(buffer) + 1; + err = pWinHttpWebSocketQueryCloseStatus( socket, &close_status, buffer, sizeof(buffer), &size ); + ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); + ok( close_status == 0xdead, "got %u\n", close_status ); + ok( size == sizeof(buffer) + 1, "got %u\n", size ); + setup_test( &info, winhttp_websocket_close, __LINE__ ); - ret = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); + err = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); ok( err == ERROR_SUCCESS, "got %u\n", err ); WaitForSingleObject( info.wait, INFINITE ); -- 2.34.1

3 21

[PATCH v6] ntdll: Use case insensitive comparison in is_import_dll_system().
by Paul Gofman 25 Jan '22

25 Jan '22

From: Ben Shefte <shefben(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52446 Fixes a regression introduced by commit 250c113169217933b1fffa8024fa958f71b8aee7. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 224209. v6: - make patch compile; - change subject; - use _stricmp() instead of stricmp(). changelog: v1-v4 -> 5 removed unicode code referemces Fixes Regression from: Wine 6.21 dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..b50b9e61bbc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -628,7 +628,7 @@ static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_ { const char *name = get_rva( mod->DllBase, import->Name ); - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + return !_stricmp( name, "ntdll.dll" ) || !_stricmp( name, "kernel32.dll" ); } /********************************************************************** -- 2.34.1

1 0

[PATCH 2/2] server: Strip terminating '\0' from the registry key name. (Resend)
by Dmitry Timoshkov 25 Jan '22

25 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 18 +++++++++++++++++- server/registry.c | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 445c05a02e1..956df02fae4 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -456,6 +456,14 @@ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtOpenKey( &key, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win8 */, + "NtOpenKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + pRtlFreeUnicodeString( &str ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); @@ -630,13 +638,21 @@ static void test_NtCreateKey(void) status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - if (!status) pNtClose( subkey ); + pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); diff --git a/server/registry.c b/server/registry.c index 2a2bc9a4e68..6a03a41a9de 100644 --- a/server/registry.c +++ b/server/registry.c @@ -477,6 +477,8 @@ static inline void get_req_path( struct unicode_str *str ) { str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); + + while (str->len && !str->str[str->len / sizeof(WCHAR) - 1]) str->len -= sizeof(WCHAR); } /* return the next token in a given path */ -- 2.34.1

2 3

[PATCH 07/11] d3d11/tests: Add some tests for ID3DUserDefinedAnnotation.
by Henri Verbeet 25 Jan '22

25 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1e2f04a50ac..148043dc914 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33994,6 +33994,46 @@ static void test_dynamic_map_synchronization(void) release_test_context(&test_context); } +static void test_user_defined_annotation(void) +{ + struct d3d11_test_context test_context; + ID3DUserDefinedAnnotation *annotation; + ID3D11DeviceContext *context; + HRESULT hr; + int ret; + + if (!init_test_context(&test_context, NULL)) + return; + + hr = ID3D11DeviceContext_QueryInterface(test_context.immediate_context, + &IID_ID3DUserDefinedAnnotation, (void **)&annotation); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ret = ID3DUserDefinedAnnotation_BeginEvent(annotation, L"Event 1"); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ret = ID3DUserDefinedAnnotation_EndEvent(annotation); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ID3DUserDefinedAnnotation_SetMarker(annotation, L"Marker 1"); + ret = ID3DUserDefinedAnnotation_GetStatus(annotation); + ok(!ret, "Got unexpected status %#x.\n", ret); + ID3DUserDefinedAnnotation_Release(annotation); + + hr = ID3D11Device_CreateDeferredContext(test_context.device, 0, &context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_QueryInterface(context, &IID_ID3DUserDefinedAnnotation, (void **)&annotation); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ret = ID3DUserDefinedAnnotation_BeginEvent(annotation, L"Event 2"); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ret = ID3DUserDefinedAnnotation_EndEvent(annotation); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ID3DUserDefinedAnnotation_SetMarker(annotation, L"Marker 2"); + ret = ID3DUserDefinedAnnotation_GetStatus(annotation); + ok(!ret, "Got unexpected status %#x.\n", ret); + ID3DUserDefinedAnnotation_Release(annotation); + ID3D11DeviceContext_Release(context); + + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -34168,6 +34208,7 @@ START_TEST(d3d11) queue_test(test_texture_compressed_3d); queue_test(test_constant_buffer_offset); queue_test(test_dynamic_map_synchronization); + queue_test(test_user_defined_annotation); run_queued_tests(); -- 2.30.2

2 1

[PATCH v2 6/6] d3d10/effect: Fix index access in GetBlendState().
by Matteo Bruni 25 Jan '22

25 Jan '22

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Add a GetBlendState(..., 1, ...) test. dlls/d3d10/effect.c | 12 +++++------- dlls/d3d10/tests/effect.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 96fd994fe77..e3c261d0270 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8531,17 +8531,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_blend_variable_GetBlendState(ID3D1 TRACE("iface %p, index %u, blend_state %p.\n", iface, index, blend_state); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - else if (index) - return E_FAIL; - - if (v->type->basetype != D3D10_SVT_BLEND) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a blend state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->blend_states))) + return E_FAIL; + if ((*blend_state = v->u.state.object.blend)) ID3D10BlendState_AddRef(*blend_state); diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5c2e7766767..b4ea4402a05 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4530,8 +4530,22 @@ static void test_effect_state_groups(void) blend_desc.RenderTargetWriteMask[0]); ok(blend_desc.RenderTargetWriteMask[7] == 0x7, "Got unexpected RenderTargetWriteMask[7] %#x.\n", blend_desc.RenderTargetWriteMask[7]); + hr = b->lpVtbl->GetBlendState(b, 0, &blend_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10BlendState_GetDesc(blend_state, &blend_desc); + ok(blend_desc.SrcBlend == D3D10_BLEND_ONE, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); + ID3D10BlendState_Release(blend_state); b->lpVtbl->GetBackingStore(b, 1, &blend_desc); ok(blend_desc.SrcBlend == D3D10_BLEND_SRC_COLOR, "Got unexpected SrcBlend %#x.\n", blend_desc.SrcBlend); + hr = b->lpVtbl->GetBlendState(b, 1, &blend_state); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10BlendState_GetDesc(blend_state, &blend_desc); + /* We can't check the SrcBlend value from the ID3D10BlendState object + * descriptor because BlendEnable[0] is effectively false, which forces + * normalization of all the other descriptor values. We can at least + * confirm that we got blend_state2 by checking BlendEnable[0] itself. */ + ok(!blend_desc.BlendEnable[0], "Got unexpected BlendEnable[0] %#x.\n", blend_desc.BlendEnable[0]); + ID3D10BlendState_Release(blend_state); v = effect->lpVtbl->GetVariableByName(effect, "ds_state"); d = v->lpVtbl->AsDepthStencil(v); -- 2.34.1

1 0

[PATCH 1/6] d3d10/effect: Fix iteration in GetBackingStore() for depth stencil states.
by Nikolay Sivov 25 Jan '22

25 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 11 +++++------ dlls/d3d10/tests/effect.c | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a6a1189be20..3198ad5a575 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8796,21 +8796,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingS TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); - - if (v->type->basetype != D3D10_SVT_DEPTHSTENCIL) + if (!iface->lpVtbl->IsValid(iface)) { - WARN("Variable is not a depth stencil state.\n"); + WARN("Invalid variable.\n"); return E_FAIL; } + if (!(v = d3d10_get_state_variable(v, index, &v->effect->ds_states))) + return E_FAIL; + *desc = v->u.state.desc.depth_stencil; return S_OK; } - static const struct ID3D10EffectDepthStencilVariableVtbl d3d10_effect_depth_stencil_variable_vtbl = { /* ID3D10EffectVariable methods */ diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 418747b5df5..93ad4d8a475 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4548,6 +4548,8 @@ static void test_effect_state_groups(void) ds_desc.BackFace.StencilPassOp); ok(ds_desc.BackFace.StencilFunc == D3D10_COMPARISON_GREATER_EQUAL, "Got unexpected BackFaceStencilFunc %#x.\n", ds_desc.BackFace.StencilFunc); + d->lpVtbl->GetBackingStore(d, 1, &ds_desc); + ok(!ds_desc.DepthEnable, "Got unexpected DepthEnable %#x.\n", ds_desc.DepthEnable); v = effect->lpVtbl->GetVariableByName(effect, "rast_state"); r = v->lpVtbl->AsRasterizer(v); -- 2.34.1

2 10

[PATCH 06/11] d3d11: Implement the ID3DUserDefinedAnnotation interface.
by Henri Verbeet 25 Jan '22

25 Jan '22

From: Andrey Gusev <andrey.goosev(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51354 Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 79 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 41272d08da8..efe26551258 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -545,6 +545,7 @@ struct d3d11_device_context { ID3D11DeviceContext1 ID3D11DeviceContext1_iface; ID3D11Multithread ID3D11Multithread_iface; + ID3DUserDefinedAnnotation ID3DUserDefinedAnnotation_iface; LONG refcount; D3D11_DEVICE_CONTEXT_TYPE type; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index cb2969d8cf6..f0cbb1741ab 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -484,6 +484,10 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_context_QueryInterface(ID3D11Devic { *out = &context->ID3D11Multithread_iface; } + else if (IsEqualGUID(iid, &IID_ID3DUserDefinedAnnotation)) + { + *out = &context->ID3DUserDefinedAnnotation_iface; + } else { WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); @@ -3187,11 +3191,86 @@ static const struct ID3D11MultithreadVtbl d3d11_multithread_vtbl = d3d11_multithread_GetMultithreadProtected, }; +/* ID3DUserDefinedAnnotation methods */ + +static inline struct d3d11_device_context *impl_from_ID3DUserDefinedAnnotation(ID3DUserDefinedAnnotation *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_device_context, ID3DUserDefinedAnnotation_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_user_defined_annotation_QueryInterface(ID3DUserDefinedAnnotation *iface, + REFIID iid, void **out) +{ + struct d3d11_device_context *context = impl_from_ID3DUserDefinedAnnotation(iface); + + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + return d3d11_device_context_QueryInterface(&context->ID3D11DeviceContext1_iface, iid, out); +} + +static ULONG STDMETHODCALLTYPE d3d11_user_defined_annotation_AddRef(ID3DUserDefinedAnnotation *iface) +{ + struct d3d11_device_context *context = impl_from_ID3DUserDefinedAnnotation(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_device_context_AddRef(&context->ID3D11DeviceContext1_iface); +} + +static ULONG STDMETHODCALLTYPE d3d11_user_defined_annotation_Release(ID3DUserDefinedAnnotation *iface) +{ + struct d3d11_device_context *context = impl_from_ID3DUserDefinedAnnotation(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_device_context_Release(&context->ID3D11DeviceContext1_iface); +} + +static int STDMETHODCALLTYPE d3d11_user_defined_annotation_BeginEvent(ID3DUserDefinedAnnotation *iface, + const WCHAR *name) +{ + TRACE("iface %p, name %s.\n", iface, debugstr_w(name)); + + return -1; +} + +static int STDMETHODCALLTYPE d3d11_user_defined_annotation_EndEvent(ID3DUserDefinedAnnotation *iface) +{ + TRACE("iface %p.\n", iface); + + return -1; +} + +static void STDMETHODCALLTYPE d3d11_user_defined_annotation_SetMarker(ID3DUserDefinedAnnotation *iface, + const WCHAR *name) +{ + TRACE("iface %p, name %s.\n", iface, debugstr_w(name)); +} + +static BOOL STDMETHODCALLTYPE d3d11_user_defined_annotation_GetStatus(ID3DUserDefinedAnnotation *iface) +{ + TRACE("iface %p.\n", iface); + + return FALSE; +} + +static const struct ID3DUserDefinedAnnotationVtbl d3d11_user_defined_annotation_vtbl = +{ + d3d11_user_defined_annotation_QueryInterface, + d3d11_user_defined_annotation_AddRef, + d3d11_user_defined_annotation_Release, + d3d11_user_defined_annotation_BeginEvent, + d3d11_user_defined_annotation_EndEvent, + d3d11_user_defined_annotation_SetMarker, + d3d11_user_defined_annotation_GetStatus, +}; + static void d3d11_device_context_init(struct d3d11_device_context *context, struct d3d_device *device, D3D11_DEVICE_CONTEXT_TYPE type) { context->ID3D11DeviceContext1_iface.lpVtbl = &d3d11_device_context_vtbl; context->ID3D11Multithread_iface.lpVtbl = &d3d11_multithread_vtbl; + context->ID3DUserDefinedAnnotation_iface.lpVtbl = &d3d11_user_defined_annotation_vtbl; context->refcount = 1; context->type = type; -- 2.30.2

2 1

[PATCH 11/11] wined3d: Use wined3d_mask_from_size() in set_glsl_shader_program().
by Henri Verbeet 25 Jan '22

25 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a49644a8fc5..e6381265def 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10506,7 +10506,7 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, { unsigned int clip_distance_count = wined3d_popcount(pre_rasterization_shader->reg_maps.clip_distance_mask); entry->shader_controlled_clip_distances = 1; - entry->clip_distance_mask = (1u << clip_distance_count) - 1; + entry->clip_distance_mask = wined3d_mask_from_size(clip_distance_count); } if (needs_legacy_glsl_syntax(gl_info)) -- 2.30.2

1 0

[PATCH 10/11] wined3d: Use wined3d_mask_from_size() in shader_glsl_generate_stream_output_setup().
by Henri Verbeet 25 Jan '22

25 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b2f9d1e0e41..a49644a8fc5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7318,7 +7318,7 @@ static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffe DWORD write_mask; char str_mask[6]; - write_mask = ((1u << e->component_count) - 1) << component_idx; + write_mask = wined3d_mask_from_size(e->component_count) << component_idx; shader_glsl_write_mask_to_str(write_mask, str_mask); shader_addline(buffer, "shader_out.reg%u_%u_%u = outputs[%u]%s;\n", register_idx, component_idx, component_idx + e->component_count - 1, -- 2.30.2

1 0

[PATCH 09/11] wined3d: Use wined3d_mask_from_size() in shader_glsl_gather4().
by Henri Verbeet 25 Jan '22

25 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b5d36884f5..b2f9d1e0e41 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6215,7 +6215,7 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) shader_glsl_swizzle_to_str(ins->src[resource_param_idx].swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], 0, resource_info->data_type); - shader_glsl_add_src_param(ins, &ins->src[0], (1u << coord_size) - 1, &coord_param); + shader_glsl_add_src_param(ins, &ins->src[0], wined3d_mask_from_size(coord_size), &coord_param); shader_addline(buffer, "textureGather%s(%s_sampler%u, %s", has_offset ? "Offset" : "", prefix, sampler_bind_idx, coord_param.param_str); @@ -6226,7 +6226,7 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) } if (ins->handler_idx == WINED3DSIH_GATHER4_PO || ins->handler_idx == WINED3DSIH_GATHER4_PO_C) { - shader_glsl_add_src_param(ins, &ins->src[1], (1u << offset_size) - 1, &offset_param); + shader_glsl_add_src_param(ins, &ins->src[1], wined3d_mask_from_size(offset_size), &offset_param); shader_addline(buffer, ", %s", offset_param.param_str); } else if (has_offset) -- 2.30.2

1 0

[PATCH 08/11] wined3d: Use wined3d_mask_from_size() in shader_glsl_store_uav().
by Henri Verbeet 25 Jan '22

25 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7983aeddcec..4b5d36884f5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5659,7 +5659,7 @@ static void shader_glsl_store_uav(const struct wined3d_shader_instruction *ins) return; } data_type = reg_maps->uav_resource_info[uav_idx].data_type; - coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + coord_mask = wined3d_mask_from_size(resource_type_info[resource_type].coord_size); shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); shader_glsl_add_src_param_ext(ins->ctx, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); -- 2.30.2

1 0

[PATCH 05/11] wined3d: Acquire references to vertex buffers for command lists by inspecting CS packets.
by Henri Verbeet 25 Jan '22

25 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 224a52324b8..b268ce83ca0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3671,6 +3671,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_STREAM_SOURCES: + { + struct wined3d_cs_set_stream_sources *op; + + op = (struct wined3d_cs_set_stream_sources *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->streams[i].buffer) + wined3d_buffer_decref(op->streams[i].buffer); + } + break; + } + default: break; } @@ -3860,6 +3873,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_STREAM_SOURCES: + { + struct wined3d_cs_set_stream_sources *op; + + op = (struct wined3d_cs_set_stream_sources *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->streams[i].buffer) + wined3d_buffer_incref(op->streams[i].buffer); + } + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 04/11] wined3d: Acquire references to stream output buffers for command lists by inspecting CS packets.
by Henri Verbeet 25 Jan '22

25 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index c46b38854c6..224a52324b8 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3658,6 +3658,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_STREAM_OUTPUTS: + { + struct wined3d_cs_set_stream_outputs *op; + + op = (struct wined3d_cs_set_stream_outputs *)packet->data; + for (i = 0; i < ARRAY_SIZE(op->outputs); ++i) + { + if (op->outputs[i].buffer) + wined3d_buffer_decref(op->outputs[i].buffer); + } + break; + } + default: break; } @@ -3834,6 +3847,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_STREAM_OUTPUTS: + { + struct wined3d_cs_set_stream_outputs *op; + + op = (struct wined3d_cs_set_stream_outputs *)packet->data; + for (i = 0; i < ARRAY_SIZE(op->outputs); ++i) + { + if (op->outputs[i].buffer) + wined3d_buffer_incref(op->outputs[i].buffer); + } + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 03/11] wined3d: Acquire references to index buffers for command lists by inspecting CS packets.
by Henri Verbeet 25 Jan '22

25 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 6fac275ccf1..c46b38854c6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3648,6 +3648,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_INDEX_BUFFER: + { + struct wined3d_cs_set_index_buffer *op; + + op = (struct wined3d_cs_set_index_buffer *)packet->data; + if (op->buffer) + wined3d_buffer_decref(op->buffer); + break; + } + default: break; } @@ -3814,6 +3824,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_INDEX_BUFFER: + { + struct wined3d_cs_set_index_buffer *op; + + op = (struct wined3d_cs_set_index_buffer *)packet->data; + if (op->buffer) + wined3d_buffer_incref(op->buffer); + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 02/11] wined3d: Acquire references to indirect draw buffers for command lists by inspecting CS packets.
by Henri Verbeet 25 Jan '22

25 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 80f9a973eaa..6fac275ccf1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3639,6 +3639,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_DRAW: + { + struct wined3d_cs_draw *op = (struct wined3d_cs_draw *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_decref(op->parameters.u.indirect.buffer); + break; + } + default: break; } @@ -3796,6 +3805,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_DRAW: + { + struct wined3d_cs_draw *op = (struct wined3d_cs_draw *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_incref(op->parameters.u.indirect.buffer); + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 01/11] wined3d: Acquire references to indirect dispatch buffers for command lists by inspecting CS packets.
by Henri Verbeet 25 Jan '22

25 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 9f7421e865f..80f9a973eaa 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3630,6 +3630,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_DISPATCH: + { + struct wined3d_cs_dispatch *op = (struct wined3d_cs_dispatch *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_decref(op->parameters.u.indirect.buffer); + break; + } + default: break; } @@ -3778,6 +3787,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_DISPATCH: + { + struct wined3d_cs_dispatch *op = (struct wined3d_cs_dispatch *)packet->data; + + if (op->parameters.indirect) + wined3d_buffer_incref(op->parameters.u.indirect.buffer); + break; + } + default: break; } -- 2.30.2

1 0

[PATCH] ddraw/tests: Accept broken depth readback of new-ish AMD GPUs (v2).
by Stefan Dösinger 25 Jan '22

25 Jan '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Version 2: Fix parenthesis. --- dlls/ddraw/tests/ddraw2.c | 8 +++++++- dlls/ddraw/tests/ddraw4.c | 8 +++++++- dlls/ddraw/tests/ddraw7.c | 9 +++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f80d4fe3ab8..00c8f820edb 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -148,6 +148,11 @@ static BOOL ddraw_is_vendor(IDirectDraw2 *ddraw, DWORD vendor) && identifier.dwVendorId == vendor; } +static BOOL ddraw_is_amd(IDirectDraw2 *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x1002); +} + static BOOL ddraw_is_intel(IDirectDraw2 *ddraw) { return ddraw_is_vendor(ddraw, 0x8086); @@ -13640,7 +13645,8 @@ static void test_depth_readback(void) /* The ddraw2 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, * except that we only have D16 (broken on geforce 9) and D24X8 (broken on geforce 7) available. * Accept all nvidia GPUs as broken here, but still expect one of the formats to pass. */ - ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw), + ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw) + || (ddraw_is_amd(ddraw) && tests[i].z_depth == 24), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); if (!compare_uint(expected_depth, depth, max_diff)) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 4447c5675ea..a8b68b8a20b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -149,6 +149,11 @@ static BOOL ddraw_is_vendor(IDirectDraw4 *ddraw, DWORD vendor) && identifier.dwVendorId == vendor; } +static BOOL ddraw_is_amd(IDirectDraw4 *ddraw) +{ + return ddraw_is_vendor(ddraw, 0x1002); +} + static BOOL ddraw_is_intel(IDirectDraw4 *ddraw) { return ddraw_is_vendor(ddraw, 0x8086); @@ -16252,7 +16257,8 @@ static void test_depth_readback(void) * * Some of the tested places pass on some GPUs on Wine by accident. */ todo_wine_if(tests[i].todo && !compare_uint(expected_depth, depth, max_diff)) - ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw), + ok(compare_uint(expected_depth, depth, max_diff) || ddraw_is_nvidia(ddraw) + || (ddraw_is_amd(ddraw) && !tests[i].s_depth && tests[i].z_mask == 0x00ffffff), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); if (!compare_uint(expected_depth, depth, max_diff)) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e5324cfe8bd..f4388296702 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15716,7 +15716,8 @@ static void test_depth_readback(void) depth = raw_value & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; - /* This test is very reliably on AMD, but fails in a number of interesting ways on Nvidia GPUs: + /* This test is very reliably on older AMD drivers, but fails in a number of interesting + * ways on Nvidia GPUs: * * Geforce 7 GPUs work only with D16. D24 and D24S8 return 0, D24X8 broken data. * @@ -15729,10 +15730,14 @@ static void test_depth_readback(void) * Arx Fatalis is broken on the Geforce 9 in the same way it was broken in Wine (bug 43654). * The !tests[i].s_depth is supposed to rule out D16 on GF9 and D24X8 on GF7. * + * On new-ish AMD GPUs (Radeon Polaris at least) returns weird data for D24 and D24X8. D16 + * and D24S8 work. + * * Some of the tested places pass on some GPUs on Wine by accident. */ todo_wine_if(tests[i].todo && !compare_uint(expected_depth, depth, max_diff)) ok(compare_uint(expected_depth, depth, max_diff) - || (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)), + || (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)) + || (ddraw_is_amd(ddraw) && !tests[i].s_depth && tests[i].z_mask == 0x00ffffff), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); if (!compare_uint(expected_depth, depth, max_diff)) -- 2.34.1

3 2

[PATCH 2/2] scrrun: generate temp name with tmp suffix.
by Robert Wilhelm 25 Jan '22

25 Jan '22

https://bugs.winehq.org/show_bug.cgi?id=52163 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/filesystem.c | 2 +- dlls/scrrun/tests/filesystem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 7b0b2e110a6..2b732b2f4d2 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3323,7 +3323,7 @@ static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *result) if(!RtlGenRandom(&random, sizeof(random))) return E_FAIL; - swprintf(*result, 12, L"rad%05X.txt", random & 0xfffff); + swprintf(*result, 13, L"rad%05X.tmp", random & 0xfffff); return S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 559e4c33b5b..f424bb83512 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -482,7 +482,7 @@ static void test_GetTempName(void) result = (BSTR)0xdeadbeef; hr = IFileSystem3_GetTempName(fs3, &result); ok(hr == S_OK, "GetTempName returned %x, expected S_OK\n", hr); - todo_wine ok(wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); + ok(wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); SysFreeString(result); } -- 2.31.1

2 2

[PATCH 1/2] scrrun: Add test for GetTempName.
by Robert Wilhelm 25 Jan '22

25 Jan '22

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/scrrun/tests/filesystem.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 8b06dbb883d..559e4c33b5b 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -472,6 +472,20 @@ static void test_GetFileName(void) } } +static void test_GetTempName(void) +{ + BSTR result; + HRESULT hr; + + hr = IFileSystem3_GetTempName(fs3, NULL); + ok(hr == E_POINTER, "GetTempName returned %x, expected E_POINTER\n", hr); + result = (BSTR)0xdeadbeef; + hr = IFileSystem3_GetTempName(fs3, &result); + ok(hr == S_OK, "GetTempName returned %x, expected S_OK\n", hr); + todo_wine ok(wcsstr( result,L".tmp"), "GetTempName returned %s, expected .tmp suffix\n", debugstr_w(result)); + SysFreeString(result); +} + static void test_GetBaseName(void) { static const struct @@ -2598,6 +2612,7 @@ START_TEST(filesystem) test_GetBaseName(); test_GetAbsolutePathName(); test_GetFile(); + test_GetTempName(); test_CopyFolder(); test_BuildPath(); test_GetFolder(); -- 2.31.1

2 4

[PATCH 1/6] mf/tests: Add some WMA encoder creation tests.
by Rémi Bernon 25 Jan '22

25 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I'm not expecting the encoder transform to be available in Wine anytime soon, but I'm going to use it in the tests to produce and validate the WMA data I'm going to feed the decoder. The problem I faced here was that ffmpeg WMA support is very minimal and not fully reverse engineered, and although it's seemingly able to decode WMA that Microsoft encoder produces, it's missing a lot of knowledge of the codec data blob and is ignoring most of the information in it, and I wasn't able to produce fully valid WMA stream that Microsoft decoder would decode properly. For the tests I needed WMA data that both can decode, and so I'm using the WMA encoder transform on Windows to produce it. These tests also should pass on Wine whether the decoder transform stub is registered or not, as there's already some appropriate todo_wine. When it's not, the tests are simply skipped. dlls/mf/tests/mf.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 1ba1bc4691d..9768491650a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -5420,6 +5420,59 @@ static BOOL create_transform(GUID category, MFT_REGISTER_TYPE_INFO *input_type, return TRUE; } +static void test_wma_encoder(void) +{ + static const media_type_desc transform_inputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_PCM), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + }, + }; + static const media_type_desc transform_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudioV8), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudioV9), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_WMAudio_Lossless), + }, + }; + + MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Audio, MFAudioFormat_WMAudioV8}; + MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Audio, MFAudioFormat_Float}; + IMFTransform *transform; + GUID class_id; + HRESULT hr; + ULONG ret; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + if (!create_transform(MFT_CATEGORY_AUDIO_ENCODER, &input_type, &output_type, L"WMAudio Encoder MFT", + transform_inputs, ARRAY_SIZE(transform_inputs), transform_outputs, ARRAY_SIZE(transform_outputs), + &transform, &class_id)) + goto failed; + + check_interface(transform, &IID_IMediaObject, TRUE); + + ret = IMFTransform_Release(transform); + ok(ret == 0, "Release returned %u\n", ret); + +failed: + CoUninitialize(); +} + static void test_wma_decoder(void) { static const media_type_desc transform_inputs[] = @@ -5511,5 +5564,6 @@ START_TEST(mf) test_sample_copier_output_processing(); test_MFGetTopoNodeCurrentType(); test_MFRequireProtectedEnvironment(); + test_wma_encoder(); test_wma_decoder(); } -- 2.34.1

2 11

[PATCH] include/wine/debug.h: signedness correctness in printf arguments
by Eric Pouech 25 Jan '22

25 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/debug.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 6aac7fe82e8..9730e85d97a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -451,9 +451,9 @@ static inline const char *wine_dbgstr_variant( const VARIANT *v ) case VT_UI1: return wine_dbg_sprintf( "%p {VT_UI1: %u}", v, V_UI1(v) ); case VT_UI2: - return wine_dbg_sprintf( "%p {VT_UI2: %d}", v, V_UI2(v) ); + return wine_dbg_sprintf( "%p {VT_UI2: %u}", v, V_UI2(v) ); case VT_UI4: - return wine_dbg_sprintf( "%p {VT_UI4: %d}", v, V_UI4(v) ); + return wine_dbg_sprintf( "%p {VT_UI4: %u}", v, V_UI4(v) ); case VT_I8: return wine_dbg_sprintf( "%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v)) ); case VT_UI8:

1 0

[PATCH 3/4] dmusic: Get rid of the SynthPortImpl typedef
by Michael Stefaniuc 25 Jan '22

25 Jan '22

and rename the iface to obj helpers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 96 +++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 88c7c60a50d..c51b33ce9c3 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); -typedef struct SynthPortImpl { +struct synth_port { IDirectMusicPort IDirectMusicPort_iface; IDirectMusicPortDownload IDirectMusicPortDownload_iface; IDirectMusicThru IDirectMusicThru_iface; @@ -43,31 +43,31 @@ typedef struct SynthPortImpl { DMUS_PORTPARAMS params; int nrofgroups; DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; -} SynthPortImpl; +}; static inline IDirectMusicDownloadedInstrumentImpl* impl_from_IDirectMusicDownloadedInstrument(IDirectMusicDownloadedInstrument *iface) { return CONTAINING_RECORD(iface, IDirectMusicDownloadedInstrumentImpl, IDirectMusicDownloadedInstrument_iface); } -static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicPort(IDirectMusicPort *iface) +static inline struct synth_port *synth_from_IDirectMusicPort(IDirectMusicPort *iface) { - return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicPort_iface); + return CONTAINING_RECORD(iface, struct synth_port, IDirectMusicPort_iface); } -static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicPortDownload(IDirectMusicPortDownload *iface) +static inline struct synth_port *synth_from_IDirectMusicPortDownload(IDirectMusicPortDownload *iface) { - return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicPortDownload_iface); + return CONTAINING_RECORD(iface, struct synth_port, IDirectMusicPortDownload_iface); } -static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicThru(IDirectMusicThru *iface) +static inline struct synth_port *synth_from_IDirectMusicThru(IDirectMusicThru *iface) { - return CONTAINING_RECORD(iface, SynthPortImpl, IDirectMusicThru_iface); + return CONTAINING_RECORD(iface, struct synth_port, IDirectMusicThru_iface); } -static inline SynthPortImpl *impl_from_IKsControl(IKsControl *iface) +static inline struct synth_port *synth_from_IKsControl(IKsControl *iface) { - return CONTAINING_RECORD(iface, SynthPortImpl, IKsControl_iface); + return CONTAINING_RECORD(iface, struct synth_port, IKsControl_iface); } /* IDirectMusicDownloadedInstrument IUnknown part follows: */ @@ -152,7 +152,7 @@ static HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDown /* SynthPortImpl IDirectMusicPort IUnknown part follows: */ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ret_iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); @@ -177,7 +177,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p)->(): new ref = %u\n", This, ref); @@ -189,7 +189,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT ifac static ULONG WINAPI SynthPortImpl_IDirectMusicPort_Release(LPDIRECTMUSICPORT iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p)->(): new ref = %u\n", This, ref); @@ -217,7 +217,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPort_Release(LPDIRECTMUSICPORT ifa /* SynthPortImpl IDirectMusicPort interface follows: */ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_PlayBuffer(LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER buffer) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); HRESULT hr; REFERENCE_TIME time; LPBYTE data; @@ -244,7 +244,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_PlayBuffer(LPDIRECTMUSICPOR static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetReadNotificationHandle(LPDIRECTMUSICPORT iface, HANDLE event) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); FIXME("(%p/%p)->(%p): stub\n", iface, This, event); @@ -253,7 +253,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetReadNotificationHandle(L static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Read(LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER buffer) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); FIXME("(%p/%p)->(%p): stub\n", iface, This, buffer); @@ -262,7 +262,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Read(LPDIRECTMUSICPORT ifac static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicInstrument* instrument, IDirectMusicDownloadedInstrument** downloaded_instrument, DMUS_NOTERANGE* note_ranges, DWORD num_note_ranges) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); IDirectMusicInstrumentImpl *instrument_object; HRESULT ret; BOOL free; @@ -348,7 +348,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECT static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *downloaded_instrument) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); IDirectMusicDownloadedInstrumentImpl *downloaded_object = unsafe_impl_from_IDirectMusicDownloadedInstrument(downloaded_instrument); TRACE("(%p/%p)->(%p)\n", iface, This, downloaded_instrument); @@ -368,7 +368,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMU static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetLatencyClock(LPDIRECTMUSICPORT iface, IReferenceClock** clock) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); TRACE("(%p/%p)->(%p)\n", iface, This, clock); @@ -380,7 +380,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetLatencyClock(LPDIRECTMUS static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetRunningStats(LPDIRECTMUSICPORT iface, LPDMUS_SYNTHSTATS stats) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); FIXME("(%p/%p)->(%p): stub\n", iface, This, stats); @@ -389,7 +389,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetRunningStats(LPDIRECTMUS static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Compact(LPDIRECTMUSICPORT iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); FIXME("(%p/%p)->(): stub\n", iface, This); @@ -398,7 +398,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Compact(LPDIRECTMUSICPORT i static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetCaps(LPDIRECTMUSICPORT iface, LPDMUS_PORTCAPS port_caps) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); TRACE("(%p/%p)->(%p)\n", iface, This, port_caps); @@ -410,7 +410,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetCaps(LPDIRECTMUSICPORT i static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DeviceIoControl(LPDIRECTMUSICPORT iface, DWORD io_control_code, LPVOID in_buffer, DWORD in_buffer_size, LPVOID out_buffer, DWORD out_buffer_size, LPDWORD bytes_returned, LPOVERLAPPED overlapped) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); FIXME("(%p/%p)->(%d, %p, %d, %p, %d, %p, %p): stub\n", iface, This, io_control_code, in_buffer, in_buffer_size, out_buffer, out_buffer_size, bytes_returned, overlapped); @@ -419,7 +419,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DeviceIoControl(LPDIRECTMUS static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetNumChannelGroups(LPDIRECTMUSICPORT iface, DWORD channel_groups) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); FIXME("(%p/%p)->(%d): semi-stub\n", iface, This, channel_groups); @@ -430,7 +430,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetNumChannelGroups(LPDIREC static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetNumChannelGroups(LPDIRECTMUSICPORT iface, LPDWORD channel_groups) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); TRACE("(%p/%p)->(%p)\n", iface, This, channel_groups); @@ -441,7 +441,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetNumChannelGroups(LPDIREC static HRESULT WINAPI synth_dmport_Activate(IDirectMusicPort *iface, BOOL active) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); FIXME("(%p/%p)->(%d): semi-stub\n", iface, This, active); @@ -470,7 +470,7 @@ static HRESULT WINAPI synth_dmport_Activate(IDirectMusicPort *iface, BOOL active static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetChannelPriority(LPDIRECTMUSICPORT iface, DWORD channel_group, DWORD channel, DWORD priority) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); FIXME("(%p/%p)->(%d, %d, %d): semi-stub\n", iface, This, channel_group, channel, priority); @@ -485,7 +485,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetChannelPriority(LPDIRECT static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetChannelPriority(LPDIRECTMUSICPORT iface, DWORD channel_group, DWORD channel, LPDWORD priority) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); TRACE("(%p/%p)->(%u, %u, %p)\n", iface, This, channel_group, channel, priority); @@ -497,7 +497,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetChannelPriority(LPDIRECT static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDirectSound *dsound, IDirectSoundBuffer *dsbuffer) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); FIXME("(%p/%p)->(%p, %p): semi-stub\n", iface, This, dsound, dsbuffer); @@ -527,7 +527,7 @@ static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDire static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetFormat(LPDIRECTMUSICPORT iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize, LPDWORD pdwBufferSize) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface); + struct synth_port *This = synth_from_IDirectMusicPort(iface); WAVEFORMATEX format; FIXME("(%p, %p, %p, %p): stub\n", This, pWaveFormatEx, pdwWaveFormatExSize, pdwBufferSize); @@ -598,7 +598,7 @@ static const IDirectMusicPortVtbl SynthPortImpl_DirectMusicPort_Vtbl = { /* SynthPortImpl IDirectMusicPortDownload IUnknown part follows: */ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_QueryInterface(LPDIRECTMUSICPORTDOWNLOAD iface, REFIID riid, LPVOID *ret_iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPortDownload(iface); + struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); @@ -607,7 +607,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_QueryInterface(LPDI static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_AddRef (LPDIRECTMUSICPORTDOWNLOAD iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPortDownload(iface); + struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); TRACE("(%p/%p)->()\n", iface, This); @@ -616,7 +616,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_AddRef (LPDIRECTMUSIC static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_Release(LPDIRECTMUSICPORTDOWNLOAD iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPortDownload(iface); + struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); TRACE("(%p/%p)->()\n", iface, This); @@ -626,7 +626,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_Release(LPDIRECTMUSIC /* SynthPortImpl IDirectMusicPortDownload Interface follows: */ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetBuffer(LPDIRECTMUSICPORTDOWNLOAD iface, DWORD DLId, IDirectMusicDownload** IDMDownload) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPortDownload(iface); + struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); FIXME("(%p/%p)->(%u, %p): stub\n", iface, This, DLId, IDMDownload); @@ -638,7 +638,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetBuffer(LPDIRECTM static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_AllocateBuffer(LPDIRECTMUSICPORTDOWNLOAD iface, DWORD size, IDirectMusicDownload** IDMDownload) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPortDownload(iface); + struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); FIXME("(%p/%p)->(%u, %p): stub\n", iface, This, size, IDMDownload); @@ -647,7 +647,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_AllocateBuffer(LPDI static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetDLId(LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* start_DLId, DWORD count) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPortDownload(iface); + struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); FIXME("(%p/%p)->(%p, %u): stub\n", iface, This, start_DLId, count); @@ -656,7 +656,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetDLId(LPDIRECTMUS static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetAppend (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* append) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPortDownload(iface); + struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); FIXME("(%p/%p)->(%p): stub\n", iface, This, append); @@ -665,7 +665,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetAppend (LPDIRECT static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Download(LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* IDMDownload) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPortDownload(iface); + struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); FIXME("(%p/%p)->(%p): stub\n", iface, This, IDMDownload); @@ -674,7 +674,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Download(LPDIRECTMU static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Unload(LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* IDMDownload) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPortDownload(iface); + struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); FIXME("(%p/%p)->(%p): stub\n", iface, This, IDMDownload); @@ -698,7 +698,7 @@ static const IDirectMusicPortDownloadVtbl SynthPortImpl_DirectMusicPortDownload_ /* SynthPortImpl IDirectMusicThru IUnknown part follows: */ static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_QueryInterface(LPDIRECTMUSICTHRU iface, REFIID riid, LPVOID *ret_iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicThru(iface); + struct synth_port *This = synth_from_IDirectMusicThru(iface); TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface); @@ -707,7 +707,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_QueryInterface(LPDIRECTMUSI static ULONG WINAPI SynthPortImpl_IDirectMusicThru_AddRef(LPDIRECTMUSICTHRU iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicThru(iface); + struct synth_port *This = synth_from_IDirectMusicThru(iface); TRACE("(%p/%p)->()\n", iface, This); @@ -716,7 +716,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicThru_AddRef(LPDIRECTMUSICTHRU ifac static ULONG WINAPI SynthPortImpl_IDirectMusicThru_Release(LPDIRECTMUSICTHRU iface) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicThru(iface); + struct synth_port *This = synth_from_IDirectMusicThru(iface); TRACE("(%p/%p)->()\n", iface, This); @@ -727,7 +727,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicThru_Release(LPDIRECTMUSICTHRU ifa static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_ThruChannel(LPDIRECTMUSICTHRU iface, DWORD source_channel_group, DWORD source_channel, DWORD destination_channel_group, DWORD destination_channel, LPDIRECTMUSICPORT destination_port) { - SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicThru(iface); + struct synth_port *This = synth_from_IDirectMusicThru(iface); FIXME("(%p/%p)->(%d, %d, %d, %d, %p): stub\n", iface, This, source_channel_group, source_channel, destination_channel_group, destination_channel, destination_port); @@ -746,21 +746,21 @@ static const IDirectMusicThruVtbl SynthPortImpl_DirectMusicThru_Vtbl = { static HRESULT WINAPI IKsControlImpl_QueryInterface(IKsControl *iface, REFIID riid, void **ret_iface) { - SynthPortImpl *This = impl_from_IKsControl(iface); + struct synth_port *This = synth_from_IKsControl(iface); return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); } static ULONG WINAPI IKsControlImpl_AddRef(IKsControl *iface) { - SynthPortImpl *This = impl_from_IKsControl(iface); + struct synth_port *This = synth_from_IKsControl(iface); return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); } static ULONG WINAPI IKsControlImpl_Release(IKsControl *iface) { - SynthPortImpl *This = impl_from_IKsControl(iface); + struct synth_port *This = synth_from_IKsControl(iface); return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); } @@ -815,7 +815,7 @@ static const IKsControlVtbl ikscontrol_vtbl = { HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_params, DMUS_PORTCAPS *port_caps, IDirectMusicPort **port) { - SynthPortImpl *obj; + struct synth_port *obj; HRESULT hr = E_FAIL; int i; @@ -823,7 +823,7 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param *port = NULL; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SynthPortImpl)); + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); if (!obj) return E_OUTOFMEMORY; -- 2.31.1

2 3

[PATCH v2 1/2] user32/tests: Add some tests for WM_NCCALCSIZE. (Resend)
by Dmitry Timoshkov 25 Jan '22

25 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/win.c | 70 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0156987f529..b93839e40b5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -12328,6 +12328,75 @@ static void test_DragDetect(void) ok(!(GetKeyState( VK_LBUTTON ) & 0x8000), "got VK_LBUTTON\n"); } +static void test_WM_NCCALCSIZE(void) +{ + WNDCLASSA cls; + HWND hwnd; + NCCALCSIZE_PARAMS params; + WINDOWPOS winpos; + RECT client_rect, window_rect; + LRESULT ret; + + cls.style = CS_DBLCLKS | CS_VREDRAW | CS_HREDRAW; + cls.lpfnWndProc = DefWindowProcA; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "dummy_window_class"; + ret = RegisterClassA(&cls); + ok(ret, "RegisterClass error %u\n", GetLastError()); + + hwnd = CreateWindowExA(0, "dummy_window_class", NULL, + WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP, + 100, 100, 200, 200, 0, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != 0, "CreateWindowEx error %u\n", GetLastError()); + + GetWindowRect(hwnd, &window_rect); + params.rgrc[0] = window_rect; + params.rgrc[1] = window_rect; + GetClientRect(hwnd, &client_rect); + MapWindowPoints(hwnd, 0, (POINT *)&client_rect, 2); + params.rgrc[2] = client_rect; + + winpos.hwnd = hwnd; + winpos.hwndInsertAfter = HWND_TOP; + winpos.x = window_rect.left; + winpos.y = window_rect.top; + winpos.cx = window_rect.right - window_rect.left; + winpos.cy = window_rect.bottom - window_rect.top; + winpos.flags = SWP_NOMOVE; + params.lppos = &winpos; + + ret = SendMessageW(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + params.rgrc[0] = window_rect; + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, TRUE, (LPARAM)&params); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&params.rgrc[0], &client_rect), "got %s\n", wine_dbgstr_rect(&params.rgrc[0])); + + GetWindowRect(hwnd, &window_rect); + ret = SendMessageW(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + GetWindowRect(hwnd, &window_rect); + ret = DefWindowProcA(hwnd, WM_NCCALCSIZE, FALSE, (LPARAM)&window_rect); +todo_wine + ok(!ret, "got %08x\n", ret); + ok(EqualRect(&window_rect, &client_rect), "got %s\n", wine_dbgstr_rect(&window_rect)); + + DestroyWindow(hwnd); +} + START_TEST(win) { char **argv; @@ -12497,6 +12566,7 @@ START_TEST(win) test_SC_SIZE(); test_cancel_mode(); test_DragDetect(); + test_WM_NCCALCSIZE(); /* add the tests above this line */ if (hhook) UnhookWindowsHookEx(hhook); -- 2.34.1

2 2

[PATCH 3/3] user32: Draw standard scroll bars in hovered state only when they were previously painted by DefWinProc().
by Zhiyi Zhang 25 Jan '22

25 Jan '22

When an application handles WM_NCPAINT by itself, standard scroll bars are not drawn even if WS_HSCROLL or WS_VSCROLL is used. In this case, when handling WM_NCMOUSEMOVE, DefWinProc() shouldn't repaint standard scroll bars to reflect hovered state, otherwise, DefWinProc() draws over the custom non-client area painted by the application. This is also the behavior on XP. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51900 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/painting.c | 13 +++++++++++- dlls/user32/scroll.c | 41 ++++++++++++++++++++++++++++++++++++-- dlls/user32/tests/win.c | 1 - dlls/user32/user_private.h | 1 + 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index 41c0bb3c6e1..63a8e840998 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -639,6 +639,7 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) { HRGN whole_rgn = get_update_region( hwnd, flags, child ); HRGN client_rgn = 0; + DWORD style; if (child) hwnd = *child; @@ -678,7 +679,17 @@ static HRGN send_ncpaint( HWND hwnd, HWND *child, UINT *flags ) if (whole_rgn) /* NOTE: WM_NCPAINT allows wParam to be 1 */ { - if (*flags & UPDATE_NONCLIENT) SendMessageW( hwnd, WM_NCPAINT, (WPARAM)whole_rgn, 0 ); + if (*flags & UPDATE_NONCLIENT) + { + /* Mark standard scroll bars as not painted before sending WM_NCPAINT */ + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (style & WS_HSCROLL) + SCROLL_SetStandardScrollPainted( hwnd, SB_HORZ, FALSE ); + if (style & WS_VSCROLL) + SCROLL_SetStandardScrollPainted( hwnd, SB_VERT, FALSE ); + + SendMessageW( hwnd, WM_NCPAINT, (WPARAM)whole_rgn, 0 ); + } if (whole_rgn > (HRGN)1) DeleteObject( whole_rgn ); } SetThreadDpiAwarenessContext( context ); diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a17495d9ff0..a3f0becbbd6 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -39,6 +39,7 @@ typedef struct INT maxVal; /* Maximum scroll-bar value */ INT page; /* Page size of scroll bar (Win32) */ UINT flags; /* EnableScrollBar flags */ + BOOL painted; /* Whether the scroll bar is painted by DefWinProc() */ } SCROLLBAR_INFO, *LPSCROLLBAR_INFO; /* data for window that has (one or two) scroll bars */ @@ -643,6 +644,29 @@ void WINAPI USER_ScrollBarDraw( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTES } } +void SCROLL_SetStandardScrollPainted( HWND hwnd, INT bar, BOOL painted ) +{ + LPSCROLLBAR_INFO info; + + if (bar != SB_HORZ && bar != SB_VERT) + return; + + info = SCROLL_GetInternalInfo( hwnd, bar, FALSE ); + if (info) + info->painted = painted; +} + +static BOOL SCROLL_IsStandardScrollPainted( HWND hwnd, INT bar ) +{ + LPSCROLLBAR_INFO info; + + if (bar != SB_HORZ && bar != SB_VERT) + return FALSE; + + info = SCROLL_GetInternalInfo( hwnd, bar, FALSE ); + return info ? info->painted : FALSE; +} + /*********************************************************************** * SCROLL_DrawScrollBar * @@ -653,9 +677,9 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT bar, enum SCROLL_HITTEST hit_ BOOL draw_interior ) { INT arrow_size, thumb_size, thumb_pos; + RECT rect, clip_box, intersect; BOOL vertical; DWORD style; - RECT rect; if (!(hwnd = WIN_GetFullHandle( hwnd ))) return; @@ -682,6 +706,13 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT bar, enum SCROLL_HITTEST hit_ GetCapture()); user_api->pScrollBarDraw( hwnd, hdc, bar, hit_test, tracking_info, draw_arrows, draw_interior, &rect, arrow_size, thumb_pos, thumb_size, vertical ); + + if (bar == SB_HORZ || bar == SB_VERT) + { + GetClipBox( hdc, &clip_box ); + if (IntersectRect(&intersect, &rect, &clip_box)) + SCROLL_SetStandardScrollPainted( hwnd, bar, TRUE ); + } } void SCROLL_DrawNCScrollBar( HWND hwnd, HDC hdc, BOOL draw_horizontal, BOOL draw_vertical ) @@ -899,7 +930,13 @@ void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt ) switch (g_tracking_info.hit_test) { case SCROLL_NOWHERE: /* No tracking in progress */ - if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE || msg == WM_NCMOUSEMOVE || msg == WM_NCMOUSELEAVE) + /* For standard scroll bars, hovered state gets painted only when the scroll bar was + * previously painted by DefWinProc(). If an application handles WM_NCPAINT by itself, then + * the scrollbar shouldn't be repainted here to avoid overwriting the application painted + * content */ + if (msg == WM_MOUSEMOVE || msg == WM_MOUSELEAVE + || ((msg == WM_NCMOUSEMOVE || msg == WM_NCMOUSELEAVE) + && SCROLL_IsStandardScrollPainted( hwnd, nBar))) SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, &g_tracking_info, TRUE, TRUE ); break; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ed90c5fbe5f..cb6b61e59c0 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1269,7 +1269,6 @@ static void test_nonclient_area(HWND hwnd) RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); - todo_wine ok(color == old_color, "Expected color %#x, got %#x.\n", old_color, color); ReleaseDC(parent, hdc); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 7a9845adeb9..3b542ea1452 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -308,5 +308,6 @@ LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HID void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL) DECLSPEC_HIDDEN; +void SCROLL_SetStandardScrollPainted(HWND hwnd, INT bar, BOOL visible); #endif /* __WINE_USER_PRIVATE_H */ -- 2.32.0

2 1

[PATCH 3/3] comctl32/tests: Add more LVM_INSERTITEM tests. (Resend)
by Dmitry Timoshkov 25 Jan '22

25 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 144 ++++++++++++++++++++++++++++++--- 1 file changed, 131 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 236a9d14372..b257b282a96 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -413,15 +413,6 @@ static const struct message listview_header_set_imagelist[] = { { 0 } }; -static const struct message parent_insert_focused_seq[] = { - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, - { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, - { 0 } -}; - static const struct message parent_report_cd_seq[] = { { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, @@ -5920,6 +5911,98 @@ static void test_deleteitem(void) DestroyWindow(hwnd); } +static const struct message parent_insert_focused0_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_focused1_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 1, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 0, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id|wparam|lparam, 1, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_item_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static const struct message parent_insert_selected_seq[] = { + { WM_NOTIFY, sent|id|wparam|lparam, 3, LVIF_STATE, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id|wparam|lparam, 3, LVIF_STATE, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_INSERTITEM }, + { 0 } +}; + +static void test_LVM_INSERTITEM(void) +{ + static const struct + { + UINT mask, state, stateMask; + } insert_item[] = + { + { LVIF_STATE, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE, LVIS_FOCUSED, 0 }, + { LVIF_STATE, 0, LVIS_FOCUSED }, + { LVIF_STATE, LVIS_SELECTED, LVIS_SELECTED }, + { LVIF_STATE, LVIS_SELECTED, 0 }, + { LVIF_STATE, 0, LVIS_SELECTED }, + { LVIF_STATE, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED }, + { LVIF_STATE, LVIS_FOCUSED | LVIS_SELECTED, 0 }, + { LVIF_STATE, 0, LVIS_FOCUSED | LVIS_SELECTED }, + { LVIF_STATE | LVIF_PARAM, LVIS_FOCUSED, LVIS_FOCUSED }, + { LVIF_STATE | LVIF_PARAM, LVIS_FOCUSED, 0 }, + { LVIF_STATE | LVIF_PARAM, 0, LVIS_FOCUSED }, + { LVIF_STATE | LVIF_PARAM, LVIS_SELECTED, LVIS_SELECTED }, + { LVIF_STATE | LVIF_PARAM, LVIS_SELECTED, 0 }, + { LVIF_STATE | LVIF_PARAM, 0, LVIS_SELECTED }, + { LVIF_STATE, 0, 0 }, + { LVIF_PARAM, 0, 0 }, + }; + LVITEMA item; + UINT state; + HWND hwnd; + INT ret, i; + char buf[256]; + + for (i = 0; i < ARRAY_SIZE(insert_item); i++) + { + hwnd = create_listview_control(LVS_REPORT); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.mask = insert_item[i].mask; + item.state = insert_item[i].state; + item.stateMask = insert_item[i].stateMask; + item.iItem = 0; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 0, "%d: got %d\n", i, ret); + + if (insert_item[i].state & (LVIS_FOCUSED | LVIS_SELECTED)) + { + sprintf(buf, "%d: insert focused", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, buf, TRUE); + } + else + { + sprintf(buf, "%d: insert item", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, buf, FALSE); + } + + state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED | LVIS_SELECTED); + ok(state == insert_item[i].state, "%d: expected %#x, got %#x\n", i, insert_item[i].state, state); + + DestroyWindow(hwnd); + } +} + static void test_insertitem(void) { LVITEMA item; @@ -5929,6 +6012,8 @@ static void test_insertitem(void) hwnd = create_listview_control(LVS_REPORT); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + /* insert item 0 focused */ item.mask = LVIF_STATE; item.state = LVIS_FOCUSED; @@ -5937,12 +6022,11 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 0, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused0_seq, "insert focused 0", TRUE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 0, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); - flush_sequences(sequences, NUM_MSG_SEQUENCES); - /* insert item 1, focus shift */ item.mask = LVIF_STATE; item.state = LVIS_FOCUSED; @@ -5951,8 +6035,7 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 1, "got %d\n", ret); - - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused_seq, "insert focused", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_focused1_seq, "insert focused 1", TRUE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); @@ -5965,10 +6048,44 @@ static void test_insertitem(void) item.iSubItem = 0; ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); ok(ret == 2, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert focused 2", FALSE); state = SendMessageA(hwnd, LVM_GETITEMSTATE, 1, LVIS_FOCUSED); ok(state == LVIS_FOCUSED, "got %x\n", state); + /* insert item 3 */ + item.mask = LVIF_STATE | LVIF_PARAM; + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + item.iItem = 3; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 3, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_selected_seq, "insert selected", TRUE); + + /* insert item 4 */ + item.mask = LVIF_PARAM; + item.state = 0; + item.stateMask = 0; + item.iItem = 4; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 4, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert param", FALSE); + + /* insert item 5 */ + item.mask = LVIF_STATE; + item.state = 0; + item.stateMask = 0; + item.iItem = 5; + item.iSubItem = 0; + item.lParam = 0xdeadbeef; + ret = SendMessageA(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + ok(ret == 5, "got %d\n", ret); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_insert_item_seq, "insert state", FALSE); + DestroyWindow(hwnd); } @@ -6687,6 +6804,7 @@ START_TEST(listview) test_imagelists(); test_deleteitem(); test_insertitem(); + test_LVM_INSERTITEM(); test_header_proc(); test_oneclickactivate(); test_callback_mask(); -- 2.34.1

1 0

[PATCH 2/3] comctl32/tests: Add iItem and uChanged to LVN_ITEMCHANGING/LVN_ITEMCHANGED context. (Resend)
by Dmitry Timoshkov 25 Jan '22

25 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/comctl32/tests/listview.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e95b81f5bb1..236a9d14372 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -472,7 +472,17 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; + if (message == WM_NOTIFY && lParam) + { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lParam; + + msg.id = nmlv->hdr.code; + if (msg.id == LVN_ITEMCHANGING || msg.id == LVN_ITEMCHANGED) + { + msg.wParam = nmlv->iItem; + msg.lParam = nmlv->uChanged; + } + } if (message == WM_COMMAND) msg.id = HIWORD(wParam); /* log system messages, except for painting */ -- 2.34.1

1 0

[PATCH 1/2] server: Use normal key path handling also for the '\Registry' prefix. (Resend)
by Dmitry Timoshkov 25 Jan '22

25 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 3 --- server/registry.c | 50 ++++++++++++------------------------------ 2 files changed, 14 insertions(+), 39 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 91b752ac069..445c05a02e1 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -386,7 +386,6 @@ todo_wine key = (HANDLE)0xdeadbeef; status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine ok(status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtOpenKey Failed: 0x%08x\n", status); -todo_wine ok(!key, "key = %p\n", key); pRtlFreeUnicodeString( &str ); @@ -417,7 +416,6 @@ todo_wine pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); pNtClose( key ); pRtlFreeUnicodeString( &str ); @@ -569,7 +567,6 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); diff --git a/server/registry.c b/server/registry.c index b00abdbc004..2a2bc9a4e68 100644 --- a/server/registry.c +++ b/server/registry.c @@ -127,7 +127,7 @@ static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between peri static struct timeout_user *save_timeout_user; /* saving timer */ static enum prefix_type { PREFIX_UNKNOWN, PREFIX_32BIT, PREFIX_64BIT } prefix_type; -static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; +static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y' }; static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; static const WCHAR symlink_value[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e'}; static const struct unicode_str symlink_str = { symlink_value, sizeof(symlink_value) }; @@ -411,7 +411,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) { static const WCHAR backslash = '\\'; struct key *key = (struct key *) obj; - data_size_t len = sizeof(root_name) - sizeof(WCHAR); + data_size_t len = 0; char *ret; if (key->flags & KEY_DELETED) @@ -431,7 +431,6 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) len -= key->namelen + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); } - memcpy( ret, root_name, sizeof(root_name) - sizeof(WCHAR) ); return (WCHAR *)ret; } @@ -474,16 +473,10 @@ static void key_destroy( struct object *obj ) } /* get the request vararg as registry path */ -static inline void get_req_path( struct unicode_str *str, int skip_root ) +static inline void get_req_path( struct unicode_str *str ) { str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); - - if (skip_root && str->len >= sizeof(root_name) && !memicmp_strW( str->str, root_name, sizeof(root_name) )) - { - str->str += ARRAY_SIZE( root_name ); - str->len -= sizeof(root_name); - } } /* return the next token in a given path */ @@ -494,19 +487,22 @@ static struct unicode_str *get_path_token( const struct unicode_str *path, struc if (!token->str) /* first time */ { - /* path cannot start with a backslash */ + /* if path starts with a backslash it must be the Registry root */ if (len && path->str[0] == '\\') { - set_error( STATUS_OBJECT_PATH_INVALID ); - return NULL; + if (path->len < sizeof(root_name) || memicmp_strW( path->str, root_name, sizeof(root_name) )) + { + set_error( STATUS_OBJECT_PATH_INVALID ); + return NULL; + } } } else { i = token->str - path->str; i += token->len / sizeof(WCHAR); - while (i < len && path->str[i] == '\\') i++; } + while (i < len && path->str[i] == '\\') i++; token->str = path->str + i; while (i < len && path->str[i] != '\\') i++; token->len = (path->str + i - token->str) * sizeof(WCHAR); @@ -730,10 +726,6 @@ static struct key *follow_symlink( struct key *key, int iteration ) path.str = value->data; path.len = (value->len / sizeof(WCHAR)) * sizeof(WCHAR); - if (path.len <= sizeof(root_name)) return NULL; - if (memicmp_strW( path.str, root_name, sizeof(root_name) )) return NULL; - path.str += ARRAY_SIZE( root_name ); - path.len -= sizeof(root_name); key = root_key; token.str = NULL; @@ -1842,8 +1834,8 @@ static void init_supported_machines(void) /* registry initialisation */ void init_registry(void) { - static const WCHAR HKLM[] = { 'M','a','c','h','i','n','e' }; - static const WCHAR HKU_default[] = { 'U','s','e','r','\\','.','D','e','f','a','u','l','t' }; + static const WCHAR HKLM[] = { '\\','R','e','g','i','s','t','r','y','\\','M','a','c','h','i','n','e' }; + static const WCHAR HKU_default[] = { '\\','R','e','g','i','s','t','r','y','\\','U','s','e','r','\\','.','D','e','f','a','u','l','t' }; static const WCHAR classes_i386[] = {'S','o','f','t','w','a','r','e','\\', 'C','l','a','s','s','e','s','\\', 'W','o','w','6','4','3','2','N','o','d','e'}; @@ -2151,13 +2143,6 @@ DECL_HANDLER(create_key) class.str = get_req_data_after_objattr( objattr, &class.len ); class.len = (class.len / sizeof(WCHAR)) * sizeof(WCHAR); - if (!objattr->rootdir && name.len >= sizeof(root_name) && - !memicmp_strW( name.str, root_name, sizeof(root_name) )) - { - name.str += ARRAY_SIZE( root_name ); - name.len -= sizeof(root_name); - } - /* NOTE: no access rights are required from the parent handle to create a key */ if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { @@ -2184,7 +2169,7 @@ DECL_HANDLER(open_key) /* NOTE: no access rights are required to open the parent key, only the child key */ if ((parent = get_parent_hkey_obj( req->parent ))) { - get_req_path( &name, !req->parent ); + get_req_path( &name ); if ((key = open_key( parent, &name, access, req->attributes ))) { reply->hkey = alloc_handle( current->process, key, access, req->attributes ); @@ -2309,13 +2294,6 @@ DECL_HANDLER(load_registry) return; } - if (!objattr->rootdir && name.len >= sizeof(root_name) && - !memicmp_strW( name.str, root_name, sizeof(root_name) )) - { - name.str += ARRAY_SIZE( root_name ); - name.len -= sizeof(root_name); - } - if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { int dummy; @@ -2344,7 +2322,7 @@ DECL_HANDLER(unload_registry) if ((parent = get_parent_hkey_obj( req->parent ))) { - get_req_path( &name, !req->parent ); + get_req_path( &name ); if ((key = open_key( parent, &name, access, req->attributes ))) { if (key->obj.handle_count) -- 2.34.1

1 0

[PATCH 2/2] dwrite: Add Segoe UI Symbol fallback ranges. (Resend)
by Dmitry Timoshkov 25 Jan '22

25 Jan '22

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dwrite/analyzer.c | 8 ++++++++ dlls/dwrite/tests/layout.c | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 13ccf8e4434..a169b8ef860 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -220,6 +220,13 @@ static const DWRITE_UNICODE_RANGE cjk_ranges[] = { 0x4e00, 0x9fff }, /* CJK Unified Ideographs */ }; +static const WCHAR *SegoeUI_Symbol_families[] = { L"Segoe UI Symbol" }; + +static const DWRITE_UNICODE_RANGE SegoeUI_Symbol_ranges[] = +{ + { 0x2196, 0x2bef }, +}; + struct fallback_mapping { DWRITE_UNICODE_RANGE *ranges; UINT32 ranges_count; @@ -236,6 +243,7 @@ static const struct fallback_mapping fontfallback_neutral_data[] = { (WCHAR **)families, ARRAY_SIZE(families) } MAPPING_RANGE(cjk_ranges, cjk_families), + MAPPING_RANGE(SegoeUI_Symbol_ranges, SegoeUI_Symbol_families), #undef MAPPING_RANGE }; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c242155cce3..7bc53834ea3 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -6604,19 +6604,18 @@ todo_wine { hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, families[i], DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); -todo_wine_if(families[i] == NULL) ok(hr == S_OK, "%u: %s - got %#x\n", i, wine_dbgstr_w(families[i]), hr); if (hr != S_OK) continue; ok(mappedlength == 1, "got %u\n", mappedlength); ok(scale == 1.0f, "got %f\n", scale); get_font_name(font, name, ARRAY_SIZE(name)); -todo_wine +todo_wine_if(families[i] != NULL) ok(!wcscmp(name, L"Segoe UI Symbol"), "got %s\n", wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, 0x25d4, &exists); ok(hr == S_OK, "got %#x\n", hr); -todo_wine +todo_wine_if(families[i] != NULL) ok(exists, "%s should have character 0x25d4\n", wine_dbgstr_w(name)); IDWriteFont_Release(font); -- 2.34.1

1 0

[PATCH 2/3] user32/tests: Test painting standard scroll bars in hovered state.
by Zhiyi Zhang 25 Jan '22

25 Jan '22

Mostly to test that standard scroll bars doesn't get painted in hovered state if they weren't previously painted by DefWinProcA/W(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/win.c | 122 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 0156987f529..ed90c5fbe5f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1132,12 +1132,42 @@ static void wine_AdjustWindowRectExForDpi( RECT *rect, LONG style, BOOL menu, LO InflateRect(rect, GetSystemMetrics(SM_CXEDGE), GetSystemMetrics(SM_CYEDGE)); } +static int offset; + +static LRESULT CALLBACK test_standard_scrollbar_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + switch (msg) + { + case WM_NCPAINT: + { + HRGN region; + RECT rect; + + GetWindowRect(hwnd, &rect); + region = CreateRectRgn(rect.left, rect.top, rect.right, rect.bottom - offset); + DefWindowProcA(hwnd, msg, (WPARAM)region, lp); + DeleteObject(region); + return 0; + } + default: + return DefWindowProcA(hwnd, msg, wp, lp); + } +} + static void test_nonclient_area(HWND hwnd) { + BOOL (WINAPI *pIsThemeActive)(void); + POINT point, old_cursor_pos; + COLORREF color, old_color; + BOOL is_theme_active; DWORD style, exstyle; RECT rc_window, rc_client, rc; + HWND child, parent; + HMODULE uxtheme; + WNDCLASSA cls; BOOL menu; LRESULT ret; + HDC hdc; style = GetWindowLongA(hwnd, GWL_STYLE); exstyle = GetWindowLongA(hwnd, GWL_EXSTYLE); @@ -1189,6 +1219,98 @@ static void test_nonclient_area(HWND hwnd) ok(EqualRect(&rc, &rc_client), "synthetic rect does not match: style:exstyle=0x%08x:0x%08x, menu=%d, client=%s, calc=%s\n", style, exstyle, menu, wine_dbgstr_rect(&rc_client), wine_dbgstr_rect(&rc)); + + /* Test standard scroll bars */ + uxtheme = LoadLibraryA("uxtheme.dll"); + ok(!!uxtheme, "Failed to load uxtheme.dll, error %u.\n", GetLastError()); + pIsThemeActive = (void *)GetProcAddress(uxtheme, "IsThemeActive"); + ok(!!pIsThemeActive, "Failed to load IsThemeActive, error %u.\n", GetLastError()); + is_theme_active = pIsThemeActive(); + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = DefWindowProcA; + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(LTGRAY_BRUSH); + cls.lpszClassName = "TestStandardScrollbarParentClass"; + RegisterClassA(&cls); + + cls.lpfnWndProc = test_standard_scrollbar_proc; + cls.hbrBackground = GetStockObject(GRAY_BRUSH); + cls.lpszClassName = "TestStandardScrollbarClass"; + RegisterClassA(&cls); + + parent = CreateWindowA("TestStandardScrollbarParentClass", "parent", WS_POPUP | WS_VISIBLE, 100, + 100, 100, 100, NULL, NULL, 0, NULL); + ok(!!parent, "Failed to create a parent window, error %u.\n", GetLastError()); + GetCursorPos(&old_cursor_pos); + + /* Place the cursor on the standard scroll bar arrow button when not painting it at all. + * Expects the standard scroll bar not to appear before and after the cursor position change */ + offset = GetSystemMetrics(SM_CYHSCROLL); + child = CreateWindowA("TestStandardScrollbarClass", "test", WS_CHILD | WS_HSCROLL | WS_VISIBLE, + 0, 0, 50, 50, parent, NULL, 0, NULL); + ok(!!child, "Failed to create a test window, error %u.\n", GetLastError()); + hdc = GetDC(parent); + ok(!!hdc, "GetDC failed, error %d.\n", GetLastError()); + + SetCursorPos(0, 0); + flush_events(TRUE); + RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + old_color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, + 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); + ok(old_color == 0xc0c0c0, "Expected color %#x, got %#x.\n", 0xc0c0c0, old_color); + + point.x = 50 - GetSystemMetrics(SM_CXVSCROLL) / 2; + point.y = 50 - GetSystemMetrics(SM_CYHSCROLL) / 2; + ClientToScreen(child, &point); + SetCursorPos(point.x, point.y); + flush_events(TRUE); + RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, + 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); + todo_wine + ok(color == old_color, "Expected color %#x, got %#x.\n", old_color, color); + + ReleaseDC(parent, hdc); + DestroyWindow(child); + + /* Place the cursor on standard scroll bar arrow button when painting 1 pixel of the scroll bar. + * Expects the scroll bar to appear after the cursor position change */ + offset = GetSystemMetrics(SM_CYHSCROLL) - 1; + child = CreateWindowA("TestStandardScrollbarClass", "test", WS_CHILD | WS_HSCROLL | WS_VISIBLE, + 0, 0, 50, 50, parent, NULL, 0, NULL); + ok(!!child, "Failed to create a test window, error %u.\n", GetLastError()); + hdc = GetDC(parent); + ok(!!hdc, "GetDC failed, error %d.\n", GetLastError()); + + SetCursorPos(0, 0); + flush_events(TRUE); + RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + old_color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, + 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); + + point.x = 50 - GetSystemMetrics(SM_CXVSCROLL) / 2; + point.y = 50 - GetSystemMetrics(SM_CYHSCROLL) / 2; + ClientToScreen(child, &point); + SetCursorPos(point.x, point.y); + flush_events(TRUE); + RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); + color = GetPixel(hdc, 50 - GetSystemMetrics(SM_CXVSCROLL) / 2, + 50 - GetSystemMetrics(SM_CYHSCROLL) / 2); + if (is_theme_active) + ok(color != old_color || broken(color == old_color), /* Win 10 1507 64-bit */ + "Got unexpected color %#x.\n", color); + else + todo_wine + ok(color == old_color, "Expected color %#x, got %#x.\n", old_color, color); + + SetCursorPos(old_cursor_pos.x, old_cursor_pos.y); + ReleaseDC(parent, hdc); + DestroyWindow(parent); + UnregisterClassA("TestStandardScrollbarClass", GetModuleHandleA(0)); + UnregisterClassA("TestStandardScrollbarParentClass", GetModuleHandleA(0)); + FreeLibrary(uxtheme); } static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) -- 2.32.0

2 1

[PATCH] programs/wscript: use correct integral type
by Eric Pouech 25 Jan '22

25 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/wscript/host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index e20d3132f16..8765dd271f4 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -314,7 +314,7 @@ static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) { WCHAR *output = NULL, *ptr; unsigned argc, i, len; - int ubound, lbound; + LONG ubound, lbound; VARIANT *argv; BSTR *strs; HRESULT hres;

1 0

[PATCH] programs/wscript: use correct integral type
by Eric Pouech 25 Jan '22

25 Jan '22

--- programs/wscript/host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wscript/host.c b/programs/wscript/host.c index e20d3132f16..8765dd271f4 100644 --- a/programs/wscript/host.c +++ b/programs/wscript/host.c @@ -314,7 +314,7 @@ static HRESULT WINAPI Host_Echo(IHost *iface, SAFEARRAY *args) { WCHAR *output = NULL, *ptr; unsigned argc, i, len; - int ubound, lbound; + LONG ubound, lbound; VARIANT *argv; BSTR *strs; HRESULT hres;

1 0

[PATCH] gdiplus: Disable PNG encoding filters.
by Florian Will 25 Jan '22

25 Jan '22

This speeds up the encoding process, sometimes at the cost of increased PNG file sizes. PNGs created using gdiplus on Windows 10 have filters disabled, too, according to pngcheck. The application "ZusiDisplay" encodes finished frames in PNG format and sends them through a named pipe for "Zusi 3" to use as an in-game texture, so performance matters for that use case to improve "embedded display" FPS. Signed-off-by: Florian Will <florian.will(a)gmail.com> --- I noticed that a 1840x3052 mostly text-based website screenshot I used for testing actually shrunk from 402kB to 349kB after disabling filters. Maybe this is common for basic "draw some lines and shapes in gdiplus" images? On win10, the same screenshot is 371kB because the zlib compression level appears to be "fast" instead of "default", and win10 gdiplus stores an alpha channel, while wine stores the fully opaque screenshot loaded from a BMP file as 24bit RGB without alpha (all according to pngcheck). --- dlls/gdiplus/Makefile.in | 2 +- dlls/gdiplus/image.c | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index ac12bd1c613..c87ec5ba827 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -1,6 +1,6 @@ MODULE = gdiplus.dll IMPORTLIB = gdiplus -IMPORTS = uuid shlwapi ole32 user32 gdi32 +IMPORTS = uuid shlwapi ole32 oleaut32 user32 gdi32 DELAYIMPORTS = windowscodecs C_SRCS = \ diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 518a9bf8689..56eb62392ec 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4544,6 +4544,7 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) GpBitmap *bitmap; IWICBitmapFrameEncode *frameencode; IPropertyBag2 *encoderoptions; + GUID container_format; HRESULT hr; UINT width, height; PixelFormat gdipformat=0; @@ -4570,7 +4571,20 @@ static GpStatus encode_frame_wic(IWICBitmapEncoder *encoder, GpImage *image) if (SUCCEEDED(hr)) /* created frame */ { - hr = IWICBitmapFrameEncode_Initialize(frameencode, encoderoptions); + hr = IWICBitmapEncoder_GetContainerFormat(encoder, &container_format); + if (SUCCEEDED(hr) && IsEqualGUID(&container_format, &GUID_ContainerFormatPng)) + { + /* disable PNG filters for faster encoding */ + PROPBAG2 filter_option = { .pstrName = (LPOLESTR) L"FilterOption" }; + VARIANT filter_value; + VariantInit(&filter_value); + V_VT(&filter_value) = VT_UI1; + V_UI1(&filter_value) = WICPngFilterNone; + hr = IPropertyBag2_Write(encoderoptions, 1, &filter_option, &filter_value); + } + + if (SUCCEEDED(hr)) + hr = IWICBitmapFrameEncode_Initialize(frameencode, encoderoptions); if (SUCCEEDED(hr)) hr = IWICBitmapFrameEncode_SetSize(frameencode, width, height); -- 2.32.0

3 4

[PATCH 2/2] uxtheme: Do not resize source image even if destination is smaller than sizing margins.
by Zhiyi Zhang 25 Jan '22

25 Jan '22

This partially reverts 2b650fa, which resizes source image if destination is smaller than its sizing margins. Resizing the source image may result in the destination image missing some edges because of StretchBlt() calls. Same StretchBlt() calls also produce similar results on Windows. So it seems that Windows don't resize the source image and only resize the margins to try to keep the edges crisp. Fix scroll bar thumb missing edges when it's too small. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 709cf522d00..75db466967c 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -711,9 +711,9 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, const DTBGOPTS *pOptions) { HRESULT hr = S_OK; - HBITMAP bmpSrc, bmpSrcResized = NULL; + HBITMAP bmpSrc; HGDIOBJ oldSrc; - HDC hdcSrc, hdcOrigSrc = NULL; + HDC hdcSrc; RECT rcSrc; RECT rcDst; POINT dstSize; @@ -777,33 +777,17 @@ static HRESULT UXTHEME_DrawImageBackground(HTHEME hTheme, HDC hdc, int iPartId, GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); - /* Resize source image if destination smaller than margins */ + /* Resize sizing margins if destination is smaller */ if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y || sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.y); sm.cyBottomHeight = dstSize.y - sm.cyTopHeight; - srcSize.y = dstSize.y; } if (sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { sm.cxLeftWidth = MulDiv(sm.cxLeftWidth, dstSize.x, srcSize.x); sm.cxRightWidth = dstSize.x - sm.cxLeftWidth; - srcSize.x = dstSize.x; } - - hdcOrigSrc = hdcSrc; - hdcSrc = CreateCompatibleDC(NULL); - bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); - SelectObject(hdcSrc, bmpSrcResized); - - /* Use ALPHABLEND_NONE because the image is getting resized, rather than blended with the target */ - UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, - rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, ALPHABLEND_NONE, 0); - - rcSrc.left = 0; - rcSrc.top = 0; - rcSrc.right = srcSize.x; - rcSrc.bottom = srcSize.y; } hdcDst = hdc; @@ -910,8 +894,6 @@ draw_error: } SelectObject(hdcSrc, oldSrc); DeleteDC(hdcSrc); - if (bmpSrcResized) DeleteObject(bmpSrcResized); - if (hdcOrigSrc) DeleteDC(hdcOrigSrc); *pRect = rcDst; return hr; } -- 2.32.0

1 0

[PATCH 1/2] uxtheme: Search TMT_IMAGEFILE1~7 first when drawing background for parts without glyph images.
by Zhiyi Zhang 25 Jan '22

25 Jan '22

Try TMT_IMAGEFILE first when drawing part background and the part contains glyph images. Otherwise, search TMT_IMAGEFILE1~7 and then TMT_IMAGEFILE or TMT_GLYPHIMAGEFILE. This behavior can be verified by drawing scroll bar arrow buttons, where TMT_IMAGEFILE is used for background despite TMT_IMAGEFILE1 being present and TMT_IMAGEFILE1 is used for glyphs despite TMT_IMAGEFILE is present. For parts without glyph images, TMT_IMAGEFILE1~7 are always searched first, then try TMT_IMAGEFILE or TMT_GLYPHIMAGEFILE. Fix the size grip on status control not being painted when using builtin Light theme. The status gripper part uses TMT_IMAGEFILE1~7 and doesn't have TMT_IMAGEFILE. So when UXTHEME_SelectImage() tries to query TMT_IMAGEFILE for status gripper, it falls back to using status class TMT_IMAGEFILE. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 4aac46f3fed..709cf522d00 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -185,20 +185,23 @@ static int imagefile_index_to_property(int index) static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStateId, const RECT *pRect, BOOL glyph, int *imageDpi) { - PTHEME_PROPERTY tp; - int imageselecttype = IST_NONE; + int imageselecttype = IST_NONE, glyphtype = GT_NONE; + PTHEME_PROPERTY tp = NULL; int i; - int image; - if(glyph) - image = TMT_GLYPHIMAGEFILE; - else - image = TMT_IMAGEFILE; if (imageDpi) *imageDpi = 96; - if((tp=MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, image))) - return tp; + /* Try TMT_IMAGEFILE first when drawing part background and the part contains glyph images. + * Otherwise, search TMT_IMAGEFILE1~7 and then TMT_IMAGEFILE or TMT_GLYPHIMAGEFILE */ + if (!glyph) + { + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_GLYPHTYPE, &glyphtype); + if (glyphtype == GT_IMAGEGLYPH && + (tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE))) + return tp; + } + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_IMAGESELECTTYPE, &imageselecttype); if(imageselecttype == IST_DPI) { @@ -223,7 +226,7 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStat } } /* If an image couldn't be selected, choose the first one */ - return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); + tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); } else if(imageselecttype == IST_SIZE) { POINT size = {pRect->right-pRect->left, pRect->bottom-pRect->top}; @@ -270,9 +273,13 @@ static PTHEME_PROPERTY UXTHEME_SelectImage(HTHEME hTheme, int iPartId, int iStat } } /* If an image couldn't be selected, choose the smallest one */ - return MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); + tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, TMT_IMAGEFILE1); } - return NULL; + + if (!tp) + tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, + glyph ? TMT_GLYPHIMAGEFILE : TMT_IMAGEFILE); + return tp; } /*********************************************************************** -- 2.32.0

1 0

[PATCH 1/3] user32: Avoid recalculating the non-client hit-test value for NC_HandleNCMouseMove().
by Zhiyi Zhang 25 Jan '22

25 Jan '22

The wParam in WM_NCMOUSEMOVE messages already contains the non-client hit-test value. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/controls.h | 2 +- dlls/user32/defwnd.c | 7 +------ dlls/user32/nonclient.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 2b3d405ae69..ce14d13171f 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -171,7 +171,7 @@ extern LRESULT NC_HandleNCActivate( HWND hwnd, WPARAM wParam, LPARAM lParam ) DE extern LRESULT NC_HandleNCCalcSize( HWND hwnd, WPARAM wParam, RECT *winRect ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; -extern LRESULT NC_HandleNCMouseMove( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; +extern LRESULT NC_HandleNCMouseMove( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCMouseLeave( HWND hwnd ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCRButtonDown( HWND hwnd, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern LRESULT NC_HandleNCLButtonDblClk( HWND hwnd, WPARAM wParam, LPARAM lParam) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 44675c7b8e7..abb73e73ca8 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -246,12 +246,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa return NC_HandleNCPaint( hwnd, (HRGN)wParam ); case WM_NCMOUSEMOVE: - { - POINT pt; - pt.x = (short)LOWORD(lParam); - pt.y = (short)HIWORD(lParam); - return NC_HandleNCMouseMove( hwnd, pt ); - } + return NC_HandleNCMouseMove( hwnd, wParam, lParam ); case WM_NCMOUSELEAVE: return NC_HandleNCMouseLeave( hwnd ); diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index b47616bb639..639cca707fb 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -635,22 +635,24 @@ LRESULT NC_HandleNCHitTest( HWND hwnd, POINT pt ) return HTNOWHERE; } -LRESULT NC_HandleNCMouseMove(HWND hwnd, POINT pt) +LRESULT NC_HandleNCMouseMove(HWND hwnd, WPARAM wParam, LPARAM lParam) { - LONG hittest; RECT rect; + POINT pt; - TRACE("hwnd=%p pt=%s\n", hwnd, wine_dbgstr_point(&pt)); + TRACE("hwnd=%p wparam=%#lx lparam=%#lx\n", hwnd, wParam, lParam); - hittest = NC_HandleNCHitTest(hwnd, pt); - if (hittest != HTHSCROLL && hittest != HTVSCROLL) + if (wParam != HTHSCROLL && wParam != HTVSCROLL) return 0; WIN_GetRectangles(hwnd, COORDS_CLIENT, &rect, NULL); + + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); ScreenToClient(hwnd, &pt); pt.x -= rect.left; pt.y -= rect.top; - SCROLL_HandleScrollEvent(hwnd, hittest == HTHSCROLL ? SB_HORZ : SB_VERT, WM_NCMOUSEMOVE, pt); + SCROLL_HandleScrollEvent(hwnd, wParam == HTHSCROLL ? SB_HORZ : SB_VERT, WM_NCMOUSEMOVE, pt); return 0; } -- 2.32.0

1 0

[PATCH] widl: Remove the uuid_t typedef which causes conflicts on macOS.
by Huw Davies 25 Jan '22

25 Jan '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- tools/widl/client.c | 2 +- tools/widl/header.c | 14 +++++++------- tools/widl/parser.l | 4 ++-- tools/widl/parser.y | 6 +++--- tools/widl/proxy.c | 4 ++-- tools/widl/register.c | 18 +++++++++--------- tools/widl/server.c | 2 +- tools/widl/typegen.c | 2 +- tools/widl/typelib.c | 2 +- tools/widl/typelib_struct.h | 8 ++++---- tools/widl/typetree.c | 8 ++++---- tools/widl/utils.h | 2 +- tools/widl/widl.c | 8 ++++---- tools/widl/widltypes.h | 10 +++++----- tools/widl/write_msft.c | 20 ++++++++++---------- 15 files changed, 55 insertions(+), 55 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 05ce8e732aa..704be91cb78 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -437,7 +437,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) static void write_clientinterfacedecl(type_t *iface) { unsigned int ver = get_attrv(iface->attrs, ATTR_VERSION); - const uuid_t *uuid = get_attrp(iface->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(iface->attrs, ATTR_UUID); const str_list_t *endpoints = get_attrp(iface->attrs, ATTR_ENDPOINT); if (endpoints) write_endpoints( client, iface->name, endpoints ); diff --git a/tools/widl/header.c b/tools/widl/header.c index f8dcab91e6a..ce2f9064c38 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -141,7 +141,7 @@ static char *format_parameterized_type_args(const type_t *type, const char *pref return buf; } -static void write_guid(FILE *f, const char *guid_prefix, const char *name, const uuid_t *uuid) +static void write_guid(FILE *f, const char *guid_prefix, const char *name, const struct uuid *uuid) { if (!uuid) return; fprintf(f, "DEFINE_GUID(%s_%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," @@ -151,7 +151,7 @@ static void write_guid(FILE *f, const char *guid_prefix, const char *name, const uuid->Data4[6], uuid->Data4[7]); } -static void write_uuid_decl(FILE *f, type_t *type, const uuid_t *uuid) +static void write_uuid_decl(FILE *f, type_t *type, const struct uuid *uuid) { fprintf(f, "#ifdef __CRT_UUID_DECL\n"); fprintf(f, "__CRT_UUID_DECL(%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," @@ -162,7 +162,7 @@ static void write_uuid_decl(FILE *f, type_t *type, const uuid_t *uuid) fprintf(f, "#endif\n"); } -static const char *uuid_string(const uuid_t *uuid) +static const char *uuid_string(const struct uuid *uuid) { static char buf[37]; @@ -937,7 +937,7 @@ static void write_declaration(FILE *header, const var_t *v) static void write_library(FILE *header, const typelib_t *typelib) { - const uuid_t *uuid = get_attrp(typelib->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(typelib->attrs, ATTR_UUID); fprintf(header, "\n"); write_guid(header, "LIBID", typelib->name, uuid); fprintf(header, "\n"); @@ -1680,7 +1680,7 @@ static void write_widl_using_method_macros(FILE *header, const type_t *iface, co static void write_widl_using_macros(FILE *header, type_t *iface) { - const uuid_t *uuid = get_attrp(iface->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(iface->attrs, ATTR_UUID); const char *name = iface->short_name ? iface->short_name : iface->name; char *macro; @@ -1702,7 +1702,7 @@ static void write_widl_using_macros(FILE *header, type_t *iface) static void write_com_interface_end(FILE *header, type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); - const uuid_t *uuid = get_attrp(iface->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(iface->attrs, ATTR_UUID); expr_t *contract = get_attrp(iface->attrs, ATTR_CONTRACT); type_t *type; @@ -1836,7 +1836,7 @@ static void write_rpc_interface_end(FILE *header, const type_t *iface) static void write_coclass(FILE *header, type_t *cocl) { - const uuid_t *uuid = get_attrp(cocl->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(cocl->attrs, ATTR_UUID); fprintf(header, "/*****************************************************************************\n"); fprintf(header, " * %s coclass\n", cocl->name); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 8fb5c91e6dc..823d6f0acca 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -96,9 +96,9 @@ static unsigned int xstrtoul(const char *nptr, char **endptr, int base) return val; } -uuid_t *parse_uuid(const char *u) +struct uuid *parse_uuid(const char *u) { - uuid_t* uuid = xmalloc(sizeof(*uuid)); + struct uuid* uuid = xmalloc(sizeof(*uuid)); char b[3]; /* it would be nice to use UuidFromStringA */ uuid->Data1 = strtoul(u, NULL, 16); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d7fc009c5c2..82cf946e8fb 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -50,7 +50,7 @@ static decl_spec_t *make_decl_spec(type_t *type, decl_spec_t *left, decl_spec_t enum storage_class stgclass, enum type_qualifier qual, enum function_specifier func_specifier); static attr_t *make_attr(enum attr_type type); static attr_t *make_attrv(enum attr_type type, unsigned int val); -static attr_t *make_custom_attr(uuid_t *id, expr_t *pval); +static attr_t *make_custom_attr(struct uuid *id, expr_t *pval); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); @@ -141,7 +141,7 @@ static typelib_t *current_typelib; typeref_t *typeref; typeref_list_t *typeref_list; char *str; - uuid_t *uuid; + struct uuid *uuid; unsigned int num; double dbl; typelib_t *typelib; @@ -1523,7 +1523,7 @@ attr_t *make_attrp(enum attr_type type, void *val) return a; } -static attr_t *make_custom_attr(uuid_t *id, expr_t *pval) +static attr_t *make_custom_attr(struct uuid *id, expr_t *pval) { attr_t *a = xmalloc(sizeof(attr_t)); attr_custdata_t *cstdata = xmalloc(sizeof(attr_custdata_t)); diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 53ae9433463..a80aa5d77fe 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -847,8 +847,8 @@ static int cmp_iid( const void *ptr1, const void *ptr2 ) { const type_t * const *iface1 = ptr1; const type_t * const *iface2 = ptr2; - const uuid_t *uuid1 = get_attrp( (*iface1)->attrs, ATTR_UUID ); - const uuid_t *uuid2 = get_attrp( (*iface2)->attrs, ATTR_UUID ); + const struct uuid *uuid1 = get_attrp( (*iface1)->attrs, ATTR_UUID ); + const struct uuid *uuid2 = get_attrp( (*iface2)->attrs, ATTR_UUID ); return memcmp( uuid1, uuid2, sizeof(*uuid1) ); } diff --git a/tools/widl/register.c b/tools/widl/register.c index 24381353952..6c00dfaf5a2 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -34,7 +34,7 @@ static int indent; -static const char *format_uuid( const uuid_t *uuid ) +static const char *format_uuid( const struct uuid *uuid ) { static char buffer[40]; sprintf( buffer, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", @@ -76,8 +76,8 @@ static const type_t *find_ps_factory( const statement_list_t *stmts ) static void write_interface( const type_t *iface, const type_t *ps_factory ) { - const uuid_t *uuid = get_attrp( iface->attrs, ATTR_UUID ); - const uuid_t *ps_uuid = get_attrp( ps_factory->attrs, ATTR_UUID ); + const struct uuid *uuid = get_attrp( iface->attrs, ATTR_UUID ); + const struct uuid *ps_uuid = get_attrp( ps_factory->attrs, ATTR_UUID ); if (!uuid) return; if (!is_object( iface )) return; @@ -109,8 +109,8 @@ static void write_interfaces( const statement_list_t *stmts, const type_t *ps_fa static void write_typelib_interface( const type_t *iface, const typelib_t *typelib ) { - const uuid_t *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); - const uuid_t *uuid = get_attrp( iface->attrs, ATTR_UUID ); + const struct uuid *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const struct uuid *uuid = get_attrp( iface->attrs, ATTR_UUID ); unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); if (!uuid) return; @@ -139,7 +139,7 @@ static void write_typelib_interfaces( const typelib_t *typelib ) static int write_coclass( const type_t *class, const typelib_t *typelib ) { - const uuid_t *uuid = get_attrp( class->attrs, ATTR_UUID ); + const struct uuid *uuid = get_attrp( class->attrs, ATTR_UUID ); const char *descr = get_attrp( class->attrs, ATTR_HELPSTRING ); const char *progid = get_attrp( class->attrs, ATTR_PROGID ); const char *vi_progid = get_attrp( class->attrs, ATTR_VIPROGID ); @@ -157,7 +157,7 @@ static int write_coclass( const type_t *class, const typelib_t *typelib ) if (progid) put_str( indent, "ProgId = s '%s'\n", progid ); if (typelib) { - const uuid_t *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const struct uuid *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); put_str( indent, "TypeLib = s '%s'\n", format_uuid( typelib_uuid )); if (!version) version = get_attrv( typelib->attrs, ATTR_VERSION ); } @@ -200,7 +200,7 @@ static void write_runtimeclasses_registry( const statement_list_t *stmts ) static int write_progid( const type_t *class ) { - const uuid_t *uuid = get_attrp( class->attrs, ATTR_UUID ); + const struct uuid *uuid = get_attrp( class->attrs, ATTR_UUID ); const char *descr = get_attrp( class->attrs, ATTR_HELPSTRING ); const char *progid = get_attrp( class->attrs, ATTR_PROGID ); const char *vi_progid = get_attrp( class->attrs, ATTR_VIPROGID ); @@ -324,7 +324,7 @@ void write_typelib_regscript( const statement_list_t *stmts ) void output_typelib_regscript( const typelib_t *typelib ) { - const uuid_t *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); + const struct uuid *typelib_uuid = get_attrp( typelib->attrs, ATTR_UUID ); const char *descr = get_attrp( typelib->attrs, ATTR_HELPSTRING ); const expr_t *lcid_expr = get_attrp( typelib->attrs, ATTR_LIBLCID ); unsigned int version = get_attrv( typelib->attrs, ATTR_VERSION ); diff --git a/tools/widl/server.c b/tools/widl/server.c index e3ff5afc11c..1d8ab41185d 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -399,7 +399,7 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) static void write_serverinterfacedecl(type_t *iface) { unsigned int ver = get_attrv(iface->attrs, ATTR_VERSION); - uuid_t *uuid = get_attrp(iface->attrs, ATTR_UUID); + struct uuid *uuid = get_attrp(iface->attrs, ATTR_UUID); const str_list_t *endpoints = get_attrp(iface->attrs, ATTR_ENDPOINT); if (endpoints) write_endpoints( server, iface->name, endpoints ); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a195c5b3730..b2d9ab5d100 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3506,7 +3506,7 @@ static unsigned int write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *t else { const type_t *base = is_ptr(type) ? type_pointer_get_ref_type(type) : type; - const uuid_t *uuid = get_attrp(base->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(base->attrs, ATTR_UUID); if (! uuid) error("%s: interface %s missing UUID\n", __FUNCTION__, base->name); diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 5c679d5513e..202702c54dd 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -239,7 +239,7 @@ unsigned short get_type_vt(type_t *t) return 0; } -static void msft_read_guid(void *data, MSFT_SegDir *segdir, int offset, uuid_t *guid) +static void msft_read_guid(void *data, MSFT_SegDir *segdir, int offset, struct uuid *guid) { memcpy( guid, (char *)data + segdir->pGuidTab.offset + offset, sizeof(*guid) ); } diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 745f37b76ee..ec1e317bf23 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -242,7 +242,7 @@ typedef struct { /* this is how a guid is stored */ typedef struct { - uuid_t guid; + struct uuid guid; int hreftype; /* -2 for the typelib guid, typeinfo offset for typeinfo guid, low two bits are 01 if this is an imported typeinfo, low two bits @@ -357,10 +357,10 @@ typedef struct { unsigned short syskind; /* == 1 for win32, 0 for win16 */ unsigned short lcid; /* == 0x409, 0x809 etc */ unsigned int res12; /* == 0 */ - unsigned short libflags; /* LIBFLAG_* */ + unsigned short libflags; /* LIBFLAG_* */ unsigned short maj_vers; unsigned short min_vers; - uuid_t uuid; + struct uuid uuid; } SLTG_LibBlk; #define SLTG_LIBBLK_MAGIC 0x51cc @@ -379,7 +379,7 @@ typedef struct { unsigned short res20; /* 0xffff */ unsigned int helpcontext; unsigned short res26; /* 0xffff */ - uuid_t uuid; + struct uuid uuid; } SLTG_OtherTypeInfo; /* Next we get WORD 0x0003 followed by a DWORD which if we add to diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 33735d26f58..065bed28b04 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -160,7 +160,7 @@ static size_t append_var_list_signature(char **buf, size_t *len, size_t pos, var static size_t append_type_signature(char **buf, size_t *len, size_t pos, type_t *type) { - const uuid_t *uuid; + const struct uuid *uuid; size_t n = 0; if (!type) return 0; @@ -329,7 +329,7 @@ static char *format_parameterized_type_signature(type_t *type, typeref_list_t *p size_t len = 0, pos = 0; char *buf = NULL; typeref_t *ref; - const uuid_t *uuid; + const struct uuid *uuid; if (!(uuid = get_attrp(type->attrs, ATTR_UUID))) error_loc_info(&type->loc_info, "cannot compute type signature, no uuid found for type %s.\n", type->name); @@ -1237,7 +1237,7 @@ static void compute_interface_signature_uuid(type_t *iface) static const int version = 5; struct sha1_context ctx; unsigned char hash[20]; - uuid_t *uuid; + struct uuid *uuid; if (!(uuid = get_attrp(iface->attrs, ATTR_UUID))) { @@ -1266,7 +1266,7 @@ static void compute_interface_signature_uuid(type_t *iface) uuid->Data1 = ((unsigned int)hash[0] << 24) | ((unsigned int)hash[1] << 16) | ((unsigned int)hash[2] << 8) | hash[3]; uuid->Data2 = ((unsigned short)hash[4] << 8) | hash[5]; uuid->Data3 = ((unsigned short)hash[6] << 8) | hash[7]; - memcpy(&uuid->Data4, hash + 8, sizeof(*uuid) - offsetof(uuid_t, Data4)); + memcpy(&uuid->Data4, hash + 8, sizeof(*uuid) - offsetof(struct uuid, Data4)); } type_t *type_parameterized_type_specialize_define(type_t *type) diff --git a/tools/widl/utils.h b/tools/widl/utils.h index eeb1d068c96..f042f0e064c 100644 --- a/tools/widl/utils.h +++ b/tools/widl/utils.h @@ -35,7 +35,7 @@ size_t strappend(char **buf, size_t *len, size_t pos, const char* fmt, ...) __at size_t widl_getline(char **linep, size_t *lenp, FILE *fp); -uuid_t *parse_uuid(const char *u); +struct uuid *parse_uuid(const char *u); int is_valid_uuid(const char *s); /* buffer management */ diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 980e57b1782..7686594b7d3 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -382,7 +382,7 @@ void write_dlldata(const statement_list_t *stmts) write_dlldata_list(filenames, define_proxy_delegation); } -static void write_id_guid(FILE *f, const char *type, const char *guid_prefix, const char *name, const uuid_t *uuid) +static void write_id_guid(FILE *f, const char *type, const char *guid_prefix, const char *name, const struct uuid *uuid) { if (!uuid) return; fprintf(f, "MIDL_DEFINE_GUID(%s, %s_%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," @@ -402,7 +402,7 @@ static void write_id_data_stmts(const statement_list_t *stmts) const type_t *type = stmt->u.type; if (type_get_type(type) == TYPE_INTERFACE) { - const uuid_t *uuid; + const struct uuid *uuid; if (!is_object(type) && !is_attr(type->attrs, ATTR_DISPINTERFACE)) continue; uuid = get_attrp(type->attrs, ATTR_UUID); @@ -416,13 +416,13 @@ static void write_id_data_stmts(const statement_list_t *stmts) } else if (type_get_type(type) == TYPE_COCLASS) { - const uuid_t *uuid = get_attrp(type->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(type->attrs, ATTR_UUID); write_id_guid(idfile, "CLSID", "CLSID", type->name, uuid); } } else if (stmt->type == STMT_LIBRARY) { - const uuid_t *uuid = get_attrp(stmt->u.lib->attrs, ATTR_UUID); + const struct uuid *uuid = get_attrp(stmt->u.lib->attrs, ATTR_UUID); write_id_guid(idfile, "IID", "LIBID", stmt->u.lib->name, uuid); write_id_data_stmts(stmt->u.lib->stmts); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 622c4708a87..8df927fea4c 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -26,13 +26,13 @@ #include "ndrtypes.h" #include "wine/list.h" -typedef struct +struct uuid { unsigned int Data1; unsigned short Data2; unsigned short Data3; unsigned char Data4[8]; -} uuid_t; +}; #define TRUE 1 #define FALSE 0 @@ -359,7 +359,7 @@ struct _expr_t { }; struct _attr_custdata_t { - uuid_t id; + struct uuid id; expr_t *pval; }; @@ -564,7 +564,7 @@ struct _typelib_entry_t { struct _importinfo_t { int offset; - uuid_t guid; + struct uuid guid; int flags; int id; @@ -578,7 +578,7 @@ struct _importlib_t { char *name; int version; - uuid_t guid; + struct uuid guid; importinfo_t *importinfos; int ntypeinfos; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 7c00a7d59af..610f781ba76 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -186,7 +186,7 @@ static void ctl2_init_segdir( * * The hash key for the GUID. */ -static int ctl2_hash_guid(const uuid_t *guid) +static int ctl2_hash_guid(const struct uuid *guid) { int hash; int i; @@ -211,7 +211,7 @@ static int ctl2_hash_guid(const uuid_t *guid) static int ctl2_find_guid( msft_typelib_t *typelib, /* [I] The typelib to operate against. */ int hash_key, /* [I] The hash key for the guid. */ - const uuid_t *guid) /* [I] The guid to find. */ + const struct uuid *guid) /* [I] The guid to find. */ { int offset; MSFT_GuidEntry *guidentry; @@ -1255,7 +1255,7 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e write_int_value(typelib, out, vt, expr->cval); } -static void set_custdata(msft_typelib_t *typelib, const uuid_t *guid, +static void set_custdata(msft_typelib_t *typelib, const struct uuid *guid, int vt, const void *value, int *offset) { int guidoffset; @@ -1992,7 +1992,7 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ break; case ATTR_UUID: - guidentry.guid = *(uuid_t *)attr->u.pval; + guidentry.guid = *(struct uuid *)attr->u.pval; guidentry.hreftype = typelib->typelib_typeinfo_offsets[typeinfo->typekind >> 16]; guidentry.next_hash = -1; typeinfo->posguid = ctl2_alloc_guid(typelib, &guidentry); @@ -2025,8 +2025,8 @@ static void add_dispatch(msft_typelib_t *typelib) int guid_offset, impfile_offset, hash_key; MSFT_GuidEntry guidentry; MSFT_ImpInfo impinfo; - static const uuid_t stdole = {0x00020430,0x0000,0x0000,{0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}}; - static const uuid_t iid_idispatch = {0x00020400,0x0000,0x0000,{0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}}; + static const struct uuid stdole = {0x00020430,0x0000,0x0000,{0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}}; + static const struct uuid iid_idispatch = {0x00020400,0x0000,0x0000,{0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46}}; if(typelib->typelib_header.dispatchpos != -1) return; @@ -2509,7 +2509,7 @@ static void set_guid(msft_typelib_t *typelib) { MSFT_GuidEntry guidentry = { {0}, -2, -1 }; int offset; - uuid_t *ptr = get_attrp( typelib->typelib->attrs, ATTR_UUID ); + struct uuid *ptr = get_attrp( typelib->typelib->attrs, ATTR_UUID ); if (ptr) guidentry.guid = *ptr; @@ -2753,9 +2753,9 @@ int create_msft_typelib(typelib_t *typelib) time_t cur_time; char *time_override; unsigned int version = 7 << 24 | 555; /* 7.00.0555 */ - static const uuid_t midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; - static const uuid_t midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; - static const uuid_t midl_info_guid = {0xde77ba65,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + static const struct uuid midl_time_guid = {0xde77ba63,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + static const struct uuid midl_version_guid = {0xde77ba64,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; + static const struct uuid midl_info_guid = {0xde77ba65,0x517c,0x11d1,{0xa2,0xda,0x00,0x00,0xf8,0x77,0x3c,0xe9}}; char info_string[128]; msft = xmalloc(sizeof(*msft)); -- 2.23.0

1 0

[PATCH] programs/start: wrap child inside a job so child get's killed when start.exe terminates
by Eric Pouech 25 Jan '22

25 Jan '22

fixes: #50869 https://bugs.winehq.org/show_bug.cgi?id=50869 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/start/start.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/programs/start/start.c b/programs/start/start.c index dcd0a113f59..b5bf8187603 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -676,7 +676,24 @@ done: if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { DWORD exitcode; + HANDLE hJob; + JOBOBJECT_EXTENDED_LIMIT_INFORMATION info; + SetConsoleCtrlHandler(NULL, TRUE); + hJob = CreateJobObjectA(NULL, NULL); + /* Create a job where the child is associated... if the start.exe terminates + * before the child, the job will be terminated, and the child will be terminated as well. + * (The idea is to allow to kill (from a Unix standpoint) a created Windows + * process (here start.exe), and that the unix-kill of start.exe will be also terminate + * start.exe's child process). + */ + memset(&info, 0, sizeof(info)); + info.BasicLimitInformation.LimitFlags = + JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE | + JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK; + SetInformationJobObject(hJob, JobObjectExtendedLimitInformation, &info, sizeof(info)); + AssignProcessToJobObject(hJob, sei.hProcess); + WaitForSingleObject(sei.hProcess, INFINITE); GetExitCodeProcess(sei.hProcess, &exitcode); ExitProcess(exitcode);

1 0

[PATCH 0/2] Long path in cmd
by Eric Pouech 25 Jan '22

25 Jan '22

Protect and test programs/cmd against path which length exceeds MAX_PATH patch to programs/cmd is applied before adding the tests as the tests make cmd crash with a stack overflow A+ --- Eric Pouech (2): programs/cmd: don't overflow internal buffers programs/cmd/tests: test paths which length exceeds MAX_PATH programs/cmd/builtins.c | 39 +++++++++++++++++------- programs/cmd/tests/test_builtins.cmd | 19 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 +++ programs/cmd/wcmdmain.c | 10 ++++-- 4 files changed, 58 insertions(+), 14 deletions(-)

2 4

[PATCH] programs/cmd/test: don't output more data than available
by Eric Pouech 25 Jan '22

25 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/tests/batch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 162e9cfa151..0b48d7fa039 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -344,8 +344,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da } } - ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); - ok(out_ptr >= out_data+out_size, "too long output, got additional %s\n", out_ptr); + ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %.*s\n", line, exp_data + exp_size - exp_ptr, exp_ptr); + ok(out_ptr >= out_data+out_size, "too long output, got additional %.*s\n", out_data + out_size - out_ptr, out_ptr); } static void run_test(const char *cmd_data, DWORD cmd_size, const char *exp_data, DWORD exp_size)

2 1

[PATCH 2/2] msdasql: Implement ICommandPrepare Prepare
by Alistair Leslie-Hughes 25 Jan '22

25 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 4 ++-- dlls/msdasql/msdasql_private.h | 3 ++- dlls/msdasql/session.c | 31 ++++++++++++++++++++++++++++++- dlls/msdasql/tests/provider.c | 14 ++++++++++++++ 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 0d0a60ab7a2..d6c833c4c14 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -43,7 +43,7 @@ DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0 DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); -static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) +void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) { SQLCHAR state[6], msg[SQL_MAX_MESSAGE_LENGTH]; SQLINTEGER native; @@ -611,7 +611,7 @@ static HRESULT WINAPI dbsess_CreateSession(IDBCreateSession *iface, IUnknown *ou if (outer) FIXME("outer currently not supported.\n"); - hr = create_db_session(riid, &provider->MSDASQL_iface, (void**)session); + hr = create_db_session(riid, &provider->MSDASQL_iface, provider->hdbc, (void**)session); return hr; } diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index 7d7f67c2c78..42bb8697030 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,4 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) DECLSPEC_HIDDEN; +void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) DECLSPEC_HIDDEN; diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index b4239c59037..f0e915ca710 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -30,6 +30,7 @@ #include "msdasql.h" #include "oledberr.h" +#include "sqlucode.h" #include "msdasql_private.h" @@ -45,6 +46,8 @@ struct msdasql_session LONG refs; IUnknown *datasource; + + HDBC hdbc; }; static inline struct msdasql_session *impl_from_IUnknown( IUnknown *iface ) @@ -305,6 +308,8 @@ struct command LONG refs; WCHAR *query; IUnknown *session; + HDBC hdbc; + SQLHSTMT hstmt; }; static inline struct command *impl_from_ICommandText( ICommandText *iface ) @@ -424,6 +429,10 @@ static ULONG WINAPI command_Release(ICommandText *iface) TRACE( "destroying %p\n", command ); if (command->session) IUnknown_Release(command->session); + + if (command->hstmt) + SQLFreeHandle(SQL_HANDLE_STMT, command->hstmt); + heap_free( command->query ); heap_free( command ); } @@ -1051,7 +1060,24 @@ static ULONG WINAPI commandprepare_Release(ICommandPrepare *iface) static HRESULT WINAPI commandprepare_Prepare(ICommandPrepare *iface, ULONG runs) { struct command *command = impl_from_ICommandPrepare( iface ); + RETCODE ret; + TRACE("%p, %u\n", command, runs); + + if (!command->query) + return DB_E_NOCOMMAND; + + if (command->hstmt) + SQLFreeHandle(SQL_HANDLE_STMT, command->hstmt); + + SQLAllocHandle(SQL_HANDLE_STMT, command->hdbc, &command->hstmt); + + ret = SQLPrepareW(command->hstmt, command->query, SQL_NTS); + if (ret != SQL_SUCCESS) + { + dump_sql_diag_records(SQL_HANDLE_STMT, command->hstmt); + return E_FAIL; + } return S_OK; } @@ -1147,6 +1173,8 @@ static HRESULT WINAPI createcommand_CreateCommand(IDBCreateCommand *iface, IUnkn command->ICommandWithParameters_iface.lpVtbl = &command_with_params_vtbl; command->refs = 1; command->query = NULL; + command->hdbc = session->hdbc; + command->hstmt = NULL; IUnknown_QueryInterface(&session->session_iface, &IID_IUnknown, (void**)&command->session); @@ -1163,7 +1191,7 @@ static const IDBCreateCommandVtbl createcommandVtbl = createcommand_CreateCommand }; -HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) +HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) { struct msdasql_session *session; HRESULT hr; @@ -1179,6 +1207,7 @@ HRESULT create_db_session(REFIID riid, IUnknown *datasource, void **unk) session->IDBCreateCommand_iface.lpVtbl = &createcommandVtbl; IUnknown_QueryInterface(datasource, &IID_IUnknown, (void**)&session->datasource); session->refs = 1; + session->hdbc = hdbc; hr = IUnknown_QueryInterface(&session->session_iface, riid, unk); IUnknown_Release(&session->session_iface); diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index ce3573fbfd7..eefddbf6dcb 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -354,6 +354,7 @@ static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) static void test_command_rowset(IUnknown *cmd) { ICommandText *command_text; + ICommandPrepare *commandprepare; HRESULT hr; IUnknown *unk = NULL; IRowset *rowset; @@ -362,9 +363,22 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandPrepare, (void**)&commandprepare); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandPrepare_Prepare(commandprepare, 1); + ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = ICommandPrepare_Prepare(commandprepare, 1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICommandPrepare_Release(commandprepare); + affected = 9999; hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.34.1

1 0

[PATCH 1/2] msdasql: Fix logic when dumping diagnostics records.
by Alistair Leslie-Hughes 25 Jan '22

25 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/msdasql_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index cf69195baf7..0d0a60ab7a2 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -52,7 +52,7 @@ static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) if (!TRACE_ON(msdasql)) return; - while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) != SQL_SUCCESS) + while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) == SQL_SUCCESS) { WARN("%d: %s: %s\n", i, state, msg); i++; -- 2.34.1

1 0

[PATCH v4 1/2] winmm: Test that a callback passed to `waveOutOpen` can call `waveOutWrite` without getting called reentrantly.
by Liam Murphy 25 Jan '22

25 Jan '22

This behaviour is relied upon by Teardown, see https://github.com/ValveSoftware/Proton/issues/4332. Signed-off-by: Liam Murphy <liampm32(a)gmail.com> --- v2: Add `todo_wine` to avoid test failure --- v3: Use block comments instead of line comments --- v4: Simplify test --- dlls/winmm/tests/wave.c | 160 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2f0c8443363..83e83a0150e 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -865,6 +865,164 @@ EXIT: HeapFree(GetProcessHeap(), 0, frags); } +struct reentrancy_callback_data { + HANDLE hevent; + /* Which thread is currently running the callback, or 0 if it isn't running. */ + DWORD running_thread; + /* How many times the callback's been called. */ + BOOL call_num; +}; + +static void CALLBACK reentrancy_callback_func(HWAVEOUT hwo, UINT uMsg, + DWORD_PTR dwInstance, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + struct reentrancy_callback_data *data = (struct reentrancy_callback_data *)dwInstance; + + data->call_num += 1; + + todo_wine_if(data->call_num == 3) + ok(data->running_thread != GetCurrentThreadId(), "winmm callback called reentrantly, with message %u\n", uMsg); + if (data->running_thread) { + if (data->running_thread != GetCurrentThreadId()) trace("Callback running on two threads simultaneously\n"); + + /* Don't mess with what the original call was doing. */ + return; + } + data->running_thread = GetCurrentThreadId(); + + /* We have to wait for a `WOM_DONE` event rather than just using the `WOM_OPEN` event + * so that we're running on the winmm audio thread, so that we can block it + * to prevent the next `WOM_DONE` event just getting fired in the background + * (and then presumably calling the callback on another thread?) */ + if (uMsg == WOM_DONE) { + if (data->call_num == 2) { + MMRESULT rc; + /* Reuse the header which just finished. */ + WAVEHDR *hdr = (WAVEHDR *)dwParam1; + + /* Each frame is supposed to last 100ms, so 150ms should be enough to guarantee that the last one has finished. */ + Sleep(150); + + /* This is needed to trigger the bug in wine, + * since winmm checks for `WOM_DONE` within `WINMM_PushData`, which this calls. */ + rc = waveOutWrite(hwo, hdr, sizeof(*hdr)); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(): rc=%s\n", wave_out_error(rc)); + } + } + + data->running_thread = 0; + /* Only do this at the end of the function so that it isn't possible for the main thread + * to mistakenly call `waveOutClose` while the test is running. */ + SetEvent(data->hevent); +} + +/* Test whether the callback gets called reentrantly when `waveOutWrite` is called + * from within the callback passed to `waveOutOpen`. */ +static void wave_out_test_no_reentrancy(int device) +{ + HWAVEOUT wout; + HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); + WAVEHDR *frags = 0; + MMRESULT rc; + int headers = 2; + int loops = 0; + WAVEFORMATEX format; + WAVEFORMATEX* pwfx = &format; + DWORD flags = CALLBACK_FUNCTION; + double duration = 0.2; + DWORD_PTR callback = 0; + struct reentrancy_callback_data callback_data; + DWORD_PTR callback_instance = 0; + char * buffer; + DWORD length; + DWORD frag_length; + int i; + BOOL done; + + format.wFormatTag=WAVE_FORMAT_PCM; + format.nChannels=1; + format.wBitsPerSample=8; + format.nSamplesPerSec=22050; + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + format.cbSize=0; + + callback = (DWORD_PTR)reentrancy_callback_func; + callback_data.hevent = hevent; + callback_data.running_thread = 0; + callback_data.call_num = 0; + callback_instance = (DWORD_PTR)(&callback_data); + + wout=NULL; + rc=waveOutOpen(&wout,device,pwfx,callback,callback_instance,flags); + if (rc!=MMSYSERR_NOERROR) { + trace("`waveOutOpen` failed with rc %s, skipping", mmsys_error(rc)); + goto EXIT; + } + + rc=WaitForSingleObject(hevent,9000); + ok(rc==WAIT_OBJECT_0, "missing WOM_OPEN notification\n"); + + frags = HeapAlloc(GetProcessHeap(), 0, headers * sizeof(WAVEHDR)); + + buffer=wave_generate_silence(pwfx,duration / (loops + 1),&length); + + /* make sure fragment length is a multiple of block size */ + frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign; + + for (i = 0; i < headers; i++) { + frags[i].lpData=buffer + (i * frag_length); + if (i != (headers-1)) + frags[i].dwBufferLength=frag_length; + else { + /* use remainder of buffer for last fragment */ + frags[i].dwBufferLength=length - (i * frag_length); + } + frags[i].dwFlags=0; + frags[i].dwLoops=0; + rc=waveOutPrepareHeader(wout, &frags[i], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, + "waveOutPrepareHeader(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + } + + if (rc==MMSYSERR_NOERROR) { + /* Queue up the initial fragments. */ + rc=waveOutWrite(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s): rc=%s\n", + dev_name(device),wave_out_error(rc)); + + rc=waveOutWrite(wout, &frags[1], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s): rc=%s\n", + dev_name(device),wave_out_error(rc)); + } + + done = FALSE; + while (!done) { + rc=WaitForSingleObject(hevent,8000); + ok(rc==WAIT_OBJECT_0, "missing WOM_DONE notification\n"); + + done = TRUE; + for (i = 0; i < headers; i++) { + if (!(frags[i].dwFlags & WHDR_DONE)) { + done = FALSE; + } + } + } + + /* Calling `waveOutClose` from within the callback hangs on Windows, so we have to make sure to do it here instead. */ + rc = waveOutClose(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutClose(): rc=%s\n", wave_out_error(rc)); + + rc=WaitForSingleObject(hevent,1500); + ok(rc==WAIT_OBJECT_0, "missing WOM_CLOSE notification\n"); + + HeapFree(GetProcessHeap(), 0, buffer); +EXIT: + CloseHandle(hevent); + HeapFree(GetProcessHeap(), 0, frags); +} + static void wave_out_test_device(UINT_PTR device) { WAVEOUTCAPSA capsA; @@ -984,6 +1142,8 @@ static void wave_out_test_device(UINT_PTR device) trace(" %s\n",wave_out_caps(capsA.dwSupport)); HeapFree(GetProcessHeap(), 0, nameA); + wave_out_test_no_reentrancy(device); + if (winetest_interactive && (device != WAVE_MAPPER)) { trace("Playing a 5 seconds reference tone.\n"); -- 2.35.0

1 1

[PATCH] dmsynth: Implement the sink Init method
by Michael Stefaniuc 24 Jan '22

24 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 1 + dlls/dmsynth/synthsink.c | 6 +++++- dlls/dmsynth/tests/dmsynth.c | 2 ++ dlls/dmusic/port.c | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 2a2e88c8e88..aabf1f56904 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -77,6 +77,7 @@ struct IDirectMusicSynthSinkImpl { LONG ref; IReferenceClock *latency_clock; IReferenceClock *master_clock; + IDirectMusicSynth *synth; /* No reference hold! */ BOOL active; }; diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 72fd671a415..9d7096a032b 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -96,7 +96,11 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_Init(IDirectMusicSynthSink *ifac { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - FIXME("(%p)->(%p): stub\n", This, synth); + TRACE("(%p)->(%p)\n", This, synth); + + /* Not holding a reference to avoid circular dependencies. + The synth will release the sink during the synth's destruction. */ + This->synth = synth; return S_OK; } diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 1e3e20829b7..e27d8abdb26 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -131,6 +131,8 @@ static void test_dmsynth(void) ref_clock_sink = get_refcount(clock_sink); /* This will Init() the SynthSink and finish initializing the Synth */ + hr = IDirectMusicSynthSink_Init(dmsynth_sink2, NULL); + ok(hr == S_OK, "IDirectMusicSynthSink_Init returned: %x\n", hr); hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink2); ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 31b3b764e02..7fe72563bb0 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -195,10 +195,10 @@ static ULONG WINAPI synth_port_Release(IDirectMusicPort *iface) if (!ref) { dmusic_remove_port(This->parent, iface); + IDirectMusicSynthSink_Release(This->synth_sink); IDirectMusicSynth_Activate(This->synth, FALSE); IDirectMusicSynth_Close(This->synth); IDirectMusicSynth_Release(This->synth); - IDirectMusicSynthSink_Release(This->synth_sink); if (This->dsbuffer) IDirectSoundBuffer_Release(This->dsbuffer); if (This->dsound) -- 2.34.1

1 0

[PATCH v5] Fix Case Insensitive function importing
by Ben Shefte 24 Jan '22

24 Jan '22

changelog: v1-v4 -> 5 removed unicode code referemces Fixes Regression from: Wine 6.21 https://bugs.winehq.org/show_bug.cgi?id=52446 Signed-off-by: Ben Shefte <shefben(a)gmail.com> --- dlls/ntdll/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..41d9012c519 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -624,11 +624,11 @@ static WCHAR *append_dll_ext( const WCHAR *name ) /*********************************************************************** * is_import_dll_system */ -static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import ) +static BOOL is_import_dll_system( LDR_ DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import ) { const char *name = get_rva( mod->DllBase, import->Name ); - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + return !stricmp( name, "ntdll.dll" ) || !stricmp( name, "kernel32.dll" ); } /********************************************************************** -- 2.27.0

2 1

[PATCH 1/2] msvcp140_atomic_wait: Add stub dll.
by Daniel Lehman 24 Jan '22

24 Jan '22

1 0

[PATCH] Fix Case Insensitive function importing
by Ben Shefte 24 Jan '22

24 Jan '22

changelog: v1-v3 -> 4 removed unicode code referemces Fixes Regression from: Wine 6.21 https://bugs.winehq.org/show_bug.cgi?id=52446 Signed-off-by: Ben Shefte <shefben(a)gmail.com> --- dlls/ntdll/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..41d9012c519 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -624,11 +624,11 @@ static WCHAR *append_dll_ext( const WCHAR *name ) /*********************************************************************** * is_import_dll_system */ -static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import ) +static BOOL is_import_dll_system( LDR_ DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import ) { const char *name = get_rva( mod->DllBase, import->Name ); - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + return !_stricmp( name, "ntdll.dll" ) || !_stricmp( name, "kernel32.dll" ); } /********************************************************************** -- 2.27.0

2 1

[PATCH] ole32: Add stub for OleConvertIStorageToOLESTREAMEx.
by Louis Lenders 24 Jan '22

24 Jan '22

https://bugs.winehq.org/show_bug.cgi?id=52298 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ole32/ole32.spec | 2 +- dlls/ole32/storage32.c | 11 +++++++++++ include/ole2.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index d9ffd63585c..e9982036eeb 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -187,7 +187,7 @@ @ stdcall Ole32DllGetClassObject(ptr ptr ptr) @ stdcall OleBuildVersion() @ stdcall OleConvertIStorageToOLESTREAM(ptr ptr) -@ stub OleConvertIStorageToOLESTREAMEx +@ stdcall OleConvertIStorageToOLESTREAMEx(ptr long long long long ptr ptr) @ stdcall OleConvertOLESTREAMToIStorage(ptr ptr ptr) @ stub OleConvertOLESTREAMToIStorageEx @ stdcall OleCreate(ptr ptr long ptr ptr ptr ptr) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1bc8455cc6b..06766a28fe7 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -10570,6 +10570,17 @@ enum stream_1ole_flags { OleStream_Convert = 0x00000004 }; +/************************************************************************* + * OleConvertIStorageToOLESTREAMEx [OLE32.@] + */ +HRESULT WINAPI OleConvertIStorageToOLESTREAMEx ( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, + DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ) +{ + FIXME("%p %x %d %d %d %p %p stub\n", stg, cf, width, height, size, medium, olestream); + + return E_NOTIMPL; +} + /*********************************************************************** * GetConvertStg (OLE32.@) */ diff --git a/include/ole2.h b/include/ole2.h index 05c1b5502c7..628bebae137 100644 --- a/include/ole2.h +++ b/include/ole2.h @@ -161,6 +161,8 @@ typedef struct _OLESTREAM { HRESULT WINAPI OleConvertOLESTREAMToIStorage( LPOLESTREAM lpolestream, LPSTORAGE pstg, const DVTARGETDEVICE* ptd); HRESULT WINAPI OleConvertIStorageToOLESTREAM( LPSTORAGE pstg, LPOLESTREAM lpolestream); +HRESULT WINAPI OleConvertIStorageToOLESTREAMEx( LPSTORAGE stg, CLIPFORMAT cf, LONG width, LONG height, + DWORD size, LPSTGMEDIUM medium, LPOLESTREAM olestream ); HRESULT WINAPI OleDoAutoConvert( LPSTORAGE pStg, LPCLSID pClsidNew ); HRESULT WINAPI OleGetAutoConvert( REFCLSID clsidOld, LPCLSID pClsidNew ); -- 2.34.1

2 1

[PATCH v3 1/2] winmm: Test that a callback passed to `waveOutOpen` can call `waveOutWrite` without getting called reentrantly.
by Liam Murphy 24 Jan '22

24 Jan '22

This behaviour is relied upon by Teardown, see https://github.com/ValveSoftware/Proton/issues/4332. Signed-off-by: Liam Murphy <liampm32(a)gmail.com> --- v2: Add `todo_wine` to avoid test failure --- v3: Use block comments instead of line comments --- dlls/winmm/tests/wave.c | 159 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2f0c8443363..619c4f9339e 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -865,6 +865,163 @@ EXIT: HeapFree(GetProcessHeap(), 0, frags); } +struct reentrancy_callback_data { + HANDLE hevent; + /* Which thread is currently running the callback, or 0 if it isn't running. */ + DWORD running_thread; + /* How many times the callback's been called. */ + BOOL call_num; +}; + +static void CALLBACK reentrancy_callback_func(HWAVEOUT hwo, UINT uMsg, + DWORD_PTR dwInstance, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + struct reentrancy_callback_data *data = (struct reentrancy_callback_data *)dwInstance; + + data->call_num += 1; + + todo_wine_if(data->call_num == 3) + ok(data->running_thread != GetCurrentThreadId(), "winmm callback called reentrantly, with message %u\n", uMsg); + if (data->running_thread) { + if (data->running_thread != GetCurrentThreadId()) trace("Callback running on two threads simultaneously\n"); + + /* Don't mess with what the original call was doing. */ + return; + } + data->running_thread = GetCurrentThreadId(); + + /* We have to wait for a `WOM_DONE` event rather than just using the `WOM_OPEN` event + * so that we're running on the winmm audio thread, so that we can block it + * to prevent the next `WOM_DONE` event just getting fired in the background + * (and then presumably calling the callback on another thread?) */ + if (uMsg == WOM_DONE) { + if (data->call_num == 2) { + MMRESULT rc; + /* Since this is the first `WOM_DONE`, and the first frame is always `frags[0]`, we know that this is actually a pointer to `frags`. */ + WAVEHDR *frags = (WAVEHDR *)dwParam1; + + rc = waveOutWrite(hwo, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(): rc=%s\n", wave_out_error(rc)); + + /* Each frame is supposed to last 100ms, so 150ms should be enough to guarantee that the last one has finished. */ + Sleep(150); + + /* This is needed to trigger the bug in wine, + * since winmm checks for `WOM_DONE` within `WINMM_PushData`, which this calls. */ + rc = waveOutWrite(hwo, &frags[1], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(): rc=%s\n", wave_out_error(rc)); + } + } + + data->running_thread = 0; + /* Only do this at the end of the function so that it isn't possible for the main thread + * to mistakenly call `waveOutClose` while the test is running. */ + SetEvent(data->hevent); +} + +/* Test whether the callback gets called reentrantly when `waveOutWrite` is called + * from within the callback passed to `waveOutOpen`. */ +static void wave_out_test_no_reentrancy(int device) +{ + HWAVEOUT wout; + HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); + WAVEHDR *frags = 0; + MMRESULT rc; + int headers = 2; + int loops = 0; + WAVEFORMATEX format; + WAVEFORMATEX* pwfx = &format; + DWORD flags = CALLBACK_FUNCTION; + double duration = 0.2; + DWORD_PTR callback = 0; + struct reentrancy_callback_data callback_data; + DWORD_PTR callback_instance = 0; + char * buffer; + DWORD length; + DWORD frag_length; + int i; + BOOL done; + + format.wFormatTag=WAVE_FORMAT_PCM; + format.nChannels=1; + format.wBitsPerSample=8; + format.nSamplesPerSec=22050; + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + format.cbSize=0; + + callback = (DWORD_PTR)reentrancy_callback_func; + callback_data.hevent = hevent; + callback_data.running_thread = 0; + callback_data.call_num = 0; + callback_instance = (DWORD_PTR)(&callback_data); + + wout=NULL; + rc=waveOutOpen(&wout,device,pwfx,callback,callback_instance,flags); + if (rc!=MMSYSERR_NOERROR) { + trace("`waveOutOpen` failed with rc %s, skipping", mmsys_error(rc)); + goto EXIT; + } + + rc=WaitForSingleObject(hevent,9000); + ok(rc==WAIT_OBJECT_0, "missing WOM_OPEN notification\n"); + + frags = HeapAlloc(GetProcessHeap(), 0, headers * sizeof(WAVEHDR)); + + buffer=wave_generate_silence(pwfx,duration / (loops + 1),&length); + + /* make sure fragment length is a multiple of block size */ + frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign; + + for (i = 0; i < headers; i++) { + frags[i].lpData=buffer + (i * frag_length); + if (i != (headers-1)) + frags[i].dwBufferLength=frag_length; + else { + /* use remainder of buffer for last fragment */ + frags[i].dwBufferLength=length - (i * frag_length); + } + frags[i].dwFlags=0; + frags[i].dwLoops=0; + rc=waveOutPrepareHeader(wout, &frags[i], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, + "waveOutPrepareHeader(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + } + + if (rc==MMSYSERR_NOERROR) { + /* Queue up the first fragment. */ + rc=waveOutWrite(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s): rc=%s\n", + dev_name(device),wave_out_error(rc)); + } + + done = FALSE; + while (!done) { + rc=WaitForSingleObject(hevent,8000); + ok(rc==WAIT_OBJECT_0, "missing WOM_DONE notification\n"); + + done = TRUE; + for (i = 0; i < headers; i++) { + if (!(frags[i].dwFlags & WHDR_DONE)) { + done = FALSE; + } + } + } + + /* Calling `waveOutClose` from within the callback hangs on Windows, so we have to make sure to do it here instead. */ + rc = waveOutClose(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutClose(): rc=%s\n", wave_out_error(rc)); + + rc=WaitForSingleObject(hevent,1500); + ok(rc==WAIT_OBJECT_0, "missing WOM_CLOSE notification\n"); + + HeapFree(GetProcessHeap(), 0, buffer); +EXIT: + CloseHandle(hevent); + HeapFree(GetProcessHeap(), 0, frags); +} + static void wave_out_test_device(UINT_PTR device) { WAVEOUTCAPSA capsA; @@ -984,6 +1141,8 @@ static void wave_out_test_device(UINT_PTR device) trace(" %s\n",wave_out_caps(capsA.dwSupport)); HeapFree(GetProcessHeap(), 0, nameA); + wave_out_test_no_reentrancy(device); + if (winetest_interactive && (device != WAVE_MAPPER)) { trace("Playing a 5 seconds reference tone.\n"); -- 2.34.1

2 3

[tools 1/3] testbot/SetWinlocale: Run() is not used so remove it.
by Francois Gouget 24 Jan '22

24 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index fcc816d9a1..55722e13ee 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -75,16 +75,6 @@ sub Debug(@) print STDERR @_ if ($Debug or $DryRun); } -sub Run(@) -{ - Debug("Running '", join("' '", @_), "'\n"); - return 0 if ($DryRun); - - my $Rc = system(@_); - Debug("-> exit code $Rc\n"); - return $Rc; -} - my $Start = Time(); sub FatalError(@) { -- 2.30.2

1 2

[tools] testbot/SetWinLocale: Fix the usage, GetThreadLocale() is set by --system.
by Francois Gouget 24 Jan '22

24 Jan '22

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 0f624e81cd..fcc816d9a1 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -459,13 +459,13 @@ if (defined $Usage) print " --locale LOC Specifies the user formats (see --defaults).\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; - print " . APIs: GetUserDefaultLCID(), GetThreadLocale().\n"; + print " . APIs: GetUserDefaultLCID().\n"; print " . Powershell: Set-Culture LOC\n"; print " --system SYS Specifies the system locale (see --defaults).\n"; print " . Only takes effect after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; print " Administrative Language Settings -> Change system locale.\n"; - print " . APIs: GetSystemDefaultLCID().\n"; + print " . APIs: GetSystemDefaultLCID(), GetThreadLocale().\n"; print " . Powershell: Set-WinSystemLocale -SystemLocale SYS\n"; print " --utf8 Set the code pages (ACP, MACCP and OEMCP) to UTF-8.\n"; print " . Windows 10 GUI: Time & language -> Language ->\n"; -- 2.30.2

1 0

[PATCH 1/4] winebus.sys: Add a function to check if the device is a Sony DualSense gamepad.
by Arkadiusz Hiler 24 Jan '22

24 Jan '22

Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/winebus.sys/unix_private.h | 1 + dlls/winebus.sys/unixlib.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index efecf6cdbe3..e897251dea8 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -266,5 +266,6 @@ extern void hid_device_set_effect_state(struct unix_device *iface, BYTE index, B BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; BOOL is_dualshock4_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; +BOOL is_dualsense_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; #endif /* __WINEBUS_UNIX_PRIVATE_H */ diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 1269ae05c2b..3a7c3a16428 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -70,6 +70,12 @@ BOOL is_dualshock4_gamepad(WORD vid, WORD pid) return FALSE; } +BOOL is_dualsense_gamepad(WORD vid, WORD pid) +{ + if (vid == 0x054c && pid == 0x0ce6) return TRUE; + return FALSE; +} + struct mouse_device { struct unix_device unix_device; -- 2.34.1

3 17

[PATCH v4] wdscore: Implement CurrentIP.
by Mohamad Al-Jaf 24 Jan '22

24 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51850 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v4: - Load the wdscore dll in tests (Thanks Stefan Dösinger). - Remove unnecessary 0 in i386 and x86_64 assembly code. --- configure.ac | 1 + dlls/wdscore/Makefile.in | 3 ++ dlls/wdscore/main.c | 54 ++++++++++++++++++++++++++++ dlls/wdscore/tests/Makefile.in | 4 +++ dlls/wdscore/tests/main.c | 65 ++++++++++++++++++++++++++++++++++ dlls/wdscore/wdscore.spec | 2 +- 6 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 dlls/wdscore/main.c create mode 100644 dlls/wdscore/tests/Makefile.in create mode 100644 dlls/wdscore/tests/main.c diff --git a/configure.ac b/configure.ac index b42cb8a5346..a50881cc2fb 100644 --- a/configure.ac +++ b/configure.ac @@ -3347,6 +3347,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) WINE_CONFIG_MAKEFILE(dlls/wdscore) +WINE_CONFIG_MAKEFILE(dlls/wdscore/tests) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/websocket) diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 20ba1d3b1c9..2020e72c7bb 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,3 +1,6 @@ MODULE = wdscore.dll EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/main.c b/dlls/wdscore/main.c new file mode 100644 index 00000000000..8854887a555 --- /dev/null +++ b/dlls/wdscore/main.c @@ -0,0 +1,54 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/asm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wdscore); + +/*********************************************************************** + * CurrentIP (wdscore.@) + */ +#ifdef __i386__ +__ASM_STDCALL_FUNC(CurrentIP, 0, + "movl (%esp), %eax\n\t" + "ret" ) +#elif defined(__x86_64__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "movq (%rsp), %rax\n\t" + "ret" ) +#elif defined(__arm__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "mov r0, lr\n\t" + "bx lr" ) +#elif defined(__aarch64__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "mov x0, lr\n\t" + "ret" ) +#else +void *WINAPI CurrentIP(void) +{ + FIXME( "not implemented\n" ); + return 0; +} +#endif diff --git a/dlls/wdscore/tests/Makefile.in b/dlls/wdscore/tests/Makefile.in new file mode 100644 index 00000000000..baf4adf23a1 --- /dev/null +++ b/dlls/wdscore/tests/Makefile.in @@ -0,0 +1,4 @@ +TESTDLL = wdscore.dll + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/tests/main.c b/dlls/wdscore/tests/main.c new file mode 100644 index 00000000000..d06a25703c6 --- /dev/null +++ b/dlls/wdscore/tests/main.c @@ -0,0 +1,65 @@ +/* + * Unit test suite for wdscore + * + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/test.h" + +static HMODULE dll; +static void* (WINAPI *pCurrentIP)(void); + +static BOOL init_function_pointers(void) +{ + dll = LoadLibraryA("wdscore.dll"); + + if (dll) + { + pCurrentIP = (void*)GetProcAddress(dll, "CurrentIP"); + return TRUE; + } + + return FALSE; +} + +static void test_CurrentIP(void) +{ + char *cur; + char *ret; + + cur = (char*)&test_CurrentIP; + ret = (char*)pCurrentIP(); + + ok(cur <= ret && ret < (cur + 0x100), "Address %p not in function starting at %p.\n", ret, cur); +} + +START_TEST(main) +{ + if (init_function_pointers()) + { + test_CurrentIP(); + FreeLibrary(dll); + } + else + skip("could not load wdscore.dll\n"); +} diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index 15958b86aba..8b6febe6b3b 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -71,7 +71,7 @@ @ stub ConstructPartialMsgIfW @ stub ConstructPartialMsgVA @ stub ConstructPartialMsgVW -@ stub CurrentIP +@ stdcall CurrentIP() @ stub EndMajorTask @ stub EndMinorTask @ stub GetMajorTask -- 2.34.1

2 1

[PATCH] ieframe: Fix position vs. length check in the go_forward() helper.
by Dmitry Timoshkov 24 Jan '22

24 Jan '22

This->travellog.position is 0 based while This->travellog.length is a total counter. So, with current comparison if(This->travellog.position >= This->travellog.length) go_forward() would jump to an invalid index if position == 1 and length == 2. This patch fixes a crash while navigating html help file that I have here. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/navigate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 9efdacc080e..82d1399334f 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -1127,7 +1127,7 @@ HRESULT go_back(DocHost *This) HRESULT go_forward(DocHost *This) { - if(This->travellog.position >= This->travellog.length) { + if(This->travellog.position+1 >= This->travellog.length) { WARN("No history available\n"); return E_FAIL; } -- 2.34.1

3 3

[PATCH] ws2_32/tests: Add order-agnostic check in test_simultaneous_async_recv.
by Jinoh Kang 24 Jan '22

24 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 782b1e59729..966a681e809 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11520,6 +11520,8 @@ static void test_simultaneous_async_recv(void) const void *expect = msgstr + i * stride; const void *actual = resbuf + i * stride; DWORD size; + int allcmp; + size_t j; ret = WaitForSingleObject(events[i], 1000); ok(!ret, "wait timed out\n"); @@ -11528,6 +11530,20 @@ static void test_simultaneous_async_recv(void) ret = GetOverlappedResult((HANDLE)client, &overlappeds[i], &size, FALSE); ok(ret, "got error %u\n", GetLastError()); ok(size == stride, "got size %u\n", size); + + allcmp = 0; + for (j = 0; j <= num_io * stride - size; j++) allcmp |= !memcmp(msgstr + j, actual, size); + ok(allcmp, "returned data shall be part of original message (got %s)\n", debugstr_an(actual, size)); + + /* Observation: Windows *always* respects the order of WSARecv() calls + * and fills out the buffers in first-in-first-out manner. + * + * This behaviour is admittedly not clearly documented, and it can be + * argued that a well-designed application would instead use vectored + * I/O with an array of WSABUFs, which are then are guaranteed to be + * filled out in order. However, at least one real-world application + * is known to rely on the WSARecv() order-respecting behaviour. + */ ok(!memcmp(expect, actual, stride), "expected %s, got %s\n", debugstr_an(expect, stride), debugstr_an(actual, stride)); } -- 2.31.1

3 5

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Use hlsl_alloc() in hlsl_new_texture_type().
by Matteo Bruni 24 Jan '22

24 Jan '22

Spotted by Giovanni Mascellani. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8ae31306..a2879740 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -265,7 +265,7 @@ struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_ { struct hlsl_type *type; - if (!(type = vkd3d_calloc(1, sizeof(*type)))) + if (!(type = hlsl_alloc(ctx, sizeof(*type)))) return NULL; type->type = HLSL_CLASS_OBJECT; type->base_type = HLSL_TYPE_TEXTURE; -- 2.34.1

2 8

[PATCH 1/5] iphlpapi/tests: Add tests for GetBestInterface.
by Jinoh Kang 24 Jan '22

24 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/iphlpapi/tests/iphlpapi.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 12da629c30c..f9044c685c5 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1456,9 +1456,32 @@ static void testGetNetworkParams(void) } } +static void testGetBestInterface(void) +{ + DWORD apiReturn; + DWORD bestIfIndex; + + apiReturn = GetBestInterface( INADDR_ANY, &bestIfIndex ); + trace( "GetBestInterface([0.0.0.0], {%u}) = %u\n", bestIfIndex, apiReturn ); + if (apiReturn == ERROR_NOT_SUPPORTED) + { + skip( "GetBestInterface is not supported\n" ); + return; + } + + apiReturn = GetBestInterface( INADDR_LOOPBACK, NULL ); + ok( apiReturn == ERROR_INVALID_PARAMETER, + "GetBestInterface([127.0.0.1], NULL) returned %u, expected %u\n", + apiReturn, ERROR_INVALID_PARAMETER ); + + apiReturn = GetBestInterface( INADDR_LOOPBACK, &bestIfIndex ); + ok( apiReturn == NO_ERROR, + "GetBestInterface([127.0.0.1], {%u}) returned %u, expected %u\n", + bestIfIndex, apiReturn, NO_ERROR ); +} + /* still-to-be-tested 98-onward functions: -GetBestInterface GetBestRoute IpReleaseAddress IpRenewAddress @@ -1468,6 +1491,7 @@ static DWORD CALLBACK testWin98Functions(void *p) testGetInterfaceInfo(); testGetAdaptersInfo(); testGetNetworkParams(); + testGetBestInterface(); return 0; } -- 2.31.1

2 6

[PATCH 10/10] wined3d: Use wined3d_mask_from_size() in stateblock_savedstates_set_all().
by Henri Verbeet 24 Jan '22

24 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/stateblock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6d174652b4a..c5ca5990009 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -219,7 +219,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, stateblock_set_all_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; - states->clipplane = (1u << WINED3D_MAX_CLIP_DISTANCES) - 1; + states->clipplane = wined3d_mask_from_size(WINED3D_MAX_CLIP_DISTANCES); states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff; states->vertexShaderConstantsB = 0xffff; -- 2.30.2

1 0

[PATCH 09/10] wined3d: Use wined3d_mask_from_size() in find_ps_compile_args().
by Henri Verbeet 24 Jan '22

24 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 157aa6283ac..43c6bb402c0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -4204,7 +4204,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 } else { - args->texcoords_initialized = (1u << WINED3D_MAX_TEXTURES) - 1; + args->texcoords_initialized = wined3d_mask_from_size(WINED3D_MAX_TEXTURES); } args->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] -- 2.30.2

1 0

[PATCH 08/10] wined3d: Use wined3d_mask_from_size() in geometry_shader_init_stream_output().
by Henri Verbeet 24 Jan '22

24 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 24d08a02a38..157aa6283ac 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3882,7 +3882,7 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader, return E_INVALIDARG; } - mask = ((1u << e->component_count) - 1) << component_idx; + mask = wined3d_mask_from_size(e->component_count) << component_idx; if ((output->mask & 0xff & mask) != mask) { WARN("Invalid component range %u-%u (mask %#x), output mask %#x.\n", -- 2.30.2

1 0

[PATCH 07/10] wined3d: Properly compare integers in wined3d_graphics_pipeline_vk_compare().
by Henri Verbeet 24 Jan '22

24 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 59 ++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 686c9fe090f..97c60719489 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1812,38 +1812,41 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi unsigned int i; int ret; - if (a->pipeline_desc.stageCount != b->pipeline_desc.stageCount) - return a->pipeline_desc.stageCount - b->pipeline_desc.stageCount; + if ((ret = wined3d_uint32_compare(a->pipeline_desc.stageCount, b->pipeline_desc.stageCount))) + return ret; for (i = 0; i < a->pipeline_desc.stageCount; ++i) { - if (a->stages[i].module != b->stages[i].module) - return a->stages[i].module - b->stages[i].module; + if ((ret = wined3d_uint64_compare(a->stages[i].module, b->stages[i].module))) + return ret; } - if (a->divisor_desc.vertexBindingDivisorCount != b->divisor_desc.vertexBindingDivisorCount) - return a->divisor_desc.vertexBindingDivisorCount - b->divisor_desc.vertexBindingDivisorCount; + if ((ret = wined3d_uint32_compare(a->divisor_desc.vertexBindingDivisorCount, + b->divisor_desc.vertexBindingDivisorCount))) + return ret; if ((ret = memcmp(a->divisors, b->divisors, a->divisor_desc.vertexBindingDivisorCount * sizeof(*a->divisors)))) return ret; - if (a->input_desc.vertexAttributeDescriptionCount != b->input_desc.vertexAttributeDescriptionCount) - return a->input_desc.vertexAttributeDescriptionCount - b->input_desc.vertexAttributeDescriptionCount; + if ((ret = wined3d_uint32_compare(a->input_desc.vertexAttributeDescriptionCount, + b->input_desc.vertexAttributeDescriptionCount))) + return ret; if ((ret = memcmp(a->attributes, b->attributes, a->input_desc.vertexAttributeDescriptionCount * sizeof(*a->attributes)))) return ret; - if (a->input_desc.vertexBindingDescriptionCount != b->input_desc.vertexBindingDescriptionCount) - return a->input_desc.vertexBindingDescriptionCount - b->input_desc.vertexBindingDescriptionCount; + if ((ret = wined3d_uint32_compare(a->input_desc.vertexBindingDescriptionCount, + b->input_desc.vertexBindingDescriptionCount))) + return ret; if ((ret = memcmp(a->bindings, b->bindings, a->input_desc.vertexBindingDescriptionCount * sizeof(*a->bindings)))) return ret; - if (a->ia_desc.topology != b->ia_desc.topology) - return a->ia_desc.topology - b->ia_desc.topology; - if (a->ia_desc.primitiveRestartEnable != b->ia_desc.primitiveRestartEnable) - return a->ia_desc.primitiveRestartEnable - b->ia_desc.primitiveRestartEnable; + if ((ret = wined3d_uint32_compare(a->ia_desc.topology, b->ia_desc.topology))) + return ret; + if ((ret = wined3d_uint32_compare(a->ia_desc.primitiveRestartEnable, b->ia_desc.primitiveRestartEnable))) + return ret; - if (a->ts_desc.patchControlPoints != b->ts_desc.patchControlPoints) - return a->ts_desc.patchControlPoints - b->ts_desc.patchControlPoints; + if ((ret = wined3d_uint32_compare(a->ts_desc.patchControlPoints, b->ts_desc.patchControlPoints))) + return ret; if ((ret = memcmp(&a->viewport, &b->viewport, sizeof(a->viewport)))) return ret; @@ -1854,27 +1857,27 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi if ((ret = memcmp(&a->rs_desc, &b->rs_desc, sizeof(a->rs_desc)))) return ret; - if (a->ms_desc.rasterizationSamples != b->ms_desc.rasterizationSamples) - return a->ms_desc.rasterizationSamples - b->ms_desc.rasterizationSamples; - if (a->ms_desc.alphaToCoverageEnable != b->ms_desc.alphaToCoverageEnable) - return a->ms_desc.alphaToCoverageEnable - b->ms_desc.alphaToCoverageEnable; - if (a->sample_mask != b->sample_mask) - return a->sample_mask - b->sample_mask; + if ((ret = wined3d_uint32_compare(a->ms_desc.rasterizationSamples, b->ms_desc.rasterizationSamples))) + return ret; + if ((ret = wined3d_uint32_compare(a->ms_desc.alphaToCoverageEnable, b->ms_desc.alphaToCoverageEnable))) + return ret; + if ((ret = wined3d_uint32_compare(a->sample_mask, b->sample_mask))) + return ret; if ((ret = memcmp(&a->ds_desc, &b->ds_desc, sizeof(a->ds_desc)))) return ret; - if (a->blend_desc.attachmentCount != b->blend_desc.attachmentCount) - return a->blend_desc.attachmentCount - b->blend_desc.attachmentCount; + if ((ret = wined3d_uint32_compare(a->blend_desc.attachmentCount, b->blend_desc.attachmentCount))) + return ret; if ((ret = memcmp(a->blend_attachments, b->blend_attachments, a->blend_desc.attachmentCount * sizeof(*a->blend_attachments)))) return ret; - if (a->pipeline_desc.layout != b->pipeline_desc.layout) - return a->pipeline_desc.layout - b->pipeline_desc.layout; + if ((ret = wined3d_uint64_compare(a->pipeline_desc.layout, b->pipeline_desc.layout))) + return ret; - if (a->pipeline_desc.renderPass != b->pipeline_desc.renderPass) - return a->pipeline_desc.renderPass - b->pipeline_desc.renderPass; + if ((ret = wined3d_uint64_compare(a->pipeline_desc.renderPass, b->pipeline_desc.renderPass))) + return ret; return 0; } -- 2.30.2

1 0

[PATCH 06/10] wined3d: Properly compare integers in wined3d_bo_slab_vk_compare().
by Henri Verbeet 24 Jan '22

24 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 11 ++++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index cf6247387ca..686c9fe090f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1883,12 +1883,13 @@ static int wined3d_bo_slab_vk_compare(const void *key, const struct wine_rb_entr { const struct wined3d_bo_slab_vk *slab = WINE_RB_ENTRY_VALUE(entry, const struct wined3d_bo_slab_vk, entry); const struct wined3d_bo_slab_vk_key *k = key; + int ret; - if (k->memory_type != slab->requested_memory_type) - return k->memory_type - slab->requested_memory_type; - if (k->usage != slab->bo.usage) - return k->usage - slab->bo.usage; - return k->size - slab->bo.size; + if ((ret = wined3d_uint32_compare(k->memory_type, slab->requested_memory_type))) + return ret; + if ((ret = wined3d_uint32_compare(k->usage, slab->bo.usage))) + return ret; + return wined3d_uint64_compare(k->size, slab->bo.size); } static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context_vk *context_vk) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e297169b6e1..95a3b08f78a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -452,6 +452,11 @@ static inline int wined3d_uint32_compare(uint32_t x, uint32_t y) return (x > y) - (x < y); } +static inline int wined3d_uint64_compare(uint64_t x, uint64_t y) +{ + return (x > y) - (x < y); +} + #define ORM_BACKBUFFER 0 #define ORM_FBO 1 -- 2.30.2

1 0

[PATCH 05/10] wined3d: Acquire references to cleared render-target views for command lists by inspecting CS packets.
by Henri Verbeet 24 Jan '22

24 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ae120b1790d..9f7421e865f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3616,6 +3616,20 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_CLEAR: + { + struct wined3d_cs_clear *op = (struct wined3d_cs_clear *)packet->data; + + for (i = 0; i < op->rt_count; ++i) + { + if (op->fb.render_targets[i]) + wined3d_rendertarget_view_decref(op->fb.render_targets[i]); + } + if (op->fb.depth_stencil) + wined3d_rendertarget_view_decref(op->fb.depth_stencil); + break; + } + default: break; } @@ -3750,6 +3764,20 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_CLEAR: + { + struct wined3d_cs_clear *op = (struct wined3d_cs_clear *)packet->data; + + for (i = 0; i < op->rt_count; ++i) + { + if (op->fb.render_targets[i]) + wined3d_rendertarget_view_incref(op->fb.render_targets[i]); + } + if (op->fb.depth_stencil) + wined3d_rendertarget_view_incref(op->fb.depth_stencil); + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 04/10] wined3d: Acquire references to cleared unordered-access views for command lists by inspecting CS packets.
by Henri Verbeet 24 Jan '22

24 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 76db5b5184e..ae120b1790d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3607,6 +3607,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW: + { + struct wined3d_cs_clear_unordered_access_view *op; + + op = (struct wined3d_cs_clear_unordered_access_view *)packet->data; + wined3d_unordered_access_view_decref(op->view); + break; + } + default: break; } @@ -3732,6 +3741,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW: + { + struct wined3d_cs_clear_unordered_access_view *op; + + op = (struct wined3d_cs_clear_unordered_access_view *)packet->data; + wined3d_unordered_access_view_incref(op->view); + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 03/10] wined3d: Acquire references to constant buffers for command lists by inspecting CS packets.
by Henri Verbeet 24 Jan '22

24 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 221a79faa0c..76db5b5184e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3594,6 +3594,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_CONSTANT_BUFFERS: + { + struct wined3d_cs_set_constant_buffers *op; + + op = (struct wined3d_cs_set_constant_buffers *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->buffers[i].buffer) + wined3d_buffer_decref(op->buffers[i].buffer); + } + break; + } + default: break; } @@ -3706,6 +3719,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_CONSTANT_BUFFERS: + { + struct wined3d_cs_set_constant_buffers *op; + + op = (struct wined3d_cs_set_constant_buffers *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->buffers[i].buffer) + wined3d_buffer_incref(op->buffers[i].buffer); + } + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 02/10] wined3d: Acquire references to depth/stencil views for command lists by inspecting CS packets.
by Henri Verbeet 24 Jan '22

24 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bb38dd0d3ab..221a79faa0c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3584,6 +3584,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW: + { + struct wined3d_cs_set_depth_stencil_view *op; + + op = (struct wined3d_cs_set_depth_stencil_view *)packet->data; + if (op->view) + wined3d_rendertarget_view_decref(op->view); + break; + } + default: break; } @@ -3686,6 +3696,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW: + { + struct wined3d_cs_set_depth_stencil_view *op; + + op = (struct wined3d_cs_set_depth_stencil_view *)packet->data; + if (op->view) + wined3d_rendertarget_view_incref(op->view); + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 01/10] wined3d: Acquire references to unordered-access views for command lists by inspecting CS packets.
by Henri Verbeet 24 Jan '22

24 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 914941d18ae..bb38dd0d3ab 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3571,6 +3571,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEWS: + { + struct wined3d_cs_set_unordered_access_views *op; + + op = (struct wined3d_cs_set_unordered_access_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->uavs[i].view) + wined3d_unordered_access_view_decref(op->uavs[i].view); + } + break; + } + default: break; } @@ -3660,6 +3673,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEWS: + { + struct wined3d_cs_set_unordered_access_views *op; + + op = (struct wined3d_cs_set_unordered_access_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->uavs[i].view) + wined3d_unordered_access_view_incref(op->uavs[i].view); + } + break; + } + default: break; } -- 2.30.2

1 0

[PATCH v3 1/2] d3d11: Report D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER.
by Zebediah Figura 24 Jan '22

24 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 2 +- dlls/d3d11/device.c | 1 + dlls/d3d11/tests/d3d11.c | 10 ++++++---- dlls/wined3d/directx.c | 6 +++++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 5caaaa73255..937627fde38 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -13688,7 +13688,7 @@ static void check_format_support(const unsigned int *format_support, continue; } - todo_wine + todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) ok(supported, "Format %#x - %s supported, format support %#x.\n", format, feature_name, format_support[format]); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5a46f26e459..7cd1d018513 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3757,6 +3757,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * flag_mapping[] = { {WINED3D_RTYPE_BUFFER, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_BUFFER}, + {WINED3D_RTYPE_BUFFER, WINED3D_BIND_VERTEX_BUFFER, 0, D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER}, {WINED3D_RTYPE_TEXTURE_1D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE1D}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE2D}, {WINED3D_RTYPE_TEXTURE_3D, WINED3D_BIND_SHADER_RESOURCE, 0, D3D11_FORMAT_SUPPORT_TEXTURE3D}, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1aa5b92288d..4d531f815b5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20756,8 +20756,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE if (formats[i].fl_required <= feature_level) { - todo_wine ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", - format, feature_name, feature_level, format_support[format]); + todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) + ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", + format, feature_name, feature_level, format_support[format]); continue; } @@ -20769,8 +20770,9 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE continue; } - ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", - format, feature_name, feature_level, format_support[format]); + todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER) + ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", + format, feature_name, feature_level, format_support[format]); } } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b2925eb97e9..334a520072d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1821,7 +1821,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, allowed_usage = WINED3DUSAGE_DYNAMIC; allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE - | WINED3D_BIND_UNORDERED_ACCESS; + | WINED3D_BIND_UNORDERED_ACCESS + | WINED3D_BIND_VERTEX_BUFFER; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER; break; @@ -1853,6 +1854,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, format_flags |= WINED3DFMT_FLAG_DEPTH_STENCIL; if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) format_flags |= WINED3DFMT_FLAG_UNORDERED_ACCESS; + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + format_flags |= WINED3DFMT_FLAG_VERTEX_ATTRIBUTE; + if (usage & WINED3DUSAGE_QUERY_FILTER) format_flags |= WINED3DFMT_FLAG_FILTERING; if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) -- 2.34.1

3 5

[PATCH v5 1/5] combase/tests: Add tests for the hstring_private struct.
by Bernhard Kölbl 24 Jan '22

24 Jan '22

The goal of these tests is to show, that the memory layout of hstring_private is different on Windows, than currently used in Wine. This creates issues with the WinRT SDK, which allocates HSTRINGs without using the functions provided by the combase dll. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/combase/tests/string.c | 80 +++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 5ebf669a426..713f08d342b 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -479,6 +479,85 @@ static void test_trim(void) ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string\n"); } +static void test_hstring_struct(void) +{ + struct hstring_header + { + UINT32 flags; + UINT32 length; + UINT32 padding1; + UINT32 padding2; + const WCHAR *str; + }; + + struct hstring_private + { + struct hstring_header header; + LONG refcount; + WCHAR buffer[1]; + }; + + HSTRING str; + HSTRING str2; + HSTRING_HEADER hdr; + struct hstring_private* prv; + struct hstring_private* prv2; + + BOOL arch64 = (sizeof(void*) == 8); + + ok(arch64 ? (sizeof(prv->header) == 24) : (sizeof(prv->header) == 20), "hstring_header size incorrect.\n"); + + ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string.\n"); + + prv = CONTAINING_RECORD(str, struct hstring_private, header); + + todo_wine + ok(prv->header.flags == 0, "Expected 0 in flags field, got %#x.\n", prv->header.flags); + todo_wine + ok(prv->header.length == 6, "Expected 6 in length field, got %u.\n", prv->header.length); + todo_wine + ok(prv->header.str == prv->buffer, "Expected str to point at buffer, instead pointing at %p.\n", prv->header.str); + todo_wine + ok(prv->refcount == 1, "Expected 1 in refcount, got %u.\n", prv->refcount); + todo_wine + ok(wcscmp(input_string, prv->buffer) == 0, "Expected strings to match.\n"); + todo_wine + ok(prv->buffer[prv->header.length] == '\0', "Expected buffer to be null terminated.\n"); + + ok(WindowsDuplicateString(str, &str2) == S_OK, "Failed to duplicate string.\n"); + + prv2 = CONTAINING_RECORD(str2, struct hstring_private, header); + + todo_wine + ok(prv->refcount == 2, "Expected 2 in refcount, got %u.\n", prv->refcount); + todo_wine + ok(prv2->refcount == 2, "Expected 2 in refcount, got %u.\n", prv2->refcount); + todo_wine + ok(wcscmp(input_string, prv2->buffer) == 0, "Expected strings to match.\n"); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n"); + + todo_wine + ok(prv->refcount == 1, "Expected 1 in refcount, got %u.\n", prv->refcount); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n"); + + ok(WindowsCreateStringReference(input_string, 6, &hdr, &str) == S_OK, "Failed to create string ref.\n"); + + prv = CONTAINING_RECORD(&hdr, struct hstring_private, header); + prv2 = CONTAINING_RECORD(str, struct hstring_private, header); + + ok(prv == prv2, "Pointers not identical.\n"); + todo_wine + ok(prv2->header.flags == 1, "Expected HSTRING_REFERENCE_FLAG to be set, got %#x.\n", prv2->header.flags); + todo_wine + ok(prv2->header.length == 6, "Expected 6 in length field, got %u.\n", prv2->header.length); + todo_wine + ok(prv2->header.str == input_string, "Expected str to point at input_string, instead pointing at %p.\n", prv2->header.str); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string ref.\n"); +} + START_TEST(string) { test_create_delete(); @@ -489,4 +568,5 @@ START_TEST(string) test_concat(); test_compare(); test_trim(); + test_hstring_struct(); } -- 2.34.1

3 10

[PATCH] server: Use console_add_queue for console output.
by Jacek Caban 24 Jan '22

24 Jan '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] Use Windows 10 as default prefix version.
by Nikolay Sivov 24 Jan '22

24 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/version.c | 2 +- loader/wine.inf.in | 24 ++++++++++++------------ programs/winecfg/appdefaults.c | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index 5f956d9d2e6..b782e239d39 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -467,7 +467,7 @@ void version_init(void) NtQuerySystemInformation( SystemWineVersionInformation, wine_version, sizeof(wine_version), NULL ); - current_version = &VersionData[WIN7]; + current_version = &VersionData[WIN10]; RtlOpenCurrentUser( KEY_ALL_ACCESS, &root ); attr.Length = sizeof(attr); diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c0251934dfc..c3c22361a98 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -5594,12 +5594,12 @@ HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 [VersionInfo] -HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" -HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10001,6 -HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10001,1 -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" -HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"10.0" +HKLM,%CurrentVersionNT%,"CurrentMajorVersionNumber",0x10001,10 +HKLM,%CurrentVersionNT%,"CurrentMinorVersionNumber",0x10001,0 +HKLM,%CurrentVersionNT%,"CSDVersion",2,"" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"17763" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"17763" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ @@ -5608,16 +5608,16 @@ HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 10" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [VersionInfo.ntamd64] -HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" -HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" -HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" -HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" +HKLM,%CurrentVersionNT%,"CurrentVersion",2,"10.0" +HKLM,%CurrentVersionNT%,"CSDVersion",2,"" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"17763" +HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"17763" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ @@ -5626,7 +5626,7 @@ HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 -HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" +HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 10" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index df187ca41e1..3f8892e95e9 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -74,7 +74,7 @@ static const struct win_version win_versions[] = #endif }; -#define DEFAULT_WIN_VERSION L"win7" +#define DEFAULT_WIN_VERSION L"win10" static const WCHAR szKey9x[] = L"Software\\Microsoft\\Windows\\CurrentVersion"; static const WCHAR szKeyNT[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion"; -- 2.34.1

4 8

[PATCH 1/4] winhttp: Drain frames until close frame in socket_close().
by Paul Gofman 24 Jan '22

24 Jan '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 13 ++++++++++--- dlls/winhttp/tests/notification.c | 14 ++++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index af04292ea06..f4f81af42da 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3686,9 +3686,16 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea socket->state = SOCKET_STATE_SHUTDOWN; } - if ((ret = receive_frame( socket, &count, &socket->opcode ))) goto done; - if (socket->opcode != SOCKET_OPCODE_CLOSE || - (count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason)))) + while (1) + { + if ((ret = receive_frame( socket, &count, &socket->opcode ))) goto done; + if (socket->opcode == SOCKET_OPCODE_CLOSE) break; + + socket->read_size = count; + if ((ret = socket_drain( socket ))) goto done; + } + + if ((count && (count < sizeof(socket->status) || count > sizeof(socket->status) + sizeof(socket->reason)))) { ret = ERROR_WINHTTP_INVALID_SERVER_RESPONSE; goto done; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 6b0e11023da..1573dd37faa 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -659,6 +659,7 @@ static const struct notification websocket_test[] = { winhttp_receive_response, WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE, NF_SIGNAL }, { winhttp_websocket_complete_upgrade, WINHTTP_CALLBACK_STATUS_HANDLE_CREATED, NF_SIGNAL }, { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_SIGNAL }, + { winhttp_websocket_send, WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE, NF_SIGNAL }, { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, { winhttp_websocket_receive, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SIGNAL }, @@ -681,6 +682,7 @@ static void test_websocket(BOOL secure) char buffer[1024]; USHORT close_status; DWORD protocols, flags; + unsigned int i; if (!pWinHttpWebSocketCompleteUpgrade) { @@ -788,10 +790,14 @@ static void test_websocket(BOOL secure) ok( err == ERROR_SUCCESS, "got %u\n", err ); WaitForSingleObject( info.wait, INFINITE ); - setup_test( &info, winhttp_websocket_send, __LINE__ ); - err = pWinHttpWebSocketSend( socket, 0, (void *)"hello", sizeof("hello") ); - ok( err == ERROR_SUCCESS, "got %u\n", err ); - WaitForSingleObject( info.wait, INFINITE ); + for (i = 0; i < 2; ++i) + { + setup_test( &info, winhttp_websocket_send, __LINE__ ); + err = pWinHttpWebSocketSend( socket, WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE, + (void*)"hello", sizeof("hello") ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + WaitForSingleObject( info.wait, INFINITE ); + } setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); err = pWinHttpWebSocketShutdown( socket, 1000, (void *)"success", sizeof("success") ); -- 2.34.1

3 9

[PATCH] mshtml: Fix leak on failure in return_nsstr.
by Gabriel Ivăncescu 24 Jan '22

24 Jan '22

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsembed.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 25ad92d..32ae792 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -917,6 +917,7 @@ HRESULT map_nsresult(nsresult nsres) HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) { const PRUnichar *str; + HRESULT hres = S_OK; if(NS_FAILED(nsres)) { WARN("failed: %08x\n", nsres); @@ -929,13 +930,13 @@ HRESULT return_nsstr(nsresult nsres, nsAString *nsstr, BSTR *p) if(*str) { *p = SysAllocString(str); if(!*p) - return E_OUTOFMEMORY; + hres = E_OUTOFMEMORY; }else { *p = NULL; } nsAString_Finish(nsstr); - return S_OK; + return hres; } HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, unsigned flags, VARIANT *p) -- 2.34.1

2 1

[PATCH 1/4] dinput/tests: Add some tests for DIERR_INPUTLOST conditions.
by Rémi Bernon 24 Jan '22

24 Jan '22

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Resending the patches. After investigation it looks like the test timeouts are happening randomly, because installing/uninstalling the test driver takes some random amount of time, and fixing them properly will require some unclear amount of work. For now it seems alright, and tests could be split if they start timing out too much, like here. What is taking the most time are the UpdateDriverForPlugAndPlayDevicesW calls. That can be improved, by installing the test driver only once, and then only creating / destroying the root device, but as far as I could see, this then causes more spurious failures. Probably the device removal is asynchronous, and adding it back quickly is making things worse. The proper fix, imho, and what I would like to have ultimately anyway for testing multiple devices or hotplug, would be to introduce a bus test device, installed on test startup, and use it to create and remove HID devices, without having to reinstall their drivers. This will require a substantial amount of redesign of the HID test driver, or be done separately and then the other tests switch to it when it's ready. dlls/dinput/tests/Makefile.in | 1 + dlls/dinput/tests/hotplug.c | 175 ++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+) create mode 100644 dlls/dinput/tests/hotplug.c diff --git a/dlls/dinput/tests/Makefile.in b/dlls/dinput/tests/Makefile.in index b6648008115..44ea9d340bb 100644 --- a/dlls/dinput/tests/Makefile.in +++ b/dlls/dinput/tests/Makefile.in @@ -13,6 +13,7 @@ SOURCES = \ driver_hid.spec \ force_feedback.c \ hid.c \ + hotplug.c \ joystick.c \ joystick8.c \ keyboard.c \ diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c new file mode 100644 index 00000000000..e42af12e810 --- /dev/null +++ b/dlls/dinput/tests/hotplug.c @@ -0,0 +1,175 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define DIRECTINPUT_VERSION 0x0800 + +#include <stdarg.h> +#include <stddef.h> +#include <limits.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" + +#define COBJMACROS +#include "dinput.h" +#include "dinputd.h" +#include "devguid.h" +#include "mmsystem.h" + +#include "wine/hid.h" + +#include "dinput_test.h" + +static BOOL test_input_lost( DWORD version ) +{ +#include "psh_hid_macros.h" + static const unsigned char report_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_PAGE(1, HID_USAGE_PAGE_BUTTON), + USAGE_MINIMUM(1, 1), + USAGE_MAXIMUM(1, 6), + 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, + }; +#include "pop_hid_macros.h" + + static const HIDP_CAPS hid_caps = + { + .InputReportByteLength = 1, + }; + static const DIPROPDWORD buffer_size = + { + .diph = + { + .dwHeaderSize = sizeof(DIPROPHEADER), + .dwSize = sizeof(DIPROPDWORD), + .dwHow = DIPH_DEVICE, + .dwObj = 0, + }, + .dwData = UINT_MAX, + }; + + DIDEVICEINSTANCEW devinst = {.dwSize = sizeof(DIDEVICEINSTANCEW)}; + DIDEVICEOBJECTDATA objdata[32] = {{0}}; + WCHAR cwd[MAX_PATH], tempdir[MAX_PATH]; + IDirectInputDevice8W *device = NULL; + ULONG ref, count, size; + DIJOYSTATE2 state; + HRESULT hr; + + winetest_push_context( "%#x", version ); + + GetCurrentDirectoryW( ARRAY_SIZE(cwd), cwd ); + GetTempPathW( ARRAY_SIZE(tempdir), tempdir ); + SetCurrentDirectoryW( tempdir ); + + cleanup_registry_keys(); + if (!dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 )) goto done; + if (FAILED(hr = dinput_test_create_device( version, &devinst, &device ))) goto done; + + hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); + ok( hr == DI_OK, "SetDataFormat returned %#x\n", hr ); + hr = IDirectInputDevice8_SetCooperativeLevel( device, 0, DISCL_NONEXCLUSIVE | DISCL_BACKGROUND ); + ok( hr == DI_OK, "SetCooperativeLevel returned %#x\n", hr ); + hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &buffer_size.diph ); + ok( hr == DI_OK, "SetProperty returned %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + ok( hr == DI_OK, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DI_OK, "GetDeviceState returned %#x\n", hr ); + size = version < 0x0800 ? sizeof(DIDEVICEOBJECTDATA_DX3) : sizeof(DIDEVICEOBJECTDATA); + count = 1; + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); + ok( count == 0, "got %u expected %u\n", count, 0 ); + + pnp_driver_stop(); + + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + todo_wine + ok( hr == DIERR_INPUTLOST, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Poll( device ); + todo_wine + ok( hr == DIERR_INPUTLOST, "Poll returned: %#x\n", hr ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceData( device, size, objdata, &count, DIGDD_PEEK ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceData returned %#x\n", hr ); + hr = IDirectInputDevice8_Unacquire( device ); + ok( hr == DI_NOEFFECT, "Unacquire returned: %#x\n", hr ); + + dinput_driver_start( report_desc, sizeof(report_desc), &hid_caps, NULL, 0 ); + + hr = IDirectInputDevice8_Acquire( device ); + todo_wine + ok( hr == DIERR_UNPLUGGED, "Acquire returned %#x\n", hr ); + hr = IDirectInputDevice8_GetDeviceState( device, sizeof(state), &state ); + todo_wine + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned %#x\n", hr ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "Release returned %d\n", ref ); + +done: + pnp_driver_stop(); + cleanup_registry_keys(); + SetCurrentDirectoryW( cwd ); + + winetest_pop_context(); + return device != NULL; +} + +START_TEST( hotplug ) +{ + if (!dinput_test_init()) return; + + CoInitialize( NULL ); + if (test_input_lost( 0x500 )) + { + test_input_lost( 0x700 ); + test_input_lost( 0x800 ); + } + CoUninitialize(); + + dinput_test_exit(); +} -- 2.34.1

1 3

[PATCH] adsldp/tests: Fix misleading indentation warnings
by Fabian Maurer 24 Jan '22

24 Jan '22

This fixes a few warnings gcc gives me when compiling. If this is an okay approach, there's a lot more patches I have for all the other tests. This warning appears a lot. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/adsldp/tests/ldap.c | 10 +++++----- dlls/adsldp/tests/sysinfo.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index fe9801a3972..161fc5d0bbc 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -190,7 +190,7 @@ static void test_ParseDisplayName(void) count = 0xdeadbeef; hr = MkParseDisplayName(bc, test[i].path, &count, &mk); -todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) + todo_wine_if(i == 0 || i == 1 || i == 11 || i == 12) ok(hr == test[i].hr, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); if (hr == S_OK) { @@ -394,7 +394,7 @@ static void test_DirectorySearch(void) ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); hr = IDirectorySearch_GetPreviousRow(ds, sh); -todo_wine + todo_wine ok(hr == E_ADS_BAD_PARAMETER, "got %#x\n", hr); while (IDirectorySearch_GetNextRow(ds, sh) != S_ADS_NOMORE_ROWS) @@ -430,9 +430,9 @@ todo_wine name = NULL; hr = IDirectorySearch_GetNextColumnName(ds, sh, &name); -todo_wine + todo_wine ok(hr == S_OK || broken(hr == S_ADS_NOMORE_COLUMNS) /* XP */, "got %#x\n", hr); -todo_wine + todo_wine ok((name && !wcscmp(name, L"ADsPath")) || broken(!name) /* XP */, "got %s\n", wine_dbgstr_w(name)); FreeADsMem(name); @@ -488,7 +488,7 @@ static void test_DirectoryObject(void) ok(hr == S_OK, "got %#x\n", hr); hr = IDirectoryObject_QueryInterface(dirobj, &IID_IADsOpenDSObject, (void **)&unk); -todo_wine + todo_wine ok(hr == E_NOINTERFACE, "got %#x\n", hr); if (hr == S_OK) IUnknown_Release(unk); hr = IDirectoryObject_QueryInterface(dirobj, &IID_IDispatch, (void **)&unk); diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index c7495dcb88b..4e7b0b405a9 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -123,7 +123,7 @@ static void test_UserName(void) ok(hr == S_OK, "got %#x\n", hr); hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); -todo_wine + todo_wine ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); if (hr == S_OK) { @@ -164,7 +164,7 @@ static void test_sysinfo(void) SysFreeString(bstr); hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); -todo_wine + todo_wine ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); if (hr != S_OK) goto done; SysFreeString(bstr); -- 2.34.1

3 5

[PATCH] tools: Add gdbinit helper with LoadSymbolFiles command.
by Rémi Bernon 24 Jan '22

24 Jan '22

To help gdb reload symbol files from /proc/<pid>/maps, making it possible to load debug info for ELF and PE modules for Wine processes. When sourced (from ~/.gdbinit for instance), this adds a new "load-symbol-files" command (with an "lsf" alias), which automatically calls add-symbol-file on every mapped file that can be read as ELF or PE, with the correct section offset. The command has to be run manually, for instance after executing for a while, to load new modules that may have been loaded, as there's no way for gdb to be notified of such changes automatically. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is some script I've been using for a while, and more or less broken versions are also used by other people, so I figured maybe it would be better to have a proper working version officially distributed with Wine source instead, as it's pretty useful for debugging Wine under gdb. It's still a bit manual to use, as gdb cannot easily be notified of dynamic library loading [1], but I think it's much better than having nothing. [1] in theory there's ways to do it using systemtap probes, but it's going to be hard to make it work, especially for PE modules. tools/gdbinit.py | 108 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 tools/gdbinit.py diff --git a/tools/gdbinit.py b/tools/gdbinit.py new file mode 100644 index 00000000000..265d97722b7 --- /dev/null +++ b/tools/gdbinit.py @@ -0,0 +1,108 @@ +#!/bin/env python3 + +# Copyright 2021 Rémi Bernon for CodeWeavers +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +from __future__ import print_function + +import gdb +import re +import subprocess +import sys + +class LoadSymbolFiles(gdb.Command): + 'Command to load symbol files directly from /proc/<pid>/maps.' + + def __init__(self): + sup = super(LoadSymbolFiles, self) + sup.__init__('load-symbol-files', gdb.COMMAND_FILES, gdb.COMPLETE_NONE, + False) + + self.libs = {} + gdb.execute('alias -a lsf = load-symbol-files', True) + + def invoke(self, arg, from_tty): + pid = gdb.selected_inferior().pid + if not pid in self.libs: self.libs[pid] = {} + + def command(cmd, confirm=from_tty): + to_string = not from_tty + gdb.execute(cmd, from_tty=confirm, to_string=to_string) + + def execute(cmd): + return subprocess.check_output(cmd, stderr=subprocess.STDOUT) \ + .decode('utf-8') + + # load mappings addresses + libs = {} + with open('/proc/{}/maps'.format(pid), 'r') as maps: + for line in maps: + addr, _, _, _, node, path = re.split(r'\s+', line, 5) + path = path.strip() + if node == '0': continue + if path in libs: continue + libs[path] = int(addr.split('-')[0], 16) + + # unload symbol file if address changed + for k in set(libs) & set(self.libs[pid]): + if libs[k] != self.libs[pid][k]: + command('remove-symbol-file "{}"'.format(k), confirm=False) + del self.libs[k] + + # load symbol file for new mappings + for k in set(libs) - set(self.libs[pid]): + if arg is not None and re.search(arg, k) is None: continue + addr = self.libs[pid][k] = libs[k] + offs = None + + try: + out = execute(['file', k]) + except: + continue + + # try loading mapping as ELF + try: + out = execute(['readelf', '-l', k]) + for line in out.split('\n'): + if not 'LOAD' in line: continue + base = int(line.split()[2], 16) + break + + out = execute(['objdump', '-h', k]) + for line in out.split('\n'): + if not '.text' in line: continue + offs = int(line.split()[3], 16) - base + break + if offs is None: continue + + # try again, assuming mapping is PE + except: + try: + out = execute(['objdump', '-h', k]) + for line in out.split('\n'): + if not '.text' in line: continue + offs = int(line.split()[5], 16) + break + if offs is None: continue + + except: + continue + + command('add-symbol-file "{}" 0x{:x}'.format(k, addr + offs), + confirm=False) + + +LoadSymbolFiles() -- 2.31.0

3 7

Arbitrary DOS device name
by Daniel Kučera 24 Jan '22

24 Jan '22

Hello all, I have a Windows software which tries to access dos device name but it is failing: 0009:Call KERNEL32.CreateFileA(0060f588 "\\\\.\\d6CDE-0",40000000,00000002,00000000,00000003,00000000,00000000) ret=00b1117f 0009:Call ntdll.RtlInitAnsiString(0060f49c,0060f588 "\\\\.\\d6CDE-0") ret=7b036296 0009:Ret ntdll.RtlInitAnsiString() retval=0060f49c ret=7b036296 0009:Call ntdll.RtlAnsiStringToUnicodeString(3fff8bf8,0060f49c,00000000) ret=7b0362fb 0009:Ret ntdll.RtlAnsiStringToUnicodeString() retval=00000000 ret=7b0362fb 0009:Call ntdll._wcsicmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d0c0 L"CONIN$") ret=7b0355c9 0009:Ret ntdll._wcsicmp() retval=fffffff9 ret=7b0355c9 0009:Call ntdll._wcsicmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d0ce L"CONOUT$") ret=7b035636 0009:Ret ntdll._wcsicmp() retval=fffffff9 ret=7b035636 0009:Call ntdll.wcsncmp(3fff8c00 L"\\\\.\\d6CDE-0",7b09d644 L"\\\\.\\",00000004) ret=7b035670 0009:Ret ntdll.wcsncmp() retval=00000000 ret=7b035670 0009:Call ntdll.iswalpha(00000064) ret=7b0356cd 0009:Ret ntdll.iswalpha() retval=00000102 ret=7b0356cd 0009:Call ntdll._wcsnicmp(3fff8c08 L"d6CDE-0",7b09d638 L"PIPE\\",00000005) ret=7b0356f5 0009:Ret ntdll._wcsnicmp() retval=fffffff4 ret=7b0356f5 0009:Call ntdll._wcsnicmp(3fff8c08 L"d6CDE-0",7b09d624 L"MAILSLOT\\",00000009) ret=7b03570e 0009:Ret ntdll._wcsnicmp() retval=fffffff7 ret=7b03570e 0009:Call ntdll.RtlIsDosDeviceName_U(3fff8c08 L"d6CDE-0") ret=7b035724 0009:Ret ntdll.RtlIsDosDeviceName_U() retval=00000000 ret=7b035724 0009:Call ntdll.RtlDosPathNameToNtPathName_U(3fff8c00 L"\\\\.\\d6CDE-0",0060f458,00000000,00000000) ret=7b035769 0009:Ret ntdll.RtlDosPathNameToNtPathName_U() retval=00000001 ret=7b035769 0009:Call ntdll.NtCreateFile(0060f454,40100080,0060f474,0060f460,00000000,00000000,00000002,00000001,00000060,00000000,00000000) ret=7b03581e 0009:Ret ntdll.NtCreateFile() retval=c0000034 ret=7b03581e 0009:Call ntdll.RtlNtStatusToDosError(c0000034) ret=7b035a11 0009:Ret ntdll.RtlNtStatusToDosError() retval=00000002 ret=7b035a11 0009:Call ntdll.RtlFreeUnicodeString(0060f458) ret=7b03592b 0009:Ret ntdll.RtlFreeUnicodeString() retval=0060f458 ret=7b03592b 0009:Ret KERNEL32.CreateFileA() retval=ffffffff ret=00b1117f The problem is, that wine doesn't recognize "\\\\.\\d6CDE-0" as valid DOS device name: https://github.com/wine-mirror/wine/blob/e909986e6ea5ecd49b2b847f321ad89b2a… Even when I created the device in HKEY_LOCAL_MACHINE\Software\Wine\Ports it doesn't allow to open it. When I patched the corresponding DLL to use COM81 and created the device in Ports, it works okay (can open the device). I want to write a patch to ntdll/path.c to recognize my string as DOS device but I want it to be generic enough to be acceptable. What approach do you suggest? Can I add a generic match, something like: "\\\\.\\[^\\]+$" ? To add some context here, the software is for controlling USB osclloscope from Hantek: http://hantek.com/uploadpic/hantek/files/20210731/Hantek-6000_Ver2.2.7_D202… It installs a driver which creates mentioned "DOS device" and communicates through it using ioctl. I am reversing the driver and I'll create a Linux char device to handle those ioctl calls and talk to the USB device using libusb. Thanks. -- S pozdravom / Best regards Daniel Kucera.

1 0

[PATCH] winepulse: Remove unused member "mute".
by Huw Davies 24 Jan '22

24 Jan '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 356f68e0db2..f32f2a3d26c 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -56,7 +56,6 @@ struct pulse_stream AUDCLNT_SHAREMODE share; HANDLE event; float vol[PA_CHANNELS_MAX]; - BOOL mute; INT32 locked; BOOL started; -- 2.25.1

1 0

[PATCH] wshom: Use CRT allocation functions.
by Nikolay Sivov 24 Jan '22

24 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/shell.c | 103 ++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index e8fcba72505..1ee74577310 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -24,7 +24,6 @@ #include "dispex.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); @@ -49,7 +48,7 @@ typedef struct LONG ref; IShellLinkW *link; - BSTR path_link; + WCHAR *path_link; } WshShortcut; typedef struct @@ -130,7 +129,7 @@ static ULONG WINAPI WshExec_Release(IWshExec *iface) if (!ref) { CloseHandle(This->info.hThread); CloseHandle(This->info.hProcess); - heap_free(This); + free(This); } return ref; @@ -321,24 +320,25 @@ static const IWshExecVtbl WshExecVtbl = { static HRESULT WshExec_create(BSTR command, IWshExec **ret) { STARTUPINFOW si = {0}; - WshExecImpl *This; + WshExecImpl *object; *ret = NULL; - This = heap_alloc(sizeof(*This)); - if (!This) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; - This->IWshExec_iface.lpVtbl = &WshExecVtbl; - This->ref = 1; + object->IWshExec_iface.lpVtbl = &WshExecVtbl; + object->ref = 1; - if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &This->info)) { - heap_free(This); + if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &object->info)) + { + free(object); return HRESULT_FROM_WIN32(GetLastError()); } - init_classinfo(&CLSID_WshExec, (IUnknown *)&This->IWshExec_iface, &This->classinfo); - *ret = &This->IWshExec_iface; + init_classinfo(&CLSID_WshExec, (IUnknown *)&object->IWshExec_iface, &object->classinfo); + *ret = &object->IWshExec_iface; + return S_OK; } @@ -383,7 +383,7 @@ static ULONG WINAPI WshEnvironment_Release(IWshEnvironment *iface) TRACE("(%p) ref = %d\n", This, ref); if (!ref) - heap_free(This); + free(This); return ref; } @@ -519,16 +519,16 @@ static const IWshEnvironmentVtbl WshEnvironmentVtbl = { static HRESULT WshEnvironment_Create(IWshEnvironment **env) { - WshEnvironment *This; + WshEnvironment *object; - This = heap_alloc(sizeof(*This)); - if (!This) return E_OUTOFMEMORY; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - This->IWshEnvironment_iface.lpVtbl = &WshEnvironmentVtbl; - This->ref = 1; + object->IWshEnvironment_iface.lpVtbl = &WshEnvironmentVtbl; + object->ref = 1; - init_classinfo(&IID_IWshEnvironment, (IUnknown *)&This->IWshEnvironment_iface, &This->classinfo); - *env = &This->IWshEnvironment_iface; + init_classinfo(&IID_IWshEnvironment, (IUnknown *)&object->IWshEnvironment_iface, &object->classinfo); + *env = &object->IWshEnvironment_iface; return S_OK; } @@ -574,7 +574,7 @@ static ULONG WINAPI WshCollection_Release(IWshCollection *iface) TRACE("(%p) ref = %d\n", This, ref); if (!ref) - heap_free(This); + free(This); return ref; } @@ -718,16 +718,16 @@ static const IWshCollectionVtbl WshCollectionVtbl = { static HRESULT WshCollection_Create(IWshCollection **collection) { - WshCollection *This; + WshCollection *object; - This = heap_alloc(sizeof(*This)); - if (!This) return E_OUTOFMEMORY; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - This->IWshCollection_iface.lpVtbl = &WshCollectionVtbl; - This->ref = 1; + object->IWshCollection_iface.lpVtbl = &WshCollectionVtbl; + object->ref = 1; - init_classinfo(&IID_IWshCollection, (IUnknown *)&This->IWshCollection_iface, &This->classinfo); - *collection = &This->IWshCollection_iface; + init_classinfo(&IID_IWshCollection, (IUnknown *)&object->IWshCollection_iface, &object->classinfo); + *collection = &object->IWshCollection_iface; return S_OK; } @@ -775,9 +775,9 @@ static ULONG WINAPI WshShortcut_Release(IWshShortcut *iface) if (!ref) { - SysFreeString(This->path_link); IShellLinkW_Release(This->link); - heap_free(This); + free(This->path_link); + free(This); } return ref; @@ -1070,35 +1070,34 @@ static const IWshShortcutVtbl WshShortcutVtbl = { static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) { - WshShortcut *This; + WshShortcut *object; HRESULT hr; *shortcut = NULL; - This = heap_alloc(sizeof(*This)); - if (!This) return E_OUTOFMEMORY; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - This->IWshShortcut_iface.lpVtbl = &WshShortcutVtbl; - This->ref = 1; + object->IWshShortcut_iface.lpVtbl = &WshShortcutVtbl; + object->ref = 1; - hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, - &IID_IShellLinkW, (void**)&This->link); + hr = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkW, (void **)&object->link); if (FAILED(hr)) { - heap_free(This); + free(object); return hr; } - This->path_link = SysAllocString(path); - if (!This->path_link) + object->path_link = wcsdup(path); + if (!object->path_link) { - IShellLinkW_Release(This->link); - heap_free(This); + IShellLinkW_Release(object->link); + free(object); return E_OUTOFMEMORY; } - init_classinfo(&IID_IWshShortcut, (IUnknown *)&This->IWshShortcut_iface, &This->classinfo); - *shortcut = (IDispatch*)&This->IWshShortcut_iface; + init_classinfo(&IID_IWshShortcut, (IUnknown *)&object->IWshShortcut_iface, &object->classinfo); + *shortcut = (IDispatch *)&object->IWshShortcut_iface; return S_OK; } @@ -1220,7 +1219,7 @@ static WCHAR *split_command( BSTR cmd, WCHAR **params ) WCHAR *ret, *ptr; BOOL in_quotes = FALSE; - if (!(ret = heap_alloc((lstrlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; + if (!(ret = malloc((lstrlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; lstrcpyW( ret, cmd ); *params = NULL; @@ -1283,7 +1282,7 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, info.nShow = V_I4(&s); ret = ShellExecuteExW(&info); - heap_free( file ); + free(file); if (!ret) { TRACE("ShellExecute failed, %d\n", GetLastError()); @@ -1454,7 +1453,7 @@ static HRESULT split_reg_path(const WCHAR *path, WCHAR **subkey, WCHAR **value) unsigned int len = *value - *subkey - 1; WCHAR *ret; - ret = heap_alloc((len + 1)*sizeof(WCHAR)); + ret = malloc((len + 1)*sizeof(WCHAR)); if (!ret) return E_OUTOFMEMORY; @@ -1494,7 +1493,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v if (ret == ERROR_SUCCESS) { void *data; - data = heap_alloc(datalen); + data = malloc(datalen); if (!data) { hr = E_OUTOFMEMORY; goto fail; @@ -1502,7 +1501,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v ret = RegGetValueW(root, subkey, val, RRF_RT_ANY, &type, data, &datalen); if (ret) { - heap_free(data); + free(data); hr = HRESULT_FROM_WIN32(ret); goto fail; } @@ -1592,7 +1591,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v hr = E_FAIL; }; - heap_free(data); + free(data); if (FAILED(hr)) VariantInit(value); } @@ -1601,7 +1600,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v fail: if (val) - heap_free(subkey); + free(subkey); return hr; } @@ -1684,7 +1683,7 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * fail: VariantClear(&v); if (val) - heap_free(subkey); + free(subkey); return hr; } -- 2.34.1

1 0

[PATCH v3] Re-enabled Wide Character Case insensitive import handling
by Ben Shefte 24 Jan '22

24 Jan '22

From: Benjamin Shefte <support(a)neuwon.com> Fixes Regression from: Wine 6.21 https://bugs.winehq.org/show_bug.cgi?id=52446 Signed-off-by: Ben Shefte <shefben(a)gmail.com> --- dlls/ntdll/loader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..ec1fc556250 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -627,8 +627,14 @@ static WCHAR *append_dll_ext( const WCHAR *name ) static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import ) { const char *name = get_rva( mod->DllBase, import->Name ); - - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + WCHAR buffer[16]; + DWORD len = strlen(name); + + if (len * sizeof(WCHAR) >= sizeof(buffer)) + return 0; + ascii_to_unicode( buffer, name, len + 1 ); + + return !wcsicmp( buffer, L"ntdll.dll" ) || !wcsicmp( buffer, L"kernel32.dll" ); } /********************************************************************** -- 2.27.0

2 1

[PATCH 5/5] comctl32/propsheet: Handle page dialog tab texture in DefDlgProc().
by Zhiyi Zhang 24 Jan '22

24 Jan '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/propsheet.c | 164 -------------------------------------- 1 file changed, 164 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 82c0a3cc576..556d63f2c75 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -63,7 +63,6 @@ #include "prsht.h" #include "comctl32.h" #include "uxtheme.h" -#include "vsstyle.h" #include "wine/debug.h" @@ -141,7 +140,6 @@ typedef struct */ static const WCHAR PropSheetInfoStr[] = L"PropertySheetInfo"; -static const WCHAR PropSheetPageBackgroundBrush[] = L"PropSheetPageBackgroundBrush"; #define PSP_INTERNAL_UNICODE 0x80000000 @@ -1198,136 +1196,6 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } -static HBRUSH get_propsheet_background_brush(HWND hwnd) -{ - HBITMAP bitmap, old_bitmap; - HDC hdc, hdc_screen; - HBRUSH brush; - HTHEME theme; - HRESULT hr; - RECT rect; - SIZE size; - - brush = GetPropW(hwnd, PropSheetPageBackgroundBrush); - if (brush) - return brush; - - theme = OpenThemeData(NULL, L"Tab"); - if (!theme) - return NULL; - - hr = GetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); - if (FAILED(hr)) - { - size.cx = 10; - size.cy = 600; - } - - hdc_screen = GetDC(NULL); - hdc = CreateCompatibleDC(hdc_screen); - bitmap = CreateCompatibleBitmap(hdc_screen, size.cx, size.cy); - old_bitmap = SelectObject(hdc, bitmap); - - SetRect(&rect, 0, 0, size.cx, size.cy); - /* FIXME: XP draws the tab body bitmap directly without transparency even if there is */ - FillRect(hdc, &rect, GetSysColorBrush(COLOR_3DFACE)); - hr = DrawThemeBackground(theme, hdc, TABP_BODY, 0, &rect, NULL); - if (SUCCEEDED(hr)) - { - brush = CreatePatternBrush(bitmap); - SetPropW(hwnd, PropSheetPageBackgroundBrush, brush); - } - - SelectObject(hdc, old_bitmap); - DeleteDC(hdc); - ReleaseDC(NULL, hdc_screen); - CloseThemeData(theme); - return brush; -} - -/* Subclassing window procedure for theming dialogs in property sheet pages */ -static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, - UINT_PTR id, DWORD_PTR ref) -{ - POINT org, old_org; - LOGBRUSH logbrush; - WNDPROC dlgproc; - HBRUSH brush; - LRESULT lr; - RECT rect; - HDC hdc; - - switch (msg) - { - case WM_THEMECHANGED: - { - brush = GetPropW(hwnd, PropSheetPageBackgroundBrush); - if (brush) - { - RemovePropW(hwnd, PropSheetPageBackgroundBrush); - if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) - DeleteObject((HBITMAP)logbrush.lbHatch); - DeleteObject(brush); - } - InvalidateRect(hwnd, NULL, TRUE); - break; - } - case WM_ERASEBKGND: - { - if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) - break; - - dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); - lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); - if (lr) - return lr; - - brush = get_propsheet_background_brush(hwnd); - if (!brush) - break; - - /* Using FillRect() to draw background could introduce a tiling effect if the destination - * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is - * visible on property sheet pages if system DPI is set to 192. However, the same bug also - * exists on XP and explains why vista+ don't use gradient tab body background anymore */ - hdc = (HDC)wp; - GetViewportOrgEx(hdc, &org); - SetBrushOrgEx(hdc, org.x, org.y, &old_org); - GetClientRect(hwnd, &rect); - FillRect(hdc, &rect, brush); - SetBrushOrgEx(hdc, old_org.x, old_org.y, NULL); - return TRUE; - } - - case WM_CTLCOLORSTATIC: - { - if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) - break; - - dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); - lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); - if (lr) - return lr; - - brush = get_propsheet_background_brush(hwnd); - if (!brush) - break; - - hdc = (HDC)wp; - SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); - SetBkMode(hdc, TRANSPARENT); - - org.x = 0; - org.y = 0; - MapWindowPoints((HWND)lp, hwnd, &org, 1); - SetBrushOrgEx(hdc, -org.x, -org.y, NULL); - return (LRESULT)brush; - } - } - - return DefSubclassProc(hwnd, msg, wp, lp); -} - /* * Get the size of an in-memory Template * @@ -1599,10 +1467,6 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, (DWORD_PTR)ppshpage); } - else - { - SetWindowSubclass(hwndPage, PROPSHEET_ThemedSubclassProc, 1, (DWORD_PTR)ppshpage); - } if (!(psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)) EnableThemeDialogTexture (hwndPage, ETDT_ENABLETAB); @@ -2487,8 +2351,6 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); PropPageInfo* oldPages; - LOGBRUSH logbrush; - HBRUSH brush; TRACE("index %d, hpage %p\n", index, hpage); if (!psInfo) { @@ -2546,18 +2408,6 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_WizardSubclassProc, 1); } - else - { - RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_ThemedSubclassProc, 1); - brush = GetPropW(psInfo->proppage[index].hwndPage, PropSheetPageBackgroundBrush); - if (brush) - { - RemovePropW(psInfo->proppage[index].hwndPage, PropSheetPageBackgroundBrush); - if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) - DeleteObject((HBITMAP)logbrush.lbHatch); - DeleteObject(brush); - } - } /* Destroy page dialog window */ DestroyWindow(psInfo->proppage[index].hwndPage); @@ -2855,8 +2705,6 @@ static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE page, const PropSheetInfo* psIn */ static void PROPSHEET_CleanUp(HWND hwndDlg) { - LOGBRUSH logbrush; - HBRUSH brush; int i; PropSheetInfo* psInfo = RemovePropW(hwndDlg, PropSheetInfoStr); @@ -2877,18 +2725,6 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_WizardSubclassProc, 1); } - else - { - RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_ThemedSubclassProc, 1); - brush = GetPropW(psInfo->proppage[i].hwndPage, PropSheetPageBackgroundBrush); - if (brush) - { - RemovePropW(psInfo->proppage[i].hwndPage, PropSheetPageBackgroundBrush); - if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) - DeleteObject((HBITMAP)logbrush.lbHatch); - DeleteObject(brush); - } - } if(psInfo->proppage[i].hwndPage) DestroyWindow(psInfo->proppage[i].hwndPage); -- 2.32.0

1 0

[PATCH 4/5] comctl32/static: Enable parent dialog tab texture.
by Zhiyi Zhang 24 Jan '22

24 Jan '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/static.c | 9 +++++++++ dlls/uxtheme/tests/system.c | 3 --- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/static.c b/dlls/comctl32/static.c index 60af6696425..d584b470a8c 100644 --- a/dlls/comctl32/static.c +++ b/dlls/comctl32/static.c @@ -35,6 +35,7 @@ #include "wingdi.h" #include "winuser.h" #include "commctrl.h" +#include "uxtheme.h" #include "wine/heap.h" #include "wine/debug.h" @@ -432,12 +433,20 @@ static LRESULT CALLBACK STATIC_WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, switch (uMsg) { case WM_CREATE: + { + HWND parent; + if (style < 0L || style > SS_TYPEMASK) { ERR("Unknown style 0x%02x\n", style ); return -1; } + + parent = GetParent( hwnd ); + if (parent) + EnableThemeDialogTexture( parent, ETDT_ENABLE ); break; + } case WM_NCDESTROY: if (style == SS_ICON) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 32bf754e2f8..afc05b8549f 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2097,7 +2097,6 @@ static void test_EnableThemeDialogTexture(void) child_hdc = GetDC(child); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); if (class_tests[i].texture_enabled) - todo_wine_if(!lstrcmpA(class_tests[i].param.class_name, WC_STATICA)) ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture enabled.\n"); else ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); @@ -2121,7 +2120,6 @@ static void test_EnableThemeDialogTexture(void) child_hdc = GetDC(child); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); if (class_tests[i].texture_enabled) - todo_wine_if(!lstrcmpA(class_tests[i].param.class_name, WC_STATICA)) ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture enabled.\n"); else ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); @@ -2142,7 +2140,6 @@ static void test_EnableThemeDialogTexture(void) NULL); ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); ret = IsThemeDialogTextureEnabled(hwnd); - todo_wine ok(ret, "Wrong dialog texture status.\n"); /* Test that if you move the child control to another window, it doesn't enables tab texture for -- 2.32.0

1 0

[PATCH 3/5] comctl32/button: Enable parent dialog tab texture.
by Zhiyi Zhang 24 Jan '22

24 Jan '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 8 ++++++++ dlls/uxtheme/tests/system.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 72c1a17402c..a2a1c9e0561 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -526,6 +526,9 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L break; case WM_CREATE: + { + HWND parent; + if (btn_type >= MAX_BTN_TYPE) return -1; /* abort */ @@ -537,7 +540,12 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L } infoPtr->state = BST_UNCHECKED; OpenThemeData( hWnd, WC_BUTTONW ); + + parent = GetParent( hWnd ); + if (parent) + EnableThemeDialogTexture( parent, ETDT_ENABLE ); return 0; + } case WM_DESTROY: theme = GetWindowTheme( hWnd ); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 540cd7d2fcd..32bf754e2f8 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2097,7 +2097,7 @@ static void test_EnableThemeDialogTexture(void) child_hdc = GetDC(child); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); if (class_tests[i].texture_enabled) - todo_wine + todo_wine_if(!lstrcmpA(class_tests[i].param.class_name, WC_STATICA)) ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture enabled.\n"); else ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); @@ -2121,7 +2121,7 @@ static void test_EnableThemeDialogTexture(void) child_hdc = GetDC(child); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); if (class_tests[i].texture_enabled) - todo_wine + todo_wine_if(!lstrcmpA(class_tests[i].param.class_name, WC_STATICA)) ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture enabled.\n"); else ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); -- 2.32.0

1 0

[PATCH 2/5] uxtheme: Hook DefDlgProc() for dialog theming.
by Zhiyi Zhang 24 Jan '22

24 Jan '22

Fix controls on OpenMPT's channel setting dialog having incorrect background. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/defdlg.c | 34 +++++-- dlls/user32/hook.c | 1 + dlls/user32/user_private.h | 1 + dlls/uxtheme/Makefile.in | 1 + dlls/uxtheme/dialog.c | 176 ++++++++++++++++++++++++++++++++++++ dlls/uxtheme/system.c | 1 + dlls/uxtheme/tests/system.c | 20 +--- dlls/uxtheme/uxthemedll.h | 1 + include/winuser.h | 1 + 9 files changed, 210 insertions(+), 26 deletions(-) create mode 100644 dlls/uxtheme/dialog.c diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 81c7cb0f207..4f44a93cd49 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -354,10 +354,7 @@ out: return dlgInfo; } -/*********************************************************************** - * DefDlgProcA (USER32.@) - */ -LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -411,10 +408,7 @@ LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } -/*********************************************************************** - * DefDlgProcW (USER32.@) - */ -LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -467,3 +461,27 @@ LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } + +LRESULT WINAPI USER_DefDlgProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) +{ + if (unicode) + return USER_DefDlgProcW( hwnd, msg, wParam, lParam ); + else + return USER_DefDlgProcA( hwnd, msg, wParam, lParam ); +} + +/*********************************************************************** + * DefDlgProcA (USER32.@) + */ +LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, FALSE ); +} + +/*********************************************************************** + * DefDlgProcW (USER32.@) + */ +LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +{ + return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, TRUE ); +} diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 159797020f2..f5b4c6ab8a1 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -83,6 +83,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); static struct user_api_hook original_user_api = { + USER_DefDlgProc, USER_ScrollBarDraw, USER_ScrollBarProc, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 6923ddb2906..7a9845adeb9 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -303,6 +303,7 @@ extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; #endif extern struct user_api_hook *user_api DECLSPEC_HIDDEN; +LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 01751d3243a..933650f4261 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -5,6 +5,7 @@ DELAYIMPORTS = msimg32 C_SRCS = \ buffer.c \ + dialog.c \ draw.c \ main.c \ metric.c \ diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c new file mode 100644 index 00000000000..87c2b7d1c13 --- /dev/null +++ b/dlls/uxtheme/dialog.c @@ -0,0 +1,176 @@ +/* + * Dialog theming support + * + * Copyright 2022 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "uxtheme.h" +#include "uxthemedll.h" +#include "vssym32.h" + +extern ATOM atDialogThemeEnabled; +static const WCHAR wine_dialog_brush[] = L"wine_dialog_brush"; + +static HBRUSH get_dialog_background_brush(HWND hwnd, BOOL create) +{ + HBITMAP bitmap, old_bitmap; + HDC hdc, hdc_screen; + HBRUSH brush; + HTHEME theme; + DWORD flag; + HRESULT hr; + RECT rect; + SIZE size; + + if (!IsThemeActive()) + return NULL; + + flag = HandleToUlong(GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled))); + if (flag != ETDT_ENABLETAB && flag != ETDT_ENABLEAEROWIZARDTAB) + return NULL; + + brush = GetPropW(hwnd, wine_dialog_brush); + if (brush) + return brush; + + if (!create) + return NULL; + + theme = OpenThemeData(NULL, L"Tab"); + if (!theme) + return NULL; + + hr = GetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); + if (FAILED(hr)) + { + size.cx = 10; + size.cy = 600; + } + + hdc_screen = GetDC(NULL); + hdc = CreateCompatibleDC(hdc_screen); + bitmap = CreateCompatibleBitmap(hdc_screen, size.cx, size.cy); + old_bitmap = SelectObject(hdc, bitmap); + + SetRect(&rect, 0, 0, size.cx, size.cy); + /* FIXME: XP draws the tab body bitmap directly without transparency even if there is */ + FillRect(hdc, &rect, GetSysColorBrush(COLOR_3DFACE)); + hr = DrawThemeBackground(theme, hdc, TABP_BODY, 0, &rect, NULL); + if (SUCCEEDED(hr)) + { + brush = CreatePatternBrush(bitmap); + SetPropW(hwnd, wine_dialog_brush, brush); + } + + SelectObject(hdc, old_bitmap); + DeleteDC(hdc); + ReleaseDC(NULL, hdc_screen); + CloseThemeData(theme); + return brush; +} + +static void destroy_dialog_brush(HWND hwnd) +{ + LOGBRUSH logbrush; + HBRUSH brush; + + brush = GetPropW(hwnd, wine_dialog_brush); + if (brush) + { + RemovePropW(hwnd, wine_dialog_brush); + if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) + DeleteObject((HBITMAP)logbrush.lbHatch); + DeleteObject(brush); + } +} + +LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, BOOL unicode) +{ + POINT org, old_org; + WNDPROC dlgproc; + HBRUSH brush; + LRESULT lr; + RECT rect; + HDC hdc; + + switch (msg) + { + case WM_NCDESTROY: + { + destroy_dialog_brush(hwnd); + break; + } + case WM_THEMECHANGED: + { + destroy_dialog_brush(hwnd); + InvalidateRect(hwnd, NULL, TRUE); + break; + } + case WM_ERASEBKGND: + { + dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); + if (lr) + return lr; + + brush = get_dialog_background_brush(hwnd, TRUE); + if (!brush) + break; + + /* Using FillRect() to draw background could introduce a tiling effect if the destination + * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is + * visible on property sheet pages if system DPI is set to 192. However, the same bug also + * exists on XP and explains why vista+ don't use gradient tab body background anymore */ + hdc = (HDC)wp; + GetViewportOrgEx(hdc, &org); + SetBrushOrgEx(hdc, org.x, org.y, &old_org); + GetClientRect(hwnd, &rect); + FillRect(hdc, &rect, brush); + SetBrushOrgEx(hdc, old_org.x, old_org.y, NULL); + return TRUE; + } + case WM_CTLCOLORSTATIC: + { + dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); + if (lr) + return lr; + + brush = get_dialog_background_brush(hwnd, FALSE); + if (!brush) + break; + + hdc = (HDC)wp; + SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); + SetBkMode(hdc, TRANSPARENT); + + org.x = 0; + org.y = 0; + MapWindowPoints((HWND)lp, hwnd, &org, 1); + SetBrushOrgEx(hdc, -org.x, -org.y, NULL); + return (LRESULT)brush; + } + } + + return user_api.pDefDlgProc(hwnd, msg, wp, lp, unicode); +} diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 61a608e5962..37c484387ec 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1245,6 +1245,7 @@ BOOL WINAPI ThemeHooksInstall(void) { struct user_api_hook hooks; + hooks.pDefDlgProc = UXTHEME_DefDlgProc; hooks.pScrollBarDraw = UXTHEME_ScrollBarDraw; hooks.pScrollBarWndProc = UXTHEME_ScrollbarWndProc; return RegisterUserApiHook(&hooks, &user_api); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 4a5a6d291fc..540cd7d2fcd 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1772,7 +1772,6 @@ static void test_EnableThemeDialogTexture(void) lr = SendMessageA(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); ok(lr != 0, "WM_ERASEBKGND failed.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected brush changed.\n"); /* Test disabling theme dialog texture should change the brush immediately */ @@ -1780,7 +1779,6 @@ static void test_EnableThemeDialogTexture(void) hr = EnableThemeDialogTexture(dialog, ETDT_DISABLE); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); brush2 = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush2 != brush, "Expected a different brush.\n"); ok(brush2 == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), brush2); @@ -1799,7 +1797,6 @@ static void test_EnableThemeDialogTexture(void) hr = EnableThemeDialogTexture(dialog, ETDT_USETABTEXTURE); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); brush2 = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush2 != brush, "Expected a different brush.\n"); /* Test ETDT_ENABLE | ETDT_USEAEROWIZARDTABTEXTURE should change the brush immediately */ @@ -1811,7 +1808,6 @@ static void test_EnableThemeDialogTexture(void) if (LOBYTE(LOWORD(GetVersion())) < 6) ok(brush2 == brush, "Expected the same brush.\n"); else - todo_wine ok(brush2 != brush, "Expected a different brush.\n"); hr = EnableThemeDialogTexture(dialog, ETDT_DISABLE); @@ -1832,7 +1828,6 @@ static void test_EnableThemeDialogTexture(void) SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); ret = GetBrushOrgEx(child_hdc, &org); ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - todo_wine ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); /* Test that WM_CTLCOLORSTATIC changes background mode when dialog texture is on */ @@ -1840,7 +1835,6 @@ static void test_EnableThemeDialogTexture(void) ok(old_mode != 0, "SetBkMode failed.\n"); SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); mode = SetBkMode(child_hdc, old_mode); - todo_wine ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); /* Test that WM_CTLCOLORSTATIC changes background color when dialog texture is on */ @@ -1859,15 +1853,12 @@ static void test_EnableThemeDialogTexture(void) memset(&log_brush, 0, sizeof(log_brush)); count = GetObjectA(brush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - todo_wine ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, log_brush.lbStyle); memset(&bmp, 0, sizeof(bmp)); count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); - todo_wine ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); theme = OpenThemeData(NULL, L"Tab"); @@ -1877,16 +1868,13 @@ static void test_EnableThemeDialogTexture(void) size.cy = 0; hr = GetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); CloseThemeData(theme); /* Test that DefDlgProcA/W() are hooked for WM_CTLCOLORSTATIC */ brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); brush2 = (HBRUSH)DefDlgProcW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); ok(brush2 == brush, "Expected the same brush.\n"); @@ -1895,11 +1883,12 @@ static void test_EnableThemeDialogTexture(void) /* Test that DefWindowProcA/W() are also hooked for WM_CTLCOLORSTATIC */ brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); brush2 = (HBRUSH)DefWindowProcW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine ok(brush2 == brush, "Expected the same brush.\n"); brush2 = (HBRUSH)DefWindowProcA(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine ok(brush2 == brush, "Expected the same brush.\n"); /* Test that DefWindowProcA/W() are not hooked for WM_ERASEBKGND. So the background is still @@ -1951,13 +1940,11 @@ static void test_EnableThemeDialogTexture(void) SetLastError(0xdeadbeef); ret = GetObjectA(brush, sizeof(log_brush), &log_brush); error = GetLastError(); - todo_wine ok(!ret || broken(ret) /* XP */, "GetObjectA succeeded.\n"); todo_wine ok(error == ERROR_INVALID_PARAMETER || broken(error == 0xdeadbeef) /* XP */, "Expected error %u, got %u.\n", ERROR_INVALID_PARAMETER, error); ret = DeleteObject(brush); - todo_wine ok(!ret || broken(ret) /* XP */, "DeleteObject succeeded.\n"); /* Should still report the same brush handle after the brush handle was freed */ @@ -1971,7 +1958,6 @@ static void test_EnableThemeDialogTexture(void) lr = SendMessageA(dialog, WM_THEMECHANGED, 0, 0); ok(lr == 0, "WM_THEMECHANGED failed.\n"); brush2 = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine ok(brush2 != brush, "Expected a different brush.\n"); ReleaseDC(child, child_hdc); @@ -2027,7 +2013,6 @@ static void test_EnableThemeDialogTexture(void) ok(lr != 0, "WM_ERASEBKGND failed.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); if (flags[i] == ETDT_ENABLETAB || flags[i] == ETDT_ENABLEAEROWIZARDTAB) - todo_wine ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture enabled.\n"); else ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); @@ -2054,7 +2039,6 @@ static void test_EnableThemeDialogTexture(void) || ((flags[i] | flags[j]) & ETDT_ENABLEAEROWIZARDTAB) == ETDT_ENABLEAEROWIZARDTAB) && !((flags[i] | flags[j]) & ETDT_DISABLE))) && (((flags[i] | flags[j]) & (ETDT_ENABLETAB | ETDT_ENABLEAEROWIZARDTAB)) != (ETDT_ENABLETAB | ETDT_ENABLEAEROWIZARDTAB))) - todo_wine ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture enabled.\n"); else ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index c43ad703884..67130774392 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -106,6 +106,7 @@ extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; +LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, diff --git a/include/winuser.h b/include/winuser.h index 1d37bd44344..898c9034e33 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4435,6 +4435,7 @@ struct SCROLL_TRACKING_INFO struct user_api_hook { + LRESULT (WINAPI *pDefDlgProc)(HWND, UINT, WPARAM, LPARAM, BOOL); void (WINAPI *pScrollBarDraw)(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL); -- 2.32.0

1 0

[PATCH 1/5] uxtheme: Allow EnableThemeDialogTexture() to set flags in multiple steps.
by Zhiyi Zhang 24 Jan '22

24 Jan '22

For example, set ETDT_USETABTEXTURE first and then set ETDT_ENABLE to activate dialog theming. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 28 +++++++++++++++++++++++----- dlls/uxtheme/tests/system.c | 8 ++------ 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index b6e5f0230e5..4aac46f3fed 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -52,14 +52,32 @@ extern ATOM atDialogThemeEnabled; /*********************************************************************** * EnableThemeDialogTexture (UXTHEME.@) */ -HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) +HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD new_flag) { + DWORD old_flag = 0; BOOL res; - TRACE("(%p,0x%08x\n", hwnd, dwFlags); - res = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), - UlongToHandle(dwFlags|0x80000000)); - /* 0x80000000 serves as a "flags set" flag */ + TRACE("(%p,%#x\n", hwnd, new_flag); + + new_flag &= ETDT_VALIDBITS; + + if (new_flag == 0) + return S_OK; + + if (new_flag & ETDT_DISABLE) + { + new_flag = ETDT_DISABLE; + old_flag = 0; + } + + if (new_flag & ~ETDT_DISABLE) + { + old_flag = HandleToUlong(GetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled))); + old_flag &= ~ETDT_DISABLE; + } + + new_flag = new_flag | old_flag; + res = SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), UlongToHandle(new_flag)); return res ? S_OK : HRESULT_FROM_WIN32(GetLastError()); } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 93994fa8364..4a5a6d291fc 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1645,16 +1645,15 @@ static void test_EnableThemeDialogTexture(void) { DWORD flag; BOOL enabled; - BOOL todo; } invalid_flag_tests[] = { - {0, FALSE, TRUE}, + {0, FALSE}, {ETDT_DISABLE | ETDT_ENABLE, FALSE}, {ETDT_ENABLETAB | ETDT_ENABLEAEROWIZARDTAB, TRUE}, {ETDT_USETABTEXTURE | ETDT_USEAEROWIZARDTABTEXTURE, TRUE}, {ETDT_VALIDBITS, FALSE}, - {~ETDT_VALIDBITS, FALSE, TRUE}, + {~ETDT_VALIDBITS, FALSE}, {~ETDT_VALIDBITS | ETDT_DISABLE, FALSE} }; @@ -1989,7 +1988,6 @@ static void test_EnableThemeDialogTexture(void) hr = EnableThemeDialogTexture(dialog, invalid_flag_tests[i].flag); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); ret = IsThemeDialogTextureEnabled(dialog); - todo_wine_if(invalid_flag_tests[i].todo) ok(ret == invalid_flag_tests[i].enabled, "Wrong dialog texture status.\n"); EndDialog(dialog, 0); @@ -2020,7 +2018,6 @@ static void test_EnableThemeDialogTexture(void) "EnableThemeDialogTexture first flag", FALSE); ret = IsThemeDialogTextureEnabled(dialog); /* Non-zero flags without ETDT_DISABLE enables dialog texture */ - todo_wine_if(flags[i] == 0) ok(ret == (!(flags[i] & ETDT_DISABLE) && flags[i]), "Wrong dialog texture status.\n"); child = GetDlgItem(dialog, 100); @@ -2045,7 +2042,6 @@ static void test_EnableThemeDialogTexture(void) if (flags[j]) ok(ret == !(flags[j] & ETDT_DISABLE), "Wrong dialog texture status.\n"); else - todo_wine_if(!flags[i] || flags[i] == ETDT_DISABLE || flags[i] == (ETDT_DISABLE | ETDT_ENABLE)) ok(ret == (!(flags[i] & ETDT_DISABLE) && flags[i]), "Wrong dialog texture status.\n"); lr = SendMessageA(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); ok(lr != 0, "WM_ERASEBKGND failed.\n"); -- 2.32.0

1 0

[PATCH v2] kernelbase: Improve stub for ResolveLocaleName.
by Louis Lenders 23 Jan '22

23 Jan '22

v2: Remove some unnecessary initialization code (leftovers) from test, as this minimal test now only tests for returnvalues of ResolveLocaleName Fixes https://bugs.winehq.org/show_bug.cgi?id=52407 The current stub assumes a failing call to ResolveLocaleName returns 0, but tests show it returns 1 (and empty string). It actually never seems to returns 0. Added test is minimal to keep patch small, a few other traces of what the function returns can be seen on testbot here https://testbot.winehq.org/JobDetails.pl?Key=105651&f206=exe32.report#k206 and https://testbot.winehq.org/JobDetails.pl?Key=105651&f206=exe32.report&f207=… Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/tests/locale.c | 19 +++++++++++++++++++ dlls/kernelbase/locale.c | 6 ++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2d327b7130c..daa70f13580 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -99,6 +99,7 @@ static NTSTATUS (WINAPI *pRtlCustomCPToUnicodeN)(CPTABLEINFO*,WCHAR*,DWORD,DWORD static NTSTATUS (WINAPI *pRtlGetSystemPreferredUILanguages)(DWORD,ULONG,ULONG*,WCHAR*,ULONG*); static NTSTATUS (WINAPI *pRtlGetThreadPreferredUILanguages)(DWORD,ULONG*,WCHAR*,ULONG*); static NTSTATUS (WINAPI *pRtlGetUserPreferredUILanguages)(DWORD,ULONG,ULONG*,WCHAR*,ULONG*); +static INT (WINAPI *pResolveLocaleName)(LPCWSTR,LPWSTR,INT); static void InitFunctionPointers(void) { @@ -139,6 +140,7 @@ static void InitFunctionPointers(void) X(GetNLSVersion); X(GetNLSVersionEx); X(IsValidNLSVersion); + X(ResolveLocaleName); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -7142,6 +7144,22 @@ static void test_EnumCalendarInfoExW(void) } } +static void test_ResolveLocaleName(void) +{ + WCHAR name[LOCALE_NAME_MAX_LENGTH]; + INT i; + + /* querying for 'eo' returns empty string '' on <=win8 and 'eo-001' on win10 */ + i = pResolveLocaleName( L"eo", name, LOCALE_NAME_MAX_LENGTH ); + ok( i, "ResolveLocaleName returned unexpected %d\n", i ); + + i = pResolveLocaleName( L"wi-NEHQ", name, LOCALE_NAME_MAX_LENGTH ); + ok( i == 1, "ResolveLocaleName returned unexpected %d\n", i ); + + i = pResolveLocaleName( L"wi-NEHQ", NULL, 0 ); + ok( i == 1, "ResolveLocaleName returned unexpected %d\n", i ); +} + START_TEST(locale) { InitFunctionPointers(); @@ -7198,4 +7216,5 @@ START_TEST(locale) test_EnumCalendarInfoW(); test_EnumCalendarInfoExA(); test_EnumCalendarInfoExW(); + test_ResolveLocaleName(); } diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 667d1a4dc65..79e60913182 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5621,8 +5621,10 @@ INT WINAPI DECLSPEC_HOTPATCH ResolveLocaleName( LPCWSTR name, LPWSTR buffer, INT { FIXME( "stub: %s, %p, %d\n", wine_dbgstr_w(name), buffer, len ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + if (buffer) + buffer[0] = 0; + + return 1; } -- 2.34.1

2 1

[PATCH v9 1/2] kernel32/tests: Test module refcounting with forwarded exports.
by Jinoh Kang 23 Jan '22

23 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v3 -> v4: - iatgas.h - LLVM(Clang), ARM, ARM64 support - Use __ASM_NAME macro - Don't fail test on MSVC - Don't end asm macros with "\n\t" v4 -> v5: - iatgas.h - mark idata sections as RO - loader.c - test for forward export itself v5 -> v6: - loader.c - Fix compilation warning in format string v6 -> v7: - forward4.c - fix building without MinGW v7 -> v8: - Also do GetProcAddress for forwarded ordinal exports - forward[1-3].c - Call DisableThreadLibraryCalls in DllMain - forward4.c: removed - iatgas.h: removed - sforward.c: new file - loader.c - test static forwarded import using shlwapi -> userenv forward v8 -> v9: - Test with iprop (documented as an ole32 forwarder in MSDN [1]) [1] https://docs.microsoft.com/en-us/windows/win32/api/coml2api/nf-coml2api-stg… dlls/iprop/Makefile.in | 1 + dlls/kernel32/tests/Makefile.in | 14 ++- dlls/kernel32/tests/forward1.c | 19 ++++ dlls/kernel32/tests/forward1.spec | 2 + dlls/kernel32/tests/forward2.c | 9 ++ dlls/kernel32/tests/forward2.spec | 2 + dlls/kernel32/tests/forward3.c | 9 ++ dlls/kernel32/tests/forward3.spec | 2 + dlls/kernel32/tests/loader.c | 182 ++++++++++++++++++++++++++++++ dlls/kernel32/tests/sforward.c | 16 +++ dlls/kernel32/tests/sforward.spec | 1 + 11 files changed, 255 insertions(+), 2 deletions(-) create mode 100644 dlls/kernel32/tests/forward1.c create mode 100644 dlls/kernel32/tests/forward1.spec create mode 100644 dlls/kernel32/tests/forward2.c create mode 100644 dlls/kernel32/tests/forward2.spec create mode 100644 dlls/kernel32/tests/forward3.c create mode 100644 dlls/kernel32/tests/forward3.spec create mode 100644 dlls/kernel32/tests/sforward.c create mode 100644 dlls/kernel32/tests/sforward.spec diff --git a/dlls/iprop/Makefile.in b/dlls/iprop/Makefile.in index e402cd0d4a9..709aebafe14 100644 --- a/dlls/iprop/Makefile.in +++ b/dlls/iprop/Makefile.in @@ -1 +1,2 @@ MODULE = iprop.dll +IMPORTLIB = iprop diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e9516603ce9..b453269273f 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -1,5 +1,7 @@ TESTDLL = kernel32.dll -IMPORTS = user32 advapi32 + +# iprop is for testing export forwarding (to ole32) +IMPORTS = user32 advapi32 iprop SOURCES = \ actctx.c \ @@ -37,4 +39,12 @@ SOURCES = \ toolhelp.c \ version.c \ virtual.c \ - volume.c + volume.c \ + forward1.c \ + forward1.spec \ + forward2.c \ + forward2.spec \ + forward3.c \ + forward3.spec \ + sforward.c \ + sforward.spec diff --git a/dlls/kernel32/tests/forward1.c b/dlls/kernel32/tests/forward1.c new file mode 100644 index 00000000000..6419d95eaea --- /dev/null +++ b/dlls/kernel32/tests/forward1.c @@ -0,0 +1,19 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} + +unsigned long forward_test_func(void) +{ + return 0x00005678UL; +} + +unsigned long forward_test_func2(void) +{ + return 0x12340000UL; +} diff --git a/dlls/kernel32/tests/forward1.spec b/dlls/kernel32/tests/forward1.spec new file mode 100644 index 00000000000..bf19fa7e011 --- /dev/null +++ b/dlls/kernel32/tests/forward1.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() +2 cdecl -noname forward_test_func2() diff --git a/dlls/kernel32/tests/forward2.c b/dlls/kernel32/tests/forward2.c new file mode 100644 index 00000000000..d1e77f45f3c --- /dev/null +++ b/dlls/kernel32/tests/forward2.c @@ -0,0 +1,9 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/forward2.spec b/dlls/kernel32/tests/forward2.spec new file mode 100644 index 00000000000..374156d8d06 --- /dev/null +++ b/dlls/kernel32/tests/forward2.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward1.forward_test_func +2 cdecl -noname forward_test_func2() forward1.#2 diff --git a/dlls/kernel32/tests/forward3.c b/dlls/kernel32/tests/forward3.c new file mode 100644 index 00000000000..d1e77f45f3c --- /dev/null +++ b/dlls/kernel32/tests/forward3.c @@ -0,0 +1,9 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/forward3.spec b/dlls/kernel32/tests/forward3.spec new file mode 100644 index 00000000000..31d019aa071 --- /dev/null +++ b/dlls/kernel32/tests/forward3.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward2.forward_test_func +2 cdecl -noname forward_test_func2() forward2.#2 diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f990d632f73..527f9f5157b 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1642,6 +1642,185 @@ static void test_ImportDescriptors(void) } } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + +static void test_static_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH], sforward_path[MAX_PATH]; + HMODULE ole32, iprop, sforward; + FARPROC test_func_stub; + + if (GetModuleHandleA( "ole32.dll" )) + { + skip("cannot test since ole32.dll is already loaded\n"); + return; + } + if (GetModuleHandleA( "iprop.dll" )) + { + skip("cannot test since iprop.dll is already loaded\n"); + return; + } + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( sforward_path, MAX_PATH, "%s\\sforward.dll", dir_path ); + extract_resource( "sforward.dll", "TESTDLL", sforward_path ); + + ole32 = LoadLibraryA( "ole32.dll" ); + ok( !!ole32, "couldn't find ole32.dll: %u\n", GetLastError() ); + iprop = LoadLibraryA( "iprop.dll" ); + ok( !!iprop, "couldn't find iprop.dll: %u\n", GetLastError() ); + sforward = LoadLibraryA( sforward_path ); + ok( !!sforward, "couldn't find %s: %u\n", sforward_path, GetLastError() ); + + test_func_stub = GetProcAddress( sforward, "test_func_stub" ); + ok( !!test_func_stub, "sforward!test_func_stub not found\n" ); + + FreeLibrary( ole32 ); + FreeLibrary( iprop ); + + todo_wine + ok( !!GetModuleHandleA( "ole32.dll" ), "ole32.dll unexpectedly unloaded\n" ); + ok( !!GetModuleHandleA( "iprop.dll" ), "iprop.dll unexpectedly unloaded\n" ); + + FreeLibrary( sforward ); + + ok( !GetModuleHandleA( "ole32.dll" ), "ole32.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "iprop.dll" ), "iprop.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "sforward.dll" ), "sforward.dll unexpectedly kept open\n" ); + + DeleteFileA( sforward_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + FARPROC proc1, proc2, proc3, oproc1, oproc2, oproc3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + proc1 = GetProcAddress(forward1, "forward_test_func"); + ok( !!proc1, "cannot resolve forward1!forward_test_func\n"); + proc2 = GetProcAddress(forward2, "forward_test_func"); + ok( !!proc2, "cannot resolve forward2!forward_test_func\n"); + proc3 = GetProcAddress(forward3, "forward_test_func"); + ok( !!proc3, "cannot resolve forward3!forward_test_func\n"); + ok( proc1 == proc3, "forward1!forward_test_func is not equal to forward3!forward_test_func\n"); + ok( proc2 == proc3, "forward2!forward_test_func is not equal to forward3!forward_test_func\n"); + + oproc1 = GetProcAddress(forward1, (LPSTR)2); + ok( !!oproc1, "cannot resolve forward1!#2 (forward_test_func2)\n"); + oproc2 = GetProcAddress(forward2, (LPSTR)2); + ok( !!oproc2, "cannot resolve forward2!#2 (forward_test_func2)\n"); + oproc3 = GetProcAddress(forward3, (LPSTR)2); + ok( !!oproc3, "cannot resolve forward3!#2 (forward_test_func2)\n"); + ok( oproc1 == oproc3, "forward1!forward_test_func2 is not equal to forward3!forward_test_func2\n"); + ok( oproc2 == oproc3, "forward2!forward_test_func2 is not equal to forward3!forward_test_func2\n"); + + FreeLibrary( forward1 ); + FreeLibrary( forward2 ); + + todo_wine + ok( !!GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly unloaded\n" ); + todo_wine + ok( !!GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly unloaded\n" ); + + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forward_export_norefs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + FreeLibrary( forward1 ); + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + FreeLibrary( forward2 ); + + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL is_dll) { HANDLE hfile, hmap; @@ -4119,9 +4298,12 @@ START_TEST(loader) return; } + test_static_forwarded_import_refs(); /* Must be first; other tests may load ole32.dll */ test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); + test_dynamic_forwarded_import_refs(); + test_dynamic_forward_export_norefs(); test_section_access(); test_import_resolution(); test_ExitProcess(); diff --git a/dlls/kernel32/tests/sforward.c b/dlls/kernel32/tests/sforward.c new file mode 100644 index 00000000000..91865b4834c --- /dev/null +++ b/dlls/kernel32/tests/sforward.c @@ -0,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <ole2.h> +#include <propidl.h> + +void test_func_stub(void) +{ + StgOpenPropStg(NULL, NULL, 0, 0, NULL); +} + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/sforward.spec b/dlls/kernel32/tests/sforward.spec new file mode 100644 index 00000000000..cb6d4add796 --- /dev/null +++ b/dlls/kernel32/tests/sforward.spec @@ -0,0 +1 @@ +@ cdecl test_func_stub() -- 2.31.1

2 3

[PATCH v2] Re-enabled Wide Character Case insensitive import handling
by Ben Shefte 23 Jan '22

23 Jan '22

From: Benjamin Shefte <support(a)neuwon.com> Fixes Regression from: Wine 6.21 https://bugs.winehq.org/show_bug.cgi?id=52446 Signed-off-by: Ben Shefte <shefben(a)gmail.com> --- dlls/ntdll/loader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..ec1fc556250 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -627,8 +627,14 @@ static WCHAR *append_dll_ext( const WCHAR *name ) static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import ) { const char *name = get_rva( mod->DllBase, import->Name ); - - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + WCHAR buffer[16]; + DWORD len = strlen(name); + + if (len * sizeof(WCHAR) >= sizeof(buffer)) + return; + ascii_to_unicode( buffer, name, len + 1 ); + + return !wcsicmp( buffer, L"ntdll.dll" ) || !wcsicmp( buffer, L"kernel32.dll" ); } /********************************************************************** -- 2.27.0

2 1

[PATCH] Re-enabled Wide Character Case insensitive import handling
by Ben Shefte 23 Jan '22

23 Jan '22

From: Benjamin Shefte <support(a)neuwon.com> Fixes Regression from: Wine 6.21 https://bugs.winehq.org/show_bug.cgi?id=52446 Signed-off-by: Ben Shefte <shefben(a)gmail.com> --- dlls/ntdll/loader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 362e1c66be5..ec1fc556250 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -627,8 +627,14 @@ static WCHAR *append_dll_ext( const WCHAR *name ) static BOOL is_import_dll_system( LDR_DATA_TABLE_ENTRY *mod, const IMAGE_IMPORT_DESCRIPTOR *import ) { const char *name = get_rva( mod->DllBase, import->Name ); - - return !strcmp( name, "ntdll.dll" ) || !strcmp( name, "kernel32.dll" ); + WCHAR buffer[16]; + DWORD len = strlen(name); + + if (len * sizeof(WCHAR) >= sizeof(buffer)) + continue; + ascii_to_unicode( buffer, name, len + 1 ); + + return !wcsicmp( buffer, L"ntdll.dll" ) || !wcsicmp( buffer, L"kernel32.dll" ); } /********************************************************************** -- 2.27.0

2 1

[PATCH 1/4] ntdll/unix: Zero-extend IP_TOS byte to INT.
by Jinoh Kang 23 Jan '22

23 Jan '22

The IP_TOS control data is 1 byte on Unix, but 4 bytes on Windows. Properly zero-extend the value instead of copying 3 bytes of garbage. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/socket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f82c7ae1ddf..71dfcdd1114 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -429,8 +429,9 @@ static int convert_control_headers(struct msghdr *hdr, WSABUF *control) #if defined(IP_TOS) case IP_TOS: { + INT tos = *(unsigned char *)CMSG_DATA(cmsg_unix); ptr = fill_control_message( WS_IPPROTO_IP, WS_IP_TOS, ptr, &ctlsize, - CMSG_DATA(cmsg_unix), sizeof(INT) ); + &tos, sizeof(INT) ); if (!ptr) goto error; break; } -- 2.31.1

3 14

version wine for android publish google play store
by Виртуалины MER user MER 22 Jan '22

22 Jan '22

Google play store in there appbundle

1 0

[PATCH] kernelbase: Improve stub for ResolveLocaleName.
by Louis Lenders 22 Jan '22

22 Jan '22

Fixes https://bugs.winehq.org/show_bug.cgi?id=52407 The current stub assumes a failing call to ResolveLocaleName returns 0, but tests show it returns 1 (and empty string). It actually never seems to returns 0. Added test is minimal to keep patch small, a few other traces of what the function returns can be seen on testbot here https://testbot.winehq.org/JobDetails.pl?Key=105651&f206=exe32.report#k206 and https://testbot.winehq.org/JobDetails.pl?Key=105651&f206=exe32.report&f207=… Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/tests/locale.c | 21 +++++++++++++++++++++ dlls/kernelbase/locale.c | 6 ++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 2d327b7130c..d02d5c63ae7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -99,6 +99,7 @@ static NTSTATUS (WINAPI *pRtlCustomCPToUnicodeN)(CPTABLEINFO*,WCHAR*,DWORD,DWORD static NTSTATUS (WINAPI *pRtlGetSystemPreferredUILanguages)(DWORD,ULONG,ULONG*,WCHAR*,ULONG*); static NTSTATUS (WINAPI *pRtlGetThreadPreferredUILanguages)(DWORD,ULONG*,WCHAR*,ULONG*); static NTSTATUS (WINAPI *pRtlGetUserPreferredUILanguages)(DWORD,ULONG,ULONG*,WCHAR*,ULONG*); +static INT (WINAPI *pResolveLocaleName)(LPCWSTR,LPWSTR,INT); static void InitFunctionPointers(void) { @@ -139,6 +140,7 @@ static void InitFunctionPointers(void) X(GetNLSVersion); X(GetNLSVersionEx); X(IsValidNLSVersion); + X(ResolveLocaleName); mod = GetModuleHandleA("ntdll"); X(RtlUpcaseUnicodeChar); @@ -7142,6 +7144,24 @@ static void test_EnumCalendarInfoExW(void) } } +static void test_ResolveLocaleName(void) +{ + WCHAR name[LOCALE_NAME_MAX_LENGTH]; + INT i; + + name[0] = 0; /* querying for 'eo' returns empty string '' on <=win8 and 'eo-001' on win10 */ + i = pResolveLocaleName( L"eo", name, LOCALE_NAME_MAX_LENGTH ); + ok( i, "ResolveLocaleName returned unexpected %d\n", i ); + + name[0] = 0; + i = pResolveLocaleName( L"wi-NEHQ", name, LOCALE_NAME_MAX_LENGTH ); + ok( i == 1, "ResolveLocaleName returned unexpected %d\n", i ); + + name[0] = 0; + i = pResolveLocaleName( L"wi-NEHQ", NULL, 0 ); + ok( i == 1, "ResolveLocaleName returned unexpected %d\n", i ); +} + START_TEST(locale) { InitFunctionPointers(); @@ -7198,4 +7218,5 @@ START_TEST(locale) test_EnumCalendarInfoW(); test_EnumCalendarInfoExA(); test_EnumCalendarInfoExW(); + test_ResolveLocaleName(); } diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 667d1a4dc65..79e60913182 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5621,8 +5621,10 @@ INT WINAPI DECLSPEC_HOTPATCH ResolveLocaleName( LPCWSTR name, LPWSTR buffer, INT { FIXME( "stub: %s, %p, %d\n", wine_dbgstr_w(name), buffer, len ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return 0; + if (buffer) + buffer[0] = 0; + + return 1; } -- 2.34.1

1 0

[PATCH resend] ws2_32: Fix setsockopt(TCP_NODELAY) when optlen is less than 4.
by Bastien Orivel 22 Jan '22

22 Jan '22

According to MSDN [1], the `TCP_NODELAY` parameter should be of type `BOOL` which is 4 bytes. Due to a bug [2] in rustc passing a byte instead of an int, any program written in rust that tries to set that option on a socket will fail with a "Invalid parameter supplied" error. Turns out that setsockopt on linux does not want optlen to be less than 4 bytes [3]. Windows' behavior is the following: - For optlen <= 0, return SOCKET_ERROR and set last error to WSAEFAULT - For optlen > 0, ignore the optlen value and set the TCP_NODELAY value to one if the first byte of the given optvalue is not 0. This will fix any rust program using the hyper library to do HTTP requests. [1]: https://docs.microsoft.com/en-us/windows/win32/winsock/ipproto-tcp-socket-o… [2]: https://github.com/rust-lang/rust/blob/44593aeb1387b1be355aeaf0040d5927bd80… [3]: https://github.com/torvalds/linux/blob/d58071a8a76d779eedab38033ae4c821c302… Signed-off-by: Bastien Orivel <eijebong(a)bananium.fr> --- dlls/ws2_32/socket.c | 10 ++++++-- dlls/ws2_32/tests/sock.c | 53 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fe7e4fb3464..e43d6c5d671 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2900,8 +2900,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case TCP_NODELAY: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, optval, optlen ); - + { + INT nodelay = *optval; + if (optlen <= 0) { + SetLastError(WSAEFAULT); + return SOCKET_ERROR; + } + return server_setsockopt( s, IOCTL_AFD_WINE_SET_TCP_NODELAY, (char*)&nodelay, sizeof(nodelay) ); + } default: FIXME("Unknown IPPROTO_TCP optname 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 054e597b719..042c743f95e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1259,6 +1259,59 @@ static void test_set_getsockopt(void) ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + /* TCP_NODELAY: optlen doesn't matter on windows, it should work with any positive value */ + size = sizeof(value); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 1); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 1\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 42); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 42\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(value == 1, "TCP_NODELAY should be 1\n"); + value = 0; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, sizeof(value)); + ok(!err, "Failed to reset TCP_NODELAY to 0\n"); + + value = 1; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 0); + ok(err == SOCKET_ERROR && WSAGetLastError() == WSAEFAULT, + "got %d with %d (expected SOCKET_ERROR with WSAEFAULT)\n", err, WSAGetLastError()); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + + value = 0x100; + err = setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, 4); + ok (!err, "setsockopt TCP_NODELAY failed with optlen == 4 and optvalue = 0x100\n"); + value = 0xff; + err = getsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char*)&value, &size); + ok(!err, "getsockopt TCP_NODELAY failed\n"); + ok(!value, "TCP_NODELAY should be 0\n"); + /* Test for erroneously passing a value instead of a pointer as optval */ size = sizeof(char); err = setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)1, size); -- 2.34.1

3 2

[PATCH v6 1/4] include: Define fast fail codes and the __fastfail() intrinsic.
by Jinoh Kang 22 Jan '22

22 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v5 -> v6: - Replace ULONG/ULONGLONG with ULONG_PTR for cross-architecture consistency. - Use machine-specific machine constraint ("c") for i386 and x86-64. - Merge i386 and x86-64 code. - "Prevent" taking address of __fastfail (just like MSVC exclusive intrinsic). - Remove erroneous preprocessor directive comments. - Don't repeat function declaration and epilogue. include/winnt.h | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index c80efee077d..34406853469 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -915,6 +915,108 @@ NTSYSAPI PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ NTSYSAPI WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER); +/* Fast fail (__fastfail) codes */ + +#define FAST_FAIL_LEGACY_GS_VIOLATION 0 +#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 +#define FAST_FAIL_CORRUPT_LIST_ENTRY 3 +#define FAST_FAIL_INCORRECT_STACK 4 +#define FAST_FAIL_INVALID_ARG 5 +#define FAST_FAIL_GS_COOKIE_INIT 6 +#define FAST_FAIL_FATAL_APP_EXIT 7 +#define FAST_FAIL_RANGE_CHECK_FAILURE 8 +#define FAST_FAIL_UNSAFE_REGISTRY_ACCESS 9 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE 10 +#define FAST_FAIL_GUARD_WRITE_CHECK_FAILURE 11 +#define FAST_FAIL_INVALID_FIBER_SWITCH 12 +#define FAST_FAIL_INVALID_SET_OF_CONTEXT 13 +#define FAST_FAIL_INVALID_REFERENCE_COUNT 14 +#define FAST_FAIL_INVALID_JUMP_BUFFER 18 +#define FAST_FAIL_MRDATA_MODIFIED 19 +#define FAST_FAIL_CERTIFICATION_FAILURE 20 +#define FAST_FAIL_INVALID_EXCEPTION_CHAIN 21 +#define FAST_FAIL_CRYPTO_LIBRARY 22 +#define FAST_FAIL_INVALID_CALL_IN_DLL_CALLOUT 23 +#define FAST_FAIL_INVALID_IMAGE_BASE 24 +#define FAST_FAIL_DLOAD_PROTECTION_FAILURE 25 +#define FAST_FAIL_UNSAFE_EXTENSION_CALL 26 +#define FAST_FAIL_DEPRECATED_SERVICE_INVOKED 27 +#define FAST_FAIL_INVALID_BUFFER_ACCESS 28 +#define FAST_FAIL_INVALID_BALANCED_TREE 29 +#define FAST_FAIL_INVALID_NEXT_THREAD 30 +#define FAST_FAIL_GUARD_ICALL_CHECK_SUPPRESSED 31 +#define FAST_FAIL_APCS_DISABLED 32 +#define FAST_FAIL_INVALID_IDLE_STATE 33 +#define FAST_FAIL_MRDATA_PROTECTION_FAILURE 34 +#define FAST_FAIL_UNEXPECTED_HEAP_EXCEPTION 35 +#define FAST_FAIL_INVALID_LOCK_STATE 36 +#define FAST_FAIL_GUARD_JUMPTABLE 37 +#define FAST_FAIL_INVALID_LONGJUMP_TARGET 38 +#define FAST_FAIL_INVALID_DISPATCH_CONTEXT 39 +#define FAST_FAIL_INVALID_THREAD 40 +#define FAST_FAIL_INVALID_SYSCALL_NUMBER 41 +#define FAST_FAIL_INVALID_FILE_OPERATION 42 +#define FAST_FAIL_LPAC_ACCESS_DENIED 43 +#define FAST_FAIL_GUARD_SS_FAILURE 44 +#define FAST_FAIL_LOADER_CONTINUITY_FAILURE 45 +#define FAST_FAIL_GUARD_EXPORT_SUPPRESSION_FAILURE 46 +#define FAST_FAIL_INVALID_CONTROL_STACK 47 +#define FAST_FAIL_SET_CONTEXT_DENIED 48 +#define FAST_FAIL_INVALID_IAT 49 +#define FAST_FAIL_HEAP_METADATA_CORRUPTION 50 +#define FAST_FAIL_PAYLOAD_RESTRICTION_VIOLATION 51 +#define FAST_FAIL_LOW_LABEL_ACCESS_DENIED 52 +#define FAST_FAIL_ENCLAVE_CALL_FAILURE 53 +#define FAST_FAIL_UNHANDLED_LSS_EXCEPTON 54 +#define FAST_FAIL_ADMINLESS_ACCESS_DENIED 55 +#define FAST_FAIL_UNEXPECTED_CALL 56 +#define FAST_FAIL_CONTROL_INVALID_RETURN_ADDRESS 57 +#define FAST_FAIL_UNEXPECTED_HOST_BEHAVIOR 58 +#define FAST_FAIL_FLAGS_CORRUPTION 59 +#define FAST_FAIL_VEH_CORRUPTION 60 +#define FAST_FAIL_ETW_CORRUPTION 61 +#define FAST_FAIL_RIO_ABORT 62 +#define FAST_FAIL_INVALID_PFN 63 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE_XFG 64 +#define FAST_FAIL_CAST_GUARD 65 +#define FAST_FAIL_HOST_VISIBILITY_CHANGE 66 +#define FAST_FAIL_KERNEL_CET_SHADOW_STACK_ASSIST 67 +#define FAST_FAIL_PATCH_CALLBACK_FAILED 68 +#define FAST_FAIL_NTDLL_PATCH_FAILED 69 +#define FAST_FAIL_INVALID_FLS_DATA 70 +#define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF + +#if defined(__GNUC__) +/* __fastfail is intentionally not declared static, so that taking the address + * of this function will fail on link due to unresolved symbol (just like MSVC). + */ +#ifdef __GNUC_GNU_INLINE__ +extern /* don't emit definition of this inline function */ +#endif +FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ +#if defined(__x86_64__) || defined(__i386__) + __asm__ __volatile__( "int $0x29" :: "c" ((ULONG_PTR)code) : "memory" ); +#elif defined(__aarch64__) + register ULONG_PTR val __asm__("x0") = code; + __asm__ __volatile__( "brk #0xf003" :: "r" (val) : "memory" ); +#elif defined(__arm__) + register ULONG_PTR val __asm__("r0") = code; + __asm__ __volatile__( "udf #0xfb" :: "r" (val) : "memory" ); +#else +#error __fastfail not defined for this architecture +#endif +#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) + __builtin_unreachable(); +#endif +} +#elif defined(_MSC_VER) && (_MSC_VER >= 1610) +DECLSPEC_NORETURN void __fastfail(unsigned int); +#pragma intrinsic(__fastfail) +#endif + + /* Heap flags */ #define HEAP_NO_SERIALIZE 0x00000001 -- 2.31.1

1 3

[RFC PATCH 00/11] Fix sock_recv reordering issue (#52401)
by Jinoh Kang 22 Jan '22

22 Jan '22

As discussed in https://www.winehq.org/pipermail/wine-devel/2022-January/204710.html, I converted my previous patch serie to use APCs instead of a new select op. "Talk is cheap. Show me the code." -Linus I was, well, the original proposer of the APC approach; now, this patch serie serves as my counterargument to this approach. I tried my best to minimize the complexity introduced by this patch serie; however, the APC approach resulted in net increase in the number of patches: - server: Add a helper function to trigger synchronous completion of I/O via APC_ASYNC_IO. - include: Add a helper function to test if a status indicates deferred completion. - server: Add helpers for synchronous APC delivery via ordinary server call reply. - server: Prevent I/O synchronous completion requests from firing APC interrupts if possible. - ntdll: Make server_select and server_wait accept extra "inline_apc" argument. - ntdll: Don't interrupt sock_recv with an I/O synchronous completion APC. The APC approach *did* enable code reuse of async_recv_proc, albeit with the following drawbacks: - We need to modify async_recv_proc anyway. - Deferring the synchronous I/O to the APC callback makes the synchronous I/O code flow much less obvious. (Implicit call flow: sock_recv -> async_recv_proc -> sock_recv) In the meantime, the following patches are common to both approaches: - ntdll: Don't call try_recv before server call in sock_recv. - server: Replace redundant recv_socket status fields with force_async boolean field. Further notes are placed in each patch. As always, feedbacks welcome. Jinoh Kang (11): server: Allow calling async_handoff() with status code STATUS_ALERTED. server: Add a helper function to trigger synchronous completion of I/O via APC_ASYNC_IO. include: Add a helper function to test if a status indicates deferred completion. server: Attempt to complete I/O request immediately in recv_socket. server: Add helpers for synchronous APC delivery via ordinary server call reply. server: Prevent I/O synchronous completion requests from firing APC interrupts if possible. ntdll: Make server_select and server_wait accept extra "inline_apc" argument. ntdll: Add a helper to process APC and wait for async in one function call. ntdll: Don't interrupt sock_recv with an I/O synchronous completion APC. ntdll: Don't call try_recv before server call in sock_recv. server: Replace redundant recv_socket status fields with force_async boolean field. dlls/ntdll/unix/server.c | 16 ++++++---- dlls/ntdll/unix/socket.c | 33 ++++++++------------- dlls/ntdll/unix/sync.c | 29 ++++++++++++++---- dlls/ntdll/unix/thread.c | 4 +-- dlls/ntdll/unix/unix_private.h | 6 ++-- dlls/ws2_32/tests/sock.c | 8 ++--- include/wine/afd.h | 17 +++++++++++ include/wine/async.h | 46 +++++++++++++++++++++++++++++ server/async.c | 32 +++++++++++++++++++- server/file.h | 1 + server/protocol.def | 11 +++++-- server/request.h | 4 +-- server/sock.c | 54 ++++++++++++++++++++++++++-------- server/thread.c | 44 +++++++++++++++++++++++++++ server/thread.h | 3 ++ server/trace.c | 19 ++++++++++++ tools/make_requests | 1 + 17 files changed, 273 insertions(+), 55 deletions(-) create mode 100644 include/wine/async.h -- 2.31.1

1 12

[PATCH v9 1/3] ntdll: sock_recv keeps message ordered
by Dongwan Kim 22 Jan '22

22 Jan '22

Calling try_recv could make messages misordered. Suppose that a server program calls a overlapped WSARecv and its operation is pending. Another program sends a message and wineserver is busy. The server program calls another overlapped WSARecv and it intercepts the message for the pending WSARecv. The problem already had been discussed here https://www.winehq.org/pipermail/wine-devel/2021-May/186612.html To avoid this situation, this kind of approach can be applied. The server program needs to know if there are pending asyncs before calling try_recv. Signed-off-by: Dongwan Kim <kdw6485(a)gmail.com> --- dlls/ntdll/unix/socket.c | 20 +++++++++++++++++++- include/wine/server_protocol.h | 16 ++++++++++++++++ server/request.h | 7 +++++++ server/sock.c | 26 ++++++++++++++++++++++++++ server/trace.c | 13 +++++++++++++ 5 files changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f82c7ae1ddf..8823e99901b 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -673,6 +673,21 @@ static BOOL async_recv_proc( void *user, ULONG_PTR *info, NTSTATUS *status ) release_fileio( &async->io ); return TRUE; } +static int query_asyncs_queued( HANDLE sock, int type ) +{ + int result=0; + + SERVER_START_REQ( query_async_waiting ) + { + req->handle = wine_server_obj_handle( sock ); + req->type = type; + wine_server_call(req); + result = reply->state; + } + SERVER_END_REQ; + return result; + +} static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, int fd, const void *buffers_ptr, unsigned int count, WSABUF *control, @@ -735,7 +750,10 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi } } - status = try_recv( fd, async, &information ); + if( force_async && query_asyncs_queued( handle , ASYNC_TYPE_READ )) + status = STATUS_DEVICE_NOT_READY; + else + status = try_recv( fd, async, &information ); if (status != STATUS_SUCCESS && status != STATUS_BUFFER_OVERFLOW && status != STATUS_DEVICE_NOT_READY) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 1d17a40530f..104e3b4cd3c 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5404,7 +5404,20 @@ struct get_next_thread_reply obj_handle_t handle; char __pad_12[4]; }; +struct query_async_waiting_request +{ + struct request_header __header; + obj_handle_t handle; + int type; + char __pad_20[4]; +}; +struct query_async_waiting_reply +{ + struct reply_header __header; + int state; + char __pad_12[4]; +}; enum request { @@ -5682,6 +5695,7 @@ enum request REQ_suspend_process, REQ_resume_process, REQ_get_next_thread, + REQ_query_async_waiting, REQ_NB_REQUESTS }; @@ -5963,6 +5977,7 @@ union generic_request struct suspend_process_request suspend_process_request; struct resume_process_request resume_process_request; struct get_next_thread_request get_next_thread_request; + struct query_async_waiting_request query_async_waiting_request; }; union generic_reply { @@ -6242,6 +6257,7 @@ union generic_reply struct suspend_process_reply suspend_process_reply; struct resume_process_reply resume_process_reply; struct get_next_thread_reply get_next_thread_reply; + struct query_async_waiting_reply query_async_waiting_reply; }; /* ### protocol_version begin ### */ diff --git a/server/request.h b/server/request.h index 3c455799d54..e26dbaae0f3 100644 --- a/server/request.h +++ b/server/request.h @@ -393,6 +393,7 @@ DECL_HANDLER(terminate_job); DECL_HANDLER(suspend_process); DECL_HANDLER(resume_process); DECL_HANDLER(get_next_thread); +DECL_HANDLER(query_async_waiting); #ifdef WANT_REQUEST_HANDLERS @@ -673,6 +674,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_suspend_process, (req_handler)req_resume_process, (req_handler)req_get_next_thread, + (req_handler)req_query_async_waiting, }; C_ASSERT( sizeof(abstime_t) == 8 ); @@ -2244,6 +2246,11 @@ C_ASSERT( FIELD_OFFSET(struct get_next_thread_request, flags) == 28 ); C_ASSERT( sizeof(struct get_next_thread_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct get_next_thread_reply, handle) == 8 ); C_ASSERT( sizeof(struct get_next_thread_reply) == 16 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_request, type) == 16 ); +C_ASSERT( sizeof(struct query_async_waiting_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct query_async_waiting_reply, state) == 8 ); +C_ASSERT( sizeof(struct query_async_waiting_reply) == 16 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/sock.c b/server/sock.c index 2df4f3d3056..d3e3b4cd847 100644 --- a/server/sock.c +++ b/server/sock.c @@ -3520,3 +3520,29 @@ DECL_HANDLER(send_socket) } release_object( sock ); } + +DECL_HANDLER( query_async_waiting ) +{ + struct sock *sock; + struct async *async; + reply->state = 0; + + if (!(sock = (struct sock *)get_handle_obj( current->process, req->handle, + FILE_READ_ATTRIBUTES, &sock_ops))) return; + if (get_unix_fd( sock->fd ) == -1) return; + + if (is_fd_overlapped( sock->fd )) + { + if(req->type == ASYNC_TYPE_READ && ( async = find_pending_async(&sock->read_q) )) { + reply->state = 1; + release_object(async); + } + if(req->type == ASYNC_TYPE_WRITE && ( async = find_pending_async(&sock->write_q )) ) + { + reply->state = 1; + release_object(async); + } + } + release_object( &sock->obj ); + +} diff --git a/server/trace.c b/server/trace.c index a48f00258fe..32f236b2b5a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4516,6 +4516,16 @@ static void dump_get_next_thread_reply( const struct get_next_thread_reply *req { fprintf( stderr, " handle=%04x", req->handle ); } +static void dump_query_async_waiting_request( const struct query_async_waiting_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", type=%d", req->type ); +} +static void dump_query_async_waiting_reply( const struct query_async_waiting_reply *req ) +{ + fprintf( stderr, " state=%d", req->state ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, @@ -4792,6 +4802,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_suspend_process_request, (dump_func)dump_resume_process_request, (dump_func)dump_get_next_thread_request, + (dump_func)dump_query_async_waiting_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -5069,6 +5080,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, (dump_func)dump_get_next_thread_reply, + (dump_func)dump_query_async_waiting_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -5346,6 +5358,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "suspend_process", "resume_process", "get_next_thread", + "query_async_waiting", }; static const struct -- 2.30.2

2 3

[PATCH] wdscore: Implement CurrentIP.
by Mohamad Al-Jaf 22 Jan '22

22 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51850 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- Based on this: https://bugs.winehq.org/show_bug.cgi?id=51850#c6 --- dlls/wdscore/Makefile.in | 3 +++ dlls/wdscore/main.c | 45 +++++++++++++++++++++++++++++++++++++++ dlls/wdscore/wdscore.spec | 2 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 dlls/wdscore/main.c diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 20ba1d3b1c9..2020e72c7bb 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,3 +1,6 @@ MODULE = wdscore.dll EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/main.c b/dlls/wdscore/main.c new file mode 100644 index 00000000000..78309ac561d --- /dev/null +++ b/dlls/wdscore/main.c @@ -0,0 +1,45 @@ +/* + * Copyright 2021 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdint.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/asm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wdscore); + +uint32_t get_ip(); +__ASM_GLOBAL_FUNC( get_ip, + "mov 0(%esp), %eax\n\t" + "ret\n\t" ) + + +/*********************************************************************** + * CurrentIP (wdscore.@) + */ +int WINAPI CurrentIP() +{ + uint32_t ip; + + ip = get_ip(); + return ip; +} \ No newline at end of file diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index 15958b86aba..8b6febe6b3b 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -71,7 +71,7 @@ @ stub ConstructPartialMsgIfW @ stub ConstructPartialMsgVA @ stub ConstructPartialMsgVW -@ stub CurrentIP +@ stdcall CurrentIP() @ stub EndMajorTask @ stub EndMinorTask @ stub GetMajorTask -- 2.34.1

10 25

[PATCH] widl: Allow optional interface parameter on the [activatable] attribute.
by Rémi Bernon 22 Jan '22

22 Jan '22

From: Bernhard Kölbl <besentv(a)gmail.com> As per MIDL 3.0. Needed for some WinRT runtime classes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/parser.y | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fa863921c92..a945d0f2fca 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -278,6 +278,7 @@ static typelib_t *current_typelib; %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const %type <expr> contract_req %type <expr> static_attr +%type <expr> activatable_attr %type <type> delegatedef %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list @@ -580,8 +581,14 @@ static_attr: decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTER $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); } +activatable_attr: + decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) + error_loc("type %s is not an interface\n", $1->type->name); + $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); + | contract_req { $$ = $1; } /* activatable on the default activation factory */ + attribute: { $$ = NULL; } - | tACTIVATABLE '(' contract_req ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } + | tACTIVATABLE '(' activatable_attr ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } -- 2.34.1

2 1

[PATCH v2] widl: Allow optional interface parameter on the [activatable] attribute.
by Rémi Bernon 22 Jan '22

22 Jan '22

From: Bernhard Kölbl <besentv(a)gmail.com> As per MIDL 3.0. Needed for some WinRT runtime classes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Borked the v1 while fixing up the tabs, oops... tools/widl/parser.y | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fa863921c92..6ee527da926 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -278,6 +278,7 @@ static typelib_t *current_typelib; %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const %type <expr> contract_req %type <expr> static_attr +%type <expr> activatable_attr %type <type> delegatedef %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list @@ -580,8 +581,15 @@ static_attr: decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTER $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); } +activatable_attr: + decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) + error_loc("type %s is not an interface\n", $1->type->name); + $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); + } + | contract_req { $$ = $1; } /* activatable on the default activation factory */ + attribute: { $$ = NULL; } - | tACTIVATABLE '(' contract_req ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } + | tACTIVATABLE '(' activatable_attr ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } -- 2.34.1

1 0

[PATCH 3/3] msdasql/tests: Test for ITransaction* interfaces on a session
by Alistair Leslie-Hughes 21 Jan '22

21 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/tests/provider.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index dfe3e3af886..ce3573fbfd7 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -409,6 +409,9 @@ static void test_sessions(void) IGetDataSource *datasource = NULL; ISessionProperties *session_props = NULL; IUnknown *unimplemented = NULL; + ITransaction *transaction = NULL; + ITransactionLocal *local = NULL; + ITransactionObject *object = NULL; ITransactionJoin *join = NULL; IUnknown *cmd = NULL; HRESULT hr; @@ -463,6 +466,19 @@ static void test_sessions(void) IDBProperties_Release(dsource); IGetDataSource_Release(datasource); + hr = IUnknown_QueryInterface(session, &IID_ITransaction, (void**)&transaction); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + ITransaction_Release(transaction); + + hr = IUnknown_QueryInterface(session, &IID_ITransactionLocal, (void**)&local); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + if(hr == S_OK) + ITransactionLocal_Release(local); + + hr = IUnknown_QueryInterface(session, &IID_ITransactionObject, (void**)&object); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(session, &IID_ITransactionJoin, (void**)&join); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if(hr == S_OK) -- 2.34.1

1 0

[PATCH 2/3] include: Add trnobj.idl
by Alistair Leslie-Hughes 21 Jan '22

21 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnobj.idl | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 include/trnobj.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index e6ddf9b4885..6ce50209940 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1796,3 +1796,17 @@ HRESULT __RPC_STUB ITransactionLocal_StartTransaction_Stub(ITransactionLocal* Th FIXME("(%p)->(%d, 0x%08x, %p, %p, %p): stub\n", This, level, flags, options, trans_level, info); return E_NOTIMPL; } + +HRESULT CALLBACK ITransactionObject_GetTransactionObject_Proxy(ITransactionObject* This, + ULONG level, ITransaction **transaction) +{ + FIXME("(%p)->(%d, 0x%08x, %p): stub\n", This, level, transaction); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionObject_GetTransactionObject_Stub(ITransactionObject* This, + ULONG level, ITransaction **transaction, IErrorInfo **info) +{ + FIXME("(%p)->(%d, 0x%08x, %p, %p): stub\n", This, level, transaction, info); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index b965bdb9917..7fcf5f0ba7b 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -718,6 +718,7 @@ SOURCES = \ transact.idl \ trnjoi.idl \ trnlcl.idl \ + trnobj.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index d7e56f222e6..ce8aa74138a 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -82,6 +82,7 @@ typedef LONG_PTR DB_LRESERVE; #include "transact.idl" #include "trnjoi.idl" #include "trnlcl.idl" +#include "trnobj.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnobj.idl b/include/trnobj.idl new file mode 100644 index 00000000000..f33aaaf384e --- /dev/null +++ b/include/trnobj.idl @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2022 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a60-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionObject : IUnknown { + + [local] + HRESULT GetTransactionObject([in] ULONG level, [out] ITransaction **transaction); + + [call_as(GetTransactionObject)] + HRESULT RemoteGetTransactionObject([in] ULONG level, [out] ITransaction **transaction, [out] IErrorInfo **info); +} -- 2.34.1

1 0

[PATCH 1/3] include: Add trnlcl.idl
by Alistair Leslie-Hughes 21 Jan '22

21 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdaps/usrmarshal.c | 27 ++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/trnlcl.idl | 41 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 include/trnlcl.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index dc0f2261096..e6ddf9b4885 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1769,3 +1769,30 @@ HRESULT CALLBACK ITransactionJoin_JoinTransaction_Proxy(ITransactionJoin* This, FIXME("(%p)->(%p, %d, 0x%08x, %p): stub\n", This, unk, level, flags, options); return E_NOTIMPL; } + +HRESULT __RPC_STUB ITransactionLocal_GetOptionsObject_Stub(ITransactionLocal* This, + ITransactionOptions **options, IErrorInfo **info) +{ + FIXME("(%p)->(%p, %p): stub\n", This, options, info); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionLocal_GetOptionsObject_Proxy(ITransactionLocal* This, ITransactionOptions **options) +{ + FIXME("(%p)->(%p): stub\n", This, options); + return E_NOTIMPL; +} + +HRESULT CALLBACK ITransactionLocal_StartTransaction_Proxy(ITransactionLocal* This, ISOLEVEL level, + ULONG flags, ITransactionOptions *options, ULONG *trans_level) +{ + FIXME("(%p)->(%d, 0x%08x, %p, %p): stub\n", This, level, flags, options, trans_level); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB ITransactionLocal_StartTransaction_Stub(ITransactionLocal* This, ISOLEVEL level, + ULONG flags, ITransactionOptions *options, ULONG *trans_level, IErrorInfo **info) +{ + FIXME("(%p)->(%d, 0x%08x, %p, %p, %p): stub\n", This, level, flags, options, trans_level, info); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index e5ae8429ed0..b965bdb9917 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -717,6 +717,7 @@ SOURCES = \ traffic.h \ transact.idl \ trnjoi.idl \ + trnlcl.idl \ twain.h \ txcoord.idl \ txdtc.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index abd4d55069c..d7e56f222e6 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -81,6 +81,7 @@ typedef LONG_PTR DB_LRESERVE; #include "mulres.idl" #include "transact.idl" #include "trnjoi.idl" +#include "trnlcl.idl" #include "cmdwpr.idl" cpp_quote("#include <accctrl.h>") diff --git a/include/trnlcl.idl b/include/trnlcl.idl new file mode 100644 index 00000000000..5224997b38f --- /dev/null +++ b/include/trnlcl.idl @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2022 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a5f-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface ITransactionLocal : ITransaction +{ + [local] + HRESULT GetOptionsObject([out] ITransactionOptions **options); + + [call_as(GetOptionsObject)] + HRESULT RemoteGetOptionsObject([out] ITransactionOptions **options, [out] IErrorInfo **info); + + [local] + HRESULT StartTransaction([in] ISOLEVEL level, [in] ULONG flags, [in] ITransactionOptions *options, [out] ULONG *trans_level); + + [call_as(StartTransaction)] + HRESULT RemoteStartTransaction([in] ISOLEVEL level, [in] ULONG flags, [in] ITransactionOptions *options, + [in, out] ULONG *trans_level, [out] IErrorInfo **info); +} -- 2.34.1

1 0

[PATCH 0/5] winemac.drv: New ClipCursor implementation
by Tim Clem 21 Jan '22

21 Jan '22

The Mac driver has historically used session-wide CGEventTaps to implement ClipCursor. In macOS Mojave, such event taps started requiring Accessibility permission from the user. That's problematic on two levels: First, it's a hassle. Unlike, say, microphone permissions, the user can't just click "Approve" on a dialog box. Instead they have to go to the System Preferences app, enter their password, and click a checkbox (which will have the name of the preloader). This is especially bad because ClipCursor is frequently called by fullscreen games, which means the permission prompt will be hidden. Second, many apps misbehave if ClipCursor fails. For instance, some Unity games (e.g. Raft, The Forest) exhibit erratic mouse movement in that case. But apps are likely to end up in that state since Accessibility permission is deny-by-default and there is no blocking call to check for the permission. The attempt to install an event tap immediately fails until the permission is granted. As of 10.13, there is an undocumented NSWindow method -setMouseConfinementRect: that is in many ways a better option. It does not support certain uncommon scenarios (clipping to regions outside of a window), but it is far simpler and requires fewer workarounds than the event tap. It also does not require permission from the user. This series of patches factors the existing clipping code out of cocoa_app.m into its own class. It then adds a second implementation of that interface that uses -setMouseConfinementRect:. Finally it enables that approach by default in 10.13+, adding a registry key to enable the old behavior if needed. I'd welcome any feedback or suggestions. If you know of any apps that clip the cursor to a region outside of a single frontmost window, I'd also love to hear about those. Tim Clem (5): winemac.drv: Factor out cursor clipping code to its own class. winemac.drv: Create a protocol to represent a cursor clipping handler. winemac.drv: Factor common cursor clipping methods into functions. winemac.drv: Add a cursor clipping implementation using -setMouseConfinementRect:. winemac.drv: Use -setMouseConfinementRect: for cursor clipping by default. dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/cocoa_app.h | 11 +- dlls/winemac.drv/cocoa_app.m | 333 ++-------------- dlls/winemac.drv/cocoa_cursorclipping.h | 73 ++++ dlls/winemac.drv/cocoa_cursorclipping.m | 510 ++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/macdrv_main.c | 4 + 7 files changed, 626 insertions(+), 307 deletions(-) create mode 100644 dlls/winemac.drv/cocoa_cursorclipping.h create mode 100644 dlls/winemac.drv/cocoa_cursorclipping.m -- 2.34.1

2 6

[PATCH 4/4] dmsynth: Implement SetMasterClock() for the sink
by Michael Stefaniuc 21 Jan '22

21 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 7 +++---- dlls/dmsynth/synthsink.c | 12 +++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 22d020992b8..2a2e88c8e88 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -72,13 +72,12 @@ struct IDirectMusicSynth8Impl { * IDirectMusicSynthSinkImpl implementation structure */ struct IDirectMusicSynthSinkImpl { - /* IUnknown fields */ IDirectMusicSynthSink IDirectMusicSynthSink_iface; IKsControl IKsControl_iface; LONG ref; - - /* IDirectMusicSynthSinkImpl fields */ - IReferenceClock* latency_clock; + IReferenceClock *latency_clock; + IReferenceClock *master_clock; + BOOL active; }; /********************************************************************** diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 46011eae27a..72fd671a415 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -81,6 +81,8 @@ static ULONG WINAPI IDirectMusicSynthSinkImpl_Release(IDirectMusicSynthSink *ifa if (!ref) { if (This->latency_clock) IReferenceClock_Release(This->latency_clock); + if (This->master_clock) + IReferenceClock_Release(This->master_clock); HeapFree(GetProcessHeap(), 0, This); DMSYNTH_UnlockModule(); } @@ -104,7 +106,15 @@ static HRESULT WINAPI IDirectMusicSynthSinkImpl_SetMasterClock(IDirectMusicSynth { IDirectMusicSynthSinkImpl *This = impl_from_IDirectMusicSynthSink(iface); - FIXME("(%p)->(%p): stub\n", This, clock); + TRACE("(%p)->(%p)\n", This, clock); + + if (!clock) + return E_POINTER; + if (This->active) + return E_FAIL; + + IReferenceClock_AddRef(clock); + This->master_clock = clock; return S_OK; } -- 2.31.1

1 0

[PATCH 3/4] dmusic: The synth port needs to get the latency clock from the synth
by Michael Stefaniuc 21 Jan '22

21 Jan '22

and not reimplement it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Well, from the Sink but via the Synth. dlls/dmusic/port.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index fb807e7871a..31b3b764e02 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -35,7 +35,6 @@ struct synth_port { IDirectMusic8Impl *parent; IDirectSound *dsound; IDirectSoundBuffer *dsbuffer; - IReferenceClock *pLatencyClock; IDirectMusicSynth *synth; IDirectMusicSynthSink *synth_sink; BOOL active; @@ -200,7 +199,6 @@ static ULONG WINAPI synth_port_Release(IDirectMusicPort *iface) IDirectMusicSynth_Close(This->synth); IDirectMusicSynth_Release(This->synth); IDirectMusicSynthSink_Release(This->synth_sink); - IReferenceClock_Release(This->pLatencyClock); if (This->dsbuffer) IDirectSoundBuffer_Release(This->dsbuffer); if (This->dsound) @@ -372,10 +370,7 @@ static HRESULT WINAPI synth_port_GetLatencyClock(IDirectMusicPort *iface, IRefer TRACE("(%p/%p)->(%p)\n", iface, This, clock); - *clock = This->pLatencyClock; - IReferenceClock_AddRef(*clock); - - return S_OK; + return IDirectMusicSynth8_GetLatencyClock(This->synth, clock); } static HRESULT WINAPI synth_port_GetRunningStats(IDirectMusicPort *iface, DMUS_SYNTHSTATS *stats) @@ -840,15 +835,8 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param obj->params = *port_params; obj->caps = *port_caps; - hr = DMUSIC_CreateReferenceClockImpl(&IID_IReferenceClock, (LPVOID*)&obj->pLatencyClock, NULL); - if (hr != S_OK) - { - HeapFree(GetProcessHeap(), 0, obj); - return hr; - } - - if (SUCCEEDED(hr)) - hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (void**)&obj->synth); + hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, + (void **)&obj->synth); if (SUCCEEDED(hr)) hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (void**)&obj->synth_sink); @@ -898,8 +886,6 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param IDirectMusicSynth_Release(obj->synth); if (obj->synth_sink) IDirectMusicSynthSink_Release(obj->synth_sink); - if (obj->pLatencyClock) - IReferenceClock_Release(obj->pLatencyClock); HeapFree(GetProcessHeap(), 0, obj); return hr; -- 2.31.1

1 0

[PATCH 2/4] dmusic: Send the master clock to the synth and not a latency clock
by Michael Stefaniuc 21 Jan '22

21 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index a17e399ee17..fb807e7871a 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -857,7 +857,7 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param hr = IDirectMusicSynth_SetSynthSink(obj->synth, obj->synth_sink); if (SUCCEEDED(hr)) - hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); + hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->parent->master_clock); if (SUCCEEDED(hr)) hr = IDirectMusicSynth_Open(obj->synth, port_params); -- 2.31.1

1 0

[PATCH 1/4] dmusic/tests: Fix an object leak
by Michael Stefaniuc 21 Jan '22

21 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index c7de6c5326e..cf648228a43 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -553,6 +553,8 @@ static void test_COM_synthport(void) ok(hr == E_NOINTERFACE, "QueryInterface for IID_IReferenceClock failed: %08x\n", hr); while (IDirectMusicPort_Release(port)); + refcount = IDirectMusic_Release(dmusic); + ok(!refcount, "Got outstanding refcount %d.\n", refcount); } struct chunk { -- 2.31.1

1 0

[PATCH vkd3d v2 1/2] vkd3d: Use the resource's stored format in d3d12_command_list_CopyTextureRegion().
by Conor McCarthy 21 Jan '22

21 Jan '22

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 73ba226a..2cf1eba2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3562,18 +3562,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic assert(d3d12_resource_is_texture(dst_resource)); assert(d3d12_resource_is_texture(src_resource)); - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", dst_resource->desc.Format); - return; - } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &src_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", src_resource->desc.Format); - return; - } + dst_format = dst_resource->format; + src_format = src_resource->format; if ((dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) && (dst_format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) -- 2.34.1

2 3

[PATCH] comctl32/listview: Add partial implementation of LVM_GETNEXTITEMINDEX.
by Nikolay Sivov 21 Jan '22

21 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listview.c | 14 ++++++++++++++ dlls/comctl32/tests/listview.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 044e64bfa53..4176fb72c63 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7452,6 +7452,17 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF return -1; } +static BOOL LISTVIEW_GetNextItemIndex(const LISTVIEW_INFO *infoPtr, LVITEMINDEX *index, UINT flags) +{ + /* FIXME: specified item group is ignored */ + + if (!index) + return FALSE; + + index->iItem = LISTVIEW_GetNextItem(infoPtr, index->iItem, flags); + return index->iItem != -1; +} + /* LISTVIEW_GetNumberOfWorkAreas */ /*** @@ -11426,6 +11437,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_GETNEXTITEM: return LISTVIEW_GetNextItem(infoPtr, (INT)wParam, LOWORD(lParam)); + case LVM_GETNEXTITEMINDEX: + return LISTVIEW_GetNextItemIndex(infoPtr, (LVITEMINDEX *)wParam, lParam); + case LVM_GETNUMBEROFWORKAREAS: FIXME("LVM_GETNUMBEROFWORKAREAS: unimplemented\n"); return 1; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e95b81f5bb1..5b40cea1fce 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6624,6 +6624,37 @@ static void test_selected_column(void) } } +static void test_LVM_GETNEXTITEMINDEX(void) +{ + LVITEMINDEX index; + HWND hwnd; + BOOL ret; + + hwnd = create_listview_control(LVS_REPORT); + + insert_item(hwnd, 0); + insert_item(hwnd, 1); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEMINDEX, 0, LVNI_ALL); + ok(!ret, "Unexpected return value %d.\n", ret); + + index.iItem = -1; + index.iGroup = 0; + ret = SendMessageA(hwnd, LVM_GETNEXTITEMINDEX, (WPARAM)&index, LVNI_ALL); + ok(ret, "Unexpected return value %d.\n", ret); + ok(index.iItem == 0, "Unexpected item index %d.\n", index.iItem); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEMINDEX, (WPARAM)&index, LVNI_ALL); + ok(ret, "Unexpected return value %d.\n", ret); + ok(index.iItem == 1, "Unexpected item index %d.\n", index.iItem); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEMINDEX, (WPARAM)&index, LVNI_ALL); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(index.iItem == -1, "Unexpected item index %d.\n", index.iItem); + + DestroyWindow(hwnd); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6730,6 +6761,7 @@ START_TEST(listview) test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); test_selected_column(); + test_LVM_GETNEXTITEMINDEX(); unload_v6_module(ctx_cookie, hCtx); -- 2.34.1

1 0

[PATCH] msi: Use custom action name for MsiBreak handling.
by Hans Leidekker 21 Jan '22

21 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50433 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/custom.c | 31 ++++++++++++++----------------- dlls/msi/winemsi.idl | 4 ++-- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 19ad3917265..ee4f59b5faa 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -449,21 +449,15 @@ static msi_custom_action_info *find_action_by_guid( const GUID *guid ) return info; } -static void handle_msi_break(LPCSTR target) +static void handle_msi_break( const WCHAR *action ) { - char format[] = "To debug your custom action, attach your debugger to " - "process %i (0x%X) and press OK"; - char val[MAX_PATH]; - char msg[100]; + const WCHAR fmt[] = L"To debug your custom action, attach your debugger to process %u (0x%x) and press OK"; + WCHAR val[MAX_PATH], msg[100]; - if (!GetEnvironmentVariableA("MsiBreak", val, MAX_PATH)) - return; + if (!GetEnvironmentVariableW( L"MsiBreak", val, MAX_PATH ) || wcscmp( val, action )) return; - if (strcmp(val, target)) - return; - - sprintf(msg, format, GetCurrentProcessId(), GetCurrentProcessId()); - MessageBoxA(NULL, msg, "Windows Installer", MB_OK); + swprintf( msg, ARRAY_SIZE(msg), fmt, GetCurrentProcessId(), GetCurrentProcessId() ); + MessageBoxW( NULL, msg, L"Windows Installer", MB_OK ); DebugBreak(); } @@ -497,7 +491,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) RPC_WSTR binding_str; MSIHANDLE hPackage; RPC_STATUS status; - LPWSTR dll = NULL; + WCHAR *dll = NULL, *action = NULL; LPSTR proc = NULL; HANDLE hModule; INT type; @@ -525,7 +519,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) RpcStringFreeW(&binding_str); } - r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package); + r = remote_GetActionInfo(guid, &action, &type, &dll, &proc, &remote_package); if (r != ERROR_SUCCESS) return r; @@ -533,6 +527,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) if (!hPackage) { ERR( "failed to create handle for %x\n", remote_package ); + midl_user_free( action ); midl_user_free( dll ); midl_user_free( proc ); return ERROR_INSTALL_FAILURE; @@ -542,6 +537,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) if (!hModule) { ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + midl_user_free( action ); midl_user_free( dll ); midl_user_free( proc ); MsiCloseHandle( hPackage ); @@ -552,7 +548,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) if (!fn) WARN( "GetProcAddress(%s) failed\n", debugstr_a(proc) ); else { - handle_msi_break(proc); + handle_msi_break(action); __TRY { @@ -569,11 +565,11 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) FreeLibrary(hModule); + midl_user_free(action); midl_user_free(dll); midl_user_free(proc); MsiCloseAllHandles(); - return r; } @@ -1612,7 +1608,7 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package) LeaveCriticalSection( &msi_custom_action_cs ); } -UINT __cdecl s_remote_GetActionInfo(const GUID *guid, int *type, LPWSTR *dll, LPSTR *func, MSIHANDLE *hinst) +UINT __cdecl s_remote_GetActionInfo(const GUID *guid, WCHAR **name, int *type, WCHAR **dll, char **func, MSIHANDLE *hinst) { msi_custom_action_info *info; @@ -1620,6 +1616,7 @@ UINT __cdecl s_remote_GetActionInfo(const GUID *guid, int *type, LPWSTR *dll, LP if (!info) return ERROR_INVALID_DATA; + *name = strdupW(info->action); *type = info->type; *hinst = alloc_msihandle(&info->package->hdr); *dll = strdupW(info->source); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 7888b0ceb40..e9f0f9e6e59 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -105,7 +105,7 @@ interface IWineMsiRemote UINT remote_EnumComponentCosts( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR component, [in] DWORD index, [in] INSTALLSTATE state, [out, string, size_is(3)] LPWSTR drive, [out] INT *cost, [out] INT *temp ); - UINT remote_GetActionInfo( [in] const GUID *guid, [out] int *type, [out, string] LPWSTR *dllname, - [out, string] LPSTR *function, [out] MSIHANDLE *hinst ); + UINT remote_GetActionInfo( [in] const GUID *guid, [out, string] WCHAR **action, [out] int *type, [out, string] WCHAR **dllname, + [out, string] char **function, [out] MSIHANDLE *hinst ); UINT remote_CloseHandle( [in] MSIHANDLE handle ); } -- 2.30.2

1 0

[PATCH 5/5] wined3d: Acquire references to shader resource views for command lists by inspecting CS packets.
by Henri Verbeet 21 Jan '22

21 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index cae6e238ed0..914941d18ae 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3558,6 +3558,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEWS: + { + struct wined3d_cs_set_shader_resource_views *op; + + op = (struct wined3d_cs_set_shader_resource_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->views[i]) + wined3d_shader_resource_view_decref(op->views[i]); + } + break; + } + default: break; } @@ -3634,6 +3647,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEWS: + { + struct wined3d_cs_set_shader_resource_views *op; + + op = (struct wined3d_cs_set_shader_resource_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->views[i]) + wined3d_shader_resource_view_incref(op->views[i]); + } + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 4/5] wined3d: Acquire references to render-target views for command lists by inspecting CS packets.
by Henri Verbeet 21 Jan '22

21 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7e3237e2543..cae6e238ed0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3545,6 +3545,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_RENDERTARGET_VIEWS: + { + struct wined3d_cs_set_rendertarget_views *op; + + op = (struct wined3d_cs_set_rendertarget_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->views[i]) + wined3d_rendertarget_view_decref(op->views[i]); + } + break; + } + default: break; } @@ -3608,6 +3621,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_RENDERTARGET_VIEWS: + { + struct wined3d_cs_set_rendertarget_views *op; + + op = (struct wined3d_cs_set_rendertarget_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->views[i]) + wined3d_rendertarget_view_incref(op->views[i]); + } + break; + } + default: break; } -- 2.30.2

1 0

[PATCH 3/5] wined3d: Acquire blend state references for command lists by inspecting CS packets.
by Henri Verbeet 21 Jan '22

21 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 68 ++++++++++------------------------ dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 20 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 00be0776323..7e3237e2543 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -63,9 +63,6 @@ struct wined3d_command_list SIZE_T query_count; struct wined3d_deferred_query_issue *queries; - - SIZE_T blend_state_count; - struct wined3d_blend_state **blend_states; }; static void invalidate_client_address(struct wined3d_resource *resource) @@ -541,12 +538,6 @@ static inline void wined3d_device_context_acquire_resource(struct wined3d_device context->ops->acquire_resource(context, resource); } -static inline void wined3d_device_context_acquire_blend_state(struct wined3d_device_context *context, - struct wined3d_blend_state *blend_state) -{ - context->ops->acquire_blend_state(context, blend_state); -} - static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1801,8 +1792,6 @@ void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context * op->factor = *blend_factor; op->sample_mask = sample_mask; - if (state) - wined3d_device_context_acquire_blend_state(context, state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2929,11 +2918,6 @@ static void wined3d_cs_acquire_resource(struct wined3d_device_context *context, wined3d_resource_acquire(resource); } -static void wined3d_cs_acquire_blend_state(struct wined3d_device_context *context, - struct wined3d_blend_state *blend_state) -{ -} - static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3171,7 +3155,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_flush, wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, - wined3d_cs_acquire_blend_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3300,7 +3283,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_flush, wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, - wined3d_cs_acquire_blend_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3553,6 +3535,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_BLEND_STATE: + { + struct wined3d_cs_set_blend_state *op; + + op = (struct wined3d_cs_set_blend_state *)packet->data; + if (op->state) + wined3d_blend_state_decref(op->state); + break; + } + default: break; } @@ -3606,6 +3598,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_BLEND_STATE: + { + struct wined3d_cs_set_blend_state *op; + + op = (struct wined3d_cs_set_blend_state *)packet->data; + if (op->state) + wined3d_blend_state_incref(op->state); + break; + } + default: break; } @@ -3632,9 +3634,6 @@ struct wined3d_deferred_context SIZE_T query_count, queries_capacity; struct wined3d_deferred_query_issue *queries; - - SIZE_T blend_state_count, blend_states_capacity; - struct wined3d_blend_state **blend_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3835,18 +3834,6 @@ static void wined3d_deferred_context_acquire_command_list(struct wined3d_device_ wined3d_command_list_incref(deferred->command_lists[deferred->command_list_count++] = list); } -static void wined3d_deferred_context_acquire_blend_state(struct wined3d_device_context *context, - struct wined3d_blend_state *blend_state) -{ - struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - if (!wined3d_array_reserve((void **)&deferred->blend_states, &deferred->blend_states_capacity, - deferred->blend_state_count + 1, sizeof(*deferred->blend_states))) - return; - - deferred->blend_states[deferred->blend_state_count++] = blend_state; - wined3d_blend_state_incref(blend_state); -} - static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3859,7 +3846,6 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_flush, wined3d_deferred_context_acquire_resource, wined3d_deferred_context_acquire_command_list, - wined3d_deferred_context_acquire_blend_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3918,10 +3904,6 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_query_decref(deferred->queries[i].query); heap_free(deferred->queries); - for (i = 0; i < deferred->blend_state_count; ++i) - wined3d_blend_state_decref(deferred->blend_states[i]); - heap_free(deferred->blend_states); - while (offset < deferred->data_size) { packet = wined3d_next_cs_packet(deferred->data, &offset); @@ -3947,7 +3929,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->upload_count * sizeof(*object->uploads) + deferred->command_list_count * sizeof(*object->command_lists) + deferred->query_count * sizeof(*object->queries) - + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->data_size); if (!memory) @@ -3987,12 +3968,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->queries, deferred->queries, deferred->query_count * sizeof(*object->queries)); /* Transfer our references to the queries to the command list. */ - object->blend_states = memory; - memory = &object->blend_states[deferred->blend_state_count]; - object->blend_state_count = deferred->blend_state_count; - memcpy(object->blend_states, deferred->blend_states, deferred->blend_state_count * sizeof(*object->blend_states)); - /* Transfer our references to the blend states to the command list. */ - object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4002,7 +3977,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->upload_count = 0; deferred->command_list_count = 0; deferred->query_count = 0; - deferred->blend_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4058,8 +4032,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_resource_decref(list->uploads[i].resource); for (i = 0; i < list->query_count; ++i) wined3d_query_decref(list->queries[i].query); - for (i = 0; i < list->blend_state_count; ++i) - wined3d_blend_state_decref(list->blend_states[i]); offset = 0; while (offset < list->data_size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 822c3324b3f..e297169b6e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4874,7 +4874,6 @@ struct wined3d_device_context_ops void (*flush)(struct wined3d_device_context *context); void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); - void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); }; struct wined3d_device_context -- 2.30.2

1 0

[PATCH 2/5] wined3d: Acquire rasterizer state references for command lists by inspecting CS packets.
by Henri Verbeet 21 Jan '22

21 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 69 ++++++++++------------------------ dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 20 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0132af721ef..00be0776323 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -66,9 +66,6 @@ struct wined3d_command_list SIZE_T blend_state_count; struct wined3d_blend_state **blend_states; - - SIZE_T rasterizer_state_count; - struct wined3d_rasterizer_state **rasterizer_states; }; static void invalidate_client_address(struct wined3d_resource *resource) @@ -550,12 +547,6 @@ static inline void wined3d_device_context_acquire_blend_state(struct wined3d_dev context->ops->acquire_blend_state(context, blend_state); } -static inline void wined3d_device_context_acquire_rasterizer_state(struct wined3d_device_context *context, - struct wined3d_rasterizer_state *rasterizer_state) -{ - context->ops->acquire_rasterizer_state(context, rasterizer_state); -} - static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1859,8 +1850,6 @@ void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_cont op->opcode = WINED3D_CS_OP_SET_RASTERIZER_STATE; op->state = rasterizer_state; - if (rasterizer_state) - wined3d_device_context_acquire_rasterizer_state(context, rasterizer_state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2945,11 +2934,6 @@ static void wined3d_cs_acquire_blend_state(struct wined3d_device_context *contex { } -static void wined3d_cs_acquire_rasterizer_state(struct wined3d_device_context *context, - struct wined3d_rasterizer_state *rasterizer_state) -{ -} - static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3188,7 +3172,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, - wined3d_cs_acquire_rasterizer_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3318,7 +3301,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, - wined3d_cs_acquire_rasterizer_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3561,6 +3543,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_RASTERIZER_STATE: + { + struct wined3d_cs_set_rasterizer_state *op; + + op = (struct wined3d_cs_set_rasterizer_state *)packet->data; + if (op->state) + wined3d_rasterizer_state_decref(op->state); + break; + } + default: break; } @@ -3604,6 +3596,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_RASTERIZER_STATE: + { + struct wined3d_cs_set_rasterizer_state *op; + + op = (struct wined3d_cs_set_rasterizer_state *)packet->data; + if (op->state) + wined3d_rasterizer_state_incref(op->state); + break; + } + default: break; } @@ -3633,9 +3635,6 @@ struct wined3d_deferred_context SIZE_T blend_state_count, blend_states_capacity; struct wined3d_blend_state **blend_states; - - SIZE_T rasterizer_state_count, rasterizer_states_capacity; - struct wined3d_rasterizer_state **rasterizer_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3848,18 +3847,6 @@ static void wined3d_deferred_context_acquire_blend_state(struct wined3d_device_c wined3d_blend_state_incref(blend_state); } -static void wined3d_deferred_context_acquire_rasterizer_state(struct wined3d_device_context *context, - struct wined3d_rasterizer_state *rasterizer_state) -{ - struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - if (!wined3d_array_reserve((void **)&deferred->rasterizer_states, &deferred->rasterizer_states_capacity, - deferred->rasterizer_state_count + 1, sizeof(*deferred->rasterizer_states))) - return; - - deferred->rasterizer_states[deferred->rasterizer_state_count++] = rasterizer_state; - wined3d_rasterizer_state_incref(rasterizer_state); -} - static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3873,7 +3860,6 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_resource, wined3d_deferred_context_acquire_command_list, wined3d_deferred_context_acquire_blend_state, - wined3d_deferred_context_acquire_rasterizer_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3936,10 +3922,6 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_blend_state_decref(deferred->blend_states[i]); heap_free(deferred->blend_states); - for (i = 0; i < deferred->rasterizer_state_count; ++i) - wined3d_rasterizer_state_decref(deferred->rasterizer_states[i]); - heap_free(deferred->rasterizer_states); - while (offset < deferred->data_size) { packet = wined3d_next_cs_packet(deferred->data, &offset); @@ -3966,7 +3948,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->command_list_count * sizeof(*object->command_lists) + deferred->query_count * sizeof(*object->queries) + deferred->blend_state_count * sizeof(*object->blend_states) - + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->data_size); if (!memory) @@ -4012,13 +3993,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->blend_states, deferred->blend_states, deferred->blend_state_count * sizeof(*object->blend_states)); /* Transfer our references to the blend states to the command list. */ - object->rasterizer_states = memory; - memory = &object->rasterizer_states[deferred->rasterizer_state_count]; - object->rasterizer_state_count = deferred->rasterizer_state_count; - memcpy(object->rasterizer_states, deferred->rasterizer_states, - deferred->rasterizer_state_count * sizeof(*object->rasterizer_states)); - /* Transfer our references to the rasterizer states to the command list. */ - object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4029,7 +4003,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->command_list_count = 0; deferred->query_count = 0; deferred->blend_state_count = 0; - deferred->rasterizer_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4087,8 +4060,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_query_decref(list->queries[i].query); for (i = 0; i < list->blend_state_count; ++i) wined3d_blend_state_decref(list->blend_states[i]); - for (i = 0; i < list->rasterizer_state_count; ++i) - wined3d_rasterizer_state_decref(list->rasterizer_states[i]); offset = 0; while (offset < list->data_size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b8596ba9d7..822c3324b3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4875,8 +4875,6 @@ struct wined3d_device_context_ops void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); - void (*acquire_rasterizer_state)(struct wined3d_device_context *context, - struct wined3d_rasterizer_state *rasterizer_state); }; struct wined3d_device_context -- 2.30.2

1 0

[PATCH 1/5] wined3d: Acquire depth/stencil state references for command lists by inspecting CS packets.
by Henri Verbeet 21 Jan '22

21 Jan '22

From: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 69 ++++++++++------------------------ dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 20 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 009ad561be7..0132af721ef 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -69,9 +69,6 @@ struct wined3d_command_list SIZE_T rasterizer_state_count; struct wined3d_rasterizer_state **rasterizer_states; - - SIZE_T depth_stencil_state_count; - struct wined3d_depth_stencil_state **depth_stencil_states; }; static void invalidate_client_address(struct wined3d_resource *resource) @@ -559,12 +556,6 @@ static inline void wined3d_device_context_acquire_rasterizer_state(struct wined3 context->ops->acquire_rasterizer_state(context, rasterizer_state); } -static inline void wined3d_device_context_acquire_depth_stencil_state(struct wined3d_device_context *context, - struct wined3d_depth_stencil_state *depth_stencil_state) -{ - context->ops->acquire_depth_stencil_state(context, depth_stencil_state); -} - static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1848,8 +1839,6 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c op->state = state; op->stencil_ref = stencil_ref; - if (state) - wined3d_device_context_acquire_depth_stencil_state(context, state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2961,11 +2950,6 @@ static void wined3d_cs_acquire_rasterizer_state(struct wined3d_device_context *c { } -static void wined3d_cs_acquire_depth_stencil_state(struct wined3d_device_context *context, - struct wined3d_depth_stencil_state *depth_stencil_state) -{ -} - static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3205,7 +3189,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, - wined3d_cs_acquire_depth_stencil_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3336,7 +3319,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, - wined3d_cs_acquire_depth_stencil_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3569,6 +3551,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_DEPTH_STENCIL_STATE: + { + struct wined3d_cs_set_depth_stencil_state *op; + + op = (struct wined3d_cs_set_depth_stencil_state *)packet->data; + if (op->state) + wined3d_depth_stencil_state_decref(op->state); + break; + } + default: break; } @@ -3602,6 +3594,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_DEPTH_STENCIL_STATE: + { + struct wined3d_cs_set_depth_stencil_state *op; + + op = (struct wined3d_cs_set_depth_stencil_state *)packet->data; + if (op->state) + wined3d_depth_stencil_state_incref(op->state); + break; + } + default: break; } @@ -3634,9 +3636,6 @@ struct wined3d_deferred_context SIZE_T rasterizer_state_count, rasterizer_states_capacity; struct wined3d_rasterizer_state **rasterizer_states; - - SIZE_T depth_stencil_state_count, depth_stencil_states_capacity; - struct wined3d_depth_stencil_state **depth_stencil_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3861,18 +3860,6 @@ static void wined3d_deferred_context_acquire_rasterizer_state(struct wined3d_dev wined3d_rasterizer_state_incref(rasterizer_state); } -static void wined3d_deferred_context_acquire_depth_stencil_state(struct wined3d_device_context *context, - struct wined3d_depth_stencil_state *depth_stencil_state) -{ - struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - if (!wined3d_array_reserve((void **)&deferred->depth_stencil_states, &deferred->depth_stencil_states_capacity, - deferred->depth_stencil_state_count + 1, sizeof(*deferred->depth_stencil_states))) - return; - - deferred->depth_stencil_states[deferred->depth_stencil_state_count++] = depth_stencil_state; - wined3d_depth_stencil_state_incref(depth_stencil_state); -} - static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3887,7 +3874,6 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_command_list, wined3d_deferred_context_acquire_blend_state, wined3d_deferred_context_acquire_rasterizer_state, - wined3d_deferred_context_acquire_depth_stencil_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3954,10 +3940,6 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_rasterizer_state_decref(deferred->rasterizer_states[i]); heap_free(deferred->rasterizer_states); - for (i = 0; i < deferred->depth_stencil_state_count; ++i) - wined3d_depth_stencil_state_decref(deferred->depth_stencil_states[i]); - heap_free(deferred->depth_stencil_states); - while (offset < deferred->data_size) { packet = wined3d_next_cs_packet(deferred->data, &offset); @@ -3985,7 +3967,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->query_count * sizeof(*object->queries) + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) - + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) + deferred->data_size); if (!memory) @@ -4038,13 +4019,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->rasterizer_state_count * sizeof(*object->rasterizer_states)); /* Transfer our references to the rasterizer states to the command list. */ - object->depth_stencil_states = memory; - memory = &object->depth_stencil_states[deferred->depth_stencil_state_count]; - object->depth_stencil_state_count = deferred->depth_stencil_state_count; - memcpy(object->depth_stencil_states, deferred->depth_stencil_states, - deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states)); - /* Transfer our references to the depth stencil states to the command list. */ - object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4056,7 +4030,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->query_count = 0; deferred->blend_state_count = 0; deferred->rasterizer_state_count = 0; - deferred->depth_stencil_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4116,8 +4089,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_blend_state_decref(list->blend_states[i]); for (i = 0; i < list->rasterizer_state_count; ++i) wined3d_rasterizer_state_decref(list->rasterizer_states[i]); - for (i = 0; i < list->depth_stencil_state_count; ++i) - wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); offset = 0; while (offset < list->data_size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c9d83b3fbc7..2b8596ba9d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4877,8 +4877,6 @@ struct wined3d_device_context_ops void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); void (*acquire_rasterizer_state)(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state); - void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, - struct wined3d_depth_stencil_state *depth_stencil_state); }; struct wined3d_device_context -- 2.30.2

1 0

[PATCH] d3d8/tests: Accept new WARP test failure in test_updatetexture().
by Stefan Dösinger 21 Jan '22

21 Jan '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Just like b7eeab900f38ae67e7a63c0f46c61201a3753215 in d3d9. --- dlls/d3d8/tests/visual.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 3c61426e17f..1f188340fc6 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6767,7 +6767,7 @@ static void test_updatetexture(void) UINT dst_width, dst_height; UINT src_levels, dst_levels; D3DFORMAT src_format, dst_format; - BOOL broken; + BOOL broken_result, broken_updatetex; } tests[] = { @@ -6785,7 +6785,8 @@ static void test_updatetexture(void) * one or something like that). */ /* {8, 8, 7, 7, 4, 2, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */ {8, 8, 8, 8, 1, 4, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, /* 8 */ - {4, 4, 8, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, /* 9 */ + /* For this one UpdateTexture() returns failure on WARP on > Win 10 1709. */ + {4, 4, 8, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, TRUE}, /* 9 */ /* This one causes weird behavior on Windows (it probably writes out * of the texture memory). */ /* {8, 8, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */ @@ -7012,7 +7013,8 @@ static void test_updatetexture(void) hr = IDirect3DDevice8_UpdateTexture(device, src, dst); if (FAILED(hr)) { - todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u, %u.\n", hr, t, i); + todo_wine ok(SUCCEEDED(hr) || broken(tests[i].broken_updatetex), + "Failed to update texture, hr %#x, case %u, %u.\n", hr, t, i); IDirect3DBaseTexture8_Release(src); IDirect3DBaseTexture8_Release(dst); continue; @@ -7036,7 +7038,7 @@ static void test_updatetexture(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken) + ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken_result) || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); } -- 2.34.1

2 1

[PATCH 1/3] d3d9/tests: Accept Nvidia results in test_sample_mask as broken.
by Stefan Dösinger 21 Jan '22

21 Jan '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f4aa45f91fa..89f9e9cf2c6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -26911,7 +26911,15 @@ static void test_sample_mask(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); get_rt_readback(rt, &rb); colour = get_readback_color(&rb, 64, 64); - ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); + /* Multiple generations of Nvidia cards return broken results. + * A mask with no bits or all bits set produce the expected results (0x00 / 0xff), + * but any other mask behaves almost as if the result is 0.5 + (enabled / total) + * samples. It's not quite that though (you'd expect 0xbf or 0xc0 instead of 0xbc). + * + * I looked at a few other possible problems: Incorrectly enabled Z test, alpha test, + * culling, the multisample mask affecting CopyRects. Neither of these make a difference. */ + ok(color_match(colour, 0xffff8080, 1) || broken(color_match(colour, 0xffffbcbc, 1)), + "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); hr = IDirect3DDevice9_EndScene(device); -- 2.24.3 (Apple Git-128)

2 5

[PATCH vkd3d 2/2] vkd3d: Map copy queues to compute queues if necessary and supported.
by Conor McCarthy 21 Jan '22

21 Jan '22

In cases where there is only one or a small number of direct queues, mapping copy to compute may prevent a fence deadlock caused by sending a wait and signal to the same Vk queue. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/device.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index ce570ffe..6d2f30ea 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1767,8 +1767,18 @@ static HRESULT vkd3d_select_queues(const struct vkd3d_instance *vkd3d_instance, } if (info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] == ~0u) { - info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; - info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT]; + if ((info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE].queueFlags & VK_QUEUE_TRANSFER_BIT) + && info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE].queueCount + >= info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT].queueCount) + { + info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_COMPUTE]; + info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE]; + } + else + { + info->family_index[VKD3D_QUEUE_FAMILY_TRANSFER] = info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; + info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER] = info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT]; + } } /* Compact the array. */ -- 2.34.1

1 0

[PATCH vkd3d 1/2] vkd3d: Use all available command queues.
by Conor McCarthy 21 Jan '22

21 Jan '22

Deadlock will occur if a fence GPU wait is queued and then the fence is signalled on the same queue. Mapping multiple D3D12 queues to one Vk queue can cause this scenario. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 21 ++++-- libs/vkd3d/device.c | 138 ++++++++++++++++++++++++++++--------- libs/vkd3d/vkd3d_private.h | 15 ++-- 3 files changed, 129 insertions(+), 45 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2cf1eba2..9ec2c1b2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -23,7 +23,8 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence); HRESULT vkd3d_queue_create(struct d3d12_device *device, - uint32_t family_index, const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue) + uint32_t family_index, const VkQueueFamilyProperties *properties, + struct vkd3d_queue_array *queue_array, uint32_t queue_index) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_queue *object; @@ -52,11 +53,11 @@ HRESULT vkd3d_queue_create(struct d3d12_device *device, memset(object->old_vk_semaphores, 0, sizeof(object->old_vk_semaphores)); - VK_CALL(vkGetDeviceQueue(device->vk_device, family_index, 0, &object->vk_queue)); + VK_CALL(vkGetDeviceQueue(device->vk_device, family_index, queue_index, &object->vk_queue)); TRACE("Created queue %p for queue family index %u.\n", object, family_index); - *queue = object; + queue_array->queues[queue_index] = object; return S_OK; } @@ -1729,17 +1730,23 @@ static struct d3d12_command_allocator *unsafe_impl_from_ID3D12CommandAllocator(I return impl_from_ID3D12CommandAllocator(iface); } +static struct vkd3d_queue *d3d12_device_get_next_vkd3d_queue(struct vkd3d_queue_array *queue_array) +{ + unsigned int i = (unsigned int)(InterlockedIncrement(&queue_array->index) - 1) % queue_array->count; + return queue_array->queues[i]; +} + struct vkd3d_queue *d3d12_device_get_vkd3d_queue(struct d3d12_device *device, D3D12_COMMAND_LIST_TYPE type) { switch (type) { case D3D12_COMMAND_LIST_TYPE_DIRECT: - return device->direct_queue; + return d3d12_device_get_next_vkd3d_queue(device->direct_queues); case D3D12_COMMAND_LIST_TYPE_COMPUTE: - return device->compute_queue; + return d3d12_device_get_next_vkd3d_queue(device->compute_queues); case D3D12_COMMAND_LIST_TYPE_COPY: - return device->copy_queue; + return d3d12_device_get_next_vkd3d_queue(device->copy_queues); default: FIXME("Unhandled command list type %#x.\n", type); return NULL; @@ -1759,7 +1766,7 @@ static HRESULT d3d12_command_allocator_init(struct d3d12_command_allocator *allo return hr; if (!(queue = d3d12_device_get_vkd3d_queue(device, type))) - queue = device->direct_queue; + queue = device->direct_queues->queues[0]; allocator->ID3D12CommandAllocator_iface.lpVtbl = &d3d12_command_allocator_vtbl; allocator->refcount = 1; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4bcb5efc..ce570ffe 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1594,19 +1594,67 @@ struct vkd3d_device_queue_info VkDeviceQueueCreateInfo vk_queue_create_info[VKD3D_QUEUE_FAMILY_COUNT]; }; +static void vkd3d_queue_array_cleanup(struct vkd3d_queue_array *queue_array, struct d3d12_device *device) +{ + unsigned int i; + + if (!queue_array) + return; + + for (i = 0; i < queue_array->count; ++i) + vkd3d_queue_destroy(queue_array->queues[i], device); + vkd3d_free(queue_array); +} + static void d3d12_device_destroy_vkd3d_queues(struct d3d12_device *device) { - if (device->direct_queue) - vkd3d_queue_destroy(device->direct_queue, device); - if (device->compute_queue && device->compute_queue != device->direct_queue) - vkd3d_queue_destroy(device->compute_queue, device); - if (device->copy_queue && device->copy_queue != device->direct_queue - && device->copy_queue != device->compute_queue) - vkd3d_queue_destroy(device->copy_queue, device); - - device->direct_queue = NULL; - device->compute_queue = NULL; - device->copy_queue = NULL; + vkd3d_queue_array_cleanup(device->direct_queues, device); + if (device->compute_queues != device->direct_queues) + vkd3d_queue_array_cleanup(device->compute_queues, device); + if (device->copy_queues != device->direct_queues && device->copy_queues != device->compute_queues) + vkd3d_queue_array_cleanup(device->copy_queues, device); + + device->direct_queues = NULL; + device->compute_queues = NULL; + device->copy_queues = NULL; +} + +static HRESULT d3d12_device_create_family_queue_array(struct d3d12_device *device, + const struct vkd3d_device_queue_info *queue_info, enum vkd3d_queue_family family, + struct vkd3d_queue_array **queue_array_ptr) +{ + unsigned int family_index = queue_info->family_index[family]; + struct vkd3d_queue_array *queue_array; + unsigned int i; + HRESULT hr; + + if (!(queue_array = vkd3d_calloc(1, sizeof(*queue_array) + queue_info->vk_properties[family].queueCount + * sizeof(queue_array->queues[0])))) + return E_OUTOFMEMORY; + + queue_array->count = queue_info->vk_properties[family].queueCount; + + for (i = 0; i < queue_array->count; ++i) + { + if (SUCCEEDED(hr = vkd3d_queue_create(device, family_index, + &queue_info->vk_properties[family], queue_array, i))) + continue; + + if (!i) + { + vkd3d_free(queue_array); + return hr; + } + + WARN("Failed to create queue of family %#x at index %u.\n", family, i); + queue_array->count = i; + break; + } + + device->queue_family_indices[device->queue_family_count++] = family_index; + *queue_array_ptr = queue_array; + + return S_OK; } static HRESULT d3d12_device_create_vkd3d_queues(struct d3d12_device *device, @@ -1617,38 +1665,32 @@ static HRESULT d3d12_device_create_vkd3d_queues(struct d3d12_device *device, uint32_t direct_family_index = queue_info->family_index[VKD3D_QUEUE_FAMILY_DIRECT]; HRESULT hr; - device->direct_queue = NULL; - device->compute_queue = NULL; - device->copy_queue = NULL; + device->direct_queues = NULL; + device->compute_queues = NULL; + device->copy_queues = NULL; device->queue_family_count = 0; memset(device->queue_family_indices, 0, sizeof(device->queue_family_indices)); - if (SUCCEEDED((hr = vkd3d_queue_create(device, direct_family_index, - &queue_info->vk_properties[VKD3D_QUEUE_FAMILY_DIRECT], &device->direct_queue)))) - device->queue_family_indices[device->queue_family_count++] = direct_family_index; - else + if (FAILED(hr = d3d12_device_create_family_queue_array(device, queue_info, VKD3D_QUEUE_FAMILY_DIRECT, + &device->direct_queues))) goto out_destroy_queues; if (compute_family_index == direct_family_index) - device->compute_queue = device->direct_queue; - else if (SUCCEEDED(hr = vkd3d_queue_create(device, compute_family_index, - &queue_info->vk_properties[VKD3D_QUEUE_FAMILY_COMPUTE], &device->compute_queue))) - device->queue_family_indices[device->queue_family_count++] = compute_family_index; - else + device->compute_queues = device->direct_queues; + else if (FAILED(hr = d3d12_device_create_family_queue_array(device, queue_info, VKD3D_QUEUE_FAMILY_COMPUTE, + &device->compute_queues))) goto out_destroy_queues; if (transfer_family_index == direct_family_index) - device->copy_queue = device->direct_queue; + device->copy_queues = device->direct_queues; else if (transfer_family_index == compute_family_index) - device->copy_queue = device->compute_queue; - else if (SUCCEEDED(hr = vkd3d_queue_create(device, transfer_family_index, - &queue_info->vk_properties[VKD3D_QUEUE_FAMILY_TRANSFER], &device->copy_queue))) - device->queue_family_indices[device->queue_family_count++] = transfer_family_index; - else + device->copy_queues = device->compute_queues; + else if (FAILED(hr = d3d12_device_create_family_queue_array(device, queue_info, VKD3D_QUEUE_FAMILY_TRANSFER, + &device->copy_queues))) goto out_destroy_queues; - device->feature_options3.CopyQueueTimestampQueriesSupported = !!device->copy_queue->timestamp_bits; + device->feature_options3.CopyQueueTimestampQueriesSupported = !!device->copy_queues->queues[0]->timestamp_bits; return S_OK; @@ -1657,8 +1699,6 @@ out_destroy_queues: return hr; } -static float queue_priorities[] = {1.0f}; - static HRESULT vkd3d_select_queues(const struct vkd3d_instance *vkd3d_instance, VkPhysicalDevice physical_device, struct vkd3d_device_queue_info *info) { @@ -1707,8 +1747,8 @@ static HRESULT vkd3d_select_queues(const struct vkd3d_instance *vkd3d_instance, queue_info->pNext = NULL; queue_info->flags = 0; queue_info->queueFamilyIndex = i; - queue_info->queueCount = 1; /* FIXME: Use multiple queues. */ - queue_info->pQueuePriorities = queue_priorities; + queue_info->queueCount = queue_properties[i].queueCount; + queue_info->pQueuePriorities = NULL; } vkd3d_free(queue_properties); @@ -1767,6 +1807,29 @@ static bool d3d12_is_64k_msaa_supported(struct d3d12_device *device) && info.Alignment <= 0x10000; } +static bool vkd3d_queue_priorities_init(struct vkd3d_device_queue_info *queue_info) +{ + unsigned int i, max_count; + float *queue_priorities; + + for (i = 0, max_count = 0; i < queue_info->vk_family_count; ++i) + max_count = max(max_count, queue_info->vk_queue_create_info[i].queueCount); + if (!(queue_priorities = vkd3d_malloc(max_count * sizeof(*queue_priorities)))) + return false; + for (i = 0; i < max_count; ++i) + queue_priorities[i] = 1.0f; + + for (i = 0; i < queue_info->vk_family_count; ++i) + queue_info->vk_queue_create_info[i].pQueuePriorities = queue_priorities; + + return true; +} + +static void vkd3d_queue_priorities_cleanup(const struct vkd3d_device_queue_info *queue_info) +{ + vkd3d_free((float *)queue_info->vk_queue_create_info[0].pQueuePriorities); +} + static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, const struct vkd3d_device_create_info *create_info) { @@ -1839,8 +1902,15 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, device_info.pEnabledFeatures = &physical_device_info.features2.features; vkd3d_free(user_extension_supported); + if (!vkd3d_queue_priorities_init(&device_queue_info)) + { + vkd3d_free(extensions); + return E_OUTOFMEMORY; + } + vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device)); vkd3d_free(extensions); + vkd3d_queue_priorities_cleanup(&device_queue_info); if (vr < 0) { ERR("Failed to create Vulkan device, vr %d.\n", vr); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 136b0203..ec80d983 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1063,9 +1063,16 @@ struct vkd3d_queue VkSemaphore old_vk_semaphores[VKD3D_MAX_VK_SYNC_OBJECTS]; }; +struct vkd3d_queue_array +{ + LONG index; + unsigned int count; + struct vkd3d_queue *queues[]; +}; + VkQueue vkd3d_queue_acquire(struct vkd3d_queue *queue); HRESULT vkd3d_queue_create(struct d3d12_device *device, uint32_t family_index, - const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue); + const VkQueueFamilyProperties *properties, struct vkd3d_queue_array *queue_array, uint32_t queue_index); void vkd3d_queue_destroy(struct vkd3d_queue *queue, struct d3d12_device *device); void vkd3d_queue_release(struct vkd3d_queue *queue); @@ -1197,9 +1204,9 @@ struct d3d12_device struct vkd3d_vulkan_info vk_info; - struct vkd3d_queue *direct_queue; - struct vkd3d_queue *compute_queue; - struct vkd3d_queue *copy_queue; + struct vkd3d_queue_array *direct_queues; + struct vkd3d_queue_array *compute_queues; + struct vkd3d_queue_array *copy_queues; uint32_t queue_family_indices[VKD3D_MAX_QUEUE_FAMILY_COUNT]; unsigned int queue_family_count; VkTimeDomainEXT vk_host_time_domain; -- 2.34.1

1 0

[PATCH v7 1/6] ddraw: Use WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES only if window is not in foreground.
by Gabriel Ivăncescu 21 Jan '22

21 Jan '22

Fixes a regression introduced by f90d607c67768f19e36d9d74b498594252faa3fd. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50370 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- The current tests were testing a hidden window only, which ddraw treats as "inactive" (but not d3d8/d3d9ex). Tests were added to show that even visible windows, but not foreground, are not set to topmost, while foreground ones are. This is ddraw specific. d3d8 and d3d9ex treat hidden windows as "active" for the purposes of window changes (so only visible windows, if inactive, prevent changes). We have existing tests for that. Unfortunately, most of the tests are still todo_wine, even though the WS_EX_TOPMOST style matches (except when exiting, that's fixed on 3rd patch). That's because we don't have WS_EX_WINDOWEDGE on fullscreen windows (long-standing issue), but the topmost bit is set correctly. dlls/ddraw/ddraw.c | 6 ++-- dlls/ddraw/tests/ddraw1.c | 67 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 67 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 67 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 67 ++++++++++++++++++++++++++++++++++++++- 5 files changed, 268 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5b70bb4..77172d4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -583,8 +583,10 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; swapchain_desc.windowed = windowed; - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH - | WINED3D_SWAPCHAIN_IMPLICIT | WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; + swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + + if (window != GetForegroundWindow()) + swapchain_desc.flags |= WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; if (ddraw->flags & DDRAW_NO3D) return wined3d_swapchain_create(ddraw->wined3d_device, &swapchain_desc, diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index efbecf0..137469c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2585,14 +2585,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2636,6 +2638,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); @@ -2659,6 +2723,7 @@ static void test_window_style(void) ref = IDirectDraw_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + DestroyWindow(window2); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 65ac21d..f3801ef 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2663,14 +2663,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw2 *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2714,6 +2716,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); @@ -2737,6 +2801,7 @@ static void test_window_style(void) ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + DestroyWindow(window2); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index ce2333d..9c22103 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2899,14 +2899,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw4 *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2950,6 +2952,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); @@ -2973,6 +3037,7 @@ static void test_window_style(void) ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + DestroyWindow(window2); DestroyWindow(window); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4cf57bf..7cadb88 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2564,14 +2564,16 @@ static void test_window_style(void) { LONG style, exstyle, tmp, expected_style; RECT fullscreen_rect, r; + HWND window, window2; IDirectDraw7 *ddraw; - HWND window; HRESULT hr; ULONG ref; BOOL ret; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, 0, 0, 0, 0); + window2 = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 50, 50, 0, 0, 0, 0); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -2615,6 +2617,68 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_EXSTYLE); ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); + ret = SetForegroundWindow(GetDesktopWindow()); + ok(ret, "Failed to set foreground window.\n"); + SetActiveWindow(window); + ok(GetActiveWindow() == window, "Unexpected active window.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + SetWindowPos(window, NULL, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOACTIVATE); + GetWindowRect(window, &r); + ok(!EqualRect(&r, &fullscreen_rect), "Window resize failed? got %s.\n", + wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window2); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected %s, got %s.\n", + wine_dbgstr_rect(&fullscreen_rect), wine_dbgstr_rect(&r)); + + ret = SetForegroundWindow(window); + ok(ret, "Failed to set foreground window.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + expected_style = style | WS_VISIBLE; + todo_wine ok(tmp == expected_style, "Expected window style %#x, got %#x.\n", expected_style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + expected_style = exstyle | WS_EX_TOPMOST; + todo_wine ok(tmp == expected_style, "Expected window extended style %#x, got %#x.\n", expected_style, tmp); + + ShowWindow(window, SW_HIDE); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + ShowWindow(window, SW_SHOW); hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); @@ -2638,6 +2702,7 @@ static void test_window_style(void) ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + DestroyWindow(window2); DestroyWindow(window); } -- 2.34.1

5 23

[PATCH 1/3] include: Fixup DWRITE_COLOR_GLYPH_RUN1 definition.
by Nikolay Sivov 21 Jan '22

21 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- This is to match resulting layout while still being able to access fields directly, original C++ definition uses inheritance: DWRITE_COLOR_GLYPH_RUN1 : DWRITE_COLOR_GLYPH_RUN. include/dwrite_3.idl | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 0db2de71cf1..3542fbc8f1d 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -795,17 +795,22 @@ interface IDWriteFontFace5 : IDWriteFontFace4 BOOL Equals(IDWriteFontFace *fontface); } -typedef struct DWRITE_COLOR_GLYPH_RUN1 -{ - DWRITE_GLYPH_RUN glyphRun; - DWRITE_GLYPH_RUN_DESCRIPTION *glyphRunDescription; - FLOAT baselineOriginX; - FLOAT baselineOriginY; - DWRITE_COLOR_F runColor; - UINT16 paletteIndex; - DWRITE_GLYPH_IMAGE_FORMATS glyphImageFormat; - DWRITE_MEASURING_MODE measuringMode; -} DWRITE_COLOR_GLYPH_RUN1; +typedef struct DWRITE_COLOR_GLYPH_RUN1 DWRITE_COLOR_GLYPH_RUN1; + +cpp_quote("struct DWRITE_COLOR_GLYPH_RUN1") +cpp_quote("{") +cpp_quote(" DWRITE_GLYPH_RUN glyphRun;") +cpp_quote(" DWRITE_GLYPH_RUN_DESCRIPTION *glyphRunDescription;") +cpp_quote(" FLOAT baselineOriginX;") +cpp_quote(" FLOAT baselineOriginY;") +cpp_quote(" DWRITE_COLOR_F runColor;") +cpp_quote(" UINT16 paletteIndex;") +cpp_quote("#ifdef _WIN64") +cpp_quote(" UINT32 _pad;") +cpp_quote("#endif") +cpp_quote(" DWRITE_GLYPH_IMAGE_FORMATS glyphImageFormat;") +cpp_quote(" DWRITE_MEASURING_MODE measuringMode;") +cpp_quote("};") [ local, -- 2.34.1

1 2

[PATCH 1/5] winhttp/tests: Also test async websockets with secure connection.
by Paul Gofman 21 Jan '22

21 Jan '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/tests/notification.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 72cef89a618..ce585087370 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -671,7 +671,7 @@ static const struct notification websocket_test[] = { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING, NF_SIGNAL } }; -static void test_websocket(void) +static void test_websocket(BOOL secure) { HANDLE session, connection, request, socket, event; WINHTTP_WEB_SOCKET_BUFFER_TYPE type; @@ -680,6 +680,7 @@ static void test_websocket(void) struct info info, *context = &info; char buffer[1024]; USHORT close_status; + DWORD protocols, flags; if (!pWinHttpWebSocketCompleteUpgrade) { @@ -703,6 +704,13 @@ static void test_websocket(void) unload = FALSE; } + if (secure) + { + protocols = WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2; + ret = WinHttpSetOption(session, WINHTTP_OPTION_SECURE_PROTOCOLS, &protocols, sizeof(protocols)); + ok(ret, "failed to set protocols %u\n", GetLastError()); + } + SetLastError( 0xdeadbeef ); WinHttpSetStatusCallback( session, check_notification, WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS, 0 ); err = GetLastError(); @@ -723,11 +731,19 @@ static void test_websocket(void) setup_test( &info, winhttp_open_request, __LINE__ ); SetLastError( 0xdeadbeef ); - request = WinHttpOpenRequest( connection, NULL, L"/", NULL, NULL, NULL, 0 ); + request = WinHttpOpenRequest( connection, NULL, L"/", NULL, NULL, NULL, secure ? WINHTTP_FLAG_SECURE : 0); err = GetLastError(); ok( request != NULL, "got %u\n", err ); ok( err == ERROR_SUCCESS, "got %u\n", err ); + if (secure) + { + flags = SECURITY_FLAG_IGNORE_UNKNOWN_CA | SECURITY_FLAG_IGNORE_CERT_DATE_INVALID | + SECURITY_FLAG_IGNORE_CERT_CN_INVALID; + ret = WinHttpSetOption(request, WINHTTP_OPTION_SECURITY_FLAGS, &flags, sizeof(flags)); + ok(ret, "failed to set security flags %u\n", GetLastError()); + } + ret = WinHttpSetOption( request, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0 ); ok( ret, "got %u\n", GetLastError() ); @@ -1380,7 +1396,10 @@ START_TEST (notification) test_connection_cache(); test_redirect(); test_async(); - test_websocket(); + test_websocket( FALSE ); + winetest_push_context( "secure" ); + test_websocket( TRUE ); + winetest_pop_context(); test_recursion(); si.event = CreateEventW( NULL, 0, 0, NULL ); -- 2.34.1

3 11

[PATCH vkd3d v2 8/8] tests: Test initializer argument flattening.
by Francisco Casas 21 Jan '22

21 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-flatten.shader_test | 70 ++++++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 tests/hlsl-initializer-flatten.shader_test diff --git a/Makefile.am b/Makefile.am index 2ffe81af..b4d4d91d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-flatten.shader_test \ tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ @@ -297,6 +298,7 @@ XFAIL_TESTS = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-flatten.shader_test \ tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ diff --git a/tests/hlsl-initializer-flatten.shader_test b/tests/hlsl-initializer-flatten.shader_test new file mode 100644 index 00000000..4fd71da7 --- /dev/null +++ b/tests/hlsl-initializer-flatten.shader_test @@ -0,0 +1,70 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 aa = {1, float2(2, 3), 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1, 2, 3, 4) + + +[pixel shader] +struct stu { + int3 aa; + float4 bb; +}; + +float4 main() : sv_target +{ + struct stu foo = {1, 2, float2(3, 4), int3(5, 6, 7)}; + return foo.bb; +} + +[test] +draw quad +probe all rgba (4, 5, 6, 7) + + +[pixel shader] +float4 main() : sv_target +{ + int4 aa = {10, 20, 30, 40}; + float4 foo[3] = {1, aa, aa, 2, 3, 4}; + return foo[1]; +} + +[test] +draw quad +probe all rgba (40, 10, 20, 30) + + +[pixel shader] +struct stu { + float aa; + int bb; +}; + +float4 main() : sv_target +{ + struct stu foo = {2.0, 3}; + float4 f = {1.0, foo, 4.0}; + return f; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + + +[pixel shader] +float4 main() : sv_target +{ + int arr[3] = {2, 3, 4}; + float4 f = {1.0, arr}; + return f; +} +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) -- 2.25.1

3 2

[PATCH vkd3d v2 7/8] tests: Test single numeric initializers.
by Francisco Casas 21 Jan '22

21 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 1 + ...lsl-single-numeric-initializer.shader_test | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 tests/hlsl-single-numeric-initializer.shader_test diff --git a/Makefile.am b/Makefile.am index 1da56869..2ffe81af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,6 +84,7 @@ vkd3d_shader_tests = \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ tests/hlsl-shape.shader_test \ + tests/hlsl-single-numeric-initializer.shader_test \ tests/hlsl-state-block-syntax.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ diff --git a/tests/hlsl-single-numeric-initializer.shader_test b/tests/hlsl-single-numeric-initializer.shader_test new file mode 100644 index 00000000..0aee6439 --- /dev/null +++ b/tests/hlsl-single-numeric-initializer.shader_test @@ -0,0 +1,24 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 aa = 7; + return aa; +} +[test] +draw quad +probe all rgba (7.0, 7.0, 7.0, 7.0) + +[pixel shader] +float4 main() : sv_target +{ + float4 bb; + float3 aa = 7; + + bb.xyz = aa; + bb.w = 8.0; + return bb; +} + +[test] +draw quad +probe all rgba (7.0, 7.0, 7.0, 8.0) -- 2.25.1

3 2

[PATCH vkd3d v2 6/8] tests: Test initialization using a numeric constructor with implicit truncation.
by Francisco Casas 21 Jan '22

21 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 ++ ...numeric-constructor-truncation.shader_test | 32 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 tests/hlsl-numeric-constructor-truncation.shader_test diff --git a/Makefile.am b/Makefile.am index 2a6d54e4..1da56869 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,6 +79,7 @@ vkd3d_shader_tests = \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ + tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ @@ -309,6 +310,7 @@ XFAIL_TESTS = \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ tests/hlsl-nested-arrays.shader_test \ + tests/hlsl-numeric-constructor-truncation.shader_test \ tests/hlsl-numeric-types.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ diff --git a/tests/hlsl-numeric-constructor-truncation.shader_test b/tests/hlsl-numeric-constructor-truncation.shader_test new file mode 100644 index 00000000..f54ce44d --- /dev/null +++ b/tests/hlsl-numeric-constructor-truncation.shader_test @@ -0,0 +1,32 @@ +[pixel shader] +float4 main() : sv_target +{ + float3 x = float4(71, 72, 73, 74); + return float4(x, 75); +} + +[test] +draw quad +probe all rgba (71.0, 72.0, 73.0, 75.0) + + +[pixel shader] +struct stu { + float aa; + float2 bb; + float cc; +}; + +float4 main() : sv_target +{ + struct stu foo; + foo.cc = 5; + foo.bb = float3(2, 3, 4); // It shall not overflow to cc; + foo.aa = 1; + + return float4(foo); +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 5.0) -- 2.25.1

3 2

[PATCH vkd3d v2 5/8] tests: Test nested initializers.
by Francisco Casas 21 Jan '22

21 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-nested.shader_test | 54 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 tests/hlsl-initializer-nested.shader_test diff --git a/Makefile.am b/Makefile.am index ef32711c..2a6d54e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-numeric.shader_test \ @@ -294,6 +295,7 @@ XFAIL_TESTS = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-nested.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-numeric.shader_test \ diff --git a/tests/hlsl-initializer-nested.shader_test b/tests/hlsl-initializer-nested.shader_test new file mode 100644 index 00000000..b32ced40 --- /dev/null +++ b/tests/hlsl-initializer-nested.shader_test @@ -0,0 +1,54 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 aaa = {1, {{{2, {3}}, 4}}}; + return aaa; +} + +[test] +draw quad +probe all rgba (1, 2, 3, 4) + + +[pixel shader] +float4 main() : sv_target +{ + float4 aaa[3] = { + 11, {{{12, {13}}, 14}, + 21, 22}, 23, {{24, + 31, {32, 33}, 34}}, + }; + return aaa[1]; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +struct stu1 +{ + float4 aaa; + float4 bbb; +}; + +struct stu2 +{ + int3 ccc; + stu1 ddd; +}; + +float4 main() : sv_target +{ + struct stu2 val = { + 11, {12, 13, + 21, {{{22}}}, 23}, {{24, + 31, 32}}, 33, 34, + }; + return val.ddd.aaa; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) -- 2.25.1

3 2

[PATCH vkd3d v2 4/8] tests: Test complex initializers for numeric types.
by Francisco Casas 21 Jan '22

21 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 ++ tests/hlsl-initializer-numeric.shader_test | 35 ++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 tests/hlsl-initializer-numeric.shader_test diff --git a/Makefile.am b/Makefile.am index 23887367..ef32711c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ @@ -295,6 +296,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-numeric.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/hlsl-initializer-numeric.shader_test b/tests/hlsl-initializer-numeric.shader_test new file mode 100644 index 00000000..2fce3909 --- /dev/null +++ b/tests/hlsl-initializer-numeric.shader_test @@ -0,0 +1,35 @@ +[pixel shader] +float4 main() : sv_target +{ + int4 aa = {1, 2, 3, 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float4 aa = {1, 2, 3, 4}; + return aa; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 + + +[pixel shader] +float4 main() : sv_target +{ + float3 aa = {1, 2, 3}; + float4 bb = {aa.x, aa.y, aa.z, 4.0}; + return bb; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) 4 -- 2.25.1

3 2

[PATCH vkd3d v2 3/8] tests: Test invalid number of arguments on initializers.
by Francisco Casas 21 Jan '22

21 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + ...lsl-initializer-invalid-n-args.shader_test | 95 +++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 tests/hlsl-initializer-invalid-n-args.shader_test diff --git a/Makefile.am b/Makefile.am index 051053cd..23887367 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,7 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ @@ -292,6 +293,7 @@ XFAIL_TESTS = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-invalid-n-args.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-initializer-struct.shader_test \ diff --git a/tests/hlsl-initializer-invalid-n-args.shader_test b/tests/hlsl-initializer-invalid-n-args.shader_test new file mode 100644 index 00000000..bde6024f --- /dev/null +++ b/tests/hlsl-initializer-invalid-n-args.shader_test @@ -0,0 +1,95 @@ +[pixel shader] +float4 main() : sv_target +{ + float4 color[2][3] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24 + }; + return color[1][1]; +} + +[test] +draw quad +probe all rgba (17, 18, 19, 20) + + +[pixel shader fail] +float4 main() : sv_target +{ + float4 color[2][3] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 + }; + return color[1][1]; +} + +[pixel shader fail] +float4 main() : sv_target +{ + float4 color[2][3] = { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 + }; + return color[1][1]; +} + + +[pixel shader] +struct stu { + struct { + int bar; + float4 foo; + } bbb[2]; + int2 aaa; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, 14, 25, + 21, 22, 23, 24, 25, + 31, 32, + }; + return val.bbb[1].foo; +} + +[test] +draw quad +probe all rgba (22, 23, 24, 25) + + +[pixel shader fail] +struct stu { + struct { + int bar; + float4 foo; + } bbb[2]; + int2 aaa; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, 14, 25, + 21, 22, 23, 24, 25, + 31, 32, 33, + }; + return val.bbb[1].foo; +} + + +[pixel shader fail] +struct stu { + struct { + int bar; + float4 foo; + } bbb[2]; + int2 aaa; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, 14, 25, + 21, 22, 23, 24, 25, + 31, + }; + return val.bbb[1].foo; +} -- 2.25.1

3 2

[PATCH vkd3d v2 1/8] tests: Test array initializers.
by Francisco Casas 21 Jan '22

21 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 4 ++ .../hlsl-initializer-local-array.shader_test | 35 ++++++++++++++++++ .../hlsl-initializer-static-array.shader_test | 37 +++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 tests/hlsl-initializer-local-array.shader_test create mode 100644 tests/hlsl-initializer-static-array.shader_test diff --git a/Makefile.am b/Makefile.am index a3ec6850..3545d74b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,8 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ @@ -289,6 +291,8 @@ XFAIL_TESTS = \ tests/cast-to-int.shader_test \ tests/cast-to-uint.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-initializer-local-array.shader_test b/tests/hlsl-initializer-local-array.shader_test new file mode 100644 index 00000000..0862d4c9 --- /dev/null +++ b/tests/hlsl-initializer-local-array.shader_test @@ -0,0 +1,35 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float4 array_loc[3] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34 + }; + return array_loc[1]; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +float4 main() : SV_TARGET +{ + float4 array_loc[2][4] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34, + 41, 42, 43, 44, + 51, 52, 53, 54, + 61, 62, 63, 64, + 71, 72, 73, 74, + 81, 82, 83, 84, + }; + return array_loc[1][2]; +} + +[test] +draw quad +probe all rgba (71, 72, 73, 74) diff --git a/tests/hlsl-initializer-static-array.shader_test b/tests/hlsl-initializer-static-array.shader_test new file mode 100644 index 00000000..57733502 --- /dev/null +++ b/tests/hlsl-initializer-static-array.shader_test @@ -0,0 +1,37 @@ +[pixel shader] +static const float4 array_st[3] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34 +}; + +float4 main() : SV_TARGET +{ + return array_st[1]; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +static const float4 array_st[4][2] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34, + 41, 42, 43, 44, + 51, 52, 53, 54, + 61, 62, 63, 64, + 71, 72, 73, 74, + 81, 82, 83, 84, +}; + +float4 main() : SV_TARGET +{ + return array_st[2][1]; +} + +[test] +draw quad +probe all rgba (61, 62, 63, 64) -- 2.25.1

3 2

[PATCH vkd3d v3 2/8] tests: Test struct initializers.
by Francisco Casas 21 Jan '22

21 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: Replaced double2 with int2 so that tests are compatible with ps_4_0. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-struct.shader_test | 77 +++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 tests/hlsl-initializer-struct.shader_test diff --git a/Makefile.am b/Makefile.am index 3545d74b..051053cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ @@ -293,6 +294,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-initializer-struct.shader_test b/tests/hlsl-initializer-struct.shader_test new file mode 100644 index 00000000..7efb4bb4 --- /dev/null +++ b/tests/hlsl-initializer-struct.shader_test @@ -0,0 +1,77 @@ +[pixel shader] +struct stu { + int3 aaa; + float3 bbb; + int2 ccc; + float4 ddd; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 21, 22, 23, + 31, 32, + 41, 42, 43, 44, + 51 + }; + return val.ddd; +} + +[test] +draw quad +probe all rgba (41, 42, 43, 44) + + +[pixel shader] +struct stu { + int3 aaa; + float3 bbb[2]; + int2 ccc; + float4 ddd[3][2]; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 211, 212, 213, 221, 222, 223, + 31, 32, + 4111, 4112, 4113, 4114, 4121, 4122, 4123, 4124, + 4211, 4212, 4213, 4214, 4221, 4222, 4223, 4224, + 4311, 4312, 4313, 4314, 4321, 4322, 4323, 4324, + 51 + }; + return val.ddd[2][0]; +} + +[test] +draw quad +probe all rgba (4311, 4312, 4313, 4314) + + +[pixel shader] +struct stu { + int3 aaa; + struct { + float4 foo; + int2 bar; + } bbb[3]; +}; + +float4 main() : sv_target +{ + struct stu val = { + 1, 2, 3, + 11, 12, 13, 14, 15, 16, + 21, 22, 23, 24, 25, 26, + 31, 32, 33, 34, 35, 36 + }; + return val.bbb[1].foo; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) -- 2.25.1

3 3

[PATCH] mfmediaengine: Add a IMFMediaEngineEx stub.
by Nikolay Sivov 21 Jan '22

21 Jan '22

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfmediaengine/main.c | 496 ++++++++++++++++++++++++++++++-------- 1 file changed, 398 insertions(+), 98 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index b098844a7fa..3fb8e2b9433 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -113,7 +113,7 @@ struct rect struct media_engine { - IMFMediaEngine IMFMediaEngine_iface; + IMFMediaEngineEx IMFMediaEngineEx_iface; IMFGetService IMFGetService_iface; IMFAsyncCallback session_events; IMFAsyncCallback load_handler; @@ -718,9 +718,9 @@ static void media_engine_set_flag(struct media_engine *engine, unsigned int mask engine->flags &= ~mask; } -static inline struct media_engine *impl_from_IMFMediaEngine(IMFMediaEngine *iface) +static inline struct media_engine *impl_from_IMFMediaEngineEx(IMFMediaEngineEx *iface) { - return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngine_iface); + return CONTAINING_RECORD(iface, struct media_engine, IMFMediaEngineEx_iface); } static inline struct media_engine *impl_from_IMFGetService(IMFGetService *iface) @@ -826,13 +826,13 @@ static HRESULT WINAPI media_engine_callback_QueryInterface(IMFAsyncCallback *ifa static ULONG WINAPI media_engine_session_events_AddRef(IMFAsyncCallback *iface) { struct media_engine *engine = impl_from_session_events_IMFAsyncCallback(iface); - return IMFMediaEngine_AddRef(&engine->IMFMediaEngine_iface); + return IMFMediaEngineEx_AddRef(&engine->IMFMediaEngineEx_iface); } static ULONG WINAPI media_engine_session_events_Release(IMFAsyncCallback *iface) { struct media_engine *engine = impl_from_session_events_IMFAsyncCallback(iface); - return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); + return IMFMediaEngineEx_Release(&engine->IMFMediaEngineEx_iface); } static HRESULT WINAPI media_engine_callback_GetParameters(IMFAsyncCallback *iface, DWORD *flags, DWORD *queue) @@ -948,13 +948,13 @@ static const IMFAsyncCallbackVtbl media_engine_session_events_vtbl = static ULONG WINAPI media_engine_load_handler_AddRef(IMFAsyncCallback *iface) { struct media_engine *engine = impl_from_load_handler_IMFAsyncCallback(iface); - return IMFMediaEngine_AddRef(&engine->IMFMediaEngine_iface); + return IMFMediaEngineEx_AddRef(&engine->IMFMediaEngineEx_iface); } static ULONG WINAPI media_engine_load_handler_Release(IMFAsyncCallback *iface) { struct media_engine *engine = impl_from_load_handler_IMFAsyncCallback(iface); - return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); + return IMFMediaEngineEx_Release(&engine->IMFMediaEngineEx_iface); } static HRESULT media_engine_create_source_node(IMFMediaSource *source, IMFPresentationDescriptor *pd, IMFStreamDescriptor *sd, @@ -1258,13 +1258,14 @@ static const IMFAsyncCallbackVtbl media_engine_load_handler_vtbl = media_engine_load_handler_Invoke, }; -static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID riid, void **obj) +static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngineEx *iface, REFIID riid, void **obj) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); - if (IsEqualIID(riid, &IID_IMFMediaEngine) || + if (IsEqualIID(riid, &IID_IMFMediaEngineEx) || + IsEqualIID(riid, &IID_IMFMediaEngine) || IsEqualIID(riid, &IID_IUnknown)) { *obj = iface; @@ -1284,9 +1285,9 @@ static HRESULT WINAPI media_engine_QueryInterface(IMFMediaEngine *iface, REFIID return S_OK; } -static ULONG WINAPI media_engine_AddRef(IMFMediaEngine *iface) +static ULONG WINAPI media_engine_AddRef(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); ULONG refcount = InterlockedIncrement(&engine->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -1318,9 +1319,9 @@ static void free_media_engine(struct media_engine *engine) free(engine); } -static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) +static ULONG WINAPI media_engine_Release(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); ULONG refcount = InterlockedDecrement(&engine->refcount); TRACE("%p, refcount %u.\n", iface, refcount); @@ -1331,9 +1332,9 @@ static ULONG WINAPI media_engine_Release(IMFMediaEngine *iface) return refcount; } -static HRESULT WINAPI media_engine_GetError(IMFMediaEngine *iface, IMFMediaError **error) +static HRESULT WINAPI media_engine_GetError(IMFMediaEngineEx *iface, IMFMediaError **error) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, error); @@ -1356,9 +1357,9 @@ static HRESULT WINAPI media_engine_GetError(IMFMediaEngine *iface, IMFMediaError return hr; } -static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngine *iface, MF_MEDIA_ENGINE_ERR code) +static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngineEx *iface, MF_MEDIA_ENGINE_ERR code) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; TRACE("%p, %u.\n", iface, code); @@ -1376,16 +1377,16 @@ static HRESULT WINAPI media_engine_SetErrorCode(IMFMediaEngine *iface, MF_MEDIA_ return hr; } -static HRESULT WINAPI media_engine_SetSourceElements(IMFMediaEngine *iface, IMFMediaEngineSrcElements *elements) +static HRESULT WINAPI media_engine_SetSourceElements(IMFMediaEngineEx *iface, IMFMediaEngineSrcElements *elements) { FIXME("(%p, %p): stub.\n", iface, elements); return E_NOTIMPL; } -static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) +static HRESULT WINAPI media_engine_SetSource(IMFMediaEngineEx *iface, BSTR url) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; TRACE("%p, %s.\n", iface, debugstr_w(url)); @@ -1433,9 +1434,9 @@ static HRESULT WINAPI media_engine_SetSource(IMFMediaEngine *iface, BSTR url) return hr; } -static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngine *iface, BSTR *url) +static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngineEx *iface, BSTR *url) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, url); @@ -1453,18 +1454,18 @@ static HRESULT WINAPI media_engine_GetCurrentSource(IMFMediaEngine *iface, BSTR return hr; } -static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngine *iface) +static USHORT WINAPI media_engine_GetNetworkState(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); TRACE("%p.\n", iface); return engine->network_state; } -static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *iface) +static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); MF_MEDIA_ENGINE_PRELOAD preload; TRACE("%p.\n", iface); @@ -1476,9 +1477,9 @@ static MF_MEDIA_ENGINE_PRELOAD WINAPI media_engine_GetPreload(IMFMediaEngine *if return preload; } -static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_ENGINE_PRELOAD preload) +static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngineEx *iface, MF_MEDIA_ENGINE_PRELOAD preload) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); TRACE("%p, %d.\n", iface, preload); @@ -1489,9 +1490,9 @@ static HRESULT WINAPI media_engine_SetPreload(IMFMediaEngine *iface, MF_MEDIA_EN return S_OK; } -static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTimeRange **range) +static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngineEx *iface, IMFMediaTimeRange **range) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr; TRACE("%p, %p.\n", iface, range); @@ -1507,23 +1508,23 @@ static HRESULT WINAPI media_engine_GetBuffered(IMFMediaEngine *iface, IMFMediaTi return hr; } -static HRESULT WINAPI media_engine_Load(IMFMediaEngine *iface) +static HRESULT WINAPI media_engine_Load(IMFMediaEngineEx *iface) { FIXME("(%p): stub.\n", iface); return E_NOTIMPL; } -static HRESULT WINAPI media_engine_CanPlayType(IMFMediaEngine *iface, BSTR type, MF_MEDIA_ENGINE_CANPLAY *answer) +static HRESULT WINAPI media_engine_CanPlayType(IMFMediaEngineEx *iface, BSTR type, MF_MEDIA_ENGINE_CANPLAY *answer) { FIXME("(%p, %s, %p): stub.\n", iface, debugstr_w(type), answer); return E_NOTIMPL; } -static USHORT WINAPI media_engine_GetReadyState(IMFMediaEngine *iface) +static USHORT WINAPI media_engine_GetReadyState(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); unsigned short state; TRACE("%p.\n", iface); @@ -1535,16 +1536,16 @@ static USHORT WINAPI media_engine_GetReadyState(IMFMediaEngine *iface) return state; } -static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) +static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngineEx *iface) { FIXME("(%p): stub.\n", iface); return FALSE; } -static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) +static double WINAPI media_engine_GetCurrentTime(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); double ret = 0.0; MFTIME clocktime; @@ -1564,23 +1565,23 @@ static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) return ret; } -static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) +static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngineEx *iface, double time) { FIXME("(%p, %f): stub.\n", iface, time); return E_NOTIMPL; } -static double WINAPI media_engine_GetStartTime(IMFMediaEngine *iface) +static double WINAPI media_engine_GetStartTime(IMFMediaEngineEx *iface) { FIXME("(%p): stub.\n", iface); return 0.0; } -static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) +static double WINAPI media_engine_GetDuration(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); double value; TRACE("%p.\n", iface); @@ -1592,9 +1593,9 @@ static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) return value; } -static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) +static BOOL WINAPI media_engine_IsPaused(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); BOOL value; TRACE("%p.\n", iface); @@ -1606,9 +1607,9 @@ static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) return value; } -static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) +static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); double rate; TRACE("%p.\n", iface); @@ -1620,9 +1621,9 @@ static double WINAPI media_engine_GetDefaultPlaybackRate(IMFMediaEngine *iface) return rate; } -static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngine *iface, double rate) +static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngineEx *iface, double rate) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; TRACE("%p, %f.\n", iface, rate); @@ -1640,9 +1641,9 @@ static HRESULT WINAPI media_engine_SetDefaultPlaybackRate(IMFMediaEngine *iface, return hr; } -static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngine *iface) +static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); double rate; TRACE("%p.\n", iface); @@ -1654,9 +1655,9 @@ static double WINAPI media_engine_GetPlaybackRate(IMFMediaEngine *iface) return rate; } -static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngine *iface, double rate) +static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngineEx *iface, double rate) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; TRACE("%p, %f.\n", iface, rate); @@ -1674,23 +1675,23 @@ static HRESULT WINAPI media_engine_SetPlaybackRate(IMFMediaEngine *iface, double return hr; } -static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngine *iface, IMFMediaTimeRange **played) +static HRESULT WINAPI media_engine_GetPlayed(IMFMediaEngineEx *iface, IMFMediaTimeRange **played) { FIXME("(%p, %p): stub.\n", iface, played); return E_NOTIMPL; } -static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngine *iface, IMFMediaTimeRange **seekable) +static HRESULT WINAPI media_engine_GetSeekable(IMFMediaEngineEx *iface, IMFMediaTimeRange **seekable) { FIXME("(%p, %p): stub.\n", iface, seekable); return E_NOTIMPL; } -static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) +static BOOL WINAPI media_engine_IsEnded(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); BOOL value; TRACE("%p.\n", iface); @@ -1702,9 +1703,9 @@ static BOOL WINAPI media_engine_IsEnded(IMFMediaEngine *iface) return value; } -static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) +static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); BOOL value; TRACE("%p.\n", iface); @@ -1716,9 +1717,9 @@ static BOOL WINAPI media_engine_GetAutoPlay(IMFMediaEngine *iface) return value; } -static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autoplay) +static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngineEx *iface, BOOL autoplay) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); FIXME("(%p, %d): stub.\n", iface, autoplay); @@ -1729,9 +1730,9 @@ static HRESULT WINAPI media_engine_SetAutoPlay(IMFMediaEngine *iface, BOOL autop return S_OK; } -static BOOL WINAPI media_engine_GetLoop(IMFMediaEngine *iface) +static BOOL WINAPI media_engine_GetLoop(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); BOOL value; TRACE("%p.\n", iface); @@ -1743,9 +1744,9 @@ static BOOL WINAPI media_engine_GetLoop(IMFMediaEngine *iface) return value; } -static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) +static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngineEx *iface, BOOL loop) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); FIXME("(%p, %d): stub.\n", iface, loop); @@ -1756,9 +1757,9 @@ static HRESULT WINAPI media_engine_SetLoop(IMFMediaEngine *iface, BOOL loop) return S_OK; } -static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) +static HRESULT WINAPI media_engine_Play(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); TRACE("%p.\n", iface); @@ -1786,9 +1787,9 @@ static HRESULT WINAPI media_engine_Play(IMFMediaEngine *iface) return S_OK; } -static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) +static HRESULT WINAPI media_engine_Pause(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); TRACE("%p.\n", iface); @@ -1810,9 +1811,9 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) return S_OK; } -static BOOL WINAPI media_engine_GetMuted(IMFMediaEngine *iface) +static BOOL WINAPI media_engine_GetMuted(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); BOOL ret; TRACE("%p.\n", iface); @@ -1824,9 +1825,9 @@ static BOOL WINAPI media_engine_GetMuted(IMFMediaEngine *iface) return ret; } -static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngine *iface, BOOL muted) +static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngineEx *iface, BOOL muted) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; TRACE("%p, %d.\n", iface, muted); @@ -1844,9 +1845,9 @@ static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngine *iface, BOOL muted) return hr; } -static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) +static double WINAPI media_engine_GetVolume(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); double volume; TRACE("%p.\n", iface); @@ -1858,9 +1859,9 @@ static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) return volume; } -static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngine *iface, double volume) +static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngineEx *iface, double volume) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; TRACE("%p, %f.\n", iface, volume); @@ -1878,9 +1879,9 @@ static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngine *iface, double volum return hr; } -static BOOL WINAPI media_engine_HasVideo(IMFMediaEngine *iface) +static BOOL WINAPI media_engine_HasVideo(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); BOOL value; TRACE("%p.\n", iface); @@ -1892,9 +1893,9 @@ static BOOL WINAPI media_engine_HasVideo(IMFMediaEngine *iface) return value; } -static BOOL WINAPI media_engine_HasAudio(IMFMediaEngine *iface) +static BOOL WINAPI media_engine_HasAudio(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); BOOL value; TRACE("%p.\n", iface); @@ -1906,9 +1907,9 @@ static BOOL WINAPI media_engine_HasAudio(IMFMediaEngine *iface) return value; } -static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) +static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngineEx *iface, DWORD *cx, DWORD *cy) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; TRACE("%p, %p, %p.\n", iface, cx, cy); @@ -1933,9 +1934,9 @@ static HRESULT WINAPI media_engine_GetNativeVideoSize(IMFMediaEngine *iface, DWO return hr; } -static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DWORD *cx, DWORD *cy) +static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngineEx *iface, DWORD *cx, DWORD *cy) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; TRACE("%p, %p, %p.\n", iface, cx, cy); @@ -1960,9 +1961,9 @@ static HRESULT WINAPI media_engine_GetVideoAspectRatio(IMFMediaEngine *iface, DW return hr; } -static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngine *iface) +static HRESULT WINAPI media_engine_Shutdown(IMFMediaEngineEx *iface) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr = S_OK; FIXME("(%p): stub.\n", iface); @@ -2202,10 +2203,10 @@ done: return hr; } -static HRESULT WINAPI media_engine_TransferVideoFrame(IMFMediaEngine *iface, IUnknown *surface, +static HRESULT WINAPI media_engine_TransferVideoFrame(IMFMediaEngineEx *iface, IUnknown *surface, const MFVideoNormalizedRect *src_rect, const RECT *dst_rect, const MFARGB *color) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); ID3D11Texture2D *texture; HRESULT hr = E_NOINTERFACE; @@ -2230,9 +2231,9 @@ static HRESULT WINAPI media_engine_TransferVideoFrame(IMFMediaEngine *iface, IUn return hr; } -static HRESULT WINAPI media_engine_OnVideoStreamTick(IMFMediaEngine *iface, LONGLONG *pts) +static HRESULT WINAPI media_engine_OnVideoStreamTick(IMFMediaEngineEx *iface, LONGLONG *pts) { - struct media_engine *engine = impl_from_IMFMediaEngine(iface); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); HRESULT hr; TRACE("%p, %p.\n", iface, pts); @@ -2254,7 +2255,269 @@ static HRESULT WINAPI media_engine_OnVideoStreamTick(IMFMediaEngine *iface, LONG return hr; } -static const IMFMediaEngineVtbl media_engine_vtbl = +static HRESULT WINAPI media_engine_SetSourceFromByteStream(IMFMediaEngineEx *iface, IMFByteStream *bytestream, BSTR url) +{ + FIXME("%p, %p, %s stub.\n", iface, bytestream, debugstr_w(url)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetStatistics(IMFMediaEngineEx *iface, MF_MEDIA_ENGINE_STATISTIC stat_id, PROPVARIANT *stat) +{ + FIXME("%p, %x, %p stub.\n", iface, stat_id, stat); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_UpdateVideoStream(IMFMediaEngineEx *iface, const MFVideoNormalizedRect *src, + const RECT *dst, const MFARGB *border_color) +{ + FIXME("%p, %p, %p, %p stub.\n", iface, src, dst, border_color); + + return E_NOTIMPL; +} + +static double WINAPI media_engine_GetBalance(IMFMediaEngineEx *iface) +{ + FIXME("%p stub.\n", iface); + + return 0.0; +} + +static HRESULT WINAPI media_engine_SetBalance(IMFMediaEngineEx *iface, double balance) +{ + FIXME("%p, %f stub.\n", iface, balance); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_IsPlaybackRateSupported(IMFMediaEngineEx *iface, double rate) +{ + FIXME("%p, %f stub.\n", iface, rate); + + return FALSE; +} + +static HRESULT WINAPI media_engine_FrameStep(IMFMediaEngineEx *iface, BOOL forward) +{ + FIXME("%p, %d stub.\n", iface, forward); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetResourceCharacteristics(IMFMediaEngineEx *iface, DWORD *flags) +{ + FIXME("%p, %p stub.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetPresentationAttribute(IMFMediaEngineEx *iface, REFGUID attribute, + PROPVARIANT *value) +{ + FIXME("%p, %s, %p stub.\n", iface, debugstr_guid(attribute), value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetNumberOfStreams(IMFMediaEngineEx *iface, DWORD *stream_count) +{ + FIXME("%p, %p stub.\n", iface, stream_count); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetStreamAttribute(IMFMediaEngineEx *iface, DWORD stream_index, REFGUID attribute, + PROPVARIANT *value) +{ + FIXME("%p, %d, %s, %p stub.\n", iface, stream_index, debugstr_guid(attribute), value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetStreamSelection(IMFMediaEngineEx *iface, DWORD stream_index, BOOL *enabled) +{ + FIXME("%p, %d, %p stub.\n", iface, stream_index, enabled); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetStreamSelection(IMFMediaEngineEx *iface, DWORD stream_index, BOOL enabled) +{ + FIXME("%p, %d, %d stub.\n", iface, stream_index, enabled); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_ApplyStreamSelections(IMFMediaEngineEx *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_IsProtected(IMFMediaEngineEx *iface, BOOL *protected) +{ + FIXME("%p, %p stub.\n", iface, protected); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_InsertVideoEffect(IMFMediaEngineEx *iface, IUnknown *effect, BOOL is_optional) +{ + FIXME("%p, %p, %d stub.\n", iface, effect, is_optional); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_InsertAudioEffect(IMFMediaEngineEx *iface, IUnknown *effect, BOOL is_optional) +{ + FIXME("%p, %p, %d stub.\n", iface, effect, is_optional); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_RemoveAllEffects(IMFMediaEngineEx *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetTimelineMarkerTimer(IMFMediaEngineEx *iface, double timeout) +{ + FIXME("%p, %f stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetTimelineMarkerTimer(IMFMediaEngineEx *iface, double *timeout) +{ + FIXME("%p, %p stub.\n", iface, timeout); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_CancelTimelineMarkerTimer(IMFMediaEngineEx *iface) +{ + FIXME("%p stub.\n", iface); + + return E_NOTIMPL; +} + +static BOOL WINAPI media_engine_IsStereo3D(IMFMediaEngineEx *iface) +{ + FIXME("%p stub.\n", iface); + + return FALSE; +} + +static HRESULT WINAPI media_engine_GetStereo3DFramePackingMode(IMFMediaEngineEx *iface, MF_MEDIA_ENGINE_S3D_PACKING_MODE *mode) +{ + FIXME("%p, %p stub.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetStereo3DFramePackingMode(IMFMediaEngineEx *iface, MF_MEDIA_ENGINE_S3D_PACKING_MODE mode) +{ + FIXME("%p, %#x stub.\n", iface, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetStereo3DRenderMode(IMFMediaEngineEx *iface, MF3DVideoOutputType *output_type) +{ + FIXME("%p, %p stub.\n", iface, output_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetStereo3DRenderMode(IMFMediaEngineEx *iface, MF3DVideoOutputType output_type) +{ + FIXME("%p, %#x stub.\n", iface, output_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_EnableWindowlessSwapchainMode(IMFMediaEngineEx *iface, BOOL enable) +{ + FIXME("%p, %d stub.\n", iface, enable); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetVideoSwapchainHandle(IMFMediaEngineEx *iface, HANDLE *swapchain) +{ + FIXME("%p, %p stub.\n", iface, swapchain); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_EnableHorizontalMirrorMode(IMFMediaEngineEx *iface, BOOL enable) +{ + FIXME("%p, %d stub.\n", iface, enable); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetAudioStreamCategory(IMFMediaEngineEx *iface, UINT32 *category) +{ + FIXME("%p, %p stub.\n", iface, category); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetAudioStreamCategory(IMFMediaEngineEx *iface, UINT32 category) +{ + FIXME("%p, %u stub.\n", iface, category); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetAudioEndpointRole(IMFMediaEngineEx *iface, UINT32 *role) +{ + FIXME("%p, %p stub.\n", iface, role); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetAudioEndpointRole(IMFMediaEngineEx *iface, UINT32 role) +{ + FIXME("%p, %u stub.\n", iface, role); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_GetRealTimeMode(IMFMediaEngineEx *iface, BOOL *enabled) +{ + FIXME("%p, %p stub.\n", iface, enabled); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetRealTimeMode(IMFMediaEngineEx *iface, BOOL enable) +{ + FIXME("%p, %d stub.\n", iface, enable); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_SetCurrentTimeEx(IMFMediaEngineEx *iface, double seektime, MF_MEDIA_ENGINE_SEEK_MODE mode) +{ + FIXME("%p, %f, %#x stub.\n", iface, seektime, mode); + + return E_NOTIMPL; +} + +static HRESULT WINAPI media_engine_EnableTimeUpdateTimer(IMFMediaEngineEx *iface, BOOL enable) +{ + FIXME("%p, %d stub.\n", iface, enable); + + return E_NOTIMPL; +} + +static const IMFMediaEngineExVtbl media_engine_vtbl = { media_engine_QueryInterface, media_engine_AddRef, @@ -2301,24 +2564,61 @@ static const IMFMediaEngineVtbl media_engine_vtbl = media_engine_Shutdown, media_engine_TransferVideoFrame, media_engine_OnVideoStreamTick, + media_engine_SetSourceFromByteStream, + media_engine_GetStatistics, + media_engine_UpdateVideoStream, + media_engine_GetBalance, + media_engine_SetBalance, + media_engine_IsPlaybackRateSupported, + media_engine_FrameStep, + media_engine_GetResourceCharacteristics, + media_engine_GetPresentationAttribute, + media_engine_GetNumberOfStreams, + media_engine_GetStreamAttribute, + media_engine_GetStreamSelection, + media_engine_SetStreamSelection, + media_engine_ApplyStreamSelections, + media_engine_IsProtected, + media_engine_InsertVideoEffect, + media_engine_InsertAudioEffect, + media_engine_RemoveAllEffects, + media_engine_SetTimelineMarkerTimer, + media_engine_GetTimelineMarkerTimer, + media_engine_CancelTimelineMarkerTimer, + media_engine_IsStereo3D, + media_engine_GetStereo3DFramePackingMode, + media_engine_SetStereo3DFramePackingMode, + media_engine_GetStereo3DRenderMode, + media_engine_SetStereo3DRenderMode, + media_engine_EnableWindowlessSwapchainMode, + media_engine_GetVideoSwapchainHandle, + media_engine_EnableHorizontalMirrorMode, + media_engine_GetAudioStreamCategory, + media_engine_SetAudioStreamCategory, + media_engine_GetAudioEndpointRole, + media_engine_SetAudioEndpointRole, + media_engine_GetRealTimeMode, + media_engine_SetRealTimeMode, + media_engine_SetCurrentTimeEx, + media_engine_EnableTimeUpdateTimer, }; 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); + return IMFMediaEngineEx_QueryInterface(&engine->IMFMediaEngineEx_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); + return IMFMediaEngineEx_AddRef(&engine->IMFMediaEngineEx_iface); } static ULONG WINAPI media_engine_gs_Release(IMFGetService *iface) { struct media_engine *engine = impl_from_IMFGetService(iface); - return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); + return IMFMediaEngineEx_Release(&engine->IMFMediaEngineEx_iface); } static HRESULT WINAPI media_engine_gs_GetService(IMFGetService *iface, REFGUID service, @@ -2355,13 +2655,13 @@ static HRESULT WINAPI media_engine_grabber_callback_QueryInterface(IMFSampleGrab static ULONG WINAPI media_engine_grabber_callback_AddRef(IMFSampleGrabberSinkCallback *iface) { struct media_engine *engine = impl_from_IMFSampleGrabberSinkCallback(iface); - return IMFMediaEngine_AddRef(&engine->IMFMediaEngine_iface); + return IMFMediaEngineEx_AddRef(&engine->IMFMediaEngineEx_iface); } static ULONG WINAPI media_engine_grabber_callback_Release(IMFSampleGrabberSinkCallback *iface) { struct media_engine *engine = impl_from_IMFSampleGrabberSinkCallback(iface); - return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); + return IMFMediaEngineEx_Release(&engine->IMFMediaEngineEx_iface); } static HRESULT WINAPI media_engine_grabber_callback_OnClockStart(IMFSampleGrabberSinkCallback *iface, @@ -2490,7 +2790,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct IMFClock *clock; HRESULT hr; - engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; + engine->IMFMediaEngineEx_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; @@ -2572,7 +2872,7 @@ static HRESULT WINAPI media_engine_factory_CreateInstance(IMFMediaEngineClassFac return hr; } - *engine = &object->IMFMediaEngine_iface; + *engine = (IMFMediaEngine *)&object->IMFMediaEngineEx_iface; return S_OK; } -- 2.34.1

2 1

[PATCH 1/2] dwrite: Partially implement newer TranslateColorGlyphRun() variant.
by Nikolay Sivov 21 Jan '22

21 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 5 +- dlls/dwrite/font.c | 38 ++++++++---- dlls/dwrite/main.c | 22 ++++--- dlls/dwrite/tests/font.c | 108 +++++++++++++++++++++++++++++++---- 4 files changed, 140 insertions(+), 33 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 91b2bb3241c..00fe325518f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -315,8 +315,9 @@ extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DEC extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; extern BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE) DECLSPEC_HIDDEN; extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; -extern HRESULT create_colorglyphenum(FLOAT,FLOAT,const DWRITE_GLYPH_RUN*,const DWRITE_GLYPH_RUN_DESCRIPTION*,DWRITE_MEASURING_MODE, - const DWRITE_MATRIX*,UINT32,IDWriteColorGlyphRunEnumerator**) DECLSPEC_HIDDEN; +extern HRESULT create_colorglyphenum(D2D1_POINT_2F origin, const DWRITE_GLYPH_RUN *run, const DWRITE_GLYPH_RUN_DESCRIPTION *desc, + DWRITE_GLYPH_IMAGE_FORMATS formats, DWRITE_MEASURING_MODE mode, const DWRITE_MATRIX *transform, UINT32 palette, + IDWriteColorGlyphRunEnumerator1 **enumerator) DECLSPEC_HIDDEN; extern BOOL lb_is_newline_char(WCHAR) DECLSPEC_HIDDEN; extern HRESULT create_system_fontfallback(IDWriteFactory7 *factory, IDWriteFontFallback1 **fallback) DECLSPEC_HIDDEN; extern void release_system_fontfallback(IDWriteFontFallback1 *fallback) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 2296c74c1e3..cbc0434b72d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -397,8 +397,7 @@ struct dwrite_colorglyphenum IDWriteColorGlyphRunEnumerator1 IDWriteColorGlyphRunEnumerator1_iface; LONG refcount; - FLOAT origin_x; /* original run origin */ - FLOAT origin_y; + D2D1_POINT_2F origin; /* original run origin */ IDWriteFontFace5 *fontface; /* for convenience */ DWRITE_COLOR_GLYPH_RUN1 colorrun; /* returned with GetCurrentRun() */ @@ -6431,8 +6430,8 @@ static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphen glyphenum->color_offsets[g] = glyphenum->offsets[g]; } - colorrun->baselineOriginX = glyphenum->origin_x + get_glyph_origin(glyphenum, first_glyph); - colorrun->baselineOriginY = glyphenum->origin_y; + colorrun->baselineOriginX = glyphenum->origin.x + get_glyph_origin(glyphenum, first_glyph); + colorrun->baselineOriginY = glyphenum->origin.y; colorrun->glyphRun.glyphCount = glyphenum->run.glyphCount; colorrun->paletteIndex = 0xffff; memset(&colorrun->runColor, 0, sizeof(colorrun->runColor)); @@ -6470,8 +6469,8 @@ static BOOL colorglyphenum_build_color_run(struct dwrite_colorglyphenum *glyphen glyphenum->palette, colorrun->paletteIndex, hr); } /* found a glyph position new color run starts from, origin is "original origin + distance to this glyph" */ - colorrun->baselineOriginX = glyphenum->origin_x + get_glyph_origin(glyphenum, g); - colorrun->baselineOriginY = glyphenum->origin_y; + colorrun->baselineOriginX = glyphenum->origin.x + get_glyph_origin(glyphenum, g); + colorrun->baselineOriginY = glyphenum->origin.y; glyphenum->color_advances[index] = glyphenum->advances[g]; got_palette_index = TRUE; } @@ -6562,9 +6561,9 @@ static const IDWriteColorGlyphRunEnumerator1Vtbl colorglyphenumvtbl = colorglyphenum1_GetCurrentRun, }; -HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_RUN *run, - const DWRITE_GLYPH_RUN_DESCRIPTION *rundescr, DWRITE_MEASURING_MODE measuring_mode, - const DWRITE_MATRIX *transform, unsigned int palette, IDWriteColorGlyphRunEnumerator **ret) +HRESULT create_colorglyphenum(D2D1_POINT_2F origin, const DWRITE_GLYPH_RUN *run, + const DWRITE_GLYPH_RUN_DESCRIPTION *rundescr, DWRITE_GLYPH_IMAGE_FORMATS formats, DWRITE_MEASURING_MODE measuring_mode, + const DWRITE_MATRIX *transform, unsigned int palette, IDWriteColorGlyphRunEnumerator1 **ret) { struct dwrite_colorglyphenum *colorglyphenum; BOOL colorfont, has_colored_glyph; @@ -6580,13 +6579,28 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R if (!colorfont) return DWRITE_E_NOCOLOR; + if (!(formats & (DWRITE_GLYPH_IMAGE_FORMATS_COLR | + DWRITE_GLYPH_IMAGE_FORMATS_SVG | + DWRITE_GLYPH_IMAGE_FORMATS_PNG | + DWRITE_GLYPH_IMAGE_FORMATS_JPEG | + DWRITE_GLYPH_IMAGE_FORMATS_TIFF | + DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8))) + { + return DWRITE_E_NOCOLOR; + } + + if (formats & ~(DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE | DWRITE_GLYPH_IMAGE_FORMATS_CFF | DWRITE_GLYPH_IMAGE_FORMATS_COLR)) + { + FIXME("Unimplemented formats requested %#x.\n", formats); + return E_NOTIMPL; + } + if (!(colorglyphenum = calloc(1, sizeof(*colorglyphenum)))) return E_OUTOFMEMORY; colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface.lpVtbl = &colorglyphenumvtbl; colorglyphenum->refcount = 1; - colorglyphenum->origin_x = originX; - colorglyphenum->origin_y = originY; + colorglyphenum->origin = origin; colorglyphenum->fontface = &fontface->IDWriteFontFace5_iface; IDWriteFontFace5_AddRef(colorglyphenum->fontface); colorglyphenum->glyphs = NULL; @@ -6648,7 +6662,7 @@ HRESULT create_colorglyphenum(float originX, float originY, const DWRITE_GLYPH_R run->fontEmSize, 1.0f, transform, run->glyphIndices[i], run->isSideways); } - *ret = (IDWriteColorGlyphRunEnumerator *)&colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface; + *ret = &colorglyphenum->IDWriteColorGlyphRunEnumerator1_iface; return S_OK; } diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index b21eba0c50a..ab53d5cb80d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1398,13 +1398,17 @@ static HRESULT WINAPI dwritefactory2_CreateFontFallbackBuilder(IDWriteFactory7 * } static HRESULT WINAPI dwritefactory2_TranslateColorGlyphRun(IDWriteFactory7 *iface, FLOAT originX, FLOAT originY, - const DWRITE_GLYPH_RUN *run, const DWRITE_GLYPH_RUN_DESCRIPTION *rundescr, DWRITE_MEASURING_MODE mode, - const DWRITE_MATRIX *transform, UINT32 palette, IDWriteColorGlyphRunEnumerator **colorlayers) + const DWRITE_GLYPH_RUN *run, const DWRITE_GLYPH_RUN_DESCRIPTION *run_desc, DWRITE_MEASURING_MODE measuring_mode, + const DWRITE_MATRIX *transform, UINT32 palette, IDWriteColorGlyphRunEnumerator **layers) { - TRACE("%p, %.8e, %.8e, %p, %p, %d, %p, %u, %p.\n", iface, originX, originY, run, rundescr, mode, - transform, palette, colorlayers); + D2D1_POINT_2F origin = { originX, originY }; - return create_colorglyphenum(originX, originY, run, rundescr, mode, transform, palette, colorlayers); + TRACE("%p, %.8e, %.8e, %p, %p, %d, %p, %u, %p.\n", iface, originX, originY, run, run_desc, measuring_mode, + transform, palette, layers); + + return create_colorglyphenum(origin, run, run_desc, DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE + | DWRITE_GLYPH_IMAGE_FORMATS_CFF | DWRITE_GLYPH_IMAGE_FORMATS_COLR, + measuring_mode, transform, palette, (IDWriteColorGlyphRunEnumerator1 **)layers); } static HRESULT WINAPI dwritefactory2_CreateCustomRenderingParams(IDWriteFactory7 *iface, FLOAT gamma, FLOAT contrast, @@ -1697,15 +1701,15 @@ static HRESULT WINAPI dwritefactory3_GetFontDownloadQueue(IDWriteFactory7 *iface return E_NOTIMPL; } -static HRESULT WINAPI dwritefactory4_TranslateColorGlyphRun(IDWriteFactory7 *iface, D2D1_POINT_2F baseline_origin, +static HRESULT WINAPI dwritefactory4_TranslateColorGlyphRun(IDWriteFactory7 *iface, D2D1_POINT_2F origin, DWRITE_GLYPH_RUN const *run, DWRITE_GLYPH_RUN_DESCRIPTION const *run_desc, DWRITE_GLYPH_IMAGE_FORMATS desired_formats, DWRITE_MEASURING_MODE measuring_mode, DWRITE_MATRIX const *transform, UINT32 palette, IDWriteColorGlyphRunEnumerator1 **layers) { - FIXME("%p, %p, %p, %u, %d, %p, %u, %p: stub\n", iface, run, run_desc, desired_formats, measuring_mode, - transform, palette, layers); + TRACE("%p, %.8e, %.8e, %p, %p, %u, %d, %p, %u, %p.\n", iface, origin.x, origin.y, run, run_desc, desired_formats, + measuring_mode, transform, palette, layers); - return E_NOTIMPL; + return create_colorglyphenum(origin, run, run_desc, desired_formats, measuring_mode, transform, palette, layers); } HRESULT compute_glyph_origins(DWRITE_GLYPH_RUN const *run, DWRITE_MEASURING_MODE measuring_mode, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b347a73a53e..a610491e09c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7671,6 +7671,7 @@ static void test_TranslateColorGlyphRun(void) const DWRITE_COLOR_GLYPH_RUN *colorrun; IDWriteFontFace2 *fontface2; IDWriteFontFace *fontface; + IDWriteFactory4 *factory4; IDWriteFactory2 *factory; DWRITE_GLYPH_RUN run; UINT32 codepoints[2]; @@ -7740,7 +7741,8 @@ static void test_TranslateColorGlyphRun(void) win_skip("IDWriteColorGlyphRunEnumerator1 is not supported.\n"); } - for (;;) { + for (;;) + { hasrun = FALSE; hr = IDWriteColorGlyphRunEnumerator_MoveNext(layers, &hasrun); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -7749,22 +7751,24 @@ static void test_TranslateColorGlyphRun(void) break; hr = IDWriteColorGlyphRunEnumerator_GetCurrentRun(layers, &colorrun); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(colorrun->glyphRun.fontFace != NULL, "got fontface %p\n", colorrun->glyphRun.fontFace); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(colorrun->glyphRun.fontFace == fontface, "Unexpected fontface %p.\n", colorrun->glyphRun.fontFace); ok(colorrun->glyphRun.fontEmSize == 20.0f, "got wrong font size %f\n", colorrun->glyphRun.fontEmSize); - ok(colorrun->glyphRun.glyphCount > 0, "got wrong glyph count %u\n", colorrun->glyphRun.glyphCount); + ok(colorrun->glyphRun.glyphCount == 1, "Unexpected glyph count %u.\n", colorrun->glyphRun.glyphCount); ok(colorrun->glyphRun.glyphIndices != NULL, "got null glyph indices %p\n", colorrun->glyphRun.glyphIndices); ok(colorrun->glyphRun.glyphAdvances != NULL, "got null glyph advances %p\n", colorrun->glyphRun.glyphAdvances); + ok(!colorrun->glyphRunDescription, "Unexpected description pointer.\n"); if (layers1) { hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); ok(hr == S_OK, "Failed to get color runt, hr %#x.\n", hr); - ok(colorrun1->glyphRun.fontFace != NULL, "Unexpected fontface %p.\n", colorrun1->glyphRun.fontFace); - ok(colorrun1->glyphRun.fontEmSize == 20.0f, "Unexpected font size %f.\n", colorrun1->glyphRun.fontEmSize); - ok(colorrun1->glyphRun.glyphCount > 0, "Unexpected glyph count %u\n", colorrun1->glyphRun.glyphCount); - ok(colorrun1->glyphRun.glyphIndices != NULL, "Unexpected indices array.\n"); - ok(colorrun1->glyphRun.glyphAdvances != NULL, "Unexpected advances array.\n"); + ok((const DWRITE_COLOR_GLYPH_RUN *)colorrun1 == colorrun, "Unexpected pointer.\n"); + ok(colorrun1->glyphImageFormat == (DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE | DWRITE_GLYPH_IMAGE_FORMATS_COLR) || + colorrun1->glyphImageFormat == DWRITE_GLYPH_IMAGE_FORMATS_NONE, + "Unexpected glyph image format %#x.\n", colorrun1->glyphImageFormat); + ok(colorrun1->measuringMode == DWRITE_MEASURING_MODE_NATURAL, "Unexpected measuring mode %d.\n", + colorrun1->measuringMode); } } @@ -7804,6 +7808,7 @@ static void test_TranslateColorGlyphRun(void) codepoints[0] = 'A'; hr = IDWriteFontFace_GetGlyphIndices(fontface, codepoints, 1, glyphs); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!!*glyphs, "Unexpected glyph.\n"); layers = (void*)0xdeadbeef; hr = IDWriteFactory2_TranslateColorGlyphRun(factory, 0.0f, 0.0f, &run, NULL, @@ -7822,11 +7827,94 @@ static void test_TranslateColorGlyphRun(void) layers = NULL; hr = IDWriteFactory2_TranslateColorGlyphRun(factory, 0.0f, 0.0f, &run, NULL, - DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); + DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers); ok(hr == S_OK, "got 0x%08x\n", hr); ok(layers != NULL, "got %p\n", layers); + + hr = IDWriteColorGlyphRunEnumerator_QueryInterface(layers, &IID_IDWriteColorGlyphRunEnumerator1, (void **)&layers1); + if (SUCCEEDED(hr)) + { + for (;;) + { + hasrun = FALSE; + hr = IDWriteColorGlyphRunEnumerator1_MoveNext(layers1, &hasrun); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (!hasrun) + break; + + hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!colorrun1->glyphRun.fontFace, "Unexpected fontface %p.\n", colorrun1->glyphRun.fontFace); + ok(colorrun1->glyphRun.fontEmSize == 20.0f, "got wrong font size %f\n", colorrun1->glyphRun.fontEmSize); + ok(colorrun1->glyphRun.glyphCount > 0, "Unexpected glyph count %u.\n", colorrun1->glyphRun.glyphCount); + ok(!!colorrun1->glyphRun.glyphIndices, "Unexpected indices %p.\n", colorrun1->glyphRun.glyphIndices); + ok(!!colorrun1->glyphRun.glyphAdvances, "Unexpected advances %p.\n", colorrun1->glyphRun.glyphAdvances); + ok(!colorrun1->glyphRunDescription, "Unexpected description pointer.\n"); + todo_wine + ok(colorrun1->glyphImageFormat == (DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE | DWRITE_GLYPH_IMAGE_FORMATS_COLR) || + colorrun1->glyphImageFormat == DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE, "Unexpected glyph image format %#x.\n", + colorrun1->glyphImageFormat); + ok(colorrun1->measuringMode == DWRITE_MEASURING_MODE_NATURAL, "Unexpected measuring mode %d.\n", + colorrun1->measuringMode); + } + + IDWriteColorGlyphRunEnumerator1_Release(layers1); + } IDWriteColorGlyphRunEnumerator_Release(layers); + if (SUCCEEDED(IDWriteFactory2_QueryInterface(factory, &IID_IDWriteFactory4, (void **)&factory4))) + { + D2D1_POINT_2F origin; + + origin.x = origin.y = 0.0f; + hr = IDWriteFactory4_TranslateColorGlyphRun(factory4, origin, &run, NULL, + DWRITE_GLYPH_IMAGE_FORMATS_NONE, DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers1); + ok(hr == DWRITE_E_NOCOLOR, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFactory4_TranslateColorGlyphRun(factory4, origin, &run, NULL, + DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE, DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers1); + ok(hr == DWRITE_E_NOCOLOR, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFactory4_TranslateColorGlyphRun(factory4, origin, &run, NULL, + DWRITE_GLYPH_IMAGE_FORMATS_CFF, DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers1); + ok(hr == DWRITE_E_NOCOLOR, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFactory4_TranslateColorGlyphRun(factory4, origin, &run, NULL, + DWRITE_GLYPH_IMAGE_FORMATS_COLR, DWRITE_MEASURING_MODE_NATURAL, NULL, 0, &layers1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + for (;;) + { + hasrun = FALSE; + hr = IDWriteColorGlyphRunEnumerator1_MoveNext(layers1, &hasrun); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (!hasrun) + break; + + hr = IDWriteColorGlyphRunEnumerator1_GetCurrentRun(layers1, &colorrun1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!colorrun1->glyphRun.fontFace, "Unexpected fontface %p.\n", colorrun1->glyphRun.fontFace); + ok(colorrun1->glyphRun.fontEmSize == 20.0f, "got wrong font size %f\n", colorrun1->glyphRun.fontEmSize); + ok(colorrun1->glyphRun.glyphCount > 0, "Unexpected glyph count %u.\n", colorrun1->glyphRun.glyphCount); + ok(!!colorrun1->glyphRun.glyphIndices, "Unexpected indices %p.\n", colorrun1->glyphRun.glyphIndices); + ok(!!colorrun1->glyphRun.glyphAdvances, "Unexpected advances %p.\n", colorrun1->glyphRun.glyphAdvances); + ok(!colorrun1->glyphRunDescription, "Unexpected description pointer.\n"); + ok(colorrun1->glyphImageFormat == DWRITE_GLYPH_IMAGE_FORMATS_COLR || + colorrun1->glyphImageFormat == DWRITE_GLYPH_IMAGE_FORMATS_NONE, "Unexpected glyph image format %#x.\n", + colorrun1->glyphImageFormat); + ok(colorrun1->measuringMode == DWRITE_MEASURING_MODE_NATURAL, "Unexpected measuring mode %d.\n", + colorrun1->measuringMode); + } + + IDWriteColorGlyphRunEnumerator1_Release(layers1); + + IDWriteFactory4_Release(factory4); + } + else + win_skip("IDWriteFactory4::TranslateColorGlyphRun() is not supported.\n"); + IDWriteFontFace2_Release(fontface2); IDWriteFontFace_Release(fontface); ref = IDWriteFactory2_Release(factory); -- 2.34.1

2 4

[PATCH 5/5] uxtheme: Make IsThemeDialogTextureEnabled() return TRUE for all valid flags without ETDT_DISABLE.
by Zhiyi Zhang 21 Jan '22

21 Jan '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 7 ++----- dlls/uxtheme/tests/system.c | 17 ++++++----------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index a7942b03f97..b6e5f0230e5 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -69,14 +69,11 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) BOOL WINAPI IsThemeDialogTextureEnabled(HWND hwnd) { DWORD dwDialogTextureFlags; + TRACE("(%p)\n", hwnd); dwDialogTextureFlags = HandleToUlong( GetPropW( hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled) )); - if (dwDialogTextureFlags == 0) - /* Means EnableThemeDialogTexture wasn't called for this dialog */ - return TRUE; - - return (dwDialogTextureFlags & ETDT_ENABLE) && !(dwDialogTextureFlags & ETDT_DISABLE); + return dwDialogTextureFlags && !(dwDialogTextureFlags & ETDT_DISABLE); } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 03e435eb463..93994fa8364 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1649,12 +1649,12 @@ static void test_EnableThemeDialogTexture(void) } invalid_flag_tests[] = { - {0, FALSE}, + {0, FALSE, TRUE}, {ETDT_DISABLE | ETDT_ENABLE, FALSE}, {ETDT_ENABLETAB | ETDT_ENABLEAEROWIZARDTAB, TRUE}, - {ETDT_USETABTEXTURE | ETDT_USEAEROWIZARDTABTEXTURE, TRUE, TRUE}, + {ETDT_USETABTEXTURE | ETDT_USEAEROWIZARDTABTEXTURE, TRUE}, {ETDT_VALIDBITS, FALSE}, - {~ETDT_VALIDBITS, FALSE}, + {~ETDT_VALIDBITS, FALSE, TRUE}, {~ETDT_VALIDBITS | ETDT_DISABLE, FALSE} }; @@ -1746,7 +1746,6 @@ static void test_EnableThemeDialogTexture(void) /* Test dialog texture is disabled by default. EnableThemeDialogTexture() needs to be called */ ret = IsThemeDialogTextureEnabled(dialog); - todo_wine ok(!ret, "Expected theme dialog texture disabled.\n"); ok(GetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); @@ -2021,7 +2020,7 @@ static void test_EnableThemeDialogTexture(void) "EnableThemeDialogTexture first flag", FALSE); ret = IsThemeDialogTextureEnabled(dialog); /* Non-zero flags without ETDT_DISABLE enables dialog texture */ - todo_wine_if(flags[i] == ETDT_USETABTEXTURE || flags[i] == ETDT_USEAEROWIZARDTABTEXTURE) + todo_wine_if(flags[i] == 0) ok(ret == (!(flags[i] & ETDT_DISABLE) && flags[i]), "Wrong dialog texture status.\n"); child = GetDlgItem(dialog, 100); @@ -2044,10 +2043,9 @@ static void test_EnableThemeDialogTexture(void) ret = IsThemeDialogTextureEnabled(dialog); /* If the flag is zero, it will have previous dialog texture status */ if (flags[j]) - todo_wine_if(flags[j] == ETDT_USETABTEXTURE || flags[j] == ETDT_USEAEROWIZARDTABTEXTURE) ok(ret == !(flags[j] & ETDT_DISABLE), "Wrong dialog texture status.\n"); else - todo_wine_if((!(flags[i] & ETDT_DISABLE) && flags[i])) + todo_wine_if(!flags[i] || flags[i] == ETDT_DISABLE || flags[i] == (ETDT_DISABLE | ETDT_ENABLE)) ok(ret == (!(flags[i] & ETDT_DISABLE) && flags[i]), "Wrong dialog texture status.\n"); lr = SendMessageA(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); ok(lr != 0, "WM_ERASEBKGND failed.\n"); @@ -2159,12 +2157,12 @@ static void test_EnableThemeDialogTexture(void) 0, 0, NULL); ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); ret = IsThemeDialogTextureEnabled(hwnd); - todo_wine ok(!ret, "Wrong dialog texture status.\n"); child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, 0, 0, NULL); ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); ret = IsThemeDialogTextureEnabled(hwnd); + todo_wine ok(ret, "Wrong dialog texture status.\n"); /* Test that if you move the child control to another window, it doesn't enables tab texture for @@ -2173,18 +2171,15 @@ static void test_EnableThemeDialogTexture(void) 0, 0, NULL); ok(hwnd2 != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); ret = IsThemeDialogTextureEnabled(hwnd2); - todo_wine ok(!ret, "Wrong dialog texture status.\n"); SetParent(child, hwnd2); ok(GetParent(child) == hwnd2, "Wrong parent.\n"); ret = IsThemeDialogTextureEnabled(hwnd2); - todo_wine ok(!ret, "Wrong dialog texture status.\n"); InvalidateRect(child, NULL, TRUE); flush_events(); ret = IsThemeDialogTextureEnabled(hwnd2); - todo_wine ok(!ret, "Wrong dialog texture status.\n"); DestroyWindow(hwnd2); -- 2.32.0

1 0

[PATCH 4/5] uxtheme: Do not call SetWindowTheme() in EnableThemeDialogTexture().
by Zhiyi Zhang 21 Jan '22

21 Jan '22

It's no longer necessary to call SetWindowTheme() in EnableThemeDialogTexture() because dialog theming doesn't need to open theme handles associated with the dialog. Calling SetWindowTheme() also sends extra messages. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/draw.c | 7 +------ dlls/uxtheme/tests/system.c | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 04ea1e79df9..a7942b03f97 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -60,12 +60,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) res = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), UlongToHandle(dwFlags|0x80000000)); /* 0x80000000 serves as a "flags set" flag */ - if (!res) - return HRESULT_FROM_WIN32(GetLastError()); - if (dwFlags & ETDT_USETABTEXTURE) - return SetWindowTheme (hwnd, NULL, L"Tab"); - else - return SetWindowTheme (hwnd, NULL, NULL); + return res ? S_OK : HRESULT_FROM_WIN32(GetLastError()); } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 3f8f32a9a7b..03e435eb463 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2018,7 +2018,7 @@ static void test_EnableThemeDialogTexture(void) hr = EnableThemeDialogTexture(dialog, flags[i]); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, - "EnableThemeDialogTexture first flag", TRUE); + "EnableThemeDialogTexture first flag", FALSE); ret = IsThemeDialogTextureEnabled(dialog); /* Non-zero flags without ETDT_DISABLE enables dialog texture */ todo_wine_if(flags[i] == ETDT_USETABTEXTURE || flags[i] == ETDT_USEAEROWIZARDTABTEXTURE) @@ -2040,7 +2040,7 @@ static void test_EnableThemeDialogTexture(void) hr = EnableThemeDialogTexture(dialog, flags[j]); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, - "EnableThemeDialogTexture second flag", TRUE); + "EnableThemeDialogTexture second flag", FALSE); ret = IsThemeDialogTextureEnabled(dialog); /* If the flag is zero, it will have previous dialog texture status */ if (flags[j]) -- 2.32.0

1 0

[PATCH 3/5] comctl32/tests: Remove WM_CTLCOLORSTATIC tests for property sheets.
by Zhiyi Zhang 21 Jan '22

21 Jan '22

The removed tests are covered by test_EnableThemeDialogTexture() in uxtheme/tests/system.c. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/propsheet.c | 229 ++------------------------------ 1 file changed, 14 insertions(+), 215 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index affd21da825..0284311c81b 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -20,8 +20,6 @@ #include <windows.h> #include <commctrl.h> -#include <uxtheme.h> -#include <vsstyle.h> #include "msg.h" #include "resources.h" @@ -45,13 +43,8 @@ static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageW)(const PROPSHEETPAGEW * static BOOL (WINAPI *pDestroyPropertySheetPage)(HPROPSHEETPAGE proppage); static INT_PTR (WINAPI *pPropertySheetA)(const PROPSHEETHEADERA *header); -static HRESULT (WINAPI *pCloseThemeData)(HTHEME); -static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); -static HRESULT (WINAPI *pGetThemePartSize)(HTHEME, HDC, int, int, RECT *, THEMESIZE, SIZE *); -static HTHEME (WINAPI *pGetWindowTheme)(HWND); static BOOL (WINAPI *pIsThemeActive)(void); static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); -static HTHEME (WINAPI *pOpenThemeData)(HWND, LPCWSTR); static void detect_locale(void) { @@ -1198,26 +1191,12 @@ static void test_bad_control_class(void) DestroyWindow((HWND)ret); } -static BOOL handle_WM_CTLCOLORSTATIC; - static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - static HWND child; - switch(msg) { case WM_INITDIALOG: sheethwnd = hwnd; - child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, hwnd, - (HMENU)100, 0, NULL); - ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); - return FALSE; - - case WM_CTLCOLORSTATIC: - return (INT_PTR)(handle_WM_CTLCOLORSTATIC ? GetSysColorBrush(COLOR_MENU) : 0); - - case WM_CLOSE: - DestroyWindow(child); return FALSE; default: @@ -1225,26 +1204,16 @@ static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM } } -static void test_WM_CTLCOLORSTATIC(void) +static void test_page_dialog_texture(void) { - HWND hdlg, child, parent, hwnd; - COLORREF color, old_color; - int mode, old_mode, count; - HBRUSH hbrush, hbrush2; HPROPSHEETPAGE hpsp[1]; PROPSHEETHEADERA psh; - HDC child_hdc, hdc; - LOGBRUSH log_brush; PROPSHEETPAGEA psp; ULONG_PTR dlgproc; - WNDCLASSA cls; - HTHEME theme; - DWORD error; - BITMAP bmp; - HRESULT hr; - POINT org; - SIZE size; + HWND hdlg, hwnd; + HBRUSH hbrush; BOOL ret; + HDC hdc; memset(&psp, 0, sizeof(psp)); psp.dwSize = sizeof(psp); @@ -1265,193 +1234,28 @@ static void test_WM_CTLCOLORSTATIC(void) ok(hdlg != INVALID_HANDLE_VALUE, "Got invalid handle value %p.\n", hdlg); flush_events(); - child = GetDlgItem(sheethwnd, 100); - ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - parent = GetParent(child); - ok(parent == sheethwnd, "Expected parent %p, got %p.\n", sheethwnd, parent); - ok(sheethwnd != hdlg, "Expected handles not equal.\n"); - /* Test that page dialog procedure is unchanged */ dlgproc = GetWindowLongPtrA(sheethwnd, DWLP_DLGPROC); ok(dlgproc == (ULONG_PTR)test_WM_CTLCOLORSTATIC_proc, "Unexpected dlgproc %#lx.\n", dlgproc); - child_hdc = GetDC(child); - old_mode = SetBkMode(child_hdc, OPAQUE); - ok(old_mode != 0, "SetBkMode failed.\n"); - old_color = SetBkColor(child_hdc, 0xaa5511); - ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); - - /* Test that brush origin is at (0,0) */ - ret = GetBrushOrgEx(child_hdc, &org); - ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); - /* Test that theme dialog texture is enabled for comctl32 v6, even when theming is off */ ret = pIsThemeDialogTextureEnabled(sheethwnd); todo_wine_if(!is_v6) ok(ret == is_v6, "Wrong theme dialog texture status.\n"); - hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hwnd = CreateWindowA(WC_EDITA, "child", WS_POPUP | WS_VISIBLE, 1, 2, 50, 50, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + hdc = GetDC(hwnd); + + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); if (is_v6 && is_theme_active) { - /* Test that brush origin is changed after WM_CTLCOLORSTATIC */ - ret = GetBrushOrgEx(child_hdc, &org); - ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); - - /* Test that device context is set to transparent after WM_CTLCOLORSTATIC */ - mode = SetBkMode(child_hdc, old_mode); - ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); - - /* Test that the brush is a pattern brush created from the tab body bitmap in the theme */ + /* Test that dialog tab texture is enabled even without any child controls in the dialog */ ok(hbrush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - ok(hbrush != GetStockObject(NULL_BRUSH), "Expected a different brush.\n"); - hbrush2 = SelectObject(child_hdc, GetSysColorBrush(COLOR_BTNFACE)); - ok(hbrush2 != hbrush, "Expected a different brush.\n"); - - memset(&log_brush, 0, sizeof(log_brush)); - count = GetObjectA(hbrush, sizeof(log_brush), &log_brush); - ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); - ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, - log_brush.lbStyle); - - memset(&bmp, 0, sizeof(bmp)); - count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); - ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - - ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); - ok(pGetWindowTheme(sheethwnd) == NULL, "Expected NULL theme handle.\n"); - - memset(&cls, 0, sizeof(cls)); - cls.lpfnWndProc = DefWindowProcA; - cls.hInstance = GetModuleHandleA(NULL); - cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); - cls.hbrBackground = GetStockObject(WHITE_BRUSH); - cls.lpszClassName = "TestClass"; - RegisterClassA(&cls); - - hwnd = CreateWindowA("TestClass", "test", WS_POPUP | WS_VISIBLE, 0, 0, 4, 4, 0, 0, 0, NULL); - ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); - theme = pOpenThemeData(hwnd, L"Tab"); - ok(theme != NULL, "OpenThemeData failed.\n"); - - size.cx = 0; - size.cy = 0; - hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); - ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); - - pCloseThemeData(theme); - - /* Test that other controls besides static controls also get the same brush */ - hdc = GetDC(hwnd); - old_mode = SetBkMode(hdc, OPAQUE); - ok(old_mode != 0, "SetBkMode failed.\n"); - hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); - ok(hbrush2 == hbrush, "Expected the same brush.\n"); - mode = SetBkMode(hdc, old_mode); - ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); - ReleaseDC(hwnd, hdc); - DestroyWindow(hwnd); - UnregisterClassA("TestClass", GetModuleHandleA(NULL)); - - /* Test disabling theme dialog texture should change the brush */ - hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - hr = pEnableThemeDialogTexture(sheethwnd, ETDT_DISABLE); - ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); - hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(hbrush2 != hbrush, "Expected a different brush.\n"); - ok(hbrush2 == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", - GetSysColorBrush(COLOR_BTNFACE), hbrush2); - - /* Test re-enabling theme dialog texture with ETDT_ENABLE doesn't change the brush*/ - hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE); - ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); - hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(hbrush2 != hbrush) - ok(hbrush2 == hbrush, "Expected the same brush.\n"); - - /* Test ETDT_ENABLE | ETDT_USETABTEXTURE should change the brush */ - hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE | ETDT_USETABTEXTURE); - ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); - hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(hbrush2 == hbrush) - ok(hbrush2 != hbrush, "Expected a different brush.\n"); - - /* Test ETDT_ENABLE | ETDT_USEAEROWIZARDTABTEXTURE should change the brush */ - hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE | ETDT_USEAEROWIZARDTABTEXTURE); - ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); - hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - /* ETDT_USEAEROWIZARDTABTEXTURE is supported only on Vista+ */ - if (LOBYTE(LOWORD(GetVersion())) < 6) - ok(hbrush2 == hbrush, "Expected the same brush.\n"); - else - todo_wine_if(hbrush2 == hbrush) - ok(hbrush2 != hbrush, "Expected a different brush.\n"); - - hr = pEnableThemeDialogTexture(sheethwnd, ETDT_DISABLE); - ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); - hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE | ETDT_USETABTEXTURE); - ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); - - /* Test that the page procedure should take precedence if WM_CTLCOLORSTATIC is handled */ - handle_WM_CTLCOLORSTATIC = TRUE; - hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(hbrush == GetSysColorBrush(COLOR_MENU), "Expected brush %p, got %p.\n", - GetSysColorBrush(COLOR_MENU), hbrush); - handle_WM_CTLCOLORSTATIC = FALSE; - - /* Test that the brush is not a system object and has only one reference and shouldn't be freed */ - hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ret = DeleteObject(hbrush); - ok(ret, "DeleteObject failed, error %u.\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); - error = GetLastError(); - ok(!ret, "GetObjectA succeeded.\n"); - todo_wine - ok(error == ERROR_INVALID_PARAMETER, "Expected error %u, got %u.\n", - ERROR_INVALID_PARAMETER, error); - ret = DeleteObject(hbrush); - ok(!ret, "DeleteObject succeeded.\n"); - - /* Should still report the same brush handle after the brush handle was freed */ - hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(hbrush2 == hbrush, "Expected the same brush.\n"); - - /* Test that WM_THEMECHANGED should recreate the brush */ - hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - SendMessageW(sheethwnd, WM_THEMECHANGED, 0, 0); - hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(hbrush2 != hbrush, "Expected a different brush.\n"); - ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); - ok(!ret, "GetObjectA succeeded.\n"); } - else - { - /* Test that brush origin is at (0,0) */ - ret = GetBrushOrgEx(child_hdc, &org); - ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - todo_wine_if(is_theme_active) - ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); - todo_wine_if(is_theme_active) - ok(hbrush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", - GetSysColorBrush(COLOR_BTNFACE), hbrush); - mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(is_theme_active) - ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); - } - color = SetBkColor(child_hdc, old_color); - ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", - GetSysColor(COLOR_BTNFACE), color); - - ReleaseDC(child, child_hdc); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); DestroyWindow(hdlg); } @@ -1472,13 +1276,8 @@ static void init_uxtheme_functions(void) HMODULE uxtheme = LoadLibraryA("uxtheme.dll"); #define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); - X(CloseThemeData) - X(EnableThemeDialogTexture) - X(GetThemePartSize) - X(GetWindowTheme) X(IsThemeActive) X(IsThemeDialogTextureEnabled) - X(OpenThemeData) #undef X } @@ -1511,7 +1310,7 @@ START_TEST(propsheet) test_PSM_ADDPAGE(); test_PSM_INSERTPAGE(); test_CreatePropertySheetPage(); - test_WM_CTLCOLORSTATIC(); + test_page_dialog_texture(); if (!load_v6_module(&ctx_cookie, &ctx)) return; @@ -1519,7 +1318,7 @@ START_TEST(propsheet) init_comctl32_functions(); is_v6 = TRUE; - test_WM_CTLCOLORSTATIC(); + test_page_dialog_texture(); unload_v6_module(ctx_cookie, ctx); } -- 2.32.0

1 0

[PATCH 2/5] comctl32/tests: Remove WM_CTLCOLORSTATIC tests for static controls.
by Zhiyi Zhang 21 Jan '22

21 Jan '22

These tests are covered by test_EnableThemeDialogTexture() in uxtheme/tests/system.c. These tests are also misleading because a WM_ERASEBKGND message is needed to actually activate dialog theming. Without the message, they give the impression that EnableThemeDialogTexture() does nothing and DefDlgProcA/W() are not hooked. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/static.c | 120 ----------------------------------- 1 file changed, 120 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 529396b3f0d..40a337b97b0 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -27,7 +27,6 @@ #include "winuser.h" #include "commctrl.h" #include "resources.h" -#include "uxtheme.h" #include "wine/test.h" @@ -40,10 +39,6 @@ static HWND hMainWnd; static int g_nReceivedColorStatic; -static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); -static HTHEME (WINAPI *pGetWindowTheme)(HWND); -static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); - /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -382,118 +377,6 @@ static void test_STM_SETIMAGE(void) DeleteEnhMetaFile(emf); } -static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) -{ - static HWND child; - - switch (msg) - { - case WM_INITDIALOG: - child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, hwnd, - (HMENU)100, 0, NULL); - ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); - return FALSE; - - case WM_CLOSE: - DestroyWindow(child); - return TRUE; - - default: - return FALSE; - } -} - -static void test_WM_CTLCOLORSTATIC(void) -{ - HWND parent, dialog, child; - COLORREF color, old_color; - HDC child_hdc, dialog_hdc; - int mode, old_mode; - HBRUSH brush; - HRESULT hr; - POINT org; - BOOL ret; - - struct - { - DLGTEMPLATE tmplate; - WORD menu; - WORD class; - WORD title; - } temp = {{0}}; - - parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, - NULL); - ok(parent != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); - - temp.tmplate.style = WS_CHILD | WS_VISIBLE; - temp.tmplate.cx = 80; - temp.tmplate.cy = 80; - dialog = CreateDialogIndirectParamA(NULL, &temp.tmplate, parent, test_WM_CTLCOLORSTATIC_proc, 0); - ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); - child = GetDlgItem(dialog, 100); - ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - - dialog_hdc = GetDC(dialog); - child_hdc = GetDC(child); - PatBlt(dialog_hdc, 0, 0, 80, 80, BLACKNESS); - - old_mode = SetBkMode(child_hdc, OPAQUE); - ok(old_mode != 0, "SetBkMode failed.\n"); - old_color = SetBkColor(child_hdc, 0xaa5511); - ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); - - ret = pIsThemeDialogTextureEnabled(dialog); - ok(ret, "Expected theme dialog texture supported.\n"); - ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); - - brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", - GetSysColorBrush(COLOR_BTNFACE), brush); - color = SetBkColor(child_hdc, old_color); - ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", - GetSysColor(COLOR_BTNFACE), color); - mode = SetBkMode(child_hdc, old_mode); - ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); - color = GetPixel(dialog_hdc, 40, 40); - ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); - - /* Test that EnableThemeDialogTexture() doesn't make WM_CTLCOLORSTATIC return a different brush */ - hr = pEnableThemeDialogTexture(dialog, ETDT_DISABLE); - ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); - ret = pIsThemeDialogTextureEnabled(dialog); - ok(!ret, "Expected theme dialog texture disabled.\n"); - hr = pEnableThemeDialogTexture(dialog, ETDT_ENABLETAB); - ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); - ret = pIsThemeDialogTextureEnabled(dialog); - ok(ret, "Expected theme dialog texture enabled.\n"); - - brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", - GetSysColorBrush(COLOR_BTNFACE), brush); - - /* Test that WM_CTLCOLORSTATIC doesn't change brush origin */ - ret = GetBrushOrgEx(child_hdc, &org); - ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); - - ReleaseDC(child, child_hdc); - ReleaseDC(dialog, dialog_hdc); - EndDialog(dialog, 0); - DestroyWindow(parent); -} - -static void init_functions(void) -{ - HMODULE uxtheme = LoadLibraryA("uxtheme.dll"); - -#define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); - X(EnableThemeDialogTexture) - X(GetWindowTheme) - X(IsThemeDialogTextureEnabled) -#undef X -} - START_TEST(static) { static const char classname[] = "testclass"; @@ -504,8 +387,6 @@ START_TEST(static) if (!load_v6_module(&ctx_cookie, &hCtx)) return; - init_functions(); - wndclass.cbSize = sizeof(wndclass); wndclass.style = CS_HREDRAW | CS_VREDRAW; wndclass.lpfnWndProc = WndProc; @@ -536,7 +417,6 @@ START_TEST(static) test_set_text(); test_set_image(); test_STM_SETIMAGE(); - test_WM_CTLCOLORSTATIC(); DestroyWindow(hMainWnd); -- 2.32.0

1 0

[PATCH 1/5] uxtheme/tests: Add EnableThemeDialogTexture() tests.
by Zhiyi Zhang 21 Jan '22

21 Jan '22

These tests show that DefDlgProcA/W() are hooked to implemented dialog theming, using a pattern brush created from the tab body part. For dialogs that need theming, EnableThemeDialogTexture(ETDT_USETABTEXTURE) or EnableThemeDialogTexture(ETDT_USEAEROWIZARDTABTEXTURE) is called for the dialog. And then static or button controls in comctl32 v6 call EnableThemeDialogTexture(ETDT_ENABLE) to activate it. A WM_ERASEBKGND is also needed to activate dialog theming. test_WM_CTLCOLORSTATIC() in dlls/comctl32/tests/static.c doesn't send this message after EnableThemeDialogTexture() calls, which misdirected me to think that DefDlgProcA/W() are not hooked. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 658 ++++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/v6util.h | 131 +++++++ 2 files changed, 789 insertions(+) create mode 100644 dlls/uxtheme/tests/v6util.h diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 0385af663e3..3f8f32a9a7b 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1,6 +1,7 @@ /* Unit test suite for uxtheme API functions * * Copyright 2006 Paul Vriens + * Copyright 2021-2022 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,6 +34,8 @@ #include "msg.h" #include "wine/test.h" +#include "v6util.h" + static HTHEME (WINAPI * pOpenThemeDataEx)(HWND, LPCWSTR, DWORD); static HTHEME (WINAPI *pOpenThemeDataForDpi)(HWND, LPCWSTR, UINT); static HPAINTBUFFER (WINAPI *pBeginBufferedPaint)(HDC, const RECT *, BP_BUFFERFORMAT, BP_PAINTPARAMS *, HDC *); @@ -1545,8 +1548,656 @@ static void test_DrawThemeParentBackground(void) UnregisterClassA("TestDrawThemeParentBackgroundClass", GetModuleHandleA(0)); } +struct test_EnableThemeDialogTexture_param +{ + const CHAR *class_name; + DWORD style; +}; + +static const struct message empty_seq[] = +{ + {0} +}; + +static HWND dialog_child; +static DWORD dialog_init_flag; +static BOOL handle_WM_CTLCOLORSTATIC; + +static INT_PTR CALLBACK test_EnableThemeDialogTexture_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + struct test_EnableThemeDialogTexture_param *param; + struct message message = {0}; + + message.message = msg; + message.flags = sent | wparam | lparam; + message.wParam = wp; + message.lParam = lp; + add_message(sequences, PARENT_SEQ_INDEX, &message); + + switch (msg) + { + case WM_INITDIALOG: + param = (struct test_EnableThemeDialogTexture_param *)lp; + dialog_child = CreateWindowA(param->class_name, "child", + param->style | WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, hwnd, + (HMENU)100, 0, NULL); + ok(dialog_child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + if (dialog_init_flag) + EnableThemeDialogTexture(hwnd, dialog_init_flag); + return TRUE; + + case WM_CTLCOLORSTATIC: + return (INT_PTR)(handle_WM_CTLCOLORSTATIC ? GetSysColorBrush(COLOR_MENU) : 0); + + case WM_CLOSE: + DestroyWindow(dialog_child); + dialog_child = NULL; + return TRUE; + + default: + return FALSE; + } +} + +static void test_EnableThemeDialogTexture(void) +{ + struct test_EnableThemeDialogTexture_param param; + HWND dialog, child, hwnd, hwnd2; + int mode, old_mode, count, i, j; + COLORREF color, old_color; + HBRUSH brush, brush2; + HDC child_hdc, hdc; + LOGBRUSH log_brush; + ULONG_PTR proc; + WNDCLASSA cls; + HTHEME theme; + DWORD error; + BITMAP bmp; + HRESULT hr; + LRESULT lr; + POINT org; + SIZE size; + BOOL ret; + + struct + { + DLGTEMPLATE template; + WORD menu; + WORD class; + WORD title; + } temp = {{0}}; + + static const DWORD flags[] = + { + ETDT_DISABLE, + ETDT_ENABLE, + ETDT_USETABTEXTURE, + ETDT_USEAEROWIZARDTABTEXTURE, + ETDT_ENABLETAB, + ETDT_ENABLEAEROWIZARDTAB, + /* Bad flags */ + 0, + ETDT_DISABLE | ETDT_ENABLE, + ETDT_ENABLETAB | ETDT_ENABLEAEROWIZARDTAB + }; + + static const struct invalid_flag_test + { + DWORD flag; + BOOL enabled; + BOOL todo; + } + invalid_flag_tests[] = + { + {0, FALSE}, + {ETDT_DISABLE | ETDT_ENABLE, FALSE}, + {ETDT_ENABLETAB | ETDT_ENABLEAEROWIZARDTAB, TRUE}, + {ETDT_USETABTEXTURE | ETDT_USEAEROWIZARDTABTEXTURE, TRUE, TRUE}, + {ETDT_VALIDBITS, FALSE}, + {~ETDT_VALIDBITS, FALSE}, + {~ETDT_VALIDBITS | ETDT_DISABLE, FALSE} + }; + + static const struct class_test + { + struct test_EnableThemeDialogTexture_param param; + BOOL texture_enabled; + } + class_tests[] = + { + {{ANIMATE_CLASSA}}, + {{WC_BUTTONA, BS_PUSHBUTTON}, TRUE}, + {{WC_BUTTONA, BS_DEFPUSHBUTTON}, TRUE}, + {{WC_BUTTONA, BS_CHECKBOX}, TRUE}, + {{WC_BUTTONA, BS_AUTOCHECKBOX}, TRUE}, + {{WC_BUTTONA, BS_RADIOBUTTON}, TRUE}, + {{WC_BUTTONA, BS_3STATE}, TRUE}, + {{WC_BUTTONA, BS_AUTO3STATE}, TRUE}, + {{WC_BUTTONA, BS_GROUPBOX}, TRUE}, + {{WC_BUTTONA, BS_USERBUTTON}, TRUE}, + {{WC_BUTTONA, BS_AUTORADIOBUTTON}, TRUE}, + {{WC_BUTTONA, BS_PUSHBOX}, TRUE}, + {{WC_BUTTONA, BS_OWNERDRAW}, TRUE}, + {{WC_BUTTONA, BS_SPLITBUTTON}, TRUE}, + {{WC_BUTTONA, BS_DEFSPLITBUTTON}, TRUE}, + {{WC_BUTTONA, BS_COMMANDLINK}, TRUE}, + {{WC_BUTTONA, BS_DEFCOMMANDLINK}, TRUE}, + {{WC_COMBOBOXA}}, + {{WC_COMBOBOXEXA}}, + {{DATETIMEPICK_CLASSA}}, + {{WC_EDITA}}, + {{WC_HEADERA}}, + {{HOTKEY_CLASSA}}, + {{WC_IPADDRESSA}}, + {{WC_LISTBOXA}}, + {{WC_LISTVIEWA}}, + {{MONTHCAL_CLASSA}}, + {{WC_NATIVEFONTCTLA}}, + {{WC_PAGESCROLLERA}}, + {{PROGRESS_CLASSA}}, + {{REBARCLASSNAMEA}}, + {{WC_STATICA, SS_LEFT}, TRUE}, + {{WC_STATICA, SS_ICON}, TRUE}, + {{WC_STATICA, SS_BLACKRECT}, TRUE}, + {{WC_STATICA, SS_OWNERDRAW}, TRUE}, + {{WC_STATICA, SS_BITMAP}, TRUE}, + {{WC_STATICA, SS_ENHMETAFILE}, TRUE}, + {{WC_STATICA, SS_ETCHEDHORZ}, TRUE}, + {{STATUSCLASSNAMEA}}, + {{"SysLink"}}, + {{WC_TABCONTROLA}}, + {{TOOLBARCLASSNAMEA}}, + {{TOOLTIPS_CLASSA}}, + {{TRACKBAR_CLASSA}}, + {{WC_TREEVIEWA}}, + {{UPDOWN_CLASSA}}, + {{WC_SCROLLBARA}}, + }; + + if (!IsThemeActive()) + { + skip("Theming is inactive.\n"); + return; + } + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = DefWindowProcA; + cls.hInstance = GetModuleHandleA(NULL); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(GRAY_BRUSH); + cls.lpszClassName = "TestEnableThemeDialogTextureClass"; + RegisterClassA(&cls); + + temp.template.style = WS_CHILD | WS_VISIBLE; + temp.template.cx = 100; + temp.template.cy = 100; + param.class_name = cls.lpszClassName; + param.style = 0; + dialog = CreateDialogIndirectParamA(NULL, &temp.template, GetDesktopWindow(), + test_EnableThemeDialogTexture_proc, (LPARAM)&param); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); + child = GetDlgItem(dialog, 100); + ok(child != NULL, "Failed to get child control, error %d.\n", GetLastError()); + child_hdc = GetDC(child); + + /* Test that dialog procedure is unchanged */ + proc = GetWindowLongPtrA(dialog, DWLP_DLGPROC); + ok(proc == (ULONG_PTR)test_EnableThemeDialogTexture_proc, "Unexpected proc %#lx.\n", proc); + + /* Test dialog texture is disabled by default. EnableThemeDialogTexture() needs to be called */ + ret = IsThemeDialogTextureEnabled(dialog); + todo_wine + ok(!ret, "Expected theme dialog texture disabled.\n"); + ok(GetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); + + /* Test ETDT_ENABLE | ETDT_USETABTEXTURE doesn't take effect immediately */ + hr = EnableThemeDialogTexture(dialog, ETDT_ENABLE | ETDT_USETABTEXTURE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ret = IsThemeDialogTextureEnabled(dialog); + ok(ret, "Expected theme dialog texture enabled.\n"); + + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), brush); + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + + /* Test WM_THEMECHANGED doesn't make ETDT_ENABLE | ETDT_USETABTEXTURE take effect */ + lr = SendMessageA(dialog, WM_THEMECHANGED, 0, 0); + ok(lr == 0, "WM_THEMECHANGED failed.\n"); + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), brush); + + /* Test WM_ERASEBKGND make ETDT_ENABLE | ETDT_USETABTEXTURE take effect */ + lr = SendMessageA(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); + ok(lr != 0, "WM_ERASEBKGND failed.\n"); + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected brush changed.\n"); + + /* Test disabling theme dialog texture should change the brush immediately */ + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = EnableThemeDialogTexture(dialog, ETDT_DISABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + brush2 = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine + ok(brush2 != brush, "Expected a different brush.\n"); + ok(brush2 == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), brush2); + + /* Test re-enabling theme dialog texture with ETDT_ENABLE doesn't change the brush */ + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = EnableThemeDialogTexture(dialog, ETDT_ENABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + brush2 = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush2 == brush, "Expected the same brush.\n"); + ok(brush2 == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), brush2); + + /* Test adding ETDT_USETABTEXTURE should change the brush immediately */ + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = EnableThemeDialogTexture(dialog, ETDT_USETABTEXTURE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + brush2 = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine + ok(brush2 != brush, "Expected a different brush.\n"); + + /* Test ETDT_ENABLE | ETDT_USEAEROWIZARDTABTEXTURE should change the brush immediately */ + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = EnableThemeDialogTexture(dialog, ETDT_ENABLE | ETDT_USEAEROWIZARDTABTEXTURE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + brush2 = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + /* ETDT_USEAEROWIZARDTABTEXTURE is supported only on Vista+ */ + if (LOBYTE(LOWORD(GetVersion())) < 6) + ok(brush2 == brush, "Expected the same brush.\n"); + else + todo_wine + ok(brush2 != brush, "Expected a different brush.\n"); + + hr = EnableThemeDialogTexture(dialog, ETDT_DISABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + hr = EnableThemeDialogTexture(dialog, ETDT_ENABLE | ETDT_USETABTEXTURE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + + /* Test that the dialog procedure should take precedence over DefDlgProc() for WM_CTLCOLORSTATIC */ + handle_WM_CTLCOLORSTATIC = TRUE; + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush == GetSysColorBrush(COLOR_MENU), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_MENU), brush); + handle_WM_CTLCOLORSTATIC = FALSE; + + /* Test that WM_CTLCOLORSTATIC changes brush origin when dialog texture is on */ + ret = SetBrushOrgEx(child_hdc, 0, 0, NULL); + ok(ret, "SetBrushOrgEx failed, error %u.\n", GetLastError()); + SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + todo_wine + ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); + + /* Test that WM_CTLCOLORSTATIC changes background mode when dialog texture is on */ + old_mode = SetBkMode(child_hdc, OPAQUE); + ok(old_mode != 0, "SetBkMode failed.\n"); + SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + mode = SetBkMode(child_hdc, old_mode); + todo_wine + ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); + + /* Test that WM_CTLCOLORSTATIC changes background color when dialog texture is on */ + old_color = SetBkColor(child_hdc, 0xaa5511); + ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + color = SetBkColor(child_hdc, old_color); + ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", + GetSysColor(COLOR_BTNFACE), color); + + /* Test that dialog doesn't have theme handle opened for itself */ + ok(GetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); + + /* Test that the returned brush is a pattern brush created from the tab body */ + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + memset(&log_brush, 0, sizeof(log_brush)); + count = GetObjectA(brush, sizeof(log_brush), &log_brush); + ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); + todo_wine + ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); + todo_wine + ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, + log_brush.lbStyle); + + memset(&bmp, 0, sizeof(bmp)); + count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); + todo_wine + ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); + + theme = OpenThemeData(NULL, L"Tab"); + ok(theme != NULL, "OpenThemeData failed.\n"); + + size.cx = 0; + size.cy = 0; + hr = GetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); + ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); + todo_wine + ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); + todo_wine + ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); + + CloseThemeData(theme); + + /* Test that DefDlgProcA/W() are hooked for WM_CTLCOLORSTATIC */ + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); + brush2 = (HBRUSH)DefDlgProcW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush2 == brush, "Expected the same brush.\n"); + brush2 = (HBRUSH)DefDlgProcA(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush2 == brush, "Expected the same brush.\n"); + + /* Test that DefWindowProcA/W() are also hooked for WM_CTLCOLORSTATIC */ + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); + brush2 = (HBRUSH)DefWindowProcW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush2 == brush, "Expected the same brush.\n"); + brush2 = (HBRUSH)DefWindowProcA(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush2 == brush, "Expected the same brush.\n"); + + /* Test that DefWindowProcA/W() are not hooked for WM_ERASEBKGND. So the background is still + * drawn with hbrBackground, which in this case, is GRAY_BRUSH. + * + * This test means it could be that both DefWindowProc() and DefDlgProc() are hooked for + * WM_CTLCOLORSTATIC and only DefDlgProc() is hooked for WM_ERASEBKGND. Or it could mean + * DefWindowProc() is hooked for WM_CTLCOLORSTATIC and DefDlgProc() is hooked for WM_ERASEBKGND. + * Considering the dialog theming needs a WM_ERASEBKGND to activate, it would be weird for let + * only DefWindowProc() to hook WM_CTLCOLORSTATIC. For example, what's the point of hooking + * WM_CTLCOLORSTATIC in DefWindowProc() for a feature that can only be activated in + * DefDlgProc()? So I tend to believe both DefWindowProc() and DefDlgProc() are hooked for + * WM_CTLCOLORSTATIC */ + hwnd = CreateWindowA(cls.lpszClassName, "parent", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, 0, 0, + 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + hwnd2 = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 10, 10, 20, 20, hwnd, NULL, 0, + NULL); + hr = EnableThemeDialogTexture(hwnd, ETDT_ENABLETAB); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ret = IsThemeDialogTextureEnabled(hwnd); + ok(ret, "Wrong dialog texture status.\n"); + flush_events(); + + hdc = GetDC(hwnd); + color = GetPixel(hdc, 0, 0); + ok(color == 0x808080 || broken(color == 0xffffffff), /* Win 7 may report 0xffffffff */ + "Expected color %#x, got %#x.\n", 0x808080, color); + color = GetPixel(hdc, 50, 50); + ok(color == 0x808080 || broken(color == 0xffffffff), /* Win 7 may report 0xffffffff */ + "Expected color %#x, got %#x.\n", 0x808080, color); + color = GetPixel(hdc, 99, 99); + ok(color == 0x808080 || broken(color == 0xffffffff), /* Win 7 may report 0xffffffff */ + "Expected color %#x, got %#x.\n", 0x808080, color); + ReleaseDC(hwnd, hdc); + + /* Test EnableThemeDialogTexture() doesn't work for non-dialog windows */ + hdc = GetDC(hwnd2); + brush = (HBRUSH)SendMessageW(hwnd, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd2); + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); + ReleaseDC(hwnd2, hdc); + + DestroyWindow(hwnd); + + /* Test that the brush is not a system object and has only one reference and shouldn't be freed */ + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ret = DeleteObject(brush); + ok(ret, "DeleteObject failed, error %u.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetObjectA(brush, sizeof(log_brush), &log_brush); + error = GetLastError(); + todo_wine + ok(!ret || broken(ret) /* XP */, "GetObjectA succeeded.\n"); + todo_wine + ok(error == ERROR_INVALID_PARAMETER || broken(error == 0xdeadbeef) /* XP */, + "Expected error %u, got %u.\n", ERROR_INVALID_PARAMETER, error); + ret = DeleteObject(brush); + todo_wine + ok(!ret || broken(ret) /* XP */, "DeleteObject succeeded.\n"); + + /* Should still report the same brush handle after the brush handle was freed */ + brush2 = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush2 == brush, "Expected the same brush.\n"); + + /* Test WM_THEMECHANGED can update the brush now that ETDT_ENABLE | ETDT_USETABTEXTURE is in + * effect. This test needs to be ran last as it affect other tests for the same dialog for + * unknown reason, causing the brush not to update */ + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + lr = SendMessageA(dialog, WM_THEMECHANGED, 0, 0); + ok(lr == 0, "WM_THEMECHANGED failed.\n"); + brush2 = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine + ok(brush2 != brush, "Expected a different brush.\n"); + + ReleaseDC(child, child_hdc); + EndDialog(dialog, 0); + + /* Test invalid flags */ + for (i = 0; i < ARRAY_SIZE(invalid_flag_tests); ++i) + { + winetest_push_context("%d flag %#x", i, invalid_flag_tests[i].flag); + + dialog = CreateDialogIndirectParamA(NULL, &temp.template, GetDesktopWindow(), + test_EnableThemeDialogTexture_proc, (LPARAM)&param); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); + hr = EnableThemeDialogTexture(dialog, invalid_flag_tests[i].flag); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ret = IsThemeDialogTextureEnabled(dialog); + todo_wine_if(invalid_flag_tests[i].todo) + ok(ret == invalid_flag_tests[i].enabled, "Wrong dialog texture status.\n"); + EndDialog(dialog, 0); + + winetest_pop_context(); + } + + /* Test different flag combinations */ + for (i = 0; i < ARRAY_SIZE(flags); ++i) + { + for (j = 0; j < ARRAY_SIZE(flags); ++j) + { + /* ETDT_USEAEROWIZARDTABTEXTURE is supported only on Vista+ */ + if (LOBYTE(LOWORD(GetVersion())) < 6 + && ((flags[i] | flags[j]) & ETDT_USEAEROWIZARDTABTEXTURE)) + continue; + + winetest_push_context("%#x to %#x", flags[i], flags[j]); + + dialog = CreateDialogIndirectParamA(NULL, &temp.template, GetDesktopWindow(), + test_EnableThemeDialogTexture_proc, (LPARAM)&param); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + hr = EnableThemeDialogTexture(dialog, flags[i]); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "EnableThemeDialogTexture first flag", TRUE); + ret = IsThemeDialogTextureEnabled(dialog); + /* Non-zero flags without ETDT_DISABLE enables dialog texture */ + todo_wine_if(flags[i] == ETDT_USETABTEXTURE || flags[i] == ETDT_USEAEROWIZARDTABTEXTURE) + ok(ret == (!(flags[i] & ETDT_DISABLE) && flags[i]), "Wrong dialog texture status.\n"); + + child = GetDlgItem(dialog, 100); + ok(child != NULL, "Failed to get child control, error %d.\n", GetLastError()); + child_hdc = GetDC(child); + lr = SendMessageA(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); + ok(lr != 0, "WM_ERASEBKGND failed.\n"); + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + if (flags[i] == ETDT_ENABLETAB || flags[i] == ETDT_ENABLEAEROWIZARDTAB) + todo_wine + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture enabled.\n"); + else + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + hr = EnableThemeDialogTexture(dialog, flags[j]); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, + "EnableThemeDialogTexture second flag", TRUE); + ret = IsThemeDialogTextureEnabled(dialog); + /* If the flag is zero, it will have previous dialog texture status */ + if (flags[j]) + todo_wine_if(flags[j] == ETDT_USETABTEXTURE || flags[j] == ETDT_USEAEROWIZARDTABTEXTURE) + ok(ret == !(flags[j] & ETDT_DISABLE), "Wrong dialog texture status.\n"); + else + todo_wine_if((!(flags[i] & ETDT_DISABLE) && flags[i])) + ok(ret == (!(flags[i] & ETDT_DISABLE) && flags[i]), "Wrong dialog texture status.\n"); + lr = SendMessageA(dialog, WM_ERASEBKGND, (WPARAM)child_hdc, 0); + ok(lr != 0, "WM_ERASEBKGND failed.\n"); + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + /* Dialog texture is turned on when the flag contains ETDT_ENABLETAB or + * ETDT_ENABLEAEROWIZARDTAB. The flag can be turned on in multiple steps, but you can't + * do things like set ETDT_ENABLETAB and then ETDT_USEAEROWIZARDTABTEXTURE */ + if (((flags[j] == ETDT_ENABLETAB || flags[j] == ETDT_ENABLEAEROWIZARDTAB) + || ((((flags[i] | flags[j]) & ETDT_ENABLETAB) == ETDT_ENABLETAB + || ((flags[i] | flags[j]) & ETDT_ENABLEAEROWIZARDTAB) == ETDT_ENABLEAEROWIZARDTAB) + && !((flags[i] | flags[j]) & ETDT_DISABLE))) + && (((flags[i] | flags[j]) & (ETDT_ENABLETAB | ETDT_ENABLEAEROWIZARDTAB)) != (ETDT_ENABLETAB | ETDT_ENABLEAEROWIZARDTAB))) + todo_wine + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture enabled.\n"); + else + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); + + ReleaseDC(child, child_hdc); + EndDialog(dialog, 0); + + winetest_pop_context(); + } + } + + /* Test that the dialog procedure should set ETDT_USETABTEXTURE/ETDT_USEAEROWIZARDTABTEXTURE and + * find out which comctl32 class should set ETDT_ENABLE to turn on dialog texture */ + for (i = 0; i < ARRAY_SIZE(class_tests); ++i) + { + winetest_push_context("%s %#x", wine_dbgstr_a(class_tests[i].param.class_name), + class_tests[i].param.style); + + dialog = CreateDialogIndirectParamA(NULL, &temp.template, GetDesktopWindow(), + test_EnableThemeDialogTexture_proc, + (LPARAM)&class_tests[i].param); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); + /* GetDlgItem() fails to get the child control if the child is a tooltip */ + child = dialog_child; + ok(child != NULL, "Failed to get child control, error %d.\n", GetLastError()); + child_hdc = GetDC(child); + + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); + + ReleaseDC(child, child_hdc); + EndDialog(dialog, 0); + + dialog_init_flag = ETDT_ENABLE; + dialog = CreateDialogIndirectParamA(NULL, &temp.template, GetDesktopWindow(), + test_EnableThemeDialogTexture_proc, + (LPARAM)&class_tests[i].param); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); + child = dialog_child; + ok(child != NULL, "Failed to get child control, error %d.\n", GetLastError()); + child_hdc = GetDC(child); + + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); + + ReleaseDC(child, child_hdc); + EndDialog(dialog, 0); + + dialog_init_flag = ETDT_USETABTEXTURE; + dialog = CreateDialogIndirectParamA(NULL, &temp.template, GetDesktopWindow(), + test_EnableThemeDialogTexture_proc, + (LPARAM)&class_tests[i].param); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); + child = dialog_child; + ok(child != NULL, "Failed to get child control, error %d.\n", GetLastError()); + child_hdc = GetDC(child); + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + if (class_tests[i].texture_enabled) + todo_wine + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture enabled.\n"); + else + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); + ReleaseDC(child, child_hdc); + EndDialog(dialog, 0); + + if (LOBYTE(LOWORD(GetVersion())) < 6) + { + dialog_init_flag = 0; + winetest_pop_context(); + continue; + } + + dialog_init_flag = ETDT_USEAEROWIZARDTABTEXTURE; + dialog = CreateDialogIndirectParamA(NULL, &temp.template, GetDesktopWindow(), + test_EnableThemeDialogTexture_proc, + (LPARAM)&class_tests[i].param); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); + child = dialog_child; + ok(child != NULL, "Failed to get child control, error %d.\n", GetLastError()); + child_hdc = GetDC(child); + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + if (class_tests[i].texture_enabled) + todo_wine + ok(brush != GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture enabled.\n"); + else + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected tab texture disabled.\n"); + ReleaseDC(child, child_hdc); + EndDialog(dialog, 0); + dialog_init_flag = 0; + + winetest_pop_context(); + } + + /* Test that EnableThemeDialogTexture() is called from child controls for its parent */ + hwnd = CreateWindowA(cls.lpszClassName, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 200, 200, 0, + 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + ret = IsThemeDialogTextureEnabled(hwnd); + todo_wine + ok(!ret, "Wrong dialog texture status.\n"); + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, 0, 0, + NULL); + ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + ret = IsThemeDialogTextureEnabled(hwnd); + ok(ret, "Wrong dialog texture status.\n"); + + /* Test that if you move the child control to another window, it doesn't enables tab texture for + * the new parent */ + hwnd2 = CreateWindowA(cls.lpszClassName, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 200, 200, 0, + 0, 0, NULL); + ok(hwnd2 != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + ret = IsThemeDialogTextureEnabled(hwnd2); + todo_wine + ok(!ret, "Wrong dialog texture status.\n"); + + SetParent(child, hwnd2); + ok(GetParent(child) == hwnd2, "Wrong parent.\n"); + ret = IsThemeDialogTextureEnabled(hwnd2); + todo_wine + ok(!ret, "Wrong dialog texture status.\n"); + InvalidateRect(child, NULL, TRUE); + flush_events(); + ret = IsThemeDialogTextureEnabled(hwnd2); + todo_wine + ok(!ret, "Wrong dialog texture status.\n"); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); + + UnregisterClassA(cls.lpszClassName, GetModuleHandleA(NULL)); +} + START_TEST(system) { + ULONG_PTR ctx_cookie; + HANDLE ctx; + init_funcs(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); @@ -1568,6 +2219,13 @@ START_TEST(system) test_GetThemeTransitionDuration(); test_DrawThemeParentBackground(); + if (load_v6_module(&ctx_cookie, &ctx)) + { + test_EnableThemeDialogTexture(); + + unload_v6_module(ctx_cookie, ctx); + } + /* Test EnableTheming() in the end because it may disable theming */ test_EnableTheming(); } diff --git a/dlls/uxtheme/tests/v6util.h b/dlls/uxtheme/tests/v6util.h new file mode 100644 index 00000000000..626f6e61255 --- /dev/null +++ b/dlls/uxtheme/tests/v6util.h @@ -0,0 +1,131 @@ +/* + * Utility routines for comctl32 v6 tests + * + * Copyright 2006 Mike McCormack for CodeWeavers + * Copyright 2007 George Gov + * Copyright 2009 Owen Rudge for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#elif defined __arm__ +#define ARCH "arm" +#elif defined __aarch64__ +#define ARCH "arm64" +#else +#define ARCH "none" +#endif + +static const CHAR manifest_name[] = "cc6.manifest"; + +static const CHAR manifest[] = + "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n" + " <assemblyIdentity\n" + " type=\"win32\"\n" + " name=\"Wine.ComCtl32.Tests\"\n" + " version=\"1.0.0.0\"\n" + " processorArchitecture=\"" ARCH "\"\n" + " />\n" + "<description>Wine comctl32 test suite</description>\n" + "<dependency>\n" + " <dependentAssembly>\n" + " <assemblyIdentity\n" + " type=\"win32\"\n" + " name=\"microsoft.windows.common-controls\"\n" + " version=\"6.0.0.0\"\n" + " processorArchitecture=\"" ARCH "\"\n" + " publicKeyToken=\"6595b64144ccf1df\"\n" + " language=\"*\"\n" + " />\n" + "</dependentAssembly>\n" + "</dependency>\n" + "</assembly>\n"; + +static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) +{ + DeactivateActCtx(0, cookie); + ReleaseActCtx(hCtx); + + DeleteFileA(manifest_name); +} + +static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) +{ + ACTCTX_SECTION_KEYED_DATA data; + DWORD written; + HMODULE hmod; + ACTCTXA ctx; + HANDLE file; + BOOL ret; + + /* create manifest */ + file = CreateFileA( manifest_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); + if (file != INVALID_HANDLE_VALUE) + { + ret = (WriteFile( file, manifest, sizeof(manifest)-1, &written, NULL ) && + written == sizeof(manifest)-1); + CloseHandle( file ); + if (!ret) + { + DeleteFileA( manifest_name ); + skip("Failed to fill manifest file. Skipping comctl32 V6 tests.\n"); + return FALSE; + } + else + trace("created %s\n", manifest_name); + } + else + { + skip("Failed to create manifest file. Skipping comctl32 V6 tests.\n"); + return FALSE; + } + + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.lpSource = manifest_name; + + *hCtx = CreateActCtxA(&ctx); + ok(*hCtx != 0, "Expected context handle\n"); + + hmod = GetModuleHandleA("comctl32.dll"); + + ret = ActivateActCtx(*hCtx, pcookie); + ok(ret, "Failed to activate context, error %d.\n", GetLastError()); + + if (!ret) + { + win_skip("A problem during context activation occurred.\n"); + DeleteFileA(manifest_name); + } + + data.cbSize = sizeof(data); + ret = FindActCtxSectionStringA(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, + "comctl32.dll", &data); + ok(ret, "failed to find comctl32.dll in active context, %u\n", GetLastError()); + if (ret) + { + FreeLibrary(hmod); + LoadLibraryA("comctl32.dll"); + } + + return ret; +} + +#undef ARCH -- 2.32.0

1 0

[PATCH] msdasql: Connect to DSN in IDBInitialize Initialize.
by Alistair Leslie-Hughes 21 Jan '22

21 Jan '22

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/Makefile.in | 2 +- dlls/msdasql/msdasql_main.c | 63 ++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index ee8fa672623..0f5453131f6 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -1,5 +1,5 @@ MODULE = msdasql.dll -IMPORTS = uuid ole32 oleaut32 +IMPORTS = uuid ole32 oleaut32 odbc32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index bc208a74cc5..cf69195baf7 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -30,6 +30,9 @@ #include "initguid.h" #include "msdasql.h" +#include "odbcinst.h" +#include "sqlext.h" +#include "sqlucode.h" #include "msdasql_private.h" @@ -40,6 +43,22 @@ DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0 DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) +{ + SQLCHAR state[6], msg[SQL_MAX_MESSAGE_LENGTH]; + SQLINTEGER native; + SQLSMALLINT i = 1, len; + + if (!TRACE_ON(msdasql)) + return; + + while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) != SQL_SUCCESS) + { + WARN("%d: %s: %s\n", i, state, msg); + i++; + } +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -210,6 +229,10 @@ struct msdasql LONG ref; struct msdasql_prop properties[14]; + + /* ODBC Support */ + HENV henv; + HDBC hdbc; }; static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) @@ -294,6 +317,10 @@ static ULONG WINAPI msdsql_Release(IUnknown *iface) if (!ref) { + SQLDisconnect(provider->hdbc); + + SQLFreeHandle(SQL_HANDLE_DBC, provider->hdbc); + SQLFreeHandle(SQL_HANDLE_ENV, provider->henv); free(provider); } @@ -502,8 +529,33 @@ static ULONG WINAPI dbinit_Release(IDBInitialize *iface) static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) { struct msdasql *provider = impl_from_IDBInitialize(iface); + int i; + SQLRETURN ret; - FIXME("%p stub\n", provider); + FIXME("%p semi-stub\n", provider); + + for(i=0; i < sizeof(provider->properties); i++) + { + if (provider->properties[i].id == DBPROP_INIT_DATASOURCE) + break; + } + + if (i >= sizeof(provider->properties)) + { + ERR("Datasource not found\n"); + return E_FAIL; + } + + ret = SQLConnectW( provider->hdbc, (SQLWCHAR *)V_BSTR(&provider->properties[i].value), + SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS ); + TRACE("SQLConnectW ret %d\n", ret); + if (ret != SQL_SUCCESS) + { + dump_sql_diag_records(SQL_HANDLE_DBC, provider->hdbc); + + if (ret != SQL_SUCCESS_WITH_INFO) + return E_FAIL; + } return S_OK; } @@ -653,6 +705,15 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) } } + SQLAllocHandle(SQL_HANDLE_ENV, NULL, &provider->henv ); + if (SQLSetEnvAttr(provider->henv, SQL_ATTR_ODBC_VERSION, (void *)SQL_OV_ODBC3_80, 0) == SQL_ERROR) + { + WARN("Falling back to SQL_OV_ODBC3\n"); + SQLSetEnvAttr(provider->henv, SQL_ATTR_ODBC_VERSION, (void *)SQL_OV_ODBC3, 0); + } + + SQLAllocHandle(SQL_HANDLE_DBC, provider->henv, &provider->hdbc); + hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); IUnknown_Release(&provider->MSDASQL_iface); return hr; -- 2.34.1

1 0

[PATCH v2 1/2] winmm: Test that a callback passed to `waveOutOpen` can call `waveOutWrite` without getting called reentrantly.
by Liam Murphy 21 Jan '22

21 Jan '22

This behaviour is relied upon by Teardown, see https://github.com/ValveSoftware/Proton/issues/4332. Signed-off-by: Liam Murphy <liampm32(a)gmail.com> --- v2: Add `todo_wine` to avoid test failure --- dlls/winmm/tests/wave.c | 159 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2f0c8443363..05e5e3b2d71 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -865,6 +865,163 @@ EXIT: HeapFree(GetProcessHeap(), 0, frags); } +struct reentrancy_callback_data { + HANDLE hevent; + // Which thread is currently running the callback, or 0 if it isn't. + DWORD running_thread; + // How many times the callback's been called. + BOOL call_num; +}; + +static void CALLBACK reentrancy_callback_func(HWAVEOUT hwo, UINT uMsg, + DWORD_PTR dwInstance, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + struct reentrancy_callback_data *data = (struct reentrancy_callback_data *)dwInstance; + + data->call_num += 1; + + todo_wine_if(data->call_num == 3) + ok(data->running_thread != GetCurrentThreadId(), "winmm callback called reentrantly, with message %u\n", uMsg); + if (data->running_thread) { + if (data->running_thread != GetCurrentThreadId()) trace("Callback running on two threads simultaneously\n"); + + // Don't mess with what the original call was doing. + return; + } + data->running_thread = GetCurrentThreadId(); + + // We have to wait for a `WOM_DONE` event rather than just using the `WOM_OPEN` event + // so that we're running on the winmm audio thread, so that we can block it + // to prevent the next `WOM_DONE` event just getting fired in the background + // (and then presumably calling the callback on another thread?) + if (uMsg == WOM_DONE) { + if (data->call_num == 2) { + MMRESULT rc; + // Since this is the first `WOM_DONE`, and the first frame is always `frags[0]`, we know that this is actually a pointer to `frags`. + WAVEHDR *frags = (WAVEHDR *)dwParam1; + + rc = waveOutWrite(hwo, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(): rc=%s\n", wave_out_error(rc)); + + // Each frame is supposed to last 100ms, so 150ms should be enough to guarantee that the last one has finished. + Sleep(150); + + // This is needed to trigger the bug in wine, + // since winmm checks for `WOM_DONE` within `WINMM_PushData`, which this calls. + rc = waveOutWrite(hwo, &frags[1], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(): rc=%s\n", wave_out_error(rc)); + } + } + + data->running_thread = 0; + // Only do this at the end of the function so that it isn't possible for the main thread + // to mistakenly call `waveOutClose` while the test is running. + SetEvent(data->hevent); +} + +// Test whether the callback gets called reentrantly when `waveOutWrite` is called +// from within the callback passed to `waveOutOpen`. +static void wave_out_test_no_reentrancy(int device) +{ + HWAVEOUT wout; + HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); + WAVEHDR *frags = 0; + MMRESULT rc; + int headers = 2; + int loops = 0; + WAVEFORMATEX format; + WAVEFORMATEX* pwfx = &format; + DWORD flags = CALLBACK_FUNCTION; + double duration = 0.2; + DWORD_PTR callback = 0; + struct reentrancy_callback_data callback_data; + DWORD_PTR callback_instance = 0; + char * buffer; + DWORD length; + DWORD frag_length; + int i; + BOOL done; + + format.wFormatTag=WAVE_FORMAT_PCM; + format.nChannels=1; + format.wBitsPerSample=8; + format.nSamplesPerSec=22050; + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + format.cbSize=0; + + callback = (DWORD_PTR)reentrancy_callback_func; + callback_data.hevent = hevent; + callback_data.running_thread = 0; + callback_data.call_num = 0; + callback_instance = (DWORD_PTR)(&callback_data); + + wout=NULL; + rc=waveOutOpen(&wout,device,pwfx,callback,callback_instance,flags); + if (rc!=MMSYSERR_NOERROR) { + trace("`waveOutOpen` failed with rc %s, skipping", mmsys_error(rc)); + goto EXIT; + } + + rc=WaitForSingleObject(hevent,9000); + ok(rc==WAIT_OBJECT_0, "missing WOM_OPEN notification\n"); + + frags = HeapAlloc(GetProcessHeap(), 0, headers * sizeof(WAVEHDR)); + + buffer=wave_generate_silence(pwfx,duration / (loops + 1),&length); + + /* make sure fragment length is a multiple of block size */ + frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign; + + for (i = 0; i < headers; i++) { + frags[i].lpData=buffer + (i * frag_length); + if (i != (headers-1)) + frags[i].dwBufferLength=frag_length; + else { + /* use remainder of buffer for last fragment */ + frags[i].dwBufferLength=length - (i * frag_length); + } + frags[i].dwFlags=0; + frags[i].dwLoops=0; + rc=waveOutPrepareHeader(wout, &frags[i], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, + "waveOutPrepareHeader(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + } + + if (rc==MMSYSERR_NOERROR) { + // Queue up the first fragment. + rc=waveOutWrite(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s): rc=%s\n", + dev_name(device),wave_out_error(rc)); + } + + done = FALSE; + while (!done) { + rc=WaitForSingleObject(hevent,8000); + ok(rc==WAIT_OBJECT_0, "missing WOM_DONE notification\n"); + + done = TRUE; + for (i = 0; i < headers; i++) { + if (!(frags[i].dwFlags & WHDR_DONE)) { + done = FALSE; + } + } + } + + // Calling `waveOutClose` from within the callback hangs on Windows, so we have to make sure to do it here instead. + rc = waveOutClose(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutClose(): rc=%s\n", wave_out_error(rc)); + + rc=WaitForSingleObject(hevent,1500); + ok(rc==WAIT_OBJECT_0, "missing WOM_CLOSE notification\n"); + + HeapFree(GetProcessHeap(), 0, buffer); +EXIT: + CloseHandle(hevent); + HeapFree(GetProcessHeap(), 0, frags); +} + static void wave_out_test_device(UINT_PTR device) { WAVEOUTCAPSA capsA; @@ -984,6 +1141,8 @@ static void wave_out_test_device(UINT_PTR device) trace(" %s\n",wave_out_caps(capsA.dwSupport)); HeapFree(GetProcessHeap(), 0, nameA); + wave_out_test_no_reentrancy(device); + if (winetest_interactive && (device != WAVE_MAPPER)) { trace("Playing a 5 seconds reference tone.\n"); -- 2.34.1

1 1

[PATCH] gdiplus: Handle NULL elementdata.combine.left/right in delete_element
by Konstantin Romanov 21 Jan '22

21 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52423 Signed-off-by: Konstantin Romanov <incubusrk(a)gmail.com> --- dlls/gdiplus/gdiplus.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 7c4c68f162f..7b0592c184c 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -473,10 +473,14 @@ void delete_element(region_element* element) case RegionDataInfiniteRect: break; default: - delete_element(element->elementdata.combine.left); - delete_element(element->elementdata.combine.right); - heap_free(element->elementdata.combine.left); - heap_free(element->elementdata.combine.right); + if(element->elementdata.combine.left){ + delete_element(element->elementdata.combine.left); + heap_free(element->elementdata.combine.left); + } + if(element->elementdata.combine.right){ + delete_element(element->elementdata.combine.right); + heap_free(element->elementdata.combine.right); + } break; } } -- 2.33.0.windows.1

3 3

[PATCH 1/2] winmm: Test that a callback passed to `waveOutOpen` can call `waveOutWrite` without getting called reentrantly.
by Liam Murphy 21 Jan '22

21 Jan '22

This behaviour is relied upon by Teardown, see https://github.com/ValveSoftware/Proton/issues/4332. Signed-off-by: Liam Murphy <liampm32(a)gmail.com> --- dlls/winmm/tests/wave.c | 158 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2f0c8443363..986714bcbde 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -865,6 +865,162 @@ EXIT: HeapFree(GetProcessHeap(), 0, frags); } +struct reentrancy_callback_data { + HANDLE hevent; + // Which thread is currently running the callback, or 0 if it isn't. + DWORD running_thread; + // Whether we've finished our test. + BOOL test_done; +}; + +static void CALLBACK reentrancy_callback_func(HWAVEOUT hwo, UINT uMsg, + DWORD_PTR dwInstance, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + struct reentrancy_callback_data *data = (struct reentrancy_callback_data *)dwInstance; + + ok(data->running_thread != GetCurrentThreadId(), "winmm callback called reentrantly, with message %u\n", uMsg); + if (data->running_thread) { + if (data->running_thread != GetCurrentThreadId()) trace("Callback running on two threads simultaneously\n"); + + // Don't mess with what the original call was doing. + return; + } + data->running_thread = GetCurrentThreadId(); + + // We have to wait for a `WOM_DONE` event rather than just using the `WOM_OPEN` event + // so that we're running on the winmm audio thread, so that we can block it + // to prevent the next `WOM_DONE` event just getting fired in the background + // (and then presumably calling the callback on another thread?) + if (uMsg == WOM_DONE) { + if (!data->test_done) { + MMRESULT rc; + // Since this is the first `WOM_DONE`, and the first frame is always `frags[0]`, we know that this is actually a pointer to `frags`. + WAVEHDR *frags = (WAVEHDR *)dwParam1; + + rc = waveOutWrite(hwo, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(): rc=%s\n", wave_out_error(rc)); + + // Each frame is supposed to last 100ms, so 150ms should be enough to guarantee that the last one has finished. + Sleep(150); + + // This is needed to trigger the bug in wine, + // since winmm checks for `WOM_DONE` within `WINMM_PushData`, which this calls. + rc = waveOutWrite(hwo, &frags[1], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(): rc=%s\n", wave_out_error(rc)); + + data->test_done = TRUE; + } + } + + data->running_thread = 0; + // Only do this at the end of the function so that it isn't possible for the main thread + // to mistakenly call `waveOutClose` while the test is running. + SetEvent(data->hevent); +} + +// Test whether the callback gets called reentrantly when `waveOutWrite` is called +// from within the callback passed to `waveOutOpen`. +static void wave_out_test_no_reentrancy(int device) +{ + HWAVEOUT wout; + HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); + WAVEHDR *frags = 0; + MMRESULT rc; + int headers = 2; + int loops = 0; + WAVEFORMATEX format; + WAVEFORMATEX* pwfx = &format; + DWORD flags = CALLBACK_FUNCTION; + double duration = 0.2; + DWORD_PTR callback = 0; + struct reentrancy_callback_data callback_data; + DWORD_PTR callback_instance = 0; + char * buffer; + DWORD length; + DWORD frag_length; + int i; + BOOL done; + + format.wFormatTag=WAVE_FORMAT_PCM; + format.nChannels=1; + format.wBitsPerSample=8; + format.nSamplesPerSec=22050; + format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; + format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + format.cbSize=0; + + callback = (DWORD_PTR)reentrancy_callback_func; + callback_data.hevent = hevent; + callback_data.running_thread = 0; + callback_data.test_done = FALSE; + callback_instance = (DWORD_PTR)(&callback_data); + + wout=NULL; + rc=waveOutOpen(&wout,device,pwfx,callback,callback_instance,flags); + if (rc!=MMSYSERR_NOERROR) { + trace("`waveOutOpen` failed with rc %s, skipping", mmsys_error(rc)); + goto EXIT; + } + + rc=WaitForSingleObject(hevent,9000); + ok(rc==WAIT_OBJECT_0, "missing WOM_OPEN notification\n"); + + frags = HeapAlloc(GetProcessHeap(), 0, headers * sizeof(WAVEHDR)); + + buffer=wave_generate_silence(pwfx,duration / (loops + 1),&length); + + /* make sure fragment length is a multiple of block size */ + frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign; + + for (i = 0; i < headers; i++) { + frags[i].lpData=buffer + (i * frag_length); + if (i != (headers-1)) + frags[i].dwBufferLength=frag_length; + else { + /* use remainder of buffer for last fragment */ + frags[i].dwBufferLength=length - (i * frag_length); + } + frags[i].dwFlags=0; + frags[i].dwLoops=0; + rc=waveOutPrepareHeader(wout, &frags[i], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR, + "waveOutPrepareHeader(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + } + + if (rc==MMSYSERR_NOERROR) { + // Queue up the first fragment. + rc=waveOutWrite(wout, &frags[0], sizeof(frags[0])); + ok(rc==MMSYSERR_NOERROR,"waveOutWrite(%s): rc=%s\n", + dev_name(device),wave_out_error(rc)); + } + + done = FALSE; + while (!done) { + rc=WaitForSingleObject(hevent,8000); + ok(rc==WAIT_OBJECT_0, "missing WOM_DONE notification\n"); + + done = TRUE; + for (i = 0; i < headers; i++) { + if (!(frags[i].dwFlags & WHDR_DONE)) { + done = FALSE; + } + } + } + + // Calling `waveOutClose` from within the callback hangs on Windows, so we have to make sure to do it here instead. + rc = waveOutClose(wout); + ok(rc==MMSYSERR_NOERROR,"waveOutClose(): rc=%s\n", wave_out_error(rc)); + + rc=WaitForSingleObject(hevent,1500); + ok(rc==WAIT_OBJECT_0, "missing WOM_CLOSE notification\n"); + + HeapFree(GetProcessHeap(), 0, buffer); +EXIT: + CloseHandle(hevent); + HeapFree(GetProcessHeap(), 0, frags); +} + static void wave_out_test_device(UINT_PTR device) { WAVEOUTCAPSA capsA; @@ -984,6 +1140,8 @@ static void wave_out_test_device(UINT_PTR device) trace(" %s\n",wave_out_caps(capsA.dwSupport)); HeapFree(GetProcessHeap(), 0, nameA); + wave_out_test_no_reentrancy(device); + if (winetest_interactive && (device != WAVE_MAPPER)) { trace("Playing a 5 seconds reference tone.\n"); -- 2.34.1

2 1

[PATCH 2/2] winmm: Buffer any WOM_DONE/WIM_DATA events triggered from within a waveOut/waveIn callback.
by Liam Murphy 21 Jan '22

21 Jan '22

The events are then fired after the callback completes. Signed-off-by: Liam Murphy <liampm32(a)gmail.com> --- dlls/winmm/waveform.c | 165 +++++++++++++++++++++++++++++++----------- 1 file changed, 124 insertions(+), 41 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 1159b48b483..55b18b3e4dd 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -67,12 +67,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(winmm); #define AC_BUFLEN (10 * 100000) #define MAX_DEVICES 256 #define MAPPER_INDEX 0x3F +#define CB_RUNNING 0x10 typedef struct _WINMM_CBInfo { DWORD_PTR callback; DWORD_PTR user; + // Layout: 0b00000000_000r0ttt + // where t: callback type (`DCB_*` constants) + // r: Whether the callback is currently running, to avoid reentrancy. + // The 0 in the middle is `DCB_NOSWITCH`. DWORD flags; HWAVE hwave; + // Used to buffer data from `WIM_DATA` or `WOM_DONE` if the callback is still running, + // depending on whether this is an input or output device respectively. + WAVEHDR *first, *last; } WINMM_CBInfo; struct _WINMM_MMDevice; @@ -169,6 +177,12 @@ typedef struct _WINMM_OpenInfo { WAVEFORMATEX *format; DWORD_PTR callback; DWORD_PTR cb_user; + // The high half of the bits are the same as `WINMM_CBInfo.flags`, + // and the low half have the layout 0b00000000_0000dmaq, + // where d: `WAVE_FORMAT_DIRECT`, + // m: `WAVE_MAPPED`, + // a: `WAVE_ALLOWSYNC`, + // q: `WAVE_FORMAT_QUERY`. DWORD flags; BOOL reset; } WINMM_OpenInfo; @@ -370,13 +384,103 @@ static WINMM_Device *WINMM_GetDeviceFromHWAVE(HWAVE hwave) return device; } +// Note: the lock on `device` must already have been acquired before calling this function. +static inline void WINMM_SendBufferedMessages(WINMM_Device *device) { + WINMM_CBInfo* info = &device->cb_info; + // Make a copy of this to pass to the callback while within the critical section, + // since it can be mutated once we leave the critical section. + DWORD cb_type = info->flags; + + while (info->first) { + WAVEHDR* hdr; + WORD new_msg; + + if (device->render) { + new_msg = WOM_DONE; + } else { + new_msg = WIM_DATA; + } + + hdr = info->first; + info->first = hdr->lpNext; + hdr->lpNext = NULL; + + LeaveCriticalSection(&device->lock); + + DriverCallback(info->callback, cb_type, (HDRVR)info->hwave, + new_msg, info->user, (DWORD_PTR)hdr, 0); + + EnterCriticalSection(&device->lock); + } +} + /* Note: NotifyClient should never be called while holding the device lock - * since the client may call wave* functions from within the callback. */ -static inline void WINMM_NotifyClient(WINMM_CBInfo *info, WORD msg, DWORD_PTR param1, - DWORD_PTR param2) + * since the client may call wave* functions from within the callback. + * + * Any `WAVEHDR`s passed to this function must no longer be referenced by any other `WAVEHDR`s, + * so that their linked list can be reused to buffer them when this is called from within the callback. */ +static inline void WINMM_NotifyClient(WINMM_Device *device, WORD msg, WAVEHDR* param1, + WAVEHDR* param2) { - DriverCallback(info->callback, info->flags, (HDRVR)info->hwave, - msg, info->user, param1, param2); + WINMM_CBInfo *info; + DWORD cb_type; + + EnterCriticalSection(&device->lock); + info = &device->cb_info; + // Make a copy of this to pass to the callback while within the critical section, + // since it can be mutated once we leave the critical section. + cb_type = info->flags; + + if (info->flags & CB_RUNNING) { + switch (msg) { + case WIM_DATA: + case WOM_DONE: + param1->lpNext = NULL; + if (!info->first) { + info->first = info->last = param1; + } else { + info->last->lpNext = param1; + info->last = param1; + } + break; + case WIM_CLOSE: + case WOM_CLOSE: + // If this device is closing, it might get reopened as another kind of device + // with all the buffered messages wiped, causing them to never get sent. + // So we need to send them all now. + // + // On Windows, calling `waveOutClose` from within `DriverCallback` hangs anyway, + // so this causing reentrancy isn't really a problem. + WINMM_SendBufferedMessages(device); + + LeaveCriticalSection(&device->lock); + + DriverCallback(info->callback, cb_type, (HDRVR)info->hwave, + msg, info->user, (DWORD_PTR)param1, (DWORD_PTR)param2); + + EnterCriticalSection(&device->lock); + break; + } + } else { + if ((info->flags & DCB_TYPEMASK) == DCB_FUNCTION) { + info->flags |= CB_RUNNING; + } + + LeaveCriticalSection(&device->lock); + + DriverCallback(info->callback, cb_type, (HDRVR)info->hwave, + msg, info->user, (DWORD_PTR)param1, (DWORD_PTR)param2); + + EnterCriticalSection(&device->lock); + + if ((info->flags & DCB_TYPEMASK) == DCB_FUNCTION) { + WINMM_SendBufferedMessages(device); + + info->flags &= ~CB_RUNNING; + } + } + + LeaveCriticalSection(&device->lock); } static MMRESULT hr2mmr(HRESULT hr) @@ -1202,6 +1306,8 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, device->cb_info.callback = info->callback; device->cb_info.user = info->cb_user; device->cb_info.hwave = device->handle; + device->cb_info.first = NULL; + device->cb_info.last = NULL; info->handle = device->handle; @@ -1623,7 +1729,6 @@ static WAVEHDR *WOD_MarkDoneHeaders(WINMM_Device *device) static void WOD_PushData(WINMM_Device *device) { - WINMM_CBInfo cb_info; HRESULT hr; UINT32 pad, bufsize, avail_frames, queue_frames, written, ofs; UINT32 queue_bytes, nloops; @@ -1752,15 +1857,13 @@ static void WOD_PushData(WINMM_Device *device) device->played_frames += avail_frames; exit: - cb_info = device->cb_info; - LeaveCriticalSection(&device->lock); while(first){ WAVEHDR *next = first->lpNext; first->dwFlags &= ~WHDR_INQUEUE; first->dwFlags |= WHDR_DONE; - WINMM_NotifyClient(&cb_info, WOM_DONE, (DWORD_PTR)first, 0); + WINMM_NotifyClient(device, WOM_DONE, first, 0); first = next; } } @@ -1860,7 +1963,6 @@ static void WID_PullACMData(WINMM_Device *device) static void WID_PullData(WINMM_Device *device) { - WINMM_CBInfo cb_info; WAVEHDR *queue, *first = NULL, *last = NULL; HRESULT hr; @@ -1926,8 +2028,6 @@ static void WID_PullData(WINMM_Device *device) } exit: - cb_info = device->cb_info; - LeaveCriticalSection(&device->lock); if(last){ @@ -1936,7 +2036,7 @@ exit: WAVEHDR *next = first->lpNext; first->dwFlags &= ~WHDR_INQUEUE; first->dwFlags |= WHDR_DONE; - WINMM_NotifyClient(&cb_info, WIM_DATA, (DWORD_PTR)first, 0); + WINMM_NotifyClient(device, WIM_DATA, first, 0); first = next; } } @@ -1985,7 +2085,6 @@ static LRESULT WINMM_Pause(WINMM_Device *device) static LRESULT WINMM_Reset(HWAVE hwave) { - WINMM_CBInfo cb_info; WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave); BOOL is_out; WAVEHDR *first; @@ -2012,7 +2111,6 @@ static LRESULT WINMM_Reset(HWAVE hwave) device->last_clock_pos = 0; IAudioClient_Reset(device->client); - cb_info = device->cb_info; is_out = device->render != NULL; LeaveCriticalSection(&device->lock); @@ -2022,9 +2120,9 @@ static LRESULT WINMM_Reset(HWAVE hwave) first->dwFlags &= ~WHDR_INQUEUE; first->dwFlags |= WHDR_DONE; if(is_out) - WINMM_NotifyClient(&cb_info, WOM_DONE, (DWORD_PTR)first, 0); + WINMM_NotifyClient(device, WOM_DONE, first, 0); else - WINMM_NotifyClient(&cb_info, WIM_DATA, (DWORD_PTR)first, 0); + WINMM_NotifyClient(device, WIM_DATA, first, 0); first = next; } @@ -2732,7 +2830,7 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, { LRESULT res; WINMM_OpenInfo info; - WINMM_CBInfo cb_info; + WINMM_Device* device; TRACE("(%p, %u, %p, %lx, %lx, %08x)\n", lphWaveOut, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags); @@ -2763,12 +2861,9 @@ MMRESULT WINAPI waveOutOpen(LPHWAVEOUT lphWaveOut, UINT uDeviceID, if(lphWaveOut) *lphWaveOut = (HWAVEOUT)info.handle; - cb_info.flags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - cb_info.callback = dwCallback; - cb_info.user = dwInstance; - cb_info.hwave = info.handle; + device = WINMM_GetDeviceFromHWAVE(info.handle); - WINMM_NotifyClient(&cb_info, WOM_OPEN, 0, 0); + WINMM_NotifyClient(device, WOM_OPEN, 0, 0); return res; } @@ -2780,7 +2875,6 @@ UINT WINAPI waveOutClose(HWAVEOUT hWaveOut) { UINT res; WINMM_Device *device; - WINMM_CBInfo cb_info; TRACE("(%p)\n", hWaveOut); @@ -2789,14 +2883,12 @@ UINT WINAPI waveOutClose(HWAVEOUT hWaveOut) if(!WINMM_ValidateAndLock(device)) return MMSYSERR_INVALHANDLE; - cb_info = device->cb_info; - LeaveCriticalSection(&device->lock); res = SendMessageW(g_devices_hwnd, WODM_CLOSE, (WPARAM)hWaveOut, 0); if(res == MMSYSERR_NOERROR) - WINMM_NotifyClient(&cb_info, WOM_CLOSE, 0, 0); + WINMM_NotifyClient(device, WOM_CLOSE, 0, 0); return res; } @@ -3388,7 +3480,7 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, { LRESULT res; WINMM_OpenInfo info; - WINMM_CBInfo cb_info; + WINMM_Device* device; TRACE("(%p, %x, %p, %lx, %lx, %08x)\n", lphWaveIn, uDeviceID, lpFormat, dwCallback, dwInstance, dwFlags); @@ -3419,12 +3511,9 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, if(lphWaveIn) *lphWaveIn = (HWAVEIN)info.handle; - cb_info.flags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - cb_info.callback = dwCallback; - cb_info.user = dwInstance; - cb_info.hwave = info.handle; + device = WINMM_GetDeviceFromHWAVE(info.handle); - WINMM_NotifyClient(&cb_info, WIM_OPEN, 0, 0); + WINMM_NotifyClient(device, WIM_OPEN, 0, 0); return res; } @@ -3435,7 +3524,6 @@ MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, UINT WINAPI waveInClose(HWAVEIN hWaveIn) { WINMM_Device *device; - WINMM_CBInfo cb_info; UINT res; TRACE("(%p)\n", hWaveIn); @@ -3445,14 +3533,12 @@ UINT WINAPI waveInClose(HWAVEIN hWaveIn) if(!WINMM_ValidateAndLock(device)) return MMSYSERR_INVALHANDLE; - cb_info = device->cb_info; - LeaveCriticalSection(&device->lock); res = SendMessageW(g_devices_hwnd, WIDM_CLOSE, (WPARAM)hWaveIn, 0); if(res == MMSYSERR_NOERROR) - WINMM_NotifyClient(&cb_info, WIM_CLOSE, 0, 0); + WINMM_NotifyClient(device, WIM_CLOSE, 0, 0); return res; } @@ -3568,7 +3654,6 @@ UINT WINAPI waveInStart(HWAVEIN hWaveIn) */ UINT WINAPI waveInStop(HWAVEIN hWaveIn) { - WINMM_CBInfo cb_info; WINMM_Device *device; WAVEHDR *buf; HRESULT hr; @@ -3593,14 +3678,12 @@ UINT WINAPI waveInStop(HWAVEIN hWaveIn) }else buf = NULL; - cb_info = device->cb_info; - LeaveCriticalSection(&device->lock); if(buf){ buf->dwFlags &= ~WHDR_INQUEUE; buf->dwFlags |= WHDR_DONE; - WINMM_NotifyClient(&cb_info, WIM_DATA, (DWORD_PTR)buf, 0); + WINMM_NotifyClient(device, WIM_DATA, buf, 0); } return MMSYSERR_NOERROR; -- 2.34.1

1 0

[PATCH v3] wdscore: Implement CurrentIP.
by Mohamad Al-Jaf 20 Jan '22

20 Jan '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51850 Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v3: - Swap operands for arm and aarch64 (Credit: Jinoh Kang) - Use void * instead of int for CurrentIP - Add useful test (Credit: Giovanni Mascellani) - Remove unnecessary #include <stdint.h> Note: In the test I had to remove WINAPI from the declaration because it would result in an 'undefined reference' error only in the 32-bit build of Wine. The 64-bit build compiled without any problems. I don't understand why this happens. --- configure.ac | 1 + dlls/wdscore/Makefile.in | 3 ++ dlls/wdscore/main.c | 54 ++++++++++++++++++++++++++++++++++ dlls/wdscore/tests/Makefile.in | 5 ++++ dlls/wdscore/tests/main.c | 41 ++++++++++++++++++++++++++ dlls/wdscore/wdscore.spec | 2 +- 6 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 dlls/wdscore/main.c create mode 100644 dlls/wdscore/tests/Makefile.in create mode 100644 dlls/wdscore/tests/main.c diff --git a/configure.ac b/configure.ac index b42cb8a5346..a50881cc2fb 100644 --- a/configure.ac +++ b/configure.ac @@ -3347,6 +3347,7 @@ WINE_CONFIG_MAKEFILE(dlls/wbemdisp/tests) WINE_CONFIG_MAKEFILE(dlls/wbemprox) WINE_CONFIG_MAKEFILE(dlls/wbemprox/tests) WINE_CONFIG_MAKEFILE(dlls/wdscore) +WINE_CONFIG_MAKEFILE(dlls/wdscore/tests) WINE_CONFIG_MAKEFILE(dlls/webservices) WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/websocket) diff --git a/dlls/wdscore/Makefile.in b/dlls/wdscore/Makefile.in index 20ba1d3b1c9..2020e72c7bb 100644 --- a/dlls/wdscore/Makefile.in +++ b/dlls/wdscore/Makefile.in @@ -1,3 +1,6 @@ MODULE = wdscore.dll EXTRADLLFLAGS = -Wb,--prefer-native + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/main.c b/dlls/wdscore/main.c new file mode 100644 index 00000000000..24371068980 --- /dev/null +++ b/dlls/wdscore/main.c @@ -0,0 +1,54 @@ +/* + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +#include "wine/asm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wdscore); + +/*********************************************************************** + * CurrentIP (wdscore.@) + */ +#ifdef __i386__ +__ASM_STDCALL_FUNC(CurrentIP, 0, + "movl 0(%esp), %eax\n\t" + "ret" ) +#elif defined(__x86_64__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "movq 0(%rsp), %rax\n\t" + "ret" ) +#elif defined(__arm__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "mov r0, lr\n\t" + "bx lr" ) +#elif defined(__aarch64__) +__ASM_STDCALL_FUNC(CurrentIP, 0, + "mov x0, lr\n\t" + "ret" ) +#else +void *WINAPI CurrentIP(void) +{ + FIXME( "not implemented\n" ); + return 0; +} +#endif diff --git a/dlls/wdscore/tests/Makefile.in b/dlls/wdscore/tests/Makefile.in new file mode 100644 index 00000000000..f0606d902d5 --- /dev/null +++ b/dlls/wdscore/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wdscore.dll +IMPORTS = wdscore + +C_SRCS = \ + main.c diff --git a/dlls/wdscore/tests/main.c b/dlls/wdscore/tests/main.c new file mode 100644 index 00000000000..71de31a1a0a --- /dev/null +++ b/dlls/wdscore/tests/main.c @@ -0,0 +1,41 @@ +/* + * Unit test suite for wdscore + * + * Copyright 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "wine/test.h" +#include "winbase.h" + +extern void *CurrentIP(void); + +static void test_CurrentIP(void) +{ + char *cur; + char *ret; + + cur = (char*)&test_CurrentIP; + ret = (char*)CurrentIP(); + + ok(cur <= ret && ret < (cur + 0x100), "Address %p not in function starting at %p.\n", ret, cur); +} + +START_TEST(main) +{ + test_CurrentIP(); +} diff --git a/dlls/wdscore/wdscore.spec b/dlls/wdscore/wdscore.spec index 15958b86aba..8b6febe6b3b 100644 --- a/dlls/wdscore/wdscore.spec +++ b/dlls/wdscore/wdscore.spec @@ -71,7 +71,7 @@ @ stub ConstructPartialMsgIfW @ stub ConstructPartialMsgVA @ stub ConstructPartialMsgVW -@ stub CurrentIP +@ stdcall CurrentIP() @ stub EndMajorTask @ stub EndMinorTask @ stub GetMajorTask -- 2.34.1

3 4

[PATCH] server: Allocate enough space for the backslash in dup_nt_name() (Valgrind).
by Zebediah Figura 20 Jan '22

20 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/fd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/fd.c b/server/fd.c index c9a21186722..1b4b98b0e76 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1867,7 +1867,7 @@ static WCHAR *dup_nt_name( struct fd *root, struct unicode_str name, data_size_t name.str++; name.len -= sizeof(WCHAR); } - if ((ret = malloc( retlen + name.len + 1 ))) + if ((ret = malloc( retlen + name.len + sizeof(WCHAR) ))) { memcpy( ret, root->nt_name, root->nt_namelen ); if (name.len && name.str[0] != '\\' && -- 2.34.1

1 0

[PATCH v8 1/2] kernel32/tests: Test module refcounting with forwarded exports.
by Jinoh Kang 20 Jan '22

20 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v3 -> v4: - iatgas.h - LLVM(Clang), ARM, ARM64 support - Use __ASM_NAME macro - Don't fail test on MSVC - Don't end asm macros with "\n\t" v4 -> v5: - iatgas.h - mark idata sections as RO - loader.c - test for forward export itself v5 -> v6: - loader.c - Fix compilation warning in format string v6 -> v7: - forward4.c - fix building without MinGW v7 -> v8: - forward[1-3].c - Call DisableThreadLibraryCalls in DllMain - forward4.c: removed - iatgas.h: removed - sforward.c: new file - loader.c - test static forwarded import using shlwapi -> userenv forward dlls/kernel32/tests/Makefile.in | 14 ++- dlls/kernel32/tests/forward1.c | 19 ++++ dlls/kernel32/tests/forward1.spec | 2 + dlls/kernel32/tests/forward2.c | 9 ++ dlls/kernel32/tests/forward2.spec | 2 + dlls/kernel32/tests/forward3.c | 9 ++ dlls/kernel32/tests/forward3.spec | 2 + dlls/kernel32/tests/loader.c | 177 ++++++++++++++++++++++++++++++ dlls/kernel32/tests/sforward.c | 16 +++ dlls/kernel32/tests/sforward.spec | 1 + 10 files changed, 249 insertions(+), 2 deletions(-) create mode 100644 dlls/kernel32/tests/forward1.c create mode 100644 dlls/kernel32/tests/forward1.spec create mode 100644 dlls/kernel32/tests/forward2.c create mode 100644 dlls/kernel32/tests/forward2.spec create mode 100644 dlls/kernel32/tests/forward3.c create mode 100644 dlls/kernel32/tests/forward3.spec create mode 100644 dlls/kernel32/tests/sforward.c create mode 100644 dlls/kernel32/tests/sforward.spec diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index e9516603ce9..1f8dd3b86a0 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -1,5 +1,7 @@ TESTDLL = kernel32.dll -IMPORTS = user32 advapi32 + +# shlwapi is for testing export forwarding (to userenv) +IMPORTS = user32 advapi32 shlwapi SOURCES = \ actctx.c \ @@ -37,4 +39,12 @@ SOURCES = \ toolhelp.c \ version.c \ virtual.c \ - volume.c + volume.c \ + forward1.c \ + forward1.spec \ + forward2.c \ + forward2.spec \ + forward3.c \ + forward3.spec \ + sforward.c \ + sforward.spec diff --git a/dlls/kernel32/tests/forward1.c b/dlls/kernel32/tests/forward1.c new file mode 100644 index 00000000000..6419d95eaea --- /dev/null +++ b/dlls/kernel32/tests/forward1.c @@ -0,0 +1,19 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} + +unsigned long forward_test_func(void) +{ + return 0x00005678UL; +} + +unsigned long forward_test_func2(void) +{ + return 0x12340000UL; +} diff --git a/dlls/kernel32/tests/forward1.spec b/dlls/kernel32/tests/forward1.spec new file mode 100644 index 00000000000..bf19fa7e011 --- /dev/null +++ b/dlls/kernel32/tests/forward1.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() +2 cdecl -noname forward_test_func2() diff --git a/dlls/kernel32/tests/forward2.c b/dlls/kernel32/tests/forward2.c new file mode 100644 index 00000000000..d1e77f45f3c --- /dev/null +++ b/dlls/kernel32/tests/forward2.c @@ -0,0 +1,9 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/forward2.spec b/dlls/kernel32/tests/forward2.spec new file mode 100644 index 00000000000..374156d8d06 --- /dev/null +++ b/dlls/kernel32/tests/forward2.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward1.forward_test_func +2 cdecl -noname forward_test_func2() forward1.#2 diff --git a/dlls/kernel32/tests/forward3.c b/dlls/kernel32/tests/forward3.c new file mode 100644 index 00000000000..d1e77f45f3c --- /dev/null +++ b/dlls/kernel32/tests/forward3.c @@ -0,0 +1,9 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/forward3.spec b/dlls/kernel32/tests/forward3.spec new file mode 100644 index 00000000000..31d019aa071 --- /dev/null +++ b/dlls/kernel32/tests/forward3.spec @@ -0,0 +1,2 @@ +1 cdecl forward_test_func() forward2.forward_test_func +2 cdecl -noname forward_test_func2() forward2.#2 diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index f990d632f73..1efd5a7fa5d 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1642,6 +1642,180 @@ static void test_ImportDescriptors(void) } } +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + +static void test_static_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH], sforward_path[MAX_PATH]; + HMODULE userenv, shlwapi, sforward; + FARPROC test_func_stub; + + if (GetModuleHandleA( "userenv.dll" )) + { + skip("cannot test since userenv.dll is already loaded\n"); + return; + } + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( sforward_path, MAX_PATH, "%s\\sforward.dll", dir_path ); + extract_resource( "sforward.dll", "TESTDLL", sforward_path ); + + userenv = LoadLibraryA( "userenv.dll" ); + ok( !!userenv, "couldn't find userenv.dll: %u\n", GetLastError() ); + shlwapi = LoadLibraryA( "shlwapi.dll" ); + ok( !!shlwapi, "couldn't find shlwapi.dll: %u\n", GetLastError() ); + sforward = LoadLibraryA( sforward_path ); + ok( !!sforward, "couldn't find %s: %u\n", sforward_path, GetLastError() ); + + test_func_stub = GetProcAddress( sforward, "test_func_stub" ); + ok( !!test_func_stub, "sforward!test_func_stub not found\n" ); + + FreeLibrary( userenv ); + FreeLibrary( shlwapi ); + + todo_wine + ok( !!GetModuleHandleA( "userenv.dll" ), "userenv.dll unexpectedly unloaded\n" ); + ok( !!GetModuleHandleA( "shlwapi.dll" ), "shlwapi.dll unexpectedly unloaded\n" ); + + FreeLibrary( sforward ); + + ok( !GetModuleHandleA( "userenv.dll" ), "userenv.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "shlwapi.dll" ), "shlwapi.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "sforward.dll" ), "sforward.dll unexpectedly kept open\n" ); + + DeleteFileA( sforward_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forwarded_import_refs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + FARPROC proc1, proc2, proc3, oproc1, oproc2, oproc3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + proc1 = GetProcAddress(forward1, "forward_test_func"); + ok( !!proc1, "cannot resolve forward1!forward_test_func\n"); + proc2 = GetProcAddress(forward2, "forward_test_func"); + ok( !!proc2, "cannot resolve forward2!forward_test_func\n"); + proc3 = GetProcAddress(forward3, "forward_test_func"); + ok( !!proc3, "cannot resolve forward3!forward_test_func\n"); + ok( proc1 == proc3, "forward1!forward_test_func is not equal to forward3!forward_test_func\n"); + ok( proc2 == proc3, "forward2!forward_test_func is not equal to forward3!forward_test_func\n"); + + oproc1 = GetProcAddress(forward1, (LPSTR)2); + ok( !!oproc1, "cannot resolve forward1!#2 (forward_test_func2)\n"); + oproc2 = GetProcAddress(forward2, (LPSTR)2); + ok( !!oproc2, "cannot resolve forward2!#2 (forward_test_func2)\n"); + oproc3 = GetProcAddress(forward3, (LPSTR)2); + ok( !!oproc3, "cannot resolve forward3!#2 (forward_test_func2)\n"); + ok( oproc1 == oproc3, "forward1!forward_test_func2 is not equal to forward3!forward_test_func2\n"); + ok( oproc2 == oproc3, "forward2!forward_test_func2 is not equal to forward3!forward_test_func2\n"); + + FreeLibrary( forward1 ); + FreeLibrary( forward2 ); + + todo_wine + ok( !!GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly unloaded\n" ); + todo_wine + ok( !!GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly unloaded\n" ); + + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + +static void test_dynamic_forward_export_norefs(void) +{ + CHAR temp_path[MAX_PATH], dir_path[MAX_PATH]; + CHAR forward1_path[MAX_PATH]; + CHAR forward2_path[MAX_PATH]; + CHAR forward3_path[MAX_PATH]; + HMODULE forward1, forward2, forward3; + + GetTempPathA( ARRAY_SIZE(temp_path), temp_path ); + GetTempFileNameA( temp_path, "ldr", GetTickCount() | 1UL, dir_path ); + ok( CreateDirectoryA( dir_path, NULL ), "failed to create dir %s, error %u\n", + dir_path, GetLastError() ); + + snprintf( forward1_path, MAX_PATH, "%s\\forward1.dll", dir_path ); + snprintf( forward2_path, MAX_PATH, "%s\\forward2.dll", dir_path ); + snprintf( forward3_path, MAX_PATH, "%s\\forward3.dll", dir_path ); + extract_resource( "forward1.dll", "TESTDLL", forward1_path ); + extract_resource( "forward2.dll", "TESTDLL", forward2_path ); + extract_resource( "forward3.dll", "TESTDLL", forward3_path ); + + forward1 = LoadLibraryA( forward1_path ); + ok( !!forward1, "couldn't find %s: %u\n", forward1_path, GetLastError() ); + forward2 = LoadLibraryA( forward2_path ); + ok( !!forward2, "couldn't find %s: %u\n", forward2_path, GetLastError() ); + forward3 = LoadLibraryA( forward3_path ); + ok( !!forward3, "couldn't find %s: %u\n", forward3_path, GetLastError() ); + + FreeLibrary( forward1 ); + FreeLibrary( forward3 ); + + ok( !GetModuleHandleA( "forward1.dll" ), "forward1.dll unexpectedly kept open\n" ); + ok( !GetModuleHandleA( "forward3.dll" ), "forward3.dll unexpectedly kept open\n" ); + + FreeLibrary( forward2 ); + + ok( !GetModuleHandleA( "forward2.dll" ), "forward2.dll unexpectedly kept open\n" ); + + DeleteFileA( forward1_path ); + DeleteFileA( forward2_path ); + DeleteFileA( forward3_path ); + RemoveDirectoryA( dir_path ); +} + static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL is_dll) { HANDLE hfile, hmap; @@ -4119,9 +4293,12 @@ START_TEST(loader) return; } + test_static_forwarded_import_refs(); /* Must be first; other tests may load userenv.dll */ test_filenames(); test_ResolveDelayLoadedAPI(); test_ImportDescriptors(); + test_dynamic_forwarded_import_refs(); + test_dynamic_forward_export_norefs(); test_section_access(); test_import_resolution(); test_ExitProcess(); diff --git a/dlls/kernel32/tests/sforward.c b/dlls/kernel32/tests/sforward.c new file mode 100644 index 00000000000..17f79fb5a74 --- /dev/null +++ b/dlls/kernel32/tests/sforward.c @@ -0,0 +1,16 @@ +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +DECLSPEC_IMPORT BOOL WINAPI SHExpandEnvironmentStringsForUserW(HANDLE,LPCWSTR,LPWSTR,DWORD); + +void test_func_stub(void) +{ + SHExpandEnvironmentStringsForUserW(NULL, NULL, NULL, 0); +} + +BOOL WINAPI DllMain(HINSTANCE instance_new, DWORD reason, LPVOID reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls( instance_new ); + return TRUE; +} diff --git a/dlls/kernel32/tests/sforward.spec b/dlls/kernel32/tests/sforward.spec new file mode 100644 index 00000000000..cb6d4add796 --- /dev/null +++ b/dlls/kernel32/tests/sforward.spec @@ -0,0 +1 @@ +@ cdecl test_func_stub() -- 2.31.1

3 7

[PATCH 4/4] dmusic: Remove SynthPortImpl from the method and vtbl names
by Michael Stefaniuc 20 Jan '22

20 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 163 +++++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 80 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index c51b33ce9c3..a17e399ee17 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -149,8 +149,7 @@ static HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDown return S_OK; } -/* SynthPortImpl IDirectMusicPort IUnknown part follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI synth_port_QueryInterface(IDirectMusicPort *iface, REFIID riid, void **ret_iface) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -175,7 +174,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI return S_OK; } -static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT iface) +static ULONG WINAPI synth_port_AddRef(IDirectMusicPort *iface) { struct synth_port *This = synth_from_IDirectMusicPort(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -187,7 +186,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT ifac return ref; } -static ULONG WINAPI SynthPortImpl_IDirectMusicPort_Release(LPDIRECTMUSICPORT iface) +static ULONG WINAPI synth_port_Release(IDirectMusicPort *iface) { struct synth_port *This = synth_from_IDirectMusicPort(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -214,8 +213,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPort_Release(LPDIRECTMUSICPORT ifa return ref; } -/* SynthPortImpl IDirectMusicPort interface follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_PlayBuffer(LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER buffer) +static HRESULT WINAPI synth_port_PlayBuffer(IDirectMusicPort *iface, IDirectMusicBuffer *buffer) { struct synth_port *This = synth_from_IDirectMusicPort(iface); HRESULT hr; @@ -242,7 +240,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_PlayBuffer(LPDIRECTMUSICPOR return hr; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetReadNotificationHandle(LPDIRECTMUSICPORT iface, HANDLE event) +static HRESULT WINAPI synth_port_SetReadNotificationHandle(IDirectMusicPort *iface, HANDLE event) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -251,7 +249,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetReadNotificationHandle(L return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Read(LPDIRECTMUSICPORT iface, LPDIRECTMUSICBUFFER buffer) +static HRESULT WINAPI synth_port_Read(IDirectMusicPort *iface, IDirectMusicBuffer *buffer) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -260,7 +258,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Read(LPDIRECTMUSICPORT ifac return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicInstrument* instrument, IDirectMusicDownloadedInstrument** downloaded_instrument, DMUS_NOTERANGE* note_ranges, DWORD num_note_ranges) +static HRESULT WINAPI synth_port_DownloadInstrument(IDirectMusicPort *iface, IDirectMusicInstrument *instrument, + IDirectMusicDownloadedInstrument **downloaded_instrument, DMUS_NOTERANGE *note_ranges, DWORD num_note_ranges) { struct synth_port *This = synth_from_IDirectMusicPort(iface); IDirectMusicInstrumentImpl *instrument_object; @@ -346,7 +345,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECT return E_FAIL; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMUSICPORT iface, IDirectMusicDownloadedInstrument *downloaded_instrument) +static HRESULT WINAPI synth_port_UnloadInstrument(IDirectMusicPort *iface, + IDirectMusicDownloadedInstrument *downloaded_instrument) { struct synth_port *This = synth_from_IDirectMusicPort(iface); IDirectMusicDownloadedInstrumentImpl *downloaded_object = unsafe_impl_from_IDirectMusicDownloadedInstrument(downloaded_instrument); @@ -366,7 +366,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_UnloadInstrument(LPDIRECTMU return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetLatencyClock(LPDIRECTMUSICPORT iface, IReferenceClock** clock) +static HRESULT WINAPI synth_port_GetLatencyClock(IDirectMusicPort *iface, IReferenceClock **clock) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -378,7 +378,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetLatencyClock(LPDIRECTMUS return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetRunningStats(LPDIRECTMUSICPORT iface, LPDMUS_SYNTHSTATS stats) +static HRESULT WINAPI synth_port_GetRunningStats(IDirectMusicPort *iface, DMUS_SYNTHSTATS *stats) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -387,7 +387,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetRunningStats(LPDIRECTMUS return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Compact(LPDIRECTMUSICPORT iface) +static HRESULT WINAPI synth_port_Compact(IDirectMusicPort *iface) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -396,7 +396,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_Compact(LPDIRECTMUSICPORT i return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetCaps(LPDIRECTMUSICPORT iface, LPDMUS_PORTCAPS port_caps) +static HRESULT WINAPI synth_port_GetCaps(IDirectMusicPort *iface, DMUS_PORTCAPS *port_caps) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -407,8 +407,9 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetCaps(LPDIRECTMUSICPORT i return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DeviceIoControl(LPDIRECTMUSICPORT iface, DWORD io_control_code, LPVOID in_buffer, DWORD in_buffer_size, - LPVOID out_buffer, DWORD out_buffer_size, LPDWORD bytes_returned, LPOVERLAPPED overlapped) +static HRESULT WINAPI synth_port_DeviceIoControl(IDirectMusicPort *iface, DWORD io_control_code, + void *in_buffer, DWORD in_buffer_size, void *out_buffer, DWORD out_buffer_size, + DWORD *bytes_returned, OVERLAPPED *overlapped) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -417,7 +418,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DeviceIoControl(LPDIRECTMUS return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetNumChannelGroups(LPDIRECTMUSICPORT iface, DWORD channel_groups) +static HRESULT WINAPI synth_port_SetNumChannelGroups(IDirectMusicPort *iface, DWORD channel_groups) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -428,7 +429,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetNumChannelGroups(LPDIREC return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetNumChannelGroups(LPDIRECTMUSICPORT iface, LPDWORD channel_groups) +static HRESULT WINAPI synth_port_GetNumChannelGroups(IDirectMusicPort *iface, DWORD *channel_groups) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -439,7 +440,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetNumChannelGroups(LPDIREC return S_OK; } -static HRESULT WINAPI synth_dmport_Activate(IDirectMusicPort *iface, BOOL active) +static HRESULT WINAPI synth_port_Activate(IDirectMusicPort *iface, BOOL active) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -468,7 +469,8 @@ static HRESULT WINAPI synth_dmport_Activate(IDirectMusicPort *iface, BOOL active return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetChannelPriority(LPDIRECTMUSICPORT iface, DWORD channel_group, DWORD channel, DWORD priority) +static HRESULT WINAPI synth_port_SetChannelPriority(IDirectMusicPort *iface, DWORD channel_group, + DWORD channel, DWORD priority) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -483,7 +485,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_SetChannelPriority(LPDIRECT return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetChannelPriority(LPDIRECTMUSICPORT iface, DWORD channel_group, DWORD channel, LPDWORD priority) +static HRESULT WINAPI synth_port_GetChannelPriority(IDirectMusicPort *iface, DWORD channel_group, + DWORD channel, DWORD *priority) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -494,7 +497,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetChannelPriority(LPDIRECT return S_OK; } -static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDirectSound *dsound, +static HRESULT WINAPI synth_port_SetDirectSound(IDirectMusicPort *iface, IDirectSound *dsound, IDirectSoundBuffer *dsbuffer) { struct synth_port *This = synth_from_IDirectMusicPort(iface); @@ -525,7 +528,8 @@ static HRESULT WINAPI synth_dmport_SetDirectSound(IDirectMusicPort *iface, IDire return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetFormat(LPDIRECTMUSICPORT iface, LPWAVEFORMATEX pWaveFormatEx, LPDWORD pdwWaveFormatExSize, LPDWORD pdwBufferSize) +static HRESULT WINAPI synth_port_GetFormat(IDirectMusicPort *iface, WAVEFORMATEX *pWaveFormatEx, + DWORD *pdwWaveFormatExSize, DWORD *pdwBufferSize) { struct synth_port *This = synth_from_IDirectMusicPort(iface); WAVEFORMATEX format; @@ -570,33 +574,32 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_GetFormat(LPDIRECTMUSICPORT return S_OK; } -static const IDirectMusicPortVtbl SynthPortImpl_DirectMusicPort_Vtbl = { +static const IDirectMusicPortVtbl synth_port_vtbl = { /**** IDirectMusicPort IUnknown part methods ***/ - SynthPortImpl_IDirectMusicPort_QueryInterface, - SynthPortImpl_IDirectMusicPort_AddRef, - SynthPortImpl_IDirectMusicPort_Release, + synth_port_QueryInterface, + synth_port_AddRef, + synth_port_Release, /**** IDirectMusicPort methods ***/ - SynthPortImpl_IDirectMusicPort_PlayBuffer, - SynthPortImpl_IDirectMusicPort_SetReadNotificationHandle, - SynthPortImpl_IDirectMusicPort_Read, - SynthPortImpl_IDirectMusicPort_DownloadInstrument, - SynthPortImpl_IDirectMusicPort_UnloadInstrument, - SynthPortImpl_IDirectMusicPort_GetLatencyClock, - SynthPortImpl_IDirectMusicPort_GetRunningStats, - SynthPortImpl_IDirectMusicPort_Compact, - SynthPortImpl_IDirectMusicPort_GetCaps, - SynthPortImpl_IDirectMusicPort_DeviceIoControl, - SynthPortImpl_IDirectMusicPort_SetNumChannelGroups, - SynthPortImpl_IDirectMusicPort_GetNumChannelGroups, - synth_dmport_Activate, - SynthPortImpl_IDirectMusicPort_SetChannelPriority, - SynthPortImpl_IDirectMusicPort_GetChannelPriority, - synth_dmport_SetDirectSound, - SynthPortImpl_IDirectMusicPort_GetFormat + synth_port_PlayBuffer, + synth_port_SetReadNotificationHandle, + synth_port_Read, + synth_port_DownloadInstrument, + synth_port_UnloadInstrument, + synth_port_GetLatencyClock, + synth_port_GetRunningStats, + synth_port_Compact, + synth_port_GetCaps, + synth_port_DeviceIoControl, + synth_port_SetNumChannelGroups, + synth_port_GetNumChannelGroups, + synth_port_Activate, + synth_port_SetChannelPriority, + synth_port_GetChannelPriority, + synth_port_SetDirectSound, + synth_port_GetFormat }; -/* SynthPortImpl IDirectMusicPortDownload IUnknown part follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_QueryInterface(LPDIRECTMUSICPORTDOWNLOAD iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI synth_port_download_QueryInterface(IDirectMusicPortDownload *iface, REFIID riid, void **ret_iface) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -605,7 +608,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_QueryInterface(LPDI return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); } -static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_AddRef (LPDIRECTMUSICPORTDOWNLOAD iface) +static ULONG WINAPI synth_port_download_AddRef(IDirectMusicPortDownload *iface) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -614,7 +617,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_AddRef (LPDIRECTMUSIC return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); } -static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_Release(LPDIRECTMUSICPORTDOWNLOAD iface) +static ULONG WINAPI synth_port_download_Release(IDirectMusicPortDownload *iface) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -623,8 +626,8 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicPortDownload_Release(LPDIRECTMUSIC return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); } -/* SynthPortImpl IDirectMusicPortDownload Interface follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetBuffer(LPDIRECTMUSICPORTDOWNLOAD iface, DWORD DLId, IDirectMusicDownload** IDMDownload) +static HRESULT WINAPI synth_port_download_GetBuffer(IDirectMusicPortDownload *iface, DWORD DLId, + IDirectMusicDownload **IDMDownload) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -636,7 +639,8 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetBuffer(LPDIRECTM return DMUSIC_CreateDirectMusicDownloadImpl(&IID_IDirectMusicDownload, (LPVOID*)IDMDownload, NULL); } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_AllocateBuffer(LPDIRECTMUSICPORTDOWNLOAD iface, DWORD size, IDirectMusicDownload** IDMDownload) +static HRESULT WINAPI synth_port_download_AllocateBuffer(IDirectMusicPortDownload *iface, DWORD size, + IDirectMusicDownload **IDMDownload) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -645,7 +649,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_AllocateBuffer(LPDI return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetDLId(LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* start_DLId, DWORD count) +static HRESULT WINAPI synth_port_download_GetDLId(IDirectMusicPortDownload *iface, DWORD *start_DLId, DWORD count) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -654,7 +658,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetDLId(LPDIRECTMUS return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetAppend (LPDIRECTMUSICPORTDOWNLOAD iface, DWORD* append) +static HRESULT WINAPI synth_port_download_GetAppend(IDirectMusicPortDownload *iface, DWORD *append) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -663,7 +667,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_GetAppend (LPDIRECT return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Download(LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* IDMDownload) +static HRESULT WINAPI synth_port_download_Download(IDirectMusicPortDownload *iface, IDirectMusicDownload *IDMDownload) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -672,7 +676,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Download(LPDIRECTMU return S_OK; } -static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Unload(LPDIRECTMUSICPORTDOWNLOAD iface, IDirectMusicDownload* IDMDownload) +static HRESULT WINAPI synth_port_download_Unload(IDirectMusicPortDownload *iface, IDirectMusicDownload *IDMDownload) { struct synth_port *This = synth_from_IDirectMusicPortDownload(iface); @@ -681,22 +685,21 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPortDownload_Unload(LPDIRECTMUSI return S_OK; } -static const IDirectMusicPortDownloadVtbl SynthPortImpl_DirectMusicPortDownload_Vtbl = { +static const IDirectMusicPortDownloadVtbl synth_port_download_vtbl = { /*** IDirectMusicPortDownload IUnknown part methods ***/ - SynthPortImpl_IDirectMusicPortDownload_QueryInterface, - SynthPortImpl_IDirectMusicPortDownload_AddRef, - SynthPortImpl_IDirectMusicPortDownload_Release, + synth_port_download_QueryInterface, + synth_port_download_AddRef, + synth_port_download_Release, /*** IDirectMusicPortDownload methods ***/ - SynthPortImpl_IDirectMusicPortDownload_GetBuffer, - SynthPortImpl_IDirectMusicPortDownload_AllocateBuffer, - SynthPortImpl_IDirectMusicPortDownload_GetDLId, - SynthPortImpl_IDirectMusicPortDownload_GetAppend, - SynthPortImpl_IDirectMusicPortDownload_Download, - SynthPortImpl_IDirectMusicPortDownload_Unload + synth_port_download_GetBuffer, + synth_port_download_AllocateBuffer, + synth_port_download_GetDLId, + synth_port_download_GetAppend, + synth_port_download_Download, + synth_port_download_Unload }; -/* SynthPortImpl IDirectMusicThru IUnknown part follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_QueryInterface(LPDIRECTMUSICTHRU iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI synth_port_thru_QueryInterface(IDirectMusicThru *iface, REFIID riid, void **ret_iface) { struct synth_port *This = synth_from_IDirectMusicThru(iface); @@ -705,7 +708,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_QueryInterface(LPDIRECTMUSI return IDirectMusicPort_QueryInterface(&This->IDirectMusicPort_iface, riid, ret_iface); } -static ULONG WINAPI SynthPortImpl_IDirectMusicThru_AddRef(LPDIRECTMUSICTHRU iface) +static ULONG WINAPI synth_port_thru_AddRef(IDirectMusicThru *iface) { struct synth_port *This = synth_from_IDirectMusicThru(iface); @@ -714,7 +717,7 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicThru_AddRef(LPDIRECTMUSICTHRU ifac return IDirectMusicPort_AddRef(&This->IDirectMusicPort_iface); } -static ULONG WINAPI SynthPortImpl_IDirectMusicThru_Release(LPDIRECTMUSICTHRU iface) +static ULONG WINAPI synth_port_thru_Release(IDirectMusicThru *iface) { struct synth_port *This = synth_from_IDirectMusicThru(iface); @@ -723,9 +726,9 @@ static ULONG WINAPI SynthPortImpl_IDirectMusicThru_Release(LPDIRECTMUSICTHRU ifa return IDirectMusicPort_Release(&This->IDirectMusicPort_iface); } -/* SynthPortImpl IDirectMusicThru Interface follows: */ -static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_ThruChannel(LPDIRECTMUSICTHRU iface, DWORD source_channel_group, DWORD source_channel, DWORD destination_channel_group, - DWORD destination_channel, LPDIRECTMUSICPORT destination_port) +static HRESULT WINAPI synth_port_thru_ThruChannel(IDirectMusicThru *iface, DWORD source_channel_group, + DWORD source_channel, DWORD destination_channel_group, DWORD destination_channel, + IDirectMusicPort *destination_port) { struct synth_port *This = synth_from_IDirectMusicThru(iface); @@ -734,13 +737,13 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicThru_ThruChannel(LPDIRECTMUSICTH return S_OK; } -static const IDirectMusicThruVtbl SynthPortImpl_DirectMusicThru_Vtbl = { +static const IDirectMusicThruVtbl synth_port_thru_vtbl = { /*** IDirectMusicThru IUnknown part methods */ - SynthPortImpl_IDirectMusicThru_QueryInterface, - SynthPortImpl_IDirectMusicThru_AddRef, - SynthPortImpl_IDirectMusicThru_Release, + synth_port_thru_QueryInterface, + synth_port_thru_AddRef, + synth_port_thru_Release, /*** IDirectMusicThru methods ***/ - SynthPortImpl_IDirectMusicThru_ThruChannel + synth_port_thru_ThruChannel }; static HRESULT WINAPI IKsControlImpl_QueryInterface(IKsControl *iface, REFIID riid, @@ -827,9 +830,9 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param if (!obj) return E_OUTOFMEMORY; - obj->IDirectMusicPort_iface.lpVtbl = &SynthPortImpl_DirectMusicPort_Vtbl; - obj->IDirectMusicPortDownload_iface.lpVtbl = &SynthPortImpl_DirectMusicPortDownload_Vtbl; - obj->IDirectMusicThru_iface.lpVtbl = &SynthPortImpl_DirectMusicThru_Vtbl; + obj->IDirectMusicPort_iface.lpVtbl = &synth_port_vtbl; + obj->IDirectMusicPortDownload_iface.lpVtbl = &synth_port_download_vtbl; + obj->IDirectMusicThru_iface.lpVtbl = &synth_port_thru_vtbl; obj->IKsControl_iface.lpVtbl = &ikscontrol_vtbl; obj->ref = 1; obj->parent = parent; -- 2.31.1

1 0

[PATCH 2/4] dmsynth: Pass the master clock on to the sink
by Michael Stefaniuc 20 Jan '22

20 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/synth.c | 7 +++++-- dlls/dmusic/port.c | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 3d3af80d005..51b33e8df8d 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -305,9 +305,12 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetMasterClock(IDirectMusicSynth8 * { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - FIXME("(%p)->(%p): stub\n", This, clock); + TRACE("(%p)->(%p)\n", This, clock); - return S_OK; + if (!This->sink) + return DMUS_E_NOSYNTHSINK; + + return IDirectMusicSynthSink_SetMasterClock(This->sink, clock); } static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 *iface, diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 165bd520191..88c7c60a50d 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -856,9 +856,6 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param if (SUCCEEDED(hr)) hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); - if (SUCCEEDED(hr)) - hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock); - if (SUCCEEDED(hr)) hr = IDirectMusicSynth_Open(obj->synth, port_params); -- 2.31.1

1 0

[PATCH 1/4] dmusic: Call SetSynkSink() first to initialize the Synth
by Michael Stefaniuc 20 Jan '22

20 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmusic/port.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 7bd2afdb9a3..165bd520191 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -851,13 +851,13 @@ HRESULT synth_port_create(IDirectMusic8Impl *parent, DMUS_PORTPARAMS *port_param hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (void**)&obj->synth_sink); if (SUCCEEDED(hr)) - hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); + hr = IDirectMusicSynth_SetSynthSink(obj->synth, obj->synth_sink); if (SUCCEEDED(hr)) - hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock); + hr = IDirectMusicSynth_SetMasterClock(obj->synth, obj->pLatencyClock); if (SUCCEEDED(hr)) - hr = IDirectMusicSynth_SetSynthSink(obj->synth, obj->synth_sink); + hr = IDirectMusicSynthSink_SetMasterClock(obj->synth_sink, obj->pLatencyClock); if (SUCCEEDED(hr)) hr = IDirectMusicSynth_Open(obj->synth, port_params); -- 2.31.1

1 0

[PATCH vkd3d v2 2/8] tests: Test struct initializers.
by Francisco Casas 20 Jan '22

20 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 2 + tests/hlsl-initializer-struct.shader_test | 77 +++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 tests/hlsl-initializer-struct.shader_test diff --git a/Makefile.am b/Makefile.am index 3545d74b..051053cd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,6 +70,7 @@ vkd3d_shader_tests = \ tests/hlsl-function-overload.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-intrinsic-override.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ @@ -293,6 +294,7 @@ XFAIL_TESTS = \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-initializer-local-array.shader_test \ tests/hlsl-initializer-static-array.shader_test \ + tests/hlsl-initializer-struct.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-initializer-struct.shader_test b/tests/hlsl-initializer-struct.shader_test new file mode 100644 index 00000000..ab9ac0f3 --- /dev/null +++ b/tests/hlsl-initializer-struct.shader_test @@ -0,0 +1,77 @@ +[pixel shader] +struct stu { + int3 aaa; + float3 bbb; + double2 ccc; + float4 ddd; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 21, 22, 23, + 31, 32, + 41, 42, 43, 44, + 51 + }; + return val.ddd; +} + +[test] +draw quad +probe all rgba (41, 42, 43, 44) + + +[pixel shader] +struct stu { + int3 aaa; + float3 bbb[2]; + double2 ccc; + float4 ddd[3][2]; + int eee; +}; + +float4 main() : sv_target +{ + struct stu val = { + 11, 12, 13, + 211, 212, 213, 221, 222, 223, + 31, 32, + 4111, 4112, 4113, 4114, 4121, 4122, 4123, 4124, + 4211, 4212, 4213, 4214, 4221, 4222, 4223, 4224, + 4311, 4312, 4313, 4314, 4321, 4322, 4323, 4324, + 51 + }; + return val.ddd[2][0]; +} + +[test] +draw quad +probe all rgba (4311, 4312, 4313, 4314) + + +[pixel shader] +struct stu { + int3 aaa; + struct { + float4 foo; + int2 bar; + } bbb[3]; +}; + +float4 main() : sv_target +{ + struct stu val = { + 1, 2, 3, + 11, 12, 13, 14, 15, 16, + 21, 22, 23, 24, 25, 26, + 31, 32, 33, 34, 35, 36 + }; + return val.bbb[1].foo; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) -- 2.25.1

2 1

[PATCH] widl: Allow optional interface parameter on the [activatable] attribute.
by Bernhard Kölbl 20 Jan '22

20 Jan '22

As per MIDL 3.0. Needed for some WinRT runtime classes. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- tools/widl/parser.y | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index fa863921c92..04365d62280 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -278,6 +278,7 @@ static typelib_t *current_typelib; %type <expr_list> m_exprs /* exprs expr_list */ expr_list_int_const %type <expr> contract_req %type <expr> static_attr +%type <expr> activatable_attr %type <type> delegatedef %type <stgclass> storage_cls_spec %type <type_qualifier> type_qualifier m_type_qual_list @@ -580,8 +581,16 @@ static_attr: decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTER $$ = make_exprt(EXPR_MEMBER, declare_var(NULL, $1, make_declarator(NULL), 0), $3); } +/* The interface part of the activatable attribute is only checked +for the type, but won't be further used by the following nonterminal. */ +activatable_attr: + contract_req { $$ = $1; } + | decl_spec ',' contract_req { if ($1->type->type_type != TYPE_INTERFACE) + error_loc("type %s is not an interface\n", $1->type->name); + $$ = $3; } + attribute: { $$ = NULL; } - | tACTIVATABLE '(' contract_req ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } + | tACTIVATABLE '(' activatable_attr ')' { $$ = make_attrp(ATTR_ACTIVATABLE, $3); } | tAGGREGATABLE { $$ = make_attr(ATTR_AGGREGATABLE); } | tANNOTATION '(' aSTRING ')' { $$ = make_attrp(ATTR_ANNOTATION, $3); } | tAPPOBJECT { $$ = make_attr(ATTR_APPOBJECT); } -- 2.34.1

1 0

[PATCH 5/5] wined3d: Properly compare integers in wined3d_so_desc_compare().
by Henri Verbeet 20 Jan '22

20 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 93c738ad955..71b5aaa5742 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5733,11 +5733,11 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * unsigned int i; int ret; - if ((ret = (k->element_count - desc->element_count))) + if ((ret = wined3d_uint32_compare(k->element_count, desc->element_count))) return ret; - if ((ret = (k->buffer_stride_count - desc->buffer_stride_count))) + if ((ret = wined3d_uint32_compare(k->buffer_stride_count, desc->buffer_stride_count))) return ret; - if ((ret = (k->rasterizer_stream_idx - desc->rasterizer_stream_idx))) + if ((ret = wined3d_uint32_compare(k->rasterizer_stream_idx, desc->rasterizer_stream_idx))) return ret; for (i = 0; i < k->element_count; ++i) @@ -5745,25 +5745,25 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * const struct wined3d_stream_output_element *b = &desc->elements[i]; const struct wined3d_stream_output_element *a = &k->elements[i]; - if ((ret = (a->stream_idx - b->stream_idx))) + if ((ret = wined3d_uint32_compare(a->stream_idx, b->stream_idx))) return ret; if ((ret = (!a->semantic_name - !b->semantic_name))) return ret; if (a->semantic_name && (ret = strcmp(a->semantic_name, b->semantic_name))) return ret; - if ((ret = (a->semantic_idx - b->semantic_idx))) + if ((ret = wined3d_uint32_compare(a->semantic_idx, b->semantic_idx))) return ret; - if ((ret = (a->component_idx - b->component_idx))) + if ((ret = wined3d_uint32_compare(a->component_idx, b->component_idx))) return ret; - if ((ret = (a->component_count - b->component_count))) + if ((ret = wined3d_uint32_compare(a->component_count, b->component_count))) return ret; - if ((ret = (a->output_slot - b->output_slot))) + if ((ret = wined3d_uint32_compare(a->output_slot, b->output_slot))) return ret; } for (i = 0; i < k->buffer_stride_count; ++i) { - if ((ret = (k->buffer_strides[i] - desc->buffer_strides[i]))) + if ((ret = wined3d_uint32_compare(k->buffer_strides[i], desc->buffer_strides[i]))) return ret; } -- 2.30.2

1 0

[PATCH 4/5] wined3d: Properly compare integers in wined3d_pipeline_layout_vk_compare().
by Henri Verbeet 20 Jan '22

20 Jan '22

As pointed out by Giovanni, modular subtraction doesn't produce a total order; in particular, it's not transitive. For the values likely to be encountered by wined3d_pipeline_layout_vk_compare(), this is perhaps unlikely to be an issue in practice. However, that's not necessarily the case for e.g. handles or masks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context_vk.c | 5 +++-- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index fd6d810f0e2..cf6247387ca 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1797,9 +1797,10 @@ static int wined3d_pipeline_layout_vk_compare(const void *key, const struct wine const struct wined3d_pipeline_layout_key_vk *a = key; const struct wined3d_pipeline_layout_key_vk *b = &WINE_RB_ENTRY_VALUE(entry, const struct wined3d_pipeline_layout_vk, entry)->key; + int ret; - if (a->binding_count != b->binding_count) - return a->binding_count - b->binding_count; + if ((ret = wined3d_uint32_compare(a->binding_count, b->binding_count))) + return ret; return memcmp(a->bindings, b->bindings, a->binding_count * sizeof(*a->bindings)); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5fa51a844ac..c9d83b3fbc7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -447,6 +447,11 @@ static inline unsigned int wined3d_popcount(unsigned int x) #endif } +static inline int wined3d_uint32_compare(uint32_t x, uint32_t y) +{ + return (x > y) - (x < y); +} + #define ORM_BACKBUFFER 0 #define ORM_FBO 1 -- 2.30.2

1 0

[PATCH 3/5] wined3d: Use wined3d_mask_from_size() in wined3d_ffp_get_fs_settings().
by Henri Verbeet 20 Jan '22

20 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4724393905b..69c73487240 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6549,7 +6549,7 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st } else { - settings->texcoords_initialized = (1u << WINED3D_MAX_TEXTURES) - 1; + settings->texcoords_initialized = wined3d_mask_from_size(WINED3D_MAX_TEXTURES); } settings->pointsprite = state->render_states[WINED3D_RS_POINTSPRITEENABLE] -- 2.30.2

1 0

[PATCH 2/5] wined3d: Use wined3d_mask_from_size() in wined3d_ffp_get_vs_settings().
by Henri Verbeet 20 Jan '22

20 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/utils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5e375f43a48..4724393905b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6734,7 +6734,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } if (d3d_info->full_ffp_varyings) - settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; + settings->texcoords = wined3d_mask_from_size(WINED3D_MAX_TEXTURES); if (d3d_info->emulated_flatshading) settings->flatshading = state->render_states[WINED3D_RS_SHADEMODE] == WINED3D_SHADE_FLAT; @@ -6783,7 +6783,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, settings->texgen[i] = state->texture_states[i][WINED3D_TSS_TEXCOORD_INDEX]; } if (d3d_info->full_ffp_varyings) - settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; + settings->texcoords = wined3d_mask_from_size(WINED3D_MAX_TEXTURES); for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { -- 2.30.2

1 0

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

20 Jan '22

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 20 Jan '22

20 Jan '22

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 20 Jan '22

20 Jan '22

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 20 Jan '22

20 Jan '22

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 20 Jan '22

20 Jan '22

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 20 Jan '22

20 Jan '22

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 20 Jan '22

20 Jan '22

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 20 Jan '22

20 Jan '22

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 20 Jan '22

20 Jan '22

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 20 Jan '22

20 Jan '22

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

[PATCH] bcrypt: Return BCryptSignHash len when only output is NULL
by Piotr Kleski 20 Jan '22

20 Jan '22

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> --- 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..488a3605dcd 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->input || !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 1/2] dwrite: Implement GetMatchingFontsByLOGFONT().
by Nikolay Sivov 20 Jan '22

20 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 4 ++- dlls/dwrite/gdiinterop.c | 15 ++++++++--- dlls/dwrite/tests/font.c | 57 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5815c09e8ae..2296c74c1e3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7501,6 +7501,8 @@ static IDWriteLocalizedStrings * fontset_entry_get_property(struct dwrite_fontse opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG, &value); else if (property == DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG) opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, &value); + else if (property == DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME) + opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &value); else WARN("Unsupported property %u.\n", property); @@ -7642,6 +7644,7 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE case DWRITE_FONT_PROPERTY_ID_FULL_NAME: case DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG: case DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG: + case DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME: if (!(value = fontset_entry_get_property(entry, props[i].propertyId))) return FALSE; @@ -7652,7 +7655,6 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE case DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME: case DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME: case DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME: - case DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME: case DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG: case DWRITE_FONT_PROPERTY_ID_WEIGHT: case DWRITE_FONT_PROPERTY_ID_STRETCH: diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index e8b4a747e29..703b1e8170c 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -906,11 +906,20 @@ static HRESULT WINAPI gdiinterop1_GetFontSignature(IDWriteGdiInterop1 *iface, ID } static HRESULT WINAPI gdiinterop1_GetMatchingFontsByLOGFONT(IDWriteGdiInterop1 *iface, LOGFONTW const *logfont, - IDWriteFontSet *fontset, IDWriteFontSet **subset) + IDWriteFontSet *fontset, IDWriteFontSet **subset) { - FIXME("%p, %p, %p, %p: stub.\n", iface, logfont, fontset, subset); + DWRITE_FONT_PROPERTY property; - return E_NOTIMPL; + TRACE("%p, %p, %p, %p.\n", iface, logfont, fontset, subset); + + if (!logfont || !fontset) + return E_INVALIDARG; + + property.propertyId = DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME; + property.propertyValue = logfont->lfFaceName; + property.localeName = L""; + + return IDWriteFontSet_GetMatchingFonts(fontset, &property, 1, subset); } static const IDWriteGdiInterop1Vtbl gdiinteropvtbl = diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index b185db49c13..b347a73a53e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -10319,6 +10319,62 @@ if (SUCCEEDED(hr)) DELETE_FONTFILE(path); } +static void test_GetMatchingFontsByLOGFONT(void) +{ + IDWriteFontSet *systemset, *set; + IDWriteGdiInterop1 *interop; + IDWriteGdiInterop *interop0; + IDWriteFactory3 *factory; + ULONG refcount, count; + LOGFONTW logfont; + HRESULT hr; + + factory = create_factory_iid(&IID_IDWriteFactory3); + if (!factory) + { + win_skip("Skipping GetMatchingFontsByLOGFONT() tests.\n"); + return; + } + + hr = IDWriteFactory3_GetSystemFontSet(factory, &systemset); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + interop = NULL; + hr = IDWriteFactory3_GetGdiInterop(factory, &interop0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteGdiInterop_QueryInterface(interop0, &IID_IDWriteGdiInterop1, (void **)&interop); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDWriteGdiInterop_Release(interop0); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWidth = 12; + logfont.lfWeight = FW_BOLD; + logfont.lfItalic = 1; + lstrcpyW(logfont.lfFaceName, L"tahoma"); + + hr = IDWriteGdiInterop1_GetMatchingFontsByLOGFONT(interop, NULL, systemset, &set); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteGdiInterop1_GetMatchingFontsByLOGFONT(interop, &logfont, NULL, &set); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteGdiInterop1_GetMatchingFontsByLOGFONT(interop, &logfont, systemset, &set); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + count = IDWriteFontSet_GetFontCount(set); + ok(count > 0, "Unexpected count %u.\n", count); + + IDWriteFontSet_Release(set); + + IDWriteGdiInterop1_Release(interop); + IDWriteFontSet_Release(systemset); + + refcount = IDWriteFactory3_Release(factory); + ok(!refcount, "Factory wasn't released, %u.\n", refcount); +} + START_TEST(font) { IDWriteFactory *factory; @@ -10393,6 +10449,7 @@ START_TEST(font) test_family_font_set(); test_system_font_set(); test_CreateFontCollectionFromFontSet(); + test_GetMatchingFontsByLOGFONT(); IDWriteFactory_Release(factory); } -- 2.34.1

1 1

[PATCH] mfreadwrite/tests: Use CRT allocation functions.
by Nikolay Sivov 20 Jan '22

20 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index e3ff7f6e7aa..7e724344168 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -40,7 +40,6 @@ DEFINE_GUID(GUID_NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); #include "d3d9.h" #include "dxva2api.h" -#include "wine/heap.h" #include "wine/test.h" static ULONG get_refcount(void *iface) @@ -145,7 +144,7 @@ static ULONG WINAPI test_media_stream_Release(IMFMediaStream *iface) if (!refcount) { IMFMediaEventQueue_Release(stream->event_queue); - heap_free(stream); + free(stream); } return refcount; @@ -297,7 +296,7 @@ static ULONG WINAPI test_source_Release(IMFMediaSource *iface) if (!refcount) { IMFMediaEventQueue_Release(source->event_queue); - heap_free(source); + free(source); } return refcount; @@ -488,7 +487,7 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia BOOL selected; HRESULT hr; - stream = heap_alloc_zero(sizeof(*stream)); + stream = calloc(1, sizeof(*stream)); stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl; stream->refcount = 1; hr = MFCreateEventQueue(&stream->event_queue); @@ -509,7 +508,7 @@ static IMFMediaSource *create_test_source(int stream_count) struct test_source *source; int i; - source = heap_alloc_zero(sizeof(*source)); + source = calloc(1, sizeof(*source)); source->IMFMediaSource_iface.lpVtbl = &test_source_vtbl; source->refcount = 1; source->stream_count = stream_count; @@ -606,9 +605,7 @@ static ULONG WINAPI async_callback_Release(IMFSourceReaderCallback *iface) ULONG refcount = InterlockedDecrement(&callback->refcount); if (!refcount) - { - heap_free(callback); - } + free(callback); return refcount; } @@ -646,7 +643,7 @@ static struct async_callback *create_async_callback(void) { struct async_callback *callback; - callback = heap_alloc(sizeof(*callback)); + callback = calloc(1, sizeof(*callback)); callback->IMFSourceReaderCallback_iface.lpVtbl = &async_callback_vtbl; callback->refcount = 1; -- 2.34.1

1 0

[PATCH] bcrypt: Return BCryptSignHash len when only output is NULL
by Piotr Kleski 20 Jan '22

20 Jan '22

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> --- 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..488a3605dcd 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->input || !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] programs/cmd/tests: test paths which length exceeds MAX_PATH
by Eric Pouech 20 Jan '22

20 Jan '22

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/tests/test_builtins.cmd | 20 ++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++++ 2 files changed, 24 insertions(+) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 47b028207ac..a4cb8ec100c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -3333,6 +3333,26 @@ if errorlevel 1 echo Normal+tab+garbage drive change failed popd +echo ------------ Testing length wrt. MAX_PATH ------------ +rem native cmd limits all path lengths to MAX_PATH=260 +rem so cannot create more than 23 10-letter subdirs: +rem 260-2(C:)-1(\0)=23*11(\abcdefghij)+5 +pushd +set depth=30 +for /L %d in (0,1,30) do ( + mkdir abcdefghij + if errorlevel 0 ( + cd abcdefghij + set depth=%d + ) +) +popd +if depth gtr 23 (echo Failure) else echo Success +rem even relative paths are transformed to absolute, and tested against MAX_PATH +echo abc > 0123456789 +if exist 0123456789 (echo Failure) else echo Success +popd +rmdir /s /q abcdefghij echo ------------ Testing combined CALLs/GOTOs ------------ echo @echo off>foo.cmd echo goto :eof>>foot.cmd diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4c7bc3e0c02..b6fc2fda894 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1687,6 +1687,10 @@ Normal+space+garbage Quoted should fail Normal+tab Normal+tab+garbage +------------ Testing length wrt. MAX_PATH ------------ +@pwd@ +@todo_wine@Success +@todo_wine@Success ------------ Testing combined CALLs/GOTOs ------------ world cheball

2 1

[PATCH 5/5] comctl32/status: Do not draw background for status text.
by Zhiyi Zhang 20 Jan '22

20 Jan '22

DrawStatusTextW() always draws the text background, so it's unfit to use it directly to draw status text because status control draws its own background. Fix status control text having wrong background when themed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 67 ++++++++++++++++++++++------------------ dlls/comctl32/status.c | 3 +- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 44d3b43ab9b..f9ed8b84ffd 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -182,6 +182,7 @@ extern COMCTL32_SysColor comctl32_color DECLSPEC_HIDDEN; /* Internal function */ HWND COMCTL32_CreateToolTip (HWND) DECLSPEC_HIDDEN; +void COMCTL32_DrawStatusText(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style, BOOL draw_background) DECLSPEC_HIDDEN; VOID COMCTL32_RefreshSysColors(void) DECLSPEC_HIDDEN; void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark, BOOL bHorizontal) DECLSPEC_HIDDEN; void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight, COLORREF crBackground) DECLSPEC_HIDDEN; diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index b457bdcb8be..c707703ccd2 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -460,39 +460,25 @@ GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, const INT *lpInfo) } while (*lpRun); } - -/*********************************************************************** - * DrawStatusTextW [COMCTL32.@] - * - * Draws text with borders, like in a status bar. - * - * PARAMS - * hdc [I] handle to the window's display context - * lprc [I] pointer to a rectangle - * text [I] pointer to the text - * style [I] drawing style - * - * RETURNS - * No return value. - * - * NOTES - * The style variable can have one of the following values: - * (will be written ...) - */ - -void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) +void COMCTL32_DrawStatusText(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style, BOOL draw_background) { RECT r = *lprc; - UINT border = BDR_SUNKENOUTER; + UINT border; COLORREF oldbkcolor; - if (style & SBT_POPOUT) - border = BDR_RAISEDOUTER; - else if (style & SBT_NOBORDERS) - border = 0; + if (draw_background) + { + if (style & SBT_POPOUT) + border = BDR_RAISEDOUTER; + else if (style & SBT_NOBORDERS) + border = 0; + else + border = BDR_SUNKENOUTER; - oldbkcolor = SetBkColor (hdc, comctl32_color.clrBtnFace); - DrawEdge (hdc, &r, border, BF_MIDDLE|BF_RECT|BF_ADJUST); + oldbkcolor = SetBkColor (hdc, comctl32_color.clrBtnFace); + DrawEdge (hdc, &r, border, BF_MIDDLE|BF_RECT|BF_ADJUST); + SetBkColor (hdc, oldbkcolor); + } /* now draw text */ if (text) { @@ -524,10 +510,31 @@ void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) SetBkMode (hdc, oldbkmode); SetTextColor (hdc, oldtextcolor); } - - SetBkColor (hdc, oldbkcolor); } +/*********************************************************************** + * DrawStatusTextW [COMCTL32.@] + * + * Draws text with borders, like in a status bar. + * + * PARAMS + * hdc [I] handle to the window's display context + * lprc [I] pointer to a rectangle + * text [I] pointer to the text + * style [I] drawing style + * + * RETURNS + * No return value. + * + * NOTES + * The style variable can have one of the following values: + * (will be written ...) + */ + +void WINAPI DrawStatusTextW(HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style) +{ + COMCTL32_DrawStatusText(hdc, lprc, text, style, TRUE); +} /*********************************************************************** * DrawStatusText [COMCTL32.@] diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 6fcdc32086a..e804c0418f4 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -139,7 +139,6 @@ STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) DrawFrameControl( hdc, &rc, DFC_SCROLL, DFCS_SCROLLSIZEGRIP ); } - static void STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { @@ -187,7 +186,7 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART SendMessageW (infoPtr->Notify, WM_DRAWITEM, dis.CtlID, (LPARAM)&dis); } else { r.left += x; - DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS); + COMCTL32_DrawStatusText(hdc, &r, part->text, 0, FALSE); } } -- 2.32.0

1 0

[PATCH 4/5] comctl32/status: Calculate border for part background only when theming is off.
by Zhiyi Zhang 20 Jan '22

20 Jan '22

This is a no-op. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/status.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 786fcbd291d..6fcdc32086a 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -144,16 +144,12 @@ static void STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { RECT r = part->bound; - UINT border = BDR_SUNKENOUTER; + UINT border; HTHEME theme = GetWindowTheme (infoPtr->Self); int themePart = SP_PANE; int x = 0; TRACE("part bound %s\n", wine_dbgstr_rect(&r)); - if (part->style & SBT_POPOUT) - border = BDR_RAISEDOUTER; - else if (part->style & SBT_NOBORDERS) - border = 0; if (theme) { @@ -163,7 +159,15 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART DrawThemeBackground(theme, hdc, themePart, 0, &r, NULL); } else + { + if (part->style & SBT_POPOUT) + border = BDR_RAISEDOUTER; + else if (part->style & SBT_NOBORDERS) + border = 0; + else + border = BDR_SUNKENOUTER; DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST); + } if (part->hIcon) { INT cy = r.bottom - r.top; -- 2.32.0

1 0

[PATCH 3/5] comctl32/status: Remove redundant background drawing code.
by Zhiyi Zhang 20 Jan '22

20 Jan '22

The part background is already painted in STATUSBAR_Refresh(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/status.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index ac93d7712c0..786fcbd291d 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -191,9 +191,6 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART static void STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPART *part, int itemID) { - HBRUSH hbrBk; - HTHEME theme; - TRACE("item %d\n", itemID); if (part->bound.right < part->bound.left) return; @@ -201,23 +198,6 @@ STATUSBAR_RefreshPart (const STATUS_INFO *infoPtr, HDC hdc, const STATUSWINDOWPA if (!RectVisible(hdc, &part->bound)) return; - if ((theme = GetWindowTheme (infoPtr->Self))) - { - RECT cr; - GetClientRect (infoPtr->Self, &cr); - DrawThemeBackground(theme, hdc, 0, 0, &cr, &part->bound); - } - else - { - if (infoPtr->clrBk != CLR_DEFAULT) - hbrBk = CreateSolidBrush (infoPtr->clrBk); - else - hbrBk = GetSysColorBrush (COLOR_3DFACE); - FillRect(hdc, &part->bound, hbrBk); - if (infoPtr->clrBk != CLR_DEFAULT) - DeleteObject (hbrBk); - } - STATUSBAR_DrawPart (infoPtr, hdc, part, itemID); } -- 2.32.0

1 0

[PATCH 2/5] comctl32/treeview: Support themed check boxes for TVS_CHECKBOXES style.
by Zhiyi Zhang 20 Jan '22

20 Jan '22

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/treeview.c | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index f4a387dd0d2..1368105f271 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2962,6 +2962,52 @@ TREEVIEW_Invalidate(const TREEVIEW_INFO *infoPtr, const TREEVIEW_ITEM *item) InvalidateRect(infoPtr->hwnd, NULL, TRUE); } +static BOOL TREEVIEW_InitThemedCheckboxes(TREEVIEW_INFO *info) +{ + HBITMAP bitmap, old_bitmap; + HDC hdc, hdc_screen; + HTHEME theme; + RECT rect; + SIZE size; + + if (!GetWindowTheme(info->hwnd)) + return FALSE; + + theme = OpenThemeDataForDpi(NULL, L"Button", GetDpiForWindow(info->hwnd)); + if (!theme) + return FALSE; + + hdc_screen = GetDC(0); + hdc = CreateCompatibleDC(hdc_screen); + GetThemePartSize(theme, hdc, BP_CHECKBOX, 0, NULL, TS_DRAW, &size); + bitmap = CreateCompatibleBitmap(hdc_screen, size.cx * 3, size.cy); + old_bitmap = SelectObject(hdc, bitmap); + + SetRect(&rect, 0, 0, size.cx * 3, size.cy); + FillRect(hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); + + rect.left = size.cx; + rect.right = rect.left + size.cx; + DrawThemeBackground(theme, hdc, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, &rect, NULL); + + rect.left = size.cx * 2; + rect.right = rect.left + size.cx; + DrawThemeBackground(theme, hdc, BP_CHECKBOX, CBS_CHECKEDNORMAL, &rect, NULL); + + SelectObject(hdc, old_bitmap); + info->himlState = ImageList_Create(size.cx, size.cy, ILC_COLOR32, 3, 0); + ImageList_Add(info->himlState, bitmap, NULL); + + DeleteObject(bitmap); + DeleteDC(hdc); + ReleaseDC(0, hdc_screen); + CloseThemeData(theme); + + info->stateImageWidth = size.cx; + info->stateImageHeight = size.cy; + return TRUE; +} + static void TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) { @@ -2970,6 +3016,9 @@ TREEVIEW_InitCheckboxes(TREEVIEW_INFO *infoPtr) HDC hdc, hdcScreen; int nIndex; + if (TREEVIEW_InitThemedCheckboxes(infoPtr)) + return; + infoPtr->himlState = ImageList_Create(16, 16, ILC_COLOR | ILC_MASK, 3, 0); hdcScreen = GetDC(0); -- 2.32.0

1 0

[PATCH 1/5] comctl32/listview: Support themed check boxes for LVS_EX_CHECKBOXES style.
by Zhiyi Zhang 20 Jan '22

20 Jan '22

Fix check boxes in the list items of 7-zip options dialog not being themed even when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/listview.c | 52 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 9e35f7879b7..044e64bfa53 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -139,6 +139,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" +#include "vsstyle.h" #include "shlwapi.h" #include "wine/debug.h" @@ -8424,15 +8425,62 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) * Creates the checkbox imagelist. Helper for LISTVIEW_SetExtendedListViewStyle * */ +static HIMAGELIST LISTVIEW_CreateThemedCheckBoxImageList(const LISTVIEW_INFO *info) +{ + HBITMAP bitmap, old_bitmap; + HIMAGELIST image_list; + HDC hdc, mem_hdc; + HTHEME theme; + RECT rect; + SIZE size; + + if (!GetWindowTheme(info->hwndSelf)) + return NULL; + + theme = OpenThemeDataForDpi(NULL, L"Button", GetDpiForWindow(info->hwndSelf)); + if (!theme) + return NULL; + + hdc = GetDC(info->hwndSelf); + GetThemePartSize(theme, hdc, BP_CHECKBOX, 0, NULL, TS_DRAW, &size); + SetRect(&rect, 0, 0, size.cx, size.cy); + image_list = ImageList_Create(size.cx, size.cy, ILC_COLOR32, 2, 2); + mem_hdc = CreateCompatibleDC(hdc); + bitmap = CreateCompatibleBitmap(hdc, size.cx, size.cy); + old_bitmap = SelectObject(mem_hdc, bitmap); + ReleaseDC(info->hwndSelf, hdc); + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_CHECKBOX, CBS_UNCHECKEDNORMAL)) + FillRect(mem_hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); + DrawThemeBackground(theme, mem_hdc, BP_CHECKBOX, CBS_UNCHECKEDNORMAL, &rect, NULL); + ImageList_Add(image_list, bitmap, NULL); + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_CHECKBOX, CBS_CHECKEDNORMAL)) + FillRect(mem_hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); + DrawThemeBackground(theme, mem_hdc, BP_CHECKBOX, CBS_CHECKEDNORMAL, &rect, NULL); + ImageList_Add(image_list, bitmap, NULL); + + SelectObject(mem_hdc, old_bitmap); + DeleteObject(bitmap); + DeleteDC(mem_hdc); + CloseThemeData(theme); + return image_list; +} + static HIMAGELIST LISTVIEW_CreateCheckBoxIL(const LISTVIEW_INFO *infoPtr) { HDC hdc_wnd, hdc; HBITMAP hbm_im, hbm_mask, hbm_orig; RECT rc; - HBRUSH hbr_white = GetStockObject(WHITE_BRUSH); - HBRUSH hbr_black = GetStockObject(BLACK_BRUSH); + HBRUSH hbr_white, hbr_black; HIMAGELIST himl; + himl = LISTVIEW_CreateThemedCheckBoxImageList(infoPtr); + if (himl) + return himl; + + hbr_white = GetStockObject(WHITE_BRUSH); + hbr_black = GetStockObject(BLACK_BRUSH); himl = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_MASK, 2, 2); hdc_wnd = GetDC(infoPtr->hwndSelf); -- 2.32.0

1 0

[PATCH] msado15: Return early if Execute doesn't return a rowset
by Alistair Leslie-Hughes 20 Jan '22

20 Jan '22

Not all queries return a rowset, eg delete from .... In these cases, there isn't anything else to be done. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 92a0deb6959..23865b37688 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1531,7 +1531,7 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT hr = ICommandText_Execute(command_text, NULL, &IID_IUnknown, NULL, &affected, &rowset); ICommandText_Release(command_text); - if (FAILED(hr)) + if (FAILED(hr) || !rowset) return hr; ADORecordsetConstruction_put_Rowset(&recordset->ADORecordsetConstruction_iface, rowset); -- 2.34.1

1 0

[PATCH vkd3d v3 1/8] tests: Test array initializers.
by Francisco Casas 20 Jan '22

20 Jan '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- Makefile.am | 4 ++ .../hlsl-initializer-local-array.shader_test | 36 ++++++++++++++++++ .../hlsl-initializer-static-array.shader_test | 38 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 tests/hlsl-initializer-local-array.shader_test create mode 100644 tests/hlsl-initializer-static-array.shader_test diff --git a/Makefile.am b/Makefile.am index 20fee06d..efe99124 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,6 +68,8 @@ vkd3d_shader_tests = \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ tests/hlsl-function-overload.shader_test \ + tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-invalid.shader_test \ tests/hlsl-majority-pragma.shader_test \ tests/hlsl-majority-typedef.shader_test \ @@ -289,6 +291,8 @@ XFAIL_TESTS = \ tests/cast-to-uint.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ + tests/hlsl-initializer-local-array.shader_test \ + tests/hlsl-initializer-static-array.shader_test \ tests/hlsl-bool-cast.shader_test \ tests/hlsl-duplicate-modifiers.shader_test \ tests/hlsl-for.shader_test \ diff --git a/tests/hlsl-initializer-local-array.shader_test b/tests/hlsl-initializer-local-array.shader_test new file mode 100644 index 00000000..9ea35d52 --- /dev/null +++ b/tests/hlsl-initializer-local-array.shader_test @@ -0,0 +1,36 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float4 array_loc[3] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34 + }; + return array_loc[1]; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +float4 main() : SV_TARGET +{ + float4 array_loc[2][4] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34, + 41, 42, 43, 44, + 51, 52, 53, 54, + 61, 62, 63, 64, + 71, 72, 73, 74, + 81, 82, 83, 84, + }; + return array_loc[1][2]; +} + +[test] +draw quad +probe all rgba (71, 72, 73, 74) + diff --git a/tests/hlsl-initializer-static-array.shader_test b/tests/hlsl-initializer-static-array.shader_test new file mode 100644 index 00000000..bcddc524 --- /dev/null +++ b/tests/hlsl-initializer-static-array.shader_test @@ -0,0 +1,38 @@ +[pixel shader] +static const float4 array_st[3] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34 +}; + +float4 main() : SV_TARGET +{ + return array_st[1]; +} + +[test] +draw quad +probe all rgba (21, 22, 23, 24) + + +[pixel shader] +static const float4 array_st[4][2] = { + 11, 12, 13, 14, + 21, 22, 23, 24, + 31, 32, 33, 34, + 41, 42, 43, 44, + 51, 52, 53, 54, + 61, 62, 63, 64, + 71, 72, 73, 74, + 81, 82, 83, 84, +}; + +float4 main() : SV_TARGET +{ + return array_st[2][1]; +} + +[test] +draw quad +probe all rgba (61, 62, 63, 64) + -- 2.25.1

2 1

[PATCH vkd3d 1/3] vkd3d-shader/hlsl: Handle branches in copy propagation.
by Giovanni Mascellani 19 Jan '22

19 Jan '22

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- A new var_def is now initialized to the content of the same var_def in earlier stack frames. I still believe this is more complicated than it should be (i.e., harder to check and therefore more prone to bugs), but maybe it's correct anyway. Zebediah said she doesn't like it in this way, but I couldn't understand in which direction I should change it to make it better; since my last submission has been evicted from the patch tracker, I am sending again without changes. --- libs/vkd3d-shader/hlsl_codegen.c | 148 +++++++++++++++++++++++++++---- 1 file changed, 133 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 75716bdf..d09a6a3b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -290,6 +290,7 @@ struct copy_propagation_var_def struct copy_propagation_state { struct rb_tree var_defs; + struct copy_propagation_state *parent; }; static int copy_propagation_var_def_compare(const void *key, const struct rb_entry *entry) @@ -308,9 +309,12 @@ static void copy_propagation_var_def_destroy(struct rb_entry *entry, void *conte } static struct copy_propagation_var_def *copy_propagation_get_var_def(struct copy_propagation_state *state, - struct hlsl_ir_var *var) + const struct hlsl_ir_var *var) { - struct rb_entry *entry = rb_get(&state->var_defs, var); + struct rb_entry *entry; + + while (state && !(entry = rb_get(&state->var_defs, var))) + state = state->parent; if (entry) return RB_ENTRY_VALUE(entry, struct copy_propagation_var_def, entry); @@ -321,8 +325,8 @@ static struct copy_propagation_var_def *copy_propagation_get_var_def(struct copy static struct copy_propagation_var_def *copy_propagation_create_var_def(struct hlsl_ctx *ctx, struct copy_propagation_state *state, struct hlsl_ir_var *var) { + struct copy_propagation_var_def *var_def, *prev_var_def; struct rb_entry *entry = rb_get(&state->var_defs, var); - struct copy_propagation_var_def *var_def; int res; if (entry) @@ -331,6 +335,10 @@ static struct copy_propagation_var_def *copy_propagation_create_var_def(struct h if (!(var_def = hlsl_alloc(ctx, offsetof(struct copy_propagation_var_def, values[var->data_type->reg_size])))) return NULL; + prev_var_def = copy_propagation_get_var_def(state, var); + if (prev_var_def) + memcpy(var_def->values, prev_var_def->values, var->data_type->reg_size * sizeof(*var_def->values)); + var_def->var = var; res = rb_put(&state->var_defs, var, &var_def->entry); @@ -339,12 +347,6 @@ static struct copy_propagation_var_def *copy_propagation_create_var_def(struct h return var_def; } -static void copy_propagation_invalidate_whole_variable(struct copy_propagation_var_def *var_def) -{ - TRACE("Invalidate variable %s.\n", var_def->var->name); - memset(var_def->values, 0, sizeof(*var_def->values) * var_def->var->data_type->reg_size); -} - static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, unsigned int offset, unsigned char writemask, struct hlsl_ir_node *node) { @@ -354,7 +356,7 @@ static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, { if (writemask & (1u << i)) { - TRACE("Variable %s[%u] is written by instruction %p%s.\n", + TRACE("Variable %s[%u] updated with value from %p%s.\n", var_def->var->name, offset + i, node, debug_hlsl_writemask(1u << i)); var_def->values[offset + i].node = node; var_def->values[offset + i].component = j++; @@ -362,6 +364,99 @@ static void copy_propagation_set_value(struct copy_propagation_var_def *var_def, } } +static void copy_propagation_invalidate_whole_variable(struct copy_propagation_state *state, + struct copy_propagation_var_def *var_def) +{ + const struct hlsl_ir_var *var = var_def->var; + + TRACE("Invalidate variable %s.\n", var->name); + while (state) + { + if ((var_def = copy_propagation_get_var_def(state, var))) + memset(var_def->values, 0, sizeof(*var_def->values) * var_def->var->data_type->reg_size); + state = state->parent; + } +} + +static void copy_propagation_invalidate_variable_partial(struct copy_propagation_state *state, + struct copy_propagation_var_def *var_def, unsigned int offset, unsigned char writemask) +{ + const struct hlsl_ir_var *var = var_def->var; + + TRACE("Invalidate variable %s[%u]%s.\n", var->name, offset, debug_hlsl_writemask(writemask)); + while (state) + { + if ((var_def = copy_propagation_get_var_def(state, var))) + copy_propagation_set_value(var_def, offset, writemask, NULL); + state = state->parent; + } +} + +static void copy_propagation_invalidate_from_block(struct hlsl_ctx *ctx, struct copy_propagation_state *state, + struct hlsl_block *block) +{ + struct hlsl_ir_node *instr; + + LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) + { + switch (instr->type) + { + case HLSL_IR_STORE: + { + struct hlsl_ir_store *store = hlsl_ir_store(instr); + struct copy_propagation_var_def *var_def; + struct hlsl_deref *lhs = &store->lhs; + struct hlsl_ir_var *var = lhs->var; + unsigned int offset; + + if (!(var_def = copy_propagation_get_var_def(state, var))) + continue; + + if (hlsl_offset_from_deref(lhs, &offset)) + copy_propagation_invalidate_variable_partial(state, var_def, offset, store->writemask); + else + copy_propagation_invalidate_whole_variable(state, var_def); + + break; + } + + case HLSL_IR_IF: + { + struct hlsl_ir_if *iff = hlsl_ir_if(instr); + + copy_propagation_invalidate_from_block(ctx, state, &iff->then_instrs); + copy_propagation_invalidate_from_block(ctx, state, &iff->else_instrs); + + break; + } + + case HLSL_IR_LOOP: + { + struct hlsl_ir_loop *loop = hlsl_ir_loop(instr); + + copy_propagation_invalidate_from_block(ctx, state, &loop->body); + + break; + } + + default: + break; + } + } +} + +static void copy_propagation_state_destroy(struct copy_propagation_state *state) +{ + rb_destroy(&state->var_defs, copy_propagation_var_def_destroy, NULL); +} + +static void copy_propagation_state_init(struct hlsl_ctx *ctx, struct copy_propagation_state *state, + struct copy_propagation_state *parent) +{ + rb_init(&state->var_defs, copy_propagation_var_def_compare); + state->parent = parent; +} + static struct hlsl_ir_node *copy_propagation_compute_replacement(struct copy_propagation_var_def *var_def, unsigned int offset, unsigned int count, unsigned int *swizzle) { @@ -433,7 +528,30 @@ static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_s if (hlsl_offset_from_deref(lhs, &offset)) copy_propagation_set_value(var_def, offset, store->writemask, store->rhs.node); else - copy_propagation_invalidate_whole_variable(var_def); + copy_propagation_invalidate_whole_variable(state, var_def); +} + +static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, + struct copy_propagation_state *state); + +static bool copy_propagation_process_if(struct hlsl_ctx *ctx, struct hlsl_ir_if *iff, + struct copy_propagation_state *state) +{ + struct copy_propagation_state inner_state; + bool progress = false; + + copy_propagation_state_init(ctx, &inner_state, state); + progress |= copy_propagation_transform_block(ctx, &iff->then_instrs, &inner_state); + copy_propagation_state_destroy(&inner_state); + + copy_propagation_state_init(ctx, &inner_state, state); + progress |= copy_propagation_transform_block(ctx, &iff->else_instrs, &inner_state); + copy_propagation_state_destroy(&inner_state); + + copy_propagation_invalidate_from_block(ctx, state, &iff->then_instrs); + copy_propagation_invalidate_from_block(ctx, state, &iff->else_instrs); + + return progress; } static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_block *block, @@ -455,8 +573,8 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b break; case HLSL_IR_IF: - FIXME("Copy propagation doesn't support conditionals yet, leaving.\n"); - return progress; + progress |= copy_propagation_process_if(ctx, hlsl_ir_if(instr), state); + break; case HLSL_IR_LOOP: FIXME("Copy propagation doesn't support loops yet, leaving.\n"); @@ -475,11 +593,11 @@ static bool copy_propagation_execute(struct hlsl_ctx *ctx, struct hlsl_block *bl struct copy_propagation_state state; bool progress; - rb_init(&state.var_defs, copy_propagation_var_def_compare); + copy_propagation_state_init(ctx, &state, NULL); progress = copy_propagation_transform_block(ctx, block, &state); - rb_destroy(&state.var_defs, copy_propagation_var_def_destroy, NULL); + copy_propagation_state_destroy(&state); return progress; } -- 2.34.1

2 3

[PATCH 1/3] winemac.drv: Allow foregrounding WS_EX_NOACTIVATE windows.
by Tim Clem 19 Jan '22

19 Jan '22

The previous behavior denies any attempt to focus such windows, which is not in line with how they behave on Windows. Rename the macdrv_window_state no_activate field to no_foreground so it more accurately reflects its meaning. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/winemac.drv/cocoa_app.m | 2 +- dlls/winemac.drv/cocoa_window.h | 4 ++-- dlls/winemac.drv/cocoa_window.m | 14 +++++++------- dlls/winemac.drv/macdrv_cocoa.h | 2 +- dlls/winemac.drv/window.c | 14 +++++++------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 1bb752d20b78..16a773e14703 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1864,7 +1864,7 @@ - (void) handleMouseButton:(NSEvent*)theEvent break; } } - if (!process && ![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) + if (!process && ![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noForeground) [self windowGotFocus:windowBroughtForward]; } diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 9a8bbb5e2557..c7bcaedfd970 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -27,7 +27,7 @@ @interface WineWindow : NSPanel <NSWindowDelegate> { BOOL disabled; - BOOL noActivate; + BOOL noForeground; BOOL floating; BOOL resizable; BOOL maximized; @@ -90,7 +90,7 @@ @interface WineWindow : NSPanel <NSWindowDelegate> @property (retain, readonly, nonatomic) WineEventQueue* queue; @property (readonly, nonatomic) BOOL disabled; -@property (readonly, nonatomic) BOOL noActivate; +@property (readonly, nonatomic) BOOL noForeground; @property (readonly, nonatomic) BOOL floating; @property (readonly, getter=isFullscreen, nonatomic) BOOL fullscreen; @property (readonly, getter=isFakingClose, nonatomic) BOOL fakingClose; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 7708157a9924..2e15ec8ce721 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -378,7 +378,7 @@ - (WineMetalView*) newMetalViewWithDevice:(id<MTLDevice>)device; @interface WineWindow () @property (readwrite, nonatomic) BOOL disabled; -@property (readwrite, nonatomic) BOOL noActivate; +@property (readwrite, nonatomic) BOOL noForeground; @property (readwrite, nonatomic) BOOL floating; @property (readwrite, nonatomic) BOOL drawnSinceShown; @property (readwrite, nonatomic) BOOL closing; @@ -942,7 +942,7 @@ @implementation WineWindow static WineWindow* causing_becomeKeyWindow; - @synthesize disabled, noActivate, floating, fullscreen, fakingClose, closing, latentParentWindow, hwnd, queue; + @synthesize disabled, noForeground, floating, fullscreen, fakingClose, closing, latentParentWindow, hwnd, queue; @synthesize drawnSinceShown; @synthesize surface, surface_mutex; @synthesize shapeChangedSinceLastDraw; @@ -1232,7 +1232,7 @@ - (void) setMacDrvState:(const struct macdrv_window_state*)state NSWindowCollectionBehavior behavior; self.disabled = state->disabled; - self.noActivate = state->no_activate; + self.noForeground = state->no_foreground; if (self.floating != state->floating) { @@ -2338,7 +2338,7 @@ - (void) checkEmptyShaped - (BOOL) canBecomeKeyWindow { if (causing_becomeKeyWindow == self) return YES; - if (self.disabled || self.noActivate) return NO; + if (self.disabled || self.noForeground) return NO; if ([self isKeyWindow]) return YES; // If a window's collectionBehavior says it participates in cycling, @@ -2406,7 +2406,7 @@ - (BOOL) validateMenuItem:(NSMenuItem *)menuItem BOOL ret = [super validateMenuItem:menuItem]; if ([menuItem action] == @selector(makeKeyAndOrderFront:)) - ret = [self isKeyWindow] || (!self.disabled && !self.noActivate); + ret = [self isKeyWindow] || (!self.disabled && !self.noForeground); if ([menuItem action] == @selector(toggleFullScreen:) && (self.disabled || maximized)) ret = NO; @@ -2421,7 +2421,7 @@ - (void) makeKeyAndOrderFront:(id)sender [self orderBelow:nil orAbove:nil activate:NO]; [[self ancestorWineWindow] postBroughtForwardEvent]; - if (![self isKeyWindow] && !self.disabled && !self.noActivate) + if (![self isKeyWindow] && !self.disabled && !self.noForeground) [[WineApplicationController sharedController] windowGotFocus:self]; } @@ -2815,7 +2815,7 @@ - (void)windowDidDeminiaturize:(NSNotification *)notification if (![self parentWindow]) [self postBroughtForwardEvent]; - if (!self.disabled && !self.noActivate) + if (!self.disabled && !self.noForeground) { causing_becomeKeyWindow = self; [self makeKeyWindow]; diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 2c903bfb12a3..2304f771bfa3 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -542,7 +542,7 @@ extern int macdrv_register_hot_key(macdrv_event_queue q, unsigned int vkey, unsi struct macdrv_window_state { unsigned int disabled:1; - unsigned int no_activate:1; + unsigned int no_foreground:1; unsigned int floating:1; unsigned int excluded_by_expose:1; unsigned int excluded_by_cycle:1; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 07f04993ee81..6d735bb4ed22 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -90,17 +90,17 @@ static void get_cocoa_window_features(struct macdrv_win_data *data, /******************************************************************* - * can_activate_window + * can_window_become_foreground * - * Check if we can activate the specified window. + * Check if the specified window can become the foreground/key + * window. */ -static inline BOOL can_activate_window(HWND hwnd) +static inline BOOL can_window_become_foreground(HWND hwnd) { LONG style = GetWindowLongW(hwnd, GWL_STYLE); if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; - if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_NOACTIVATE) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; return !(style & WS_DISABLED); } @@ -115,7 +115,7 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, { memset(state, 0, sizeof(*state)); state->disabled = (style & WS_DISABLED) != 0; - state->no_activate = !can_activate_window(data->hwnd); + state->no_foreground = !can_window_become_foreground(data->hwnd); state->floating = (ex_style & WS_EX_TOPMOST) != 0; state->excluded_by_expose = state->excluded_by_cycle = (!(ex_style & WS_EX_APPWINDOW) && @@ -2347,7 +2347,7 @@ void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event) hwnd, event->window, event->window_got_focus.serial, IsWindowEnabled(hwnd), IsWindowVisible(hwnd), style, GetFocus(), GetActiveWindow(), GetForegroundWindow()); - if (can_activate_window(hwnd) && !(style & WS_MINIMIZE)) + if (can_window_become_foreground(hwnd) && !(style & WS_MINIMIZE)) { /* simulate a mouse click on the menu to find out * whether the window wants to be activated */ @@ -2570,7 +2570,7 @@ void macdrv_window_drag_begin(HWND hwnd, const macdrv_event *event) data->drag_event = drag_event; release_win_data(data); - if (!event->window_drag_begin.no_activate && can_activate_window(hwnd) && GetForegroundWindow() != hwnd) + if (!event->window_drag_begin.no_activate && can_window_become_foreground(hwnd) && GetForegroundWindow() != hwnd) { /* ask whether the window wants to be activated */ LRESULT ma = SendMessageW(hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor(hwnd, GA_ROOT), -- 2.34.1

1 2

[PATCH 00/11] windows.media.speech: First speechrecognition work.
by Bernhard Kölbl 19 Jan '22

19 Jan '22

Hello everyone, this patchset is my first work towars getting speechrecognition to hopefully work soon(tm). It mostly consists of stubs for the least amount of interfaces and classes which are required to get basic recognition working. I also made some "heavier" changes on how the activation factory works based on what seemed logical for it to actually be doing on real WinRT dlls. For activatable classes I refrained from creating a create function, which accepts an IID, because DllGetClassObject isn't implemented as of now and the activation factory seems to always query for the classes default interface implementing IInspectable. Not sure if the general solution I made for this is the best, so this is something to really take a greater look at. Bernhard Bernhard Kölbl (11): include/windows.foundation.collections.idl: Add IVector<T> interface. include/windows.foundation.idl: Add IAsyncAction interface. include/windows.globalization.idl: Add ILanguage interface and Language class stubs. include: Add windows.storage.idl. include: Add windows.media.speechrecognition.idl. windows.media.speech: Move speechsynthesis into a seperate file. windows.media.speech: Add SpeechRecognizer stub. windows.media.speech: Add SpeechRecognitionListConstraint stub. windows.media.speech: Add SpeechRecognitionResult stub. windows.media.speech: Add SpeechRecognitionCompilationResult stub. windows.media.speech: Add SpeechRecognizerStateChangedEventArgs stub. dlls/windows.media.speech/Makefile.in | 8 +- dlls/windows.media.speech/classes.idl | 1 + dlls/windows.media.speech/main.c | 672 ++++++---------- .../speechrecognitioncompilationresult.c | 151 ++++ .../speechrecognitionlistconstraint.c | 329 ++++++++ .../speechrecognitionresult.c | 325 ++++++++ dlls/windows.media.speech/speechrecognizer.c | 497 ++++++++++++ .../speechrecognizerstatechangedrventargs.c | 156 ++++ dlls/windows.media.speech/speechsynthesis.c | 505 ++++++++++++ dlls/windows.media.speech/tests/speech.c | 111 +++ .../windows_media_speech_private.h | 109 +++ include/Makefile.in | 2 + include/windows.foundation.collections.idl | 20 + include/windows.foundation.idl | 23 + include/windows.globalization.idl | 38 + include/windows.media.speechrecognition.idl | 722 ++++++++++++++++++ include/windows.storage.idl | 61 ++ 17 files changed, 3307 insertions(+), 423 deletions(-) create mode 100644 dlls/windows.media.speech/speechrecognitioncompilationresult.c create mode 100644 dlls/windows.media.speech/speechrecognitionlistconstraint.c create mode 100644 dlls/windows.media.speech/speechrecognitionresult.c create mode 100644 dlls/windows.media.speech/speechrecognizer.c create mode 100644 dlls/windows.media.speech/speechrecognizerstatechangedrventargs.c create mode 100644 dlls/windows.media.speech/speechsynthesis.c create mode 100644 dlls/windows.media.speech/windows_media_speech_private.h create mode 100644 include/windows.media.speechrecognition.idl create mode 100644 include/windows.storage.idl -- 2.34.1

3 19

[PATCH v5 resend 1/4] include: Define fast fail codes and the __fastfail() intrinsic.
by Jinoh Kang 19 Jan '22

19 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winnt.h | 116 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index c80efee077d..e80c10bd49c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -915,6 +915,122 @@ NTSYSAPI PSLIST_ENTRY WINAPI RtlInterlockedPushEntrySList(PSLIST_HEADER, PSLIST_ NTSYSAPI WORD WINAPI RtlQueryDepthSList(PSLIST_HEADER); +/* Fast fail (__fastfail) codes */ + +#define FAST_FAIL_LEGACY_GS_VIOLATION 0 +#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 +#define FAST_FAIL_CORRUPT_LIST_ENTRY 3 +#define FAST_FAIL_INCORRECT_STACK 4 +#define FAST_FAIL_INVALID_ARG 5 +#define FAST_FAIL_GS_COOKIE_INIT 6 +#define FAST_FAIL_FATAL_APP_EXIT 7 +#define FAST_FAIL_RANGE_CHECK_FAILURE 8 +#define FAST_FAIL_UNSAFE_REGISTRY_ACCESS 9 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE 10 +#define FAST_FAIL_GUARD_WRITE_CHECK_FAILURE 11 +#define FAST_FAIL_INVALID_FIBER_SWITCH 12 +#define FAST_FAIL_INVALID_SET_OF_CONTEXT 13 +#define FAST_FAIL_INVALID_REFERENCE_COUNT 14 +#define FAST_FAIL_INVALID_JUMP_BUFFER 18 +#define FAST_FAIL_MRDATA_MODIFIED 19 +#define FAST_FAIL_CERTIFICATION_FAILURE 20 +#define FAST_FAIL_INVALID_EXCEPTION_CHAIN 21 +#define FAST_FAIL_CRYPTO_LIBRARY 22 +#define FAST_FAIL_INVALID_CALL_IN_DLL_CALLOUT 23 +#define FAST_FAIL_INVALID_IMAGE_BASE 24 +#define FAST_FAIL_DLOAD_PROTECTION_FAILURE 25 +#define FAST_FAIL_UNSAFE_EXTENSION_CALL 26 +#define FAST_FAIL_DEPRECATED_SERVICE_INVOKED 27 +#define FAST_FAIL_INVALID_BUFFER_ACCESS 28 +#define FAST_FAIL_INVALID_BALANCED_TREE 29 +#define FAST_FAIL_INVALID_NEXT_THREAD 30 +#define FAST_FAIL_GUARD_ICALL_CHECK_SUPPRESSED 31 +#define FAST_FAIL_APCS_DISABLED 32 +#define FAST_FAIL_INVALID_IDLE_STATE 33 +#define FAST_FAIL_MRDATA_PROTECTION_FAILURE 34 +#define FAST_FAIL_UNEXPECTED_HEAP_EXCEPTION 35 +#define FAST_FAIL_INVALID_LOCK_STATE 36 +#define FAST_FAIL_GUARD_JUMPTABLE 37 +#define FAST_FAIL_INVALID_LONGJUMP_TARGET 38 +#define FAST_FAIL_INVALID_DISPATCH_CONTEXT 39 +#define FAST_FAIL_INVALID_THREAD 40 +#define FAST_FAIL_INVALID_SYSCALL_NUMBER 41 +#define FAST_FAIL_INVALID_FILE_OPERATION 42 +#define FAST_FAIL_LPAC_ACCESS_DENIED 43 +#define FAST_FAIL_GUARD_SS_FAILURE 44 +#define FAST_FAIL_LOADER_CONTINUITY_FAILURE 45 +#define FAST_FAIL_GUARD_EXPORT_SUPPRESSION_FAILURE 46 +#define FAST_FAIL_INVALID_CONTROL_STACK 47 +#define FAST_FAIL_SET_CONTEXT_DENIED 48 +#define FAST_FAIL_INVALID_IAT 49 +#define FAST_FAIL_HEAP_METADATA_CORRUPTION 50 +#define FAST_FAIL_PAYLOAD_RESTRICTION_VIOLATION 51 +#define FAST_FAIL_LOW_LABEL_ACCESS_DENIED 52 +#define FAST_FAIL_ENCLAVE_CALL_FAILURE 53 +#define FAST_FAIL_UNHANDLED_LSS_EXCEPTON 54 +#define FAST_FAIL_ADMINLESS_ACCESS_DENIED 55 +#define FAST_FAIL_UNEXPECTED_CALL 56 +#define FAST_FAIL_CONTROL_INVALID_RETURN_ADDRESS 57 +#define FAST_FAIL_UNEXPECTED_HOST_BEHAVIOR 58 +#define FAST_FAIL_FLAGS_CORRUPTION 59 +#define FAST_FAIL_VEH_CORRUPTION 60 +#define FAST_FAIL_ETW_CORRUPTION 61 +#define FAST_FAIL_RIO_ABORT 62 +#define FAST_FAIL_INVALID_PFN 63 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE_XFG 64 +#define FAST_FAIL_CAST_GUARD 65 +#define FAST_FAIL_HOST_VISIBILITY_CHANGE 66 +#define FAST_FAIL_KERNEL_CET_SHADOW_STACK_ASSIST 67 +#define FAST_FAIL_PATCH_CALLBACK_FAILED 68 +#define FAST_FAIL_NTDLL_PATCH_FAILED 69 +#define FAST_FAIL_INVALID_FLS_DATA 70 +#define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF + +#if defined(__GNUC__) +#if defined(__x86_64__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONGLONG val __asm__("rcx") = code; + __asm__ __volatile__( "int $0x29" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__i386__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONG val __asm__("ecx") = code; + __asm__ __volatile__( "int $0x29" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__aarch64__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONGLONG val __asm__("x0") = code; + __asm__ __volatile__( "brk #0xf003" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#elif defined(__arm__) +static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) +{ + register ULONG val __asm__("r0") = code; + __asm__ __volatile__( "udf #0xfb" :: "r" (val) : "memory" ); +#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))) + __builtin_unreachable(); +#endif +} +#endif /* __x86_64__ */ +#elif defined(_MSC_VER) && (_MSC_VER >= 1610) +DECLSPEC_NORETURN void __fastfail(unsigned int); +#pragma intrinsic(__fastfail) +#endif /* __GNUC__ */ + + /* Heap flags */ #define HEAP_NO_SERIALIZE 0x00000001 -- 2.31.1

2 5

[PATCH 4/4] dmsynth: Disconnect old sink, addref and init new sink
by Michael Stefaniuc 19 Jan '22

19 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/synth.c | 21 +++++++++++++++++---- dlls/dmsynth/tests/dmsynth.c | 12 ++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 7c573ca708c..3d3af80d005 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -362,15 +362,28 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(IDirectMusicSynth8 *if IDirectMusicSynthSink *sink) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + HRESULT hr; TRACE("(%p)->(%p)\n", iface, sink); - This->sink = sink; + if (sink == This->sink) + return S_OK; + + if (!sink || This->sink) { + /* Disconnect the sink */ + if (This->latency_clock) + IReferenceClock_Release(This->latency_clock); + IDirectMusicSynthSink_Release(This->sink); + } - if (sink) - return IDirectMusicSynthSink_GetLatencyClock(sink, &This->latency_clock); + This->sink = sink; + if (!sink) + return S_OK; - return S_OK; + IDirectMusicSynthSink_AddRef(This->sink); + if (FAILED(hr = IDirectMusicSynthSink_Init(sink, (IDirectMusicSynth *)iface))) + return hr; + return IDirectMusicSynthSink_GetLatencyClock(sink, &This->latency_clock); } static HRESULT WINAPI IDirectMusicSynth8Impl_Render(IDirectMusicSynth8 *iface, short *buffer, diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index bb42553469b..1e3e20829b7 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -54,7 +54,7 @@ static ULONG get_refcount(void *iface) static void test_dmsynth(void) { IDirectMusicSynth *dmsynth = NULL; - IDirectMusicSynthSink *dmsynth_sink = NULL; + IDirectMusicSynthSink *dmsynth_sink = NULL, *dmsynth_sink2 = NULL; IReferenceClock* clock_synth = NULL; IReferenceClock* clock_sink = NULL; IKsControl* control_synth = NULL; @@ -68,7 +68,11 @@ static void test_dmsynth(void) hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth, (LPVOID*)&dmsynth); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); - hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, (LPVOID*)&dmsynth_sink); + hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, + (void **)&dmsynth_sink); + ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusicSynthSink, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynthSink, + (void **)&dmsynth_sink2); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = IDirectMusicSynth_QueryInterface(dmsynth, &IID_IKsControl, (LPVOID*)&control_synth); @@ -127,6 +131,8 @@ static void test_dmsynth(void) ref_clock_sink = get_refcount(clock_sink); /* This will Init() the SynthSink and finish initializing the Synth */ + hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink2); + ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); hr = IDirectMusicSynth_SetSynthSink(dmsynth, dmsynth_sink); ok(hr == S_OK, "IDirectMusicSynth_SetSynthSink returned: %x\n", hr); @@ -148,6 +154,8 @@ static void test_dmsynth(void) IReferenceClock_Release(clock_sink); if (dmsynth_sink) IDirectMusicSynthSink_Release(dmsynth_sink); + if (dmsynth_sink2) + IDirectMusicSynthSink_Release(dmsynth_sink2); IDirectMusicSynth_Release(dmsynth); } -- 2.31.1

1 0

[PATCH 3/4] dmsynth: Avoid hungarian notation in the synth object
by Michael Stefaniuc 19 Jan '22

19 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 4 ++-- dlls/dmsynth/synth.c | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 9ad06dff5dd..22d020992b8 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -62,9 +62,9 @@ struct IDirectMusicSynth8Impl { LONG ref; /* IDirectMusicSynth8 fields */ - DMUS_PORTCAPS pCaps; + DMUS_PORTCAPS caps; BOOL active; - IReferenceClock* pLatencyClock; + IReferenceClock *latency_clock; IDirectMusicSynthSink *sink; }; diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index bd1ee201165..7c573ca708c 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -84,8 +84,8 @@ static ULONG WINAPI IDirectMusicSynth8Impl_Release(IDirectMusicSynth8 *iface) TRACE("(%p)->(): new ref = %u\n", This, ref); if (!ref) { - if (This->pLatencyClock) - IReferenceClock_Release(This->pLatencyClock); + if (This->latency_clock) + IReferenceClock_Release(This->latency_clock); HeapFree(GetProcessHeap(), 0, This); DMSYNTH_UnlockModule(); } @@ -295,7 +295,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetPortCaps(IDirectMusicSynth8 *ifa TRACE("(%p)->(%p)\n", This, caps); - *caps = This->pCaps; + *caps = This->caps; return S_OK; } @@ -323,8 +323,8 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 if (!This->sink) return DMUS_E_NOSYNTHSINK; - *clock = This->pLatencyClock; - IReferenceClock_AddRef(This->pLatencyClock); + *clock = This->latency_clock; + IReferenceClock_AddRef(This->latency_clock); return S_OK; } @@ -368,7 +368,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(IDirectMusicSynth8 *if This->sink = sink; if (sink) - return IDirectMusicSynthSink_GetLatencyClock(sink, &This->pLatencyClock); + return IDirectMusicSynthSink_GetLatencyClock(sink, &This->latency_clock); return S_OK; } @@ -627,17 +627,17 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicSynthImpl(REFIID riid, void **ppobj) obj->IKsControl_iface.lpVtbl = &DMSynthImpl_IKsControl_Vtbl; obj->ref = 1; /* fill in caps */ - obj->pCaps.dwSize = sizeof(DMUS_PORTCAPS); - obj->pCaps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; - obj->pCaps.guidPort = CLSID_DirectMusicSynth; - obj->pCaps.dwClass = DMUS_PC_OUTPUTCLASS; - obj->pCaps.dwType = DMUS_PORT_USER_MODE_SYNTH; - obj->pCaps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; - obj->pCaps.dwMaxChannelGroups = 1000; - obj->pCaps.dwMaxVoices = 1000; - obj->pCaps.dwMaxAudioChannels = 2; - obj->pCaps.dwEffectFlags = DMUS_EFFECT_REVERB; - lstrcpyW(obj->pCaps.wszDescription, L"Microsoft Synthesizer"); + obj->caps.dwSize = sizeof(DMUS_PORTCAPS); + obj->caps.dwFlags = DMUS_PC_DLS | DMUS_PC_SOFTWARESYNTH | DMUS_PC_DIRECTSOUND | DMUS_PC_DLS2 | DMUS_PC_AUDIOPATH | DMUS_PC_WAVE; + obj->caps.guidPort = CLSID_DirectMusicSynth; + obj->caps.dwClass = DMUS_PC_OUTPUTCLASS; + obj->caps.dwType = DMUS_PORT_USER_MODE_SYNTH; + obj->caps.dwMemorySize = DMUS_PC_SYSTEMMEMORY; + obj->caps.dwMaxChannelGroups = 1000; + obj->caps.dwMaxVoices = 1000; + obj->caps.dwMaxAudioChannels = 2; + obj->caps.dwEffectFlags = DMUS_EFFECT_REVERB; + lstrcpyW(obj->caps.wszDescription, L"Microsoft Synthesizer"); DMSYNTH_LockModule(); hr = IDirectMusicSynth8_QueryInterface(&obj->IDirectMusicSynth8_iface, riid, ppobj); -- 2.31.1

1 0

[PATCH 2/4] dmsynth: Activate the sink from the synth Activate() method
by Michael Stefaniuc 19 Jan '22

19 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmsynth/dmsynth_private.h | 2 +- dlls/dmsynth/synth.c | 20 +++++++++++++++++++- dlls/dmsynth/tests/dmsynth.c | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 32a79f65dd3..9ad06dff5dd 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -63,7 +63,7 @@ struct IDirectMusicSynth8Impl { /* IDirectMusicSynth8 fields */ DMUS_PORTCAPS pCaps; - BOOL fActive; + BOOL active; IReferenceClock* pLatencyClock; IDirectMusicSynthSink *sink; }; diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 4d71bc738c1..bd1ee201165 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -332,10 +332,28 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 static HRESULT WINAPI IDirectMusicSynth8Impl_Activate(IDirectMusicSynth8 *iface, BOOL enable) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); + HRESULT hr; TRACE("(%p)->(%d)\n", This, enable); - This->fActive = enable; + if (!This->sink) + return DMUS_E_NOSYNTHSINK; + + if (enable == This->active) { + if (enable) + return DMUS_E_SYNTHACTIVE; + else + return S_FALSE; + } + + if ((hr = IDirectMusicSynthSink_Activate(This->sink, enable)) != S_OK) { + if (hr == DMUS_E_SYNTHACTIVE || hr == S_FALSE) + WARN("Synth and sink active state out of sync. Fixing.\n"); + else + return hr; + } + + This->active = enable; return S_OK; } diff --git a/dlls/dmsynth/tests/dmsynth.c b/dlls/dmsynth/tests/dmsynth.c index 3970933cb6f..bb42553469b 100644 --- a/dlls/dmsynth/tests/dmsynth.c +++ b/dlls/dmsynth/tests/dmsynth.c @@ -114,7 +114,7 @@ static void test_dmsynth(void) /* Synth isn't fully initialized yet */ hr = IDirectMusicSynth_Activate(dmsynth, TRUE); - todo_wine ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %x\n", hr); + ok(hr == DMUS_E_NOSYNTHSINK, "IDirectMusicSynth_Activate returned: %x\n", hr); /* Synth has no default clock */ hr = IDirectMusicSynth_GetLatencyClock(dmsynth, &clock_synth); -- 2.31.1

1 0

[PATCH 1/4] dmsynth: Drop "synth" from the synth_sink field
by Michael Stefaniuc 19 Jan '22

19 Jan '22

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- While that implements the IDirectMusicSynthSink interface the documentation talks about the "wave sink". dlls/dmsynth/dmsynth_private.h | 2 +- dlls/dmsynth/synth.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index bcc866e879e..32a79f65dd3 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -65,7 +65,7 @@ struct IDirectMusicSynth8Impl { DMUS_PORTCAPS pCaps; BOOL fActive; IReferenceClock* pLatencyClock; - IDirectMusicSynthSink *synth_sink; + IDirectMusicSynthSink *sink; }; /***************************************************************************** diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 19789b5a256..4d71bc738c1 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -320,7 +320,7 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_GetLatencyClock(IDirectMusicSynth8 if (!clock) return E_POINTER; - if (!This->synth_sink) + if (!This->sink) return DMUS_E_NOSYNTHSINK; *clock = This->pLatencyClock; @@ -341,16 +341,16 @@ static HRESULT WINAPI IDirectMusicSynth8Impl_Activate(IDirectMusicSynth8 *iface, } static HRESULT WINAPI IDirectMusicSynth8Impl_SetSynthSink(IDirectMusicSynth8 *iface, - IDirectMusicSynthSink *synth_sink) + IDirectMusicSynthSink *sink) { IDirectMusicSynth8Impl *This = impl_from_IDirectMusicSynth8(iface); - TRACE("(%p)->(%p)\n", iface, synth_sink); + TRACE("(%p)->(%p)\n", iface, sink); - This->synth_sink = synth_sink; + This->sink = sink; - if (synth_sink) - return IDirectMusicSynthSink_GetLatencyClock(synth_sink, &This->pLatencyClock); + if (sink) + return IDirectMusicSynthSink_GetLatencyClock(sink, &This->pLatencyClock); return S_OK; } -- 2.31.1

1 0

[PATCH] configure: add rpath for Unix libs
by Alex Xu (Hello71) 19 Jan '22

19 Jan '22

wine expects that dlopen("/usr/lib/i386-windows/ntdll.so"); dlopen("/usr/lib/i386-windows/ws2_32.so") succeeds. this works on most libcs using ntdll.so SONAME, but fails for musl. there has been some discussion of implementing this in musl, but it is clearly more correct to specify rpath $ORIGIN for ELF, same as darwin. this was always broken on musl but not noticed before 6.19 because dlsym failure was ignored prior to 5689ec7bba ("ntdll: Return a failure if the unix call funcs don't exist.") Fixes https://bugs.winehq.org/show_bug.cgi?id=52418. --- configure | 32 ++++++++++++++++++++++++++++++++ configure.ac | 4 ++++ 2 files changed, 36 insertions(+) diff --git a/configure b/configure index 2cda771fb99..d51850cb76c 100755 --- a/configure +++ b/configure @@ -10858,6 +10858,38 @@ fi LIBWINE_DEPENDS="wine.map" TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion" + + # do this at the end because it needs double dollar for makefile + as_ac_var=`printf "%s\n" "ac_cv_cflags_-Wl,-rpath,\\\\\\$ORIGIN" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN" >&5 +printf %s "checking whether the compiler supports -Wl,-rpath,\\\$ORIGIN... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wl,-rpath,\\\$ORIGIN" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'" +fi ;; esac diff --git a/configure.ac b/configure.ac index 057a2a39948..a887e1ed8e9 100644 --- a/configure.ac +++ b/configure.ac @@ -859,6 +859,10 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version") AC_SUBST(LIBWINE_DEPENDS,"wine.map") TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion" + + # musl does not satisfy pathless dlopen requests with prior pathed dlls + # do this at the end because it needs double dollar for makefile + WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"]) ;; esac -- 2.34.1

1 0

[PATCH 1/3] concrt140: Add ?_Byte_reverse_table@details@Concurrency@@3QBEB data export.
by Paul Gofman 19 Jan '22

19 Jan '22

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 2 +- dlls/concrt140/details.c | 21 +++++++++++++++++++++ dlls/concrt140/tests/concrt140.c | 24 ++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 364a1ad8d84..50db9348327 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -433,7 +433,7 @@ @ stub -arch=arm ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IAAXABV123@@Z @ stub -arch=i386 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IAEXABV123@@Z @ stub -arch=win64 ?_Assign@_Concurrent_queue_iterator_base_v4@details@Concurrency@@IEAAXAEBV123@@Z -# extern ?_Byte_reverse_table@details@Concurrency@@3QBEB +@ extern ?_Byte_reverse_table@details@Concurrency@@3QBEB byte_reverse_table @ stub -arch=arm ?_Cancel@_StructuredTaskCollection@details@Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel@_StructuredTaskCollection@details@Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel@_StructuredTaskCollection@details@Concurrency@@QEAAXXZ diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 27cdd911ad2..13a2fbbca96 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -1110,3 +1110,24 @@ void init_concurrency_details(void *base) init__Runtime_object_rtti(base); #endif } + +/* ?_Byte_reverse_table@details@Concurrency@@3QBEB */ +const BYTE byte_reverse_table[256] = +{ + 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, + 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, + 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, + 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, + 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, + 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, + 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, + 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, + 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, + 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, + 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, + 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, + 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, + 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, + 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, + 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff, +}; diff --git a/dlls/concrt140/tests/concrt140.c b/dlls/concrt140/tests/concrt140.c index 55b200c6c78..7b3300a3d59 100644 --- a/dlls/concrt140/tests/concrt140.c +++ b/dlls/concrt140/tests/concrt140.c @@ -90,6 +90,8 @@ static void (__thiscall *p__Timer_dtor)(_Timer*); static void (__thiscall *p__Timer__Start)(_Timer*); static void (__thiscall *p__Timer__Stop)(_Timer*); +static const BYTE *p_byte_reverse_table; + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -142,6 +144,7 @@ static BOOL init(void) } init_thiscall_thunk(); + SET(p_byte_reverse_table, "?_Byte_reverse_table@details@Concurrency@@3QBEB"); return TRUE; } @@ -217,9 +220,30 @@ static void test_Timer(void) CloseHandle(callback_called); } +static BYTE byte_reverse(BYTE b) +{ + b = ((b & 0xf0) >> 4) | ((b & 0x0f) << 4); + b = ((b & 0xcc) >> 2) | ((b & 0x33) << 2); + b = ((b & 0xaa) >> 1) | ((b & 0x55) << 1); + return b; +} + +static void test_data_exports(void) +{ + unsigned int i; + + ok(IsBadWritePtr((BYTE *)p_byte_reverse_table, 256), "byte_reverse_table is writeable.\n"); + for (i = 0; i < 256; ++i) + { + ok(p_byte_reverse_table[i] == byte_reverse(i), "Got unexpected byte %#x, expected %#x.\n", + p_byte_reverse_table[i], byte_reverse(i)); + } +} + START_TEST(concrt140) { if (!init()) return; test_CurrentContext(); test_Timer(); + test_data_exports(); } -- 2.34.1

3 6

[PATCH 1/6] include: Move WIN32_MEMORY_RANGE_ENTRY from winnt.h to winbase.h.
by Jinoh Kang 19 Jan '22

19 Jan '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winbase.h | 6 ++++++ include/winnt.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index 0a0bfde9d10..ecde84ed7d5 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1760,6 +1760,12 @@ typedef struct _WIN32_FIND_STREAM_DATA { WCHAR cStreamName[MAX_PATH + 36]; } WIN32_FIND_STREAM_DATA,*PWIN32_FIND_STREAM_DATA; +typedef struct _WIN32_MEMORY_RANGE_ENTRY +{ + PVOID VirtualAddress; + SIZE_T NumberOfBytes; +} WIN32_MEMORY_RANGE_ENTRY, *PWIN32_MEMORY_RANGE_ENTRY; + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); diff --git a/include/winnt.h b/include/winnt.h index c80efee077d..cb7a8ca2135 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -776,12 +776,6 @@ typedef struct DECLSPEC_ALIGN(8) MEM_EXTENDED_PARAMETER { } DUMMYUNIONNAME; } MEM_EXTENDED_PARAMETER, *PMEM_EXTENDED_PARAMETER; -typedef struct _WIN32_MEMORY_RANGE_ENTRY -{ - PVOID VirtualAddress; - SIZE_T NumberOfBytes; -} WIN32_MEMORY_RANGE_ENTRY, *PWIN32_MEMORY_RANGE_ENTRY; - #define PAGE_NOACCESS 0x01 #define PAGE_READONLY 0x02 #define PAGE_READWRITE 0x04 -- 2.31.1

1 5

[PATCH 1/8] dinput/tests: Don't consider extra IOCTL_HID_GET_STRING an error.
by Arkadiusz Hiler 19 Jan '22

19 Jan '22

It's easy to get them on Windows depending what software/services are running. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/dinput/tests/driver_hid.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/driver_hid.c b/dlls/dinput/tests/driver_hid.c index 84b84101592..b8651331fda 100644 --- a/dlls/dinput/tests/driver_hid.c +++ b/dlls/dinput/tests/driver_hid.c @@ -696,8 +696,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_HID_GET_STRING: { - static unsigned int once; - if (!once++) todo_wine ok( 0, "unexpected IOCTL_HID_GET_STRING\n" ); memcpy( irp->UserBuffer, L"Wine Test", sizeof(L"Wine Test") ); irp->IoStatus.Information = sizeof(L"Wine Test"); ret = STATUS_SUCCESS; -- 2.34.1

3 13

[PATCH vkd3d 1/7] tests: Test a texture with format DXGI_FORMAT_UNKNOWN in test_create_committed_resource().
by Conor McCarthy 19 Jan '22

19 Jan '22

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9d4fb7d4..0702573b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1736,6 +1736,12 @@ static void test_create_committed_resource(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); resource_desc.SampleDesc.Count = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, &IID_ID3D12Resource, (void **)&resource); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D12Device_CreateCommittedResource(device, &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, D3D12_RESOURCE_STATE_RENDER_TARGET | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE, &clear_value, &IID_ID3D12Resource, (void **)&resource); -- 2.34.1

3 14

[PATCH vkd3d v2 1/2] vkd3d: Handle NULL event handles in ID3D12Fence::SetEventOnCompletion().
by Conor McCarthy 19 Jan '22

19 Jan '22

The D3D12 documentation states: "If hEvent is a null handle, then this API will not return until the specified fence value(s) have been reached." Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 39 ++++++++++++++++++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 2 ++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3e252aee..d940f30c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -806,6 +806,7 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF { struct d3d12_device *device = fence->device; struct vkd3d_signaled_semaphore *current; + bool signal_null_event_cond = false; unsigned int i, j; int rc; @@ -823,7 +824,15 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF if (current->value <= value) { - fence->device->signal_event(current->event); + if (current->event) + { + fence->device->signal_event(current->event); + } + else + { + current->latch = true; + signal_null_event_cond = true; + } } else { @@ -834,6 +843,9 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF } fence->event_count = j; + if (signal_null_event_cond) + pthread_cond_broadcast(&fence->null_event_cond); + if (vk_fence) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -916,6 +928,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) ERR("Failed to destroy mutex, error %d.\n", rc); + pthread_cond_destroy(&fence->null_event_cond); vkd3d_free(fence); d3d12_device_release(device); @@ -997,6 +1010,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); unsigned int i; + bool *latch; int rc; TRACE("iface %p, value %#"PRIx64", event %p.\n", iface, value, event); @@ -1009,7 +1023,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i if (value <= fence->value) { - fence->device->signal_event(event); + if (event) + fence->device->signal_event(event); pthread_mutex_unlock(&fence->mutex); return S_OK; } @@ -1036,8 +1051,20 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i fence->events[fence->event_count].value = value; fence->events[fence->event_count].event = event; + fence->events[fence->event_count].latch = false; + latch = &fence->events[fence->event_count].latch; ++fence->event_count; + /* If event is NULL, we need to block until the fence value completes. + * Implement this in a uniform way where we pretend we have a dummy event. + * A NULL fence->events[].event means that we should set latch to true + * and signal a condition variable instead of calling external signal_event callback. */ + if (!event) + { + while (!*latch) + pthread_cond_wait(&fence->null_event_cond, &fence->mutex); + } + pthread_mutex_unlock(&fence->mutex); return S_OK; } @@ -1095,6 +1122,13 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * return hresult_from_errno(rc); } + if ((rc = pthread_cond_init(&fence->null_event_cond, NULL))) + { + ERR("Failed to initialize cond variable, error %d.\n", rc); + pthread_mutex_destroy(&fence->mutex); + return hresult_from_errno(rc); + } + if (flags) FIXME("Ignoring flags %#x.\n", flags); @@ -1112,6 +1146,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { pthread_mutex_destroy(&fence->mutex); + pthread_cond_destroy(&fence->null_event_cond); return hr; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 047f4a29..8d1332e2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -364,11 +364,13 @@ struct d3d12_fence uint64_t value; pthread_mutex_t mutex; + pthread_cond_t null_event_cond; struct vkd3d_waiting_event { uint64_t value; HANDLE event; + bool latch; } *events; size_t events_size; size_t event_count; -- 2.34.1

2 3

[PATCH vkd3d 5/6] vkd3d: Use the resource's stored format in d3d12_resource_WriteToSubresource().
by Conor McCarthy 19 Jan '22

19 Jan '22

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index b40683cc..f81caa9d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1353,11 +1353,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_WriteToSubresource(ID3D12Resourc device = resource->device; vk_procs = &device->vk_procs; - if (!(format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0))) - { - ERR("Invalid DXGI format %#x.\n", resource->desc.Format); - return E_INVALIDARG; - } + format = resource->format; if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) { FIXME("Not supported for format %#x.\n", format->dxgi_format); -- 2.34.1

2 3

[PATCH vkd3d 4/6] vkd3d: Use the resource's stored format in d3d12_resource_validate_box().
by Conor McCarthy 19 Jan '22

19 Jan '22

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a2be9a81..b40683cc 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1080,7 +1080,6 @@ static bool d3d12_resource_validate_box(const struct d3d12_resource *resource, unsigned int sub_resource_idx, const D3D12_BOX *box) { unsigned int mip_level = sub_resource_idx % resource->desc.MipLevels; - struct d3d12_device *device = resource->device; const struct vkd3d_format *vkd3d_format; uint32_t width_mask, height_mask; uint64_t width, height, depth; @@ -1089,7 +1088,7 @@ static bool d3d12_resource_validate_box(const struct d3d12_resource *resource, height = d3d12_resource_desc_get_height(&resource->desc, mip_level); depth = d3d12_resource_desc_get_depth(&resource->desc, mip_level); - vkd3d_format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, 0); + vkd3d_format = resource->format; assert(vkd3d_format); width_mask = vkd3d_format->block_width - 1; height_mask = vkd3d_format->block_height - 1; -- 2.34.1

2 1

[PATCH vkd3d 3/6] vkd3d: Use the resource's stored format in vkd3d_create_image().
by Conor McCarthy 19 Jan '22

19 Jan '22

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index b376ecd2..a2be9a81 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -855,7 +855,11 @@ static HRESULT vkd3d_create_image(struct d3d12_device *device, VkImageCreateInfo image_info; VkResult vr; - if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) + if (resource) + { + format = resource->format; + } + else if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid DXGI format %#x.\n", desc->Format); return E_INVALIDARG; -- 2.34.1

2 1

[PATCH vkd3d v2 1/6] vkd3d: Store the vkd3d format in resource objects.
by Conor McCarthy 19 Jan '22

19 Jan '22

Resource formats are immutable and the format object is static data. Storing it saves a function call and error check in many locations. The current implementation for finding a format iterates over the entire list of formats. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 9 +-------- libs/vkd3d/resource.c | 3 +++ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3e252aee..9ac2bb9f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2116,17 +2116,10 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vulkan_info *vk_info = &list->device->vk_info; VkPipelineStageFlags src_stage_mask, dst_stage_mask; - const struct vkd3d_format *format; VkImageMemoryBarrier barrier; assert(d3d12_resource_is_texture(resource)); - if (!(format = vkd3d_format_from_d3d12_resource_desc(list->device, &resource->desc, 0))) - { - ERR("Resource %p has invalid format %#x.\n", resource, resource->desc.Format); - return; - } - barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.pNext = NULL; @@ -2146,7 +2139,7 @@ static void d3d12_command_list_transition_resource_to_initial_state(struct d3d12 barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; barrier.image = resource->u.vk_image; - barrier.subresourceRange.aspectMask = format->vk_aspect_mask; + barrier.subresourceRange.aspectMask = resource->format->vk_aspect_mask; barrier.subresourceRange.baseMipLevel = 0; barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; barrier.subresourceRange.baseArrayLayer = 0; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 78b32bde..b376ecd2 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1778,6 +1778,8 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 if (FAILED(hr = d3d12_resource_validate_desc(&resource->desc, device))) return hr; + resource->format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0); + switch (desc->Dimension) { case D3D12_RESOURCE_DIMENSION_BUFFER: @@ -2030,6 +2032,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->refcount = 1; object->internal_refcount = 1; object->desc = create_info->desc; + object->format = vkd3d_format_from_d3d12_resource_desc(d3d12_device, &create_info->desc, 0); object->u.vk_image = create_info->vk_image; object->flags = VKD3D_RESOURCE_EXTERNAL; object->flags |= create_info->flags & VKD3D_RESOURCE_PUBLIC_FLAGS; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 047f4a29..6c31467f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -427,6 +427,7 @@ struct d3d12_resource LONG internal_refcount; D3D12_RESOURCE_DESC desc; + const struct vkd3d_format *format; D3D12_GPU_VIRTUAL_ADDRESS gpu_address; union -- 2.34.1

2 3

[PATCH] msvcrt: Fix Pi contants while computing acosf.
by Piotr Caban 19 Jan '22

19 Jan '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0

[PATCH] msvcrt: Add support for demangling char{8,16,32}_t types.
by Piotr Caban 19 Jan '22

19 Jan '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/undname.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH] mfplat: Implement MFTGetInfo().
by Nikolay Sivov 19 Jan '22

19 Jan '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 153 ++++++++++++++++++++++++++++++++++--- dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 61 +++++++++++++-- include/mfapi.h | 2 + 4 files changed, 203 insertions(+), 15 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f36c960f852..e2f892ed91d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -631,7 +631,7 @@ static const BYTE guid_conv_table[256] = 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ }; -static WCHAR* GUIDToString(WCHAR *str, REFGUID guid) +static WCHAR* guid_to_string(WCHAR *str, REFGUID guid) { swprintf(str, 39, L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], @@ -706,7 +706,7 @@ static HRESULT register_transform(const CLSID *clsid, const WCHAR *name, UINT32 WCHAR str[250]; UINT8 *blob; - GUIDToString(buffer, clsid); + guid_to_string(buffer, clsid); swprintf(str, ARRAY_SIZE(str), L"%s\\%s", transform_keyW, buffer); if ((ret = RegCreateKeyW(HKEY_CLASSES_ROOT, str, &hclsid))) @@ -767,8 +767,8 @@ static HRESULT register_category(CLSID *clsid, GUID *category) WCHAR guid1[64], guid2[64]; WCHAR str[350]; - GUIDToString(guid1, category); - GUIDToString(guid2, clsid); + guid_to_string(guid1, category); + guid_to_string(guid2, clsid); swprintf(str, ARRAY_SIZE(str), L"%s\\%s\\%s", categories_keyW, guid1, guid2); @@ -1030,7 +1030,7 @@ static BOOL mft_is_type_info_match(struct mft_registration *mft, const GUID *cat return matching; } -static void mft_get_reg_type_info(const WCHAR *clsidW, const WCHAR *typeW, MFT_REGISTER_TYPE_INFO **type, +static void mft_get_reg_type_info_internal(const WCHAR *clsidW, const WCHAR *typeW, MFT_REGISTER_TYPE_INFO **type, UINT32 *count) { HKEY htransform, hfilter; @@ -1109,7 +1109,7 @@ static HRESULT mft_collect_machine_reg(struct list *mfts, const GUID *category, if (RegOpenKeyW(HKEY_CLASSES_ROOT, categories_keyW, &hcategory)) return E_FAIL; - GUIDToString(clsidW, category); + guid_to_string(clsidW, category); ret = RegOpenKeyW(hcategory, clsidW, &hlist); RegCloseKey(hcategory); if (ret) @@ -1126,10 +1126,10 @@ static HRESULT mft_collect_machine_reg(struct list *mfts, const GUID *category, mft_get_reg_flags(clsidW, L"MFTFlags", &mft.flags); if (output_type) - mft_get_reg_type_info(clsidW, L"OutputTypes", &mft.output_types, &mft.output_types_count); + mft_get_reg_type_info_internal(clsidW, L"OutputTypes", &mft.output_types, &mft.output_types_count); if (input_type) - mft_get_reg_type_info(clsidW, L"InputTypes", &mft.input_types, &mft.input_types_count); + mft_get_reg_type_info_internal(clsidW, L"InputTypes", &mft.input_types, &mft.input_types_count); if (!mft_is_type_info_match(&mft, category, flags, plugin_control, input_type, output_type)) { @@ -1416,7 +1416,7 @@ HRESULT WINAPI MFTUnregister(CLSID clsid) TRACE("(%s)\n", debugstr_guid(&clsid)); - GUIDToString(buffer, &clsid); + guid_to_string(buffer, &clsid); if (!RegOpenKeyW(HKEY_CLASSES_ROOT, transform_keyW, &htransform)) { @@ -1442,6 +1442,141 @@ HRESULT WINAPI MFTUnregister(CLSID clsid) return S_OK; } +static HRESULT mft_get_name(HKEY hkey, WCHAR **name) +{ + DWORD size; + + if (!name) + return S_OK; + + *name = NULL; + + if (!RegQueryValueExW(hkey, NULL, NULL, NULL, NULL, &size)) + { + if (!(*name = CoTaskMemAlloc(size))) + return E_OUTOFMEMORY; + + RegQueryValueExW(hkey, NULL, NULL, NULL, (BYTE *)*name, &size); + } + + return S_OK; +} + +static HRESULT mft_get_reg_type_info(const WCHAR *clsid, const WCHAR *key, MFT_REGISTER_TYPE_INFO **ret_types, + UINT32 *ret_count) +{ + MFT_REGISTER_TYPE_INFO *types = NULL; + UINT32 count = 0; + + if (!ret_types) + return S_OK; + + mft_get_reg_type_info_internal(clsid, key, &types, &count); + if (count) + { + if (!(*ret_types = CoTaskMemAlloc(count * sizeof(**ret_types)))) + { + free(types); + return E_OUTOFMEMORY; + } + + memcpy(*ret_types, types, count * sizeof(**ret_types)); + *ret_count = count; + } + + free(types); + + return S_OK; +} + +static HRESULT mft_get_attributes(HKEY hkey, IMFAttributes **ret) +{ + IMFAttributes *attributes; + UINT8 *blob; + DWORD size; + HRESULT hr; + + if (!ret) + return S_OK; + + if (FAILED(hr = MFCreateAttributes(&attributes, 0))) + return hr; + + if (!RegQueryValueExW(hkey, L"Attributes", NULL, NULL, NULL, &size) && size) + { + if (!(blob = malloc(size))) + { + IMFAttributes_Release(attributes); + return E_OUTOFMEMORY; + } + + if (!RegQueryValueExW(hkey, L"Attributes", NULL, NULL, blob, &size)) + { + if (FAILED(hr = MFInitAttributesFromBlob(attributes, blob, size))) + WARN("Failed to initialize attributes, hr %#x.\n", hr); + } + + free(blob); + } + + if (SUCCEEDED(hr)) + { + *ret = attributes; + IMFAttributes_AddRef(*ret); + } + + IMFAttributes_Release(attributes); + + return hr; +} + +/*********************************************************************** + * MFTGetInfo (mfplat.@) + */ +HRESULT WINAPI MFTGetInfo(CLSID clsid, WCHAR **name, MFT_REGISTER_TYPE_INFO **input_types, + UINT32 *input_types_count, MFT_REGISTER_TYPE_INFO **output_types, UINT32 *output_types_count, + IMFAttributes **attributes) +{ + HRESULT hr = S_OK; + WCHAR clsidW[64]; + HKEY hroot, hmft; + DWORD ret; + + TRACE("%s, %p, %p, %p, %p, %p, %p.\n", debugstr_guid(&clsid), name, input_types, + input_types_count, output_types, output_types_count, attributes); + + guid_to_string(clsidW, &clsid); + + if ((ret = RegOpenKeyW(HKEY_CLASSES_ROOT, transform_keyW, &hroot))) + return HRESULT_FROM_WIN32(ret); + + ret = RegOpenKeyW(hroot, clsidW, &hmft); + RegCloseKey(hroot); + if (ret) + return HRESULT_FROM_WIN32(ret); + + if (input_types_count) + *input_types_count = 0; + + if (output_types_count) + *output_types_count = 0; + + hr = mft_get_name(hmft, name); + + if (SUCCEEDED(hr)) + hr = mft_get_reg_type_info(clsidW, L"InputTypes", input_types, input_types_count); + + if (SUCCEEDED(hr)) + hr = mft_get_reg_type_info(clsidW, L"OutputTypes", output_types, output_types_count); + + if (SUCCEEDED(hr)) + hr = mft_get_attributes(hmft, attributes); + + RegCloseKey(hmft); + + return hr; +} + /*********************************************************************** * MFStartup (mfplat.@) */ diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 6cc3fb07105..44d98a957e2 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -160,7 +160,7 @@ @ stdcall MFTEnum(int128 long ptr ptr ptr ptr ptr) @ stdcall MFTEnum2(int128 long ptr ptr ptr ptr ptr) @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) -@ stub MFTGetInfo +@ stdcall MFTGetInfo(int128 ptr ptr ptr ptr ptr ptr) @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) @ stdcall MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stdcall MFTRegisterLocalByCLSID(ptr ptr wstr long long ptr long ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 21eab6d1172..207bd61b8dc 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -396,6 +396,7 @@ static BOOL check_clsid(CLSID *clsids, UINT32 count) static void test_register(void) { + MFT_REGISTER_TYPE_INFO *in_types, *out_types; WCHAR name[] = L"Wine test"; MFT_REGISTER_TYPE_INFO input[] = { @@ -405,17 +406,19 @@ static void test_register(void) { { DUMMY_CLSID, DUMMY_GUID2 } }; + UINT32 count, in_count, out_count; + IMFAttributes *attributes; + WCHAR *mft_name; CLSID *clsids; - UINT32 count; - HRESULT ret; + HRESULT hr, ret; ret = MFTRegister(DUMMY_CLSID, MFT_CATEGORY_OTHER, name, 0, 1, input, 1, output, NULL); if (ret == E_ACCESSDENIED) { - win_skip("Not enough permissions to register a filter\n"); + win_skip("Not enough permissions to register a transform.\n"); return; } - ok(ret == S_OK, "Failed to register dummy filter: %x\n", ret); + ok(ret == S_OK, "Failed to register dummy transform, hr %#x.\n", ret); if(0) { @@ -445,6 +448,49 @@ if(0) ret = MFTEnum(MFT_CATEGORY_OTHER, 0, NULL, NULL, NULL, &clsids, NULL); ok(ret == E_POINTER, "Failed to enumerate filters: %x\n", ret); } + hr = MFTGetInfo(DUMMY_CLSID, &mft_name, NULL, NULL, NULL, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(mft_name, L"Wine test"), "Unexpected name %s.\n", wine_dbgstr_w(mft_name)); + CoTaskMemFree(mft_name); + + hr = MFTGetInfo(DUMMY_CLSID, NULL, NULL, NULL, NULL, NULL, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + in_count = out_count = 1; + hr = MFTGetInfo(DUMMY_CLSID, NULL, NULL, &in_count, NULL, &out_count, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!in_count, "Unexpected count %u.\n", in_count); + ok(!out_count, "Unexpected count %u.\n", out_count); + + hr = MFTGetInfo(DUMMY_CLSID, NULL, NULL, NULL, NULL, NULL, &attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!attributes, "Unexpected attributes.\n"); + IMFAttributes_Release(attributes); + + hr = MFTGetInfo(DUMMY_CLSID, &mft_name, &in_types, &in_count, &out_types, &out_count, &attributes); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!lstrcmpW(mft_name, L"Wine test"), "Unexpected name %s.\n", wine_dbgstr_w(mft_name)); + ok(!!in_types, "Unexpected pointer.\n"); + ok(!!out_types, "Unexpected pointer.\n"); + ok(in_count == 1, "Unexpected count %u.\n", in_count); + ok(out_count == 1, "Unexpected count %u.\n", out_count); + ok(IsEqualGUID(&in_types->guidMajorType, &DUMMY_CLSID), "Unexpected type guid %s.\n", + wine_dbgstr_guid(&in_types->guidMajorType)); + ok(IsEqualGUID(&in_types->guidSubtype, &DUMMY_GUID1), "Unexpected type guid %s.\n", + wine_dbgstr_guid(&in_types->guidSubtype)); + ok(IsEqualGUID(&out_types->guidMajorType, &DUMMY_CLSID), "Unexpected type guid %s.\n", + wine_dbgstr_guid(&out_types->guidMajorType)); + ok(IsEqualGUID(&out_types->guidSubtype, &DUMMY_GUID2), "Unexpected type guid %s.\n", + wine_dbgstr_guid(&out_types->guidSubtype)); + ok(!!attributes, "Unexpected attributes.\n"); + count = 1; + hr = IMFAttributes_GetCount(attributes, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + CoTaskMemFree(mft_name); + CoTaskMemFree(in_types); + CoTaskMemFree(out_types); + IMFAttributes_Release(attributes); count = 0; clsids = NULL; @@ -5213,9 +5259,11 @@ static const IClassFactoryVtbl test_mft_factory_vtbl = static void test_MFTRegisterLocal(void) { IClassFactory test_factory = { &test_mft_factory_vtbl }; - MFT_REGISTER_TYPE_INFO input_types[1]; + MFT_REGISTER_TYPE_INFO input_types[1], *in_types, *out_types; + IMFAttributes *attributes; IMFActivate **activate; UINT32 count, count2; + WCHAR *name; HRESULT hr; if (!pMFTRegisterLocal) @@ -5255,6 +5303,9 @@ static void test_MFTRegisterLocal(void) 0, NULL); ok(hr == S_OK, "Failed to register MFT, hr %#x.\n", hr); + hr = MFTGetInfo(MFT_CATEGORY_OTHER, &name, &in_types, &count, &out_types, &count2, &attributes); + ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "Unexpected hr %#x.\n", hr); + hr = pMFTUnregisterLocal(NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); diff --git a/include/mfapi.h b/include/mfapi.h index bcb5d26121e..5b60833f529 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -558,6 +558,8 @@ HRESULT WINAPI MFTEnum2(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INF HRESULT WINAPI MFTEnumEx(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INFO *input_type, const MFT_REGISTER_TYPE_INFO *output_type, IMFActivate ***activate, UINT32 *pcount); +HRESULT WINAPI MFTGetInfo(CLSID clsid, WCHAR **name, MFT_REGISTER_TYPE_INFO **input_types, UINT32 *input_types_count, + MFT_REGISTER_TYPE_INFO **output_types, UINT32 *output_types_count, IMFAttributes **attributes); BOOL WINAPI MFIsFormatYUV(DWORD format); HRESULT WINAPI MFInitAttributesFromBlob(IMFAttributes *attributes, const UINT8 *buffer, UINT size); HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WAVEFORMATEX *format, UINT32 size); -- 2.34.1

1 0

[PATCH 1/2] d3d11: Implement ID3D11RasterizerState1.
by Zebediah Figura 19 Jan '22

19 Jan '22

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 7 ++-- dlls/d3d11/state.c | 68 +++++++++++++++++++++++--------------- dlls/d3d11/tests/d3d11.c | 19 +++++++++++ 4 files changed, 65 insertions(+), 31 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index afbde9a4bfb..b45ef8431bf 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -461,7 +461,7 @@ struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( /* ID3D11RasterizerState, ID3D10RasterizerState */ struct d3d_rasterizer_state { - ID3D11RasterizerState ID3D11RasterizerState_iface; + ID3D11RasterizerState1 ID3D11RasterizerState1_iface; ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 626e4889708..c0191677e77 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2283,7 +2283,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_RSGetState(ID3D11DeviceContex if ((wined3d_state = wined3d_device_context_get_rasterizer_state(context->wined3d_context))) { rasterizer_state_impl = wined3d_rasterizer_state_get_parent(wined3d_state); - ID3D11RasterizerState_AddRef(*rasterizer_state = &rasterizer_state_impl->ID3D11RasterizerState_iface); + *rasterizer_state = (ID3D11RasterizerState *)&rasterizer_state_impl->ID3D11RasterizerState1_iface; + ID3D11RasterizerState_AddRef(*rasterizer_state); } else { @@ -3604,7 +3605,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device if (FAILED(hr = d3d_rasterizer_state_create(device, desc, &object))) return hr; - *rasterizer_state = &object->ID3D11RasterizerState_iface; + *rasterizer_state = (ID3D11RasterizerState *)&object->ID3D11RasterizerState1_iface; return S_OK; } @@ -4950,7 +4951,7 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device1 *iface, ID3D rasterizer_state_object = unsafe_impl_from_ID3D10RasterizerState(rasterizer_state); d3d11_device_context_RSSetState(&device->immediate_context.ID3D11DeviceContext1_iface, - rasterizer_state_object ? &rasterizer_state_object->ID3D11RasterizerState_iface : NULL); + rasterizer_state_object ? (ID3D11RasterizerState *)&rasterizer_state_object->ID3D11RasterizerState1_iface : NULL); } static void STDMETHODCALLTYPE d3d10_device_RSSetViewports(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 810217c93b4..9aa841f0805 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -841,23 +841,24 @@ struct d3d_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10De /* ID3D11RasterizerState methods */ -static inline struct d3d_rasterizer_state *impl_from_ID3D11RasterizerState(ID3D11RasterizerState *iface) +static inline struct d3d_rasterizer_state *impl_from_ID3D11RasterizerState1(ID3D11RasterizerState1 *iface) { - return CONTAINING_RECORD(iface, struct d3d_rasterizer_state, ID3D11RasterizerState_iface); + return CONTAINING_RECORD(iface, struct d3d_rasterizer_state, ID3D11RasterizerState1_iface); } -static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_QueryInterface(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_QueryInterface(ID3D11RasterizerState1 *iface, REFIID riid, void **object) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_ID3D11RasterizerState) + || IsEqualGUID(riid, &IID_ID3D11RasterizerState1) || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - ID3D11RasterizerState_AddRef(iface); + ID3D11RasterizerState1_AddRef(iface); *object = iface; return S_OK; } @@ -876,9 +877,9 @@ static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_QueryInterface(ID3D11Ras return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerState *iface) +static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerState1 *iface) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); ULONG refcount = InterlockedIncrement(&state->refcount); TRACE("%p increasing refcount to %u.\n", state, refcount); @@ -892,9 +893,9 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_AddRef(ID3D11RasterizerSta return refcount; } -static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerState *iface) +static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerState1 *iface) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); @@ -909,10 +910,10 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt return refcount; } -static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDevice(ID3D11RasterizerState *iface, +static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDevice(ID3D11RasterizerState1 *iface, ID3D11Device **device) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -920,47 +921,58 @@ static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDevice(ID3D11RasterizerS ID3D11Device_AddRef(*device); } -static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_GetPrivateData(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_GetPrivateData(ID3D11RasterizerState1 *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); return d3d_get_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateData(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateData(ID3D11RasterizerState1 *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); return d3d_set_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateDataInterface(ID3D11RasterizerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateDataInterface(ID3D11RasterizerState1 *iface, REFGUID guid, const IUnknown *data) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); return d3d_set_private_data_interface(&state->private_store, guid, data); } -static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc(ID3D11RasterizerState *iface, +static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc(ID3D11RasterizerState1 *iface, D3D11_RASTERIZER_DESC *desc) { - struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); TRACE("iface %p, desc %p.\n", iface, desc); *desc = state->desc; } -static const struct ID3D11RasterizerStateVtbl d3d11_rasterizer_state_vtbl = +static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc1(ID3D11RasterizerState1 *iface, + D3D11_RASTERIZER_DESC1 *desc) +{ + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState1(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + memcpy(desc, &state->desc, sizeof(state->desc)); + desc->ForcedSampleCount = 0; +} + +static const struct ID3D11RasterizerState1Vtbl d3d11_rasterizer_state_vtbl = { /* IUnknown methods */ d3d11_rasterizer_state_QueryInterface, @@ -973,6 +985,8 @@ static const struct ID3D11RasterizerStateVtbl d3d11_rasterizer_state_vtbl = d3d11_rasterizer_state_SetPrivateDataInterface, /* ID3D11RasterizerState methods */ d3d11_rasterizer_state_GetDesc, + /* ID3D11RasterizerState1 methods */ + d3d11_rasterizer_state_GetDesc1, }; /* ID3D10RasterizerState methods */ @@ -991,7 +1005,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10Ras TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - return d3d11_rasterizer_state_QueryInterface(&state->ID3D11RasterizerState_iface, riid, object); + return d3d11_rasterizer_state_QueryInterface(&state->ID3D11RasterizerState1_iface, riid, object); } static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerState *iface) @@ -1000,7 +1014,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta TRACE("iface %p.\n", iface); - return d3d11_rasterizer_state_AddRef(&state->ID3D11RasterizerState_iface); + return d3d11_rasterizer_state_AddRef(&state->ID3D11RasterizerState1_iface); } static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) @@ -1009,7 +1023,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerSt TRACE("iface %p.\n", state); - return d3d11_rasterizer_state_Release(&state->ID3D11RasterizerState_iface); + return d3d11_rasterizer_state_Release(&state->ID3D11RasterizerState1_iface); } /* ID3D10DeviceChild methods */ @@ -1113,7 +1127,7 @@ static HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, str struct wined3d_rasterizer_state_desc wined3d_desc; HRESULT hr; - state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; + state->ID3D11RasterizerState1_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; wined3d_private_store_init(&state->private_store); @@ -1175,7 +1189,7 @@ HRESULT d3d_rasterizer_state_create(struct d3d_device *device, const D3D11_RASTE object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); TRACE("Returning existing rasterizer state %p.\n", object); - ID3D11RasterizerState_AddRef(&object->ID3D11RasterizerState_iface); + ID3D11RasterizerState1_AddRef(&object->ID3D11RasterizerState1_iface); *state = object; wined3d_mutex_unlock(); @@ -1207,9 +1221,9 @@ struct d3d_rasterizer_state *unsafe_impl_from_ID3D11RasterizerState(ID3D11Raster { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d11_rasterizer_state_vtbl); + assert(iface->lpVtbl == (ID3D11RasterizerStateVtbl *)&d3d11_rasterizer_state_vtbl); - return impl_from_ID3D11RasterizerState(iface); + return impl_from_ID3D11RasterizerState1((ID3D11RasterizerState1 *)iface); } struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 55a245c744c..cd4905e2a82 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5507,6 +5507,7 @@ static void test_create_rasterizer_state(void) D3D10_RASTERIZER_DESC d3d10_desc; D3D11_RASTERIZER_DESC desc; ID3D11Device *device, *tmp; + ID3D11Device1 *device1; HRESULT hr; if (!(device = create_device(NULL))) @@ -5570,6 +5571,24 @@ static void test_create_rasterizer_state(void) ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); } + if (ID3D11Device_QueryInterface(device, &IID_ID3D11Device1, (void **)&device1) == S_OK) + { + ID3D11RasterizerState1 *state_ex1; + D3D11_RASTERIZER_DESC1 desc1; + + hr = ID3D11RasterizerState_QueryInterface(rast_state1, &IID_ID3D11RasterizerState1, (void **)&state_ex1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&desc1, 0xcc, sizeof(desc1)); + ID3D11RasterizerState1_GetDesc1(state_ex1, &desc1); + ok(!memcmp(&desc1, &desc, sizeof(desc)), "D3D11 desc didn't match.\n"); + ok(!desc1.ForcedSampleCount, "Got forced sample count %u.\n", desc1.ForcedSampleCount); + + ID3D11RasterizerState1_Release(state_ex1); + + ID3D11Device1_Release(device1); + } + refcount = ID3D11RasterizerState_Release(rast_state2); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); refcount = ID3D11RasterizerState_Release(rast_state1); -- 2.34.1

3 5

[PATCH v2] dxgi: Allow sampling of Vulkan swapchain images for D3D12.
by Conor McCarthy 19 Jan '22

19 Jan '22

Psychonauts 2 creates an SRV on a swapchain image, and lack of VK_IMAGE_USAGE_SAMPLED_BIT results in failure to create a Vulkan SRV descriptor. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8d5f2f537..0bc1ba4f4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1304,6 +1304,8 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc image_info.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + if (swapchain->desc.BufferUsage & DXGI_USAGE_SHADER_INPUT) + image_info.usage |= VK_IMAGE_USAGE_SAMPLED_BIT; image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; image_info.queueFamilyIndexCount = 0; image_info.pQueueFamilyIndices = NULL; @@ -1794,6 +1796,12 @@ static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *s usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT; if (!(usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) || !(usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) WARN("Transfer not supported for swapchain images.\n"); + if (swapchain->desc.BufferUsage & DXGI_USAGE_SHADER_INPUT) + { + usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_SAMPLED_BIT; + if (!(usage & VK_IMAGE_USAGE_SAMPLED_BIT)) + WARN("Sampling not supported for swapchain images.\n"); + } vk_swapchain_desc.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; vk_swapchain_desc.pNext = NULL; @@ -3087,8 +3095,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI IDXGIOutput_Release(output); } - if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT) - FIXME("Ignoring buffer usage %#x.\n", swapchain_desc->BufferUsage); + if (swapchain_desc->BufferUsage & ~(DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_SHADER_INPUT)) + FIXME("Ignoring buffer usage %#x.\n", swapchain_desc->BufferUsage & ~(DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_SHADER_INPUT)); if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH && swapchain_desc->Scaling != DXGI_SCALING_NONE) FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); if (swapchain_desc->AlphaMode && swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) -- 2.34.1

3 2

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-devel