Ros-diffs July 2008

ros-diffs@reactos.org

25 participants
761 discussions

[jmorlan] 34928: - Remove unused hVScrollBar and hHScrollBar members in GUI_CONSOLE_DATA. - Remove ScreenBufferSize member from GUI_CONSOLE_DATA; when building the structure for console.dll, send the actual screen buffer size instead. - GuiConsolePaint, GuiIntDrawRegion: Adjust coordinates based on buffer's scroll position. - GuiConsolePaint: Use ConioCoordToPointer when finding attribute at top-left. - GuiConsoleHandlePaint: Don't leak the DC when the paint rectangle is empty. - GuiConsoleHandl
by jmorlan＠svn.reactos.org 29 Jul '08

29 Jul '08

Author: jmorlan Date: Tue Jul 29 11:10:38 2008 New Revision: 34928 URL: http://svn.reactos.org/svn/reactos?rev=34928&view=rev Log: - Remove unused hVScrollBar and hHScrollBar members in GUI_CONSOLE_DATA. - Remove ScreenBufferSize member from GUI_CONSOLE_DATA; when building the structure for console.dll, send the actual screen buffer size instead. - GuiConsolePaint, GuiIntDrawRegion: Adjust coordinates based on buffer's scroll position. - GuiConsolePaint: Use ConioCoordToPointer when finding attribute at top-left. - GuiConsoleHandlePaint: Don't leak the DC when the paint rectangle is empty. - GuiConsoleHandleScroll: Actually update the buffer's scroll position, not just the scrollbar's. Allow scrolling either horizontally or vertically. Fix typo in SB_THUMBTRACK case. Don't rely on GetScrollInfo for bound checking - any thread can sabotage the scrollbar ranges. - CsrGetScreenBufferInfo: Return the visible area in srWindow. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Tue Jul 29 11:10:38 2008 @@ -1292,6 +1292,7 @@ CSR_API(CsrGetScreenBufferInfo) { NTSTATUS Status; + PCSRSS_CONSOLE Console; PCSRSS_SCREEN_BUFFER Buff; PCONSOLE_SCREEN_BUFFER_INFO pInfo; @@ -1300,9 +1301,15 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + Status = ConioConsoleFromProcessData(ProcessData, &Console); + if (! NT_SUCCESS(Status)) + { + return Request->Status = Status; + } Status = ConioLockScreenBuffer(ProcessData, Request->Data.ScreenBufferInfoRequest.ConsoleHandle, &Buff, GENERIC_READ); if (! NT_SUCCESS(Status)) { + ConioUnlockConsole(Console); return Request->Status = Status; } pInfo = &Request->Data.ScreenBufferInfoRequest.Info; @@ -1311,13 +1318,14 @@ pInfo->dwCursorPosition.X = Buff->CurrentX; pInfo->dwCursorPosition.Y = Buff->CurrentY; pInfo->wAttributes = Buff->DefaultAttrib; - pInfo->srWindow.Left = 0; - pInfo->srWindow.Right = Buff->MaxX - 1; - pInfo->srWindow.Top = 0; - pInfo->srWindow.Bottom = Buff->MaxY - 1; + pInfo->srWindow.Left = Buff->ShowX; + pInfo->srWindow.Right = Buff->ShowX + Console->Size.X - 1; + pInfo->srWindow.Top = Buff->ShowY; + pInfo->srWindow.Bottom = Buff->ShowY + Console->Size.Y - 1; pInfo->dwMaximumWindowSize.X = Buff->MaxX; pInfo->dwMaximumWindowSize.Y = Buff->MaxY; ConioUnlockScreenBuffer(Buff); + ConioUnlockConsole(Console); Request->Status = STATUS_SUCCESS; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Tue Jul 29 11:10:38 2008 @@ -32,8 +32,6 @@ BOOL MouseDown; HMODULE ConsoleLibrary; HANDLE hGuiInitEvent; - HWND hVScrollBar; - HWND hHScrollBar; WCHAR FontName[LF_FACESIZE]; DWORD FontSize; DWORD FontWeight; @@ -44,7 +42,6 @@ DWORD NumberOfHistoryBuffers; DWORD HistoryBufferSize; DWORD WindowPosition; - DWORD ScreenBufferSize; DWORD UseRasterFonts; COLORREF ScreenText; COLORREF ScreenBackground; @@ -620,7 +617,6 @@ GuiData->PopupText = RGB(128, 0, 128); GuiData->PopupBackground = RGB(255, 255, 255); GuiData->WindowPosition = UINT_MAX; - GuiData->ScreenBufferSize = MAKELONG(80, 300); //FIXME GuiData->UseRasterFonts = TRUE; memcpy(GuiData->Colors, s_Colors, sizeof(s_Colors)); @@ -868,16 +864,16 @@ Buff = Console->ActiveBuffer; - TopLine = rc->top / GuiData->CharHeight; - BottomLine = (rc->bottom + (GuiData->CharHeight - 1)) / GuiData->CharHeight - 1; - LeftChar = rc->left / GuiData->CharWidth; - RightChar = (rc->right + (GuiData->CharWidth - 1)) / GuiData->CharWidth - 1; - LastAttribute = Buff->Buffer[(TopLine * Buff->MaxX + LeftChar) * 2 + 1]; + EnterCriticalSection(&Buff->Header.Lock); + + TopLine = rc->top / GuiData->CharHeight + Buff->ShowY; + BottomLine = (rc->bottom + (GuiData->CharHeight - 1)) / GuiData->CharHeight - 1 + Buff->ShowY; + LeftChar = rc->left / GuiData->CharWidth + Buff->ShowX; + RightChar = (rc->right + (GuiData->CharWidth - 1)) / GuiData->CharWidth - 1 + Buff->ShowX; + LastAttribute = ConioCoordToPointer(Buff, LeftChar, TopLine)[1]; SetTextColor(hDC, GuiConsoleRGBFromAttribute(GuiData, LastAttribute)); SetBkColor(hDC, GuiConsoleRGBFromAttribute(GuiData, LastAttribute >> 4)); - - EnterCriticalSection(&Buff->Header.Lock); if (BottomLine >= Buff->MaxY) BottomLine = Buff->MaxY - 1; if (RightChar >= Buff->MaxX) RightChar = Buff->MaxX - 1; @@ -896,8 +892,8 @@ if (*(From + 1) != LastAttribute) { TextOutW(hDC, - Start * GuiData->CharWidth, - Line * GuiData->CharHeight, + (Start - Buff->ShowX) * GuiData->CharWidth, + (Line - Buff->ShowY) * GuiData->CharHeight, GuiData->LineBuffer, Char - Start); Start = Char; @@ -922,8 +918,8 @@ } TextOutW(hDC, - Start * GuiData->CharWidth, - Line * GuiData->CharHeight, + (Start - Buff->ShowX) * GuiData->CharWidth, + (Line - Buff->ShowY) * GuiData->CharHeight, GuiData->LineBuffer, RightChar - Start + 1); } @@ -955,8 +951,8 @@ OldBrush = SelectObject(hDC, CursorBrush); PatBlt(hDC, - CursorX * GuiData->CharWidth, - CursorY * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), + (CursorX - Buff->ShowX) * GuiData->CharWidth, + (CursorY - Buff->ShowY) * GuiData->CharHeight + (GuiData->CharHeight - CursorHeight), GuiData->CharWidth, CursorHeight, PATCOPY); @@ -1027,8 +1023,8 @@ } } - EndPaint(hWnd, &ps); - } + } + EndPaint(hWnd, &ps); } static VOID FASTCALL @@ -1054,14 +1050,14 @@ } static VOID FASTCALL -GuiIntDrawRegion(PGUI_CONSOLE_DATA GuiData, HWND Wnd, RECT *Region) +GuiIntDrawRegion(PCSRSS_SCREEN_BUFFER Buff, PGUI_CONSOLE_DATA GuiData, HWND Wnd, RECT *Region) { RECT RegionRect; - RegionRect.left = Region->left * GuiData->CharWidth; - RegionRect.top = Region->top * GuiData->CharHeight; - RegionRect.right = (Region->right + 1) * GuiData->CharWidth; - RegionRect.bottom = (Region->bottom + 1) * GuiData->CharHeight; + RegionRect.left = (Region->left - Buff->ShowX) * GuiData->CharWidth; + RegionRect.top = (Region->top - Buff->ShowY) * GuiData->CharHeight; + RegionRect.right = (Region->right + 1 - Buff->ShowX) * GuiData->CharWidth; + RegionRect.bottom = (Region->bottom + 1 - Buff->ShowY) * GuiData->CharHeight; InvalidateRect(Wnd, &RegionRect, FALSE); } @@ -1073,12 +1069,12 @@ if (NULL != Console->hWindow && NULL != GuiData) { - GuiIntDrawRegion(GuiData, Console->hWindow, Region); + GuiIntDrawRegion(Console->ActiveBuffer, GuiData, Console->hWindow, Region); } } static VOID FASTCALL -GuiInvalidateCell(PGUI_CONSOLE_DATA GuiData, HWND Wnd, UINT x, UINT y) +GuiInvalidateCell(PCSRSS_SCREEN_BUFFER Buff, PGUI_CONSOLE_DATA GuiData, HWND Wnd, UINT x, UINT y) { RECT CellRect; @@ -1087,7 +1083,7 @@ CellRect.right = x; CellRect.bottom = y; - GuiIntDrawRegion(GuiData, Wnd, &CellRect); + GuiIntDrawRegion(Buff, GuiData, Wnd, &CellRect); } static VOID STDCALL @@ -1140,12 +1136,12 @@ SW_INVALIDATE); } - GuiIntDrawRegion(GuiData, Console->hWindow, Region); + GuiIntDrawRegion(Buff, GuiData, Console->hWindow, Region); if (CursorStartX < Region->left || Region->right < CursorStartX || CursorStartY < Region->top || Region->bottom < CursorStartY) { - GuiInvalidateCell(GuiData, Console->hWindow, CursorStartX, CursorStartY); + GuiInvalidateCell(Buff, GuiData, Console->hWindow, CursorStartX, CursorStartY); } CursorEndX = Buff->CurrentX; @@ -1154,7 +1150,7 @@ || CursorEndY < Region->top || Region->bottom < CursorEndY) && (CursorEndX != CursorStartX || CursorEndY != CursorStartY)) { - GuiInvalidateCell(GuiData, Console->hWindow, CursorEndX, CursorEndY); + GuiInvalidateCell(Buff, GuiData, Console->hWindow, CursorEndX, CursorEndY); } } @@ -1463,7 +1459,7 @@ SharedInfo.PopupBackground = GuiData->PopupBackground; SharedInfo.WindowSize = (DWORD)MAKELONG(Console->Size.X, Console->Size.Y); SharedInfo.WindowPosition = GuiData->WindowPosition; - SharedInfo.ScreenBuffer = GuiData->ScreenBufferSize; + SharedInfo.ScreenBuffer = (DWORD)MAKELONG(Console->ActiveBuffer->MaxX, Console->ActiveBuffer->MaxY); SharedInfo.UseRasterFonts = GuiData->UseRasterFonts; SharedInfo.FontSize = (DWORD)GuiData->FontSize; SharedInfo.FontWeight = GuiData->FontWeight; @@ -1687,18 +1683,39 @@ static LRESULT -GuiConsoleHandleScroll(HWND hwnd, UINT uMsg, WPARAM wParam, PGUI_CONSOLE_DATA GuiData) -{ +GuiConsoleHandleScroll(HWND hwnd, UINT uMsg, WPARAM wParam) +{ + PCSRSS_CONSOLE Console; + PCSRSS_SCREEN_BUFFER Buff; + PGUI_CONSOLE_DATA GuiData; SCROLLINFO sInfo; - int old_pos; + int fnBar; + int old_pos, Maximum; + PUSHORT pShowXY; + + GuiConsoleGetDataPointers(hwnd, &Console, &GuiData); + if (Console == NULL || GuiData == NULL) + return FALSE; + Buff = Console->ActiveBuffer; + + if (uMsg == WM_HSCROLL) + { + fnBar = SB_HORZ; + Maximum = Buff->MaxX - Console->Size.X; + pShowXY = &Buff->ShowX; + } + else + { + fnBar = SB_VERT; + Maximum = Buff->MaxY - Console->Size.Y; + pShowXY = &Buff->ShowY; + } /* set scrollbar sizes */ sInfo.cbSize = sizeof(SCROLLINFO); sInfo.fMask = SIF_RANGE | SIF_POS | SIF_PAGE | SIF_TRACKPOS; - if (!GetScrollInfo(hwnd, - (uMsg == WM_HSCROLL ? SB_HORZ : SB_VERT), - &sInfo)) + if (!GetScrollInfo(hwnd, fnBar, &sInfo)) { return FALSE; } @@ -1724,7 +1741,7 @@ break; case SB_THUMBTRACK: - sInfo.nPage = sInfo.nTrackPos; + sInfo.nPos = sInfo.nTrackPos; break; case SB_TOP: @@ -1739,38 +1756,26 @@ break; } - sInfo.fMask = SIF_POS; - sInfo.cbSize = sizeof(SCROLLINFO); - - SetScrollInfo(hwnd, - (uMsg == WM_HSCROLL ? SB_HORZ : SB_VERT), - &sInfo, - TRUE); - - sInfo.cbSize = sizeof(SCROLLINFO); - sInfo.fMask = SIF_POS; - - if (!GetScrollInfo(hwnd, - (uMsg == WM_HSCROLL ? SB_HORZ : SB_VERT), - &sInfo)) - { - return 0; - } + sInfo.nPos = max(sInfo.nPos, 0); + sInfo.nPos = min(sInfo.nPos, Maximum); if (old_pos != sInfo.nPos) { - /// - /// fixme scroll window - /// + USHORT OldX = Buff->ShowX; + USHORT OldY = Buff->ShowY; + *pShowXY = sInfo.nPos; ScrollWindowEx(hwnd, - 0, - GuiData->CharHeight * (old_pos - sInfo.nPos), + (OldX - Buff->ShowX) * GuiData->CharWidth, + (OldY - Buff->ShowY) * GuiData->CharHeight, NULL, NULL, NULL, NULL, SW_INVALIDATE); + + sInfo.fMask = SIF_POS; + SetScrollInfo(hwnd, fnBar, &sInfo, TRUE); UpdateWindow(hwnd); } @@ -1827,7 +1832,7 @@ break; case WM_HSCROLL: case WM_VSCROLL: - Result = GuiConsoleHandleScroll(hWnd, msg, wParam, GuiData); + Result = GuiConsoleHandleScroll(hWnd, msg, wParam); break; case WM_SIZE: GuiConsoleResize(hWnd, wParam, lParam);

1 0

[sginsberg] 34927: - Silence 600+ warnings by returning something in non-void functions - Fix some NtUser* prototypes
by sginsberg＠svn.reactos.org 29 Jul '08

29 Jul '08

Author: sginsberg Date: Tue Jul 29 10:41:03 2008 New Revision: 34927 URL: http://svn.reactos.org/svn/reactos?rev=34927&view=rev Log: - Silence 600+ warnings by returning something in non-void functions - Fix some NtUser* prototypes Removed: branches/nwin32/subsystems/win32/win32k/include/stubs.h Modified: branches/nwin32/include/reactos/win32k/ntuser.h branches/nwin32/subsystems/win32/win32k/gre/init.c branches/nwin32/subsystems/win32/win32k/include/win32k.h branches/nwin32/subsystems/win32/win32k/ntddraw/ddeng.c branches/nwin32/subsystems/win32/win32k/ntgdi/gdistubs.c branches/nwin32/subsystems/win32/win32k/ntuser/usrstubs.c branches/nwin32/subsystems/win32/win32k/w32ksvc.db branches/nwin32/subsystems/win32/win32k/win32k.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/nwin32/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/reactos/win32k/n… Modified: branches/nwin32/subsystems/win32/win32k/gre/init.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Removed: branches/nwin32/subsystems/win32/win32k/include/stubs.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntddraw/ddeng.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntgdi/gdistubs.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/ntuser/usrstubs.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… Modified: branches/nwin32/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/…

1 0

[tkreuzer] 34926: remove useless cast
by tkreuzer＠svn.reactos.org 29 Jul '08

29 Jul '08

Author: tkreuzer Date: Tue Jul 29 10:30:15 2008 New Revision: 34926 URL: http://svn.reactos.org/svn/reactos?rev=34926&view=rev Log: remove useless cast Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Tue Jul 29 10:30:15 2008 @@ -5735,7 +5735,7 @@ #define InterlockedIncrement _InterlockedIncrement #define InterlockedDecrement _InterlockedDecrement #define InterlockedExchangeAdd _InterlockedExchangeAdd -#define InterlockedCompareExchange (LONG)_InterlockedCompareExchange +#define InterlockedCompareExchange _InterlockedCompareExchange #define InterlockedOr _InterlockedOr #define InterlockedAnd _InterlockedAnd #define InterlockedXor _InterlockedXor Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Tue Jul 29 10:30:15 2008 @@ -30,7 +30,7 @@ // #define InterlockedDecrement _InterlockedDecrement #define InterlockedIncrement _InterlockedIncrement -#define InterlockedCompareExchange (LONG)_InterlockedCompareExchange +#define InterlockedCompareExchange _InterlockedCompareExchange #define InterlockedExchange _InterlockedExchange #define InterlockedExchangeAdd _InterlockedExchangeAdd

1 0

[tkreuzer] 34925: - fix InterlockedExchangeAddSizeT - fix __writecrx instrinsics - fix some mmtypes
by tkreuzer＠svn.reactos.org 29 Jul '08

29 Jul '08

Author: tkreuzer Date: Tue Jul 29 10:22:17 2008 New Revision: 34925 URL: http://svn.reactos.org/svn/reactos?rev=34925&view=rev Log: - fix InterlockedExchangeAddSizeT - fix __writecrx instrinsics - fix some mmtypes Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h branches/ros-amd64-bringup/reactos/include/ndk/arch/mmtypes.h branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Tue Jul 29 10:22:17 2008 @@ -5772,7 +5772,7 @@ #if defined (_M_AMD64) -#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONG *)a, b) +#define InterlockedExchangeAddSizeT(a, b) InterlockedExchangeAdd64((LONGLONG *)a, (LONGLONG)b) #define InterlockedIncrementSizeT(a) InterlockedIncrement64((LONGLONG *)a) #define InterlockedDecrementSizeT(a) InterlockedDecrement64((LONGLONG *)a) #define InterlockedAnd _InterlockedAnd Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] Tue Jul 29 10:22:17 2008 @@ -1,18 +1,20 @@ /*++ NDK Version: 0095 Copyright (c) Alex Ionescu. All rights reserved. +Copyright (c) Timo Kreuzer All rights reserved. Header Name: - mmtypes.h (X86) + mmtypes.h (AMD64) Abstract: - i386 Type definitions for the Memory Manager + AMD64 Type definitions for the Memory Manager Author: Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 + Timo Kreuzer (timo.kreuzer(a)reactos.com) 29-Jul-2008 --*/ @@ -43,29 +45,26 @@ #endif // -// PAE SEG0 Base? -// -#define KSEG0_BASE_PAE 0xE0000000 - -// // Page Table Entry Definitions // -typedef struct _HARDWARE_PTE_X86 +typedef struct _HARDWARE_PTE_AMD64 { - ULONG Valid:1; - ULONG Write:1; - ULONG Owner:1; - ULONG WriteThrough:1; - ULONG CacheDisable:1; - ULONG Accessed:1; - ULONG Dirty:1; - ULONG LargePage:1; - ULONG Global:1; - ULONG CopyOnWrite:1; - ULONG Prototype: 1; - ULONG reserved: 1; - ULONG PageFrameNumber:20; -} HARDWARE_PTE_X86, *PHARDWARE_PTE_X86; + ULONGLONG Valid:1; + ULONGLONG Write:1; + ULONGLONG Owner:1; + ULONGLONG WriteThrough:1; + ULONGLONG CacheDisable:1; + ULONGLONG Accessed:1; + ULONGLONG Dirty:1; + ULONGLONG LargePage:1; + ULONGLONG Global:1; + ULONGLONG CopyOnWrite:1; + ULONGLONG Prototype: 1; + ULONGLONG reserved1: 1; + ULONGLONG PageFrameNumber:40; + ULONGLONG reserved2:11; + ULONGLONG NoExecute:1; +} HARDWARE_PTE_AMD64, *PHARDWARE_PTE_AMD64; typedef struct _MMPTE_SOFTWARE { @@ -124,46 +123,33 @@ typedef struct _MMPTE_HARDWARE { - ULONG Valid:1; - ULONG Write:1; - ULONG Owner:1; - ULONG WriteThrough:1; - ULONG CacheDisable:1; - ULONG Accessed:1; - ULONG Dirty:1; - ULONG LargePage:1; - ULONG Global:1; - ULONG CopyOnWrite:1; - ULONG Prototype:1; - ULONG reserved:1; - ULONG PageFrameNumber:20; + ULONGLONG Valid:1; + ULONGLONG Write:1; + ULONGLONG Owner:1; + ULONGLONG WriteThrough:1; + ULONGLONG CacheDisable:1; + ULONGLONG Accessed:1; + ULONGLONG Dirty:1; + ULONGLONG LargePage:1; + ULONGLONG Global:1; + ULONGLONG CopyOnWrite:1; + ULONGLONG Prototype: 1; + ULONGLONG reserved1: 1; + ULONGLONG PageFrameNumber:40; + ULONGLONG reserved2:11; + ULONGLONG NoExecute:1; } MMPTE_HARDWARE, *PMMPTE_HARDWARE; #else -typedef struct _MMPTE_HARDWARE -{ - ULONG Valid:1; - ULONG Writable:1; - ULONG Owner:1; - ULONG WriteThrough:1; - ULONG CacheDisable:1; - ULONG Accessed:1; - ULONG Dirty:1; - ULONG LargePage:1; - ULONG Global:1; - ULONG CopyOnWrite:1; - ULONG Prototype:1; - ULONG Write:1; - ULONG PageFrameNumber:20; -} MMPTE_HARDWARE, *PMMPTE_HARDWARE; +#error MMPTE_HARDWARE undeclared #endif // // Use the right PTE structure // -#define HARDWARE_PTE HARDWARE_PTE_X86 -#define PHARDWARE_PTE PHARDWARE_PTE_X86 +#define HARDWARE_PTE HARDWARE_PTE_AMD64 +#define PHARDWARE_PTE PHARDWARE_PTE_AMD64 #endif Modified: branches/ros-amd64-bringup/reactos/include/ndk/arch/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/arch/mmtypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/arch/mmtypes.h [iso-8859-1] Tue Jul 29 10:22:17 2008 @@ -22,12 +22,14 @@ // // Include the right file for this architecture. // -#if defined(_M_IX86) || defined(_M_AMD64) +#if defined(_M_IX86) #include <i386/mmtypes.h> #elif defined(_M_PPC) #include <powerpc/mmtypes.h> #elif defined(_M_ARM) #include <arm/mmtypes.h> +#elif defined(_M_AMD64) +#include <amd64/mmtypes.h> #else #error "Unknown processor" #endif Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Tue Jul 29 10:22:17 2008 @@ -1078,8 +1078,24 @@ return value; } +#ifdef _M_AMD64 static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) { + __asm__("movq %q[Data], %%cr0" : : [Data] "q" (Data) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __writecr3(const unsigned long long Data) +{ + __asm__("movq %q[Data], %%cr3" : : [Data] "q" (Data) : "memory"); +} + +static __inline__ __attribute__((always_inline)) void __writecr4(const unsigned long long Data) +{ + __asm__("movq %q[Data], %%cr4" : : [Data] "q" (Data) : "memory"); +} +#else +static __inline__ __attribute__((always_inline)) void __writecr0(const unsigned long long Data) +{ __asm__("mov %[Data], %%cr0" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); } @@ -1092,6 +1108,7 @@ { __asm__("mov %[Data], %%cr4" : : [Data] "q" ((const unsigned long)(Data & 0xFFFFFFFF)) : "memory"); } +#endif static __inline__ __attribute__((always_inline)) void __invlpg(void * const Address) {

1 0

[cwittich] 34924: Odbccp32 dll doesn't have a DllMain function reported by hto See issue #3603 for more details.
by cwittich＠svn.reactos.org 29 Jul '08

29 Jul '08

Author: cwittich Date: Tue Jul 29 02:30:49 2008 New Revision: 34924 URL: http://svn.reactos.org/svn/reactos?rev=34924&view=rev Log: Odbccp32 dll doesn't have a DllMain function reported by hto See issue #3603 for more details. Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild [iso-8859-1] Tue Jul 29 02:30:49 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true"> +<module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true" entrypoint="0"> <importlibrary definition="odbccp32.spec.def" /> <include base="odbccp32">.</include> <include base="ReactOS">include/reactos/wine</include>

1 0

[jmorlan] 34923: NtUserBeginPaint: Taking the bounding box of the update region first and clipping it to the client area afterwards was making rcPaint contain the entire client area when scrolling. It should be done the other way around: clip to the client area first, then box. Since there is already a clipped update region in the DC, this is easy; just use GdiGetClipBox.
by jmorlan＠svn.reactos.org 29 Jul '08

29 Jul '08

Author: jmorlan Date: Mon Jul 28 21:08:56 2008 New Revision: 34923 URL: http://svn.reactos.org/svn/reactos?rev=34923&view=rev Log: NtUserBeginPaint: Taking the bounding box of the update region first and clipping it to the client area afterwards was making rcPaint contain the entire client area when scrolling. It should be done the other way around: clip to the client area first, then box. Since there is already a clipped update region in the DC, this is easy; just use GdiGetClipBox. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c 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] Mon Jul 28 21:08:56 2008 @@ -770,7 +770,6 @@ { PWINDOW_OBJECT Window = NULL; PAINTSTRUCT Ps; - PROSRGNDATA Rgn; NTSTATUS Status; DECLARE_RETURN(HDC); USER_REFERENCE_ENTRY Ref; @@ -816,23 +815,7 @@ if (Window->UpdateRegion != NULL) { MsqDecPaintCountQueue(Window->MessageQueue); - Rgn = REGION_LockRgn(Window->UpdateRegion); - if (NULL != Rgn) - { - REGION_GetRgnBox(Rgn, &Ps.rcPaint); - REGION_UnlockRgn(Rgn); - IntGdiIntersectRect(&Ps.rcPaint, &Ps.rcPaint, &Window->Wnd->ClientRect); - if (! IntGdiIsEmptyRect(&Ps.rcPaint)) - { - IntGdiOffsetRect(&Ps.rcPaint, - -Window->Wnd->ClientRect.left, - -Window->Wnd->ClientRect.top); - } - } - else - { - IntGetClientRect(Window, &Ps.rcPaint); - } + GdiGetClipBox(Ps.hdc, &Ps.rcPaint); GDIOBJ_SetOwnership(Window->UpdateRegion, PsGetCurrentProcess()); /* The region is part of the dc now and belongs to the process! */ Window->UpdateRegion = NULL;

1 0

[jimtabor] 34922: - Added more hook points, WH_FOREGROUNDIDLE and WH_KEYBOARD. - Fixed WH_CALLWNDPROC/RET, now the posted test program works as it should. - Tested with Opera 9.51, FF, Seamonkey, Abiword, Miranda, Mirc and the rest of our applications.
by jimtabor＠svn.reactos.org 29 Jul '08

29 Jul '08

Author: jimtabor Date: Mon Jul 28 19:35:05 2008 New Revision: 34922 URL: http://svn.reactos.org/svn/reactos?rev=34922&view=rev Log: - Added more hook points, WH_FOREGROUNDIDLE and WH_KEYBOARD. - Fixed WH_CALLWNDPROC/RET, now the posted test program works as it should. - Tested with Opera 9.51, FF, Seamonkey, Abiword, Miranda, Mirc and the rest of our applications. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Mon Jul 28 19:35:05 2008 @@ -524,7 +524,9 @@ // FIXME("UHOOK Memory: %x: %x\n",Common, Msg); Result = Common->Proc(Common->Code, Common->wParam, (LPARAM) Msg); break; + case WH_FOREGROUNDIDLE: case WH_KEYBOARD: + case WH_SHELL: Result = Common->Proc(Common->Code, Common->wParam, Common->lParam); break; default: 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] Mon Jul 28 19:35:05 2008 @@ -393,8 +393,9 @@ case WH_GETMESSAGE: ArgumentLength += sizeof(MSG); break; + case WH_FOREGROUNDIDLE: case WH_KEYBOARD: -// case WH_SHELL: + case WH_SHELL: break; default: DPRINT1("Trying to call unsupported window hook %d\n", HookId); @@ -473,10 +474,9 @@ Common->lParam = (LPARAM) (Extra - (PCHAR) Common); // DPRINT1("KHOOK Memory: %x\n",Common); break; + case WH_FOREGROUNDIDLE: case WH_KEYBOARD: - break; -// case WH_SHELL: -// Extra = lParam; + case WH_SHELL: break; } 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] Mon Jul 28 19:35:05 2008 @@ -267,15 +267,22 @@ } static LRESULT FASTCALL -IntCallLowLevelHook(INT HookId, INT Code, WPARAM wParam, LPARAM lParam, PHOOK Hook) +IntCallLowLevelHook(PHOOK Hook, INT Code, WPARAM wParam, LPARAM lParam) { NTSTATUS Status; ULONG_PTR uResult; /* FIXME should get timeout from * HKEY_CURRENT_USER\Control Panel\Desktop\LowLevelHooksTimeout */ - Status = co_MsqSendMessage(((PW32THREAD)Hook->Thread->Tcb.Win32Thread)->MessageQueue, (HWND) Code, HookId, - wParam, lParam, 5000, TRUE, TRUE, &uResult); + Status = co_MsqSendMessage(((PW32THREAD)Hook->Thread->Tcb.Win32Thread)->MessageQueue, + (HWND) Code, + Hook->HookId, + wParam, + lParam, + 5000, + TRUE, + TRUE, + &uResult); return NT_SUCCESS(Status) ? uResult : 0; } @@ -317,17 +324,10 @@ } } - if (Hook->Thread != PsGetCurrentThread() - && (WH_KEYBOARD_LL == HookId || WH_MOUSE_LL == HookId)) - { - DPRINT("Calling hook in owning thread\n"); - return IntCallLowLevelHook(HookId, Code, wParam, lParam, Hook); - } - if ((Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL)) { - DPRINT1("Calling hooks in other threads not implemented yet"); - return 0; + // Post it in message queue. + return IntCallLowLevelHook(Hook, Code, wParam, lParam); } Table->Counts[HOOKID_TO_INDEX(HookId)]++; @@ -340,8 +340,13 @@ SaveHook = ClientInfo->phkCurrent; ClientInfo->phkCurrent = Hook; // Load the call. - Result = co_IntCallHookProc(HookId, Code, wParam, lParam, Hook->Proc, - Hook->Ansi, &Hook->ModuleName); + Result = co_IntCallHookProc( HookId, + Code, + wParam, + lParam, + Hook->Proc, + Hook->Ansi, + &Hook->ModuleName); ClientInfo->phkCurrent = SaveHook; @@ -413,9 +418,19 @@ FASTCALL co_HOOK_CallHookNext(PHOOK Hook, INT Code, WPARAM wParam, LPARAM lParam) { + if ((Hook->Thread != PsGetCurrentThread()) && (Hook->Thread != NULL)) + { + DPRINT1("CALLING HOOK from another Thread. %d\n",Hook->HookId); + return IntCallLowLevelHook(Hook, Code, wParam, lParam); + } DPRINT("CALLING HOOK %d\n",Hook->HookId); - return co_IntCallHookProc(Hook->HookId, Code, wParam, lParam, Hook->Proc, - Hook->Ansi, &Hook->ModuleName); + return co_IntCallHookProc(Hook->HookId, + Code, + wParam, + lParam, + Hook->Proc, + Hook->Ansi, + &Hook->ModuleName); } @@ -1030,9 +1045,7 @@ if (Global || WH_DEBUG == HookId || WH_JOURNALPLAYBACK == HookId || - WH_JOURNALRECORD == HookId || - WH_FOREGROUNDIDLE == HookId || - WH_SHELL == HookId) + WH_JOURNALRECORD == HookId) { #if 0 /* Removed to get winEmbed working again */ UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Jul 28 19:35:05 2008 @@ -295,6 +295,53 @@ return STATUS_INVALID_PARAMETER; } +static +VOID +FASTCALL +IntCallWndProc +( PWINDOW_OBJECT Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + BOOL SameThread = FALSE; + + if (Window->ti == PsGetCurrentThreadWin32Thread()->ThreadInfo) + SameThread = TRUE; + + if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || + (SameThread && ISITHOOKED(WH_CALLWNDPROC)) ) + { + CWPSTRUCT CWP; + CWP.hwnd = hWnd; + CWP.message = Msg; + CWP.wParam = wParam; + CWP.lParam = lParam; + co_HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, SameThread, (LPARAM)&CWP ); + } +} +static +VOID +FASTCALL +IntCallWndProcRet +( PWINDOW_OBJECT Window, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *uResult) +{ + BOOL SameThread = FALSE; + + if (Window->ti == PsGetCurrentThreadWin32Thread()->ThreadInfo) + SameThread = TRUE; + + if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || + (SameThread && ISITHOOKED(WH_CALLWNDPROCRET)) ) + { + CWPRETSTRUCT CWPR; + CWPR.hwnd = hWnd; + CWPR.message = Msg; + CWPR.wParam = wParam; + CWPR.lParam = lParam; + CWPR.lResult = *uResult; + co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); + } +} + + BOOL STDCALL NtUserCallMsgFilter( @@ -1429,7 +1476,6 @@ PW32THREAD Win32Thread; DECLARE_RETURN(LRESULT); USER_REFERENCE_ENTRY Ref; - BOOL SameThread = FALSE; if (!(Window = UserGetWindowObject(hWnd))) { @@ -1440,20 +1486,8 @@ Win32Thread = PsGetCurrentThreadWin32Thread(); - if (Window->ti == Win32Thread->ThreadInfo) - SameThread = TRUE; - - if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROC))) || - (SameThread && ISITHOOKED(WH_CALLWNDPROC)) ) - { - CWPSTRUCT CWP; - CWP.hwnd = hWnd; - CWP.message = Msg; - CWP.wParam = wParam; - CWP.lParam = lParam; - co_HOOK_CallHooks( WH_CALLWNDPROC, HC_ACTION, SameThread, (LPARAM)&CWP ); - } - + IntCallWndProc( Window, hWnd, Msg, wParam, lParam); + if (NULL != Win32Thread && Window->MessageQueue == Win32Thread->MessageQueue) { @@ -1488,17 +1522,7 @@ *uResult = Result; } - if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || - (SameThread && ISITHOOKED(WH_CALLWNDPROCRET)) ) - { - CWPRETSTRUCT CWPR; - CWPR.hwnd = hWnd; - CWPR.message = Msg; - CWPR.wParam = wParam; - CWPR.lParam = lParam; - CWPR.lResult = Result; - co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); - } + IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam))) { @@ -1538,17 +1562,7 @@ (uFlags & SMTO_NOTIMEOUTIFNOTHUNG) && !MsqIsHung(Window->MessageQueue)); - if ((!SameThread && (Window->ti->Hooks & HOOKID_TO_FLAG(WH_CALLWNDPROCRET))) || - (SameThread && ISITHOOKED(WH_CALLWNDPROCRET)) ) - { - CWPRETSTRUCT CWPR; - CWPR.hwnd = hWnd; - CWPR.message = Msg; - CWPR.wParam = wParam; - CWPR.lParam = lParam; - CWPR.lResult = *uResult; - co_HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, SameThread, (LPARAM)&CWPR ); - } + IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); if (STATUS_TIMEOUT == Status) { @@ -1703,6 +1717,8 @@ Info.Ansi = ! Window->Wnd->Unicode; } + IntCallWndProc( Window, hWnd, Msg, wParam, lParam); + if (Window->Wnd->IsSystem) { Info.Proc = (!Info.Ansi ? Window->Wnd->WndProc : Window->Wnd->WndProcExtra); @@ -1712,6 +1728,9 @@ Info.Ansi = !Window->Wnd->Unicode; Info.Proc = Window->Wnd->WndProc; } + + IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, &Result); + } else {

1 0

[arty] 34921: Fix my error not noticing that queued spinlock functions return KIRQL through the actual function return, not through a parameter.
by arty＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: arty Date: Mon Jul 28 17:33:11 2008 New Revision: 34921 URL: http://svn.reactos.org/svn/reactos?rev=34921&view=rev Log: Fix my error not noticing that queued spinlock functions return KIRQL through the actual function return, not through a parameter. Modified: trunk/reactos/ntoskrnl/include/internal/mm.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] Mon Jul 28 17:33:11 2008 @@ -1010,11 +1010,11 @@ MmGetLockCountPage(PFN_TYPE Page); FORCEINLINE -VOID +KIRQL NTAPI MmAcquirePageListLock() { - KeAcquireQueuedSpinLock(LockQueuePfnLock); + return KeAcquireQueuedSpinLock(LockQueuePfnLock); } FORCEINLINE 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] Mon Jul 28 17:33:11 2008 @@ -51,9 +51,9 @@ { PLIST_ENTRY NextListEntry; PHYSICAL_PAGE* PageDescriptor; - KIRQL oldIrql = KeGetCurrentIrql(); - - KeAcquireQueuedSpinLock(LockQueuePfnLock); + KIRQL oldIrql; + + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); NextListEntry = UserPageListHead.Flink; if (NextListEntry == &UserPageListHead) { @@ -70,10 +70,10 @@ NTAPI MmInsertLRULastUserPage(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; PPHYSICAL_PAGE Page; - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); ASSERT(Page->Flags.Consumer == MC_USER); @@ -87,10 +87,10 @@ { PLIST_ENTRY NextListEntry; PHYSICAL_PAGE* PageDescriptor; - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; PPHYSICAL_PAGE Page; - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(PreviousPfn); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); ASSERT(Page->Flags.Consumer == MC_USER); @@ -125,11 +125,11 @@ ULONG last; ULONG length; ULONG boundary; - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; NrPages = PAGE_ROUND_UP(NumberOfBytes) / PAGE_SIZE; - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); last = min(HighestAcceptableAddress.LowPart / PAGE_SIZE, MmPageArraySize - 1); boundary = BoundaryAddressMultiple.LowPart / PAGE_SIZE; @@ -370,9 +370,9 @@ NTAPI MmSetFlagsPage(PFN_TYPE Pfn, ULONG Flags) { - KIRQL oldIrql = KeGetCurrentIrql(); - - KeAcquireQueuedSpinLock(LockQueuePfnLock); + KIRQL oldIrql; + + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MiGetPfnEntry(Pfn)->AllFlags = Flags; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } @@ -381,9 +381,9 @@ NTAPI MmSetRmapListHeadPage(PFN_TYPE Pfn, struct _MM_RMAP_ENTRY* ListHead) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MiGetPfnEntry(Pfn)->RmapListHead = ListHead; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } @@ -392,10 +392,10 @@ NTAPI MmGetRmapListHeadPage(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; struct _MM_RMAP_ENTRY* ListHead; - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); ListHead = MiGetPfnEntry(Pfn)->RmapListHead; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); @@ -406,12 +406,12 @@ NTAPI MmMarkPageMapped(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; PPHYSICAL_PAGE Page; if (Pfn <= MmPageArraySize) { - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { @@ -428,12 +428,12 @@ NTAPI MmMarkPageUnmapped(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; PPHYSICAL_PAGE Page; if (Pfn <= MmPageArraySize) { - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { @@ -455,10 +455,10 @@ NTAPI MmGetFlagsPage(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; ULONG Flags; - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Flags = MiGetPfnEntry(Pfn)->AllFlags; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); @@ -470,9 +470,9 @@ NTAPI MmSetSavedSwapEntryPage(PFN_TYPE Pfn, SWAPENTRY SavedSwapEntry) { - KIRQL oldIrql = KeGetCurrentIrql(); - - KeAcquireQueuedSpinLock(LockQueuePfnLock); + KIRQL oldIrql; + + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); MiGetPfnEntry(Pfn)->SavedSwapEntry = SavedSwapEntry; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } @@ -482,9 +482,9 @@ MmGetSavedSwapEntryPage(PFN_TYPE Pfn) { SWAPENTRY SavedSwapEntry; - KIRQL oldIrql = KeGetCurrentIrql(); - - KeAcquireQueuedSpinLock(LockQueuePfnLock); + KIRQL oldIrql; + + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); SavedSwapEntry = MiGetPfnEntry(Pfn)->SavedSwapEntry; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); @@ -495,7 +495,7 @@ NTAPI MmReferencePageUnsafe(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; PPHYSICAL_PAGE Page; DPRINT("MmReferencePageUnsafe(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); @@ -505,7 +505,7 @@ return; } - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) @@ -531,13 +531,13 @@ NTAPI MmGetReferenceCountPage(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; ULONG RCount; PPHYSICAL_PAGE Page; DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { @@ -565,12 +565,12 @@ NTAPI MmDereferencePage(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; PPHYSICAL_PAGE Page; DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); @@ -635,13 +635,13 @@ NTAPI MmGetLockCountPage(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; ULONG LockCount; PPHYSICAL_PAGE Page; DPRINT("MmGetLockCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) @@ -660,12 +660,12 @@ NTAPI MmLockPageUnsafe(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; PPHYSICAL_PAGE Page; DPRINT("MmLockPageUnsafe(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) @@ -691,12 +691,12 @@ NTAPI MmUnlockPage(PFN_TYPE Pfn) { - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; PPHYSICAL_PAGE Page; DPRINT("MmUnlockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) @@ -716,12 +716,12 @@ PFN_TYPE PfnOffset; PLIST_ENTRY ListEntry; PPHYSICAL_PAGE PageDescriptor; - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; BOOLEAN NeedClear = FALSE; DPRINT("MmAllocPage()\n"); - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); if (IsListEmpty(&FreeZeroedPageListHead)) { if (IsListEmpty(&FreeUnzeroedPageListHead)) @@ -803,7 +803,7 @@ PPFN_TYPE Pages) { PPHYSICAL_PAGE PageDescriptor; - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; PFN_TYPE LowestPage, HighestPage; PFN_TYPE pfn; ULONG NumberOfPagesFound = 0; @@ -833,7 +833,7 @@ if (HighestPage > MmPageArraySize) HighestPage = MmPageArraySize; - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); if (LowestPage == 0 && HighestPage == MmPageArraySize) { PLIST_ENTRY ListEntry; @@ -947,7 +947,7 @@ MmZeroPageThreadMain(PVOID Ignored) { NTSTATUS Status; - KIRQL oldIrql = KeGetCurrentIrql(); + KIRQL oldIrql; PLIST_ENTRY ListEntry; PPHYSICAL_PAGE PageDescriptor; PFN_TYPE Pfn; @@ -979,7 +979,7 @@ return STATUS_SUCCESS; } Count = 0; - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); while (!IsListEmpty(&FreeUnzeroedPageListHead)) { ListEntry = RemoveTailList(&FreeUnzeroedPageListHead); @@ -991,7 +991,7 @@ Pfn = PageDescriptor - MmPageArray; Status = MiZeroPage(Pfn); - KeAcquireQueuedSpinLock(LockQueuePfnLock); + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); if (PageDescriptor->MapCount != 0) { DPRINT1("Mapped page on freelist.\n");

1 0

[arty] 34920: - Reverse my previous (in retrospect) hack - Make MmProbeAndLockPages smart enough to work at DISPATCH_LEVEL - At Alex' request, remove the stand alone spinlock for the page list, and use the queued spinlock in the prcb.
by arty＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: arty Date: Mon Jul 28 17:05:56 2008 New Revision: 34920 URL: http://svn.reactos.org/svn/reactos?rev=34920&view=rev Log: - Reverse my previous (in retrospect) hack - Make MmProbeAndLockPages smart enough to work at DISPATCH_LEVEL - At Alex' request, remove the stand alone spinlock for the page list, and use the queued spinlock in the prcb. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mdlsup.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Mon Jul 28 17:05:56 2008 @@ -4405,8 +4405,7 @@ if (Irp->MdlAddress != NULL) { - /* We don't need to unlock this MDL because the request could - * only have come from dispatch level */ + MmUnlockPages(Irp->MdlAddress); IoFreeMdl(Irp->MdlAddress); Irp->MdlAddress = NULL; } 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] Mon Jul 28 17:05:56 2008 @@ -1009,6 +1009,22 @@ NTAPI MmGetLockCountPage(PFN_TYPE Page); +FORCEINLINE +VOID +NTAPI +MmAcquirePageListLock() +{ + KeAcquireQueuedSpinLock(LockQueuePfnLock); +} + +FORCEINLINE +VOID +NTAPI +MmReleasePageListLock(KIRQL oldIrql) +{ + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); +} + VOID NTAPI MmInitializePageList( Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Mon Jul 28 17:05:56 2008 @@ -682,31 +682,24 @@ return NULL; } - if (KeGetCurrentIrql() >= DISPATCH_LEVEL) + /* Probe and Lock */ + _SEH_TRY { - MmBuildMdlForNonPagedPool(Irp->MdlAddress); + /* Do the probe */ + MmProbeAndLockPages(Irp->MdlAddress, + KernelMode, + MajorFunction == IRP_MJ_READ ? + IoWriteAccess : IoReadAccess); } - else + _SEH_HANDLE { - /* Probe and Lock */ - _SEH_TRY - { - /* Do the probe */ - MmProbeAndLockPages(Irp->MdlAddress, - KernelMode, - MajorFunction == IRP_MJ_READ ? - IoWriteAccess : IoReadAccess); - } - _SEH_HANDLE - { - /* Free the IRP and its MDL */ - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); - Irp = NULL; - } - _SEH_END; + /* Free the IRP and its MDL */ + IoFreeMdl(Irp->MdlAddress); + IoFreeIrp(Irp); + Irp = NULL; } - + _SEH_END; + /* This is how we know if we failed during the probe */ if (!Irp) return NULL; } 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] Mon Jul 28 17:05:56 2008 @@ -30,7 +30,6 @@ PPHYSICAL_PAGE MmPageArray; ULONG MmPageArraySize; -static KSPIN_LOCK PageListLock; /* List of pages allocated to the MC_USER Consumer */ static LIST_ENTRY UserPageListHead; /* List of pages zeroed by the ZPW (MmZeroPageThreadMain) */ @@ -52,18 +51,18 @@ { PLIST_ENTRY NextListEntry; PHYSICAL_PAGE* PageDescriptor; - KIRQL oldIrql; - - KeAcquireSpinLock(&PageListLock, &oldIrql); + KIRQL oldIrql = KeGetCurrentIrql(); + + KeAcquireQueuedSpinLock(LockQueuePfnLock); NextListEntry = UserPageListHead.Flink; if (NextListEntry == &UserPageListHead) { - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return 0; } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); ASSERT_PFN(PageDescriptor); - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return PageDescriptor - MmPageArray; } @@ -71,15 +70,15 @@ NTAPI MmInsertLRULastUserPage(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); PPHYSICAL_PAGE Page; - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); ASSERT(Page->Flags.Consumer == MC_USER); InsertTailList(&UserPageListHead, &Page->ListEntry); - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } PFN_TYPE @@ -88,21 +87,21 @@ { PLIST_ENTRY NextListEntry; PHYSICAL_PAGE* PageDescriptor; - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); PPHYSICAL_PAGE Page; - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(PreviousPfn); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); ASSERT(Page->Flags.Consumer == MC_USER); NextListEntry = Page->ListEntry.Flink; if (NextListEntry == &UserPageListHead) { - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return 0; } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return PageDescriptor - MmPageArray; } @@ -126,11 +125,11 @@ ULONG last; ULONG length; ULONG boundary; - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); NrPages = PAGE_ROUND_UP(NumberOfBytes) / PAGE_SIZE; - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); last = min(HighestAcceptableAddress.LowPart / PAGE_SIZE, MmPageArraySize - 1); boundary = BoundaryAddressMultiple.LowPart / PAGE_SIZE; @@ -197,7 +196,7 @@ Page->MapCount = 0; Page->SavedSwapEntry = 0; } - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); for (i = start; i < (start + length); i++) { if (MiGetPfnEntry(i)->Flags.Zero == 0) @@ -212,7 +211,7 @@ return start; } } - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return 0; } @@ -243,7 +242,6 @@ PMEMORY_ALLOCATION_DESCRIPTOR Md; /* Initialize the page lists */ - KeInitializeSpinLock(&PageListLock); InitializeListHead(&UserPageListHead); InitializeListHead(&FreeUnzeroedPageListHead); InitializeListHead(&FreeZeroedPageListHead); @@ -372,34 +370,34 @@ NTAPI MmSetFlagsPage(PFN_TYPE Pfn, ULONG Flags) { - KIRQL oldIrql; - - KeAcquireSpinLock(&PageListLock, &oldIrql); + KIRQL oldIrql = KeGetCurrentIrql(); + + KeAcquireQueuedSpinLock(LockQueuePfnLock); MiGetPfnEntry(Pfn)->AllFlags = Flags; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } VOID NTAPI MmSetRmapListHeadPage(PFN_TYPE Pfn, struct _MM_RMAP_ENTRY* ListHead) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); MiGetPfnEntry(Pfn)->RmapListHead = ListHead; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } struct _MM_RMAP_ENTRY* NTAPI MmGetRmapListHeadPage(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); struct _MM_RMAP_ENTRY* ListHead; - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); ListHead = MiGetPfnEntry(Pfn)->RmapListHead; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return(ListHead); } @@ -408,12 +406,12 @@ NTAPI MmMarkPageMapped(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); PPHYSICAL_PAGE Page; if (Pfn <= MmPageArraySize) { - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { @@ -422,7 +420,7 @@ } Page->MapCount++; Page->ReferenceCount++; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } } @@ -430,12 +428,12 @@ NTAPI MmMarkPageUnmapped(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); PPHYSICAL_PAGE Page; if (Pfn <= MmPageArraySize) { - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) { @@ -449,7 +447,7 @@ } Page->MapCount--; Page->ReferenceCount--; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } } @@ -457,12 +455,12 @@ NTAPI MmGetFlagsPage(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); ULONG Flags; - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Flags = MiGetPfnEntry(Pfn)->AllFlags; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return(Flags); } @@ -472,11 +470,11 @@ NTAPI MmSetSavedSwapEntryPage(PFN_TYPE Pfn, SWAPENTRY SavedSwapEntry) { - KIRQL oldIrql; - - KeAcquireSpinLock(&PageListLock, &oldIrql); + KIRQL oldIrql = KeGetCurrentIrql(); + + KeAcquireQueuedSpinLock(LockQueuePfnLock); MiGetPfnEntry(Pfn)->SavedSwapEntry = SavedSwapEntry; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } SWAPENTRY @@ -484,11 +482,11 @@ MmGetSavedSwapEntryPage(PFN_TYPE Pfn) { SWAPENTRY SavedSwapEntry; - KIRQL oldIrql; - - KeAcquireSpinLock(&PageListLock, &oldIrql); + KIRQL oldIrql = KeGetCurrentIrql(); + + KeAcquireQueuedSpinLock(LockQueuePfnLock); SavedSwapEntry = MiGetPfnEntry(Pfn)->SavedSwapEntry; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return(SavedSwapEntry); } @@ -497,7 +495,7 @@ NTAPI MmReferencePageUnsafe(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); PPHYSICAL_PAGE Page; DPRINT("MmReferencePageUnsafe(PysicalAddress %x)\n", Pfn << PAGE_SHIFT); @@ -507,7 +505,7 @@ return; } - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) @@ -517,7 +515,7 @@ } Page->ReferenceCount++; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } VOID @@ -533,13 +531,13 @@ NTAPI MmGetReferenceCountPage(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); ULONG RCount; PPHYSICAL_PAGE Page; DPRINT("MmGetReferenceCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { @@ -549,7 +547,7 @@ RCount = Page->ReferenceCount; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return(RCount); } @@ -567,12 +565,12 @@ NTAPI MmDereferencePage(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); PPHYSICAL_PAGE Page; DPRINT("MmDereferencePage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); @@ -630,20 +628,20 @@ KeSetEvent(&ZeroPageThreadEvent, IO_NO_INCREMENT, FALSE); } } - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } ULONG NTAPI MmGetLockCountPage(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); ULONG LockCount; PPHYSICAL_PAGE Page; DPRINT("MmGetLockCountPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) @@ -653,7 +651,7 @@ } LockCount = Page->LockCount; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return(LockCount); } @@ -662,12 +660,12 @@ NTAPI MmLockPageUnsafe(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); PPHYSICAL_PAGE Page; DPRINT("MmLockPageUnsafe(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) @@ -677,7 +675,7 @@ } Page->LockCount++; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } VOID @@ -693,12 +691,12 @@ NTAPI MmUnlockPage(PFN_TYPE Pfn) { - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); PPHYSICAL_PAGE Page; DPRINT("MmUnlockPage(PhysicalAddress %x)\n", Pfn << PAGE_SHIFT); - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) @@ -708,7 +706,7 @@ } Page->LockCount--; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } PFN_TYPE @@ -718,12 +716,12 @@ PFN_TYPE PfnOffset; PLIST_ENTRY ListEntry; PPHYSICAL_PAGE PageDescriptor; - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); BOOLEAN NeedClear = FALSE; DPRINT("MmAllocPage()\n"); - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); if (IsListEmpty(&FreeZeroedPageListHead)) { if (IsListEmpty(&FreeUnzeroedPageListHead)) @@ -732,14 +730,14 @@ if (MmStats.NrTotalPages == 0) { /* Allocate an early page -- we'll account for it later */ - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); PfnOffset = MmAllocEarlyPage(); MiZeroPage(PfnOffset); return PfnOffset; } DPRINT1("MmAllocPage(): Out of memory\n"); - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return 0; } ListEntry = RemoveTailList(&FreeUnzeroedPageListHead); @@ -781,7 +779,7 @@ MmStats.NrSystemPages++; MmStats.NrFreePages--; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); PfnOffset = PageDescriptor - MmPageArray; if (NeedClear) @@ -805,7 +803,7 @@ PPFN_TYPE Pages) { PPHYSICAL_PAGE PageDescriptor; - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); PFN_TYPE LowestPage, HighestPage; PFN_TYPE pfn; ULONG NumberOfPagesFound = 0; @@ -835,7 +833,7 @@ if (HighestPage > MmPageArraySize) HighestPage = MmPageArraySize; - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); if (LowestPage == 0 && HighestPage == MmPageArraySize) { PLIST_ENTRY ListEntry; @@ -854,7 +852,7 @@ { if (NumberOfPagesFound == 0) { - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); DPRINT1("MmAllocPagesSpecifyRange(): Out of memory\n"); return -1; } @@ -925,7 +923,7 @@ break; } } - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); /* Zero unzero-ed pages */ for (i = 0; i < NumberOfPagesFound; i++) @@ -949,7 +947,7 @@ MmZeroPageThreadMain(PVOID Ignored) { NTSTATUS Status; - KIRQL oldIrql; + KIRQL oldIrql = KeGetCurrentIrql(); PLIST_ENTRY ListEntry; PPHYSICAL_PAGE PageDescriptor; PFN_TYPE Pfn; @@ -981,7 +979,7 @@ return STATUS_SUCCESS; } Count = 0; - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); while (!IsListEmpty(&FreeUnzeroedPageListHead)) { ListEntry = RemoveTailList(&FreeUnzeroedPageListHead); @@ -989,11 +987,11 @@ PageDescriptor = CONTAINING_RECORD(ListEntry, PHYSICAL_PAGE, ListEntry); /* We set the page to used, because MmCreateVirtualMapping failed with unused pages */ PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); Pfn = PageDescriptor - MmPageArray; Status = MiZeroPage(Pfn); - KeAcquireSpinLock(&PageListLock, &oldIrql); + KeAcquireQueuedSpinLock(LockQueuePfnLock); if (PageDescriptor->MapCount != 0) { DPRINT1("Mapped page on freelist.\n"); @@ -1015,7 +1013,7 @@ } DPRINT("Zeroed %d pages.\n", Count); KeResetEvent(&ZeroPageThreadEvent); - KeReleaseSpinLock(&PageListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Mon Jul 28 17:05:56 2008 @@ -391,11 +391,12 @@ PVOID Base, Address; ULONG i, j; ULONG NrPages; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PFN_TYPE Page; PEPROCESS CurrentProcess; PETHREAD Thread; PMM_AVL_TABLE AddressSpace; + KIRQL OldIrql = KeGetCurrentIrql(); DPRINT("Probing MDL: %p\n", Mdl); /* Sanity checks */ @@ -486,7 +487,10 @@ /* * Lock the pages */ - MmLockAddressSpace(AddressSpace); + if (OldIrql < DISPATCH_LEVEL) + MmLockAddressSpace(AddressSpace); + else + MmAcquirePageListLock(&OldIrql); for (i = 0; i < NrPages; i++) { @@ -500,8 +504,7 @@ Status = MmAccessFault(FALSE, Address, AccessMode, NULL); if (!NT_SUCCESS(Status)) { - MmUnlockAddressSpace(AddressSpace); - ExRaiseStatus(STATUS_ACCESS_VIOLATION); + goto cleanup; } } else @@ -524,8 +527,7 @@ MmDereferencePage(Page); } } - MmUnlockAddressSpace(AddressSpace); - ExRaiseStatus(STATUS_ACCESS_VIOLATION); + goto cleanup; } } Page = MmGetPfnForProcess(NULL, Address); @@ -539,9 +541,17 @@ MmReferencePage(Page); } } - - MmUnlockAddressSpace(AddressSpace); + +cleanup: + if (OldIrql < DISPATCH_LEVEL) + MmUnlockAddressSpace(AddressSpace); + else + MmReleasePageListLock(OldIrql); + + if (!NT_SUCCESS(Status)) + ExRaiseStatus(STATUS_ACCESS_VIOLATION); Mdl->MdlFlags |= MDL_PAGES_LOCKED; + return; } /*

1 0

[tkreuzer] 34919: fix _InterlockedDecrement64
by tkreuzer＠svn.reactos.org 28 Jul '08

28 Jul '08

Author: tkreuzer Date: Mon Jul 28 17:00:17 2008 New Revision: 34919 URL: http://svn.reactos.org/svn/reactos?rev=34919&view=rev Log: fix _InterlockedDecrement64 Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/intrin_x86.h [iso-8859-1] Mon Jul 28 17:00:17 2008 @@ -481,7 +481,7 @@ #if defined(_M_AMD64) static __inline__ __attribute__((always_inline)) long long _InterlockedDecrement64(volatile long long * const lpAddend) { - return _InterlockedExchangeAdd(lpAddend, -1) - 1; + return _InterlockedExchangeAdd64(lpAddend, -1) - 1; } static __inline__ __attribute__((always_inline)) long long _InterlockedIncrement64(volatile long long * const lpAddend)

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
77
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 2008