Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 42229: Silence a warning.
by dgorbachev＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: dgorbachev Date: Sun Jul 26 11:55:46 2009 New Revision: 42229 URL: http://svn.reactos.org/svn/reactos?rev=42229&view=rev Log: Silence a warning. Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.c [iso-8859-1] Sun Jul 26 11:55:46 2009 @@ -5424,11 +5424,18 @@ // Fill in vendor identification fields. // - for (i = 0; i < 20; i += 2) { + for (i = 0; i < 8; i += 2) { inquiryData->VendorId[i] = ((PUCHAR)identifyData->ModelNumber)[i + 1]; inquiryData->VendorId[i+1] = ((PUCHAR)identifyData->ModelNumber)[i]; + } + + for (i = 0; i < 12; i += 2) { + inquiryData->ProductId[i] = + ((PUCHAR)identifyData->ModelNumber)[i + 8 + 1]; + inquiryData->ProductId[i+1] = + ((PUCHAR)identifyData->ModelNumber)[i + 8]; } //

1 0

[dgorbachev] 42228: Silence a warning.
by dgorbachev＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: dgorbachev Date: Sun Jul 26 11:52:27 2009 New Revision: 42228 URL: http://svn.reactos.org/svn/reactos?rev=42228&view=rev Log: Silence a warning. Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c Modified: trunk/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/ac.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/ac.c [iso-8859-1] Sun Jul 26 11:52:27 2009 @@ -729,15 +729,7 @@ StrBuf, BufferSize) == 0) { -ConvertErr: - ErrorCode = GetLastError(); - - /* cleanup */ - RtlFreeHeap(RtlGetProcessHeap(), - 0, - *pTrusteeW); - - return ErrorCode; + goto ConvertErr; } oan->ptstrName = StrBuf; } @@ -757,6 +749,16 @@ break; } } + + return ErrorCode; + +ConvertErr: + ErrorCode = GetLastError(); + + /* cleanup */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + *pTrusteeW); return ErrorCode; } @@ -930,15 +932,7 @@ StrBuf, BufferSize) == 0) { -ConvertErr: - ErrorCode = GetLastError(); - - /* cleanup */ - RtlFreeHeap(RtlGetProcessHeap(), - 0, - peaw); - - return ErrorCode; + goto ConvertErr; } oan->ptstrName = StrBuf; @@ -973,6 +967,16 @@ } return ErrorCode; + +ConvertErr: + ErrorCode = GetLastError(); + + /* cleanup */ + RtlFreeHeap(RtlGetProcessHeap(), + 0, + peaw); + + return ErrorCode; }

1 0

[dgorbachev] 42227: Silence a warning.
by dgorbachev＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: dgorbachev Date: Sun Jul 26 11:52:00 2009 New Revision: 42227 URL: http://svn.reactos.org/svn/reactos?rev=42227&view=rev Log: Silence a warning. Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Sun Jul 26 11:52:00 2009 @@ -638,7 +638,7 @@ DeviceExtension->MouseTimeoutState = TimeoutStart; PortDeviceExtension = DeviceExtension->Common.PortDeviceExtension; - switch (DeviceExtension->MouseResetState) + switch ((ULONG)DeviceExtension->MouseResetState) { case 1100: /* the first ack, drop it. */ DeviceExtension->MouseResetState = ExpectingReset;

1 0

[ros-arm-bringup] 42226: - Get rid of the concept and tracking of "mapped pages". The MapCount was never checked anywhere in terms of page accounting -- only the reference count is. - Fix the issue with the system attempting to map page 0 into hyperspace.
by ros-arm-bringup＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: ros-arm-bringup Date: Sun Jul 26 10:20:29 2009 New Revision: 42226 URL: http://svn.reactos.org/svn/reactos?rev=42226&view=rev Log: - Get rid of the concept and tracking of "mapped pages". The MapCount was never checked anywhere in terms of page accounting -- only the reference count is. - Fix the issue with the system attempting to map page 0 into hyperspace. Modified: trunk/reactos/ntoskrnl/ke/procobj.c trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Sun Jul 26 10:20:29 2009 @@ -96,6 +96,9 @@ /* Release lock */ KiReleaseApcLockFromDpcLevel(ApcLock); + + /* Make sure that we are in the right page directory (ReactOS Mm Hack) */ + MiSyncForProcessAttach(Thread, (PEPROCESS)Process); /* Swap Processes */ KiSwapProcess(Process, SavedApcState->Process); @@ -573,9 +576,6 @@ ASSERT_PROCESS(Process); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); - /* Make sure that we are in the right page directory (ReactOS Mm Hack) */ - MiSyncForProcessAttach(Thread, (PEPROCESS)Process); - /* Crash system if DPC is being executed! */ if (KeIsExecutingDpc()) { Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/hypermap.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] Sun Jul 26 10:20:29 2009 @@ -37,9 +37,10 @@ PFN_NUMBER Offset; // - // Never accept page 0 + // Never accept page 0 or non-physical pages // ASSERT(Page != 0); + ASSERT(MiGetPfnEntry(Page) != NULL); // // Build the PTE 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] Sun Jul 26 10:20:29 2009 @@ -38,7 +38,6 @@ #define Type CacheAttribute #define Zero PrototypePte #define LockCount u3.e1.PageColor -#define MapCount u2.ShareCount #define RmapListHead AweReferenceCount #define SavedSwapEntry u4.EntireFrame #define Flags u3.e1 @@ -264,7 +263,6 @@ Pfn1->Flags.Consumer = MC_NPPOOL; Pfn1->ReferenceCount = 1; Pfn1->LockCount = 0; - Pfn1->MapCount = 0; Pfn1->SavedSwapEntry = 0; // @@ -452,7 +450,6 @@ // Make sure it's really free // ASSERT(Pfn1->Flags.Type == MM_PHYSICAL_PAGE_FREE); - ASSERT(Pfn1->MapCount == 0); ASSERT(Pfn1->ReferenceCount == 0); // @@ -464,7 +461,6 @@ Pfn1->Flags.EndOfAllocation = 1; Pfn1->ReferenceCount = 1; Pfn1->LockCount = 0; - Pfn1->MapCount = 0; Pfn1->SavedSwapEntry = 0; // @@ -507,7 +503,6 @@ // // Sanity checks // - ASSERT(Pfn1->MapCount == 0); ASSERT(Pfn1->ReferenceCount == 0); // @@ -519,7 +514,6 @@ Pfn1->Flags.StartOfAllocation = 1; Pfn1->Flags.EndOfAllocation = 1; Pfn1->LockCount = 0; - Pfn1->MapCount = 0; Pfn1->SavedSwapEntry = 0; // @@ -678,12 +672,11 @@ // // Pretty-print the page // - DbgPrint("0x%08p:\t%04s\t%20s\t(%02d.%02d.%02d) [%08p])\n", + DbgPrint("0x%08p:\t%04s\t%20s\t(%02d.%02d) [%08p])\n", i << PAGE_SHIFT, State, Consumer, Pfn1->ReferenceCount, - Pfn1->MapCount, Pfn1->LockCount, Pfn1->RmapListHead); } @@ -716,8 +709,7 @@ RtlZeroMemory(&UsedPage, sizeof(UsedPage)); UsedPage.Flags.Type = MM_PHYSICAL_PAGE_USED; UsedPage.Flags.Consumer = MC_NPPOOL; - UsedPage.ReferenceCount = 2; - UsedPage.MapCount = 1; + UsedPage.ReferenceCount = 1; /* Loop the memory descriptors */ for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; @@ -814,61 +806,6 @@ VOID NTAPI -MmMarkPageMapped(PFN_TYPE Pfn) -{ - KIRQL oldIrql; - PPHYSICAL_PAGE Page; - - if (Pfn <= MmHighestPhysicalPage) - { - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MiGetPfnEntry(Pfn); - if (Page) - { - if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) - { - DPRINT1("Mapping non-used page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - Page->MapCount++; - Page->ReferenceCount++; - } - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - } -} - -VOID -NTAPI -MmMarkPageUnmapped(PFN_TYPE Pfn) -{ - KIRQL oldIrql; - PPHYSICAL_PAGE Page; - - if (Pfn <= MmHighestPhysicalPage) - { - oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - Page = MiGetPfnEntry(Pfn); - if (Page) - { - if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) - { - DPRINT1("Unmapping non-used page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (Page->MapCount == 0) - { - DPRINT1("Unmapping not mapped page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - Page->MapCount--; - Page->ReferenceCount--; - } - KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); - } -} - -VOID -NTAPI MmSetSavedSwapEntryPage(PFN_TYPE Pfn, SWAPENTRY SwapEntry) { KIRQL oldIrql; @@ -998,12 +935,6 @@ if (Page->RmapListHead != (LONG)NULL) { DPRINT1("Freeing page with rmap entries.\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (Page->MapCount != 0) - { - DPRINT1("Freeing mapped page (0x%x count %d)\n", - Pfn << PAGE_SHIFT, Page->MapCount); KeBugCheck(MEMORY_MANAGEMENT); } if (Page->LockCount > 0) @@ -1162,11 +1093,6 @@ DPRINT1("Got non-free page from freelist\n"); KeBugCheck(MEMORY_MANAGEMENT); } - if (PageDescriptor->MapCount != 0) - { - DPRINT1("Got mapped page from freelist\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } if (PageDescriptor->ReferenceCount != 0) { DPRINT1("%d\n", PageDescriptor->ReferenceCount); @@ -1176,7 +1102,6 @@ PageDescriptor->Flags.Consumer = Consumer; PageDescriptor->ReferenceCount = 1; PageDescriptor->LockCount = 0; - PageDescriptor->MapCount = 0; PageDescriptor->SavedSwapEntry = SwapEntry; MmStats.NrSystemPages++; @@ -1188,11 +1113,6 @@ if ((NeedClear) && (Consumer != MC_SYSTEM)) { MiZeroPage(PfnOffset); - } - if (PageDescriptor->MapCount != 0) - { - DPRINT1("Returning mapped page.\n"); - KeBugCheck(MEMORY_MANAGEMENT); } return PfnOffset; } @@ -1247,12 +1167,7 @@ Status = MiZeroPage(Pfn); oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - if (PageDescriptor->MapCount != 0) - { - DPRINT1("Mapped page on freelist.\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - PageDescriptor->Flags.Zero = 1; + PageDescriptor->Flags.Zero = 1; PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_FREE; if (NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Jul 26 10:20:29 2009 @@ -465,7 +465,6 @@ if (WasValid) { Pfn = PTE_TO_PFN(Pte); - MmMarkPageUnmapped(Pfn); } else { @@ -768,10 +767,6 @@ KeBugCheck(MEMORY_MANAGEMENT); } Pte = *Pt; - if (PAGE_MASK((Pte)) != 0) - { - MmMarkPageUnmapped(PTE_TO_PFN((Pte))); - } InterlockedExchangePte(Pt, SwapEntry << 1); if (Pte != 0) { @@ -882,15 +877,10 @@ oldPdeOffset = PdeOffset; Pte = *Pt; - MmMarkPageMapped(Pages[i]); if (PAGE_MASK(Pte) != 0 && !(Pte & PA_PRESENT) && (Pte & 0x800)) { DPRINT1("Bad PTE %lx\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); - } - if (PAGE_MASK(Pte) != 0) - { - MmMarkPageUnmapped(PTE_TO_PFN(Pte)); } InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); if (Pte != 0) @@ -1049,6 +1039,18 @@ { ULONG StartOffset, EndOffset, Offset; PULONG Pde; + + // + // Check if the process isn't there anymore + // This is probably a bad sign, since it means the caller is setting cr3 to + // 0 or something... + // + if ((PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0]) == 0) && (Process != PsGetCurrentProcess())) + { + DPRINT1("Process: %16s is dead: %p\n", Process->ImageFileName, Process->Pcb.DirectoryTableBase[0]); + ASSERT(FALSE); + return; + } if (Address < MmSystemRangeStart) {

1 0

[cgutman] 42225: - Begin using ws2help_new - I have tested this with various applications in ROS - Part 2 of 2
by cgutman＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: cgutman Date: Sun Jul 26 08:00:32 2009 New Revision: 42225 URL: http://svn.reactos.org/svn/reactos?rev=42225&view=rev Log: - Begin using ws2help_new - I have tested this with various applications in ROS - Part 2 of 2 Added: trunk/reactos/dll/win32/ws2help/ (props changed) - copied from r42178, trunk/reactos/dll/win32/ws2help_new/ Removed: trunk/reactos/dll/win32/ws2help_new/ Propchange: trunk/reactos/dll/win32/ws2help/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Jul 26 08:00:32 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/ws2help/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/ws2help/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/ws2help/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/dll/win32/ws2help/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[cgutman] 42224: - Remove our old ws2help in preparation for the transition to ws2help_new - This will not build - Part 1 of 2
by cgutman＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: cgutman Date: Sun Jul 26 07:51:30 2009 New Revision: 42224 URL: http://svn.reactos.org/svn/reactos?rev=42224&view=rev Log: - Remove our old ws2help in preparation for the transition to ws2help_new - This will not build - Part 1 of 2 Removed: trunk/reactos/dll/win32/ws2help/

1 0

[jimtabor] 42223: - [Win32k] Moving forward and replace some of the old header types with the new ones. This will continue and start the win32k object manager rewrite. Finding more bugs and this is still a work in progress. Run across the C_ASSERT bug. I see someone else noticed it. - Finished the user32 system class proc start-up. - Tested wine, Firefox 1.15.xx and AbiWord 2.6.8.
by jimtabor＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: jimtabor Date: Sun Jul 26 03:59:08 2009 New Revision: 42223 URL: http://svn.reactos.org/svn/reactos?rev=42223&view=rev Log: - [Win32k] Moving forward and replace some of the old header types with the new ones. This will continue and start the win32k object manager rewrite. Finding more bugs and this is still a work in progress. Run across the C_ASSERT bug. I see someone else noticed it. - Finished the user32 system class proc start-up. - Tested wine, Firefox 1.15.xx and AbiWord 2.6.8. Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/icontitle.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/regcontrol.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/controls/static.c trunk/reactos/dll/win32/user32/include/controls.h trunk/reactos/dll/win32/user32/include/menu.h trunk/reactos/dll/win32/user32/include/scroll.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/hook.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/object.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/button.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -102,8 +102,8 @@ static void UB_Paint( HWND hwnd, HDC hDC, UINT action ); static void OB_Paint( HWND hwnd, HDC hDC, UINT action ); static void BUTTON_CheckAutoRadioButton( HWND hwnd ); -static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); #define MAX_BTN_TYPE 12 @@ -249,8 +249,8 @@ /*********************************************************************** * ButtonWndProc_common */ -static LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg, + WPARAM wParam, LPARAM lParam, BOOL unicode ) { RECT rect; POINT pt; @@ -591,7 +591,7 @@ * the passed HWND and calls the real window procedure (with a WND* * pointer pointing to the locked windowstructure). */ -static LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; return ButtonWndProc_common( hWnd, uMsg, wParam, lParam, TRUE ); @@ -601,7 +601,7 @@ /*********************************************************************** * ButtonWndProcA */ -static LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; return ButtonWndProc_common( hWnd, uMsg, wParam, lParam, FALSE ); Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -74,8 +74,8 @@ #define COMBO_EDITBUTTONSPACE() 0 #define EDIT_CONTROL_PADDING() 1 -static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); /********************************************************************* * combo class descriptor @@ -1836,8 +1836,8 @@ /*********************************************************************** * ComboWndProc_common */ -static LRESULT ComboWndProc_common( HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam, BOOL unicode ) { LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); @@ -2361,7 +2361,7 @@ * This is just a wrapper for the real ComboWndProc which locks/unlocks * window structs. */ -static LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { if (!IsWindow(hwnd)) return 0; return ComboWndProc_common( hwnd, message, wParam, lParam, FALSE ); @@ -2370,7 +2370,7 @@ /*********************************************************************** * ComboWndProcW */ -static LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { if (!IsWindow(hwnd)) return 0; return ComboWndProc_common( hwnd, message, wParam, lParam, TRUE ); Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -4816,7 +4816,7 @@ * names). * */ -static LRESULT EditWndProc_common( HWND hwnd, UINT msg, +LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW( hwnd, 0 ); Modified: trunk/reactos/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/icontitle.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -30,7 +30,7 @@ static BOOL bMultiLineTitle; static HFONT hIconTitleFont; -static LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ); /********************************************************************* * icon title class descriptor Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -138,8 +138,8 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; -static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam,LPARAM lParam ); +//static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); @@ -2659,8 +2659,8 @@ /*********************************************************************** * ListBoxWndProc_common */ -static LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam, BOOL unicode ) { LB_DESCR *descr = (LB_DESCR *)GetWindowLongPtrW( hwnd, 0 ); LPHEADCOMBO lphc = 0; @@ -3446,7 +3446,7 @@ /*********************************************************************** * ListBoxWndProcA */ -static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { return ListBoxWndProc_common( hwnd, msg, wParam, lParam, FALSE ); } @@ -3454,7 +3454,7 @@ /*********************************************************************** * ListBoxWndProcW */ -static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { return ListBoxWndProc_common( hwnd, msg, wParam, lParam, TRUE ); } Modified: trunk/reactos/dll/win32/user32/controls/regcontrol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/regcontrol.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/regcontrol.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -12,6 +12,10 @@ #include <user32.h> #include <wine/debug.h> + +static PFNCLIENT pfnClientA; +static PFNCLIENT pfnClientW; +static PFNCLIENTWORKER pfnClientWorker; static const struct { @@ -61,46 +65,57 @@ return NtUserRegisterSystemClasses(sizeof(cls) / sizeof(cls[0]), cls); } +LRESULT +WINAPI +MsgWindowProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +{ + if (message == WM_NCCREATE) return TRUE; + return 0; +} - -static PFNCLIENT pfnClientA; -static PFNCLIENT pfnClientW; -static PFNCLIENTWORKER pfnClientWorker; +LRESULT +WINAPI +DialogWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode) +{ + if (unicode) + return DefDlgProcW( hwnd, uMsg, wParam, lParam); + return DefDlgProcA( hwnd, uMsg, wParam, lParam); +} BOOL WINAPI RegisterClientPFN(VOID) { NTSTATUS Status; -// pfnClientA.pfnScrollBarWndProc = ScrollBarWndProcA; -// pfnClientW.pfnScrollBarWndProc = ScrollBarWndProcW; -// pfnClientA.pfnTitleWndProc = IconTitleWndProc; -// pfnClientW.pfnTitleWndProc = IconTitleWndProc; -// pfnClientA.pfnMenuWndProc = PopupMenuWndProcA; -// pfnClientW.pfnMenuWndProc = PopupMenuWndProcW; - pfnClientA.pfnDesktopWndProc = DesktopWndProc; // Fixme! + pfnClientA.pfnScrollBarWndProc = ScrollBarWndProcA; + pfnClientW.pfnScrollBarWndProc = ScrollBarWndProcW; + pfnClientA.pfnTitleWndProc = IconTitleWndProc; + pfnClientW.pfnTitleWndProc = IconTitleWndProc; + pfnClientA.pfnMenuWndProc = PopupMenuWndProcA; + pfnClientW.pfnMenuWndProc = PopupMenuWndProcW; + pfnClientA.pfnDesktopWndProc = DesktopWndProc; pfnClientW.pfnDesktopWndProc = DesktopWndProc; pfnClientA.pfnDefWindowProc = DefWindowProcA; pfnClientW.pfnDefWindowProc = DefWindowProcW; - pfnClientA.pfnMessageWindowProc = DefWindowProcA; - pfnClientW.pfnMessageWindowProc = DefWindowProcW; + pfnClientA.pfnMessageWindowProc = MsgWindowProc; + pfnClientW.pfnMessageWindowProc = MsgWindowProc; pfnClientA.pfnSwitchWindowProc = DefWindowProcA; pfnClientW.pfnSwitchWindowProc = DefWindowProcW; -// pfnClientA.pfnButtonWndProc = ButtonWndProcA; -// pfnClientW.pfnButtonWndProc = ButtonWndProcW -// pfnClientA.pfnComboBoxWndProc = ComboWndProcA; -// pfnClientW.pfnComboBoxWndProc = ComboWndProcW; -// pfnClientA.pfnComboListBoxProc = ListBoxWndProcA; -// pfnClientW.pfnComboListBoxProc = ListBoxWndProcW; -// pfnClientA.pfnDialogWndProc = DefDlgProcA; -// pfnClientW.pfnDialogWndProc = DefDlgProcW; -// pfnClientA.pfnEditWndProc = EditWndProcA; -// pfnClientW.pfnEditWndProc = EditWndProcW; -// pfnClientA.pfnListBoxWndProc = ListBoxWndProcA; -// pfnClientW.pfnListBoxWndProc = ListBoxWndProcW; -// pfnClientA.pfnMDIClientWndProc = MDIClientWndProcA; -// pfnClientW.pfnMDIClientWndProc = MDIClientWndProcW; -// pfnClientA.pfnStaticWndProc = StaticWndProcA; -// pfnClientW.pfnStaticWndProc = StaticWndProcW; + pfnClientA.pfnButtonWndProc = ButtonWndProcA; + pfnClientW.pfnButtonWndProc = ButtonWndProcW; + pfnClientA.pfnComboBoxWndProc = ComboWndProcA; + pfnClientW.pfnComboBoxWndProc = ComboWndProcW; + pfnClientA.pfnComboListBoxProc = ListBoxWndProcA; + pfnClientW.pfnComboListBoxProc = ListBoxWndProcW; + pfnClientA.pfnDialogWndProc = DefDlgProcA; + pfnClientW.pfnDialogWndProc = DefDlgProcW; + pfnClientA.pfnEditWndProc = EditWndProcA; + pfnClientW.pfnEditWndProc = EditWndProcW; + pfnClientA.pfnListBoxWndProc = ListBoxWndProcA; + pfnClientW.pfnListBoxWndProc = ListBoxWndProcW; + pfnClientA.pfnMDIClientWndProc = MDIClientWndProcA; + pfnClientW.pfnMDIClientWndProc = MDIClientWndProcW; + pfnClientA.pfnStaticWndProc = StaticWndProcA; + pfnClientW.pfnStaticWndProc = StaticWndProcW; pfnClientA.pfnImeWndProc = DefWindowProcA; pfnClientW.pfnImeWndProc = DefWindowProcW; pfnClientA.pfnGhostWndProc = DefWindowProcA; @@ -118,14 +133,14 @@ pfnClientA.pfnMDIActivateDlgProc = DefWindowProcA; pfnClientW.pfnMDIActivateDlgProc = DefWindowProcW; -// pfnClientWorker.pfnButtonWndProc = ButtonWndProc_common; -// pfnClientWorker.pfnComboBoxWndProc = ComboWndProc_common; -// pfnClientWorker.pfnComboListBoxProc = ListBoxWndProc_common; -//// pfnClientWorker.pfnDialogWndProc = DefDlgProc_common; -// pfnClientWorker.pfnEditWndProc = EditWndProc_common; -// pfnClientWorker.pfnListBoxWndProc = ListBoxWndProc_common; -// pfnClientWorker.pfnMDIClientWndProc = MDIClientWndProc_common; -// pfnClientWorker.pfnStaticWndProc = StaticWndProc_common; + pfnClientWorker.pfnButtonWndProc = ButtonWndProc_common; + pfnClientWorker.pfnComboBoxWndProc = ComboWndProc_common; + pfnClientWorker.pfnComboListBoxProc = ListBoxWndProc_common; + pfnClientWorker.pfnDialogWndProc = DialogWndProc_common; + pfnClientWorker.pfnEditWndProc = EditWndProc_common; + pfnClientWorker.pfnListBoxWndProc = ListBoxWndProc_common; + pfnClientWorker.pfnMDIClientWndProc = MDIClientWndProc_common; + pfnClientWorker.pfnStaticWndProc = StaticWndProc_common; pfnClientWorker.pfnImeWndProc = User32DefWindowProc; pfnClientWorker.pfnGhostWndProc = User32DefWindowProc; pfnClientWorker.pfnCtfHookProc = User32DefWindowProc; Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -69,8 +69,8 @@ HBRUSH DefWndControlColor(HDC hDC, UINT ctlType); -static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); UINT WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); @@ -1248,7 +1248,7 @@ /*********************************************************************** * ScrollBarWndProc */ -static LRESULT WINAPI +LRESULT WINAPI ScrollBarWndProc(WNDPROC DefWindowProc, HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { if (! IsWindow(Wnd)) @@ -1457,13 +1457,13 @@ return 0; } -static LRESULT WINAPI +LRESULT WINAPI ScrollBarWndProcW(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { return ScrollBarWndProc(DefWindowProcW, Wnd, Msg, wParam, lParam); } -static LRESULT WINAPI +LRESULT WINAPI ScrollBarWndProcA(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam) { return ScrollBarWndProc(DefWindowProcA, Wnd, Msg, wParam, lParam); Modified: trunk/reactos/dll/win32/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/static.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -55,8 +55,8 @@ static void STATIC_PaintBitmapfn( HWND hwnd, HDC hdc, DWORD style ); //static void STATIC_PaintEnhMetafn( HWND hwnd, HDC hdc, DWORD style ); static void STATIC_PaintEtchedfn( HWND hwnd, HDC hdc, DWORD style ); -static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); static COLORREF color_3dshadow, color_3ddkshadow, color_3dhighlight; @@ -436,7 +436,7 @@ /*********************************************************************** * StaticWndProc_common */ -static LRESULT StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, +LRESULT WINAPI StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode ) { LRESULT lResult = 0; @@ -663,7 +663,7 @@ /*********************************************************************** * StaticWndProcA */ -static LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; return StaticWndProc_common(hWnd, uMsg, wParam, lParam, FALSE); @@ -672,7 +672,7 @@ /*********************************************************************** * StaticWndProcW */ -static LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) { if (!IsWindow( hWnd )) return 0; return StaticWndProc_common(hWnd, uMsg, wParam, lParam, TRUE); Modified: trunk/reactos/dll/win32/user32/include/controls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/c… ============================================================================== --- trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/controls.h [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -110,5 +110,24 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); LRESULT WINAPI User32DefWindowProc(HWND,UINT,WPARAM,LPARAM,BOOL); BOOL WINAPI RegisterClientPFN(VOID); +LRESULT WINAPI IconTitleWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI ButtonWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI ButtonWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode); +LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode); +LRESULT WINAPI EditWndProcA(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +LRESULT WINAPI EditWndProcW(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); +LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode); +LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg,WPARAM wParam, LPARAM lParam, BOOL unicode); +LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI MDIClientWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode); +LRESULT WINAPI StaticWndProcA( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI StaticWndProcW( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +LRESULT WINAPI StaticWndProc_common( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL unicode); #endif /* _ROS_CONTROLS_H */ Modified: trunk/reactos/dll/win32/user32/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/m… ============================================================================== --- trunk/reactos/dll/win32/user32/include/menu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/menu.h [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -19,4 +19,7 @@ VOID MenuTrackKbdMenuBar(HWND hWnd, UINT wParam, WCHAR wChar); +LRESULT WINAPI PopupMenuWndProcA(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam); +LRESULT WINAPI PopupMenuWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); + #endif /* __LIB_USER32_INCLUDE_MENU_H */ Modified: trunk/reactos/dll/win32/user32/include/scroll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/s… ============================================================================== --- trunk/reactos/dll/win32/user32/include/scroll.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/scroll.h [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -9,6 +9,8 @@ #ifndef USER32_SCROLL_H_INCLUDED #define USER32_SCROLL_H_INCLUDED -extern VOID FASTCALL ScrollTrackScrollBar(HWND Wnd, INT SBType, POINT Pt); +LRESULT WINAPI ScrollBarWndProcW( HWND hwnd, UINT uMsg, WPARAM wParam,LPARAM lParam ); +LRESULT WINAPI ScrollBarWndProcA( HWND hwnd, UINT uMsg, WPARAM wParam,LPARAM lParam ); +VOID FASTCALL ScrollTrackScrollBar(HWND Wnd, INT SBType, POINT Pt); #endif 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] Sun Jul 26 03:59:08 2009 @@ -270,10 +270,10 @@ FASTCALL TestWindowProcess(PWND Wnd) { - if (Wnd->pti == (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) + if (Wnd->head.pti == (PW32THREADINFO)NtCurrentTeb()->Win32ThreadInfo) return TRUE; else - return (NtUserQueryWindow(Wnd->hdr.Handle, QUERY_WINDOW_UNIQUE_PROCESS_ID) == + return (NtUserQueryWindow(Wnd->head.h, QUERY_WINDOW_UNIQUE_PROCESS_ID) == (DWORD)NtCurrentTeb()->ClientId.UniqueProcess ); } Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -123,8 +123,8 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *); static HWND MDI_MoreWindowsDialog(HWND); -static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); -static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); +//static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); HWND* WIN_ListChildren (HWND hWndparent) { @@ -1057,8 +1057,8 @@ /********************************************************************** * MDIClientWndProc_common */ -static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message, - WPARAM wParam, LPARAM lParam, BOOL unicode ) +LRESULT WINAPI MDIClientWndProc_common( HWND hwnd, UINT message, + WPARAM wParam, LPARAM lParam, BOOL unicode ) { MDICLIENTINFO *ci = NULL; @@ -1319,7 +1319,7 @@ /*********************************************************************** * MDIClientWndProcA */ -static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { if (!IsWindow(hwnd)) return 0; return MDIClientWndProc_common( hwnd, message, wParam, lParam, FALSE ); @@ -1328,7 +1328,7 @@ /*********************************************************************** * MDIClientWndProcW */ -static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { if (!IsWindow(hwnd)) return 0; return MDIClientWndProc_common( hwnd, message, wParam, lParam, TRUE ); 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] Sun Jul 26 03:59:08 2009 @@ -72,8 +72,8 @@ POINT Pt; } MTRACKER; -static LRESULT WINAPI PopupMenuWndProcA(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam); -static LRESULT WINAPI PopupMenuWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); +//static LRESULT WINAPI PopupMenuWndProcA(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam); +//static LRESULT WINAPI PopupMenuWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); /********************************************************************* * PopupMenu class descriptor @@ -972,7 +972,7 @@ } } -static LRESULT WINAPI +LRESULT WINAPI PopupMenuWndProcA(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) { TRACE("YES! hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam); @@ -1036,7 +1036,7 @@ return 0; } -static LRESULT WINAPI +LRESULT WINAPI PopupMenuWndProcW(HWND Wnd, UINT Message, WPARAM wParam, LPARAM lParam) { TRACE("hwnd=%x msg=0x%04x wp=0x%04lx lp=0x%08lx\n", Wnd, Message, wParam, lParam); 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] Sun Jul 26 03:59:08 2009 @@ -1340,7 +1340,7 @@ if (lpmsg->hwnd != NULL) { Wnd = ValidateHwnd(lpmsg->hwnd); - if (!Wnd || SharedPtrToUser(Wnd->pti) != GetW32ThreadInfo()) + if (!Wnd || SharedPtrToUser(Wnd->head.pti) != GetW32ThreadInfo()) return 0; } else @@ -1401,7 +1401,7 @@ if (lpmsg->hwnd != NULL) { Wnd = ValidateHwnd(lpmsg->hwnd); - if (!Wnd || SharedPtrToUser(Wnd->pti) != GetW32ThreadInfo()) + if (!Wnd || SharedPtrToUser(Wnd->head.pti) != GetW32ThreadInfo()) return 0; } else @@ -1801,7 +1801,7 @@ PW32THREADINFO ti = GetW32ThreadInfo(); Window = ValidateHwnd(Wnd); - if (Window != NULL && SharedPtrToUser(Window->pti) == ti && !IsThreadHooked(GetWin32ClientInfo())) + if (Window != NULL && SharedPtrToUser(Window->head.pti) == ti && !IsThreadHooked(GetWin32ClientInfo())) { /* NOTE: We can directly send messages to the window procedure if *all* the following conditions are met: @@ -1865,7 +1865,7 @@ PW32THREADINFO ti = GetW32ThreadInfo(); Window = ValidateHwnd(Wnd); - if (Window != NULL && SharedPtrToUser(Window->pti) == ti && !IsThreadHooked(GetWin32ClientInfo())) + if (Window != NULL && SharedPtrToUser(Window->head.pti) == ti && !IsThreadHooked(GetWin32ClientInfo())) { /* NOTE: We can directly send messages to the window procedure if *all* the following conditions are met: 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] Sun Jul 26 03:59:08 2009 @@ -1268,7 +1268,7 @@ if (!pWnd) return Ret; - ti = SharedPtrToUser(pWnd->pti); + ti = SharedPtrToUser(pWnd->head.pti); if (ti) { Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -451,7 +451,8 @@ RECT r; HBRUSH hBrush; } PATRECT, * PPATRECT; - +#endif +#ifndef __WIN32K_NTUSER_H typedef struct _W32CLIENTINFO { ULONG CI_flags; @@ -462,7 +463,6 @@ ULONG W32ClientInfo[57]; } W32CLIENTINFO, *PW32CLIENTINFO; #endif - typedef struct _GDIBSPPATBLT { GDIBATCHHDR gbHdr; 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] Sun Jul 26 03:59:08 2009 @@ -2,7 +2,6 @@ #define __WIN32K_NTUSER_H typedef struct _PROCESSINFO *PPROCESSINFO; -struct _W32THREADINFO; struct _DESKTOP; struct _WND; @@ -36,8 +35,134 @@ VOID NTAPI RtlInitLargeUnicodeString(IN OUT PLARGE_UNICODE_STRING,IN PCWSTR,IN INT); BOOL NTAPI RtlLargeStringToUnicodeString( PUNICODE_STRING, PLARGE_STRING); -/* FIXME: UserHMGetHandle needs to be updated once the new handle manager is implemented */ -#define UserHMGetHandle(obj) ((obj)->hdr.Handle) +typedef struct _DESKTOPINFO +{ + PVOID pvDesktopBase; + PVOID pvDesktopLimit; + + HANDLE hKernelHeap; + ULONG_PTR HeapLimit; + HWND hTaskManWindow; + HWND hProgmanWindow; + HWND hShellWindow; + struct _WND *Wnd; + + union + { + UINT Dummy; + struct + { + UINT LastInputWasKbd : 1; + }; + }; + + WCHAR szDesktopName[1]; +} DESKTOPINFO, *PDESKTOPINFO; + +#define CTI_INSENDMESSAGE 0x0002 + +typedef struct _CLIENTTHREADINFO +{ + DWORD CTI_flags; + WORD fsChangeBits; + WORD fsWakeBits; + WORD fsWakeBitsJournal; + WORD fsWakeMask; + ULONG tickLastMsgChecked; + DWORD dwcPumpHook; +} CLIENTTHREADINFO, *PCLIENTTHREADINFO; + +typedef struct _W32THREADINFO +{ + PPROCESSINFO ppi; /* [KERNEL] */ + PDESKTOPINFO pDeskInfo; + ULONG fsHooks; +} W32THREADINFO, *PW32THREADINFO; + +typedef struct _HEAD +{ + HANDLE h; + DWORD cLockObj; +} HEAD, *PHEAD; + +typedef struct _THRDESKHEAD +{ + HANDLE h; + DWORD cLockObj; + PW32THREADINFO pti; + struct _DESKTOP *rpdesk; + PVOID pSelf; +} THRDESKHEAD, *PTHRDESKHEAD; + +typedef struct _PROCDESKHEAD +{ + HANDLE h; + DWORD cLockObj; + DWORD hTaskWow; + struct _DESKTOP *rpdesk; + PVOID pSelf; +} PROCDESKHEAD, *PPROCDESKHEAD; + +#define UserHMGetHandle(obj) ((obj)->head.h) + +/* Window Client Information structure */ +struct _ETHREAD; + +typedef struct tagHOOK +{ + THRDESKHEAD head; + LIST_ENTRY Chain; /* Hook chain entry */ + struct _ETHREAD* Thread; /* Thread owning the hook */ + int HookId; /* Hook table index */ + HOOKPROC Proc; /* Hook function */ + BOOLEAN Ansi; /* Is it an Ansi hook? */ + ULONG Flags; /* Some internal flags */ + UNICODE_STRING ModuleName; /* Module name for global hooks */ +} HOOK, *PHOOK; + +typedef struct _CALLBACKWND +{ + HWND hWnd; + PVOID pvWnd; +} CALLBACKWND, *PCALLBACKWND; + +#define CI_CURTHPRHOOK 0x00000010 + +typedef struct _CLIENTINFO +{ + ULONG CI_flags; + ULONG cSpins; + DWORD dwExpWinVer; + DWORD dwCompatFlags; + DWORD dwCompatFlags2; + DWORD dwTIFlags; + PDESKTOPINFO pDeskInfo; + ULONG_PTR ulClientDelta; + PHOOK phkCurrent; + ULONG fsHooks; + CALLBACKWND CallbackWnd; + DWORD dwHookCurrent; + INT cInDDEMLCallback; + PCLIENTTHREADINFO pClientThreadInfo; + ULONG_PTR dwHookData; + DWORD dwKeyCache; + DWORD afKeyState[2]; + DWORD dwAsyncKeyCache; + DWORD afAsyncKeyState[2]; + DWORD afAsyncKeyStateRecentDow[2]; + HKL hKL; + USHORT CodePage; + USHORT achDbcsCF; + MSG msgDbcsCB; + ULONG Win32ClientInfo3[28]; +/* It's just a pointer reference not to be used w the structure in user space. */ + PPROCESSINFO ppi; +} CLIENTINFO, *PCLIENTINFO; + +/* Make sure it fits exactly into the TEB */ +C_ASSERT(sizeof(CLIENTINFO) == FIELD_OFFSET(TEB, glDispatchTable) - FIELD_OFFSET(TEB, Win32ClientInfo)); + +#define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo)) typedef struct _REGISTER_SYSCLASS { @@ -60,36 +185,6 @@ PUNICODE_STRING pusMenuName; } CLSMENUNAME, *PCLSMENUNAME; -typedef struct _USER_OBJHDR -{ - /* This is the common header for all user handle objects */ - HANDLE Handle; -} USER_OBJHDR, PUSER_OBJHDR; - -typedef struct _DESKTOPINFO -{ - PVOID pvDesktopBase; - PVOID pvDesktopLimit; - - HANDLE hKernelHeap; - ULONG_PTR HeapLimit; - HWND hTaskManWindow; - HWND hProgmanWindow; - HWND hShellWindow; - struct _WND *Wnd; - - union - { - UINT Dummy; - struct - { - UINT LastInputWasKbd : 1; - }; - }; - - WCHAR szDesktopName[1]; -} DESKTOPINFO, *PDESKTOPINFO; - typedef enum _GETCPD { UserGetCPDU2A = 0x01, @@ -102,9 +197,7 @@ typedef struct _CALLPROCDATA { -// PROCDESKHEAD head; // Use this once new handle manager is implemented!!! - USER_OBJHDR hdr; /* FIXME: Move out of the structure once new handle manager is implemented */ -// + PROCDESKHEAD head; struct _CALLPROCDATA *spcpdNext; WNDPROC pfnClientPrevious; union @@ -257,15 +350,7 @@ typedef struct _WND { - //THRDESKHEAD head; // head.h == handle - 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 - eventually replace WINDOW_OBJECT. Right now WINDOW_OBJECT - keeps a reference to this structure until all the information - is moved to this structure */ - struct _W32THREADINFO *pti; // head.pti - struct _DESKTOP *rpdesk; // head.rpdesk - + THRDESKHEAD head; DWORD state; DWORD state2; /* Extended style. */ @@ -388,6 +473,7 @@ #define FNID_MENU 0x029C #define FNID_DESKTOP 0x029D #define FNID_DEFWINDOWPROC 0x029E +#define FNID_MESSAGEWND 0x029F #define FNID_SWITCH 0x02A0 #define FNID_BUTTON 0x02A1 #define FNID_COMBOBOX 0x02A2 @@ -398,17 +484,20 @@ #define FNID_MDICLIENT 0x02A7 #define FNID_STATIC 0x02A8 #define FNID_IME 0x02A9 -#define FNID_CALLWNDPROC 0x02AA -#define FNID_CALLWNDPROCRET 0x02AB -#define FNID_HKINLPCWPEXSTRUCT 0x02AC -#define FNID_HKINLPCWPRETEXSTRUCT 0x02AD -#define FNID_SENDMESSAGE 0x02B0 +#define FNID_GHOST 0x02AA +#define FNID_CALLWNDPROC 0x02AB +#define FNID_CALLWNDPROCRET 0x02AC +#define FNID_HKINLPCWPEXSTRUCT 0x02AD +#define FNID_HKINLPCWPRETEXSTRUCT 0x02AE +#define FNID_MB_DLGPROC 0x02AF +#define FNID_MDIACTIVATEDLGPROC 0x02B0 +#define FNID_SENDMESSAGE 0x02B1 +#define FNID_SENDMESSAGEFF 0x02B2 // Kernel has option to use TimeOut or normal msg send, based on type of msg. -#define FNID_SENDMESSAGEWTOOPTION 0x02B1 -#define FNID_SENDMESSAGETIMEOUT 0x02B2 -#define FNID_BROADCASTSYSTEMMESSAGE 0x02B4 -#define FNID_TOOLTIPS 0x02B5 -#define FNID_UNKNOWN 0x02B6 +#define FNID_SENDMESSAGEWTOOPTION 0x02B3 +#define FNID_SENDMESSAGETIMEOUT 0x02B4 +#define FNID_BROADCASTSYSTEMMESSAGE 0x02B5 +#define FNID_TOOLTIPS 0x02B6 #define FNID_SENDNOTIFYMESSAGE 0x02B7 #define FNID_SENDMESSAGECALLBACK 0x02B8 #define FNID_LAST 0x02B9 @@ -551,85 +640,6 @@ PERUSERSERVERINFO; } SERVERINFO, *PSERVERINFO; -#define CTI_INSENDMESSAGE 0x0002 - -typedef struct _CLIENTTHREADINFO -{ - DWORD CTI_flags; - WORD fsChangeBits; - WORD fsWakeBits; - WORD fsWakeBitsJournal; - WORD fsWakeMask; - ULONG tickLastMsgChecked; - DWORD dwcPumpHook; -} CLIENTTHREADINFO, *PCLIENTTHREADINFO; - -typedef struct _W32THREADINFO -{ - PPROCESSINFO ppi; /* [KERNEL] */ - PDESKTOPINFO pDeskInfo; - ULONG fsHooks; -} W32THREADINFO, *PW32THREADINFO; - -/* Window Client Information structure */ -struct _ETHREAD; - - -typedef struct tagHOOK -{ - LIST_ENTRY Chain; /* Hook chain entry */ - HHOOK Self; /* user handle for this hook */ - struct _ETHREAD* Thread; /* Thread owning the hook */ - int HookId; /* Hook table index */ - HOOKPROC Proc; /* Hook function */ - BOOLEAN Ansi; /* Is it an Ansi hook? */ - ULONG Flags; /* Some internal flags */ - UNICODE_STRING ModuleName; /* Module name for global hooks */ -} HOOK, *PHOOK; - -typedef struct _CALLBACKWND -{ - HWND hWnd; - PVOID pvWnd; -} CALLBACKWND, *PCALLBACKWND; - -#define CI_CURTHPRHOOK 0x00000010 - -typedef struct _CLIENTINFO -{ - ULONG CI_flags; - ULONG cSpins; - DWORD dwExpWinVer; - DWORD dwCompatFlags; - DWORD dwCompatFlags2; - DWORD dwTIFlags; - PDESKTOPINFO pDeskInfo; - ULONG_PTR ulClientDelta; - PHOOK phkCurrent; - ULONG fsHooks; - CALLBACKWND CallbackWnd; - DWORD dwHookCurrent; - INT cInDDEMLCallback; - PCLIENTTHREADINFO pClientThreadInfo; - ULONG_PTR dwHookData; - DWORD dwKeyCache; - DWORD afKeyState[2]; - DWORD dwAsyncKeyCache; - DWORD afAsyncKeyState[2]; - DWORD afAsyncKeyStateRecentDow[2]; - HKL hKL; - USHORT CodePage; - USHORT achDbcsCF; - MSG msgDbcsCB; - ULONG Win32ClientInfo3[28]; -/* It's just a pointer reference not to be used w the structure in user space. */ - PPROCESSINFO ppi; -} CLIENTINFO, *PCLIENTINFO; - -/* Make sure it fits exactly into the TEB */ -C_ASSERT(sizeof(CLIENTINFO) == FIELD_OFFSET(TEB, glDispatchTable) - FIELD_OFFSET(TEB, Win32ClientInfo)); - -#define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo)) // Server event activity bits. #define SRV_EVENT_MENU 0x0001 Modified: trunk/reactos/subsystems/win32/win32k/include/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/hook.h [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -2,19 +2,6 @@ #define _WIN32K_HOOK_H #define HOOK_THREAD_REFERENCED (0x1) -#if 0 -typedef struct tagHOOK -{ - LIST_ENTRY Chain; /* Hook chain entry */ - HHOOK Self; /* user handle for this hook */ - PETHREAD Thread; /* Thread owning the hook */ - int HookId; /* Hook table index */ - HOOKPROC Proc; /* Hook function */ - BOOLEAN Ansi; /* Is it an Ansi hook? */ - ULONG Flags; /* Some internal flags */ - UNICODE_STRING ModuleName; /* Module name for global hooks */ -} HOOK, *PHOOK; -#endif #define NB_HOOKS (WH_MAXHOOK-WH_MINHOOK+1) #define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK) #define HOOKID_TO_FLAG(HookId) (1 << ((HookId) + 1)) @@ -29,7 +16,6 @@ typedef struct tagEVENTHOOK { LIST_ENTRY Chain; /* Event chain entry */ - HWINEVENTHOOK Self; /* user handle for this event */ PETHREAD Thread; /* Thread owning the event */ UINT eventMin; UINT eventMax; @@ -39,6 +25,7 @@ ULONG Flags; /* Some internal flags */ ULONG_PTR offPfn; INT ihmod; + THRDESKHEAD head; // FIXME When on top it creates problems UNICODE_STRING ModuleName; /* Module name for global events */ } EVENTHOOK, *PEVENTHOOK; 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] Sun Jul 26 03:59:08 2009 @@ -169,7 +169,7 @@ LRESULT FASTCALL IntDefWindowProc( PWINDOW_OBJECT Window, UINT Msg, WPARAM wParam, LPARAM lParam, BOOL Ansi); -VOID FASTCALL IntNotifyWinEvent(DWORD, HWND, LONG, LONG); +VOID FASTCALL IntNotifyWinEvent(DWORD, PWND, LONG, LONG); PWND APIENTRY co_IntCreateWindowEx(DWORD,PUNICODE_STRING,PUNICODE_STRING,DWORD,LONG,LONG,LONG,LONG,HWND,HMENU,HINSTANCE,LPVOID,DWORD,BOOL); #endif /* _WIN32K_WINDOW_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callproc.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -48,7 +48,7 @@ sizeof(CALLPROCDATA)); if (NewCallProc != NULL) { - NewCallProc->hdr.Handle = Handle; /* FIXME: Remove hack */ + NewCallProc->head.h = Handle; NewCallProc->pfnClientPrevious = CallProc->pfnClientPrevious; NewCallProc->Unicode = CallProc->Unicode; NewCallProc->spcpdNext = NULL; @@ -73,7 +73,7 @@ sizeof(CALLPROCDATA)); if (NewCallProc != NULL) { - NewCallProc->hdr.Handle = Handle; /* FIXME: Remove hack */ + NewCallProc->head.h = Handle; NewCallProc->pfnClientPrevious = WndProc; NewCallProc->Unicode = Unicode; NewCallProc->spcpdNext = NULL; 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] Sun Jul 26 03:59:08 2009 @@ -566,7 +566,7 @@ DPRINT("No active desktop\n"); return NULL; } - return pdo->spwndMessage->hdr.Handle; + return pdo->spwndMessage->head.h; } HWND FASTCALL IntGetCurrentThreadDesktopWindow(VOID) @@ -1119,7 +1119,7 @@ wc.cbSize = sizeof(wc); wc.style = 0; - wc.lpfnWndProc = gpsi->apfnClientW.pfnDesktopWndProc; // Use pfnMessageWindowProc + wc.lpfnWndProc = gpsi->apfnClientW.pfnMessageWindowProc; wc.cbClsExtra = 0; wc.cbWndExtra = 0; wc.hInstance = hModClient; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -3,6 +3,9 @@ #define NDEBUG #include <debug.h> + +#define WINEVENT_INIT 0x40000000 +#define WINEVENT_DESTROYED 0x80000000 typedef struct _EVENTPACK { @@ -126,10 +129,13 @@ { if (pEH) { + DPRINT("IntRemoveEvent pEH 0x%x\n",pEH); + KeEnterCriticalRegion(); RemoveEntryList(&pEH->Chain); GlobalEvents->Counts--; if (!GlobalEvents->Counts) gpsi->dwInstalledEventHooks = 0; - UserDeleteObject(pEH->Self, otEvent); + UserDeleteObject(pEH->head.h, otEvent); + KeLeaveCriticalRegion(); return TRUE; } return FALSE; @@ -150,14 +156,14 @@ pEH = pEP->pEH; - Result = co_IntCallEventProc( pEH->Self, - event, - hwnd, - pEP->idObject, - pEP->idChild, + Result = co_IntCallEventProc( pEH->head.h, + event, + hwnd, + pEP->idObject, + pEP->idChild, (DWORD)(NtCurrentTeb()->ClientId).UniqueThread, - (DWORD)EngGetTickCount(), - pEH->Proc); + (DWORD)EngGetTickCount(), + pEH->Proc); return Result; } @@ -165,19 +171,32 @@ FASTCALL IntNotifyWinEvent( DWORD Event, - HWND hWnd, + PWND pWnd, LONG idObject, LONG idChild) { PEVENTHOOK pEH; LRESULT Result; + DPRINT("IntNotifyWinEvent GlobalEvents = 0x%x pWnd 0x%x\n",GlobalEvents, pWnd); + + if (!pWnd) return; + + if (pWnd && pWnd->state & WNDS_DESTROYED) return; + if (!GlobalEvents || !GlobalEvents->Counts) return; + if (!UserIsEntered()) return; + pEH = (PEVENTHOOK)GlobalEvents->Events.Flink; - + DPRINT("IntNotifyWinEvent pEH 0x%x\n",pEH); do { + if (pEH->Flags & WINEVENT_INIT) + { + DPRINT("IntNotifyWinEvent is still in INIT MODE!! pEH 0x%x\n",pEH); + } + UserReferenceObject(pEH); // Must be inside the event window. if ( (pEH->eventMin <= Event) && (pEH->eventMax >= Event)) @@ -187,7 +206,7 @@ if (!(pEH->idProcess) || !(pEH->idThread) || (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)pEH->idProcess)) { - Result = IntCallLowLevelEvent(pEH, Event, hWnd, idObject, idChild); + Result = IntCallLowLevelEvent(pEH, Event, UserHMGetHandle(pWnd), idObject, idChild); } }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && @@ -196,14 +215,16 @@ !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) || !pEH->idProcess ) ) { - Result = co_IntCallEventProc( pEH->Self, - Event, - hWnd, - idObject, - idChild, + + Result = co_IntCallEventProc( pEH->head.h, + Event, + UserHMGetHandle(pWnd), + idObject, + idChild, PtrToUint(NtCurrentTeb()->ClientId.UniqueThread), - (DWORD)EngGetTickCount(), - pEH->Proc); + (DWORD)EngGetTickCount(), + pEH->Proc); + } } UserDereferenceObject(pEH); @@ -234,7 +255,7 @@ if (gpsi->dwInstalledEventHooks & GetMaskFromEvent(Event)) { UserRefObjectCo(Window, &Ref); - IntNotifyWinEvent( Event, Window->hSelf, idObject, idChild); + IntNotifyWinEvent( Event, Window->Wnd, idObject, idChild); UserDerefObjectCo(Window); } UserLeave(); @@ -309,7 +330,10 @@ InsertTailList(&GlobalEvents->Events, &pEH->Chain); GlobalEvents->Counts++; - pEH->Self = Handle; + pEH->Flags = dwflags|WINEVENT_INIT; + pEH->head.h = Handle; +// pEH->head.pti =? +// pEH->head.rpdesk if (Thread) pEH->Thread = Thread; else @@ -318,8 +342,6 @@ pEH->eventMax = eventMax; pEH->idProcess = idProcess; pEH->idThread = idThread; - pEH->Flags = dwflags; - if (NULL != hmodWinEventProc) { @@ -371,6 +393,8 @@ else pEH->Proc = lpfnWinEventProc; + pEH->Flags &= ~WINEVENT_INIT; + UserDereferenceObject(pEH); Ret = Handle; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -104,7 +104,9 @@ return NULL; } - Hook->Self = Handle; +// Hook->head.pti =? +// Hook->head.rpdesk + Hook->head.h = Handle; Hook->Thread = Thread; Hook->HookId = HookId; @@ -218,7 +220,7 @@ } /* Close handle */ - UserDeleteObject(Hook->Self, otHook); + UserDeleteObject(Hook->head.h, otHook); } /* remove a hook, freeing it if the chain is not in use */ @@ -1282,7 +1284,7 @@ Hook->Proc = HookProc; Hook->Ansi = Ansi; - Handle = Hook->Self; + Handle = Hook->head.h; /* Clear the client threads next hook. */ ClientInfo->phkCurrent = 0; @@ -1333,7 +1335,7 @@ RETURN( FALSE); } - ASSERT(Hook == HookObj->Self); + ASSERT(Hook == HookObj->head.h); IntRemoveHook(HookObj, WinStaObj, FALSE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/object.c [iso-8859-1] Sun Jul 26 03:59:08 2009 @@ -382,7 +382,7 @@ if (!hdr->destroyed && hdr->RefCount == 0) { hdr->RefCount++; // BOUNCE!!!!! - DPRINT1("warning! Dereference to zero without deleting!\n"); + DPRINT1("warning! Dereference to zero without deleting! Obj -> 0x%x\n", obj); } if (hdr->RefCount == 0 && hdr->destroyed) 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] Sun Jul 26 03:59:08 2009 @@ -418,7 +418,7 @@ // Window nz, check to see if we still own this or it is just cheap wine tonight. if (!(Flags & DCX_CACHE)) { - if ( Wnd->pti != GetW32ThreadInfo()) + if ( Wnd->head.pti != GetW32ThreadInfo()) Flags |= DCX_CACHE; // Ah~ Not Powned! Forced to be cheap~ } 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] Sun Jul 26 03:59:08 2009 @@ -329,12 +329,12 @@ { Wnd->strName.Length = 0; Wnd->strName.MaximumLength = 0; - DesktopHeapFree(Wnd->rpdesk, + DesktopHeapFree(Wnd->head.rpdesk, Wnd->strName.Buffer); Wnd->strName.Buffer = NULL; } - DesktopHeapFree(Wnd->rpdesk, Wnd); + DesktopHeapFree(Wnd->head.rpdesk, Wnd); WindowObject->Wnd = NULL; } @@ -370,6 +370,9 @@ } Window->Status |= WINDOWSTATUS_DESTROYING; Wnd->style &= ~WS_VISIBLE; + + IntNotifyWinEvent(EVENT_OBJECT_DESTROY, Wnd, OBJID_WINDOW, 0); + /* remove the window already at this point from the thread window list so we don't get into trouble when destroying the thread windows while we're still in IntDestroyWindow() */ @@ -378,8 +381,6 @@ BelongsToThreadData = IntWndBelongsToThread(Window, ThreadData); IntDeRegisterShellHookWindow(Window->hSelf); - - IntNotifyWinEvent(EVENT_OBJECT_DESTROY, Window->hSelf, OBJID_WINDOW, 0); if(SendMessages) { @@ -428,6 +429,8 @@ /* from now on no messages can be sent to this window anymore */ Window->Status |= WINDOWSTATUS_DESTROYED; + Wnd->state |= WNDS_DESTROYED; + /* don't remove the WINDOWSTATUS_DESTROYING bit */ /* reset shell window handles */ @@ -569,10 +572,10 @@ Wnd->Unicode); if (NewCallProc == NULL) { - NewCallProc = CreateCallProc(Wnd->pti->pDeskInfo, + NewCallProc = CreateCallProc(Wnd->head.pti->pDeskInfo, Wnd->lpfnWndProc, Wnd->Unicode, - Wnd->pti->ppi); + Wnd->head.pti->ppi); if (NewCallProc == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -1669,11 +1672,11 @@ goto AllocErr; RtlZeroMemory(Window->Wnd, sizeof(WND) + Class->cbwndExtra); - Window->Wnd->hdr.Handle = hWnd; /* FIXME: Remove hack , are you sure?*/ + Window->Wnd->head.h = hWnd; Wnd = Window->Wnd; - Wnd->pti = ti; - Wnd->rpdesk = pti->Desktop; + Wnd->head.pti = ti; + Wnd->head.rpdesk = pti->Desktop; Wnd->hWndLastActive = hWnd; } @@ -1769,7 +1772,7 @@ if ( NULL != WindowName->Buffer && WindowName->Length > 0 ) { - Wnd->strName.Buffer = DesktopHeapAlloc(Wnd->rpdesk, + Wnd->strName.Buffer = DesktopHeapAlloc(Wnd->head.rpdesk, WindowName->Length + sizeof(UNICODE_NULL)); if (Wnd->strName.Buffer == NULL) { @@ -2122,7 +2125,7 @@ RETURN((PWND)0); } - IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window->hSelf, OBJID_WINDOW, 0); + IntNotifyWinEvent(EVENT_OBJECT_CREATE, Window->Wnd, OBJID_WINDOW, 0); /* Send move and size messages. */ if (!(Window->Flags & WINDOWOBJECT_NEED_SIZE)) @@ -2240,7 +2243,7 @@ { PCALLPROCDATA CallProc; //CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, bUnicodeWindow, Wnd->ti->ppi); - CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, Wnd->Unicode , Wnd->pti->ppi); + CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, Wnd->Unicode , Wnd->head.pti->ppi); if (!CallProc) { @@ -2363,7 +2366,7 @@ dwShowMode, bUnicodeWindow); - if (pNewWindow) NewWindow = pNewWindow->hdr.Handle; + if (pNewWindow) NewWindow = UserHMGetHandle(pNewWindow); if (WindowName.Buffer) { @@ -3729,7 +3732,7 @@ CallProc = CreateCallProc(NULL, Wnd->lpfnWndProc, Wnd->Unicode, - Wnd->pti->ppi); + Wnd->head.pti->ppi); if (CallProc == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -4819,10 +4822,10 @@ Wnd->strName.Buffer = NULL; if (buf != NULL) { - DesktopHeapFree(Wnd->rpdesk, buf); + DesktopHeapFree(Wnd->head.rpdesk, buf); } - Wnd->strName.Buffer = DesktopHeapAlloc(Wnd->rpdesk, + Wnd->strName.Buffer = DesktopHeapAlloc(Wnd->head.rpdesk, UnicodeString.Length + sizeof(UNICODE_NULL)); if (Wnd->strName.Buffer != NULL) {

1 0

[tkreuzer] 42222: Add hack for gnu ld like in mingw lib, as it uses _image_base__ insetad of __ImageBase
by tkreuzer＠svn.reactos.org 26 Jul '09

26 Jul '09

Author: tkreuzer Date: Sun Jul 26 02:22:57 2009 New Revision: 42222 URL: http://svn.reactos.org/svn/reactos?rev=42222&view=rev Log: Add hack for gnu ld like in mingw lib, as it uses _image_base__ insetad of __ImageBase Modified: trunk/reactos/include/psdk/delayimp.h Modified: trunk/reactos/include/psdk/delayimp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/delayimp.h?re… ============================================================================== --- trunk/reactos/include/psdk/delayimp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/delayimp.h [iso-8859-1] Sun Jul 26 02:22:57 2009 @@ -1,5 +1,10 @@ #ifndef _delayimp_h #define _delayimp_h + +#ifdef __GNUC__ +/* Hack, for bug in ld. Will be removed soon. */ +#define __ImageBase _image_base__ +#endif #define DELAYLOAD_VERSION 0x200

1 0

[sginsberg] 42221: - Fix memory leak from r42218 ;0)
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sun Jul 26 00:19:45 2009 New Revision: 42221 URL: http://svn.reactos.org/svn/reactos?rev=42221&view=rev Log: - Fix memory leak from r42218 ;0) Modified: trunk/reactos/boot/freeldr/freeldr/video/fade.c Modified: trunk/reactos/boot/freeldr/freeldr/video/fade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/video/fade.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/video/fade.c [iso-8859-1] Sun Jul 26 00:19:45 2009 @@ -90,6 +90,8 @@ MachVideoSetPaletteColor(Color, PaletteColors[Color].Red, PaletteColors[Color].Green, PaletteColors[Color].Blue); } } + + MmHeapFree(PaletteColors); } VOID VideoFadeOut(ULONG ColorCount)

1 0

[ros-arm-bringup] 42220: - This is a HIGH RISK patch. It has been tested on multiple emulators and configurations but requires broader input. - Implement several changes to PFN database management: - The PTEs for the PFN Database are now created by ARM3. Unlike the old code which create PTE for every page on the machine, ARM3 only creates PTEs to account for pages that should be in the PFN database. - A second related change is what "pages should be in the PFN database". Previously, reserved or
by ros-arm-bringup＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: ros-arm-bringup Date: Sat Jul 25 23:35:31 2009 New Revision: 42220 URL: http://svn.reactos.org/svn/reactos?rev=42220&view=rev Log: - This is a HIGH RISK patch. It has been tested on multiple emulators and configurations but requires broader input. - Implement several changes to PFN database management: - The PTEs for the PFN Database are now created by ARM3. Unlike the old code which create PTE for every page on the machine, ARM3 only creates PTEs to account for pages that should be in the PFN database. - A second related change is what "pages should be in the PFN database". Previously, reserved or otherwise non-existing (ie: holes) memory regions would get a PFN entry created and marked as "BIOS". This is wasteful and not compatible with Windows: there should not be PFN entries created at all. - So we removed BIOS PFN entries, and now only create PTEs for valid pages as listed in the physical memory ranges. - This allows machines with "holes" in their physical address space not to waste dozens of MBs of nonpaged pool - Also saves memory on regular machines too, since 1-4MB worth of memory will now not be in the DB anymore - To keep track of pages that are invalid/unknown/ignored, there is now a "PFN Bitmap". This bitmap has one bit set for each valid PFN in the database. - And so, MiGetPfnEntry now also validates that, if there is a PFN Bitmap, the requested PFN is actually present in the database. - This introduces a major functional change: device pages, reserved pages, and other BIOS pages cannot be referenced, shared, or managed in any meaningful way. - We have attempted to fix parts of the OS that depended on this, but there may still be bugs. - A known issue may be an assertion during reboot and/or shutdown in the hyperspace mapping function. It is currently safe to simply "cont" in the debugger a couple of times. - We are working on a fix. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Jul 25 23:35:31 2009 @@ -1045,9 +1045,13 @@ MiGetPfnEntry(IN PFN_TYPE Pfn) { PMMPFN Page; + extern RTL_BITMAP MiPfnBitMap; /* Make sure the PFN number is valid */ if (Pfn > MmHighestPhysicalPage) return NULL; + + /* Make sure this page actually has a PFN entry */ + if ((MiPfnBitMap.Buffer) && !(RtlTestBit(&MiPfnBitMap, Pfn))) return NULL; /* Get the entry */ Page = &MmPfnDatabase[Pfn]; Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Jul 25 23:35:31 2009 @@ -169,6 +169,20 @@ // In Windows, this includes the Quark Color Table, but not in ARMÂ³ // ULONG MxPfnAllocation; + +// +// Unlike the old ReactOS Memory Manager, ARMÂ³ (and Windows) does not keep track +// of pages that are not actually valid physical memory, such as ACPI reserved +// regions, BIOS address ranges, or holes in physical memory address space which +// could indicate device-mapped I/O memory. +// +// In fact, the lack of a PFN entry for a page usually indicates that this is +// I/O space instead. +// +// A bitmap, called the PFN bitmap, keeps track of all page frames by assigning +// a bit to each. If the bit is set, then the page is valid physical RAM. +// +RTL_BITMAP MiPfnBitMap; // // This structure describes the different pieces of RAM-backed address space @@ -596,6 +610,9 @@ ULONG OldCount; BOOLEAN IncludeType[LoaderMaximum]; ULONG i; + PVOID Bitmap; + PPHYSICAL_MEMORY_RUN Run; + PFN_NUMBER FreePage, FreePageCount, PagesLeft, BasePage, PageCount; BoundaryAddressMultiple.QuadPart = 0; if (Phase == 0) @@ -1108,9 +1125,138 @@ // Now go ahead and initialize the ARMÂ³ nonpaged pool // MiInitializeArmPool(); + + // + // Get current page data, since we won't be using MxGetNextPage as it + // would corrupt our state + // + FreePage = MxFreeDescriptor->BasePage; + FreePageCount = MxFreeDescriptor->PageCount; + PagesLeft = 0; + + // + // Loop the memory descriptors + // + NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry != &KeLoaderBlock->MemoryDescriptorListHead) + { + // + // Get the descriptor + // + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + if ((MdBlock->MemoryType == LoaderFirmwarePermanent) || + (MdBlock->MemoryType == LoaderBBTMemory) || + (MdBlock->MemoryType == LoaderSpecialMemory)) + { + // + // These pages are not part of the PFN database + // + NextEntry = MdBlock->ListEntry.Flink; + continue; + } + + // + // Next, check if this is our special free descriptor we've found + // + if (MdBlock == MxFreeDescriptor) + { + // + // Use the real numbers instead + // + BasePage = MxOldFreeDescriptor.BasePage; + PageCount = MxOldFreeDescriptor.PageCount; + } + else + { + // + // Use the descriptor's numbers + // + BasePage = MdBlock->BasePage; + PageCount = MdBlock->PageCount; + } + + // + // Get the PTEs for this range + // + PointerPte = MiAddressToPte(&MmPfnDatabase[BasePage]); + LastPte = MiAddressToPte(((ULONG_PTR)&MmPfnDatabase[BasePage + PageCount]) - 1); + DPRINT("MD Type: %lx Base: %lx Count: %lx\n", MdBlock->MemoryType, BasePage, PageCount); + + // + // Loop them + // + while (PointerPte <= LastPte) + { + // + // We'll only touch PTEs that aren't already valid + // + if (PointerPte->u.Hard.Valid == 0) + { + // + // Use the next free page + // + TempPte.u.Hard.PageFrameNumber = FreePage; + ASSERT(FreePageCount != 0); + + // + // Consume free pages + // + FreePage++; + FreePageCount--; + if (!FreePageCount) + { + // + // Out of memory + // + KeBugCheckEx(INSTALL_MORE_MEMORY, + MmNumberOfPhysicalPages, + FreePageCount, + MxOldFreeDescriptor.PageCount, + 1); + } + + // + // Write out this PTE + // + PagesLeft++; + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPte = TempPte; + + // + // Zero this page + // + RtlZeroMemory(MiPteToAddress(PointerPte), PAGE_SIZE); + } + + // + // Next! + // + PointerPte++; + } + + // + // Do the next address range + // + NextEntry = MdBlock->ListEntry.Flink; + } + + // + // Now update the free descriptors to consume the pages we used up during + // the PFN allocation loop + // + MxFreeDescriptor->BasePage = FreePage; + MxFreeDescriptor->PageCount = FreePageCount; } else if (Phase == 1) // IN BETWEEN, THE PFN DATABASE IS NOW CREATED - { + { + // + // Reset the descriptor back so we can create the correct memory blocks + // + *MxFreeDescriptor = MxOldFreeDescriptor; + // // Initialize the nonpaged pool // @@ -1197,16 +1343,57 @@ // MmPhysicalMemoryBlock = MmInitializeMemoryLimits(LoaderBlock, IncludeType); + + // + // Allocate enough buffer for the PFN bitmap + // Align it up to a 32-bit boundary + // + Bitmap = ExAllocatePoolWithTag(NonPagedPool, + (((MmHighestPhysicalPage + 1) + 31) / 32) * 4, + ' mM'); + if (!Bitmap) + { + // + // This is critical + // + KeBugCheckEx(INSTALL_MORE_MEMORY, + MmNumberOfPhysicalPages, + MmLowestPhysicalPage, + MmHighestPhysicalPage, + 0x101); + } + + // + // Initialize it and clear all the bits to begin with + // + RtlInitializeBitMap(&MiPfnBitMap, + Bitmap, + MmHighestPhysicalPage + 1); + RtlClearAllBits(&MiPfnBitMap); + + // + // Loop physical memory runs + // for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) { // - // Dump it for debugging - // - PPHYSICAL_MEMORY_RUN Run; + // Get the run + // Run = &MmPhysicalMemoryBlock->Run[i]; DPRINT("PHYSICAL RAM [0x%08p to 0x%08p]\n", Run->BasePage << PAGE_SHIFT, (Run->BasePage + Run->PageCount) << PAGE_SHIFT); + + // + // Make sure it has pages inside it + // + if (Run->PageCount) + { + // + // Set the bits in the PFN bitmap + // + RtlSetBits(&MiPfnBitMap, Run->BasePage, Run->PageCount); + } } // 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] Sat Jul 25 23:35:31 2009 @@ -133,6 +133,7 @@ extern MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; extern ULONG MxPfnAllocation; extern MM_PAGED_POOL_INFO MmPagedPoolInfo; +extern RTL_BITMAP MiPfnBitMap; 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] Sat Jul 25 23:35:31 2009 @@ -25,7 +25,6 @@ #define MM_PHYSICAL_PAGE_FREE (0x1) #define MM_PHYSICAL_PAGE_USED (0x2) -#define MM_PHYSICAL_PAGE_BIOS (0x3) /* GLOBALS ****************************************************************/ @@ -98,6 +97,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); ASSERT(Page->Flags.Consumer == MC_USER); InsertTailList(&UserPageListHead, &Page->ListEntry); @@ -115,6 +115,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(PreviousPfn); + ASSERT(Page); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); ASSERT(Page->Flags.Consumer == MC_USER); NextListEntry = (PLIST_ENTRY)Page->ListEntry.Flink; @@ -495,6 +496,7 @@ // Get the PFN entry for this page // Pfn1 = MiGetPfnEntry(Page); + ASSERT(Pfn1); // // Make sure it's free and if this is our first pass, zeroed @@ -591,6 +593,7 @@ // Get the PFN entry for the page and check if we should zero it out // Pfn1 = MiGetPfnEntry(Page); + ASSERT(Pfn1); if (Pfn1->Flags.Zero == 0) MiZeroPage(Page); } @@ -610,7 +613,7 @@ PPHYSICAL_PAGE Pfn1; PCHAR State = "????", Consumer = "Unknown"; KIRQL OldIrql; - ULONG Totals[5] = {0}, BiosPages = 0, FreePages = 0; + ULONG Totals[5] = {0}, FreePages = 0; KeRaiseIrql(HIGH_LEVEL, &OldIrql); @@ -620,6 +623,7 @@ for (i = 0; i <= MmHighestPhysicalPage; i++) { Pfn1 = MiGetPfnEntry(i); + if (!Pfn1) continue; // // Get the consumer @@ -668,13 +672,6 @@ State = "Free"; Consumer = "Free"; FreePages++; - break; - - case MM_PHYSICAL_PAGE_BIOS: - - State = "BIOS"; - Consumer = "System Reserved"; - BiosPages++; break; } @@ -696,63 +693,24 @@ DbgPrint("File System Cache: %d pages\t[%d KB]\n", Totals[MC_CACHE], (Totals[MC_CACHE] << PAGE_SHIFT) / 1024); DbgPrint("Process Working Set: %d pages\t[%d KB]\n", Totals[MC_USER], (Totals[MC_USER] << PAGE_SHIFT) / 1024); DbgPrint("System: %d pages\t[%d KB]\n", Totals[MC_SYSTEM], (Totals[MC_SYSTEM] << PAGE_SHIFT) / 1024); - DbgPrint("BIOS: %d pages\t[%d KB]\n", BiosPages, (BiosPages << PAGE_SHIFT) / 1024); DbgPrint("Free: %d pages\t[%d KB]\n", FreePages, (FreePages << PAGE_SHIFT) / 1024); KeLowerIrql(OldIrql); } -PFN_NUMBER -NTAPI -MxGetNextPage(IN PFN_NUMBER PageCount); - VOID NTAPI MmInitializePageList(VOID) { ULONG i; - NTSTATUS Status; - PFN_TYPE Pfn = 0; PHYSICAL_PAGE UsedPage; + PMEMORY_ALLOCATION_DESCRIPTOR Md; PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR Md; /* Initialize the page lists */ InitializeListHead(&UserPageListHead); InitializeListHead(&FreeUnzeroedPageListHead); InitializeListHead(&FreeZeroedPageListHead); - - /* Loop every page required to hold the PFN database */ - for (i = 0; i < MxPfnAllocation; i++) - { - PVOID Address = (char*)MmPfnDatabase + (i * PAGE_SIZE); - - /* Check if FreeLDR has already allocated it for us */ - if (!MmIsPagePresent(NULL, Address)) - { - /* Use one of our highest usable pages */ - Pfn = MxGetNextPage(1); - - /* Set the PFN */ - Status = MmCreateVirtualMappingForKernel(Address, - PAGE_READWRITE, - &Pfn, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - } - else - { - /* Setting the page protection is necessary to set the global bit */ - MmSetPageProtect(NULL, Address, PAGE_READWRITE); - } - } - - /* Clear the PFN database */ - RtlZeroMemory(MmPfnDatabase, (MmHighestPhysicalPage + 1) * sizeof(PHYSICAL_PAGE)); /* This is what a used page looks like */ RtlZeroMemory(&UsedPage, sizeof(UsedPage)); @@ -779,17 +737,10 @@ (Md->MemoryType == LoaderSpecialMemory) || (Md->MemoryType == LoaderBad)) { - /* Loop every page part of the block but valid in the database */ - for (i = 0; i < Md->PageCount; i++) - { - /* Skip memory we ignore completely */ - if ((Md->BasePage + i) > MmHighestPhysicalPage) break; - - /* These are pages reserved by the BIOS/ROMs */ - MmPfnDatabase[Md->BasePage + i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPfnDatabase[Md->BasePage + i].Flags.Consumer = MC_NPPOOL; - MmStats.NrSystemPages++; - } + // + // We do not build PFN entries for this + // + continue; } else if ((Md->MemoryType == LoaderFree) || (Md->MemoryType == LoaderLoadedProgram) || @@ -872,13 +823,16 @@ { oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); - if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) + if (Page) { - DPRINT1("Mapping non-used page\n"); - KeBugCheck(MEMORY_MANAGEMENT); + if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) + { + DPRINT1("Mapping non-used page\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + Page->MapCount++; + Page->ReferenceCount++; } - Page->MapCount++; - Page->ReferenceCount++; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } } @@ -894,18 +848,21 @@ { oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); - if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) + if (Page) { - DPRINT1("Unmapping non-used page\n"); - KeBugCheck(MEMORY_MANAGEMENT); + if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) + { + DPRINT1("Unmapping non-used page\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + if (Page->MapCount == 0) + { + DPRINT1("Unmapping not mapped page\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + Page->MapCount--; + Page->ReferenceCount--; } - if (Page->MapCount == 0) - { - DPRINT1("Unmapping not mapped page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - Page->MapCount--; - Page->ReferenceCount--; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } } @@ -952,6 +909,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Referencing non-used page\n"); @@ -983,6 +941,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting reference count for free page\n"); @@ -1017,6 +976,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { @@ -1088,6 +1048,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting lock count for free page\n"); @@ -1112,6 +1073,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Locking free page\n"); @@ -1143,6 +1105,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Unlocking free page\n"); @@ -1173,7 +1136,7 @@ /* Check if this allocation is for the PFN DB itself */ if (MmStats.NrTotalPages == 0) { - MxGetNextPage(1); + ASSERT(FALSE); } DPRINT1("MmAllocPage(): Out of memory\n");

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs