Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 53049: [CSRSRV]: Hey Arch, try creating a shared section before mapping it.
by ion＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: ion Date: Wed Aug 3 15:04:21 2011 New Revision: 53049 URL: http://svn.reactos.org/svn/reactos?rev=53049&view=rev Log: [CSRSRV]: Hey Arch, try creating a shared section before mapping it. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/init.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Wed Aug 3 15:04:21 2011 @@ -153,7 +153,6 @@ PPEB Peb = NtCurrentPeb(); /* ReactOS Hackssss */ - ParameterValue = "1024,3072,512"; Status = NtQuerySystemInformation(SystemBasicInformation, &CsrNtSysInfo, sizeof(SYSTEM_BASIC_INFORMATION), @@ -175,7 +174,7 @@ } /* Make sure it's valid */ - if (!*SizeValue) return(STATUS_INVALID_PARAMETER); + if (!*SizeValue) return STATUS_INVALID_PARAMETER; /* Convert it to an integer */ Status = RtlCharToInteger(SizeValue, 0, &Size); @@ -184,6 +183,7 @@ /* Multiply by 1024 entries and round to page size */ #define ROUND_UP(n,size) (((ULONG)(n) + (size - 1)) & ~(size - 1)) // hax CsrSrvSharedSectionSize = ROUND_UP(Size * 1024, CsrNtSysInfo.PageSize); + DPRINT1("Size: %lx\n", CsrSrvSharedSectionSize); /* Create the Secion */ SectionSize.LowPart = CsrSrvSharedSectionSize; Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Wed Aug 3 15:04:21 2011 @@ -512,7 +512,8 @@ } - Status = CsrSrvCreateSharedSection(""); + Status = CsrSrvCreateSharedSection("1024,3072,512"); + DPRINT1("Status: %lx\n", Status); ASSERT(Status == STATUS_SUCCESS); BasepFakeStaticServerData();

1 0

[jgardou] 53048: [CMAKE] - use functions instead of macros. This avoids adding flags multiple times. See the PARENT_SCOPE option of cmake's command "set" for details.
by jgardou＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: jgardou Date: Wed Aug 3 15:02:11 2011 New Revision: 53048 URL: http://svn.reactos.org/svn/reactos?rev=53048&view=rev Log: [CMAKE] - use functions instead of macros. This avoids adding flags multiple times. See the PARENT_SCOPE option of cmake's command "set" for details. Modified: trunk/reactos/cmake/compilerflags.cmake Modified: trunk/reactos/cmake/compilerflags.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/compilerflags.cmake?… ============================================================================== --- trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/compilerflags.cmake [iso-8859-1] Wed Aug 3 15:02:11 2011 @@ -1,31 +1,22 @@ -macro(add_compiler_flags) +function(add_compiler_flags) # Adds the compiler flag to both CMAKE_C_FLAGS and CMAKE_CXX_FLAGS foreach(flag ${ARGN}) set(flags_list "${flags_list} ${flag}") endforeach() - if(CMAKE_C_FLAGS) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flags_list}") - else() - set(CMAKE_C_FLAGS ${flags_list}) - endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flags_list}" PARENT_SCOPE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flags_list}" PARENT_SCOPE) +endfunction() - if(CMAKE_CXX_FLAGS) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flags_list}") - else() - set(CMAKE_CXX_FLAGS ${flags_list}) - endif() -endmacro() - -macro(add_linkerflag MODULE _flag) +function(add_linkerflag MODULE _flag) set(NEW_LINKER_FLAGS ${_flag}) get_target_property(LINKER_FLAGS ${MODULE} LINK_FLAGS) if(LINKER_FLAGS) set(NEW_LINKER_FLAGS "${LINKER_FLAGS} ${NEW_LINKER_FLAGS}") endif() set_target_properties(${MODULE} PROPERTIES LINK_FLAGS ${NEW_LINKER_FLAGS}) -endmacro() +endfunction() macro(set_unicode) add_definitions(-DUNICODE -D_UNICODE)

1 0

[tfaber] 53047: [KMTESTS] - add IoDriverObject test, partly ported from old kmtests. Should possibly be merged with another test - ExDoubleList: add another small testcase
by tfaber＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: tfaber Date: Wed Aug 3 12:48:22 2011 New Revision: 53047 URL: http://svn.reactos.org/svn/reactos?rev=53047&view=rev Log: [KMTESTS] - add IoDriverObject test, partly ported from old kmtests. Should possibly be merged with another test - ExDoubleList: add another small testcase Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/CMakeLists.txt - copied, changed from r52780, branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_drv.c - copied, changed from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/drvobj_test.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_user.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/iodriverobject_drv.rbuild - copied, changed from r52780, branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Wed Aug 3 12:48:22 2011 @@ -5,6 +5,7 @@ # subdirectories containing special-purpose drivers # add_subdirectory(example) +add_subdirectory(ntos_io) # # kmtest_drv.sys driver @@ -65,6 +66,7 @@ kmtest/testlist.c example/Example_user.c + ntos_io/IoDriverObject_user.c rtl/RtlAvlTree.c rtl/RtlMemory.c rtl/RtlSplayTree.c @@ -82,7 +84,7 @@ # Group targets # add_custom_target(kmtest_drivers) -add_dependencies(kmtest_drivers kmtest_drv example_drv) +add_dependencies(kmtest_drivers kmtest_drv example_drv iodriverobject_drv) add_custom_target(kmtest_all) add_dependencies(kmtest_all kmtest_drivers kmtest) Modified: branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/d… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild [iso-8859-1] Wed Aug 3 12:48:22 2011 @@ -4,6 +4,9 @@ <directory name="example"> <xi:include href="example/example_drv.rbuild" /> </directory> + <directory name="ntos_io"> + <xi:include href="ntos_io/iodriverobject_drv.rbuild" /> + </directory> <xi:include href="kmtest.rbuild" /> <xi:include href="kmtest_drv.rbuild" /> </group> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] Wed Aug 3 12:48:22 2011 @@ -12,6 +12,9 @@ <directory name="example"> <file>Example_user.c</file> </directory> + <directory name="ntos_io"> + <file>IoDriverObject_user.c</file> + </directory> <directory name="rtl"> <file>RtlAvlTree.c</file> <file>RtlMemory.c</file> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] Wed Aug 3 12:48:22 2011 @@ -8,6 +8,7 @@ #include <kmt_test.h> KMT_TESTFUNC Test_Example; +KMT_TESTFUNC Test_IoDriverObject; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlSplayTree; @@ -16,6 +17,7 @@ const KMT_TEST TestList[] = { { "Example", Test_Example }, + { "IoDriverObject", Test_IoDriverObject }, { "RtlAvlTree", Test_RtlAvlTree }, { "RtlMemory", Test_RtlMemory }, { "RtlSplayTree", Test_RtlSplayTree }, Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c [iso-8859-1] Wed Aug 3 12:48:22 2011 @@ -35,16 +35,16 @@ KSPIN_LOCK SpinLock; LIST_ENTRY ListHead; PLIST_ENTRY Ret; - + KeInitializeSpinLock(&SpinLock); - + memset(&ListHead, 0x55, sizeof ListHead); InitializeListHead(&ListHead); ok_eq_pointer(ListHead.Flink, &ListHead); ok_eq_pointer(ListHead.Blink, &ListHead); ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); ok_irql(PASSIVE_LEVEL); - + Ret = ExInterlockedInsertHeadList(&ListHead, &Entries[0], &SpinLock); ok_eq_pointer(Ret, NULL); ok_eq_pointer(ListHead.Flink, &Entries[0]); @@ -53,61 +53,61 @@ ok_eq_pointer(Entries[0].Blink, &ListHead); ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, &Entries[0]); - ok_eq_pointer(ListHead.Flink, &ListHead); - ok_eq_pointer(ListHead.Blink, &ListHead); - ok_eq_free(Entries[0].Flink, &ListHead); - ok_eq_free(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Flink, &ListHead); - ok_eq_pointer(ListHead.Blink, &ListHead); - ok_eq_free(Entries[0].Flink, &ListHead); - ok_eq_free(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedInsertTailList(&ListHead, &Entries[0], &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Flink, &Entries[0]); - ok_eq_pointer(ListHead.Blink, &Entries[0]); - ok_eq_pointer(Entries[0].Flink, &ListHead); - ok_eq_pointer(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, &Entries[0]); - ok_eq_pointer(ListHead.Flink, &ListHead); - ok_eq_pointer(ListHead.Blink, &ListHead); - ok_eq_free(Entries[0].Flink, &ListHead); - ok_eq_free(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Flink, &ListHead); - ok_eq_pointer(ListHead.Blink, &ListHead); - ok_eq_free(Entries[0].Flink, &ListHead); - ok_eq_free(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedInsertTailList(&ListHead, &Entries[0], &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Flink, &Entries[0]); - ok_eq_pointer(ListHead.Blink, &Entries[0]); - ok_eq_pointer(Entries[0].Flink, &ListHead); - ok_eq_pointer(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - + + Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); + ok_eq_pointer(Ret, &Entries[0]); + ok_eq_pointer(ListHead.Flink, &ListHead); + ok_eq_pointer(ListHead.Blink, &ListHead); + ok_eq_free(Entries[0].Flink, &ListHead); + ok_eq_free(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + + Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); + ok_eq_pointer(Ret, NULL); + ok_eq_pointer(ListHead.Flink, &ListHead); + ok_eq_pointer(ListHead.Blink, &ListHead); + ok_eq_free(Entries[0].Flink, &ListHead); + ok_eq_free(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + + Ret = ExInterlockedInsertTailList(&ListHead, &Entries[0], &SpinLock); + ok_eq_pointer(Ret, NULL); + ok_eq_pointer(ListHead.Flink, &Entries[0]); + ok_eq_pointer(ListHead.Blink, &Entries[0]); + ok_eq_pointer(Entries[0].Flink, &ListHead); + ok_eq_pointer(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + + Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); + ok_eq_pointer(Ret, &Entries[0]); + ok_eq_pointer(ListHead.Flink, &ListHead); + ok_eq_pointer(ListHead.Blink, &ListHead); + ok_eq_free(Entries[0].Flink, &ListHead); + ok_eq_free(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + + Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); + ok_eq_pointer(Ret, NULL); + ok_eq_pointer(ListHead.Flink, &ListHead); + ok_eq_pointer(ListHead.Blink, &ListHead); + ok_eq_free(Entries[0].Flink, &ListHead); + ok_eq_free(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + + Ret = ExInterlockedInsertTailList(&ListHead, &Entries[0], &SpinLock); + ok_eq_pointer(Ret, NULL); + ok_eq_pointer(ListHead.Flink, &Entries[0]); + ok_eq_pointer(ListHead.Blink, &Entries[0]); + ok_eq_pointer(Entries[0].Flink, &ListHead); + ok_eq_pointer(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + Ret = ExInterlockedInsertHeadList(&ListHead, &Entries[1], &SpinLock); ok_eq_pointer(Ret, &Entries[0]); ok_eq_pointer(ListHead.Flink, &Entries[1]); @@ -118,7 +118,20 @@ ok_eq_pointer(Entries[1].Blink, &ListHead); ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); ok_irql(PASSIVE_LEVEL); - + + Ret = ExInterlockedInsertTailList(&ListHead, &Entries[2], &SpinLock); + ok_eq_pointer(Ret, &Entries[0]); + ok_eq_pointer(ListHead.Flink, &Entries[1]); + ok_eq_pointer(ListHead.Blink, &Entries[2]); + ok_eq_pointer(Entries[0].Flink, &Entries[2]); + ok_eq_pointer(Entries[0].Blink, &Entries[1]); + ok_eq_pointer(Entries[1].Flink, &Entries[0]); + ok_eq_pointer(Entries[1].Blink, &ListHead); + ok_eq_pointer(Entries[2].Flink, &ListHead); + ok_eq_pointer(Entries[2].Blink, &Entries[0]); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + memset(Entries, 0x55, sizeof Entries); #undef ExInterlockedInsertHeadList #undef ExInterlockedInsertTailList @@ -130,7 +143,7 @@ ok_eq_pointer(ListHead.Blink, &ListHead); ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); ok_irql(PASSIVE_LEVEL); - + Ret = ExInterlockedInsertHeadList(&ListHead, &Entries[0], &SpinLock); ok_eq_pointer(Ret, NULL); ok_eq_pointer(ListHead.Flink, &Entries[0]); @@ -139,61 +152,61 @@ ok_eq_pointer(Entries[0].Blink, &ListHead); ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, &Entries[0]); - ok_eq_pointer(ListHead.Flink, &ListHead); - ok_eq_pointer(ListHead.Blink, &ListHead); - ok_eq_free2(Entries[0].Flink, &ListHead); - ok_eq_free2(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Flink, &ListHead); - ok_eq_pointer(ListHead.Blink, &ListHead); - ok_eq_free2(Entries[0].Flink, &ListHead); - ok_eq_free2(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedInsertTailList(&ListHead, &Entries[0], &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Flink, &Entries[0]); - ok_eq_pointer(ListHead.Blink, &Entries[0]); - ok_eq_pointer(Entries[0].Flink, &ListHead); - ok_eq_pointer(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, &Entries[0]); - ok_eq_pointer(ListHead.Flink, &ListHead); - ok_eq_pointer(ListHead.Blink, &ListHead); - ok_eq_free2(Entries[0].Flink, &ListHead); - ok_eq_free2(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Flink, &ListHead); - ok_eq_pointer(ListHead.Blink, &ListHead); - ok_eq_free2(Entries[0].Flink, &ListHead); - ok_eq_free2(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedInsertTailList(&ListHead, &Entries[0], &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Flink, &Entries[0]); - ok_eq_pointer(ListHead.Blink, &Entries[0]); - ok_eq_pointer(Entries[0].Flink, &ListHead); - ok_eq_pointer(Entries[0].Blink, &ListHead); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - + + Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); + ok_eq_pointer(Ret, &Entries[0]); + ok_eq_pointer(ListHead.Flink, &ListHead); + ok_eq_pointer(ListHead.Blink, &ListHead); + ok_eq_free2(Entries[0].Flink, &ListHead); + ok_eq_free2(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + + Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); + ok_eq_pointer(Ret, NULL); + ok_eq_pointer(ListHead.Flink, &ListHead); + ok_eq_pointer(ListHead.Blink, &ListHead); + ok_eq_free2(Entries[0].Flink, &ListHead); + ok_eq_free2(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + + Ret = ExInterlockedInsertTailList(&ListHead, &Entries[0], &SpinLock); + ok_eq_pointer(Ret, NULL); + ok_eq_pointer(ListHead.Flink, &Entries[0]); + ok_eq_pointer(ListHead.Blink, &Entries[0]); + ok_eq_pointer(Entries[0].Flink, &ListHead); + ok_eq_pointer(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + + Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); + ok_eq_pointer(Ret, &Entries[0]); + ok_eq_pointer(ListHead.Flink, &ListHead); + ok_eq_pointer(ListHead.Blink, &ListHead); + ok_eq_free2(Entries[0].Flink, &ListHead); + ok_eq_free2(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + + Ret = ExInterlockedRemoveHeadList(&ListHead, &SpinLock); + ok_eq_pointer(Ret, NULL); + ok_eq_pointer(ListHead.Flink, &ListHead); + ok_eq_pointer(ListHead.Blink, &ListHead); + ok_eq_free2(Entries[0].Flink, &ListHead); + ok_eq_free2(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + + Ret = ExInterlockedInsertTailList(&ListHead, &Entries[0], &SpinLock); + ok_eq_pointer(Ret, NULL); + ok_eq_pointer(ListHead.Flink, &Entries[0]); + ok_eq_pointer(ListHead.Blink, &Entries[0]); + ok_eq_pointer(Entries[0].Flink, &ListHead); + ok_eq_pointer(Entries[0].Blink, &ListHead); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + Ret = ExInterlockedInsertHeadList(&ListHead, &Entries[1], &SpinLock); ok_eq_pointer(Ret, &Entries[0]); ok_eq_pointer(ListHead.Flink, &Entries[1]); @@ -204,6 +217,19 @@ ok_eq_pointer(Entries[1].Blink, &ListHead); ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); ok_irql(PASSIVE_LEVEL); - + + Ret = ExInterlockedInsertTailList(&ListHead, &Entries[2], &SpinLock); + ok_eq_pointer(Ret, &Entries[0]); + ok_eq_pointer(ListHead.Flink, &Entries[1]); + ok_eq_pointer(ListHead.Blink, &Entries[2]); + ok_eq_pointer(Entries[0].Flink, &Entries[2]); + ok_eq_pointer(Entries[0].Blink, &Entries[1]); + ok_eq_pointer(Entries[1].Flink, &Entries[0]); + ok_eq_pointer(Entries[1].Blink, &ListHead); + ok_eq_pointer(Entries[2].Flink, &ListHead); + ok_eq_pointer(Entries[2].Blink, &Entries[0]); + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); + ok_irql(PASSIVE_LEVEL); + KmtSetIrql(PASSIVE_LEVEL); } Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/CMakeLists.txt (from r52780, branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/CMakeLists.txt [iso-8859-1] Wed Aug 3 12:48:22 2011 @@ -3,13 +3,13 @@ list(APPEND EXAMPLE_DRV_SOURCE ../kmtest_drv/kmtest_standalone.c - Example_drv.c) + IoDriverObject_drv.c) -add_library(example_drv SHARED ${EXAMPLE_DRV_SOURCE}) +add_library(iodriverobject_drv SHARED ${EXAMPLE_DRV_SOURCE}) -set_module_type(example_drv kernelmodedriver) -target_link_libraries(example_drv kmtest_printf ${PSEH_LIB}) -add_importlibs(example_drv ntoskrnl hal) -set_property(TARGET example_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER) +set_module_type(iodriverobject_drv kernelmodedriver) +target_link_libraries(iodriverobject_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(iodriverobject_drv ntoskrnl hal) +set_property(TARGET iodriverobject_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER) -add_cd_file(TARGET example_drv DESTINATION reactos/bin FOR all) +add_cd_file(TARGET iodriverobject_drv DESTINATION reactos/bin FOR all) Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_drv.c (from r52215, branches/GSoC_2011/KMTestSuite/drivers/kmtest/drvobj_test.c) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/drivers/kmtest/drvobj_test.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_drv.c [iso-8859-1] Wed Aug 3 12:48:22 2011 @@ -1,31 +1,82 @@ /* - * Driver Regression Tests - * - * Copyright 2009 Michael Martin <martinmnet(a)hotmail.com> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. - * If not, write to the Free Software Foundation, - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Driver Object Test Driver + * PROGRAMMER: Michael Martin <martinmnet(a)hotmail.com> + * Thomas Faber <thfabba(a)gmx.de> */ -/* INCLUDES *******************************************************************/ +#include <kmt_test.h> -#include "kmtest.h" -#include <ddk/ntddk.h> -#include <ddk/ntifs.h> +//#define NDEBUG +#include <debug.h> -VOID DriverObjectTest(PDRIVER_OBJECT DriverObject, int DriverStatus) +typedef enum +{ + DriverEntry, + DriverIrp, + DriverUnload +} DRIVER_STATUS; + +static KMT_IRP_HANDLER TestIrpHandler; +static VOID TestDriverObject(IN PDRIVER_OBJECT DriverObject, IN DRIVER_STATUS DriverStatus); + +NTSTATUS +TestEntry( + IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath, + OUT PCWSTR *DeviceName, + OUT INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + *DeviceName = L"IoDriverObject"; + + KmtRegisterIrpHandler(IRP_MJ_CREATE, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_CLOSE, NULL, TestIrpHandler); + + TestDriverObject(DriverObject, DriverEntry); + + return Status; +} + +VOID +TestUnload( + IN PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); + + TestDriverObject(DriverObject, DriverUnload); +} + +static +NTSTATUS +TestIrpHandler( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_SUCCESS; + + TestDriverObject(DeviceObject->DriverObject, DriverIrp); + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +static +VOID +TestDriverObject( + IN PDRIVER_OBJECT DriverObject, + IN DRIVER_STATUS DriverStatus) { BOOLEAN CheckThisDispatchRoutine; PVOID FirstMajorFunc; @@ -34,7 +85,7 @@ ok(DriverObject->Size == sizeof(DRIVER_OBJECT), "Size does not match, got %x",DriverObject->Size); ok(DriverObject->Type == 4, "Type does not match 4. got %d",DriverObject->Type); - if (DriverStatus == 0) + if (DriverStatus == DriverEntry) { ok(DriverObject->DeviceObject == NULL, "Expected DeviceObject pointer to be 0, got %p", DriverObject->DeviceObject); @@ -42,26 +93,28 @@ "Expected Flags to be DRVO_LEGACY_DRIVER, got %lu", DriverObject->Flags); } - else if (DriverStatus == 1) + else if (DriverStatus == DriverIrp) { ok(DriverObject->DeviceObject != NULL, "Expected DeviceObject pointer to non null"); ok (DriverObject->Flags == (DRVO_LEGACY_DRIVER | DRVO_INITIALIZED), "Expected Flags to be DRVO_LEGACY_DRIVER | DRVO_INITIALIZED, got %lu", DriverObject->Flags); } - else + else if (DriverStatus == DriverUnload) { ok(DriverObject->DeviceObject != NULL, "Expected DeviceObject pointer to non null"); - ok (DriverObject->Flags == (DRVO_LEGACY_DRIVER | DRVO_INITIALIZED | DRVO_UNLOAD_INVOKED), + ok (DriverObject->Flags == (DRVO_LEGACY_DRIVER | DRVO_INITIALIZED | DRVO_UNLOAD_INVOKED), "Expected Flags to be DRVO_LEGACY_DRIVER | DRVO_INITIALIZED | DRVO_UNLOAD_INVOKED, got %lu", DriverObject->Flags); } + else + ASSERT(FALSE); /* Select a routine that was not changed */ FirstMajorFunc = DriverObject->MajorFunction[1]; ok(FirstMajorFunc != 0, "Expected MajorFunction[1] to be non NULL"); - if (FirstMajorFunc) + if (!skip(FirstMajorFunc != NULL, "First major function not set!\n")) { for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) { @@ -75,67 +128,4 @@ } } } - else - { - ok(TRUE, "Skipped testing for all MajorFunction"); - } } - -BOOLEAN ZwLoadTest(PDRIVER_OBJECT DriverObject, PUNICODE_STRING DriverRegistryPath, PWCHAR NewDriverRegPath) -{ - UNICODE_STRING RegPath; - NTSTATUS Status; - - /* Try to load ourself */ - Status = ZwLoadDriver(DriverRegistryPath); - ok (Status == STATUS_IMAGE_ALREADY_LOADED, "Expected NTSTATUS STATUS_IMAGE_ALREADY_LOADED, got 0x%lX", Status); - - if (Status != STATUS_IMAGE_ALREADY_LOADED) - { - DbgPrint("WARNING: Loading this a second time will cause BUGCHECK!\n"); - } - - /* Try to load with a Registry Path that doesnt exist */ - RtlInitUnicodeString(&RegPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\deadbeef"); - Status = ZwLoadDriver(&RegPath); - ok (Status == STATUS_OBJECT_NAME_NOT_FOUND, "Expected NTSTATUS STATUS_OBJECT_NAME_NOT_FOUND, got 0x%lX", Status); - - /* Load the driver */ - RtlInitUnicodeString(&RegPath, NewDriverRegPath); - Status = ZwLoadDriver(&RegPath); - ok(Status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%lX", Status); - - if (!NT_SUCCESS(Status)) - { - return FALSE; - } - - return TRUE; -} - -BOOLEAN ZwUnloadTest(PDRIVER_OBJECT DriverObject, PUNICODE_STRING DriverRegistryPath, PWCHAR NewDriverRegPath) -{ - UNICODE_STRING RegPath; - NTSTATUS Status; - - /* Try to unload ourself, which should fail as our Unload routine hasnt been set yet. */ - Status = ZwUnloadDriver(DriverRegistryPath); - ok (Status == STATUS_INVALID_DEVICE_REQUEST, "Expected NTSTATUS STATUS_INVALID_DEVICE_REQUEST, got 0x%lX", Status); - - /* Try to unload with a Registry Path that doesnt exist */ - RtlInitUnicodeString(&RegPath, L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\deadbeef"); - Status = ZwUnloadDriver(&RegPath); - ok (Status == STATUS_OBJECT_NAME_NOT_FOUND, "Expected NTSTATUS STATUS_OBJECT_NAME_NOT_FOUND, got 0x%lX", Status); - - /* Unload the driver */ - RtlInitUnicodeString(&RegPath, NewDriverRegPath); - Status = ZwUnloadDriver(&RegPath); - ok(Status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got 0x%lX", Status); - - if (!NT_SUCCESS(Status)) - { - return FALSE; - } - - return TRUE; -} Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_user.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_user.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_user.c [iso-8859-1] Wed Aug 3 12:48:22 2011 @@ -1,0 +1,16 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Driver Object test user-mode part + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +START_TEST(IoDriverObject) +{ + KmtLoadDriver(L"IoDriverObject", FALSE); + KmtOpenDriver(); + KmtCloseDriver(); + KmtUnloadDriver(); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDriverObject_user.c ------------------------------------------------------------------------------ svn:eol-style = native Copied: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/iodriverobject_drv.rbuild (from r52780, branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild) URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/iodriverobject_drv.rbuild [iso-8859-1] Wed Aug 3 12:48:22 2011 @@ -1,11 +1,11 @@ -<module name="example_drv" type="kernelmodedriver" installbase="bin" installname="example_drv.sys"> +<module name="iodriverobject_drv" type="kernelmodedriver" installbase="bin" installname="iodriverobject_drv.sys"> <include base="kmtest_drv">include</include> <library>ntoskrnl</library> <library>hal</library> <library>pseh</library> <library>kmtest_printf</library> <define name="KMT_STANDALONE_DRIVER" /> - <file>Example_drv.c</file> + <file>IoDriverObject_drv.c</file> <directory name=".."> <directory name="kmtest_drv"> <file>kmtest_standalone.c</file>

1 0

[tfaber] 53046: [KMTESTS] - add RtlSplayTree test. Patch by arty (hacks by me ; ]) - add RtlAvlTree test using the same code - add kmtest_drivers and kmtest_all build targets
by tfaber＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: tfaber Date: Wed Aug 3 11:21:35 2011 New Revision: 53046 URL: http://svn.reactos.org/svn/reactos?rev=53046&view=rev Log: [KMTESTS] - add RtlSplayTree test. Patch by arty (hacks by me ;]) - add RtlAvlTree test using the same code - add kmtest_drivers and kmtest_all build targets Added: branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlAvlTree.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlSplayTree.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Wed Aug 3 11:21:35 2011 @@ -32,7 +32,9 @@ ntos_ke/KeProcessor.c ntos_ke/KeSpinLock.c ntos_ob/ObCreate.c + rtl/RtlAvlTree.c rtl/RtlMemory.c + rtl/RtlSplayTree.c kmtest_drv/kmtest_drv.rc) @@ -63,13 +65,24 @@ kmtest/testlist.c example/Example_user.c + rtl/RtlAvlTree.c rtl/RtlMemory.c + rtl/RtlSplayTree.c kmtest/kmtest.rc) add_executable(kmtest ${KMTEST_SOURCE}) set_module_type(kmtest win32cui) -add_importlibs(kmtest advapi32 msvcrt kernel32) +add_importlibs(kmtest advapi32 msvcrt kernel32 ntdll) set_property(TARGET kmtest PROPERTY COMPILE_DEFINITIONS KMT_USER_MODE) add_cd_file(TARGET kmtest DESTINATION reactos/bin FOR all) + +# +# Group targets +# +add_custom_target(kmtest_drivers) +add_dependencies(kmtest_drivers kmtest_drv example_drv) + +add_custom_target(kmtest_all) +add_dependencies(kmtest_all kmtest_drivers kmtest) Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] Wed Aug 3 11:21:35 2011 @@ -1,6 +1,7 @@ <module name="kmtest" type="win32cui" installbase="bin" installname="kmtest.exe"> <include base="kmtest">include</include> <library>advapi32</library> + <library>ntdll</library> <define name="KMT_USER_MODE" /> <directory name="kmtest"> <file>kmtest.c</file> @@ -12,6 +13,8 @@ <file>Example_user.c</file> </directory> <directory name="rtl"> + <file>RtlAvlTree.c</file> <file>RtlMemory.c</file> + <file>RtlSplayTree.c</file> </directory> </module> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] Wed Aug 3 11:21:35 2011 @@ -8,12 +8,16 @@ #include <kmt_test.h> KMT_TESTFUNC Test_Example; +KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlMemory; +KMT_TESTFUNC Test_RtlSplayTree; /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = { { "Example", Test_Example }, + { "RtlAvlTree", Test_RtlAvlTree }, { "RtlMemory", Test_RtlMemory }, + { "RtlSplayTree", Test_RtlSplayTree }, { NULL, NULL }, }; Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Wed Aug 3 11:21:35 2011 @@ -42,7 +42,9 @@ <file>ObCreate.c</file> </directory> <directory name="rtl"> + <file>RtlAvlTree.c</file> <file>RtlMemory.c</file> + <file>RtlSplayTree.c</file> </directory> </module> <module name="kmtest_printf" type="staticlibrary"> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Wed Aug 3 11:21:35 2011 @@ -5,7 +5,6 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#include <ntddk.h> #include <kmt_test.h> KMT_TESTFUNC Test_Example; @@ -27,7 +26,9 @@ KMT_TESTFUNC Test_KeProcessor; KMT_TESTFUNC Test_KernelType; KMT_TESTFUNC Test_ObCreate; +KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlMemory; +KMT_TESTFUNC Test_RtlSplayTree; const KMT_TEST TestList[] = { @@ -50,6 +51,8 @@ { "KeProcessor", Test_KeProcessor }, { "-KernelType", Test_KernelType }, { "ObCreate", Test_ObCreate }, + { "RtlAvlTreeKM", Test_RtlAvlTree }, { "RtlMemoryKM", Test_RtlMemory }, + { "RtlSplayTreeKM", Test_RtlSplayTree }, { NULL, NULL } }; Added: branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlAvlTree.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/r… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlAvlTree.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlAvlTree.c [iso-8859-1] Wed Aug 3 11:21:35 2011 @@ -1,0 +1,34 @@ +/* HACK: broken ntddk.h */ +#ifdef KMT_KERNEL_MODE +typedef struct _RTL_SPLAY_LINKS { + struct _RTL_SPLAY_LINKS *Parent; + struct _RTL_SPLAY_LINKS *LeftChild; + struct _RTL_SPLAY_LINKS *RightChild; +} RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS; +#endif + +#define RTL_USE_AVL_TABLES +#define KMT_EMULATE_KERNEL +#include <kmt_test.h> + +#if defined KMT_USER_MODE +/* HACK: missing in rtltypes.h */ +#undef RTL_GENERIC_TABLE +#undef PRTL_GENERIC_TABLE + +#define RTL_GENERIC_TABLE RTL_AVL_TABLE +#define PRTL_GENERIC_TABLE PRTL_AVL_TABLE + +/* HACK: missing in rtlfuncs.h */ +#define RtlInitializeGenericTable RtlInitializeGenericTableAvl +#define RtlInsertElementGenericTable RtlInsertElementGenericTableAvl +#define RtlDeleteElementGenericTable RtlDeleteElementGenericTableAvl +#define RtlLookupElementGenericTable RtlLookupElementGenericTableAvl +#define RtlEnumerateGenericTable RtlEnumerateGenericTableAvl +#define RtlGetElementGenericTable RtlGetElementGenericTableAvl +#define RtlNumberGenericTableElements RtlNumberGenericTableElementsAvl +#endif + +/* this is a little hacky, but better than duplicating the code (for now) */ +#define Test_RtlSplayTree Test_RtlAvlTree +#include "RtlSplayTree.c" Propchange: branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlAvlTree.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlSplayTree.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/r… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlSplayTree.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlSplayTree.c [iso-8859-1] Wed Aug 3 11:21:35 2011 @@ -1,0 +1,103 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite RtlGenericTable + * PROGRAMMER: arty + */ + +#define KMT_EMULATE_KERNEL +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +/* HACK: missing in rtlfuncs.h */ +#if defined KMT_USER_MODE && !defined RTL_USE_AVL_TABLES +NTSYSAPI VOID NTAPI RtlInitializeGenericTable(OUT PRTL_GENERIC_TABLE Table, IN PRTL_GENERIC_COMPARE_ROUTINE CompareRoutine, IN PRTL_GENERIC_ALLOCATE_ROUTINE AllocateRoutine, IN PRTL_GENERIC_FREE_ROUTINE FreeRoutine, IN PVOID TableContext OPTIONAL); +NTSYSAPI PVOID NTAPI RtlInsertElementGenericTable(IN PRTL_GENERIC_TABLE Table, IN PVOID Buffer, IN CLONG BufferSize, OUT PBOOLEAN NewElement OPTIONAL); +NTSYSAPI BOOLEAN NTAPI RtlDeleteElementGenericTable(IN PRTL_GENERIC_TABLE Table, IN PVOID Buffer); +NTSYSAPI PVOID NTAPI RtlLookupElementGenericTable(IN PRTL_GENERIC_TABLE Table, IN PVOID Buffer); +NTSYSAPI PVOID NTAPI RtlEnumerateGenericTable(IN PRTL_GENERIC_TABLE Table, IN BOOLEAN Restart); +NTSYSAPI PVOID NTAPI RtlGetElementGenericTable(IN PRTL_GENERIC_TABLE Table, IN ULONG I); +NTSYSAPI ULONG NTAPI RtlNumberGenericTableElements(IN PRTL_GENERIC_TABLE Table); +#endif + +static LIST_ENTRY Allocations; + +static RTL_GENERIC_COMPARE_RESULTS NTAPI +CompareCharTable(PRTL_GENERIC_TABLE Table, PVOID A, PVOID B) +{ + RTL_GENERIC_COMPARE_RESULTS Result = (*((PCHAR)A) < *((PCHAR)B)) ? GenericLessThan : + (*((PCHAR)A) > *((PCHAR)B)) ? GenericGreaterThan : + GenericEqual; + return Result; +} + +static PVOID NTAPI +AllocRoutine(PRTL_GENERIC_TABLE Table, CLONG ByteSize) +{ + PLIST_ENTRY Entry = ExAllocatePool + (NonPagedPool, sizeof(LIST_ENTRY) + ByteSize); + InsertTailList(&Allocations, Entry); + return &Entry[1]; +} + +static VOID NTAPI +FreeRoutine(PRTL_GENERIC_TABLE Table, PVOID Buffer) +{ + PLIST_ENTRY Entry = (PLIST_ENTRY)(((PCHAR)Buffer) - sizeof(LIST_ENTRY)); + RemoveEntryList(Entry); + ExFreePool(Entry); +} + +static void RtlSplayTreeTest() +{ + ULONG i, del; + PCHAR Ch; + CHAR Text[] = "the quick_brown!fOx-jUmp3d/0vER+THe^lazy.D@g"; + CHAR NewE[] = "11111111111111111111111111111111110111111111"; + RTL_GENERIC_TABLE Table; + RtlInitializeGenericTable + (&Table, + CompareCharTable, + AllocRoutine, + FreeRoutine, + NULL); + for (i = 0; Text[i]; i++) { + BOOLEAN WasNew; + Ch = (PCHAR)RtlInsertElementGenericTable + (&Table, + &Text[i], + sizeof(Text[i]), + &WasNew); + ok(Ch && *Ch == Text[i], "Copy character into node\n"); + ok(WasNew == (NewE[i] == '1'), "Character newness didn't match\n"); + } + for (Ch = (PCHAR)RtlEnumerateGenericTable(&Table, TRUE), i = 0; + Ch; + Ch = (PCHAR)RtlEnumerateGenericTable(&Table, FALSE), i++) { + ok(strchr(Text, *Ch) != NULL, "Nonexistent character\n"); + } + ok(RtlNumberGenericTableElements(&Table) == strlen(Text) - 1, "Not the right number of elements\n"); + ok(RtlLookupElementGenericTable(&Table, "q") != NULL, "Could not lookup q\n"); + ok(!RtlLookupElementGenericTable(&Table, "#"), "Found a character that shouldn't appear\n"); + ok(strlen(Text) == i + 1, "Didn't enumerate enough characters\n"); + del = 0; + for (i = 0; Text[i]; i++) { + if (NewE[i] == '1') { + BOOLEAN WasDeleted; + WasDeleted = RtlDeleteElementGenericTable(&Table, &Text[i]); + del += WasDeleted; + } + } + ok(!RtlNumberGenericTableElements(&Table), "Not zero elements\n"); + ok(!RtlGetElementGenericTable(&Table, 0), "Elements left when we removed them all\n"); + ok(strlen(Text) == del + 1, "Deleted too many times\n"); + ok(IsListEmpty(&Allocations), "Didn't free all memory\n"); +} + +START_TEST(RtlSplayTree) +{ + InitializeListHead(&Allocations); + RtlSplayTreeTest(); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlSplayTree.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 53045: [NDIS] - Fix adapter binding for the WinPcap driver
by cgutman＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: cgutman Date: Wed Aug 3 07:52:51 2011 New Revision: 53045 URL: http://svn.reactos.org/svn/reactos?rev=53045&view=rev Log: [NDIS] - Fix adapter binding for the WinPcap driver Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Wed Aug 3 07:52:51 2011 @@ -907,20 +907,22 @@ */ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING RegistryPath; - WCHAR *RegistryPathStr; + WCHAR *RegistryPathStr, *DataPtr = NULL; NTSTATUS NtStatus; - WCHAR *DataPtr; HANDLE DriverKeyHandle = NULL; PKEY_VALUE_PARTIAL_INFORMATION KeyInformation = NULL; PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics = &Protocol->Chars; + UNICODE_STRING ValueName; + ULONG ResultLength; + PLIST_ENTRY CurrentEntry = NULL; RegistryPathStr = ExAllocatePoolWithTag(PagedPool, sizeof(SERVICES_KEY) + ProtocolCharacteristics->Name.Length + sizeof(LINKAGE_KEY), NDIS_TAG + __LINE__); if(!RegistryPathStr) - { + { NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); *Status = NDIS_STATUS_RESOURCES; return; - } + } wcscpy(RegistryPathStr, SERVICES_KEY); wcsncat(RegistryPathStr, ((WCHAR *)ProtocolCharacteristics->Name.Buffer), ProtocolCharacteristics->Name.Length / sizeof(WCHAR)); @@ -935,130 +937,165 @@ ExFreePool(RegistryPathStr); - if(!NT_SUCCESS(NtStatus)) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to open protocol configuration\n")); - *Status = NDIS_STATUS_FAILURE; - return; - } - - NDIS_DbgPrint(MAX_TRACE, ("Successfully opened the registry configuration\n")); - - { - UNICODE_STRING ValueName; - ULONG ResultLength; - - RtlInitUnicodeString(&ValueName, L"Bind"); - - NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); - if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value for size\n")); - ZwClose(DriverKeyHandle); - *Status = NDIS_STATUS_FAILURE; - return; - } - - KeyInformation = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, NDIS_TAG + __LINE__); - if(!KeyInformation) - { - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - ZwClose(DriverKeyHandle); - *Status = NDIS_STATUS_FAILURE; - return; - } - - NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, KeyInformation, - sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, &ResultLength); - - ZwClose(DriverKeyHandle); - - if(!NT_SUCCESS(NtStatus)) - { - NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value\n")); + if(NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MAX_TRACE, ("Successfully opened the registry configuration\n")); + + RtlInitUnicodeString(&ValueName, L"Bind"); + + NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, NULL, 0, &ResultLength); + if(NtStatus != STATUS_BUFFER_OVERFLOW && NtStatus != STATUS_BUFFER_TOO_SMALL && NtStatus != STATUS_SUCCESS) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value for size\n")); + ZwClose(DriverKeyHandle); + } + else + { + KeyInformation = ExAllocatePoolWithTag(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, NDIS_TAG + __LINE__); + if(!KeyInformation) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ZwClose(DriverKeyHandle); + NtStatus = STATUS_NO_MEMORY; + } + else + { + NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, KeyInformation, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, &ResultLength); + + ZwClose(DriverKeyHandle); + + if(!NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value\n")); + ExFreePool(KeyInformation); + KeyInformation = NULL; + } + } + } + } + + if (!NT_SUCCESS(NtStatus)) + { + NDIS_DbgPrint(MIN_TRACE, ("Performing global bind for protocol '%wZ'\n", &ProtocolCharacteristics->Name)); + KeyInformation = NULL; + + CurrentEntry = AdapterListHead.Flink; + } + else + { + NDIS_DbgPrint(MIN_TRACE, ("Performing standard bind for protocol '%wZ'\n", &ProtocolCharacteristics->Name)); + + DataPtr = (WCHAR*)KeyInformation->Data; + } + + /* Assume success for now */ + *Status = NDIS_STATUS_SUCCESS; + + while (TRUE) + { + /* BindContext is for tracking pending binding operations */ + VOID *BindContext = 0; + NDIS_STRING DeviceName; + NDIS_STRING RegistryPath; + WCHAR *RegistryPathStr = NULL; + ULONG PathLength = 0; + PLOGICAL_ADAPTER Adapter; + + if (KeyInformation) + { + /* Parse the REG_MULTI_SZ entry for device names */ + if (!(*DataPtr)) + break; + + RtlInitUnicodeString(&DeviceName, DataPtr); + } + else + { + /* Use the device name from the global adapter list */ + if (CurrentEntry == &AdapterListHead) + break; + + Adapter = CONTAINING_RECORD(CurrentEntry, LOGICAL_ADAPTER, ListEntry); + + DeviceName = Adapter->NdisMiniportBlock.MiniportName; + } + + /* Make sure the adapter has started */ + if (!MiniLocateDevice(&DeviceName)) + { + /* It wasn't in the global miniport list, so skip the bind entry */ + goto next; + } + + /* Make sure this device isn't already bound to this protocol */ + if (LocateAdapterBindingByName(Protocol, &DeviceName)) + { + /* It was already in this protocol's bound adapter list, so skip the bind entry */ + goto next; + } + + /* + * RegistryPath should be: + * \Registry\Machine\System\CurrentControlSet\Services\Nic1\Parameters\Tcpip + * + * This is constructed as follows: + * SERVICES_KEY + extracted device name + Protocol name from characteristics + */ + + PathLength = sizeof(SERVICES_KEY) + /* \Registry\Machine\System\CurrentControlSet\Services\ */ + wcslen( DeviceName.Buffer + 8 ) * sizeof(WCHAR) + /* Adapter1 (extracted from \Device\Adapter1) */ + sizeof(PARAMETERS_KEY) + /* \Parameters\ */ + ProtocolCharacteristics->Name.Length + sizeof(WCHAR); /* Tcpip */ + + RegistryPathStr = ExAllocatePool(PagedPool, PathLength); + if(!RegistryPathStr) + { + NDIS_DbgPrint(MIN_TRACE, ("insufficient resources.\n")); + *Status = NDIS_STATUS_RESOURCES; + break; + } + + wcscpy(RegistryPathStr, SERVICES_KEY); + wcscat(RegistryPathStr, DeviceName.Buffer + 8 ); + wcscat(RegistryPathStr, PARAMETERS_KEY); + wcsncat(RegistryPathStr, ProtocolCharacteristics->Name.Buffer, ProtocolCharacteristics->Name.Length / sizeof(WCHAR) ); + + RegistryPathStr[PathLength/sizeof(WCHAR) - 1] = 0; + + RtlInitUnicodeString(&RegistryPath, RegistryPathStr); + + NDIS_DbgPrint(MAX_TRACE, ("Calling protocol's BindAdapter handler with DeviceName %wZ and RegistryPath %wZ\n", + &DeviceName, &RegistryPath)); + + { + BIND_HANDLER BindHandler = ProtocolCharacteristics->BindAdapterHandler; + if(BindHandler) + { + BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0); + NDIS_DbgPrint(MIN_TRACE, ("%wZ's BindAdapter handler returned 0x%x for %wZ\n", &ProtocolCharacteristics->Name, *Status, &DeviceName)); + } + else + NDIS_DbgPrint(MIN_TRACE, ("No protocol bind handler specified\n")); + } + + next: + if (KeyInformation) + { + /* Advance to the next adapter in the REG_MULTI_SZ */ + DataPtr += (DeviceName.Length / sizeof(WCHAR)) + 1; + } + else + { + /* Advance to the next adapter in the global list */ + CurrentEntry = CurrentEntry->Flink; + } + } + + if (KeyInformation) + { ExFreePool(KeyInformation); - *Status = NDIS_STATUS_FAILURE; - return; - } - } - - /* Assume success for now */ - *Status = NDIS_STATUS_SUCCESS; - - for (DataPtr = (WCHAR *)KeyInformation->Data; - *DataPtr != 0; - DataPtr += wcslen(DataPtr) + 1) - { - /* BindContext is for tracking pending binding operations */ - VOID *BindContext = 0; - NDIS_STRING DeviceName; - NDIS_STRING RegistryPath; - WCHAR *RegistryPathStr = NULL; - ULONG PathLength = 0; - - RtlInitUnicodeString(&DeviceName, DataPtr); /* we know this is 0-term */ - - /* Make sure the adapter has started */ - if (!MiniLocateDevice(&DeviceName)) - { - /* It wasn't in the global miniport list, so skip the bind entry */ - continue; - } - - /* Make sure this device isn't already bound to this protocol */ - if (LocateAdapterBindingByName(Protocol, &DeviceName)) - { - /* It was already in this protocol's bound adapter list, so skip the bind entry */ - continue; - } - - /* - * RegistryPath should be: - * \Registry\Machine\System\CurrentControlSet\Services\Nic1\Parameters\Tcpip - * - * This is constructed as follows: - * SERVICES_KEY + extracted device name + Protocol name from characteristics - */ - - PathLength = sizeof(SERVICES_KEY) + /* \Registry\Machine\System\CurrentControlSet\Services\ */ - wcslen( DataPtr + 8 ) * sizeof(WCHAR) + /* Adapter1 (extracted from \Device\Adapter1) */ - sizeof(PARAMETERS_KEY) + /* \Parameters\ */ - ProtocolCharacteristics->Name.Length + sizeof(WCHAR); /* Tcpip */ - - RegistryPathStr = ExAllocatePool(PagedPool, PathLength); - if(!RegistryPathStr) - { - NDIS_DbgPrint(MIN_TRACE, ("insufficient resources.\n")); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - wcscpy(RegistryPathStr, SERVICES_KEY); - wcscat(RegistryPathStr, DataPtr + 8 ); - wcscat(RegistryPathStr, PARAMETERS_KEY); - wcsncat(RegistryPathStr, ProtocolCharacteristics->Name.Buffer, ProtocolCharacteristics->Name.Length / sizeof(WCHAR) ); - - RegistryPathStr[PathLength/sizeof(WCHAR) - 1] = 0; - - RtlInitUnicodeString(&RegistryPath, RegistryPathStr); - - NDIS_DbgPrint(MAX_TRACE, ("Calling protocol's BindAdapter handler with DeviceName %wZ and RegistryPath %wZ\n", - &DeviceName, &RegistryPath)); - - { - BIND_HANDLER BindHandler = ProtocolCharacteristics->BindAdapterHandler; - if(BindHandler) - { - BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0); - NDIS_DbgPrint(MIN_TRACE, ("%wZ's BindAdapter handler returned 0x%x for %wZ\n", &ProtocolCharacteristics->Name, *Status, &DeviceName)); - } - else - NDIS_DbgPrint(MIN_TRACE, ("No protocol bind handler specified\n")); - } - } - - ExFreePool(KeyInformation); + } } /*

1 0

[ion] 53044: [CSRSRV]: Hey Arch, try creating a shared section before mapping it.
by ion＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: ion Date: Wed Aug 3 06:18:42 2011 New Revision: 53044 URL: http://svn.reactos.org/svn/reactos?rev=53044&view=rev Log: [CSRSRV]: Hey Arch, try creating a shared section before mapping it. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Wed Aug 3 06:18:42 2011 @@ -482,12 +482,22 @@ return Status; } + +VOID +WINAPI +BasepFakeStaticServerData(VOID); + +NTSTATUS +NTAPI +CsrSrvCreateSharedSection(IN PCHAR ParameterValue); + /********************************************************************** * CsrpCreateHeap/3 */ static NTSTATUS CsrpCreateHeap (int argc, char ** argv, char ** envp) { + NTSTATUS Status; DPRINT("CSR: %s called\n", __FUNCTION__); CsrssApiHeap = RtlCreateHeap(HEAP_GROWABLE, @@ -500,6 +510,12 @@ { return STATUS_UNSUCCESSFUL; } + + + Status = CsrSrvCreateSharedSection(""); + ASSERT(Status == STATUS_SUCCESS); + + BasepFakeStaticServerData(); return STATUS_SUCCESS; }

1 0

[ion] 53043: [CSRSRV]: Try to see why it appears some processes don't have a handle in their CSR_PROCESS_DATA....
by ion＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: ion Date: Wed Aug 3 05:58:58 2011 New Revision: 53043 URL: http://svn.reactos.org/svn/reactos?rev=53043&view=rev Log: [CSRSRV]: Try to see why it appears some processes don't have a handle in their CSR_PROCESS_DATA.... Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Wed Aug 3 05:58:58 2011 @@ -105,6 +105,7 @@ PROCESS_ALL_ACCESS, &ObjectAttributes, &ClientId); + DPRINT1("CSR PRocess: %p Handle: %p\n", pProcessData, pProcessData->Process); if (!NT_SUCCESS(Status)) { ProcessData[hash] = pProcessData->next; Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Wed Aug 3 05:58:58 2011 @@ -282,6 +282,7 @@ if (CsrProcess) { /* Map the sectio into this process */ + DPRINT1("CSR Process Handle: %p. CSR Process: %p\n", CsrProcess->Process, CsrProcess); Status = NtMapViewOfSection(CsrSrvSharedSection, CsrProcess->Process, &CsrSrvSharedSectionBase, @@ -437,6 +438,24 @@ DPRINT1("Unable to allocate or find data for process 0x%x\n", Request->ClientId.UniqueProcess); } + } + + if (ProcessData->Process == NULL) + { + OBJECT_ATTRIBUTES ObjectAttributes; + + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); + DPRINT1("WARNING: CSR PROCESS WITH NO CSR PROCESS HANDLE???\n"); + ClientId.UniqueThread = 0; + Status = NtOpenProcess(&ProcessData->Process, + PROCESS_ALL_ACCESS, + &ObjectAttributes, + &Request->ClientId); + DPRINT1("Status: %lx. Handle: %lx\n", Status, ProcessData->Process); } if (ProcessData)

1 0

[ion] 53042: [CSRSS]: Fix broken logic.
by ion＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: ion Date: Wed Aug 3 03:57:30 2011 New Revision: 53042 URL: http://svn.reactos.org/svn/reactos?rev=53042&view=rev Log: [CSRSS]: Fix broken logic. Modified: trunk/reactos/ntoskrnl/lpc/complete.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/ntoskrnl/lpc/complete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/complete.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/complete.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/complete.c [iso-8859-1] Wed Aug 3 03:57:30 2011 @@ -148,7 +148,11 @@ RtlCopyMemory(ConnectMessage + 1, ReplyMessage + 1, ConnectionInfoLength); /* At this point, if the caller refused the connection, go to cleanup */ - if (!AcceptConnection) goto Cleanup; + if (!AcceptConnection) + { + DPRINT1("LPC connection was refused\n"); + goto Cleanup; + } /* Otherwise, create the actual port */ Status = ObCreateObject(PreviousMode, @@ -222,6 +226,11 @@ { /* Otherwise, quit */ ObDereferenceObject(ServerPort); + DPRINT1("Client section mapping failed: %lx\n", Status); + DPRINT1("View base, offset, size: %lx %lx %lx\n", + ServerPort->ClientSectionBase, + ConnectMessage->ClientView.ViewSize, + SectionOffset); goto Cleanup; } } Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Wed Aug 3 03:57:30 2011 @@ -437,11 +437,20 @@ DPRINT1("Unable to allocate or find data for process 0x%x\n", Request->ClientId.UniqueProcess); } + } + + if (ProcessData) + { + /* Attach the Shared Section */ + Status = CsrSrvAttachSharedSection(ProcessData, ConnectInfo); + if (NT_SUCCESS(Status)) + { + DPRINT1("Connection ok\n"); + AllowConnection = TRUE; + } else { - /* Attach the Shared Section */ - Status = CsrSrvAttachSharedSection(ProcessData, ConnectInfo); - if (NT_SUCCESS(Status)) AllowConnection = TRUE; + DPRINT1("Shared section map failed: %lx\n", Status); } }

1 0

[ion] 53041: [CSRSS]: Hack header to fix build.
by ion＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: ion Date: Wed Aug 3 03:30:56 2011 New Revision: 53041 URL: http://svn.reactos.org/svn/reactos?rev=53041&view=rev Log: [CSRSS]: Hack header to fix build. Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Wed Aug 3 03:30:56 2011 @@ -692,7 +692,6 @@ } Data; } CSR_API_MESSAGE, *PCSR_API_MESSAGE; - typedef struct _NLS_USER_INFO { WCHAR iCountry[80]; @@ -730,7 +729,7 @@ WCHAR sLocaleName[85]; LCID UserLocaleId; LUID InteractiveUserLuid; - CHAR InteractiveUserSid[SECURITY_MAX_SID_SIZE]; + CHAR InteractiveUserSid[68]; // SECURITY_MAX_SID_SIZE to make ros happy ULONG ulCacheUpdateCount; } NLS_USER_INFO, *PNLS_USER_INFO;

1 0

[ion] 53040: [CSRSRV/KERNEL32]: Have CSRSS create a proper shared section (Based on code taken from the CSRSS rewrite in trunk) and attach it to every client. [CSRSRV/KERNEL32]: Have CSRSS fill out...
by ion＠svn.reactos.org 03 Aug '11

03 Aug '11

Author: ion Date: Wed Aug 3 03:09:02 2011 New Revision: 53040 URL: http://svn.reactos.org/svn/reactos?rev=53040&view=rev Log: [CSRSRV/KERNEL32]: Have CSRSS create a proper shared section (Based on code taken from the CSRSS rewrite in trunk) and attach it to every client. [CSRSRV/KERNEL32]: Have CSRSS fill out the base server static data. Still a bit of a hack since we should have a basesrv to do this, but it'll fix the "can't install any drivers" bug as well as increase performance since we now cache a bunch of data system-wide. [KERNEL32]: Remove all related hacks in kernel32. [CSRSRV]: Only accept the incoming connection if we found CSR process data about it. Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Wed Aug 3 03:09:02 2011 @@ -21,7 +21,6 @@ extern UNICODE_STRING SystemDirectory; extern UNICODE_STRING WindowsDirectory; - PBASE_STATIC_SERVER_DATA BaseStaticServerData; @@ -250,112 +249,6 @@ return TRUE; } -VOID -WINAPI -BasepFakeStaticServerData(VOID) -{ - NTSTATUS Status; - WCHAR Buffer[MAX_PATH]; - UNICODE_STRING SystemRootString; - UNICODE_STRING UnexpandedSystemRootString = RTL_CONSTANT_STRING(L"%SystemRoot%"); - UNICODE_STRING BaseSrvCSDString; - RTL_QUERY_REGISTRY_TABLE BaseServerRegistryConfigurationTable[2] = - { - { - NULL, - RTL_QUERY_REGISTRY_DIRECT, - L"CSDVersion", - &BaseSrvCSDString - }, - {0} - }; - - /* Allocate the fake data */ - BaseStaticServerData = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(BASE_STATIC_SERVER_DATA)); - ASSERT(BaseStaticServerData != NULL); - - /* Get the Windows directory */ - RtlInitEmptyUnicodeString(&SystemRootString, Buffer, sizeof(Buffer)); - Status = RtlExpandEnvironmentStrings_U(NULL, - &UnexpandedSystemRootString, - &SystemRootString, - NULL); - DPRINT1("Status: %lx. Root: %wZ\n", Status, &SystemRootString); - ASSERT(NT_SUCCESS(Status)); - - Buffer[SystemRootString.Length / sizeof(WCHAR)] = UNICODE_NULL; - Status = RtlCreateUnicodeString(&BaseStaticServerData->WindowsDirectory, - SystemRootString.Buffer); - ASSERT(NT_SUCCESS(Status)); - - wcscat(SystemRootString.Buffer, L"\\system32"); - Status = RtlCreateUnicodeString(&BaseStaticServerData->WindowsSystemDirectory, - SystemRootString.Buffer); - ASSERT(NT_SUCCESS(Status)); - - if (!SessionId) - { - Status = RtlCreateUnicodeString(&BaseStaticServerData->NamedObjectDirectory, - L"\\BaseNamedObjects"); - ASSERT(NT_SUCCESS(Status)); - } - else - { - /* Hopefully we'll fix CSRSS Before we add multiple sessions... */ - ASSERT(FALSE); - } - - /* - * Confirmed that in Windows, CSDNumber and RCNumber are actually Length - * and MaximumLength of the CSD String, since the same UNICODE_STRING is - * being queried twice, the first time as a ULONG! - * - * Somehow, in Windows this doesn't cause a buffer overflow, but it might - * in ReactOS, so this code is disabled until someone figures out WTF. - */ - BaseStaticServerData->CSDNumber = 0; - BaseStaticServerData->RCNumber = 0; - - /* Initialize the CSD string */ - RtlInitEmptyUnicodeString(&BaseSrvCSDString, Buffer, sizeof(Buffer)); - - Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT, - L"", - BaseServerRegistryConfigurationTable, - NULL, - NULL); - if (NT_SUCCESS(Status)) - { - wcsncpy(BaseStaticServerData->CSDVersion, - BaseSrvCSDString.Buffer, - BaseSrvCSDString.Length / sizeof(WCHAR)); - } - else - { - BaseStaticServerData->CSDVersion[0] = UNICODE_NULL; - } - - Status = NtQuerySystemInformation(SystemBasicInformation, - &BaseStaticServerData->SysInfo, - sizeof(BaseStaticServerData->SysInfo), - NULL); - ASSERT(NT_SUCCESS(Status)); - - BaseStaticServerData->DefaultSeparateVDM = FALSE; - BaseStaticServerData->IsWowTaskReady = FALSE; - BaseStaticServerData->LUIDDeviceMapsEnabled = FALSE; - BaseStaticServerData->TermsrvClientTimeZoneId = TIME_ZONE_ID_INVALID; - BaseStaticServerData->TermsrvClientTimeZoneChangeNum = 0; - - Status = NtQuerySystemInformation(SystemTimeOfDayInformation, - &BaseStaticServerData->TimeOfDay, - sizeof(BaseStaticServerData->TimeOfDay), - NULL); - ASSERT(NT_SUCCESS(Status)); -} - BOOL WINAPI DllMain(HANDLE hDll, @@ -417,21 +310,7 @@ } /* Get the server data */ - if (!Peb->ReadOnlyStaticServerData) - { - /* Build fake one for ReactOS */ - BasepFakeStaticServerData(); - - /* Allocate the array */ - Peb->ReadOnlyStaticServerData = RtlAllocateHeap(RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - 4 * sizeof(PVOID)); - - /* Set the data for the BASESRV DLL Index */ - Peb->ReadOnlyStaticServerData[CSR_CONSOLE] = BaseStaticServerData; - } - - /* Get the server data */ + ASSERT(Peb->ReadOnlyStaticServerData); BaseStaticServerData = Peb->ReadOnlyStaticServerData[CSR_CONSOLE]; ASSERT(BaseStaticServerData); Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Wed Aug 3 03:09:02 2011 @@ -80,73 +80,6 @@ CPTABLEINFO CodePageTable; } CODEPAGE_ENTRY, *PCODEPAGE_ENTRY; -typedef struct _NLS_USER_INFO -{ - WCHAR iCountry[80]; - WCHAR sCountry[80]; - WCHAR sList[80]; - WCHAR iMeasure[80]; - WCHAR iPaperSize[80]; - WCHAR sDecimal[80]; - WCHAR sThousand[80]; - WCHAR sGrouping[80]; - WCHAR iDigits[80]; - WCHAR iLZero[80]; - WCHAR iNegNumber[80]; - WCHAR sNativeDigits[80]; - WCHAR iDigitSubstitution[80]; - WCHAR sCurrency[80]; - WCHAR sMonDecSep[80]; - WCHAR sMonThouSep[80]; - WCHAR sMonGrouping[80]; - WCHAR iCurrDigits[80]; - WCHAR iCurrency[80]; - WCHAR iNegCurr[80]; - WCHAR sPosSign[80]; - WCHAR sNegSign[80]; - WCHAR sTimeFormat[80]; - WCHAR s1159[80]; - WCHAR s2359[80]; - WCHAR sShortDate[80]; - WCHAR sYearMonth[80]; - WCHAR sLongDate[80]; - WCHAR iCalType[80]; - WCHAR iFirstDay[80]; - WCHAR iFirstWeek[80]; - WCHAR sLocale[80]; - WCHAR sLocaleName[85]; - LCID UserLocaleId; - LUID InteractiveUserLuid; - CHAR InteractiveUserSid[SECURITY_MAX_SID_SIZE]; - ULONG ulCacheUpdateCount; -} NLS_USER_INFO, *PNLS_USER_INFO; - -typedef struct _BASE_STATIC_SERVER_DATA -{ - UNICODE_STRING WindowsDirectory; - UNICODE_STRING WindowsSystemDirectory; - UNICODE_STRING NamedObjectDirectory; - USHORT WindowsMajorVersion; - USHORT WindowsMinorVersion; - USHORT BuildNumber; - USHORT CSDNumber; - USHORT RCNumber; - WCHAR CSDVersion[128]; - SYSTEM_BASIC_INFORMATION SysInfo; - SYSTEM_TIMEOFDAY_INFORMATION TimeOfDay; - PVOID IniFileMapping; - NLS_USER_INFO NlsUserInfo; - BOOLEAN DefaultSeparateVDM; - BOOLEAN IsWowTaskReady; - UNICODE_STRING WindowsSys32x86Directory; - BOOLEAN fTermsrvAppInstallMode; - TIME_ZONE_INFORMATION tziTermsrvClientTimeZone; - KSYSTEM_TIME ktTermsrvClientBias; - ULONG TermsrvClientTimeZoneId; - BOOLEAN LUIDDeviceMapsEnabled; - ULONG TermsrvClientTimeZoneChangeNum; -} BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA; - extern PBASE_STATIC_SERVER_DATA BaseStaticServerData; typedef Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h [iso-8859-1] Wed Aug 3 03:09:02 2011 @@ -692,6 +692,76 @@ } Data; } CSR_API_MESSAGE, *PCSR_API_MESSAGE; + +typedef struct _NLS_USER_INFO +{ + WCHAR iCountry[80]; + WCHAR sCountry[80]; + WCHAR sList[80]; + WCHAR iMeasure[80]; + WCHAR iPaperSize[80]; + WCHAR sDecimal[80]; + WCHAR sThousand[80]; + WCHAR sGrouping[80]; + WCHAR iDigits[80]; + WCHAR iLZero[80]; + WCHAR iNegNumber[80]; + WCHAR sNativeDigits[80]; + WCHAR iDigitSubstitution[80]; + WCHAR sCurrency[80]; + WCHAR sMonDecSep[80]; + WCHAR sMonThouSep[80]; + WCHAR sMonGrouping[80]; + WCHAR iCurrDigits[80]; + WCHAR iCurrency[80]; + WCHAR iNegCurr[80]; + WCHAR sPosSign[80]; + WCHAR sNegSign[80]; + WCHAR sTimeFormat[80]; + WCHAR s1159[80]; + WCHAR s2359[80]; + WCHAR sShortDate[80]; + WCHAR sYearMonth[80]; + WCHAR sLongDate[80]; + WCHAR iCalType[80]; + WCHAR iFirstDay[80]; + WCHAR iFirstWeek[80]; + WCHAR sLocale[80]; + WCHAR sLocaleName[85]; + LCID UserLocaleId; + LUID InteractiveUserLuid; + CHAR InteractiveUserSid[SECURITY_MAX_SID_SIZE]; + ULONG ulCacheUpdateCount; +} NLS_USER_INFO, *PNLS_USER_INFO; + + +typedef struct _BASE_STATIC_SERVER_DATA +{ + UNICODE_STRING WindowsDirectory; + UNICODE_STRING WindowsSystemDirectory; + UNICODE_STRING NamedObjectDirectory; + USHORT WindowsMajorVersion; + USHORT WindowsMinorVersion; + USHORT BuildNumber; + USHORT CSDNumber; + USHORT RCNumber; + WCHAR CSDVersion[128]; + SYSTEM_BASIC_INFORMATION SysInfo; + SYSTEM_TIMEOFDAY_INFORMATION TimeOfDay; + PVOID IniFileMapping; + NLS_USER_INFO NlsUserInfo; + BOOLEAN DefaultSeparateVDM; + BOOLEAN IsWowTaskReady; + UNICODE_STRING WindowsSys32x86Directory; + BOOLEAN fTermsrvAppInstallMode; + TIME_ZONE_INFORMATION tziTermsrvClientTimeZone; + KSYSTEM_TIME ktTermsrvClientBias; + ULONG TermsrvClientTimeZoneId; + BOOLEAN LUIDDeviceMapsEnabled; + ULONG TermsrvClientTimeZoneChangeNum; +} BASE_STATIC_SERVER_DATA, *PBASE_STATIC_SERVER_DATA; + + /* Types used in the new CSR. Temporarly here for proper compile of NTDLL */ #define CSR_SRV_SERVER 0 Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Wed Aug 3 03:09:02 2011 @@ -118,6 +118,294 @@ (VOID)CallHardError(ProcessData, Message); } +PVOID CsrSrvSharedSectionHeap; +PVOID CsrSrvSharedSectionBase; +PVOID *CsrSrvSharedStaticServerData; +ULONG CsrSrvSharedSectionSize; +HANDLE CsrSrvSharedSection; + +/*++ + * @name CsrSrvCreateSharedSection + * + * The CsrSrvCreateSharedSection creates the Shared Section that all CSR Server + * DLLs and Clients can use to share data. + * + * @param ParameterValue + * Specially formatted string from our registry command-line which + * specifies various arguments for the shared section. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrSrvCreateSharedSection(IN PCHAR ParameterValue) +{ + PCHAR SizeValue = ParameterValue; + ULONG Size; + NTSTATUS Status; + LARGE_INTEGER SectionSize; + ULONG ViewSize = 0; + SYSTEM_BASIC_INFORMATION CsrNtSysInfo; + PPEB Peb = NtCurrentPeb(); + + /* ReactOS Hackssss */ + ParameterValue = "1024,3072,512"; + Status = NtQuerySystemInformation(SystemBasicInformation, + &CsrNtSysInfo, + sizeof(SYSTEM_BASIC_INFORMATION), + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Find the first comma, and null terminate */ + while (*SizeValue) + { + if (*SizeValue == ',') + { + *SizeValue++ = '\0'; + break; + } + else + { + SizeValue++; + } + } + + /* Make sure it's valid */ + if (!*SizeValue) return(STATUS_INVALID_PARAMETER); + + /* Convert it to an integer */ + Status = RtlCharToInteger(SizeValue, 0, &Size); + if (!NT_SUCCESS(Status)) return Status; + + /* Multiply by 1024 entries and round to page size */ + #define ROUND_UP(n,size) (((ULONG)(n) + (size - 1)) & ~(size - 1)) // hax + CsrSrvSharedSectionSize = ROUND_UP(Size * 1024, CsrNtSysInfo.PageSize); + + /* Create the Secion */ + SectionSize.LowPart = CsrSrvSharedSectionSize; + SectionSize.HighPart = 0; + Status = NtCreateSection(&CsrSrvSharedSection, + SECTION_ALL_ACCESS, + NULL, + &SectionSize, + PAGE_EXECUTE_READWRITE, + SEC_BASED | SEC_RESERVE, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Map the section */ + Status = NtMapViewOfSection(CsrSrvSharedSection, + NtCurrentProcess(), + &CsrSrvSharedSectionBase, + 0, + 0, + NULL, + &ViewSize, + ViewUnmap, + MEM_TOP_DOWN, + PAGE_EXECUTE_READWRITE); + if(!NT_SUCCESS(Status)) + { + /* Fail */ + NtClose(CsrSrvSharedSection); + return(Status); + } + + /* FIXME: Write the value to registry */ + + /* The Heap is the same place as the Base */ + CsrSrvSharedSectionHeap = CsrSrvSharedSectionBase; + + /* Create the heap */ + if (!(RtlCreateHeap(HEAP_ZERO_MEMORY, + CsrSrvSharedSectionHeap, + CsrSrvSharedSectionSize, + PAGE_SIZE, + 0, + 0))) + { + /* Failure, unmap section and return */ + NtUnmapViewOfSection(NtCurrentProcess(), + CsrSrvSharedSectionBase); + NtClose(CsrSrvSharedSection); + return STATUS_NO_MEMORY; + } + + /* Now allocate space from the heap for the Shared Data */ + CsrSrvSharedStaticServerData = RtlAllocateHeap(CsrSrvSharedSectionHeap, + 0, + 4 * // HAX CSR_SERVER_DLL_MAX * + sizeof(PVOID)); + + /* Write the values to the PEB */ + Peb->ReadOnlySharedMemoryBase = CsrSrvSharedSectionBase; + Peb->ReadOnlySharedMemoryHeap = CsrSrvSharedSectionHeap; + Peb->ReadOnlyStaticServerData = CsrSrvSharedStaticServerData; + + /* Return */ + return STATUS_SUCCESS; +} + +/*++ + * @name CsrSrvAttachSharedSection + * + * The CsrSrvAttachSharedSection maps the CSR Shared Section into a new + * CSR Process' address space, and returns the pointers to the section + * through the Connection Info structure. + * + * @param CsrProcess + * Pointer to the CSR Process that is attempting a connection. + * + * @param ConnectInfo + * Pointer to the CSR Connection Info structure for the incoming + * connection. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrSrvAttachSharedSection(IN PCSRSS_PROCESS_DATA CsrProcess OPTIONAL, + OUT PCSR_CONNECTION_INFO ConnectInfo) +{ + NTSTATUS Status; + ULONG ViewSize = 0; + + /* Check if we have a process */ + if (CsrProcess) + { + /* Map the sectio into this process */ + Status = NtMapViewOfSection(CsrSrvSharedSection, + CsrProcess->Process, + &CsrSrvSharedSectionBase, + 0, + 0, + NULL, + &ViewSize, + ViewUnmap, + SEC_NO_CHANGE, + PAGE_EXECUTE_READ); + if (!NT_SUCCESS(Status)) return Status; + } + + /* Write the values in the Connection Info structure */ + ConnectInfo->SharedSectionBase = CsrSrvSharedSectionBase; + ConnectInfo->SharedSectionHeap = CsrSrvSharedSectionHeap; + ConnectInfo->SharedSectionData = CsrSrvSharedStaticServerData; + + /* Return success */ + return STATUS_SUCCESS; +} + +PBASE_STATIC_SERVER_DATA BaseStaticServerData; + +VOID +WINAPI +BasepFakeStaticServerData(VOID) +{ + NTSTATUS Status; + WCHAR Buffer[MAX_PATH]; + UNICODE_STRING SystemRootString; + UNICODE_STRING UnexpandedSystemRootString = RTL_CONSTANT_STRING(L"%SystemRoot%"); + UNICODE_STRING BaseSrvCSDString; + RTL_QUERY_REGISTRY_TABLE BaseServerRegistryConfigurationTable[2] = + { + { + NULL, + RTL_QUERY_REGISTRY_DIRECT, + L"CSDVersion", + &BaseSrvCSDString + }, + {0} + }; + + /* Allocate the fake data */ + BaseStaticServerData = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(BASE_STATIC_SERVER_DATA)); + ASSERT(BaseStaticServerData != NULL); + + /* Get the Windows directory */ + RtlInitEmptyUnicodeString(&SystemRootString, Buffer, sizeof(Buffer)); + Status = RtlExpandEnvironmentStrings_U(NULL, + &UnexpandedSystemRootString, + &SystemRootString, + NULL); + DPRINT1("Status: %lx. Root: %wZ\n", Status, &SystemRootString); + ASSERT(NT_SUCCESS(Status)); + + Buffer[SystemRootString.Length / sizeof(WCHAR)] = UNICODE_NULL; + Status = RtlCreateUnicodeString(&BaseStaticServerData->WindowsDirectory, + SystemRootString.Buffer); + ASSERT(NT_SUCCESS(Status)); + + wcscat(SystemRootString.Buffer, L"\\system32"); + Status = RtlCreateUnicodeString(&BaseStaticServerData->WindowsSystemDirectory, + SystemRootString.Buffer); + ASSERT(NT_SUCCESS(Status)); + + Status = RtlCreateUnicodeString(&BaseStaticServerData->NamedObjectDirectory, + L"\\BaseNamedObjects"); + ASSERT(NT_SUCCESS(Status)); + + /* + * Confirmed that in Windows, CSDNumber and RCNumber are actually Length + * and MaximumLength of the CSD String, since the same UNICODE_STRING is + * being queried twice, the first time as a ULONG! + * + * Somehow, in Windows this doesn't cause a buffer overflow, but it might + * in ReactOS, so this code is disabled until someone figures out WTF. + */ + BaseStaticServerData->CSDNumber = 0; + BaseStaticServerData->RCNumber = 0; + + /* Initialize the CSD string */ + RtlInitEmptyUnicodeString(&BaseSrvCSDString, Buffer, sizeof(Buffer)); + + Status = RtlQueryRegistryValues(RTL_REGISTRY_WINDOWS_NT, + L"", + BaseServerRegistryConfigurationTable, + NULL, + NULL); + if (NT_SUCCESS(Status)) + { + wcsncpy(BaseStaticServerData->CSDVersion, + BaseSrvCSDString.Buffer, + BaseSrvCSDString.Length / sizeof(WCHAR)); + } + else + { + BaseStaticServerData->CSDVersion[0] = UNICODE_NULL; + } + + Status = NtQuerySystemInformation(SystemBasicInformation, + &BaseStaticServerData->SysInfo, + sizeof(BaseStaticServerData->SysInfo), + NULL); + ASSERT(NT_SUCCESS(Status)); + + BaseStaticServerData->DefaultSeparateVDM = FALSE; + BaseStaticServerData->IsWowTaskReady = FALSE; + BaseStaticServerData->LUIDDeviceMapsEnabled = FALSE; + BaseStaticServerData->TermsrvClientTimeZoneId = TIME_ZONE_ID_INVALID; + BaseStaticServerData->TermsrvClientTimeZoneChangeNum = 0; + + Status = NtQuerySystemInformation(SystemTimeOfDayInformation, + &BaseStaticServerData->TimeOfDay, + sizeof(BaseStaticServerData->TimeOfDay), + NULL); + ASSERT(NT_SUCCESS(Status)); + + CsrSrvSharedStaticServerData[CSR_CONSOLE] = BaseStaticServerData; +} + NTSTATUS WINAPI CsrpHandleConnectionRequest (PPORT_MESSAGE Request, IN HANDLE hApiListenPort) @@ -127,6 +415,7 @@ PCSRSS_PROCESS_DATA ProcessData = NULL; REMOTE_PORT_VIEW LpcRead; CLIENT_ID ClientId; + BOOLEAN AllowConnection = FALSE; PCSR_CONNECTION_INFO ConnectInfo; LpcRead.Length = sizeof(LpcRead); ServerPort = NULL; @@ -134,16 +423,32 @@ DPRINT("CSR: %s: Handling: %p\n", __FUNCTION__, Request); ConnectInfo = (PCSR_CONNECTION_INFO)(Request + 1); - DPRINT1("CSR Connect Info: %p\n", ConnectInfo); /* Save the process ID */ RtlZeroMemory(ConnectInfo, sizeof(CSR_CONNECTION_INFO)); ConnectInfo->ProcessId = NtCurrentTeb()->ClientId.UniqueProcess; + ProcessData = CsrGetProcessData(Request->ClientId.UniqueProcess); + if (ProcessData == NULL) + { + ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); + if (ProcessData == NULL) + { + DPRINT1("Unable to allocate or find data for process 0x%x\n", + Request->ClientId.UniqueProcess); + } + else + { + /* Attach the Shared Section */ + Status = CsrSrvAttachSharedSection(ProcessData, ConnectInfo); + if (NT_SUCCESS(Status)) AllowConnection = TRUE; + } + } + Status = NtAcceptConnectPort(&ServerPort, NULL, Request, - TRUE, + AllowConnection, 0, & LpcRead); if (!NT_SUCCESS(Status)) @@ -152,24 +457,11 @@ return Status; } - ProcessData = CsrGetProcessData(Request->ClientId.UniqueProcess); - if (ProcessData == NULL) - { - ProcessData = CsrCreateProcessData(Request->ClientId.UniqueProcess); - if (ProcessData == NULL) - { - DPRINT1("Unable to allocate or find data for process 0x%x\n", - Request->ClientId.UniqueProcess); - Status = STATUS_UNSUCCESSFUL; - return Status; - } - } - ProcessData->CsrSectionViewBase = LpcRead.ViewBase; ProcessData->CsrSectionViewSize = LpcRead.ViewSize; ProcessData->ServerCommunicationPort = ServerPort; - Status = NtCompleteConnectPort(ServerPort); + if (AllowConnection) Status = NtCompleteConnectPort(ServerPort); if (!NT_SUCCESS(Status)) { DPRINT1("CSR: NtCompleteConnectPort() failed\n");

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