Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
f8dc38f9
Commit
f8dc38f9
authored
Apr 18, 2022
by
Daniel Lehman
Committed by
Alexandre Julliard
Oct 17, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernelbase: Call NtCancelSynchronousIoFile in CancelSynchronousIo.
Signed-off-by:
Daniel Lehman
<
dlehman25@gmail.com
>
parent
0a02b6a8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
pipe.c
dlls/kernel32/tests/pipe.c
+0
-8
file.c
dlls/kernelbase/file.c
+3
-3
No files found.
dlls/kernel32/tests/pipe.c
View file @
f8dc38f9
...
@@ -4247,14 +4247,12 @@ static void test_CancelSynchronousIo(void)
...
@@ -4247,14 +4247,12 @@ static void test_CancelSynchronousIo(void)
SetLastError
(
0xdeadbeef
);
SetLastError
(
0xdeadbeef
);
res
=
pCancelSynchronousIo
((
HANDLE
)
0xdeadbeef
);
res
=
pCancelSynchronousIo
((
HANDLE
)
0xdeadbeef
);
ok
(
!
res
,
"CancelSynchronousIo succeeded unexpectedly
\n
"
);
ok
(
!
res
,
"CancelSynchronousIo succeeded unexpectedly
\n
"
);
todo_wine
ok
(
GetLastError
()
==
ERROR_INVALID_HANDLE
,
ok
(
GetLastError
()
==
ERROR_INVALID_HANDLE
,
"In CancelSynchronousIo failure, expected ERROR_INVALID_HANDLE, got %ld
\n
"
,
GetLastError
());
"In CancelSynchronousIo failure, expected ERROR_INVALID_HANDLE, got %ld
\n
"
,
GetLastError
());
SetLastError
(
0xdeadbeef
);
SetLastError
(
0xdeadbeef
);
res
=
pCancelSynchronousIo
(
GetCurrentThread
());
res
=
pCancelSynchronousIo
(
GetCurrentThread
());
ok
(
!
res
,
"CancelSynchronousIo succeeded unexpectedly
\n
"
);
ok
(
!
res
,
"CancelSynchronousIo succeeded unexpectedly
\n
"
);
todo_wine
ok
(
GetLastError
()
==
ERROR_NOT_FOUND
,
ok
(
GetLastError
()
==
ERROR_NOT_FOUND
,
"In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld
\n
"
,
GetLastError
());
"In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld
\n
"
,
GetLastError
());
...
@@ -4269,14 +4267,9 @@ static void test_CancelSynchronousIo(void)
...
@@ -4269,14 +4267,9 @@ static void test_CancelSynchronousIo(void)
ok
(
wait
==
WAIT_TIMEOUT
,
"WaitForSingleObject returned %lu (error %lu)
\n
"
,
wait
,
GetLastError
());
ok
(
wait
==
WAIT_TIMEOUT
,
"WaitForSingleObject returned %lu (error %lu)
\n
"
,
wait
,
GetLastError
());
SetLastError
(
0xdeadbeef
);
SetLastError
(
0xdeadbeef
);
res
=
pCancelSynchronousIo
(
thread
);
res
=
pCancelSynchronousIo
(
thread
);
todo_wine
{
ok
(
res
,
"CancelSynchronousIo failed with error %ld
\n
"
,
GetLastError
());
ok
(
res
,
"CancelSynchronousIo failed with error %ld
\n
"
,
GetLastError
());
ok
(
GetLastError
()
==
0xdeadbeef
,
ok
(
GetLastError
()
==
0xdeadbeef
,
"In CancelSynchronousIo failure, expected 0xdeadbeef got %ld
\n
"
,
GetLastError
());
"In CancelSynchronousIo failure, expected 0xdeadbeef got %ld
\n
"
,
GetLastError
());
}
if
(
GetLastError
()
==
ERROR_CALL_NOT_IMPLEMENTED
)
CancelIoEx
(
pipe
,
NULL
);
wait
=
WaitForSingleObject
(
thread
,
1000
);
wait
=
WaitForSingleObject
(
thread
,
1000
);
ok
(
wait
==
WAIT_OBJECT_0
,
"WaitForSingleObject returned %lx
\n
"
,
wait
);
ok
(
wait
==
WAIT_OBJECT_0
,
"WaitForSingleObject returned %lx
\n
"
,
wait
);
CloseHandle
(
thread
);
CloseHandle
(
thread
);
...
@@ -4294,7 +4287,6 @@ static void test_CancelSynchronousIo(void)
...
@@ -4294,7 +4287,6 @@ static void test_CancelSynchronousIo(void)
SetLastError
(
0xdeadbeef
);
SetLastError
(
0xdeadbeef
);
res
=
pCancelSynchronousIo
(
thread
);
res
=
pCancelSynchronousIo
(
thread
);
ok
(
!
res
,
"CancelSynchronousIo succeeded unexpectedly
\n
"
);
ok
(
!
res
,
"CancelSynchronousIo succeeded unexpectedly
\n
"
);
todo_wine
ok
(
GetLastError
()
==
ERROR_NOT_FOUND
,
ok
(
GetLastError
()
==
ERROR_NOT_FOUND
,
"In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld
\n
"
,
GetLastError
());
"In CancelSynchronousIo failure, expected ERROR_NOT_FOUND, got %ld
\n
"
,
GetLastError
());
file
=
CreateFileA
(
PIPENAME
,
GENERIC_READ
|
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
0
);
file
=
CreateFileA
(
PIPENAME
,
GENERIC_READ
|
GENERIC_WRITE
,
0
,
NULL
,
OPEN_EXISTING
,
0
,
0
);
...
...
dlls/kernelbase/file.c
View file @
f8dc38f9
...
@@ -2900,9 +2900,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH CancelIoEx( HANDLE handle, LPOVERLAPPED overlapped
...
@@ -2900,9 +2900,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH CancelIoEx( HANDLE handle, LPOVERLAPPED overlapped
*/
*/
BOOL
WINAPI
DECLSPEC_HOTPATCH
CancelSynchronousIo
(
HANDLE
thread
)
BOOL
WINAPI
DECLSPEC_HOTPATCH
CancelSynchronousIo
(
HANDLE
thread
)
{
{
FIXME
(
"(%p): stub
\n
"
,
thread
)
;
IO_STATUS_BLOCK
io
;
SetLastError
(
ERROR_CALL_NOT_IMPLEMENTED
);
return
FALSE
;
return
set_ntstatus
(
NtCancelSynchronousIoFile
(
thread
,
NULL
,
&
io
))
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment