From: Thomas Faber Date: Thu, 29 Jun 2017 15:30:23 +0000 (+0000) Subject: [KMTESTS:KERNEL32] X-Git-Tag: ReactOS-0.4.6~150 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=24ac7c8bed856031a4723ed53a122d13138add9b;hp=f4e131fa499908efa6e1577f6fc5f1fa982db913 [KMTESTS:KERNEL32] - Rename FindFile_drv to kernel32_drv (and perform some other appropriate renames), since it can be used for multiple tests, not just FindFile - Change license to LGPL (this is okay since nobody but me has touched these files) CORE-13495 svn path=/trunk/; revision=75235 --- diff --git a/rostests/kmtests/CMakeLists.txt b/rostests/kmtests/CMakeLists.txt index 474577a21fa..292f13181a0 100644 --- a/rostests/kmtests/CMakeLists.txt +++ b/rostests/kmtests/CMakeLists.txt @@ -155,12 +155,12 @@ add_custom_target(kmtest_drivers) add_dependencies(kmtest_drivers kmtest_drv example_drv - findfile_drv hidp_drv iocreatefile_drv iodeviceobject_drv iohelper_drv ioreadwrite_drv + kernel32_drv mmmaplockedpagesspecifycache_drv ntcreatesection_drv poirp_drv diff --git a/rostests/kmtests/kernel32/CMakeLists.txt b/rostests/kmtests/kernel32/CMakeLists.txt index 8d0b2ec9674..e93c8e55608 100644 --- a/rostests/kmtests/kernel32/CMakeLists.txt +++ b/rostests/kmtests/kernel32/CMakeLists.txt @@ -1,14 +1,14 @@ include_directories(../include) -list(APPEND FINDFILE_DRV_SOURCE +list(APPEND KERNEL32_DRV_SOURCE ../kmtest_drv/kmtest_standalone.c - FindFile_drv.c) + kernel32_drv.c) -add_library(findfile_drv SHARED ${FINDFILE_DRV_SOURCE}) -set_module_type(findfile_drv kernelmodedriver) -target_link_libraries(findfile_drv kmtest_printf ${PSEH_LIB}) -add_importlibs(findfile_drv ntoskrnl hal) -add_target_compile_definitions(findfile_drv KMT_STANDALONE_DRIVER) -#add_pch(findfile_drv ../include/kmt_test.h) -add_rostests_file(TARGET findfile_drv) +add_library(kernel32_drv SHARED ${KERNEL32_DRV_SOURCE}) +set_module_type(kernel32_drv kernelmodedriver) +target_link_libraries(kernel32_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(kernel32_drv ntoskrnl hal) +add_target_compile_definitions(kernel32_drv KMT_STANDALONE_DRIVER) +#add_pch(kernel32_drv ../include/kmt_test.h) +add_rostests_file(TARGET kernel32_drv) diff --git a/rostests/kmtests/kernel32/FindFile_user.c b/rostests/kmtests/kernel32/FindFile_user.c index 816dc8aee6f..34bd99a92f1 100644 --- a/rostests/kmtests/kernel32/FindFile_user.c +++ b/rostests/kmtests/kernel32/FindFile_user.c @@ -1,13 +1,13 @@ /* * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory * PURPOSE: Test for FindFirstFile's wildcard substitution * PROGRAMMER: Thomas Faber */ #include -#include "FindFile.h" +#include "kernel32_test.h" START_TEST(FindFile) { @@ -98,14 +98,14 @@ START_TEST(FindFile) INT i; WCHAR ExpressionBuffer[MAX_PATH]; - KmtLoadDriver(L"FindFile", FALSE); + KmtLoadDriver(L"kernel32", FALSE); KmtOpenDriver(); for (i = 0; i < TestCount; i++) { trace("[%d] '%ls', '%ls'\n", i, Tests[i].Expression, Tests[i].ExpectedExpression); - KmtSendWStringToDriver(IOCTL_EXPECT, Tests[i].ExpectedExpression); - wcscpy(ExpressionBuffer, L"\\\\.\\Global\\GLOBALROOT\\Device\\Kmtest-FindFile\\"); + KmtSendWStringToDriver(IOCTL_EXPECT_EXPRESSION, Tests[i].ExpectedExpression); + wcscpy(ExpressionBuffer, L"\\\\.\\Global\\GLOBALROOT\\Device\\Kmtest-kernel32\\"); wcscat(ExpressionBuffer, Tests[i].Expression); FindHandle = FindFirstFileW(ExpressionBuffer, &FindData); ok(FindHandle != NULL && FindHandle != INVALID_HANDLE_VALUE, "Handle: %p, error=%lu\n", (PVOID)FindHandle, GetLastError()); diff --git a/rostests/kmtests/kernel32/FindFile_drv.c b/rostests/kmtests/kernel32/kernel32_drv.c similarity index 85% rename from rostests/kmtests/kernel32/FindFile_drv.c rename to rostests/kmtests/kernel32/kernel32_drv.c index 86674159547..a4fdc80db35 100644 --- a/rostests/kmtests/kernel32/FindFile_drv.c +++ b/rostests/kmtests/kernel32/kernel32_drv.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Test driver for FindFirstFile's wildcard substitution + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test driver for kernel32 filesystem tests * PROGRAMMER: Thomas Faber */ @@ -10,10 +10,10 @@ #define NDEBUG #include -#include "FindFile.h" +#include "kernel32_test.h" static KMT_MESSAGE_HANDLER TestMessageHandler; -static KMT_IRP_HANDLER TestIrpHandler; +static KMT_IRP_HANDLER TestDirectoryControl; static UNICODE_STRING ExpectedExpression = RTL_CONSTANT_STRING(L""); static WCHAR ExpressionBuffer[MAX_PATH]; @@ -31,10 +31,10 @@ TestEntry( UNREFERENCED_PARAMETER(RegistryPath); - *DeviceName = L"FindFile"; + *DeviceName = L"kernel32"; *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE; - KmtRegisterIrpHandler(IRP_MJ_DIRECTORY_CONTROL, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_DIRECTORY_CONTROL, NULL, TestDirectoryControl); KmtRegisterMessageHandler(0, NULL, TestMessageHandler); return Status; @@ -62,10 +62,10 @@ TestMessageHandler( switch (ControlCode) { - case IOCTL_EXPECT: + case IOCTL_EXPECT_EXPRESSION: { C_ASSERT(sizeof(ExpressionBuffer) <= UNICODE_STRING_MAX_BYTES); - DPRINT("IOCTL_EXPECT, InLength = %lu\n", InLength); + DPRINT("IOCTL_EXPECT_EXPRESSION, InLength = %lu\n", InLength); if (InLength > sizeof(ExpressionBuffer)) return STATUS_BUFFER_OVERFLOW; @@ -75,7 +75,7 @@ TestMessageHandler( RtlInitEmptyUnicodeString(&ExpectedExpression, ExpressionBuffer, sizeof(ExpressionBuffer)); RtlCopyMemory(ExpressionBuffer, Buffer, InLength); ExpectedExpression.Length = (USHORT)InLength; - DPRINT("IOCTL_EXPECT: %wZ\n", &ExpectedExpression); + DPRINT("IOCTL_EXPECT_EXPRESSION: %wZ\n", &ExpectedExpression); break; } @@ -88,7 +88,7 @@ TestMessageHandler( static NTSTATUS -TestIrpHandler( +TestDirectoryControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PIO_STACK_LOCATION IoStackLocation) diff --git a/rostests/kmtests/kernel32/FindFile.h b/rostests/kmtests/kernel32/kernel32_test.h similarity index 55% rename from rostests/kmtests/kernel32/FindFile.h rename to rostests/kmtests/kernel32/kernel32_test.h index 361a0c3b44b..1923285f4c9 100644 --- a/rostests/kmtests/kernel32/FindFile.h +++ b/rostests/kmtests/kernel32/kernel32_test.h @@ -1,13 +1,13 @@ /* * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: FindFirstFile wildcard substitution test declarations + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel32 filesystem test declarations * PROGRAMMER: Thomas Faber */ #ifndef _KMTEST_FINDFILE_H_ #define _KMTEST_FINDFILE_H_ -#define IOCTL_EXPECT 1 +#define IOCTL_EXPECT_EXPRESSION 1 #endif /* !defined _KMTEST_FINDFILE_H_ */