ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Zebediah Figura 2017-10-09 11:48:03 -05:00 committed by Alexandre Julliard
parent a34adbefe4
commit cd4dc08b30
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/ntdll/tests/pipe.c
View File

@ -98,10 +98,10 @@ static BOOL init_func_ptrs(void)
loadfunc(NtQueryVolumeInformationFile) loadfunc(NtQueryVolumeInformationFile)
loadfunc(NtSetInformationFile) loadfunc(NtSetInformationFile)
loadfunc(NtCancelIoFile) loadfunc(NtCancelIoFile)
loadfunc(NtCancelIoFileEx)
loadfunc(RtlInitUnicodeString) loadfunc(RtlInitUnicodeString)
/* not fatal */ /* not fatal */
pNtCancelIoFileEx = (void *)GetProcAddress(module, "NtCancelIoFileEx");
module = GetModuleHandleA("kernel32.dll"); module = GetModuleHandleA("kernel32.dll");
pOpenThread = (void *)GetProcAddress(module, "OpenThread"); pOpenThread = (void *)GetProcAddress(module, "OpenThread");
pQueueUserAPC = (void *)GetProcAddress(module, "QueueUserAPC"); pQueueUserAPC = (void *)GetProcAddress(module, "QueueUserAPC");
@ -516,21 +516,27 @@ static void test_cancelio(void)
CloseHandle(hPipe); CloseHandle(hPipe);
res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */); if (pNtCancelIoFileEx)
ok(!res, "NtCreateNamedPipeFile returned %x\n", res); {
res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */);
ok(!res, "NtCreateNamedPipeFile returned %x\n", res);
memset(&iosb, 0x55, sizeof(iosb)); memset(&iosb, 0x55, sizeof(iosb));
res = listen_pipe(hPipe, hEvent, &iosb, FALSE); res = listen_pipe(hPipe, hEvent, &iosb, FALSE);
ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res);
res = pNtCancelIoFileEx(hPipe, &iosb, &cancel_sb); res = pNtCancelIoFileEx(hPipe, &iosb, &cancel_sb);
ok(!res, "NtCancelIoFileEx returned %x\n", res); ok(!res, "NtCancelIoFileEx returned %x\n", res);
ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status);
ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n");
CloseHandle(hPipe);
}
else
win_skip("NtCancelIoFileEx not available\n");
CloseHandle(hEvent); CloseHandle(hEvent);
CloseHandle(hPipe);
} }
static void _check_pipe_handle_state(int line, HANDLE handle, ULONG read, ULONG completion) 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( read );
CloseHandle( write ); CloseHandle( write );
} }
else
win_skip("NtCancelIoFileEx not available\n");
CloseHandle(event); CloseHandle(event);
} }