[PATCH 5/5] ntoskrnl/tests: Use a more descriptive name for the netio test driver.
Paul Gofman
pgofman at codeweavers.com
Mon Apr 5 04:10:05 CDT 2021
FWIW the idea was not to have this test driver specific to netio but
rather for the tests which require Windows 7+ to load (or test the
functionality present on newer Windows only to avoid extra checks for
keeping compatibility with earlier versions).
On 4/5/21 06:36, Zebediah Figura wrote:
> Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
> ---
> dlls/ntoskrnl.exe/tests/Makefile.in | 8 ++++----
> dlls/ntoskrnl.exe/tests/{driver4.c => driver_netio.c} | 6 +++---
> .../tests/{driver4.spec => driver_netio.spec} | 0
> dlls/ntoskrnl.exe/tests/ntoskrnl.c | 10 +++++-----
> 4 files changed, 12 insertions(+), 12 deletions(-)
> rename dlls/ntoskrnl.exe/tests/{driver4.c => driver_netio.c} (99%)
> rename dlls/ntoskrnl.exe/tests/{driver4.spec => driver_netio.spec} (100%)
>
> diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in
> index c799dfcaf77..d911879ff99 100644
> --- a/dlls/ntoskrnl.exe/tests/Makefile.in
> +++ b/dlls/ntoskrnl.exe/tests/Makefile.in
> @@ -7,8 +7,8 @@ driver2_IMPORTS = winecrt0 ntoskrnl
> driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
> driver3_IMPORTS = winecrt0 ntoskrnl
> driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
> -driver4_IMPORTS = winecrt0 ntoskrnl netio
> -driver4_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
> +driver_netio_IMPORTS = winecrt0 ntoskrnl netio
> +driver_netio_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
> driver_pnp_IMPORTS = winecrt0 ntoskrnl
> driver_pnp_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
>
> @@ -19,8 +19,8 @@ SOURCES = \
> driver2.spec \
> driver3.c \
> driver3.spec \
> - driver4.c \
> - driver4.spec \
> + driver_netio.c \
> + driver_netio.spec \
> driver_pnp.c \
> driver_pnp.spec \
> ntoskrnl.c
> diff --git a/dlls/ntoskrnl.exe/tests/driver4.c b/dlls/ntoskrnl.exe/tests/driver_netio.c
> similarity index 99%
> rename from dlls/ntoskrnl.exe/tests/driver4.c
> rename to dlls/ntoskrnl.exe/tests/driver_netio.c
> index d2a053e6b7a..3d783dbef0d 100644
> --- a/dlls/ntoskrnl.exe/tests/driver4.c
> +++ b/dlls/ntoskrnl.exe/tests/driver_netio.c
> @@ -1,5 +1,5 @@
> /*
> - * ntoskrnl.exe testing framework
> + * Unit tests for netio.sys (kernel sockets)
> *
> * Copyright 2020 Paul Gofman for CodeWeavers
> *
> @@ -39,8 +39,8 @@
> static DRIVER_OBJECT *driver_obj;
> static DEVICE_OBJECT *device_obj;
>
> -static const WCHAR driver_link[] = L"\\DosDevices\\WineTestDriver4";
> -static const WCHAR device_name[] = L"\\Device\\WineTestDriver4";
> +static const WCHAR driver_link[] = L"\\DosDevices\\winetest_netio";
> +static const WCHAR device_name[] = L"\\Device\\winetest_netio";
>
> static WSK_CLIENT_NPI client_npi;
> static WSK_REGISTRATION registration;
> diff --git a/dlls/ntoskrnl.exe/tests/driver4.spec b/dlls/ntoskrnl.exe/tests/driver_netio.spec
> similarity index 100%
> rename from dlls/ntoskrnl.exe/tests/driver4.spec
> rename to dlls/ntoskrnl.exe/tests/driver_netio.spec
> diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
> index 18f5189e382..4667915f621 100644
> --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c
> +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c
> @@ -899,14 +899,14 @@ static DWORD WINAPI wsk_test_thread(void *parameter)
> return TRUE;
> }
>
> -static void test_driver4(struct testsign_context *ctx)
> +static void test_driver_netio(struct testsign_context *ctx)
> {
> WCHAR filename[MAX_PATH];
> SC_HANDLE service;
> HANDLE hthread;
> 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;
>
> if (!start_driver(service, TRUE))
> @@ -915,7 +915,7 @@ static void test_driver4(struct testsign_context *ctx)
> 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());
>
> hthread = CreateThread(NULL, 0, wsk_test_thread, NULL, 0, NULL);
> @@ -1260,8 +1260,8 @@ START_TEST(ntoskrnl)
> ok(ret, "DeleteFile failed: %u\n", GetLastError());
>
> test_driver3(&ctx);
> - subtest("driver4");
> - test_driver4(&ctx);
> + subtest("driver_netio");
> + test_driver_netio(&ctx);
>
> test_pnp_driver(&ctx);
>
More information about the wine-devel
mailing list