Ros-diffs

ros-diffs@reactos.org

81390 discussions

01/01: [KMTESTS:CC] Add tests for PIN_EXCLUSIVE
by Pierre Schweitzer 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b28f538d209c09caff216… commit b28f538d209c09caff216a621a4c292a6933e9ad Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 1 15:22:41 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 1 15:22:41 2018 +0200 [KMTESTS:CC] Add tests for PIN_EXCLUSIVE --- modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 62 ++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index 9b1d214d16..ecaceb38fb 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -190,6 +190,53 @@ PinInAnotherThread(IN PVOID Context) CcUnpinData(Bcb); } + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, PIN_EXCLUSIVE, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + ok_eq_pointer(Bcb, TestContext->Bcb); + ok_eq_pointer(Buffer, TestContext->Buffer); + + CcUnpinData(Bcb); + } + + return; +} + +static +VOID +NTAPI +PinInAnotherThreadExclusive(IN PVOID Context) +{ + BOOLEAN Ret; + PULONG Buffer; + PVOID Bcb; + LARGE_INTEGER Offset; + PTEST_CONTEXT TestContext; + + ok(TestFileObject != NULL, "Called in invalid context!\n"); + ok_eq_ulong(TestTestId, 3); + + TestContext = Context; + ok(TestContext != NULL, "Called in invalid context!\n"); + ok(TestContext->Bcb != NULL, "Called in invalid context!\n"); + ok(TestContext->Buffer != NULL, "Called in invalid context!\n"); + ok(TestContext->Length != 0, "Called in invalid context!\n"); + + Ret = FALSE; + Offset.QuadPart = 0x1000; + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, PIN_EXCLUSIVE, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == FALSE, "CcPinRead succeed\n"); + + if (Ret) + { + CcUnpinData(Bcb); + } + return; } @@ -299,6 +346,21 @@ PerformTest( CcUnpinData(TestContext->Bcb); } + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_WAIT | PIN_EXCLUSIVE, &TestContext->Bcb, &TestContext->Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + PKTHREAD ThreadHandle; + + TestContext->Length = FileSizes.FileSize.QuadPart - Offset.QuadPart; + ThreadHandle = KmtStartThread(PinInAnotherThreadExclusive, TestContext); + KmtFinishThread(ThreadHandle, NULL); + + CcUnpinData(TestContext->Bcb); + } + ExFreePool(TestContext); } }

1 0

06/06: [KMTESTS:CC] Add a test for pinning without access
by Pierre Schweitzer 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38487d63d807705c67308… commit 38487d63d807705c67308bdac3091032c35a04be Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 1 12:40:24 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 1 12:41:02 2018 +0200 [KMTESTS:CC] Add a test for pinning without access --- modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 19 ++++++++++++++++++- modules/rostests/kmtests/ntos_cc/CcPinRead_user.c | 3 ++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index 34ceb13696..9b1d214d16 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -217,6 +217,8 @@ PerformTest( Fcb = ExAllocatePool(NonPagedPool, sizeof(TEST_FCB)); if (!skip(Fcb != NULL, "ExAllocatePool failed\n")) { + BOOLEAN PinAccess = (TestId != 4); + RtlZeroMemory(Fcb, sizeof(TEST_FCB)); ExInitializeFastMutex(&Fcb->HeaderMutex); FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); @@ -225,7 +227,7 @@ PerformTest( TestFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; KmtStartSeh(); - CcInitializeCacheMap(TestFileObject, &FileSizes, TRUE, &Callbacks, NULL); + CcInitializeCacheMap(TestFileObject, &FileSizes, PinAccess, &Callbacks, NULL); KmtEndSeh(STATUS_SUCCESS); if (!skip(CcIsFileCached(TestFileObject) == TRUE, "CcInitializeCacheMap failed\n")) @@ -300,6 +302,21 @@ PerformTest( ExFreePool(TestContext); } } + else if (TestId == 4) + { + Ret = FALSE; + Offset.QuadPart = 0x1000; + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_WAIT, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + ok_eq_ulong(Buffer[0x2000 / sizeof(ULONG)], 0); + + CcUnpinData(Bcb); + } + } } } } diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c index c7a93a5d96..78818164e8 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c @@ -20,8 +20,9 @@ START_TEST(CcPinRead) /* 3 tests for offset * 1 test for BCB + * 1 test for pinning access */ - for (TestId = 0; TestId < 4; ++TestId) + for (TestId = 0; TestId < 5; ++TestId) { Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret);

1 0

05/06: [NTOSKRNL] Fail on pinning when there's no pin access set
by Pierre Schweitzer 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f96f1224a7979b40cded4… commit f96f1224a7979b40cded4cbe73c6dfa057fb4ae1 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 1 12:39:05 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 1 12:41:01 2018 +0200 [NTOSKRNL] Fail on pinning when there's no pin access set Instead of assert, now, CcPinRead will just fail. This is not consistent without Windows behavior, but still better than asserting while testing! --- ntoskrnl/cc/pin.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 3843cb2693..aba97049f1 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -186,7 +186,11 @@ CcPinMappedData ( SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; ASSERT(SharedCacheMap); - ASSERT(SharedCacheMap->PinAccess); + if (!SharedCacheMap->PinAccess) + { + DPRINT1("FIXME: Pinning a file with no pin access!\n"); + return FALSE; + } iBcb = *Bcb; ASSERT(iBcb->Pinned == FALSE);

1 0

04/06: [KMTESTS:CC] Add tests for PIN_IF_BCB flag
by Pierre Schweitzer 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a4dc3c49636ff97af1661… commit a4dc3c49636ff97af166184544dbe081c465ff60 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 1 12:29:09 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 1 12:41:01 2018 +0200 [KMTESTS:CC] Add tests for PIN_IF_BCB flag --- modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index b2aac2fdf7..34ceb13696 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -178,6 +178,18 @@ PinInAnotherThread(IN PVOID Context) CcUnpinData(Bcb); } + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, PIN_WAIT | PIN_IF_BCB, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + + if (!skip(Ret == TRUE, "CcPinRead failed\n")) + { + ok_eq_pointer(Bcb, TestContext->Bcb); + ok_eq_pointer(Buffer, TestContext->Buffer); + + CcUnpinData(Bcb); + } + return; } @@ -242,6 +254,17 @@ PerformTest( { Ret = FALSE; Offset.QuadPart = 0x1000; + + /* Try enforce BCB first */ + KmtStartSeh(); + Ret = CcPinRead(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_WAIT | PIN_IF_BCB, &Bcb, (PVOID *)&Buffer); + KmtEndSeh(STATUS_SUCCESS); + ok(Ret == FALSE, "CcPinRead succeed\n"); + if (Ret) + { + CcUnpinData(Bcb); + } + KmtStartSeh(); Ret = CcPinRead(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_WAIT, &TestContext->Bcb, &TestContext->Buffer); KmtEndSeh(STATUS_SUCCESS);

1 0

03/06: [KMTESTS:CC] Duplicate tests for CcPinRead
by Pierre Schweitzer 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6937fa8f41d9ffc807e33… commit 6937fa8f41d9ffc807e33ee64663b4d33cde7907 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 1 12:20:17 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 1 12:41:01 2018 +0200 [KMTESTS:CC] Duplicate tests for CcPinRead To be extended. --- modules/rostests/kmtests/CMakeLists.txt | 1 + modules/rostests/kmtests/kmtest/testlist.c | 2 ++ modules/rostests/kmtests/ntos_cc/CMakeLists.txt | 15 ++++++++++ modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c | 35 +++++++++++++----------- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index 8c844534dd..51407959c4 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -137,6 +137,7 @@ list(APPEND KMTEST_SOURCE kernel32/FindFile_user.c ntos_cc/CcCopyRead_user.c ntos_cc/CcMapData_user.c + ntos_cc/CcPinRead_user.c ntos_io/IoCreateFile_user.c ntos_io/IoDeviceObject_user.c ntos_io/IoReadWrite_user.c diff --git a/modules/rostests/kmtests/kmtest/testlist.c b/modules/rostests/kmtests/kmtest/testlist.c index 99f500994f..7b4930f659 100644 --- a/modules/rostests/kmtests/kmtest/testlist.c +++ b/modules/rostests/kmtests/kmtest/testlist.c @@ -8,6 +8,7 @@ KMT_TESTFUNC Test_CcCopyRead; KMT_TESTFUNC Test_CcMapData; +KMT_TESTFUNC Test_CcPinRead; KMT_TESTFUNC Test_Example; KMT_TESTFUNC Test_FileAttributes; KMT_TESTFUNC Test_FindFile; @@ -37,6 +38,7 @@ const KMT_TEST TestList[] = { { "CcCopyRead", Test_CcCopyRead }, { "CcMapData", Test_CcMapData }, + { "CcPinRead", Test_CcPinRead }, { "-Example", Test_Example }, { "FileAttributes", Test_FileAttributes }, { "FindFile", Test_FindFile }, diff --git a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt index f4e4fe01de..83d2317a75 100644 --- a/modules/rostests/kmtests/ntos_cc/CMakeLists.txt +++ b/modules/rostests/kmtests/ntos_cc/CMakeLists.txt @@ -30,3 +30,18 @@ add_importlibs(ccmapdata_drv ntoskrnl hal) add_target_compile_definitions(ccmapdata_drv KMT_STANDALONE_DRIVER) #add_pch(ccmapdata_drv ../include/kmt_test.h) add_rostests_file(TARGET ccmapdata_drv) + +# +# CcPinRead +# +list(APPEND CCPINREAD_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + CcPinRead_drv.c) + +add_library(ccpinread_drv SHARED ${CCPINREAD_DRV_SOURCE}) +set_module_type(ccpinread_drv kernelmodedriver) +target_link_libraries(ccpinread_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(ccpinread_drv ntoskrnl hal) +add_target_compile_definitions(ccpinread_drv KMT_STANDALONE_DRIVER) +#add_pch(ccmapdata_drv ../include/kmt_test.h) +add_rostests_file(TARGET ccpinread_drv) diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index 0d63e48572..b2aac2fdf7 100644 --- a/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -27,7 +27,6 @@ typedef struct _TEST_CONTEXT ULONG Length; } TEST_CONTEXT, *PTEST_CONTEXT; -static BOOLEAN TestMap = FALSE; static ULONG TestTestId = -1; static PFILE_OBJECT TestFileObject; static PDEVICE_OBJECT TestDeviceObject; @@ -47,7 +46,7 @@ TestEntry( UNREFERENCED_PARAMETER(RegistryPath); - *DeviceName = L"CcMapData"; + *DeviceName = L"CcPinRead"; *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE | TESTENTRY_BUFFERED_IO_DEVICE | TESTENTRY_NO_READONLY_DEVICE; @@ -148,7 +147,7 @@ MapAndLockUserBuffer( static VOID NTAPI -MapInAnotherThread(IN PVOID Context) +PinInAnotherThread(IN PVOID Context) { BOOLEAN Ret; PULONG Buffer; @@ -168,12 +167,10 @@ MapInAnotherThread(IN PVOID Context) Ret = FALSE; Offset.QuadPart = 0x1000; KmtStartSeh(); - TestMap = TRUE; - Ret = CcMapData(TestFileObject, &Offset, TestContext->Length, MAP_WAIT, &Bcb, (PVOID *)&Buffer); - TestMap = FALSE; + Ret = CcPinRead(TestFileObject, &Offset, TestContext->Length, PIN_WAIT, &Bcb, (PVOID *)&Buffer); KmtEndSeh(STATUS_SUCCESS); - if (!skip(Ret == TRUE, "CcMapData failed\n")) + if (!skip(Ret == TRUE, "CcPinRead failed\n")) { ok_eq_pointer(Bcb, TestContext->Bcb); ok_eq_pointer(Buffer, TestContext->Buffer); @@ -216,7 +213,7 @@ PerformTest( TestFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; KmtStartSeh(); - CcInitializeCacheMap(TestFileObject, &FileSizes, FALSE, &Callbacks, NULL); + CcInitializeCacheMap(TestFileObject, &FileSizes, TRUE, &Callbacks, NULL); KmtEndSeh(STATUS_SUCCESS); if (!skip(CcIsFileCached(TestFileObject) == TRUE, "CcInitializeCacheMap failed\n")) @@ -226,10 +223,10 @@ PerformTest( Ret = FALSE; Offset.QuadPart = TestId * 0x1000; KmtStartSeh(); - Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &Bcb, (PVOID *)&Buffer); + Ret = CcPinRead(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_WAIT, &Bcb, (PVOID *)&Buffer); KmtEndSeh(STATUS_SUCCESS); - if (!skip(Ret == TRUE, "CcMapData failed\n")) + if (!skip(Ret == TRUE, "CcPinRead failed\n")) { ok_eq_ulong(Buffer[(0x3000 - TestId * 0x1000) / sizeof(ULONG)], 0xDEADBABE); @@ -246,12 +243,10 @@ PerformTest( Ret = FALSE; Offset.QuadPart = 0x1000; KmtStartSeh(); - TestMap = TRUE; - Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &TestContext->Bcb, &TestContext->Buffer); - TestMap = FALSE; + Ret = CcPinRead(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, PIN_WAIT, &TestContext->Bcb, &TestContext->Buffer); KmtEndSeh(STATUS_SUCCESS); - if (!skip(Ret == TRUE, "CcMapData failed\n")) + if (!skip(Ret == TRUE, "CcPinRead failed\n")) { PKTHREAD ThreadHandle; @@ -269,11 +264,11 @@ PerformTest( #endif TestContext->Length = FileSizes.FileSize.QuadPart - Offset.QuadPart; - ThreadHandle = KmtStartThread(MapInAnotherThread, TestContext); + ThreadHandle = KmtStartThread(PinInAnotherThread, TestContext); KmtFinishThread(ThreadHandle, NULL); TestContext->Length = FileSizes.FileSize.QuadPart - 2 * Offset.QuadPart; - ThreadHandle = KmtStartThread(MapInAnotherThread, TestContext); + ThreadHandle = KmtStartThread(PinInAnotherThread, TestContext); KmtFinishThread(ThreadHandle, NULL); CcUnpinData(TestContext->Bcb); @@ -336,6 +331,8 @@ TestMessageHandler( { NTSTATUS Status = STATUS_SUCCESS; + FsRtlEnterFileSystem(); + switch (ControlCode) { case IOCTL_START_TEST: @@ -353,6 +350,8 @@ TestMessageHandler( break; } + FsRtlExitFileSystem(); + return Status; } @@ -370,6 +369,8 @@ TestIrpHandler( DPRINT("IRP %x/%x\n", IoStack->MajorFunction, IoStack->MinorFunction); ASSERT(IoStack->MajorFunction == IRP_MJ_READ); + FsRtlEnterFileSystem(); + Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; @@ -425,5 +426,7 @@ TestIrpHandler( IoCompleteRequest(Irp, IO_NO_INCREMENT); } + FsRtlExitFileSystem(); + return Status; }

1 0

02/06: [KMTESTS:CC] Add missing FsRtlEnter/ExitFileSystem() calls
by Pierre Schweitzer 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b0d1522886465977dd667… commit b0d1522886465977dd667c8daaf15f2f220be524 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 1 12:18:51 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 1 12:41:01 2018 +0200 [KMTESTS:CC] Add missing FsRtlEnter/ExitFileSystem() calls Spotted by Thomas --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index c7ed089ed5..6624b10e70 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -331,6 +331,8 @@ TestMessageHandler( { NTSTATUS Status = STATUS_SUCCESS; + FsRtlEnterFileSystem(); + switch (ControlCode) { case IOCTL_START_TEST: @@ -348,6 +350,8 @@ TestMessageHandler( break; } + FsRtlExitFileSystem(); + return Status; } @@ -365,6 +369,8 @@ TestIrpHandler( DPRINT("IRP %x/%x\n", IoStack->MajorFunction, IoStack->MinorFunction); ASSERT(IoStack->MajorFunction == IRP_MJ_READ); + FsRtlEnterFileSystem(); + Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; @@ -420,5 +426,7 @@ TestIrpHandler( IoCompleteRequest(Irp, IO_NO_INCREMENT); } + FsRtlExitFileSystem(); + return Status; }

1 0

01/06: [KMTESTS:CC] That wasn't meant to be committed
by Pierre Schweitzer 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f284f8a0c77e20f5fc85… commit 8f284f8a0c77e20f5fc85f7750c72bb67133ad03 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Sep 1 10:10:09 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Sep 1 12:41:00 2018 +0200 [KMTESTS:CC] That wasn't meant to be committed --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 5 ---- .../ntos_cc/{CcMapData_drv.c => CcPinRead_drv.c} | 2 +- modules/rostests/kmtests/ntos_cc/CcPinRead_user.c | 34 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index e067124ee2..c7ed089ed5 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -27,7 +27,6 @@ typedef struct _TEST_CONTEXT ULONG Length; } TEST_CONTEXT, *PTEST_CONTEXT; -static BOOLEAN TestMap = FALSE; static ULONG TestTestId = -1; static PFILE_OBJECT TestFileObject; static PDEVICE_OBJECT TestDeviceObject; @@ -168,9 +167,7 @@ MapInAnotherThread(IN PVOID Context) Ret = FALSE; Offset.QuadPart = 0x1000; KmtStartSeh(); - TestMap = TRUE; Ret = CcMapData(TestFileObject, &Offset, TestContext->Length, MAP_WAIT, &Bcb, (PVOID *)&Buffer); - TestMap = FALSE; KmtEndSeh(STATUS_SUCCESS); if (!skip(Ret == TRUE, "CcMapData failed\n")) @@ -246,9 +243,7 @@ PerformTest( Ret = FALSE; Offset.QuadPart = 0x1000; KmtStartSeh(); - TestMap = TRUE; Ret = CcMapData(TestFileObject, &Offset, FileSizes.FileSize.QuadPart - Offset.QuadPart, MAP_WAIT, &TestContext->Bcb, &TestContext->Buffer); - TestMap = FALSE; KmtEndSeh(STATUS_SUCCESS); if (!skip(Ret == TRUE, "CcMapData failed\n")) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c similarity index 99% copy from modules/rostests/kmtests/ntos_cc/CcMapData_drv.c copy to modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c index e067124ee2..0d63e48572 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_drv.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS kernel-mode tests * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory - * PURPOSE: Test driver for CcMapData function + * PURPOSE: Test driver for CcPinRead function * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> */ diff --git a/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c b/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c new file mode 100644 index 0000000000..c7a93a5d96 --- /dev/null +++ b/modules/rostests/kmtests/ntos_cc/CcPinRead_user.c @@ -0,0 +1,34 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite CcPinRead test user-mode part + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define IOCTL_START_TEST 1 +#define IOCTL_FINISH_TEST 2 + +START_TEST(CcPinRead) +{ + DWORD Ret; + ULONG TestId; + + KmtLoadDriver(L"CcPinRead", FALSE); + KmtOpenDriver(); + + /* 3 tests for offset + * 1 test for BCB + */ + for (TestId = 0; TestId < 4; ++TestId) + { + Ret = KmtSendUlongToDriver(IOCTL_START_TEST, TestId); + ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret); + Ret = KmtSendUlongToDriver(IOCTL_FINISH_TEST, TestId); + ok(Ret == ERROR_SUCCESS, "KmtSendUlongToDriver failed: %lx\n", Ret); + } + + KmtCloseDriver(); + KmtUnloadDriver(); +}

1 0

01/01: [COMCTL32_WINETEST] treeview.c: Skip test_right_click()
by Serge Gautherie 01 Sep '18

01 Sep '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cbcfbc4322f20f19d47ff… commit cbcfbc4322f20f19d47ff5cbc3bf11d302fdb3e1 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Mon Aug 27 19:12:56 2018 +0200 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Sep 1 09:22:45 2018 +0200 [COMCTL32_WINETEST] treeview.c: Skip test_right_click() until CORE-14975 is fixed upstream and WINESYNC. CORE-14975 --- modules/rostests/winetests/comctl32/treeview.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/rostests/winetests/comctl32/treeview.c b/modules/rostests/winetests/comctl32/treeview.c index 007bbe8957..ceaa112588 100644 --- a/modules/rostests/winetests/comctl32/treeview.c +++ b/modules/rostests/winetests/comctl32/treeview.c @@ -2724,6 +2724,14 @@ static void test_right_click(void) LRESULT result; POINT pt; +#ifdef __REACTOS__ + if (!winetest_interactive) + { + skip("test_right_click() (set WINETEST_INTERACTIVE=1), until CORE-14975 is fixed upstream and WINESYNC\n"); + return; + } +#endif + hTree = create_treeview_control(0); fill_tree(hTree);

1 0

01/01: [KMTESTS:CC] Add a test to show we map our buffers wrong in CC
by Pierre Schweitzer 31 Aug '18

31 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d04c691af4f2035074d1… commit 5d04c691af4f2035074d1689744a986dea77902b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 31 23:29:59 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Aug 31 23:29:59 2018 +0200 [KMTESTS:CC] Add a test to show we map our buffers wrong in CC That is expected (cf. CORE-14259) --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 6eded83e21..e067124ee2 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -255,6 +255,19 @@ PerformTest( { PKTHREAD ThreadHandle; +#ifdef _X86_ + /* FIXME: Should be fixed, will fail under certains conditions */ + ok(TestContext->Buffer > (PVOID)0xC1000000 && TestContext->Buffer < (PVOID)0xDCFFFFFF, + "Buffer %p not mapped in system space\n", TestContext->Buffer); +#else +#ifdef _M_AMD64 + ok(TestContext->Buffer > (PVOID)0xFFFFF98000000000 && TestContext->Buffer < (PVOID)0xFFFFFA8000000000, + "Buffer %p not mapped in system space\n", TestContext->Buffer); +#else + skip(FALSE, "System space mapping not defined\n"); +#endif +#endif + TestContext->Length = FileSizes.FileSize.QuadPart - Offset.QuadPart; ThreadHandle = KmtStartThread(MapInAnotherThread, TestContext); KmtFinishThread(ThreadHandle, NULL);

1 0

03/03: [KMTESTS:CC] Remove dummy leftover
by Pierre Schweitzer 31 Aug '18

31 Aug '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1b9b4c48c9a9adde6f899… commit 1b9b4c48c9a9adde6f8993975ba6fc25daf78542 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Aug 31 23:08:25 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Aug 31 23:08:25 2018 +0200 [KMTESTS:CC] Remove dummy leftover --- modules/rostests/kmtests/ntos_cc/CcMapData_drv.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c index 415eb148a3..6eded83e21 100644 --- a/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c +++ b/modules/rostests/kmtests/ntos_cc/CcMapData_drv.c @@ -263,9 +263,7 @@ PerformTest( ThreadHandle = KmtStartThread(MapInAnotherThread, TestContext); KmtFinishThread(ThreadHandle, NULL); - TestTestId = -1; CcUnpinData(TestContext->Bcb); - TestTestId = 3; } ExFreePool(TestContext);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs