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

ntoskrnl/tests: Use a more descriptive name for the netio test driver. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-04-04 22:36:49 -05:00 committed by Alexandre Julliard
parent 3d3c411d05
commit b1eba2266a
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ntoskrnl.exe/tests/Makefile.in
View File

@ -7,8 +7,8 @@ driver2_IMPORTS = winecrt0 ntoskrnl
driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
driver3_IMPORTS = winecrt0 ntoskrnl driver3_IMPORTS = winecrt0 ntoskrnl
driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
driver4_IMPORTS = winecrt0 ntoskrnl netio driver_netio_IMPORTS = winecrt0 ntoskrnl netio
driver4_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
driver_pnp_IMPORTS = winecrt0 ntoskrnl driver_pnp_IMPORTS = winecrt0 ntoskrnl
driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
@ -19,8 +19,8 @@ SOURCES = \
driver2.spec \ driver2.spec \
driver3.c \ driver3.c \
driver3.spec \ driver3.spec \
driver4.c \ driver_netio.c \
driver4.spec \ driver_netio.spec \
driver_pnp.c \ driver_pnp.c \
driver_pnp.spec \ driver_pnp.spec \
ntoskrnl.c ntoskrnl.c

6
dlls/ntoskrnl.exe/tests/driver4.c → dlls/ntoskrnl.exe/tests/driver_netio.c
View File

@ -1,5 +1,5 @@
/* /*
* ntoskrnl.exe testing framework * Unit tests for netio.sys (kernel sockets)
* *
* Copyright 2020 Paul Gofman for CodeWeavers * Copyright 2020 Paul Gofman for CodeWeavers
* *
@ -39,8 +39,8 @@
static DRIVER_OBJECT *driver_obj; static DRIVER_OBJECT *driver_obj;
static DEVICE_OBJECT *device_obj; static DEVICE_OBJECT *device_obj;
static const WCHAR driver_link[] = L"\\DosDevices\\WineTestDriver4"; static const WCHAR driver_link[] = L"\\DosDevices\\winetest_netio";
static const WCHAR device_name[] = L"\\Device\\WineTestDriver4"; static const WCHAR device_name[] = L"\\Device\\winetest_netio";
static WSK_CLIENT_NPI client_npi; static WSK_CLIENT_NPI client_npi;
static WSK_REGISTRATION registration; static WSK_REGISTRATION registration;

0
dlls/ntoskrnl.exe/tests/driver4.spec → dlls/ntoskrnl.exe/tests/driver_netio.spec
View File

10
dlls/ntoskrnl.exe/tests/ntoskrnl.c
View File

@ -899,14 +899,14 @@ static DWORD WINAPI wsk_test_thread(void *parameter)
return TRUE; return TRUE;
} }
static void test_driver4(struct testsign_context *ctx) static void test_driver_netio(struct testsign_context *ctx)
{ {
WCHAR filename[MAX_PATH]; WCHAR filename[MAX_PATH];
SC_HANDLE service; SC_HANDLE service;
HANDLE hthread; HANDLE hthread;
BOOL ret; BOOL ret;
if (!(service = load_driver(ctx, filename, L"driver4.dll", L"WineTestDriver4"))) if (!(service = load_driver(ctx, filename, L"driver_netio.dll", L"winetest_netio")))
return; return;
if (!start_driver(service, TRUE)) if (!start_driver(service, TRUE))
@ -915,7 +915,7 @@ static void test_driver4(struct testsign_context *ctx)
return; return;
} }
device = CreateFileA("\\\\.\\WineTestDriver4", 0, 0, NULL, OPEN_EXISTING, 0, NULL); device = CreateFileA("\\\\.\\winetest_netio", 0, 0, NULL, OPEN_EXISTING, 0, NULL);
ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); ok(device != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError());
hthread = CreateThread(NULL, 0, wsk_test_thread, NULL, 0, NULL); hthread = CreateThread(NULL, 0, wsk_test_thread, NULL, 0, NULL);
@ -1260,8 +1260,8 @@ START_TEST(ntoskrnl)
ok(ret, "DeleteFile failed: %u\n", GetLastError()); ok(ret, "DeleteFile failed: %u\n", GetLastError());
test_driver3(&ctx); test_driver3(&ctx);
subtest("driver4"); subtest("driver_netio");
test_driver4(&ctx); test_driver_netio(&ctx);
test_pnp_driver(&ctx); test_pnp_driver(&ctx);