Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[tfaber] 53361: [CMAKE] - Add current source directory to MS RC include paths - Add include directories to WRC include paths - Now they should behave identically enough. Thanks to Amine.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 21 21:18:59 2011 New Revision: 53361 URL: http://svn.reactos.org/svn/reactos?rev=53361&view=rev Log: [CMAKE] - Add current source directory to MS RC include paths - Add include directories to WRC include paths - Now they should behave identically enough. Thanks to Amine. Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53361&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Aug 21 21:18:59 2011 @@ -187,7 +187,7 @@ #set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>" PARENT_SCOPE) set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_C_COMPILER> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${rc_result_defs} -I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} -xc -E <SOURCE> -o <OBJECT>" - "${WRC} -I${CMAKE_CURRENT_SOURCE_DIR} -i <OBJECT> -o <OBJECT>" + "${WRC} -I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} -i <OBJECT> -o <OBJECT>" "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>" PARENT_SCOPE) endfunction() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=53361… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Aug 21 21:18:59 2011 @@ -132,7 +132,18 @@ endfunction() function(set_rc_compiler) -# dummy, this workaround is only needed in mingw due to lack of RC support in cmake + get_directory_property(defines COMPILE_DEFINITIONS) + get_directory_property(includes INCLUDE_DIRECTORIES) + + foreach(arg ${defines}) + set(rc_result_defs "${rc_result_defs} /D${arg}") + endforeach() + + foreach(arg ${includes}) + set(rc_result_incs "/I${arg} ${rc_result_incs}") + endforeach() + + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} /I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} /fo <OBJECT> <SOURCE>" PARENT_SCOPE) endfunction() # Thanks MS for creating a stupid linker

13 years, 4 months

[akhaldi] 53360: [SERVICES] * Fix CMake build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Aug 21 18:48:53 2011 New Revision: 53360 URL: http://svn.reactos.org/svn/reactos?rev=53360&view=rev Log: [SERVICES] * Fix CMake build. Modified: trunk/reactos/base/system/services/CMakeLists.txt Modified: trunk/reactos/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/CMake… ============================================================================== --- trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/services/CMakeLists.txt [iso-8859-1] Sun Aug 21 18:48:53 2011 @@ -1,7 +1,8 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/subsys - ${REACTOS_SOURCE_DIR}/include/reactos/idl) + ${REACTOS_SOURCE_DIR}/include/reactos/idl + ${CMAKE_CURRENT_BINARY_DIR}) add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl) @@ -25,5 +26,5 @@ set_module_type(services win32cui) add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) -add_pch(services services.h) +add_pch(services services.h ${CMAKE_CURRENT_BINARY_DIR}/svcctl_s.h) add_cd_file(TARGET services DESTINATION reactos/system32 FOR all)

13 years, 4 months

[tfaber] 53359: [KMTESTS/EX] - Add ExSequencedList test and restructure ExSingleList so they can share the test body

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 21 16:08:27 2011 New Revision: 53359 URL: http://svn.reactos.org/svn/reactos?rev=53359&view=rev Log: [KMTESTS/EX] - Add ExSequencedList test and restructure ExSingleList so they can share the test body Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSequencedList.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExXList.h (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.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] Sun Aug 21 16:08:27 2011 @@ -22,6 +22,7 @@ ntos_ex/ExInterlocked.c ntos_ex/ExPools.c ntos_ex/ExResource.c + ntos_ex/ExSequencedList.c ntos_ex/ExSingleList.c ntos_ex/ExTimer.c ntos_fsrtl/FsRtlExpression.c 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] Sun Aug 21 16:08:27 2011 @@ -21,6 +21,7 @@ <file>ExInterlocked.c</file> <file>ExPools.c</file> <file>ExResource.c</file> + <file>ExSequencedList.c</file> <file>ExSingleList.c</file> <file>ExTimer.c</file> </directory> 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] Sun Aug 21 16:08:27 2011 @@ -15,6 +15,7 @@ KMT_TESTFUNC Test_ExInterlocked; KMT_TESTFUNC Test_ExPools; KMT_TESTFUNC Test_ExResource; +KMT_TESTFUNC Test_ExSequencedList; KMT_TESTFUNC Test_ExSingleList; KMT_TESTFUNC Test_ExTimer; KMT_TESTFUNC Test_FsRtlExpression; @@ -43,6 +44,7 @@ { "ExInterlocked", Test_ExInterlocked }, { "ExPools", Test_ExPools }, { "ExResource", Test_ExResource }, + { "ExSequencedList", Test_ExSequencedList }, { "ExSingleList", Test_ExSingleList }, { "ExTimer", Test_ExTimer }, { "Example", Test_Example }, Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSequencedList.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSequencedList.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSequencedList.c [iso-8859-1] Sun Aug 21 16:08:27 2011 @@ -1,0 +1,79 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite sequenced singly-linked list test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +struct _SINGLE_LIST_ENTRY; +union _SLIST_HEADER; +struct _SINGLE_LIST_ENTRY *__fastcall ExInterlockedPushEntrySList(union _SLIST_HEADER *, struct _SINGLE_LIST_ENTRY *, unsigned long *); +struct _SINGLE_LIST_ENTRY *__fastcall ExInterlockedPopEntrySList(union _SLIST_HEADER *, unsigned long *); + +#include <kmt_test.h> + +/* TODO: SLIST_HEADER is a lot different for x64 */ + +#define CheckSListHeader(ListHead, ExpectedPointer, ExpectedDepth) do \ +{ \ + ok_eq_pointer((ListHead)->Next.Next, ExpectedPointer); \ + /*ok_eq_pointer(FirstEntrySList(ListHead), ExpectedPointer);*/ \ + ok_eq_uint((ListHead)->Depth, ExpectedDepth); \ + ok_eq_uint((ListHead)->Sequence, ExpectedSequence); \ + ok_eq_uint(ExQueryDepthSList(ListHead), ExpectedDepth); \ + ok_irql(HIGH_LEVEL); \ + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); \ +} while (0) + +#define PXLIST_HEADER PSLIST_HEADER +#define PXLIST_ENTRY PSLIST_ENTRY +#define PushXList ExInterlockedPushEntrySList +#define PopXList ExInterlockedPopEntrySList +#define FlushXList ExInterlockedFlushSList +#define ok_free_xlist ok_eq_pointer +#define CheckXListHeader CheckSListHeader +#define TestXListFunctional TestSListFunctional +#include "ExXList.h" + +#undef ExInterlockedPushEntrySList +#undef ExInterlockedPopEntrySList +#define TestXListFunctional TestSListFunctionalExports +#include "ExXList.h" + +START_TEST(ExSequencedList) +{ + PSLIST_HEADER ListHead; + KSPIN_LOCK SpinLock; + USHORT ExpectedSequence = 0; + PKSPIN_LOCK pSpinLock = &SpinLock; + PCHAR Buffer; + PSLIST_ENTRY Entries; + SIZE_T EntriesSize = 5 * sizeof *Entries; + KIRQL Irql; + + KeInitializeSpinLock(&SpinLock); +#ifdef _M_IX86 + pSpinLock = NULL; +#endif + + /* make sure stuff is as un-aligned as possible ;) */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, sizeof *ListHead + EntriesSize + 1, 'TLqS'); + ListHead = (PVOID)&Buffer[1]; + Entries = (PVOID)&ListHead[1]; + KeRaiseIrql(HIGH_LEVEL, &Irql); + + RtlFillMemory(Entries, EntriesSize, 0x55); + RtlFillMemory(ListHead, sizeof *ListHead, 0x55); + InitializeSListHead(ListHead); + CheckSListHeader(ListHead, NULL, 0); + TestSListFunctional(ListHead, Entries, pSpinLock); + + RtlFillMemory(Entries, EntriesSize, 0x55); + RtlFillMemory(ListHead, sizeof *ListHead, 0x55); + ExInitializeSListHead(ListHead); + CheckSListHeader(ListHead, NULL, 0); + TestSListFunctionalExports(ListHead, Entries, pSpinLock); + + KeLowerIrql(Irql); + ExFreePoolWithTag(Buffer, 'TLqS'); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSequencedList.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c [iso-8859-1] Sun Aug 21 16:08:27 2011 @@ -11,8 +11,6 @@ #include <kmt_test.h> -SINGLE_LIST_ENTRY Entries[5]; - #define ok_eq_free2(Value, Expected) do \ { \ if (KmtIsCheckedBuild) \ @@ -21,107 +19,94 @@ ok_eq_pointer(Value, Expected); \ } while (0) +PSINGLE_LIST_ENTRY FlushList(PSINGLE_LIST_ENTRY ListHead) +{ + PSINGLE_LIST_ENTRY Ret = ListHead->Next; + ListHead->Next = NULL; + return Ret; +} + +USHORT QueryDepthList(PSINGLE_LIST_ENTRY ListHead) +{ + USHORT Depth = 0; + while (ListHead->Next) + { + ++Depth; + ListHead = ListHead->Next; + } + return Depth; +} + +PSINGLE_LIST_ENTRY PushEntryListWrapper(PSINGLE_LIST_ENTRY ListHead, PSINGLE_LIST_ENTRY Entry, PKSPIN_LOCK Lock) +{ + PSINGLE_LIST_ENTRY Ret; + UNREFERENCED_PARAMETER(Lock); + Ret = ListHead->Next; + PushEntryList(ListHead, Entry); + return Ret; +} + +#define CheckListHeader(ListHead, ExpectedPointer, ExpectedDepth) do \ +{ \ + ok_eq_pointer((ListHead)->Next, ExpectedPointer); \ + ok_eq_uint(QueryDepthList(ListHead), ExpectedDepth); \ + ok_irql(HIGH_LEVEL); \ + ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); \ +} while (0) + +#define PXLIST_HEADER PSINGLE_LIST_ENTRY +#define PXLIST_ENTRY PSINGLE_LIST_ENTRY +#define PushXList ExInterlockedPushEntryList +#define PopXList ExInterlockedPopEntryList +#define FlushXList FlushList +#define ok_free_xlist ok_eq_free2 +#define CheckXListHeader CheckListHeader +#define TestXListFunctional TestListFunctional +#include "ExXList.h" + +#undef ExInterlockedPushEntryList +#undef ExInterlockedPopEntryList +#define TestXListFunctional TestListFunctionalExports +#include "ExXList.h" + +#undef PushXList +#define PushXList PushEntryListWrapper +#undef PopXList +#define PopXList(h, s) PopEntryList(h) +#undef ok_free_xlist +#define ok_free_xlist ok_eq_pointer +#define TestXListFunctional TestListFunctionalNoInterlocked +#include "ExXList.h" + START_TEST(ExSingleList) { KSPIN_LOCK SpinLock; - SINGLE_LIST_ENTRY ListHead; - PSINGLE_LIST_ENTRY Ret; + PSINGLE_LIST_ENTRY ListHead; + PSINGLE_LIST_ENTRY Entries; + SIZE_T EntriesSize = 5 * sizeof *Entries; + PCHAR Buffer; + KIRQL Irql; KeInitializeSpinLock(&SpinLock); - memset(Entries, 0x55, sizeof Entries); - ListHead.Next = NULL; - Ret = ExInterlockedPushEntryList(&ListHead, &Entries[0], &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Next, &Entries[0]); - ok_eq_pointer(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); + /* make sure stuff is as un-aligned as possible ;) */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, sizeof *ListHead + EntriesSize + 1, 'TLiS'); + ListHead = (PVOID)&Buffer[1]; + Entries = (PVOID)&ListHead[1]; + KeRaiseIrql(HIGH_LEVEL, &Irql); + + RtlFillMemory(Entries, sizeof Entries, 0x55); + ListHead->Next = NULL; + TestListFunctional(ListHead, Entries, &SpinLock); - Ret = ExInterlockedPopEntryList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, &Entries[0]); - ok_eq_pointer(ListHead.Next, NULL); - ok_eq_free2(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedPopEntryList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Next, NULL); - ok_eq_free2(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedPushEntryList(&ListHead, &Entries[0], &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Next, &Entries[0]); - ok_eq_pointer(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedPushEntryList(&ListHead, &Entries[1], &SpinLock); - ok_eq_pointer(Ret, &Entries[0]); - ok_eq_pointer(ListHead.Next, &Entries[1]); - ok_eq_pointer(Entries[1].Next, &Entries[0]); - ok_eq_pointer(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedPopEntryList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, &Entries[1]); - ok_eq_pointer(ListHead.Next, &Entries[0]); - ok_eq_free2(Entries[1].Next, &Entries[0]); - ok_eq_pointer(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - -#undef ExInterlockedPushEntryList -#undef ExInterlockedPopEntryList - memset(Entries, 0x55, sizeof Entries); - ListHead.Next = NULL; - Ret = ExInterlockedPushEntryList(&ListHead, &Entries[0], &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Next, &Entries[0]); - ok_eq_pointer(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedPopEntryList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, &Entries[0]); - ok_eq_pointer(ListHead.Next, NULL); - ok_eq_free2(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedPopEntryList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Next, NULL); - ok_eq_free2(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedPushEntryList(&ListHead, &Entries[0], &SpinLock); - ok_eq_pointer(Ret, NULL); - ok_eq_pointer(ListHead.Next, &Entries[0]); - ok_eq_pointer(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedPushEntryList(&ListHead, &Entries[1], &SpinLock); - ok_eq_pointer(Ret, &Entries[0]); - ok_eq_pointer(ListHead.Next, &Entries[1]); - ok_eq_pointer(Entries[1].Next, &Entries[0]); - ok_eq_pointer(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - Ret = ExInterlockedPopEntryList(&ListHead, &SpinLock); - ok_eq_pointer(Ret, &Entries[1]); - ok_eq_pointer(ListHead.Next, &Entries[0]); - ok_eq_free2(Entries[1].Next, &Entries[0]); - ok_eq_pointer(Entries[0].Next, NULL); - ok_bool_true(KmtAreInterruptsEnabled(), "Interrupts enabled:"); - ok_irql(PASSIVE_LEVEL); - - KmtSetIrql(PASSIVE_LEVEL); + RtlFillMemory(Entries, sizeof Entries, 0x55); + ListHead->Next = NULL; + TestListFunctionalExports(ListHead, Entries, &SpinLock); + + RtlFillMemory(Entries, sizeof Entries, 0x55); + ListHead->Next = NULL; + TestListFunctionalNoInterlocked(ListHead, Entries, &SpinLock); + + KeLowerIrql(Irql); + ExFreePoolWithTag(Buffer, 'TLiS'); } Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExXList.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExXList.h (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExXList.h [iso-8859-1] Sun Aug 21 16:08:27 2011 @@ -1,0 +1,91 @@ +/* used by ExSingleList and ExSequencedList tests */ +static +VOID +TestXListFunctional( + IN PXLIST_HEADER ListHead, + IN PXLIST_ENTRY Entries, + IN PKSPIN_LOCK pSpinLock) +{ + USHORT ExpectedSequence = 0; + PXLIST_ENTRY Ret; + + Ret = FlushXList(ListHead); + ok_eq_pointer(Ret, NULL); + CheckXListHeader(ListHead, NULL, 0); + + Ret = PopXList(ListHead, pSpinLock); + ok_eq_pointer(Ret, NULL); + CheckXListHeader(ListHead, NULL, 0); + + Ret = PushXList(ListHead, &Entries[0], pSpinLock); + ++ExpectedSequence; + ok_eq_pointer(Ret, NULL); + ok_eq_pointer(Entries[0].Next, NULL); + CheckXListHeader(ListHead, &Entries[0], 1); + + Ret = PushXList(ListHead, &Entries[1], pSpinLock); + ++ExpectedSequence; + ok_eq_pointer(Ret, &Entries[0]); + ok_eq_pointer(Entries[0].Next, NULL); + ok_eq_pointer(Entries[1].Next, &Entries[0]); + CheckXListHeader(ListHead, &Entries[1], 2); + + Ret = PopXList(ListHead, pSpinLock); + ok_eq_pointer(Ret, &Entries[1]); + ok_eq_pointer(Entries[0].Next, NULL); + ok_free_xlist(Entries[1].Next, &Entries[0]); + CheckXListHeader(ListHead, &Entries[0], 1); + + Ret = PopXList(ListHead, pSpinLock); + ok_eq_pointer(Ret, &Entries[0]); + ok_free_xlist(Entries[0].Next, NULL); + ok_free_xlist(Entries[1].Next, &Entries[0]); + CheckXListHeader(ListHead, NULL, 0); + + Ret = PopXList(ListHead, pSpinLock); + ok_eq_pointer(Ret, NULL); + ok_free_xlist(Entries[0].Next, NULL); + ok_free_xlist(Entries[1].Next, &Entries[0]); + CheckXListHeader(ListHead, NULL, 0); + + /* add entries again */ + Ret = PushXList(ListHead, &Entries[0], pSpinLock); + ++ExpectedSequence; + ok_eq_pointer(Ret, NULL); + ok_eq_pointer(Entries[0].Next, NULL); + CheckXListHeader(ListHead, &Entries[0], 1); + + Ret = PushXList(ListHead, &Entries[1], pSpinLock); + ++ExpectedSequence; + ok_eq_pointer(Ret, &Entries[0]); + ok_eq_pointer(Entries[0].Next, NULL); + ok_eq_pointer(Entries[1].Next, &Entries[0]); + CheckXListHeader(ListHead, &Entries[1], 2); + + Ret = PopXList(ListHead, pSpinLock); + ok_eq_pointer(Ret, &Entries[1]); + ok_eq_pointer(Entries[0].Next, NULL); + ok_free_xlist(Entries[1].Next, &Entries[0]); + CheckXListHeader(ListHead, &Entries[0], 1); + + Ret = PushXList(ListHead, &Entries[1], pSpinLock); + ++ExpectedSequence; + ok_eq_pointer(Ret, &Entries[0]); + ok_eq_pointer(Entries[0].Next, NULL); + ok_eq_pointer(Entries[1].Next, &Entries[0]); + CheckXListHeader(ListHead, &Entries[1], 2); + + Ret = PushXList(ListHead, &Entries[2], pSpinLock); + ++ExpectedSequence; + ok_eq_pointer(Ret, &Entries[1]); + ok_eq_pointer(Entries[0].Next, NULL); + ok_eq_pointer(Entries[1].Next, &Entries[0]); + ok_eq_pointer(Entries[2].Next, &Entries[1]); + CheckXListHeader(ListHead, &Entries[2], 3); + + Ret = FlushXList(ListHead); + ok_eq_pointer(Ret, &Entries[2]); + CheckXListHeader(ListHead, NULL, 0); +} + +#undef TestXListFunctional Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExXList.h ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 4 months

[ekohl] 53358: [SERVICES/ADVAPI32] Rewrite the command packet transfer code between the service control manager (services.exe) and the service control dispatcher (advapi32.dll). The service name is...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 21 15:35:19 2011 New Revision: 53358 URL: http://svn.reactos.org/svn/reactos?rev=53358&view=rev Log: [SERVICES/ADVAPI32] Rewrite the command packet transfer code between the service control manager (services.exe) and the service control dispatcher (advapi32.dll). The service name is no longer stored in an array of WCHARs at the end of the command packet. The service name is now stored behind the fixed size command packet header using an offset value in the header to determine the start of the string. The same method will be used to store start arguments to the service dispatcher, but it is not fully implemented yet. Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h trunk/reactos/dll/win32/advapi32/service/sctrl.c trunk/reactos/include/reactos/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sun Aug 21 15:35:19 2011 @@ -918,33 +918,43 @@ DWORD dwWriteCount = 0; DWORD dwReadCount = 0; - DWORD TotalLength; + DWORD PacketSize; + PWSTR Ptr; DWORD dwError = ERROR_SUCCESS; DPRINT("ScmControlService() called\n"); EnterCriticalSection(&ControlServiceCriticalSection); - TotalLength = wcslen(Service->lpServiceName) + 1; + /* Calculate the total length of the start command line */ + PacketSize = sizeof(SCM_CONTROL_PACKET); + PacketSize += (wcslen(Service->lpServiceName) + 1) * sizeof(WCHAR); ControlPacket = (SCM_CONTROL_PACKET*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR))); + PacketSize); if (ControlPacket == NULL) { LeaveCriticalSection(&ControlServiceCriticalSection); return ERROR_NOT_ENOUGH_MEMORY; } + ControlPacket->dwSize = PacketSize; ControlPacket->dwControl = dwControl; - ControlPacket->dwSize = TotalLength; ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; - wcscpy(&ControlPacket->szArguments[0], Service->lpServiceName); + + ControlPacket->dwServiceNameOffset = sizeof(SCM_CONTROL_PACKET); + + Ptr = (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); + wcscpy(Ptr, Service->lpServiceName); + + ControlPacket->dwArgumentsCount = 0; + ControlPacket->dwArgumentsOffset = 0; /* Send the control packet */ WriteFile(Service->lpImage->hControlPipe, ControlPacket, - sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR)), + PacketSize, &dwWriteCount, NULL); @@ -986,9 +996,7 @@ { PSCM_CONTROL_PACKET ControlPacket; SCM_REPLY_PACKET ReplyPacket; - DWORD TotalLength; - DWORD ArgsLength = 0; - DWORD Length; + DWORD PacketSize; PWSTR Ptr; DWORD dwWriteCount = 0; DWORD dwReadCount = 0; @@ -998,52 +1006,59 @@ DPRINT("ScmSendStartCommand() called\n"); /* Calculate the total length of the start command line */ - TotalLength = wcslen(Service->lpServiceName) + 1; - if (argc > 0) - { + PacketSize = sizeof(SCM_CONTROL_PACKET); + PacketSize += (wcslen(Service->lpServiceName) + 1) * sizeof(WCHAR); + + /* Calculate the required packet size for the start arguments */ + if (argc > 0 && argv != NULL) + { + PacketSize = ALIGN_UP(PacketSize, LPWSTR); + + DPRINT("Argc: %lu\n", argc); for (i = 0; i < argc; i++) { - DPRINT("Arg: %S\n", argv[i]); - Length = wcslen(argv[i]) + 1; - TotalLength += Length; - ArgsLength += Length; - } - } - TotalLength++; - DPRINT("ArgsLength: %ld TotalLength: %ld\n", ArgsLength, TotalLength); + DPRINT("Argv[%lu]: %S\n", i, argv[i]); + PacketSize += (wcslen(argv[i]) + 1) * sizeof(WCHAR) + sizeof(PWSTR); + } + } /* Allocate a control packet */ ControlPacket = (SCM_CONTROL_PACKET*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(SCM_CONTROL_PACKET) + (TotalLength - 1) * sizeof(WCHAR)); + PacketSize); if (ControlPacket == NULL) return ERROR_NOT_ENOUGH_MEMORY; + ControlPacket->dwSize = PacketSize; ControlPacket->dwControl = SERVICE_CONTROL_START; ControlPacket->hServiceStatus = (SERVICE_STATUS_HANDLE)Service; - ControlPacket->dwSize = TotalLength; - Ptr = &ControlPacket->szArguments[0]; + ControlPacket->dwServiceNameOffset = sizeof(SCM_CONTROL_PACKET); + + Ptr = (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); wcscpy(Ptr, Service->lpServiceName); - Ptr += (wcslen(Service->lpServiceName) + 1); + + ControlPacket->dwArgumentsCount = 0; + ControlPacket->dwArgumentsOffset = 0; /* Copy argument list */ - if (argc > 0) - { - UNIMPLEMENTED; - DPRINT1("Arguments sent to service ignored!\n"); + if (argc > 0 && argv != NULL) + { +// Ptr += wcslen(Service->lpServiceName) + 1; +// Ptr = ALIGN_UP_POINTER(Ptr, LPWSTR); + +// ControlPacket->dwArgumentsOffset = (DWORD)((INT_PTR)Ptr - (INT_PTR)ControlPacket); + + #if 0 memcpy(Ptr, Arguments, ArgsLength); Ptr += ArgsLength; #endif } - /* Terminate the argument list */ - *Ptr = 0; - /* Send the start command */ WriteFile(Service->lpImage->hControlPipe, ControlPacket, - sizeof(SCM_CONTROL_PACKET) + (TotalLength - 1) * sizeof(WCHAR), + PacketSize, &dwWriteCount, NULL); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Aug 21 15:35:19 2011 @@ -11,7 +11,6 @@ /* INCLUDES ****************************************************************/ #include "services.h" -#include "svcctl_s.h" #define NDEBUG #include <debug.h> @@ -2868,8 +2867,17 @@ DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; - - DPRINT("RStartServiceW() called\n"); + DWORD i; + + DPRINT("RStartServiceW(%p %lu %p) called\n", hService, argc, argv); + DPRINT(" argc: %lu\n", argc); + if (argv != NULL) + { + for (i = 0; i < argc; i++) + { + DPRINT(" argv[%lu]: %S\n", i, argv[i]); + } + } if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -2901,13 +2909,8 @@ if (lpService->bDeleted) return ERROR_SERVICE_MARKED_FOR_DELETE; - if (argv) { - UNIMPLEMENTED; - argv = NULL; - } - /* Start the service */ - dwError = ScmStartService(lpService, argc, (LPWSTR *)argv); + dwError = ScmStartService(lpService, argc, (LPWSTR*)argv); return dwError; } Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… ============================================================================== --- trunk/reactos/base/system/services/services.h [iso-8859-1] (original) +++ trunk/reactos/base/system/services/services.h [iso-8859-1] Sun Aug 21 15:35:19 2011 @@ -11,6 +11,7 @@ #include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #include <services/services.h> +#include "svcctl_s.h" typedef struct _SERVICE_GROUP Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Sun Aug 21 15:35:19 2011 @@ -125,13 +125,19 @@ { DWORD i; + TRACE("ScLookupServiceByServiceName(%S) called\n", lpServiceName); + for (i = 0; i < dwActiveServiceCount; i++) { + TRACE("Checking %S\n", lpActiveServices[i].ServiceName.Buffer); if (_wcsicmp(lpActiveServices[i].ServiceName.Buffer, lpServiceName) == 0) { + TRACE("Found!\n"); return &lpActiveServices[i]; } } + + TRACE("No service found!\n"); SetLastError(ERROR_SERVICE_DOES_NOT_EXIST); @@ -344,23 +350,52 @@ { HANDLE ThreadHandle; DWORD ThreadId; + PWSTR pServiceName; + PWSTR Ptr; + DWORD dwArgumentsSize; TRACE("ScStartService() called\n"); TRACE("Size: %lu\n", ControlPacket->dwSize); - TRACE("Service: %S\n", &ControlPacket->szArguments[0]); + TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); /* Set the service status handle */ lpService->hServiceStatus = ControlPacket->hServiceStatus; + pServiceName = (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); + + /* Get the service name size */ + dwArgumentsSize = (wcslen(pServiceName) + 1) * sizeof(WCHAR); + + /* Get the size of the service start arguments */ + if (ControlPacket->dwArgumentsCount > 0 && + ControlPacket->dwArgumentsOffset != 0) + { + /* FIXME */ +#if 0 + dwArgumentSize += (wcslen(...) + 1) * sizeof(WCHAR); +#endif + } + lpService->Arguments = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - (ControlPacket->dwSize + 1) * sizeof(WCHAR)); + dwArgumentsSize + sizeof(WCHAR)); if (lpService->Arguments == NULL) return ERROR_OUTOFMEMORY; - memcpy(lpService->Arguments, - ControlPacket->szArguments, - ControlPacket->dwSize * sizeof(WCHAR)); + Ptr = lpService->Arguments; + + /* Add the service name as first argument */ + wcscpy(Ptr, pServiceName); + Ptr += (wcslen(pServiceName) + 1); + + /* Add service start arguments */ + if (ControlPacket->dwArgumentsCount > 0 && + ControlPacket->dwArgumentsOffset != 0) + { + /* FIXME */ + } + + *Ptr = 0; /* invoke the services entry point and implement the command loop */ ThreadHandle = CreateThread(NULL, @@ -385,7 +420,7 @@ { TRACE("ScControlService() called\n"); TRACE("Size: %lu\n", ControlPacket->dwSize); - TRACE("Service: %S\n", &ControlPacket->szArguments[0]); + TRACE("Service: %S\n", (PWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset)); if (lpService->HandlerFunction) { @@ -446,7 +481,7 @@ return FALSE; } - lpServiceName = &ControlPacket->szArguments[0]; + lpServiceName = (LPWSTR)((PBYTE)ControlPacket + ControlPacket->dwServiceNameOffset); TRACE("Service: %S\n", lpServiceName); lpService = ScLookupServiceByServiceName(lpServiceName); Modified: trunk/reactos/include/reactos/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/services/s… ============================================================================== --- trunk/reactos/include/reactos/services/services.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/services/services.h [iso-8859-1] Sun Aug 21 15:35:19 2011 @@ -13,10 +13,12 @@ typedef struct _SCM_CONTROL_PACKET { + DWORD dwSize; DWORD dwControl; SERVICE_STATUS_HANDLE hServiceStatus; - DWORD dwSize; - WCHAR szArguments[1]; + DWORD dwServiceNameOffset; + DWORD dwArgumentsCount; + DWORD dwArgumentsOffset; } SCM_CONTROL_PACKET, *PSCM_CONTROL_PACKET; typedef struct _SCM_REPLY_PACKET

13 years, 4 months

[gadamopoulos] 53357: [win32k] - Fix some debug output

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Aug 21 14:57:04 2011 New Revision: 53357 URL: http://svn.reactos.org/svn/reactos?rev=53357&view=rev Log: [win32k] - Fix some debug output Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Sun Aug 21 14:57:04 2011 @@ -174,6 +174,8 @@ ULONG ArgumentLength; LRESULT Result; + TRACE_CH(UserMsgCall,"hwnd:0x%x, msg:%d, wparam:%d, lparam:%d\n", Wnd, Message, wParam, lParam); + if (0 < lParamBufferSize) { ArgumentLength = sizeof(WINDOWPROC_CALLBACK_ARGUMENTS) + lParamBufferSize; @@ -203,8 +205,6 @@ IntSetTebWndCallback (&Wnd, &pWnd); - TRACE_CH(UserMsgCall,"hwnd:0x%x, msg:%d, wparam:%d, lparam:%d\n", Wnd, Message, wParam, lParam); - UserLeaveCo(); Status = KeUserModeCallback(USER32_CALLBACK_WINDOWPROC, @@ -220,6 +220,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ERR_CH(UserMsgCall,"Failed to copy result from user mode!\n"); Status = _SEH2_GetExceptionCode(); } _SEH2_END; @@ -230,6 +231,7 @@ if (!NT_SUCCESS(Status)) { + ERR_CH(UserMsgCall,"Call to user mode failed!\n"); if (0 < lParamBufferSize) { IntCbFreeMemory(Arguments);

13 years, 4 months

[ekohl] 53356: [ADVAPI32] QueryServiceLockStatusA/W: If lpLockStatus is NULL or cbBufSize is less than sizeof(QUERY_SERVICE_LOCK_STATUSA/W) pass a pointer to an buffer to RQueryServiceLockStatusA/W.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Aug 21 14:04:19 2011 New Revision: 53356 URL: http://svn.reactos.org/svn/reactos?rev=53356&view=rev Log: [ADVAPI32] QueryServiceLockStatusA/W: If lpLockStatus is NULL or cbBufSize is less than sizeof(QUERY_SERVICE_LOCK_STATUSA/W) pass a pointer to an buffer to RQueryServiceLockStatusA/W. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Aug 21 14:04:19 2011 @@ -2309,16 +2309,30 @@ DWORD cbBufSize, LPDWORD pcbBytesNeeded) { + QUERY_SERVICE_LOCK_STATUSA LockStatus; + LPQUERY_SERVICE_LOCK_STATUSA lpStatusPtr; + DWORD dwBufferSize; DWORD dwError; TRACE("QueryServiceLockStatusA() called\n"); + + if (lpLockStatus == NULL || cbBufSize < sizeof(QUERY_SERVICE_LOCK_STATUSA)) + { + lpStatusPtr = &LockStatus; + dwBufferSize = sizeof(QUERY_SERVICE_LOCK_STATUSA); + } + else + { + lpStatusPtr = lpLockStatus; + dwBufferSize = cbBufSize; + } RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceLockStatusA((SC_RPC_HANDLE)hSCManager, - lpLockStatus, - cbBufSize, + lpStatusPtr, + dwBufferSize, pcbBytesNeeded); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -2334,10 +2348,10 @@ return FALSE; } - if (lpLockStatus->lpLockOwner != NULL) - { - lpLockStatus->lpLockOwner = - (LPSTR)((UINT_PTR)lpLockStatus + (UINT_PTR)lpLockStatus->lpLockOwner); + if (lpStatusPtr->lpLockOwner != NULL) + { + lpStatusPtr->lpLockOwner = + (LPSTR)((UINT_PTR)lpStatusPtr + (UINT_PTR)lpStatusPtr->lpLockOwner); } TRACE("QueryServiceLockStatusA() done\n"); @@ -2357,16 +2371,30 @@ DWORD cbBufSize, LPDWORD pcbBytesNeeded) { + QUERY_SERVICE_LOCK_STATUSW LockStatus; + LPQUERY_SERVICE_LOCK_STATUSW lpStatusPtr; + DWORD dwBufferSize; DWORD dwError; TRACE("QueryServiceLockStatusW() called\n"); + + if (lpLockStatus == NULL || cbBufSize < sizeof(QUERY_SERVICE_LOCK_STATUSW)) + { + lpStatusPtr = &LockStatus; + dwBufferSize = sizeof(QUERY_SERVICE_LOCK_STATUSW); + } + else + { + lpStatusPtr = lpLockStatus; + dwBufferSize = cbBufSize; + } RpcTryExcept { /* Call to services.exe using RPC */ dwError = RQueryServiceLockStatusW((SC_RPC_HANDLE)hSCManager, - lpLockStatus, - cbBufSize, + lpStatusPtr, + dwBufferSize, pcbBytesNeeded); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) @@ -2382,10 +2410,10 @@ return FALSE; } - if (lpLockStatus->lpLockOwner != NULL) - { - lpLockStatus->lpLockOwner = - (LPWSTR)((UINT_PTR)lpLockStatus + (UINT_PTR)lpLockStatus->lpLockOwner); + if (lpStatusPtr->lpLockOwner != NULL) + { + lpStatusPtr->lpLockOwner = + (LPWSTR)((UINT_PTR)lpStatusPtr + (UINT_PTR)lpStatusPtr->lpLockOwner); } TRACE("QueryServiceLockStatusW() done\n");

13 years, 4 months

[gadamopoulos] 53355: [win32k] - Add one more debug channel to trace EVERY message that is sent to user mode - Add some more traces here and there

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Aug 21 13:37:23 2011 New Revision: 53355 URL: http://svn.reactos.org/svn/reactos?rev=53355&view=rev Log: [win32k] - Add one more debug channel to trace EVERY message that is sent to user mode - Add some more traces here and there Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h [iso-8859-1] Sun Aug 21 13:37:23 2011 @@ -97,6 +97,7 @@ DbgChUserMisc, DbgChUserMonitor, DbgChUserMsg, + DbgChUserMsgCall, DbgChUserMsgQ, DbgChUserObj, DbgChUserPainting, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Sun Aug 21 13:37:23 2011 @@ -202,6 +202,8 @@ ResultLength = ArgumentLength; IntSetTebWndCallback (&Wnd, &pWnd); + + TRACE_CH(UserMsgCall,"hwnd:0x%x, msg:%d, wparam:%d, lparam:%d\n", Wnd, Message, wParam, lParam); UserLeaveCo(); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Sun Aug 21 13:37:23 2011 @@ -164,8 +164,9 @@ { if (hWndPrev) { + TRACE("sending WM_KILLFOCUS to hwnd 0x%x\n", hWndPrev); IntNotifyWinEvent(EVENT_OBJECT_FOCUS, NULL, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntPostOrSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); + co_IntSendMessage(hWndPrev, WM_KILLFOCUS, (WPARAM)hWnd, 0); } } @@ -176,7 +177,7 @@ { PWND pWnd = UserGetWindowObject(hWnd); IntNotifyWinEvent(EVENT_OBJECT_FOCUS, pWnd, OBJID_CLIENT, CHILDID_SELF, 0); - co_IntPostOrSendMessage(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0); + co_IntSendMessage(hWnd, WM_SETFOCUS, (WPARAM)hWndPrev, 0); } } @@ -402,13 +403,14 @@ return 0; } ThreadQueue->FocusWindow = Window->head.h; - TRACE("Focus: %d -> %d\n", hWndPrev, Window->head.h); + TRACE("Focus: 0x%x -> 0x%x\n", hWndPrev, Window->head.h); co_IntSendKillFocusMessages(hWndPrev, Window->head.h); co_IntSendSetFocusMessages(hWndPrev, Window->head.h); } else { + TRACE("Focus: 0x%x -> 0x%x\n", hWndPrev, 0); ThreadQueue->FocusWindow = 0; if (co_HOOK_CallHooks( WH_CBT, HCBT_SETFOCUS, (WPARAM)0, (LPARAM)hWndPrev)) { @@ -697,7 +699,7 @@ DECLARE_RETURN(HWND); HWND ret; - TRACE("Enter NtUserSetFocus(%x)\n", hWnd); + TRACE("Enter NtUserSetFocus(0x%x)\n", hWnd); UserEnterExclusive(); if (hWnd) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sun Aug 21 13:37:23 2011 @@ -1182,6 +1182,7 @@ if (!(Window = UserGetWindowObject(hWnd))) { + ERR("UserGetWindowObject filed!\n"); RETURN( FALSE); } @@ -1196,6 +1197,7 @@ { if (Win32Thread->TIF_flags & TIF_INCLEANUP) { + ERR("Trying to send message to a thread in cleanup\n"); /* Never send messages to exiting threads */ RETURN( FALSE); } Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [iso-8859-1] Sun Aug 21 13:37:23 2011 @@ -78,6 +78,7 @@ {L"UserMisc", DbgChUserMisc}, {L"UserMonitor", DbgChUserMonitor}, {L"UserMsg", DbgChUserMsg}, + {L"UserMsgCall", DbgChUserMsgCall}, {L"UserMsgQ", DbgChUserMsgQ}, {L"UserObj", DbgChUserObj}, {L"UserPainting", DbgChUserPainting},

13 years, 4 months

[gadamopoulos] 53354: [win32k] - Remove some unneeded and misleading debug prints when parsing debug channels - Switch NtUser to the new debug system

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Aug 21 12:38:52 2011 New Revision: 53354 URL: http://svn.reactos.org/svn/reactos?rev=53354&view=rev Log: [win32k] - Remove some unneeded and misleading debug prints when parsing debug channels - Switch NtUser to the new debug system Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h trunk/reactos/subsystems/win32/win32k/include/userfuncs.h trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/caret.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/display.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/prop.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/win32kdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/caret.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/guicheck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/useratom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… Modified: trunk/reactos/subsystems/win32/win32k/objects/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…

13 years, 4 months

[cgutman] 53353: - Enable some more prints in ACPI

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Aug 21 03:30:04 2011 New Revision: 53353 URL: http://svn.reactos.org/svn/reactos?rev=53353&view=rev Log: - Enable some more prints in ACPI Modified: trunk/reactos/drivers/bus/acpi/main.c Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Sun Aug 21 03:30:04 2011 @@ -9,7 +9,7 @@ #include <acpiioct.h> #include <poclass.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> NTSTATUS

13 years, 4 months

[cgutman] 53352: - Disable the PnP manager debugging again

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Aug 21 02:54:29 2011 New Revision: 53352 URL: http://svn.reactos.org/svn/reactos?rev=53352&view=rev Log: - Disable the PnP manager debugging again Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Aug 21 02:54:29 2011 @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Aug 21 02:54:29 2011 @@ -9,7 +9,7 @@ #include <ntoskrnl.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> static

13 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011