September 2020 - Wine-commits

Zebediah Figura : winegstreamer: Dereference messages dropped from watch_bus().
by Alexandre Julliard 10 Sep '20

10 Sep '20

Module: wine Branch: master Commit: 21d2e68d8e1ab37e47c146af954c267908dd55ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d2e68d8e1ab37e47c146af… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 9 18:00:58 2020 -0500 winegstreamer: Dereference messages dropped from watch_bus(). >From GStreamer documentation: "If the handler returns GST_BUS_DROP, it should unref the message, else the message should not be unreffed by the sync handler." Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2c9aafd7a6..724ac8fd25 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1280,6 +1280,7 @@ static GstBusSyncReply watch_bus(GstBus *bus, GstMessage *msg, gpointer data) default: break; } + gst_message_unref(msg); return GST_BUS_DROP; }

1 0

Zebediah Figura : server: Use GENERIC_READ | GENERIC_WRITE in inherit_console().
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: c4ae13e31264616757200cd97700724ffe37e602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4ae13e31264616757200cd9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 8 17:49:12 2020 -0500 server: Use GENERIC_READ | GENERIC_WRITE in inherit_console(). The inherited console must have at least FILE_READ_DATA | FILE_WRITE_DATA. This also matches the access rights in AllocConsole(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index 3ea8a0fe53..6a4a0b60d5 100644 --- a/server/console.c +++ b/server/console.c @@ -784,7 +784,7 @@ obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, process->console = console; console->num_proc++; return alloc_handle( process, process->console, - SYNCHRONIZE | FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES, 0 ); + SYNCHRONIZE | GENERIC_READ | GENERIC_WRITE, 0 ); } struct thread *console_get_renderer( struct console_input *console )

1 0

Zebediah Figura : include: Use ioctl access bits for console driver ioctls.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 947fe11e02f0cb227f571a26625ef4cbddf93030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=947fe11e02f0cb227f571a26… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 8 17:49:13 2020 -0500 include: Use ioctl access bits for console driver ioctls. ioctls can only specify FILE_READ_ACCESS and FILE_WRITE_ACCESS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 2e6c5c689f..7bc5e7f15b 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -25,31 +25,31 @@ #include "wincon.h" /* common console input and output ioctls */ -#define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_PROPERTIES) -#define IOCTL_CONDRV_SET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_GET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 0, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_MODE CTL_CODE(FILE_DEVICE_CONSOLE, 1, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console input ioctls */ #define IOCTL_CONDRV_READ_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 10, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONDRV_WRITE_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 11, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_WRITE_INPUT CTL_CODE(FILE_DEVICE_CONSOLE, 11, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS) -#define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) -#define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) -#define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_PROPERTIES) -#define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) -#define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) +#define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_CTRL_EVENT CTL_CODE(FILE_DEVICE_CONSOLE, 17, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console output ioctls */ -#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_READ_DATA) -#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_DATA) -#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) -#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) -#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_DATA) -#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_DATA) -#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_DATA) +#define IOCTL_CONDRV_READ_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 30, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_WRITE_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 31, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_SET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 33, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_ACTIVATE CTL_CODE(FILE_DEVICE_CONSOLE, 34, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 35, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_ACCESS) /* console renderer ioctls */ -#define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) -#define IOCTL_CONDRV_ATTACH_RENDERER CTL_CODE(FILE_DEVICE_CONSOLE, 71, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_CONDRV_ATTACH_RENDERER CTL_CODE(FILE_DEVICE_CONSOLE, 71, METHOD_BUFFERED, FILE_READ_ACCESS) /* ioctls used for communication between driver and host */ #define IOCTL_CONDRV_INIT_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 90, METHOD_BUFFERED, 0)

1 0

Zhiyi Zhang : dxgi/tests: Relax closest matching mode comparison.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 8776111bc4a1b0f9b3a49dd286a5a6b46f4ab4c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8776111bc4a1b0f9b3a49dd2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 9 21:54:22 2020 +0800 dxgi/tests: Relax closest matching mode comparison. On Windows, a DXGI output may support 1920x1440 and 2560x1080 display modes, both of which have the same pixel count. And when finding a mode closest to 2559x1079 or 2561x1081, 1920x1440 is returned. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 59b23918de..f5c5e3b786 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -207,8 +207,9 @@ static unsigned int check_multisample_quality_levels(IDXGIDevice *dxgi_device, #define MODE_DESC_IGNORE_FORMAT 0x00000004u #define MODE_DESC_IGNORE_SCANLINE_ORDERING 0x00000008u #define MODE_DESC_IGNORE_SCALING 0x00000010u +#define MODE_DESC_IGNORE_EXACT_RESOLUTION 0x00000020u -#define MODE_DESC_CHECK_RESOLUTION (~MODE_DESC_IGNORE_RESOLUTION) +#define MODE_DESC_CHECK_RESOLUTION (~MODE_DESC_IGNORE_RESOLUTION & ~MODE_DESC_IGNORE_EXACT_RESOLUTION) #define MODE_DESC_CHECK_FORMAT (~MODE_DESC_IGNORE_FORMAT) #define check_mode_desc(a, b, c) check_mode_desc_(__LINE__, a, b, c) @@ -217,10 +218,16 @@ static void check_mode_desc_(unsigned int line, const DXGI_MODE_DESC *desc, { if (!(ignore_flags & MODE_DESC_IGNORE_RESOLUTION)) { - ok_(__FILE__, line)(desc->Width == expected_desc->Width - && desc->Height == expected_desc->Height, - "Got resolution %ux%u, expected %ux%u.\n", - desc->Width, desc->Height, expected_desc->Width, expected_desc->Height); + if (ignore_flags & MODE_DESC_IGNORE_EXACT_RESOLUTION) + ok_(__FILE__, line)(desc->Width * desc->Height == + expected_desc->Width * expected_desc->Height, + "Got resolution %ux%u, expected %ux%u.\n", + desc->Width, desc->Height, expected_desc->Width, expected_desc->Height); + else + ok_(__FILE__, line)(desc->Width == expected_desc->Width && + desc->Height == expected_desc->Height, + "Got resolution %ux%u, expected %ux%u.\n", + desc->Width, desc->Height, expected_desc->Width, expected_desc->Height); } if (!(ignore_flags & MODE_DESC_IGNORE_REFRESH_RATE)) { @@ -1526,7 +1533,8 @@ static void test_find_closest_matching_mode(void) mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_mode_desc(&matching_mode, &modes[i], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); + check_mode_desc(&matching_mode, &modes[i], + (MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT) | MODE_DESC_IGNORE_EXACT_RESOLUTION); memset(&mode, 0, sizeof(mode)); mode.Width = modes[i].Width + 1; @@ -1534,7 +1542,8 @@ static void test_find_closest_matching_mode(void) mode.Format = DXGI_FORMAT_R8G8B8A8_UNORM; hr = IDXGIOutput_FindClosestMatchingMode(output, &mode, &matching_mode, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - check_mode_desc(&matching_mode, &modes[i], MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT); + check_mode_desc(&matching_mode, &modes[i], + (MODE_DESC_CHECK_RESOLUTION & MODE_DESC_CHECK_FORMAT) | MODE_DESC_IGNORE_EXACT_RESOLUTION); } memset(&mode, 0, sizeof(mode));

1 0

Zhiyi Zhang : dxgi/tests: Fix swapchain parameter test failures on Win10 1909.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: e0b0ed3d00a9e3d29d07e8fc1b5630ae87b0a428 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0b0ed3d00a9e3d29d07e8fc… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 9 21:54:32 2020 +0800 dxgi/tests: Fix swapchain parameter test failures on Win10 1909. Some of the invalid swapchain parameter tests crash on Win10 1909. And DXGI_USAGE_DISCARD_ON_PRESENT is a DXGI internal flag. It doesn't always get added if swap effect is DXGI_SWAP_EFFECT_DISCARD. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f5c5e3b786..acbcadda35 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4293,66 +4293,79 @@ static void test_swapchain_parameters(void) } tests[] = { - {TRUE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 0 */ {TRUE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, - {TRUE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 1}, {TRUE, 3, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 2}, + /* 5 */ {TRUE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 10 */ {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {TRUE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, {TRUE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, + /* 15 */ {TRUE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {TRUE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, + /* 20 */ {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, {TRUE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {TRUE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - - {FALSE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, - {FALSE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 25 */ {FALSE, 1, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 1}, {FALSE, 3, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 2}, {FALSE, 0, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 30 */ {FALSE, 2, 2 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 1}, {FALSE, 3, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 2}, + /* 35 */ {FALSE, 0, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 2, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 0, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 1, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 40 */ {FALSE, 2, 5 /* undefined */, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_DISCARD, S_OK, S_OK, 0}, {FALSE, 16, DXGI_SWAP_EFFECT_SEQUENTIAL, S_OK, S_OK, 15}, {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, S_OK, DXGI_ERROR_INVALID_CALL, 15}, + {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* 45 */ + {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + /* The following test fails on Nvidia with E_OUTOFMEMORY and leaks device references in the * process. Disable it for now. {FALSE, 16, DXGI_SWAP_EFFECT_FLIP_DISCARD, S_OK, DXGI_ERROR_INVALID_CALL, 0}, */ + + /* The following tests crash on Win10 1909 + {TRUE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {TRUE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + {FALSE, 0, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, - {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, + */ }; static const DXGI_USAGE usage_tests[] = { @@ -4417,11 +4430,10 @@ static void test_swapchain_parameters(void) } expected_usage = DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER; - if (tests[i].swap_effect == DXGI_SWAP_EFFECT_DISCARD) - expected_usage |= DXGI_USAGE_DISCARD_ON_PRESENT; hr = IDXGIResource_GetUsage(resource, &usage); ok(SUCCEEDED(hr), "Failed to get resource usage, hr %#x, test %u.\n", hr, i); - ok(usage == expected_usage, "Got usage %x, expected %x, test %u.\n", usage, expected_usage, i); + ok((usage & expected_usage) == expected_usage, "Got usage %x, expected %x, test %u.\n", + usage, expected_usage, i); IDXGIResource_Release(resource);

1 0

Zhiyi Zhang : dxgi/tests: Fix output ownership test failures on Win10 1909.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: f92f363bbdb111f63b13eb1c380f2512df034695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f92f363bbdb111f63b13eb1c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 9 21:54:43 2020 +0800 dxgi/tests: Fix output ownership test failures on Win10 1909. All DXGI output ownership calls on Win10 1909 return S_OK. It doesn't grab VidPN output exclusive ownership for full screen mode. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 78 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index acbcadda35..ce1aee5ee3 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -548,9 +548,12 @@ static void wait_fullscreen_state_(unsigned int line, IDXGISwapChain *swapchain, "Got unexpected state %#x, expected %#x.\n", state, expected); } -#define wait_vidpn_exclusive_ownership(a, b, c) wait_vidpn_exclusive_ownership_(__LINE__, a, b, c) -static void wait_vidpn_exclusive_ownership_(unsigned int line, - const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc, NTSTATUS expected, BOOL todo) +/* VidPN exclusive ownership doesn't change immediately. + * This helper is used to wait for the expected status */ +#define get_expected_vidpn_exclusive_ownership(a, b) \ + get_expected_vidpn_exclusive_ownership_(__LINE__, a, b) +static NTSTATUS get_expected_vidpn_exclusive_ownership_(unsigned int line, + const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *desc, NTSTATUS expected) { static const unsigned int wait_timeout = 2000; static const unsigned int wait_step = 100; @@ -565,8 +568,7 @@ static void wait_vidpn_exclusive_ownership_(unsigned int line, Sleep(wait_step); total_time += wait_step; } - todo_wine_if(todo) ok_(__FILE__, line)(status == expected, - "Got unexpected status %#x, expected %#x.\n", status, expected); + return status; } static HWND create_window(void) @@ -6315,7 +6317,9 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) check_ownership_desc.hAdapter = open_adapter_gdi_desc.hAdapter; check_ownership_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -6349,20 +6353,41 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(fullscreen, "Got unexpected fullscreen state.\n"); + /* Win10 1909 doesn't seem to grab output exclusive ownership. + * And all output ownership calls return S_OK on D3D10 and D3D12 with 1909. */ if (is_d3d12) - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + { + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); + } else - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, TRUE); + { + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + todo_wine ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || + broken(status == STATUS_SUCCESS), /* Win10 1909 */ + "Got unexpected status %#x, expected %#x.\n", status, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + } hr = IDXGIOutput_TakeOwnership(output, NULL, FALSE); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, NULL, TRUE); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - todo_wine ok(hr == (is_d3d12 ? E_NOINTERFACE : E_INVALIDARG), "Got unexpected hr %#x.\n", hr); + if (is_d3d12) + todo_wine ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#x.\n", hr); + else + todo_wine ok(hr == E_INVALIDARG || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); - todo_wine_if(is_d3d12) ok(hr == (is_d3d12 ? E_NOINTERFACE : S_OK), "Got unexpected hr %#x.\n", hr); + ok(hr == E_NOINTERFACE || hr == S_OK, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); /* IDXGIOutput_TakeOwnership always returns E_NOINTERFACE for d3d12. Tests * finished. */ @@ -6370,16 +6395,21 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) goto done; hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Note that the "exclusive" parameter to IDXGIOutput_TakeOwnership() * seems to behave opposite to what's described by MSDN. */ - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || + broken(status == STATUS_SUCCESS), /* Win10 1909 */ + "Got unexpected status %#x, expected %#x.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Win10 1909 */, "Got unexpected hr %#x.\n", hr); IDXGIOutput_ReleaseOwnership(output); /* Swapchain in windowed mode. */ @@ -6389,16 +6419,24 @@ static void test_output_ownership(IUnknown *device, BOOL is_d3d12) hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(!fullscreen, "Unexpected fullscreen state.\n"); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); hr = IDXGIOutput_TakeOwnership(output, device, FALSE); - ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected hr %#x.\n", hr); hr = IDXGIOutput_TakeOwnership(output, device, TRUE); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_GRAPHICS_PRESENT_OCCLUDED, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, + STATUS_GRAPHICS_PRESENT_OCCLUDED); + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED || broken(hr == S_OK), /* Win10 1909 */ + "Got unexpected status %#x, expected %#x.\n", status, STATUS_GRAPHICS_PRESENT_OCCLUDED); IDXGIOutput_ReleaseOwnership(output); - wait_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS, FALSE); + status = get_expected_vidpn_exclusive_ownership(&check_ownership_desc, STATUS_SUCCESS); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x, expected %#x.\n", status, + STATUS_SUCCESS); done: IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL);

1 0

Pengpeng Dong : quartz: Return E_POINTER from IVideoWindow::get_Visible() if "visible" is NULL.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 4765c5ffe2ad42be97ce29e09a6a5c01d5672f60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4765c5ffe2ad42be97ce29e0… Author: Pengpeng Dong <dongpengpeng(a)uniontech.com> Date: Wed Sep 9 10:07:18 2020 -0500 quartz: Return E_POINTER from IVideoWindow::get_Visible() if "visible" is NULL. Signed-off-by: Pengpeng Dong <dongpengpeng(a)uniontech.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/window.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index c2b6271021..448efe501b 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2257,6 +2257,9 @@ static void test_video_window(void) hr = IBaseFilter_QueryInterface(filter, &IID_IVideoWindow, (void **)&window); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVideoWindow_get_Visible(window, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + hr = IVideoWindow_get_Caption(window, &caption); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/window.c b/dlls/quartz/window.c index 07e042eccd..3983d43b08 100644 --- a/dlls/quartz/window.c +++ b/dlls/quartz/window.c @@ -334,6 +334,9 @@ HRESULT WINAPI BaseControlWindowImpl_get_Visible(IVideoWindow *iface, LONG *visi TRACE("window %p, visible %p.\n", window, visible); + if (!visible) + return E_POINTER; + *visible = IsWindowVisible(window->hwnd) ? OATRUE : OAFALSE; return S_OK; }

1 0

Paul Gofman : msvcrt: Handle rethrowing from nested try blocks on x64.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: f65fb09dff86dbb87564264481a23b1179e8d890 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65fb09dff86dbb875642644… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 9 19:12:06 2020 +0300 msvcrt: Handle rethrowing from nested try blocks on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 09eddfb979..42283131e8 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -90,6 +90,7 @@ typedef struct { cxx_frame_info frame_info; BOOL rethrow; + EXCEPTION_RECORD *prev_rec; } cxx_catch_ctx; typedef struct @@ -306,14 +307,13 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, static LONG CALLBACK cxx_rethrow_filter(PEXCEPTION_POINTERS eptrs, void *c) { EXCEPTION_RECORD *rec = eptrs->ExceptionRecord; - thread_data_t *data = msvcrt_get_thread_data(); cxx_catch_ctx *ctx = c; if (rec->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) return EXCEPTION_EXECUTE_HANDLER; - if (rec->ExceptionInformation[1] == data->exc_record->ExceptionInformation[1]) + if (rec->ExceptionInformation[1] == ctx->prev_rec->ExceptionInformation[1]) ctx->rethrow = TRUE; return EXCEPTION_CONTINUE_SEARCH; } @@ -340,6 +340,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) TRACE("calling handler %p\n", handler); ctx.rethrow = FALSE; + ctx.prev_rec = prev_rec; __CxxRegisterExceptionObject(&ep, &ctx.frame_info); msvcrt_get_thread_data()->processing_throw--; __TRY @@ -565,6 +566,12 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionCode == CXX_EXCEPTION) { + if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) + { + TRACE("rethrow detected.\n"); + *rec = *msvcrt_get_thread_data()->exc_record; + } + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (TRACE_ON(seh))

1 0

Liam Middlebrook : winevulkan: Fail on explicit layer usage.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: e447e86ae2fbfbd9dee1b488e38a653aaea5447e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e447e86ae2fbfbd9dee1b488… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Tue Sep 8 12:46:27 2020 -0700 winevulkan: Fail on explicit layer usage. Fixes failure in dEQP-VK.api.device_init.create_instance_layer_name_abuse which expects all layers passed in as part of test to cause instance creation to fail. A quirk bit WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS has been added to optionally restore the previous functionality. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 14 ++++++++++---- dlls/winevulkan/vulkan_private.h | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 9f8e2451ad..f730c04923 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -335,7 +335,7 @@ static void wine_vk_init_once(void) * driver is responsible for handling e.g. surface extensions. */ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, - VkInstanceCreateInfo *dst) + VkInstanceCreateInfo *dst, struct VkInstance_T *object) { unsigned int i; VkResult res; @@ -351,8 +351,14 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo /* ICDs don't support any layers, so nothing to copy. Modern versions of the loader * filter this data out as well. */ - dst->enabledLayerCount = 0; - dst->ppEnabledLayerNames = NULL; + if (object->quirks & WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS) { + dst->enabledLayerCount = 0; + dst->ppEnabledLayerNames = NULL; + WARN("Ignoring explicit layers!\n"); + } else if (dst->enabledLayerCount) { + FIXME("Loading explicit layers is not supported by winevulkan!\n"); + return VK_ERROR_LAYER_NOT_PRESENT; + } TRACE("Enabled %u instance extensions.\n", dst->enabledExtensionCount); for (i = 0; i < dst->enabledExtensionCount; i++) @@ -673,7 +679,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + res = wine_vk_instance_convert_create_info(create_info, &create_info_host, object); if (res != VK_SUCCESS) { wine_vk_instance_free(object); diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index b048108f7a..4bcc4de440 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -39,6 +39,7 @@ #define WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR 0x00000001 #define WINEVULKAN_QUIRK_ADJUST_MAX_IMAGE_COUNT 0x00000002 +#define WINEVULKAN_QUIRK_IGNORE_EXPLICIT_LAYERS 0x00000004 struct vulkan_func {

1 0

Rémi Bernon : kernelbase: Also pass CreateFile2 file flags to CreateFileW.
by Alexandre Julliard 09 Sep '20

09 Sep '20

Module: wine Branch: master Commit: 1445ae79e69ad684af0127d4cfbbe9715a687eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=1445ae79e69ad684af0127d4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 9 20:38:44 2020 +0200 kernelbase: Also pass CreateFile2 file flags to CreateFileW. Instead of just attributes. Otherwise we may miss important flags like FILE_FLAG_OVERLAPPED and open the file for synchronous I/O, causing a deadlock in Flight Simulator. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 48 ++++++++++++++++++++++++++++++++++++++-------- dlls/kernelbase/file.c | 30 +++++++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0f2c00d75a..ec0e923706 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -1675,14 +1675,14 @@ static void test_CreateFileW(void) static void test_CreateFile2(void) { - HANDLE hFile; + HANDLE hFile, iocp; WCHAR temp_path[MAX_PATH]; WCHAR filename[MAX_PATH]; CREATEFILE2_EXTENDED_PARAMETERS exparams; static const WCHAR emptyW[]={'\0'}; static const WCHAR prefix[] = {'p','f','x',0}; static const WCHAR bogus[] = { '\\', '\\', '.', '\\', 'B', 'O', 'G', 'U', 'S', 0 }; - DWORD ret; + DWORD i, ret; if (!pCreateFile2) { @@ -1699,8 +1699,8 @@ static void test_CreateFile2(void) SetLastError(0xdeadbeef); exparams.dwSize = sizeof(exparams); - exparams.dwFileAttributes = FILE_FLAG_RANDOM_ACCESS; - exparams.dwFileFlags = 0; + exparams.dwFileAttributes = 0; + exparams.dwFileFlags = FILE_FLAG_RANDOM_ACCESS; exparams.dwSecurityQosFlags = 0; exparams.lpSecurityAttributes = NULL; exparams.hTemplateFile = 0; @@ -1744,14 +1744,46 @@ static void test_CreateFile2(void) ret = CreateDirectoryW(filename, NULL); ok(ret == TRUE, "couldn't create temporary directory\n"); - exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL | FILE_FLAG_BACKUP_SEMANTICS; + exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + exparams.dwFileFlags = FILE_FLAG_BACKUP_SEMANTICS; + SetLastError(0xdeadbeef); hFile = pCreateFile2(filename, GENERIC_READ | GENERIC_WRITE, 0, OPEN_ALWAYS, &exparams); - todo_wine - ok(hFile == INVALID_HANDLE_VALUE, - "expected CreateFile2 to fail on existing directory, error: %d\n", GetLastError()); + ok(hFile != INVALID_HANDLE_VALUE, + "CreateFile2 failed with FILE_FLAG_BACKUP_SEMANTICS on existing directory, error: %d\n", GetLastError()); CloseHandle(hFile); ret = RemoveDirectoryW(filename); ok(ret, "DeleteFileW: error %d\n", GetLastError()); + + for (i = 0; i < 2; ++i) + { + memset(&exparams, 0, sizeof(exparams)); + exparams.dwSize = sizeof(exparams); + if (i == 0) + { + exparams.dwFileAttributes = FILE_ATTRIBUTE_NORMAL; + exparams.dwFileFlags = FILE_FLAG_OVERLAPPED | FILE_FLAG_DELETE_ON_CLOSE; + } + else + { + exparams.dwFileFlags = FILE_ATTRIBUTE_NORMAL; + exparams.dwFileAttributes = FILE_FLAG_OVERLAPPED | FILE_FLAG_DELETE_ON_CLOSE; + } + + SetLastError(0xdeadbeef); + hFile = pCreateFile2(filename, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, CREATE_ALWAYS, &exparams); + ok(hFile != INVALID_HANDLE_VALUE && GetLastError() == 0, "%d: hFile %p, last error %u\n", i, hFile, GetLastError()); + + iocp = CreateIoCompletionPort(hFile, NULL, 0, 2); + if (i == 1) ok(iocp == NULL && GetLastError() == ERROR_INVALID_PARAMETER, "%d: CreateIoCompletionPort returned %p, error %u\n", i, iocp, GetLastError()); + else ok(iocp != INVALID_HANDLE_VALUE && GetLastError() == 0, "%d: CreateIoCompletionPort returned %p, error %u\n", i, iocp, GetLastError()); + + CloseHandle(iocp); + CloseHandle(hFile); + + ret = DeleteFileW(filename); + if (i == 1) ok(ret, "%d: unexpected DeleteFileW failure, error %u\n", i, GetLastError()); + else ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, "%d: unexpected DeleteFileW result, ret %d error %u\n", i, ret, GetLastError()); + } } static void test_GetTempFileNameA(void) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index d9b3440869..b265866ac5 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -655,13 +655,39 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateDirectoryExW( LPCWSTR template, LPCWSTR path HANDLE WINAPI DECLSPEC_HOTPATCH CreateFile2( LPCWSTR name, DWORD access, DWORD sharing, DWORD creation, CREATEFILE2_EXTENDED_PARAMETERS *params ) { + static const DWORD attributes_mask = FILE_ATTRIBUTE_READONLY | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_NORMAL | + FILE_ATTRIBUTE_TEMPORARY | + FILE_ATTRIBUTE_OFFLINE | + FILE_ATTRIBUTE_ENCRYPTED | + FILE_ATTRIBUTE_INTEGRITY_STREAM; + static const DWORD flags_mask = FILE_FLAG_BACKUP_SEMANTICS | + FILE_FLAG_DELETE_ON_CLOSE | + FILE_FLAG_NO_BUFFERING | + FILE_FLAG_OPEN_NO_RECALL | + FILE_FLAG_OPEN_REPARSE_POINT | + FILE_FLAG_OVERLAPPED | + FILE_FLAG_POSIX_SEMANTICS | + FILE_FLAG_RANDOM_ACCESS | + FILE_FLAG_SEQUENTIAL_SCAN | + FILE_FLAG_WRITE_THROUGH; + LPSECURITY_ATTRIBUTES sa = params ? params->lpSecurityAttributes : NULL; - DWORD attributes = params ? params->dwFileAttributes : 0; HANDLE template = params ? params->hTemplateFile : NULL; + DWORD attributes = params ? params->dwFileAttributes : 0; + DWORD flags = params ? params->dwFileFlags : 0; FIXME( "(%s %x %x %x %p), partial stub\n", debugstr_w(name), access, sharing, creation, params ); - return CreateFileW( name, access, sharing, sa, creation, attributes, template ); + if (attributes & ~attributes_mask) FIXME( "unsupported attributes %#x\n", attributes ); + if (flags & ~flags_mask) FIXME( "unsupported flags %#x\n", flags ); + attributes &= attributes_mask; + flags &= flags_mask; + + return CreateFileW( name, access, sharing, sa, creation, flags | attributes, template ); }

1 0