January 2024 - Wine-Commits

Fan Wenjie : wined3d: Compile sm1 bytecode to spirv.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 1474f5cc47d9f056382f04ea5dff3314c6d181b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/1474f5cc47d9f056382f04ea5dff33… Author: Fan Wenjie <fanwj(a)mail.ustc.edu.cn> Date: Wed Nov 2 21:31:06 2022 +0800 wined3d: Compile sm1 bytecode to spirv. --- dlls/wined3d/shader.c | 15 +++++++-------- dlls/wined3d/shader_spirv.c | 33 +++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 428389a7177..1f0fe13402c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2395,7 +2395,6 @@ static void shader_trace(const void *code, size_t size, enum vkd3d_shader_source static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { - enum vkd3d_shader_source_type source_type; HRESULT hr; TRACE("byte_code %p, byte_code_size %#lx.\n", desc->byte_code, (long)desc->byte_code_size); @@ -2424,8 +2423,8 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device const DWORD *ptr; void *fe_data; - source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; - if (!(shader->frontend = shader_select_frontend(source_type))) + shader->source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; + if (!(shader->frontend = shader_select_frontend(shader->source_type))) { FIXME("Unable to find frontend for shader.\n"); hr = WINED3DERR_INVALIDCALL; @@ -2471,10 +2470,10 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device shader->byte_code_size = desc->byte_code_size; max_version = shader_max_version_from_feature_level(device->cs->c.state->feature_level); - if (FAILED(hr = wined3d_shader_extract_from_dxbc(shader, max_version, &source_type))) + if (FAILED(hr = wined3d_shader_extract_from_dxbc(shader, max_version, &shader->source_type))) goto fail; - if (!(shader->frontend = shader_select_frontend(source_type))) + if (!(shader->frontend = shader_select_frontend(shader->source_type))) { FIXME("Unable to find frontend for shader.\n"); hr = WINED3DERR_INVALIDCALL; @@ -2484,10 +2483,10 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device if (TRACE_ON(d3d_shader)) { - if (source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE) - shader_trace(shader->function, shader->functionLength, source_type); + if (shader->source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE) + shader_trace(shader->function, shader->functionLength, shader->source_type); else - shader_trace(shader->byte_code, shader->byte_code_size, source_type); + shader_trace(shader->byte_code, shader->byte_code_size, shader->source_type); } diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index b5b0e1f0462..f2e220beed2 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -228,9 +228,9 @@ static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_sh } static VkShaderModule shader_spirv_compile_shader(struct wined3d_context_vk *context_vk, - const struct wined3d_shader_desc *shader_desc, enum wined3d_shader_type shader_type, - const struct shader_spirv_compile_arguments *args, const struct shader_spirv_resource_bindings *bindings, - const struct wined3d_stream_output_desc *so_desc) + const struct wined3d_shader_desc *shader_desc, enum vkd3d_shader_source_type source_type, + enum wined3d_shader_type shader_type, const struct shader_spirv_compile_arguments *args, + const struct shader_spirv_resource_bindings *bindings, const struct wined3d_stream_output_desc *so_desc) { struct wined3d_shader_spirv_compile_args compile_args; struct wined3d_shader_spirv_shader_interface iface; @@ -252,7 +252,7 @@ static VkShaderModule shader_spirv_compile_shader(struct wined3d_context_vk *con info.next = &compile_args.spirv_target; info.source.code = shader_desc->byte_code; info.source.size = shader_desc->byte_code_size; - info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.source_type = source_type; info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = spirv_compile_options; info.option_count = ARRAY_SIZE(spirv_compile_options); @@ -338,11 +338,19 @@ static struct shader_spirv_graphics_program_variant_vk *shader_spirv_find_graphi variant_vk->compile_args = args; variant_vk->binding_base = binding_base; - shader_desc.byte_code = shader->byte_code; - shader_desc.byte_code_size = shader->byte_code_size; + if (shader->source_type == VKD3D_SHADER_SOURCE_D3D_BYTECODE) + { + shader_desc.byte_code = shader->function; + shader_desc.byte_code_size = shader->functionLength; + } + else + { + shader_desc.byte_code = shader->byte_code; + shader_desc.byte_code_size = shader->byte_code_size; + } - if (!(variant_vk->vk_module = shader_spirv_compile_shader(context_vk, &shader_desc, shader_type, &args, - bindings, so_desc))) + if (!(variant_vk->vk_module = shader_spirv_compile_shader(context_vk, &shader_desc, + shader->source_type, shader_type, &args, bindings, so_desc))) return NULL; ++program_vk->variant_count; @@ -370,8 +378,8 @@ static struct shader_spirv_compute_program_vk *shader_spirv_find_compute_program shader_desc.byte_code = shader->byte_code; shader_desc.byte_code_size = shader->byte_code_size; - if (!(program->vk_module = shader_spirv_compile_shader(context_vk, &shader_desc, WINED3D_SHADER_TYPE_COMPUTE, - NULL, bindings, NULL))) + if (!(program->vk_module = shader_spirv_compile_shader(context_vk, &shader_desc, + shader->source_type, WINED3D_SHADER_TYPE_COMPUTE, NULL, bindings, NULL))) return NULL; if (!(layout = wined3d_context_vk_get_pipeline_layout(context_vk, @@ -692,7 +700,7 @@ static void shader_spirv_scan_shader(struct wined3d_shader *shader, info.next = descriptor_info; info.source.code = shader->byte_code; info.source.size = shader->byte_code_size; - info.source_type = VKD3D_SHADER_SOURCE_DXBC_TPF; + info.source_type = shader->source_type; info.target_type = VKD3D_SHADER_TARGET_SPIRV_BINARY; info.options = spirv_compile_options; info.option_count = ARRAY_SIZE(spirv_compile_options); @@ -1049,7 +1057,8 @@ static uint64_t shader_spirv_compile(struct wined3d_context *context, const stru enum wined3d_shader_type shader_type) { struct shader_spirv_resource_bindings bindings = {0}; - return (uint64_t)shader_spirv_compile_shader(wined3d_context_vk(context), shader_desc, shader_type, NULL, &bindings, NULL); + return (uint64_t)shader_spirv_compile_shader(wined3d_context_vk(context), shader_desc, + VKD3D_SHADER_SOURCE_DXBC_TPF, shader_type, NULL, &bindings, NULL); } static const struct wined3d_shader_backend_ops spirv_shader_backend_vk = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5a35ca88a7b..ff08a7f837f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4251,6 +4251,7 @@ struct wined3d_shader void *byte_code; unsigned int byte_code_size; BOOL load_local_constsF; + enum vkd3d_shader_source_type source_type; const struct wined3d_shader_frontend *frontend; void *frontend_data; void *backend_data;

1 0

Brendan Shanks : wined3d: Update reported AMD driver version.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: f201a609a09949e737836c677f99fce58a2cc74e URL: https://gitlab.winehq.org/wine/wine/-/commit/f201a609a09949e737836c677f99fc… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 9 11:09:13 2024 -0800 wined3d: Update reported AMD driver version. Satisfies driver version check in Counter Strike 2. --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ab4fa04b3cf..11d829c2756 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -289,7 +289,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_AMD_R600, DRIVER_MODEL_NT5X, "ati2dvag.dll", 10, 1280}, {DRIVER_AMD_R300, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 741 }, {DRIVER_AMD_R600, DRIVER_MODEL_NT6X, "atiumdag.dll", 10, 1280}, - {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 21023, 2010}, /* Adrenalin 23.7.2 */ + {DRIVER_AMD_RX, DRIVER_MODEL_NT6X, "aticfx32.dll", 23013, 1023}, /* Adrenalin 23.12.1 */ /* Intel * The drivers are unified but not all versions support all GPUs. At some point the 2k/xp

1 0

Alexandre Julliard : ntdll: Add NtCompareTokens syscall for ARM64EC.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 7aa982f88b22af06691053beb7c083d34d881d09 URL: https://gitlab.winehq.org/wine/wine/-/commit/7aa982f88b22af06691053beb7c083… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 16:22:59 2024 +0100 ntdll: Add NtCompareTokens syscall for ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 3d6bc39468d..1bfd5716d07 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -376,6 +376,11 @@ NTSTATUS SYSCALL_API NtCompareObjects( HANDLE first, HANDLE second ) __ASM_SYSCALL_FUNC( __id_NtCompareObjects ); } +NTSTATUS SYSCALL_API NtCompareTokens( HANDLE first, HANDLE second, BOOLEAN *equal ) +{ + __ASM_SYSCALL_FUNC( __id_NtCompareTokens ); +} + NTSTATUS SYSCALL_API NtCompleteConnectPort( HANDLE handle ) { __ASM_SYSCALL_FUNC( __id_NtCompleteConnectPort );

1 0

Zebediah Figura : wined3d: Hook up push constants for Vulkan.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 9e094def75c435065919b5e13484e136ca1784ad URL: https://gitlab.winehq.org/wine/wine/-/commit/9e094def75c435065919b5e13484e1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 2 13:28:29 2023 -0500 wined3d: Hook up push constants for Vulkan. --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/cs.c | 35 ++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3e6604c035e..0e6a7babfb1 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2322,6 +2322,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->subpixel_viewport = true; d3d_info->fences = true; d3d_info->persistent_map = true; + d3d_info->gpu_push_constants = true; /* Like GL, Vulkan doesn't explicitly specify a filling convention and only mandates that a * shared edge of two adjacent triangles generate a fragment for exactly one of the triangles. diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 37d160d8f25..fb114fb0b78 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2144,29 +2144,39 @@ static const struct push_constant_info size_t size; unsigned int max_count; DWORD mask; + enum wined3d_shader_type shader_type; + enum vkd3d_shader_d3dbc_constant_register shader_binding; } wined3d_cs_push_constant_info[] = { - [WINED3D_PUSH_CONSTANTS_VS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_VS_CONSTS_F, WINED3D_SHADER_CONST_VS_F}, - [WINED3D_PUSH_CONSTANTS_PS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_PS_CONSTS_F, WINED3D_SHADER_CONST_PS_F}, - [WINED3D_PUSH_CONSTANTS_VS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_CONST_VS_I}, - [WINED3D_PUSH_CONSTANTS_PS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_CONST_PS_I}, - [WINED3D_PUSH_CONSTANTS_VS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_CONST_VS_B}, - [WINED3D_PUSH_CONSTANTS_PS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_CONST_PS_B}, + [WINED3D_PUSH_CONSTANTS_VS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_VS_CONSTS_F, WINED3D_SHADER_CONST_VS_F, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_PS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_PS_CONSTS_F, WINED3D_SHADER_CONST_PS_F, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_VS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_CONST_VS_I, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_INT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_PS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_CONST_PS_I, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_INT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_VS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_CONST_VS_B, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_BOOL_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_PS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_CONST_PS_B, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_BOOL_CONSTANT_REGISTER}, }; -static bool prepare_push_constant_buffer(struct wined3d_device *device, enum wined3d_push_constants type) +static bool prepare_push_constant_buffer(struct wined3d_device_context *context, enum wined3d_push_constants type) { const struct push_constant_info *info = &wined3d_cs_push_constant_info[type]; + struct wined3d_device *device = context->device; + bool gpu = device->adapter->d3d_info.gpu_push_constants; HRESULT hr; - const struct wined3d_buffer_desc desc = + struct wined3d_buffer_desc desc = { .byte_width = info->max_count * info->size, .bind_flags = 0, .access = WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W, }; + if (gpu) + { + desc.bind_flags = WINED3D_BIND_CONSTANT_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + } + if (!device->push_constants[type] && FAILED(hr = wined3d_buffer_create(device, &desc, NULL, NULL, &wined3d_null_parent_ops, &device->push_constants[type]))) { @@ -2174,6 +2184,13 @@ static bool prepare_push_constant_buffer(struct wined3d_device *device, enum win return false; } + if (gpu) + { + struct wined3d_constant_buffer_state state = {.buffer = device->push_constants[type], .size = desc.byte_width}; + + wined3d_device_context_emit_set_constant_buffers(context, info->shader_type, info->shader_binding, 1, &state); + } + return true; } @@ -2219,7 +2236,7 @@ void wined3d_device_context_push_constants(struct wined3d_device_context *contex unsigned int byte_size = count * info->size; struct wined3d_box box; - if (!prepare_push_constant_buffer(context->device, type)) + if (!prepare_push_constant_buffer(context, type)) return; wined3d_box_set(&box, byte_offset, 0, byte_offset + byte_size, 1, 0, 1); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 238456e78d8..5a35ca88a7b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -236,6 +236,7 @@ struct wined3d_d3d_info uint32_t subpixel_viewport : 1; uint32_t fences : 1; uint32_t persistent_map : 1; + uint32_t gpu_push_constants : 1; enum wined3d_feature_level feature_level; DWORD multisample_draw_location;

1 0

Nikolay Sivov : mf/tests: Fully cleanup when skipping tests.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 21bbd34d35034eb1c0291445cb754e491702c84e URL: https://gitlab.winehq.org/wine/wine/-/commit/21bbd34d35034eb1c0291445cb754e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 18 23:44:45 2024 +0100 mf/tests: Fully cleanup when skipping tests. --- dlls/mf/tests/mf.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 13b55b1f836..1fa832e11fa 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3733,6 +3733,23 @@ static void test_topology_loader_evr(void) hr = CoInitialize(NULL); ok(hr == S_OK, "Failed to initialize, hr %#lx.\n", hr); + /* EVR sink node. */ + window = create_window(); + + hr = MFCreateVideoRendererActivate(window, &activate); + ok(hr == S_OK, "Failed to create activate object, hr %#lx.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + if (FAILED(hr)) + { + skip("Failed to create an EVR sink, skipping tests.\n"); + DestroyWindow(window); + IMFActivate_Release(activate); + CoUninitialize(); + return; + } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = MFCreateTopoLoader(&loader); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -3749,21 +3766,6 @@ static void test_topology_loader_evr(void) IMFPresentationDescriptor_Release(pd); IMFStreamDescriptor_Release(sd); - /* EVR sink node. */ - window = create_window(); - - hr = MFCreateVideoRendererActivate(window, &activate); - ok(hr == S_OK, "Failed to create activate object, hr %#lx.\n", hr); - - hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); - if (FAILED(hr)) - { - skip("Failed to create an EVR sink, skipping tests.\n"); - DestroyWindow(window); - IMFActivate_Release(activate); - return; - } - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaSink_GetStreamSinkById(sink, 0, &stream_sink); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr);

1 0

Zhiyi Zhang : include: Add some ncrypt definitions.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 2021959538e9d2eef0eae7f14052c6ba41c8154d URL: https://gitlab.winehq.org/wine/wine/-/commit/2021959538e9d2eef0eae7f14052c6… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Dec 21 18:11:35 2023 +0800 include: Add some ncrypt definitions. --- include/ncrypt.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/ncrypt.h b/include/ncrypt.h index 9fc2cb5b171..7a1769c8bd9 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -58,6 +58,21 @@ typedef struct NCryptKeyName { DWORD dwFlags; } NCryptKeyName; +typedef struct __NCRYPT_SUPPORTED_LENGTHS { + DWORD dwMinLength; + DWORD dwMaxLength; + DWORD dwIncrement; + DWORD dwDefaultLength; +} NCRYPT_SUPPORTED_LENGTHS; + +typedef struct __NCRYPT_UI_POLICY { + DWORD dwVersion; + DWORD dwFlags; + LPCWSTR pszCreationTitle; + LPCWSTR pszFriendlyName; + LPCWSTR pszDescription; +} NCRYPT_UI_POLICY; + typedef ULONG_PTR NCRYPT_HANDLE; typedef ULONG_PTR NCRYPT_PROV_HANDLE; typedef ULONG_PTR NCRYPT_KEY_HANDLE; @@ -76,6 +91,17 @@ typedef ULONG_PTR NCRYPT_SECRET_HANDLE; #define NCRYPT_PAD_OAEP_FLAG 0x00000004 #define NCRYPT_PAD_PSS_FLAG 0x00000008 +#define NCRYPT_ALLOW_DECRYPT_FLAG 0x00000001 +#define NCRYPT_ALLOW_SIGNING_FLAG 0x00000002 +#define NCRYPT_ALLOW_KEY_AGREEMENT_FLAG 0x00000004 +#define NCRYPT_ALLOW_KEY_IMPORT_FLAG 0x00000008 +#define NCRYPT_ALLOW_ALL_USAGES 0x00ffffff + +#define NCRYPT_ALLOW_EXPORT_FLAG 0x00000001 +#define NCRYPT_ALLOW_PLAINTEXT_EXPORT_FLAG 0x00000002 +#define NCRYPT_ALLOW_ARCHIVING_FLAG 0x00000004 +#define NCRYPT_ALLOW_PLAINTEXT_ARCHIVING_FLAG 0x00000008 + #define NCRYPT_NAME_PROPERTY L"Name" #define NCRYPT_UNIQUE_NAME_PROPERTY L"Unique Name" #define NCRYPT_ALGORITHM_PROPERTY L"Algorithm Name"

1 0

Alexandre Julliard : opengl32: Return a proper NTSTATUS in the debug callback.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 4b5b478de9890c5b840918f3730f37fd3f02121a URL: https://gitlab.winehq.org/wine/wine/-/commit/4b5b478de9890c5b840918f3730f37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 14:36:56 2024 +0100 opengl32: Return a proper NTSTATUS in the debug callback. --- dlls/opengl32/wgl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 40602d7d22d..a1c29a84fae 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1285,11 +1285,12 @@ GLboolean WINAPI glUnmapNamedBufferEXT( GLuint buffer ) return gl_unmap_named_buffer( unix_glUnmapNamedBufferEXT, buffer ); } -static BOOL WINAPI call_opengl_debug_message_callback( struct wine_gl_debug_message_params *params, ULONG size ) +static NTSTATUS WINAPI call_opengl_debug_message_callback( void *args, ULONG size ) { + struct wine_gl_debug_message_params *params = args; params->user_callback( params->source, params->type, params->id, params->severity, params->length, params->message, params->user_data ); - return TRUE; + return STATUS_SUCCESS; } /***********************************************************************

1 0

Alexandre Julliard : user32: Return a proper NTSTATUS in all user callbacks.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: b26d1278971ca13a0078104570bec3661e2cda01 URL: https://gitlab.winehq.org/wine/wine/-/commit/b26d1278971ca13a0078104570bec3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 14:30:48 2024 +0100 user32: Return a proper NTSTATUS in all user callbacks. --- dlls/user.exe16/message.c | 4 +++- dlls/user32/class.c | 6 ++++-- dlls/user32/hook.c | 8 +++++--- dlls/user32/user_main.c | 23 ++++++++++++++--------- dlls/user32/user_private.h | 8 ++++---- dlls/user32/winproc.c | 14 +++++++++----- dlls/win32u/defwnd.c | 5 ++--- dlls/win32u/imm.c | 5 ++--- dlls/win32u/win32u_private.h | 2 +- 9 files changed, 44 insertions(+), 31 deletions(-)

1 0

Alexandre Julliard : winex11.drv: Return result through NtCallbackReturn for the drag and drop callbacks.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 5cd386143864431611560247aa691592518b5bed URL: https://gitlab.winehq.org/wine/wine/-/commit/5cd386143864431611560247aa6915… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 13:46:34 2024 +0100 winex11.drv: Return result through NtCallbackReturn for the drag and drop callbacks. --- dlls/winex11.drv/dllmain.c | 18 ++---------------- dlls/winex11.drv/event.c | 19 +++++++++++++++---- dlls/winex11.drv/unixlib.h | 20 +++----------------- dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_dll.h | 5 ++--- dlls/winex11.drv/x11drv_main.c | 7 ------- dlls/winex11.drv/xdnd.c | 21 +++++++++++++-------- 7 files changed, 35 insertions(+), 56 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index b0a579e4ee2..dbda015fd50 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -25,28 +25,14 @@ HMODULE x11drv_module = 0; -typedef NTSTATUS (*callback_func)( UINT arg ); -static const callback_func callback_funcs[] = -{ - x11drv_dnd_drop_event, - x11drv_dnd_leave_event, -}; - -C_ASSERT( ARRAYSIZE(callback_funcs) == client_funcs_count ); - -static NTSTATUS WINAPI x11drv_callback( void *arg, ULONG size ) -{ - struct client_callback_params *params = arg; - return callback_funcs[params->id]( params->arg ); -} - typedef NTSTATUS (WINAPI *kernel_callback)( void *params, ULONG size ); static const kernel_callback kernel_callbacks[] = { - x11drv_callback, x11drv_dnd_enter_event, x11drv_dnd_position_event, x11drv_dnd_post_drop, + x11drv_dnd_drop_event, + x11drv_dnd_leave_event, }; C_ASSERT( NtUserDriverCallbackFirst + ARRAYSIZE(kernel_callbacks) == client_func_last ); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 97ebf4ae0d6..aafb89a4fed 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1754,13 +1754,18 @@ static void handle_xdnd_position_event( HWND hwnd, XClientMessageEvent *event ) { struct dnd_position_event_params params; XClientMessageEvent e; + void *ret_ptr; + ULONG ret_len; UINT effect; params.hwnd = HandleToUlong( hwnd ); params.point = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); params.effect = effect = xdnd_action_to_drop_effect( event->data.l[4] ); - effect = x11drv_client_func( client_func_dnd_position_event, &params, sizeof(params) ); + if (KeUserModeCallback( client_func_dnd_position_event, &params, sizeof(params), + &ret_ptr, &ret_len ) || ret_len != sizeof(effect)) + return; + effect = *(UINT *)ret_ptr; TRACE( "actionRequested(%ld) chosen(0x%x) at x(%d),y(%d)\n", event->data.l[4], effect, (int)params.point.x, (int)params.point.y ); @@ -1786,9 +1791,15 @@ static void handle_xdnd_position_event( HWND hwnd, XClientMessageEvent *event ) static void handle_xdnd_drop_event( HWND hwnd, XClientMessageEvent *event ) { XClientMessageEvent e; - DWORD effect; + void *ret_ptr; + ULONG ret_len; + ULONG arg = HandleToUlong( hwnd ); + UINT effect; - effect = x11drv_client_call( client_dnd_drop_event, HandleToUlong( hwnd )); + if (KeUserModeCallback( client_func_dnd_drop_event, &arg, sizeof(arg), + &ret_ptr, &ret_len ) || ret_len != sizeof(effect)) + return; + effect = *(UINT *)ret_ptr; /* Tell the target we are finished. */ memset( &e, 0, sizeof(e) ); @@ -1806,7 +1817,7 @@ static void handle_xdnd_drop_event( HWND hwnd, XClientMessageEvent *event ) static void handle_xdnd_leave_event( HWND hwnd, XClientMessageEvent *event ) { - x11drv_client_call( client_dnd_leave_event, 0 ); + x11drv_client_func( client_func_dnd_leave_event, NULL, 0 ); } diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 9f3f7ec2926..0be0d5dae86 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -55,30 +55,16 @@ struct xim_preedit_state_params /* driver client callbacks exposed with KernelCallbackTable interface */ enum x11drv_client_funcs { - client_func_callback = NtUserDriverCallbackFirst, - client_func_dnd_enter_event, + client_func_dnd_enter_event = NtUserDriverCallbackFirst, client_func_dnd_position_event, client_func_dnd_post_drop, + client_func_dnd_drop_event, + client_func_dnd_leave_event, client_func_last }; C_ASSERT( client_func_last <= NtUserDriverCallbackLast + 1 ); -/* simplified interface for client callbacks requiring only a single UINT parameter */ -enum client_callback -{ - client_dnd_drop_event, - client_dnd_leave_event, - client_funcs_count -}; - -/* x11drv_callback params */ -struct client_callback_params -{ - UINT id; - UINT arg; -}; - /* x11drv_dnd_enter_event and x11drv_dnd_post_drop params */ struct format_entry { diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6bd671db3ff..d5edb9ba377 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -844,7 +844,6 @@ extern NTSTATUS x11drv_tablet_info( void *arg ); extern NTSTATUS x11drv_client_func( enum x11drv_client_funcs func, const void *params, ULONG size ); -extern NTSTATUS x11drv_client_call( enum client_callback func, UINT arg ); /* GDI helpers */ diff --git a/dlls/winex11.drv/x11drv_dll.h b/dlls/winex11.drv/x11drv_dll.h index 89b8d50057e..bc68c3996c3 100644 --- a/dlls/winex11.drv/x11drv_dll.h +++ b/dlls/winex11.drv/x11drv_dll.h @@ -30,9 +30,8 @@ extern NTSTATUS WINAPI x11drv_dnd_enter_event( void *params, ULONG size ); extern NTSTATUS WINAPI x11drv_dnd_position_event( void *params, ULONG size ); extern NTSTATUS WINAPI x11drv_dnd_post_drop( void *data, ULONG size ); - -extern NTSTATUS x11drv_dnd_drop_event( UINT arg ); -extern NTSTATUS x11drv_dnd_leave_event( UINT arg ); +extern NTSTATUS WINAPI x11drv_dnd_drop_event( void *params, ULONG size ); +extern NTSTATUS WINAPI x11drv_dnd_leave_event( void *params, ULONG size ); extern LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index d1f31081b09..1b9555bcfbf 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -1305,13 +1305,6 @@ NTSTATUS x11drv_client_func( enum x11drv_client_funcs id, const void *params, UL } -NTSTATUS x11drv_client_call( enum client_callback func, UINT arg ) -{ - struct client_callback_params params = { .id = func, .arg = arg }; - return x11drv_client_func( client_func_callback, &params, sizeof(params) ); -} - - const unixlib_entry_t __wine_unix_call_funcs[] = { x11drv_init, diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 0e1a747b604..1d3171538cb 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -20,6 +20,8 @@ */ #define COBJMACROS +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "x11drv_dll.h" #include "shellapi.h" #include "shlobj.h" @@ -246,11 +248,13 @@ NTSTATUS WINAPI x11drv_dnd_position_event( void *arg, ULONG size ) } } - return accept ? effect : DROPEFFECT_NONE; + if (!accept) effect = DROPEFFECT_NONE; + return NtCallbackReturn( &effect, sizeof(effect), STATUS_SUCCESS ); } -NTSTATUS x11drv_dnd_drop_event( UINT arg ) +NTSTATUS WINAPI x11drv_dnd_drop_event( void *args, ULONG size ) { + HWND hwnd = UlongToHandle( *(ULONG *)args ); IDropTarget *dropTarget; DWORD effect = XDNDDropEffect; int accept = 0; /* Assume we're not accepting */ @@ -303,7 +307,7 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg ) /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ - HWND hwnd_drop = window_accepting_files(window_from_point_dnd( UlongToHandle(arg), XDNDxy )); + HWND hwnd_drop = window_accepting_files(window_from_point_dnd( hwnd, XDNDxy )); if (hwnd_drop && X11DRV_XDND_HasHDROP()) { @@ -319,7 +323,8 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg ) TRACE("effectRequested(0x%lx) accept(%d) performed(0x%lx) at x(%ld),y(%ld)\n", XDNDDropEffect, accept, effect, XDNDxy.x, XDNDxy.y); - return accept ? effect : DROPEFFECT_NONE; + if (!accept) effect = DROPEFFECT_NONE; + return NtCallbackReturn( &effect, sizeof(effect), STATUS_SUCCESS ); } /************************************************************************** @@ -327,7 +332,7 @@ NTSTATUS x11drv_dnd_drop_event( UINT arg ) * * Handle an XdndLeave event. */ -NTSTATUS x11drv_dnd_leave_event( UINT arg ) +NTSTATUS WINAPI x11drv_dnd_leave_event( void *params, ULONG size ) { IDropTarget *dropTarget; @@ -347,7 +352,7 @@ NTSTATUS x11drv_dnd_leave_event( UINT arg ) } X11DRV_XDND_FreeDragDropOp(); - return 0; + return STATUS_SUCCESS; } @@ -365,7 +370,7 @@ NTSTATUS WINAPI x11drv_dnd_enter_event( void *params, ULONG size ) memcpy( xdnd_formats, formats, size ); xdnd_formats_end = (struct format_entry *)((char *)xdnd_formats + size); } - return 0; + return STATUS_SUCCESS; } @@ -731,5 +736,5 @@ NTSTATUS WINAPI x11drv_dnd_post_drop( void *data, ULONG size ) PostMessageW( hwnd, WM_DROPFILES, (WPARAM)handle, 0 ); } - return 0; + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : winevulkan: Return result through NtCallbackReturn for the debug callbacks.
by Alexandre Julliard Jan. 19, 2024

Jan. 19, 2024

Module: wine Branch: master Commit: 643538a836f33b4996730cf05dc2af77667d6150 URL: https://gitlab.winehq.org/wine/wine/-/commit/643538a836f33b4996730cf05dc2af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 19 13:42:14 2024 +0100 winevulkan: Return result through NtCallbackReturn for the debug callbacks. --- dlls/winevulkan/loader.c | 14 +++++++++----- dlls/winevulkan/vulkan.c | 13 ++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/winevulkan/loader.c b/dlls/winevulkan/loader.c index 19fd240f0cb..8ef256f61f0 100644 --- a/dlls/winevulkan/loader.c +++ b/dlls/winevulkan/loader.c @@ -602,15 +602,19 @@ void WINAPI vkFreeCommandBuffers(VkDevice device, VkCommandPool cmd_pool, uint32 } } -static BOOL WINAPI call_vulkan_debug_report_callback( struct wine_vk_debug_report_params *params, ULONG size ) +static NTSTATUS WINAPI call_vulkan_debug_report_callback( void *args, ULONG size ) { - return params->user_callback(params->flags, params->object_type, params->object_handle, params->location, - params->code, params->layer_prefix, params->message, params->user_data); + struct wine_vk_debug_report_params *params = args; + VkBool32 ret = params->user_callback(params->flags, params->object_type, params->object_handle, params->location, + params->code, params->layer_prefix, params->message, params->user_data); + return NtCallbackReturn( &ret, sizeof(ret), STATUS_SUCCESS ); } -static BOOL WINAPI call_vulkan_debug_utils_callback( struct wine_vk_debug_utils_params *params, ULONG size ) +static NTSTATUS WINAPI call_vulkan_debug_utils_callback( void *args, ULONG size ) { - return params->user_callback(params->severity, params->message_types, &params->data, params->user_data); + struct wine_vk_debug_utils_params *params = args; + VkBool32 ret = params->user_callback(params->severity, params->message_types, &params->data, params->user_data); + return NtCallbackReturn( &ret, sizeof(ret), STATUS_SUCCESS ); } BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 2691624db66..c999363e268 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -118,7 +118,6 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB struct wine_debug_utils_messenger *object; void *ret_ptr; ULONG ret_len; - VkBool32 result; unsigned int i; TRACE("%i, %u, %p, %p\n", severity, message_types, callback_data, user_data); @@ -166,12 +165,11 @@ static VkBool32 debug_utils_callback_conversion(VkDebugUtilsMessageSeverityFlagB params.data.pObjects = object_name_infos; /* applications should always return VK_FALSE */ - result = KeUserModeCallback( NtUserCallVulkanDebugUtilsCallback, &params, sizeof(params), - &ret_ptr, &ret_len ); + KeUserModeCallback( NtUserCallVulkanDebugUtilsCallback, &params, sizeof(params), &ret_ptr, &ret_len ); free(object_name_infos); - - return result; + if (ret_len == sizeof(VkBool32)) return *(VkBool32 *)ret_ptr; + return VK_FALSE; } static VkBool32 debug_report_callback_conversion(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT object_type, @@ -207,8 +205,9 @@ static VkBool32 debug_report_callback_conversion(VkDebugReportFlagsEXT flags, Vk if (!params.object_handle) params.object_type = VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT; - return KeUserModeCallback( NtUserCallVulkanDebugReportCallback, &params, sizeof(params), - &ret_ptr, &ret_len ); + KeUserModeCallback( NtUserCallVulkanDebugReportCallback, &params, sizeof(params), &ret_ptr, &ret_len ); + if (ret_len == sizeof(VkBool32)) return *(VkBool32 *)ret_ptr; + return VK_FALSE; } static void wine_vk_physical_device_free(struct wine_phys_dev *phys_dev)

1 0