May 2019 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Use shader_glsl_append_imm_vec4() in shader_glsl_get_register_name().
by Alexandre Julliard May 2, 2019

May 2, 2019

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 May 2, 2019

May 2, 2019

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/tests: Add CancelIo tests.
by Alexandre Julliard May 2, 2019

May 2, 2019

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 May 2, 2019

May 2, 2019

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

Jacek Caban : ntoskrnl.exe/tests: Add IoCallDriver tests.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: da5b97c8b4b09c19288495cb49b0515fecfd09a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da5b97c8b4b09c19288495cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 2 13:21:05 2019 +0200 ntoskrnl.exe/tests: Add IoCallDriver 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 | 74 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index ac31a4d..5e6d5ca 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -233,6 +233,7 @@ static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) ok(irpsp->FileObject == last_created_file, "FileObject != last_created_file\n"); ok(irpsp->DeviceObject == device, "unexpected DeviceObject\n"); ok(irpsp->FileObject->DeviceObject == device, "unexpected FileObject->DeviceObject\n"); + ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); } static void test_mdl_map(void) @@ -694,6 +695,69 @@ static void test_sync(void) KeCancelTimer(&timer); } +static void test_call_driver(DEVICE_OBJECT *device) +{ + IO_STACK_LOCATION *irpsp; + IO_STATUS_BLOCK iosb; + IRP *irp = NULL; + KEVENT event; + NTSTATUS status; + + irp = IoBuildAsynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &iosb); + ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); + ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); + ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); + ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); + + 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); + + status = IoCallDriver(device, irp); + ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); + + irp->IoStatus.Status = STATUS_SUCCESS; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); + + KeInitializeEvent(&event, NotificationEvent, FALSE); + + irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, device, NULL, 0, NULL, &event, &iosb); + ok(irp->UserIosb == &iosb, "unexpected UserIosb\n"); + ok(!irp->Cancel, "Cancel = %x\n", irp->Cancel); + ok(!irp->CancelRoutine, "CancelRoutine = %x\n", irp->CancelRoutine); + ok(irp->UserEvent == &event, "UserEvent = %p\n", irp->UserEvent); + ok(irp->CurrentLocation == 2, "CurrentLocation = %u\n", irp->CurrentLocation); + + 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); + + status = wait_single(&event, 0); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + + status = IoCallDriver(device, irp); + ok(status == STATUS_PENDING, "IoCallDriver returned %#x\n", status); + + status = wait_single(&event, 0); + ok(status == STATUS_TIMEOUT, "got %#x\n", status); + + irp->IoStatus.Status = STATUS_SUCCESS; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); + + status = wait_single(&event, 0); + todo_wine + ok(status == STATUS_SUCCESS, "got %#x\n", status); +} + static int callout_cnt; static void WINAPI callout(void *parameter) @@ -1229,6 +1293,7 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) main_test_work_item = NULL; test_current_thread(TRUE); + test_call_driver(device); /* print process report */ if (winetest_debug) @@ -1377,6 +1442,14 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) return status; } +static NTSTATUS WINAPI driver_FlushBuffers(DEVICE_OBJECT *device, IRP *irp) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); + ok(irpsp->DeviceObject == device, "device != DeviceObject\n"); + IoMarkIrpPending(irp); + return STATUS_PENDING; +} + static NTSTATUS WINAPI driver_Close(DEVICE_OBJECT *device, IRP *irp) { irp->IoStatus.Status = STATUS_SUCCESS; @@ -1410,6 +1483,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) /* Set driver functions */ driver->MajorFunction[IRP_MJ_CREATE] = driver_Create; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = driver_IoControl; + driver->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = driver_FlushBuffers; driver->MajorFunction[IRP_MJ_CLOSE] = driver_Close; RtlInitUnicodeString(&nameW, driver_device);

1 0

Jacek Caban : ntoskrnl.exe: Implement IoBuildAsynchronousFsdRequest.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: a11cdd2231d8d736f79c806e00fc81d9776db9ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=a11cdd2231d8d736f79c806e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 2 13:20:52 2019 +0200 ntoskrnl.exe: Implement IoBuildAsynchronousFsdRequest. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 35 +++++++++++++++++++++++++++-------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index eff90bb..63f6647 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1366,18 +1366,17 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, return irp; } - -/********************************************************** - * IoBuildSynchronousFsdRequest (NTOSKRNL.EXE.@) +/*********************************************************************** + * IoBuildAsynchronousFsdRequest (NTOSKRNL.EXE.@) */ -PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, - PVOID buffer, ULONG length, PLARGE_INTEGER startoffset, - PKEVENT event, PIO_STATUS_BLOCK iosb) +PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG majorfunc, DEVICE_OBJECT *device, + void *buffer, ULONG length, LARGE_INTEGER *startoffset, + IO_STATUS_BLOCK *iosb) { PIRP irp; PIO_STACK_LOCATION irpsp; - TRACE("(%d %p %p %d %p %p %p)\n", majorfunc, device, buffer, length, startoffset, event, iosb); + TRACE( "(%d %p %p %d %p %p)\n", majorfunc, device, buffer, length, startoffset, iosb ); if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) return NULL; @@ -1414,11 +1413,31 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, } irp->RequestorMode = KernelMode; irp->UserIosb = iosb; - irp->UserEvent = event; + irp->UserEvent = NULL; irp->UserBuffer = buffer; return irp; } + + +/*********************************************************************** + * IoBuildSynchronousFsdRequest (NTOSKRNL.EXE.@) + */ +PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, + PVOID buffer, ULONG length, PLARGE_INTEGER startoffset, + PKEVENT event, PIO_STATUS_BLOCK iosb) +{ + IRP *irp; + + TRACE("(%d %p %p %d %p %p)\n", majorfunc, device, buffer, length, startoffset, iosb); + + irp = IoBuildAsynchronousFsdRequest( majorfunc, device, buffer, length, startoffset, iosb ); + if (!irp) return NULL; + + irp->UserEvent = event; + return irp; +} + static void build_driver_keypath( const WCHAR *name, UNICODE_STRING *keypath ) { static const WCHAR driverW[] = {'\\','D','r','i','v','e','r','\\',0}; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a1c84ee..20999d2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -330,7 +330,7 @@ @ stub IoAttachDeviceByPointer @ stdcall IoAttachDeviceToDeviceStack(ptr ptr) @ stub IoAttachDeviceToDeviceStackSafe -@ stub IoBuildAsynchronousFsdRequest +@ stdcall IoBuildAsynchronousFsdRequest(long ptr ptr long ptr ptr) @ stdcall IoBuildDeviceIoControlRequest(long ptr ptr long ptr long long ptr ptr) @ stub IoBuildPartialMdl @ stdcall IoBuildSynchronousFsdRequest(long ptr ptr long ptr ptr ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 25f2d49..1f6bdfa 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1559,6 +1559,7 @@ PIRP WINAPI IoAllocateIrp(CCHAR,BOOLEAN); PMDL WINAPI IoAllocateMdl(PVOID,ULONG,BOOLEAN,BOOLEAN,IRP*); PIO_WORKITEM WINAPI IoAllocateWorkItem(PDEVICE_OBJECT); PDEVICE_OBJECT WINAPI IoAttachDeviceToDeviceStack(PDEVICE_OBJECT,PDEVICE_OBJECT); +PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG,DEVICE_OBJECT*,void*,ULONG,LARGE_INTEGER*,IO_STATUS_BLOCK*); 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*);

1 0

Zebediah Figura : setupapi/tests: Add tests for source media path resolution.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: d5a6a2675c250cffd7b37a27d61fc2031b1d7b21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5a6a2675c250cffd7b37a27… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:14 2019 -0500 setupapi/tests: Add tests for source media path resolution. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 728 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 728 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5a6a2675c250cffd7b3…

1 0

Zebediah Figura : setupapi: Implement source media path resolution.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: 3e5c9798a80641e0e39e95e4467c60405b22b062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e5c9798a80641e0e39e95e4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:13 2019 -0500 setupapi: Implement source media path resolution. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47107 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 110 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 98 insertions(+), 12 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index ec5c9fa..c065c6e 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -55,6 +55,8 @@ struct source_media { WCHAR root[MAX_PATH]; WCHAR *desc, *tag; + BOOL resolved; + BOOL cabinet; }; struct file_op @@ -518,6 +520,8 @@ static struct source_media *get_source_media(struct file_queue *queue, strcpyW(queue->sources[i]->root, root); queue->sources[i]->desc = strdupW(desc); queue->sources[i]->tag = strdupW(tag); + queue->sources[i]->resolved = FALSE; + queue->sources[i]->cabinet = FALSE; return queue->sources[i]; } @@ -1284,7 +1288,10 @@ static BOOL queue_copy_file( const WCHAR *source, const WCHAR *dest, /* try to extract it from the cabinet file */ if (op->media->tag && extract_cabinet_file(op->media->tag, op->media->root, op->src_file, dest)) + { + op->media->cabinet = TRUE; return TRUE; + } return FALSE; } @@ -1367,22 +1374,101 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC { WCHAR newpath[MAX_PATH]; - build_filepathsW( op, &paths ); - op_result = handler( context, SPFILENOTIFY_STARTCOPY, (UINT_PTR)&paths, FILEOP_COPY ); - if (op_result == FILEOP_ABORT) goto done; - if (op_result == FILEOP_NEWPATH) op_result = FILEOP_DOIT; - while (op_result == FILEOP_DOIT || op_result == FILEOP_NEWPATH) + if (!op->media->resolved) { - if (queue_copy_file( op_result == FILEOP_NEWPATH ? newpath : paths.Source, - paths.Target, op, handler, context )) + /* The NEEDMEDIA callback asks for the folder containing the + * first file, but that might be in a subdir of the source + * disk's root directory. We have to do some contortions to + * correct for this. Pretend that the file we're using + * actually isn't in a subdirectory, but keep track of what it + * was, and then later strip it from the root path that we + * ultimately resolve the source disk to. */ + WCHAR *src_path = op->src_path; + + op->src_path = NULL; + if (src_path) + { + strcatW(op->media->root, backslashW); + strcatW(op->media->root, src_path); + } + + for (;;) + { + SOURCE_MEDIA_W media; + media.Reserved = NULL; + media.Tagfile = op->media->tag; + media.Description = op->media->desc; + media.SourcePath = op->media->root; + media.SourceFile = op->src_file; + media.Flags = op->style & (SP_COPY_WARNIFSKIP | SP_COPY_NOSKIP | SP_FLAG_CABINETCONTINUATION | SP_COPY_NOBROWSE); + + newpath[0] = 0; + op_result = handler( context, SPFILENOTIFY_NEEDMEDIA, (UINT_PTR)&media, (UINT_PTR)newpath ); + + if (op_result == FILEOP_ABORT) + goto done; + else if (op_result == FILEOP_SKIP) + break; + else if (op_result == FILEOP_NEWPATH) + strcpyW(op->media->root, newpath); + else if (op_result != FILEOP_DOIT) + FIXME("Unhandled return value %#x.\n", op_result); + + build_filepathsW( op, &paths ); + op_result = handler( context, SPFILENOTIFY_STARTCOPY, (UINT_PTR)&paths, FILEOP_COPY ); + if (op_result == FILEOP_ABORT) + goto done; + else if (op_result == FILEOP_SKIP) + break; + else if (op_result != FILEOP_DOIT) + FIXME("Unhandled return value %#x.\n", op_result); + + if (queue_copy_file( paths.Source, paths.Target, op, handler, context )) + { + if (src_path && !op->media->cabinet) + { + size_t root_len = strlenW(op->media->root), path_len = strlenW(src_path); + if (path_len <= root_len && !strncmpiW(op->media->root + root_len - path_len, src_path, path_len)) + op->media->root[root_len - path_len - 1] = 0; + heap_free( src_path ); + } + op->media->resolved = TRUE; + handler( context, SPFILENOTIFY_ENDCOPY, (UINT_PTR)&paths, 0 ); + break; + } + } + } + else + { + build_filepathsW( op, &paths ); + op_result = handler( context, SPFILENOTIFY_STARTCOPY, (UINT_PTR)&paths, FILEOP_COPY ); + if (op_result == FILEOP_ABORT) + goto done; + else if (op_result == FILEOP_SKIP) break; + else if (op_result != FILEOP_DOIT) + FIXME("Unhandled return value %#x.\n", op_result); - paths.Win32Error = GetLastError(); - op_result = handler( context, SPFILENOTIFY_COPYERROR, - (UINT_PTR)&paths, (UINT_PTR)newpath ); - if (op_result == FILEOP_ABORT) goto done; + while (op_result == FILEOP_DOIT || op_result == FILEOP_NEWPATH) + { + if (queue_copy_file( paths.Source, paths.Target, op, handler, context )) + break; + + paths.Win32Error = GetLastError(); + newpath[0] = 0; + op_result = handler( context, SPFILENOTIFY_COPYERROR, (UINT_PTR)&paths, (UINT_PTR)newpath ); + if (op_result == FILEOP_ABORT) + goto done; + else if (op_result == FILEOP_NEWPATH) + { + strcpyW(op->media->root, newpath); + build_filepathsW(op, &paths); + } + else if (op_result != FILEOP_SKIP && op_result != FILEOP_DOIT) + FIXME("Unhandled return value %#x.\n", op_result); + } + handler( context, SPFILENOTIFY_ENDCOPY, (UINT_PTR)&paths, 0 ); } - handler( context, SPFILENOTIFY_ENDCOPY, (UINT_PTR)&paths, 0 ); } handler( context, SPFILENOTIFY_ENDSUBQUEUE, FILEOP_COPY, 0 ); }

1 0

Zebediah Figura : setupapi: Keep track of source media in a separate list.
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: 31bb0097ad85090b1e006ade020c68aa5582dc0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=31bb0097ad85090b1e006ade… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:08 2019 -0500 setupapi: Keep track of source media in a separate list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 122 +++++++++++++++++++++++++++++--------------------- 1 file changed, 71 insertions(+), 51 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 73929ea..fb0c401 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -51,17 +51,21 @@ struct default_callback_context DWORD_PTR unk3[5]; }; +struct source_media +{ + WCHAR root[MAX_PATH]; + WCHAR *desc, *tag; +}; + struct file_op { struct file_op *next; UINT style; - WCHAR *src_root; WCHAR *src_path; WCHAR *src_file; - WCHAR *src_descr; - WCHAR *src_tag; WCHAR *dst_path; WCHAR *dst_file; + struct source_media *media; }; struct file_op_queue @@ -76,7 +80,9 @@ struct file_queue struct file_op_queue copy_queue; struct file_op_queue delete_queue; struct file_op_queue rename_queue; - DWORD flags; + DWORD flags; + struct source_media **sources; + unsigned int source_count; }; @@ -97,11 +103,8 @@ static void free_file_op_queue( struct file_op_queue *queue ) while( op ) { - HeapFree( GetProcessHeap(), 0, op->src_root ); HeapFree( GetProcessHeap(), 0, op->src_path ); HeapFree( GetProcessHeap(), 0, op->src_file ); - HeapFree( GetProcessHeap(), 0, op->src_descr ); - HeapFree( GetProcessHeap(), 0, op->src_tag ); HeapFree( GetProcessHeap(), 0, op->dst_path ); if (op->dst_file != op->src_file) HeapFree( GetProcessHeap(), 0, op->dst_file ); t = op; @@ -145,7 +148,7 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) unsigned int src_len = 1, dst_len = 1; WCHAR *source = (PWSTR)paths->Source, *target = (PWSTR)paths->Target; - if (op->src_root) src_len += strlenW(op->src_root) + 1; + if (op->media) src_len += strlenW(op->media->root) + 1; if (op->src_path) src_len += strlenW(op->src_path) + 1; if (op->src_file) src_len += strlenW(op->src_file) + 1; if (op->dst_path) dst_len += strlenW(op->dst_path) + 1; @@ -164,7 +167,7 @@ static BOOL build_filepathsW( const struct file_op *op, FILEPATHS_W *paths ) paths->Target = target = HeapAlloc( GetProcessHeap(), 0, dst_len ); } if (!source || !target) return FALSE; - concat_W( source, op->src_root, op->src_path, op->src_file ); + concat_W( source, op->media ? op->media->root : NULL, op->src_path, op->src_file ); concat_W( target, NULL, op->dst_path, op->dst_file ); paths->Win32Error = 0; paths->Flags = 0; @@ -416,10 +419,18 @@ HSPFILEQ WINAPI SetupOpenFileQueue(void) BOOL WINAPI SetupCloseFileQueue( HSPFILEQ handle ) { struct file_queue *queue = handle; + unsigned int i; free_file_op_queue( &queue->copy_queue ); free_file_op_queue( &queue->rename_queue ); free_file_op_queue( &queue->delete_queue ); + for (i = 0; i < queue->source_count; ++i) + { + heap_free( queue->sources[i]->desc ); + heap_free( queue->sources[i]->tag ); + heap_free( queue->sources[i] ); + } + heap_free( queue->sources ); HeapFree( GetProcessHeap(), 0, queue ); return TRUE; } @@ -459,22 +470,48 @@ BOOL WINAPI SetupQueueCopyIndirectA( SP_FILE_COPY_PARAMS_A *paramsA ) return ret; } +static BOOL equal_str(const WCHAR *a, const WCHAR *b) +{ + return (!a && !b) || (a && b && !strcmpW(a, b)); +} + +static struct source_media *get_source_media(struct file_queue *queue, + const WCHAR *root, const WCHAR *desc, const WCHAR *tag) +{ + unsigned int i; + + for (i = 0; i < queue->source_count; ++i) + { + if (!strcmpW(root, queue->sources[i]->root) + && equal_str(desc, queue->sources[i]->desc) + && equal_str(tag, queue->sources[i]->tag)) + { + return queue->sources[i]; + } + } + + queue->sources = heap_realloc( queue->sources, ++queue->source_count * sizeof(*queue->sources) ); + queue->sources[i] = heap_alloc( sizeof(*queue->sources[i]) ); + strcpyW(queue->sources[i]->root, root); + queue->sources[i]->desc = strdupW(desc); + queue->sources[i]->tag = strdupW(tag); + + return queue->sources[i]; +} /*********************************************************************** * SetupQueueCopyIndirectW (SETUPAPI.@) */ BOOL WINAPI SetupQueueCopyIndirectW( PSP_FILE_COPY_PARAMS_W params ) { + static const WCHAR emptyW[] = {0}; struct file_queue *queue = params->QueueHandle; struct file_op *op; if (!(op = HeapAlloc( GetProcessHeap(), 0, sizeof(*op) ))) return FALSE; op->style = params->CopyStyle; - op->src_root = strdupW( params->SourceRootPath ); op->src_path = strdupW( params->SourcePath ); op->src_file = strdupW( params->SourceFilename ); - op->src_descr = strdupW( params->SourceDescription ); - op->src_tag = strdupW( params->SourceTagfile ); op->dst_path = strdupW( params->TargetDirectory ); op->dst_file = strdupW( params->TargetFilename ); @@ -483,10 +520,13 @@ BOOL WINAPI SetupQueueCopyIndirectW( PSP_FILE_COPY_PARAMS_W params ) if (params->LayoutInf) FIXME("Unhandled LayoutInf %p.\n", params->LayoutInf); + op->media = get_source_media( queue, params->SourceRootPath ? params->SourceRootPath : emptyW, + params->SourceDescription, params->SourceTagfile ); + TRACE( "root=%s path=%s file=%s -> dir=%s file=%s descr=%s tag=%s\n", - debugstr_w(op->src_root), debugstr_w(op->src_path), debugstr_w(op->src_file), + debugstr_w(op->media->root), debugstr_w(op->src_path), debugstr_w(op->src_file), debugstr_w(op->dst_path), debugstr_w(op->dst_file), - debugstr_w(op->src_descr), debugstr_w(op->src_tag) ); + debugstr_w(op->media->desc), debugstr_w(op->media->tag) ); queue_file_op( &queue->copy_queue, op ); return TRUE; @@ -614,15 +654,9 @@ BOOL WINAPI SetupQueueDeleteA( HSPFILEQ handle, PCSTR part1, PCSTR part2 ) struct file_queue *queue = handle; struct file_op *op; - if (!(op = HeapAlloc( GetProcessHeap(), 0, sizeof(*op) ))) return FALSE; - op->style = 0; - op->src_root = NULL; - op->src_path = NULL; - op->src_file = NULL; - op->src_descr = NULL; - op->src_tag = NULL; - op->dst_path = strdupAtoW( part1 ); - op->dst_file = strdupAtoW( part2 ); + if (!(op = heap_alloc_zero( sizeof(*op) ))) return FALSE; + op->dst_path = strdupAtoW( part1 ); + op->dst_file = strdupAtoW( part2 ); queue_file_op( &queue->delete_queue, op ); return TRUE; } @@ -636,15 +670,9 @@ BOOL WINAPI SetupQueueDeleteW( HSPFILEQ handle, PCWSTR part1, PCWSTR part2 ) struct file_queue *queue = handle; struct file_op *op; - if (!(op = HeapAlloc( GetProcessHeap(), 0, sizeof(*op) ))) return FALSE; - op->style = 0; - op->src_root = NULL; - op->src_path = NULL; - op->src_file = NULL; - op->src_descr = NULL; - op->src_tag = NULL; - op->dst_path = strdupW( part1 ); - op->dst_file = strdupW( part2 ); + if (!(op = heap_alloc_zero( sizeof(*op) ))) return FALSE; + op->dst_path = strdupW( part1 ); + op->dst_file = strdupW( part2 ); queue_file_op( &queue->delete_queue, op ); return TRUE; } @@ -659,15 +687,11 @@ BOOL WINAPI SetupQueueRenameA( HSPFILEQ handle, PCSTR SourcePath, PCSTR SourceFi struct file_queue *queue = handle; struct file_op *op; - if (!(op = HeapAlloc( GetProcessHeap(), 0, sizeof(*op) ))) return FALSE; - op->style = 0; - op->src_root = NULL; - op->src_path = strdupAtoW( SourcePath ); - op->src_file = strdupAtoW( SourceFilename ); - op->src_descr = NULL; - op->src_tag = NULL; - op->dst_path = strdupAtoW( TargetPath ); - op->dst_file = strdupAtoW( TargetFilename ); + if (!(op = heap_alloc_zero( sizeof(*op) ))) return FALSE; + op->src_path = strdupAtoW( SourcePath ); + op->src_file = strdupAtoW( SourceFilename ); + op->dst_path = strdupAtoW( TargetPath ); + op->dst_file = strdupAtoW( TargetFilename ); queue_file_op( &queue->rename_queue, op ); return TRUE; } @@ -682,15 +706,11 @@ BOOL WINAPI SetupQueueRenameW( HSPFILEQ handle, PCWSTR SourcePath, PCWSTR Source struct file_queue *queue = handle; struct file_op *op; - if (!(op = HeapAlloc( GetProcessHeap(), 0, sizeof(*op) ))) return FALSE; - op->style = 0; - op->src_root = NULL; - op->src_path = strdupW( SourcePath ); - op->src_file = strdupW( SourceFilename ); - op->src_descr = NULL; - op->src_tag = NULL; - op->dst_path = strdupW( TargetPath ); - op->dst_file = strdupW( TargetFilename ); + if (!(op = heap_alloc_zero( sizeof(*op) ))) return FALSE; + op->src_path = strdupW( SourcePath ); + op->src_file = strdupW( SourceFilename ); + op->dst_path = strdupW( TargetPath ); + op->dst_file = strdupW( TargetFilename ); queue_file_op( &queue->rename_queue, op ); return TRUE; } @@ -1240,7 +1260,7 @@ static BOOL queue_copy_file( const WCHAR *source, const WCHAR *dest, return TRUE; /* try to extract it from the cabinet file */ - if (op->src_tag && extract_cabinet_file(op->src_tag, op->src_root, op->src_file, dest)) + if (op->media->tag && extract_cabinet_file(op->media->tag, op->media->root, op->src_file, dest)) return TRUE; return FALSE;

1 0

Zebediah Figura : setupapi: Implement SetupDefaultQueueCallback( SPFILENOTIFY_NEEDMEDIA).
by Alexandre Julliard May 2, 2019

May 2, 2019

Module: wine Branch: master Commit: 46dc6dddf3d1ef02aa773d0e25c121b8643d4bba URL: https://source.winehq.org/git/wine.git/?a=commit;h=46dc6dddf3d1ef02aa773d0e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 1 18:24:09 2019 -0500 setupapi: Implement SetupDefaultQueueCallback(SPFILENOTIFY_NEEDMEDIA). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index fb0c401..e160d9e 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -1601,8 +1601,12 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification, debugstr_a(paths->Source), debugstr_a(paths->Target) ); return FILEOP_SKIP; case SPFILENOTIFY_NEEDMEDIA: - TRACE( "need media\n" ); - return FILEOP_SKIP; + { + const SOURCE_MEDIA_A *media = (const SOURCE_MEDIA_A *)param1; + TRACE( "need media %s %s\n", debugstr_a(media->SourcePath), debugstr_a(media->SourceFile) ); + strcpy( (char *)param2, media->SourcePath ); + return FILEOP_DOIT; + } default: FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 ); break; @@ -1666,8 +1670,12 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification, debugstr_w(paths->Source), debugstr_w(paths->Target) ); return FILEOP_SKIP; case SPFILENOTIFY_NEEDMEDIA: - TRACE( "need media\n" ); - return FILEOP_SKIP; + { + const SOURCE_MEDIA_W *media = (const SOURCE_MEDIA_W *)param1; + TRACE( "need media %s %s\n", debugstr_w(media->SourcePath), debugstr_w(media->SourceFile) ); + strcpyW( (WCHAR *)param2, media->SourcePath ); + return FILEOP_DOIT; + } default: FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 ); break;

1 0