ntdll/tests: Don't abort if NtCancelFileIoEx() is missing.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
a34adbefe4
commit
cd4dc08b30
|
@ -98,10 +98,10 @@ static BOOL init_func_ptrs(void)
|
|||
loadfunc(NtQueryVolumeInformationFile)
|
||||
loadfunc(NtSetInformationFile)
|
||||
loadfunc(NtCancelIoFile)
|
||||
loadfunc(NtCancelIoFileEx)
|
||||
loadfunc(RtlInitUnicodeString)
|
||||
|
||||
/* not fatal */
|
||||
pNtCancelIoFileEx = (void *)GetProcAddress(module, "NtCancelIoFileEx");
|
||||
module = GetModuleHandleA("kernel32.dll");
|
||||
pOpenThread = (void *)GetProcAddress(module, "OpenThread");
|
||||
pQueueUserAPC = (void *)GetProcAddress(module, "QueueUserAPC");
|
||||
|
@ -516,6 +516,8 @@ static void test_cancelio(void)
|
|||
|
||||
CloseHandle(hPipe);
|
||||
|
||||
if (pNtCancelIoFileEx)
|
||||
{
|
||||
res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */);
|
||||
ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
|
||||
|
||||
|
@ -529,8 +531,12 @@ static void test_cancelio(void)
|
|||
ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status);
|
||||
ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n");
|
||||
|
||||
CloseHandle(hEvent);
|
||||
CloseHandle(hPipe);
|
||||
}
|
||||
else
|
||||
win_skip("NtCancelIoFileEx not available\n");
|
||||
|
||||
CloseHandle(hEvent);
|
||||
}
|
||||
|
||||
static void _check_pipe_handle_state(int line, HANDLE handle, ULONG read, ULONG completion)
|
||||
|
@ -1094,6 +1100,8 @@ static void read_pipe_test(ULONG pipe_flags, ULONG pipe_type)
|
|||
CloseHandle( read );
|
||||
CloseHandle( write );
|
||||
}
|
||||
else
|
||||
win_skip("NtCancelIoFileEx not available\n");
|
||||
|
||||
CloseHandle(event);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue