Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rharabien] 54140: [WIN32K] - Move mouse specific input processing from input.c to mouse.c
by rharabien＠svn.reactos.org 14 Oct '11

14 Oct '11

Author: rharabien Date: Fri Oct 14 18:41:06 2011 New Revision: 54140 URL: http://svn.reactos.org/svn/reactos?rev=54140&view=rev Log: [WIN32K] - Move mouse specific input processing from input.c to mouse.c Added: trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c (with props) Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt trunk/reactos/subsystems/win32/win32k/include/input.h trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/CM… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Fri Oct 14 18:41:06 2011 @@ -106,6 +106,7 @@ ntuser/metric.c ntuser/misc.c ntuser/monitor.c + ntuser/mouse.c ntuser/msgqueue.c ntuser/ntstubs.c ntuser/ntuser.c Modified: trunk/reactos/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/input.h [iso-8859-1] Fri Oct 14 18:41:06 2011 @@ -42,6 +42,7 @@ PKBL W32kGetDefaultKeyLayout(VOID); VOID NTAPI UserProcessKeyboardInput(PKEYBOARD_INPUT_DATA pKeyInput); BOOL NTAPI UserSendKeyboardInput(KEYBDINPUT *pKbdInput, BOOL bInjected); +VOID NTAPI UserProcessMouseInput(PMOUSE_INPUT_DATA Data, ULONG InputCount); BOOL FASTCALL IntBlockInput(PTHREADINFO W32Thread, BOOL BlockIt); BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi, BOOL Injected); BOOL UserInitDefaultKeyboardLayout(VOID); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri Oct 14 18:41:06 2011 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * PURPOSE: Window classes + * PURPOSE: General input functions * FILE: subsystems/win32/win32k/ntuser/input.c * PROGRAMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Rafal Harabien (rafalh(a)reactos.org) @@ -29,19 +29,6 @@ /* FUNCTIONS *****************************************************************/ -#define ClearMouseInput(mi) \ - mi.dx = 0; \ - mi.dy = 0; \ - mi.mouseData = 0; \ - mi.dwFlags = 0; - -#define SendMouseEvent(mi) \ - if(mi.dx != 0 || mi.dy != 0) \ - mi.dwFlags |= MOUSEEVENTF_MOVE; \ - if(mi.dwFlags) \ - IntMouseInput(&mi,FALSE); \ - ClearMouseInput(mi); - static DWORD FASTCALL IntLastInputTick(BOOL bUpdate) { @@ -89,97 +76,6 @@ } } } -} - -static VOID NTAPI -IntProcessMouseInputData(PMOUSE_INPUT_DATA Data, ULONG InputCount) -{ - PMOUSE_INPUT_DATA mid; - MOUSEINPUT mi; - ULONG i; - - ClearMouseInput(mi); - mi.time = 0; - mi.dwExtraInfo = 0; - for(i = 0; i < InputCount; i++) - { - mid = (Data + i); - mi.dx += mid->LastX; - mi.dy += mid->LastY; - - /* Check if the mouse move is absolute */ - if (mid->Flags == MOUSE_MOVE_ABSOLUTE) - { - /* Set flag to convert to screen location */ - mi.dwFlags |= MOUSEEVENTF_ABSOLUTE; - } - - if(mid->ButtonFlags) - { - if(mid->ButtonFlags & MOUSE_LEFT_BUTTON_DOWN) - { - mi.dwFlags |= MOUSEEVENTF_LEFTDOWN; - SendMouseEvent(mi); - } - if(mid->ButtonFlags & MOUSE_LEFT_BUTTON_UP) - { - mi.dwFlags |= MOUSEEVENTF_LEFTUP; - SendMouseEvent(mi); - } - if(mid->ButtonFlags & MOUSE_MIDDLE_BUTTON_DOWN) - { - mi.dwFlags |= MOUSEEVENTF_MIDDLEDOWN; - SendMouseEvent(mi); - } - if(mid->ButtonFlags & MOUSE_MIDDLE_BUTTON_UP) - { - mi.dwFlags |= MOUSEEVENTF_MIDDLEUP; - SendMouseEvent(mi); - } - if(mid->ButtonFlags & MOUSE_RIGHT_BUTTON_DOWN) - { - mi.dwFlags |= MOUSEEVENTF_RIGHTDOWN; - SendMouseEvent(mi); - } - if(mid->ButtonFlags & MOUSE_RIGHT_BUTTON_UP) - { - mi.dwFlags |= MOUSEEVENTF_RIGHTUP; - SendMouseEvent(mi); - } - if(mid->ButtonFlags & MOUSE_BUTTON_4_DOWN) - { - mi.mouseData |= XBUTTON1; - mi.dwFlags |= MOUSEEVENTF_XDOWN; - SendMouseEvent(mi); - } - if(mid->ButtonFlags & MOUSE_BUTTON_4_UP) - { - mi.mouseData |= XBUTTON1; - mi.dwFlags |= MOUSEEVENTF_XUP; - SendMouseEvent(mi); - } - if(mid->ButtonFlags & MOUSE_BUTTON_5_DOWN) - { - mi.mouseData |= XBUTTON2; - mi.dwFlags |= MOUSEEVENTF_XDOWN; - SendMouseEvent(mi); - } - if(mid->ButtonFlags & MOUSE_BUTTON_5_UP) - { - mi.mouseData |= XBUTTON2; - mi.dwFlags |= MOUSEEVENTF_XUP; - SendMouseEvent(mi); - } - if(mid->ButtonFlags & MOUSE_WHEEL) - { - mi.mouseData = mid->ButtonData; - mi.dwFlags |= MOUSEEVENTF_WHEEL; - SendMouseEvent(mi); - } - } - } - - SendMouseEvent(mi); } static VOID APIENTRY @@ -282,7 +178,7 @@ UserEnterExclusive(); - IntProcessMouseInputData(&MouseInput, Iosb.Information / sizeof(MOUSE_INPUT_DATA)); + UserProcessMouseInput(&MouseInput, Iosb.Information / sizeof(MOUSE_INPUT_DATA)); UserLeave(); } @@ -571,175 +467,6 @@ } BOOL FASTCALL -IntMouseInput(MOUSEINPUT *mi, BOOL Injected) -{ - const UINT SwapBtnMsg[2][2] = - { - {WM_LBUTTONDOWN, WM_RBUTTONDOWN}, - {WM_LBUTTONUP, WM_RBUTTONUP} - }; - const WPARAM SwapBtn[2] = - { - MK_LBUTTON, MK_RBUTTON - }; - POINT MousePos; - PSYSTEM_CURSORINFO CurInfo; - BOOL SwapButtons; - MSG Msg; - - ASSERT(mi); - - CurInfo = IntGetSysCursorInfo(); - - if(!mi->time) - { - LARGE_INTEGER LargeTickCount; - KeQueryTickCount(&LargeTickCount); - mi->time = MsqCalculateMessageTime(&LargeTickCount); - } - - SwapButtons = gspv.bMouseBtnSwap; - - MousePos = gpsi->ptCursor; - - if(mi->dwFlags & MOUSEEVENTF_MOVE) - { - if(mi->dwFlags & MOUSEEVENTF_ABSOLUTE) - { - MousePos.x = mi->dx * UserGetSystemMetrics(SM_CXVIRTUALSCREEN) >> 16; - MousePos.y = mi->dy * UserGetSystemMetrics(SM_CYVIRTUALSCREEN) >> 16; - } - else - { - MousePos.x += mi->dx; - MousePos.y += mi->dy; - } - } - - /* - * Insert the messages into the system queue - */ - Msg.wParam = 0; - Msg.lParam = MAKELPARAM(MousePos.x, MousePos.y); - Msg.pt = MousePos; - - if (IS_KEY_DOWN(gafAsyncKeyState, VK_SHIFT)) - { - Msg.wParam |= MK_SHIFT; - } - - if (IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL)) - { - Msg.wParam |= MK_CONTROL; - } - - if(mi->dwFlags & MOUSEEVENTF_MOVE) - { - UserSetCursorPos(MousePos.x, MousePos.y, Injected, mi->dwExtraInfo, TRUE); - } - if(mi->dwFlags & MOUSEEVENTF_LEFTDOWN) - { - SET_KEY_DOWN(gafAsyncKeyState, VK_LBUTTON, TRUE); - Msg.message = SwapBtnMsg[0][SwapButtons]; - CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; - Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) - { - SET_KEY_DOWN(gafAsyncKeyState, VK_LBUTTON, FALSE); - Msg.message = SwapBtnMsg[1][SwapButtons]; - CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; - Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) - { - SET_KEY_DOWN(gafAsyncKeyState, VK_MBUTTON, TRUE); - Msg.message = WM_MBUTTONDOWN; - CurInfo->ButtonsDown |= MK_MBUTTON; - Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) - { - SET_KEY_DOWN(gafAsyncKeyState, VK_MBUTTON, FALSE); - Msg.message = WM_MBUTTONUP; - CurInfo->ButtonsDown &= ~MK_MBUTTON; - Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) - { - SET_KEY_DOWN(gafAsyncKeyState, VK_RBUTTON, TRUE); - Msg.message = SwapBtnMsg[0][!SwapButtons]; - CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; - Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) - { - SET_KEY_DOWN(gafAsyncKeyState, VK_RBUTTON, FALSE); - Msg.message = SwapBtnMsg[1][!SwapButtons]; - CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; - Msg.wParam |= CurInfo->ButtonsDown; - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - - if((mi->dwFlags & (MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)) && - (mi->dwFlags & MOUSEEVENTF_WHEEL)) - { - /* fail because both types of events use the mouseData field */ - return FALSE; - } - - if(mi->dwFlags & MOUSEEVENTF_XDOWN) - { - Msg.message = WM_XBUTTONDOWN; - if(mi->mouseData & XBUTTON1) - { - SET_KEY_DOWN(gafAsyncKeyState, VK_XBUTTON1, TRUE); - CurInfo->ButtonsDown |= MK_XBUTTON1; - Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - if(mi->mouseData & XBUTTON2) - { - SET_KEY_DOWN(gafAsyncKeyState, VK_XBUTTON2, TRUE); - CurInfo->ButtonsDown |= MK_XBUTTON2; - Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - } - else if(mi->dwFlags & MOUSEEVENTF_XUP) - { - Msg.message = WM_XBUTTONUP; - if(mi->mouseData & XBUTTON1) - { - SET_KEY_DOWN(gafAsyncKeyState, VK_XBUTTON1, FALSE); - CurInfo->ButtonsDown &= ~MK_XBUTTON1; - Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - if(mi->mouseData & XBUTTON2) - { - SET_KEY_DOWN(gafAsyncKeyState, VK_XBUTTON2, FALSE); - CurInfo->ButtonsDown &= ~MK_XBUTTON2; - Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - } - if(mi->dwFlags & MOUSEEVENTF_WHEEL) - { - Msg.message = WM_MOUSEWHEEL; - Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, mi->mouseData); - co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); - } - - return TRUE; -} - -BOOL FASTCALL UserAttachThreadInput(PTHREADINFO pti, PTHREADINFO ptiTo, BOOL fAttach) { PATTACHINFO pai; @@ -823,7 +550,7 @@ * e.g. services running in the service window station cannot block input */ if (!ThreadHasInputAccess(pti) || - !IntIsActiveDesktop(pti->rpdesk)) + !IntIsActiveDesktop(pti->rpdesk)) { EngSetLastError(ERROR_ACCESS_DENIED); RETURN( 0); @@ -853,6 +580,7 @@ cnt++; break; case INPUT_HARDWARE: + FIXME("INPUT_HARDWARE not supported!"); break; default: ERR("SendInput(): Invalid input type: 0x%x\n", SafeInput.type); @@ -868,268 +596,4 @@ END_CLEANUP; } -BOOL -FASTCALL -IntQueryTrackMouseEvent( - LPTRACKMOUSEEVENT lpEventTrack) -{ - PDESKTOP pDesk; - PTHREADINFO pti; - - pti = PsGetCurrentThreadWin32Thread(); - pDesk = pti->rpdesk; - - /* Always cleared with size set and return true. */ - RtlZeroMemory(lpEventTrack , sizeof(TRACKMOUSEEVENT)); - lpEventTrack->cbSize = sizeof(TRACKMOUSEEVENT); - - if ( pDesk->dwDTFlags & (DF_TME_LEAVE | DF_TME_HOVER) && - pDesk->spwndTrack && - pti->MessageQueue == pDesk->spwndTrack->head.pti->MessageQueue ) - { - if ( pDesk->htEx != HTCLIENT ) - lpEventTrack->dwFlags |= TME_NONCLIENT; - - if ( pDesk->dwDTFlags & DF_TME_LEAVE ) - lpEventTrack->dwFlags |= TME_LEAVE; - - if ( pDesk->dwDTFlags & DF_TME_HOVER ) - { - lpEventTrack->dwFlags |= TME_HOVER; - lpEventTrack->dwHoverTime = pDesk->dwMouseHoverTime; - } - lpEventTrack->hwndTrack = UserHMGetHandle(pDesk->spwndTrack); - } - return TRUE; -} - -BOOL -FASTCALL -IntTrackMouseEvent( - LPTRACKMOUSEEVENT lpEventTrack) -{ - PDESKTOP pDesk; - PTHREADINFO pti; - PWND pWnd; - POINT point; - - pti = PsGetCurrentThreadWin32Thread(); - pDesk = pti->rpdesk; - - if (!(pWnd = UserGetWindowObject(lpEventTrack->hwndTrack))) - return FALSE; - - /* Tracking spwndTrack same as pWnd */ - if ( lpEventTrack->dwFlags & TME_CANCEL ) // Canceled mode. - { - if ( lpEventTrack->dwFlags & TME_LEAVE ) - pDesk->dwDTFlags &= ~DF_TME_LEAVE; - - if ( lpEventTrack->dwFlags & TME_HOVER ) - { - if ( pDesk->dwDTFlags & DF_TME_HOVER ) - { // Kill hover timer. - IntKillTimer(pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); - pDesk->dwDTFlags &= ~DF_TME_HOVER; - } - } - } - else // Not Canceled. - { - pDesk->spwndTrack = pWnd; - if ( lpEventTrack->dwFlags & TME_LEAVE ) - pDesk->dwDTFlags |= DF_TME_LEAVE; - - if ( lpEventTrack->dwFlags & TME_HOVER ) - { - pDesk->dwDTFlags |= DF_TME_HOVER; - - if ( !lpEventTrack->dwHoverTime || lpEventTrack->dwHoverTime == HOVER_DEFAULT ) - pDesk->dwMouseHoverTime = gspv.iMouseHoverTime; // use the system default hover time-out. - else - pDesk->dwMouseHoverTime = lpEventTrack->dwHoverTime; - // Start timer for the hover period. - IntSetTimer( pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, pDesk->dwMouseHoverTime, SystemTimerProc, TMRF_SYSTEM); - // Get windows thread message points. - point = pWnd->head.pti->ptLast; - // Set desktop mouse hover from the system default hover rectangle. - RECTL_vSetRect(&pDesk->rcMouseHover, - point.x - gspv.iMouseHoverWidth / 2, - point.y - gspv.iMouseHoverHeight / 2, - point.x + gspv.iMouseHoverWidth / 2, - point.y + gspv.iMouseHoverHeight / 2); - } - } - return TRUE; -} - -BOOL -APIENTRY -NtUserTrackMouseEvent( - LPTRACKMOUSEEVENT lpEventTrack) -{ - TRACKMOUSEEVENT saveTME; - BOOL Ret = FALSE; - - TRACE("Enter NtUserTrackMouseEvent\n"); - UserEnterExclusive(); - - _SEH2_TRY - { - ProbeForRead(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1); - RtlCopyMemory(&saveTME, lpEventTrack, sizeof(TRACKMOUSEEVENT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(goto Exit;) - } - _SEH2_END; - - if ( saveTME.cbSize != sizeof(TRACKMOUSEEVENT) ) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - goto Exit; - } - - if (saveTME.dwFlags & ~(TME_CANCEL | TME_QUERY | TME_NONCLIENT | TME_LEAVE | TME_HOVER) ) - { - EngSetLastError(ERROR_INVALID_FLAGS); - goto Exit; - } - - if ( saveTME.dwFlags & TME_QUERY ) - { - Ret = IntQueryTrackMouseEvent(&saveTME); - _SEH2_TRY - { - ProbeForWrite(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1); - RtlCopyMemory(lpEventTrack, &saveTME, sizeof(TRACKMOUSEEVENT)); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - Ret = FALSE; - } - _SEH2_END; - } - else - { - Ret = IntTrackMouseEvent(&saveTME); - } - -Exit: - TRACE("Leave NtUserTrackMouseEvent, ret=%i\n", Ret); - UserLeave(); - return Ret; -} - -extern MOUSEMOVEPOINT MouseHistoryOfMoves[]; -extern INT gcur_count; - -DWORD -APIENTRY -NtUserGetMouseMovePointsEx( - UINT cbSize, - LPMOUSEMOVEPOINT lpptIn, - LPMOUSEMOVEPOINT lpptOut, - int nBufPoints, - DWORD resolution) -{ - MOUSEMOVEPOINT Safeppt; - //BOOL Hit; - INT Count = -1; - DECLARE_RETURN(DWORD); - - TRACE("Enter NtUserGetMouseMovePointsEx\n"); - UserEnterExclusive(); - - if ((cbSize != sizeof(MOUSEMOVEPOINT)) || (nBufPoints < 0) || (nBufPoints > 64)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - RETURN( -1); - } - - if (!lpptIn || (!lpptOut && nBufPoints)) - { - EngSetLastError(ERROR_NOACCESS); - RETURN( -1); - } - - _SEH2_TRY - { - ProbeForRead( lpptIn, cbSize, 1); - RtlCopyMemory(&Safeppt, lpptIn, cbSize); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN( -1)) - } - _SEH2_END; - - // http://msdn.microsoft.com/en-us/library/ms646259(v=vs.85).aspx - // This explains the math issues in transforming points. - Count = gcur_count; // FIFO is forward so retrieve backward. - //Hit = FALSE; - do - { - if (Safeppt.x == 0 && Safeppt.y == 0) - break; // No test. - // Finds the point, it returns the last nBufPoints prior to and including the supplied point. - if (MouseHistoryOfMoves[Count].x == Safeppt.x && MouseHistoryOfMoves[Count].y == Safeppt.y) - { - if ( Safeppt.time ) // Now test time and it seems to be absolute. - { - if (Safeppt.time == MouseHistoryOfMoves[Count].time) - { - //Hit = TRUE; - break; - } - else - { - if (--Count < 0) Count = 63; - continue; - } - } - //Hit = TRUE; - break; - } - if (--Count < 0) Count = 63; - } - while ( Count != gcur_count); - - switch(resolution) - { - case GMMP_USE_DISPLAY_POINTS: - if (nBufPoints) - { - _SEH2_TRY - { - ProbeForWrite(lpptOut, cbSize, 1); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - SetLastNtError(_SEH2_GetExceptionCode()); - _SEH2_YIELD(RETURN( -1)) - } - _SEH2_END; - } - Count = nBufPoints; - break; - case GMMP_USE_HIGH_RESOLUTION_POINTS: - break; - default: - EngSetLastError(ERROR_POINT_NOT_FOUND); - RETURN( -1); - } - - RETURN( Count); - -CLEANUP: - TRACE("Leave NtUserGetMouseMovePointsEx, ret=%i\n", _ret_); - UserLeave(); - END_CLEANUP; -} - /* EOF */ Added: trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c (added) +++ trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c [iso-8859-1] Fri Oct 14 18:41:06 2011 @@ -1,0 +1,548 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Mouse functions + * FILE: subsystems/win32/win32k/ntuser/input.c + * PROGRAMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Rafal Harabien (rafalh(a)reactos.org) + */ + +#include <win32k.h> +DBG_DEFAULT_CHANNEL(UserInput); + +#define ClearMouseInput(mi) \ + mi.dx = 0; \ + mi.dy = 0; \ + mi.mouseData = 0; \ + mi.dwFlags = 0; + +#define SendMouseEvent(mi) \ + if(mi.dx != 0 || mi.dy != 0) \ + mi.dwFlags |= MOUSEEVENTF_MOVE; \ + if(mi.dwFlags) \ + IntMouseInput(&mi,FALSE); \ + ClearMouseInput(mi); + +VOID NTAPI +UserProcessMouseInput(PMOUSE_INPUT_DATA Data, ULONG InputCount) +{ + PMOUSE_INPUT_DATA mid; + MOUSEINPUT mi; + ULONG i; + + ClearMouseInput(mi); + mi.time = 0; + mi.dwExtraInfo = 0; + for(i = 0; i < InputCount; i++) + { + mid = (Data + i); + mi.dx += mid->LastX; + mi.dy += mid->LastY; + + /* Check if the mouse move is absolute */ + if (mid->Flags == MOUSE_MOVE_ABSOLUTE) + { + /* Set flag to convert to screen location */ + mi.dwFlags |= MOUSEEVENTF_ABSOLUTE; + } + + if(mid->ButtonFlags) + { + if(mid->ButtonFlags & MOUSE_LEFT_BUTTON_DOWN) + { + mi.dwFlags |= MOUSEEVENTF_LEFTDOWN; + SendMouseEvent(mi); + } + if(mid->ButtonFlags & MOUSE_LEFT_BUTTON_UP) + { + mi.dwFlags |= MOUSEEVENTF_LEFTUP; + SendMouseEvent(mi); + } + if(mid->ButtonFlags & MOUSE_MIDDLE_BUTTON_DOWN) + { + mi.dwFlags |= MOUSEEVENTF_MIDDLEDOWN; + SendMouseEvent(mi); + } + if(mid->ButtonFlags & MOUSE_MIDDLE_BUTTON_UP) + { + mi.dwFlags |= MOUSEEVENTF_MIDDLEUP; + SendMouseEvent(mi); + } + if(mid->ButtonFlags & MOUSE_RIGHT_BUTTON_DOWN) + { + mi.dwFlags |= MOUSEEVENTF_RIGHTDOWN; + SendMouseEvent(mi); + } + if(mid->ButtonFlags & MOUSE_RIGHT_BUTTON_UP) + { + mi.dwFlags |= MOUSEEVENTF_RIGHTUP; + SendMouseEvent(mi); + } + if(mid->ButtonFlags & MOUSE_BUTTON_4_DOWN) + { + mi.mouseData |= XBUTTON1; + mi.dwFlags |= MOUSEEVENTF_XDOWN; + SendMouseEvent(mi); + } + if(mid->ButtonFlags & MOUSE_BUTTON_4_UP) + { + mi.mouseData |= XBUTTON1; + mi.dwFlags |= MOUSEEVENTF_XUP; + SendMouseEvent(mi); + } + if(mid->ButtonFlags & MOUSE_BUTTON_5_DOWN) + { + mi.mouseData |= XBUTTON2; + mi.dwFlags |= MOUSEEVENTF_XDOWN; + SendMouseEvent(mi); + } + if(mid->ButtonFlags & MOUSE_BUTTON_5_UP) + { + mi.mouseData |= XBUTTON2; + mi.dwFlags |= MOUSEEVENTF_XUP; + SendMouseEvent(mi); + } + if(mid->ButtonFlags & MOUSE_WHEEL) + { + mi.mouseData = mid->ButtonData; + mi.dwFlags |= MOUSEEVENTF_WHEEL; + SendMouseEvent(mi); + } + } + } + + SendMouseEvent(mi); +} + +BOOL FASTCALL +IntMouseInput(MOUSEINPUT *mi, BOOL Injected) +{ + const UINT SwapBtnMsg[2][2] = + { + {WM_LBUTTONDOWN, WM_RBUTTONDOWN}, + {WM_LBUTTONUP, WM_RBUTTONUP} + }; + const WPARAM SwapBtn[2] = + { + MK_LBUTTON, MK_RBUTTON + }; + POINT MousePos; + PSYSTEM_CURSORINFO CurInfo; + BOOL SwapButtons; + MSG Msg; + + ASSERT(mi); + + CurInfo = IntGetSysCursorInfo(); + + if(!mi->time) + { + LARGE_INTEGER LargeTickCount; + KeQueryTickCount(&LargeTickCount); + mi->time = MsqCalculateMessageTime(&LargeTickCount); + } + + SwapButtons = gspv.bMouseBtnSwap; + + MousePos = gpsi->ptCursor; + + if(mi->dwFlags & MOUSEEVENTF_MOVE) + { + if(mi->dwFlags & MOUSEEVENTF_ABSOLUTE) + { + MousePos.x = mi->dx * UserGetSystemMetrics(SM_CXVIRTUALSCREEN) >> 16; + MousePos.y = mi->dy * UserGetSystemMetrics(SM_CYVIRTUALSCREEN) >> 16; + } + else + { + MousePos.x += mi->dx; + MousePos.y += mi->dy; + } + } + + /* + * Insert the messages into the system queue + */ + Msg.wParam = 0; + Msg.lParam = MAKELPARAM(MousePos.x, MousePos.y); + Msg.pt = MousePos; + + if (IS_KEY_DOWN(gafAsyncKeyState, VK_SHIFT)) + { + Msg.wParam |= MK_SHIFT; + } + + if (IS_KEY_DOWN(gafAsyncKeyState, VK_CONTROL)) + { + Msg.wParam |= MK_CONTROL; + } + + if(mi->dwFlags & MOUSEEVENTF_MOVE) + { + UserSetCursorPos(MousePos.x, MousePos.y, Injected, mi->dwExtraInfo, TRUE); + } + if(mi->dwFlags & MOUSEEVENTF_LEFTDOWN) + { + SET_KEY_DOWN(gafAsyncKeyState, VK_LBUTTON, TRUE); + Msg.message = SwapBtnMsg[0][SwapButtons]; + CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; + Msg.wParam |= CurInfo->ButtonsDown; + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) + { + SET_KEY_DOWN(gafAsyncKeyState, VK_LBUTTON, FALSE); + Msg.message = SwapBtnMsg[1][SwapButtons]; + CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; + Msg.wParam |= CurInfo->ButtonsDown; + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) + { + SET_KEY_DOWN(gafAsyncKeyState, VK_MBUTTON, TRUE); + Msg.message = WM_MBUTTONDOWN; + CurInfo->ButtonsDown |= MK_MBUTTON; + Msg.wParam |= CurInfo->ButtonsDown; + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) + { + SET_KEY_DOWN(gafAsyncKeyState, VK_MBUTTON, FALSE); + Msg.message = WM_MBUTTONUP; + CurInfo->ButtonsDown &= ~MK_MBUTTON; + Msg.wParam |= CurInfo->ButtonsDown; + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) + { + SET_KEY_DOWN(gafAsyncKeyState, VK_RBUTTON, TRUE); + Msg.message = SwapBtnMsg[0][!SwapButtons]; + CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; + Msg.wParam |= CurInfo->ButtonsDown; + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) + { + SET_KEY_DOWN(gafAsyncKeyState, VK_RBUTTON, FALSE); + Msg.message = SwapBtnMsg[1][!SwapButtons]; + CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; + Msg.wParam |= CurInfo->ButtonsDown; + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + + if((mi->dwFlags & (MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)) && + (mi->dwFlags & MOUSEEVENTF_WHEEL)) + { + /* fail because both types of events use the mouseData field */ + return FALSE; + } + + if(mi->dwFlags & MOUSEEVENTF_XDOWN) + { + Msg.message = WM_XBUTTONDOWN; + if(mi->mouseData & XBUTTON1) + { + SET_KEY_DOWN(gafAsyncKeyState, VK_XBUTTON1, TRUE); + CurInfo->ButtonsDown |= MK_XBUTTON1; + Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + if(mi->mouseData & XBUTTON2) + { + SET_KEY_DOWN(gafAsyncKeyState, VK_XBUTTON2, TRUE); + CurInfo->ButtonsDown |= MK_XBUTTON2; + Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + } + else if(mi->dwFlags & MOUSEEVENTF_XUP) + { + Msg.message = WM_XBUTTONUP; + if(mi->mouseData & XBUTTON1) + { + SET_KEY_DOWN(gafAsyncKeyState, VK_XBUTTON1, FALSE); + CurInfo->ButtonsDown &= ~MK_XBUTTON1; + Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + if(mi->mouseData & XBUTTON2) + { + SET_KEY_DOWN(gafAsyncKeyState, VK_XBUTTON2, FALSE); + CurInfo->ButtonsDown &= ~MK_XBUTTON2; + Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + } + if(mi->dwFlags & MOUSEEVENTF_WHEEL) + { + Msg.message = WM_MOUSEWHEEL; + Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, mi->mouseData); + co_MsqInsertMouseMessage(&Msg, Injected, mi->dwExtraInfo, TRUE); + } + + return TRUE; +} + +BOOL +FASTCALL +IntQueryTrackMouseEvent( + LPTRACKMOUSEEVENT lpEventTrack) +{ + PDESKTOP pDesk; + PTHREADINFO pti; + + pti = PsGetCurrentThreadWin32Thread(); + pDesk = pti->rpdesk; + + /* Always cleared with size set and return true. */ + RtlZeroMemory(lpEventTrack , sizeof(TRACKMOUSEEVENT)); + lpEventTrack->cbSize = sizeof(TRACKMOUSEEVENT); + + if ( pDesk->dwDTFlags & (DF_TME_LEAVE | DF_TME_HOVER) && + pDesk->spwndTrack && + pti->MessageQueue == pDesk->spwndTrack->head.pti->MessageQueue ) + { + if ( pDesk->htEx != HTCLIENT ) + lpEventTrack->dwFlags |= TME_NONCLIENT; + + if ( pDesk->dwDTFlags & DF_TME_LEAVE ) + lpEventTrack->dwFlags |= TME_LEAVE; + + if ( pDesk->dwDTFlags & DF_TME_HOVER ) + { + lpEventTrack->dwFlags |= TME_HOVER; + lpEventTrack->dwHoverTime = pDesk->dwMouseHoverTime; + } + lpEventTrack->hwndTrack = UserHMGetHandle(pDesk->spwndTrack); + } + return TRUE; +} + +BOOL +FASTCALL +IntTrackMouseEvent( + LPTRACKMOUSEEVENT lpEventTrack) +{ + PDESKTOP pDesk; + PTHREADINFO pti; + PWND pWnd; + POINT point; + + pti = PsGetCurrentThreadWin32Thread(); + pDesk = pti->rpdesk; + + if (!(pWnd = UserGetWindowObject(lpEventTrack->hwndTrack))) + return FALSE; + + /* Tracking spwndTrack same as pWnd */ + if ( lpEventTrack->dwFlags & TME_CANCEL ) // Canceled mode. + { + if ( lpEventTrack->dwFlags & TME_LEAVE ) + pDesk->dwDTFlags &= ~DF_TME_LEAVE; + + if ( lpEventTrack->dwFlags & TME_HOVER ) + { + if ( pDesk->dwDTFlags & DF_TME_HOVER ) + { // Kill hover timer. + IntKillTimer(pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, TRUE); + pDesk->dwDTFlags &= ~DF_TME_HOVER; + } + } + } + else // Not Canceled. + { + pDesk->spwndTrack = pWnd; + if ( lpEventTrack->dwFlags & TME_LEAVE ) + pDesk->dwDTFlags |= DF_TME_LEAVE; + + if ( lpEventTrack->dwFlags & TME_HOVER ) + { + pDesk->dwDTFlags |= DF_TME_HOVER; + + if ( !lpEventTrack->dwHoverTime || lpEventTrack->dwHoverTime == HOVER_DEFAULT ) + pDesk->dwMouseHoverTime = gspv.iMouseHoverTime; // use the system default hover time-out. + else + pDesk->dwMouseHoverTime = lpEventTrack->dwHoverTime; + // Start timer for the hover period. + IntSetTimer( pWnd, ID_EVENT_SYSTIMER_MOUSEHOVER, pDesk->dwMouseHoverTime, SystemTimerProc, TMRF_SYSTEM); + // Get windows thread message points. + point = pWnd->head.pti->ptLast; + // Set desktop mouse hover from the system default hover rectangle. + RECTL_vSetRect(&pDesk->rcMouseHover, + point.x - gspv.iMouseHoverWidth / 2, + point.y - gspv.iMouseHoverHeight / 2, + point.x + gspv.iMouseHoverWidth / 2, + point.y + gspv.iMouseHoverHeight / 2); + } + } + return TRUE; +} + +BOOL +APIENTRY +NtUserTrackMouseEvent( + LPTRACKMOUSEEVENT lpEventTrack) +{ + TRACKMOUSEEVENT saveTME; + BOOL Ret = FALSE; + + TRACE("Enter NtUserTrackMouseEvent\n"); + UserEnterExclusive(); + + _SEH2_TRY + { + ProbeForRead(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1); + RtlCopyMemory(&saveTME, lpEventTrack, sizeof(TRACKMOUSEEVENT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(goto Exit;) + } + _SEH2_END; + + if ( saveTME.cbSize != sizeof(TRACKMOUSEEVENT) ) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + goto Exit; + } + + if (saveTME.dwFlags & ~(TME_CANCEL | TME_QUERY | TME_NONCLIENT | TME_LEAVE | TME_HOVER) ) + { + EngSetLastError(ERROR_INVALID_FLAGS); + goto Exit; + } + + if ( saveTME.dwFlags & TME_QUERY ) + { + Ret = IntQueryTrackMouseEvent(&saveTME); + _SEH2_TRY + { + ProbeForWrite(lpEventTrack, sizeof(TRACKMOUSEEVENT), 1); + RtlCopyMemory(lpEventTrack, &saveTME, sizeof(TRACKMOUSEEVENT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + Ret = FALSE; + } + _SEH2_END; + } + else + { + Ret = IntTrackMouseEvent(&saveTME); + } + +Exit: + TRACE("Leave NtUserTrackMouseEvent, ret=%i\n", Ret); + UserLeave(); + return Ret; +} + +extern MOUSEMOVEPOINT MouseHistoryOfMoves[]; +extern INT gcur_count; + +DWORD +APIENTRY +NtUserGetMouseMovePointsEx( + UINT cbSize, + LPMOUSEMOVEPOINT lpptIn, + LPMOUSEMOVEPOINT lpptOut, + int nBufPoints, + DWORD resolution) +{ + MOUSEMOVEPOINT Safeppt; + //BOOL Hit; + INT Count = -1; + DECLARE_RETURN(DWORD); + + TRACE("Enter NtUserGetMouseMovePointsEx\n"); + UserEnterExclusive(); + + if ((cbSize != sizeof(MOUSEMOVEPOINT)) || (nBufPoints < 0) || (nBufPoints > 64)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + RETURN( -1); + } + + if (!lpptIn || (!lpptOut && nBufPoints)) + { + EngSetLastError(ERROR_NOACCESS); + RETURN( -1); + } + + _SEH2_TRY + { + ProbeForRead( lpptIn, cbSize, 1); + RtlCopyMemory(&Safeppt, lpptIn, cbSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(RETURN( -1)) + } + _SEH2_END; + + // http://msdn.microsoft.com/en-us/library/ms646259(v=vs.85).aspx + // This explains the math issues in transforming points. + Count = gcur_count; // FIFO is forward so retrieve backward. + //Hit = FALSE; + do + { + if (Safeppt.x == 0 && Safeppt.y == 0) + break; // No test. + // Finds the point, it returns the last nBufPoints prior to and including the supplied point. + if (MouseHistoryOfMoves[Count].x == Safeppt.x && MouseHistoryOfMoves[Count].y == Safeppt.y) + { + if ( Safeppt.time ) // Now test time and it seems to be absolute. + { + if (Safeppt.time == MouseHistoryOfMoves[Count].time) + { + //Hit = TRUE; + break; + } + else + { + if (--Count < 0) Count = 63; + continue; + } + } + //Hit = TRUE; + break; + } + if (--Count < 0) Count = 63; + } + while ( Count != gcur_count); + + switch(resolution) + { + case GMMP_USE_DISPLAY_POINTS: + if (nBufPoints) + { + _SEH2_TRY + { + ProbeForWrite(lpptOut, cbSize, 1); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(RETURN( -1)) + } + _SEH2_END; + } + Count = nBufPoints; + break; + case GMMP_USE_HIGH_RESOLUTION_POINTS: + break; + default: + EngSetLastError(ERROR_POINT_NOT_FOUND); + RETURN( -1); + } + + RETURN( Count); + +CLEANUP: + TRACE("Leave NtUserGetMouseMovePointsEx, ret=%i\n", _ret_); + UserLeave(); + END_CLEANUP; +} Propchange: trunk/reactos/subsystems/win32/win32k/ntuser/mouse.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Fri Oct 14 18:41:06 2011 @@ -144,6 +144,7 @@ <file>metric.c</file> <file>misc.c</file> <file>monitor.c</file> + <file>mouse.c</file> <file>msgqueue.c</file> <file>ntstubs.c</file> <file>ntuser.c</file>

1 0

[khornicek] 54139: [VGAMP] Fix the confusion between mode index 12 and video mode 12h introduced more than six years ago. ReactOS should now boot again when VGA is selected in the 1st stage.
by khornicek＠svn.reactos.org 14 Oct '11

14 Oct '11

Author: khornicek Date: Fri Oct 14 18:09:30 2011 New Revision: 54139 URL: http://svn.reactos.org/svn/reactos?rev=54139&view=rev Log: [VGAMP] Fix the confusion between mode index 12 and video mode 12h introduced more than six years ago. ReactOS should now boot again when VGA is selected in the 1st stage. Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.c Modified: trunk/reactos/drivers/video/miniport/vga/vgamp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga/vgamp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga/vgamp.c [iso-8859-1] Fri Oct 14 18:09:30 2011 @@ -440,21 +440,21 @@ OUT PSTATUS_BLOCK StatusBlock) { CurrentMode->Length = sizeof(VIDEO_MODE_INFORMATION); - CurrentMode->ModeIndex = 12; + CurrentMode->ModeIndex = 2; CurrentMode->VisScreenWidth = 640; CurrentMode->VisScreenHeight = 480; - CurrentMode->ScreenStride = 320; - CurrentMode->NumberOfPlanes = 1; - CurrentMode->BitsPerPlane = 4; + CurrentMode->ScreenStride = 80; + CurrentMode->NumberOfPlanes = 4; + CurrentMode->BitsPerPlane = 1; CurrentMode->Frequency = 60; - CurrentMode->XMillimeter = 0; /* FIXME */ - CurrentMode->YMillimeter = 0; /* FIXME */ + CurrentMode->XMillimeter = 320; + CurrentMode->YMillimeter = 240; CurrentMode->NumberRedBits = CurrentMode->NumberGreenBits = CurrentMode->NumberBlueBits = 6; CurrentMode->RedMask = CurrentMode->GreenMask = - CurrentMode->BlueMask = 0; /* FIXME */ + CurrentMode->BlueMask = 0; CurrentMode->VideoMemoryBitmapWidth = 640; CurrentMode->VideoMemoryBitmapHeight = 480; CurrentMode->AttributeFlags = VIDEO_MODE_GRAPHICS | VIDEO_MODE_COLOR |

1 0

[akhaldi] 54138: [WIN32K] * Fix a copy-paste error in EngBitBlt() and improve DIB_32BPP_ColorFill() behaviour in case when input rectangle is invalid (RECTL structure fields are signed, so "jle" in...
by akhaldi＠svn.reactos.org 14 Oct '11

14 Oct '11

Author: akhaldi Date: Fri Oct 14 18:03:07 2011 New Revision: 54138 URL: http://svn.reactos.org/svn/reactos?rev=54138&view=rev Log: [WIN32K] * Fix a copy-paste error in EngBitBlt() and improve DIB_32BPP_ColorFill() behaviour in case when input rectangle is invalid (RECTL structure fields are signed, so "jle" instruction should be used instead of "jbe"). * Patch by Igor Sudarikov <4seev3 at gmail [dot] com> See issue #4423 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s [iso-8859-1] Fri Oct 14 18:03:07 2011 @@ -39,11 +39,11 @@ mov ebx, [edx+8] /* ebx = prcl->right; */ sub ebx, [edx] /* ebx = prcl->right - prcl->left; */ - jbe .end /* if (ebx <= 0) goto end; */ + jle .end /* if (ebx <= 0) goto end; */ mov edx, [edx+12] /* edx = prcl->bottom; */ sub edx, edi /* edx -= prcl->top; */ - jbe .end /* if (eax <= 0) goto end; */ + jle .end /* if (eax <= 0) goto end; */ mov eax, [ebp+16] /* eax = iColor; */ cld Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Fri Oct 14 18:03:07 2011 @@ -349,16 +349,7 @@ //DPRINT1("Rop4 : 0x%08x\n", Rop4); OutputRect = *DestRect; - if (OutputRect.right < OutputRect.left) - { - OutputRect.left = DestRect->right; - OutputRect.right = DestRect->left; - } - if (OutputRect.bottom < OutputRect.top) - { - OutputRect.left = DestRect->right; - OutputRect.right = DestRect->left; - } + RECTL_vMakeWellOrdered(&OutputRect); if (UsesSource) {

1 0

[rharabien] 54137: [WIN32K] - Fix sending WM_SYSKEYUP for ALT. Fixes rest of user32:input winetest (6). It's finally green!
by rharabien＠svn.reactos.org 14 Oct '11

14 Oct '11

Author: rharabien Date: Fri Oct 14 17:59:16 2011 New Revision: 54137 URL: http://svn.reactos.org/svn/reactos?rev=54137&view=rev Log: [WIN32K] - Fix sending WM_SYSKEYUP for ALT. Fixes rest of user32:input winetest (6). It's finally green! Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Fri Oct 14 17:59:16 2011 @@ -820,7 +820,6 @@ } else { - bMenuDownRecently = FALSE; if (bIsDown) Msg.message = WM_KEYDOWN; else

1 0

[akhaldi] 54136: [CMD] * Reduce the scope of some variables.
by akhaldi＠svn.reactos.org 14 Oct '11

14 Oct '11

Author: akhaldi Date: Fri Oct 14 17:50:16 2011 New Revision: 54136 URL: http://svn.reactos.org/svn/reactos?rev=54136&view=rev Log: [CMD] * Reduce the scope of some variables. Modified: trunk/reactos/base/shell/cmd/assoc.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/cmd/start.c trunk/reactos/base/shell/cmd/ver.c Modified: trunk/reactos/base/shell/cmd/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/assoc.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/assoc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/assoc.c [iso-8859-1] Fri Oct 14 17:50:16 2011 @@ -206,8 +206,6 @@ INT CommandAssoc (LPTSTR param) { - LPTSTR lpEqualSign = NULL; - /* print help */ if (!_tcsncmp (param, _T("/?"), 2)) { @@ -221,7 +219,7 @@ PrintAllAssociations(); else { - lpEqualSign = _tcschr(param, _T('=')); + LPTSTR lpEqualSign = _tcschr(param, _T('=')); if(lpEqualSign != NULL) { LPTSTR fileType = lpEqualSign + 1; Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Fri Oct 14 17:50:16 2011 @@ -1260,13 +1260,11 @@ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags that we will use to sort */ { LPWIN32_FIND_DATA lpTemp; /* A temporary pointer */ - int First, Last, Temp; BOOL Way; if (i < j) { - First = i; - Last = j; + int First = i, Last = j, Temp; Way = TRUE; while (i != j) { Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/filecomp.c [iso-8859-1] Fri Oct 14 17:50:16 2011 @@ -209,7 +209,6 @@ TCHAR path[MAX_PATH]; TCHAR fname[MAX_PATH]; TCHAR directory[MAX_PATH]; - UINT longestfname = 0; SHORT screenwidth; /* expand current file name */ @@ -277,6 +276,7 @@ hFile = FindFirstFile (path, &file); if (hFile != INVALID_HANDLE_VALUE) { + UINT longestfname = 0; /* Get the size of longest filename first. */ do { Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Fri Oct 14 17:50:16 2011 @@ -48,7 +48,6 @@ TCHAR szFullCmdLine [CMDLINE_LENGTH]; PROCESS_INFORMATION prci; STARTUPINFO stui; - INT i = 0; #ifdef UNICODE DWORD dwCreationFlags = CREATE_NEW_CONSOLE | CREATE_UNICODE_ENVIRONMENT; #else @@ -213,7 +212,7 @@ /* Parsing the command that gets called by start, and it's parameters */ { BOOL bInside = FALSE; - + INT i; /* find the end of the command and put the arguments in param */ for (i = 0; Rest[i]; i++) { Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=5… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Fri Oct 14 17:50:16 2011 @@ -28,8 +28,6 @@ VOID ShortVersion (VOID) { OSVERSIONINFO VersionInfo; - unsigned RosVersionLen; - LPTSTR RosVersion; ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); @@ -37,6 +35,9 @@ memset(VersionInfo.szCSDVersion, 0, sizeof(VersionInfo.szCSDVersion)); if (GetVersionEx(&VersionInfo)) { + LPTSTR RosVersion; + unsigned RosVersionLen; + RosVersion = VersionInfo.szCSDVersion + _tcslen(VersionInfo.szCSDVersion) + 1; RosVersionLen = sizeof(VersionInfo.szCSDVersion) / sizeof(VersionInfo.szCSDVersion[0]) - (RosVersion - VersionInfo.szCSDVersion);

1 0

[tkreuzer] 54135: [VIDEOPRT] Remove an old hack, that caused an inconsistency between the display's device object name and the name of its symbolic link / registry key. The hack isn't needed anymor...
by tkreuzer＠svn.reactos.org 14 Oct '11

14 Oct '11

Author: tkreuzer Date: Fri Oct 14 14:50:22 2011 New Revision: 54135 URL: http://svn.reactos.org/svn/reactos?rev=54135&view=rev Log: [VIDEOPRT] Remove an old hack, that caused an inconsistency between the display's device object name and the name of its symbolic link / registry key. The hack isn't needed anymore, because win32k now loads the next device if one isn't available. Fixes VBoxVideo being loaded together with framebuf.dll instead of VBoxDisp.dll and now the mouse pointer integration works completely. Modified: trunk/reactos/drivers/video/videoprt/videoprt.c Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Fri Oct 14 14:50:22 2011 @@ -359,7 +359,7 @@ WCHAR SymlinkBuffer[20]; UNICODE_STRING SymlinkName; BOOL LegacyDetection = FALSE; - ULONG DeviceNumber, DisplayNumber; + ULONG DeviceNumber; DeviceExtension = (PVIDEO_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceNumber = DeviceExtension->DeviceNumber; @@ -480,30 +480,12 @@ RtlInitUnicodeString(&DeviceName, DeviceBuffer); /* Create symbolic link "\??\DISPLAYx" */ - - /* HACK: We need this to find the first available display to - * use. We can't use the device number because then we could - * end up with \Device\Video0 being non-functional because - * HwFindAdapter returned an error. \Device\Video1 would be - * the correct primary display but it would be set to DISPLAY2 - * so it would never be used and ROS would bugcheck on boot. - * By doing it this way, we ensure that DISPLAY1 is always - * functional. Another idea would be letting the IO manager - * give our video devices names then getting those names - * somehow and creating symbolic links to \Device\VideoX - * and \??\DISPLAYX once we know that HwFindAdapter has succeeded. - */ - DisplayNumber = 0; - do - { - DisplayNumber++; - swprintf(SymlinkBuffer, L"\\??\\DISPLAY%lu", DisplayNumber); - RtlInitUnicodeString(&SymlinkName, SymlinkBuffer); - } - while (IoCreateSymbolicLink(&SymlinkName, &DeviceName) != STATUS_SUCCESS); + swprintf(SymlinkBuffer, L"\\??\\DISPLAY%lu", DeviceNumber + 1); + RtlInitUnicodeString(&SymlinkName, SymlinkBuffer); + IoCreateSymbolicLink(&SymlinkName, &DeviceName); /* Add entry to DEVICEMAP\VIDEO key in registry. */ - swprintf(DeviceVideoBuffer, L"\\Device\\Video%d", DisplayNumber - 1); + swprintf(DeviceVideoBuffer, L"\\Device\\Video%d", DeviceNumber); RtlWriteRegistryValue( RTL_REGISTRY_DEVICEMAP, L"VIDEO",

1 0

[rharabien] 54134: [WIN32K] - Keyboard state is update when msg is peeked from queue (not posted) and before virtual keys are simplified. Fixes 2 user32:input winetests.
by rharabien＠svn.reactos.org 14 Oct '11

14 Oct '11

Author: rharabien Date: Fri Oct 14 14:21:51 2011 New Revision: 54134 URL: http://svn.reactos.org/svn/reactos?rev=54134&view=rev Log: [WIN32K] - Keyboard state is update when msg is peeked from queue (not posted) and before virtual keys are simplified. Fixes 2 user32:input winetests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Fri Oct 14 14:21:51 2011 @@ -260,32 +260,32 @@ UpdateKeyStateFromMsg(PUSER_MESSAGE_QUEUE MessageQueue, MSG* msg) { UCHAR key; - BOOL down = 0; + BOOL down = FALSE; TRACE("UpdateKeyStateFromMsg message:%d\n", msg->message); switch (msg->message) { case WM_LBUTTONDOWN: - down = 1; + down = TRUE; /* fall through */ case WM_LBUTTONUP: UpdateKeyState(MessageQueue, VK_LBUTTON, down); break; case WM_MBUTTONDOWN: - down = 1; + down = TRUE; /* fall through */ case WM_MBUTTONUP: UpdateKeyState(MessageQueue, VK_MBUTTON, down); break; case WM_RBUTTONDOWN: - down = 1; + down = TRUE; /* fall through */ case WM_RBUTTONUP: UpdateKeyState(MessageQueue, VK_RBUTTON, down); break; case WM_XBUTTONDOWN: - down = 1; + down = TRUE; /* fall through */ case WM_XBUTTONUP: if (msg->wParam == XBUTTON1) @@ -295,7 +295,7 @@ break; case WM_KEYDOWN: case WM_SYSKEYDOWN: - down = 1; + down = TRUE; /* fall through */ case WM_KEYUP: case WM_SYSKEYUP: @@ -1215,8 +1215,6 @@ { InsertTailList(&MessageQueue->HardwareMessagesListHead, &Message->ListEntry); - - UpdateKeyStateFromMsg( MessageQueue, Msg ); } Message->QS_Flags = MessageBits; @@ -1720,11 +1718,11 @@ { msg = CurrentMessage->Msg; + UpdateKeyStateFromMsg(MessageQueue, &msg); AcceptMessage = co_IntProcessHardwareMessage(&msg, &Remove, MsgFilterLow, MsgFilterHigh); if (Remove) { - UpdateKeyStateFromMsg(MessageQueue, &msg); RemoveEntryList(&CurrentMessage->ListEntry); ClearMsgBitsMask(MessageQueue, CurrentMessage->QS_Flags); MsqDestroyMessage(CurrentMessage); @@ -2190,7 +2188,7 @@ { DWORD Ret; - UserEnterExclusive(); + UserEnterShared(); Ret = UserGetKeyState(key);

1 0

[tkreuzer] 54133: [WIN32K] - Since some display drivers don't do as they should - return the drisplay driver name in the DEVMODE's dmDisplayName field - but return the miniport driver name, fix tha...
by tkreuzer＠svn.reactos.org 14 Oct '11

14 Oct '11

Author: tkreuzer Date: Fri Oct 14 13:41:03 2011 New Revision: 54133 URL: http://svn.reactos.org/svn/reactos?rev=54133&view=rev Log: [WIN32K] - Since some display drivers don't do as they should - return the drisplay driver name in the DEVMODE's dmDisplayName field - but return the miniport driver name, fix that name when creating the mode list. This fixes loading of VBox driver, when it is installed properly, which needs to be fixed as well. Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c Modified: trunk/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Fri Oct 14 13:41:03 2011 @@ -148,13 +148,19 @@ pdminfo->pdmiNext = pGraphicsDevice->pdevmodeInfo; pGraphicsDevice->pdevmodeInfo = pdminfo; - /* Count DEVMODEs */ + /* Loop all DEVMODEs */ pdmEnd = (DEVMODEW*)((PCHAR)pdminfo->adevmode + pdminfo->cbdevmode); for (pdm = pdminfo->adevmode; pdm + 1 <= pdmEnd; pdm = (DEVMODEW*)((PCHAR)pdm + pdm->dmSize + pdm->dmDriverExtra)) { + /* Count this DEVMODE */ cModes++; + + /* Some drivers like the VBox driver don't fill the dmDeviceName + with the name of the display driver. So fix that here. */ + wcsncpy(pdm->dmDeviceName, pwsz, CCHDEVICENAME); + pdm->dmDeviceName[CCHDEVICENAME - 1] = 0; } // FIXME: release the driver again until it's used?

1 0

[tkreuzer] 54132: [CRT] Fix rbuild...
by tkreuzer＠svn.reactos.org 14 Oct '11

14 Oct '11

Author: tkreuzer Date: Fri Oct 14 08:50:13 2011 New Revision: 54132 URL: http://svn.reactos.org/svn/reactos?rev=54132&view=rev Log: [CRT] Fix rbuild... Modified: trunk/reactos/lib/sdk/crt/crt.rbuild trunk/reactos/lib/sdk/crt/libcntpr.rbuild Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Fri Oct 14 08:50:13 2011 @@ -316,6 +316,7 @@ <file>amsg.c</file> <file>assert.c</file> <file>environ.c</file> + <file>fltused.c</file> <file>getargs.c</file> <file>i10output.c</file> <file>initterm.c</file> Modified: trunk/reactos/lib/sdk/crt/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.rbuil… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.rbuild [iso-8859-1] Fri Oct 14 08:50:13 2011 @@ -125,6 +125,10 @@ <file>memccpy.c</file> <file>memcmp.c</file> <file>memicmp.c</file> + </directory> + + <directory name="misc"> + <file>fltused.c</file> </directory> <directory name="search">

1 0

[tkreuzer] 54131: [CRT] - Remove _fltused from alldiv_asm.s / mscmain.c and use fltused.c instead. - Remove amd64/alldiv.S - Implement amd64 ceil, ceilf with sse [NTOSKNRL] - Fix amd64 exports [ASM...
by tkreuzer＠svn.reactos.org 14 Oct '11

14 Oct '11

Author: tkreuzer Date: Fri Oct 14 08:33:22 2011 New Revision: 54131 URL: http://svn.reactos.org/svn/reactos?rev=54131&view=rev Log: [CRT] - Remove _fltused from alldiv_asm.s / mscmain.c and use fltused.c instead. - Remove amd64/alldiv.S - Implement amd64 ceil, ceilf with sse [NTOSKNRL] - Fix amd64 exports [ASM] - Fix amd64 asm files to conform to the new syntax Removed: trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S Modified: trunk/reactos/boot/freeldr/bootsect/ext2.S trunk/reactos/dll/win32/kernel32/client/amd64/fiber.S trunk/reactos/lib/rtl/amd64/except_asm.S trunk/reactos/lib/rtl/amd64/rtlmem.S trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s trunk/reactos/lib/sdk/crt/except/amd64/seh.s trunk/reactos/lib/sdk/crt/float/amd64/clearfp.S trunk/reactos/lib/sdk/crt/float/amd64/fpreset.S trunk/reactos/lib/sdk/crt/float/amd64/getsetfpcw.S trunk/reactos/lib/sdk/crt/float/amd64/logb.S trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/math/amd64/ceil.S trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S trunk/reactos/lib/sdk/crt/math/amd64/floor.S trunk/reactos/lib/sdk/crt/math/amd64/floorf.S trunk/reactos/lib/sdk/crt/math/i386/alldiv_asm.s trunk/reactos/lib/sdk/crt/misc/fltused.c trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s trunk/reactos/lib/sdk/crt/startup/mscmain.c trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/ke/amd64/boot.S trunk/reactos/ntoskrnl/ke/amd64/thrdini.c trunk/reactos/ntoskrnl/ke/amd64/trap.S trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/boot/freeldr/bootsect/ext2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/ext2… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/ext2.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/ext2.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -683,4 +683,6 @@ .word HEX(0aa55) // BootSector signature +.endcode16 + END Modified: trunk/reactos/dll/win32/kernel32/client/amd64/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/amd64/fiber.S [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/amd64/fiber.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -17,7 +17,7 @@ /* FIXME: TODO */ ret -ENDFUNC BaseFiberStartup +ENDFUNC PUBLIC SwitchToFiber @@ -27,6 +27,6 @@ UNIMPLEMENTED BaseFiberStartup /* FIXME: TODO */ ret -ENDFUNC SwitchToFiber +ENDFUNC END Modified: trunk/reactos/lib/rtl/amd64/except_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/except_asm.S… ============================================================================== --- trunk/reactos/lib/rtl/amd64/except_asm.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/except_asm.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -15,7 +15,7 @@ .code64 -/* +/* * VOID NTAPI * RtlCaptureContext( * PCONTEXT ContextRecord); <rcx> @@ -96,7 +96,7 @@ /* Cleanup stack and return */ add rsp, 8 ret -.ENDP RtlCaptureContext +.ENDP END Modified: trunk/reactos/lib/rtl/amd64/rtlmem.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/rtlmem.S?rev… ============================================================================== --- trunk/reactos/lib/rtl/amd64/rtlmem.S [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/amd64/rtlmem.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Run-Time Library * PURPOSE: Memory functions for amd64 - * FILE: lib/rtl/i386/rtlswap.S + * FILE: lib/rtl/amd64/rtlmem.S * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ @@ -14,7 +14,7 @@ .code64 -/* SIZE_T +/* SIZE_T * RtlCompareMemory( * IN CONST VOID *Source1, <rcx> * IN CONST VOID *Source2, <rdx> @@ -81,7 +81,7 @@ pop rdi pop rsi ret -.endp RtlCompareMemory +.endp END Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -123,6 +123,7 @@ misc/amsg.c misc/assert.c misc/environ.c + misc/fltused.c misc/getargs.c misc/i10output.c misc/initterm.c @@ -384,7 +385,6 @@ float/amd64/fpreset.S float/amd64/logb.S float/i386/statfp.c - math/amd64/alldiv.S math/amd64/atan.S math/amd64/atan2.S math/amd64/ceil.S Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/c… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -20,13 +20,13 @@ .endprolog UNIMPLEMENTED chkstk ret -ENDFUNC __chkstk +ENDFUNC FUNC __alloca_probe .endprolog UNIMPLEMENTED alloca_probe ret -ENDFUNC __alloca_probe +ENDFUNC END /* EOF */ Modified: trunk/reactos/lib/sdk/crt/except/amd64/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/s… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -30,36 +30,36 @@ FUNC _unwind_handler .endprolog ret -ENDFUNC _unwind_handler +ENDFUNC FUNC _global_unwind2 .endprolog ret -ENDFUNC _global_unwind2 +ENDFUNC FUNC _abnormal_termination .endprolog ret -ENDFUNC _abnormal_termination +ENDFUNC FUNC _local_unwind .endprolog ret -ENDFUNC _local_unwind +ENDFUNC FUNC _local_unwind2 .endprolog ret -ENDFUNC _local_unwind2 +ENDFUNC FUNC _except_handler2 .endprolog ret -ENDFUNC _except_handler2 +ENDFUNC FUNC _except_handler3 .endprolog ret -ENDFUNC _except_handler3 +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/float/amd64/clearfp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/amd64/cl… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/amd64/clearfp.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/amd64/clearfp.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -10,6 +10,6 @@ .ENDPROLOG fnclex -ENDFUNC _clearfp +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/float/amd64/fpreset.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/amd64/fp… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/amd64/fpreset.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/amd64/fpreset.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -6,6 +6,6 @@ FUNC _fpreset .endprolog fninit -ENDFUNC _fpreset +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/float/amd64/getsetfpcw.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/amd64/ge… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/amd64/getsetfpcw.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/amd64/getsetfpcw.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -11,7 +11,7 @@ mov rax, [rsp] add rsp, 8 ret -ENDFUNC __getfpcw87 +ENDFUNC PUBLIC __setfpcw87 FUNC __setfpcw87 @@ -19,6 +19,6 @@ .ENDPROLOG ldmxcsr [rsp + 8] ret -ENDFUNC __setfpcw87 +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/float/amd64/logb.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/amd64/lo… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/amd64/logb.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/amd64/logb.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -11,6 +11,6 @@ fxtract fstp st ret -ENDFUNC _logb +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -9,6 +9,7 @@ mem/memccpy.c mem/memcmp.c mem/memicmp.c + misc/fltused.c printf/_snprintf.c printf/_snwprintf.c printf/_vcprintf.c @@ -104,7 +105,6 @@ setjmp/amd64/setjmp.s math/cos.c math/sin.c - math/amd64/alldiv.S math/amd64/atan.S math/amd64/atan2.S math/amd64/ceil.S Removed: trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/all… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S (removed) @@ -1,30 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * PURPOSE: Implementation of alldiv - * FILE: lib/sdk/crt/math/amd64/alldiv.S - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -/* DATA **********************************************************************/ -.code64 - -PUBLIC _fltused -_fltused: - .long HEX(9875) - -/* CODE **********************************************************************/ -.code64 - -FUNC alldiv - .endprolog - UNIMPLEMENTED alldiv - ret - -ENDFUNC alldiv - -END Modified: trunk/reactos/lib/sdk/crt/math/amd64/ceil.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/cei… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -14,9 +14,42 @@ /* CODE **********************************************************************/ .code64 +/* ceil(x) = - floor(-x) + */ PUBLIC ceil -ceil: - UNIMPLEMENTED ceil +.PROC ceil + sub rsp, 16 + .ENDPROLOG + + /* Duplicate the bits into rax */ + movd rax, xmm0 + + /* Invert the sign bit */ + rol rax, 1 + xor al, 1 + ror rax, 1 + + /* Copy back to xmm0 */ + movd xmm0, rax + + /* Truncate xmm0 to integer (double precision) */ + cvttsd2si rcx, xmm0 + + /* Shift all bits to the right, keeping the sign bit */ + shr rax, 63 + + /* Substract the sign bit from the truncated value, so that + we get the correct result for negative values. */ + sub rcx, rax + + /* Now compensate for the previous negation */ + neg rcx + + /* Convert the result back to xmm0 (double precision) */ + cvtsi2sd xmm0, rcx + + add rsp, 16 ret +.ENDP END Modified: trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/cei… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -19,29 +19,33 @@ sub rsp, 16 .ENDPROLOG - /* Put parameter on the stack */ - movss dword ptr [rsp], xmm0 - fld dword ptr [rsp] + /* Duplicate the bits into eax (zero exteneded to rax) */ + movd eax, xmm0 - /* Change fpu control word to round up */ - fstcw [rsp + 8] - mov eax, [rsp + 8] - or eax, HEX(00800) - and eax, HEX(0fbff) - mov [rsp + 12], eax - fldcw [rsp + 12] + /* Invert the sign bit */ + xor eax, HEX(80000000) - /* Round to integer */ - frndint + /* Copy back to xmm0 */ + movd xmm0, eax - /* Restore fpu control word */ - fldcw [rsp + 8] + /* Truncate xmm0 to integer (single precision) */ + cvttss2si rcx, xmm0 - fstp dword ptr [rsp] - movss xmm0, dword ptr [rsp] + /* Shift all bits to the right, keeping the sign bit */ + shr rax, 31 + + /* Add the sign bit from the truncated value, so that + we get the correct result for negative values. */ + add rcx, rax + + /* Now compensate for the previous negation */ + neg ecx + + /* Convert the result back to xmm0 (single precision) */ + cvtsi2ss xmm0, rcx add rsp, 16 ret -ENDFUNC ceilf +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/math/amd64/floor.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -36,6 +36,6 @@ add rsp, 16 ret -ENDFUNC floor +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/math/amd64/floorf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -36,6 +36,6 @@ add rsp, 16 ret -ENDFUNC floorf +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/math/i386/alldiv_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/alld… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/alldiv_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/alldiv_asm.s [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -6,20 +6,20 @@ * PROGRAMER: Alex Ionescu (alex(a)relsoft.net) * * Copyright (C) 2002 Michael Ringgaard. - * All rights reserved. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. + * documentation and/or other materials provided with the distribution. * 3. Neither the name of the project nor the names of its contributors * may be used to endorse or promote products derived from this software - * without specific prior written permission. + * without specific prior written permission. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -30,22 +30,17 @@ * OR SERVICES// LOSS OF USE, DATA, OR PROFITS// OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include <asm.inc> PUBLIC __alldiv -PUBLIC __fltused /* DATA ********************************************************************/ .data ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING - -__fltused: - .long HEX(9875) - /* FUNCTIONS ***************************************************************/ .code Modified: trunk/reactos/lib/sdk/crt/misc/fltused.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/fltused.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/fltused.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/fltused.c [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -1,2 +1,2 @@ -int _fltused; +int _fltused = 0x9875; Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -51,8 +51,7 @@ elseif(ARCH MATCHES amd64) list(APPEND MSVCRTEX_SOURCE except/amd64/chkstk_asm.s - except/amd64/chkstk_ms.s - math/amd64/alldiv.S) + except/amd64/chkstk_ms.s) endif() if(MSVC) Modified: trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/setjmp/amd64/s… ============================================================================== --- trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -77,7 +77,7 @@ movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 xor rax, rax ret -ENDFUNC _setjmp +ENDFUNC /*! * int _setjmpex(jmp_buf _Buf,void *_Ctx); @@ -119,7 +119,7 @@ movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 xor rax, rax ret -ENDFUNC _setjmpex +ENDFUNC /*! @@ -164,6 +164,6 @@ jnz l2 inc rax l2: jmp r8 -ENDFUNC longjmp +ENDFUNC END Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -6,8 +6,6 @@ #include <windows.h> #include <stdlib.h> - -int _fltused; int __mingw_init_ehandler (void) { Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -78,7 +78,6 @@ /* MMPTE related defines */ #define MM_EMPTY_PTE_LIST ((ULONG64)0xFFFFFFFF) #define MM_EMPTY_LIST ((ULONG_PTR)-1) -#define PTE_PER_PAGE 0x200 #define ADDR_TO_PAGE_TABLE(v) ((ULONG)(((ULONG_PTR)(v)) / (512 * PAGE_SIZE))) #define ADDR_TO_PDE_OFFSET(v) ((ULONG)((((ULONG_PTR)(v)) / (512 * PAGE_SIZE)))) Modified: trunk/reactos/ntoskrnl/ke/amd64/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/boot.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/boot.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/boot.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -36,7 +36,7 @@ jmp KiSystemStartupBootStack -.ENDP KiSwitchToBootStack +.ENDP END Modified: trunk/reactos/ntoskrnl/ke/amd64/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/thrdini.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -90,7 +90,7 @@ /* Set the Thread's NPX State */ Thread->NpxState = 0xA; - Thread->DispatcherHeader.NpxIrql = PASSIVE_LEVEL; + Thread->Header.NpxIrql = PASSIVE_LEVEL; /* Disable any debug regiseters */ Context->ContextFlags &= ~CONTEXT_DEBUG_REGISTERS; Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -135,7 +135,7 @@ add rsp, EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH ret -.ENDP InternalDispatchException +.ENDP /* SOFTWARE INTERRUPT SERVICES ***********************************************/ @@ -153,7 +153,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiDivideErrorFault +ENDFUNC PUBLIC KiDebugTrapOrFault @@ -174,7 +174,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiDebugTrapOrFault +ENDFUNC PUBLIC KiNmiInterrupt @@ -187,7 +187,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiNmiInterrupt +ENDFUNC PUBLIC KiBreakpointTrap @@ -200,7 +200,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiBreakpointTrap +ENDFUNC PUBLIC KiOverflowTrap @@ -216,7 +216,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiOverflowTrap +ENDFUNC PUBLIC KiBoundFault @@ -240,7 +240,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiBoundFault +ENDFUNC PUBLIC KiInvalidOpcodeFault @@ -265,7 +265,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiInvalidOpcodeFault +ENDFUNC PUBLIC KiNpxNotAvailableFault @@ -287,7 +287,7 @@ KiNpxNotAvailableFaultExit: /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiNpxNotAvailableFault +ENDFUNC PUBLIC KiDoubleFaultAbort @@ -298,7 +298,7 @@ /* Bugcheck */ Fatal 8 // EXCEPTION_DOUBLE_FAULT jmp $ -ENDFUNC KiDoubleFaultAbort +ENDFUNC PUBLIC KiNpxSegmentOverrunAbort @@ -309,7 +309,7 @@ /* Bugcheck */ Fatal EXCEPTION_NPX_OVERRUN jmp $ -ENDFUNC KiNpxSegmentOverrunAbort +ENDFUNC PUBLIC KiInvalidTssFault @@ -320,7 +320,7 @@ /* Bugcheck */ Fatal EXCEPTION_INVALID_TSS jmp $ -ENDFUNC KiInvalidTssFault +ENDFUNC PUBLIC KiSegmentNotPresentFault @@ -331,7 +331,7 @@ /* Bugcheck */ Fatal EXCEPTION_SEGMENT_NOT_PRESENT jmp $ -ENDFUNC KiSegmentNotPresentFault +ENDFUNC PUBLIC KiStackFault @@ -342,7 +342,7 @@ /* Bugcheck */ Fatal EXCEPTION_STACK_FAULT jmp $ -ENDFUNC KiStackFault +ENDFUNC PUBLIC KiGeneralProtectionFault @@ -376,7 +376,7 @@ /* Return */ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiGeneralProtectionFault +ENDFUNC PUBLIC KiPageFault @@ -435,7 +435,7 @@ PageFaultReturn: /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiPageFault +ENDFUNC PUBLIC KiFloatingErrorFault @@ -448,7 +448,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiFloatingErrorFault +ENDFUNC PUBLIC KiAlignmentFault @@ -459,7 +459,7 @@ /* Bugcheck */ Fatal EXCEPTION_ALIGNMENT_CHECK jmp $ -ENDFUNC KiAlignmentFault +ENDFUNC PUBLIC KiMcheckAbort @@ -470,7 +470,7 @@ /* Bugcheck */ Fatal HEX(12) jmp $ -ENDFUNC KiMcheckAbort +ENDFUNC PUBLIC KiXmmException @@ -492,7 +492,7 @@ KiXmmExit: /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiXmmException +ENDFUNC PUBLIC KiRaiseAssertion @@ -508,7 +508,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiRaiseAssertion +ENDFUNC PUBLIC KiDebugServiceTrap @@ -524,7 +524,7 @@ /* Return */ ExitTrap TF_SAVE_ALL -.ENDP KiDebugServiceTrap +.ENDP PUBLIC KiApcInterrupt @@ -554,7 +554,7 @@ /* Return */ ExitTrap (TF_VOLATILES or TF_IRQL) -.ENDP KiApcInterrupt +.ENDP PUBLIC KiDpcInterrupt @@ -576,7 +576,7 @@ /* Return */ ExitTrap (TF_VOLATILES or TF_IRQL) -.ENDP KiDpcInterrupt +.ENDP PUBLIC KiIpiInterrupt @@ -595,7 +595,7 @@ /* Return */ ExitTrap (TF_VOLATILES or TF_IRQL) -.ENDP KiIpiInterrupt +.ENDP PUBLIC KiUnexpectedInterrupt @@ -616,7 +616,7 @@ #endif /* Return */ ExitTrap TF_SAVE_ALL -ENDFUNC KiUnexpectedInterrupt +ENDFUNC #ifdef _MSC_VER #undef lgdt Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Fri Oct 14 08:33:22 2011 @@ -627,7 +627,7 @@ @ stdcall KeLeaveCriticalRegion() _KeLeaveCriticalRegion @ stdcall KeLeaveGuardedRegion() _KeLeaveGuardedRegion @ extern KeLoaderBlock -@ cdecl -arch=x86_64 KeLowerIrql(long) +@ cdecl -arch=x86_64 -private KeLowerIrql(long) @ extern KeNumberProcessors _KeNumberProcessors @ stdcall -arch=i386,arm KeProfileInterrupt(ptr) @ stdcall KeProfileInterruptWithSource(ptr long) @@ -641,7 +641,7 @@ @ stdcall -arch=i386,arm KeQuerySystemTime(ptr) @ stdcall -arch=i386,arm KeQueryTickCount(ptr) @ stdcall KeQueryTimeIncrement() -@ cdecl -arch=x86_64 KeRaiseIrqlToDpcLevel() +@ cdecl -arch=x86_64 -private KeRaiseIrqlToDpcLevel() @ stdcall KeRaiseUserException(long) @ stdcall KeReadStateEvent(ptr) @ stdcall KeReadStateMutant(ptr) @@ -654,6 +654,7 @@ @ stdcall KeRegisterNmiCallback(ptr ptr) @ fastcall KeReleaseGuardedMutex(ptr) @ fastcall KeReleaseGuardedMutexUnsafe(ptr) +@ cdecl -arch=x86_64 KeReleaseInStackQueuedSpinLock(ptr) @ fastcall KeReleaseInStackQueuedSpinLockForDpc(ptr) @ fastcall KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) @ stdcall KeReleaseInterruptSpinLock(ptr long) @@ -716,7 +717,7 @@ @ fastcall -arch=i386,arm KefAcquireSpinLockAtDpcLevel(ptr) @ fastcall -arch=i386,arm KefReleaseSpinLockFromDpcLevel(ptr) @ stdcall -arch=i386 Kei386EoiHelper() -@ cdecl -arch=x86_64 KfRaiseIrql(long) +@ cdecl -arch=x86_64 -private KfRaiseIrql(long) @ fastcall -arch=i386 KiEoiHelper(ptr) @ fastcall -arch=i386,arm KiAcquireSpinLock(ptr) @ extern KiBugCheckData @@ -1080,6 +1081,8 @@ @ stdcall RtlConvertSidToUnicodeString(ptr ptr long) @ stdcall RtlConvertUlongToLargeInteger(long) @ stdcall RtlCopyLuid(ptr ptr) +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr int64) memmove +@ stdcall -arch=x86_64 RtlCopyMemoryNonTemporal(ptr ptr int64) memmove @ stdcall RtlCopyRangeList(ptr ptr) @ stdcall RtlCopySid(long ptr ptr) @ stdcall RtlCopyString(ptr ptr)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs