Ros-diffs September 2011

ros-diffs@reactos.org

20 participants
399 discussions

[tkreuzer] 53861: [HAL] - Fix a typo in HalpAllocPhysicalMemory, that caused the function to remove MADs that still had pages rather than removing those who are empty. Fixes an assertion on VMWare....

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 26 15:01:11 2011 New Revision: 53861 URL: http://svn.reactos.org/svn/reactos?rev=53861&view=rev Log: [HAL] - Fix a typo in HalpAllocPhysicalMemory, that caused the function to remove MADs that still had pages rather than removing those who are empty. Fixes an assertion on VMWare. Kudos go to Kamil for tracking it down. - Fix another bug in HalpAllocPhysicalMemory, where the size of the newly allocated MAD was set to the alignment value instead of the original MAD, this lead to conflicting MADs and possible reuse of hal memory by the kernel. This seems to fix a bugcheck 0x19 with halacpi. Modified: trunk/reactos/hal/halx86/generic/memory.c Modified: trunk/reactos/hal/halx86/generic/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/memory.… ============================================================================== --- trunk/reactos/hal/halx86/generic/memory.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/memory.c [iso-8859-1] Mon Sep 26 15:01:11 2011 @@ -99,7 +99,7 @@ if (Alignment) { /* Check if we had leftovers */ - if ((MdBlock->PageCount - Alignment) != PageCount) + if (MdBlock->PageCount > (PageCount + Alignment)) { /* Get the next descriptor */ FreeBlock = &HalpAllocationDescriptorArray[UsedDescriptors]; @@ -113,8 +113,10 @@ InsertHeadList(&MdBlock->ListEntry, &FreeBlock->ListEntry); } - /* Use this descriptor */ - NewBlock->PageCount = Alignment; + /* Trim the original block to the alignment only */ + MdBlock->PageCount = Alignment; + + /* Insert the descriptor after the original one */ InsertHeadList(&MdBlock->ListEntry, &NewBlock->ListEntry); } else @@ -123,11 +125,11 @@ MdBlock->BasePage += (ULONG)PageCount; MdBlock->PageCount -= (ULONG)PageCount; - /* Insert the descriptor */ + /* Insert the descriptor before the original one */ InsertTailList(&MdBlock->ListEntry, &NewBlock->ListEntry); /* Remove the entry if the whole block was allocated */ - if (!MdBlock->PageCount == 0) RemoveEntryList(&MdBlock->ListEntry); + if (MdBlock->PageCount == 0) RemoveEntryList(&MdBlock->ListEntry); } /* Return the address */

13 years, 2 months

[ekohl] 53860: [DISKPART] Install diskpart.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Sep 26 09:21:11 2011 New Revision: 53860 URL: http://svn.reactos.org/svn/reactos?rev=53860&view=rev Log: [DISKPART] Install diskpart. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Sep 26 09:21:11 2011 @@ -116,6 +116,7 @@ base\system\autochk\autochk.exe 1 base\system\bootok\bootok.exe 1 +base\system\diskpart\diskpart.exe 1 base\system\expand\expand.exe 1 base\system\subst\subst.exe 1 base\system\format\format.exe 1

13 years, 2 months

[pschweitzer] 53859: [NTOSKRNL] Fix FsRtlIs*InExpression() by (finally) implementing backtracking. No regressions noticed regarding kmtest. Also commented code.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Sep 26 05:58:13 2011 New Revision: 53859 URL: http://svn.reactos.org/svn/reactos?rev=53859&view=rev Log: [NTOSKRNL] Fix FsRtlIs*InExpression() by (finally) implementing backtracking. No regressions noticed regarding kmtest. Also commented code. Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Mon Sep 26 05:58:13 2011 @@ -160,7 +160,9 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, IN PANSI_STRING Name) { - USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, StarFound = MAXUSHORT; + SHORT StarFound = -1; + PUSHORT BackTracking = NULL; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; PAGED_CODE(); ASSERT(Name->Length); @@ -169,74 +171,44 @@ while (NamePosition < Name->Length && ExpressionPosition < Expression->Length) { + /* Basic check to test if chars are equal */ if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[NamePosition])) { NamePosition++; ExpressionPosition++; } - else if (StarFound != MAXUSHORT && (Expression->Buffer[StarFound + 1] == '*' || - Expression->Buffer[StarFound + 1] == '?' || Expression->Buffer[StarFound + 1] == ANSI_DOS_DOT)) - { - ExpressionPosition = StarFound + 1; - switch (Expression->Buffer[ExpressionPosition]) - { - case '*': - StarFound = MAXUSHORT; - break; - - case '?': - if (++ExpressionPosition == Expression->Length) - { - NamePosition = Name->Length; - break; - } - - MatchingChars = NamePosition; - while (NamePosition < Name->Length && - Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition]) - { - NamePosition++; - } - - if (NamePosition - MatchingChars > 0) - { - StarFound = MAXUSHORT; - } - break; - - case ANSI_DOS_DOT: - while (NamePosition < Name->Length && Name->Buffer[NamePosition] != '.') - { - NamePosition++; - } - ExpressionPosition++; - StarFound = MAXUSHORT; - break; - - default: - /* Should never happen */ - ASSERT(FALSE); - } - } + /* Check cases that eat one char */ else if ((Expression->Buffer[ExpressionPosition] == '?') || (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) || (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT && Name->Buffer[NamePosition] == '.')) { NamePosition++; ExpressionPosition++; - StarFound = MAXUSHORT; - } + } + /* Test star */ else if (Expression->Buffer[ExpressionPosition] == '*') { - StarFound = ExpressionPosition++; + /* Save star position */ + if (!BackTracking) + { + BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + Expression->Length * sizeof(USHORT), 'nrSF'); + } + BackTracking[++StarFound] = ExpressionPosition++; + + /* If star is at the end, then eat all rest and leave */ if (ExpressionPosition == Expression->Length) { NamePosition = Name->Length; break; } - } + else if (Expression->Buffer[ExpressionPosition] != '?') + { + NamePosition++; + } + } + /* Check DOS_STAR */ else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) { - StarFound = MAXUSHORT; MatchingChars = NamePosition; while (MatchingChars < Name->Length) { @@ -248,18 +220,23 @@ } ExpressionPosition++; } - else if (StarFound != MAXUSHORT) - { - ExpressionPosition = StarFound + 1; - while (NamePosition < Name->Length && - Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition]) - { - NamePosition++; - } - } + /* If nothing match, try to backtrack */ + else if (StarFound >= 0) + { + ExpressionPosition = BackTracking[StarFound--]; + } + /* Otherwise, fail */ else { break; + } + + /* Under certain circumstances, expression is over, but name isn't + * and we can backtrack, then, backtrack */ + if (ExpressionPosition == Expression->Length && + NamePosition != Name->Length && StarFound >= 0) + { + ExpressionPosition = BackTracking[StarFound--]; } } if (ExpressionPosition + 1 == Expression->Length && NamePosition == Name->Length && Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Mon Sep 26 05:58:13 2011 @@ -23,8 +23,10 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, StarFound = MAXUSHORT; + SHORT StarFound = -1; + PUSHORT BackTracking = NULL; UNICODE_STRING IntExpression; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; PAGED_CODE(); /* Check if we were given strings at all */ @@ -99,76 +101,45 @@ while (NamePosition < Name->Length / sizeof(WCHAR) && ExpressionPosition < Expression->Length / sizeof(WCHAR)) { + /* Basic check to test if chars are equal */ if ((Expression->Buffer[ExpressionPosition] == (IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]))) { NamePosition++; ExpressionPosition++; } - else if (StarFound != MAXUSHORT && (Expression->Buffer[StarFound + 1] == L'*' || - Expression->Buffer[StarFound + 1] == L'?' || Expression->Buffer[StarFound + 1] == DOS_DOT)) - { - ExpressionPosition = StarFound + 1; - switch (Expression->Buffer[ExpressionPosition]) - { - case L'*': - StarFound = MAXUSHORT; - break; - - case L'?': - if (++ExpressionPosition == Expression->Length / sizeof(WCHAR)) - { - NamePosition = Name->Length / sizeof(WCHAR); - break; - } - - MatchingChars = NamePosition; - while (NamePosition < Name->Length / sizeof(WCHAR) && - (IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : - Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition]) - { - NamePosition++; - } - - if (NamePosition - MatchingChars > 0) - { - StarFound = MAXUSHORT; - } - break; - - case DOS_DOT: - while (NamePosition < Name->Length / sizeof(WCHAR) && - Name->Buffer[NamePosition] != L'.') - { - NamePosition++; - } - ExpressionPosition++; - StarFound = MAXUSHORT; - break; - - default: - /* Should never happen */ - ASSERT(FALSE); - } - } + /* Check cases that eat one char */ else if (Expression->Buffer[ExpressionPosition] == L'?' || (Expression->Buffer[ExpressionPosition] == DOS_QM) || (Expression->Buffer[ExpressionPosition] == DOS_DOT && Name->Buffer[NamePosition] == L'.')) { NamePosition++; ExpressionPosition++; - StarFound = MAXUSHORT; - } + } + /* Test star */ else if (Expression->Buffer[ExpressionPosition] == L'*') { - StarFound = ExpressionPosition++; + /* Save star position */ + if (!BackTracking) + { + BackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + (Expression->Length / sizeof(WCHAR)) * sizeof(USHORT), + 'nrSF'); + } + BackTracking[++StarFound] = ExpressionPosition++; + + /* If star is at the end, then eat all rest and leave */ if (ExpressionPosition == Expression->Length / sizeof(WCHAR)) { NamePosition = Name->Length / sizeof(WCHAR); break; } - } + else if (Expression->Buffer[ExpressionPosition] != L'?') + { + NamePosition++; + } + } + /* Check DOS_STAR */ else if (Expression->Buffer[ExpressionPosition] == DOS_STAR) { - StarFound = MAXUSHORT; MatchingChars = NamePosition; while (MatchingChars < Name->Length / sizeof(WCHAR)) { @@ -180,25 +151,35 @@ } ExpressionPosition++; } - else if (StarFound != MAXUSHORT) - { - ExpressionPosition = StarFound + 1; - while (NamePosition < Name->Length / sizeof(WCHAR) && - (IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : - Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition]) - { - NamePosition++; - } - } + /* If nothing match, try to backtrack */ + else if (StarFound >= 0) + { + ExpressionPosition = BackTracking[StarFound--]; + } + /* Otherwise, fail */ else { break; + } + + /* Under certain circumstances, expression is over, but name isn't + * and we can backtrack, then, backtrack */ + if (ExpressionPosition == Expression->Length / sizeof(WCHAR) && + NamePosition != Name->Length / sizeof(WCHAR) && + StarFound >= 0) + { + ExpressionPosition = BackTracking[StarFound--]; } } if (ExpressionPosition + 1 == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR) && Expression->Buffer[ExpressionPosition] == DOS_DOT) { ExpressionPosition++; + } + + if (BackTracking) + { + ExFreePoolWithTag(BackTracking, 'nrSF'); } return (ExpressionPosition == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR));

13 years, 3 months

[pschweitzer] 53858: [KMTEST] Add more tests for FsRtlIs*InExpression() Those are currently failing on ReactOS

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Sep 26 05:51:39 2011 New Revision: 53858 URL: http://svn.reactos.org/svn/reactos?rev=53858&view=rev Log: [KMTEST] Add more tests for FsRtlIs*InExpression() Those are currently failing on ReactOS Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlE… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] Mon Sep 26 05:51:39 2011 @@ -170,6 +170,15 @@ RtlInitUnicodeString(&Expression, L"*.bmp;*.dib"); RtlInitUnicodeString(&Name, L"winhlp32.exe"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + + /* Backtracking tests */ + RtlInitUnicodeString(&Expression, L"*.*.*.*"); + RtlInitUnicodeString(&Name, L"127.0.0.1"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + + RtlInitUnicodeString(&Expression, L"*a*ab*abc"); + RtlInitUnicodeString(&Name, L"aabaabcdadabdabc"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); } static VOID FsRtlIsDbcsInExpressionTest() @@ -329,6 +338,15 @@ RtlInitAnsiString(&Expression, "*.bmp;*.dib"); RtlInitAnsiString(&Name, "winhlp32.exe"); ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + + /* Backtracking tetss */ + RtlInitAnsiString(&Expression, "*.*.*.*"); + RtlInitAnsiString(&Name, "127.0.0.1"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + + RtlInitAnsiString(&Expression, "*a*ab*abc"); + RtlInitAnsiString(&Name, "aabaabcdadabdabc"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); } START_TEST(FsRtlExpression)

13 years, 3 months

[tkreuzer] 53857: [FREELDR] - Get rid of MmAllocateMemory, freeing about 1MB of low physical memory for the kernel - verify that MmMarkPagesInLookupTable is not called with invalid page regions - a...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 25 19:19:50 2011 New Revision: 53857 URL: http://svn.reactos.org/svn/reactos?rev=53857&view=rev Log: [FREELDR] - Get rid of MmAllocateMemory, freeing about 1MB of low physical memory for the kernel - verify that MmMarkPagesInLookupTable is not called with invalid page regions - add maximum allocation to heap statistics <long explanation> There was a function called MmAllocateMemory, what was commented as "// Temporary forwarder..." since January 2008. This function allocated one page of memory and marked it as LoaderOsLoaderHeap. This function was used by the fat filesystem code (and linuxboot.c) which allocated and freed memory in small chunks all the time. Since MmFreeMemory() is not implemented at all (obviously someone removed it) we were allocating one full page for allocations as small as 8 bytes and never free them. This accumulated to a total of 240 pages, almost 1MB, split into into 14 chunks. This memory was never freed by the kernel (the kernel keeps the loader heap memory for some reason) and fragmented the low memory region. Remove MmAllocateMemory completely and replace references in the fat code with MmHeapAlloc. The maximum heap usage after this was 184 KB, heap size is 4MB. </long explanation> Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/mm/heap.c trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c trunk/reactos/boot/freeldr/freeldr/video/video.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Sep 25 19:19:50 2011 @@ -402,7 +402,7 @@ // Attempt to allocate memory for directory buffer // TRACE("Trying to allocate (DirectorySize) %d bytes.\n", *DirectorySize); - DirectoryBuffer = MmAllocateMemory(*DirectorySize); + DirectoryBuffer = MmHeapAlloc(*DirectorySize); if (DirectoryBuffer == NULL) { @@ -416,7 +416,7 @@ { if (!FatReadVolumeSectors(Volume, Volume->RootDirSectorStart, Volume->RootDirSectors, DirectoryBuffer)) { - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); return NULL; } } @@ -424,7 +424,7 @@ { if (!FatReadClusterChain(Volume, DirectoryStartCluster, 0xFFFFFFFF, DirectoryBuffer)) { - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); return NULL; } } @@ -774,7 +774,7 @@ { if (!FatXSearchDirectoryBufferForFile(Volume, DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); return ENOENT; } } @@ -782,12 +782,12 @@ { if (!FatSearchDirectoryBufferForFile(Volume, DirectoryBuffer, DirectorySize, PathPart, &FatFileInfo)) { - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); return ENOENT; } } - MmFreeMemory(DirectoryBuffer); + MmHeapFree(DirectoryBuffer); // // If we have another sub-directory to go then @@ -800,12 +800,12 @@ // if (!(FatFileInfo.Attributes & ATTR_DIRECTORY)) { - MmFreeMemory(FatFileInfo.FileFatChain); + MmHeapFree(FatFileInfo.FileFatChain); return ENOTDIR; } DirectoryStartCluster = FatFileInfo.FileFatChain[0]; } - MmFreeMemory(FatFileInfo.FileFatChain); + MmHeapFree(FatFileInfo.FileFatChain); } memcpy(FatFileInfoPointer, &FatFileInfo, sizeof(FAT_FILE_INFO)); @@ -1011,7 +1011,7 @@ // // Allocate array memory // - ArrayPointer = MmAllocateMemory(ArraySize); + ArrayPointer = MmHeapAlloc(ArraySize); if (ArrayPointer == NULL) { @@ -1044,7 +1044,7 @@ // if (!FatGetFatEntry(Volume, StartCluster, &StartCluster)) { - MmFreeMemory(ArrayPointer); + MmHeapFree(ArrayPointer); return NULL; } } Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c [iso-8859-1] Sun Sep 25 19:19:50 2011 @@ -18,7 +18,7 @@ */ #ifndef _M_ARM - + #include <freeldr.h> #include <debug.h> #ifdef __i386__ @@ -283,7 +283,7 @@ BOOLEAN LinuxReadBootSector(PFILE LinuxKernelFile) { // Allocate memory for boot sector - LinuxBootSector = (PLINUX_BOOTSECTOR)MmAllocateMemory(512); + LinuxBootSector = MmAllocateMemoryWithType(512, LoaderSystemCode); if (LinuxBootSector == NULL) { return FALSE; @@ -346,7 +346,7 @@ } // Allocate memory for setup sectors - LinuxSetupSector = (PLINUX_SETUPSECTOR)MmAllocateMemory(SetupSectorSize); + LinuxSetupSector = MmAllocateMemoryWithType(SetupSectorSize, LoaderSystemCode); if (LinuxSetupSector == NULL) { return FALSE; Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] Sun Sep 25 19:19:50 2011 @@ -19,6 +19,10 @@ #include <freeldr.h> #include <debug.h> + +//#define MM_DBG 1 // needs #define BufStats 1 in bget.c + +ULONG MmMaximumHeapAlloc; DBG_DEFAULT_CHANNEL(MEMORY); @@ -62,15 +66,16 @@ { ERR("Heap allocation for %d bytes failed\n", MemorySize); } -#if MM_DBG - { - LONG CurAlloc, TotalFree, MaxFree, NumberOfGets, NumberOfRels; +#ifdef MM_DBG + { + LONG CurAlloc, TotalFree, MaxFree, NumberOfGets, NumberOfRels; - // Gather some stats - bstats(&CurAlloc, &TotalFree, &MaxFree, &NumberOfGets, &NumberOfRels); + // Gather some stats + bstats(&CurAlloc, &TotalFree, &MaxFree, &NumberOfGets, &NumberOfRels); + if (CurAlloc > MmMaximumHeapAlloc) MmMaximumHeapAlloc = CurAlloc; - TRACE("Current alloced %d bytes, free %d bytes, allocs %d, frees %d\n", - CurAlloc, TotalFree, NumberOfGets, NumberOfRels); + TRACE("Current alloc %d, free %d, max alloc %lx, allocs %d, frees %d\n", + CurAlloc, TotalFree, MmMaximumHeapAlloc, NumberOfGets, NumberOfRels); } #endif return Result; 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] Sun Sep 25 19:19:50 2011 @@ -333,7 +333,7 @@ while ((MemoryDescriptor = ArcGetMemoryDescriptor(MemoryDescriptor)) != NULL) { // Mark used pages in the lookup table - + if (MemoryDescriptor->BasePage + MemoryDescriptor->PageCount <= TotalPageCount) { TRACE("Marking pages 0x%lx-0x%lx as type %s\n", @@ -365,6 +365,15 @@ ULONG Index; TRACE("MmMarkPagesInLookupTable()\n"); + /* Validate the range */ + if ((StartPage < MmLowestPhysicalPage) || + ((StartPage + PageCount - 1) > MmHighestPhysicalPage)) + { + ERR("Memory (0x%lx:0x%lx) outside of lookup table! Valid range: 0x%lx-0x%lx.\n", + StartPage, PageCount, MmLowestPhysicalPage, MmHighestPhysicalPage); + return; + } + StartPage -= MmLowestPhysicalPage; for (Index=StartPage; Index<(StartPage+PageCount); Index++) { Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c [iso-8859-1] Sun Sep 25 19:19:50 2011 @@ -71,7 +71,8 @@ FreePagesInLookupTable -= PagesNeeded; MemPointer = (PVOID)((ULONG_PTR)FirstFreePageFromEnd * MM_PAGE_SIZE); - TRACE("Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd); + TRACE("Allocated %d bytes (%d pages) of memory (type %ld) starting at page 0x%lx.\n", + MemorySize, PagesNeeded, MemoryType, FirstFreePageFromEnd); TRACE("Memory allocation pointer: 0x%x\n", MemPointer); // Update LoaderPagesSpanned count @@ -80,12 +81,6 @@ // Now return the pointer return MemPointer; -} - -PVOID MmAllocateMemory(ULONG MemorySize) -{ - // Temporary forwarder... - return MmAllocateMemoryWithType(MemorySize, LoaderOsloaderHeap); } PVOID MmAllocateMemoryAtAddress(ULONG MemorySize, PVOID DesiredAddress, TYPE_OF_MEMORY MemoryType) Modified: trunk/reactos/boot/freeldr/freeldr/video/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/video/video.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/video/video.c [iso-8859-1] Sun Sep 25 19:19:50 2011 @@ -33,7 +33,7 @@ BufferSize = MachVideoGetBufferSize(); - VideoOffScreenBuffer = MmAllocateMemory(BufferSize); + VideoOffScreenBuffer = MmAllocateMemoryWithType(BufferSize, LoaderFirmwareTemporary); return VideoOffScreenBuffer; }

13 years, 3 months

[akhaldi] 53856: [ACTPRXY] * Enclose midl-incompatible declarations as widl-only. Fixes actxprxy MSVC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Sep 25 16:28:58 2011 New Revision: 53856 URL: http://svn.reactos.org/svn/reactos?rev=53856&view=rev Log: [ACTPRXY] * Enclose midl-incompatible declarations as widl-only. Fixes actxprxy MSVC build. Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_activscp.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -20,8 +20,10 @@ #include "activscp.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_comcat.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -20,8 +20,10 @@ #include "comcat.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_docobj.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -20,8 +20,10 @@ #include "docobj.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_hlink.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -20,8 +20,10 @@ #include "hlink.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_htiframe.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -20,8 +20,10 @@ #include "htiframe.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_objsafe.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -20,8 +20,10 @@ #include "objsafe.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_ocmm.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -20,8 +20,10 @@ #include "ocmm.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_servprov.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -1,7 +1,9 @@ #include "servprov.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shldisp.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -20,8 +20,10 @@ #include "shldisp.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_shobjidl.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -20,8 +20,10 @@ #include "shobjidl.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif Modified: trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/actxprxy_urlhist.idl [iso-8859-1] Sun Sep 25 16:28:58 2011 @@ -20,8 +20,10 @@ #include "urlhist.idl" +#ifdef __WIDL__ [ threading(both), uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ ] coclass PSFactoryBuffer { interface IFactoryBuffer; } +#endif

13 years, 3 months

[gadamopoulos] 53855: [user32_apitest] - In TrackMouseEvent tests, use mouse_event function to move the mouse cause this causes low level hooks to be called and SetCursorPos doesn't - Test low leve...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Sep 25 16:05:09 2011 New Revision: 53855 URL: http://svn.reactos.org/svn/reactos?rev=53855&view=rev Log: [user32_apitest] - In TrackMouseEvent tests, use mouse_event function to move the mouse cause this causes low level hooks to be called and SetCursorPos doesn't - Test low level mouse hooks for TrackMouseEvent - Test ways to block WM_MOUSEHOVER and WM_MOUSELEAVE. This is useful to detect where each message is generated - clean up the code a bit by adding FLUSH_MESSAGES macro that checks for expected message queue status and flushes the message queue Modified: trunk/rostests/apitests/user32/TrackMouseEvent.c trunk/rostests/apitests/user32/helper.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] Sun Sep 25 16:05:09 2011 @@ -13,6 +13,7 @@ HWND hWnd1, hWnd2, hWnd3; HHOOK hMouseHookLL, hMouseHook; +int ignore_timer = 0, ignore_mouse = 0, ignore_mousell = 0; static int get_iwnd(HWND hWnd) { @@ -55,15 +56,23 @@ static LRESULT CALLBACK MouseLLHookProc(int nCode, WPARAM wParam, LPARAM lParam) { + LRESULT ret; record_message(0, WH_MOUSE_LL, HOOK, wParam, 0); - return CallNextHookEx(hMouseHookLL, nCode, wParam, lParam); + ret = CallNextHookEx(hMouseHookLL, nCode, wParam, lParam); + if(ignore_mousell) + return TRUE; + return ret; } static LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) { MOUSEHOOKSTRUCT *hs = (MOUSEHOOKSTRUCT*) lParam; + LRESULT ret; record_message(get_iwnd(hs->hwnd), WH_MOUSE, HOOK, wParam, hs->wHitTestCode); - return CallNextHookEx(hMouseHook, nCode, wParam, lParam); + ret = CallNextHookEx(hMouseHook, nCode, wParam, lParam); + if(ignore_mouse) + return TRUE; + return ret; } static void FlushMessages() @@ -76,13 +85,22 @@ if(iwnd) { if(msg.message == WM_SYSTIMER) + { record_message(iwnd, msg.message, POST,msg.wParam,0); + if(ignore_timer) + continue; + } else if(!(msg.message > WM_USER || !iwnd || IsDWmMsg(msg.message) || IseKeyMsg(msg.message))) record_message(iwnd, msg.message, POST,0,0); } DispatchMessageA( &msg ); } } + +#define FLUSH_MESSAGES(expected, notexpected) \ + { EXPECT_QUEUE_STATUS(expected, notexpected);\ + FlushMessages();\ + } static void create_test_windows() { @@ -140,10 +158,15 @@ ok(flags == (expected),"wrong tme flags. expected %li, and got %li\n", (DWORD)(expected), flags); \ } +#define MOVE_CURSOR(x,y) mouse_event(MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE , \ + x*(65535/GetSystemMetrics(SM_CXVIRTUALSCREEN)), \ + y*(65535/GetSystemMetrics(SM_CYVIRTUALSCREEN)) , 0,0); + MSG_ENTRY empty_chain[]= {{0,0}}; /* the mouse moves over hwnd2 */ -MSG_ENTRY mousemove2_chain[]={{2, WM_NCHITTEST}, +MSG_ENTRY mousemove2_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {2, WM_NCHITTEST}, {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, {2, WM_SETCURSOR}, {1, WM_SETCURSOR}, @@ -151,7 +174,8 @@ {0,0}}; /* the mouse hovers hwnd2 */ -MSG_ENTRY mousehover2_chain[]={{2, WM_NCHITTEST}, +MSG_ENTRY mousehover2_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {2, WM_NCHITTEST}, {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, {2, WM_SETCURSOR}, {1, WM_SETCURSOR}, @@ -161,7 +185,8 @@ {0,0}}; /* the mouse leaves hwnd2 and moves to hwnd1 */ -MSG_ENTRY mouseleave2to1_chain[]={{1, WM_NCHITTEST}, +MSG_ENTRY mouseleave2to1_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {1, WM_NCHITTEST}, {1, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, {1, WM_SETCURSOR}, {1, WM_MOUSEMOVE, POST}, @@ -169,7 +194,8 @@ {0,0}}; /* the mouse leaves hwnd2 and moves to hwnd3 */ -MSG_ENTRY mouseleave2to3_chain[]={{3, WM_NCHITTEST}, +MSG_ENTRY mouseleave2to3_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {3, WM_NCHITTEST}, {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, {3, WM_SETCURSOR}, {1, WM_SETCURSOR}, @@ -177,37 +203,78 @@ {2, WM_MOUSELEAVE, POST}, {0,0}}; +/* the mouse hovers hwnd3 */ +MSG_ENTRY mousehover3_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {3, WM_NCHITTEST}, + {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {3, WM_SETCURSOR}, + {1, WM_SETCURSOR}, + {3, WM_MOUSEMOVE, POST}, + {3, WM_SYSTIMER, POST, ID_TME_TIMER}, + {3, WM_MOUSEHOVER, POST}, + {0,0}}; + +/* the mouse hovers hwnd3 and the timer is not dispatched */ +MSG_ENTRY mousehover3_droptimer_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {3, WM_NCHITTEST}, + {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {3, WM_SETCURSOR}, + {1, WM_SETCURSOR}, + {3, WM_MOUSEMOVE, POST}, + {3, WM_SYSTIMER, POST, ID_TME_TIMER}, + {0,0}}; + +/* the mouse hovers hwnd3 and mouse message is dropped by WH_MOUSE */ +MSG_ENTRY mousehover3_dropmouse_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {3, WM_NCHITTEST}, + {3, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {3, WM_SYSTIMER, POST, ID_TME_TIMER}, + {3, WM_MOUSEHOVER, POST}, + {0,0}}; + +/* the mouse hovers hwnd3 and mouse message is dropped by WH_MOUSE_LL */ +MSG_ENTRY mousehover3_dropmousell_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {3, WM_SYSTIMER, POST, ID_TME_TIMER}, + {3, WM_MOUSEHOVER, POST}, + {0,0}}; + +/* the mouse leaves hwnd2 and moves to hwnd3 and mouse message is dropped by WH_MOUSE */ +MSG_ENTRY mouseleave3to2_dropmouse_chain[]={{0, WH_MOUSE_LL, HOOK, WM_MOUSEMOVE}, + {2, WM_NCHITTEST}, + {2, WH_MOUSE,HOOK, WM_MOUSEMOVE, HTCLIENT}, + {0,0}}; + void Test_TrackMouseEvent() { - SetCursorPos(0,0); + MOVE_CURSOR(0,0); create_test_windows(); - FlushMessages(); + FlushMessages(0,0); empty_message_cache(); /* the mouse moves over hwnd2 */ - SetCursorPos(220,220); + MOVE_CURSOR(220,220); FlushMessages(); COMPARE_CACHE(mousemove2_chain); EXPECT_TME_FLAGS(hWnd2, 0); + + /* Begin tracking mouse events for hWnd2 */ TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); FlushMessages(); COMPARE_CACHE(empty_chain); /* the mouse hovers hwnd2 */ - SetCursorPos(221,221); - Sleep(100); - EXPECT_QUEUE_STATUS(QS_TIMER|QS_MOUSEMOVE, 0); - EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); - FlushMessages(); + MOVE_CURSOR(221, 221); + Sleep(100); + EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); + FLUSH_MESSAGES(QS_TIMER|QS_MOUSEMOVE, 0); EXPECT_TME_FLAGS(hWnd2, TME_LEAVE); COMPARE_CACHE(mousehover2_chain); /* the mouse leaves hwnd2 and moves to hwnd1 */ - SetCursorPos(150,150); - EXPECT_QUEUE_STATUS(QS_MOUSEMOVE,QS_TIMER ); + MOVE_CURSOR(150, 150); EXPECT_TME_FLAGS(hWnd2, TME_LEAVE); - FlushMessages(); + FLUSH_MESSAGES(QS_MOUSEMOVE,QS_TIMER ); EXPECT_TME_FLAGS(hWnd2, 0); COMPARE_CACHE(mouseleave2to1_chain); @@ -215,28 +282,26 @@ COMPARE_CACHE(empty_chain); /* the mouse moves over hwnd2 */ - SetCursorPos(220,220); - EXPECT_QUEUE_STATUS(QS_MOUSEMOVE, QS_TIMER); - FlushMessages(); + MOVE_CURSOR(220,220); + FLUSH_MESSAGES(QS_MOUSEMOVE, QS_TIMER); COMPARE_CACHE(mousemove2_chain); EXPECT_TME_FLAGS(hWnd2, 0); - COMPARE_CACHE(empty_chain); - TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); - TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); - TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); - TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); - EXPECT_QUEUE_STATUS(0, QS_TIMER|QS_MOUSEMOVE); - FlushMessages(); - COMPARE_CACHE(empty_chain); - EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); - - FlushMessages(); - COMPARE_CACHE(empty_chain); + + FlushMessages(); + COMPARE_CACHE(empty_chain); + + /* Begin tracking mouse events for hWnd2 */ + TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); + TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); + TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); + TmeStartTracking(hWnd2, TME_HOVER|TME_LEAVE); + FLUSH_MESSAGES(0, QS_TIMER|QS_MOUSEMOVE); + COMPARE_CACHE(empty_chain); + EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); /* the mouse moves from hwnd2 to the intersection of hwnd2 and hwnd3 */ - SetCursorPos(300,300); - EXPECT_QUEUE_STATUS(QS_MOUSEMOVE, QS_TIMER); - FlushMessages(); + MOVE_CURSOR(300,300); + FLUSH_MESSAGES(QS_MOUSEMOVE, QS_TIMER); EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); COMPARE_CACHE(mousemove2_chain); @@ -244,14 +309,80 @@ COMPARE_CACHE(empty_chain); /* the mouse moves from hwnd2 to hwnd3 */ - SetCursorPos(400,400); - EXPECT_QUEUE_STATUS(QS_MOUSEMOVE, QS_TIMER); - FlushMessages(); + MOVE_CURSOR(400,400); + FLUSH_MESSAGES(QS_MOUSEMOVE, QS_TIMER); EXPECT_TME_FLAGS(hWnd2, 0); COMPARE_CACHE(mouseleave2to3_chain); FlushMessages(); COMPARE_CACHE(empty_chain); + + /* Begin tracking mouse events for hWnd3 */ + TmeStartTracking(hWnd3, TME_HOVER|TME_LEAVE); + FLUSH_MESSAGES(0, QS_TIMER|QS_MOUSEMOVE); + COMPARE_CACHE(empty_chain); + EXPECT_TME_FLAGS(hWnd2, TME_HOVER|TME_LEAVE); + + /* the mouse hovers hwnd3 */ + MOVE_CURSOR(401,401); + Sleep(100); + EXPECT_TME_FLAGS(hWnd3, TME_HOVER|TME_LEAVE); + FLUSH_MESSAGES(QS_TIMER|QS_MOUSEMOVE, 0); + EXPECT_TME_FLAGS(hWnd3, TME_LEAVE); + COMPARE_CACHE(mousehover3_chain); + + /* Begin tracking mouse events for hWnd3 */ + TmeStartTracking(hWnd3, TME_HOVER ); + FLUSH_MESSAGES(0, QS_TIMER|QS_MOUSEMOVE); + COMPARE_CACHE(empty_chain); + EXPECT_TME_FLAGS(hWnd3, TME_HOVER|TME_LEAVE); + + /* make sure that the timer won't fire before the mouse moves */ + Sleep(100); + COMPARE_CACHE(empty_chain); + Sleep(100); + COMPARE_CACHE(empty_chain); + Sleep(100); + COMPARE_CACHE(empty_chain); + + /* the mouse hovers hwnd3 and the timer is not dispatched*/ + ignore_timer = TRUE; + MOVE_CURSOR(400,400); + Sleep(100); + EXPECT_TME_FLAGS(hWnd3, TME_HOVER|TME_LEAVE); + FLUSH_MESSAGES(QS_TIMER|QS_MOUSEMOVE, 0); /* the loop drops WM_SYSTIMER */ + EXPECT_TME_FLAGS(hWnd3, TME_HOVER|TME_LEAVE); /* TME_HOVER is still active */ + COMPARE_CACHE(mousehover3_droptimer_chain); /* we get no WM_MOUSEHOVER */ + ignore_timer = FALSE; + + /* the mouse hovers hwnd3 and mouse message is dropped by WH_MOUSE_LL */ + ignore_mousell = TRUE; + MOVE_CURSOR(402,402); + Sleep(100); + EXPECT_TME_FLAGS(hWnd3, TME_HOVER|TME_LEAVE); + FLUSH_MESSAGES(QS_TIMER, QS_MOUSEMOVE); /* WH_MOUSE_LL drops WM_MOUSEMOVE */ + EXPECT_TME_FLAGS(hWnd3, TME_LEAVE); + COMPARE_CACHE(mousehover3_dropmousell_chain); /* we get WM_MOUSEHOVER normaly */ + ignore_mousell = FALSE; + + /* the mouse hovers hwnd3 and mouse message is dropped by WH_MOUSE */ + ignore_mouse = TRUE; + TmeStartTracking(hWnd3, TME_HOVER ); + MOVE_CURSOR(401,401); + Sleep(100); + EXPECT_TME_FLAGS(hWnd3, TME_HOVER|TME_LEAVE); + FLUSH_MESSAGES(QS_TIMER|QS_MOUSEMOVE, 0); /* WH_MOUSE drops WM_MOUSEMOVE */ + EXPECT_TME_FLAGS(hWnd3, TME_LEAVE); + COMPARE_CACHE(mousehover3_dropmouse_chain); /* we get WM_MOUSEHOVER normaly */ + ignore_mouse = FALSE; + + /* the mouse leaves hwnd2 and moves to hwnd3 and mouse message is dropped by WH_MOUSE */ + ignore_mouse = TRUE; + MOVE_CURSOR(220,220); + FLUSH_MESSAGES(QS_MOUSEMOVE, QS_TIMER); /* WH_MOUSE drops WM_MOUSEMOVE */ + EXPECT_TME_FLAGS(hWnd3, 0); /* all flags are removed */ + COMPARE_CACHE(mouseleave3to2_dropmouse_chain); /* we get no WM_MOUSELEAVE */ + ignore_mouse = FALSE; } START_TEST(TrackMouseEvent) 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] Sun Sep 25 16:05:09 2011 @@ -134,7 +134,7 @@ if(!got_error && !same) got_error = TRUE; - if(msg_chain->msg !=0 && msg_chain->iwnd != 0) + if(msg_chain->msg !=0 || msg_chain->iwnd != 0) msg_chain++; else {

13 years, 3 months

[dgorbachev] 53854: [Explorer] Link with libmingw32.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Sep 25 16:02:29 2011 New Revision: 53854 URL: http://svn.reactos.org/svn/reactos?rev=53854&view=rev Log: [Explorer] Link with libmingw32. Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sun Sep 25 16:02:29 2011 @@ -63,6 +63,7 @@ -lstdc++ -lgcc -lmingwex + -lmingw32 wine uuid)

13 years, 3 months

[dgorbachev] 53853: [NTOSKRNL] Disable mouse when reading from keyboard port.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Sep 25 16:02:14 2011 New Revision: 53853 URL: http://svn.reactos.org/svn/reactos?rev=53853&view=rev Log: [NTOSKRNL] Disable mouse when reading from keyboard port. Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sun Sep 25 16:02:14 2011 @@ -3489,6 +3489,9 @@ *(KdpPromptString.Buffer + i)); } + if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) + KbdDisableMouse(); + /* Loop the whole string */ for (i = 0; i < OutStringLength; i++) { @@ -3556,6 +3559,9 @@ KdPortPutByteEx(&SerialPortInfo, Response); } + if (!(KdbDebugState & KD_DEBUG_KDSERIAL)) + KbdEnableMouse(); + /* Print a new line */ KdPortPutByteEx(&SerialPortInfo, '\r'); KdPortPutByteEx(&SerialPortInfo, '\n'); Modified: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_keyboard… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c [iso-8859-1] Sun Sep 25 16:02:14 2011 @@ -93,13 +93,11 @@ VOID KbdEnableMouse() { KbdSendCommandToMouse(MOU_ENAB); - // kbd_write_command(KBD_ENABLE_MOUSE); } VOID KbdDisableMouse() { KbdSendCommandToMouse(MOU_DISAB); - // kbd_write_command(KBD_DISABLE_MOUSE); } CHAR

13 years, 3 months

[dgorbachev] 53852: [PSDK] Remove duplicate lines, noticed by sharpsighted forum people.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Sep 25 16:01:44 2011 New Revision: 53852 URL: http://svn.reactos.org/svn/reactos?rev=53852&view=rev Log: [PSDK] Remove duplicate lines, noticed by sharpsighted forum people. Modified: trunk/reactos/include/psdk/usb.h Modified: trunk/reactos/include/psdk/usb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usb.h?rev=538… ============================================================================== --- trunk/reactos/include/psdk/usb.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/usb.h [iso-8859-1] Sun Sep 25 16:01:44 2011 @@ -200,13 +200,11 @@ #define USBD_STATUS_FRAME_CONTROL_OWNED ((USBD_STATUS)0xC0000C00L) #define USBD_STATUS_FRAME_CONTROL_NOT_OWNED ((USBD_STATUS)0xC0000D00L) #define USBD_STATUS_NOT_SUPPORTED ((USBD_STATUS)0xC0000E00L) -#define USBD_STATUS_INAVLID_CONFIGURATION_DESCRIPTOR ((USBD_STATUS)0xC0000F00L) #define USBD_STATUS_INVALID_CONFIGURATION_DESCRIPTOR ((USBD_STATUS)0xC0000F00L) #define USBD_STATUS_INSUFFICIENT_RESOURCES ((USBD_STATUS)0xC0001000L) #define USBD_STATUS_SET_CONFIG_FAILED ((USBD_STATUS)0xC0002000L) #define USBD_STATUS_BUFFER_TOO_SMALL ((USBD_STATUS)0xC0003000L) #define USBD_STATUS_INTERFACE_NOT_FOUND ((USBD_STATUS)0xC0004000L) -#define USBD_STATUS_INAVLID_PIPE_FLAGS ((USBD_STATUS)0xC0005000L) #define USBD_STATUS_INVALID_PIPE_FLAGS ((USBD_STATUS)0xC0005000L) #define USBD_STATUS_TIMEOUT ((USBD_STATUS)0xC0006000L) #define USBD_STATUS_DEVICE_GONE ((USBD_STATUS)0xC0007000L)

13 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
40
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 September 2011