Daniel Lehman : kernelbase: Call NtCancelSynchronousIoFile in CancelSynchronousIo.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f8dc38f9c216e677a8dc398f8cada86ec5b8f96b
URL:    https://gitlab.winehq.org/wine/wine/-/commit/f8dc38f9c216e677a8dc398f8cada86...

Author: Daniel Lehman 
Date:   Mon Apr 18 22:40:41 2022 -0700

kernelbase: Call NtCancelSynchronousIoFile in CancelSynchronousIo.

Signed-off-by: Daniel Lehman

---

dlls/kernel32/tests/pipe.c | 8 --------
 dlls/kernelbase/file.c     | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
index 55890cc9172..9481835b49b 100644
--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -4247,14 +4247,12 @@ static void test_CancelSynchronousIo(void)
     SetLastError(0xdeadbeef);
     res = pCancelSynchronousIo((HANDLE)0xdeadbeef);
     ok(!res, "CancelSynchronousIo succeeded unexpectedly\n");
-    todo_wine
     ok(GetLastError() == ERROR_INVALID_HANDLE,
         "In CancelSynchronousIo failure, expected ERROR_INVALID_HANDLE, got %ld\n", GetLastError());

SetLastError(0xdeadbeef);
     res = pCancelSynchronousIo(GetCurrentThread());
     ok(!res, "CancelSynchronousIo succeeded unexpectedly\n");
-    todo_wine
     ok(GetLastError() == ERROR_NOT_FOUND,
         "In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld\n", GetLastError());

@@ -4269,14 +4267,9 @@ static void test_CancelSynchronousIo(void)
     ok(wait == WAIT_TIMEOUT, "WaitForSingleObject returned %lu (error %lu)\n", wait, GetLastError());
     SetLastError(0xdeadbeef);
     res = pCancelSynchronousIo(thread);
-    todo_wine
-    {
     ok(res, "CancelSynchronousIo failed with error %ld\n", GetLastError());
     ok(GetLastError() == 0xdeadbeef,
         "In CancelSynchronousIo failure, expected 0xdeadbeef got %ld\n", GetLastError());
-    }
-    if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
-        CancelIoEx(pipe, NULL);
     wait = WaitForSingleObject(thread, 1000);
     ok(wait == WAIT_OBJECT_0, "WaitForSingleObject returned %lx\n", wait);
     CloseHandle(thread);
@@ -4294,7 +4287,6 @@ static void test_CancelSynchronousIo(void)
     SetLastError(0xdeadbeef);
     res = pCancelSynchronousIo(thread);
     ok(!res, "CancelSynchronousIo succeeded unexpectedly\n");
-    todo_wine
     ok(GetLastError() == ERROR_NOT_FOUND,
         "In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld\n", GetLastError());
     file = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0);
diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
index 5ba7e0be419..3e1fd5aec4e 100644
--- a/dlls/kernelbase/file.c
+++ b/dlls/kernelbase/file.c
@@ -2900,9 +2900,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH CancelIoEx( HANDLE handle, LPOVERLAPPED overlapped
  */
 BOOL WINAPI DECLSPEC_HOTPATCH CancelSynchronousIo( HANDLE thread )
 {
-    FIXME( "(%p): stub\n", thread );
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
+    IO_STATUS_BLOCK io;
+
+    return set_ntstatus( NtCancelSynchronousIoFile( thread, NULL, &io ));
 }