Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[jimtabor] 45306: - Wrong commit msg, removed debug prints and fixed RedrawWindow. This fix one part of the leak.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jan 29 00:45:22 2010 New Revision: 45306 URL: http://svn.reactos.org/svn/reactos?rev=45306&view=rev Log: - Wrong commit msg, removed debug prints and fixed RedrawWindow. This fix one part of the leak. 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] Fri Jan 29 00:45:22 2010 @@ -330,7 +330,7 @@ BOOL HasPaintMessage, HasNCPaintMessage; Wnd = Window->Wnd; - DPRINT1("IntInvalidateWindows start\n"); + DPRINT("IntInvalidateWindows start\n"); /* * If the nonclient is not to be redrawn, clip the region to the client * rect @@ -482,7 +482,7 @@ else MsqIncPaintCountQueue(Window->pti->MessageQueue); } - DPRINT1("IntInvalidateWindows exit\n"); + DPRINT("IntInvalidateWindows exit\n"); } /* @@ -527,7 +527,7 @@ ULONG Flags) { HRGN hRgn = NULL; - DPRINT1("co_UserRedrawWindow start\n"); + DPRINT("co_UserRedrawWindow start\n"); /* * Step 1. @@ -609,7 +609,7 @@ { REGION_FreeRgnByHandle(hRgn); } - DPRINT1("co_UserRedrawWindow exit\n"); + DPRINT("co_UserRedrawWindow exit\n"); return TRUE; } @@ -1088,7 +1088,7 @@ NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(BOOL); - DPRINT1("Enter NtUserRedrawWindow\n"); + DPRINT("Enter NtUserRedrawWindow\n"); UserEnterExclusive(); if (!(Wnd = UserGetWindowObject(hWnd ? hWnd : IntGetDesktopWindow()))) @@ -1136,7 +1136,7 @@ RETURN( Ret); CLEANUP: - DPRINT1("Leave NtUserRedrawWindow, ret=%i\n",_ret_); + DPRINT("Leave NtUserRedrawWindow, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; }

14 years, 7 months

[jimtabor] 45305: [Win32k] - Add back removed window dce support routine. Fixed list handling and implemented thread cleanup for dces.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Fri Jan 29 00:34:57 2010 New Revision: 45305 URL: http://svn.reactos.org/svn/reactos?rev=45305&view=rev Log: [Win32k] - Add back removed window dce support routine. Fixed list handling and implemented thread cleanup for dces. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Fri Jan 29 00:34:57 2010 @@ -1116,18 +1116,6 @@ return 0; } -/* ValidateRect gets redirected to NtUserValidateRect: - http://blog.csdn.net/ntdll/archive/2005/10/19/509299.aspx */ -BOOL -APIENTRY -NtUserValidateRect( - HWND hWnd, - const RECT *lpRect) -{ - UNIMPLEMENTED; - return 0; -} - BOOL APIENTRY NtUserValidateTimerCallback( 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] Fri Jan 29 00:34:57 2010 @@ -81,8 +81,9 @@ if (Recurse) return FALSE; - IntInvalidateWindows(ParentWindow, hValidateRgn, - RDW_VALIDATE | RDW_NOCHILDREN); + IntInvalidateWindows( ParentWindow, + hValidateRgn, + RDW_VALIDATE | RDW_NOCHILDREN); } ParentWindow = ParentWindow->spwndParent; @@ -250,7 +251,9 @@ Window->state &= ~WINDOWOBJECT_NEED_NCPAINT; MsqDecPaintCountQueue(Window->pti->MessageQueue); co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)TempRegion, 0); - if ((HANDLE) 1 != TempRegion && NULL != TempRegion) + + if ( (HANDLE) 1 != TempRegion && + NULL != TempRegion) { /* NOTE: The region can already be deleted! */ GDIOBJ_FreeObjByHandle(TempRegion, GDI_OBJECT_TYPE_REGION | GDI_OBJECT_TYPE_SILENT); @@ -261,9 +264,10 @@ { if (Window->hrgnUpdate) { - hDC = UserGetDCEx(Window, Window->hrgnUpdate, - DCX_CACHE | DCX_USESTYLE | - DCX_INTERSECTRGN | DCX_KEEPCLIPRGN); + hDC = UserGetDCEx( Window, + Window->hrgnUpdate, + DCX_CACHE|DCX_USESTYLE|DCX_INTERSECTRGN|DCX_KEEPCLIPRGN); + if (co_IntSendMessage(hWnd, WM_ERASEBKGND, (WPARAM)hDC, 0)) { Window->state &= ~WINDOWOBJECT_NEED_ERASEBKGND; @@ -285,8 +289,9 @@ /* * Paint child windows. */ - if (!(Flags & RDW_NOCHILDREN) && !(Wnd->style & WS_MINIMIZE) && - ((Flags & RDW_ALLCHILDREN) || !(Wnd->style & WS_CLIPCHILDREN))) + if (!(Flags & RDW_NOCHILDREN) && + !(Wnd->style & WS_MINIMIZE) && + ((Flags & RDW_ALLCHILDREN) || !(Wnd->style & WS_CLIPCHILDREN)) ) { HWND *List, *phWnd; @@ -325,7 +330,7 @@ BOOL HasPaintMessage, HasNCPaintMessage; Wnd = Window->Wnd; - + DPRINT1("IntInvalidateWindows start\n"); /* * If the nonclient is not to be redrawn, clip the region to the client * rect @@ -353,13 +358,13 @@ } else { - NtGdiOffsetRgn(hRgn, - -Wnd->rcWindow.left, - -Wnd->rcWindow.top); + NtGdiOffsetRgn( hRgn, + -Wnd->rcWindow.left, + -Wnd->rcWindow.top); RgnType = NtGdiCombineRgn(hRgn, hRgn, Window->hrgnClip, RGN_AND); - NtGdiOffsetRgn(hRgn, - Wnd->rcWindow.left, - Wnd->rcWindow.top); + NtGdiOffsetRgn( hRgn, + Wnd->rcWindow.left, + Wnd->rcWindow.top); } /* @@ -477,7 +482,7 @@ else MsqIncPaintCountQueue(Window->pti->MessageQueue); } - + DPRINT1("IntInvalidateWindows exit\n"); } /* @@ -515,21 +520,23 @@ */ BOOL FASTCALL -co_UserRedrawWindow(PWINDOW_OBJECT Window, const RECTL* UpdateRect, HRGN UpdateRgn, - ULONG Flags) +co_UserRedrawWindow( + PWINDOW_OBJECT Window, + const RECTL* UpdateRect, + HRGN UpdateRgn, + ULONG Flags) { HRGN hRgn = NULL; + DPRINT1("co_UserRedrawWindow start\n"); /* * Step 1. * Validation of passed parameters. */ - if (!IntIsWindowDrawable(Window) || - (Flags & (RDW_VALIDATE | RDW_INVALIDATE)) == - (RDW_VALIDATE | RDW_INVALIDATE)) - { - return FALSE; + if (!IntIsWindowDrawable(Window)) + { + return TRUE; // Just do nothing!!! } /* @@ -538,7 +545,7 @@ * a region hRgn specified in screen coordinates. */ - if (Flags & (RDW_INVALIDATE | RDW_VALIDATE)) + if (Flags & (RDW_INVALIDATE | RDW_VALIDATE)) // Both are OKAY! { if (UpdateRgn != NULL) { @@ -602,6 +609,7 @@ { REGION_FreeRgnByHandle(hRgn); } + DPRINT1("co_UserRedrawWindow exit\n"); return TRUE; } @@ -660,8 +668,13 @@ } BOOL FASTCALL -IntGetPaintMessage(PWINDOW_OBJECT Window, UINT MsgFilterMin, UINT MsgFilterMax, - PTHREADINFO Thread, MSG *Message, BOOL Remove) +IntGetPaintMessage( + PWINDOW_OBJECT Window, + UINT MsgFilterMin, + UINT MsgFilterMax, + PTHREADINFO Thread, + MSG *Message, + BOOL Remove) { PUSER_MESSAGE_QUEUE MessageQueue = (PUSER_MESSAGE_QUEUE)Thread->MessageQueue; @@ -787,7 +800,9 @@ RtlZeroMemory(&Ps, sizeof(PAINTSTRUCT)); - Ps.hdc = UserGetDCEx(Window, Window->hrgnUpdate, DCX_INTERSECTRGN | DCX_USESTYLE); + Ps.hdc = UserGetDCEx( Window, + Window->hrgnUpdate, + DCX_INTERSECTRGN | DCX_USESTYLE); if (!Ps.hdc) { RETURN(NULL); @@ -1060,16 +1075,20 @@ */ BOOL APIENTRY -NtUserRedrawWindow(HWND hWnd, CONST RECT *lprcUpdate, HRGN hrgnUpdate, - UINT flags) +NtUserRedrawWindow( + HWND hWnd, + CONST RECT *lprcUpdate, + HRGN hrgnUpdate, + UINT flags) { RECTL SafeUpdateRect; - NTSTATUS Status; PWINDOW_OBJECT Wnd; + BOOL Ret; + USER_REFERENCE_ENTRY Ref; + NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(BOOL); - USER_REFERENCE_ENTRY Ref; - - DPRINT("Enter NtUserRedrawWindow\n"); + + DPRINT1("Enter NtUserRedrawWindow\n"); UserEnterExclusive(); if (!(Wnd = UserGetWindowObject(hWnd ? hWnd : IntGetDesktopWindow()))) @@ -1077,44 +1096,61 @@ RETURN( FALSE); } - if (lprcUpdate != NULL) - { - Status = MmCopyFromCaller(&SafeUpdateRect, lprcUpdate, - sizeof(RECTL)); - + if (lprcUpdate) + { + _SEH2_TRY + { + ProbeForRead(lprcUpdate, sizeof(RECTL), 1); + RtlCopyMemory(&SafeUpdateRect, lprcUpdate, sizeof(RECTL)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END if (!NT_SUCCESS(Status)) { - SetLastWin32Error(ERROR_INVALID_PARAMETER); + SetLastWin32Error(RtlNtStatusToDosError(Status)); RETURN( FALSE); } } + if ( flags & ~(RDW_ERASE|RDW_FRAME|RDW_INTERNALPAINT|RDW_INVALIDATE| + RDW_NOERASE|RDW_NOFRAME|RDW_NOINTERNALPAINT|RDW_VALIDATE| + RDW_ERASENOW|RDW_UPDATENOW|RDW_ALLCHILDREN|RDW_NOCHILDREN) ) + { + /* RedrawWindow fails only in case that flags are invalid */ + SetLastWin32Error(ERROR_INVALID_FLAGS); + RETURN( FALSE); + } + UserRefObjectCo(Wnd, &Ref); - Status = co_UserRedrawWindow(Wnd, NULL == lprcUpdate ? NULL : &SafeUpdateRect, - hrgnUpdate, flags); + Ret = co_UserRedrawWindow( Wnd, + lprcUpdate ? &SafeUpdateRect : NULL, + hrgnUpdate, + flags); UserDerefObjectCo(Wnd); - if (!NT_SUCCESS(Status)) - { - /* IntRedrawWindow fails only in case that flags are invalid */ - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); - } - - RETURN( TRUE); + RETURN( Ret); CLEANUP: - DPRINT("Leave NtUserRedrawWindow, ret=%i\n",_ret_); + DPRINT1("Leave NtUserRedrawWindow, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; } static INT FASTCALL -UserScrollDC(HDC hDC, INT dx, INT dy, const RECTL *prcScroll, - const RECTL *prcClip, HRGN hrgnUpdate, RECTL *prcUpdate) +UserScrollDC( + HDC hDC, + INT dx, + INT dy, + const RECTL *prcScroll, + const RECTL *prcClip, + HRGN hrgnUpdate, + RECTL *prcUpdate) { PDC pDC; RECTL rcScroll, rcClip, rcSrc, rcDst; @@ -1141,9 +1177,17 @@ RECTL_vOffsetRect(&rcDst, dx, dy); RECTL_bIntersectRect(&rcDst, &rcDst, &rcClip); - if (!NtGdiBitBlt(hDC, rcDst.left, rcDst.top, - rcDst.right - rcDst.left, rcDst.bottom - rcDst.top, - hDC, rcDst.left - dx, rcDst.top - dy, SRCCOPY, 0, 0)) + if (!NtGdiBitBlt( hDC, + rcDst.left, + rcDst.top, + rcDst.right - rcDst.left, + rcDst.bottom - rcDst.top, + hDC, + rcDst.left - dx, + rcDst.top - dy, + SRCCOPY, + 0, + 0)) { return ERROR; } @@ -1159,7 +1203,7 @@ { return FALSE; } - hrgnVisible = pDC->rosdc.hVisRgn; // pDC->w.hGCClipRgn? + hrgnVisible = pDC->rosdc.hVisRgn; // pDC->prgnRao? DC_UnlockDc(pDC); /* Begin with the shifted and then clipped scroll rect */ @@ -1539,7 +1583,8 @@ } BOOL -UserDrawCaptionText(HDC hDc, +UserDrawCaptionText( + HDC hDc, const PUNICODE_STRING Text, const RECTL *lpRc, UINT uFlags) @@ -1984,4 +2029,19 @@ return NtUserRedrawWindow(hWnd, NULL, hRgn, RDW_INVALIDATE | (bErase? RDW_ERASE : 0)); } +/* ValidateRect gets redirected to NtUserValidateRect: + http://blog.csdn.net/ntdll/archive/2005/10/19/509299.aspx */ +BOOL +APIENTRY +NtUserValidateRect( + HWND hWnd, + const RECT *lpRect) +{ + if (hWnd) + { + return NtUserRedrawWindow(hWnd, lpRect, NULL, RDW_VALIDATE ); + } + return NtUserRedrawWindow(hWnd, lpRect, NULL, RDW_INVALIDATE|RDW_ERASE|RDW_ERASENOW|RDW_ALLCHILDREN); +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Fri Jan 29 00:34:57 2010 @@ -903,8 +903,8 @@ /* * Only allow CSRSS to mess with the desktop window */ - if (Window->hSelf == IntGetDesktopWindow() && - Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) + if ( Window->hSelf == IntGetDesktopWindow() && + Window->pti->pEThread->ThreadsProcess != PsGetCurrentProcess()) { return FALSE; } @@ -934,9 +934,9 @@ } Ancestor = UserGetAncestor(Window, GA_PARENT); - if ((WinPos.flags & (SWP_NOZORDER | SWP_HIDEWINDOW | SWP_SHOWWINDOW)) != + if ( (WinPos.flags & (SWP_NOZORDER | SWP_HIDEWINDOW | SWP_SHOWWINDOW)) != SWP_NOZORDER && - Ancestor && Ancestor->hSelf == IntGetDesktopWindow()) + Ancestor && Ancestor->hSelf == IntGetDesktopWindow() ) { WinPos.hwndInsertAfter = WinPosDoOwnedPopups(WinPos.hwnd, WinPos.hwndInsertAfter); } @@ -945,15 +945,16 @@ { /* Compute the visible region before the window position is changed */ if (!(WinPos.flags & (SWP_NOREDRAW | SWP_SHOWWINDOW)) && - (WinPos.flags & (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | + (WinPos.flags & (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_HIDEWINDOW | SWP_FRAMECHANGED)) != (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER)) { VisBefore = VIS_ComputeVisibleRegion(Window, FALSE, FALSE, TRUE); VisRgn = NULL; - if (VisBefore != NULL && (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(VisBefore, NULL)) && - REGION_GetRgnBox(VisRgn, &TempRect) == NULLREGION) + if ( VisBefore != NULL && + (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(VisBefore, NULL)) && + REGION_GetRgnBox(VisRgn, &TempRect) == NULLREGION ) { RGNOBJAPI_Unlock(VisRgn); GreDeleteObject(VisBefore); @@ -989,7 +990,8 @@ { InsertAfterWindow = NULL; Sibling = ParentWindow->spwndChild; - while (NULL != Sibling && 0 != (Sibling->Wnd->ExStyle & WS_EX_TOPMOST)) + while ( NULL != Sibling && + 0 != (Sibling->Wnd->ExStyle & WS_EX_TOPMOST) ) { InsertAfterWindow = Sibling; Sibling = Sibling->spwndNext; @@ -1027,12 +1029,13 @@ } if (InsertAfterWindow != NULL) UserDereferenceObject(InsertAfterWindow); - if ((HWND_TOPMOST == WinPos.hwndInsertAfter) - || (0 != (Window->Wnd->ExStyle & WS_EX_TOPMOST) - && NULL != Window->spwndPrev - && 0 != (Window->spwndPrev->Wnd->ExStyle & WS_EX_TOPMOST)) - || (NULL != Window->spwndNext - && 0 != (Window->spwndNext->Wnd->ExStyle & WS_EX_TOPMOST))) + + if ( (HWND_TOPMOST == WinPos.hwndInsertAfter) || + (0 != (Window->Wnd->ExStyle & WS_EX_TOPMOST) && + NULL != Window->spwndPrev && + 0 != (Window->spwndPrev->Wnd->ExStyle & WS_EX_TOPMOST)) || + (NULL != Window->spwndNext && + 0 != (Window->spwndNext->Wnd->ExStyle & WS_EX_TOPMOST)) ) { Window->Wnd->ExStyle |= WS_EX_TOPMOST; } @@ -1063,8 +1066,8 @@ /* FIXME: Actually do something with WVR_VALIDRECTS */ - if (NewClientRect.left != OldClientRect.left || - NewClientRect.top != OldClientRect.top) + if ( NewClientRect.left != OldClientRect.left || + NewClientRect.top != OldClientRect.top) { WinPosInternalMoveWindow(Window, NewClientRect.left - OldClientRect.left, @@ -1077,8 +1080,11 @@ if (!(WinPos.flags & SWP_SHOWWINDOW) && (WinPos.flags & SWP_HIDEWINDOW)) { /* Clear the update region */ - co_UserRedrawWindow(Window, NULL, 0, RDW_VALIDATE | RDW_NOFRAME | - RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_ALLCHILDREN); + co_UserRedrawWindow( Window, + NULL, + 0, + RDW_VALIDATE | RDW_NOFRAME | RDW_NOERASE | RDW_NOINTERNALPAINT | RDW_ALLCHILDREN); + if ((Window->Wnd->style & WS_VISIBLE) && Window->spwndParent == UserGetDesktopWindow()) { @@ -1089,7 +1095,7 @@ else if (WinPos.flags & SWP_SHOWWINDOW) { if (!(Window->Wnd->style & WS_VISIBLE) && - Window->spwndParent == UserGetDesktopWindow()) + Window->spwndParent == UserGetDesktopWindow() ) { co_IntShellHookNotify(HSHELL_WINDOWCREATED, (LPARAM)Window->hSelf); } @@ -1111,8 +1117,9 @@ VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, FALSE, TRUE); VisRgn = NULL; - if (VisAfter != NULL && (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(VisAfter, NULL)) && - REGION_GetRgnBox(VisRgn, &TempRect) == NULLREGION) + if ( VisAfter != NULL && + (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(VisAfter, NULL)) && + REGION_GetRgnBox(VisRgn, &TempRect) == NULLREGION ) { RGNOBJAPI_Unlock(VisRgn); GreDeleteObject(VisAfter); @@ -1131,9 +1138,11 @@ * class need to be completely repainted on (horizontal/vertical) size * change. */ - if (VisBefore != NULL && VisAfter != NULL && !(WinPos.flags & SWP_NOCOPYBITS) && + if ( VisBefore != NULL && + VisAfter != NULL && + !(WinPos.flags & SWP_NOCOPYBITS) && ((WinPos.flags & SWP_NOSIZE) || !(WvrFlags & WVR_REDRAW)) && - !(Window->Wnd->ExStyle & WS_EX_TRANSPARENT)) + !(Window->Wnd->ExStyle & WS_EX_TRANSPARENT) ) { CopyRgn = IntSysCreateRectRgn(0, 0, 0, 0); RgnType = NtGdiCombineRgn(CopyRgn, VisAfter, VisBefore, RGN_AND); @@ -1146,8 +1155,9 @@ * we don't have to crop (can't take anything away from an empty * region...) */ - if (!(WinPos.flags & SWP_NOSIZE) && RgnType != ERROR && - RgnType != NULLREGION) + if (!(WinPos.flags & SWP_NOSIZE) && + RgnType != ERROR && + RgnType != NULLREGION ) { PROSRGNDATA pCopyRgn; RECTL ORect = OldClientRect; @@ -1173,7 +1183,7 @@ * there's nothing to copy. Also, it's no use copying bits onto * themselves. */ - if ((VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(CopyRgn, NULL)) && + if ( (VisRgn = (PROSRGNDATA)RGNOBJAPI_Lock(CopyRgn, NULL)) && REGION_GetRgnBox(VisRgn, &CopyRect) == NULLREGION) { /* Nothing to copy, clean up */ @@ -1189,24 +1199,30 @@ RGNOBJAPI_Unlock(VisRgn); } - /* - * Small trick here: there is no function to bitblt a region. So - * we set the region as the clipping region, take the bounding box - * of the region and bitblt that. Since nothing outside the clipping - * region is copied, this has the effect of bitblt'ing the region. - * - * Since NtUserGetDCEx takes ownership of the clip region, we need - * to create a copy of CopyRgn and pass that. We need CopyRgn later - */ + /* + * Small trick here: there is no function to bitblt a region. So + * we set the region as the clipping region, take the bounding box + * of the region and bitblt that. Since nothing outside the clipping + * region is copied, this has the effect of bitblt'ing the region. + * + * Since NtUserGetDCEx takes ownership of the clip region, we need + * to create a copy of CopyRgn and pass that. We need CopyRgn later + */ NtGdiOffsetRgn(CopyRgn, NewWindowRect.left, NewWindowRect.top); - Dc = UserGetDCEx(Window, CopyRgn, DCX_WINDOW | DCX_CACHE | - DCX_INTERSECTRGN | DCX_CLIPSIBLINGS | - DCX_KEEPCLIPRGN); - NtGdiBitBlt(Dc, - CopyRect.left, CopyRect.top, CopyRect.right - CopyRect.left, - CopyRect.bottom - CopyRect.top, Dc, - CopyRect.left + (OldWindowRect.left - NewWindowRect.left), - CopyRect.top + (OldWindowRect.top - NewWindowRect.top), SRCCOPY, 0, 0); + Dc = UserGetDCEx( Window, + CopyRgn, + DCX_WINDOW|DCX_CACHE|DCX_INTERSECTRGN|DCX_CLIPSIBLINGS|DCX_KEEPCLIPRGN); + NtGdiBitBlt( Dc, + CopyRect.left, CopyRect.top, + CopyRect.right - CopyRect.left, + CopyRect.bottom - CopyRect.top, + Dc, + CopyRect.left + (OldWindowRect.left - NewWindowRect.left), + CopyRect.top + (OldWindowRect.top - NewWindowRect.top), + SRCCOPY, + 0, + 0); + UserReleaseDC(Window, Dc, FALSE); IntValidateParent(Window, CopyRgn, FALSE); NtGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); @@ -1235,9 +1251,10 @@ } if (RgnType != ERROR && RgnType != NULLREGION) { - /* old code + /* old code NtGdiOffsetRgn(DirtyRgn, Window->rcWindow.left, Window->rcWindow.top); - IntInvalidateWindows(Window, DirtyRgn, + IntInvalidateWindows( Window, + DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } GreDeleteObject(DirtyRgn); @@ -1245,21 +1262,23 @@ PWINDOW_OBJECT Parent = Window->spwndParent; - NtGdiOffsetRgn(DirtyRgn, - Window->Wnd->rcWindow.left, - Window->Wnd->rcWindow.top); - if ((Window->Wnd->style & WS_CHILD) && - (Parent) && + NtGdiOffsetRgn( DirtyRgn, + Window->Wnd->rcWindow.left, + Window->Wnd->rcWindow.top); + if ( (Window->Wnd->style & WS_CHILD) && + (Parent) && !(Parent->Wnd->style & WS_CLIPCHILDREN)) { - IntInvalidateWindows(Parent, DirtyRgn, - RDW_ERASE | RDW_INVALIDATE); + IntInvalidateWindows( Parent, + DirtyRgn, + RDW_ERASE | RDW_INVALIDATE); co_IntPaintWindows(Parent, RDW_ERASENOW, FALSE); } else { - IntInvalidateWindows(Window, DirtyRgn, - RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + IntInvalidateWindows( Window, + DirtyRgn, + RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } } REGION_FreeRgnByHandle(DirtyRgn); @@ -1275,8 +1294,10 @@ { ExposedRgn = IntSysCreateRectRgn(0, 0, 0, 0); NtGdiCombineRgn(ExposedRgn, VisBefore, NULL, RGN_COPY); - NtGdiOffsetRgn(ExposedRgn, OldWindowRect.left - NewWindowRect.left, - OldWindowRect.top - NewWindowRect.top); + NtGdiOffsetRgn( ExposedRgn, + OldWindowRect.left - NewWindowRect.left, + OldWindowRect.top - NewWindowRect.top); + if (VisAfter != NULL) RgnType = NtGdiCombineRgn(ExposedRgn, ExposedRgn, VisAfter, RGN_DIFF); else

14 years, 7 months

[sir_richard] 45304: [NTOS]: The last big step. Now that the HAL is in C, we can handle interrupts in C. Do so using the proposed model that was #if'ed out, but with some improvements. [NTOS]: Implement KiUnexpectedInterruptTail and KiUnexpectedInterrupt in C as well. This is [PERF] too since the C interrupt handling code is a lot more efficient than the ASM one. Numbers look good here.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Fri Jan 29 00:18:53 2010 New Revision: 45304 URL: http://svn.reactos.org/svn/reactos?rev=45304&view=rev Log: [NTOS]: The last big step. Now that the HAL is in C, we can handle interrupts in C. Do so using the proposed model that was #if'ed out, but with some improvements. [NTOS]: Implement KiUnexpectedInterruptTail and KiUnexpectedInterrupt in C as well. This is [PERF] too since the C interrupt handling code is a lot more efficient than the ASM one. Numbers look good here. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Fri Jan 29 00:18:53 2010 @@ -197,7 +197,7 @@ .macro GENERATE_INT_HANDLER Number .func KiUnexpectedInterrupt&Number _KiUnexpectedInterrupt&Number: - push PRIMARY_VECTOR_BASE + Number + mov eax, PRIMARY_VECTOR_BASE + Number jmp _KiEndUnexpectedRange@0 .endfunc .endm Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Fri Jan 29 00:18:53 2010 @@ -954,19 +954,6 @@ IN PKTRAP_FRAME TrapFrame ); -#ifndef HAL_INTERRUPT_SUPPORT_IN_C -VOID -NTAPI -KiInterruptDispatch( - VOID -); - -VOID -NTAPI -KiChainedDispatch( - VOID -); -#else VOID FASTCALL KiInterruptDispatch( @@ -980,7 +967,6 @@ IN PKTRAP_FRAME TrapFrame, IN PKINTERRUPT Interrupt ); -#endif VOID NTAPI Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Fri Jan 29 00:18:53 2010 @@ -97,9 +97,6 @@ { DISPATCH_INFO Dispatch; PKINTERRUPT_ROUTINE Handler; -#ifndef HAL_INTERRUPT_SUPPORT_IN_C - PULONG Patch = &Interrupt->DispatchCode[0]; -#endif /* Get vector data */ KiGetVectorDispatch(Interrupt->Vector, &Dispatch); @@ -122,15 +119,6 @@ Interrupt->DispatchAddress = Handler; /* Read note in trap.s -- patching not needed since JMP is static */ -#ifndef HAL_INTERRUPT_SUPPORT_IN_C - /* Jump to the last 4 bytes */ - Patch = (PULONG)((ULONG_PTR)Patch + - ((ULONG_PTR)&KiInterruptTemplateDispatch - - (ULONG_PTR)KiInterruptTemplate) - 4); - - /* Apply the patch */ - *Patch = (ULONG)((ULONG_PTR)Handler - ((ULONG_PTR)Patch + 4)); -#endif /* Now set the final handler address */ ASSERT(Dispatch.FlatDispatch == NULL); @@ -140,6 +128,130 @@ /* Register the interrupt */ KeRegisterInterruptHandler(Interrupt->Vector, Handler); } + +VOID +FORCEINLINE +DECLSPEC_NORETURN +KiExitInterrupt(IN PKTRAP_FRAME TrapFrame, + IN KIRQL OldIrql, + IN BOOLEAN Spurious) +{ + /* Check if this was a real interrupt */ + if (!Spurious) + { + /* Set nested trap frame */ + KeGetPcr()->VdmAlert = (ULONG_PTR)TrapFrame; + + /* It was, disable interrupts and restore the IRQL */ + _disable(); + HalEndSystemInterrupt(OldIrql, 0); + } + + /* Now exit the trap */ + KiEoiHelper(TrapFrame); +} + +VOID +KiUnexpectedInterrupt(VOID) +{ + /* Crash the machine */ + KeBugCheck(TRAP_CAUSE_UNKNOWN); +} + +VOID +FASTCALL +KiUnexpectedInterruptTailHandler(IN PKTRAP_FRAME TrapFrame) +{ + KIRQL OldIrql; + + /* Enter trap */ + KiEnterInterruptTrap(TrapFrame); + + /* Increase interrupt count */ + KeGetCurrentPrcb()->InterruptCount++; + + /* Start the interrupt */ + if (HalBeginSystemInterrupt(HIGH_LEVEL, TrapFrame->Eax, &OldIrql)) + { + /* Warn user */ + DPRINT1("\n\x7\x7!!! Unexpected Interrupt %02lx !!!\n"); + + /* Now call the epilogue code */ + KiExitInterrupt(TrapFrame, OldIrql, FALSE); + } + else + { + /* Now call the epilogue code */ + KiExitInterrupt(TrapFrame, OldIrql, TRUE); + } +} + +typedef +FASTCALL +VOID +(PKI_INTERRUPT_DISPATCH)( + IN PKTRAP_FRAME TrapFrame, + IN PKINTERRUPT Interrupt +); + +VOID +FASTCALL +KiInterruptDispatch(IN PKTRAP_FRAME TrapFrame, + IN PKINTERRUPT Interrupt) +{ + KIRQL OldIrql; + + /* Increase interrupt count */ + KeGetCurrentPrcb()->InterruptCount++; + + /* Begin the interrupt, making sure it's not spurious */ + if (HalBeginSystemInterrupt(Interrupt->SynchronizeIrql, + Interrupt->Vector, + &OldIrql)) + { + /* Acquire interrupt lock */ + KxAcquireSpinLock(Interrupt->ActualLock); + + /* Call the ISR */ + Interrupt->ServiceRoutine(Interrupt, Interrupt->ServiceContext); + + /* Release interrupt lock */ + KxReleaseSpinLock(Interrupt->ActualLock); + + /* Now call the epilogue code */ + KiExitInterrupt(TrapFrame, OldIrql, FALSE); + } + else + { + /* Now call the epilogue code */ + KiExitInterrupt(TrapFrame, OldIrql, TRUE); + } +} + +VOID +FASTCALL +KiChainedDispatch(IN PKTRAP_FRAME TrapFrame, + IN PKINTERRUPT Interrupt) +{ + /* Increase interrupt count */ + KeGetCurrentPrcb()->InterruptCount++; + UNIMPLEMENTED; + while (TRUE); +} + +VOID +FASTCALL +KiInterruptHandler(IN PKTRAP_FRAME TrapFrame, + IN PKINTERRUPT Interrupt) +{ + /* Enter interrupt frame */ + KiEnterInterruptTrap(TrapFrame); + + /* Call the correct dispatcher */ + ((PKI_INTERRUPT_DISPATCH*)Interrupt->DispatchAddress)(TrapFrame, Interrupt); +} + +KiTrap(KiUnexpectedInterruptTail, KI_PUSH_FAKE_ERROR_CODE); /* PUBLIC FUNCTIONS **********************************************************/ @@ -199,12 +311,6 @@ *DispatchCode++ = KiInterruptTemplate[i]; } - /* Sanity check */ -#ifndef HAL_INTERRUPT_SUPPORT_IN_C - ASSERT((ULONG_PTR)&KiChainedDispatch2ndLvl - - (ULONG_PTR)KiInterruptTemplate <= (KINTERRUPT_DISPATCH_CODES * 4)); -#endif - /* Jump to the last 4 bytes */ Patch = (PULONG)((ULONG_PTR)Patch + ((ULONG_PTR)&KiInterruptTemplateObject - Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Fri Jan 29 00:18:53 2010 @@ -152,58 +152,8 @@ _KiEndUnexpectedRange@0: jmp _KiUnexpectedInterruptTail -.func KiUnexpectedInterruptTail -TRAP_FIXUPS kui_a, kui_t, DoFixupV86, DoFixupAbios -_KiUnexpectedInterruptTail: - - /* Enter interrupt trap */ - INT_PROLOG kui_a, kui_t, DoNotPushFakeErrorCode - - /* Increase interrupt count */ - inc dword ptr PCR[KPCR_PRCB_INTERRUPT_COUNT] - - /* Put vector in EBX and make space for KIRQL */ - mov ebx, [esp] - sub esp, 4 - - /* Begin interrupt */ - push esp - push ebx - push HIGH_LEVEL - call _HalBeginSystemInterrupt@12 - - /* Check if it was spurious or not */ - or al, al - jnz Handled - - /* Spurious, ignore it */ - add esp, 8 - jmp _Kei386EoiHelper@0 - -Handled: - /* Unexpected interrupt, print a message on debug builds */ -#if DBG - push [esp+4] - push offset _UnexpectedMsg - call _DbgPrint - add esp, 8 -#endif - - /* Exit the interrupt */ - mov esi, $ - cli - call _HalEndSystemInterrupt@8 - jmp _Kei386EoiHelper@0 -.endfunc - -.globl _KiUnexpectedInterrupt -_KiUnexpectedInterrupt: - - /* Bugcheck with invalid interrupt code */ - push TRAP_CAUSE_UNKNOWN - call _KeBugCheck@4 - -/* INTERRUPT HANDLERS ********************************************************/ + +/* DPC INTERRUPT HANDLER ******************************************************/ .func KiDispatchInterrupt@0 _KiDispatchInterrupt@0: @@ -321,10 +271,8 @@ .endfunc /* - * This is how the new-style interrupt template will look like. - * * We setup the stack for a trap frame in the KINTERRUPT DispatchCode itself and - * then mov the stack address in ECX, since the handlers are FASTCALL. We also + * then move the stack address in ECX, since the handlers are FASTCALL. We also * need to know the address of the KINTERRUPT. To do this, we maintain the old * dynamic patching technique (EDX instead of EDI, however) and let the C API * up in KeInitializeInterrupt replace the 0 with the address. Since this is in @@ -343,13 +291,9 @@ * use EDI to store the absolute offset, and jump to that instead. * */ -#ifdef HAL_INTERRUPT_SUPPORT_IN_C .func KiInterruptTemplate _KiInterruptTemplate: - push 0 - pushad - sub esp, KTRAP_FRAME_LENGTH - KTRAP_FRAME_PREVIOUS_MODE - mov ecx, esp + TRAP_HANDLER_PROLOG 1, 0 _KiInterruptTemplate2ndDispatch: /* Dummy code, will be replaced by the address of the KINTERRUPT */ @@ -363,221 +307,3 @@ _KiInterruptTemplateDispatch: /* Marks the end of the template so that the jump above can be edited */ .endfunc - -#else - -.func KiInterruptTemplate -_KiInterruptTemplate: - - /* Enter interrupt trap */ - INT_PROLOG kit_a, kit_t, DoPushFakeErrorCode - -_KiInterruptTemplate2ndDispatch: - /* Dummy code, will be replaced by the address of the KINTERRUPT */ - mov edi, 0 - -_KiInterruptTemplateObject: - /* Dummy jump, will be replaced by the actual jump */ - jmp _KeSynchronizeExecution@12 - -_KiInterruptTemplateDispatch: - /* Marks the end of the template so that the jump above can be edited */ - -TRAP_FIXUPS kit_a, kit_t, DoFixupV86, DoFixupAbios -.endfunc - -.func KiChainedDispatch2ndLvl@0 -_KiChainedDispatch2ndLvl@0: - -NextSharedInt: - /* Raise IRQL if necessary */ - mov cl, [edi+KINTERRUPT_SYNCHRONIZE_IRQL] - cmp cl, [edi+KINTERRUPT_IRQL] - je 1f - call @KfRaiseIrql@4 - -1: - /* Acquire the lock */ - mov esi, [edi+KINTERRUPT_ACTUAL_LOCK] -GetIntLock2: - ACQUIRE_SPINLOCK(esi, IntSpin2) - - /* Make sure that this interrupt isn't storming */ - VERIFY_INT kid2 - - /* Save the tick count */ - mov esi, _KeTickCount - - /* Call the ISR */ - mov eax, [edi+KINTERRUPT_SERVICE_CONTEXT] - push eax - push edi - call [edi+KINTERRUPT_SERVICE_ROUTINE] - - /* Save the ISR result */ - mov bl, al - - /* Check if the ISR timed out */ - add esi, _KiISRTimeout - cmp _KeTickCount, esi - jnc ChainedIsrTimeout - -ReleaseLock2: - /* Release the lock */ - mov esi, [edi+KINTERRUPT_ACTUAL_LOCK] - RELEASE_SPINLOCK(esi) - - /* Lower IRQL if necessary */ - mov cl, [edi+KINTERRUPT_IRQL] - cmp cl, [edi+KINTERRUPT_SYNCHRONIZE_IRQL] - je 1f - call @KfLowerIrql@4 - -1: - /* Check if the interrupt is handled */ - or bl, bl - jnz 1f - - /* Try the next shared interrupt handler */ - mov eax, [edi+KINTERRUPT_INTERRUPT_LIST_HEAD] - lea edi, [eax-KINTERRUPT_INTERRUPT_LIST_HEAD] - jmp NextSharedInt - -1: - ret - -#ifdef CONFIG_SMP -IntSpin2: - SPIN_ON_LOCK(esi, GetIntLock2) -#endif - -ChainedIsrTimeout: - /* Print warning message */ - push [edi+KINTERRUPT_SERVICE_ROUTINE] - push offset _IsrTimeoutMsg - call _DbgPrint - add esp,8 - - /* Break into debugger, then continue */ - int 3 - jmp ReleaseLock2 - - /* Cleanup verification */ - VERIFY_INT_END kid2, 0 -.endfunc - -.func KiChainedDispatch@0 -_KiChainedDispatch@0: - - /* Increase interrupt count */ - inc dword ptr PCR[KPCR_PRCB_INTERRUPT_COUNT] - - /* Save trap frame */ - mov ebp, esp - - /* Save vector and IRQL */ - mov eax, [edi+KINTERRUPT_VECTOR] - mov ecx, [edi+KINTERRUPT_IRQL] - - /* Save old irql */ - push eax - sub esp, 4 - - /* Begin interrupt */ - push esp - push eax - push ecx - call _HalBeginSystemInterrupt@12 - - /* Check if it was handled */ - or al, al - jz SpuriousInt - - /* Call the 2nd-level handler */ - call _KiChainedDispatch2ndLvl@0 - - /* Exit the interrupt */ - INT_EPILOG 0 -.endfunc - -.func KiInterruptDispatch@0 -_KiInterruptDispatch@0: - - /* Increase interrupt count */ - inc dword ptr PCR[KPCR_PRCB_INTERRUPT_COUNT] - - /* Save trap frame */ - mov ebp, esp - - /* Save vector and IRQL */ - mov eax, [edi+KINTERRUPT_VECTOR] - mov ecx, [edi+KINTERRUPT_SYNCHRONIZE_IRQL] - - /* Save old irql */ - push eax - sub esp, 4 - - /* Begin interrupt */ - push esp - push eax - push ecx - call _HalBeginSystemInterrupt@12 - - /* Check if it was handled */ - or al, al - jz SpuriousInt - - /* Acquire the lock */ - mov esi, [edi+KINTERRUPT_ACTUAL_LOCK] -GetIntLock: - ACQUIRE_SPINLOCK(esi, IntSpin) - - /* Make sure that this interrupt isn't storming */ - VERIFY_INT kid - - /* Save the tick count */ - mov ebx, _KeTickCount - - /* Call the ISR */ - mov eax, [edi+KINTERRUPT_SERVICE_CONTEXT] - push eax - push edi - call [edi+KINTERRUPT_SERVICE_ROUTINE] - - /* Check if the ISR timed out */ - add ebx, _KiISRTimeout - cmp _KeTickCount, ebx - jnc IsrTimeout - -ReleaseLock: - /* Release the lock */ - RELEASE_SPINLOCK(esi) - - /* Exit the interrupt */ - INT_EPILOG 0 - -SpuriousInt: - /* Exit the interrupt */ - add esp, 8 - INT_EPILOG 1 - -#ifdef CONFIG_SMP -IntSpin: - SPIN_ON_LOCK(esi, GetIntLock) -#endif - -IsrTimeout: - /* Print warning message */ - push [edi+KINTERRUPT_SERVICE_ROUTINE] - push offset _IsrTimeoutMsg - call _DbgPrint - add esp,8 - - /* Break into debugger, then continue */ - int 3 - jmp ReleaseLock - - /* Cleanup verification */ - VERIFY_INT_END kid, 0 -.endfunc -#endif Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Jan 29 00:18:53 2010 @@ -1601,104 +1601,4 @@ KiTrap(KiSystemService, KI_PUSH_FAKE_ERROR_CODE | KI_NONVOLATILES_ONLY); KiTrap(KiFastCallEntry, KI_FAST_SYSTEM_CALL); -/* HARDWARE INTERRUPTS ********************************************************/ - -/* - * This code can only be used once the HAL handles system interrupt code in C. - * - * This is because the HAL, when ending a system interrupt, might see pending - * DPC or APC interrupts, and attempt to piggyback on the interrupt context in - * order to deliver them. Once they have been devlivered, it will then "end" the - * interrupt context by doing a call to the ASM EOI Handler which naturally will - * throw up on our C-style KTRAP_FRAME. - * - * Once it works, expect a noticeable speed boost during hardware interrupts. - */ -#ifdef HAL_INTERRUPT_SUPPORT_IN_C - -typedef -FASTCALL -VOID -(PKI_INTERRUPT_DISPATCH)( - IN PKTRAP_FRAME TrapFrame, - IN PKINTERRUPT Interrupt -); - -VOID -FORCEINLINE -KiExitInterrupt(IN PKTRAP_FRAME TrapFrame, - IN KIRQL OldIrql, - IN BOOLEAN Spurious) -{ - if (Spurious) KiEoiHelper(TrapFrame); - - _disable(); - - DPRINT1("Calling HAL to restore IRQL to: %d\n", OldIrql); - HalEndSystemInterrupt(OldIrql, 0); - - DPRINT1("Exiting trap\n"); - KiEoiHelper(TrapFrame); -} - -VOID -FASTCALL -KiInterruptDispatch(IN PKTRAP_FRAME TrapFrame, - IN PKINTERRUPT Interrupt) -{ - KIRQL OldIrql; - - KeGetCurrentPrcb()->InterruptCount++; - - DPRINT1("Calling HAL with %lx %lx\n", Interrupt->SynchronizeIrql, Interrupt->Vector); - if (HalBeginSystemInterrupt(Interrupt->SynchronizeIrql, - Interrupt->Vector, - &OldIrql)) - { - /* Acquire interrupt lock */ - KxAcquireSpinLock(Interrupt->ActualLock); - - /* Call the ISR */ - DPRINT1("Calling ISR: %p with context: %p\n", Interrupt->ServiceRoutine, Interrupt->ServiceContext); - Interrupt->ServiceRoutine(Interrupt, Interrupt->ServiceContext); - - /* Release interrupt lock */ - KxReleaseSpinLock(Interrupt->ActualLock); - - /* Now call the epilogue code */ - DPRINT1("Exiting interrupt\n"); - KiExitInterrupt(TrapFrame, OldIrql, FALSE); - } - else - { - /* Now call the epilogue code */ - DPRINT1("Exiting Spurious interrupt\n"); - KiExitInterrupt(TrapFrame, OldIrql, TRUE); - } -} - -VOID -FASTCALL -KiChainedDispatch(IN PKTRAP_FRAME TrapFrame, - IN PKINTERRUPT Interrupt) -{ - KeGetCurrentPrcb()->InterruptCount++; - - UNIMPLEMENTED; - while (TRUE); -} - -VOID -FASTCALL -KiInterruptHandler(IN PKTRAP_FRAME TrapFrame, - IN PKINTERRUPT Interrupt) -{ - /* Enter interrupt frame */ - KiEnterInterruptTrap(TrapFrame); - - /* Call the correct dispatcher */ - ((PKI_INTERRUPT_DISPATCH*)Interrupt->DispatchAddress)(TrapFrame, Interrupt); -} -#endif - /* EOF */

14 years, 7 months

[sir_richard] 45303: [HAL]: Fix HalpFlushTlb. Thanks to Stefan Ginsberg <stefan100@reactos.org>

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Fri Jan 29 00:08:04 2010 New Revision: 45303 URL: http://svn.reactos.org/svn/reactos?rev=45303&view=rev Log: [HAL]: Fix HalpFlushTlb. Thanks to Stefan Ginsberg <stefan100(a)reactos.org> Modified: trunk/reactos/hal/halx86/generic/misc.c Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Fri Jan 29 00:08:04 2010 @@ -102,6 +102,7 @@ // Restore interrupts // __writeeflags(Flags); + return; } }

14 years, 7 months

[mkupfer] 45302: this log message left intentionally non-descriptive

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Thu Jan 28 23:18:31 2010 New Revision: 45302 URL: http://svn.reactos.org/svn/reactos?rev=45302&view=rev Log: this log message left intentionally non-descriptive Modified: trunk/reactos/dll/cpl/sysdm/general.c trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/resource.h Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/general.c [iso-8859-1] Thu Jan 28 23:18:31 2010 @@ -12,6 +12,9 @@ #include "precomp.h" +#define ANIM_STEP 2 +#define ANIM_TIME 50 + typedef struct _IMGINFO { HBITMAP hBitmap; @@ -19,6 +22,7 @@ INT cySource; } IMGINFO, *PIMGINFO; +PIMGINFO pImgInfo = NULL; void ShowLastWin32Error(HWND hWndOwner) @@ -70,6 +74,124 @@ } } +LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + static UINT timerid = 0, top = 0, offset; + static HBITMAP hBitmap2; + RECT r; + NONCLIENTMETRICS ncm; + HFONT hfont; + BITMAP bitmap; + HDC dc, sdc; + TCHAR devtext[2048]; + switch (uMsg) + { + case WM_LBUTTONDBLCLK: + if (wParam & (MK_CONTROL | MK_SHIFT)) + { + if (timerid == 0) + { + top = 0; // set top + + // build new bitmap + GetObject(pImgInfo->hBitmap, sizeof(BITMAP), &bitmap); + dc = CreateCompatibleDC(GetDC(NULL)); + sdc = CreateCompatibleDC(dc); + ncm.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); + + hfont = CreateFontIndirect(&ncm.lfMessageFont); + SelectObject(dc, hfont); + SetRect(&r, 0, 0, 0, 0); + LoadString(hApplet, IDS_DEVS, devtext, sizeof(devtext) / sizeof(TCHAR)); + DrawText(dc, devtext, -1, &r, DT_CALCRECT); + hBitmap2 = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + (r.bottom + 1 - r.top), bitmap.bmPlanes, bitmap.bmBitsPixel, NULL); + SelectObject(sdc, pImgInfo->hBitmap); + SelectObject(dc, hBitmap2); + offset = 0; + BitBlt(dc, 0, offset, bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY); + offset += bitmap.bmHeight; + + SetRect(&r, 0, offset, bitmap.bmWidth, offset + (r.bottom - r.top) + 1); + FillRect(dc, &r, GetSysColorBrush(COLOR_3DFACE)); + SetBkMode(dc, TRANSPARENT); + OffsetRect(&r, 1, 1); + SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); + DrawText(dc, devtext, -1, &r, DT_CENTER); + OffsetRect(&r, -1, -1); + SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); + DrawText(dc, devtext, -1, &r, DT_CENTER); + offset += r.bottom - r.top; + + BitBlt(dc, 0, offset, bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY); + offset += bitmap.bmHeight; + DeleteDC(sdc); + DeleteDC(dc); + + timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL); + } + } + break; + case WM_LBUTTONDOWN: + if (timerid) + { + KillTimer(hwnd, timerid); + top = 0; + timerid = 0; + DeleteObject(hBitmap2); + InvalidateRect(hwnd, NULL, FALSE); + } + break; + case WM_TIMER: + top += ANIM_STEP; + if (top > offset - pImgInfo->cySource) + { + KillTimer(hwnd, timerid); + top = 0; + timerid = 0; + DeleteObject(hBitmap2); + } + InvalidateRect(hwnd, NULL, FALSE); + break; + case WM_PAINT: + { + PAINTSTRUCT PS; + HDC hdcMem, hdc; + LONG left; + if (wParam != 0) + { + hdc = (HDC)wParam; + } else + { + hdc = BeginPaint(hwnd,&PS); + } + GetClientRect(hwnd,&PS.rcPaint); + + /* position image in center of dialog */ + left = (PS.rcPaint.right - pImgInfo->cxSource) / 2; + hdcMem = CreateCompatibleDC(hdc); + + if (hdcMem != NULL) + { + SelectObject(hdcMem, timerid ? hBitmap2 : pImgInfo->hBitmap); + BitBlt(hdc, + left, + PS.rcPaint.top, + PS.rcPaint.right - PS.rcPaint.left, + PS.rcPaint.top + pImgInfo->cySource, + hdcMem, + 0, + top, + SRCCOPY); + DeleteDC(hdcMem); + } + if (wParam == 0) + EndPaint(hwnd,&PS); + break; + } + } + return TRUE; +} static VOID SetRegTextData(HWND hwnd, @@ -372,12 +494,9 @@ WPARAM wParam, LPARAM lParam) { - PIMGINFO pImgInfo; UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); - - pImgInfo = (PIMGINFO)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { @@ -389,9 +508,8 @@ return FALSE; } - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pImgInfo); - InitImageInfo(pImgInfo); + SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_ROSIMG), GWL_WNDPROC, (LONG)RosImageProc); GetSystemInformation(hwndDlg); break; Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Thu Jan 28 23:18:31 2010 @@ -289,4 +289,5 @@ IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Geändert" -END + IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Verantwortliche\n\nColin Finck\nZ98\n\nWebseitenteam\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedienteam\n\nMindflyer\nWierd_W\n\nweiterer Dank geht an\n\nalle Mitwirkenden\nWine Team\n\n" +END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Thu Jan 28 23:18:31 2010 @@ -284,4 +284,5 @@ IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modified" -END + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" +END Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Thu Jan 28 23:18:31 2010 @@ -156,5 +156,6 @@ #define RC_LICENSE 1502 #define RTDATA 1503 +#define IDS_DEVS 2000 #endif /* __CPL_RESOURCE_H */

14 years, 7 months

[sir_richard] 45301: [PERF]: Optimize nested interrupt cases (where a pending interrupt exists at the end of a software or system interrupt) just like the old HAL did, by jumping into a second-level handler and completing the outer trap frame instead of the nested trap frame. This saves a lot of cycles in those cases, and they do happen quite often (pending DPC at the end of an interrupt, for example). [NTOS/HAL]: Rework respective code to handle this by using the VDM Alert field in the KPCR.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Jan 28 21:45:45 2010 New Revision: 45301 URL: http://svn.reactos.org/svn/reactos?rev=45301&view=rev Log: [PERF]: Optimize nested interrupt cases (where a pending interrupt exists at the end of a software or system interrupt) just like the old HAL did, by jumping into a second-level handler and completing the outer trap frame instead of the nested trap frame. This saves a lot of cycles in those cases, and they do happen quite often (pending DPC at the end of an interrupt, for example). [NTOS/HAL]: Rework respective code to handle this by using the VDM Alert field in the KPCR. Modified: trunk/reactos/hal/halx86/generic/pic.c trunk/reactos/hal/halx86/include/halp.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/time.c Modified: trunk/reactos/hal/halx86/generic/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pic.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] Thu Jan 28 21:45:45 2010 @@ -205,6 +205,15 @@ HalpDispatchInterrupt }; +/* Handlers for pending software interrupts when we already have a trap frame*/ +PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY SWInterruptHandlerTable2[3] = +{ + (PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)KiUnexpectedInterrupt, + HalpApcInterrupt2ndEntry, + HalpDispatchInterrupt2ndEntry +}; + + USHORT HalpEisaELCR; /* FUNCTIONS ******************************************************************/ @@ -552,9 +561,7 @@ /* Check for pending software interrupts and compare with current IRQL */ PendingIrql = SWInterruptLookUpTable[Pcr->IRR]; - - /* NOTE: We can do better! We need to support "jumping" a frame for nested cases! */ - if (PendingIrql > OldIrql) SWInterruptHandlerTable[PendingIrql](); + if (PendingIrql > OldIrql) HalpNestedTrap(PendingIrql); } /* INTERRUPT DISMISSAL FUNCTIONS **********************************************/ @@ -811,18 +818,56 @@ /* Check for pending software interrupts and compare with current IRQL */ PendingIrql = SWInterruptLookUpTable[Pcr->IRR]; - if (PendingIrql > OldIrql) SWInterruptHandlerTable[PendingIrql](); + if (PendingIrql > OldIrql) HalpNestedTrap(PendingIrql); } /* SOFTWARE INTERRUPT TRAPS ***************************************************/ VOID +FORCEINLINE +DECLSPEC_NORETURN +_HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame) +{ + KIRQL CurrentIrql; + PKPCR Pcr = KeGetPcr(); + + /* Save the current IRQL and update it */ + CurrentIrql = Pcr->Irql; + Pcr->Irql = APC_LEVEL; + + /* Remove DPC from IRR */ + Pcr->IRR &= ~(1 << APC_LEVEL); + + /* Enable interrupts and call the kernel's APC interrupt handler */ + _enable(); + KiDeliverApc(((KiUserTrap(TrapFrame)) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) ? + UserMode : KernelMode, + NULL, + TrapFrame); + + /* Disable interrupts and end the interrupt */ + _disable(); + Pcr->VdmAlert = (ULONG_PTR)TrapFrame; + HalpEndSoftwareInterrupt(CurrentIrql); + + /* Exit the interrupt */ + KiEoiHelper(TrapFrame); +} + +VOID FASTCALL +DECLSPEC_NORETURN +HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) +{ + /* Do the work */ + _HalpApcInterruptHandler(TrapFrame); +} + +VOID +FASTCALL +DECLSPEC_NORETURN HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame) { - KIRQL CurrentIrql; - PKPCR Pcr = KeGetPcr(); - /* Set up a fake INT Stack */ TrapFrame->EFlags = __readeflags(); TrapFrame->SegCs = KGDT_R0_CODE; @@ -831,35 +876,52 @@ /* Build the trap frame */ KiEnterInterruptTrap(TrapFrame); + /* Do the work */ + _HalpApcInterruptHandler(TrapFrame); +} + +VOID +FORCEINLINE +DECLSPEC_NORETURN +_HalpDispatchInterruptHandler(IN PKTRAP_FRAME TrapFrame) +{ + KIRQL CurrentIrql; + PKPCR Pcr = KeGetPcr(); + /* Save the current IRQL and update it */ CurrentIrql = Pcr->Irql; - Pcr->Irql = APC_LEVEL; + Pcr->Irql = DISPATCH_LEVEL; /* Remove DPC from IRR */ - Pcr->IRR &= ~(1 << APC_LEVEL); - - /* Enable interrupts and call the kernel's APC interrupt handler */ + Pcr->IRR &= ~(1 << DISPATCH_LEVEL); + + /* Enable interrupts and call the kernel's DPC interrupt handler */ _enable(); - KiDeliverApc(((KiUserTrap(TrapFrame)) || (TrapFrame->EFlags & EFLAGS_V86_MASK)) ? - UserMode : KernelMode, - NULL, - TrapFrame); - + KiDispatchInterrupt(); + /* Disable interrupts and end the interrupt */ _disable(); + Pcr->VdmAlert = (ULONG_PTR)TrapFrame; HalpEndSoftwareInterrupt(CurrentIrql); /* Exit the interrupt */ - KiEoiHelper(TrapFrame); + KiEoiHelper(TrapFrame); } VOID FASTCALL +DECLSPEC_NORETURN +HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) +{ + /* Do the work */ + _HalpDispatchInterruptHandler(TrapFrame); +} + +VOID +FASTCALL +DECLSPEC_NORETURN HalpDispatchInterruptHandler(IN PKTRAP_FRAME TrapFrame) -{ - KIRQL CurrentIrql; - PKPCR Pcr = KeGetPcr(); - +{ /* Set up a fake INT Stack */ TrapFrame->EFlags = __readeflags(); TrapFrame->SegCs = KGDT_R0_CODE; @@ -868,23 +930,8 @@ /* Build the trap frame */ KiEnterInterruptTrap(TrapFrame); - /* Save the current IRQL and update it */ - CurrentIrql = Pcr->Irql; - Pcr->Irql = DISPATCH_LEVEL; - - /* Remove DPC from IRR */ - Pcr->IRR &= ~(1 << DISPATCH_LEVEL); - - /* Enable interrupts and call the kernel's DPC interrupt handler */ - _enable(); - KiDispatchInterrupt(); - - /* Disable interrupts and end the interrupt */ - _disable(); - HalpEndSoftwareInterrupt(CurrentIrql); - - /* Exit the interrupt */ - KiEoiHelper(TrapFrame); + /* Do the work */ + _HalpDispatchInterruptHandler(TrapFrame); } KiTrap(HalpApcInterrupt, KI_SOFTWARE_TRAP); Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Thu Jan 28 21:45:45 2010 @@ -22,6 +22,19 @@ ULONG Prefix; } HAL_BIOS_FRAME, *PHAL_BIOS_FRAME; +typedef +VOID +(*PHAL_SW_INTERRUPT_HANDLER)( + VOID +); + +typedef +FASTCALL +VOID +(*PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY)( + IN PKTRAP_FRAME TrapFrame +); + #define HAL_APC_REQUEST 0 #define HAL_DPC_REQUEST 1 @@ -96,6 +109,28 @@ : [v] "i"(Alignment), [i] "i"(Size) ); +} + +// +// Nested Trap Trampoline +// +VOID +DECLSPEC_NORETURN +FORCEINLINE +HalpNestedTrap(IN KIRQL PendingIrql) +{ + /* Use the second interrupt handler table */ + extern PHAL_SW_INTERRUPT_HANDLER_2ND_ENTRY SWInterruptHandlerTable2[3]; + __asm__ __volatile__ + ( + "movl %c[t], %%ecx\n" + "jmp *%0\n" + : + : "im"(SWInterruptHandlerTable2[PendingIrql]), + [t] "i"(&PCR->VdmAlert) + : "%esp" + ); + UNREACHABLE; } // @@ -432,12 +467,6 @@ } PIC_MASK, *PPIC_MASK; typedef -VOID -(*PHAL_SW_INTERRUPT_HANDLER)( - VOID -); - -typedef BOOLEAN __attribute__((regparm(3))) (*PHAL_DISMISS_INTERRUPT)( @@ -531,6 +560,8 @@ VOID NTAPI HalpInitializePICs(IN BOOLEAN EnableInterrupts); VOID HalpApcInterrupt(VOID); VOID HalpDispatchInterrupt(VOID); +VOID FASTCALL HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); +VOID FASTCALL HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame); /* timer.c */ VOID NTAPI HalpInitializeClock(VOID); Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Thu Jan 28 21:45:45 2010 @@ -1452,6 +1452,8 @@ cli /* End the interrupt and do EOI */ + lea eax, [esp+8] + mov PCR[KPCR_VDM_ALERT], eax call _HalEndSystemInterrupt@8 jmp _Kei386EoiHelper@0 .endif Modified: trunk/reactos/ntoskrnl/ke/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/time.c?rev=453… ============================================================================== --- trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/time.c [iso-8859-1] Thu Jan 28 21:45:45 2010 @@ -112,6 +112,9 @@ Prcb->InterruptCount++; } + /* Save the nested trap frame address */ + KeGetPcr()->VdmAlert = (ULONG_PTR)TrapFrame; + /* Disable interrupts and end the interrupt */ _disable(); HalEndSystemInterrupt(Irql, CLOCK2_LEVEL);

14 years, 7 months

[sir_richard] 45300: [NTOS]: Fix L1/L2 cache detection and write out the size and associativity. Now that KeGetCurrentProcessorNumber doesn't think your L2 cache is the number of CPUs, this can be safely done.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Jan 28 21:43:25 2010 New Revision: 45300 URL: http://svn.reactos.org/svn/reactos?rev=45300&view=rev Log: [NTOS]: Fix L1/L2 cache detection and write out the size and associativity. Now that KeGetCurrentProcessorNumber doesn't think your L2 cache is the number of CPUs, this can be safely done. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Thu Jan 28 21:43:25 2010 @@ -40,6 +40,7 @@ ULONG KeDcacheFlushCount = 0; ULONG KeIcacheFlushCount = 0; ULONG KiDmaIoCoherency = 0; +ULONG KePrefetchNTAGranularity = 32; CHAR KeNumberProcessors; KAFFINITY KeActiveProcessors = 1; BOOLEAN KiI386PentiumLockErrataPresent; @@ -453,6 +454,7 @@ ULONG CacheRequests = 0, i; ULONG CurrentRegister; UCHAR RegisterByte; + ULONG Size, Associativity = 0, CacheLine = 64, CurrentSize = 0; BOOLEAN FirstPass = TRUE; /* Set default L2 size */ @@ -517,17 +519,144 @@ * (32MB), or from 0x80 to 0x89 (same size but * 8-way associative. */ - if (((RegisterByte > 0x40) && - (RegisterByte <= 0x49)) || - ((RegisterByte > 0x80) && - (RegisterByte <= 0x89))) + if (((RegisterByte > 0x40) && (RegisterByte <= 0x47)) || + ((RegisterByte > 0x78) && (RegisterByte <= 0x7C)) || + ((RegisterByte > 0x80) && (RegisterByte <= 0x85))) { + /* Compute associativity */ + Associativity = 4; + if (RegisterByte >= 0x79) Associativity = 8; + /* Mask out only the first nibble */ - RegisterByte &= 0x0F; - - /* Set the L2 Cache Size */ - Pcr->SecondLevelCacheSize = 0x10000 << - RegisterByte; + RegisterByte &= 0x07; + + /* Check if this cache is bigger than the last */ + Size = 0x10000 << RegisterByte; + if ((Size / Associativity) > CurrentSize) + { + /* Set the L2 Cache Size and Associativity */ + CurrentSize = Size / Associativity; + Pcr->SecondLevelCacheSize = Size; + Pcr->SecondLevelCacheAssociativity = Associativity; + } + } + else if ((RegisterByte > 0x21) && (RegisterByte <= 0x29)) + { + /* Set minimum cache line size */ + if (CacheLine < 128) CacheLine = 128; + + /* Hard-code size/associativity */ + Associativity = 8; + switch (RegisterByte) + { + case 0x22: + Size = 512 * 1024; + Associativity = 4; + break; + + case 0x23: + Size = 1024 * 1024; + break; + + case 0x25: + Size = 2048 * 1024; + break; + + case 0x29: + Size = 4096 * 1024; + break; + + default: + Size = 0; + break; + } + + /* Check if this cache is bigger than the last */ + if ((Size / Associativity) > CurrentSize) + { + /* Set the L2 Cache Size and Associativity */ + CurrentSize = Size / Associativity; + Pcr->SecondLevelCacheSize = Size; + Pcr->SecondLevelCacheAssociativity = Associativity; + } + } + else if (((RegisterByte > 0x65) && (RegisterByte < 0x69)) || + (RegisterByte == 0x2C) || (RegisterByte == 0xF0)) + { + /* Indicates L1 cache line of 64 bytes */ + KePrefetchNTAGranularity = 64; + } + else if (RegisterByte == 0xF1) + { + /* Indicates L1 cache line of 128 bytes */ + KePrefetchNTAGranularity = 128; + } + else if (((RegisterByte >= 0x4A) && (RegisterByte <= 0x4C)) || + (RegisterByte == 0x78) || + (RegisterByte == 0x7D) || + (RegisterByte == 0x7F) || + (RegisterByte == 0x86) || + (RegisterByte == 0x87)) + { + /* Set minimum cache line size */ + if (CacheLine < 64) CacheLine = 64; + + /* Hard-code size/associativity */ + switch (RegisterByte) + { + case 0x4A: + Size = 4 * 1024 * 1024; + Associativity = 8; + break; + + case 0x4B: + Size = 6 * 1024 * 1024; + Associativity = 12; + break; + + case 0x4C: + Size = 8 * 1024 * 1024; + Associativity = 16; + break; + + case 0x78: + Size = 1 * 1024 * 1024; + Associativity = 4; + break; + + case 0x7D: + Size = 2 * 1024 * 1024; + Associativity = 8; + break; + + case 0x7F: + Size = 512 * 1024; + Associativity = 2; + break; + + case 0x86: + Size = 512 * 1024; + Associativity = 4; + break; + + case 0x87: + Size = 1 * 1024 * 1024; + Associativity = 8; + break; + + default: + Size = 0; + break; + } + + /* Check if this cache is bigger than the last */ + if ((Size / Associativity) > CurrentSize) + { + /* Set the L2 Cache Size and Associativity */ + CurrentSize = Size / Associativity; + Pcr->SecondLevelCacheSize = Size; + Pcr->SecondLevelCacheAssociativity = Associativity; + } } } } @@ -537,15 +666,65 @@ case CPU_AMD: - /* Check if we support CPUID 0x80000006 */ - CPUID(0x80000000, &Data[0], &Dummy, &Dummy, &Dummy); - if (Data[0] >= 6) + /* Check if we support CPUID 0x80000005 */ + CPUID(0x80000000, &Data[0], &Data[1], &Data[2], &Data[3]); + if (Data[0] >= 0x80000006) { - /* Get 2nd level cache and tlb size */ - CPUID(0x80000006, &Dummy, &Dummy, &Data[2], &Dummy); - - /* Set the L2 Cache Size */ - Pcr->SecondLevelCacheSize = (Data[2] & 0xFFFF0000) >> 6; + /* Get L1 size first */ + CPUID(0x80000005, &Data[0], &Data[1], &Data[2], &Data[3]); + KePrefetchNTAGranularity = Data[2] & 0xFF; + + /* Check if we support CPUID 0x80000006 */ + CPUID(0x80000000, &Data[0], &Data[1], &Data[2], &Data[3]); + if (Data[0] >= 0x80000006) + { + /* Get 2nd level cache and tlb size */ + CPUID(0x80000006, &Data[0], &Data[1], &Data[2], &Data[3]); + + /* Cache line size */ + CacheLine = Data[2] & 0xFF; + + /* Hardcode associativity */ + RegisterByte = Data[2] >> 12; + switch (RegisterByte) + { + case 2: + Associativity = 2; + break; + + case 4: + Associativity = 4; + break; + + case 6: + Associativity = 8; + break; + + case 8: + case 15: + Associativity = 16; + break; + + default: + Associativity = 1; + break; + } + + /* Compute size */ + Size = (Data[2] >> 16) << 10; + + /* Hack for Model 6, Steping 300 */ + if ((KeGetCurrentPrcb()->CpuType == 6) && + (KeGetCurrentPrcb()->CpuStep == 0x300)) + { + /* Stick 64K in there */ + Size = 64 * 1024; + } + + /* Set the L2 Cache Size and associativity */ + Pcr->SecondLevelCacheSize = Size; + Pcr->SecondLevelCacheAssociativity = Associativity; + } } break; @@ -557,6 +736,14 @@ /* FIXME */ break; } + + /* Set the cache line */ + if (CacheLine > KeLargestCacheLine) KeLargestCacheLine = CacheLine; + DPRINT1("Prefetch Cache: %d bytes\tL2 Cache: %d bytes\tL2 Cache Line: %d bytes\tL2 Cache Associativity: %d\n", + KePrefetchNTAGranularity, + Pcr->SecondLevelCacheSize, + KeLargestCacheLine, + Pcr->SecondLevelCacheAssociativity); } VOID

14 years, 7 months

[sir_richard] 45299: [NDK]: Fix KPCR definition. [DDK]: KeGetCurrentProcessorNumber should not return a 32-bit DWORD combined of "ProcessorNumer", "VdmAlert" and "SecondLevelCacheAssociativity" because those 3 fields are probably not equal to a processor number. Having an L2 Cache will no longer result in ReactOS believing you have a 32000 core CPU.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Jan 28 17:05:54 2010 New Revision: 45299 URL: http://svn.reactos.org/svn/reactos?rev=45299&view=rev Log: [NDK]: Fix KPCR definition. [DDK]: KeGetCurrentProcessorNumber should not return a 32-bit DWORD combined of "ProcessorNumer", "VdmAlert" and "SecondLevelCacheAssociativity" because those 3 fields are probably not equal to a processor number. Having an L2 Cache will no longer result in ReactOS believing you have a 32000 core CPU. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Jan 28 17:05:54 2010 @@ -5149,23 +5149,7 @@ ULONG KeGetCurrentProcessorNumber(VOID) { -#if defined(__GNUC__) - ULONG ret; - __asm__ __volatile__ ( - "movl %%fs:%c1, %0\n" - : "=r" (ret) - : "i" (FIELD_OFFSET(KPCR, Number)) - ); - return ret; -#elif defined(_MSC_VER) -#if _MSC_FULL_VER >= 13012035 - return (ULONG)__readfsbyte(FIELD_OFFSET(KPCR, Number)); -#else - __asm { movzx eax, fs:[0] KPCR.Number } -#endif -#else -#error Unknown compiler -#endif + return (ULONG)__readfsbyte(FIELD_OFFSET(KPCR, Number)); } NTHALAPI Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Thu Jan 28 17:05:54 2010 @@ -705,8 +705,8 @@ ULONG StallScaleFactor; UCHAR SpareUnused; UCHAR Number; - UCHAR Reserved; - UCHAR L2CacheAssociativity; + UCHAR Spare0; + UCHAR SecondLevelCacheAssociativity; ULONG VdmAlert; ULONG KernelReserved[14]; ULONG SecondLevelCacheSize; Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Thu Jan 28 17:05:54 2010 @@ -1788,7 +1788,7 @@ Pcr->NtTib.Self, Pcr->Self, Pcr->Prcb, Pcr->Irql, Pcr->IRR, Pcr->IrrActive, Pcr->IDR, Pcr->KdVersionBlock, Pcr->IDT, Pcr->GDT, Pcr->TSS, Pcr->MajorVersion, Pcr->MinorVersion, Pcr->SetMember, Pcr->StallScaleFactor, - Pcr->Number, Pcr->L2CacheAssociativity, + Pcr->Number, Pcr->SecondLevelCacheAssociativity, Pcr->VdmAlert, Pcr->SecondLevelCacheSize, Pcr->InterruptMode); return TRUE;

14 years, 7 months

[sir_richard] 45298: [NTOS]: Remove checks for VDM alert during GPF. This is a Windows-specific hack for VDM, which isn't implemented.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Jan 28 17:01:43 2010 New Revision: 45298 URL: http://svn.reactos.org/svn/reactos?rev=45298&view=rev Log: [NTOS]: Remove checks for VDM alert during GPF. This is a Windows-specific hack for VDM, which isn't implemented. Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Thu Jan 28 17:01:43 2010 @@ -967,14 +967,6 @@ TrapFrame); } - /* Check for custom VDM trap handler */ - if (KeGetPcr()->VdmAlert) - { - /* Not implemented */ - UNIMPLEMENTED; - while (TRUE); - } - /* * Check for a fault during checking of the user instruction. * @@ -1086,14 +1078,6 @@ /* Save trap frame */ KiEnterTrap(TrapFrame); - /* Check for custom VDM trap handler */ - if (KeGetPcr()->VdmAlert) - { - /* Not implemented */ - UNIMPLEMENTED; - while (TRUE); - } - /* Check if this is the base frame */ Thread = KeGetCurrentThread(); if (KeGetTrapFrame(Thread) != TrapFrame)

14 years, 7 months

[sir_richard] 45297: [PERF]: Not in any way a scientific number you should bet the farm on, but we do now count the number of cycles at the very first instruction of kernel initialization, at the moment SMSS initializes the registry (when we call kernel initialization complete), and at the moment there have been 12 processes created (10 without counting idle/system), which is a bit less than a normal GUI boot. We also display the number if interrupts, system calls, and context switches it took t

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Thu Jan 28 16:51:18 2010 New Revision: 45297 URL: http://svn.reactos.org/svn/reactos?rev=45297&view=rev Log: [PERF]: Not in any way a scientific number you should bet the farm on, but we do now count the number of cycles at the very first instruction of kernel initialization, at the moment SMSS initializes the registry (when we call kernel initialization complete), and at the moment there have been 12 processes created (10 without counting idle/system), which is a bit less than a normal GUI boot. We also display the number if interrupts, system calls, and context switches it took to get us there. A purely comparative number, perhaps worthy for inclusion in testman/regression tests? Modified: trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -890,6 +890,14 @@ /* Always do this as kernel mode */ if (KeGetPreviousMode() == UserMode) return ZwInitializeRegistry(Flag); + /* Enough of the system has booted by now */ + BootCyclesEnd = __rdtsc(); + DPRINT1("Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); + DPRINT1("Interrupts: %d System Calls: %d Context Switches: %d\n", + KeGetCurrentPrcb()->InterruptCount, + KeGetCurrentPrcb()->KeSystemCalls, + KeGetContextSwitches(KeGetCurrentPrcb())); + /* Validate flag */ if (Flag > CM_BOOT_FLAG_MAX) return STATUS_INVALID_PARAMETER; Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -139,6 +139,8 @@ extern ULONG KiFreezeFlag; extern ULONG KiDPCTimeout; extern PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch; +extern ULONGLONG BootCycles, BootCyclesEnd; +extern ULONG ProcessCount; /* MACROS *************************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -24,6 +24,10 @@ /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; KSPIN_LOCK Ki486CompatibilityLock; + +/* Perf */ +ULONG ProcessCount; +ULONGLONG BootCycles, BootCyclesEnd; /* FUNCTIONS *****************************************************************/ @@ -683,6 +687,9 @@ PKTSS Tss; PKIPCR Pcr; + /* Boot cycles timestamp */ + BootCycles = __rdtsc(); + /* Check if we are being booted from FreeLDR */ if (!((ULONG_PTR)LoaderBlock & 0x80000000)) KiRosPrepareForSystemStartup((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -843,6 +843,18 @@ /* Run the Notification Routines */ PspRunCreateProcessNotifyRoutines(Process, TRUE); + + /* If 12 processes have been created, enough of user-mode is ready */ + if (++ProcessCount == 12) + { + /* Enough of the system has booted by now */ + BootCyclesEnd = __rdtsc(); + DPRINT1("User Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); + DPRINT1("Interrupts: %d System Calls: %d Context Switches: %d\n", + KeGetCurrentPrcb()->InterruptCount, + KeGetCurrentPrcb()->KeSystemCalls, + KeGetContextSwitches(KeGetCurrentPrcb())); + } CleanupWithRef: /*

14 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010