- Wine-Devel - list.winehq.org

[PATCH 5/9] win32u: Move NtUserVkKeyScanEx implementation from user32.
by Jacek Caban Nov. 16, 2021

Nov. 16, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/driver.c | 7 +--- dlls/user32/input.c | 69 ++---------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/driver.c | 6 ++++ dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 66 ++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 5 +++ 9 files changed, 84 insertions(+), 75 deletions(-)

3 2

[PATCH 4/9] win32u: Move NtUserSetKeyboardState implementation from user32.
by Jacek Caban Nov. 16, 2021

Nov. 16, 2021

2 1

[PATCH 3/9] win32u: Move NtUserGetKeyboardState implementation from user32.
by Jacek Caban Nov. 16, 2021

Nov. 16, 2021

2 1

[PATCH 2/9] win32u: Move NtUserGetKeyState implementation from user32.
by Jacek Caban Nov. 16, 2021

Nov. 16, 2021

3 2

[PATCH 1/9] win32u: Move NtUserAttachThreadInput implementation from user32.
by Jacek Caban Nov. 16, 2021

Nov. 16, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/input.c | 22 ------------------ dlls/user32/user32.spec | 2 +- dlls/win32u/Makefile.in | 1 + dlls/win32u/input.c | 49 +++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 ++++++++ include/ntuser.h | 8 +++++++ 9 files changed, 71 insertions(+), 24 deletions(-) create mode 100644 dlls/win32u/input.c

2 1

[PATCH vkd3d 1/4] vkd3d-shader/spirv: Use runtime descriptor arrays.
by Conor McCarthy Nov. 16, 2021

Nov. 16, 2021

Runtime descriptor arrays should be used for descriptor bindings with a variable count. Support for SpvCapabilityRuntimeDescriptorArrayEXT is required by the Vulkan spec as part of descriptor indexing support. The current implementation depends on a separate array declaration for each range because binding_base_idx is stored in the array data. This occurs in practice because binding.count is always different. Use of runtime arrays eliminates the count from the key, so binding_base_idx must be separated from the array data. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 70 ++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 698c3054..dbe741ab 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1972,6 +1972,14 @@ struct vkd3d_symbol_register_data bool is_dynamically_indexed; /* If member_idx is a variable ID instead of a constant. */ }; +struct vkd3d_symbol; + +struct vkd3d_descriptor_array_symbol +{ + const struct vkd3d_symbol *symbol; + unsigned int binding_base_idx; +}; + struct vkd3d_symbol_resource_data { struct vkd3d_shader_register_range range; @@ -1992,7 +2000,6 @@ struct vkd3d_symbol_descriptor_array_data { SpvStorageClass storage_class; uint32_t contained_type_id; - unsigned int binding_base_idx; }; struct vkd3d_symbol @@ -2018,8 +2025,8 @@ struct vkd3d_symbol } key; uint32_t id; - /* The array declaration which this symbol maps to, or NULL. */ - const struct vkd3d_symbol *descriptor_array; + /* descriptor_array.symbol is the array declaration which this symbol maps to, or NULL. */ + struct vkd3d_descriptor_array_symbol descriptor_array; union { @@ -2064,7 +2071,8 @@ static void vkd3d_symbol_set_register_info(struct vkd3d_symbol *symbol, enum vkd3d_shader_component_type component_type, DWORD write_mask) { symbol->id = val_id; - symbol->descriptor_array = NULL; + symbol->descriptor_array.symbol = NULL; + symbol->descriptor_array.binding_base_idx = 0; symbol->info.reg.storage_class = storage_class; symbol->info.reg.member_idx = 0; symbol->info.reg.component_type = component_type; @@ -3135,7 +3143,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_register_addressing(struct vkd3d_dxbc_c struct vkd3d_shader_register_info { uint32_t id; - const struct vkd3d_symbol *descriptor_array; + struct vkd3d_descriptor_array_symbol descriptor_array; SpvStorageClass storage_class; enum vkd3d_shader_component_type component_type; unsigned int write_mask; @@ -3158,7 +3166,8 @@ static bool vkd3d_dxbc_compiler_get_register_info(const struct vkd3d_dxbc_compil assert(reg->idx[0].offset < compiler->temp_count); register_info->id = compiler->temp_id + reg->idx[0].offset; register_info->storage_class = SpvStorageClassFunction; - register_info->descriptor_array = NULL; + register_info->descriptor_array.symbol = NULL; + register_info->descriptor_array.binding_base_idx = 0; register_info->member_idx = 0; register_info->component_type = VKD3D_SHADER_COMPONENT_FLOAT; register_info->write_mask = VKD3DSP_WRITEMASK_ALL; @@ -3243,7 +3252,7 @@ static bool vkd3d_dxbc_compiler_enable_descriptor_indexing(struct vkd3d_dxbc_com } static uint32_t vkd3d_dxbc_compiler_get_descriptor_index(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_register *reg, unsigned int binding_base_idx, + const struct vkd3d_shader_register *reg, const struct vkd3d_descriptor_array_symbol *array_symbol, enum vkd3d_shader_resource_type resource_type) { struct vkd3d_shader_register_index index = reg->idx[1]; @@ -3260,7 +3269,7 @@ static uint32_t vkd3d_dxbc_compiler_get_descriptor_index(struct vkd3d_dxbc_compi } } - index.offset -= binding_base_idx; + index.offset -= array_symbol->binding_base_idx; index_id = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &index); return index_id; @@ -3277,10 +3286,9 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp if (reg->type == VKD3DSPR_CONSTBUFFER) { assert(!reg->idx[0].rel_addr); - if (register_info->descriptor_array) + if (register_info->descriptor_array.symbol) indexes[index_count++] = vkd3d_dxbc_compiler_get_descriptor_index(compiler, reg, - register_info->descriptor_array->info.descriptor_array.binding_base_idx, - VKD3D_SHADER_RESOURCE_BUFFER); + &register_info->descriptor_array, VKD3D_SHADER_RESOURCE_BUFFER); indexes[index_count++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_info->member_idx); indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[2]); } @@ -5543,17 +5551,16 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com static uint32_t vkd3d_dxbc_compiler_build_descriptor_variable(struct vkd3d_dxbc_compiler *compiler, SpvStorageClass storage_class, uint32_t type_id, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, - const struct vkd3d_symbol **array_symbol) + struct vkd3d_descriptor_array_symbol *array_symbol) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_descriptor_binding binding; uint32_t array_type_id, ptr_type_id, var_id; - unsigned int binding_base_idx; struct vkd3d_symbol symbol; struct rb_entry *entry; binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, range, - resource_type, false, &binding_base_idx); + resource_type, false, &array_symbol->binding_base_idx); if (binding.count == 1 && range->last != ~0u) { @@ -5564,12 +5571,12 @@ static uint32_t vkd3d_dxbc_compiler_build_descriptor_variable(struct vkd3d_dxbc_ vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, var_id, &binding); vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); - *array_symbol = NULL; + array_symbol->symbol = NULL; return var_id; } - array_type_id = vkd3d_spirv_get_op_type_array(builder, type_id, - vkd3d_dxbc_compiler_get_constant_uint(compiler, binding.count)); + array_type_id = vkd3d_spirv_get_op_type_runtime_array(builder, type_id); + vkd3d_spirv_enable_capability(builder, SpvCapabilityRuntimeDescriptorArrayEXT); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, array_type_id); /* Declare one array variable per Vulkan binding, and use it for @@ -5581,8 +5588,8 @@ static uint32_t vkd3d_dxbc_compiler_build_descriptor_variable(struct vkd3d_dxbc_ symbol.key.descriptor_array.binding = binding.binding; if ((entry = rb_get(&compiler->symbol_table, &symbol))) { - *array_symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); - return (*array_symbol)->id; + array_symbol->symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + return array_symbol->symbol->id; } var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, @@ -5591,11 +5598,11 @@ static uint32_t vkd3d_dxbc_compiler_build_descriptor_variable(struct vkd3d_dxbc_ vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); symbol.id = var_id; - symbol.descriptor_array = NULL; + symbol.descriptor_array.symbol = NULL; + symbol.descriptor_array.binding_base_idx = 0; symbol.info.descriptor_array.storage_class = storage_class; symbol.info.descriptor_array.contained_type_id = type_id; - symbol.info.descriptor_array.binding_base_idx = binding_base_idx; - *array_symbol = vkd3d_dxbc_compiler_put_symbol(compiler, &symbol); + array_symbol->symbol = vkd3d_dxbc_compiler_put_symbol(compiler, &symbol); return var_id; } @@ -5609,7 +5616,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi const SpvStorageClass storage_class = SpvStorageClassUniform; const struct vkd3d_shader_register *reg = &cb->src.reg; struct vkd3d_push_constant_buffer_binding *push_cb; - const struct vkd3d_symbol *array_symbol; + struct vkd3d_descriptor_array_symbol array_symbol; struct vkd3d_symbol reg_symbol; assert(!(instruction->flags & ~VKD3DSI_INDEXED_DYNAMIC)); @@ -5690,7 +5697,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_register *reg = &sampler->src.reg; - const struct vkd3d_symbol *array_symbol; + struct vkd3d_descriptor_array_symbol array_symbol; struct vkd3d_symbol reg_symbol; uint32_t type_id, var_id; @@ -5887,8 +5894,8 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp SpvStorageClass storage_class = SpvStorageClassUniformConstant; const struct vkd3d_shader_register *reg = &resource->reg.reg; const struct vkd3d_spirv_resource_type *resource_type_info; + struct vkd3d_descriptor_array_symbol array_symbol; enum vkd3d_shader_component_type sampled_type; - const struct vkd3d_symbol *array_symbol; struct vkd3d_symbol resource_symbol; bool is_uav; @@ -8022,13 +8029,14 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil if (!symbol) symbol = vkd3d_dxbc_compiler_find_resource(compiler, resource_reg); - if (symbol->descriptor_array) + if (symbol->descriptor_array.symbol) { - const struct vkd3d_symbol_descriptor_array_data *array_data = &symbol->descriptor_array->info.descriptor_array; + const struct vkd3d_symbol_descriptor_array_data *array_data + = &symbol->descriptor_array.symbol->info.descriptor_array; uint32_t ptr_type_id, index_id; index_id = vkd3d_dxbc_compiler_get_descriptor_index(compiler, resource_reg, - array_data->binding_base_idx, symbol->info.resource.resource_type_info->resource_type); + &symbol->descriptor_array, symbol->info.resource.resource_type_info->resource_type); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, array_data->storage_class, array_data->contained_type_id); @@ -8081,14 +8089,14 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil if (!vkd3d_dxbc_compiler_get_register_info(compiler, sampler_reg, &register_info)) ERR("Failed to get sampler register info.\n"); sampler_var_id = register_info.id; - if (register_info.descriptor_array) + if (register_info.descriptor_array.symbol) { const struct vkd3d_symbol_descriptor_array_data *array_data - = &register_info.descriptor_array->info.descriptor_array; + = &register_info.descriptor_array.symbol->info.descriptor_array; uint32_t ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, register_info.storage_class, array_data->contained_type_id); uint32_t array_idx = vkd3d_dxbc_compiler_get_descriptor_index(compiler, - sampler_reg, array_data->binding_base_idx, VKD3D_SHADER_RESOURCE_NONE); + sampler_reg, &register_info.descriptor_array, VKD3D_SHADER_RESOURCE_NONE); sampler_var_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info.id, &array_idx, 1); } -- 2.32.0

2 6

[PATCH vkd3d v2 1/4] vkd3d-shader/hlsl: Write the else block only if it isn't empty.
by Giovanni Mascellani Nov. 16, 2021

Nov. 16, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index e597425a..c56a74d4 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1446,11 +1446,14 @@ static void write_sm4_if(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buf write_sm4_block(ctx, buffer, &iff->then_instrs); - instr.opcode = VKD3D_SM4_OP_ELSE; - instr.src_count = 0; - write_sm4_instruction(buffer, &instr); + if (!list_empty(&iff->else_instrs.instrs)) + { + instr.opcode = VKD3D_SM4_OP_ELSE; + instr.src_count = 0; + write_sm4_instruction(buffer, &instr); - write_sm4_block(ctx, buffer, &iff->else_instrs); + write_sm4_block(ctx, buffer, &iff->else_instrs); + } instr.opcode = VKD3D_SM4_OP_ENDIF; write_sm4_instruction(buffer, &instr); -- 2.33.1

1 3

[PATCH v2 1/3] wined3d: Make the "buffer_object" field of struct wined3d_bo_address a wined3d_bo pointer.
by Zebediah Figura Nov. 16, 2021

Nov. 16, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 16 +++++++++------- dlls/wined3d/buffer.c | 8 ++++---- dlls/wined3d/context_gl.c | 13 +++++++------ dlls/wined3d/cs.c | 2 +- dlls/wined3d/directx.c | 8 ++++---- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/texture.c | 22 +++++++++++----------- dlls/wined3d/view.c | 6 +++--- dlls/wined3d/wined3d_private.h | 7 ++++--- 9 files changed, 45 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e83f0a012d6..12811fd1482 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -960,8 +960,9 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, VkMappedMemoryRange range; void *map_ptr; - if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) + if (!data->buffer_object) return data->addr; + bo = wined3d_bo_vk(data->buffer_object); vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context->device); @@ -1065,8 +1066,9 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, struct wined3d_bo_vk *bo; unsigned int i; - if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) + if (!data->buffer_object) return; + bo = wined3d_bo_vk(data->buffer_object); if (!bo->b.coherent) { @@ -1092,8 +1094,8 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, void *dst_ptr, *src_ptr; VkBufferCopy region; - src_bo = (struct wined3d_bo_vk *)src->buffer_object; - dst_bo = (struct wined3d_bo_vk *)dst->buffer_object; + src_bo = src->buffer_object ? wined3d_bo_vk(src->buffer_object) : NULL; + dst_bo = dst->buffer_object ? wined3d_bo_vk(dst->buffer_object) : NULL; if (dst_bo && !dst->addr && size == dst_bo->size) map_flags |= WINED3D_MAP_DISCARD; @@ -1164,7 +1166,7 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, return; } - staging.buffer_object = (uintptr_t)&staging_bo; + staging.buffer_object = &staging_bo.b; staging.addr = NULL; adapter_vk_copy_bo_address(context, &staging, src, size); adapter_vk_copy_bo_address(context, dst, &staging, size); @@ -1184,7 +1186,7 @@ void adapter_vk_copy_bo_address(struct wined3d_context *context, return; } - staging.buffer_object = (uintptr_t)&staging_bo; + staging.buffer_object = &staging_bo.b; staging.addr = NULL; adapter_vk_copy_bo_address(context, &staging, src, size); adapter_vk_copy_bo_address(context, dst, &staging, size); @@ -1251,7 +1253,7 @@ static bool adapter_vk_alloc_bo(struct wined3d_device *device, struct wined3d_re ERR("Failed to map bo.\n"); } - addr->buffer_object = (uintptr_t)bo_vk; + addr->buffer_object = &bo_vk->b; addr->addr = NULL; return true; } diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d5840a488b5..b07f1510b74 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -665,7 +665,7 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_co } if (locations & WINED3D_LOCATION_BUFFER) { - data->buffer_object = (uintptr_t)buffer->buffer_object; + data->buffer_object = buffer->buffer_object; data->addr = NULL; return WINED3D_LOCATION_BUFFER; } @@ -977,7 +977,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc if (count == 1) { - addr.buffer_object = (uintptr_t)buffer->buffer_object; + addr.buffer_object = buffer->buffer_object; addr.addr = 0; buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); /* We are accessing buffer->resource.client from the CS thread, @@ -1057,7 +1057,7 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou context = context_acquire(device, NULL, 0); - addr.buffer_object = (uintptr_t)buffer->buffer_object; + addr.buffer_object = buffer->buffer_object; addr.addr = 0; wined3d_context_unmap_bo_address(context, &addr, range_count, buffer->maps); @@ -1587,7 +1587,7 @@ static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struc if (!range_count) return; - dst.buffer_object = (uintptr_t)buffer->buffer_object; + dst.buffer_object = buffer->buffer_object; dst.addr = NULL; flags = WINED3D_MAP_WRITE; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 210d8e0b925..e91bff9328b 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2729,13 +2729,13 @@ map: void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, size_t size, uint32_t flags) { - struct wined3d_bo_gl *bo; + struct wined3d_bo *bo; void *map_ptr; - if (!(bo = (struct wined3d_bo_gl *)data->buffer_object)) + if (!(bo = data->buffer_object)) return data->addr; - if (!(map_ptr = wined3d_bo_gl_map(bo, context_gl, (uintptr_t)data->addr, size, flags))) + if (!(map_ptr = wined3d_bo_gl_map(wined3d_bo_gl(bo), context_gl, (uintptr_t)data->addr, size, flags))) ERR("Failed to map bo.\n"); return map_ptr; @@ -2782,8 +2782,9 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_gl_info *gl_info; struct wined3d_bo_gl *bo; - if (!(bo = (struct wined3d_bo_gl *)data->buffer_object)) + if (!data->buffer_object) return; + bo = wined3d_bo_gl(data->buffer_object); flush_bo_ranges(context_gl, wined3d_const_bo_address(data), range_count, ranges); @@ -2816,8 +2817,8 @@ void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, BYTE *dst_ptr, *src_ptr; gl_info = context_gl->gl_info; - src_bo = (struct wined3d_bo_gl *)src->buffer_object; - dst_bo = (struct wined3d_bo_gl *)dst->buffer_object; + src_bo = src->buffer_object ? wined3d_bo_gl(src->buffer_object) : NULL; + dst_bo = dst->buffer_object ? wined3d_bo_gl(dst->buffer_object) : NULL; if (dst_bo && src_bo) { diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 262123b5d90..1a6ca2b8c7a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3130,7 +3130,7 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str return false; } - bo = (const struct wined3d_bo *)client->addr.buffer_object; + bo = client->addr.buffer_object; map_ptr = bo ? bo->map_ptr : NULL; map_ptr += (uintptr_t)client->addr.addr; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 06387452b89..40567cf1a2c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2774,7 +2774,7 @@ static void *adapter_no3d_map_bo_address(struct wined3d_context *context, { if (data->buffer_object) { - ERR("Unsupported buffer object %#lx.\n", data->buffer_object); + ERR("Unsupported buffer object %p.\n", data->buffer_object); return NULL; } @@ -2785,16 +2785,16 @@ static void adapter_no3d_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges) { if (data->buffer_object) - ERR("Unsupported buffer object %#lx.\n", data->buffer_object); + ERR("Unsupported buffer object %p.\n", data->buffer_object); } static void adapter_no3d_copy_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) { if (dst->buffer_object) - ERR("Unsupported dst buffer object %#lx.\n", dst->buffer_object); + ERR("Unsupported dst buffer object %p.\n", dst->buffer_object); if (src->buffer_object) - ERR("Unsupported src buffer object %#lx.\n", src->buffer_object); + ERR("Unsupported src buffer object %p.\n", src->buffer_object); if (dst->buffer_object || src->buffer_object) return; memcpy(dst->addr, src->addr, size); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8a4ca4f5781..79dc0bd06b6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -469,7 +469,7 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i if (data.buffer_object) { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, ((struct wined3d_bo_gl *)data.buffer_object)->id)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, wined3d_bo_gl(data.buffer_object)->id)); checkGLcall("glBindBuffer"); } @@ -527,7 +527,7 @@ error: if (data.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(context_gl, (struct wined3d_bo_gl *)data.buffer_object); + wined3d_context_gl_reference_bo(context_gl, wined3d_bo_gl(data.buffer_object)); checkGLcall("glBindBuffer"); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index df42f2d766b..370eaaf08e5 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -830,7 +830,7 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su if (locations & WINED3D_LOCATION_BUFFER) { data->addr = NULL; - data->buffer_object = (uintptr_t)&sub_resource->bo; + data->buffer_object = &sub_resource->bo.b; return; } @@ -2476,7 +2476,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, return; } - bo.buffer_object = src_bo_addr->buffer_object; + bo.buffer_object = (struct wined3d_bo *)src_bo_addr->buffer_object; bo.addr = (BYTE *)src_bo_addr->addr + src_box->front * src_slice_pitch; if (dst_texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) { @@ -2555,7 +2555,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, { if (bo.buffer_object) { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, ((struct wined3d_bo_gl *)bo.buffer_object)->id)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, wined3d_bo_gl(bo.buffer_object)->id)); checkGLcall("glBindBuffer"); } @@ -2565,7 +2565,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, if (bo.buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(context_gl, (struct wined3d_bo_gl *)bo.buffer_object); + wined3d_context_gl_reference_bo(context_gl, wined3d_bo_gl(bo.buffer_object)); checkGLcall("glBindBuffer"); } } @@ -2585,7 +2585,7 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, static void wined3d_texture_gl_download_data_slow_path(struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data) { - struct wined3d_bo_gl *bo = (struct wined3d_bo_gl *)data->buffer_object; + struct wined3d_bo_gl *bo = wined3d_bo_gl(data->buffer_object); const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; @@ -2824,7 +2824,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, unsigned int src_level, src_width, src_height, src_depth; unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_format_gl *format_gl; - struct wined3d_bo_gl *dst_bo; + struct wined3d_bo *dst_bo; BOOL srgb = FALSE; GLenum target; @@ -2899,9 +2899,9 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, return; } - if ((dst_bo = (struct wined3d_bo_gl *)dst_bo_addr->buffer_object)) + if ((dst_bo = dst_bo_addr->buffer_object)) { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, dst_bo->id)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, wined3d_bo_gl(dst_bo)->id)); checkGLcall("glBindBuffer"); } @@ -2925,7 +2925,7 @@ static void wined3d_texture_gl_download_data(struct wined3d_context *context, if (dst_bo) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(context_gl, dst_bo); + wined3d_context_gl_reference_bo(context_gl, wined3d_bo_gl(dst_bo)); checkGLcall("glBindBuffer"); } } @@ -4729,7 +4729,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, return; } - staging_bo_addr.buffer_object = (uintptr_t)&staging_bo; + staging_bo_addr.buffer_object = &staging_bo.b; staging_bo_addr.addr = NULL; if (!(map_ptr = wined3d_context_map_bo_address(context, &staging_bo_addr, sub_resource->size, WINED3D_MAP_DISCARD | WINED3D_MAP_WRITE))) @@ -4992,7 +4992,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); wined3d_context_vk_wait_command_buffer(context_vk, src_texture_vk->image.command_buffer_id); - staging_bo_addr.buffer_object = (uintptr_t)&staging_bo; + staging_bo_addr.buffer_object = &staging_bo.b; staging_bo_addr.addr = NULL; if (!(map_ptr = wined3d_context_map_bo_address(context, &staging_bo_addr, sub_resource->size, WINED3D_MAP_READ))) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index cbcfed4a21e..0d8001f5cbe 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1616,7 +1616,7 @@ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_v src.buffer_object = 0; src.addr = (void *)&value; - dst.buffer_object = view->counter_bo; + dst.buffer_object = (struct wined3d_bo *)view->counter_bo; dst.addr = NULL; wined3d_context_copy_bo_address(context, &dst, &src, sizeof(uint32_t)); @@ -2092,9 +2092,9 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view goto out; } - cb_source_address.buffer_object = 0; + cb_source_address.buffer_object = NULL; cb_source_address.addr = (BYTE *)&constants; - cb_destination_address.buffer_object = (UINT_PTR)&constants_bo; + cb_destination_address.buffer_object = &constants_bo.b; cb_destination_address.addr = 0; adapter_vk_copy_bo_address(&context_vk->c, &cb_destination_address, &cb_source_address, sizeof(constants)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dc5bfb28328..1eaf480dcd4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1619,9 +1619,9 @@ static inline struct wined3d_bo_gl *wined3d_bo_gl(struct wined3d_bo *bo) return CONTAINING_RECORD(bo, struct wined3d_bo_gl, b); } -static inline GLuint wined3d_bo_gl_id(uintptr_t bo) +static inline GLuint wined3d_bo_gl_id(struct wined3d_bo *bo) { - return bo ? ((struct wined3d_bo_gl *)bo)->id : 0; + return bo ? wined3d_bo_gl(bo)->id : 0; } struct wined3d_bo_user @@ -1679,7 +1679,7 @@ void wined3d_bo_slab_vk_unmap(struct wined3d_bo_slab_vk *slab_vk, struct wined3d_bo_address { - UINT_PTR buffer_object; + struct wined3d_bo *buffer_object; BYTE *addr; }; @@ -4409,6 +4409,7 @@ struct wined3d_texture DWORD locations; union { + struct wined3d_bo b; struct wined3d_bo_gl gl; struct wined3d_bo_vk vk; } bo; -- 2.33.0

2 5

[PATCH 1/2] msctfmonitor: Add stub dll.
by Louis Lenders Nov. 16, 2021

Nov. 16, 2021

https://bugs.winehq.org/show_bug.cgi?id=52044 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/msctfmonitor/Makefile.in | 4 ++++ dlls/msctfmonitor/msctfmonitor.spec | 7 +++++++ 4 files changed, 14 insertions(+) create mode 100644 dlls/msctfmonitor/Makefile.in create mode 100644 dlls/msctfmonitor/msctfmonitor.spec diff --git a/configure b/configure index 39c96a4e504..b442f084a96 100755 --- a/configure +++ b/configure @@ -1480,6 +1480,7 @@ enable_mscms enable_mscoree enable_mscorwks enable_msctf +enable_msctfmonitor enable_msctfp enable_msdaps enable_msdasql @@ -21551,6 +21552,7 @@ wine_fn_config_makefile dlls/mscoree/tests enable_tests wine_fn_config_makefile dlls/mscorwks enable_mscorwks wine_fn_config_makefile dlls/msctf enable_msctf wine_fn_config_makefile dlls/msctf/tests enable_tests +wine_fn_config_makefile dlls/msctfmonitor enable_msctfmonitor wine_fn_config_makefile dlls/msctfp enable_msctfp wine_fn_config_makefile dlls/msdaps enable_msdaps wine_fn_config_makefile dlls/msdasql enable_msdasql diff --git a/configure.ac b/configure.ac index ce401a47ebd..6631d2f42fc 100644 --- a/configure.ac +++ b/configure.ac @@ -3091,6 +3091,7 @@ WINE_CONFIG_MAKEFILE(dlls/mscoree/tests) WINE_CONFIG_MAKEFILE(dlls/mscorwks) WINE_CONFIG_MAKEFILE(dlls/msctf) WINE_CONFIG_MAKEFILE(dlls/msctf/tests) +WINE_CONFIG_MAKEFILE(dlls/msctfmonitor) WINE_CONFIG_MAKEFILE(dlls/msctfp) WINE_CONFIG_MAKEFILE(dlls/msdaps) WINE_CONFIG_MAKEFILE(dlls/msdasql) diff --git a/dlls/msctfmonitor/Makefile.in b/dlls/msctfmonitor/Makefile.in new file mode 100644 index 00000000000..04422ffc5e5 --- /dev/null +++ b/dlls/msctfmonitor/Makefile.in @@ -0,0 +1,4 @@ +MODULE = msctfmonitor.dll + +EXTRADLLFLAGS = -Wb,--prefer-native + diff --git a/dlls/msctfmonitor/msctfmonitor.spec b/dlls/msctfmonitor/msctfmonitor.spec new file mode 100644 index 00000000000..ce74566eaa8 --- /dev/null +++ b/dlls/msctfmonitor/msctfmonitor.spec @@ -0,0 +1,7 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub DoMsCtfMonitor +@ stub InitLocalMsCtfMonitor +@ stub UnInitLocalMsCtfMonitor \ No newline at end of file -- 2.33.1

1 1

[PATCH 3/3] msdasql: Support NULL dialect in GetCommandText
by Alistair Leslie-Hughes Nov. 16, 2021

Nov. 16, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msdasql/session.c | 2 +- dlls/msdasql/tests/provider.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 3829f8f946f..196fd1c6b81 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -910,7 +910,7 @@ static HRESULT WINAPI command_GetCommandText(ICommandText *iface, GUID *dialect, if (!command->query) return DB_E_NOCOMMAND; - if (!IsEqualGUID(&DBGUID_DEFAULT, dialect)) + if (dialect && !IsEqualGUID(&DBGUID_DEFAULT, dialect)) { *dialect = DBGUID_DEFAULT; hr = DB_S_DIALECTIGNORED; diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 37230be04cb..a0b11194f2b 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -265,6 +265,12 @@ if (0) hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICommandText_GetCommandText(comand_text, NULL, &str); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); + HeapFree(GetProcessHeap(), 0, str); + /* dialect empty value */ hr = ICommandText_GetCommandText(comand_text, &dialect, &str); ok(hr == DB_S_DIALECTIGNORED, "got 0x%08x\n", hr); -- 2.33.0

1 0