Daniel Lehman : msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 61a5fe51addd146c34f0dd4e034b38312c28dad0
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=61a5fe51addd146c34f0dd4e0...

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");