Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 45043: [usb/usbehci] - EhciDefferedRoutine: Fix late night brain fart by filling the members of the WorkItemData before queuing the work item.
by mjmartin＠svn.reactos.org 11 Jan '10

11 Jan '10

Author: mjmartin Date: Mon Jan 11 09:36:12 2010 New Revision: 45043 URL: http://svn.reactos.org/svn/reactos?rev=45043&view=rev Log: [usb/usbehci] - EhciDefferedRoutine: Fix late night brain fart by filling the members of the WorkItemData before queuing the work item. Modified: trunk/reactos/drivers/usb/usbehci/fdo.c Modified: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Mon Jan 11 09:36:12 2010 @@ -39,7 +39,6 @@ /* Check for port change on this port */ if (tmp & 0x02) { - PIO_WORKITEM WorkItem = NULL; PWORKITEM_DATA WorkItemData = NULL; /* Connect or Disconnect? */ @@ -86,13 +85,6 @@ FdoDeviceExtension->ChildDeviceCount++; CompletePendingRequest(FdoDeviceExtension); - WorkItem = IoAllocateWorkItem(FdoDeviceExtension->Pdo); - if (!WorkItem) - { - DPRINT1("WorkItem allocation failed!\n"); - break; - } - WorkItemData = ExAllocatePool(NonPagedPool, sizeof(WORKITEM_DATA)); if (!WorkItemData) { @@ -100,7 +92,17 @@ break; } - IoQueueWorkItem(WorkItem, + WorkItemData->IoWorkItem = IoAllocateWorkItem(FdoDeviceExtension->Pdo); + if (!WorkItemData->IoWorkItem) + { + DPRINT1("WorkItem allocation failed!\n"); + break; + } + + + WorkItemData->FdoDeviceExtension = FdoDeviceExtension; + + IoQueueWorkItem(WorkItemData->IoWorkItem, (PIO_WORKITEM_ROUTINE)DeviceArrivalWorkItem, DelayedWorkQueue, WorkItemData);

1 0

[jimtabor] 45042: [Win32k] - More movement to WND with updates to related files. Added new scroll and get/post message routines. In the mix we did moved to the MONITOR structure.
by jimtabor＠svn.reactos.org 11 Jan '10

11 Jan '10

Author: jimtabor Date: Mon Jan 11 08:36:48 2010 New Revision: 45042 URL: http://svn.reactos.org/svn/reactos?rev=45042&view=rev Log: [Win32k] - More movement to WND with updates to related files. Added new scroll and get/post message routines. In the mix we did moved to the MONITOR structure. Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h trunk/reactos/subsystems/win32/win32k/include/scroll.h trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c trunk/reactos/subsystems/win32/win32k/ntuser/focus.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/timer.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -1,35 +1,36 @@ #ifndef _WIN32K_MONITOR_H #define _WIN32K_MONITOR_H -//struct PDEVOBJ; - /* monitor object */ -typedef struct _MONITOR_OBJECT +typedef struct _MONITOR { - HANDLE Handle; /* system object handle */ - FAST_MUTEX Lock; /* R/W lock */ - - BOOL IsPrimary; /* wether this is the primary monitor */ - UNICODE_STRING DeviceName; /* name of the monitor */ - PDEVOBJ *GdiDevice; /* pointer to the GDI device to - which this monitor is attached */ - struct _MONITOR_OBJECT *Prev, *Next; /* doubly linked list */ - - // This is the structure Windows uses: -// HEAD head; -// struct _MONITOR_OBJECT *pMonitorNext; -// DWORD dwMONFlags; + HEAD head; +// + FAST_MUTEX Lock; /* R/W lock */ + UNICODE_STRING DeviceName; /* name of the monitor */ + PDEVOBJ *GdiDevice; /* pointer to the GDI device to + which this monitor is attached */ +// This is the structure Windows uses: +// struct _MONITOR* pMonitorNext; + union { + DWORD dwMONFlags; + struct { + DWORD IsVisible:1; + DWORD IsPalette:1; + DWORD IsPrimary:1; /* wether this is the primary monitor */ + };}; RECT rcMonitor; RECT rcWork; -// HRGN hrgnMonitor; -// SHORT Spare0; -// SHORT cWndStack; -// HDEV hDev; -// HDEV hDevReal; + HRGN hrgnMonitor; + SHORT Spare0; + SHORT cWndStack; + HDEV hDev; + HDEV hDevReal; // BYTE DockTargets[4][7]; -// struct _MONITOR_OBJECT* Flink; -// struct _MONITOR_OBJECT* Blink; -} MONITOR_OBJECT, *PMONITOR_OBJECT; +// Use LIST_ENTRY + struct _MONITOR* Next; //Flink; + struct _MONITOR* Prev; //Blink; +} MONITOR, *PMONITOR; /* functions */ NTSTATUS InitMonitorImpl(); @@ -37,7 +38,8 @@ NTSTATUS IntAttachMonitor(PDEVOBJ *pGdiDevice, ULONG DisplayNumber); NTSTATUS IntDetachMonitor(PDEVOBJ *pGdiDevice); -PMONITOR_OBJECT FASTCALL UserGetMonitorObject(IN HMONITOR); +PMONITOR FASTCALL UserGetMonitorObject(IN HMONITOR); +PMONITOR FASTCALL IntGetPrimaryMonitor(VOID); #endif /* _WIN32K_MONITOR_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/scroll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/scroll.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/scroll.h [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -1,5 +1,49 @@ #ifndef _WIN32K_SCROLL_H #define _WIN32K_SCROLL_H + +typedef struct tagSBCALC +{ + INT posMin; + INT posMax; + INT page; + INT pos; + INT pxTop; + INT pxBottom; + INT pxLeft; + INT pxRight; + INT cpxThumb; + INT pxUpArrow; + INT pxDownArrow; + INT pxStart; + INT pxThumbBottom; + INT pxThumbTop; + INT cpx; + INT pxMin; +} SBCALC, *PSBCALC; + +typedef VOID (NEAR NTAPI *PFN_SCROLLBAR)(PWND, UINT, WPARAM, LPARAM, PSBCALC); + +typedef struct tagSBTRACK +{ + ULONG fHitOld:1; + ULONG fTrackVert:1; + ULONG fCtlSB:1; + ULONG fTrackRecalc:1; + PWND spwndTrack; + PWND spwndSB; + PWND spwndSBNotify; + RECT rcTrack; + PFN_SCROLLBAR xxxpfnSB; + UINT cmdSB; + UINT_PTR hTimerSB; + INT dpxThumb; + INT pxOld; + INT posOld; + INT posNew; + INT nBar; + PSBCALC pSBCalc; +} SBTRACK, *PSBTRACK; + typedef struct _SBINFOEX { Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -88,6 +88,11 @@ PTHREADINFO ptiSibling; ULONG fsHooks; PHOOK sphkCurrent; + LPARAM lParamHkCurrent; + WPARAM wParamHkCurrent; + struct tagSBTRACK* pSBTrack; + HANDLE hEventQueueClient; + PKEVENT pEventQueueServer; LIST_ENTRY PtiLink; CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. @@ -107,6 +112,23 @@ ULONG_PTR Limit; ULONG Count; } W32HEAP_USER_MAPPING, *PW32HEAP_USER_MAPPING; + + +/* + Information from STARTUPINFOW, psdk/winbase.h. + Set from PsGetCurrentProcess()->Peb->ProcessParameters. +*/ +typedef struct tagUSERSTARTUPINFO +{ + ULONG cb; + DWORD dwX; // STARTF_USEPOSITION StartupInfo->dwX/Y + DWORD dwY; + DWORD dwXSize; // STARTF_USESIZE StartupInfo->dwX/YSize + DWORD dwYSize; + DWORD dwFlags; // STARTF_ StartupInfo->dwFlags + WORD wShowWindow; // StartupInfo->wShowWindow + USHORT cbReserved2; +} USERSTARTUPINFO, *PUSERSTARTUPINFO; typedef struct _W32PROCESS { @@ -130,10 +152,17 @@ typedef struct _PROCESSINFO { W32PROCESS; - + PTHREADINFO ptiList; + PTHREADINFO ptiMainThread; + struct _DESKTOP* rpdeskStartup; PCLS pclsPrivateList; PCLS pclsPublicList; + HMONITOR hMonitor; + + USERSTARTUPINFO usi; + ULONG Flags; + DWORD dwLayout; DWORD dwRegisteredClasses; /* ReactOS */ LIST_ENTRY ClassList; Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -39,8 +39,6 @@ HANDLE hrgnUpdate; /* Handle of the window region. */ HANDLE hrgnClip; - /* Pointer to the owning thread's message queue. */ - PUSER_MESSAGE_QUEUE MessageQueue; struct _WINDOW_OBJECT* spwndChild; struct _WINDOW_OBJECT* spwndNext; struct _WINDOW_OBJECT* spwndPrev; @@ -54,9 +52,7 @@ PDCE Dce; /* Scrollbar info */ PSBINFOEX pSBInfo; // convert to PSBINFO - PETHREAD OwnerThread; // Use Wnd->head.pti - /* counter for tiled child windows */ - ULONG TiledCounter; + PETHREAD OwnerThread; // Use Wnd->head.pti->pEThread /* WNDOBJ list */ LIST_ENTRY WndObjListHead; // Use Props } WINDOW_OBJECT; /* PWINDOW_OBJECT already declared at top of file */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/defwnd.c [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -67,7 +67,7 @@ co_IntSendMessage(WndChild->hSelf, WM_ENDSESSION, KillTimers, lParams); if (KillTimers) { - MsqRemoveTimersWindow(WndChild->MessageQueue, WndChild->hSelf); + MsqRemoveTimersWindow(WndChild->pti->MessageQueue, WndChild->hSelf); } lResult = MCSR_SHUTDOWNFINISHED; } @@ -90,7 +90,7 @@ co_IntSendMessage(pWindow->hSelf, WM_ENDSESSION, KillTimers, lParams); if (KillTimers) { - MsqRemoveTimersWindow(pWindow->MessageQueue, pWindow->hSelf); + MsqRemoveTimersWindow(pWindow->pti->MessageQueue, pWindow->hSelf); } lResult = MCSR_SHUTDOWNFINISHED; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/focus.c [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -235,26 +235,26 @@ return TRUE; } - hWndFocusPrev = (PrevForegroundQueue == FocusWindow->MessageQueue - ? FocusWindow->MessageQueue->FocusWindow : NULL); + hWndFocusPrev = (PrevForegroundQueue == FocusWindow->pti->MessageQueue + ? FocusWindow->pti->MessageQueue->FocusWindow : NULL); /* FIXME: Call hooks. */ co_IntSendDeactivateMessages(hWndPrev, hWnd); co_IntSendKillFocusMessages(hWndFocusPrev, hWndFocus); - IntSetFocusMessageQueue(Window->MessageQueue); - if (Window->MessageQueue) - { - Window->MessageQueue->ActiveWindow = hWnd; - } - - if (FocusWindow->MessageQueue) - { - FocusWindow->MessageQueue->FocusWindow = hWndFocus; - } - - if (PrevForegroundQueue != Window->MessageQueue) + IntSetFocusMessageQueue(Window->pti->MessageQueue); + if (Window->pti->MessageQueue) + { + Window->pti->MessageQueue->ActiveWindow = hWnd; + } + + if (FocusWindow->pti->MessageQueue) + { + FocusWindow->pti->MessageQueue->FocusWindow = hWndFocus; + } + + if (PrevForegroundQueue != Window->pti->MessageQueue) { /* FIXME: Send WM_ACTIVATEAPP to all thread windows. */ } @@ -482,7 +482,7 @@ pti = PsGetCurrentThreadWin32Thread(); ThreadQueue = pti->MessageQueue; - if (Window->MessageQueue != ThreadQueue) + if (Window->pti->MessageQueue != ThreadQueue) { SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); RETURN( 0); @@ -546,7 +546,7 @@ if((Window = UserGetWindowObject(hWnd))) { - if(Window->MessageQueue != ThreadQueue) + if(Window->pti->MessageQueue != ThreadQueue) { RETURN(NULL); } @@ -596,7 +596,7 @@ return( (ThreadQueue ? ThreadQueue->FocusWindow : 0)); } - if (Window->MessageQueue != ThreadQueue) + if (Window->pti->MessageQueue != ThreadQueue) { SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); return( 0); 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] Mon Jan 11 08:36:48 2010 @@ -458,7 +458,7 @@ Mesg.lParam = 0; /* The QS_HOTKEY is just a guess */ - MsqPostMessage(Window->MessageQueue, &Mesg, FALSE, QS_HOTKEY); + MsqPostMessage(Window->pti->MessageQueue, &Mesg, FALSE, QS_HOTKEY); } static VOID APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -541,7 +541,7 @@ UserRefObjectCo(Window, &Ref); - if ( ThreadQueue == Window->MessageQueue && + if ( ThreadQueue == Window->pti->MessageQueue && ThreadQueue->CaptureWindow != Window->hSelf) { /* only send WM_NCHITTEST messages if we're not capturing the window! */ @@ -559,7 +559,7 @@ UserRefObjectCo(DesktopWindow, &DesktopRef); - co_WinPosWindowFromPoint(DesktopWindow, Window->MessageQueue, &Msg->pt, &Wnd); + co_WinPosWindowFromPoint(DesktopWindow, Window->pti->MessageQueue, &Msg->pt, &Wnd); if (Wnd) { if (Wnd != Window) @@ -568,7 +568,7 @@ Msg->hwnd = Wnd->hSelf; if(!(Wnd->state & WINDOWSTATUS_DESTROYING)) { - MsqPostMessage(Wnd->MessageQueue, Msg, FALSE, + MsqPostMessage(Wnd->pti->MessageQueue, Msg, FALSE, Msg->message == WM_MOUSEMOVE ? QS_MOUSEMOVE : QS_MOUSEBUTTON); } @@ -671,9 +671,27 @@ ThreadQueue = pti->MessageQueue; /* Inspect RemoveMsg flags */ - /* FIXME: The only flag we process is PM_REMOVE - processing of others must still be implemented */ + /* Note: + The only flag we process is PM_REMOVE. + Processing (High word) PM_QS_Xx Is needed. This and MsgFilterXxx can result + with QS_Xx flags to be used to isolate which message check to test for. + ATM, we look at all messages and the filters are sent to co_MsqFindMessage + and there, it is cross checked. + Example: Wine server/queue.c is_keyboard_msg, check_msg_filter and + filter_contains_hw_range. + */ RemoveMessages = RemoveMsg & PM_REMOVE; +/* + If no filter is specified, messages are processed in the following order: + + * Sent messages + * Posted messages + * Input (hardware) messages and system internal events + * Sent messages (again) + * WM_PAINT messages + * WM_TIMER messages + */ CheckMessages: Present = FALSE; @@ -834,7 +852,8 @@ goto MsgExit; } - if ( ( Msg->Msg.hwnd && Msg->Msg.message >= WM_MOUSEFIRST && + if ( ( Msg->Msg.hwnd && + Msg->Msg.message >= WM_MOUSEFIRST && Msg->Msg.message <= WM_MOUSELAST ) && co_IntTranslateMouseMessage( ThreadQueue, &Msg->Msg, @@ -908,6 +927,139 @@ return Present; } +static NTSTATUS FASTCALL +CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEntry) +{ + NTSTATUS Status; + + PVOID KernelMem; + UINT Size; + + *KernelModeMsg = *UserModeMsg; + + /* See if this message type is present in the table */ + if (NULL == MsgMemoryEntry) + { + /* Not present, no copying needed */ + return STATUS_SUCCESS; + } + + /* Determine required size */ + Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); + + if (0 != Size) + { + /* Allocate kernel mem */ + KernelMem = ExAllocatePoolWithTag(PagedPool, Size, TAG_MSG); + if (NULL == KernelMem) + { + DPRINT1("Not enough memory to copy message to kernel mem\n"); + return STATUS_NO_MEMORY; + } + KernelModeMsg->lParam = (LPARAM) KernelMem; + + /* Copy data if required */ + if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) + { + Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); + ExFreePoolWithTag(KernelMem, TAG_MSG); + return Status; + } + } + else + { + /* Make sure we don't pass any secrets to usermode */ + RtlZeroMemory(KernelMem, Size); + } + } + else + { + KernelModeMsg->lParam = 0; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS FASTCALL +CopyMsgToUserMem(MSG *UserModeMsg, MSG *KernelModeMsg) +{ + NTSTATUS Status; + PMSGMEMORY MsgMemoryEntry; + UINT Size; + + /* See if this message type is present in the table */ + MsgMemoryEntry = FindMsgMemory(UserModeMsg->message); + if (NULL == MsgMemoryEntry) + { + /* Not present, no copying needed */ + return STATUS_SUCCESS; + } + + /* Determine required size */ + Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); + + if (0 != Size) + { + /* Copy data if required */ + if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_WRITE)) + { + Status = MmCopyToCaller((PVOID) UserModeMsg->lParam, (PVOID) KernelModeMsg->lParam, Size); + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed to copy message from kernel: invalid usermode buffer\n"); + ExFreePool((PVOID) KernelModeMsg->lParam); + return Status; + } + } + + ExFreePool((PVOID) KernelModeMsg->lParam); + } + + return STATUS_SUCCESS; +} + +static BOOL FASTCALL +co_IntWaitMessage( PWINDOW_OBJECT Window, + UINT MsgFilterMin, + UINT MsgFilterMax ) +{ + PTHREADINFO pti; + PUSER_MESSAGE_QUEUE ThreadQueue; + NTSTATUS Status = STATUS_SUCCESS; + USER_MESSAGE Msg; + + pti = PsGetCurrentThreadWin32Thread(); + ThreadQueue = pti->MessageQueue; + + do + { + if ( co_IntPeekMessage( &Msg, + Window, + MsgFilterMin, + MsgFilterMax, + PM_NOREMOVE)) + { + return TRUE; + } + /* Nothing found. Wait for new messages. */ + Status = co_MsqWaitForNewMessages( ThreadQueue, + Window, + MsgFilterMin, + MsgFilterMax); + } + while ( (STATUS_WAIT_0 <= Status && Status <= STATUS_WAIT_63) || + STATUS_TIMEOUT == Status ); + + SetLastNtError(Status); + + DPRINT1("Exit co_IntWaitMessage on error!\n"); + + return FALSE; +} + BOOL FASTCALL co_IntGetPeekMessage( PMSG pMsg, HWND hWnd, @@ -916,142 +1068,72 @@ UINT RemoveMsg, BOOL bGMSG ) { + BOOL Present; + PWINDOW_OBJECT Window; + USER_MESSAGE Msg; + + if ( hWnd == HWND_TOPMOST || + hWnd == HWND_BROADCAST ) + hWnd = HWND_BOTTOM; + + /* Validate input */ + if (hWnd && hWnd != HWND_BOTTOM) + { + if (!(Window = UserGetWindowObject(hWnd))) + { + if (bGMSG) + return -1; + else + return FALSE; + } + } + else + { + Window = (PWINDOW_OBJECT)hWnd; + } + + if (MsgFilterMax < MsgFilterMin) + { + MsgFilterMin = 0; + MsgFilterMax = 0; + } + + do + { + Present = co_IntPeekMessage( &Msg, + Window, + MsgFilterMin, + MsgFilterMax, + RemoveMsg ); + if (Present) + { + RtlCopyMemory( pMsg, &Msg.Msg, sizeof(MSG)); + + if (bGMSG) + return (WM_QUIT != pMsg->message); + else + return TRUE; + } + + if ( bGMSG && !co_IntWaitMessage(Window, MsgFilterMin, MsgFilterMax) ) + { + return -1; + } + else + { + if (!(RemoveMsg & PM_NOYIELD)) + { + // Yield this thread! + UserLeave(); + ZwYieldExecution(); + UserEnterExclusive(); + // Fall through to fail. + } + } + } + while( bGMSG && !Present ); + return FALSE; -} - - -static BOOL FASTCALL -co_IntWaitMessage( PWINDOW_OBJECT Window, - UINT MsgFilterMin, - UINT MsgFilterMax ) -{ - PTHREADINFO pti; - PUSER_MESSAGE_QUEUE ThreadQueue; - NTSTATUS Status = STATUS_SUCCESS; - USER_MESSAGE Msg; - - pti = PsGetCurrentThreadWin32Thread(); - ThreadQueue = pti->MessageQueue; - - do - { - if ( co_IntPeekMessage( &Msg, - Window, - MsgFilterMin, - MsgFilterMax, - PM_NOREMOVE)) - { - return TRUE; - } - /* Nothing found. Wait for new messages. */ - Status = co_MsqWaitForNewMessages( ThreadQueue, - Window, - MsgFilterMin, - MsgFilterMax); - } - while ( (STATUS_WAIT_0 <= Status && Status <= STATUS_WAIT_63) || - STATUS_TIMEOUT == Status ); - - SetLastNtError(Status); - - DPRINT1("Exit co_IntWaitMessage on error!\n"); - - return FALSE; -} - - -static NTSTATUS FASTCALL -CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg, PMSGMEMORY MsgMemoryEntry) -{ - NTSTATUS Status; - - PVOID KernelMem; - UINT Size; - - *KernelModeMsg = *UserModeMsg; - - /* See if this message type is present in the table */ - if (NULL == MsgMemoryEntry) - { - /* Not present, no copying needed */ - return STATUS_SUCCESS; - } - - /* Determine required size */ - Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); - - if (0 != Size) - { - /* Allocate kernel mem */ - KernelMem = ExAllocatePoolWithTag(PagedPool, Size, TAG_MSG); - if (NULL == KernelMem) - { - DPRINT1("Not enough memory to copy message to kernel mem\n"); - return STATUS_NO_MEMORY; - } - KernelModeMsg->lParam = (LPARAM) KernelMem; - - /* Copy data if required */ - if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_READ)) - { - Status = MmCopyFromCaller(KernelMem, (PVOID) UserModeMsg->lParam, Size); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to copy message to kernel: invalid usermode buffer\n"); - ExFreePoolWithTag(KernelMem, TAG_MSG); - return Status; - } - } - else - { - /* Make sure we don't pass any secrets to usermode */ - RtlZeroMemory(KernelMem, Size); - } - } - else - { - KernelModeMsg->lParam = 0; - } - - return STATUS_SUCCESS; -} - -static NTSTATUS FASTCALL -CopyMsgToUserMem(MSG *UserModeMsg, MSG *KernelModeMsg) -{ - NTSTATUS Status; - PMSGMEMORY MsgMemoryEntry; - UINT Size; - - /* See if this message type is present in the table */ - MsgMemoryEntry = FindMsgMemory(UserModeMsg->message); - if (NULL == MsgMemoryEntry) - { - /* Not present, no copying needed */ - return STATUS_SUCCESS; - } - - /* Determine required size */ - Size = MsgMemorySize(MsgMemoryEntry, UserModeMsg->wParam, UserModeMsg->lParam); - - if (0 != Size) - { - /* Copy data if required */ - if (0 != (MsgMemoryEntry->Flags & MMS_FLAG_WRITE)) - { - Status = MmCopyToCaller((PVOID) UserModeMsg->lParam, (PVOID) KernelModeMsg->lParam, Size); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to copy message from kernel: invalid usermode buffer\n"); - ExFreePool((PVOID) KernelModeMsg->lParam); - return Status; - } - } - - ExFreePool((PVOID) KernelModeMsg->lParam); - } - - return STATUS_SUCCESS; } BOOL FASTCALL @@ -1079,7 +1161,9 @@ if( Status == STATUS_SUCCESS ) { pThread = (PTHREADINFO)peThread->Tcb.Win32Thread; - if( !pThread || !pThread->MessageQueue || (pThread->TIF_flags & TIF_INCLEANUP)) + if( !pThread || + !pThread->MessageQueue || + (pThread->TIF_flags & TIF_INCLEANUP)) { ObDereferenceObject( peThread ); return FALSE; @@ -1168,7 +1252,7 @@ if (WM_QUIT == Msg) { - MsqPostQuitMessage(Window->MessageQueue, wParam); + MsqPostQuitMessage(Window->pti->MessageQueue, wParam); } else { @@ -1179,7 +1263,7 @@ Message.pt = gpsi->ptCursor; KeQueryTickCount(&LargeTickCount); pti->timeLast = Message.time = MsqCalculateMessageTime(&LargeTickCount); - MsqPostMessage(Window->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); + MsqPostMessage(Window->pti->MessageQueue, &Message, FALSE, QS_POSTMESSAGE); } } return TRUE; @@ -1232,7 +1316,7 @@ IntCallWndProc( Window, hWnd, Msg, wParam, lParam); if ( NULL != Win32Thread && - Window->MessageQueue == Win32Thread->MessageQueue) + Window->pti->MessageQueue == Win32Thread->MessageQueue) { if (Win32Thread->TIF_flags & TIF_INCLEANUP) { @@ -1280,7 +1364,7 @@ RETURN( TRUE); } - if (uFlags & SMTO_ABORTIFHUNG && MsqIsHung(Window->MessageQueue)) + if (uFlags & SMTO_ABORTIFHUNG && MsqIsHung(Window->pti->MessageQueue)) { /* FIXME - Set a LastError? */ RETURN( FALSE); @@ -1295,19 +1379,19 @@ do { - Status = co_MsqSendMessage( Window->MessageQueue, - hWnd, - Msg, - wParam, - lParam, - uTimeout, - (uFlags & SMTO_BLOCK), - MSQ_NORMAL, - uResult ); + Status = co_MsqSendMessage( Window->pti->MessageQueue, + hWnd, + Msg, + wParam, + lParam, + uTimeout, + (uFlags & SMTO_BLOCK), + MSQ_NORMAL, + uResult ); } while ((STATUS_TIMEOUT == Status) && (uFlags & SMTO_NOTIMEOUTIFNOTHUNG) && - !MsqIsHung(Window->MessageQueue)); + !MsqIsHung(Window->pti->MessageQueue)); IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); @@ -1404,7 +1488,7 @@ pti = PsGetCurrentThreadWin32Thread(); - if ( Window->MessageQueue != pti->MessageQueue && + if ( Window->pti->MessageQueue != pti->MessageQueue && FindMsgMemory(Msg) == 0 ) { Result = UserPostMessage(hWnd, Msg, wParam, lParam); @@ -1464,7 +1548,7 @@ // This is checked in user mode!!!!!!! if ( HWND_BROADCAST != hWnd && NULL != pti && - Window->MessageQueue == pti->MessageQueue && + Window->pti->MessageQueue == pti->MessageQueue && !ISITHOOKED(WH_CALLWNDPROC) && !ISITHOOKED(WH_CALLWNDPROCRET) && ( Msg < WM_DDE_FIRST || Msg > WM_DDE_LAST ) ) @@ -1585,7 +1669,7 @@ pti = PsGetCurrentThreadWin32Thread(); - if (Window->MessageQueue != pti->MessageQueue) + if (Window->pti->MessageQueue != pti->MessageQueue) { // Send message w/o waiting for it. Result = UserPostMessage(hWnd, Msg, wParam, lParam); } @@ -1926,6 +2010,8 @@ RETURN( Ret); } + RtlZeroMemory(&Msg, sizeof(MSG)); + Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, PM_REMOVE, TRUE); if (Ret) @@ -2071,6 +2157,8 @@ SetLastWin32Error(ERROR_INVALID_FLAGS); RETURN( Ret); } + + RtlZeroMemory(&Msg, sizeof(MSG)); Ret = co_IntGetPeekMessage(&Msg, hWnd, MsgFilterMin, MsgFilterMax, RemoveMsg, FALSE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -41,7 +41,7 @@ /* GLOBALS *******************************************************************/ /* list of monitors */ -static PMONITOR_OBJECT gMonitorList = NULL; +static PMONITOR gMonitorList = NULL; /* INITALIZATION FUNCTIONS ****************************************************/ @@ -76,26 +76,26 @@ /* IntCreateMonitorObject * - * Creates a MONITOR_OBJECT + * Creates a MONITOR * * Return value - * If the function succeeds a pointer to a MONITOR_OBJECT is returned. On failure + * If the function succeeds a pointer to a MONITOR is returned. On failure * NULL is returned. */ static -PMONITOR_OBJECT +PMONITOR IntCreateMonitorObject() { HANDLE Handle; - PMONITOR_OBJECT Monitor; - - Monitor = UserCreateObject(gHandleTable, &Handle, otMonitor, sizeof (MONITOR_OBJECT)); + PMONITOR Monitor; + + Monitor = UserCreateObject(gHandleTable, &Handle, otMonitor, sizeof (MONITOR)); if (Monitor == NULL) { return NULL; } - Monitor->Handle = Handle; + Monitor->head.h = Handle; ExInitializeFastMutex(&Monitor->Lock); return Monitor; @@ -103,27 +103,27 @@ /* IntDestroyMonitorObject * - * Destroys a MONITOR_OBJECT + * Destroys a MONITOR * You have to be the owner of the monitors lock to safely destroy it. * * Arguments * * pMonitor - * Pointer to the MONITOR_OBJECT which shall be deleted + * Pointer to the MONITOR which shall be deleted */ static void -IntDestroyMonitorObject(IN PMONITOR_OBJECT pMonitor) +IntDestroyMonitorObject(IN PMONITOR pMonitor) { RtlFreeUnicodeString(&pMonitor->DeviceName); UserDereferenceObject(pMonitor); } -PMONITOR_OBJECT FASTCALL +PMONITOR FASTCALL UserGetMonitorObject(IN HMONITOR hMonitor) { - PMONITOR_OBJECT Monitor; + PMONITOR Monitor; if (!hMonitor) { @@ -132,7 +132,7 @@ } - Monitor = (PMONITOR_OBJECT)UserGetObject(gHandleTable, hMonitor, otMonitor); + Monitor = (PMONITOR)UserGetObject(gHandleTable, hMonitor, otMonitor); if (!Monitor) { SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); @@ -147,7 +147,7 @@ /* IntAttachMonitor * - * Creates a new MONITOR_OBJECT and appends it to the list of monitors. + * Creates a new MONITOR and appends it to the list of monitors. * * Arguments * @@ -161,7 +161,7 @@ IntAttachMonitor(IN PDEVOBJ *pGdiDevice, IN ULONG DisplayNumber) { - PMONITOR_OBJECT Monitor; + PMONITOR Monitor; WCHAR Buffer[CCHDEVICENAME]; DPRINT("Attaching monitor...\n"); @@ -179,11 +179,18 @@ { DPRINT("Couldn't duplicate monitor name!\n"); UserDereferenceObject(Monitor); - UserDeleteObject(Monitor->Handle, otMonitor); + UserDeleteObject(Monitor->head.h, otMonitor); return STATUS_INSUFFICIENT_RESOURCES; } Monitor->GdiDevice = pGdiDevice; + Monitor->rcMonitor.left = 0; + Monitor->rcMonitor.top = 0; + Monitor->rcMonitor.right = Monitor->rcMonitor.left + pGdiDevice->gdiinfo.ulHorzRes; + Monitor->rcMonitor.bottom = Monitor->rcMonitor.top + pGdiDevice->gdiinfo.ulVertRes; + Monitor->rcWork = Monitor->rcMonitor; + Monitor->cWndStack = 0; + if (gMonitorList == NULL) { DPRINT("Primary monitor is beeing attached\n"); @@ -192,7 +199,7 @@ } else { - PMONITOR_OBJECT p; + PMONITOR p; DPRINT("Additional monitor is beeing attached\n"); for (p = gMonitorList; p->Next != NULL; p = p->Next) { @@ -206,7 +213,7 @@ /* IntDetachMonitor * - * Deletes a MONITOR_OBJECT and removes it from the list of monitors. + * Deletes a MONITOR and removes it from the list of monitors. * * Arguments * @@ -218,7 +225,7 @@ NTSTATUS IntDetachMonitor(IN PDEVOBJ *pGdiDevice) { - PMONITOR_OBJECT Monitor; + PMONITOR Monitor; for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) { @@ -234,7 +241,7 @@ if (Monitor->IsPrimary && (Monitor->Next != NULL || Monitor->Prev != NULL)) { - PMONITOR_OBJECT NewPrimaryMonitor = (Monitor->Prev != NULL) ? (Monitor->Prev) : (Monitor->Next); + PMONITOR NewPrimaryMonitor = (Monitor->Prev != NULL) ? (Monitor->Prev) : (Monitor->Next); ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&NewPrimaryMonitor->Lock); NewPrimaryMonitor->IsPrimary = TRUE; @@ -261,16 +268,16 @@ /* IntGetPrimaryMonitor * - * Returns a PMONITOR_OBJECT for the primary monitor + * Returns a PMONITOR for the primary monitor * * Return value - * PMONITOR_OBJECT - */ -static -PMONITOR_OBJECT + * PMONITOR + */ +PMONITOR +FASTCALL IntGetPrimaryMonitor() { - PMONITOR_OBJECT Monitor; + PMONITOR Monitor; for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) { @@ -321,7 +328,7 @@ OPTIONAL IN DWORD listSize, OPTIONAL IN DWORD flags) { - PMONITOR_OBJECT Monitor, NearestMonitor = NULL, PrimaryMonitor = NULL; + PMONITOR Monitor, NearestMonitor = NULL, PrimaryMonitor = NULL; UINT iCount = 0; LONG iNearestDistanceX = 0x7fffffff, iNearestDistanceY = 0x7fffffff; @@ -391,7 +398,7 @@ if (iCount < listSize) { if (hMonitorList != NULL) - hMonitorList[iCount] = Monitor->Handle; + hMonitorList[iCount] = Monitor->head.h; if (monitorRectList != NULL) monitorRectList[iCount] = IntersectionRect; } @@ -403,7 +410,7 @@ if (iCount < listSize) { if (hMonitorList != NULL) - hMonitorList[iCount] = NearestMonitor->Handle; + hMonitorList[iCount] = NearestMonitor->head.h; } iCount++; } @@ -412,7 +419,7 @@ if (iCount < listSize) { if (hMonitorList != NULL) - hMonitorList[iCount] = PrimaryMonitor->Handle; + hMonitorList[iCount] = PrimaryMonitor->head.h; } iCount++; } @@ -628,7 +635,7 @@ IN HMONITOR hMonitor, OUT LPMONITORINFO pMonitorInfo) { - PMONITOR_OBJECT Monitor; + PMONITOR Monitor; MONITORINFOEXW MonitorInfo; NTSTATUS Status; DECLARE_RETURN(BOOL); @@ -746,9 +753,9 @@ { if (dwFlags == MONITOR_DEFAULTTOPRIMARY) { - PMONITOR_OBJECT MonitorObj = IntGetPrimaryMonitor(); + PMONITOR MonitorObj = IntGetPrimaryMonitor(); if (MonitorObj) - hMonitor = MonitorObj->Handle; + hMonitor = MonitorObj->head.h; } else if (dwFlags == MONITOR_DEFAULTTONEAREST) { @@ -811,9 +818,9 @@ { if (dwFlags == MONITOR_DEFAULTTOPRIMARY) { - PMONITOR_OBJECT monitorObj = IntGetPrimaryMonitor(); + PMONITOR monitorObj = IntGetPrimaryMonitor(); if (monitorObj) - return monitorObj->Handle; + return monitorObj->head.h; } else if (dwFlags == MONITOR_DEFAULTTONEAREST) { 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] Mon Jan 11 08:36:48 2010 @@ -395,7 +395,7 @@ return(FALSE); } - if (CaptureWindow->MessageQueue != MessageQueue) + if (CaptureWindow->pti->MessageQueue != MessageQueue) { if (! FromGlobalQueue) { @@ -418,34 +418,34 @@ /* lock the destination message queue, so we don't get in trouble with other threads, messing with it at the same time */ - IntLockHardwareMessageQueue(CaptureWindow->MessageQueue); - InsertTailList(&CaptureWindow->MessageQueue->HardwareMessagesListHead, + IntLockHardwareMessageQueue(CaptureWindow->pti->MessageQueue); + InsertTailList(&CaptureWindow->pti->MessageQueue->HardwareMessagesListHead, &Message->ListEntry); if(Message->Msg.message == WM_MOUSEMOVE) { - if(CaptureWindow->MessageQueue->MouseMoveMsg) + if(CaptureWindow->pti->MessageQueue->MouseMoveMsg) { /* remove the old WM_MOUSEMOVE message, we're processing a more recent one */ - RemoveEntryList(&CaptureWindow->MessageQueue->MouseMoveMsg->ListEntry); - ExFreePool(CaptureWindow->MessageQueue->MouseMoveMsg); + RemoveEntryList(&CaptureWindow->pti->MessageQueue->MouseMoveMsg->ListEntry); + ExFreePool(CaptureWindow->pti->MessageQueue->MouseMoveMsg); } /* save the pointer to the WM_MOUSEMOVE message in the new queue */ - CaptureWindow->MessageQueue->MouseMoveMsg = Message; - - CaptureWindow->MessageQueue->QueueBits |= QS_MOUSEMOVE; - CaptureWindow->MessageQueue->ChangedBits |= QS_MOUSEMOVE; - if (CaptureWindow->MessageQueue->WakeMask & QS_MOUSEMOVE) - KeSetEvent(CaptureWindow->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + CaptureWindow->pti->MessageQueue->MouseMoveMsg = Message; + + CaptureWindow->pti->MessageQueue->QueueBits |= QS_MOUSEMOVE; + CaptureWindow->pti->MessageQueue->ChangedBits |= QS_MOUSEMOVE; + if (CaptureWindow->pti->MessageQueue->WakeMask & QS_MOUSEMOVE) + KeSetEvent(CaptureWindow->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); } else { - CaptureWindow->MessageQueue->QueueBits |= QS_MOUSEBUTTON; - CaptureWindow->MessageQueue->ChangedBits |= QS_MOUSEBUTTON; - if (CaptureWindow->MessageQueue->WakeMask & QS_MOUSEBUTTON) - KeSetEvent(CaptureWindow->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); - } - IntUnLockHardwareMessageQueue(CaptureWindow->MessageQueue); + CaptureWindow->pti->MessageQueue->QueueBits |= QS_MOUSEBUTTON; + CaptureWindow->pti->MessageQueue->ChangedBits |= QS_MOUSEBUTTON; + if (CaptureWindow->pti->MessageQueue->WakeMask & QS_MOUSEBUTTON) + KeSetEvent(CaptureWindow->pti->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); + } + IntUnLockHardwareMessageQueue(CaptureWindow->pti->MessageQueue); *Freed = FALSE; UserDereferenceObject(CaptureWindow); @@ -466,21 +466,21 @@ /* Lock the message queue so no other thread can mess with it. Our own message queue is not locked while fetching from the global queue, so we have to make sure nothing interferes! */ - IntLockHardwareMessageQueue(CaptureWindow->MessageQueue); + IntLockHardwareMessageQueue(CaptureWindow->pti->MessageQueue); /* if we're from the global queue, we need to add our message to our private queue so we don't loose it! */ - InsertTailList(&CaptureWindow->MessageQueue->HardwareMessagesListHead, + InsertTailList(&CaptureWindow->pti->MessageQueue->HardwareMessagesListHead, &Message->ListEntry); } if (Message->Msg.message == WM_MOUSEMOVE) { - if(CaptureWindow->MessageQueue->MouseMoveMsg && - (CaptureWindow->MessageQueue->MouseMoveMsg != Message)) + if(CaptureWindow->pti->MessageQueue->MouseMoveMsg && + (CaptureWindow->pti->MessageQueue->MouseMoveMsg != Message)) { /* delete the old message */ - RemoveEntryList(&CaptureWindow->MessageQueue->MouseMoveMsg->ListEntry); - ExFreePool(CaptureWindow->MessageQueue->MouseMoveMsg); + RemoveEntryList(&CaptureWindow->pti->MessageQueue->MouseMoveMsg->ListEntry); + ExFreePool(CaptureWindow->pti->MessageQueue->MouseMoveMsg); if (!FromGlobalQueue) { // We might have deleted the next one in our queue, so fix next @@ -489,11 +489,11 @@ } /* always save a pointer to this WM_MOUSEMOVE message here because we're sure that the message is in the private queue */ - CaptureWindow->MessageQueue->MouseMoveMsg = Message; + CaptureWindow->pti->MessageQueue->MouseMoveMsg = Message; } if(FromGlobalQueue) { - IntUnLockHardwareMessageQueue(CaptureWindow->MessageQueue); + IntUnLockHardwareMessageQueue(CaptureWindow->pti->MessageQueue); } UserDereferenceObject(CaptureWindow); @@ -516,22 +516,22 @@ /* Lock the message queue so no other thread can mess with it. Our own message queue is not locked while fetching from the global queue, so we have to make sure nothing interferes! */ - IntLockHardwareMessageQueue(CaptureWindow->MessageQueue); - if(CaptureWindow->MessageQueue->MouseMoveMsg) + IntLockHardwareMessageQueue(CaptureWindow->pti->MessageQueue); + if(CaptureWindow->pti->MessageQueue->MouseMoveMsg) { /* delete the WM_(NC)MOUSEMOVE message in the private queue, we're dealing with one that's been sent later */ - RemoveEntryList(&CaptureWindow->MessageQueue->MouseMoveMsg->ListEntry); - ExFreePool(CaptureWindow->MessageQueue->MouseMoveMsg); + RemoveEntryList(&CaptureWindow->pti->MessageQueue->MouseMoveMsg->ListEntry); + ExFreePool(CaptureWindow->pti->MessageQueue->MouseMoveMsg); /* our message is not in the private queue so we can remove the pointer instead of setting it to the current message we're processing */ - CaptureWindow->MessageQueue->MouseMoveMsg = NULL; + CaptureWindow->pti->MessageQueue->MouseMoveMsg = NULL; } - IntUnLockHardwareMessageQueue(CaptureWindow->MessageQueue); - } - else if (CaptureWindow->MessageQueue->MouseMoveMsg == Message) - { - CaptureWindow->MessageQueue->MouseMoveMsg = NULL; + IntUnLockHardwareMessageQueue(CaptureWindow->pti->MessageQueue); + } + else if (CaptureWindow->pti->MessageQueue->MouseMoveMsg == Message) + { + CaptureWindow->pti->MessageQueue->MouseMoveMsg = NULL; } } @@ -884,7 +884,7 @@ KeQueryTickCount(&LargeTickCount); Mesg.time = MsqCalculateMessageTime(&LargeTickCount); Mesg.pt = gpsi->ptCursor; - MsqPostMessage(Window->MessageQueue, &Mesg, FALSE, QS_HOTKEY); + MsqPostMessage(Window->pti->MessageQueue, &Mesg, FALSE, QS_HOTKEY); UserDereferenceObject(Window); ObDereferenceObject (Thread); @@ -1057,7 +1057,7 @@ ASSERT(Window); - MessageQueue = Window->MessageQueue; + MessageQueue = Window->pti->MessageQueue; ASSERT(MessageQueue); /* remove the posted messages for this window */ @@ -1363,9 +1363,12 @@ if (Hardware) { - return(co_MsqPeekHardwareMessage(MessageQueue, Window, - MsgFilterLow, MsgFilterHigh, - Remove, Message)); + return(co_MsqPeekHardwareMessage( MessageQueue, + Window, + MsgFilterLow, + MsgFilterHigh, + Remove, + Message)); } CurrentEntry = MessageQueue->PostedMessagesListHead.Flink; @@ -1374,10 +1377,12 @@ { CurrentMessage = CONTAINING_RECORD(CurrentEntry, USER_MESSAGE, ListEntry); - if ((!Window || PtrToInt(Window) == 1 || Window->hSelf == CurrentMessage->Msg.hwnd) && - ((MsgFilterLow == 0 && MsgFilterHigh == 0) || - (MsgFilterLow <= CurrentMessage->Msg.message && - MsgFilterHigh >= CurrentMessage->Msg.message))) + if ( ( !Window || + PtrToInt(Window) == 1 || + Window->hSelf == CurrentMessage->Msg.hwnd ) && + ( (MsgFilterLow == 0 && MsgFilterHigh == 0) || + ( MsgFilterLow <= CurrentMessage->Msg.message && + MsgFilterHigh >= CurrentMessage->Msg.message ) ) ) { if (Remove) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -196,7 +196,7 @@ GreDeleteObject(Window->hrgnUpdate); Window->hrgnUpdate = NULL; if (!(Window->state & WINDOWOBJECT_NEED_INTERNALPAINT)) - MsqDecPaintCountQueue(Window->MessageQueue); + MsqDecPaintCountQueue(Window->pti->MessageQueue); } } @@ -248,7 +248,7 @@ { TempRegion = IntGetNCUpdateRgn(Window, TRUE); Window->state &= ~WINDOWOBJECT_NEED_NCPAINT; - MsqDecPaintCountQueue(Window->MessageQueue); + MsqDecPaintCountQueue(Window->pti->MessageQueue); co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)TempRegion, 0); if ((HANDLE) 1 != TempRegion && NULL != TempRegion) { @@ -465,17 +465,17 @@ if (HasPaintMessage != HadPaintMessage) { if (HadPaintMessage) - MsqDecPaintCountQueue(Window->MessageQueue); + MsqDecPaintCountQueue(Window->pti->MessageQueue); else - MsqIncPaintCountQueue(Window->MessageQueue); + MsqIncPaintCountQueue(Window->pti->MessageQueue); } if (HasNCPaintMessage != HadNCPaintMessage) { if (HadNCPaintMessage) - MsqDecPaintCountQueue(Window->MessageQueue); + MsqDecPaintCountQueue(Window->pti->MessageQueue); else - MsqIncPaintCountQueue(Window->MessageQueue); + MsqIncPaintCountQueue(Window->pti->MessageQueue); } } @@ -776,7 +776,7 @@ hRgn = IntGetNCUpdateRgn(Window, FALSE); Window->state &= ~WINDOWOBJECT_NEED_NCPAINT; - MsqDecPaintCountQueue(Window->MessageQueue); + MsqDecPaintCountQueue(Window->pti->MessageQueue); co_IntSendMessage(hWnd, WM_NCPAINT, (WPARAM)hRgn, 0); if (hRgn != (HANDLE)1 && hRgn != NULL) { @@ -795,7 +795,7 @@ if (Window->hrgnUpdate != NULL) { - MsqDecPaintCountQueue(Window->MessageQueue); + MsqDecPaintCountQueue(Window->pti->MessageQueue); GdiGetClipBox(Ps.hdc, &Ps.rcPaint); GDIOBJ_SetOwnership(Window->hrgnUpdate, PsGetCurrentProcess()); /* The region is part of the dc now and belongs to the process! */ @@ -804,7 +804,7 @@ else { if (Window->state & WINDOWOBJECT_NEED_INTERNALPAINT) - MsqDecPaintCountQueue(Window->MessageQueue); + MsqDecPaintCountQueue(Window->pti->MessageQueue); IntGetClientRect(Window, &Ps.rcPaint); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -228,6 +228,53 @@ } return TRUE; +} + +BOOL FASTCALL +NEWco_IntGetScrollInfo( + PWND pWnd, + INT nBar, + PSBDATA pSBData, + LPSCROLLINFO lpsi) +{ + UINT Mask; + PSBTRACK pSBTrack = pWnd->head.pti->pSBTrack; + + if (!SBID_IS_VALID(nBar)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + DPRINT1("Trying to get scrollinfo for unknown scrollbar type %d\n", nBar); + return FALSE; + } + + Mask = lpsi->fMask; + + if (0 != (Mask & SIF_PAGE)) + { + lpsi->nPage = pSBData->page; + } + + if (0 != (Mask & SIF_POS)) + { + lpsi->nPos = pSBData->pos; + } + + if (0 != (Mask & SIF_RANGE)) + { + lpsi->nMin = pSBData->posMin; + lpsi->nMax = pSBData->posMax; + } + + if (0 != (Mask & SIF_TRACKPOS)) + { + if ( pSBTrack && + pSBTrack->nBar == nBar && + pSBTrack->spwndTrack == pWnd ) + lpsi->nTrackPos = pSBTrack->posNew; + else + lpsi->nTrackPos = pSBData->pos; + } + return (Mask & SIF_ALL) !=0; } static DWORD FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/timer.c [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -427,7 +427,7 @@ } Ret = IDEvent; - MessageQueue = Window->MessageQueue; + MessageQueue = Window->pti->MessageQueue; } #if 0 @@ -489,7 +489,7 @@ IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER)) { // Give it another chance to find the timer. - if (Window && !( MsqKillTimer(Window->MessageQueue, Wnd, + if (Window && !( MsqKillTimer(Window->pti->MessageQueue, Wnd, IDEvent, SystemTimer ? WM_SYSTIMER : WM_TIMER))) { DPRINT1("Unable to locate timer in message queue for Window.\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Jan 11 08:36:48 2010 @@ -1608,28 +1608,31 @@ * calculates the default position of a window */ BOOL FASTCALL -IntCalcDefPosSize(PWINDOW_OBJECT Parent, PWINDOW_OBJECT Window, RECTL *rc, BOOL IncPos) +IntCalcDefPosSize(PWINDOW_OBJECT Parent, RECTL *rc, BOOL IncPos) { SIZE Sz; + PMONITOR pMonitor; POINT Pos = {0, 0}; + + pMonitor = IntGetPrimaryMonitor(); if(Parent != NULL) { - RECTL_bIntersectRect(rc, rc, &Parent->Wnd->rcClient); + RECTL_bIntersectRect(rc, rc, &pMonitor->rcMonitor); if(IncPos) { - Pos.x = Parent->TiledCounter * (UserGetSystemMetrics(SM_CXSIZE) + UserGetSystemMetrics(SM_CXFRAME)); - Pos.y = Parent->TiledCounter * (UserGetSystemMetrics(SM_CYSIZE) + UserGetSystemMetrics(SM_CYFRAME)); - if(Pos.x > ((rc->right - rc->left) / 4) || - Pos.y > ((rc->bottom - rc->top) / 4)) + Pos.x = pMonitor->cWndStack * (UserGetSystemMetrics(SM_CXSIZE) + UserGetSystemMetrics(SM_CXFRAME)); + Pos.y = pMonitor->cWndStack * (UserGetSystemMetrics(SM_CYSIZE) + UserGetSystemMetrics(SM_CYFRAME)); + if (Pos.x > ((rc->right - rc->left) / 4) || + Pos.y > ((rc->bottom - rc->top) / 4)) { /* reset counter and position */ Pos.x = 0; Pos.y = 0; - Parent->TiledCounter = 0; + pMonitor->cWndStack = 0; } - Parent->TiledCounter++; + pMonitor->cWndStack++; } Pos.x += rc->left; Pos.y += rc->top; @@ -1857,8 +1860,7 @@ Wnd->hModule = hInstance; Window->hSelf = hWnd; - Window->MessageQueue = pti->MessageQueue; - IntReferenceMessageQueue(Window->MessageQueue); + IntReferenceMessageQueue(Window->pti->MessageQueue); Window->spwndParent = ParentWindow; Wnd->spwndParent = ParentWindow ? ParentWindow->Wnd : NULL; if (Wnd->spwndParent != NULL && hWndParent != 0) @@ -2112,7 +2114,7 @@ if(x == CW_USEDEFAULT || x == CW_USEDEFAULT16) { - CalculatedDefPosSize = IntCalcDefPosSize(ParentWindow, Window, &rc, TRUE); + CalculatedDefPosSize = IntCalcDefPosSize(ParentWindow, &rc, TRUE); if(ProcessParams->WindowFlags & STARTF_USEPOSITION) { @@ -2156,7 +2158,7 @@ { if(!CalculatedDefPosSize) { - IntCalcDefPosSize(ParentWindow, Window, &rc, FALSE); + IntCalcDefPosSize(ParentWindow, &rc, FALSE); } if(ProcessParams->WindowFlags & STARTF_USESIZE) { @@ -2646,14 +2648,14 @@ } } - if (Window->MessageQueue->ActiveWindow == Window->hSelf) - Window->MessageQueue->ActiveWindow = NULL; - if (Window->MessageQueue->FocusWindow == Window->hSelf) - Window->MessageQueue->FocusWindow = NULL; - if (Window->MessageQueue->CaptureWindow == Window->hSelf) - Window->MessageQueue->CaptureWindow = NULL; - - IntDereferenceMessageQueue(Window->MessageQueue); + if (Window->pti->MessageQueue->ActiveWindow == Window->hSelf) + Window->pti->MessageQueue->ActiveWindow = NULL; + if (Window->pti->MessageQueue->FocusWindow == Window->hSelf) + Window->pti->MessageQueue->FocusWindow = NULL; + if (Window->pti->MessageQueue->CaptureWindow == Window->hSelf) + Window->pti->MessageQueue->CaptureWindow = NULL; + + IntDereferenceMessageQueue(Window->pti->MessageQueue); IntEngWindowChanged(Window, WOC_DELETE); isChild = (0 != (Wnd->style & WS_CHILD)); @@ -4197,7 +4199,7 @@ break; case QUERY_WINDOW_ISHUNG: - Result = (DWORD)MsqIsHung(Window->MessageQueue); + Result = (DWORD)MsqIsHung(Window->pti->MessageQueue); break; case QUERY_WINDOW_REAL_ID: @@ -5111,7 +5113,7 @@ } case otMonitor: { - PMONITOR_OBJECT Monitor; + PMONITOR Monitor; if ((Monitor = UserGetMonitorObject((HMONITOR) handle))) return TRUE; return FALSE; } 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] Mon Jan 11 08:36:48 2010 @@ -1612,7 +1612,7 @@ UserRefObjectCo(Current, &Ref); - if (OnlyHitTests && (Current->MessageQueue == OnlyHitTests)) + if (OnlyHitTests && (Current->pti->MessageQueue == OnlyHitTests)) { *HitTest = co_IntSendMessage(Current->hSelf, WM_NCHITTEST, 0, MAKELONG(Point->x, Point->y));

1 0

[sir_richard] 45041: [NTOS]: Put ASM macros back since the HAL also uses them.
by sir_richard＠svn.reactos.org 11 Jan '10

11 Jan '10

Author: sir_richard Date: Mon Jan 11 07:41:19 2010 New Revision: 45041 URL: http://svn.reactos.org/svn/reactos?rev=45041&view=rev Log: [NTOS]: Put ASM macros back since the HAL also uses them. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 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] Mon Jan 11 07:41:19 2010 @@ -114,6 +114,28 @@ .endm // +// @name UNHANDLED_V86_PATH +// +// This macro prints out that the current code path is for unhandled VDM support +// +// @param None +// +// @remark None. +// +.macro UNHANDLED_V86_PATH + /* Get EIP */ + call $+5 + + /* Print debug message */ + push offset _V86UnhandledMsg + call _DbgPrint + add esp, 8 + + /* Loop indefinitely */ + jmp $ +.endm + +// // @name IDT // // This macro creates an IDT entry for the given handler @@ -255,6 +277,58 @@ .endm // +// @name INVALID_V86_OPCODE +// +// This macro creates one or more entries for unhandled V86 Opcodes +// in the V86 Opcode Table. +// +// @param count. +// Number of entries to generate. +// +// @remark None. +// +.macro INVALID_V86_OPCODE count + .rept \count + .byte 0 + .endr +.endm + +// +// @name GENERATE_PREFIX_HANDLER +// +// This macro creates a prefix opcode handler. +// +// @param None. +// +// @remark None. +// +.macro GENERATE_PREFIX_HANDLER Name +.func Opcode&Name&PrefixV86 +_Opcode&Name&PrefixV86: + or ebx, PREFIX_FLAG_&Name + jmp _OpcodeGenericPrefixV86 +.endfunc +.endm + +// +// @name INVALID_V86_OPCODE +// +// This macro prints out visible message and hangs the computer. +// +// @param None. +// +// @remark Temporary debugging use. +// +.macro UNHANDLED_V86_OPCODE + /* Print debug message, breakpoint and freeze */ + push ecx + push offset V86DebugMsg + call _DbgPrint + add esp, 8 + jmp $ +.endm + +// // @name TRAP_FIXUPS // // This macro contains out-of-line code for various Trap Frame Fixups, such as: @@ -448,6 +522,96 @@ cli jmp 1b 2: +.endm + +// +// @name TRAP_PROLOG +// +// This macro creates a standard trap entry prologue. +// It should be used for entry into any kernel trap (KiTrapXx), but not for +// system calls, which require special handling. +// +// @param Label +// Identifying name of the caller function; will be used to append +// to the name V86 and DR helper functions, which must already exist. +// +// @remark Use as follows: +// _KiTrap00: +// /* Push fake error code */ +// push 0 +// +// /* Enter common prologue */ +// TRAP_PROLOG(0) +// +// /* Handle trap */ +// <Your Trap Code Here> +// +.macro TRAP_PROLOG Label EndLabel + /* Just to be safe, clear out the HIWORD, since it's reserved */ + mov word ptr [esp+2], 0 + + /* Save the non-volatiles */ + push ebp + push ebx + push esi + push edi + + /* Save FS and set it to PCR */ + push fs + mov ebx, KGDT_R0_PCR + .byte 0x66 + mov fs, bx + + /* Save exception list and bogus previous mode */ + push fs:[KPCR_EXCEPTION_LIST] + push -1 + + /* Save volatiles and segment registers */ + push eax + push ecx + push edx + push ds + push es + push gs + + /* Set the R3 data segment */ + mov ax, KGDT_R3_DATA + RPL_MASK + + /* Skip debug registers and debug stuff */ + sub esp, 0x30 + + /* Load the segment registers */ + .byte 0x66 + mov ds, ax + .byte 0x66 + mov es, ax + + /* Check if this interrupt happened in 16-bit mode */ + cmp esp, 0x10000 + jb _Ki16BitStackException + + /* Set up frame */ + mov ebp, esp + + /* Check if this was from V86 Mode */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86_&Label + +V86_&EndLabel: + /* Get current thread */ + mov ecx, fs:[KPCR_CURRENT_THREAD] + cld + + /* Flush DR7 */ + and dword ptr [ebp+KTRAP_FRAME_DR7], 0 + + /* Check if the thread was being debugged */ + test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF + jnz Dr_&Label + + /* Set the Trap Frame Debug Header */ +Dr_&EndLabel: + SET_TF_DEBUG_HEADER .endm // @@ -735,6 +899,164 @@ .endm // +// @name V86_TRAP_PROLOG +// +// This macro creates a V86 Trap entry prologue. +// It should be used for entry into any fast-system call (KiGetTickCount, +// KiCallbackReturn, KiRaiseAssertion) and the generic system call handler +// (KiSystemService) +// +// @param Label +// Unique label identifying the name of the caller function; will be +// used to append to the name of the DR helper function, which must +// already exist. +// +// @remark None. +// +.macro V86_TRAP_PROLOG Label EndLabel + + /* Skip everything to the error code */ + sub esp, KTRAP_FRAME_ERROR_CODE + + /* Clear the error code */ + mov word ptr [esp+KTRAP_FRAME_ERROR_CODE+2], 0 + + /* Save the registers we'll trample */ + mov [esp+KTRAP_FRAME_EBX], ebx + mov [esp+KTRAP_FRAME_EAX], eax + mov [esp+KTRAP_FRAME_EBP], ebp + mov [esp+KTRAP_FRAME_ESI], esi + mov [esp+KTRAP_FRAME_EDI], edi + + /* Save PCR and Ring 3 segments */ + mov ebx, KGDT_R0_PCR + mov eax, KGDT_R3_DATA + RPL_MASK + + /* Save ECX and EDX too */ + mov [esp+KTRAP_FRAME_ECX], ecx + mov [esp+KTRAP_FRAME_EDX], edx + + /* Set debugging markers */ + mov dword ptr [esp+KTRAP_FRAME_PREVIOUS_MODE], -1 + mov dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + + /* Now set segments (use OVERRIDE, 0x66) */ + .byte 0x66 + mov fs, bx + .byte 0x66 + mov ds, ax + .byte 0x66 + mov es, ax + + /* Set the trap frame in the stack and clear the direction flag */ + mov ebp, esp + cld + + /* Save the exception list */ + mov eax, fs:[KPCR_EXCEPTION_LIST] + mov [esp+KTRAP_FRAME_EXCEPTION_LIST], eax + + /* Check if we need debugging */ + mov eax, dr7 + test eax, ~DR7_RESERVED_MASK + mov [esp+KTRAP_FRAME_DR7], eax + jnz Dr_&Label + +Dr_&EndLabel: +.endm + +// +// @name V86_TRAP_EPILOG +// +// This macro creates an epilogue for leaving V86 traps +// +// @param None. +// +// @remark None. +// +.macro V86_TRAP_EPILOG + + /* Get the current thread and make it unalerted */ +ExitBegin: + mov ebx, PCR[KPCR_CURRENT_THREAD] + mov byte ptr [ebx+KTHREAD_ALERTED], 0 + + /* Check if it has User-mode APCs pending */ + cmp byte ptr [ebx+KTHREAD_PENDING_USER_APC], 0 + jne PendingUserApc + + /* It doesn't, pop the frame */ + add esp, KTRAP_FRAME_EDX + pop edx + pop ecx + pop eax + + /* Check if DR registers should be restored */ + test dword ptr [ebp+KTRAP_FRAME_DR7], ~DR7_RESERVED_MASK + jnz V86DebugRestore + + /* Finish popping the rest of the frame, and return to P-mode */ +V86DebugContinue: + add esp, 12 + pop edi + pop esi + pop ebx + pop ebp + add esp, 4 + iretd + +V86DebugRestore: + + /* Get DR0, 1 */ + xor ebx, ebx + mov esi, [ebp+KTRAP_FRAME_DR0] + mov edi, [ebp+KTRAP_FRAME_DR1] + + /* Clear DR 7 */ + mov dr7, ebx + + /* Get DR2 and load DR0-2 */ + mov ebx, [ebp+KTRAP_FRAME_DR2] + mov dr0, esi + mov dr1, edi + mov dr2, ebx + + /* Get DR3-7 */ + mov esi, [ebp+KTRAP_FRAME_DR0] + mov edi, [ebp+KTRAP_FRAME_DR1] + mov ebx, [ebp+KTRAP_FRAME_DR7] + + /* Load them */ + mov dr3, esi + mov dr6, edi + mov dr7, ebx + jmp V86DebugContinue + +PendingUserApc: + + /* Raise to APC level */ + mov ecx, APC_LEVEL + call @KfRaiseIrql@4 + + /* Save KIRQL and deliver APCs */ + push eax + sti + push ebp + push 0 + push UserMode + call _KiDeliverApc@12 + + /* Restore IRQL */ + pop ecx + call @KfLowerIrql@4 + cli + + /* Check if we're not in V86 anymore */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz ExitBegin +.endm + +// // @name TRAP_EPILOG // // This macro creates an epilogue for leaving any system trap.

1 0

[sir_richard] 45040: Trap Handlers in C Patch 8 of X: [NTOS]: Implement KiCoprocessorError in C. [NTOS]: Make NMI handler fully C, now that the other parts are C too. [NTOS]: Delete more ASM macros and code that are now unused.
by sir_richard＠svn.reactos.org 11 Jan '10

11 Jan '10

Author: sir_richard Date: Mon Jan 11 07:08:11 2010 New Revision: 45040 URL: http://svn.reactos.org/svn/reactos?rev=45040&view=rev Log: Trap Handlers in C Patch 8 of X: [NTOS]: Implement KiCoprocessorError in C. [NTOS]: Make NMI handler fully C, now that the other parts are C too. [NTOS]: Delete more ASM macros and code that are now unused. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/cpu.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] Mon Jan 11 07:08:11 2010 @@ -114,28 +114,6 @@ .endm // -// @name UNHANDLED_V86_PATH -// -// This macro prints out that the current code path is for unhandled VDM support -// -// @param None -// -// @remark None. -// -.macro UNHANDLED_V86_PATH - /* Get EIP */ - call $+5 - - /* Print debug message */ - push offset _V86UnhandledMsg - call _DbgPrint - add esp, 8 - - /* Loop indefinitely */ - jmp $ -.endm - -// // @name IDT // // This macro creates an IDT entry for the given handler @@ -277,58 +255,6 @@ .endm // -// @name INVALID_V86_OPCODE -// -// This macro creates one or more entries for unhandled V86 Opcodes -// in the V86 Opcode Table. -// -// @param count. -// Number of entries to generate. -// -// @remark None. -// -.macro INVALID_V86_OPCODE count - .rept \count - .byte 0 - .endr -.endm - -// -// @name GENERATE_PREFIX_HANDLER -// -// This macro creates a prefix opcode handler. -// -// @param None. -// -// @remark None. -// -.macro GENERATE_PREFIX_HANDLER Name -.func Opcode&Name&PrefixV86 -_Opcode&Name&PrefixV86: - or ebx, PREFIX_FLAG_&Name - jmp _OpcodeGenericPrefixV86 -.endfunc -.endm - -// -// @name INVALID_V86_OPCODE -// -// This macro prints out visible message and hangs the computer. -// -// @param None. -// -// @remark Temporary debugging use. -// -.macro UNHANDLED_V86_OPCODE - /* Print debug message, breakpoint and freeze */ - push ecx - push offset V86DebugMsg - call _DbgPrint - add esp, 8 - jmp $ -.endm - -// // @name TRAP_FIXUPS // // This macro contains out-of-line code for various Trap Frame Fixups, such as: @@ -522,96 +448,6 @@ cli jmp 1b 2: -.endm - -// -// @name TRAP_PROLOG -// -// This macro creates a standard trap entry prologue. -// It should be used for entry into any kernel trap (KiTrapXx), but not for -// system calls, which require special handling. -// -// @param Label -// Identifying name of the caller function; will be used to append -// to the name V86 and DR helper functions, which must already exist. -// -// @remark Use as follows: -// _KiTrap00: -// /* Push fake error code */ -// push 0 -// -// /* Enter common prologue */ -// TRAP_PROLOG(0) -// -// /* Handle trap */ -// <Your Trap Code Here> -// -.macro TRAP_PROLOG Label EndLabel - /* Just to be safe, clear out the HIWORD, since it's reserved */ - mov word ptr [esp+2], 0 - - /* Save the non-volatiles */ - push ebp - push ebx - push esi - push edi - - /* Save FS and set it to PCR */ - push fs - mov ebx, KGDT_R0_PCR - .byte 0x66 - mov fs, bx - - /* Save exception list and bogus previous mode */ - push fs:[KPCR_EXCEPTION_LIST] - push -1 - - /* Save volatiles and segment registers */ - push eax - push ecx - push edx - push ds - push es - push gs - - /* Set the R3 data segment */ - mov ax, KGDT_R3_DATA + RPL_MASK - - /* Skip debug registers and debug stuff */ - sub esp, 0x30 - - /* Load the segment registers */ - .byte 0x66 - mov ds, ax - .byte 0x66 - mov es, ax - - /* Check if this interrupt happened in 16-bit mode */ - cmp esp, 0x10000 - jb _Ki16BitStackException - - /* Set up frame */ - mov ebp, esp - - /* Check if this was from V86 Mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz V86_&Label - -V86_&EndLabel: - /* Get current thread */ - mov ecx, fs:[KPCR_CURRENT_THREAD] - cld - - /* Flush DR7 */ - and dword ptr [ebp+KTRAP_FRAME_DR7], 0 - - /* Check if the thread was being debugged */ - test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF - jnz Dr_&Label - - /* Set the Trap Frame Debug Header */ -Dr_&EndLabel: - SET_TF_DEBUG_HEADER .endm // @@ -899,164 +735,6 @@ .endm // -// @name V86_TRAP_PROLOG -// -// This macro creates a V86 Trap entry prologue. -// It should be used for entry into any fast-system call (KiGetTickCount, -// KiCallbackReturn, KiRaiseAssertion) and the generic system call handler -// (KiSystemService) -// -// @param Label -// Unique label identifying the name of the caller function; will be -// used to append to the name of the DR helper function, which must -// already exist. -// -// @remark None. -// -.macro V86_TRAP_PROLOG Label EndLabel - - /* Skip everything to the error code */ - sub esp, KTRAP_FRAME_ERROR_CODE - - /* Clear the error code */ - mov word ptr [esp+KTRAP_FRAME_ERROR_CODE+2], 0 - - /* Save the registers we'll trample */ - mov [esp+KTRAP_FRAME_EBX], ebx - mov [esp+KTRAP_FRAME_EAX], eax - mov [esp+KTRAP_FRAME_EBP], ebp - mov [esp+KTRAP_FRAME_ESI], esi - mov [esp+KTRAP_FRAME_EDI], edi - - /* Save PCR and Ring 3 segments */ - mov ebx, KGDT_R0_PCR - mov eax, KGDT_R3_DATA + RPL_MASK - - /* Save ECX and EDX too */ - mov [esp+KTRAP_FRAME_ECX], ecx - mov [esp+KTRAP_FRAME_EDX], edx - - /* Set debugging markers */ - mov dword ptr [esp+KTRAP_FRAME_PREVIOUS_MODE], -1 - mov dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - - /* Now set segments (use OVERRIDE, 0x66) */ - .byte 0x66 - mov fs, bx - .byte 0x66 - mov ds, ax - .byte 0x66 - mov es, ax - - /* Set the trap frame in the stack and clear the direction flag */ - mov ebp, esp - cld - - /* Save the exception list */ - mov eax, fs:[KPCR_EXCEPTION_LIST] - mov [esp+KTRAP_FRAME_EXCEPTION_LIST], eax - - /* Check if we need debugging */ - mov eax, dr7 - test eax, ~DR7_RESERVED_MASK - mov [esp+KTRAP_FRAME_DR7], eax - jnz Dr_&Label - -Dr_&EndLabel: -.endm - -// -// @name V86_TRAP_EPILOG -// -// This macro creates an epilogue for leaving V86 traps -// -// @param None. -// -// @remark None. -// -.macro V86_TRAP_EPILOG - - /* Get the current thread and make it unalerted */ -ExitBegin: - mov ebx, PCR[KPCR_CURRENT_THREAD] - mov byte ptr [ebx+KTHREAD_ALERTED], 0 - - /* Check if it has User-mode APCs pending */ - cmp byte ptr [ebx+KTHREAD_PENDING_USER_APC], 0 - jne PendingUserApc - - /* It doesn't, pop the frame */ - add esp, KTRAP_FRAME_EDX - pop edx - pop ecx - pop eax - - /* Check if DR registers should be restored */ - test dword ptr [ebp+KTRAP_FRAME_DR7], ~DR7_RESERVED_MASK - jnz V86DebugRestore - - /* Finish popping the rest of the frame, and return to P-mode */ -V86DebugContinue: - add esp, 12 - pop edi - pop esi - pop ebx - pop ebp - add esp, 4 - iretd - -V86DebugRestore: - - /* Get DR0, 1 */ - xor ebx, ebx - mov esi, [ebp+KTRAP_FRAME_DR0] - mov edi, [ebp+KTRAP_FRAME_DR1] - - /* Clear DR 7 */ - mov dr7, ebx - - /* Get DR2 and load DR0-2 */ - mov ebx, [ebp+KTRAP_FRAME_DR2] - mov dr0, esi - mov dr1, edi - mov dr2, ebx - - /* Get DR3-7 */ - mov esi, [ebp+KTRAP_FRAME_DR0] - mov edi, [ebp+KTRAP_FRAME_DR1] - mov ebx, [ebp+KTRAP_FRAME_DR7] - - /* Load them */ - mov dr3, esi - mov dr6, edi - mov dr7, ebx - jmp V86DebugContinue - -PendingUserApc: - - /* Raise to APC level */ - mov ecx, APC_LEVEL - call @KfRaiseIrql@4 - - /* Save KIRQL and deliver APCs */ - push eax - sti - push ebp - push 0 - push UserMode - call _KiDeliverApc@12 - - /* Restore IRQL */ - pop ecx - call @KfLowerIrql@4 - cli - - /* Check if we're not in V86 anymore */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz ExitBegin -.endm - -// // @name TRAP_EPILOG // // This macro creates an epilogue for leaving any system trap. 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] Mon Jan 11 07:08:11 2010 @@ -1051,6 +1051,13 @@ ); VOID +NTAPI +KiSaveProcessorState( + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame +); + +VOID FASTCALL KiRetireDpcList( IN PKPRCB Prcb 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] Mon Jan 11 07:08:11 2010 @@ -944,155 +944,24 @@ KiSaveProcessorControlState(&Prcb->ProcessorState); } -/* C TRAP HANDLERS ************************************************************/ - -BOOLEAN -NTAPI -KiNmiFault(IN PVOID InterruptStack) -{ - PKTSS Tss, NmiTss; - PKTHREAD Thread; - PKPROCESS Process; - PKGDTENTRY TssGdt; - KTRAP_FRAME TrapFrame; - KIRQL OldIrql; +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +KiCoprocessorError(VOID) +{ + PFX_SAVE_AREA NpxArea; - // - // In some sort of strange recursion case, we might end up here with the IF - // flag incorrectly on the interrupt frame -- during a normal NMI this would - // normally already be set. - // - // For sanity's sake, make sure interrupts are disabled for sure. - // NMIs will already be since the CPU does it for us. - // - _disable(); - - // - // Get the current TSS, thread, and process - // - Tss = PCR->TSS; - Thread = ((PKIPCR)PCR)->PrcbData.CurrentThread; - Process = Thread->ApcState.Process; + /* Get the FPU area */ + NpxArea = KiGetThreadNpxArea(KeGetCurrentThread()); - // - // Save data usually not in the TSS - // - Tss->CR3 = Process->DirectoryTableBase[0]; - Tss->IoMapBase = Process->IopmOffset; - Tss->LDT = Process->LdtDescriptor.LimitLow ? KGDT_LDT : 0; - - // - // Now get the base address of the NMI TSS - // - TssGdt = &((PKIPCR)KeGetPcr())->GDT[KGDT_NMI_TSS / sizeof(KGDTENTRY)]; - NmiTss = (PKTSS)(ULONG_PTR)(TssGdt->BaseLow | - TssGdt->HighWord.Bytes.BaseMid << 16 | - TssGdt->HighWord.Bytes.BaseHi << 24); - - // - // Switch to it and activate it, masking off the nested flag - // - // Note that in reality, we are already on the NMI tss -- we just need to - // update the PCR to reflect this - // - PCR->TSS = NmiTss; - __writeeflags(__readeflags() &~ EFLAGS_NESTED_TASK); - TssGdt->HighWord.Bits.Dpl = 0; - TssGdt->HighWord.Bits.Pres = 1; - TssGdt->HighWord.Bits.Type = I386_TSS; - - // - // Now build the trap frame based on the original TSS - // - // The CPU does a hardware "Context switch" / task switch of sorts and so it - // takes care of saving our context in the normal TSS. - // - // We just have to go get the values... - // - RtlZeroMemory(&TrapFrame, sizeof(KTRAP_FRAME)); - TrapFrame.HardwareSegSs = Tss->Ss0; - TrapFrame.HardwareEsp = Tss->Esp0; - TrapFrame.EFlags = Tss->EFlags; - TrapFrame.SegCs = Tss->Cs; - TrapFrame.Eip = Tss->Eip; - TrapFrame.Ebp = Tss->Ebp; - TrapFrame.Ebx = Tss->Ebx; - TrapFrame.Esi = Tss->Esi; - TrapFrame.Edi = Tss->Edi; - TrapFrame.SegFs = Tss->Fs; - TrapFrame.ExceptionList = PCR->Tib.ExceptionList; - TrapFrame.PreviousPreviousMode = -1; - TrapFrame.Eax = Tss->Eax; - TrapFrame.Ecx = Tss->Ecx; - TrapFrame.Edx = Tss->Edx; - TrapFrame.SegDs = Tss->Ds; - TrapFrame.SegEs = Tss->Es; - TrapFrame.SegGs = Tss->Gs; - TrapFrame.DbgEip = Tss->Eip; - TrapFrame.DbgEbp = Tss->Ebp; - - // - // Store the trap frame in the KPRCB - // - KiSaveProcessorState(&TrapFrame, NULL); - - // - // Call any registered NMI handlers and see if they handled it or not - // - if (!KiHandleNmi()) - { - // - // They did not, so call the platform HAL routine to bugcheck the system - // - // Make sure the HAL believes it's running at HIGH IRQL... we can't use - // the normal APIs here as playing with the IRQL could change the system - // state - // - OldIrql = PCR->Irql; - PCR->Irql = HIGH_LEVEL; - HalHandleNMI(NULL); - PCR->Irql = OldIrql; - } - - // - // Although the CPU disabled NMIs, we just did a BIOS Call, which could've - // totally changed things. - // - // We have to make sure we're still in our original NMI -- a nested NMI - // will point back to the NMI TSS, and in that case we're hosed. - // - if (PCR->TSS->Backlink != KGDT_NMI_TSS) - { - // - // Restore original TSS - // - PCR->TSS = Tss; - - // - // Set it back to busy - // - TssGdt->HighWord.Bits.Dpl = 0; - TssGdt->HighWord.Bits.Pres = 1; - TssGdt->HighWord.Bits.Type = I386_ACTIVE_TSS; - - // - // Restore nested flag - // - __writeeflags(__readeflags() | EFLAGS_NESTED_TASK); - - // - // Handled, return from interrupt - // - return TRUE; - } - - // - // Unhandled: crash the system - // - return FALSE; -} - -/* PUBLIC FUNCTIONS **********************************************************/ + /* Set CR0_TS */ + NpxArea->Cr0NpxState = CR0_TS; + __writecr0(__readcr0() | CR0_TS); +} /* * @implemented 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] Mon Jan 11 07:08:11 2010 @@ -577,29 +577,6 @@ GENERATE_TRAP_HANDLER KiTrap0, 1 GENERATE_TRAP_HANDLER KiTrap1, 1 - -.func KiTrap2 -_KiTrap2: - // - // Call the C handler - // - stdCall _KiNmiFault, esp // Handle it in C - or al, al // Check if it got handled - jne 1f // Resume from NMI - - // - // Return from NMI - // - iretd // Interrupt return - jmp _KiTrap2 // Handle recursion -1: - // - // Crash the system - // - mov eax, EXCEPTION_NMI // STOP fault code - jmp _KiSystemFatalException // Bugcheck helper -.endfunc - GENERATE_TRAP_HANDLER KiTrap3, 1 GENERATE_TRAP_HANDLER KiTrap4, 1 GENERATE_TRAP_HANDLER KiTrap5, 1 @@ -616,61 +593,6 @@ GENERATE_TRAP_HANDLER KiTrap16, 1 GENERATE_TRAP_HANDLER KiTrap17, 1 GENERATE_TRAP_HANDLER KiTrap19, 1 - -.func KiSystemFatalException -_KiSystemFatalException: - - /* Push the trap frame */ - push ebp - - /* Push empty parameters */ - push 0 - push 0 - push 0 - - /* Push trap number and bugcheck code */ - push eax - push UNEXPECTED_KERNEL_MODE_TRAP - call _KeBugCheckWithTf@24 - ret -.endfunc - -.func KiCoprocessorError@0 -_KiCoprocessorError@0: - - /* Get the NPX Thread's Initial stack */ - mov eax, PCR[KPCR_NPX_THREAD] - mov eax, [eax+KTHREAD_INITIAL_STACK] - - /* Make space for the FPU Save area */ - sub eax, SIZEOF_FX_SAVE_AREA - - /* Set the CR0 State */ - mov dword ptr [eax+FN_CR0_NPX_STATE], 8 - - /* Update it */ - mov eax, cr0 - or eax, 8 - mov cr0, eax - - /* Return to caller */ - ret -.endfunc - -.func Ki16BitStackException -_Ki16BitStackException: - - /* Save stack */ - push ss - push esp - - /* Go to kernel mode thread stack */ - mov eax, PCR[KPCR_CURRENT_THREAD] - add esp, [eax+KTHREAD_INITIAL_STACK] - - /* Switch to good stack segment */ - UNHANDLED_PATH "16-Bit Stack" -.endfunc /* UNEXPECTED INTERRUPT HANDLERS **********************************************/ 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] Mon Jan 11 07:08:11 2010 @@ -549,6 +549,151 @@ KiDispatchException0Args(STATUS_SINGLE_STEP, TrapFrame->Eip, TrapFrame); +} + +VOID +KiTrap2(VOID) +{ + PKTSS Tss, NmiTss; + PKTHREAD Thread; + PKPROCESS Process; + PKGDTENTRY TssGdt; + KTRAP_FRAME TrapFrame; + KIRQL OldIrql; + + // + // In some sort of strange recursion case, we might end up here with the IF + // flag incorrectly on the interrupt frame -- during a normal NMI this would + // normally already be set. + // + // For sanity's sake, make sure interrupts are disabled for sure. + // NMIs will already be since the CPU does it for us. + // + _disable(); + + // + // Get the current TSS, thread, and process + // + Tss = PCR->TSS; + Thread = ((PKIPCR)PCR)->PrcbData.CurrentThread; + Process = Thread->ApcState.Process; + + // + // Save data usually not in the TSS + // + Tss->CR3 = Process->DirectoryTableBase[0]; + Tss->IoMapBase = Process->IopmOffset; + Tss->LDT = Process->LdtDescriptor.LimitLow ? KGDT_LDT : 0; + + // + // Now get the base address of the NMI TSS + // + TssGdt = &((PKIPCR)KeGetPcr())->GDT[KGDT_NMI_TSS / sizeof(KGDTENTRY)]; + NmiTss = (PKTSS)(ULONG_PTR)(TssGdt->BaseLow | + TssGdt->HighWord.Bytes.BaseMid << 16 | + TssGdt->HighWord.Bytes.BaseHi << 24); + + // + // Switch to it and activate it, masking off the nested flag + // + // Note that in reality, we are already on the NMI tss -- we just need to + // update the PCR to reflect this + // + PCR->TSS = NmiTss; + __writeeflags(__readeflags() &~ EFLAGS_NESTED_TASK); + TssGdt->HighWord.Bits.Dpl = 0; + TssGdt->HighWord.Bits.Pres = 1; + TssGdt->HighWord.Bits.Type = I386_TSS; + + // + // Now build the trap frame based on the original TSS + // + // The CPU does a hardware "Context switch" / task switch of sorts and so it + // takes care of saving our context in the normal TSS. + // + // We just have to go get the values... + // + RtlZeroMemory(&TrapFrame, sizeof(KTRAP_FRAME)); + TrapFrame.HardwareSegSs = Tss->Ss0; + TrapFrame.HardwareEsp = Tss->Esp0; + TrapFrame.EFlags = Tss->EFlags; + TrapFrame.SegCs = Tss->Cs; + TrapFrame.Eip = Tss->Eip; + TrapFrame.Ebp = Tss->Ebp; + TrapFrame.Ebx = Tss->Ebx; + TrapFrame.Esi = Tss->Esi; + TrapFrame.Edi = Tss->Edi; + TrapFrame.SegFs = Tss->Fs; + TrapFrame.ExceptionList = PCR->Tib.ExceptionList; + TrapFrame.PreviousPreviousMode = -1; + TrapFrame.Eax = Tss->Eax; + TrapFrame.Ecx = Tss->Ecx; + TrapFrame.Edx = Tss->Edx; + TrapFrame.SegDs = Tss->Ds; + TrapFrame.SegEs = Tss->Es; + TrapFrame.SegGs = Tss->Gs; + TrapFrame.DbgEip = Tss->Eip; + TrapFrame.DbgEbp = Tss->Ebp; + + // + // Store the trap frame in the KPRCB + // + KiSaveProcessorState(&TrapFrame, NULL); + + // + // Call any registered NMI handlers and see if they handled it or not + // + if (!KiHandleNmi()) + { + // + // They did not, so call the platform HAL routine to bugcheck the system + // + // Make sure the HAL believes it's running at HIGH IRQL... we can't use + // the normal APIs here as playing with the IRQL could change the system + // state + // + OldIrql = PCR->Irql; + PCR->Irql = HIGH_LEVEL; + HalHandleNMI(NULL); + PCR->Irql = OldIrql; + } + + // + // Although the CPU disabled NMIs, we just did a BIOS Call, which could've + // totally changed things. + // + // We have to make sure we're still in our original NMI -- a nested NMI + // will point back to the NMI TSS, and in that case we're hosed. + // + if (PCR->TSS->Backlink != KGDT_NMI_TSS) + { + // + // Restore original TSS + // + PCR->TSS = Tss; + + // + // Set it back to busy + // + TssGdt->HighWord.Bits.Dpl = 0; + TssGdt->HighWord.Bits.Pres = 1; + TssGdt->HighWord.Bits.Type = I386_ACTIVE_TSS; + + // + // Restore nested flag + // + __writeeflags(__readeflags() | EFLAGS_NESTED_TASK); + + // + // Handled, return from interrupt + // + __asm__ __volatile__ ("iret\n"); + } + + // + // Unhandled: crash the system + // + KiSystemFatalException(EXCEPTION_NMI, NULL); } VOID

1 0

[sedwards] 45039: my once a year commit, update email address
by sedwards＠svn.reactos.org 11 Jan '10

11 Jan '10

Author: sedwards Date: Mon Jan 11 06:58:59 2010 New Revision: 45039 URL: http://svn.reactos.org/svn/reactos?rev=45039&view=rev Log: my once a year commit, update email address Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=45039&r1=45038… ============================================================================== --- trunk/reactos/CREDITS [iso-8859-1] (original) +++ trunk/reactos/CREDITS [iso-8859-1] Mon Jan 11 06:58:59 2010 @@ -66,7 +66,7 @@ Samuel Serapión <samdwise51(a)gmail.com> Saveliy Tretiakov <saveliyt(a)mail.ru> Stefan Ginsberg <stefan__100__(a)hotmail.com> -Steven Edwards <steven_ed4153(a)yahoo.com> +Steven Edwards <winehacker(a)gmail.com> Thomas Weidenmueller <w3seek(a)users.sourceforge.net> Timo Kreuzer <timo.kreuzer(a)reactos.org> Victor Kirhenshtein <sauros(a)iname.com>

1 0

[sir_richard] 45038: Trap handlers in C patch 7 of X: [NTOS]: Implement GPF handler (trap 13) in C. This was by far the most complex one of them, since it also servces two complex purposes: to handle V86 emulation since the real-mode code will generate GPFs during privileged instructions, and it will detect an illegal IRET, check if it's the known V8086 Exit IRET, and then jump to V86 exit code. [NTOS]: Get rid of even more V8086 assembly since the GPF handler is now C. Deleted the entire V8086
by sir_richard＠svn.reactos.org 11 Jan '10

11 Jan '10

Author: sir_richard Date: Mon Jan 11 06:53:57 2010 New Revision: 45038 URL: http://svn.reactos.org/svn/reactos?rev=45038&view=rev Log: Trap handlers in C patch 7 of X: [NTOS]: Implement GPF handler (trap 13) in C. This was by far the most complex one of them, since it also servces two complex purposes: to handle V86 emulation since the real-mode code will generate GPFs during privileged instructions, and it will detect an illegal IRET, check if it's the known V8086 Exit IRET, and then jump to V86 exit code. [NTOS]: Get rid of even more V8086 assembly since the GPF handler is now C. Deleted the entire V8086 assembly file. [NTOS]: Get rid of a bunch of helper ASM functions that nobody is using anymore since almost all the trap handlers are in C. Removed: trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon Jan 11 06:53:57 2010 @@ -406,6 +406,12 @@ VOID FASTCALL KiEoiHelper( + IN PKTRAP_FRAME TrapFrame +); + +VOID +FASTCALL +KiExitV86Mode( IN PKTRAP_FRAME TrapFrame ); @@ -518,5 +524,20 @@ (DrAddress <= MM_HIGHEST_USER_ADDRESS) ? DrAddress : 0); } +FORCEINLINE +VOID +KiV86TrapReturn(IN ULONG_PTR Stack) +{ + /* Restore volatiles and stack */ + __asm__ __volatile__ + ( + "movl %0, %%esp\n" + "popa\n" + "ret\n" + : + : "r"(Stack) + : "%esp" + ); +} #endif #endif /* __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H */ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Mon Jan 11 06:53:57 2010 @@ -864,3 +864,13 @@ int 3 #endif .endfunc + +.globl _Ki386SetupAndExitToV86Mode@4 +.func Ki386SetupAndExitToV86Mode@4 +_Ki386SetupAndExitToV86Mode@4: + + /* Enter V8086 mode */ + pushad + call @KiEnterV86Mode@0 +.endfunc + 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] Mon Jan 11 06:53:57 2010 @@ -573,95 +573,6 @@ jmp _KiServiceExit .endfunc -/* EXCEPTION DISPATCHERS *****************************************************/ - -.func CommonDispatchException -_CommonDispatchException: - - /* Make space for an exception record */ - sub esp, EXCEPTION_RECORD_LENGTH - - /* Set it up */ - mov [esp+EXCEPTION_RECORD_EXCEPTION_CODE], eax - xor eax, eax - mov [esp+EXCEPTION_RECORD_EXCEPTION_FLAGS], eax - mov [esp+EXCEPTION_RECORD_EXCEPTION_RECORD], eax - mov [esp+EXCEPTION_RECORD_EXCEPTION_ADDRESS], ebx - mov [esp+EXCEPTION_RECORD_NUMBER_PARAMETERS], ecx - - /* Check parameter count */ - cmp ecx, 0 - jz NoParams - - /* Get information */ - lea ebx, [esp+SIZEOF_EXCEPTION_RECORD] - mov [ebx], edx - mov [ebx+4], esi - mov [ebx+8], edi - -NoParams: - - /* Set the record in ECX and check if this was V86 */ - mov ecx, esp - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jz SetPreviousMode - - /* Set V86 mode */ - mov eax, 0xFFFF - jmp MaskMode - -SetPreviousMode: - - /* Get the caller's CS */ - mov eax, [ebp+KTRAP_FRAME_CS] - -MaskMode: - /* Check if it was user-mode or kernel-mode */ - and eax, MODE_MASK - - /* Dispatch the exception */ - push 1 - push eax - push ebp - push 0 - push ecx - call _KiDispatchException@20 - - /* End the trap */ - mov esp, ebp - jmp _Kei386EoiHelper@0 -.endfunc - -.func DispatchNoParam -_DispatchNoParam: - /* Call the common dispatcher */ - xor ecx, ecx - call _CommonDispatchException -.endfunc - -.func DispatchOneParamZero -_DispatchOneParamZero: - /* Call the common dispatcher */ - xor edx, edx - mov ecx, 1 - call _CommonDispatchException -.endfunc - -.func DispatchTwoParamZero -_DispatchTwoParamZero: - /* Call the common dispatcher */ - xor edx, edx - mov ecx, 2 - call _CommonDispatchException -.endfunc - -.func DispatchTwoParam -_DispatchTwoParam: - /* Call the common dispatcher */ - mov ecx, 2 - call _CommonDispatchException -.endfunc - /* HARDWARE TRAP HANDLERS ****************************************************/ GENERATE_TRAP_HANDLER KiTrap0, 1 @@ -699,492 +610,7 @@ GENERATE_TRAP_HANDLER KiTrap10, 0 GENERATE_TRAP_HANDLER KiTrap11, 0 GENERATE_TRAP_HANDLER KiTrap12, 0 - -.func KiTrapExceptHandler -_KiTrapExceptHandler: - - /* Setup SEH handler frame */ - mov esp, [esp+8] - pop PCR[KPCR_EXCEPTION_LIST] - add esp, 4 - pop ebp - - /* Check if the fault came from user mode */ - test dword ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jnz SetException - - /* Kernel fault, bugcheck */ - push ebp - push 0 - push 0 - push 0 - push 0 - push KMODE_EXCEPTION_NOT_HANDLED - call _KeBugCheckWithTf@24 -.endfunc - -.func KiTrap13 -TRAP_FIXUPS kitd_a, kitd_t, DoFixupV86, DoNotFixupAbios -_KiTrap13: - - /* It this a V86 GPF? */ - test dword ptr [esp+12], EFLAGS_V86_MASK - jz NotV86 - - /* Enter V86 Trap */ - V86_TRAP_PROLOG kitd_a, kitd_v - - /* Make sure that this is a V86 process */ - mov ecx, PCR[KPCR_CURRENT_THREAD] - mov ecx, [ecx+KTHREAD_APCSTATE_PROCESS] - cmp dword ptr [ecx+EPROCESS_VDM_OBJECTS], 0 - jnz RaiseIrql - - /* Otherwise, something is very wrong, raise an exception */ - sti - jmp SetException - -RaiseIrql: - - /* Go to APC level */ - mov ecx, APC_LEVEL - call @KfRaiseIrql@4 - - /* Save old IRQL and enable interrupts */ - push eax - sti - - /* Handle the opcode */ - mov ecx, ebp - call @Ki386HandleOpcodeV86@4 - - /* Check if this was VDM */ - test al, 0xFF - jnz NoReflect - - /* FIXME: TODO */ - UNHANDLED_V86_PATH - -NoReflect: - - /* Lower IRQL and disable interrupts */ - pop ecx - call @KfLowerIrql@4 - cli - - /* Check if this was a V86 trap */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jz NotV86Trap - - /* Exit the V86 Trap */ - V86_TRAP_EPILOG - -NotV86Trap: - - /* Either this wasn't V86, or it was, but an APC interrupted us */ - jmp _Kei386EoiHelper@0 - -NotV86: - /* Enter trap */ - TRAP_PROLOG kitd_a, kitd_t - - /* Check if this was from kernel-mode */ - test dword ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jnz UserModeGpf - - ///* Check if we have a VDM alert */ - //cmp dword ptr PCR[KPCR_VDM_ALERT], 0 // BUGBUG: Add this back later - //jnz VdmAlertGpf - - /* Check for GPF during GPF */ - mov eax, [ebp+KTRAP_FRAME_EIP] - cmp eax, offset CheckPrivilegedInstruction - jbe KmodeGpf - cmp eax, offset CheckPrivilegedInstruction2 - jae KmodeGpf - - /* FIXME: TODO */ - UNHANDLED_PATH "Double GPF" - - /* Get the opcode and trap frame */ -KmodeGpf: - mov eax, [ebp+KTRAP_FRAME_EIP] - mov eax, [eax] - mov edx, [ebp+KTRAP_FRAME_EBP] - - /* We want to check if this was POP [DS/ES/FS/GS] */ - add edx, KTRAP_FRAME_DS - cmp al, 0x1F - jz SegPopGpf - add edx, KTRAP_FRAME_ES - KTRAP_FRAME_DS - cmp al, 7 - jz SegPopGpf - add edx, KTRAP_FRAME_FS - KTRAP_FRAME_ES - cmp ax, 0xA10F - jz SegPopGpf - add edx, KTRAP_FRAME_GS - KTRAP_FRAME_FS - cmp ax, 0xA90F - jz SegPopGpf - - /* It isn't, was it IRETD? */ - cmp al, 0xCF - jne NotIretGpf - - /* Get error code */ - lea edx, [ebp+KTRAP_FRAME_ESP] - mov ax, [ebp+KTRAP_FRAME_ERROR_CODE] - and ax, ~RPL_MASK - - /* Get CS */ - mov cx, word ptr [edx+4] - and cx, ~RPL_MASK - cmp cx, ax - jnz NotCsGpf - - /* This should be a Ki386CallBios return */ - mov eax, offset _Ki386BiosCallReturnAddress - cmp eax, [edx] - jne NotBiosGpf - mov eax, [edx+4] - cmp ax, KGDT_R0_CODE + RPL_MASK - jne NotBiosGpf - - /* Jump to return address */ - jmp _Ki386BiosCallReturnAddress - -NotBiosGpf: - /* Check if the thread was in kernel mode */ - mov ebx, PCR[KPCR_CURRENT_THREAD] - test byte ptr [ebx+KTHREAD_PREVIOUS_MODE], 0xFF - jz UserModeGpf - - /* Set RPL_MASK for check below */ - or word ptr [edx+4], RPL_MASK - -NotCsGpf: - /* Check if the IRET goes to user-mode */ - test dword ptr [edx+4], RPL_MASK - jz UserModeGpf - - /* Setup trap frame to copy */ - mov ecx, (KTRAP_FRAME_LENGTH - 12) / 4 - lea edx, [ebp+KTRAP_FRAME_ERROR_CODE] - -TrapCopy: - - /* Copy each field */ - mov eax, [edx] - mov [edx+12], eax - sub edx, 4 - loop TrapCopy - - /* Enable interrupts and adjust stack */ - sti - add esp, 12 - add ebp, 12 - - /* Setup exception record */ - mov ebx, [ebp+KTRAP_FRAME_EIP] - mov esi, [ebp+KTRAP_FRAME_ERROR_CODE] - and esi, 0xFFFF - mov eax, STATUS_ACCESS_VIOLATION - jmp _DispatchTwoParamZero - -MsrCheck: - - /* FIXME: Handle RDMSR/WRMSR */ - UNHANDLED_PATH "RDMSR/WRMSR" - -NotIretGpf: - - /* Check if this was an MSR opcode */ - cmp al, 0xF - jz MsrCheck - - /* Check if DS is Ring 3 */ - cmp word ptr [ebp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK - jz CheckEs - - /* Otherwise, fix it up */ - mov dword ptr [ebp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK - jmp ExitGpfTrap - -CheckEs: - - /* Check if ES is Ring 3 */ - cmp word ptr [ebp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK - jz UserModeGpf - - /* Otherwise, fix it up */ - mov dword ptr [ebp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK - jmp ExitGpfTrap - -SegPopGpf: - - /* Sanity check */ - lea eax, [ebp+KTRAP_FRAME_ESP] - cmp edx, eax - jz HandleSegPop - int 3 - - /* Handle segment POP fault by setting it to 0 */ -HandleSegPop: - xor eax, eax - mov dword ptr [edx], eax - -ExitGpfTrap: - - /* Do a trap exit */ - TRAP_EPILOG NotFromSystemCall, DoNotRestorePreviousMode, DoNotRestoreSegments, DoRestoreVolatiles, DoRestoreEverything - -UserModeGpf: - - /* If the previous mode was kernel, raise a fatal exception */ - mov eax, 13 - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz _KiSystemFatalException - - /* Get the process and check which CS this came from */ - mov ebx, PCR[KPCR_CURRENT_THREAD] - mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jz CheckVdmGpf - - /* Check if this is a VDM */ - cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - jnz DispatchV86Gpf - - /* Enable interrupts and check if we have an error code */ - sti - cmp word ptr [ebp+KTRAP_FRAME_ERROR_CODE], 0 - jnz SetException - jmp CheckPrivilegedInstruction - -HandleSegPop2: - /* Update EIP (will be updated below again) */ - add dword ptr [ebp+KTRAP_FRAME_EIP], 1 - -HandleEsPop: - /* Clear the segment, update EIP and ESP */ - mov dword ptr [edx], 0 - add dword ptr [ebp+KTRAP_FRAME_EIP], 1 - add dword ptr [ebp+KTRAP_FRAME_ESP], 4 - jmp _Kei386EoiHelper@0 - -CheckVdmGpf: - /* Check if this is a VDM */ - cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - jz CheckPrivilegedInstruction - - /* Bring interrupts back */ - sti - - /* Check what kind of instruction this is */ - mov eax, [ebp+KTRAP_FRAME_EIP] - mov eax, [eax] - - /* FIXME: Check for BOP4 */ - - /* Check if this is POP ES */ - mov edx, ebp - add edx, KTRAP_FRAME_ES - cmp al, 0x07 - jz HandleEsPop - - /* Check if this is POP FS */ - add edx, KTRAP_FRAME_FS - KTRAP_FRAME_ES - cmp ax, 0xA10F - jz HandleSegPop2 - - /* Check if this is POP GS */ - add edx, KTRAP_FRAME_GS - KTRAP_FRAME_FS - cmp ax, 0xA90F - jz HandleSegPop2 - -CheckPrivilegedInstruction: - /* Bring interrupts back */ - sti - - /* Setup a SEH handler */ - push ebp - push offset _KiTrapExceptHandler - push PCR[KPCR_EXCEPTION_LIST] - mov PCR[KPCR_EXCEPTION_LIST], esp - - /* Get EIP */ - mov esi, [ebp+KTRAP_FRAME_EIP] - - /* Setup loop count */ - mov ecx, 15 - -InstLoop: - /* Save loop count */ - push ecx - - /* Get the instruction */ - lods byte ptr [esi] - - /* Now lookup in the prefix table */ - mov ecx, 11 - mov edi, offset _KiTrapPrefixTable - repnz scasb - - /* Restore loop count */ - pop ecx - - /* If it's not a prefix byte, check other instructions */ - jnz NotPrefixByte - - /* Keep looping */ - loop InstLoop - - /* Fixup the stack */ - pop PCR[KPCR_EXCEPTION_LIST] - add esp, 8 - - /* Re-enable interrupts */ - sti - - /* Setup illegal instruction exception and dispatch it */ - mov ebx, [ebp+KTRAP_FRAME_EIP] - mov eax, STATUS_ILLEGAL_INSTRUCTION - jmp _DispatchNoParam - -NotPrefixByte: - /* Check if it's a HLT */ - cmp al, 0x0F4 - je IsPrivInstruction - - /* Check if the instruction has two bytes */ - cmp al, 0xF - jne CheckRing3Io - - /* Check if this is a LLDT or LTR */ - lods byte ptr [esi] - cmp al, 0 - jne NotLldt - - /* Check if this is an LLDT */ - lods byte ptr [esi] - and al, 0x38 - cmp al, 0x10 - je IsPrivInstruction - - /* Check if this is an LTR */ - cmp al, 0x18 - je IsPrivInstruction - - /* Otherwise, access violation */ - jmp NotIoViolation - -NotLldt: - /* Check if this is LGDT or LIDT or LMSW */ - cmp al, 0x01 - jne NotGdt - - /* Check if this is an LGDT */ - lods byte ptr [esi] - and al, 0x38 - cmp al, 0x10 - je IsPrivInstruction - - /* Check if this is an LIDT */ - cmp al, 0x18 - je IsPrivInstruction - - /* Check if this is an LMSW */ - cmp al, 0x30 - je IsPrivInstruction - - /* Otherwise, access violation */ - jmp NotIoViolation - -NotGdt: - /* Check if it's INVD or WBINVD */ - cmp al, 0x8 - je IsPrivInstruction - cmp al, 0x9 - je IsPrivInstruction - - /* Check if it's sysexit */ - cmp al, 0x35 - je IsPrivInstruction - - /* Check if it's a DR move */ - cmp al, 0x26 - je IsPrivInstruction - - /* Check if it's a CLTS */ - cmp al, 0x6 - je IsPrivInstruction - - /* Check if it's a CR move */ - cmp al, 0x20 - jb NotIoViolation - - /* Check if it's a DR move */ - cmp al, 0x24 - jbe IsPrivInstruction - - /* Everything else is an access violation */ - jmp NotIoViolation - -CheckRing3Io: - /* Get EFLAGS and IOPL */ - mov ebx, [ebp+KTRAP_FRAME_EFLAGS] - and ebx, EFLAGS_IOPL - shr ebx, 12 - - /* Check the CS's RPL mask */ - mov ecx, [ebp+KTRAP_FRAME_CS] - and ecx, RPL_MASK - cmp ebx, ecx - jge NotIoViolation - -CheckPrivilegedInstruction2: - /* Check if this is a CLI or STI */ - cmp al, 0xFA - je IsPrivInstruction - cmp al, 0xFB - je IsPrivInstruction - - /* Setup I/O table lookup */ - mov ecx, 13 - mov edi, offset _KiTrapIoTable - - /* Loopup in the table */ - repnz scasb - jnz NotIoViolation - - /* FIXME: Check IOPM!!! */ - -IsPrivInstruction: - /* Cleanup the SEH frame */ - pop PCR[KPCR_EXCEPTION_LIST] - add esp, 8 - - /* Setup the exception */ - mov ebx, [ebp+KTRAP_FRAME_EIP] - mov eax, STATUS_PRIVILEGED_INSTRUCTION - jmp _DispatchNoParam - -NotIoViolation: - /* Cleanup the SEH frame */ - pop PCR[KPCR_EXCEPTION_LIST] - add esp, 8 - -SetException: - /* Setup the exception */ - mov ebx, [ebp+KTRAP_FRAME_EIP] - mov esi, -1 - mov eax, STATUS_ACCESS_VIOLATION - jmp _DispatchTwoParamZero - -DispatchV86Gpf: - /* FIXME */ - UNHANDLED_V86_PATH -.endfunc - +GENERATE_TRAP_HANDLER KiTrap13, 0 GENERATE_TRAP_HANDLER KiTrap14, 0 GENERATE_TRAP_HANDLER KiTrap0F, 1 GENERATE_TRAP_HANDLER KiTrap16, 1 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] Mon Jan 11 06:53:57 2010 @@ -6,13 +6,46 @@ * PROGRAMMERS: ReactOS Portable Systems Group */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> #include "internal/trap_x.h" +/* GLOBALS ********************************************************************/ + +UCHAR KiTrapPrefixTable[] = +{ + 0xF2, /* REP */ + 0xF3, /* REP INS/OUTS */ + 0x67, /* ADDR */ + 0xF0, /* LOCK */ + 0x66, /* OP */ + 0x2E, /* SEG */ + 0x3E, /* DS */ + 0x26, /* ES */ + 0x64, /* FS */ + 0x65, /* GS */ + 0x36, /* SS */ +}; + +UCHAR KiTrapIoTable[] = +{ + 0xE4, /* IN */ + 0xE5, /* IN */ + 0xEC, /* IN */ + 0xED, /* IN */ + 0x6C, /* INS */ + 0x6D, /* INS */ + 0xE6, /* OUT */ + 0xE7, /* OUT */ + 0xEE, /* OUT */ + 0xEF, /* OUT */ + 0x6E, /* OUTS */ + 0x6F, /* OUTS */ +}; + /* TRAP EXIT CODE *************************************************************/ VOID @@ -780,6 +813,288 @@ /* FIXME: Kill the system */ UNIMPLEMENTED; KiSystemFatalException(EXCEPTION_STACK_FAULT, TrapFrame); +} + +VOID +FASTCALL +KiTrap13Handler(IN PKTRAP_FRAME TrapFrame) +{ + ULONG i, j, Iopl; + BOOLEAN Privileged = FALSE; + PUCHAR Instructions; + UCHAR Instruction = 0; + KIRQL OldIrql; + + /* Check for V86 GPF */ + if (TrapFrame->EFlags & EFLAGS_V86_MASK) + { + /* Enter V86 trap */ + KiEnterV86Trap(TrapFrame); + + /* Must be a VDM process */ + if (!PsGetCurrentProcess()->VdmObjects) + { + /* Enable interrupts */ + _enable(); + + /* Setup illegal instruction fault */ + KiDispatchException0Args(STATUS_ILLEGAL_INSTRUCTION, + TrapFrame->Eip, + TrapFrame); + } + + /* Go to APC level */ + OldIrql = KfRaiseIrql(APC_LEVEL); + _enable(); + + /* Handle the V86 opcode */ + if (Ki386HandleOpcodeV86(TrapFrame) == 0xFF) + { + /* Should only happen in VDM mode */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Bring IRQL back */ + KfLowerIrql(OldIrql); + _disable(); + + /* Do a quick V86 exit if possible */ + if (TrapFrame->EFlags & EFLAGS_V86_MASK) KiExitV86Trap(TrapFrame); + + /* Exit trap the slow way */ + KiEoiHelper(TrapFrame); + } + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Check for user-mode GPF */ + if (KiUserTrap(TrapFrame)) + { + /* Must be user-mode! */ + if (!KiUserTrap(TrapFrame)) KiSystemFatalException(EXCEPTION_GP_FAULT, TrapFrame); + + /* Should not be VDM */ + ASSERT(KiVdmTrap(TrapFrame) == FALSE); + + /* Enable interrupts and check error code */ + _enable(); + if (!TrapFrame->ErrCode) + { + /* FIXME: Use SEH */ + Instructions = (PUCHAR)TrapFrame->Eip; + + /* Scan next 15 opcodes */ + for (i = 0; i < 15; i++) + { + /* Skip prefix instructions */ + for (j = 0; j < sizeof(KiTrapPrefixTable); j++) + { + /* Is this NOT a prefix instruction? */ + if (Instructions[i] != KiTrapPrefixTable[j]) + { + /* We can go ahead and handle the fault now */ + Instruction = Instructions[i]; + break; + } + } + + /* Do we need to keep looking? */ + if (Instruction) break; + } + + /* If all we found was prefixes, then this instruction is too long */ + if (!Instruction) + { + /* Setup illegal instruction fault */ + KiDispatchException0Args(STATUS_ILLEGAL_INSTRUCTION, + TrapFrame->Eip, + TrapFrame); + } + + /* Check for privileged instructions */ + if (Instruction == 0xF4) // HLT + { + /* HLT is privileged */ + Privileged = TRUE; + } + else if (Instruction == 0x0F) + { + /* Test if it's any of the privileged two-byte opcodes */ + if (((Instructions[i + 1] == 0x00) && // LLDT or LTR + (((Instructions[i + 2] & 0x38) == 0x10) || // LLDT + (Instructions[i + 2] == 0x18))) || // LTR + ((Instructions[i + 1] == 0x01) && // LGDT or LIDT or LMSW + (((Instructions[i + 2] & 0x38) == 0x10) || // LLGT + (Instructions[i + 2] == 0x18) || // LIDT + (Instructions[i + 2] == 0x30))) || // LMSW + (Instructions[i + 1] == 0x08) || // INVD + (Instructions[i + 1] == 0x09) || // WBINVD + (Instructions[i + 1] == 0x35) || // SYSEXIT + (Instructions[i + 1] == 0x26) || // MOV DR, XXX + (Instructions[i + 1] == 0x06) || // CLTS + (Instructions[i + 1] == 0x20) || // MOV CR, XXX + (Instructions[i + 1] == 0x24) || // MOV YYY, DR + (Instructions[i + 1] == 0x30) || // WRMSR + (Instructions[i + 1] == 0x33)) // RDPMC + { + /* These are all privileged */ + Privileged = TRUE; + } + } + else + { + /* Get the IOPL and compare with the RPL mask */ + Iopl = (TrapFrame->EFlags & EFLAGS_IOPL) >> 12; + if ((TrapFrame->SegCs & RPL_MASK) == Iopl) + { + /* I/O privilege error -- check for known instructions */ + if ((Instruction == 0xFA) || (Instruction == 0xFB)) // CLI or STI + { + /* These are privileged */ + Privileged = TRUE; + } + else + { + /* Last hope: an IN/OUT instruction */ + for (j = 0; j < sizeof(KiTrapIoTable); j++) + { + /* Is this an I/O instruction? */ + if (Instruction == KiTrapIoTable[j]) + { + /* Then it's privileged */ + Privileged = TRUE; + break; + } + } + } + } + } + + /* So now... was the instruction privileged or not? */ + if (Privileged) + { + /* Whew! We have a privileged instruction, so dispatch the fault */ + KiDispatchException0Args(STATUS_PRIVILEGED_INSTRUCTION, + TrapFrame->Eip, + TrapFrame); + } + } + + /* If we got here, send an access violation */ + KiDispatchException2Args(STATUS_ACCESS_VIOLATION, + TrapFrame->Eip, + 0, + 0xFFFFFFFF, + 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. + * + * Note that the SEH handler will catch invalid EIP, but we could be dealing + * with an invalid CS, which will generate another GPF instead. + * + */ + if (((PVOID)TrapFrame->Eip >= (PVOID)KiTrap13Handler) && + ((PVOID)TrapFrame->Eip < (PVOID)KiTrap13Handler)) + { + /* Not implemented */ + UNIMPLEMENTED; + while (TRUE); + } + + /* + * NOTE: The ASM trap exit code would restore segment registers by doing + * a POP <SEG>, which could cause an invalid segment if someone had messed + * with the segment values. + * + * Another case is a bogus SS, which would hit a GPF when doing the ired. + * This could only be done through a buggy or malicious driver, or perhaps + * the kernel debugger. + * + * The kernel normally restores the "true" segment if this happens. + * + * However, since we're restoring in C, not ASM, we can't detect + * POP <SEG> since the actual instructions will be different. + * + * A better technique would be to check the EIP and somehow edit the + * trap frame before restarting the instruction -- but we would need to + * know the extract instruction that was used first. + * + * We could force a special instrinsic to use stack instructions, or write + * a simple instruction length checker. + * + * Nevertheless, this is a lot of work for the purpose of avoiding a crash + * when the user is purposedly trying to create one from kernel-mode, so + * we should probably table this for now since it's not a "real" issue. + */ + + /* + * NOTE2: Another scenario is the IRET during a V8086 restore (BIOS Call) + * which will cause a GPF since the trap frame is a total mess (on purpose) + * as built in KiEnterV86Mode. + * + * The idea is to scan for IRET, scan for the known EIP adress, validate CS + * and then manually issue a jump to the V8086 return EIP. + */ + Instructions = (PUCHAR)TrapFrame->Eip; + if (Instructions[0] == 0xCF) + { + /* + * Some evil shit is going on here -- this is not the SS:ESP you're + * looking for! Instead, this is actually CS:EIP you're looking at! + * Why? Because part of the trap frame actually corresponds to the IRET + * stack during the trap exit! + */ + if ((TrapFrame->HardwareEsp == (ULONG)KiExitV86Mode) && + (TrapFrame->HardwareSegSs == (KGDT_R0_CODE | RPL_MASK))) + { + /* Exit the V86 trap! */ + KiExitV86Mode(TrapFrame); + } + else + { + /* Otherwise, this is another kind of IRET fault */ + UNIMPLEMENTED; + while (TRUE); + } + } + + /* So since we're not dealing with the above case, check for RDMSR/WRMSR */ + if ((Instructions[0] == 0xF) && // 2-byte opcode + (((Instructions[1] >> 8) == 0x30) || // RDMSR + ((Instructions[2] >> 8) == 0x32))) // WRMSR + { + /* Unknown CPU MSR, so raise an access violation */ + KiDispatchException0Args(STATUS_ACCESS_VIOLATION, + TrapFrame->Eip, + TrapFrame); + } + + /* Check for lazy segment load */ + if (TrapFrame->SegDs != (KGDT_R3_DATA | RPL_MASK)) + { + /* Fix it */ + TrapFrame->SegDs = (KGDT_R3_DATA | RPL_MASK); + } + else if (TrapFrame->SegEs != (KGDT_R3_DATA | RPL_MASK)) + { + /* Fix it */ + TrapFrame->SegEs = (KGDT_R3_DATA | RPL_MASK); + } + + /* Do a direct trap exit: restore volatiles only */ + KiExitTrap(TrapFrame, KTE_SKIP_PM_BIT | KTE_SKIP_SEG_BIT); } VOID Removed: trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86m_sup.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S (removed) @@ -1,37 +1,0 @@ -/* - * FILE: ntoskrnl/ke/i386/v86m_sup.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: Virtual 8086 (V86) Mode Support - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - * NOTE: See asmmacro.S for the V86 trap code. - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -#include <internal/i386/asmmacro.S> -.intel_syntax noprefix - -/* FUNCTIONS *****************************************************************/ - -.globl _Ki386SetupAndExitToV86Mode@4 -.func Ki386SetupAndExitToV86Mode@4 -_Ki386SetupAndExitToV86Mode@4: - - /* Enter V8086 mode */ - pushad - call @KiEnterV86Mode@0 -.endfunc - -.globl _Ki386BiosCallReturnAddress -.func Ki386BiosCallReturnAddress -_Ki386BiosCallReturnAddress: - - /* Exit V8086 mode */ - mov ecx, ebp - call @KiExitV86Mode@4 - mov esp, eax - popad -.endfunc - - Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Mon Jan 11 06:53:57 2010 @@ -429,7 +429,7 @@ return KiVdmHandleOpcode(TrapFrame, 1); } -ULONG_PTR +VOID FASTCALL KiExitV86Mode(IN PKTRAP_FRAME TrapFrame) { @@ -466,9 +466,9 @@ GdtEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Thread->Teb >> 16); GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Thread->Teb >> 24); - /* Enable interrupts and pop back non-volatiles */ + /* Enable interrupts and get back to protected mode */ _enable(); - return TrapFrame->Edi; + KiV86TrapReturn(TrapFrame->Edi); } VOID @@ -497,7 +497,7 @@ V86Frame->PcrTeb = KeGetPcr()->Tib.Self; /* Save return EIP */ - TrapFrame->Eip = (ULONG_PTR)Ki386BiosCallReturnAddress; + TrapFrame->Eip = (ULONG_PTR)KiExitV86Mode; /* Save our stack (after the frames) */ TrapFrame->Esi = (ULONG_PTR)V86Frame; Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Jan 11 06:53:57 2010 @@ -55,7 +55,6 @@ <file>usercall_asm.S</file> <file>usercall.c</file> <file>v86vdm.c</file> - <file>v86m_sup.S</file> </directory> </if> <if property="ARCH" value="arm">

1 0

[sir_richard] 45037: [NTOS]: Rewrite BIOS Call (V8086) Entry/Exit routines in C. Only 4 lines of ASM stub remain. This wasn't fun... the stack dancing alone gives you headaches. Who ever thought of dynamically sized trap frames!
by sir_richard＠svn.reactos.org 11 Jan '10

11 Jan '10

Author: sir_richard Date: Mon Jan 11 04:47:17 2010 New Revision: 45037 URL: http://svn.reactos.org/svn/reactos?rev=45037&view=rev Log: [NTOS]: Rewrite BIOS Call (V8086) Entry/Exit routines in C. Only 4 lines of ASM stub remain. This wasn't fun... the stack dancing alone gives you headaches. Who ever thought of dynamically sized trap frames! Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/vdm/vdmexec.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Mon Jan 11 04:47:17 2010 @@ -139,6 +139,27 @@ return TRUE; \ } +C_ASSERT(NPX_FRAME_LENGTH == sizeof(FX_SAVE_AREA)); + +// +// Local parameters +// +typedef struct _KV86_FRAME +{ + PVOID ThreadStack; + PVOID ThreadTeb; + PVOID PcrTeb; +} KV86_FRAME, *PKV86_FRAME; + +// +// Virtual Stack Frame +// +typedef struct _KV8086_STACK_FRAME +{ + KTRAP_FRAME TrapFrame; + FX_SAVE_AREA NpxArea; + KV86_FRAME V86Frame; +} KV8086_STACK_FRAME, *PKV8086_STACK_FRAME; // // Registers an interrupt handler with an IDT vector @@ -379,6 +400,12 @@ BOOLEAN FASTCALL Ki386HandleOpcodeV86( + IN PKTRAP_FRAME TrapFrame +); + +VOID +FASTCALL +KiEoiHelper( IN PKTRAP_FRAME TrapFrame ); @@ -409,6 +436,14 @@ extern VOID __cdecl CopyParams(VOID); extern VOID __cdecl ReadBatch(VOID); extern VOID __cdecl FrRestore(VOID); +extern VOID Ki386BiosCallReturnAddress(VOID); + +PFX_SAVE_AREA +FORCEINLINE +KiGetThreadNpxArea(IN PKTHREAD Thread) +{ + return (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); +} // // Sanitizes a selector Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Mon Jan 11 04:47:17 2010 @@ -137,13 +137,6 @@ ((KiUserTrap(TrapFrame)) && (PsGetCurrentProcess()->VdmObjects))); } -PFX_SAVE_AREA -FORCEINLINE -KiGetThreadNpxArea(IN PKTHREAD Thread) -{ - return (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); -} - VOID FORCEINLINE KiTrapFrameFromPushaStack(IN PKTRAP_FRAME TrapFrame) Modified: trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86m_sup.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S [iso-8859-1] Mon Jan 11 04:47:17 2010 @@ -18,177 +18,20 @@ .func Ki386SetupAndExitToV86Mode@4 _Ki386SetupAndExitToV86Mode@4: - /* Save nonvolatiles */ - push ebp - push ebx - push esi - push edi - - /* Give us a little stack */ - sub esp, 12 - mov ecx, esp - - /* Go past the KTRAP_FRAME and NPX Frame and set a new frame in EAX */ - sub esp, NPX_FRAME_LENGTH - and esp, ~15 - sub esp, KTRAP_FRAME_LENGTH - mov eax, esp - - /* Create a fake user-mode frame */ - mov dword ptr [eax+KTRAP_FRAME_CS], KGDT_R0_CODE + RPL_MASK - mov dword ptr [eax+KTRAP_FRAME_ES], 0 - mov dword ptr [eax+KTRAP_FRAME_DS], 0 - mov dword ptr [eax+KTRAP_FRAME_FS], 0 - mov dword ptr [eax+KTRAP_FRAME_GS], 0 - mov dword ptr [eax+KTRAP_FRAME_ERROR_CODE], 0 - - /* Get the current thread's initial stack */ - mov ebx, [fs:KPCR_SELF] - mov edi, [ebx+KPCR_CURRENT_THREAD] - mov edx, [edi+KTHREAD_INITIAL_STACK] - sub edx, NPX_FRAME_LENGTH - - /* Save it on our stack, as well as the real TEB addresses */ - mov [ecx], edx - mov edx, [edi+KTHREAD_TEB] - mov [ecx+4], edx - mov edx, [fs:KPCR_TEB] - mov [ecx+8] , edx - - /* Set our ESP in ESI, and the return function in EIP */ - mov edi, offset _Ki386BiosCallReturnAddress - mov [eax+KTRAP_FRAME_ESI], ecx - mov [eax+KTRAP_FRAME_EIP], edi - - /* Push the flags and sanitize them */ - pushfd - pop edi - and edi, 0x60DD7 - or edi, EFLAGS_INTERRUPT_MASK - - /* Set SS and ESP, and fill out the rest of the frame */ - mov dword ptr [eax+KTRAP_FRAME_SS], KGDT_R3_DATA + RPL_MASK; - mov dword ptr [eax+KTRAP_FRAME_ESP], 0x11FFE; - mov dword ptr [eax+KTRAP_FRAME_EFLAGS], edi - mov dword ptr [eax+KTRAP_FRAME_EXCEPTION_LIST], -1 - mov dword ptr [eax+KTRAP_FRAME_PREVIOUS_MODE], -1 - mov dword ptr [eax+KTRAP_FRAME_DR7], 0 - mov dword ptr [eax+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - - /* Jump past the frame now */ - add eax, KTRAP_FRAME_LENGTH - cli - - /* Save the current stack */ - push ecx - - /* Get the current thread's intial stack again */ - mov edi, [ebx+KPCR_CURRENT_THREAD] - mov esi, [edi+KTHREAD_INITIAL_STACK] - sub esi, NPX_FRAME_LENGTH - - /* Set the size of the copy, and the destination, and copy the NPX frame */ - mov ecx, NPX_FRAME_LENGTH / 4 - mov edi, eax - rep movsd - - /* Restore stack */ - pop ecx - - /* Get the current thread and TSS */ - mov edi, [ebx+KPCR_CURRENT_THREAD] - mov esi, [ebx+KPCR_TSS] - - /* Bias the V86 vrame */ - sub eax, KTRAP_FRAME_V86_GS - KTRAP_FRAME_SS - - /* Set exception list and new ESP */ - mov dword ptr [ebx+KPCR_EXCEPTION_LIST], -1 - mov [esi+KTSS_ESP0], eax - - /* Now skip past the NPX frame and V86 fields and set this as the intial stack */ - add eax, NPX_FRAME_LENGTH + (KTRAP_FRAME_V86_GS - KTRAP_FRAME_SS) - mov [edi+KTHREAD_INITIAL_STACK], eax - - /* Setup our fake TEB pointer */ - mov eax, [ecx+0x20] - mov [fs:KPCR_TEB], eax - mov [edi+KTHREAD_TEB], eax - - /* Setup the descriptors for the fake TEB */ - mov ebx, [fs:KPCR_GDT] - mov [ebx+0x3A], ax - shr eax, 16 - mov [ebx+0x3C], al - mov [ebx+0x3F], ah - sti - - /* - * Start VDM execution. This will save this fake 32-bit KTRAP_FRAME and - * initialize a real 16-bit VDM context frame - */ - push 0 - push 0 // VdmStartExecution - call _NtVdmControl@8 - - /* Exit to V86 mode */ - mov ebp, esp - jmp _Kei386EoiHelper@0 + /* Enter V8086 mode */ + pushad + call @KiEnterV86Mode@0 .endfunc .globl _Ki386BiosCallReturnAddress .func Ki386BiosCallReturnAddress _Ki386BiosCallReturnAddress: - /* Get the PCR */ - mov eax, [fs:KPCR_SELF] + /* Exit V8086 mode */ + mov ecx, ebp + call @KiExitV86Mode@4 + mov esp, eax + popad +.endfunc - /* Get NPX destination */ - mov edi, [ebp+KTRAP_FRAME_ESI] - mov edi, [edi] - /* Get initial stack */ - mov ecx, [eax+KPCR_CURRENT_THREAD] - mov esi, [ecx+KTHREAD_INITIAL_STACK] - sub esi, NPX_FRAME_LENGTH - - /* Set length and copy the NPX frame */ - mov ecx, NPX_FRAME_LENGTH / 4 - rep movsd - - /* Restore stack */ - mov esp, [ebp+KTRAP_FRAME_ESI] - add esp, 4 - - /* Set initial stack */ - mov ecx, [eax+KPCR_CURRENT_THREAD] - mov [ecx+KTHREAD_INITIAL_STACK], edi - - /* Get TSS and set the ESP 0 */ - mov eax, [eax+KPCR_TSS] - sub edi, NPX_FRAME_LENGTH + (KTRAP_FRAME_V86_GS - KTRAP_FRAME_SS) - mov [eax+KTSS_ESP0], edi - - /* Restore KTHREAD TEB in EDX */ - pop edx - mov [ecx+KTHREAD_TEB], edx - - /* Restore PCR TEB in EDX */ - pop edx - mov [fs:KPCR_TEB], edx - - /* Setup the descriptors for the real TEB */ - mov ebx, [fs:KPCR_GDT] - mov [ebx+0x3A], dx - shr edx, 16 - mov [ebx+0x3C], dl - mov [ebx+0x3F], dh - - /* Enable interrupts and pop back non-volatiles */ - sti - pop edi - pop esi - pop ebx - pop ebp - ret 4 -.endfunc Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Mon Jan 11 04:47:17 2010 @@ -19,8 +19,6 @@ ULONG KeI386EFlagsOrMaskV86 = EFLAGS_INTERRUPT_MASK; PVOID Ki386IopmSaveArea; BOOLEAN KeI386VirtualIntExtensions = FALSE; - -#if 1 const PULONG KiNtVdmState = (PULONG)FIXED_NTVDMSTATE_LINEAR_PC_AT; /* UNHANDLED OPCODES **********************************************************/ @@ -431,8 +429,128 @@ return KiVdmHandleOpcode(TrapFrame, 1); } +ULONG_PTR +FASTCALL +KiExitV86Mode(IN PKTRAP_FRAME TrapFrame) +{ + PKV8086_STACK_FRAME StackFrame; + PKGDTENTRY GdtEntry; + PKTHREAD Thread; + PKTRAP_FRAME PmTrapFrame; + PKV86_FRAME V86Frame; + PFX_SAVE_AREA NpxFrame; + + /* Get the stack frame back */ + StackFrame = CONTAINING_RECORD(TrapFrame->Esi, KV8086_STACK_FRAME, V86Frame); + PmTrapFrame = &StackFrame->TrapFrame; + V86Frame = &StackFrame->V86Frame; + NpxFrame = &StackFrame->NpxArea; + + /* Copy the FPU frame back */ + Thread = KeGetCurrentThread(); + RtlCopyMemory(KiGetThreadNpxArea(Thread), NpxFrame, sizeof(FX_SAVE_AREA)); + + /* Set initial stack back */ + Thread->InitialStack = (PVOID)((ULONG_PTR)V86Frame->ThreadStack + sizeof(FX_SAVE_AREA)); + + /* Set ESP0 back in the KTSS */ + KeGetPcr()->TSS->Esp0 = (ULONG_PTR)&PmTrapFrame->V86Es; + + /* Restore TEB addresses */ + Thread->Teb = V86Frame->ThreadTeb; + KeGetPcr()->Tib.Self = V86Frame->PcrTeb; + + /* Setup real TEB descriptor */ + GdtEntry = &((PKIPCR)KeGetPcr())->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)]; + GdtEntry->BaseLow = (USHORT)((ULONG_PTR)Thread->Teb & 0xFFFF); + GdtEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Thread->Teb >> 16); + GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Thread->Teb >> 24); + + /* Enable interrupts and pop back non-volatiles */ + _enable(); + return TrapFrame->Edi; +} + +VOID +FASTCALL +KiEnterV86Mode(VOID) +{ + PKTHREAD Thread; + PKGDTENTRY GdtEntry; + KV8086_STACK_FRAME StackFrameBuffer; + PKV8086_STACK_FRAME StackFrame = &StackFrameBuffer; + PKTRAP_FRAME TrapFrame = &StackFrame->TrapFrame; + PKV86_FRAME V86Frame = &StackFrame->V86Frame; + PFX_SAVE_AREA NpxFrame = &StackFrame->NpxArea; + + /* Build fake user-mode trap frame */ + TrapFrame->SegCs = KGDT_R0_CODE | RPL_MASK; + TrapFrame->SegEs = TrapFrame->SegDs = TrapFrame->SegFs = TrapFrame->SegGs = 0; + TrapFrame->ErrCode = 0; + + /* Get the current thread's initial stack */ + Thread = KeGetCurrentThread(); + V86Frame->ThreadStack = KiGetThreadNpxArea(Thread); + + /* Save TEB addresses */ + V86Frame->ThreadTeb = Thread->Teb; + V86Frame->PcrTeb = KeGetPcr()->Tib.Self; + + /* Save return EIP */ + TrapFrame->Eip = (ULONG_PTR)Ki386BiosCallReturnAddress; + + /* Save our stack (after the frames) */ + TrapFrame->Esi = (ULONG_PTR)V86Frame; + TrapFrame->Edi = (ULONG_PTR)_AddressOfReturnAddress() + 4; + + /* Sanitize EFlags and enable interrupts */ + TrapFrame->EFlags = __readeflags() & 0x60DD7; + TrapFrame->EFlags |= EFLAGS_INTERRUPT_MASK; + + /* Fill out the rest of the frame */ + TrapFrame->HardwareSegSs = KGDT_R3_DATA | RPL_MASK; + TrapFrame->HardwareEsp = 0x11FFE; + TrapFrame->ExceptionList = EXCEPTION_CHAIN_END; + TrapFrame->Dr7 = 0; + //TrapFrame->DbgArgMark = 0xBADB0D00; + TrapFrame->PreviousPreviousMode = -1; + + /* Disable interrupts */ + _disable(); + + /* Copy the thread's NPX frame */ + RtlCopyMemory(NpxFrame, V86Frame->ThreadStack, sizeof(FX_SAVE_AREA)); + + /* Clear exception list */ + KeGetPcr()->Tib.ExceptionList = EXCEPTION_CHAIN_END; + + /* Set new ESP0 */ + KeGetPcr()->TSS->Esp0 = (ULONG_PTR)&TrapFrame->V86Es; + + /* Set new initial stack */ + Thread->InitialStack = V86Frame; + + /* Set VDM TEB */ + Thread->Teb = (PTEB)TRAMPOLINE_TEB; + KeGetPcr()->Tib.Self = (PVOID)TRAMPOLINE_TEB; + + /* Setup VDM TEB descriptor */ + GdtEntry = &((PKIPCR)KeGetPcr())->GDT[KGDT_R3_TEB / sizeof(KGDTENTRY)]; + GdtEntry->BaseLow = (USHORT)((ULONG_PTR)TRAMPOLINE_TEB & 0xFFFF); + GdtEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)TRAMPOLINE_TEB >> 16); + GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)TRAMPOLINE_TEB >> 24); + + /* Enable interrupts */ + _enable(); + + /* Start VDM execution */ + NtVdmControl(VdmStartExecution, NULL); + + /* Exit to V86 mode */ + KiEoiHelper(TrapFrame); +} + /* PUBLIC FUNCTIONS ***********************************************************/ -#endif /* * @implemented Modified: trunk/reactos/ntoskrnl/vdm/vdmexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/vdm/vdmexec.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/vdm/vdmexec.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/vdm/vdmexec.c [iso-8859-1] Mon Jan 11 04:47:17 2010 @@ -50,7 +50,7 @@ /* Make sure that we're at APC_LEVEL and that this is a valid frame */ ASSERT(KeGetCurrentIrql() == APC_LEVEL); - ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); + //ASSERT(TrapFrame->DbgArgMark == 0xBADB0D00); /* Check if this is a V86 frame */ if (TrapFrame->EFlags & EFLAGS_V86_MASK)

1 0

[mkupfer] 45036: - fixes issue with cancel button - fixes problems with unattended mode - temporarily enable device listing (setupapi)
by mkupfer＠svn.reactos.org 10 Jan '10

10 Jan '10

Author: mkupfer Date: Mon Jan 11 00:22:01 2010 New Revision: 45036 URL: http://svn.reactos.org/svn/reactos?rev=45036&view=rev Log: - fixes issue with cancel button - fixes problems with unattended mode - temporarily enable device listing (setupapi) Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Jan 11 00:22:01 2010 @@ -668,7 +668,7 @@ WPARAM wParam, LPARAM lParam) { -#if 0 +#if 1 HDEVINFO h; HWND hList; SP_DEVINFO_DATA DevInfoData; @@ -692,7 +692,7 @@ WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE);*/ -#if 0 +#if 1 h = SetupDiGetClassDevs(&GUID_DEVCLASS_DISKDRIVE, NULL, NULL, DIGCF_PRESENT); if (h != INVALID_HANDLE_VALUE) { @@ -805,10 +805,6 @@ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); - ShowWindow(hwndControl, SW_HIDE); - EnableWindow(hwndControl, FALSE); - /* Set title font */ /*SendDlgItemMessage(hwndDlg, IDC_STARTTITLE, @@ -828,6 +824,14 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT | PSWIZB_BACK); break; + case PSN_QUERYCANCEL: + SetWindowLongPtr(hwndDlg, + DWL_MSGRESULT, + MessageBox(GetParent(hwndDlg), + abort_msg, + abort_title, + MB_YESNO | MB_ICONQUESTION) != IDYES); + return TRUE; default: break; } @@ -859,10 +863,6 @@ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); - hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); - ShowWindow(hwndControl, SW_HIDE); - EnableWindow(hwndControl, FALSE); - /* Set title font */ /*SendDlgItemMessage(hwndDlg, IDC_STARTTITLE, @@ -883,7 +883,14 @@ // disable all buttons during installation process // PropSheet_SetWizButtons(GetParent(hwndDlg), 0 ); break; - + case PSN_QUERYCANCEL: + SetWindowLongPtr(hwndDlg, + DWL_MSGRESULT, + MessageBox(GetParent(hwndDlg), + abort_msg, + abort_title, + MB_YESNO | MB_ICONQUESTION) != IDYES); + return TRUE; default: break; } @@ -916,6 +923,10 @@ dwStyle = GetWindowLongPtr(hwndControl, GWL_STYLE); SetWindowLongPtr(hwndControl, GWL_STYLE, dwStyle & ~WS_SYSMENU); + hwndControl = GetDlgItem(GetParent(hwndDlg), IDCANCEL); + ShowWindow(hwndControl, SW_HIDE); + EnableWindow(hwndControl, FALSE); + /* Set title font */ /*SendDlgItemMessage(hwndDlg, IDC_STARTTITLE, @@ -1194,10 +1205,10 @@ hInstance = hInst; isUnattend = isUnattendSetup(); + LoadString(hInst,IDS_ABORTSETUP, abort_msg, sizeof(abort_msg)/sizeof(TCHAR)); + LoadString(hInst,IDS_ABORTSETUP2, abort_title,sizeof(abort_title)/sizeof(TCHAR)); if (!isUnattend) { - LoadString(hInst,IDS_ABORTSETUP, abort_msg, sizeof(abort_msg)/sizeof(TCHAR)); - LoadString(hInst,IDS_ABORTSETUP2, abort_title,sizeof(abort_title)/sizeof(TCHAR)); LoadSetupData(); @@ -1277,19 +1288,16 @@ psp.pszTemplate = MAKEINTRESOURCE(IDD_PROCESSPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); - if (!isUnattend) - { - /* Create finish to reboot page */ - psp.dwSize = sizeof(PROPSHEETPAGE); - psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; - psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_RESTARTTITLE); - psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_RESTARTSUBTITLE); - psp.hInstance = hInst; - psp.lParam = 0; - psp.pfnDlgProc = RestartDlgProc; - psp.pszTemplate = MAKEINTRESOURCE(IDD_RESTARTPAGE); - ahpsp[nPages++] = CreatePropertySheetPage(&psp); - } + /* Create finish to reboot page */ + psp.dwSize = sizeof(PROPSHEETPAGE); + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_RESTARTTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_RESTARTSUBTITLE); + psp.hInstance = hInst; + psp.lParam = 0; + psp.pfnDlgProc = RestartDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_RESTARTPAGE); + ahpsp[nPages++] = CreatePropertySheetPage(&psp); /* Create the property sheet */ psh.dwSize = sizeof(PROPSHEETHEADER);

1 0

[mkupfer] 45035: -set fix line endings to preserve windows line endings
by mkupfer＠svn.reactos.org 10 Jan '10

10 Jan '10

Author: mkupfer Date: Sun Jan 10 21:43:27 2010 New Revision: 45035 URL: http://svn.reactos.org/svn/reactos?rev=45035&view=rev Log: -set fix line endings to preserve windows line endings Modified: trunk/reactos/boot/bootdata/readme.txt (contents, props changed) Modified: trunk/reactos/boot/bootdata/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/readme.txt?r… ============================================================================== --- trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/readme.txt [iso-8859-1] Sun Jan 10 21:43:27 2010 @@ -1,54 +1,54 @@ -======================== -ReactOS Version 0.3.x -Updated July 28, 2007 -======================== - -1. What is ReactOS? -------------------- - -ReactOS is an Open Source effort to develop a quality operating system that is -compatible with applications and drivers written for the Microsoft Windows NT -family of operating systems (NT4, 2000, XP, 2003, Vista). - -Website: http://www.reactos.org/ - - -2. Relationship with the WINE project -------------------------------------- - -ReactOS has always intended to work with the WINE project to share as much -programming effort as possible. This mainly concerns User Mode DLLs and -still happens to a degree today. Other areas of cooperation lie in -applications and testing suites. - - -3. Future compatibility ------------------------ - -The ReactOS project, although currently focused on Windows XP -compatibility, is always keeping an eye toward compatibility with -Windows Vista and future Windows NT releases. - - -4. Supporting other System Applications ---------------------------------------- - -The Windows NT architecture allows for subsystems, as does the ReactOS -architecture. A subsystem is an implementation of the APIs of another -operating system, allowing ReactOS to run applications from other systems. We -are already looking at subsystems for: Java, OS/2, and DOS and possibly others -in the future. - - -5. Tutorials ------------- - -Developer and User Tutorials: http://www.reactos.org/wiki/index.php/Main_Page - -The tutorials contain more information on the project, compiling and testing -ReactOS - among other topics. Contributors to the project are always welcome. - -6. Author ---------- - +======================== +ReactOS Version 0.3.x +Updated July 28, 2007 +======================== + +1. What is ReactOS? +------------------- + +ReactOS is an Open Source effort to develop a quality operating system that is +compatible with applications and drivers written for the Microsoft Windows NT +family of operating systems (NT4, 2000, XP, 2003, Vista). + +Website: http://www.reactos.org/ + + +2. Relationship with the WINE project +------------------------------------- + +ReactOS has always intended to work with the WINE project to share as much +programming effort as possible. This mainly concerns User Mode DLLs and +still happens to a degree today. Other areas of cooperation lie in +applications and testing suites. + + +3. Future compatibility +----------------------- + +The ReactOS project, although currently focused on Windows XP +compatibility, is always keeping an eye toward compatibility with +Windows Vista and future Windows NT releases. + + +4. Supporting other System Applications +--------------------------------------- + +The Windows NT architecture allows for subsystems, as does the ReactOS +architecture. A subsystem is an implementation of the APIs of another +operating system, allowing ReactOS to run applications from other systems. We +are already looking at subsystems for: Java, OS/2, and DOS and possibly others +in the future. + + +5. Tutorials +------------ + +Developer and User Tutorials: http://www.reactos.org/wiki/index.php/Main_Page + +The tutorials contain more information on the project, compiling and testing +ReactOS - among other topics. Contributors to the project are always welcome. + +6. Author +--------- + This document was written by Jason Filby (jasonfilby(a)yahoo.com). Propchange: trunk/reactos/boot/bootdata/readme.txt ------------------------------------------------------------------------------ --- svn:eol-style (original) +++ svn:eol-style Sun Jan 10 21:43:27 2010 @@ -1,1 +1,1 @@ -native +CRLF

1 0

[jimtabor] 45034: [Win32k] - When locking and unlocking regions, no need to use probe to check attribute space first before read or write access. The exception handling is a feature.
by jimtabor＠svn.reactos.org 10 Jan '10

10 Jan '10

Author: jimtabor Date: Sun Jan 10 20:06:07 2010 New Revision: 45034 URL: http://svn.reactos.org/svn/reactos?rev=45034&view=rev Log: [Win32k] - When locking and unlocking regions, no need to use probe to check attribute space first before read or write access. The exception handling is a feature. Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Sun Jan 10 20:06:07 2010 @@ -2085,7 +2085,6 @@ PGDI_TABLE_ENTRY Entry; PROSRGNDATA pRgn; PRGN_ATTR pRgn_Attr; - BOOL Hit = FALSE; pRgn = REGION_LockRgn(hRgn); @@ -2101,8 +2100,6 @@ { _SEH2_TRY { - ProbeForWrite(pRgn_Attr, sizeof(RGN_ATTR), 1); - if ( !(pRgn_Attr->AttrFlags & ATTR_CACHED) && pRgn_Attr->AttrFlags & (ATTR_RGN_VALID|ATTR_RGN_DIRTY) ) { @@ -2125,7 +2122,6 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; } _SEH2_END; @@ -2148,7 +2144,6 @@ INT Index; PGDI_TABLE_ENTRY Entry; PRGN_ATTR pRgn_Attr; - BOOL Hit = FALSE; if (pRgn) { @@ -2162,8 +2157,6 @@ { _SEH2_TRY { - ProbeForWrite(pRgn_Attr, sizeof(RGN_ATTR), 1); - if ( pRgn_Attr->AttrFlags & ATTR_RGN_VALID ) { pRgn_Attr->Flags = REGION_Complexity( pRgn ); @@ -2175,7 +2168,6 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; } _SEH2_END; } @@ -2525,7 +2517,6 @@ } else { - DPRINT("SetRectRgn NULL Count: %d \n", rgn->rdh.nCount); EMPTY_REGION(rgn); } }

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