December 2019 - Wine-Devel - list.winehq.org

[PATCH 4/5] wined3d: Get gl_info from the context in wined3d_device_create_primary_opengl_context_cs().
by Henri Verbeet Dec. 13, 2019

Dec. 13, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 89134207243..cdc65a6fa71 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1002,13 +1002,15 @@ void wined3d_device_create_primary_opengl_context_cs(void *object) context_release(context); return; } - wined3d_ffp_blitter_create(&device->blitter, &device->adapter->gl_info); + + context_gl = wined3d_context_gl(context); + + wined3d_ffp_blitter_create(&device->blitter, context_gl->gl_info); if (!wined3d_glsl_blitter_create(&device->blitter, device)) wined3d_arbfp_blitter_create(&device->blitter, device); - wined3d_fbo_blitter_create(&device->blitter, &device->adapter->gl_info); - wined3d_raw_blitter_create(&device->blitter, &device->adapter->gl_info); + wined3d_fbo_blitter_create(&device->blitter, context_gl->gl_info); + wined3d_raw_blitter_create(&device->blitter, context_gl->gl_info); - context_gl = wined3d_context_gl(context); wined3d_device_gl_create_dummy_textures(wined3d_device_gl(device), context_gl); wined3d_device_create_default_samplers(device, context); context_release(context); -- 2.11.0

1 0

[PATCH 3/5] wined3d: Store a gl_info pointer in struct shader_arb_ctx_priv.
by Henri Verbeet Dec. 13, 2019

Dec. 13, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 7 +++++-- dlls/wined3d/shader.c | 1 - dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9d98c79ce51..14ca883e761 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -237,6 +237,7 @@ struct shader_arb_ctx_priv NV3 } target_version; + const struct wined3d_gl_info *gl_info; const struct arb_vs_compile_args *cur_vs_args; const struct arb_ps_compile_args *cur_ps_args; const struct arb_ps_compiled_shader *compiled_fprog; @@ -1438,7 +1439,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD case WINED3D_SHADER_RESOURCE_TEXTURE_2D: if (pshader && priv->cur_ps_args->super.np2_fixup & (1u << sampler_idx) - && ins->ctx->gl_info->supported[ARB_TEXTURE_RECTANGLE]) + && priv->gl_info->supported[ARB_TEXTURE_RECTANGLE]) tex_type = "RECT"; else tex_type = "2D"; @@ -3301,7 +3302,7 @@ static void shader_hw_ret(const struct wined3d_shader_instruction *ins) if(vshader) { if (priv->in_main_func) vshader_add_footer(priv, shader->backend_data, - priv->cur_vs_args, ins->ctx->reg_maps, ins->ctx->gl_info, buffer); + priv->cur_vs_args, ins->ctx->reg_maps, priv->gl_info, buffer); } shader_addline(buffer, "RET;\n"); @@ -3555,6 +3556,7 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, /* Create the hw ARB shader */ memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ps_args = args; priv_ctx.compiled_fprog = compiled; priv_ctx.cur_np2fixup_info = &compiled->np2fixup_info; @@ -4113,6 +4115,7 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_vs_args = args; list_init(&priv_ctx.control_frames); init_output_registers(shader, ps_input_sig, &priv_ctx, compiled); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3b9a96abc69..757631a73ef 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2624,7 +2624,6 @@ HRESULT shader_generate_code(const struct wined3d_shader *shader, struct wined3d state.in_subroutine = FALSE; ctx.shader = shader; - ctx.gl_info = &device->adapter->gl_info; ctx.reg_maps = reg_maps; ctx.buffer = buffer; ctx.tex_mx = &tex_mx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 583d970eca8..934a422ede1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -79,6 +79,7 @@ struct wined3d_fragment_pipe_ops; struct wined3d_adapter; struct wined3d_context; +struct wined3d_gl_info; struct wined3d_state; struct wined3d_swapchain_gl; struct wined3d_texture_gl; @@ -1084,7 +1085,6 @@ struct wined3d_shader_parser_state struct wined3d_shader_context { const struct wined3d_shader *shader; - const struct wined3d_gl_info *gl_info; const struct wined3d_shader_reg_maps *reg_maps; struct wined3d_string_buffer *buffer; struct wined3d_shader_tex_mx *tex_mx; -- 2.11.0

1 0

[PATCH 2/5] wined3d: Store a gl_info pointer in struct shader_glsl_ctx_priv.
by Henri Verbeet Dec. 13, 2019

Dec. 13, 2019

Since the one in struct wined3d_shader_context is going away. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 43 +++++++++++++++++++++++++++++-------------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f05631ec595..25e97723255 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -271,7 +271,9 @@ struct glsl_program_key GLuint cs_id; }; -struct shader_glsl_ctx_priv { +struct shader_glsl_ctx_priv +{ + const struct wined3d_gl_info *gl_info; const struct vs_compile_args *cur_vs_args; const struct ds_compile_args *cur_ds_args; const struct ps_compile_args *cur_ps_args; @@ -2651,8 +2653,9 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_shader *shader = ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ctx->backend_data; const char *prefix = shader_glsl_get_prefix(version->type); + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param rel_param0, rel_param1; if (reg->idx[0].offset != ~0u && reg->idx[0].rel_addr) @@ -2674,8 +2677,6 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_INCONTROLPOINT: if (version->type == WINED3D_SHADER_TYPE_VERTEX) { - struct shader_glsl_ctx_priv *priv = ctx->backend_data; - if (reg->idx[0].rel_addr) FIXME("VS3 input registers relative addressing.\n"); if (is_swizzled && priv->cur_vs_args->swizzle_map & (1u << reg->idx[0].offset)) @@ -3353,7 +3354,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context { enum wined3d_shader_resource_type resource_type; struct shader_glsl_ctx_priv *priv = ctx->backend_data; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; BOOL shadow = glsl_is_shadow_sampler(ctx->shader, priv->cur_ps_args, resource_idx, sampler_idx); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; BOOL texrect = ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL @@ -3854,8 +3855,9 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param src0_param; DWORD write_mask; @@ -4979,9 +4981,10 @@ static void shader_glsl_emit(const struct wined3d_shader_instruction *ins) { unsigned int stream = ins->handler_idx == WINED3DSIH_EMIT ? 0 : ins->src[0].reg.idx[0].offset; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; shader_addline(ins->ctx->buffer, "setup_gs_output(gs_out);\n"); - if (!ins->ctx->gl_info->supported[ARB_CLIP_CONTROL]) + if (!priv->gl_info->supported[ARB_CLIP_CONTROL]) shader_glsl_fixup_position(ins->ctx->buffer, reg_maps->viewport_array); if (!stream) @@ -5186,7 +5189,8 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, dx_param, dy_param; struct glsl_sample_function sample_function; DWORD sampler_idx; @@ -5214,7 +5218,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *shader_version = &ins->ctx->reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; DWORD swizzle = ins->src[1].swizzle; @@ -5769,8 +5774,9 @@ static BOOL is_mipmapped(enum wined3d_shader_resource_type resource_type) static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct wined3d_string_buffer *buffer = ins->ctx->buffer; + const struct wined3d_gl_info *gl_info = priv->gl_info; enum wined3d_shader_resource_type resource_type; enum wined3d_shader_register_type reg_type; unsigned int resource_idx, bind_idx, i; @@ -5858,7 +5864,8 @@ static void shader_glsl_resinfo(const struct wined3d_shader_instruction *ins) static void shader_glsl_sample_info(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct wined3d_string_buffer *buffer = ins->ctx->buffer; const struct wined3d_shader_dst_param *dst = ins->dst; const struct wined3d_shader_src_param *src = ins->src; @@ -6060,9 +6067,10 @@ static void shader_glsl_gen_sample_c_lz_emulation(const struct wined3d_shader_in static void shader_glsl_sample_c(const struct wined3d_shader_instruction *ins) { - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; unsigned int resource_idx, sampler_idx, sampler_bind_idx; const struct wined3d_shader_resource_info *resource_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct glsl_src_param coord_param, compare_param; struct glsl_sample_function sample_function; const char *lod_param = NULL; @@ -6110,8 +6118,9 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) unsigned int resource_param_idx, resource_idx, sampler_idx, sampler_bind_idx, component_idx; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const char *prefix = shader_glsl_get_prefix(reg_maps->shader_version.type); + const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; struct glsl_src_param coord_param, compare_param, offset_param; - const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; const struct wined3d_shader_resource_info *resource_info; struct wined3d_string_buffer *buffer = ins->ctx->buffer; unsigned int coord_size, offset_size; @@ -7574,6 +7583,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ DWORD map; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ps_args = args; priv_ctx.cur_np2fixup_info = np2fixup_info; priv_ctx.string_buffers = string_buffers; @@ -7927,6 +7937,7 @@ static GLuint shader_glsl_generate_vertex_shader(const struct wined3d_context_gl unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_vs_args = args; priv_ctx.string_buffers = string_buffers; @@ -8071,6 +8082,7 @@ static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context_gl * unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); @@ -8164,6 +8176,7 @@ static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl GLuint shader_id; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.cur_ds_args = args; priv_ctx.string_buffers = string_buffers; @@ -8262,6 +8275,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_ GLuint shader_id; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); @@ -8351,7 +8365,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context_ static void shader_glsl_generate_shader_epilogue(const struct wined3d_shader_context *ctx) { const struct shader_glsl_ctx_priv *priv = ctx->backend_data; - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_gl_info *gl_info = priv->gl_info; struct wined3d_string_buffer *buffer = ctx->buffer; const struct wined3d_shader *shader = ctx->shader; @@ -8388,6 +8402,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context_g unsigned int i; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.gl_info = gl_info; priv_ctx.string_buffers = string_buffers; shader_glsl_add_version_declaration(buffer, gl_info); -- 2.11.0

1 0

[PATCH 1/5] wined3d: Create Vulkan buffers.
by Henri Verbeet Dec. 13, 2019

Dec. 13, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 17 ++++++++++ dlls/wined3d/buffer.c | 66 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/context.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 21 ++++++++++++ 4 files changed, 173 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4ec68013017..7d501b4b08f 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -555,6 +555,23 @@ static void adapter_vk_destroy_swapchain(struct wined3d_swapchain *swapchain) heap_free(swapchain); } +unsigned int wined3d_adapter_vk_get_memory_type_index(const struct wined3d_adapter_vk *adapter_vk, + uint32_t memory_type_mask, VkMemoryPropertyFlags flags) +{ + const VkPhysicalDeviceMemoryProperties *memory_info = &adapter_vk->memory_properties; + unsigned int i; + + for (i = 0; i < memory_info->memoryTypeCount; ++i) + { + if (!(memory_type_mask & (1u << i))) + continue; + if ((memory_info->memoryTypes[i].propertyFlags & flags) == flags) + return i; + } + + return ~0u; +} + static HRESULT adapter_vk_create_buffer(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5da6aec4fb8..4f3c28fe0b1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1554,6 +1554,44 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined return wined3d_buffer_init(&buffer_gl->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops); } +static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buffer_vk, + struct wined3d_context_vk *context_vk) +{ + struct wined3d_resource *resource = &buffer_vk->b.resource; + uint32_t bind_flags = resource->bind_flags; + VkMemoryPropertyFlags memory_type; + VkBufferUsageFlags usage; + + usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; + if (bind_flags & WINED3D_BIND_VERTEX_BUFFER) + usage |= VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_INDEX_BUFFER) + usage |= VK_BUFFER_USAGE_INDEX_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + usage |= VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_SHADER_RESOURCE) + usage |= VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + usage |= VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT; + if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER) + usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; + if (bind_flags & (WINED3D_BIND_STREAM_OUTPUT | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) + FIXME("Ignoring some bind flags %#x.\n", bind_flags); + memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT + | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) + { + WARN("Failed to create Vulkan buffer.\n"); + return FALSE; + } + + buffer_vk->b.buffer_object = (uintptr_t)&buffer_vk->bo; + buffer_invalidate_bo_range(&buffer_vk->b, 0, 0); + + return TRUE; +} + static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) { @@ -1563,8 +1601,10 @@ static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, return wined3d_resource_prepare_sysmem(&buffer->resource); case WINED3D_LOCATION_BUFFER: - /* The Vulkan buffer is created during resource creation. */ - return TRUE; + if (buffer->buffer_object) + return TRUE; + + return wined3d_buffer_vk_create_buffer_object(wined3d_buffer_vk(buffer), wined3d_context_vk(context)); default: FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); @@ -1575,7 +1615,24 @@ static BOOL wined3d_buffer_vk_prepare_location(struct wined3d_buffer *buffer, static void wined3d_buffer_vk_unload_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) { - FIXME("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + struct wined3d_buffer_vk *buffer_vk = wined3d_buffer_vk(buffer); + + TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); + + switch (location) + { + case WINED3D_LOCATION_BUFFER: + wined3d_context_vk_destroy_bo(context_vk, &buffer_vk->bo); + buffer_vk->bo.vk_buffer = VK_NULL_HANDLE; + buffer_vk->bo.vk_memory = VK_NULL_HANDLE; + buffer_vk->b.buffer_object = 0u; + break; + + default: + ERR("Unhandled location %s.\n", wined3d_debug_location(location)); + break; + } } static void wined3d_buffer_vk_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, @@ -1605,6 +1662,9 @@ HRESULT wined3d_buffer_vk_init(struct wined3d_buffer_vk *buffer_vk, struct wined TRACE("buffer_vk %p, device %p, desc %p, data %p, parent %p, parent_ops %p.\n", buffer_vk, device, desc, data, parent, parent_ops); + if (desc->access & WINED3D_RESOURCE_ACCESS_GPU) + buffer_vk->b.flags |= WINED3D_BUFFER_USE_BO; + return wined3d_buffer_init(&buffer_vk->b, device, desc, data, parent, parent_ops, &wined3d_buffer_vk_ops); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 95769014af6..5d88d4463f9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1493,6 +1493,74 @@ static void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) wined3d_context_cleanup(&context_gl->c); } +BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, + VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + VkMemoryRequirements memory_requirements; + struct wined3d_adapter_vk *adapter_vk; + VkMemoryAllocateInfo allocate_info; + VkBufferCreateInfo create_info; + VkResult vr; + + adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); + + create_info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + create_info.size = size; + create_info.usage = usage; + create_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + create_info.queueFamilyIndexCount = 0; + create_info.pQueueFamilyIndices = NULL; + + if ((vr = VK_CALL(vkCreateBuffer(device_vk->vk_device, &create_info, NULL, &bo->vk_buffer))) < 0) + { + ERR("Failed to create Vulkan buffer, vr %s.\n", wined3d_debug_vkresult(vr)); + return FALSE; + } + + VK_CALL(vkGetBufferMemoryRequirements(device_vk->vk_device, bo->vk_buffer, &memory_requirements)); + + allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.allocationSize = memory_requirements.size; + allocate_info.memoryTypeIndex = wined3d_adapter_vk_get_memory_type_index(adapter_vk, + memory_requirements.memoryTypeBits, memory_type); + if (allocate_info.memoryTypeIndex == ~0u) + { + ERR("Failed to find suitable memory type.\n"); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) + { + ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + + if ((vr = VK_CALL(vkBindBufferMemory(device_vk->vk_device, bo->vk_buffer, bo->vk_memory, 0))) < 0) + { + ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + return FALSE; + } + + return TRUE; +} + +void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const struct wined3d_bo_vk *bo) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + + VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); + VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); +} + void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) { wined3d_context_cleanup(&context_vk->c); @@ -2344,9 +2412,13 @@ fail: HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) { + struct wined3d_adapter_vk *adapter_vk; + TRACE("context_vk %p, swapchain %p.\n", context_vk, swapchain); wined3d_context_init(&context_vk->c, swapchain); + adapter_vk = wined3d_adapter_vk(swapchain->device->adapter); + context_vk->vk_info = &adapter_vk->vk_info; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 21f17736ec7..583d970eca8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1512,6 +1512,12 @@ do { \ #define checkGLcall(A) do {} while(0) #endif +struct wined3d_bo_vk +{ + VkBuffer vk_buffer; + VkDeviceMemory vk_memory; +}; + struct wined3d_bo_address { UINT_PTR buffer_object; @@ -2155,9 +2161,20 @@ void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context struct wined3d_context_vk { struct wined3d_context c; + + const struct wined3d_vk_info *vk_info; }; +static inline struct wined3d_context_vk *wined3d_context_vk(struct wined3d_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_context_vk, c); +} + void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; +BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, + VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; +void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, + const struct wined3d_bo_vk *bo) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -2929,6 +2946,8 @@ static inline struct wined3d_adapter_vk *wined3d_adapter_vk(struct wined3d_adapt struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; +unsigned int wined3d_adapter_vk_get_memory_type_index(const struct wined3d_adapter_vk *adapter_vk, + uint32_t memory_type_mask, VkMemoryPropertyFlags flags) DECLSPEC_HIDDEN; struct wined3d_caps_gl_ctx { @@ -4208,6 +4227,8 @@ HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined struct wined3d_buffer_vk { struct wined3d_buffer b; + + struct wined3d_bo_vk bo; }; static inline struct wined3d_buffer_vk *wined3d_buffer_vk(struct wined3d_buffer *buffer) -- 2.11.0

1 0

[PATCH] dmloader: Use wide-char string literals
by Michael Stefaniuc Dec. 13, 2019

Dec. 13, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmloader/loader.c | 8 ++++---- dlls/dmloader/tests/loader.c | 23 +++++++++++------------ 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index a267d2d6b2..66c0f92b1b 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -609,7 +609,6 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_SetSearchDirectory(IDirectMusicLoad static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 *iface, REFGUID rguidClass, WCHAR *pwzFileExtension, WCHAR *pwzScanFileName) { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - static const WCHAR wszAny[] = {'*',0}; WIN32_FIND_DATAW FileData; HANDLE hSearch; WCHAR wszSearchString[MAX_PATH]; @@ -631,11 +630,12 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ScanDirectory(IDirectMusicLoader8 * p = wszSearchString + lstrlenW(wszSearchString); if (p > wszSearchString && p[-1] != '\\') *p++ = '\\'; *p++ = '*'; /* any file */ - if (lstrcmpW (pwzFileExtension, wszAny)) *p++ = '.'; /* if we have actual extension, put a dot */ + if (lstrcmpW (pwzFileExtension, L"*")) + *p++ = '.'; /* if we have actual extension, put a dot */ lstrcpyW (p, pwzFileExtension); - + TRACE(": search string: %s\n", debugstr_w(wszSearchString)); - + hSearch = FindFirstFileW (wszSearchString, &FileData); if (hSearch == INVALID_HANDLE_VALUE) { TRACE(": no files found\n"); diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 0ab2e9eaba..bd6797f135 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -48,23 +48,22 @@ static void test_directory(void) { IDirectMusicLoader8 *loader = NULL; HRESULT hr; - WCHAR con[] = {'c', 'o', 'n', 0}; WCHAR path[MAX_PATH]; - WCHAR empty[] = {0}; - WCHAR invalid_path[] = {'/', 'i', 'n', 'v', 'a', 'l', 'i', 'd', ' ', 'p', 'a', 't', 'h', 0}; hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); ok(hr == S_OK, "Couldn't create Loader %#x\n", hr); /* ScanDirectory without a previous SetSearchDirectory isn't failing */ - hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, con, NULL); + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, + (WCHAR *)L"con", NULL); ok(hr == S_FALSE, "ScanDirectory for \"con\" files failed with %#x\n", hr); /* SetSearchDirectory with invalid path */ hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, NULL, 0); ok(hr == E_POINTER, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, invalid_path, 0); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, + (WCHAR *)L"/invalid path", 0); ok(hr == DMUS_E_LOADER_BADPATH, "SetSearchDirectory failed with %#x\n", hr); /* SetSearchDirectory with the current directory */ @@ -88,7 +87,7 @@ static void test_directory(void) IDirectMusicLoader_SetSearchDirectory(loader, NULL, path, 0); /* Crashes on Windows */ hr = IDirectMusicLoader_SetSearchDirectory(loader, &IID_IDirectMusicLoader8, path, 0); ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_ScanDirectory(loader, &GUID_DirectMusicAllTypes, con, NULL); + hr = IDirectMusicLoader_ScanDirectory(loader, &GUID_DirectMusicAllTypes, (WCHAR *)L"con", NULL); ok(hr == REGDB_E_CLASSNOTREG, "ScanDirectory failed, received %#x\n", hr); /* NULL extension is not an error */ @@ -101,11 +100,12 @@ static void test_directory(void) hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC, &IID_IDirectMusicLoader8, (void**)&loader); ok(hr == S_OK, "Couldn't create Loader %#x\n", hr); - hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, empty, 0); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, (WCHAR *)L"", 0); ok(hr == S_OK, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, empty, 0); + hr = IDirectMusicLoader_SetSearchDirectory(loader, &GUID_DirectMusicAllTypes, (WCHAR *)L"", 0); ok(hr == S_FALSE, "SetSearchDirectory failed with %#x\n", hr); - hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, con, NULL); + hr = IDirectMusicLoader_ScanDirectory(loader, &CLSID_DirectMusicContainer, + (WCHAR *)L"con", NULL); ok(hr == S_FALSE, "ScanDirectory for \"con\" files failed with %#x\n", hr); IDirectMusicLoader_Release(loader); } @@ -477,7 +477,6 @@ static void test_parsedescriptor(void) DMUS_OBJECTDESC desc; HRESULT hr; DWORD valid; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; const FOURCC alldesc[] = { FOURCC_RIFF, DMUS_FOURCC_CONTAINER_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, @@ -562,7 +561,7 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass)); ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", wine_dbgstr_guid(&desc.guidClass)); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -596,7 +595,7 @@ static void test_parsedescriptor(void) ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); valid = DMUS_OBJ_OBJECT|DMUS_OBJ_CLASS|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); -- 2.23.0

1 0

[PATCH v2 2/2] gdiplus: GdipGraphicsClear() should overwrite pixels, not alpha blend
by Damjan Jovanovic Dec. 13, 2019

Dec. 13, 2019

All sample code in the Python Pyglet library suffers from terrible text corruption, caused by the inability to erase the background between rendering sequential font glyphs, resulting in leftovers from previous letters mixing with the image of new letters. This is because it attempts to erase the background by calling GdipGraphicsClear() with ARGB color 0x00000000 (completely transparent black), and in our gdiplus alpha blending that into the background has no effect. It should be using CompositeModeSourceCopy to overwrite the background with that brush instead. Try 2 split the patch. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30506 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/gdiplus/graphics.c | 4 ++++ dlls/gdiplus/tests/image.c | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+)

2 1

[PATCH v2 1/2] gdiplus: start implementing CompositingModeSourceCopy
by Damjan Jovanovic Dec. 13, 2019

Dec. 13, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30506 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/gdiplus/graphics.c | 22 +++++++++++++++------- dlls/gdiplus/tests/image.c | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-)

2 1

[PATCH 01/11] jscript: Implement ScriptTypeInfo_GetNames.
by Gabriel Ivăncescu Dec. 13, 2019

Dec. 13, 2019

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 85 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6cc6df5..9e33737 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -625,6 +625,44 @@ typedef struct { jsdisp_t *jsdisp; } ScriptTypeInfo; +static struct typeinfo_func *get_func_from_memid(const ScriptTypeInfo *typeinfo, MEMBERID memid) +{ + UINT a = 0, b = typeinfo->num_funcs; + + while (a < b) + { + UINT i = (a + b - 1) / 2; + MEMBERID func_memid = prop_to_id(typeinfo->jsdisp, typeinfo->funcs[i].prop); + + if (memid == func_memid) + return &typeinfo->funcs[i]; + else if (memid < func_memid) + b = i; + else + a = i + 1; + } + return NULL; +} + +static dispex_prop_t *get_var_from_memid(const ScriptTypeInfo *typeinfo, MEMBERID memid) +{ + UINT a = 0, b = typeinfo->num_vars; + + while (a < b) + { + UINT i = (a + b - 1) / 2; + MEMBERID var_memid = prop_to_id(typeinfo->jsdisp, typeinfo->vars[i]); + + if (memid == var_memid) + return typeinfo->vars[i]; + else if (memid < var_memid) + b = i; + else + a = i + 1; + } + return NULL; +} + static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) { return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); @@ -786,10 +824,53 @@ static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, UINT cMaxNames, UINT *pcNames) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + struct typeinfo_func *func; + ITypeInfo *disp_typeinfo; + dispex_prop_t *var; + HRESULT hr; + UINT i = 0; - FIXME("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); + TRACE("(%p)->(%d %p %u %p)\n", This, memid, rgBstrNames, cMaxNames, pcNames); - return E_NOTIMPL; + if (!rgBstrNames || !pcNames) return E_INVALIDARG; + if (memid <= 0) return TYPE_E_ELEMENTNOTFOUND; + + func = get_func_from_memid(This, memid); + if (!func) + { + var = get_var_from_memid(This, memid); + if (!var) + { + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetNames(disp_typeinfo, memid, rgBstrNames, cMaxNames, pcNames); + } + } + + *pcNames = 0; + if (!cMaxNames) return S_OK; + + rgBstrNames[0] = SysAllocString(func ? func->prop->name : var->name); + if (!rgBstrNames[0]) return E_OUTOFMEMORY; + i++; + + if (func) + { + unsigned num = min(cMaxNames, func->code->param_cnt + 1); + + for (; i < num; i++) + { + if (!(rgBstrNames[i] = SysAllocString(func->code->params[i - 1]))) + { + do SysFreeString(rgBstrNames[--i]); while (i); + return E_OUTOFMEMORY; + } + } + } + + *pcNames = i; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetRefTypeOfImplType(ITypeInfo *iface, UINT index, HREFTYPE *pRefType) -- 2.21.0

2 21

[PATCH 8/8] msado15: Prevent multiple Open/Close of a _Recordset.
by Hans Leidekker Dec. 13, 2019

Dec. 13, 2019

Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 5 +++++ dlls/msado15/tests/msado15.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 56cdee6652..1d28d6b957 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -1035,6 +1035,8 @@ static HRESULT WINAPI recordset_Close( _Recordset *iface ) TRACE( "%p\n", recordset ); + if (recordset->state == adStateClosed) return MAKE_ADO_HRESULT( adErrObjectClosed ); + close_recordset( recordset ); recordset->state = adStateClosed; return S_OK; @@ -1106,6 +1108,9 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT FIXME( "%p, %s, %s, %d, %d, %d\n", recordset, debugstr_variant(&source), debugstr_variant(&active_connection), cursor_type, lock_type, options ); + if (!recordset->fields) return MAKE_ADO_HRESULT( adErrInvalidConnection ); + if (recordset->state == adStateOpen) return MAKE_ADO_HRESULT( adErrObjectOpen ); + recordset->state = adStateOpen; return S_OK; } diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index a3bce0b471..cba3d5fafc 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -114,6 +114,9 @@ static void test_Recordset(void) ok( hr == S_OK, "got %08x\n", hr ); ok( !count, "got %d\n", count ); + hr = _Recordset_Close( recordset ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectClosed ), "got %08x\n", hr ); + refs = _Recordset_Release( recordset ); ok( !refs, "got %d\n", refs ); @@ -135,7 +138,7 @@ static void test_Recordset(void) V_VT( &missing ) = VT_ERROR; V_ERROR( &missing ) = DISP_E_PARAMNOTFOUND; hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); - todo_wine ok( hr == MAKE_ADO_HRESULT( adErrInvalidConnection ), "got %08x\n", hr ); + ok( hr == MAKE_ADO_HRESULT( adErrInvalidConnection ), "got %08x\n", hr ); hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); @@ -155,6 +158,9 @@ static void test_Recordset(void) ok( is_eof( recordset ), "not eof\n" ); ok( is_bof( recordset ), "not bof\n" ); + hr = _Recordset_Open( recordset, missing, missing, adOpenStatic, adLockBatchOptimistic, adCmdUnspecified ); + ok( hr == MAKE_ADO_HRESULT( adErrObjectOpen ), "got %08x\n", hr ); + state = -1; hr = _Recordset_get_State( recordset, &state ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

1 0

[PATCH 7/8] msado15: Add ISupportErrorInfo support to Field, Fields and _Recordset.
by Hans Leidekker Dec. 13, 2019

Dec. 13, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msado15/recordset.c | 188 +++++++++++++++++++++++++++++------ dlls/msado15/tests/msado15.c | 32 ++++++ 2 files changed, 192 insertions(+), 28 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index cd623d0dc8..56cdee6652 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -34,36 +34,39 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); struct fields; struct recordset { - _Recordset Recordset_iface; - LONG refs; - LONG state; - struct fields *fields; - LONG count; - LONG allocated; - LONG index; - VARIANT *data; + _Recordset Recordset_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + LONG state; + struct fields *fields; + LONG count; + LONG allocated; + LONG index; + VARIANT *data; }; struct fields { - Fields Fields_iface; - LONG refs; - Field **field; - ULONG count; - ULONG allocated; - struct recordset *recordset; + Fields Fields_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + Field **field; + ULONG count; + ULONG allocated; + struct recordset *recordset; }; struct field { - Field Field_iface; - LONG refs; - WCHAR *name; - DataTypeEnum type; - LONG defined_size; - LONG attrs; - LONG index; - struct recordset *recordset; + Field Field_iface; + ISupportErrorInfo ISupportErrorInfo_iface; + LONG refs; + WCHAR *name; + DataTypeEnum type; + LONG defined_size; + LONG attrs; + LONG index; + struct recordset *recordset; }; static inline struct field *impl_from_Field( Field *iface ) @@ -95,6 +98,7 @@ static ULONG WINAPI field_Release( Field *iface ) static HRESULT WINAPI field_QueryInterface( Field *iface, REFIID riid, void **obj ) { + struct field *field = impl_from_Field( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); if (IsEqualGUID( riid, &IID_Field ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -102,6 +106,10 @@ static HRESULT WINAPI field_QueryInterface( Field *iface, REFIID riid, void **ob { *obj = iface; } + else if (IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &field->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -368,12 +376,51 @@ static const struct FieldVtbl field_vtbl = field_get_Status }; +static inline struct field *field_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct field, ISupportErrorInfo_iface ); +} + +static HRESULT WINAPI field_supporterrorinfo_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct field *field = field_from_ISupportErrorInfo( iface ); + return Field_QueryInterface( &field->Field_iface, riid, obj ); +} + +static ULONG WINAPI field_supporterrorinfo_AddRef( ISupportErrorInfo *iface ) +{ + struct field *field = field_from_ISupportErrorInfo( iface ); + return Field_AddRef( &field->Field_iface ); +} + +static ULONG WINAPI field_supporterrorinfo_Release( ISupportErrorInfo *iface ) +{ + struct field *field = field_from_ISupportErrorInfo( iface ); + return Field_Release( &field->Field_iface ); +} + +static HRESULT WINAPI field_supporterrorinfo_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct field *field = field_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", field, debugstr_guid(riid) ); + return S_FALSE; +} + +static const ISupportErrorInfoVtbl field_supporterrorinfo_vtbl = +{ + field_supporterrorinfo_QueryInterface, + field_supporterrorinfo_AddRef, + field_supporterrorinfo_Release, + field_supporterrorinfo_InterfaceSupportsErrorInfo +}; + static HRESULT Field_create( const WCHAR *name, LONG index, struct recordset *recordset, Field **obj ) { struct field *field; if (!(field = heap_alloc_zero( sizeof(*field) ))) return E_OUTOFMEMORY; field->Field_iface.lpVtbl = &field_vtbl; + field->ISupportErrorInfo_iface.lpVtbl = &field_supporterrorinfo_vtbl; if (!(field->name = strdupW( name ))) { heap_free( field ); @@ -416,6 +463,7 @@ static ULONG WINAPI fields_Release( Fields *iface ) static HRESULT WINAPI fields_QueryInterface( Fields *iface, REFIID riid, void **obj ) { + struct fields *fields = impl_from_Fields( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); if (IsEqualGUID( riid, &IID_Fields ) || IsEqualGUID( riid, &IID_IDispatch ) || @@ -423,6 +471,10 @@ static HRESULT WINAPI fields_QueryInterface( Fields *iface, REFIID riid, void ** { *obj = iface; } + else if (IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &fields->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -626,12 +678,51 @@ static const struct FieldsVtbl fields_vtbl = fields_CancelUpdate }; +static inline struct fields *fields_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct fields, ISupportErrorInfo_iface ); +} + +static HRESULT WINAPI fields_supporterrorinfo_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct fields *fields = fields_from_ISupportErrorInfo( iface ); + return Fields_QueryInterface( &fields->Fields_iface, riid, obj ); +} + +static ULONG WINAPI fields_supporterrorinfo_AddRef( ISupportErrorInfo *iface ) +{ + struct fields *fields = fields_from_ISupportErrorInfo( iface ); + return Fields_AddRef( &fields->Fields_iface ); +} + +static ULONG WINAPI fields_supporterrorinfo_Release( ISupportErrorInfo *iface ) +{ + struct fields *fields = fields_from_ISupportErrorInfo( iface ); + return Fields_Release( &fields->Fields_iface ); +} + +static HRESULT WINAPI fields_supporterrorinfo_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct fields *fields = fields_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", fields, debugstr_guid(riid) ); + return S_FALSE; +} + +static const ISupportErrorInfoVtbl fields_supporterrorinfo_vtbl = +{ + fields_supporterrorinfo_QueryInterface, + fields_supporterrorinfo_AddRef, + fields_supporterrorinfo_Release, + fields_supporterrorinfo_InterfaceSupportsErrorInfo +}; + static HRESULT fields_create( struct recordset *recordset, struct fields **ret ) { struct fields *fields; if (!(fields = heap_alloc_zero( sizeof(*fields) ))) return E_OUTOFMEMORY; fields->Fields_iface.lpVtbl = &fields_vtbl; + fields->ISupportErrorInfo_iface.lpVtbl = &fields_supporterrorinfo_vtbl; fields->refs = 1; fields->recordset = recordset; _Recordset_AddRef( &fields->recordset->Recordset_iface ); @@ -686,18 +777,20 @@ static ULONG WINAPI recordset_Release( _Recordset *iface ) static HRESULT WINAPI recordset_QueryInterface( _Recordset *iface, REFIID riid, void **obj ) { + struct recordset *recordset = impl_from_Recordset( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IDispatch) || - IsEqualIID(riid, &IID__ADO) || - IsEqualIID(riid, &IID_Recordset15) || - IsEqualIID(riid, &IID_Recordset20) || - IsEqualIID(riid, &IID_Recordset21) || + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID__ADO) || IsEqualIID(riid, &IID_Recordset15) || + IsEqualIID(riid, &IID_Recordset20) || IsEqualIID(riid, &IID_Recordset21) || IsEqualIID(riid, &IID__Recordset)) { *obj = iface; } + else if (IsEqualGUID( riid, &IID_ISupportErrorInfo )) + { + *obj = &recordset->ISupportErrorInfo_iface; + } else { FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); @@ -1379,12 +1472,51 @@ static const struct _RecordsetVtbl recordset_vtbl = recordset_Save }; +static inline struct recordset *recordset_from_ISupportErrorInfo( ISupportErrorInfo *iface ) +{ + return CONTAINING_RECORD( iface, struct recordset, ISupportErrorInfo_iface ); +} + +static HRESULT WINAPI recordset_supporterrorinfo_QueryInterface( ISupportErrorInfo *iface, REFIID riid, void **obj ) +{ + struct recordset *recordset = recordset_from_ISupportErrorInfo( iface ); + return _Recordset_QueryInterface( &recordset->Recordset_iface, riid, obj ); +} + +static ULONG WINAPI recordset_supporterrorinfo_AddRef( ISupportErrorInfo *iface ) +{ + struct recordset *recordset = recordset_from_ISupportErrorInfo( iface ); + return _Recordset_AddRef( &recordset->Recordset_iface ); +} + +static ULONG WINAPI recordset_supporterrorinfo_Release( ISupportErrorInfo *iface ) +{ + struct recordset *recordset = recordset_from_ISupportErrorInfo( iface ); + return _Recordset_Release( &recordset->Recordset_iface ); +} + +static HRESULT WINAPI recordset_supporterrorinfo_InterfaceSupportsErrorInfo( ISupportErrorInfo *iface, REFIID riid ) +{ + struct recordset *recordset = recordset_from_ISupportErrorInfo( iface ); + FIXME( "%p, %s\n", recordset, debugstr_guid(riid) ); + return S_FALSE; +} + +static const ISupportErrorInfoVtbl recordset_supporterrorinfo_vtbl = +{ + recordset_supporterrorinfo_QueryInterface, + recordset_supporterrorinfo_AddRef, + recordset_supporterrorinfo_Release, + recordset_supporterrorinfo_InterfaceSupportsErrorInfo +}; + HRESULT Recordset_create( void **obj ) { struct recordset *recordset; if (!(recordset = heap_alloc_zero( sizeof(*recordset) ))) return E_OUTOFMEMORY; recordset->Recordset_iface.lpVtbl = &recordset_vtbl; + recordset->ISupportErrorInfo_iface.lpVtbl = &recordset_supporterrorinfo_vtbl; recordset->refs = 1; recordset->index = -1; diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 61040f691e..a3bce0b471 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -60,6 +60,7 @@ static LONG get_refs_recordset( _Recordset *recordset ) static void test_Recordset(void) { _Recordset *recordset; + ISupportErrorInfo *errorinfo; Fields *fields, *fields2; Field *field; LONG refs, count, state; @@ -70,6 +71,16 @@ static void test_Recordset(void) hr = CoCreateInstance( &CLSID_Recordset, NULL, CLSCTX_INPROC_SERVER, &IID__Recordset, (void **)&recordset ); ok( hr == S_OK, "got %08x\n", hr ); + /* _Recordset object supports ISupportErrorInfo */ + errorinfo = NULL; + hr = _Recordset_QueryInterface( recordset, &IID_ISupportErrorInfo, (void **)&errorinfo ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_recordset( recordset ); + ok( refs == 2, "got %d\n", refs ); + if (errorinfo) ISupportErrorInfo_Release( errorinfo ); + refs = get_refs_recordset( recordset ); + ok( refs == 1, "got %d\n", refs ); + /* handing out fields object increases recordset refcount */ refs = get_refs_recordset( recordset ); ok( refs == 1, "got %d\n", refs ); @@ -255,6 +266,7 @@ static void test_Recordset(void) static void test_Fields(void) { _Recordset *recordset; + ISupportErrorInfo *errorinfo; Fields *fields; Field *field, *field2; VARIANT val, index; @@ -270,6 +282,16 @@ static void test_Fields(void) hr = _Recordset_get_Fields( recordset, &fields ); ok( hr == S_OK, "got %08x\n", hr ); + /* Fields object supports ISupportErrorInfo */ + errorinfo = NULL; + hr = Fields_QueryInterface( fields, &IID_ISupportErrorInfo, (void **)&errorinfo ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_fields( fields ); + ok( refs == 2, "got %d\n", refs ); + if (errorinfo) ISupportErrorInfo_Release( errorinfo ); + refs = get_refs_fields( fields ); + ok( refs == 1, "got %d\n", refs ); + count = -1; hr = Fields_get_Count( fields, &count ); ok( !count, "got %d\n", count ); @@ -324,6 +346,16 @@ static void test_Fields(void) Field_Release( field2 ); SysFreeString( name ); + /* Field object supports ISupportErrorInfo */ + errorinfo = NULL; + hr = Field_QueryInterface( field, &IID_ISupportErrorInfo, (void **)&errorinfo ); + ok( hr == S_OK, "got %08x\n", hr ); + refs = get_refs_field( field ); + ok( refs == 2, "got %d\n", refs ); + if (errorinfo) ISupportErrorInfo_Release( errorinfo ); + refs = get_refs_field( field ); + ok( refs == 1, "got %d\n", refs ); + /* verify values set with _Append */ hr = Field_get_Name( field, &name ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.20.1

1 0