wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Conor McCarthy : vkd3d: Use Vulkan timeline semaphores for D3D12 fences.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: vkd3d Branch: master Commit: 22d86653003aeec7b919d0b58b2c0bb76438936e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=22d86653003aeec7b919d0b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 15:56:00 2022 +0100 vkd3d: Use Vulkan timeline semaphores for D3D12 fences. D3D12 supports signalling a fence to a lower value, while Vulkan timeline semaphores do not. On the GPU side this is handled by simply submitting the signal anyway, if a test for this passes on device creation, because working around this is impractical. For CPU signals the Vulkan semaphore is replaced with a new one at the lower value only if no waits and/or signals are pending on the GPU. Otherwise, a fixme is emitted. Partly based on a vkd3d-proton patch by Hans-Kristian Arntzen (not including the handling of lower fence values). The old implementation is used if KHR_timeline_semaphore is not available or GPU signals do not work for a lower value. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 571 ++++++++++++++++++++++++++++++++++++++++++--- libs/vkd3d/device.c | 87 +++++++ libs/vkd3d/vkd3d_private.h | 30 +++ libs/vkd3d/vulkan_procs.h | 5 + tests/d3d12.c | 11 +- 5 files changed, 663 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=22d86653003aeec7b91…

1 0

Conor McCarthy : vkd3d: Write a resource null descriptor to all applicable sets when one set is written.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: vkd3d Branch: master Commit: e3045090a80ef8ede7a71cb28ebae41d34b5e3d5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e3045090a80ef8ede7a71cb… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 14:36:10 2022 +1000 vkd3d: Write a resource null descriptor to all applicable sets when one set is written. Binding a shader with the wrong null descriptor type works in Windows. The introduction of Vulkan-backed heaps may cause a regression in clients which do this, because the written index will remain unpopulated in all other sets, but a shader may access it in one of them. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 38fd632b..68c28cd1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2131,6 +2131,7 @@ void vkd3d_view_decref(struct vkd3d_view *view, struct d3d12_device *device) vkd3d_view_destroy(view, device); } +/* TODO: write null descriptors to all applicable sets (invalid behaviour workaround). */ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descriptor_heap_vk_set *descriptor_set, struct d3d12_desc_copy_location *locations, unsigned int write_count) { @@ -2178,6 +2179,47 @@ static void d3d12_descriptor_heap_write_vk_descriptor_range(struct d3d12_descrip } } +static void d3d12_desc_write_vk_heap_null_descriptor(struct d3d12_descriptor_heap *descriptor_heap, + uint32_t dst_array_element, const struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct d3d12_descriptor_heap_vk_set *descriptor_set; + VkBufferView vk_buffer_view = VK_NULL_HANDLE; + enum vkd3d_vk_descriptor_set_index i; + VkDescriptorBufferInfo vk_cbv_info; + + vk_cbv_info.buffer = VK_NULL_HANDLE; + vk_cbv_info.offset = 0; + vk_cbv_info.range = VK_WHOLE_SIZE; + + /* Binding a shader with the wrong null descriptor type works in Windows. + * To support that here we must write one to all applicable Vulkan sets. */ + for (i = VKD3D_SET_INDEX_UNIFORM_BUFFER; i <= VKD3D_SET_INDEX_STORAGE_IMAGE; ++i) + { + descriptor_set = &descriptor_heap->vk_descriptor_sets[i]; + descriptor_set->vk_descriptor_writes[0].dstArrayElement = dst_array_element; + descriptor_set->vk_descriptor_writes[0].descriptorCount = 1; + switch (i) + { + case VKD3D_SET_INDEX_UNIFORM_BUFFER: + descriptor_set->vk_descriptor_writes[0].pBufferInfo = &vk_cbv_info; + break; + case VKD3D_SET_INDEX_SAMPLED_IMAGE: + case VKD3D_SET_INDEX_STORAGE_IMAGE: + descriptor_set->vk_image_infos[0].imageView = VK_NULL_HANDLE; + break; + case VKD3D_SET_INDEX_UNIFORM_TEXEL_BUFFER: + case VKD3D_SET_INDEX_STORAGE_TEXEL_BUFFER: + descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &vk_buffer_view; + break; + default: + assert(false); + break; + } + VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, descriptor_set->vk_descriptor_writes, 0, NULL)); + } +} + /* dst and src contain the same data unless another thread overwrites dst. The array index is * calculated from dst, and src is thread safe. */ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct d3d12_desc *src, @@ -2186,6 +2228,7 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct struct d3d12_descriptor_heap_vk_set *descriptor_set; struct d3d12_descriptor_heap *descriptor_heap; const struct vkd3d_vk_device_procs *vk_procs; + bool is_null = false; descriptor_heap = vkd3d_gpu_descriptor_allocator_heap_from_descriptor(&device->gpu_descriptor_allocator, dst); descriptor_set = &descriptor_heap->vk_descriptor_sets[vkd3d_vk_descriptor_set_index_from_vk_descriptor_type( @@ -2201,14 +2244,16 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct { case VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER: descriptor_set->vk_descriptor_writes[0].pBufferInfo = &src->u.vk_cbv_info; + is_null = !src->u.vk_cbv_info.buffer; break; case VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE: case VK_DESCRIPTOR_TYPE_STORAGE_IMAGE: - descriptor_set->vk_image_infos[0].imageView = src->u.view_info.view->u.vk_image_view; + is_null = !(descriptor_set->vk_image_infos[0].imageView = src->u.view_info.view->u.vk_image_view); break; case VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER: case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: descriptor_set->vk_descriptor_writes[0].pTexelBufferView = &src->u.view_info.view->u.vk_buffer_view; + is_null = !src->u.view_info.view->u.vk_buffer_view; break; case VK_DESCRIPTOR_TYPE_SAMPLER: descriptor_set->vk_image_infos[0].sampler = src->u.view_info.view->u.vk_sampler; @@ -2217,6 +2262,14 @@ static void d3d12_desc_write_vk_heap(const struct d3d12_desc *dst, const struct ERR("Unhandled descriptor type %#x.\n", src->vk_descriptor_type); break; } + if (is_null && device->vk_info.EXT_robustness2) + { + d3d12_desc_write_vk_heap_null_descriptor(descriptor_heap, + descriptor_set->vk_descriptor_writes[0].dstArrayElement, device); + vkd3d_mutex_unlock(&descriptor_heap->vk_sets_mutex); + return; + } + VK_CALL(vkUpdateDescriptorSets(device->vk_device, 1, descriptor_set->vk_descriptor_writes, 0, NULL)); if (src->magic == VKD3D_DESCRIPTOR_MAGIC_UAV && src->u.view_info.view->vk_counter_view)

1 0

Conor McCarthy : vkd3d: Use Vulkan null descriptors if EXT_robustness2 is available.
by Alexandre Julliard 24 Mar '22

24 Mar '22

Module: vkd3d Branch: master Commit: 06274621927a624ab1f8c88d159ac054ee625efe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=06274621927a624ab1f8c88… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Mar 24 14:36:09 2022 +1000 vkd3d: Use Vulkan null descriptors if EXT_robustness2 is available. This implements all remaining unsupported image view dimensions and saves a small amount of resources because null buffers and images are no longer needed. It matches the D3D12 requirement that all reads return zero, which is not strictly true of the existing implementation using resources of small but non-zero size. Warnings on null view creation are silenced because there should no longer be a difference from D3D12 behaviour. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 2 +- configure.ac | 2 +- libs/vkd3d/device.c | 8 +++++ libs/vkd3d/resource.c | 76 ++++++++++++++++++++++++++++++---------------- libs/vkd3d/vkd3d_private.h | 1 + 5 files changed, 61 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=06274621927a624ab1f…

1 0

Henri Verbeet : dxgi/tests: Accept DXGI_STATUS_OCCLUDED as result when creating fullscreen swapchains.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: f2afa424769de3517cf5ea3e171de36d06a5dc68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2afa424769de3517cf5ea3e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 23 17:27:37 2022 +0100 dxgi/tests: Accept DXGI_STATUS_OCCLUDED as result when creating fullscreen swapchains. These can legitimately occur in some circumstances, and shouldn't otherwise affect these tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 89e32367231..a199ba486ba 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2125,7 +2125,7 @@ static void test_create_swapchain(void) /* Fullscreen */ creation_desc.Windowed = FALSE; hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK || hr == DXGI_STATUS_OCCLUDED, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); @@ -3573,7 +3573,7 @@ static void test_inexact_modes(void) capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK || hr == DXGI_STATUS_OCCLUDED, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_GetDesc(swapchain, &result_desc); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);

1 0

Andrew Eikum : windows.media.speech: Add ISpeechSynthesizer2 stub.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 4efd4338e4d14bcbf163ce35da09cb9dc45fffbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4efd4338e4d14bcbf163ce35… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 23 11:21:59 2022 -0500 windows.media.speech: Add ISpeechSynthesizer2 stub. A recent update for Microsoft Flight Simulator requires this. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/synthesizer.c | 33 +++++++++++++++++++++++++++++++ dlls/windows.media.speech/tests/speech.c | 12 +++++++++++ include/windows.media.speechsynthesis.idl | 32 ++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 3863e468d36..179229b4bb4 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -151,6 +151,7 @@ static struct voice_information_vector all_voices = struct speech_synthesizer { ISpeechSynthesizer ISpeechSynthesizer_iface; + ISpeechSynthesizer2 ISpeechSynthesizer2_iface; IClosable IClosable_iface; LONG ref; }; @@ -181,6 +182,13 @@ static HRESULT STDMETHODCALLTYPE speech_synthesizer_QueryInterface( return S_OK; } + if (IsEqualGUID(iid, &IID_ISpeechSynthesizer2)) + { + IUnknown_AddRef(iface); + *out = &impl->ISpeechSynthesizer2_iface; + return S_OK; + } + if (IsEqualGUID(iid, &IID_IClosable)) { IUnknown_AddRef(iface); @@ -289,6 +297,30 @@ static const struct ISpeechSynthesizerVtbl speech_synthesizer_vtbl = speech_synthesizer_get_Voice, }; + +DEFINE_IINSPECTABLE(speech_synthesizer2, ISpeechSynthesizer2, struct speech_synthesizer, ISpeechSynthesizer_iface) + +static HRESULT STDMETHODCALLTYPE speech_synthesizer2_get_Options(ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value) +{ + FIXME("iface %p, value %p stub.\n", iface, value); + + return E_NOTIMPL; +} + +static const struct ISpeechSynthesizer2Vtbl speech_synthesizer2_vtbl = +{ + /* IUnknown methods */ + speech_synthesizer2_QueryInterface, + speech_synthesizer2_AddRef, + speech_synthesizer2_Release, + /* IInspectable methods */ + speech_synthesizer2_GetIids, + speech_synthesizer2_GetRuntimeClassName, + speech_synthesizer2_GetTrustLevel, + /* ISpeechSynthesizer2 methods */ + speech_synthesizer2_get_Options, +}; + static HRESULT STDMETHODCALLTYPE closable_QueryInterface( IClosable *iface, REFIID iid, void **out) { @@ -467,6 +499,7 @@ static HRESULT STDMETHODCALLTYPE factory_ActivateInstance( } obj->ISpeechSynthesizer_iface.lpVtbl = &speech_synthesizer_vtbl; + obj->ISpeechSynthesizer2_iface.lpVtbl = &speech_synthesizer2_vtbl; obj->IClosable_iface.lpVtbl = &closable_vtbl; obj->ref = 1; *instance = (IInspectable *)&obj->ISpeechSynthesizer_iface; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index fc0a8d762c1..e88cfc25d54 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -557,6 +557,7 @@ static void test_SpeechSynthesizer(void) IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; ISpeechSynthesizer *synthesizer; + ISpeechSynthesizer2 *synthesizer2; IClosable *closable; HMODULE hdll; HSTRING str, str2; @@ -673,6 +674,17 @@ static void test_SpeechSynthesizer(void) hr = IInspectable_QueryInterface(inspectable, &IID_IClosable, (void **)&closable); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IInspectable_QueryInterface(inspectable, &IID_ISpeechSynthesizer2, (void **)&synthesizer2); + ok(hr == S_OK || + broken(hr == E_NOINTERFACE), /* requires newer Windows */ + "Got unexpected hr %#lx.\n", hr); + + if (hr == S_OK) + { + ref = ISpeechSynthesizer2_Release(synthesizer2); + ok(ref == 3, "Got unexpected ref %lu.\n", ref); + } + ref = IClosable_Release(closable); ok(ref == 2, "Got unexpected ref %lu.\n", ref); diff --git a/include/windows.media.speechsynthesis.idl b/include/windows.media.speechsynthesis.idl index 29dca510dee..b2c86f37137 100644 --- a/include/windows.media.speechsynthesis.idl +++ b/include/windows.media.speechsynthesis.idl @@ -39,6 +39,7 @@ namespace Windows { interface ISpeechSynthesisStream; runtimeclass SpeechSynthesizer; runtimeclass VoiceInformation; + runtimeclass SpeechSynthesizerOptions; runtimeclass SpeechSynthesisStream; } } @@ -112,6 +113,16 @@ namespace Windows { [propget] HRESULT Voice([out] [retval] VoiceInformation **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), + uuid(a7c5ecb2-4339-4d6a-bbf8-c7a4f1544c2e) + ] + interface ISpeechSynthesizer2 : IInspectable + { + [propget] HRESULT Options([out, retval] SpeechSynthesizerOptions **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.VoiceInformation), @@ -126,6 +137,19 @@ namespace Windows { [propget] HRESULT Gender([out] [retval] VoiceGender* value); } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizerOptions), + uuid(a0e23871-cc3d-43c9-91b1-ee185324d83d) + ] + interface ISpeechSynthesizerOptions : IInspectable + { + [propget] HRESULT IncludeWordBoundaryMetadata([out, retval] boolean *value); + [propput] HRESULT IncludeWordBoundaryMetadata([in] boolean value); + [propget] HRESULT IncludeSentenceBoundaryMetadata([out, retval] boolean *value); + [propput] HRESULT IncludeSentenceBoundaryMetadata([in] boolean value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Media.SpeechSynthesis.SpeechSynthesizer), @@ -146,6 +170,14 @@ namespace Windows { [default] interface Windows.Media.SpeechSynthesis.IVoiceInformation; } + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass SpeechSynthesizerOptions + { + [default] interface Windows.Media.SpeechSynthesis.ISpeechSynthesizerOptions; + } [contract(Windows.Foundation.UniversalApiContract, 1.0)] [marshaling_behavior(agile)]

1 0

Francois Gouget : ntdll: Return the UI language id in uppercase.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: a83eea9b44f8c6a8658101189e339169facefe7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a83eea9b44f8c6a865810118… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 23 16:54:22 2022 +0100 ntdll: Return the UI language id in uppercase. This fixes a failure in kernel32:locale. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 74c395cbd85..b6cf2ec0739 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -627,7 +627,7 @@ static NTSTATUS get_dummy_preferred_ui_language( DWORD flags, LANGID lang, ULONG FIXME("(0x%x %p %p %p) returning a dummy value (current locale)\n", flags, count, buffer, size); - if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lx", lang ); + if (flags & MUI_LANGUAGE_ID) swprintf( name, ARRAY_SIZE(name), L"%04lX", lang ); else { UNICODE_STRING str;

1 0

Paul Gofman : bcrypt: Fix ECC public key export.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 00dfa1bd04ae7f93ee7dd4235dd2439697efd318 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00dfa1bd04ae7f93ee7dd423… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Mar 23 16:46:10 2022 +0300 bcrypt: Fix ECC public key export. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/gnutls.c | 20 +++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 18 ++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c index 884f4b1d37e..9de126c2bfe 100644 --- a/dlls/bcrypt/gnutls.c +++ b/dlls/bcrypt/gnutls.c @@ -91,6 +91,8 @@ static int (*pgnutls_cipher_add_auth)(gnutls_cipher_hd_t, const void *, size_t); static gnutls_sign_algorithm_t (*pgnutls_pk_to_sign)(gnutls_pk_algorithm_t, gnutls_digest_algorithm_t); static int (*pgnutls_pubkey_import_ecc_raw)(gnutls_pubkey_t, gnutls_ecc_curve_t, const gnutls_datum_t *, const gnutls_datum_t *); +static int (*pgnutls_pubkey_export_ecc_raw)(gnutls_pubkey_t key, gnutls_ecc_curve_t *curve, + gnutls_datum_t *x, gnutls_datum_t *y); static int (*pgnutls_privkey_import_ecc_raw)(gnutls_privkey_t, gnutls_ecc_curve_t, const gnutls_datum_t *, const gnutls_datum_t *, const gnutls_datum_t *); static int (*pgnutls_pubkey_verify_hash2)(gnutls_pubkey_t, gnutls_sign_algorithm_t, unsigned int, @@ -158,6 +160,12 @@ static int compat_gnutls_pubkey_import_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_c return GNUTLS_E_UNKNOWN_PK_ALGORITHM; } +static int compat_gnutls_pubkey_export_ecc_raw(gnutls_pubkey_t key, gnutls_ecc_curve_t *curve, + gnutls_datum_t *x, gnutls_datum_t *y) +{ + return GNUTLS_E_UNKNOWN_PK_ALGORITHM; +} + static int compat_gnutls_privkey_export_rsa_raw(gnutls_privkey_t key, gnutls_datum_t *m, gnutls_datum_t *e, gnutls_datum_t *d, gnutls_datum_t *p, gnutls_datum_t *q, gnutls_datum_t *u, gnutls_datum_t *e1, gnutls_datum_t *e2) @@ -292,6 +300,7 @@ static NTSTATUS gnutls_process_attach( void *args ) LOAD_FUNCPTR_OPT(gnutls_cipher_tag) LOAD_FUNCPTR_OPT(gnutls_cipher_add_auth) LOAD_FUNCPTR_OPT(gnutls_pubkey_import_ecc_raw) + LOAD_FUNCPTR_OPT(gnutls_pubkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_rsa_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_export_ecc_raw) LOAD_FUNCPTR_OPT(gnutls_privkey_import_ecc_raw) @@ -673,7 +682,14 @@ static NTSTATUS key_export_ecc_public( struct key *key, UCHAR *buf, ULONG len, U return STATUS_NOT_IMPLEMENTED; } - if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ))) + if (key_data(key)->a.pubkey) + ret = pgnutls_pubkey_export_ecc_raw( key_data(key)->a.pubkey, &curve, &x, &y ); + else if (key_data(key)->a.privkey) + ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, NULL ); + else + return STATUS_INVALID_PARAMETER; + + if (ret) { pgnutls_perror( ret ); return STATUS_INTERNAL_ERROR; @@ -910,6 +926,8 @@ static NTSTATUS key_export_ecc( struct key *key, UCHAR *buf, ULONG len, ULONG *r return STATUS_NOT_IMPLEMENTED; } + if (!key_data(key)->a.privkey) return STATUS_INVALID_PARAMETER; + if ((ret = pgnutls_privkey_export_ecc_raw( key_data(key)->a.privkey, &curve, &x, &y, &d ))) { pgnutls_perror( ret ); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index efb5843fa4e..5d8e81cc522 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -1860,6 +1860,16 @@ static void test_ECDSA(void) status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPUBLIC_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + memset(buffer, 0xcc, sizeof(buffer)); + status = BCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buffer, sizeof(buffer), &size, 0); + ok(!status, "Got unexpected status %#lx\n", status); + ok(ecckey->dwMagic == BCRYPT_ECDSA_PUBLIC_P256_MAGIC, "Got unexpected magic %#lx.\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(!memcmp(ecckey + 1, eccPubkey, sizeof(eccPubkey)), "Got unexpected key data.\n"); + + status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, sizeof(buffer), &size, 0); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected status %#lx\n", status); + status = BCryptVerifySignature(key, NULL, certHash, sizeof(certHash) - 1, certSignature, sizeof(certSignature), 0); ok(status == STATUS_INVALID_SIGNATURE, "Expected STATUS_INVALID_SIGNATURE, got %#lx\n", status); @@ -1885,6 +1895,14 @@ static void test_ECDSA(void) status = BCryptImportKeyPair(alg, NULL, BCRYPT_ECCPRIVATE_BLOB, &key, buffer, size, 0); ok(!status, "BCryptImportKeyPair failed: %#lx\n", status); + memset( buffer, 0xcc, sizeof(buffer) ); + status = BCryptExportKey(key, NULL, BCRYPT_ECCPUBLIC_BLOB, buffer, sizeof(buffer), &size, 0); + ok(!status, "Got unexpected status %#lx\n", status); + ok(ecckey->dwMagic == BCRYPT_ECDSA_PUBLIC_P256_MAGIC, "got %#lx\n", ecckey->dwMagic); + ok(ecckey->cbKey == 32, "got %lu\n", ecckey->cbKey); + ok(!memcmp(ecckey + 1, eccPrivkey, sizeof(eccPubkey)), "Got unexpected key data.\n"); + + size = sizeof(BCRYPT_ECCKEY_BLOB) + sizeof(eccPrivkey); memset( buffer, 0, sizeof(buffer) ); status = BCryptExportKey(key, NULL, BCRYPT_ECCPRIVATE_BLOB, buffer, size, &size, 0); ok(status == STATUS_SUCCESS, "got %#lx\n", status);

1 0

Jacek Caban : win32u: Move ScreenToClient implementation from user32.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: b133b756de4d4a731ce9e160d37a182808d3689f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b133b756de4d4a731ce9e160… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 23 14:02:18 2022 +0100 win32u: Move ScreenToClient implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 16 ++-------------- dlls/win32u/window.c | 20 ++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index fa074e9f7c8..5ab43089a91 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -432,21 +432,9 @@ BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) /******************************************************************* * ScreenToClient (USER32.@) */ -BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) +BOOL WINAPI ScreenToClient( HWND hwnd, POINT *pt ) { - POINT offset; - BOOL mirrored; - - if (!hwnd) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return FALSE; - } - if (!WINPOS_GetWinOffset( 0, hwnd, &mirrored, &offset )) return FALSE; - lppnt->x += offset.x; - lppnt->y += offset.y; - if (mirrored) lppnt->x = -lppnt->x; - return TRUE; + return NtUserCallHwndParam( hwnd, (UINT_PTR)pt, NtUserScreenToClient ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index f51c7e760ce..59761b8185c 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -2587,6 +2587,24 @@ other_process: /* one of the parents may belong to another process, do it the h return ret; } +/* see ScreenToClient */ +static BOOL screen_to_client( HWND hwnd, POINT *pt ) +{ + POINT offset; + BOOL mirrored; + + if (!hwnd) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + if (!get_windows_offset( 0, hwnd, get_thread_dpi(), &mirrored, &offset )) return FALSE; + pt->x += offset.x; + pt->y += offset.y; + if (mirrored) pt->x = -pt->x; + return TRUE; +} + /* map coordinates of a window region */ void map_window_region( HWND from, HWND to, HRGN hrgn ) { @@ -5019,6 +5037,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return kill_system_timer( hwnd, param ); case NtUserMonitorFromWindow: return HandleToUlong( monitor_from_window( hwnd, param, NtUserMonitorFromWindow )); + case NtUserScreenToClient: + return screen_to_client( hwnd, (POINT *)param ); case NtUserSetCaptureWindow: return set_capture_window( hwnd, param, NULL ); case NtUserSetForegroundWindow: diff --git a/include/ntuser.h b/include/ntuser.h index 5b7cc0be597..da0a8974004 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -212,6 +212,7 @@ enum NtUserIsChild, NtUserKillSystemTimer, NtUserMonitorFromWindow, + NtUserScreenToClient, NtUserSetCaptureWindow, NtUserSetForegroundWindow, NtUserSetWindowPixelFormat,

1 0

Jacek Caban : user32: Merge WINPROC_call_window into call_window_proc.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 0cfc7c445810c52622afa2b2635e0a23861df386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cfc7c445810c52622afa2b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 23 14:02:09 2022 +0100 user32: Merge WINPROC_call_window into call_window_proc. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 62 ++++++++++++++++++++++++++++++++++++++-------- dlls/user32/user_private.h | 3 +-- dlls/user32/winproc.c | 55 +++++----------------------------------- 3 files changed, 59 insertions(+), 61 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 1e7ec2b0615..426352da584 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -53,6 +53,8 @@ WINE_DECLARE_DEBUG_CHANNEL(key); #define MAX_PACK_COUNT 4 +#define MAX_WINPROC_RECURSION 64 + /* the various structures that can be sent in messages, in platform-independent layout */ struct packed_CREATESTRUCTW { @@ -2162,6 +2164,38 @@ static BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM return TRUE; } +static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, UINT msg, WPARAM wParam, + LPARAM lParam, LRESULT *result, BOOL ansi, + enum wm_char_mapping mapping ) +{ + WND *win; + + USER_CheckNotLock(); + + if (!(win = WIN_GetPtr( hwnd ))) return FALSE; + if (win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE; + if (win->tid != GetCurrentThreadId()) + { + WIN_ReleasePtr( win ); + return FALSE; + } + params->func = win->winproc; + params->ansi_dst = !(win->flags & WIN_ISUNICODE); + params->is_dialog = win->dlgInfo != NULL; + WIN_ReleasePtr( win ); + + params->hwnd = WIN_GetFullHandle( hwnd ); + get_winproc_params( params ); + params->msg = msg; + params->wparam = wParam; + params->lparam = lParam; + params->result = result; + params->ansi = ansi; + params->mapping = mapping; + params->dpi_awareness = GetWindowDpiAwarenessContext( params->hwnd ); + return TRUE; +} + /*********************************************************************** * call_window_proc * @@ -2170,35 +2204,43 @@ static BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode, BOOL same_thread, enum wm_char_mapping mapping ) { + struct user_thread_info *thread_info = get_user_thread_info(); + struct win_proc_params params; LRESULT result = 0; CWPSTRUCT cwp; CWPRETSTRUCT cwpret; if (msg & 0x80000000) - { - result = handle_internal_message( hwnd, msg, wparam, lparam ); - goto done; - } + return handle_internal_message( hwnd, msg, wparam, lparam ); + + if (!WIN_IsCurrentThread( hwnd )) return 0; + if (!init_window_call_params( &params, hwnd, msg, wparam, lparam, &result, !unicode, mapping )) + return 0; /* first the WH_CALLWNDPROC hook */ - hwnd = WIN_GetFullHandle( hwnd ); cwp.lParam = lparam; cwp.wParam = wparam; cwp.message = msg; - cwp.hwnd = hwnd; + cwp.hwnd = params.hwnd; HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, same_thread, (LPARAM)&cwp, unicode ); - /* now call the window procedure */ - if (!WINPROC_call_window( hwnd, msg, wparam, lparam, &result, unicode, mapping )) goto done; + if (thread_info->recursion_count <= MAX_WINPROC_RECURSION) + { + thread_info->recursion_count++; + + /* now call the window procedure */ + User32CallWindowProc( &params, sizeof(params) ); + + thread_info->recursion_count--; + } /* and finally the WH_CALLWNDPROCRET hook */ cwpret.lResult = result; cwpret.lParam = lparam; cwpret.wParam = wparam; cwpret.message = msg; - cwpret.hwnd = hwnd; + cwpret.hwnd = params.hwnd; HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, same_thread, (LPARAM)&cwpret, unicode ); - done: return result; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index bf798457fc6..4e114a31fa7 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -115,9 +115,8 @@ extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UIN extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; -extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, - LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern void winproc_init(void) DECLSPEC_HIDDEN; +extern void get_winproc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; extern ATOM get_class_info( HINSTANCE instance, const WCHAR *name, WNDCLASSEXW *info, UNICODE_STRING *name_str, BOOL ansi ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 46b5fedde3f..c26a765f689 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -36,7 +36,6 @@ WINE_DECLARE_DEBUG_CHANNEL(msg); WINE_DECLARE_DEBUG_CHANNEL(relay); -#define MAX_WINPROC_RECURSION 64 #define WINPROC_PROC16 ((void *)1) /* placeholder for 16-bit window procs */ static inline void *get_buffer( void *static_buffer, size_t size, size_t need ) @@ -795,67 +794,25 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) return TRUE; } -/********************************************************************** - * WINPROC_call_window - * - * Call the window procedure of the specified window. - */ -BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, - LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) +void get_winproc_params( struct win_proc_params *params ) { - struct user_thread_info *thread_info = get_user_thread_info(); - struct win_proc_params params; - WINDOWPROC *proc; - WND *wndPtr; - - USER_CheckNotLock(); - - if (!(wndPtr = WIN_GetPtr( hwnd ))) return FALSE; - if (wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return FALSE; - if (wndPtr->tid != GetCurrentThreadId()) - { - WIN_ReleasePtr( wndPtr ); - return FALSE; - } - params.func = wndPtr->winproc; - proc = handle_to_proc( wndPtr->winproc ); - params.ansi_dst = !(wndPtr->flags & WIN_ISUNICODE); - params.is_dialog = wndPtr->dlgInfo != NULL; - WIN_ReleasePtr( wndPtr ); - - params.hwnd = WIN_GetFullHandle( hwnd ); - params.msg = msg; - params.wparam = wParam; - params.lparam = lParam; - params.result = result; - params.ansi = !unicode; - params.mapping = mapping; - params.dpi_awareness = GetWindowDpiAwarenessContext( params.hwnd ); + WINDOWPROC *proc = handle_to_proc( params->func ); if (!proc) { - params.procW = params.procA = NULL; + params->procW = params->procA = NULL; } else if (proc == WINPROC_PROC16) { - params.procW = params.procA = WINPROC_PROC16; + params->procW = params->procA = WINPROC_PROC16; } else { - params.procA = proc->procA; - params.procW = proc->procW; + params->procA = proc->procA; + params->procW = proc->procW; } - - if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return FALSE; - thread_info->recursion_count++; - - dispatch_win_proc_params( &params ); - - thread_info->recursion_count--; - return TRUE; } - /********************************************************************** * CallWindowProcA (USER32.@) *

1 0

Jacek Caban : user32: Use User32CallWinEventHook in peek_message.
by Alexandre Julliard 23 Mar '22

23 Mar '22

Module: wine Branch: master Commit: 9ced5b0509b829833f818e6c39c3bc8ddde01341 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ced5b0509b829833f818e6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 23 14:01:42 2022 +0100 user32: Use User32CallWinEventHook in peek_message. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/hook.c | 6 +++--- dlls/user32/message.c | 43 ++++++++++++++++--------------------------- dlls/win32u/hook.c | 2 ++ include/ntuser.h | 2 ++ 4 files changed, 23 insertions(+), 30 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 783ded6c12a..6dc8c571c0c 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -451,14 +451,14 @@ BOOL WINAPI User32CallWinEventHook( const struct win_event_hook_params *params, TRACE_(relay)( "\1Call winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", proc, params->handle, params->event, params->hwnd, params->object_id, - params->child_id, GetCurrentThreadId(), GetCurrentTime() ); + params->child_id, params->tid, params->time ); proc( params->handle, params->event, params->hwnd, params->object_id, params->child_id, - GetCurrentThreadId(), GetCurrentTime() ); + params->tid, params->time ); TRACE_(relay)( "\1Ret winevent hook proc %p (hhook=%p,event=%x,hwnd=%p,object_id=%x,child_id=%x,tid=%04x,time=%x)\n", proc, params->handle, params->event, params->hwnd, params->object_id, - params->child_id, GetCurrentThreadId(), GetCurrentTime() ); + params->child_id, params->tid, params->time ); if (free_module) FreeLibrary( free_module ); return TRUE; diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 8100ee63fc3..1e7ec2b0615 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2716,38 +2716,27 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, case MSG_WINEVENT: if (size >= sizeof(msg_data->winevent)) { - WINEVENTPROC hook_proc; - HMODULE free_module = 0; + struct win_event_hook_params params; - hook_proc = wine_server_get_ptr( msg_data->winevent.hook_proc ); + params.proc = wine_server_get_ptr( msg_data->winevent.hook_proc ); size -= sizeof(msg_data->winevent); if (size) { - WCHAR module[MAX_PATH]; - - size = min( size, (MAX_PATH - 1) * sizeof(WCHAR) ); - memcpy( module, &msg_data->winevent + 1, size ); - module[size / sizeof(WCHAR)] = 0; - if (!(hook_proc = get_hook_proc( hook_proc, module, &free_module ))) - { - ERR( "invalid winevent hook module name %s\n", debugstr_w(module) ); - continue; - } + size = min( size, sizeof(params.module) - sizeof(WCHAR) ); + memcpy( params.module, &msg_data->winevent + 1, size ); } - - TRACE_(relay)( "\1Call winevent proc %p (hook=%04x,event=%x,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04x,time=%x)\n", - hook_proc, msg_data->winevent.hook, info.msg.message, info.msg.hwnd, - info.msg.wParam, info.msg.lParam, msg_data->winevent.tid, info.msg.time); - - hook_proc( wine_server_ptr_handle( msg_data->winevent.hook ), info.msg.message, - info.msg.hwnd, info.msg.wParam, info.msg.lParam, - msg_data->winevent.tid, info.msg.time ); - - TRACE_(relay)( "\1Ret winevent proc %p (hook=%04x,event=%x,hwnd=%p,object_id=%lx,child_id=%lx,tid=%04x,time=%x)\n", - hook_proc, msg_data->winevent.hook, info.msg.message, info.msg.hwnd, - info.msg.wParam, info.msg.lParam, msg_data->winevent.tid, info.msg.time); - - if (free_module) FreeLibrary(free_module); + params.module[size / sizeof(WCHAR)] = 0; + size = FIELD_OFFSET( struct win_hook_params, module[size / sizeof(WCHAR) + 1] ); + + params.handle = wine_server_ptr_handle( msg_data->winevent.hook ); + params.event = info.msg.message; + params.hwnd = info.msg.hwnd; + params.object_id = info.msg.wParam; + params.child_id = info.msg.lParam; + params.tid = msg_data->winevent.tid; + params.time = info.msg.time; + + User32CallWinEventHook( &params, size ); } continue; case MSG_HOOK_LL: diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index e1851aa896a..21e00d1ff3c 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -476,6 +476,7 @@ void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG c info.hwnd = hwnd; info.object_id = object_id; info.child_id = child_id; + info.tid = GetCurrentThreadId(); SERVER_START_REQ( start_hook_chain ) { @@ -502,6 +503,7 @@ void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG c TRACE( "calling WH_WINEVENT hook %p event %x hwnd %p %x %x module %s\n", info.proc, event, hwnd, object_id, child_id, debugstr_w(info.module) ); + info.time = NtGetTickCount(); KeUserModeCallback( NtUserCallWinEventHook, &info, FIELD_OFFSET( struct win_hook_params, module[lstrlenW(info.module) + 1] ), &ret_ptr, &ret_len ); diff --git a/include/ntuser.h b/include/ntuser.h index 746549e4b28..5b7cc0be597 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -58,6 +58,8 @@ struct win_event_hook_params LONG object_id; LONG child_id; void *handle; + DWORD tid; + DWORD time; WINEVENTPROC proc; WCHAR module[MAX_PATH]; };

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022