Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[ros-arm-bringup] 42131: - Separe ARM3 Init into 3 defined phases: - 1: No PFN Database exists - 2: PFN Database exists - 3: ReactOS NP Pool exists (deprecated) - Cleanup ReactOS Mm init to work with this. - ARM3 Phase 1 Init now uses pages directly from the physical memory descriptor. - This similar to how "MmAllocEarlyPage" used to work. - A new function MxGetNextPage now does this. - MxGetNextPage can allocate more than just one page however (making it possible to get contiguous physical memo
by ros-arm-bringup＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: ros-arm-bringup Date: Wed Jul 22 09:33:22 2009 New Revision: 42131 URL: http://svn.reactos.org/svn/reactos?rev=42131&view=rev Log: - Separe ARM3 Init into 3 defined phases: - 1: No PFN Database exists - 2: PFN Database exists - 3: ReactOS NP Pool exists (deprecated) - Cleanup ReactOS Mm init to work with this. - ARM3 Phase 1 Init now uses pages directly from the physical memory descriptor. - This similar to how "MmAllocEarlyPage" used to work. - A new function MxGetNextPage now does this. - MxGetNextPage can allocate more than just one page however (making it possible to get contiguous physical memory without going through the PFN-based MmAllocateContiguousMemory beast) - Also MxGetNextPage will bugcheck with INSTALL_MORE_MEMORY if it runs out of pages. - Renamed the physical memory descriptor variables to MxFreeDescriptor, MxOldFreeDescriptor instead of MiFreeDescriptor and MiOrgFreeDescriptor (based on NT symbols) - Nonpaged pool PDEs, PFN database PDEs, and initial nonpaged pool PTEs are now allocated through MxGetNextPage. - Fix an off by one error in the sizing of MxPfnAllocation. - The PFN database is now fully "owned" by ARM3 in terms of its PDE mappings and VA location at 0xB0000000. - ie. MmArmPfnDatabase is now MmPfnDatabase. - The actual PFN database entries and setup are still done by the ReactOS Mm. - Got rid of ARM nonpaged pool allocator test. - Repositioned ReactOS nonpaged pool (deprecated) after the boot image (used to be after the PFN database). - Paged pool follows. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c 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] Wed Jul 22 09:33:22 2009 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/mm/ARM3/init.c - * PURPOSE: ARM Memory Manager Initialization + * FILE: ntoskrnl/mm/ARM3/i386/init.c + * PURPOSE: ARM Memory Manager Initialization for x86 * PROGRAMMERS: ReactOS Portable Systems Group */ @@ -109,14 +109,25 @@ ULONG MxPfnAllocation; // -// The ARMÂ³ PFN Database -// -PMMPFN MmArmPfnDatabase; - -// // This structure describes the different pieces of RAM-backed address space // PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; + +// +// Before we have a PFN database, memory comes straight from our physical memory +// blocks, which is nice because it's guaranteed contiguous and also because once +// we take a page from here, the system doesn't see it anymore. +// However, once the fun is over, those pages must be re-integrated back into +// PFN society life, and that requires us keeping a copy of the original layout +// so that we can parse it later. +// +PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; +MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; + +// +// This is where we keep track of the most basic physical layout markers +// +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; /* PRIVATE FUNCTIONS **********************************************************/ @@ -141,6 +152,35 @@ MmGlobalKernelPageDirectory[Pde] = ((PULONG)PDE_BASE)[Pde]; Pde++; } +} + +PFN_NUMBER +NTAPI +MxGetNextPage(IN PFN_NUMBER PageCount) +{ + PFN_NUMBER Pfn; + + // + // Make sure we have enough pages + // + if (PageCount > MxFreeDescriptor->PageCount) + { + // + // Crash the system + // + KeBugCheckEx(INSTALL_MORE_MEMORY, + MmNumberOfPhysicalPages, + MxFreeDescriptor->PageCount, + MxOldFreeDescriptor.PageCount, + PageCount); + } + + // + // Use our highest usable free pages + // + Pfn = MxFreeDescriptor->BasePage + MxFreeDescriptor->PageCount - PageCount; + MxFreeDescriptor->PageCount -= PageCount; + return Pfn; } PPHYSICAL_MEMORY_DESCRIPTOR @@ -284,8 +324,11 @@ MmArmInitSystem(IN ULONG Phase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + ULONG FreePages = 0; PMEMORY_AREA MArea; - PHYSICAL_ADDRESS BoundaryAddressMultiple, Low, High; + PHYSICAL_ADDRESS BoundaryAddressMultiple; PFN_NUMBER PageFrameIndex; PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde = HyperTemplatePte, TempPte = HyperTemplatePte; @@ -294,8 +337,7 @@ ULONG OldCount; BOOLEAN IncludeType[LoaderMaximum]; ULONG i; - BoundaryAddressMultiple.QuadPart = Low.QuadPart = 0; - High.QuadPart = -1; + BoundaryAddressMultiple.QuadPart = 0; if (Phase == 0) { @@ -314,6 +356,95 @@ RtlZeroMemory(StartPde, (EndPde - StartPde) * sizeof(MMPTE)); // + // Loop the memory descriptors + // + NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) + { + // + // Get the memory block + // + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + // + // Skip invisible memory + // + if ((MdBlock->MemoryType != LoaderFirmwarePermanent) && + (MdBlock->MemoryType != LoaderSpecialMemory) && + (MdBlock->MemoryType != LoaderHALCachedMemory) && + (MdBlock->MemoryType != LoaderBBTMemory)) + { + // + // Check if BURNMEM was used + // + if (MdBlock->MemoryType != LoaderBad) + { + // + // Count this in the total of pages + // + MmNumberOfPhysicalPages += MdBlock->PageCount; + } + + // + // Check if this is the new lowest page + // + if (MdBlock->BasePage < MmLowestPhysicalPage) + { + // + // Update the lowest page + // + MmLowestPhysicalPage = MdBlock->BasePage; + } + + // + // Check if this is the new highest page + // + PageFrameIndex = MdBlock->BasePage + MdBlock->PageCount; + if (PageFrameIndex > MmHighestPhysicalPage) + { + // + // Update the highest page + // + MmHighestPhysicalPage = PageFrameIndex - 1; + } + + // + // Check if this is free memory + // + if ((MdBlock->MemoryType == LoaderFree) || + (MdBlock->MemoryType == LoaderLoadedProgram) || + (MdBlock->MemoryType == LoaderFirmwareTemporary) || + (MdBlock->MemoryType == LoaderOsloaderStack)) + { + // + // Check if this is the largest memory descriptor + // + if (MdBlock->PageCount > FreePages) + { + // + // For now, it is + // + FreePages = MdBlock->PageCount; + MxFreeDescriptor = MdBlock; + } + } + } + + // + // Keep going + // + NextEntry = MdBlock->ListEntry.Flink; + } + + // + // Save original values of the free descriptor, since it'll be + // altered by early allocations + // + MxOldFreeDescriptor = *MxFreeDescriptor; + + // // Check if this is a machine with less than 19MB of RAM // if (MmNumberOfPhysicalPages < MI_MIN_PAGES_FOR_SYSPTE_TUNING) @@ -434,6 +565,16 @@ // MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); 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 @@ -482,35 +623,23 @@ // with the old memory manager, so we'll create a "Shadow PFN Database" // instead, and arbitrarly start it at 0xB0000000. // - MmArmPfnDatabase = (PVOID)0xB0000000; - ASSERT(((ULONG_PTR)MmArmPfnDatabase & ((4 * 1024 * 1024) - 1)) == 0); + MmPfnDatabase = (PVOID)0xB0000000; + ASSERT(((ULONG_PTR)MmPfnDatabase & ((4 * 1024 * 1024) - 1)) == 0); // // Non paged pool comes after the PFN database // - MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmArmPfnDatabase + + MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT)); // // Now we actually need to get these many physical pages. Nonpaged pool // is actually also physically contiguous (but not the expansion) // - PageFrameIndex = MmGetContinuousPages(MmSizeOfNonPagedPoolInBytes + - (MxPfnAllocation << PAGE_SHIFT), - Low, - High, - BoundaryAddressMultiple, - FALSE); + PageFrameIndex = MxGetNextPage(MxPfnAllocation + + (MmSizeOfNonPagedPoolInBytes >> PAGE_SHIFT)); ASSERT(PageFrameIndex != 0); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmArmPfnDatabase, - (ULONG_PTR)MmArmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), - "Shadow PFN Database"); DPRINT("PFN DB PA PFN begins at: %lx\n", PageFrameIndex); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedPoolStart, - (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, - "ARM Non Paged Pool"); DPRINT("NP PA PFN begins at: %lx\n", PageFrameIndex + MxPfnAllocation); // @@ -529,7 +658,7 @@ // // Get a page // - TempPde.u.Hard.PageFrameNumber = MmAllocPage(MC_SYSTEM, 0); + TempPde.u.Hard.PageFrameNumber = MxGetNextPage(1); ASSERT(TempPde.u.Hard.Valid == 1); *StartPde = TempPde; @@ -548,7 +677,7 @@ // // Now we need pages for the page tables which will map initial NP // - StartPde = MiAddressToPde(MmArmPfnDatabase); + StartPde = MiAddressToPde(MmPfnDatabase); EndPde = MiAddressToPde((PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); while (StartPde <= EndPde) @@ -561,7 +690,7 @@ // // Get a page // - TempPde.u.Hard.PageFrameNumber = MmAllocPage(MC_SYSTEM, 0); + TempPde.u.Hard.PageFrameNumber = MxGetNextPage(1); ASSERT(TempPde.u.Hard.Valid == 1); *StartPde = TempPde; @@ -581,12 +710,6 @@ // Now remember where the expansion starts // MmNonPagedPoolExpansionStart = NonPagedPoolExpansionVa; - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, - "System PTE Space"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, - "Non Paged Pool Expansion PTE Space"); // // Last step is to actually map the nonpaged pool @@ -646,6 +769,13 @@ // Now go ahead and initialize the ARM pool // MiInitializeArmPool(); + } + else if (Phase == 1) // IN BETWEEN, THE PFN DATABASE IS NOW CREATED + { + // + // Initialize the nonpaged pool + // + InitializePool(NonPagedPool, 0); // // We PDE-aligned the nonpaged system start VA, so haul some extra PTEs! @@ -707,36 +837,28 @@ // Sync us up with ReactOS Mm // MiSyncARM3WithROS(MmNonPagedSystemStart, (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); - MiSyncARM3WithROS(MmArmPfnDatabase, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); + MiSyncARM3WithROS(MmPfnDatabase, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); MiSyncARM3WithROS((PVOID)HYPER_SPACE, (PVOID)(HYPER_SPACE + PAGE_SIZE - 1)); - - // - // Initialize the nonpaged pool - // - InitializePool(NonPagedPool, 0); - - // - // Do a little test of the nonpaged pool allocator - // - if (0) - { - ULONG i = 0; - PVOID Buffers[4096]; - while (TRUE) - { - Buffers[i] = MiAllocatePoolPages(NonPagedPool, PAGE_SIZE); - if (!Buffers[i]) break; - if (i == 4096) break; - i++; - } - - while (i--) - { - MiFreePoolPages(Buffers[i]); - } - } + + // + // Print the memory layout + // + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmPfnDatabase, + (ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), + "PFN Database"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedPoolStart, + (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, + "ARM Non Paged Pool"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, + "System PTE Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, + "Non Paged Pool Expansion PTE Space"); } - else + else // NOW WE HAVE NONPAGED POOL { // // Instantiate memory that we don't consider RAM/usable Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Jul 22 09:33:22 2009 @@ -105,6 +105,9 @@ extern ULONG MmBootImageSize; extern PMMPTE MmSystemPtesStart[MaximumPtePoolTypes]; extern PMMPTE MmSystemPtesEnd[MaximumPtePoolTypes]; +extern PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; +extern MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; +extern ULONG MxPfnAllocation; VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Wed Jul 22 09:33:22 2009 @@ -713,8 +713,8 @@ PFN_TYPE Pfn; /* Use one of our highest usable pages */ - Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; - MiFreeDescriptor->PageCount--; + Pfn = MxFreeDescriptor->BasePage + MxFreeDescriptor->PageCount - 1; + MxFreeDescriptor->PageCount--; /* Return it */ return Pfn; @@ -813,7 +813,6 @@ MmInitializePageList(VOID) { ULONG i; - ULONG Reserved; NTSTATUS Status; PFN_TYPE Pfn = 0; PHYSICAL_PAGE UsedPage; @@ -824,12 +823,9 @@ InitializeListHead(&UserPageListHead); InitializeListHead(&FreeUnzeroedPageListHead); InitializeListHead(&FreeZeroedPageListHead); - - /* Set the size and start of the PFN Database */ - Reserved = PAGE_ROUND_UP((MmHighestPhysicalPage * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; /* Loop every page required to hold the PFN database */ - for (i = 0; i < Reserved; i++) + for (i = 0; i < MxPfnAllocation; i++) { PVOID Address = (char*)MmPfnDatabase + (i * PAGE_SIZE); @@ -924,10 +920,10 @@ } } } - + /* Finally handle the pages describing the PFN database themselves */ - for (i = (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount); - i < (MiFreeDescriptorOrg.BasePage + MiFreeDescriptorOrg.PageCount); + for (i = (MxFreeDescriptor->BasePage + MxFreeDescriptor->PageCount); + i < (MxOldFreeDescriptor.BasePage + MxOldFreeDescriptor.PageCount); i++) { /* Ensure this page was not added previously */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Wed Jul 22 09:33:22 2009 @@ -48,10 +48,6 @@ PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; ULONG MmBootImageSize; -ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; -ULONG_PTR MmPfnDatabaseEnd; -PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; -MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; ULONG MmUserProbeAddress = 0; PVOID MmHighestUserAddress = NULL; PBOOLEAN Mm64BitPhysicalAddress = FALSE; @@ -115,88 +111,6 @@ VOID NTAPI -MiCountFreePagesInLoaderBlock(PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR Md; - ULONG FreePages = 0; - - for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; - NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; - NextEntry = NextEntry->Flink) - { - Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - - /* Skip invisible memory */ - if ((Md->MemoryType != LoaderFirmwarePermanent) && - (Md->MemoryType != LoaderSpecialMemory) && - (Md->MemoryType != LoaderHALCachedMemory) && - (Md->MemoryType != LoaderBBTMemory)) - { - /* Check if BURNMEM was used */ - if (Md->MemoryType != LoaderBad) - { - /* Count this in the total of pages */ - MmNumberOfPhysicalPages += Md->PageCount; - } - - /* Check if this is the new lowest page */ - if (Md->BasePage < MmLowestPhysicalPage) - { - /* Update the lowest page */ - MmLowestPhysicalPage = Md->BasePage; - } - - /* Check if this is the new highest page */ - if ((Md->BasePage + Md->PageCount) > MmHighestPhysicalPage) - { - /* Update the highest page */ - MmHighestPhysicalPage = Md->BasePage + Md->PageCount - 1; - } - - /* Check if this is free memory */ - if ((Md->MemoryType == LoaderFree) || - (Md->MemoryType == LoaderLoadedProgram) || - (Md->MemoryType == LoaderFirmwareTemporary) || - (Md->MemoryType == LoaderOsloaderStack)) - { - /* Check if this is the largest memory descriptor */ - if (Md->PageCount > FreePages) - { - /* For now, it is */ - FreePages = Md->PageCount; - MiFreeDescriptor = Md; - } - } - } - } - - /* Save original values of the free descriptor, since it'll be - altered by early allocations */ - MiFreeDescriptorOrg = *MiFreeDescriptor; -} - -VOID -NTAPI -MiDbgKernelLayout(VOID) -{ - DPRINT1("%8s%12s\t\t%s\n", "Start", "End", "Type"); - DPRINT1("0x%p - 0x%p\t%s\n", - MmSystemRangeStart, (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, - "Boot Image Mapping Region"); - DPRINT1("0x%p - 0x%p\t%s\n", - MmPfnDatabase, MmPfnDatabaseEnd, - "PFN Database region"); - DPRINT1("0x%p - 0x%p\t%s\n", - MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength, - "Non paged pool region"); - DPRINT1("0x%p - 0x%p\t%s\n", - MmPagedPoolBase, (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize, - "Paged pool region"); -} - -VOID -NTAPI MiDbgDumpMemoryDescriptors(VOID) { PLIST_ENTRY NextEntry; @@ -225,7 +139,12 @@ INIT_FUNCTION NTAPI MmInit1(VOID) -{ +{ + /* Initialize the kernel address space */ + KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); + MmKernelAddressSpace = MmGetCurrentAddressSpace(); + MmInitGlobalKernelPageDirectory(); + /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); @@ -237,62 +156,46 @@ MmSystemRangeStart = (PVOID)KSEG0_BASE; MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); - DPRINT("MmSystemRangeStart: %08x\n", MmSystemRangeStart); - DPRINT("MmUserProbeAddress: %08x\n", MmUserProbeAddress); - DPRINT("MmHighestUserAddress:%08x\n", MmHighestUserAddress); - - /* Count RAM */ - MiCountFreePagesInLoaderBlock(KeLoaderBlock); - DbgPrint("Used memory %dKb\n", (MmNumberOfPhysicalPages * PAGE_SIZE) / 1024); - - /* Initialize the kernel address space */ - KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); - MmKernelAddressSpace = MmGetCurrentAddressSpace(); - MmInitGlobalKernelPageDirectory(); - - /* We'll put the PFN array right after the loaded modules */ - MmPfnDatabase = (PVOID)((ULONG_PTR)MmSystemRangeStart + MmBootImageSize); - MmPfnDatabaseEnd = (ULONG_PTR)MmPfnDatabase + (MmHighestPhysicalPage * sizeof(MMPFN)); - MmPfnDatabaseEnd = PAGE_ROUND_UP(MmPfnDatabaseEnd); - - /* Put nonpaged pool after the PFN database */ - MiNonPagedPoolStart = (PVOID)MmPfnDatabaseEnd; - - /* Length of non-paged pool */ - MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE; - - /* Put the paged pool after the non-paged pool */ + + // + // Initialize ARMÂ³ in phase 0 + // + MmArmInitSystem(0, KeLoaderBlock); + + /* Intialize system memory areas */ + MiInitSystemMemoryAreas(); + + /* Initialize the page list */ + MmInitializePageList(); + + // + // Initialize ARMÂ³ in phase 1 + // + MmArmInitSystem(1, KeLoaderBlock); + // DEPRECATED + /* Put nonpaged pool after the loaded modules */ // DEPRECATED + MiNonPagedPoolStart = (PVOID)((ULONG_PTR)MmSystemRangeStart + // DEPRECATED + MmBootImageSize); // DEPRECATED + MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE; // DEPRECATED + // DEPRECATED + /* Initialize nonpaged pool */ // DEPRECATED + MiInitializeNonPagedPool(); // DEPRECATED + // DEPRECATED + // + // Initialize ARMÂ³ in phase 2 + // + MmArmInitSystem(2, KeLoaderBlock); + + /* Put the paged pool after nonpaged pool */ MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength); MmPagedPoolSize = MM_PAGED_POOL_SIZE; - /* Dump kernel memory layout */ - MiDbgKernelLayout(); - - /* Intialize system memory areas */ - MiInitSystemMemoryAreas(); - - /* Initialize the page list */ - MmInitializePageList(); - - // - // Initialize ARMÂ³ in phase 0 - // - MmArmInitSystem(0, KeLoaderBlock); - - /* Initialize nonpaged pool */ - MiInitializeNonPagedPool(); - /* Initialize paged pool */ MmInitializePagedPool(); /* Initialize working sets */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); - - // - // Initialize ARMÂ³ in phase 1 - // - MmArmInitSystem(1, KeLoaderBlock); } BOOLEAN

1 0

[jimtabor] 42130: - [Win32k] Rename class and window structures.
by jimtabor＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: jimtabor Date: Wed Jul 22 07:23:08 2009 New Revision: 42130 URL: http://svn.reactos.org/svn/reactos?rev=42130&view=rev Log: - [Win32k] Rename class and window structures. Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/include/window.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/prop.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32.h [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -109,11 +109,11 @@ } PCALLPROC FASTCALL ValidateCallProc(HANDLE hCallProc); -PWINDOW FASTCALL ValidateHwnd(HWND hwnd); -PWINDOW FASTCALL ValidateHwndOrDesk(HWND hwnd); -PWINDOW FASTCALL GetThreadDesktopWnd(VOID); +PWND FASTCALL ValidateHwnd(HWND hwnd); +PWND FASTCALL ValidateHwndOrDesk(HWND hwnd); +PWND FASTCALL GetThreadDesktopWnd(VOID); PVOID FASTCALL ValidateHandleNoErr(HANDLE handle, UINT uType); -PWINDOW FASTCALL ValidateHwndNoErr(HWND hwnd); +PWND FASTCALL ValidateHwndNoErr(HWND hwnd); VOID FASTCALL GetConnected(VOID); BOOL FASTCALL DefSetText(HWND hWnd, PCWSTR String, BOOL Ansi); -BOOL FASTCALL TestWindowProcess(PWINDOW); +BOOL FASTCALL TestWindowProcess(PWND); Modified: trunk/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w… ============================================================================== --- trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -40,7 +40,7 @@ void UserGetFrameSize(ULONG Style, ULONG ExStyle, SIZE *Size); void -UserGetInsideRectNC(PWINDOW Wnd, RECT *rect); +UserGetInsideRectNC(PWND Wnd, RECT *rect); DWORD SCROLL_HitTest( HWND hwnd, INT nBar, POINT pt, BOOL bDragging ); Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -268,7 +268,7 @@ BOOL FASTCALL -TestWindowProcess(PWINDOW Wnd) +TestWindowProcess(PWND Wnd) { if (Wnd->ti == (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) return TRUE; @@ -440,11 +440,11 @@ // // Validate a window handle and return the pointer to the object. // -PWINDOW +PWND FASTCALL ValidateHwnd(HWND hwnd) { - PWINDOW Wnd; + PWND Wnd; PCLIENTINFO ClientInfo = GetWin32ClientInfo(); ASSERT(ClientInfo != NULL); @@ -479,11 +479,11 @@ // // Validate a window handle and return the pointer to the object. // -PWINDOW +PWND FASTCALL ValidateHwndNoErr(HWND hwnd) { - PWINDOW Wnd; + PWND Wnd; PCLIENTINFO ClientInfo = GetWin32ClientInfo(); ASSERT(ClientInfo != NULL); @@ -515,11 +515,11 @@ return NULL; } -PWINDOW +PWND FASTCALL GetThreadDesktopWnd(VOID) { - PWINDOW Wnd = GetThreadDesktopInfo()->Wnd; + PWND Wnd = GetThreadDesktopInfo()->Wnd; if (Wnd != NULL) Wnd = DesktopPtrToUser(Wnd); return Wnd; @@ -528,7 +528,7 @@ // // Validate a window handle and return the pointer to the object. // -PWINDOW +PWND FASTCALL ValidateHwndOrDesk(HWND hwnd) { Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -194,8 +194,8 @@ DWORD WINAPI GetClassLongA(HWND hWnd, int nIndex) { - PWINDOW Wnd; - PWINDOWCLASS Class; + PWND Wnd; + PCLS Class; ULONG_PTR Ret = 0; TRACE("%p %d\n", hWnd, nIndex); @@ -307,8 +307,8 @@ DWORD WINAPI GetClassLongW ( HWND hWnd, int nIndex ) { - PWINDOW Wnd; - PWINDOWCLASS Class; + PWND Wnd; + PCLS Class; ULONG_PTR Ret = 0; TRACE("%p %d\n", hWnd, nIndex); @@ -500,7 +500,7 @@ WINAPI GetWindowLongA ( HWND hWnd, int nIndex ) { - PWINDOW Wnd; + PWND Wnd; Wnd = ValidateHwnd(hWnd); if (Wnd == NULL) @@ -557,7 +557,7 @@ WINAPI GetWindowLongW(HWND hWnd, int nIndex) { - PWINDOW Wnd; + PWND Wnd; Wnd = ValidateHwnd(hWnd); if (Wnd == NULL) Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -115,7 +115,7 @@ } void -UserGetInsideRectNC(PWINDOW Wnd, RECT *rect) +UserGetInsideRectNC(PWND Wnd, RECT *rect) { ULONG Style; ULONG ExStyle; @@ -262,7 +262,7 @@ } static LONG -DefWndStartSizeMove(HWND hWnd, PWINDOW Wnd, WPARAM wParam, POINT *capturePoint) +DefWndStartSizeMove(HWND hWnd, PWND Wnd, WPARAM wParam, POINT *capturePoint) { LONG hittest = 0; POINT pt; @@ -409,7 +409,7 @@ DWORD dwPoint = GetMessagePos(); BOOL DragFullWindows = FALSE; HWND hWndParent = NULL; - PWINDOW Wnd; + PWND Wnd; Wnd = ValidateHwnd(hwnd); if (!Wnd) @@ -1616,7 +1616,7 @@ case WM_QUERYUISTATE: { LRESULT Ret = 0; - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) { if (Wnd->HideFocus) @@ -1632,7 +1632,7 @@ BOOL AlwaysShowCues = FALSE; WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); - PWINDOW Wnd; + PWND Wnd; SystemParametersInfoW(SPI_GETKEYBOARDCUES, 0, &AlwaysShowCues, 0); if (AlwaysShowCues) @@ -1694,7 +1694,7 @@ { /* We're a child window and we need to pass this message down until we reach the root */ - hWnd = UserHMGetHandle((PWINDOW)DesktopPtrToUser(Wnd->spwndParent)); + hWnd = UserHMGetHandle((PWND)DesktopPtrToUser(Wnd->spwndParent)); } else { @@ -1714,7 +1714,7 @@ BOOL AlwaysShowCues = FALSE; WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); - PWINDOW Wnd; + PWND Wnd; SystemParametersInfoW(SPI_GETKEYBOARDCUES, 0, &AlwaysShowCues, 0); if (AlwaysShowCues) @@ -1870,7 +1870,7 @@ LPARAM lParam) { LRESULT Result = 0; - PWINDOW Wnd; + PWND Wnd; SPY_EnterMessage(SPY_DEFWNDPROC, hWnd, Msg, wParam, lParam); switch (Msg) @@ -2019,7 +2019,7 @@ LPARAM lParam) { LRESULT Result = 0; - PWINDOW Wnd; + PWND Wnd; SPY_EnterMessage(SPY_DEFWNDPROC, hWnd, Msg, wParam, lParam); switch (Msg) Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -146,7 +146,7 @@ */ DIALOGINFO * DIALOG_get_info( HWND hWnd, BOOL create ) { - PWINDOW pWindow; + PWND pWindow; DIALOGINFO* dlgInfo = (DIALOGINFO *)GetWindowLongPtrW( hWnd, DWLP_ROS_DIALOGINFO ); if(!dlgInfo && create) Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -566,7 +566,7 @@ PWCHAR Text; BOOL flat_menu = FALSE; int bkgnd; - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (!Wnd) return; Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -1304,7 +1304,7 @@ static LRESULT WINAPI -IntCallMessageProc(IN PWINDOW Wnd, IN HWND hWnd, IN UINT Msg, IN WPARAM wParam, IN LPARAM lParam, IN BOOL Ansi) +IntCallMessageProc(IN PWND Wnd, IN HWND hWnd, IN UINT Msg, IN WPARAM wParam, IN LPARAM lParam, IN BOOL Ansi) { WNDPROC WndProc; BOOL IsAnsi; @@ -1335,7 +1335,7 @@ { LRESULT Ret = 0; MSG UnicodeMsg; - PWINDOW Wnd; + PWND Wnd; if (lpmsg->hwnd != NULL) { @@ -1396,7 +1396,7 @@ DispatchMessageW(CONST MSG *lpmsg) { LRESULT Ret = 0; - PWINDOW Wnd; + PWND Wnd; if (lpmsg->hwnd != NULL) { @@ -1797,7 +1797,7 @@ if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { - PWINDOW Window; + PWND Window; PW32THREADINFO ti = GetW32ThreadInfo(); Window = ValidateHwnd(Wnd); @@ -1861,7 +1861,7 @@ if (Wnd != HWND_BROADCAST && (Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST)) { - PWINDOW Window; + PWND Window; PW32THREADINFO ti = GetW32ThreadInfo(); Window = ValidateHwnd(Wnd); Modified: trunk/reactos/dll/win32/user32/windows/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/prop.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -43,7 +43,7 @@ { PLIST_ENTRY ListEntry, temp; PPROPERTY Property; - PWINDOW pWnd; + PWND pWnd; int i; pWnd = ValidateHwnd(hWnd); Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -515,7 +515,7 @@ HWND WINAPI GetDesktopWindow(VOID) { - PWINDOW Wnd; + PWND Wnd; HWND Ret = NULL; _SEH2_TRY @@ -838,7 +838,7 @@ GetAncestor(HWND hwnd, UINT gaFlags) { HWND Ret = NULL; - PWINDOW Ancestor, Wnd; + PWND Ancestor, Wnd; Wnd = ValidateHwnd(hwnd); if (!Wnd) @@ -882,7 +882,7 @@ BOOL WINAPI GetClientRect(HWND hWnd, LPRECT lpRect) { - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) { @@ -902,7 +902,7 @@ HWND WINAPI GetLastActivePopup(HWND hWnd) { - PWINDOW Wnd; + PWND Wnd; HWND Ret = hWnd; Wnd = ValidateHwnd(hWnd); @@ -929,7 +929,7 @@ HWND WINAPI GetParent(HWND hWnd) { - PWINDOW Wnd, WndParent; + PWND Wnd, WndParent; HWND Ret = NULL; Wnd = ValidateHwnd(hWnd); @@ -989,7 +989,7 @@ GetWindow(HWND hWnd, UINT uCmd) { - PWINDOW Wnd, FoundWnd; + PWND Wnd, FoundWnd; HWND Ret = NULL; Wnd = ValidateHwnd(hWnd); @@ -1095,7 +1095,7 @@ GetWindowRect(HWND hWnd, LPRECT lpRect) { - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) { @@ -1113,7 +1113,7 @@ int WINAPI GetWindowTextA(HWND hWnd, LPSTR lpString, int nMaxCount) { - PWINDOW Wnd; + PWND Wnd; PCWSTR Buffer; INT Length = 0; @@ -1203,7 +1203,7 @@ int WINAPI GetWindowTextW(HWND hWnd, LPWSTR lpString, int nMaxCount) { - PWINDOW Wnd; + PWND Wnd; PCWSTR Buffer; INT Length = 0; @@ -1264,7 +1264,7 @@ { DWORD Ret = 0; PW32THREADINFO ti; - PWINDOW pWnd = ValidateHwnd(hWnd); + PWND pWnd = ValidateHwnd(hWnd); if (!pWnd) return Ret; @@ -1298,7 +1298,7 @@ IsChild(HWND hWndParent, HWND hWnd) { - PWINDOW WndParent, Wnd; + PWND WndParent, Wnd; BOOL Ret = FALSE; WndParent = ValidateHwnd(hWndParent); @@ -1341,7 +1341,7 @@ BOOL WINAPI IsIconic(HWND hWnd) { - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) return (Wnd->style & WS_MINIMIZE) != 0; @@ -1356,7 +1356,7 @@ BOOL WINAPI IsWindow(HWND hWnd) { - PWINDOW Wnd = ValidateHwndNoErr(hWnd); + PWND Wnd = ValidateHwndNoErr(hWnd); if (Wnd != NULL) { /* FIXME: If window is being destroyed return FALSE! */ @@ -1373,7 +1373,7 @@ BOOL WINAPI IsWindowUnicode(HWND hWnd) { - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) return Wnd->Unicode; @@ -1389,7 +1389,7 @@ IsWindowVisible(HWND hWnd) { BOOL Ret = FALSE; - PWINDOW Wnd = ValidateHwnd(hWnd); + PWND Wnd = ValidateHwnd(hWnd); if (Wnd != NULL) { @@ -1678,7 +1678,7 @@ int WINAPI MapWindowPoints(HWND hWndFrom, HWND hWndTo, LPPOINT lpPoints, UINT cPoints) { - PWINDOW FromWnd, ToWnd; + PWND FromWnd, ToWnd; POINT Delta; UINT i; @@ -1709,7 +1709,7 @@ BOOL WINAPI ScreenToClient(HWND hWnd, LPPOINT lpPoint) { - PWINDOW Wnd, DesktopWnd; + PWND Wnd, DesktopWnd; Wnd = ValidateHwnd(hWnd); if (!Wnd) @@ -1730,7 +1730,7 @@ BOOL WINAPI ClientToScreen(HWND hWnd, LPPOINT lpPoint) { - PWINDOW Wnd, DesktopWnd; + PWND Wnd, DesktopWnd; Wnd = ValidateHwnd(hWnd); if (!Wnd) Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -3,7 +3,7 @@ typedef struct _PROCESSINFO *PPROCESSINFO; struct _W32THREADINFO; -struct _WINDOW; +struct _WND; typedef struct _LARGE_UNICODE_STRING { @@ -75,7 +75,7 @@ HWND hTaskManWindow; HWND hProgmanWindow; HWND hShellWindow; - struct _WINDOW *Wnd; + struct _WND *Wnd; union { @@ -107,9 +107,9 @@ #define CSF_CACHEDSMICON 0x0040 #define CSF_WIN40COMPAT 0x0080 -typedef struct _WINDOWCLASS -{ - struct _WINDOWCLASS *pclsNext; +typedef struct _CLS +{ + struct _CLS *pclsNext; RTL_ATOM atomClassName; ATOM atomNVClassName; DWORD fnid; // New ClassId @@ -119,8 +119,8 @@ PSTR lpszClientAnsiMenuName; PWSTR lpszClientUnicodeMenuName; PCALLPROC spcpdFirst; - struct _WINDOWCLASS *pclsBase; - struct _WINDOWCLASS *pclsClone; + struct _CLS *pclsBase; + struct _CLS *pclsClone; ULONG cWndReferenceCount; UINT style; WNDPROC lpfnWndProc; @@ -145,7 +145,7 @@ UINT Global : 1; // CS_GLOBALCLASS UINT MenuNameIsString : 1; UINT NotUsed : 27; -} WINDOWCLASS, *PWINDOWCLASS; +} CLS, *PCLS; // State Flags !Not Implemented! @@ -239,7 +239,7 @@ #define WS_EX2_CONSOLEWINDOW 0X00000400 #define WS_EX2_CHILDNOACTIVATE 0X00000800 -typedef struct _WINDOW +typedef struct _WND { USER_OBJHDR hdr; /* FIXME: Move out of the structure once new handle manager is implemented */ /* NOTE: This structure is located in the desktop heap and will @@ -259,11 +259,11 @@ /* Handle of the module that created the window. */ HINSTANCE hModule; DWORD fnid; - struct _WINDOW *spwndNext; - struct _WINDOW *spwndPrev; - struct _WINDOW *spwndParent; - struct _WINDOW *spwndChild; - struct _WINDOW *spwndOwner; + struct _WND *spwndNext; + struct _WND *spwndPrev; + struct _WND *spwndParent; + struct _WND *spwndChild; + struct _WND *spwndOwner; RECT rcWindow; RECT rcClient; WNDPROC lpfnWndProc; @@ -276,7 +276,7 @@ }; /* Pointer to the window class. */ - PWINDOWCLASS pcls; + PCLS pcls; HRGN hrgnUpdate; /* Property list head.*/ LIST_ENTRY PropListHead; @@ -291,12 +291,12 @@ /* Size of the extra data associated with the window. */ ULONG cbwndExtra; HWND hWndLastActive; - struct _WINDOW *spwndLastActive; + struct _WND *spwndLastActive; //HIMC hImc; // Input context associated with this window. LONG dwUserData; //PACTIVATION_CONTEXT pActCtx; //PD3DMATRIX pTransForm; - struct _WINDOW *spwndClipboardListener; + struct _WND *spwndClipboardListener; DWORD ExStyle2; struct @@ -312,7 +312,7 @@ UINT InternalPosInitialized : 1; UINT HideFocus : 1; // WS_EX_UISTATEFOCUSRECTHIDDEN ? UINT HideAccel : 1; // WS_EX_UISTATEKBACCELHIDDEN ? -} WINDOW, *PWINDOW; +} WND, *PWND; typedef struct _PFNCLIENT { Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -44,13 +44,13 @@ void FASTCALL DestroyProcessClasses(PW32PROCESS Process ); -PWINDOWCLASS -IntReferenceClass(IN OUT PWINDOWCLASS BaseClass, - IN OUT PWINDOWCLASS *ClassLink, +PCLS +IntReferenceClass(IN OUT PCLS BaseClass, + IN OUT PCLS *ClassLink, IN PDESKTOP Desktop); VOID -IntDereferenceClass(IN OUT PWINDOWCLASS Class, +IntDereferenceClass(IN OUT PCLS Class, IN PDESKTOPINFO Desktop, IN PPROCESSINFO pi); @@ -66,7 +66,7 @@ IN HINSTANCE hInstance); ULONG_PTR -UserGetClassLongPtr(IN PWINDOWCLASS Class, +UserGetClassLongPtr(IN PCLS Class, IN INT Index, IN BOOL Ansi); @@ -74,10 +74,10 @@ IntGetClassAtom(IN PUNICODE_STRING ClassName, IN HINSTANCE hInstance OPTIONAL, IN PPROCESSINFO pi OPTIONAL, - OUT PWINDOWCLASS *BaseClass OPTIONAL, - OUT PWINDOWCLASS **Link OPTIONAL); + OUT PCLS *BaseClass OPTIONAL, + OUT PCLS **Link OPTIONAL); -PWINDOWCLASS +PCLS FASTCALL IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, @@ -88,7 +88,7 @@ IN PPROCESSINFO pi); PCALLPROC -UserFindCallProc(IN PWINDOWCLASS Class, +UserFindCallProc(IN PCLS Class, IN WNDPROC WndProc, IN BOOL bUnicode); @@ -97,7 +97,7 @@ IN PREGISTER_SYSCLASS SystemClasses); VOID -UserAddCallProcToClass(IN OUT PWINDOWCLASS Class, +UserAddCallProcToClass(IN OUT PCLS Class, IN PCALLPROC CallProc); BOOL Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -28,12 +28,12 @@ PWIN32HEAP pheapDesktop; PSECTION_OBJECT DesktopHeapSection; PDESKTOPINFO DesktopInfo; - PWINDOW spwndMessage; + PWND spwndMessage; } DESKTOP, *PDESKTOP; extern PDESKTOP InputDesktop; extern HDESK InputDesktopHandle; -extern PWINDOWCLASS DesktopWindowClass; +extern PCLS DesktopWindowClass; extern HDC ScreenDeviceContext; extern BOOL g_PaintDesktopVersion; Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -101,9 +101,9 @@ W32PROCESS XzyxW32Process; /* Place holder. */ /* ReactOS */ HINSTANCE hModUser; - PWINDOWCLASS LocalClassList; - PWINDOWCLASS GlobalClassList; - PWINDOWCLASS SystemClassList; + PCLS LocalClassList; + PCLS GlobalClassList; + PCLS SystemClassList; UINT RegisteredSysClasses : 1; Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -15,7 +15,7 @@ extern ATOM AtomMessage; -BOOL FASTCALL UserUpdateUiState(PWINDOW Wnd, WPARAM wParam); +BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam); typedef struct _WINDOW_OBJECT { @@ -23,7 +23,7 @@ is a pointer to the WINDOW structure that eventually replaces the WINDOW_OBJECT structure! USER32 expects this pointer to be here until WINDOW_OBJECT has completely been superseded! */ - PWINDOW Wnd; + PWND Wnd; /* Pointer to the thread information */ PW32THREADINFO ti; @@ -171,7 +171,7 @@ VOID FASTCALL IntNotifyWinEvent(DWORD, HWND, LONG, LONG); -PWINDOW APIENTRY co_IntCreateWindowEx(DWORD,PUNICODE_STRING,PUNICODE_STRING,DWORD,LONG,LONG,LONG,LONG,HWND,HMENU,HINSTANCE,LPVOID,DWORD,BOOL); +PWND APIENTRY co_IntCreateWindowEx(DWORD,PUNICODE_STRING,PUNICODE_STRING,DWORD,LONG,LONG,LONG,LONG,HWND,HMENU,HINSTANCE,LPVOID,DWORD,BOOL); #endif /* _WIN32K_WINDOW_H */ /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -75,7 +75,7 @@ /* WINDOWCLASS ***************************************************************/ static VOID -IntFreeClassMenuName(IN OUT PWINDOWCLASS Class) +IntFreeClassMenuName(IN OUT PCLS Class) { /* free the menu name, if it was changed and allocated */ if (Class->MenuName != NULL && Class->MenuNameIsString) @@ -87,7 +87,7 @@ } static VOID -IntDestroyClass(IN OUT PWINDOWCLASS Class) +IntDestroyClass(IN OUT PCLS Class) { /* there shouldn't be any clones anymore */ ASSERT(Class->cWndReferenceCount == 0); @@ -135,7 +135,7 @@ /* clean all process classes. all process windows must cleaned first!! */ void FASTCALL DestroyProcessClasses(PW32PROCESS Process ) { - PWINDOWCLASS Class; + PCLS Class; PPROCESSINFO pi = (PPROCESSINFO)Process; if (pi != NULL) @@ -239,7 +239,7 @@ } PCALLPROC -UserFindCallProc(IN PWINDOWCLASS Class, +UserFindCallProc(IN PCLS Class, IN WNDPROC WndProc, IN BOOL bUnicode) { @@ -261,10 +261,10 @@ } VOID -UserAddCallProcToClass(IN OUT PWINDOWCLASS Class, +UserAddCallProcToClass(IN OUT PCLS Class, IN PCALLPROC CallProc) { - PWINDOWCLASS BaseClass; + PCLS BaseClass; ASSERT(CallProc->Next == NULL); @@ -283,7 +283,7 @@ } static BOOL -IntSetClassAtom(IN OUT PWINDOWCLASS Class, +IntSetClassAtom(IN OUT PCLS Class, IN PUNICODE_STRING ClassName) { RTL_ATOM Atom = (RTL_ATOM)0; @@ -314,7 +314,7 @@ } static WNDPROC -IntGetClassWndProc(IN PWINDOWCLASS Class, +IntGetClassWndProc(IN PCLS Class, IN PPROCESSINFO pi, IN BOOL Ansi) { @@ -332,7 +332,7 @@ } else { - PWINDOWCLASS BaseClass; + PCLS BaseClass; /* make sure the call procedures are located on the desktop of the base class! */ @@ -387,7 +387,7 @@ } static WNDPROC -IntSetClassWndProc(IN OUT PWINDOWCLASS Class, +IntSetClassWndProc(IN OUT PCLS Class, IN WNDPROC WndProc, IN BOOL Ansi) { @@ -441,13 +441,13 @@ return Ret; } -static PWINDOWCLASS -IntGetClassForDesktop(IN OUT PWINDOWCLASS BaseClass, - IN OUT PWINDOWCLASS *ClassLink, +static PCLS +IntGetClassForDesktop(IN OUT PCLS BaseClass, + IN OUT PCLS *ClassLink, IN PDESKTOP Desktop) { SIZE_T ClassSize; - PWINDOWCLASS Class; + PCLS Class; ASSERT(Desktop != NULL); ASSERT(BaseClass->pclsBase == BaseClass); @@ -548,12 +548,12 @@ return Class; } -PWINDOWCLASS -IntReferenceClass(IN OUT PWINDOWCLASS BaseClass, - IN OUT PWINDOWCLASS *ClassLink, +PCLS +IntReferenceClass(IN OUT PCLS BaseClass, + IN OUT PCLS *ClassLink, IN PDESKTOP Desktop) { - PWINDOWCLASS Class; + PCLS Class; ASSERT(BaseClass->pclsBase == BaseClass); @@ -569,11 +569,11 @@ } static VOID -IntMakeCloneBaseClass(IN OUT PWINDOWCLASS Class, - IN OUT PWINDOWCLASS *BaseClassLink, - IN OUT PWINDOWCLASS *CloneLink) -{ - PWINDOWCLASS Clone, BaseClass; +IntMakeCloneBaseClass(IN OUT PCLS Class, + IN OUT PCLS *BaseClassLink, + IN OUT PCLS *CloneLink) +{ + PCLS Clone, BaseClass; ASSERT(Class->pclsBase != Class); ASSERT(Class->pclsBase->pclsClone != NULL); @@ -611,11 +611,11 @@ } VOID -IntDereferenceClass(IN OUT PWINDOWCLASS Class, +IntDereferenceClass(IN OUT PCLS Class, IN PDESKTOPINFO Desktop, IN PPROCESSINFO pi) { - PWINDOWCLASS *PrevLink, BaseClass, CurrentClass; + PCLS *PrevLink, BaseClass, CurrentClass; BaseClass = Class->pclsBase; @@ -690,10 +690,10 @@ } static BOOL -IntMoveClassToSharedHeap(IN OUT PWINDOWCLASS Class, - IN OUT PWINDOWCLASS **ClassLinkPtr) -{ - PWINDOWCLASS NewClass; +IntMoveClassToSharedHeap(IN OUT PCLS Class, + IN OUT PCLS **ClassLinkPtr) +{ + PCLS NewClass; SIZE_T ClassSize; ASSERT(Class->pclsBase == Class); @@ -730,11 +730,11 @@ static VOID IntCheckDesktopClasses(IN PDESKTOP Desktop, - IN OUT PWINDOWCLASS *ClassList, + IN OUT PCLS *ClassList, IN BOOL FreeOnFailure, OUT BOOL *Ret) { - PWINDOWCLASS Class, NextClass, *Link; + PCLS Class, NextClass, *Link; /* NOTE: We only need to check base classes! When classes are no longer needed on a desktop, the clones will be freed automatically as soon as possible. @@ -835,7 +835,7 @@ return Ret; } -PWINDOWCLASS +PCLS FASTCALL IntCreateClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, @@ -846,7 +846,7 @@ IN PPROCESSINFO pi) { SIZE_T ClassSize; - PWINDOWCLASS Class = NULL; + PCLS Class = NULL; RTL_ATOM Atom; PWSTR pszMenuName = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -998,13 +998,13 @@ return Class; } -static PWINDOWCLASS +static PCLS IntFindClass(IN RTL_ATOM Atom, IN HINSTANCE hInstance, - IN PWINDOWCLASS *ClassList, - OUT PWINDOWCLASS **Link OPTIONAL) -{ - PWINDOWCLASS Class, *PrevLink = ClassList; + IN PCLS *ClassList, + OUT PCLS **Link OPTIONAL) +{ + PCLS Class, *PrevLink = ClassList; Class = *PrevLink; while (Class != NULL) @@ -1097,8 +1097,8 @@ IntGetClassAtom(IN PUNICODE_STRING ClassName, IN HINSTANCE hInstance OPTIONAL, IN PPROCESSINFO pi OPTIONAL, - OUT PWINDOWCLASS *BaseClass OPTIONAL, - OUT PWINDOWCLASS **Link OPTIONAL) + OUT PCLS *BaseClass OPTIONAL, + OUT PCLS **Link OPTIONAL) { RTL_ATOM Atom = (RTL_ATOM)0; @@ -1108,7 +1108,7 @@ &Atom) && Atom != (RTL_ATOM)0) { - PWINDOWCLASS Class; + PCLS Class; /* attempt to locate the class object */ @@ -1183,7 +1183,7 @@ PTHREADINFO pti; PW32THREADINFO ti; PPROCESSINFO pi; - PWINDOWCLASS Class; + PCLS Class; RTL_ATOM ClassAtom; RTL_ATOM Ret = (RTL_ATOM)0; @@ -1236,7 +1236,7 @@ if (Class != NULL) { - PWINDOWCLASS *List; + PCLS *List; /* Register the class */ if (Class->System) @@ -1260,10 +1260,10 @@ UserUnregisterClass(IN PUNICODE_STRING ClassName, IN HINSTANCE hInstance) { - PWINDOWCLASS *Link; + PCLS *Link; PPROCESSINFO pi; RTL_ATOM ClassAtom; - PWINDOWCLASS Class; + PCLS Class; pi = GetW32ProcessInfo(); if (pi == NULL) @@ -1310,7 +1310,7 @@ } INT -UserGetClassName(IN PWINDOWCLASS Class, +UserGetClassName(IN PCLS Class, IN OUT PUNICODE_STRING ClassName, IN BOOL Ansi) { @@ -1428,7 +1428,7 @@ } ULONG_PTR -UserGetClassLongPtr(IN PWINDOWCLASS Class, +UserGetClassLongPtr(IN PCLS Class, IN INT Index, IN BOOL Ansi) { @@ -1520,7 +1520,7 @@ } static BOOL -IntSetClassMenuName(IN PWINDOWCLASS Class, +IntSetClassMenuName(IN PCLS Class, IN PUNICODE_STRING MenuName) { BOOL Ret = FALSE; @@ -1624,7 +1624,7 @@ } ULONG_PTR -UserSetClassLongPtr(IN PWINDOWCLASS Class, +UserSetClassLongPtr(IN PCLS Class, IN INT Index, IN ULONG_PTR NewLong, IN BOOL Ansi) @@ -1816,7 +1816,7 @@ } static BOOL -UserGetClassInfo(IN PWINDOWCLASS Class, +UserGetClassInfo(IN PCLS Class, OUT PWNDCLASSEXW lpwcx, IN BOOL Ansi, HINSTANCE hInstance) @@ -1862,7 +1862,7 @@ UNICODE_STRING ClassName, MenuName; PPROCESSINFO pi = GetW32ProcessInfo(); WNDCLASSEXW wc; - PWINDOWCLASS Class; + PCLS Class; BOOL Ret = TRUE; if (pi->RegisteredSysClasses || pi->hModUser == NULL) @@ -1992,7 +1992,7 @@ CapturedClassInfo.cbClsExtra + CapturedName.Length + CapturedMenuName.Length + - sizeof(WINDOWCLASS) < CapturedClassInfo.cbClsExtra || + sizeof(CLS) < CapturedClassInfo.cbClsExtra || CapturedClassInfo.cbWndExtra < 0 || CapturedClassInfo.hInstance == NULL) { @@ -2231,7 +2231,7 @@ BOOL Ansi) { UNICODE_STRING CapturedClassName; - PWINDOWCLASS Class; + PCLS Class; RTL_ATOM ClassAtom; PPROCESSINFO pi; BOOL Ret = FALSE; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -108,7 +108,7 @@ LPARAM lParam, BOOL Ansi) { - PWINDOW Wnd; + PWND Wnd; LRESULT lResult = 0; if (Msg > WM_USER) return 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -686,7 +686,7 @@ #else PWINDOW_OBJECT DesktopWindow; - PWINDOW DesktopWnd; + PWND DesktopWnd; DesktopWindow = IntGetWindowObject(Desktop->DesktopWindow); if (! DesktopWindow) @@ -914,8 +914,8 @@ UNICODE_STRING ClassName, WindowName, MenuName; PPROCESSINFO pi = GetW32ProcessInfo(); WNDCLASSEXW wc; - PWINDOWCLASS Class; - PWINDOW pWnd; + PCLS Class; + PWND pWnd; DECLARE_RETURN(HDESK); DPRINT("Enter NtUserCreateDesktop: %wZ\n", lpszDesktopName); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -196,7 +196,7 @@ HWND hWndFocus = FocusWindow->hSelf; HWND hWndFocusPrev = NULL; PUSER_MESSAGE_QUEUE PrevForegroundQueue; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); @@ -273,7 +273,7 @@ HWND Top; PWINDOW_OBJECT TopWindow; USER_REFERENCE_ENTRY Ref; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); @@ -319,7 +319,7 @@ PUSER_MESSAGE_QUEUE ThreadQueue; HWND hWndPrev; HWND hWnd = 0; - PWINDOW Wnd; + PWND Wnd; CBTACTIVATESTRUCT cbt; if (Window) @@ -577,7 +577,7 @@ HWND hWndPrev; PWINDOW_OBJECT TopWnd; USER_REFERENCE_ENTRY Ref; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -58,7 +58,7 @@ IntIntersectWithParents(PWINDOW_OBJECT Child, RECTL *WindowRect) { PWINDOW_OBJECT ParentWindow; - PWINDOW ParentWnd; + PWND ParentWnd; ParentWindow = Child->Parent; while (ParentWindow != NULL) @@ -87,7 +87,7 @@ IntValidateParent(PWINDOW_OBJECT Child, HRGN hValidateRgn, BOOL Recurse) { PWINDOW_OBJECT ParentWindow = Child->Parent; - PWINDOW ParentWnd; + PWND ParentWnd; while (ParentWindow) { @@ -119,7 +119,7 @@ HRGN FASTCALL IntCalcWindowRgn(PWINDOW_OBJECT Window, BOOL Client) { - PWINDOW Wnd; + PWND Wnd; HRGN hRgnWindow; UINT RgnType; @@ -241,7 +241,7 @@ HDC hDC; HWND hWnd = Window->hSelf; HRGN TempRegion; - PWINDOW Wnd; + PWND Wnd; Wnd = Window->Wnd; @@ -339,7 +339,7 @@ IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags) { INT RgnType; - PWINDOW Wnd; + PWND Wnd; BOOL HadPaintMessage, HadNCPaintMessage; BOOL HasPaintMessage, HasNCPaintMessage; @@ -511,7 +511,7 @@ IntIsWindowDrawable(PWINDOW_OBJECT Window) { PWINDOW_OBJECT WndObject; - PWINDOW Wnd; + PWND Wnd; for (WndObject = Window; WndObject != NULL; WndObject = WndObject->Parent) { @@ -628,7 +628,7 @@ BOOL FASTCALL IntIsWindowDirty(PWINDOW_OBJECT Window) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; return (Wnd->style & WS_VISIBLE) && ((Window->UpdateRegion != NULL) || (Window->Flags & WINDOWOBJECT_NEED_INTERNALPAINT) || @@ -640,7 +640,7 @@ { HWND hChild; PWINDOW_OBJECT TempWindow; - PWINDOW Wnd, TempWnd; + PWND Wnd, TempWnd; for (; Window != NULL; Window = Window->NextSibling) { @@ -773,7 +773,7 @@ NTSTATUS Status; DECLARE_RETURN(HDC); USER_REFERENCE_ENTRY Ref; - PWINDOW Wnd; + PWND Wnd; DPRINT("Enter NtUserBeginPaint\n"); UserEnterExclusive(); @@ -1623,7 +1623,7 @@ RECTL r = *lpRc; LONG ButtonWidth, IconWidth; BOOL HasIcon; - PWINDOW Wnd = NULL; + PWND Wnd = NULL; //ASSERT(pWnd != NULL); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -60,7 +60,7 @@ IntGetScrollBarRect (PWINDOW_OBJECT Window, INT nBar, RECTL *lprect) { BOOL vertical; - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; RECTL ClientRect = Window->Wnd->rcClient; RECTL WindowRect = Window->Wnd->rcWindow; @@ -105,7 +105,7 @@ BOOL FASTCALL IntCalculateThumb(PWINDOW_OBJECT Window, LONG idObject, PSCROLLBARINFO psbi, LPSCROLLINFO psi) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; INT Thumb, ThumbBox, ThumbPos, cxy, mx; RECTL ClientRect; @@ -829,7 +829,7 @@ co_UserShowScrollBar(PWINDOW_OBJECT Window, int wBar, DWORD bShow) { DWORD Style, OldStyle; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -646,7 +646,7 @@ { BOOL Ret = 0; PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(BOOLEAN); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -39,7 +39,7 @@ { HRGN VisRgn, ClipRgn; PWINDOW_OBJECT PreviousWindow, CurrentWindow, CurrentSibling; - PWINDOW Wnd, CurrentWnd, PreviousWnd, CurrentSiblingWnd; + PWND Wnd, CurrentWnd, PreviousWnd, CurrentSiblingWnd; Wnd = Window->Wnd; @@ -151,7 +151,7 @@ HRGN Temp; PWINDOW_OBJECT Parent; USER_REFERENCE_ENTRY Ref; - PWINDOW Wnd, ParentWnd; + PWND Wnd, ParentWnd; ASSERT_REFS_CO(Window); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -73,7 +73,7 @@ DceAllocDCE(PWINDOW_OBJECT Window OPTIONAL, DCE_TYPE Type) { PDCE pDce; - PWINDOW Wnd = NULL; + PWND Wnd = NULL; if (Window) Wnd = Window->Wnd; @@ -137,7 +137,7 @@ DceSetDrawable(PWINDOW_OBJECT Window OPTIONAL, HDC hDC, ULONG Flags, BOOL SetClipOrigin) { - PWINDOW Wnd; + PWND Wnd; DC *dc = DC_LockDc(hDC); if(!dc) return; @@ -240,7 +240,7 @@ if (Flags & DCX_PARENTCLIP) { PWINDOW_OBJECT Parent; - PWINDOW ParentWnd; + PWND ParentWnd; Parent = Window->Parent; if(!Parent) @@ -323,7 +323,7 @@ DCE* Dce = NULL; BOOL UpdateVisRgn = TRUE; BOOL UpdateClipOrigin = FALSE; - PWINDOW Wnd = NULL; + PWND Wnd = NULL; HDC hDC = NULL; if (NULL == Window) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -49,7 +49,7 @@ /* HELPER FUNCTIONS ***********************************************************/ -BOOL FASTCALL UserUpdateUiState(PWINDOW Wnd, WPARAM wParam) +BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam) { WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); @@ -317,7 +317,7 @@ UserFreeWindowInfo(PW32THREADINFO ti, PWINDOW_OBJECT WindowObject) { PCLIENTINFO ClientInfo = GetWin32ClientInfo(); - PWINDOW Wnd = WindowObject->Wnd; + PWND Wnd = WindowObject->Wnd; if (ClientInfo->CallbackWnd.pvWnd == DesktopHeapAddressToUser(WindowObject->Wnd)) { @@ -357,7 +357,7 @@ PWINDOW_OBJECT Child; PMENU_OBJECT Menu; BOOLEAN BelongsToThreadData; - PWINDOW Wnd; + PWND Wnd; ASSERT(Window); @@ -509,7 +509,7 @@ VOID FASTCALL IntGetWindowBorderMeasures(PWINDOW_OBJECT Window, UINT *cx, UINT *cy) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; if(HAS_DLGFRAME(Wnd->style, Wnd->ExStyle) && !(Wnd->style & WS_MINIMIZE)) { *cx = UserGetSystemMetrics(SM_CXDLGFRAME); @@ -538,7 +538,7 @@ IntGetWindowProc(IN PWINDOW_OBJECT Window, IN BOOL Ansi) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; ASSERT(UserIsEnteredExclusive() == TRUE); @@ -595,7 +595,7 @@ BOOL FASTCALL IntGetWindowInfo(PWINDOW_OBJECT Window, PWINDOWINFO pwi) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; pwi->cbSize = sizeof(WINDOWINFO); pwi->rcWindow = Window->Wnd->rcWindow; @@ -616,7 +616,7 @@ BOOL *Changed) { PMENU_OBJECT OldMenu, NewMenu = NULL; - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; if ((Wnd->style & (WS_CHILD | WS_POPUP)) == WS_CHILD) { @@ -870,7 +870,7 @@ IntIsChildWindow(PWINDOW_OBJECT Parent, PWINDOW_OBJECT BaseWindow) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; Window = BaseWindow; while (Window) @@ -895,7 +895,7 @@ IntIsWindowVisible(PWINDOW_OBJECT BaseWindow) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; Window = BaseWindow; while(Window) @@ -1179,7 +1179,7 @@ FASTCALL IntGetWindowPlacement(PWINDOW_OBJECT Window, WINDOWPLACEMENT *lpwndpl) { - PWINDOW Wnd; + PWND Wnd; POINT Size; Wnd = Window->Wnd; @@ -1438,7 +1438,7 @@ for(phWnd = List; *phWnd; phWnd++) { PWINDOW_OBJECT Child; - PWINDOW ChildWnd; + PWND ChildWnd; if((Child = UserGetWindowObject(*phWnd))) { ChildWnd = Child->Wnd; @@ -1518,7 +1518,7 @@ /* * @implemented */ -PWINDOW APIENTRY +PWND APIENTRY co_IntCreateWindowEx(DWORD dwExStyle, PUNICODE_STRING ClassName, PUNICODE_STRING WindowName, @@ -1535,8 +1535,8 @@ BOOL bUnicodeWindow) { PWINSTATION_OBJECT WinSta; - PWINDOW Wnd = NULL; - PWINDOWCLASS *ClassLink, Class = NULL; + PWND Wnd = NULL; + PCLS *ClassLink, Class = NULL; RTL_ATOM ClassAtom; PWINDOW_OBJECT Window = NULL; PWINDOW_OBJECT ParentWindow = NULL, OwnerWindow; @@ -1558,7 +1558,7 @@ CBT_CREATEWNDW CbtCreate; LRESULT Result; BOOL MenuChanged; - DECLARE_RETURN(PWINDOW); + DECLARE_RETURN(PWND); BOOL HasOwner; USER_REFERENCE_ENTRY ParentRef, Ref; PTHREADINFO pti; @@ -1595,7 +1595,7 @@ else if ((dwStyle & (WS_CHILD | WS_POPUP)) == WS_CHILD) { SetLastWin32Error(ERROR_TLW_WITH_WSCHILD); - RETURN( (PWINDOW)0); /* WS_CHILD needs a parent, but WS_POPUP doesn't */ + RETURN( (PWND)0); /* WS_CHILD needs a parent, but WS_POPUP doesn't */ } if (ParentWindowHandle) @@ -1616,7 +1616,7 @@ if (ti == NULL || pti->Desktop == NULL) { DPRINT1("Thread is not attached to a desktop! Cannot create window!\n"); - RETURN( (PWINDOW)0); + RETURN( (PWND)0); } /* Check the class. */ @@ -1639,7 +1639,7 @@ } SetLastWin32Error(ERROR_CANNOT_FIND_WND_CLASS); - RETURN((PWINDOW)0); + RETURN((PWND)0); } Class = IntReferenceClass(Class, @@ -1664,11 +1664,11 @@ if (Window) { Window->Wnd = DesktopHeapAlloc(pti->Desktop, - sizeof(WINDOW) + Class->cbwndExtra); + sizeof(WND) + Class->cbwndExtra); if (!Window->Wnd) goto AllocErr; RtlZeroMemory(Window->Wnd, - sizeof(WINDOW) + Class->cbwndExtra); + sizeof(WND) + Class->cbwndExtra); Window->Wnd->hdr.Handle = hWnd; /* FIXME: Remove hack , are you sure?*/ Wnd = Window->Wnd; @@ -1684,7 +1684,7 @@ AllocErr: ObDereferenceObject(WinSta); SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - RETURN( (PWINDOW)0); + RETURN( (PWND)0); } UserRefObjectCo(Window, &Ref); @@ -1775,7 +1775,7 @@ if (Wnd->strName.Buffer == NULL) { SetLastNtError(STATUS_INSUFFICIENT_RESOURCES); - RETURN( (PWINDOW)0); + RETURN( (PWND)0); } Wnd->strName.Buffer[WindowName->Length / sizeof(WCHAR)] = L'\0'; @@ -1889,7 +1889,7 @@ /* FIXME - Delete window object and remove it from the thread windows list */ /* FIXME - delete allocated DCE */ DPRINT1("CBT-hook returned !0\n"); - RETURN( (PWINDOW) NULL); + RETURN( (PWND) NULL); } } x = Cs.x; @@ -2056,7 +2056,7 @@ { /* FIXME: Cleanup. */ DPRINT1("IntCreateWindowEx(): NCCREATE message failed. No cleanup performed!\n"); - RETURN((PWINDOW)0); + RETURN((PWND)0); } /* Calculate the non-client size. */ @@ -2120,7 +2120,7 @@ /* FIXME: Cleanup. */ DPRINT1("IntCreateWindowEx(): send CREATE message failed. No cleanup performed!\n"); IntUnlinkWindow(Window); - RETURN((PWINDOW)0); + RETURN((PWND)0); } IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window->hSelf, OBJID_WINDOW, 0); @@ -2302,7 +2302,7 @@ UNICODE_STRING WindowName; UNICODE_STRING ClassName; HWND NewWindow = NULL; - PWINDOW pNewWindow; + PWND pNewWindow; DECLARE_RETURN(HWND); DPRINT("Enter NtUserCreateWindowEx(): (%d,%d-%d,%d)\n", x, y, nWidth, nHeight); @@ -2405,7 +2405,7 @@ BOOLEAN FASTCALL co_UserDestroyWindow(PWINDOW_OBJECT Window) { BOOLEAN isChild; - PWINDOW Wnd; + PWND Wnd; HWND hWnd; ASSERT_REFS_CO(Window); // FIXME: temp hack? @@ -3055,7 +3055,7 @@ LPPOINT ptIcon) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; DWORD Ret = 0; BOOL Hit = FALSE; WINDOWPLACEMENT wndpl; @@ -3575,7 +3575,7 @@ UserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi) { PWINDOW_OBJECT Window, Parent; - PWINDOW Wnd; + PWND Wnd; LONG Result = 0; DPRINT("NtUserGetWindowLong(%x,%d,%d)\n", hWnd, (INT)Index, Ansi); @@ -3694,7 +3694,7 @@ { WNDPROC Ret; PCALLPROC CallProc; - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; /* resolve any callproc handle if possible */ if (IsCallProcHandle(NewWndProc)) @@ -3789,7 +3789,7 @@ co_UserSetWindowLong(HWND hWnd, DWORD Index, LONG NewValue, BOOL Ansi) { PWINDOW_OBJECT Window, Parent; - PWINDOW Wnd; + PWND Wnd; PWINSTATION_OBJECT WindowStation; LONG OldValue; STYLESTRUCT Style; @@ -3987,7 +3987,7 @@ WINDOWPLACEMENT *lpwndpl) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; POINT Size; WINDOWPLACEMENT Safepl; NTSTATUS Status; @@ -4318,7 +4318,7 @@ WORD fnID) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; DECLARE_RETURN(BOOL); DPRINT("Enter NtUserSetWindowFNID\n"); @@ -4356,7 +4356,7 @@ WINDOWPLACEMENT *lpwndpl) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; WINDOWPLACEMENT Safepl; NTSTATUS Status; DECLARE_RETURN(BOOL); @@ -4472,7 +4472,7 @@ INT Ret; HRGN VisRgn; ROSRGNDATA *pRgn; - PWINDOW Wnd; + PWND Wnd; if(!Window) { @@ -4513,7 +4513,7 @@ INT Ret; HRGN VisRgn; ROSRGNDATA *pRgn; - PWINDOW Wnd; + PWND Wnd; if(!Window) { @@ -4741,7 +4741,7 @@ NtUserDefSetText(HWND hWnd, PLARGE_STRING WindowText) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; LARGE_STRING SafeText; UNICODE_STRING UnicodeString; BOOL Ret = TRUE; @@ -4877,7 +4877,7 @@ NtUserInternalGetWindowText(HWND hWnd, LPWSTR lpString, INT nMaxCount) { PWINDOW_OBJECT Window; - PWINDOW Wnd; + PWND Wnd; NTSTATUS Status; INT Result; DECLARE_RETURN(INT); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Wed Jul 22 07:23:08 2009 @@ -137,7 +137,7 @@ PWINDOW_OBJECT WndTo = NULL; HWND Fg; USER_REFERENCE_ENTRY Ref; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); @@ -209,7 +209,7 @@ for( i = 0; List[i]; i++) { PWINDOW_OBJECT WndChild; - PWINDOW ChildWnd; + PWND ChildWnd; if (!(WndChild = UserGetWindowObject(List[i]))) continue; @@ -252,7 +252,7 @@ { PWINDOW_OBJECT Parent; UINT XInc, YInc; - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; if (!Wnd->InternalPosInitialized) { @@ -299,7 +299,7 @@ { POINT Size; UINT SwpFlags = 0; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); Wnd = Window->Wnd; @@ -505,7 +505,7 @@ { PWINDOW_OBJECT Parent; UINT wvrFlags = 0; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); Wnd = Window->Wnd; @@ -584,7 +584,7 @@ PRECTL ClientRect) { INT X, Y; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); Wnd = Window->Wnd; @@ -760,7 +760,7 @@ BOOL FASTCALL WinPosFixupFlags(WINDOWPOS *WinPos, PWINDOW_OBJECT Window) { - PWINDOW Wnd = Window->Wnd; + PWND Wnd = Window->Wnd; if (!Wnd) return FALSE; @@ -1327,7 +1327,7 @@ RECTL NewPos; BOOLEAN ShowFlag; // HRGN VisibleRgn; - PWINDOW Wnd; + PWND Wnd; ASSERT_REFS_CO(Window); Wnd = Window->Wnd; @@ -1553,7 +1553,7 @@ ) { PWINDOW_OBJECT Current; - PWINDOW CurrentWnd; + PWND CurrentWnd; HWND *List, *phWnd; USER_REFERENCE_ENTRY Ref; @@ -1680,7 +1680,7 @@ { POINT Size; PWINDOW_OBJECT Window = NULL; - PWINDOW Wnd; + PWND Wnd; MINMAXINFO SafeMinMax; NTSTATUS Status; BOOL ret;

1 0

[jimtabor] 42129: - Fix crash in wine test.
by jimtabor＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: jimtabor Date: Wed Jul 22 06:26:35 2009 New Revision: 42129 URL: http://svn.reactos.org/svn/reactos?rev=42129&view=rev Log: - Fix crash in wine test. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Jul 22 06:26:35 2009 @@ -1842,7 +1842,6 @@ hMenu = co_IntCallLoadMenu( Wnd->pcls->hModule, &MenuName); if (hMenu) IntSetMenu(Window, hMenu, &MenuChanged); - if (MenuName.Buffer) RtlFreeUnicodeString(&MenuName); } } else // Not a child

1 0

[jimtabor] 42128: - [Win32k] Update class and window structures. - Rewritten Set/GetWindowContextHelpId. - Removed NtUserRegisterClassEx, replaced it with NtUserRegisterClassExWOW. - Updated all related files and functions.
by jimtabor＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: jimtabor Date: Wed Jul 22 06:11:06 2009 New Revision: 42128 URL: http://svn.reactos.org/svn/reactos?rev=42128&view=rev Log: - [Win32k] Update class and window structures. - Rewritten Set/GetWindowContextHelpId. - Removed NtUserRegisterClassEx, replaced it with NtUserRegisterClassExWOW. - Updated all related files and functions. Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/callback.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/callback.h trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/prop.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/prop.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -230,6 +230,8 @@ (PVOID)User32CallHookProcFromKernel; NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_EVENTPROC] = (PVOID)User32CallEventProcFromKernel; + NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADMENU] = + (PVOID)User32CallLoadMenuFromKernel; NtUserProcessConnect( NtCurrentProcess(), &UserCon, Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -826,8 +826,83 @@ WORD fnID, DWORD dwFlags) { - RTL_ATOM Atom = 0; - return (ATOM)Atom; + ATOM Atom; + WNDCLASSEXW WndClass; + UNICODE_STRING ClassName; + UNICODE_STRING MenuName = {0}; + CLSMENUNAME clsMenuName; + ANSI_STRING AnsiMenuName; + + if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXW) || + lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 || + lpwcx->lpszClassName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (lpwcx->hInstance == User32Instance) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + /* Yes, this is correct. We should modify the passed structure. */ + if (lpwcx->hInstance == NULL) + ((WNDCLASSEXW*)lpwcx)->hInstance = GetModuleHandleW(NULL); + + RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW)); + + if (NULL == WndClass.hIconSm) + { + WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); + } + + if (WndClass.lpszMenuName != NULL) + { + if (!IS_INTRESOURCE(WndClass.lpszMenuName)) + { + if (WndClass.lpszMenuName[0]) + { + RtlInitUnicodeString(&MenuName, WndClass.lpszMenuName); + } + } + else + { + MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName; + } + } + + if (IS_ATOM(WndClass.lpszClassName)) + { + ClassName.Length = + ClassName.MaximumLength = 0; + ClassName.Buffer = (LPWSTR)WndClass.lpszClassName; + } + else + { + RtlInitUnicodeString(&ClassName, WndClass.lpszClassName); + } + + RtlUnicodeStringToAnsiString( &AnsiMenuName, &MenuName, TRUE); + + clsMenuName.pszClientAnsiMenuName = AnsiMenuName.Buffer; + clsMenuName.pwszClientUnicodeMenuName = MenuName.Buffer; + clsMenuName.pusMenuName = &MenuName; + + Atom = NtUserRegisterClassExWOW( &WndClass, + &ClassName, + NULL, //PUNICODE_STRING ClsNVersion, + &clsMenuName, + fnID, + dwFlags, + pdwWowData); + + TRACE("atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", + Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, + lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass); + + return Atom; } /* @@ -840,7 +915,8 @@ WNDCLASSEXA WndClass; UNICODE_STRING ClassName; UNICODE_STRING MenuName = {0}; - HMENU hMenu = NULL; + CLSMENUNAME clsMenuName; + ANSI_STRING AnsiMenuName; if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXA) || lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 || @@ -850,14 +926,6 @@ return 0; } - /* - * On real Windows this looks more like: - * if (lpwcx->hInstance == User32Instance && - * *(PULONG)((ULONG_PTR)NtCurrentTeb() + 0x6D4) & 0x400) - * But since I have no idea what the magic field in the - * TEB structure means, I rather decided to omit that. - * -- Filip Navara - */ if (lpwcx->hInstance == User32Instance) { SetLastError(ERROR_INVALID_PARAMETER); @@ -888,9 +956,6 @@ { MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName; } - - if (MenuName.Buffer != NULL) - hMenu = LoadMenuA(WndClass.hInstance, WndClass.lpszMenuName); } if (IS_ATOM(WndClass.lpszClassName)) @@ -904,19 +969,29 @@ RtlCreateUnicodeStringFromAsciiz(&ClassName, WndClass.lpszClassName); } - Atom = NtUserRegisterClassEx((WNDCLASSEXW*)&WndClass, - &ClassName, - &MenuName, - NULL, - REGISTERCLASS_ANSI, - hMenu); - - TRACE("atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", + RtlUnicodeStringToAnsiString( &AnsiMenuName, &MenuName, TRUE); + + clsMenuName.pszClientAnsiMenuName = AnsiMenuName.Buffer; + clsMenuName.pwszClientUnicodeMenuName = MenuName.Buffer; + clsMenuName.pusMenuName = &MenuName; + + Atom = NtUserRegisterClassExWOW( (WNDCLASSEXW*)&WndClass, + &ClassName, + NULL, //PUNICODE_STRING ClsNVersion, + &clsMenuName, + 0, + CSF_ANSIPROC, + 0); + + TRACE("A atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass); if (!IS_INTRESOURCE(WndClass.lpszMenuName)) + { RtlFreeUnicodeString(&MenuName); + RtlFreeAnsiString(&AnsiMenuName); + } if (!IS_ATOM(WndClass.lpszClassName)) RtlFreeUnicodeString(&ClassName); @@ -933,7 +1008,8 @@ WNDCLASSEXW WndClass; UNICODE_STRING ClassName; UNICODE_STRING MenuName = {0}; - HMENU hMenu = NULL; + CLSMENUNAME clsMenuName; + ANSI_STRING AnsiMenuName; if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXW) || lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 || @@ -950,6 +1026,8 @@ * But since I have no idea what the magic field in the * TEB structure means, I rather decided to omit that. * -- Filip Navara + + GetWin32ClientInfo()->ulWindowsVersion & (WINVER == 400) */ if (lpwcx->hInstance == User32Instance) { @@ -981,9 +1059,6 @@ { MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName; } - - if (MenuName.Buffer != NULL) - hMenu = LoadMenuW(WndClass.hInstance, WndClass.lpszMenuName); } if (IS_ATOM(WndClass.lpszClassName)) @@ -997,14 +1072,21 @@ RtlInitUnicodeString(&ClassName, WndClass.lpszClassName); } - Atom = (ATOM)NtUserRegisterClassEx(&WndClass, - &ClassName, - &MenuName, - NULL, - 0, - hMenu); - - TRACE("atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", + RtlUnicodeStringToAnsiString( &AnsiMenuName, &MenuName, TRUE); + + clsMenuName.pszClientAnsiMenuName = AnsiMenuName.Buffer; + clsMenuName.pwszClientUnicodeMenuName = MenuName.Buffer; + clsMenuName.pusMenuName = &MenuName; + + Atom = NtUserRegisterClassExWOW( &WndClass, + &ClassName, + NULL, //PUNICODE_STRING ClsNVersion, + &clsMenuName, + 0, + 0, + 0); + + TRACE("W atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", Atom, lpwcx->lpfnWndProc, lpwcx->hInstance, lpwcx->hbrBackground, lpwcx->style, lpwcx->cbClsExtra, lpwcx->cbWndExtra, WndClass); Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -3945,6 +3945,19 @@ return TRUE; } +NTSTATUS WINAPI +User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength) +{ + PLOADMENU_CALLBACK_ARGUMENTS Common; + LRESULT Result; + + Common = (PLOADMENU_CALLBACK_ARGUMENTS) Arguments; + + Result = (LRESULT)LoadMenuW(Common->hModule, (LPCWSTR)&Common->MenuName); + + return ZwCallbackReturn(&Result, sizeof(LRESULT), STATUS_SUCCESS); +} + /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -241,7 +241,7 @@ hInstance, lpParam, SW_SHOW, - FALSE, + Unicode, 0); #if 0 @@ -1762,13 +1762,7 @@ DWORD WINAPI GetWindowContextHelpId(HWND hwnd) { - PWINDOW Wnd = ValidateHwnd(hwnd); - if (Wnd != NULL) - { - return Wnd->ContextHelpId; - } - - return 0; + return NtUserCallHwnd(hwnd, HWND_ROUTINE_GETWNDCONTEXTHLPID); } /* Modified: trunk/reactos/include/reactos/win32k/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/cal… ============================================================================== --- trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/callback.h [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -7,7 +7,8 @@ #define USER32_CALLBACK_LOADDEFAULTCURSORS (3) #define USER32_CALLBACK_HOOKPROC (4) #define USER32_CALLBACK_EVENTPROC (5) -#define USER32_CALLBACK_MAXIMUM (5) +#define USER32_CALLBACK_LOADMENU (6) +#define USER32_CALLBACK_MAXIMUM (6) typedef struct _WINDOWPROC_CALLBACK_ARGUMENTS { @@ -63,6 +64,12 @@ WINEVENTPROC Proc; } EVENTPROC_CALLBACK_ARGUMENTS, *PEVENTPROC_CALLBACK_ARGUMENTS; +typedef struct _LOADMENU_CALLBACK_ARGUMENTS +{ + HINSTANCE hModule; + WCHAR MenuName[1]; +} LOADMENU_CALLBACK_ARGUMENTS, *PLOADMENU_CALLBACK_ARGUMENTS; + NTSTATUS WINAPI User32CallWindowProcFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI @@ -75,5 +82,7 @@ User32CallHookProcFromKernel(PVOID Arguments, ULONG ArgumentLength); NTSTATUS WINAPI User32CallEventProcFromKernel(PVOID Arguments, ULONG ArgumentLength); +NTSTATUS WINAPI +User32CallLoadMenuFromKernel(PVOID Arguments, ULONG ArgumentLength); #endif /* __INCLUDE_USER32_CALLBACK_H */ Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -118,7 +118,6 @@ DWORD CSF_flags; PSTR lpszClientAnsiMenuName; PWSTR lpszClientUnicodeMenuName; - HANDLE hMenu; /* FIXME - Use pointer! */ PCALLPROC spcpdFirst; struct _WINDOWCLASS *pclsBase; struct _WINDOWCLASS *pclsClone; @@ -283,7 +282,7 @@ LIST_ENTRY PropListHead; ULONG PropListItems; /* Window menu handle or window id */ - UINT IDMenu; + UINT IDMenu; // Use spmenu //PMENU spmenuSys; //PMENU spmenu; HRGN hrgnClip; @@ -300,9 +299,6 @@ struct _WINDOW *spwndClipboardListener; DWORD ExStyle2; - /* Context help id */ - DWORD ContextHelpId; - struct { RECT NormalRect; @@ -310,7 +306,7 @@ POINT MaxPos; } InternalPos; - UINT Unicode : 1; // !WNDS_ANSICREATOR ? + UINT Unicode : 1; // !(WNDS_ANSICREATOR|WNDS_ANSIWINDOWPROC) ? /* Indicates whether the window is derived from a system class */ UINT IsSystem : 1; // System class ? UINT InternalPosInitialized : 1; @@ -1344,7 +1340,7 @@ HMENU hMenu, HINSTANCE hInstance, LPVOID lpParam, - DWORD dwFlags, + DWORD dwFlags, // |= 1 == Ansi PVOID acbiBuffer); #endif @@ -2993,7 +2989,6 @@ #define ONEPARAM_ROUTINE_CREATECURICONHANDLE 0xfffe0025 // CREATE_EMPTY_CURSOR_OBJECT ? #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0xfffe0027 #define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0xfffe0031 -#define ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID 0xfffe0047 // use HWND_ROUTINE_GETWNDCONTEXTHLPID #define ONEPARAM_ROUTINE_GETCURSORPOSITION 0xfffe0048 // use ONEPARAM_ or TWOPARAM routine ? #define TWOPARAM_ROUTINE_GETWINDOWRGNBOX 0xfffd0048 // user mode #define TWOPARAM_ROUTINE_GETWINDOWRGN 0xfffd0049 // user mode @@ -3165,22 +3160,6 @@ IN DWORD dwFlags); -/* FIXME: These flag constans aren't what Windows uses. */ -#define REGISTERCLASS_ANSI 2 -#define REGISTERCLASS_ALL (REGISTERCLASS_ANSI) - -RTL_ATOM -NTAPI -NtUserRegisterClassEx( // Need to use NtUserRegisterClassExWOW. - CONST WNDCLASSEXW* lpwcx, - PUNICODE_STRING ClassName, - PUNICODE_STRING MenuName, - WNDPROC wpExtra, - DWORD Flags, - HMENU hMenu); - - - typedef struct tagNTUSERSENDMESSAGEINFO { BOOL HandledByKernel; Modified: trunk/reactos/subsystems/win32/win32k/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/callback.h [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -54,4 +54,6 @@ VOID FASTCALL IntCbFreeMemory(PVOID Data); +HMENU APIENTRY co_IntCallLoadMenu(HINSTANCE,PUNICODE_STRING); + #endif /* _WIN32K_CALLBACK_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -58,7 +58,6 @@ UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, IN PUNICODE_STRING MenuName, - IN HANDLE hMenu, IN WNDPROC wpExtra, IN DWORD dwFlags); @@ -77,8 +76,6 @@ IN PPROCESSINFO pi OPTIONAL, OUT PWINDOWCLASS *BaseClass OPTIONAL, OUT PWINDOWCLASS **Link OPTIONAL); - -#define REGISTERCLASS_SYSTEM 0x4 PWINDOWCLASS FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/prop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/prop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/prop.h [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -1,6 +1,9 @@ #ifndef _WIN32K_PROP_H #define _WIN32K_PROP_H +PPROPERTY FASTCALL IntGetProp(PWINDOW_OBJECT,ATOM); +BOOL FASTCALL IntRemoveProp(PWINDOW_OBJECT,ATOM); +BOOL FASTCALL IntSetProp(PWINDOW_OBJECT, ATOM, HANDLE); #endif /* _WIN32K_PROP_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -666,4 +666,57 @@ return Result; } +// +// Callback Load Menu and results. +// +HMENU +APIENTRY +co_IntCallLoadMenu( HINSTANCE hModule, + PUNICODE_STRING pMenuName ) +{ + LRESULT Result = 0; + NTSTATUS Status; + PLOADMENU_CALLBACK_ARGUMENTS Common; + ULONG ArgumentLength, ResultLength; + PVOID Argument, ResultPointer; + + ArgumentLength = sizeof(LOADMENU_CALLBACK_ARGUMENTS); + + ArgumentLength += pMenuName->Length + sizeof(WCHAR); + + Argument = IntCbAllocateMemory(ArgumentLength); + if (NULL == Argument) + { + DPRINT1("EventProc callback failed: out of memory\n"); + return 0; + } + Common = (PLOADMENU_CALLBACK_ARGUMENTS) Argument; + + + Common->hModule = hModule; + RtlCopyMemory(&Common->MenuName, pMenuName->Buffer, pMenuName->Length); + + ResultPointer = NULL; + ResultLength = sizeof(LRESULT); + + UserLeaveCo(); + + Status = KeUserModeCallback(USER32_CALLBACK_LOADMENU, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); + + UserEnterCo(); + + IntCbFreeMemory(Argument); + + if (!NT_SUCCESS(Status)) + { + return 0; + } + + return (HMENU)Result; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -892,9 +892,9 @@ Class->pclsBase = Class; Class->atomClassName = Atom; - if (dwFlags & REGISTERCLASS_SYSTEM) - { - dwFlags &= ~REGISTERCLASS_ANSI; + if (dwFlags & CSF_SYSTEMCLASS) + { + dwFlags &= ~CSF_ANSIPROC; Class->WndProcExtra = wpExtra; Class->System = TRUE; } @@ -954,7 +954,7 @@ else Class->AnsiMenuName = (PSTR)MenuName->Buffer; - if (!(dwFlags & REGISTERCLASS_ANSI)) + if (!(dwFlags & CSF_ANSIPROC)) Class->Unicode = TRUE; if (Class->style & CS_GLOBALCLASS) @@ -1177,7 +1177,6 @@ UserRegisterClass(IN CONST WNDCLASSEXW* lpwcx, IN PUNICODE_STRING ClassName, IN PUNICODE_STRING MenuName, - IN HANDLE hMenu, /* FIXME */ IN WNDPROC wpExtra, IN DWORD dwFlags) { @@ -1238,9 +1237,6 @@ if (Class != NULL) { PWINDOWCLASS *List; - - /* FIXME - pass the PMENU pointer to IntCreateClass instead! */ - Class->hMenu = hMenu; /* Register the class */ if (Class->System) @@ -1901,7 +1897,7 @@ &ClassName, &MenuName, SystemClasses[i].ProcA, - REGISTERCLASS_SYSTEM, + CSF_SYSTEMCLASS, NULL, pi); if (Class != NULL) @@ -1932,116 +1928,6 @@ } /* SYSCALLS *****************************************************************/ - - -RTL_ATOM APIENTRY -NtUserRegisterClassEx(IN CONST WNDCLASSEXW* lpwcx, - IN PUNICODE_STRING ClassName, - IN PUNICODE_STRING MenuName, - IN WNDPROC wpExtra, - IN DWORD Flags, - IN HMENU hMenu) - -/* - * FUNCTION: - * Registers a new class with the window manager - * ARGUMENTS: - * lpwcx = Win32 extended window class structure - * bUnicodeClass = Whether to send ANSI or unicode strings - * to window procedures - * wpExtra = Extra window procedure, if this is not null, its used for the second window procedure for standard controls. - * RETURNS: - * Atom identifying the new class - */ -{ - WNDCLASSEXW CapturedClassInfo = {0}; - UNICODE_STRING CapturedName = {0}, CapturedMenuName = {0}; - RTL_ATOM Ret = (RTL_ATOM)0; - - if (Flags & ~REGISTERCLASS_ALL) - { - SetLastWin32Error(ERROR_INVALID_FLAGS); - return Ret; - } - - UserEnterExclusive(); - - _SEH2_TRY - { - /* Probe the parameters and basic parameter checks */ - if (ProbeForReadUint(&lpwcx->cbSize) != sizeof(WNDCLASSEXW)) - { - goto InvalidParameter; - } - - ProbeForRead(lpwcx, - sizeof(WNDCLASSEXW), - sizeof(ULONG)); - RtlCopyMemory(&CapturedClassInfo, - lpwcx, - sizeof(WNDCLASSEXW)); - - CapturedName = ProbeForReadUnicodeString(ClassName); - CapturedMenuName = ProbeForReadUnicodeString(MenuName); - - if (CapturedName.Length & 1 || CapturedMenuName.Length & 1 || - CapturedClassInfo.cbClsExtra < 0 || - CapturedClassInfo.cbClsExtra + CapturedName.Length + - CapturedMenuName.Length + sizeof(WINDOWCLASS) < CapturedClassInfo.cbClsExtra || - CapturedClassInfo.cbWndExtra < 0 || - CapturedClassInfo.hInstance == NULL) - { - goto InvalidParameter; - } - - if (CapturedName.Length != 0) - { - ProbeForRead(CapturedName.Buffer, - CapturedName.Length, - sizeof(WCHAR)); - } - else - { - if (!IS_ATOM(CapturedName.Buffer)) - { - goto InvalidParameter; - } - } - - if (CapturedMenuName.Length != 0) - { - ProbeForRead(CapturedMenuName.Buffer, - CapturedMenuName.Length, - sizeof(WCHAR)); - } - else if (CapturedMenuName.Buffer != NULL && - !IS_INTRESOURCE(CapturedMenuName.Buffer)) - { -InvalidParameter: - SetLastWin32Error(ERROR_INVALID_PARAMETER); - _SEH2_LEAVE; - } - - /* Register the class */ - Ret = UserRegisterClass(&CapturedClassInfo, - &CapturedName, - &CapturedMenuName, - hMenu, /* FIXME - pass pointer */ - wpExtra, - Flags); - - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - } - _SEH2_END; - - UserLeave(); - - return Ret; -} - RTL_ATOM APIENTRY @@ -2053,10 +1939,27 @@ DWORD fnID, DWORD Flags, LPDWORD pWow) +/* + * FUNCTION: + * Registers a new class with the window manager + * ARGUMENTS: + * lpwcx = Win32 extended window class structure + * bUnicodeClass = Whether to send ANSI or unicode strings + * to window procedures + * RETURNS: + * Atom identifying the new class + */ { WNDCLASSEXW CapturedClassInfo = {0}; - UNICODE_STRING CapturedName = {0}, ClassnametoVersion = {0}; + UNICODE_STRING CapturedName = {0}, CapturedMenuName = {0}; RTL_ATOM Ret = (RTL_ATOM)0; + WNDPROC wpExtra = NULL; + + if (Flags & ~(CSF_ANSIPROC)) + { + SetLastWin32Error(ERROR_INVALID_FLAGS); + return Ret; + } UserEnterExclusive(); @@ -2064,10 +1967,6 @@ { /* Probe the parameters and basic parameter checks */ if (ProbeForReadUint(&lpwcx->cbSize) != sizeof(WNDCLASSEXW)) - { - goto InvalidParameter; - } - if (!pClassMenuName) { goto InvalidParameter; } @@ -2078,24 +1977,24 @@ RtlCopyMemory(&CapturedClassInfo, lpwcx, sizeof(WNDCLASSEXW)); - /* - Need to watch this. When UnregisterClass is called these pointers - are freed by the caller in user space. So, we just probe the data - for now and pass it on and copy it to the shared class structure. - */ + + CapturedName = ProbeForReadUnicodeString(ClassName); + ProbeForRead(pClassMenuName, sizeof(CLSMENUNAME), - sizeof(ULONG)); - - CapturedName = ProbeForReadUnicodeString(ClassName); - ClassnametoVersion = ProbeForReadUnicodeString(ClsNVersion); - - if (CapturedName.Length & 1 || ClassnametoVersion.Length & 1 || - CapturedClassInfo.cbClsExtra < 0 || - CapturedClassInfo.cbClsExtra + CapturedName.Length + - ClassnametoVersion.Length + sizeof(WINDOWCLASS) < CapturedClassInfo.cbClsExtra || - CapturedClassInfo.cbWndExtra < 0 || - CapturedClassInfo.hInstance == NULL) + 1); + + CapturedMenuName = ProbeForReadUnicodeString(pClassMenuName->pusMenuName); + + if ( CapturedName.Length & 1 || + CapturedMenuName.Length & 1 || + CapturedClassInfo.cbClsExtra < 0 || + CapturedClassInfo.cbClsExtra + + CapturedName.Length + + CapturedMenuName.Length + + sizeof(WINDOWCLASS) < CapturedClassInfo.cbClsExtra || + CapturedClassInfo.cbWndExtra < 0 || + CapturedClassInfo.hInstance == NULL) { goto InvalidParameter; } @@ -2114,27 +2013,25 @@ } } - if (ClassnametoVersion.Length != 0) - { - ProbeForRead(ClassnametoVersion.Buffer, - ClassnametoVersion.Length, + if (CapturedMenuName.Length != 0) + { + ProbeForRead(CapturedMenuName.Buffer, + CapturedMenuName.Length, sizeof(WCHAR)); } - else if (ClassnametoVersion.Buffer != NULL && - !IS_INTRESOURCE(ClassnametoVersion.Buffer)) + else if (CapturedMenuName.Buffer != NULL && + !IS_INTRESOURCE(CapturedMenuName.Buffer)) { InvalidParameter: SetLastWin32Error(ERROR_INVALID_PARAMETER); _SEH2_LEAVE; } - /* Register the class */ -// Ret = UserRegisterClass(&CapturedClassInfo, -// &CapturedName, -// &ClassnametoVersion, -// hMenu, /* FIXME - pass pointer */ -// wpExtra, -// Flags); + Ret = UserRegisterClass(&CapturedClassInfo, + &CapturedName, + &CapturedMenuName, + wpExtra, + Flags); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -2147,7 +2044,6 @@ return Ret; } - ULONG_PTR APIENTRY NtUserGetClassLong(IN HWND hWnd, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -1134,7 +1134,7 @@ &ClassName, &MenuName, NULL, - REGISTERCLASS_SYSTEM, + CSF_SYSTEMCLASS, NULL, pi); if (Class != NULL) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -37,10 +37,12 @@ gpsi->atomSysClass[ICLS_ICONTITLE] = 32772; gpsi->atomSysClass[ICLS_TOOLTIPS] = 32774; + /* System Message Atom */ AtomMessage = IntAddGlobalAtom(L"Message", TRUE); gpsi->atomSysClass[ICLS_HWNDMESSAGE] = AtomMessage; - DPRINT("AtomMessage -> %x\n", AtomMessage); + /* System Context Help Id Atom */ + gpsi->atomContextHelpIdProp = IntAddGlobalAtom(L"SysCH", TRUE); return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/prop.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -34,9 +34,6 @@ /* STATIC FUNCTIONS **********************************************************/ -/* FUNCTIONS *****************************************************************/ - -static PPROPERTY FASTCALL IntGetProp(PWINDOW_OBJECT Window, ATOM Atom) { @@ -55,6 +52,49 @@ } return(NULL); } + +BOOL FASTCALL +IntRemoveProp(PWINDOW_OBJECT Window, ATOM Atom) +{ + PPROPERTY Prop; + HANDLE Data; + Prop = IntGetProp(Window, Atom); + + if (Prop == NULL) + { + return FALSE; + } + Data = Prop->Data; + RemoveEntryList(&Prop->PropListEntry); + UserHeapFree(Prop); + Window->Wnd->PropListItems--; + return TRUE; +} + +BOOL FASTCALL +IntSetProp(PWINDOW_OBJECT pWnd, ATOM Atom, HANDLE Data) +{ + PPROPERTY Prop; + + Prop = IntGetProp(pWnd, Atom); + + if (Prop == NULL) + { + Prop = UserHeapAlloc(sizeof(PROPERTY)); + if (Prop == NULL) + { + return FALSE; + } + Prop->Atom = Atom; + InsertTailList(&pWnd->Wnd->PropListHead, &Prop->PropListEntry); + pWnd->Wnd->PropListItems++; + } + + Prop->Data = Data; + return TRUE; +} + +/* FUNCTIONS *****************************************************************/ NTSTATUS APIENTRY NtUserBuildPropList(HWND hWnd, @@ -164,32 +204,6 @@ END_CLEANUP; } - -static -BOOL FASTCALL -IntSetProp(PWINDOW_OBJECT pWnd, ATOM Atom, HANDLE Data) -{ - PPROPERTY Prop; - - Prop = IntGetProp(pWnd, Atom); - - if (Prop == NULL) - { - Prop = UserHeapAlloc(sizeof(PROPERTY)); - if (Prop == NULL) - { - return FALSE; - } - Prop->Atom = Atom; - InsertTailList(&pWnd->Wnd->PropListHead, &Prop->PropListEntry); - pWnd->Wnd->PropListItems++; - } - - Prop->Data = Data; - return TRUE; -} - - BOOL APIENTRY NtUserSetProp(HWND hWnd, ATOM Atom, HANDLE Data) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -209,22 +209,6 @@ case ONEPARAM_ROUTINE_WINDOWFROMDC: RETURN( (DWORD)IntWindowFromDC((HDC)Param)); - - case ONEPARAM_ROUTINE_GETWNDCONTEXTHLPID: - { - PWINDOW_OBJECT Window; - DWORD Result; - - Window = UserGetWindowObject((HWND)Param); - if(!Window) - { - RETURN( FALSE); - } - - Result = Window->Wnd->ContextHelpId; - - RETURN( Result); - } case ONEPARAM_ROUTINE_SWAPMOUSEBUTTON: { @@ -556,7 +540,10 @@ RETURN( (DWORD)FALSE); } - Window->Wnd->ContextHelpId = Param2; + if ( Param2 ) + IntSetProp(Window, gpsi->atomContextHelpIdProp, (HANDLE)Param2); + else + IntRemoveProp(Window, gpsi->atomContextHelpIdProp); RETURN( (DWORD)TRUE); @@ -786,6 +773,27 @@ { switch (Routine) { + case HWND_ROUTINE_GETWNDCONTEXTHLPID: + { + PWINDOW_OBJECT Window; + PPROPERTY HelpId; + USER_REFERENCE_ENTRY Ref; + + UserEnterExclusive(); + + if (!(Window = UserGetWindowObject(hWnd)) || !Window->Wnd) + { + UserLeave(); + return 0; + } + UserRefObjectCo(Window, &Ref); + + HelpId = IntGetProp(Window, gpsi->atomContextHelpIdProp); + + UserDerefObjectCo(Window); + UserLeave(); + return (DWORD)HelpId; + } case HWND_ROUTINE_REGISTERSHELLHOOKWINDOW: if (IntIsWindow(hWnd)) return IntRegisterShellHookWindow(hWnd); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -1706,7 +1706,6 @@ Class = NULL; Window->SystemMenu = (HMENU)0; - Wnd->ContextHelpId = 0; Wnd->IDMenu = 0; Wnd->hModule = hInstance; Window->hSelf = hWnd; @@ -1835,14 +1834,19 @@ { if (hMenu) IntSetMenu(Window, hMenu, &MenuChanged); - else - { - hMenu = Wnd->pcls->hMenu; + else // Take it from the parent. + { + UNICODE_STRING MenuName; + + RtlInitUnicodeString( &MenuName, Wnd->pcls->MenuName); + + hMenu = co_IntCallLoadMenu( Wnd->pcls->hModule, &MenuName); if (hMenu) IntSetMenu(Window, hMenu, &MenuChanged); - } - } - else - Wnd->IDMenu = (UINT) hMenu; + if (MenuName.Buffer) RtlFreeUnicodeString(&MenuName); + } + } + else // Not a child + Wnd->IDMenu = (UINT) hMenu; /* Insert the window into the thread's window list. */ InsertTailList (&pti->WindowListHead, &Window->ThreadListEntry); Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Wed Jul 22 06:11:06 2009 @@ -696,7 +696,6 @@ NtUserMenuItemInfo 5 NtUserMonitorFromPoint 3 NtUserMonitorFromRect 2 -NtUserRegisterClassEx 6 NtUserMonitorFromWindow 2 NtUserSendMessage 5 NtUserSendMessageTimeout 8

1 0

[cgutman] 42127: - Don't fail the entire probe if something goes wrong when allocating a controller (this is what we do if _MULTI_UHCI is not defined also)
by cgutman＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: cgutman Date: Wed Jul 22 04:20:24 2009 New Revision: 42127 URL: http://svn.reactos.org/svn/reactos?rev=42127&view=rev Log: - Don't fail the entire probe if something goes wrong when allocating a controller (this is what we do if _MULTI_UHCI is not defined also) Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Wed Jul 22 04:20:24 2009 @@ -651,9 +651,8 @@ #ifdef _MULTI_UHCI { pdev = uhci_alloc(drvr_obj, reg_path, ((bus << 8) | (i << 3) | j), dev_mgr); - count++; - if (!pdev) - return NULL; + if (pdev) + count++; } #else pdev = uhci_alloc(drvr_obj, reg_path, ((bus << 8) | (i << 3) | j), dev_mgr);

1 0

[cgutman] 42126: - Return the DEVICE_OBJECT we got instead of NULL
by cgutman＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: cgutman Date: Wed Jul 22 04:06:50 2009 New Revision: 42126 URL: http://svn.reactos.org/svn/reactos?rev=42126&view=rev Log: - Return the DEVICE_OBJECT we got instead of NULL Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Wed Jul 22 04:06:50 2009 @@ -3482,7 +3482,7 @@ KeSynchronizeExecution(pdev_ext->ehci_int, ehci_cal_cpu_freq, NULL); } } - return NULL; + return pdev; } PDEVICE_OBJECT Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c [iso-8859-1] Wed Jul 22 04:06:50 2009 @@ -236,7 +236,7 @@ //KeSynchronizeExecution(pdev_ext->ohci_int, ehci_cal_cpu_freq, NULL); } } - return NULL; + return pdev; } BOOLEAN ohci_mem_init (POHCI_DEVICE_EXTENSION dev_ext) Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Wed Jul 22 04:06:50 2009 @@ -679,7 +679,7 @@ KeSynchronizeExecution(pdev_ext->uhci_int, uhci_cal_cpu_freq, NULL); } } - return NULL; + return pdev; } PDEVICE_OBJECT

1 0

[cgutman] 42125: - Fix compilation of usbdriver with _MULTI_UHCI defined
by cgutman＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: cgutman Date: Wed Jul 22 03:47:27 2009 New Revision: 42125 URL: http://svn.reactos.org/svn/reactos?rev=42125&view=rev Log: - Fix compilation of usbdriver with _MULTI_UHCI defined Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Wed Jul 22 03:47:27 2009 @@ -667,7 +667,9 @@ } } +#ifndef _MULTI_UHCI LBL_LOOPOUT: +#endif if (pdev) { pdev_ext = pdev->DeviceExtension;

1 0

[ros-arm-bringup] 42124: - Get rid of debug spew used during testing.
by ros-arm-bringup＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: ros-arm-bringup Date: Tue Jul 21 22:04:17 2009 New Revision: 42124 URL: http://svn.reactos.org/svn/reactos?rev=42124&view=rev Log: - Get rid of debug spew used during testing. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Tue Jul 21 22:04:17 2009 @@ -396,7 +396,6 @@ // // This page is on the outskirts of initial nonpaged pool, so ignore it // - DPRINT1("End of initial frame\n"); Pfn1 = NULL; } else @@ -457,7 +456,6 @@ // // Then we can't do anything or we'll risk underflowing // - DPRINT1("Start of of initial frame\n"); Pfn1 = NULL; } else

1 0

[fireball] 42123: - Add cryptdlg as autosynced.
by fireball＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: fireball Date: Tue Jul 21 21:00:08 2009 New Revision: 42123 URL: http://svn.reactos.org/svn/reactos?rev=42123&view=rev Log: - Add cryptdlg as autosynced. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jul 21 21:00:08 2009 @@ -52,6 +52,7 @@ reactos/dll/win32/compstui # Autosync reactos/dll/win32/credui # Autosync reactos/dll/win32/crypt32 # Synced to Wine-1_1_21 +reactos/dll/win32/cryptdlg # Autosync reactos/dll/win32/cryptdll # Autosync reactos/dll/win32/cryptnet # Autosync reactos/dll/win32/cryptui # Autosync

1 0

[dchapyshev] 42122: - Revert my previous changes in QueueUserWorkItem
by dchapyshev＠svn.reactos.org 21 Jul '09

21 Jul '09

Author: dchapyshev Date: Tue Jul 21 18:38:50 2009 New Revision: 42122 URL: http://svn.reactos.org/svn/reactos?rev=42122&view=rev Log: - Revert my previous changes in QueueUserWorkItem Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Tue Jul 21 18:38:50 2009 @@ -854,6 +854,34 @@ } +typedef struct _QUEUE_USER_WORKITEM_CONTEXT +{ + LPTHREAD_START_ROUTINE Function; + PVOID Context; +} QUEUE_USER_WORKITEM_CONTEXT, *PQUEUE_USER_WORKITEM_CONTEXT; + +static VOID +NTAPI +InternalWorkItemTrampoline(PVOID Context) +{ + QUEUE_USER_WORKITEM_CONTEXT Info; + + ASSERT(Context); + + /* Save the context to the stack */ + Info = *(volatile QUEUE_USER_WORKITEM_CONTEXT *)Context; + + /* Free the context before calling the callback. This avoids + a memory leak in case the thread dies... */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + Context); + + /* Call the real callback */ + Info.Function(Info.Context); +} + + /* * @implemented */ @@ -865,13 +893,34 @@ ULONG Flags ) { - NTSTATUS Status; - - Status = RtlQueueWorkItem((WORKERCALLBACKFUNC)Function, - Context, + PQUEUE_USER_WORKITEM_CONTEXT WorkItemContext; + NTSTATUS Status; + + /* Save the context for the trampoline function */ + WorkItemContext = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + sizeof(*WorkItemContext)); + if (WorkItemContext == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + WorkItemContext->Function = Function; + WorkItemContext->Context = Context; + + /* NOTE: Don't use Function directly since the callback signature + differs. This might cause problems on certain platforms... */ + Status = RtlQueueWorkItem(InternalWorkItemTrampoline, + WorkItemContext, Flags); if (!NT_SUCCESS(Status)) { + /* Free the allocated context in case of failure */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + WorkItemContext); + SetLastErrorByStatus(Status); return FALSE; }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009