May 2022 - Wine-commits - list.winehq.org

Rémi Bernon : mf/tests: Tweak topology loader tests results based on the video processor presence.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: bd527c1946cc92dfeee072542815e71b2e3d1861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd527c1946cc92dfeee07254… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 09:17:50 2022 +0200 mf/tests: Tweak topology loader tests results based on the video processor presence. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a32005863d3..cc6bec40234 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -65,6 +65,7 @@ DEFINE_GUID(DMOVideoFormat_RGB8, D3DFMT_P8, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x static HRESULT (WINAPI *pMFCreateSampleCopierMFT)(IMFTransform **copier); static HRESULT (WINAPI *pMFGetTopoNodeCurrentType)(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type); +static BOOL has_video_processor; static BOOL is_vista(void) { return !pMFGetTopoNodeCurrentType; @@ -1885,6 +1886,7 @@ enum loader_test_flags LOADER_EXPECTED_DECODER = 0x1, LOADER_EXPECTED_CONVERTER = 0x2, LOADER_TODO = 0x4, + LOADER_NEEDS_VIDEO_PROCESSOR = 0x8, }; static void test_topology_loader(void) @@ -1972,7 +1974,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_CONVERTER, S_OK, - LOADER_EXPECTED_CONVERTER | LOADER_TODO, + LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER | LOADER_TODO, }, { @@ -2021,7 +2023,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_CONVERTER, MF_E_TRANSFORM_NOT_POSSIBLE_FOR_CURRENT_MEDIATYPE_COMBINATION, - LOADER_TODO, + LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_TODO, }, { @@ -2185,9 +2187,14 @@ static void test_topology_loader(void) ok(!count, "Unexpected count %u.\n", count); hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); - todo_wine_if(test->flags & LOADER_TODO) - ok(hr == test->expected_result, "Unexpected hr %#lx on test %u.\n", hr, i); - ok(full_topology != topology, "Unexpected instance.\n"); + if (test->flags & LOADER_NEEDS_VIDEO_PROCESSOR && !has_video_processor) + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx on test %u.\n", hr, i); + else + { + todo_wine_if(test->flags & LOADER_TODO) + ok(hr == test->expected_result, "Unexpected hr %#lx on test %u.\n", hr, i); + ok(full_topology != topology, "Unexpected instance.\n"); + } if (test->expected_result == S_OK && hr == S_OK) { @@ -3629,6 +3636,7 @@ static void test_video_processor(void) transform_inputs, ARRAY_SIZE(transform_inputs), transform_outputs, ARRAY_SIZE(transform_outputs), &transform, &CLSID_VideoProcessorMFT, &class_id)) goto failed; + has_video_processor = TRUE; todo_wine check_interface(transform, &IID_IMFVideoProcessorControl, TRUE); @@ -8183,6 +8191,7 @@ START_TEST(mf) return; } + test_video_processor(); test_topology(); test_topology_tee_node(); test_topology_loader(); @@ -8195,7 +8204,6 @@ START_TEST(mf) test_presentation_clock(); test_sample_grabber(); test_sample_grabber_is_mediatype_supported(); - test_video_processor(); test_quality_manager(); test_sar(); test_evr();

1 0

Rémi Bernon : mf/tests: Update a broken IMFMediaSink_AddStreamSink result check.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: b7fa00be65363132f1fd8686bfa0a81b394c0dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7fa00be65363132f1fd8686… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 09:18:43 2022 +0200 mf/tests: Update a broken IMFMediaSink_AddStreamSink result check. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index cc6bec40234..8f2c050e3c6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4821,7 +4821,7 @@ todo_wine { /* Same test for a substream. */ hr = IMFMediaSink_AddStreamSink(sink, 1, NULL, &stream_sink2); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(hr == E_INVALIDARG), "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) {

1 0

Rémi Bernon : dinput/tests: Wait for the expected report to actually be pending.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: 606dc246ff0e6ac710288e4d9dc2fcf55568b1af URL: https://source.winehq.org/git/wine.git/?a=commit;h=606dc246ff0e6ac710288e4d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 15:10:03 2022 +0200 dinput/tests: Wait for the expected report to actually be pending. There is a race otherwise where we try to complete a pending IRP but because the async is writing the report from another thread we didn't find it and instead ignored it. Instead we need to atomically check if there was a pending IRP, and if the queue is empty, or queue the wait. Later, when a report is going to be marked as pending, and if there's someone waiting for it already, we instead complete it immediately. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput_test.h | 5 +++-- dlls/dinput/tests/driver_bus.c | 45 ++++++++++++++++++++++++++++---------- dlls/dinput/tests/driver_hid.h | 7 +++++- dlls/dinput/tests/force_feedback.c | 4 ++-- dlls/dinput/tests/hid.c | 6 +++-- 5 files changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h index 0adbd0b1ac8..c4ee42ca1c8 100644 --- a/dlls/dinput/tests/dinput_test.h +++ b/dlls/dinput/tests/dinput_test.h @@ -103,8 +103,9 @@ BOOL sync_ioctl_( const char *file, int line, HANDLE device, DWORD code, void *i #define set_hid_expect( a, b, c ) set_hid_expect_( __FILE__, __LINE__, a, b, c ) void set_hid_expect_( const char *file, int line, HANDLE device, struct hid_expect *expect, DWORD expect_size ); -#define wait_hid_expect( a, b ) wait_hid_expect_( __FILE__, __LINE__, a, b, FALSE ) -void wait_hid_expect_( const char *file, int line, HANDLE device, DWORD timeout, BOOL todo ); +#define wait_hid_expect( a, b ) wait_hid_expect_( __FILE__, __LINE__, a, b, FALSE, FALSE ) +#define wait_hid_pending( a, b ) wait_hid_expect_( __FILE__, __LINE__, a, b, TRUE, FALSE ) +void wait_hid_expect_( const char *file, int line, HANDLE device, DWORD timeout, BOOL wait_pending, BOOL todo ); #define send_hid_input( a, b, c ) send_hid_input_( __FILE__, __LINE__, a, b, c ) void send_hid_input_( const char *file, int line, HANDLE device, struct hid_expect *expect, DWORD expect_size ); diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index 6554d50c14b..6a1994e509c 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -188,26 +188,34 @@ static NTSTATUS expect_queue_add_pending( struct expect_queue *queue, IRP *irp ) return status; } -static void expect_queue_clear_pending( struct expect_queue *queue ) +/* complete an expect report previously marked as pending, or wait for one and then for the queue to empty */ +static NTSTATUS expect_queue_wait_pending( struct expect_queue *queue, IRP *irp ) { + NTSTATUS status; + IRP *pending; KIRQL irql; - IRP *irp; KeAcquireSpinLock( &queue->lock, &irql ); - if ((irp = queue->pending_wait)) + if ((pending = queue->pending_wait)) { queue->pending_wait = NULL; - if (!IoSetCancelRoutine( irp, NULL )) irp = NULL; + if (!IoSetCancelRoutine( pending, NULL )) pending = NULL; } + + if (pending && queue->pos == queue->end) status = STATUS_SUCCESS; + else status = expect_queue_add_pending_locked( queue, irp ); KeReleaseSpinLock( &queue->lock, irql ); - if (irp) + if (pending) { - irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + pending->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( pending, IO_NO_INCREMENT ); } + + return status; } +/* wait for the expect queue to empty */ static NTSTATUS expect_queue_wait( struct expect_queue *queue, IRP *irp ) { NTSTATUS status; @@ -257,11 +265,21 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ if (running_under_wine || !queue->pos->wine_only) break; queue->pos++; } - if (queue->pos == queue->end && (irp = queue->pending_wait)) + + if ((irp = queue->pending_wait)) { - queue->pending_wait = NULL; - if (!IoSetCancelRoutine( irp, NULL )) irp = NULL; + /* don't mark the IRP as pending if someone's already waiting */ + if (expect->ret_status == STATUS_PENDING) expect->ret_status = STATUS_SUCCESS; + + /* complete the pending wait IRP if the queue is now empty */ + if (queue->pos != queue->end) irp = NULL; + else + { + queue->pending_wait = NULL; + if (!IoSetCancelRoutine( irp, NULL )) irp = NULL; + } } + memcpy( context, queue->context, context_size ); KeReleaseSpinLock( &queue->lock, irql ); @@ -1244,9 +1262,12 @@ static NTSTATUS WINAPI pdo_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_SUCCESS; break; case IOCTL_WINETEST_HID_WAIT_EXPECT: - expect_queue_clear_pending( &impl->expect_queue ); - status = expect_queue_wait( &impl->expect_queue, irp ); + { + struct wait_expect_params wait_params = *(struct wait_expect_params *)irp->AssociatedIrp.SystemBuffer; + if (!wait_params.wait_pending) status = expect_queue_wait( &impl->expect_queue, irp ); + else status = expect_queue_wait_pending( &impl->expect_queue, irp ); break; + } case IOCTL_WINETEST_HID_SEND_INPUT: input_queue_reset( &impl->input_queue, irp->AssociatedIrp.SystemBuffer, in_size ); status = STATUS_SUCCESS; diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 4711d391bfe..c5641097df3 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -42,7 +42,7 @@ DEFINE_GUID(control_class,0xdeadbeef,0x29ef,0x4538,0xa5,0xfd,0xb6,0x95,0x73,0xa3,0x62,0xc0); #define IOCTL_WINETEST_HID_SET_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x800, METHOD_IN_DIRECT, FILE_ANY_ACCESS) -#define IOCTL_WINETEST_HID_WAIT_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x801, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_HID_WAIT_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x801, METHOD_IN_DIRECT, FILE_ANY_ACCESS) #define IOCTL_WINETEST_HID_SEND_INPUT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x802, METHOD_IN_DIRECT, FILE_ANY_ACCESS) #define IOCTL_WINETEST_HID_SET_CONTEXT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x803, METHOD_IN_DIRECT, FILE_ANY_ACCESS) #define IOCTL_WINETEST_CREATE_DEVICE CTL_CODE(FILE_DEVICE_KEYBOARD, 0x804, METHOD_IN_DIRECT, FILE_ANY_ACCESS) @@ -61,6 +61,11 @@ struct hid_expect BYTE report_buf[128]; }; +struct wait_expect_params +{ + BOOL wait_pending; +}; + /* create/remove device */ #define MAX_HID_DESCRIPTOR_LEN 2048 diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index f5b387f3566..976b1b93863 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5536,7 +5536,7 @@ static void test_windows_gaming_input(void) ok( !bool_async_handler.invoked, "handler invoked\n" ); IAsyncInfo_Release( async_info ); - wait_hid_expect( file, 100 ); + wait_hid_pending( file, 100 ); ret = WaitForSingleObject( bool_async_handler.event, 100 ); ok( ret == 0, "WaitForSingleObject returned %#lx\n", ret ); CloseHandle( bool_async_handler.event ); @@ -5581,7 +5581,7 @@ static void test_windows_gaming_input(void) ok( !bool_async_handler.invoked, "handler invoked\n" ); IAsyncInfo_Release( async_info ); - wait_hid_expect( file, 500 ); + wait_hid_pending( file, 100 ); ret = WaitForSingleObject( bool_async_handler.event, 100 ); ok( ret == 0, "WaitForSingleObject returned %#lx\n", ret ); CloseHandle( bool_async_handler.event ); diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 7e2d9cf86cf..00a3d65fe4d 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -911,10 +911,12 @@ void set_hid_expect_( const char *file, int line, HANDLE device, struct hid_expe ok_(file, line)( ret, "IOCTL_WINETEST_HID_SET_EXPECT failed, last error %lu\n", GetLastError() ); } -void wait_hid_expect_( const char *file, int line, HANDLE device, DWORD timeout, BOOL todo ) +void wait_hid_expect_( const char *file, int line, HANDLE device, DWORD timeout, BOOL wait_pending, BOOL todo ) { + struct wait_expect_params params = {.wait_pending = wait_pending}; + todo_wine_if(todo) { - BOOL ret = sync_ioctl_( file, line, device, IOCTL_WINETEST_HID_WAIT_EXPECT, NULL, 0, NULL, 0, timeout ); + BOOL ret = sync_ioctl_( file, line, device, IOCTL_WINETEST_HID_WAIT_EXPECT, &params, sizeof(params), NULL, 0, timeout ); ok_(file, line)( ret, "IOCTL_WINETEST_HID_WAIT_EXPECT failed, last error %lu\n", GetLastError() ); }

1 0

Alexandre Julliard : Wine release 7.8
by Alexandre Julliard 06 May '22

06 May '22

Module: website Branch: master Commit: 44f2de0497c2a3f9b18ebc3b143a1ec60e072233 URL: https://source.winehq.org/git/website.git/?a=commit;h=44f2de0497c2a3f9b18eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 22:39:11 2022 +0200 Wine release 7.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022050601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022050601.xml b/news/en/2022050601.xml new file mode 100644 index 00000000..6ca2abdf --- /dev/null +++ b/news/en/2022050601.xml @@ -0,0 +1,16 @@ +<news> +<date>May 6, 2022</date> +<title>Wine 7.8 Released</title> +<body> + The Wine development release 7.8 is now available. + <a href="{$root}/announce/7.8">What's new</a> in this release: +<ul> + <li>X11 and OSS drivers converted to PE.</li> + <li>WoW64 support in the sound drivers.</li> + <li>Number formatting using the new locale database.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.8.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Francois Gouget : kernel32/tests: Fix a typo in a comment.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 5479e9f2760783ef08539c7412eb28fe685f3605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5479e9f2760783ef08539c74… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 6 14:48:25 2022 +0200 kernel32/tests: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index b039bf524b2..cc02140f453 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2285,7 +2285,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags } - /* between the two thesholds, tail may still be set but block position is inconsistent */ + /* between the two thresholds, tail may still be set but block position is inconsistent */ alloc_size = 0x20000 * sizeof(void *) - 0x2000; winetest_push_context( "size %#Ix", alloc_size );

1 0

Francois Gouget : user32/tests: Make the test_char_from_pos() failures more informative.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 3ce1d494a6d4ac855c350225a1c62c65f58a6c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ce1d494a6d4ac855c350225… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 6 14:50:03 2022 +0200 user32/tests: Make the test_char_from_pos() failures more informative. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 1607e9d84d9..1e5ed8dbfa0 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1154,11 +1154,11 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(0 == ret, "expected 0 got %d\n", ret); + ok(0 == ret, "%d/%d/%d: expected 0 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); @@ -1172,11 +1172,11 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(0 == ret, "expected 0 got %d\n", ret); + ok(0 == ret, "%d/%d/%d: expected 0 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); @@ -1190,11 +1190,11 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(0 == ret, "expected 0 got %d\n", ret); + ok(0 == ret, "%d/%d/%d: expected 0 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); @@ -1208,11 +1208,12 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + ok(0 == ret || 1 == ret /* Vista */, + "%d/%d/%d: expected 0 or 1 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); @@ -1226,11 +1227,12 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + ok(0 == ret || 1 == ret /* Vista */, + "%d/%d/%d: expected 0 or 1 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); @@ -1244,11 +1246,12 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + ok(0 == ret || 1 == ret /* Vista */, + "%d/%d/%d: expected 0 or 1 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret);

1 0

Francois Gouget : kernelbase/tests: Loosen up the Sleep() test lower bound.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 48d538ba82a1564329d0cd0ac4d35685a4a80cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48d538ba82a1564329d0cd0a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 6 14:50:31 2022 +0200 kernelbase/tests: Loosen up the Sleep() test lower bound. It looks like Windows tries to work around the timer granularity by sometimes returning early such that the total may be a bit less than requested. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/sync.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index ecbff6d5707..4dfcfde3f26 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -213,8 +213,11 @@ static void test_Sleep(void) min = 50.0 * (r1 < r2 ? r1 : r2) / 10000000.0; max = 50.0 * (r1 < r2 ? r2 : r1) / 10000000.0; - /* Add an extra 1s to account for potential scheduling delays */ - ok(0.9 * min <= elapsed_time && elapsed_time <= 1.0 + max, + /* Windows tries to work around the timer resolution by sometimes + * returning early such that the total may be a bit less than requested! + * Also add an extra 1s to account for potential scheduling delays. + */ + ok(0.7 * min <= elapsed_time && elapsed_time <= 1.0 + max, "got %f, expected between %f and %f\n", elapsed_time, min, max); }

1 0

Nikolay Sivov : kernel32: Implement UnmapViewOfFileEx().
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 1e2bc2f50e0a7f2546067c1811cdadbc7c580ba7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e2bc2f50e0a7f2546067c18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 6 18:04:04 2022 +0300 kernel32: Implement UnmapViewOfFileEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 9 +++++++++ include/winbase.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bc5913b6d7d..ca339181e32 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1557,6 +1557,7 @@ @ stdcall -import UnlockFile(long long long long long) @ stdcall -import UnlockFileEx(long long long long ptr) @ stdcall -import UnmapViewOfFile(ptr) +@ stdcall -import UnmapViewOfFileEx(ptr long) # @ stub UnregisterApplicationRecoveryCallback @ stdcall UnregisterApplicationRestart() # @ stub UnregisterConsoleIME diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 854797ddeb0..791c3603918 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1654,7 +1654,7 @@ @ stdcall UnlockFileEx(long long long long ptr) @ stdcall UnmapViewOfFile(ptr) @ stdcall UnmapViewOfFile2(long ptr long) -# @ stub UnmapViewOfFileEx +@ stdcall UnmapViewOfFileEx(ptr long) # @ stub UnregisterBadMemoryNotification # @ stub UnregisterGPNotificationInternal # @ stub UnregisterStateChangeNotification diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 87c07887482..35e6d4e3b8c 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -312,6 +312,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFile2( HANDLE process, void *addr, ULON } +/*********************************************************************** + * UnmapViewOfFileEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFileEx( void *addr, ULONG flags ) +{ + return set_ntstatus( NtUnmapViewOfSectionEx( GetCurrentProcess(), addr, flags )); +} + + /*********************************************************************** * VirtualAlloc (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index 2b109af19df..9fbaa466b54 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2742,6 +2742,7 @@ WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID); WINBASEAPI BOOL WINAPI UnmapViewOfFile2(HANDLE,PVOID,ULONG); +WINBASEAPI BOOL WINAPI UnmapViewOfFileEx(PVOID,ULONG); WINBASEAPI BOOL WINAPI UmsThreadYield(void *); WINBASEAPI HRESULT WINAPI UnregisterApplicationRestart(void); WINBASEAPI BOOL WINAPI UnregisterWait(HANDLE);

1 0

Jacek Caban : win32u: Allow NULL cbtc in NtUserCreateWindowEx.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 21c8ff873b9657a1b8cb632ab4ec435d6ffdf065 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c8ff873b9657a1b8cb632a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 6 03:04:20 2022 +0200 win32u: Allow NULL cbtc in NtUserCreateWindowEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/window.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 9231f98539e..94cdd7f7280 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4845,9 +4845,10 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, HWND parent, HMENU menu, HINSTANCE instance, void *params, DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ) { - CREATESTRUCTW cs, *client_cs = cbtc->lpcs; + CREATESTRUCTW cs, *client_cs, cs_buf; UINT win_dpi, thread_dpi = get_thread_dpi(); DPI_AWARENESS_CONTEXT context; + CBT_CREATEWNDW cbtc_buf; HWND hwnd, owner = 0; INT sw = SW_SHOW; RECT rect; @@ -4855,8 +4856,24 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; + /* FIXME: We should pass a packed struct to client instead of using client_cs */ + if (cbtc) + { + client_cs = cbtc->lpcs; + cs.lpszName = client_cs->lpszName; + cs.lpszClass = client_cs->lpszClass; + cs.hInstance = client_cs->hInstance; /* may be different than instance for win16 */ + } + else + { + cbtc = &cbtc_buf; + client_cs = cbtc->lpcs = &cs_buf; + cs.lpszName = window_name ? window_name->Buffer : NULL; + cs.lpszClass = class_name->Buffer; + cs.hInstance = instance; + } + cs.lpCreateParams = params; - cs.hInstance = client_cs->hInstance; /* may be different than instance for win16 */ cs.hMenu = menu; cs.hwndParent = parent; cs.style = style; @@ -4865,10 +4882,6 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, cs.y = y; cs.cx = cx; cs.cy = cy; - /* We use client_cs to pass original class and name pointers, - * that's probably not how native handles it. */ - cs.lpszName = client_cs->lpszName; - cs.lpszClass = client_cs->lpszClass; /* Find the parent window */ if (parent == HWND_MESSAGE)

1 0

Jacek Caban : winex11: Directly use NtUserCreateWindowEx.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 0dcd1eaae57a6d14a9166c21ab99edf3ec3b036a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dcd1eaae57a6d14a9166c21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 16:57:41 2022 +0200 winex11: Directly use NtUserCreateWindowEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 7 +++++-- dlls/winex11.drv/window.c | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 02c5bf88f0e..d080ed5458e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -373,6 +373,7 @@ static BOOL grab_clipping_window( const RECT *clip ) #if HAVE_X11_EXTENSIONS_XINPUT2_H static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); + UNICODE_STRING class_name; Window clip_window; HWND msg_hwnd = 0; POINT pos; @@ -383,8 +384,10 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data) return FALSE; if (!(clip_window = init_clip_window())) return TRUE; - if (!(msg_hwnd = CreateWindowW( messageW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, - GetModuleHandleW(0), NULL ))) + RtlInitUnicodeString( &class_name, messageW ); + if (!(msg_hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, NULL, 0, 0, 0, 0, 0, + HWND_MESSAGE, 0, NtCurrentTeb()->Peb->ImageBaseAddress, + NULL, 0, NULL, 0, FALSE ))) return TRUE; if (keyboard_grabbed) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index cfb61c3217a..161f749a81d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2004,10 +2004,11 @@ HWND create_foreign_window( Display *display, Window xwin ) unsigned int nchildren; XWindowAttributes attr; DWORD style = WS_CLIPCHILDREN; + UNICODE_STRING class_name; if (!class_registered) { - UNICODE_STRING class_name, version = { 0 }; + UNICODE_STRING version = { 0 }; WNDCLASSEXW class; memset( &class, 0, sizeof(class) ); @@ -2050,8 +2051,10 @@ HWND create_foreign_window( Display *display, Window xwin ) pos.y = attr.y; } - hwnd = CreateWindowW( classW, NULL, style, pos.x, pos.y, attr.width, attr.height, - parent, 0, 0, NULL ); + RtlInitUnicodeString( &class_name, classW ); + hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, NULL, style, pos.x, pos.y, + attr.width, attr.height, parent, 0, NULL, NULL, 0, NULL, + 0, FALSE ); if (!(data = alloc_win_data( display, hwnd ))) { @@ -2167,6 +2170,7 @@ NTSTATUS x11drv_systray_dock( void *arg ) XSetWindowAttributes attr; XVisualInfo visual; struct x11drv_win_data *data; + UNICODE_STRING class_name; BOOL layered; HWND hwnd; @@ -2189,10 +2193,11 @@ NTSTATUS x11drv_systray_dock( void *arg ) *params->layered = layered = (visual.depth == 32); - hwnd = CreateWindowExW( layered ? WS_EX_LAYERED : 0, - icon_classname, NULL, WS_CLIPSIBLINGS | WS_POPUP, - CW_USEDEFAULT, CW_USEDEFAULT, params->cx, params->cy, - NULL, NULL, NULL, params->icon ); + RtlInitUnicodeString( &class_name, icon_classname ); + hwnd = NtUserCreateWindowEx( layered ? WS_EX_LAYERED : 0, &class_name, &class_name, NULL, + WS_CLIPSIBLINGS | WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, + params->cx, params->cy, NULL, 0, NULL, params->icon, 0, + NULL, 0, FALSE ); if (!(data = get_win_data( hwnd ))) return STATUS_UNSUCCESSFUL; if (layered) set_window_visual( data, &visual, TRUE );

1 0