Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 53840: [FREELDR/SETUPLDR] * Add _dbg versions of freeldr_pe and setupldr_pe per Dmitry's request. They retain debug info, and they're compiled on-demand (not included in the normal build).
by akhaldi＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: akhaldi Date: Sat Sep 24 16:08:37 2011 New Revision: 53840 URL: http://svn.reactos.org/svn/reactos?rev=53840&view=rev Log: [FREELDR/SETUPLDR] * Add _dbg versions of freeldr_pe and setupldr_pe per Dmitry's request. They retain debug info, and they're compiled on-demand (not included in the normal build). Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sat Sep 24 16:08:37 2011 @@ -57,7 +57,6 @@ reactos/arcname.c reactos/archwsup.c reactos/binhive.c - ui/directui.c ui/gui.c ui/minitui.c @@ -72,8 +71,7 @@ windows/peloader.c windows/winldr.c windows/wlmemory.c - windows/wlregistry.c -) + windows/wlregistry.c) if(ARCH MATCHES i386) list(APPEND FREELDR_COMMON_SOURCE @@ -155,23 +153,30 @@ bootmgr.c # This file is compiled with custom definitions freeldr.c rtl/bget.c - rtl/libsupp.c -) + rtl/libsupp.c) add_executable(freeldr_pe ${FREELDR_BASE_SOURCE}) +add_executable(freeldr_pe_dbg EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE}) if(NOT MSVC) set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") + set_target_properties(freeldr_pe_dbg PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") else() set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") + set_target_properties(freeldr_pe_dbg PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION") endif() set_image_base(freeldr_pe 0x10000) set_subsystem(freeldr_pe native) set_entrypoint(freeldr_pe RealEntryPoint) +set_image_base(freeldr_pe_dbg 0x10000) +set_subsystem(freeldr_pe_dbg native) +set_entrypoint(freeldr_pe_dbg RealEntryPoint) + if(ARCH MATCHES i386) target_link_libraries(freeldr_pe mini_hal) + target_link_libraries(freeldr_pe_dbg mini_hal) endif() target_link_libraries(freeldr_pe @@ -182,8 +187,18 @@ rtl libcntpr) +target_link_libraries(freeldr_pe_dbg + freeldr_common + cportlib + rossym + cmlib + rtl + libcntpr) + add_pch(freeldr_pe include/freeldr.h) + add_dependencies(freeldr_pe asm) +add_dependencies(freeldr_pe_dbg asm) concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin @@ -204,19 +219,27 @@ endif() add_executable(setupldr_pe ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) +add_executable(setupldr_pe_dbg EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) if(NOT MSVC) set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") + set_target_properties(setupldr_pe_dbg PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") else() set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") + set_target_properties(setupldr_pe_dbg PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") endif() set_image_base(setupldr_pe 0x10000) set_subsystem(setupldr_pe native) set_entrypoint(setupldr_pe RealEntryPoint) +set_image_base(setupldr_pe_dbg 0x10000) +set_subsystem(setupldr_pe_dbg native) +set_entrypoint(setupldr_pe_dbg RealEntryPoint) + if(ARCH MATCHES i386) target_link_libraries(setupldr_pe mini_hal) + target_link_libraries(setupldr_pe_dbg mini_hal) endif() target_link_libraries(setupldr_pe @@ -227,7 +250,16 @@ rtl libcntpr) +target_link_libraries(setupldr_pe_dbg + freeldr_common + cportlib + rossym + cmlib + rtl + libcntpr) + add_dependencies(setupldr_pe asm) +add_dependencies(setupldr_pe_dbg asm) concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin @@ -237,4 +269,3 @@ add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) -

1 0

[tkreuzer] 53838: [NTOSKRNL] - Cleanup amd64 mm.h header - Call MiScanMemoryDescriptors earlier, since it doesn't depend on anything except the loader block. - MiComputeColorInformation() and the c...
by tkreuzer＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: tkreuzer Date: Sat Sep 24 14:22:13 2011 New Revision: 53838 URL: http://svn.reactos.org/svn/reactos?rev=53838&view=rev Log: [NTOSKRNL] - Cleanup amd64 mm.h header - Call MiScanMemoryDescriptors earlier, since it doesn't depend on anything except the loader block. - MiComputeColorInformation() and the calculation of the pfn database size are portable, so move them out of MiInitMachineDependent Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Sat Sep 24 14:22:13 2011 @@ -1,16 +1,10 @@ /* - * Lowlevel memory managment definitions + * kernel internal memory managment definitions for amd64 */ - #pragma once -#define _MI_PAGING_LEVELS 4 - -/* Helper macros */ -#define PAGE_MASK(x) ((x)&(~0xfff)) -#define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) - /* Memory layout base addresses */ +#define MI_LOWEST_VAD_ADDRESS (PVOID)0x000000007FF00000ULL #define MI_HIGHEST_USER_ADDRESS (PVOID)0x000007FFFFFEFFFFULL #define MI_USER_PROBE_ADDRESS (PVOID)0x000007FFFFFF0000ULL #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0xFFFF080000000000ULL @@ -28,128 +22,58 @@ #define MI_HIGHEST_SYSTEM_ADDRESS (PVOID)0xFFFFFFFFFFFFFFFFULL #define MI_SYSTEM_CACHE_WS_START (PVOID)0xFFFFF78000001000ULL // CHECKME -#define MI_LOWEST_VAD_ADDRESS (PVOID)0x000000007FF00000ULL - +#define MM_HIGHEST_USER_ADDRESS_WOW64 0x7FFEFFFF +#define MM_SYSTEM_RANGE_START_WOW64 0x80000000 + + +#define MI_SYSTEM_PTE_END (PVOID)((ULONG64)MI_SYSTEM_PTE_START + MI_NUMBER_SYSTEM_PTES * PAGE_SIZE - 1) #define MI_SYSTEM_PTE_BASE (PVOID)MiAddressToPte(KSEG0_BASE) +#define MM_HIGHEST_VAD_ADDRESS (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) +#define MI_MAPPING_RANGE_START (ULONG64)HYPER_SPACE +#define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + MI_HYPERSPACE_PTES * PAGE_SIZE) /* Memory sizes */ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) -#define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19*1024*1024) >> PAGE_SHIFT) -#define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32*1024*1024) >> PAGE_SHIFT) -#define MI_MAX_INIT_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) -#define MI_MAX_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) -#define MI_MAX_FREE_PAGE_LISTS 4 -#define MI_MIN_INIT_PAGED_POOLSIZE (32 * 1024 * 1024) -#define MI_SESSION_VIEW_SIZE (20 * 1024 * 1024) -#define MI_SESSION_POOL_SIZE (16 * 1024 * 1024) -#define MI_SESSION_IMAGE_SIZE (8 * 1024 * 1024) -#define MI_SESSION_WORKING_SET_SIZE (4 * 1024 * 1024) -#define MI_SESSION_SIZE (MI_SESSION_VIEW_SIZE + \ - MI_SESSION_POOL_SIZE + \ - MI_SESSION_IMAGE_SIZE + \ - MI_SESSION_WORKING_SET_SIZE) -#define MI_SYSTEM_VIEW_SIZE (16 * 1024 * 1024) -#define MI_NUMBER_SYSTEM_PTES 22000 - -#define MI_MIN_SECONDARY_COLORS 8 -#define MI_SECONDARY_COLORS 64 -#define MI_MAX_SECONDARY_COLORS 1024 - -#define MI_MIN_ALLOCATION_FRAGMENT (4 * _1KB) -#define MI_ALLOCATION_FRAGMENT (64 * _1KB) -#define MI_MAX_ALLOCATION_FRAGMENT (2 * _1MB) - -#define MM_HIGHEST_VAD_ADDRESS \ - (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) - -#define MM_HIGHEST_USER_ADDRESS_WOW64 0x7FFEFFFF -#define MM_SYSTEM_RANGE_START_WOW64 0x80000000 - -PULONG64 -FORCEINLINE -MmGetPageDirectory(VOID) -{ - return (PULONG64)__readcr3(); -} - -PMMPTE -FORCEINLINE -MiAddressToPxe(PVOID Address) -{ - ULONG64 Offset = (ULONG64)Address >> (PXI_SHIFT - 3); - Offset &= PXI_MASK << 3; - return (PMMPTE)(PXE_BASE + Offset); -} - -PMMPTE -FORCEINLINE -MiAddressToPpe(PVOID Address) -{ - ULONG64 Offset = (ULONG64)Address >> (PPI_SHIFT - 3); - Offset &= 0x3FFFF << 3; - return (PMMPTE)(PPE_BASE + Offset); -} - -PMMPTE -FORCEINLINE -_MiAddressToPde(PVOID Address) -{ - ULONG64 Offset = (ULONG64)Address >> (PDI_SHIFT - 3); - Offset &= 0x7FFFFFF << 3; - return (PMMPTE)(PDE_BASE + Offset); -} -#define MiAddressToPde(x) _MiAddressToPde((PVOID)(x)) - -PMMPTE -FORCEINLINE -_MiAddressToPte(PVOID Address) -{ - ULONG64 Offset = (ULONG64)Address >> (PTI_SHIFT - 3); - Offset &= 0xFFFFFFFFFULL << 3; - return (PMMPTE)(PTE_BASE + Offset); -} -#define MiAddressToPte(x) _MiAddressToPte((PVOID)(x)) - -ULONG -FORCEINLINE -MiAddressToPti(PVOID Address) -{ - return ((((ULONG64)Address) >> PTI_SHIFT) & 0x1FF); -} -#define MiAddressToPteOffset(x) MiAddressToPti(x) // FIXME: bad name - -ULONG -FORCEINLINE -MiAddressToPxi(PVOID Address) -{ - return ((((ULONG64)Address) >> PXI_SHIFT) & 0x1FF); -} - - -/* Convert a PTE into a corresponding address */ -PVOID -FORCEINLINE -MiPteToAddress(PMMPTE Pte) -{ - /* Use signed math */ - LONG64 Temp = (LONG64)Pte; - Temp <<= 25; - Temp >>= 16; - return (PVOID)Temp; -} -#define MiPdeToAddress MiPteToAddress - -BOOLEAN -FORCEINLINE -MiIsPdeForAddressValid(PVOID Address) -{ - return ((MiAddressToPxe(Address)->u.Hard.Valid) && - (MiAddressToPpe(Address)->u.Hard.Valid) && - (MiAddressToPde(Address)->u.Hard.Valid)); -} - -#define MiPdeToPte(PDE) ((PMMPTE)MiPteToAddress(PDE)) -#define MiPteToPde(PTE) ((PMMPDE)MiAddressToPte(PTE)) +#define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19*1024*1024) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32*1024*1024) >> PAGE_SHIFT) +#define MI_MIN_INIT_PAGED_POOLSIZE (32 * 1024 * 1024) +#define MI_MAX_INIT_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) +#define MI_MAX_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) +#define MI_SYSTEM_VIEW_SIZE (16 * 1024 * 1024) +#define MI_MIN_SECONDARY_COLORS 8 +#define MI_SECONDARY_COLORS 64 +#define MI_MAX_SECONDARY_COLORS 1024 +#define MI_MIN_ALLOCATION_FRAGMENT (4 * _1KB) +#define MI_ALLOCATION_FRAGMENT (64 * _1KB) +#define MI_MAX_ALLOCATION_FRAGMENT (2 * _1MB) +#define MI_SESSION_WORKING_SET_SIZE (4 * 1024 * 1024) +#define MI_SESSION_VIEW_SIZE (20 * 1024 * 1024) +#define MI_SESSION_POOL_SIZE (16 * 1024 * 1024) +#define MI_SESSION_IMAGE_SIZE (8 * 1024 * 1024) +#define MI_SESSION_SIZE (MI_SESSION_VIEW_SIZE + \ + MI_SESSION_POOL_SIZE + \ + MI_SESSION_IMAGE_SIZE + \ + MI_SESSION_WORKING_SET_SIZE) + +/* Misc constants */ +#define _MI_PAGING_LEVELS 4 +#define MI_NUMBER_SYSTEM_PTES 22000 +#define MI_MAX_FREE_PAGE_LISTS 4 +#define NR_SECTION_PAGE_TABLES 1024 +#define NR_SECTION_PAGE_ENTRIES 1024 +#define MI_HYPERSPACE_PTES (256 - 1) +#define MI_ZERO_PTES (32) +#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + PAGE_SIZE) +#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + PAGE_SIZE) +#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + PAGE_SIZE) +/* FIXME - different architectures have different cache line sizes... */ +#define MM_CACHE_LINE_SIZE 32 + +/* Helper macros */ +#define PAGE_MASK(x) ((x)&(~0xfff)) +#define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) +#define IS_ALIGNED(addr, align) (((ULONG64)(addr) & (align - 1)) == 0) +#define IS_PAGE_ALIGNED(addr) IS_ALIGNED(addr, PAGE_SIZE) #define ADDR_TO_PAGE_TABLE(v) ((ULONG)(((ULONG_PTR)(v)) / (512 * PAGE_SIZE))) #define ADDR_TO_PDE_OFFSET(v) ((ULONG)((((ULONG_PTR)(v)) / (512 * PAGE_SIZE)))) @@ -161,43 +85,6 @@ #define VAtoPPI(va) ((((ULONG64)va) >> PPI_SHIFT) & 0x1FF) #define VAtoPDI(va) ((((ULONG64)va) >> PDI_SHIFT) & 0x1FF) #define VAtoPTI(va) ((((ULONG64)va) >> PTI_SHIFT) & 0x1FF) - -FORCEINLINE -VOID -MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, - IN PMMPTE PointerPte) -{ - /* Store the Address */ - NewPte->u.Long = (ULONG64)PointerPte; - - /* Mark this as a prototype PTE */ - NewPte->u.Proto.Prototype = 1; - NewPte->u.Proto.Valid = 1; - NewPte->u.Proto.ReadOnly = 0; - NewPte->u.Proto.Protection = 0; -} - -/* Sign extend 48 bits */ -#define MiProtoPteToPte(x) \ - (PMMPTE)((LONG64)(x)->u.Proto.ProtoAddress) - -/* We don't use these hacks */ -VOID -FORCEINLINE -MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) -{ - /* Nothing to do */ -} - -VOID -FORCEINLINE -MmInitGlobalKernelPageDirectory(VOID) -{ - /* Nothing to do */ -} - -#define IS_ALIGNED(addr, align) (((ULONG64)(addr) & (align - 1)) == 0) -#define IS_PAGE_ALIGNED(addr) IS_ALIGNED(addr, PAGE_SIZE) /* Easy accessing PFN in PTE */ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) @@ -227,34 +114,123 @@ // FIXME!!! #define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \ ((x) / (4*1024*1024)) - #define PAGE_TO_SECTION_PAGE_TABLE_OFFSET(x) \ ((((x)) % (4*1024*1024)) / (4*1024)) -#define NR_SECTION_PAGE_TABLES 1024 -#define NR_SECTION_PAGE_ENTRIES 1024 - //#define TEB_BASE 0x7FFDE000 - -#define MI_HYPERSPACE_PTES (256 - 1) -#define MI_ZERO_PTES (32) -#define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE -#define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ - MI_HYPERSPACE_PTES * PAGE_SIZE) -#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ - PAGE_SIZE) -#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ - PAGE_SIZE) -#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ - PAGE_SIZE) - /* On x86, these two are the same */ #define MMPDE MMPTE #define PMMPDE PMMPTE -/* -* FIXME - different architectures have different cache line sizes... -*/ -#define MM_CACHE_LINE_SIZE 32 - +PULONG64 +FORCEINLINE +MmGetPageDirectory(VOID) +{ + return (PULONG64)__readcr3(); +} + +PMMPTE +FORCEINLINE +MiAddressToPxe(PVOID Address) +{ + ULONG64 Offset = (ULONG64)Address >> (PXI_SHIFT - 3); + Offset &= PXI_MASK << 3; + return (PMMPTE)(PXE_BASE + Offset); +} + +PMMPTE +FORCEINLINE +MiAddressToPpe(PVOID Address) +{ + ULONG64 Offset = (ULONG64)Address >> (PPI_SHIFT - 3); + Offset &= 0x3FFFF << 3; + return (PMMPTE)(PPE_BASE + Offset); +} + +PMMPTE +FORCEINLINE +_MiAddressToPde(PVOID Address) +{ + ULONG64 Offset = (ULONG64)Address >> (PDI_SHIFT - 3); + Offset &= 0x7FFFFFF << 3; + return (PMMPTE)(PDE_BASE + Offset); +} +#define MiAddressToPde(x) _MiAddressToPde((PVOID)(x)) + +PMMPTE +FORCEINLINE +_MiAddressToPte(PVOID Address) +{ + ULONG64 Offset = (ULONG64)Address >> (PTI_SHIFT - 3); + Offset &= 0xFFFFFFFFFULL << 3; + return (PMMPTE)(PTE_BASE + Offset); +} +#define MiAddressToPte(x) _MiAddressToPte((PVOID)(x)) + +ULONG +FORCEINLINE +MiAddressToPti(PVOID Address) +{ + return ((((ULONG64)Address) >> PTI_SHIFT) & 0x1FF); +} +#define MiAddressToPteOffset(x) MiAddressToPti(x) // FIXME: bad name + +ULONG +FORCEINLINE +MiAddressToPxi(PVOID Address) +{ + return ((((ULONG64)Address) >> PXI_SHIFT) & 0x1FF); +} + + +/* Convert a PTE into a corresponding address */ +PVOID +FORCEINLINE +MiPteToAddress(PMMPTE Pte) +{ + /* Use signed math */ + LONG64 Temp = (LONG64)Pte; + Temp <<= 25; + Temp >>= 16; + return (PVOID)Temp; +} +#define MiPdeToAddress MiPteToAddress + +BOOLEAN +FORCEINLINE +MiIsPdeForAddressValid(PVOID Address) +{ + return ((MiAddressToPxe(Address)->u.Hard.Valid) && + (MiAddressToPpe(Address)->u.Hard.Valid) && + (MiAddressToPde(Address)->u.Hard.Valid)); +} + +#define MiPdeToPte(PDE) ((PMMPTE)MiPteToAddress(PDE)) +#define MiPteToPde(PTE) ((PMMPDE)MiAddressToPte(PTE)) + +FORCEINLINE +VOID +MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, + IN PMMPTE PointerPte) +{ + /* Store the Address */ + NewPte->u.Long = (ULONG64)PointerPte; + + /* Mark this as a prototype PTE */ + NewPte->u.Proto.Prototype = 1; + NewPte->u.Proto.Valid = 1; + NewPte->u.Proto.ReadOnly = 0; + NewPte->u.Proto.Protection = 0; +} + +/* Sign extend 48 bits */ +#define MiProtoPteToPte(x) (PMMPTE)((LONG64)(x)->u.Proto.ProtoAddress) + +VOID +FORCEINLINE +MmInitGlobalKernelPageDirectory(VOID) +{ + /* Nothing to do */ +} + Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Sep 24 14:22:13 2011 @@ -265,27 +265,6 @@ /* Compute non paged pool limits and size */ MiComputeNonPagedPoolVa(MiNumberOfFreePages); - /* Compute color information (L2 cache-separated paging lists) */ - MiComputeColorInformation(); - - // - // Calculate the number of bytes for the PFN database - // then add the color tables and convert to pages - // - MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); - MxPfnAllocation += (MmSecondaryColors * sizeof(MMCOLOR_TABLES) * 2); - MxPfnAllocation >>= PAGE_SHIFT; - - // - // We have to add one to the count here, because in the process of - // shifting down to the page size, we actually ended up getting the - // lower aligned size (so say, 0x5FFFF bytes is now 0x5F pages). - // Later on, we'll shift this number back into bytes, which would cause - // us to end up with only 0x5F000 bytes -- when we actually want to have - // 0x60000 bytes. - // - MxPfnAllocation++; - // // Now calculate the nonpaged pool expansion VA region // Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sat Sep 24 14:22:13 2011 @@ -1884,6 +1884,9 @@ IncludeType[LoaderBBTMemory] = FALSE; if (Phase == 0) { + /* Count physical pages on the system */ + MiScanMemoryDescriptors(LoaderBlock); + /* Initialize the phase 0 temporary event */ KeInitializeEvent(&MiTempEvent, NotificationEvent, FALSE); @@ -1939,14 +1942,9 @@ MmZeroingPageThreadActive = FALSE; // - // Count physical pages on the system - // - MiScanMemoryDescriptors(LoaderBlock); + // Check if this is a machine with less than 19MB of RAM + // PageCount = MmNumberOfPhysicalPages; - - // - // Check if this is a machine with less than 19MB of RAM - // if (PageCount < MI_MIN_PAGES_FOR_SYSPTE_TUNING) { // @@ -2031,6 +2029,23 @@ /* Make sure it's not too low */ if (MmLargeStackSize < KERNEL_STACK_SIZE) MmLargeStackSize = KERNEL_STACK_SIZE; } + + /* Compute color information (L2 cache-separated paging lists) */ + MiComputeColorInformation(); + + // Calculate the number of bytes for the PFN database + // then add the color tables and convert to pages + MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); + MxPfnAllocation += (MmSecondaryColors * sizeof(MMCOLOR_TABLES) * 2); + MxPfnAllocation >>= PAGE_SHIFT; + + // We have to add one to the count here, because in the process of + // shifting down to the page size, we actually ended up getting the + // lower aligned size (so say, 0x5FFFF bytes is now 0x5F pages). + // Later on, we'll shift this number back into bytes, which would cause + // us to end up with only 0x5F000 bytes -- when we actually want to have + // 0x60000 bytes. + MxPfnAllocation++; /* Initialize the platform-specific parts */ MiInitMachineDependent(LoaderBlock);

1 0

[dgorbachev] 53837: [FREELDR] Compare with constants of right type.
by dgorbachev＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: dgorbachev Date: Sat Sep 24 13:39:14 2011 New Revision: 53837 URL: http://svn.reactos.org/svn/reactos?rev=53837&view=rev Log: [FREELDR] Compare with constants of right type. Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c [iso-8859-1] Sat Sep 24 13:39:14 2011 @@ -255,7 +255,8 @@ // // Yes, remember it if this is real memory // - if (MemoryDescriptor->MemoryType == LoaderFree) MmHighestPhysicalPage = MemoryDescriptor->BasePage + MemoryDescriptor->PageCount; + if (MemoryDescriptor->MemoryType == MemoryFree) + MmHighestPhysicalPage = MemoryDescriptor->BasePage + MemoryDescriptor->PageCount; } // @@ -292,7 +293,7 @@ while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL) { // Continue, if memory is not free - if (MemoryDescriptor->MemoryType != LoaderFree) continue; + if (MemoryDescriptor->MemoryType != MemoryFree) continue; // Continue, if the block is not big enough? if (MemoryDescriptor->PageCount < PageLookupTablePages) continue;

1 0

[dgorbachev] 53836: [User32] Check return value of DIB_GetBitmapInfo.
by dgorbachev＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: dgorbachev Date: Sat Sep 24 13:37:24 2011 New Revision: 53836 URL: http://svn.reactos.org/svn/reactos?rev=53836&view=rev Log: [User32] Check return value of DIB_GetBitmapInfo. Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c Modified: trunk/reactos/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/cursoricon.c [iso-8859-1] Sat Sep 24 13:37:24 2011 @@ -1703,13 +1703,13 @@ else new_height = height; - if(bm_type == 0) + if (bm_type == 0) { BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)&scaled_info->bmiHeader; core->bcWidth = new_width; core->bcHeight = new_height; } - else + else if (bm_type == 1) { /* Some sanity checks for BITMAPINFO (not applicable to BITMAPCOREINFO) */ if (info->bmiHeader.biHeight > 65535 || info->bmiHeader.biWidth > 65535) { @@ -1720,6 +1720,8 @@ scaled_info->bmiHeader.biWidth = new_width; scaled_info->bmiHeader.biHeight = new_height; } + else + goto end; if (new_height < 0) new_height = -new_height;

1 0

[gadamopoulos] 53835: [user32_apitest] - Add one more small test for WM_SYSTIMER
by gadamopoulos＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: gadamopoulos Date: Sat Sep 24 12:22:21 2011 New Revision: 53835 URL: http://svn.reactos.org/svn/reactos?rev=53835&view=rev Log: [user32_apitest] - Add one more small test for WM_SYSTIMER Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous… ============================================================================== --- trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Sat Sep 24 12:22:21 2011 @@ -43,6 +43,9 @@ case WM_IME_NOTIFY : case WM_GETICON : case WM_GETTEXT: + break; + case WM_SYSTIMER: + ok(0, "Got unexpected WM_SYSTIMER in the winproc. wParam=%d\n", wParam); break; default: record_message(iwnd, message, SENT, 0,0);

1 0

[khornicek] 53834: another try to fix cmake build
by khornicek＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: khornicek Date: Sat Sep 24 12:16:04 2011 New Revision: 53834 URL: http://svn.reactos.org/svn/reactos?rev=53834&view=rev Log: another try to fix cmake build Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… ============================================================================== --- trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/CMakeLists.txt [iso-8859-1] Sat Sep 24 12:16:04 2011 @@ -41,7 +41,7 @@ uniqueid.c diskpart.rc) -set_module_type(diskpart win32cui) +set_module_type(diskpart win32cui UNICODE) add_importlibs(diskpart user32 msvcrt kernel32) if(MSVC) add_importlibs(diskpart ntdll)

1 0

[cgutman] 53833: [ACPI] - Reduce debug spam - Report critical initialization failure
by cgutman＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: cgutman Date: Sat Sep 24 12:05:43 2011 New Revision: 53833 URL: http://svn.reactos.org/svn/reactos?rev=53833&view=rev Log: [ACPI] - Reduce debug spam - Report critical initialization failure Modified: trunk/reactos/drivers/bus/acpi/pnp.c Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Sat Sep 24 12:05:43 2011 @@ -47,7 +47,7 @@ if (commonData->IsFDO) { - DPRINT1("FDO %s IRP:0x%p\n", + DPRINT("FDO %s IRP:0x%p\n", PnPMinorFunctionString(irpStack->MinorFunction), Irp); // @@ -59,7 +59,7 @@ irpStack, (PFDO_DEVICE_DATA) commonData); } else { - DPRINT1("PDO %s IRP: 0x%p\n", + DPRINT("PDO %s IRP: 0x%p\n", PnPMinorFunctionString(irpStack->MinorFunction), Irp); // @@ -312,7 +312,7 @@ /* Initialize ACPI bus manager */ AcpiStatus = acpi_init(); if (!ACPI_SUCCESS(AcpiStatus)) { - DPRINT("acpi_init() failed with status 0x%X\n", AcpiStatus); + DPRINT1("acpi_init() failed with status 0x%X\n", AcpiStatus); AcpiTerminate(); return STATUS_UNSUCCESSFUL; }

1 0

[gadamopoulos] 53832: [user32_apitest.exe] - Fix gcc build
by gadamopoulos＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: gadamopoulos Date: Sat Sep 24 12:05:14 2011 New Revision: 53832 URL: http://svn.reactos.org/svn/reactos?rev=53832&view=rev Log: [user32_apitest.exe] - Fix gcc build Modified: trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/user32/helper.h Modified: trunk/rostests/apitests/user32/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.c [iso-8859-1] Sat Sep 24 12:05:14 2011 @@ -93,6 +93,8 @@ msgName = NULL; msgType = "event"; break; + default: + return; } if(msgName) Modified: trunk/rostests/apitests/user32/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.h?… ============================================================================== --- trunk/rostests/apitests/user32/helper.h [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.h [iso-8859-1] Sat Sep 24 12:05:14 2011 @@ -23,7 +23,7 @@ ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName); /* filter messages that are affected by dwm */ -static _inline BOOL IsDWmMsg(UINT msg) +static inline BOOL IsDWmMsg(UINT msg) { switch(msg) { @@ -36,7 +36,7 @@ return FALSE; } -static _inline BOOL IseKeyMsg(UINT msg) +static inline BOOL IseKeyMsg(UINT msg) { return (msg == WM_KEYUP || msg == WM_KEYDOWN); }

1 0

[cgutman] 53831: [HAL] - Report table lookup failures - Report supported ACPI version
by cgutman＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: cgutman Date: Sat Sep 24 12:01:48 2011 New Revision: 53831 URL: http://svn.reactos.org/svn/reactos?rev=53831&view=rev Log: [HAL] - Report table lookup failures - Report supported ACPI version Modified: trunk/reactos/hal/halx86/acpi/halacpi.c Modified: trunk/reactos/hal/halx86/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halacpi.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] Sat Sep 24 12:01:48 2011 @@ -332,6 +332,12 @@ /* Using Mm */ MmUnmapIoSpace(Header, 2 * PAGE_SIZE); } + + DPRINT1("Failed to find ACPI table %c%c%c%c\n", + (Signature & 0xFF), + (Signature & 0xFF00) >> 8, + (Signature & 0xFF0000) >> 16, + (Signature & 0xFF000000) >> 24); /* Didn't find anything */ return NULL; @@ -386,7 +392,15 @@ } /* The correct checksum is always 0, anything else is illegal */ - if (CheckSum) HalpInvalidAcpiTable = Header->Signature; + if (CheckSum) + { + HalpInvalidAcpiTable = Header->Signature; + DPRINT1("Checksum failed on ACPI table %c%c%c%c\n", + (Signature & 0xFF), + (Signature & 0xFF00) >> 8, + (Signature & 0xFF0000) >> 16, + (Signature & 0xFF000000) >> 24); + } } /* Return the table */ @@ -755,6 +769,8 @@ } } + DPRINT1("ACPI %d.0 detected\n", (Rsdt->Header.Revision + 1)); + /* Done */ return Status; }

1 0

[gadamopoulos] 53830: [user32_apitest] - Implement logging post messages or winevents - For SetActiveWindow test, also test the parameters of WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED messages -...
by gadamopoulos＠svn.reactos.org 24 Sep '11

24 Sep '11

Author: gadamopoulos Date: Sat Sep 24 11:55:19 2011 New Revision: 53830 URL: http://svn.reactos.org/svn/reactos?rev=53830&view=rev Log: [user32_apitest] - Implement logging post messages or winevents - For SetActiveWindow test, also test the parameters of WM_WINDOWPOSCHANGING and WM_WINDOWPOSCHANGED messages - For TrackMouseEvent test, also test the WM_SYSTIMER that is possible to be logged now Modified: trunk/rostests/apitests/user32/SetActiveWindow.c trunk/rostests/apitests/user32/TrackMouseEvent.c trunk/rostests/apitests/user32/helper.c trunk/rostests/apitests/user32/helper.h Modified: trunk/rostests/apitests/user32/SetActiveWindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetActive… ============================================================================== --- trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetActiveWindow.c [iso-8859-1] Sat Sep 24 11:55:19 2011 @@ -9,10 +9,12 @@ #include <wine/test.h> #include <windows.h> #include "helper.h" +#include <undocuser.h> MSG_ENTRY message_cache[100]; HWND hWnd1, hWnd2, hWnd3, hWnd4; +/* FIXME: test for HWND_TOP, etc...*/ static int get_iwnd(HWND hWnd) { if(hWnd == hWnd1) return 1; @@ -24,24 +26,43 @@ LRESULT CALLBACK OwnerTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - if(message < WM_USER && - message != WM_IME_SETCONTEXT && - message != WM_IME_NOTIFY && - message != WM_KEYUP && - message != WM_GETICON && - message != WM_GETTEXT && /* the following messages have to be ignroed because dwm changes the time they are sent */ - message != WM_NCPAINT && - message != WM_ERASEBKGND && - message != WM_PAINT && - message != 0x031f /*WM_DWMNCRENDERINGCHANGED*/) + int iwnd = get_iwnd(hWnd); + + if(message > WM_USER || !iwnd || IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProc(hWnd, message, wParam, lParam); + + switch(message) { - int iwnd; - iwnd = get_iwnd(hWnd); - if(iwnd) - record_message(iwnd, message, FALSE, 0,0); + case WM_IME_SETCONTEXT: + case WM_IME_NOTIFY : + case WM_GETICON : + case WM_GETTEXT: + break; + case WM_WINDOWPOSCHANGING: + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS* pwp = (WINDOWPOS*)lParam; + ok(wParam==0,"expected wParam=0\n"); + record_message(iwnd, message, SENT, get_iwnd(pwp->hwndInsertAfter), pwp->flags); + break; + } + default: + record_message(iwnd, message, SENT, 0,0); } - return DefWindowProc(hWnd, message, wParam, lParam); +} + +static void FlushMessages() +{ + MSG msg; + + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + int iwnd = get_iwnd(msg.hwnd); + if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + record_message(iwnd, msg.message, POST,0,0); + DispatchMessageA( &msg ); + } } static void create_test_windows() @@ -58,17 +79,15 @@ hWnd4 = CreateWindowW(L"ownertest", L"ownertest", WS_OVERLAPPEDWINDOW, 250, 250, 200, 200, hWnd1, NULL, 0, NULL); - - trace("1:%p, 2:%p, 3:%p,4:%p\n", hWnd1, hWnd2, hWnd3, hWnd4); } /* the actual test begins here */ MSG_ENTRY Activate1_chain[]={{4,WM_NCACTIVATE}, {4,WM_ACTIVATE}, - {4,WM_WINDOWPOSCHANGING}, - {2,WM_WINDOWPOSCHANGING}, - {1,WM_WINDOWPOSCHANGING}, + {4,WM_WINDOWPOSCHANGING,SENT,0,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {2,WM_WINDOWPOSCHANGING,SENT,4,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {1,WM_WINDOWPOSCHANGING,SENT,2,SWP_NOMOVE | SWP_NOSIZE}, {1,WM_NCACTIVATE}, {1,WM_ACTIVATE}, {4,WM_KILLFOCUS}, @@ -77,8 +96,8 @@ MSG_ENTRY Activate2_chain[]={{1,WM_NCACTIVATE}, {1,WM_ACTIVATE}, - {3,WM_WINDOWPOSCHANGING}, - {3,WM_WINDOWPOSCHANGED}, + {3,WM_WINDOWPOSCHANGING,SENT, 0, SWP_NOMOVE | SWP_NOSIZE}, + {3,WM_WINDOWPOSCHANGED ,SENT, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, {3,WM_NCACTIVATE}, {3,WM_ACTIVATE}, {1,WM_KILLFOCUS}, @@ -87,23 +106,23 @@ MSG_ENTRY Activate3_chain[]={{3,WM_NCACTIVATE}, {3,WM_ACTIVATE}, - {2,WM_WINDOWPOSCHANGING}, - {4,WM_WINDOWPOSCHANGING}, - {1,WM_WINDOWPOSCHANGING}, - {2,WM_WINDOWPOSCHANGED}, - {4,WM_WINDOWPOSCHANGED}, - {1,WM_WINDOWPOSCHANGED}, + {2,WM_WINDOWPOSCHANGING, SENT,0, SWP_NOMOVE | SWP_NOSIZE }, + {4,WM_WINDOWPOSCHANGING, SENT,2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {1,WM_WINDOWPOSCHANGING, SENT,4, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {2,WM_WINDOWPOSCHANGED, SENT,0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOCLIENTMOVE |SWP_NOCLIENTSIZE }, + {4,WM_WINDOWPOSCHANGED, SENT,2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, + {1,WM_WINDOWPOSCHANGED, SENT,4, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |SWP_NOCLIENTMOVE|SWP_NOCLIENTSIZE}, {2,WM_NCACTIVATE}, {2,WM_ACTIVATE}, {3,WM_KILLFOCUS}, {2,WM_SETFOCUS}, {0,0}}; -MSG_ENTRY Activate4_chain[]={{2,WM_NCACTIVATE}, +MSG_ENTRY Activate4_chain[]={{2,WM_NCACTIVATE, }, {2,WM_ACTIVATE}, - {2,WM_WINDOWPOSCHANGING}, - {4,WM_WINDOWPOSCHANGING}, - {1,WM_WINDOWPOSCHANGING}, + {2,WM_WINDOWPOSCHANGING, SENT ,0 ,SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE}, + {4,WM_WINDOWPOSCHANGING, SENT, 2, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE} , + {1,WM_WINDOWPOSCHANGING, SENT, 4, SWP_NOMOVE | SWP_NOSIZE}, {1,WM_NCACTIVATE}, {1,WM_ACTIVATE}, {2,WM_KILLFOCUS}, @@ -112,34 +131,32 @@ void Test_SetActiveWindow() { - MSG msg; - SetCursorPos(0,0); create_test_windows(); ShowWindow(hWnd1, SW_SHOW); UpdateWindow(hWnd1); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_NEXT(hWnd4,hWnd2); EXPECT_NEXT(hWnd1,hWnd3); ShowWindow(hWnd2, SW_SHOW); UpdateWindow(hWnd2); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_NEXT(hWnd2,hWnd4); EXPECT_NEXT(hWnd4,hWnd1); ShowWindow(hWnd3, SW_SHOW); UpdateWindow(hWnd3); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_NEXT(hWnd3,hWnd2); EXPECT_NEXT(hWnd2,hWnd4); EXPECT_NEXT(hWnd4,hWnd1); ShowWindow(hWnd4, SW_SHOW); UpdateWindow(hWnd4); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_NEXT(hWnd4,hWnd2); EXPECT_NEXT(hWnd2,hWnd1); EXPECT_NEXT(hWnd1,hWnd3); @@ -148,7 +165,7 @@ empty_message_cache(); SetActiveWindow(hWnd1); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_NEXT(hWnd4,hWnd2); EXPECT_NEXT(hWnd2,hWnd1); EXPECT_NEXT(hWnd1,hWnd3); @@ -156,7 +173,7 @@ COMPARE_CACHE(Activate1_chain); SetActiveWindow(hWnd3); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_NEXT(hWnd3,hWnd4); EXPECT_NEXT(hWnd4,hWnd2); EXPECT_NEXT(hWnd2,hWnd1); @@ -164,7 +181,7 @@ COMPARE_CACHE(Activate2_chain); SetActiveWindow(hWnd2); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_NEXT(hWnd2,hWnd4); EXPECT_NEXT(hWnd4,hWnd1); EXPECT_NEXT(hWnd1,hWnd3); @@ -172,7 +189,7 @@ COMPARE_CACHE(Activate3_chain); SetActiveWindow(hWnd1); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_NEXT(hWnd2,hWnd4); EXPECT_NEXT(hWnd4,hWnd1); EXPECT_NEXT(hWnd1,hWnd3); Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/TrackMous… ============================================================================== --- trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/TrackMouseEvent.c [iso-8859-1] Sat Sep 24 11:55:19 2011 @@ -9,6 +9,7 @@ #include <wine/test.h> #include <windows.h> #include "helper.h" +#include <undocuser.h> HWND hWnd1, hWnd2, hWnd3; HHOOK hMouseHookLL, hMouseHook; @@ -23,21 +24,7 @@ LRESULT CALLBACK TmeTestProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - if(message < WM_USER && - message != WM_IME_SETCONTEXT && - message != WM_IME_NOTIFY && - message != WM_KEYUP && - message != WM_GETICON && - message != WM_GETTEXT && /* the following messages have to be ignroed because dwm changes the time they are sent */ - message != WM_NCPAINT && - message != WM_ERASEBKGND && - message != WM_PAINT && - message != 0x031f /*WM_DWMNCRENDERINGCHANGED*/) - { - int iwnd = get_iwnd(hWnd); - if(iwnd) - record_message(iwnd, message, FALSE,0,0); - } + int iwnd = get_iwnd(hWnd); if(message == WM_PAINT) { @@ -46,21 +33,52 @@ Rectangle(ps.hdc, ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom); EndPaint(hWnd, &ps); } - + + if(message > WM_USER || !iwnd || IsDWmMsg(message) || IseKeyMsg(message)) + return DefWindowProc(hWnd, message, wParam, lParam); + + switch(message) + { + case WM_IME_SETCONTEXT: + case WM_IME_NOTIFY : + case WM_GETICON : + case WM_GETTEXT: + break; + default: + record_message(iwnd, message, SENT, 0,0); + } return DefWindowProc(hWnd, message, wParam, lParam); } static LRESULT CALLBACK MouseLLHookProc(int nCode, WPARAM wParam, LPARAM lParam) { - record_message(0, WH_MOUSE_LL, TRUE, wParam, 0); + record_message(0, WH_MOUSE_LL, HOOK, wParam, 0); return CallNextHookEx(hMouseHookLL, nCode, wParam, lParam); } static LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) { MOUSEHOOKSTRUCT *hs = (MOUSEHOOKSTRUCT*) lParam; - record_message(get_iwnd(hs->hwnd), WH_MOUSE, TRUE, wParam, hs->wHitTestCode); + record_message(get_iwnd(hs->hwnd), WH_MOUSE, HOOK, wParam, hs->wHitTestCode); return CallNextHookEx(hMouseHook, nCode, wParam, lParam); +} + +static void FlushMessages() +{ + MSG msg; + + while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) + { + int iwnd = get_iwnd(msg.hwnd); + if(iwnd) + { + if(msg.message == WM_SYSTIMER) + record_message(iwnd, msg.message, POST,msg.wParam,0); + else if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) + record_message(iwnd, msg.message, POST,0,0); + } + DispatchMessageA( &msg ); + } } static void create_test_windows() @@ -114,73 +132,63 @@ return tme.dwFlags; } -#define FLUSH_MESSAGES(msg) while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); #define EXPECT_TME_FLAGS(hWnd, expected) \ { DWORD flags = TmeQuery(hWnd); \ ok(flags == (expected),"wrong tme flags. expected %li, and got %li\n", (DWORD)(expected), flags); \ } -#define EXPECT_QUEUE_STATUS(expected, notexpected) \ - { \ - DWORD status = HIWORD(GetQueueStatus(QS_ALLEVENTS)); \ - ok(((status) & (expected))== (expected),"wrong queue status. expected %li, and got %li\n", (DWORD)(expected), status); \ - if(notexpected) \ - ok((status & (notexpected))!=(notexpected), "wrong queue status. got non expected %li\n", (DWORD)(notexpected)); \ - } - MSG_ENTRY empty_chain[]= {{0,0}}; /* the mouse moves over hwnd2 */ MSG_ENTRY mousemove2_chain[]={{2, WM_NCHITTEST}, - {2, WH_MOUSE,1, WM_MOUSEMOVE, HTCLIENT}, + {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, {2, WM_SETCURSOR}, {1, WM_SETCURSOR}, - {2, WM_MOUSEMOVE}, + {2, WM_MOUSEMOVE, POST}, {0,0}}; /* the mouse hovers hwnd2 */ MSG_ENTRY mousehover2_chain[]={{2, WM_NCHITTEST}, - {2, WH_MOUSE,1, WM_MOUSEMOVE, HTCLIENT}, + {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, {2, WM_SETCURSOR}, {1, WM_SETCURSOR}, - {2, WM_MOUSEMOVE}, - {2, WM_MOUSEHOVER}, + {2, WM_MOUSEMOVE, POST}, + {2, WM_SYSTIMER, POST, ID_TME_TIMER}, + {2, WM_MOUSEHOVER, POST}, {0,0}}; /* the mouse leaves hwnd2 and moves to hwnd1 */ MSG_ENTRY mouseleave2to1_chain[]={{1, WM_NCHITTEST}, - {1, WH_MOUSE,1, WM_MOUSEMOVE, HTCLIENT}, + {1, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, {1, WM_SETCURSOR}, - {1, WM_MOUSEMOVE}, - {2, WM_MOUSELEAVE}, + {1, WM_MOUSEMOVE, POST}, + {2, WM_MOUSELEAVE, POST}, {0,0}}; /* the mouse leaves hwnd2 and moves to hwnd3 */ MSG_ENTRY mouseleave2to3_chain[]={{3, WM_NCHITTEST}, - {3, WH_MOUSE,1, WM_MOUSEMOVE, HTCLIENT}, + {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, {3, WM_SETCURSOR}, {1, WM_SETCURSOR}, - {3, WM_MOUSEMOVE}, - {2, WM_MOUSELEAVE}, + {3, WM_MOUSEMOVE, POST}, + {2, WM_MOUSELEAVE, POST}, {0,0}}; void Test_TrackMouseEvent() { - MSG msg; - SetCursorPos(0,0); create_test_windows(); - FLUSH_MESSAGES(msg); + FlushMessages(); empty_message_cache(); /* the mouse moves over hwnd2 */ SetCursorPos(220,220); - FLUSH_MESSAGES(msg); + FlushMessages(); COMPARE_CACHE(mousemove2_chain); EXPECT_TME_FLAGS(hWnd2, 0); TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); - FLUSH_MESSAGES(msg); + FlushMessages(); COMPARE_CACHE(empty_chain); /* the mouse hovers hwnd2 */ @@ -188,7 +196,7 @@ Sleep(100); EXPECT_QUEUE_STATUS(QS_TIMER|QS_MOUSEMOVE, 0); EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_TME_FLAGS(hWnd2, TME_LEAVE); COMPARE_CACHE(mousehover2_chain); @@ -196,17 +204,17 @@ SetCursorPos(150,150); EXPECT_QUEUE_STATUS(QS_MOUSEMOVE,QS_TIMER ); EXPECT_TME_FLAGS(hWnd2, TME_LEAVE); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_TME_FLAGS(hWnd2, 0); COMPARE_CACHE(mouseleave2to1_chain); - FLUSH_MESSAGES(msg); + FlushMessages(); COMPARE_CACHE(empty_chain); /* the mouse moves over hwnd2 */ SetCursorPos(220,220); EXPECT_QUEUE_STATUS(QS_MOUSEMOVE, QS_TIMER); - FLUSH_MESSAGES(msg); + FlushMessages(); COMPARE_CACHE(mousemove2_chain); EXPECT_TME_FLAGS(hWnd2, 0); COMPARE_CACHE(empty_chain); @@ -215,31 +223,31 @@ TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); EXPECT_QUEUE_STATUS(0, QS_TIMER|QS_MOUSEMOVE); - FLUSH_MESSAGES(msg); - COMPARE_CACHE(empty_chain); - EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); - - FLUSH_MESSAGES(msg); + FlushMessages(); + COMPARE_CACHE(empty_chain); + EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); + + FlushMessages(); COMPARE_CACHE(empty_chain); /* the mouse moves from hwnd2 to the intersection of hwnd2 and hwnd3 */ SetCursorPos(300,300); EXPECT_QUEUE_STATUS(QS_MOUSEMOVE, QS_TIMER); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); COMPARE_CACHE(mousemove2_chain); - FLUSH_MESSAGES(msg); + FlushMessages(); COMPARE_CACHE(empty_chain); /* the mouse moves from hwnd2 to hwnd3 */ SetCursorPos(400,400); EXPECT_QUEUE_STATUS(QS_MOUSEMOVE, QS_TIMER); - FLUSH_MESSAGES(msg); + FlushMessages(); EXPECT_TME_FLAGS(hWnd2, 0); COMPARE_CACHE(mouseleave2to3_chain); - FLUSH_MESSAGES(msg); + FlushMessages(); COMPARE_CACHE(empty_chain); } Modified: trunk/rostests/apitests/user32/helper.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.c?… ============================================================================== --- trunk/rostests/apitests/user32/helper.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.c [iso-8859-1] Sat Sep 24 11:55:19 2011 @@ -9,7 +9,9 @@ #include <wine/test.h> #include <windows.h> #include "helper.h" - +#include <undocuser.h> + +MSG_ENTRY last_post_message; MSG_ENTRY message_cache[100]; static int message_cache_size = 0; @@ -38,6 +40,7 @@ case WM_NCHITTEST: return "WM_NCHITTEST"; case WM_SETCURSOR: return "WM_SETCURSOR"; case WM_MOUSEMOVE: return "WM_MOUSEMOVE"; + case WM_SYSTIMER: return "WM_SYSTIMER"; default: return NULL; } } @@ -56,6 +59,7 @@ void empty_message_cache() { + memset(&last_post_message, 0, sizeof(last_post_message)); memset(message_cache, 0, sizeof(message_cache)); message_cache_size = 0; } @@ -68,8 +72,29 @@ } else { - char* msgName = msg->hook ? get_hook_name(msg->msg) : get_msg_name(msg->msg); - char* msgType = msg->hook ? "hook" : "msg"; + char* msgName; + char* msgType; + + switch (msg->type) + { + case POST: + msgName = get_msg_name(msg->msg); + msgType = "post msg"; + break; + case SENT: + msgName = get_msg_name(msg->msg); + msgType = "sent msg"; + break; + case HOOK: + msgName = get_hook_name(msg->msg); + msgType = "hook"; + break; + case EVENT: + msgName = NULL; + msgType = "event"; + break; + } + if(msgName) sprintf(buffer, "hwnd%d %s %s %d %d", msg->iwnd, msgType, msgName, msg->param1, msg->param2); else @@ -126,18 +151,39 @@ empty_message_cache(); } -void record_message(int iwnd, UINT message, BOOL hook, int param1,int param2) +void record_message(int iwnd, UINT message, MSG_TYPE type, int param1,int param2) { if(message_cache_size>=100) { + return; + } + + /* do not report a post message a second time */ + if(type == SENT && + last_post_message.iwnd == iwnd && + last_post_message.msg == message && + last_post_message.param1 == param1 && + last_post_message.param2 == param2) + { + memset(&last_post_message, 0, sizeof(last_post_message)); return; } message_cache[message_cache_size].iwnd = iwnd; message_cache[message_cache_size].msg = message; - message_cache[message_cache_size].hook = hook; + message_cache[message_cache_size].type = type; message_cache[message_cache_size].param1 = param1; message_cache[message_cache_size].param2 = param2; + + if(message_cache[message_cache_size].type == POST) + { + last_post_message = message_cache[message_cache_size]; + } + else + { + memset(&last_post_message, 0, sizeof(last_post_message)); + } + message_cache_size++; } Modified: trunk/rostests/apitests/user32/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/helper.h?… ============================================================================== --- trunk/rostests/apitests/user32/helper.h [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/helper.h [iso-8859-1] Sat Sep 24 11:55:19 2011 @@ -1,24 +1,49 @@ +typedef enum _MSG_TYPE +{ + SENT, + POST, + HOOK, + EVENT +} MSG_TYPE; typedef struct _MSG_ENTRY { int iwnd; UINT msg; - BOOL hook; + MSG_TYPE type; int param1; int param2; } MSG_ENTRY; -void record_message(int iwnd, UINT message, BOOL hook, int param1,int param2); +void record_message(int iwnd, UINT message, MSG_TYPE type, int param1,int param2); void compare_cache(const char* file, int line, MSG_ENTRY *msg_chain); void trace_cache(const char* file, int line); void empty_message_cache(); ATOM RegisterSimpleClass(WNDPROC lpfnWndProc, LPCWSTR lpszClassName); +/* filter messages that are affected by dwm */ +static _inline BOOL IsDWmMsg(UINT msg) +{ + switch(msg) + { + case WM_NCPAINT: + case WM_ERASEBKGND: + case WM_PAINT: + case 0x031f: /*WM_DWMNCRENDERINGCHANGED*/ + return TRUE; + } + return FALSE; +} + +static _inline BOOL IseKeyMsg(UINT msg) +{ + return (msg == WM_KEYUP || msg == WM_KEYDOWN); +} + #define COMPARE_CACHE(...) compare_cache(__FILE__, __LINE__, ##__VA_ARGS__) #define TRACE_CACHE() trace_cache(__FILE__, __LINE__) -#define FLUSH_MESSAGES(msg) while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); #define EXPECT_NEXT(hWnd1, hWnd2) ok(GetWindow(hWnd1,GW_HWNDNEXT) == hWnd2, "Expected %p after %p, not %p\n",hWnd2,hWnd1,GetWindow(hWnd1,GW_HWNDNEXT) ) #define EXPECT_ACTIVE(hwnd) ok(GetActiveWindow() == hwnd, "Expected %p to be the active window, not %p\n",hwnd,GetActiveWindow())

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