wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Nikolay Sivov : mfplat: Implement async file stream creation API.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 1cf021f45eeafe126bd1225dc450b7bab0d2961e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cf021f45eeafe126bd1225d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 2 17:09:07 2019 +0300 mfplat: Implement async file stream creation API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 257 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 6 +- dlls/mfplat/tests/mfplat.c | 67 ++++++++++++ include/mfapi.h | 4 + 4 files changed, 331 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1cf021f45eeafe126bd1…

1 0

Henri Verbeet : wined3d: Introduce wined3d_context_init().
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: cfe9314b646abbde60d1b1d05f92c43f82a27c30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfe9314b646abbde60d1b1d0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 2 17:28:52 2019 +0430 wined3d: Introduce wined3d_context_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 83 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4b6aaa9..223e6b2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1882,22 +1882,12 @@ HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, return ctx; } -struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, +static BOOL wined3d_context_init(struct wined3d_context *context, struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = swapchain->device; - struct wined3d_context_gl *context_gl; - struct wined3d_context *context; DWORD state; - TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); - - wined3d_from_cs(device->cs); - - if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) - return NULL; - context = &context_gl->c; - list_init(&context->timestamp_queries); list_init(&context->occlusion_queries); list_init(&context->fences); @@ -1910,31 +1900,28 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (!device->shader_backend->shader_allocate_context_data(context)) { ERR("Failed to allocate shader backend context data.\n"); - goto out; + return FALSE; } + if (!device->adapter->fragment_pipe->allocate_context_data(context)) { ERR("Failed to allocate fragment pipeline context data.\n"); - goto out; + device->shader_backend->shader_free_context_data(context); + return FALSE; } if (!(context->hdc = GetDCEx(swapchain->win_handle, 0, DCX_USESTYLE | DCX_CACHE))) { WARN("Failed to retrieve device context, trying swapchain backup.\n"); - if ((context->hdc = swapchain_get_backup_dc(swapchain))) - context->hdc_is_private = TRUE; - else + if (!(context->hdc = swapchain_get_backup_dc(swapchain))) { ERR("Failed to retrieve a device context.\n"); - goto out; + device->shader_backend->shader_free_context_data(context); + device->adapter->fragment_pipe->free_context_data(context); + return FALSE; } - } - - if (!device_context_add(device, context)) - { - ERR("Failed to add the newly created context to the context list\n"); - goto out; + context->hdc_is_private = TRUE; } context->win_handle = swapchain->win_handle; @@ -1956,13 +1943,6 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, context->current_rt.sub_resource_idx = 0; context->tid = GetCurrentThreadId(); - if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) - { - device_context_remove(device, context); - goto out; - } - - device->shader_backend->shader_init_context_state(context); context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) | (1u << WINED3D_SHADER_TYPE_VERTEX) | (1u << WINED3D_SHADER_TYPE_GEOMETRY) @@ -1970,13 +1950,50 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, | (1u << WINED3D_SHADER_TYPE_DOMAIN) | (1u << WINED3D_SHADER_TYPE_COMPUTE); + return TRUE; +} + +struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, + struct wined3d_texture *target, const struct wined3d_format *ds_format) +{ + struct wined3d_device *device = swapchain->device; + struct wined3d_context_gl *context_gl; + struct wined3d_context *context; + + TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); + + wined3d_from_cs(device->cs); + + if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) + return NULL; + context = &context_gl->c; + + if (!(wined3d_context_init(context, swapchain, target, ds_format))) + { + heap_free(context_gl); + return NULL; + } + + if (!device_context_add(device, context)) + { + ERR("Failed to add the newly created context to the context list\n"); + goto fail; + } + + if (!(device->adapter->adapter_ops->adapter_create_context(context, target, ds_format))) + { + device_context_remove(device, context); + goto fail; + } + + device->shader_backend->shader_init_context_state(context); + TRACE("Created context %p.\n", context); return context; -out: - if (context->hdc) - wined3d_release_dc(swapchain->win_handle, context->hdc); +fail: + wined3d_release_dc(context->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); heap_free(context_gl);

1 0

Henri Verbeet : wined3d: Introduce a separate structure for OpenGL context information.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 5cd787b341673b945af19edfd53685ca657089d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cd787b341673b945af19edf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 2 17:28:51 2019 +0430 wined3d: Introduce a separate structure for OpenGL context information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5015586..4b6aaa9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1886,6 +1886,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) { struct wined3d_device *device = swapchain->device; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; DWORD state; @@ -1893,8 +1894,9 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, wined3d_from_cs(device->cs); - if (!(context = heap_alloc_zero(sizeof(*context)))) + if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) return NULL; + context = &context_gl->c; list_init(&context->timestamp_queries); list_init(&context->occlusion_queries); @@ -1977,7 +1979,7 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context); + heap_free(context_gl); return NULL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index daba669..138cefb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2029,6 +2029,11 @@ struct wined3d_context unsigned int scissor_rect_count; }; +struct wined3d_context_gl +{ + struct wined3d_context c; +}; + struct wined3d_fb_state { struct wined3d_rendertarget_view *render_targets[MAX_RENDER_TARGET_VIEWS];

1 0

Henri Verbeet : wined3d: Get rid of the redundant "device" parameter to context_destroy().
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: bad9cd29a8f93d8984dbb0cf70a3baeee7722cd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bad9cd29a8f93d8984dbb0cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 2 17:28:50 2019 +0430 wined3d: Get rid of the redundant "device" parameter to context_destroy(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 +++++--- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f4179d7..5015586 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1581,7 +1581,7 @@ void context_release(struct wined3d_context *context) if (context->destroy_delayed) { TRACE("Destroying context %p.\n", context); - context_destroy(context->device, context); + wined3d_context_destroy(context); } } } @@ -2280,8 +2280,9 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, return TRUE; } -void context_destroy(struct wined3d_device *device, struct wined3d_context *context) +void wined3d_context_destroy(struct wined3d_context *context) { + struct wined3d_device *device = context->device; BOOL destroy; TRACE("Destroying ctx %p\n", context); @@ -2289,7 +2290,8 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont wined3d_from_cs(device->cs); /* We delay destroying a context when it is active. The context_release() - * function invokes context_destroy() again while leaving the last level. */ + * function invokes wined3d_context_destroy() again while leaving the last + * level. */ if (context->level) { TRACE("Delaying destruction of context %p.\n", context); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 23ba41c..e25565d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1019,7 +1019,7 @@ static void wined3d_device_delete_opengl_contexts_cs(void *object) if (device->contexts[0]->swapchain) swapchain_destroy_contexts(device->contexts[0]->swapchain); else - context_destroy(device, device->contexts[0]); + wined3d_context_destroy(device->contexts[0]); } } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c1429de..4ac091f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1095,7 +1095,7 @@ static struct wined3d_context *swapchain_create_context(struct wined3d_swapchain if (!(ctx_array = heap_calloc(swapchain->num_contexts + 1, sizeof(*ctx_array)))) { ERR("Out of memory when trying to allocate a new context array\n"); - context_destroy(swapchain->device, ctx); + wined3d_context_destroy(ctx); return NULL; } memcpy(ctx_array, swapchain->context, sizeof(*ctx_array) * swapchain->num_contexts); @@ -1114,7 +1114,7 @@ void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) for (i = 0; i < swapchain->num_contexts; ++i) { - context_destroy(swapchain->device, swapchain->context[i]); + wined3d_context_destroy(swapchain->context[i]); } heap_free(swapchain->context); swapchain->num_contexts = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 14444cb..daba669 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2189,7 +2189,7 @@ void context_copy_bo_address(struct wined3d_context *context, struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_texture *target, const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; -void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void wined3d_context_destroy(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture_gl *texture_gl, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use shader_glsl_append_imm_vec4() in shader_glsl_get_register_name().
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: e37a5e802944266e8c4c560e7b0ea757b9a457f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e37a5e802944266e8c4c560e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 2 17:28:49 2019 +0430 wined3d: Use shader_glsl_append_imm_vec4() in shader_glsl_get_register_name(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 86 ++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a71af2f..47eb6f2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -420,26 +420,43 @@ static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *bu shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } -static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values, - const struct wined3d_gl_info *gl_info) +static void shader_glsl_append_imm_vec(struct wined3d_string_buffer *buffer, + const float *values, unsigned int size, const struct wined3d_gl_info *gl_info) { - char str[4][17]; - - wined3d_ftoa(values[0], str[0]); - wined3d_ftoa(values[1], str[1]); - wined3d_ftoa(values[2], str[2]); - wined3d_ftoa(values[3], str[3]); + const int *int_values = (const int *)values; + unsigned int i; + char str[17]; - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + if (!gl_info->supported[ARB_SHADER_BIT_ENCODING]) { - const unsigned int *uint_values = (const unsigned int *)values; + if (size > 1) + shader_addline(buffer, "vec%u(", size); + + for (i = 0; i < size; ++i) + { + wined3d_ftoa(values[i], str); + shader_addline(buffer, i ? ", %s" : "%s", str); + } + + if (size > 1) + shader_addline(buffer, ")"); - shader_addline(buffer, "intBitsToFloat(ivec4(%#x, %#x, %#x, %#x))\n" - " /* %s, %s, %s, %s */", uint_values[0], uint_values[1], - uint_values[2], uint_values[3], str[0], str[1], str[2], str[3]); + return; } - else - shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); + + shader_addline(buffer, "intBitsToFloat("); + if (size > 1) + shader_addline(buffer, "ivec%u(", size); + + for (i = 0; i < size; ++i) + { + wined3d_ftoa(values[i], str); + shader_addline(buffer, i ? ", %#x /* %s */" : "%#x /* %s */", int_values[i], str); + } + + if (size > 1) + shader_addline(buffer, ")"); + shader_addline(buffer, ")"); } static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, @@ -2796,7 +2813,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { shader_addline(buffer, "const vec4 %s_lc%u = ", prefix, lconst->idx); - shader_glsl_append_imm_vec4(buffer, (const float *)lconst->value, gl_info); + shader_glsl_append_imm_vec(buffer, (const float *)lconst->value, ARRAY_SIZE(lconst->value), gl_info); shader_addline(buffer, ";\n"); } } @@ -2903,7 +2920,6 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * const struct wined3d_gl_info *gl_info = ctx->gl_info; const char *prefix = shader_glsl_get_prefix(version->type); struct glsl_src_param rel_param0, rel_param1; - char imm_str[4][17]; if (reg->idx[0].offset != ~0u && reg->idx[0].rel_addr) shader_glsl_add_src_param_ext(ctx, reg->idx[0].rel_addr, WINED3DSP_WRITEMASK_0, @@ -3139,15 +3155,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_UNORM: case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) - { - string_buffer_sprintf(register_name, "intBitsToFloat(%#x)", reg->u.immconst_data[0]); - } - else - { - wined3d_ftoa(*(const float *)reg->u.immconst_data, imm_str[0]); - string_buffer_sprintf(register_name, "%s", imm_str[0]); - } + string_buffer_clear(register_name); + shader_glsl_append_imm_vec(register_name, (const float *)reg->u.immconst_data, 1, gl_info); break; case WINED3D_DATA_INT: string_buffer_sprintf(register_name, "%#x", reg->u.immconst_data[0]); @@ -3169,21 +3178,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_UNORM: case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) - { - string_buffer_sprintf(register_name, "intBitsToFloat(ivec4(%#x, %#x, %#x, %#x))", - reg->u.immconst_data[0], reg->u.immconst_data[1], - reg->u.immconst_data[2], reg->u.immconst_data[3]); - } - else - { - wined3d_ftoa(*(const float *)&reg->u.immconst_data[0], imm_str[0]); - wined3d_ftoa(*(const float *)&reg->u.immconst_data[1], imm_str[1]); - wined3d_ftoa(*(const float *)&reg->u.immconst_data[2], imm_str[2]); - wined3d_ftoa(*(const float *)&reg->u.immconst_data[3], imm_str[3]); - string_buffer_sprintf(register_name, "vec4(%s, %s, %s, %s)", - imm_str[0], imm_str[1], imm_str[2], imm_str[3]); - } + string_buffer_clear(register_name); + shader_glsl_append_imm_vec(register_name, (const float *)reg->u.immconst_data, 4, gl_info); break; case WINED3D_DATA_INT: string_buffer_sprintf(register_name, "ivec4(%#x, %#x, %#x, %#x)", @@ -7968,10 +7964,10 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context if (args->srgb_correction) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0, gl_info); + shader_glsl_append_imm_vec(buffer, wined3d_srgb_const0, 4, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1, gl_info); + shader_glsl_append_imm_vec(buffer, wined3d_srgb_const1, 4, gl_info); shader_addline(buffer, ";\n"); } if (reg_maps->vpos || reg_maps->usesdsy) @@ -9825,10 +9821,10 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (settings->sRGB_write) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0, gl_info); + shader_glsl_append_imm_vec(buffer, wined3d_srgb_const0, 4, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1, gl_info); + shader_glsl_append_imm_vec(buffer, wined3d_srgb_const1, 4, gl_info); shader_addline(buffer, ";\n"); }

1 0

Henri Verbeet : wined3d: Introduce a debug helper for Vulkan return values.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 965ab44427603b508f4dd490e142990239b703b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=965ab44427603b508f4dd490… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 2 17:28:48 2019 +0430 wined3d: Introduce a debug helper for Vulkan return values. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 12 ++++++------ dlls/wined3d/utils.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index cb4dbab..a5fd891 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -240,7 +240,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi if ((vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device))) < 0) { - WARN("Failed to create Vulkan device, vr %d.\n", vr); + WARN("Failed to create Vulkan device, vr %s.\n", wined3d_debug_vkresult(vr)); vk_device = VK_NULL_HANDLE; hr = hresult_from_vk_result(vr); goto fail; @@ -455,7 +455,7 @@ static BOOL enable_vulkan_instance_extensions(uint32_t *extension_count, if ((vr = pfn_vkEnumerateInstanceExtensionProperties(NULL, &count, NULL)) < 0) { - WARN("Failed to count instance extensions, vr %d.\n", vr); + WARN("Failed to count instance extensions, vr %s.\n", wined3d_debug_vkresult(vr)); goto done; } if (!(extensions = heap_calloc(count, sizeof(*extensions)))) @@ -465,7 +465,7 @@ static BOOL enable_vulkan_instance_extensions(uint32_t *extension_count, } if ((vr = pfn_vkEnumerateInstanceExtensionProperties(NULL, &count, extensions)) < 0) { - WARN("Failed to enumerate extensions, vr %d.\n", vr); + WARN("Failed to enumerate extensions, vr %s.\n", wined3d_debug_vkresult(vr)); goto done; } @@ -548,7 +548,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { - WARN("Failed to create Vulkan instance, vr %d.\n", vr); + WARN("Failed to create Vulkan instance, vr %s.\n", wined3d_debug_vkresult(vr)); goto fail; } @@ -596,7 +596,7 @@ static VkPhysicalDevice get_vulkan_physical_device(struct wined3d_vk_info *vk_in if ((vr = VK_CALL(vkEnumeratePhysicalDevices(vk_info->instance, &count, NULL))) < 0) { - WARN("Failed to enumerate physical devices, vr %d.\n", vr); + WARN("Failed to enumerate physical devices, vr %s.\n", wined3d_debug_vkresult(vr)); return VK_NULL_HANDLE; } if (!count) @@ -613,7 +613,7 @@ static VkPhysicalDevice get_vulkan_physical_device(struct wined3d_vk_info *vk_in if ((vr = VK_CALL(vkEnumeratePhysicalDevices(vk_info->instance, &count, physical_devices))) < 0) { - WARN("Failed to get physical devices, vr %d.\n", vr); + WARN("Failed to get physical devices, vr %s.\n", wined3d_debug_vkresult(vr)); return VK_NULL_HANDLE; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ade29b0..e54eec2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5261,6 +5261,45 @@ const char *debug_glerror(GLenum error) { } } +const char *wined3d_debug_vkresult(VkResult vr) +{ + switch (vr) + { +#define WINED3D_TO_STR(x) case x: return #x + WINED3D_TO_STR(VK_ERROR_INVALID_DEVICE_ADDRESS_EXT); + WINED3D_TO_STR(VK_ERROR_NOT_PERMITTED_EXT); + WINED3D_TO_STR(VK_ERROR_FRAGMENTATION_EXT); + WINED3D_TO_STR(VK_ERROR_INVALID_EXTERNAL_HANDLE); + WINED3D_TO_STR(VK_ERROR_OUT_OF_POOL_MEMORY); + WINED3D_TO_STR(VK_ERROR_INVALID_SHADER_NV); + WINED3D_TO_STR(VK_ERROR_OUT_OF_DATE_KHR); + WINED3D_TO_STR(VK_ERROR_NATIVE_WINDOW_IN_USE_KHR); + WINED3D_TO_STR(VK_ERROR_SURFACE_LOST_KHR); + WINED3D_TO_STR(VK_ERROR_FRAGMENTED_POOL); + WINED3D_TO_STR(VK_ERROR_FORMAT_NOT_SUPPORTED); + WINED3D_TO_STR(VK_ERROR_TOO_MANY_OBJECTS); + WINED3D_TO_STR(VK_ERROR_INCOMPATIBLE_DRIVER); + WINED3D_TO_STR(VK_ERROR_FEATURE_NOT_PRESENT); + WINED3D_TO_STR(VK_ERROR_EXTENSION_NOT_PRESENT); + WINED3D_TO_STR(VK_ERROR_LAYER_NOT_PRESENT); + WINED3D_TO_STR(VK_ERROR_MEMORY_MAP_FAILED); + WINED3D_TO_STR(VK_ERROR_DEVICE_LOST); + WINED3D_TO_STR(VK_ERROR_INITIALIZATION_FAILED); + WINED3D_TO_STR(VK_ERROR_OUT_OF_DEVICE_MEMORY); + WINED3D_TO_STR(VK_ERROR_OUT_OF_HOST_MEMORY); + WINED3D_TO_STR(VK_SUCCESS); + WINED3D_TO_STR(VK_NOT_READY); + WINED3D_TO_STR(VK_TIMEOUT); + WINED3D_TO_STR(VK_EVENT_SET); + WINED3D_TO_STR(VK_EVENT_RESET); + WINED3D_TO_STR(VK_INCOMPLETE); + WINED3D_TO_STR(VK_SUBOPTIMAL_KHR); +#undef WINED3D_TO_STR + default: + return wine_dbg_sprintf("unrecognised(%d)", vr); + } +} + static const char *debug_fixup_channel_source(enum fixup_channel_source source) { switch(source) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00e1de6..14444cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3222,6 +3222,7 @@ const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; const char *wined3d_debug_bind_flags(DWORD bind_flags) DECLSPEC_HIDDEN; const char *wined3d_debug_view_desc(const struct wined3d_view_desc *d, const struct wined3d_resource *resource) DECLSPEC_HIDDEN; +const char *wined3d_debug_vkresult(VkResult vr) DECLSPEC_HIDDEN; static inline BOOL wined3d_resource_access_is_managed(unsigned int access) {

1 0

Jacek Caban : ntoskrnl.exe: Support UserEvent in IoCompleteRequest.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 0ee017f2ed74690ef47567de8c5394a0a837a5ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ee017f2ed74690ef47567de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 2 13:21:48 2019 +0200 ntoskrnl.exe: Support UserEvent in IoCompleteRequest. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 + dlls/ntoskrnl.exe/tests/driver.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c4c3bab..b4afc1f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2304,6 +2304,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) if (irp->Flags & IRP_DEALLOCATE_BUFFER) HeapFree( GetProcessHeap(), 0, irp->AssociatedIrp.SystemBuffer ); + if (irp->UserEvent) KeSetEvent( irp->UserEvent, IO_NO_INCREMENT, FALSE ); IoFreeIrp( irp ); } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 9ad2bb9..35a86bb 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -752,7 +752,6 @@ static void test_call_driver(DEVICE_OBJECT *device) IoCompleteRequest(irp, IO_NO_INCREMENT); status = wait_single(&event, 0); - todo_wine ok(status == STATUS_SUCCESS, "got %#x\n", status); }

1 0

Jacek Caban : ntoskrnl.exe: Set IRP DeviceObject in IoCallDriver.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 0a8c36b8e3ed66a3cbdbb534a5fc0256b50751fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a8c36b8e3ed66a3cbdbb534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 2 13:21:39 2019 +0200 ntoskrnl.exe: Set IRP DeviceObject in IoCallDriver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++---- dlls/ntoskrnl.exe/tests/driver.c | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6ac2a3e..c4c3bab 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -622,7 +622,6 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CREATE; - irpsp->DeviceObject = device; irpsp->FileObject = file; irpsp->Parameters.Create.SecurityContext = NULL; /* FIXME */ irpsp->Parameters.Create.Options = params->create.options; @@ -667,7 +666,6 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CLOSE; - irpsp->DeviceObject = device; irpsp->FileObject = file; irp->Tail.Overlay.OriginalFileObject = file; @@ -1332,7 +1330,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, irpsp->Parameters.DeviceIoControl.IoControlCode = code; irpsp->Parameters.DeviceIoControl.InputBufferLength = in_len; irpsp->Parameters.DeviceIoControl.OutputBufferLength = out_len; - irpsp->DeviceObject = device; + irpsp->DeviceObject = NULL; irpsp->CompletionRoutine = NULL; switch (code & 3) @@ -1382,7 +1380,7 @@ PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG majorfunc, DEVICE_OBJECT *device irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = majorfunc; - irpsp->DeviceObject = device; + irpsp->DeviceObject = NULL; irpsp->CompletionRoutine = NULL; irp->AssociatedIrp.SystemBuffer = buffer; @@ -1966,6 +1964,7 @@ NTSTATUS WINAPI IoCallDriver( DEVICE_OBJECT *device, IRP *irp ) --irp->CurrentLocation; irpsp = --irp->Tail.Overlay.s.u2.CurrentStackLocation; + irpsp->DeviceObject = device; dispatch = device->DriverObject->MajorFunction[irpsp->MajorFunction]; TRACE_(relay)( "\1Call driver dispatch %p (device=%p,irp=%p)\n", dispatch, device, irp ); diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6d14a22..9ad2bb9 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -712,7 +712,6 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - todo_wine ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine); @@ -735,7 +734,6 @@ static void test_call_driver(DEVICE_OBJECT *device) irpsp = IoGetNextIrpStackLocation(irp); ok(irpsp->MajorFunction == IRP_MJ_FLUSH_BUFFERS, "MajorFunction = %u\n", irpsp->MajorFunction); - todo_wine ok(!irpsp->DeviceObject, "DeviceObject = %u\n", irpsp->DeviceObject); ok(!irpsp->FileObject, "FileObject = %u\n", irpsp->FileObject); ok(!irpsp->CompletionRoutine, "CompletionRouptine = %p\n", irpsp->CompletionRoutine);

1 0

Jacek Caban : ntoskrnl.exe/tests: Add CancelIo tests.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 60ddf0f09e327df0a492fe1f6b2cdbd6acc1d61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=60ddf0f09e327df0a492fe1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 2 13:21:29 2019 +0200 ntoskrnl.exe/tests: Add CancelIo tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 36 +++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 3 ++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 80 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c2ef890..6d14a22 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -770,6 +770,15 @@ static void WINAPI cancel_irp(DEVICE_OBJECT *device, IRP *irp) cancel_cnt++; } +static void WINAPI cancel_ioctl_irp(DEVICE_OBJECT *device, IRP *irp) +{ + IoReleaseCancelSpinLock(irp->CancelIrql); + irp->IoStatus.Status = STATUS_CANCELLED; + irp->IoStatus.Information = 0; + cancel_cnt++; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static NTSTATUS WINAPI cancel_test_completion(DEVICE_OBJECT *device, IRP *irp, void *context) { ok(cancel_cnt == 1, "cancel_cnt = %d\n", cancel_cnt); @@ -1505,6 +1514,22 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * return STATUS_SUCCESS; } +static NTSTATUS get_cancel_count(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + char *buffer = irp->AssociatedIrp.SystemBuffer; + + if (!buffer) + return STATUS_ACCESS_VIOLATION; + + if (length < sizeof(DWORD)) + return STATUS_BUFFER_TOO_SMALL; + + *(DWORD*)buffer = cancel_cnt; + *info = sizeof(DWORD); + return STATUS_SUCCESS; +} + static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { BOOL *load = irp->AssociatedIrp.SystemBuffer; @@ -1549,6 +1574,17 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_LOAD_DRIVER: status = test_load_driver_ioctl(irp, stack, &irp->IoStatus.Information); break; + case IOCTL_WINETEST_RESET_CANCEL: + cancel_cnt = 0; + status = STATUS_SUCCESS; + break; + case IOCTL_WINETEST_TEST_CANCEL: + IoSetCancelRoutine(irp, cancel_ioctl_irp); + IoMarkIrpPending(irp); + return STATUS_PENDING; + case IOCTL_WINETEST_GET_CANCEL_COUNT: + status = get_cancel_count(irp, stack, &irp->IoStatus.Information); + break; default: break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index be4a9dc..1e75529 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -25,6 +25,9 @@ #define IOCTL_WINETEST_BASIC_IOCTL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x800, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_MAIN_TEST CTL_CODE(FILE_DEVICE_UNKNOWN, 0x801, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_LOAD_DRIVER CTL_CODE(FILE_DEVICE_UNKNOWN, 0x802, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_RESET_CANCEL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x803, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_TEST_CANCEL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x804, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_GET_CANCEL_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x805, METHOD_BUFFERED, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c17da7f..d9eb286 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -197,6 +197,85 @@ static void test_basic_ioctl(void) ok(!strcmp(buf, teststr), "got '%s'\n", buf); } +static void test_cancel_io(void) +{ + OVERLAPPED overlapped, overlapped2; + DWORD cancel_cnt; + HANDLE file; + BOOL res; + + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + overlapped2.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + file = CreateFileA("\\\\.\\WineTestDriver", 0, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); + + /* test cancelling all device requests */ + res = DeviceIoControl(file, IOCTL_WINETEST_RESET_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + + res = DeviceIoControl(file, IOCTL_WINETEST_TEST_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); + ok(!res && GetLastError() == ERROR_IO_PENDING, "DeviceIoControl failed: %u\n", GetLastError()); + + res = DeviceIoControl(file, IOCTL_WINETEST_TEST_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped2); + ok(!res && GetLastError() == ERROR_IO_PENDING, "DeviceIoControl failed: %u\n", GetLastError()); + + cancel_cnt = 0xdeadbeef; + res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + ok(cancel_cnt == 0, "cancel_cnt = %u\n", cancel_cnt); + + CancelIo(file); + + cancel_cnt = 0xdeadbeef; + res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + todo_wine + ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt); + + /* test cancelling selected overlapped event */ + res = DeviceIoControl(file, IOCTL_WINETEST_RESET_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + + res = DeviceIoControl(file, IOCTL_WINETEST_TEST_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped); + ok(!res && GetLastError() == ERROR_IO_PENDING, "DeviceIoControl failed: %u\n", GetLastError()); + + res = DeviceIoControl(file, IOCTL_WINETEST_TEST_CANCEL, NULL, 0, NULL, 0, NULL, &overlapped2); + ok(!res && GetLastError() == ERROR_IO_PENDING, "DeviceIoControl failed: %u\n", GetLastError()); + + CancelIoEx(file, &overlapped); + + cancel_cnt = 0xdeadbeef; + res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + todo_wine + ok(cancel_cnt == 1, "cancel_cnt = %u\n", cancel_cnt); + + CancelIoEx(file, &overlapped2); + + cancel_cnt = 0xdeadbeef; + res = DeviceIoControl(file, IOCTL_WINETEST_GET_CANCEL_COUNT, NULL, 0, &cancel_cnt, sizeof(cancel_cnt), NULL, &overlapped); + todo_wine + ok(res, "DeviceIoControl failed: %u\n", GetLastError()); + if (!res && GetLastError() == ERROR_IO_PENDING) WaitForSingleObject(overlapped.hEvent, INFINITE); + todo_wine + ok(cancel_cnt == 2, "cancel_cnt = %u\n", cancel_cnt); + + CloseHandle(overlapped.hEvent); + CloseHandle(overlapped2.hEvent); + CloseHandle(file); +} + static void test_load_driver(SC_HANDLE service) { SERVICE_STATUS status; @@ -268,6 +347,7 @@ START_TEST(ntoskrnl) test_basic_ioctl(); main_test(); + test_cancel_io(); test_load_driver(service2); unload_driver(service2);

1 0

Jacek Caban : ntoskrnl.exe: Implement IoCancelIrp.
by Alexandre Julliard 02 May '19

02 May '19

Module: wine Branch: master Commit: 5f10c86d5bbd20466091a7a54424ad630a8d3812 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f10c86d5bbd20466091a7a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 2 13:21:19 2019 +0200 ntoskrnl.exe: Implement IoCancelIrp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 25 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 120 ++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 4 ++ 4 files changed, 150 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 63f6647..6ac2a3e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2322,6 +2322,31 @@ void WINAPI IofCompleteRequest( IRP *irp, UCHAR priority_boost ) /*********************************************************************** + * IoCancelIrp (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI IoCancelIrp( IRP *irp ) +{ + PDRIVER_CANCEL cancel_routine; + KIRQL irql; + + TRACE( "(%p)\n", irp ); + + IoAcquireCancelSpinLock( &irql ); + irp->Cancel = TRUE; + if (!(cancel_routine = IoSetCancelRoutine( irp, NULL ))) + { + IoReleaseCancelSpinLock( irp->CancelIrql ); + return FALSE; + } + + /* CancelRoutine is responsible for calling IoReleaseCancelSpinLock */ + irp->CancelIrql = irql; + cancel_routine( IoGetCurrentIrpStackLocation(irp)->DeviceObject, irp ); + return TRUE; +} + + +/*********************************************************************** * InterlockedCompareExchange (NTOSKRNL.EXE.@) */ DEFINE_FASTCALL_WRAPPER( NTOSKRNL_InterlockedCompareExchange, 12 ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 20999d2..af43b2a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -336,7 +336,7 @@ @ stdcall IoBuildSynchronousFsdRequest(long ptr ptr long ptr ptr ptr) @ stdcall IoCallDriver(ptr ptr) @ stub IoCancelFileOpen -@ stub IoCancelIrp +@ stdcall IoCancelIrp(ptr) @ stub IoCheckDesiredAccess @ stub IoCheckEaBufferValidity @ stub IoCheckFunctionAccess diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 5e6d5ca..c2ef890 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -758,6 +758,125 @@ static void test_call_driver(DEVICE_OBJECT *device) ok(status == STATUS_SUCCESS, "got %#x\n", status); } +static int cancel_cnt; + +static void WINAPI cancel_irp(DEVICE_OBJECT *device, IRP *irp) +{ + IoReleaseCancelSpinLock(irp->CancelIrql); + ok(irp->Cancel == TRUE, "Cancel = %x\n", irp->Cancel); + ok(!irp->CancelRoutine, "CancelRoutine = %p\n", irp->CancelRoutine); + irp->IoStatus.Status = STATUS_CANCELLED; + irp->IoStatus.Information = 0; + cancel_cnt++; +} + +static NTSTATUS WINAPI cancel_test_completion(DEVICE_OBJECT *device, IRP *irp, void *context) +{ + ok(cancel_cnt == 1, "cancel_cnt = %d\n", cancel_cnt); + *(BOOL*)context = TRUE; + return STATUS_SUCCESS; +} + +static void test_cancel_irp(DEVICE_OBJECT *device) +{ + IO_STACK_LOCATION *irpsp; + IO_STATUS_BLOCK iosb; + IRP *irp = NULL; + BOOL completion_called; + BOOLEAN r; + NTSTATUS status; + + /* cancel IRP with no cancel routine */ + irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); + + r = IoCancelIrp(irp); + ok(!r, "IoCancelIrp returned %x\n", r); + ok(irp->Cancel == TRUE, "Cancel = %x\n", irp->Cancel); + + r = IoCancelIrp(irp); + ok(!r, "IoCancelIrp returned %x\n", r); + IoFreeIrp(irp); + + irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); + + /* cancel IRP with cancel routine */ + status = IoCallDriver(device, irp); + ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); + + ok(irp->CurrentLocation == 1, "CurrentLocation = %u\n", irp->CurrentLocation); + irpsp = IoGetCurrentIrpStackLocation(irp); + ok(irpsp->DeviceObject == device, "DeviceObject = %u\n", irpsp->DeviceObject); + + IoSetCancelRoutine(irp, cancel_irp); + cancel_cnt = 0; + r = IoCancelIrp(irp); + ok(r == TRUE, "IoCancelIrp returned %x\n", r); + ok(irp->Cancel == TRUE, "Cancel = %x\n", irp->Cancel); + ok(cancel_cnt == 1, "cancel_cnt = %d\n", cancel_cnt); + + cancel_cnt = 0; + r = IoCancelIrp(irp); + ok(!r, "IoCancelIrp returned %x\n", r); + ok(irp->Cancel == TRUE, "Cancel = %x\n", irp->Cancel); + ok(!cancel_cnt, "cancel_cnt = %d\n", cancel_cnt); + + IoCompleteRequest(irp, IO_NO_INCREMENT); + + /* cancel IRP with cancel and completion routines with no SL_INVOKE_ON_ERROR */ + irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); + IoSetCompletionRoutine(irp, cancel_test_completion, &completion_called, TRUE, FALSE, TRUE); + + status = IoCallDriver(device, irp); + ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); + + IoSetCancelRoutine(irp, cancel_irp); + cancel_cnt = 0; + r = IoCancelIrp(irp); + ok(r == TRUE, "IoCancelIrp returned %x\n", r); + ok(cancel_cnt == 1, "cancel_cnt = %d\n", cancel_cnt); + ok(irp->Cancel == TRUE, "Cancel = %x\n", irp->Cancel); + + completion_called = FALSE; + IoCompleteRequest(irp, IO_NO_INCREMENT); + ok(completion_called, "completion not called\n"); + + /* cancel IRP with cancel and completion routines with no SL_INVOKE_ON_CANCEL flag */ + irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); + IoSetCompletionRoutine(irp, cancel_test_completion, &completion_called, TRUE, TRUE, FALSE); + + status = IoCallDriver(device, irp); + ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); + + IoSetCancelRoutine(irp, cancel_irp); + cancel_cnt = 0; + r = IoCancelIrp(irp); + ok(r == TRUE, "IoCancelIrp returned %x\n", r); + ok(irp->Cancel == TRUE, "Cancel = %x\n", irp->Cancel); + ok(cancel_cnt == 1, "cancel_cnt = %d\n", cancel_cnt); + + completion_called = FALSE; + IoCompleteRequest(irp, IO_NO_INCREMENT); + ok(completion_called, "completion not called\n"); + + /* cancel IRP with cancel and completion routines, but no SL_INVOKE_ON_ERROR nor SL_INVOKE_ON_CANCEL flag */ + irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); + IoSetCompletionRoutine(irp, cancel_test_completion, &completion_called, TRUE, FALSE, FALSE); + + status = IoCallDriver(device, irp); + ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); + + IoSetCancelRoutine(irp, cancel_irp); + cancel_cnt = 0; + r = IoCancelIrp(irp); + ok(r == TRUE, "IoCancelIrp returned %x\n", r); + ok(irp->Cancel == TRUE, "Cancel = %x\n", irp->Cancel); + ok(cancel_cnt == 1, "cancel_cnt = %d\n", cancel_cnt); + + completion_called = FALSE; + IoCompleteRequest(irp, IO_NO_INCREMENT); + ok(!completion_called, "completion not called\n"); +} + static int callout_cnt; static void WINAPI callout(void *parameter) @@ -1294,6 +1413,7 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) test_current_thread(TRUE); test_call_driver(device); + test_cancel_irp(device); /* print process report */ if (winetest_debug) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 1f6bdfa..6fb718a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1493,6 +1493,9 @@ NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); # endif #endif +#define IoSetCancelRoutine(irp, routine) \ + ((PDRIVER_CANCEL)InterlockedExchangePointer((void **)&(irp)->CancelRoutine, routine)) + static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routine, void *context, BOOLEAN on_success, BOOLEAN on_error, BOOLEAN on_cancel) { @@ -1563,6 +1566,7 @@ PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG,DEVICE_OBJECT*,void*,ULONG, PIRP WINAPI IoBuildDeviceIoControlRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PVOID,ULONG,BOOLEAN,PKEVENT,IO_STATUS_BLOCK*); PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG,DEVICE_OBJECT*,PVOID,ULONG,PLARGE_INTEGER,PKEVENT,IO_STATUS_BLOCK*); NTSTATUS WINAPI IoCallDriver(DEVICE_OBJECT*,IRP*); +BOOLEAN WINAPI IoCancelIrp(IRP*); VOID WINAPI IoCompleteRequest(IRP*,UCHAR); NTSTATUS WINAPI IoCreateDevice(DRIVER_OBJECT*,ULONG,UNICODE_STRING*,DEVICE_TYPE,ULONG,BOOLEAN,DEVICE_OBJECT**); NTSTATUS WINAPI IoCreateDriver(UNICODE_STRING*,PDRIVER_INITIALIZE);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019