January 2022 - Wine-commits

Daniel Lehman : msvcp140_atomic_wait/tests: Add test for threadpool_work functions.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 2b6a1c003c08cc1ff58106c2acf777f5c2e17daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6a1c003c08cc1ff58106c2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:18:44 2022 +0100 msvcp140_atomic_wait/tests: Add test for threadpool_work functions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../tests/msvcp140_atomic_wait.c | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index aee852afd98..e0dfef3222d 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -47,6 +47,83 @@ static void test___std_parallel_algorithms_hw_threads(void) ok(nthr == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, nthr); } +static PTP_WORK cb_work; +static void *cb_context; +static void WINAPI threadpool_workcallback(PTP_CALLBACK_INSTANCE instance, void *context, PTP_WORK work) { + LONG *workcalled = context; + cb_work = work; + cb_context = context; + + InterlockedIncrement(workcalled); +} + +static HANDLE cb_event; +static void CALLBACK threadpool_workfinalization(TP_CALLBACK_INSTANCE *instance, void *context) +{ + LONG *workcalled = context; + + InterlockedIncrement(workcalled); + SetEvent(cb_event); +} + +static void test_threadpool_work(void) +{ + PTP_WORK work; + DWORD gle, ret; + LONG workcalled; + TP_CALLBACK_ENVIRON environment; + TP_CALLBACK_ENVIRON_V3 environment3; + + /* simple test */ + workcalled = 0; + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, NULL); + ok(!!work, "failed to create threadpool_work\n"); + SubmitThreadpoolWork(work); + WaitForThreadpoolWorkCallbacks(work, FALSE); + CloseThreadpoolWork(work); + ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); + ok(cb_work == work, "expected %p, got %p\n", work, cb_work); + ok(cb_context == &workcalled, "expected %p, got %p\n", &workcalled, cb_context); + + /* test with environment */ + cb_event = CreateEventW(NULL, TRUE, FALSE, NULL); + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.FinalizationCallback = threadpool_workfinalization; + workcalled = 0; + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, &environment); + ok(!!work, "failed to create threadpool_work\n"); + SubmitThreadpoolWork(work); + WaitForThreadpoolWorkCallbacks(work, FALSE); + CloseThreadpoolWork(work); + ret = WaitForSingleObject(cb_event, 1000); + ok(ret == WAIT_OBJECT_0, "expected finalization callback to be called\n"); + ok(workcalled == 2, "expected work to be called twice, got %d\n", workcalled); + CloseHandle(cb_event); + + /* test with environment version 3 */ + memset(&environment3, 0, sizeof(environment3)); + environment3.Version = 3; + environment3.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + SetLastError(0xdeadbeef); + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + (TP_CALLBACK_ENVIRON *)&environment3); + gle = GetLastError(); + ok(gle == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", gle); + ok(!!work, "failed to create threadpool_work\n"); + CloseThreadpoolWork(work); + + memset(&environment3, 0, sizeof(environment3)); + environment3.Version = 3; + environment3.CallbackPriority = TP_CALLBACK_PRIORITY_INVALID; + SetLastError(0xdeadbeef); + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + (TP_CALLBACK_ENVIRON *)&environment3); + gle = GetLastError(); + ok(gle == ERROR_INVALID_PARAMETER, "expected %d, got %d\n", ERROR_INVALID_PARAMETER, gle); + ok(!work, "expected failure\n"); +} + START_TEST(msvcp140_atomic_wait) { HMODULE msvcp; @@ -56,5 +133,6 @@ START_TEST(msvcp140_atomic_wait) return; } test___std_parallel_algorithms_hw_threads(); + test_threadpool_work(); FreeLibrary(msvcp); }

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_create_threadpool_work.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: f1e995f020c3cee99fc11bebde8892637ca9b3a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e995f020c3cee99fc11beb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:18:51 2022 +0100 msvcp140_atomic_wait: Implement __std_create_threadpool_work. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 7 +++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 17 +++++++++++++---- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index 5c430ffd959..bdc46412771 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -30,3 +30,10 @@ unsigned int __stdcall __std_parallel_algorithms_hw_threads(void) TRACE("()\n"); return _Thrd_hardware_concurrency(); } + +PTP_WORK __stdcall __std_create_threadpool_work(PTP_WORK_CALLBACK callback, void *context, + PTP_CALLBACK_ENVIRON environ) +{ + TRACE("(%p %p %p)\n", callback, context, environ); + return CreateThreadpoolWork(callback, context, environ); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 1e5d1a5128b..3b4fd48dc7f 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -14,7 +14,7 @@ @ stub __std_bulk_submit_threadpool_work @ stub __std_calloc_crt @ stub __std_close_threadpool_work -@ stub __std_create_threadpool_work +@ stdcall __std_create_threadpool_work(ptr ptr ptr) @ stub __std_execution_wait_on_uchar @ stub __std_execution_wake_by_address_all @ stub __std_free_crt diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index e0dfef3222d..097a81e5029 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -24,6 +24,8 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); +static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static HMODULE init(void) @@ -34,6 +36,8 @@ static HMODULE init(void) return NULL; SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); + + SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); return msvcp; } @@ -74,9 +78,14 @@ static void test_threadpool_work(void) TP_CALLBACK_ENVIRON environment; TP_CALLBACK_ENVIRON_V3 environment3; + if (0) /* crash on windows */ + { + p___std_create_threadpool_work(NULL, NULL, NULL); + } + /* simple test */ workcalled = 0; - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, NULL); + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); ok(!!work, "failed to create threadpool_work\n"); SubmitThreadpoolWork(work); WaitForThreadpoolWorkCallbacks(work, FALSE); @@ -91,7 +100,7 @@ static void test_threadpool_work(void) environment.Version = 1; environment.FinalizationCallback = threadpool_workfinalization; workcalled = 0; - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, &environment); + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, &environment); ok(!!work, "failed to create threadpool_work\n"); SubmitThreadpoolWork(work); WaitForThreadpoolWorkCallbacks(work, FALSE); @@ -106,7 +115,7 @@ static void test_threadpool_work(void) environment3.Version = 3; environment3.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; SetLastError(0xdeadbeef); - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, (TP_CALLBACK_ENVIRON *)&environment3); gle = GetLastError(); ok(gle == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", gle); @@ -117,7 +126,7 @@ static void test_threadpool_work(void) environment3.Version = 3; environment3.CallbackPriority = TP_CALLBACK_PRIORITY_INVALID; SetLastError(0xdeadbeef); - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, (TP_CALLBACK_ENVIRON *)&environment3); gle = GetLastError(); ok(gle == ERROR_INVALID_PARAMETER, "expected %d, got %d\n", ERROR_INVALID_PARAMETER, gle);

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_submit_threadpool_work.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 68ad71a072d355bf8b4caec996e84a4fbd277059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68ad71a072d355bf8b4caec9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:18:58 2022 +0100 msvcp140_atomic_wait: Implement __std_submit_threadpool_work. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index bdc46412771..1f5440b248a 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -37,3 +37,9 @@ PTP_WORK __stdcall __std_create_threadpool_work(PTP_WORK_CALLBACK callback, void TRACE("(%p %p %p)\n", callback, context, environ); return CreateThreadpoolWork(callback, context, environ); } + +void __stdcall __std_submit_threadpool_work(PTP_WORK work) +{ + TRACE("(%p)\n", work); + return SubmitThreadpoolWork(work); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 3b4fd48dc7f..d5c9b45a119 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -20,7 +20,7 @@ @ stub __std_free_crt @ stdcall __std_parallel_algorithms_hw_threads() @ stub __std_release_shared_mutex_for_instance -@ stub __std_submit_threadpool_work +@ stdcall __std_submit_threadpool_work(ptr) @ stub __std_tzdb_delete_current_zone @ stub __std_tzdb_delete_leap_seconds @ stub __std_tzdb_delete_sys_info diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index 097a81e5029..0e707e9be44 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -25,6 +25,7 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); +static void (__stdcall *p___std_submit_threadpool_work)(PTP_WORK); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -38,6 +39,7 @@ static HMODULE init(void) SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); + SET(p___std_submit_threadpool_work, "__std_submit_threadpool_work"); return msvcp; } @@ -81,13 +83,14 @@ static void test_threadpool_work(void) if (0) /* crash on windows */ { p___std_create_threadpool_work(NULL, NULL, NULL); + p___std_submit_threadpool_work(NULL); } /* simple test */ workcalled = 0; work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); ok(!!work, "failed to create threadpool_work\n"); - SubmitThreadpoolWork(work); + p___std_submit_threadpool_work(work); WaitForThreadpoolWorkCallbacks(work, FALSE); CloseThreadpoolWork(work); ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); @@ -102,7 +105,7 @@ static void test_threadpool_work(void) workcalled = 0; work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, &environment); ok(!!work, "failed to create threadpool_work\n"); - SubmitThreadpoolWork(work); + p___std_submit_threadpool_work(work); WaitForThreadpoolWorkCallbacks(work, FALSE); CloseThreadpoolWork(work); ret = WaitForSingleObject(cb_event, 1000);

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 61a5fe51addd146c34f0dd4e034b38312c28dad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61a5fe51addd146c34f0dd4e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:19:03 2022 +0100 msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index 1f5440b248a..28e86b93d7d 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -43,3 +43,9 @@ void __stdcall __std_submit_threadpool_work(PTP_WORK work) TRACE("(%p)\n", work); return SubmitThreadpoolWork(work); } + +void __stdcall __std_wait_for_threadpool_work_callbacks(PTP_WORK work, BOOL cancel) +{ + TRACE("(%p %d)\n", work, cancel); + return WaitForThreadpoolWorkCallbacks(work, cancel); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index d5c9b45a119..cc8bc0e404e 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -29,4 +29,4 @@ @ stub __std_tzdb_get_leap_seconds @ stub __std_tzdb_get_sys_info @ stub __std_tzdb_get_time_zones -@ stub __std_wait_for_threadpool_work_callbacks +@ stdcall __std_wait_for_threadpool_work_callbacks(ptr long) diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index 0e707e9be44..a7ba1dc76ea 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -26,6 +26,7 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); static void (__stdcall *p___std_submit_threadpool_work)(PTP_WORK); +static void (__stdcall *p___std_wait_for_threadpool_work_callbacks)(PTP_WORK, BOOL); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -40,6 +41,7 @@ static HMODULE init(void) SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); SET(p___std_submit_threadpool_work, "__std_submit_threadpool_work"); + SET(p___std_wait_for_threadpool_work_callbacks, "__std_wait_for_threadpool_work_callbacks"); return msvcp; } @@ -84,6 +86,7 @@ static void test_threadpool_work(void) { p___std_create_threadpool_work(NULL, NULL, NULL); p___std_submit_threadpool_work(NULL); + p___std_wait_for_threadpool_work_callbacks(NULL, FALSE); } /* simple test */ @@ -91,7 +94,7 @@ static void test_threadpool_work(void) work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); ok(!!work, "failed to create threadpool_work\n"); p___std_submit_threadpool_work(work); - WaitForThreadpoolWorkCallbacks(work, FALSE); + p___std_wait_for_threadpool_work_callbacks(work, FALSE); CloseThreadpoolWork(work); ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); ok(cb_work == work, "expected %p, got %p\n", work, cb_work); @@ -106,7 +109,7 @@ static void test_threadpool_work(void) work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, &environment); ok(!!work, "failed to create threadpool_work\n"); p___std_submit_threadpool_work(work); - WaitForThreadpoolWorkCallbacks(work, FALSE); + p___std_wait_for_threadpool_work_callbacks(work, FALSE); CloseThreadpoolWork(work); ret = WaitForSingleObject(cb_event, 1000); ok(ret == WAIT_OBJECT_0, "expected finalization callback to be called\n");

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_close_threadpool_work.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 69debac78681812b7dff36b9056ef6cd375e387b URL: https://source.winehq.org/git/wine.git/?a=commit;h=69debac78681812b7dff36b9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:19:11 2022 +0100 msvcp140_atomic_wait: Implement __std_close_threadpool_work. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 9 ++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index 28e86b93d7d..c00ed08bffe 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -31,6 +31,12 @@ unsigned int __stdcall __std_parallel_algorithms_hw_threads(void) return _Thrd_hardware_concurrency(); } +void __stdcall __std_close_threadpool_work(PTP_WORK work) +{ + TRACE("(%p)\n", work); + return CloseThreadpoolWork(work); +} + PTP_WORK __stdcall __std_create_threadpool_work(PTP_WORK_CALLBACK callback, void *context, PTP_CALLBACK_ENVIRON environ) { diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index cc8bc0e404e..5b03b7ccfe8 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -13,7 +13,7 @@ @ stub __std_atomic_wait_indirect @ stub __std_bulk_submit_threadpool_work @ stub __std_calloc_crt -@ stub __std_close_threadpool_work +@ stdcall __std_close_threadpool_work(ptr) @ stdcall __std_create_threadpool_work(ptr ptr ptr) @ stub __std_execution_wait_on_uchar @ stub __std_execution_wake_by_address_all diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index a7ba1dc76ea..f67270fe3b5 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -24,6 +24,7 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); +static void (__stdcall *p___std_close_threadpool_work)(PTP_WORK); static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); static void (__stdcall *p___std_submit_threadpool_work)(PTP_WORK); static void (__stdcall *p___std_wait_for_threadpool_work_callbacks)(PTP_WORK, BOOL); @@ -39,6 +40,7 @@ static HMODULE init(void) SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); + SET(p___std_close_threadpool_work, "__std_close_threadpool_work"); SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); SET(p___std_submit_threadpool_work, "__std_submit_threadpool_work"); SET(p___std_wait_for_threadpool_work_callbacks, "__std_wait_for_threadpool_work_callbacks"); @@ -87,6 +89,7 @@ static void test_threadpool_work(void) p___std_create_threadpool_work(NULL, NULL, NULL); p___std_submit_threadpool_work(NULL); p___std_wait_for_threadpool_work_callbacks(NULL, FALSE); + p___std_close_threadpool_work(NULL); } /* simple test */ @@ -95,7 +98,7 @@ static void test_threadpool_work(void) ok(!!work, "failed to create threadpool_work\n"); p___std_submit_threadpool_work(work); p___std_wait_for_threadpool_work_callbacks(work, FALSE); - CloseThreadpoolWork(work); + p___std_close_threadpool_work(work); ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); ok(cb_work == work, "expected %p, got %p\n", work, cb_work); ok(cb_context == &workcalled, "expected %p, got %p\n", &workcalled, cb_context); @@ -110,7 +113,7 @@ static void test_threadpool_work(void) ok(!!work, "failed to create threadpool_work\n"); p___std_submit_threadpool_work(work); p___std_wait_for_threadpool_work_callbacks(work, FALSE); - CloseThreadpoolWork(work); + p___std_close_threadpool_work(work); ret = WaitForSingleObject(cb_event, 1000); ok(ret == WAIT_OBJECT_0, "expected finalization callback to be called\n"); ok(workcalled == 2, "expected work to be called twice, got %d\n", workcalled); @@ -126,7 +129,7 @@ static void test_threadpool_work(void) gle = GetLastError(); ok(gle == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", gle); ok(!!work, "failed to create threadpool_work\n"); - CloseThreadpoolWork(work); + p___std_close_threadpool_work(work); memset(&environment3, 0, sizeof(environment3)); environment3.Version = 3;

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_bulk_submit_threadpool_work.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: a7f71dbb7b6146a95b5fe551a9e27ba3347a529c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f71dbb7b6146a95b5fe551… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:19:20 2022 +0100 msvcp140_atomic_wait: Implement __std_bulk_submit_threadpool_work. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 7 +++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index c00ed08bffe..f489a7d8e05 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -31,6 +31,13 @@ unsigned int __stdcall __std_parallel_algorithms_hw_threads(void) return _Thrd_hardware_concurrency(); } +void __stdcall __std_bulk_submit_threadpool_work(PTP_WORK work, size_t count) +{ + TRACE("(%p %Iu)\n", work, count); + while (count--) + SubmitThreadpoolWork(work); +} + void __stdcall __std_close_threadpool_work(PTP_WORK work) { TRACE("(%p)\n", work); diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 5b03b7ccfe8..bb4edfb76e5 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -11,7 +11,7 @@ @ stub __std_atomic_wait_get_deadline @ stub __std_atomic_wait_get_remaining_timeout @ stub __std_atomic_wait_indirect -@ stub __std_bulk_submit_threadpool_work +@ stdcall __std_bulk_submit_threadpool_work(ptr long) @ stub __std_calloc_crt @ stdcall __std_close_threadpool_work(ptr) @ stdcall __std_create_threadpool_work(ptr ptr ptr) diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index f67270fe3b5..3a971bb4ce3 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -24,6 +24,7 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); +static void (__stdcall *p___std_bulk_submit_threadpool_work)(PTP_WORK, size_t); static void (__stdcall *p___std_close_threadpool_work)(PTP_WORK); static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); static void (__stdcall *p___std_submit_threadpool_work)(PTP_WORK); @@ -40,6 +41,7 @@ static HMODULE init(void) SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); + SET(p___std_bulk_submit_threadpool_work, "__std_bulk_submit_threadpool_work"); SET(p___std_close_threadpool_work, "__std_close_threadpool_work"); SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); SET(p___std_submit_threadpool_work, "__std_submit_threadpool_work"); @@ -86,6 +88,7 @@ static void test_threadpool_work(void) if (0) /* crash on windows */ { + p___std_bulk_submit_threadpool_work(NULL, 5); p___std_create_threadpool_work(NULL, NULL, NULL); p___std_submit_threadpool_work(NULL); p___std_wait_for_threadpool_work_callbacks(NULL, FALSE); @@ -103,6 +106,23 @@ static void test_threadpool_work(void) ok(cb_work == work, "expected %p, got %p\n", work, cb_work); ok(cb_context == &workcalled, "expected %p, got %p\n", &workcalled, cb_context); + /* bulk submit */ + workcalled = 0; + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); + ok(!!work, "failed to create threadpool_work\n"); + p___std_bulk_submit_threadpool_work(work, 13); + p___std_wait_for_threadpool_work_callbacks(work, FALSE); + p___std_close_threadpool_work(work); + ok(workcalled == 13, "expected work to be called 13 times, got %d\n", workcalled); + + workcalled = 0; + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); + ok(!!work, "failed to create threadpool_work\n"); + p___std_bulk_submit_threadpool_work(work, 0); + p___std_wait_for_threadpool_work_callbacks(work, FALSE); + p___std_close_threadpool_work(work); + ok(workcalled == 0, "expected no work, got %d\n", workcalled); + /* test with environment */ cb_event = CreateEventW(NULL, TRUE, FALSE, NULL); memset(&environment, 0, sizeof(environment));

1 0

Alexandre Julliard : Release 7.1.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 594e431e36d65e470bcbe930eb3d0f2bbca17736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=594e431e36d65e470bcbe930… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 21:27:46 2022 +0100 Release 7.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 963 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 559 insertions(+), 427 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=594e431e36d65e470bcb…

1 0

Tag wine-7.1 : Alexandre Julliard : Release 7.1
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: refs/tags/wine-7.1 Tag: 0201e7bb92a01cfa3a5a5f5551a98844b0ae8e74 URL: https://source.winehq.org/git/wine.git/?a=tag;h=0201e7bb92a01cfa3a5a5f5551a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 21:27:46 2022 +0100 Release 7.1

1 0

Nikolay Sivov : dwrite/tests: Remove remaining kernel32 heap calls.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: b7d24e229908daabdc76209e8fe0738424740447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7d24e229908daabdc76209e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 11:29:16 2022 +0300 dwrite/tests: Remove remaining kernel32 heap calls. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 11 ++++------- dlls/dwrite/tests/font.c | 35 +++++++++++++++++++---------------- dlls/dwrite/tests/layout.c | 14 ++++++-------- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 875503ed5a3..d1d44c94012 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -134,16 +134,13 @@ static void add_call(struct call_sequence **seq, int sequence_index, const struc if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = HeapAlloc(GetProcessHeap(), 0, - call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = malloc(call_seq->size * sizeof(*call_seq->sequence)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - call_seq->sequence, - call_seq->size * sizeof (struct call_entry)); + call_seq->sequence = realloc(call_seq->sequence, call_seq->size * sizeof(*call_seq->sequence)); } assert(call_seq->sequence); @@ -155,7 +152,7 @@ static inline void flush_sequence(struct call_sequence **seg, int sequence_index { struct call_sequence *call_seq = seg[sequence_index]; - HeapFree(GetProcessHeap(), 0, call_seq->sequence); + free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -165,7 +162,7 @@ static void init_call_sequences(struct call_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct call_sequence)); + seq[i] = calloc(1, sizeof(*seq[i])); } static void test_uint(UINT32 actual, UINT32 expected, const char *name, const struct testcontext *ctxt) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 26f94a1e3b1..10722fee444 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -783,11 +783,13 @@ static ULONG WINAPI fontdatastream_AddRef(IDWriteFontFileStream *iface) static ULONG WINAPI fontdatastream_Release(IDWriteFontFileStream *iface) { - struct test_fontdatastream *This = impl_from_IDWriteFontFileStream(iface); - ULONG ref = InterlockedDecrement(&This->ref); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); - return ref; + struct test_fontdatastream *stream = impl_from_IDWriteFontFileStream(iface); + ULONG refcount = InterlockedDecrement(&stream->ref); + + if (!refcount) + free(stream); + + return refcount; } static HRESULT WINAPI fontdatastream_ReadFileFragment(IDWriteFontFileStream *iface, void const **fragment_start, UINT64 offset, UINT64 fragment_size, void **fragment_context) @@ -836,16 +838,17 @@ static const IDWriteFontFileStreamVtbl fontdatastreamvtbl = static HRESULT create_fontdatastream(LPVOID data, UINT size, IDWriteFontFileStream** iface) { - struct test_fontdatastream *This = HeapAlloc(GetProcessHeap(), 0, sizeof(struct test_fontdatastream)); - if (!This) + struct test_fontdatastream *object = calloc(1, sizeof(*object)); + if (!object) return E_OUTOFMEMORY; - This->data = data; - This->size = size; - This->ref = 1; - This->IDWriteFontFileStream_iface.lpVtbl = &fontdatastreamvtbl; + object->IDWriteFontFileStream_iface.lpVtbl = &fontdatastreamvtbl; + object->ref = 1; + object->data = data; + object->size = size; + + *iface = &object->IDWriteFontFileStream_iface; - *iface = &This->IDWriteFontFileStream_iface; return S_OK; } @@ -6014,7 +6017,7 @@ static void test_CreateGlyphRunAnalysis(void) ok(!IsRectEmpty(&rect), "Unexpected empty bbox.\n"); size = (rect.right - rect.left) * (rect.bottom - rect.top); - bits = HeapAlloc(GetProcessHeap(), 0, size); + bits = malloc(size); hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect, bits, size); ok(hr == S_OK, "Failed to get alpha texture, hr %#x.\n", hr); @@ -6029,7 +6032,7 @@ static void test_CreateGlyphRunAnalysis(void) todo_wine ok(hr == DWRITE_E_UNSUPPORTEDOPERATION, "Unexpected hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, bits); + free(bits); hr = IDWriteFactory_CreateCustomRenderingParams(factory, 0.1f, 0.0f, 1.0f, DWRITE_PIXEL_GEOMETRY_FLAT, DWRITE_RENDERING_MODE_NATURAL, &params); @@ -6095,7 +6098,7 @@ static void test_CreateGlyphRunAnalysis(void) ok(!IsRectEmpty(&rect), "Unexpected empty bbox.\n"); size = (rect.right - rect.left) * (rect.bottom - rect.top); - bits = HeapAlloc(GetProcessHeap(), 0, size); + bits = malloc(size); hr = IDWriteGlyphRunAnalysis_CreateAlphaTexture(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect, bits, size); ok(hr == S_OK, "Failed to get alpha texture, hr %#x.\n", hr); @@ -6110,7 +6113,7 @@ static void test_CreateGlyphRunAnalysis(void) todo_wine ok(hr == DWRITE_E_UNSUPPORTEDOPERATION, "Unexpected hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, bits); + free(bits); IDWriteGlyphRunAnalysis_Release(analysis); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3a6add954d9..95166376ac7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -343,14 +343,12 @@ static void add_call(struct drawcall_sequence **seq, int sequence_index, const s if (!call_seq->sequence) { call_seq->size = 10; - call_seq->sequence = HeapAlloc(GetProcessHeap(), 0, call_seq->size * sizeof (struct drawcall_entry)); + call_seq->sequence = malloc(call_seq->size * sizeof(*call_seq->sequence)); } if (call_seq->count == call_seq->size) { call_seq->size *= 2; - call_seq->sequence = HeapReAlloc(GetProcessHeap(), 0, - call_seq->sequence, - call_seq->size * sizeof (struct drawcall_entry)); + call_seq->sequence = realloc(call_seq->sequence, call_seq->size * sizeof(*call_seq->sequence)); } assert(call_seq->sequence); @@ -361,7 +359,7 @@ static inline void flush_sequence(struct drawcall_sequence **seg, int sequence_i { struct drawcall_sequence *call_seq = seg[sequence_index]; - HeapFree(GetProcessHeap(), 0, call_seq->sequence); + free(call_seq->sequence); call_seq->sequence = NULL; call_seq->count = call_seq->size = 0; } @@ -371,7 +369,7 @@ static void init_call_sequences(struct drawcall_sequence **seq, int n) int i; for (i = 0; i < n; i++) - seq[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct drawcall_sequence)); + seq[i] = calloc(1, sizeof(*seq[i])); } static void ok_sequence_(struct drawcall_sequence **seq, int sequence_index, @@ -879,7 +877,7 @@ static ULONG WINAPI testeffect_Release(IUnknown *iface) LONG ref = InterlockedDecrement(&effect->ref); if (!ref) - HeapFree(GetProcessHeap(), 0, effect); + free(effect); return ref; } @@ -894,7 +892,7 @@ static IUnknown *create_test_effect(void) { struct test_effect *effect; - effect = HeapAlloc(GetProcessHeap(), 0, sizeof(*effect)); + effect = calloc(1, sizeof(*effect)); effect->IUnknown_iface.lpVtbl = &testeffectvtbl; effect->ref = 1;

1 0

Gerald Pfeifer : iphlpapi: Zero-init prefix_len to avoid a compiler warning.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 56b26e1d66ad9491bd7357a60c31e5df35cdd15c URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b26e1d66ad9491bd7357a6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 28 08:53:30 2022 +0000 iphlpapi: Zero-init prefix_len to avoid a compiler warning. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c94f869c9f9..387589cc03d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1057,6 +1057,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG if (flags & GAA_FLAG_INCLUDE_PREFIX) { memset( &sockaddr, 0, sizeof(sockaddr) ); + prefix_len = 0; if (family == AF_INET) { if (!key4->next_hop.s_addr)

1 0