Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 23643: Fix compilation of ntoskrnl
by hpoussin＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: hpoussin Date: Mon Aug 21 21:16:36 2006 New Revision: 23643 URL: http://svn.reactos.org/svn/reactos?rev=23643&view=rev Log: Fix compilation of ntoskrnl Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Mon Aug 21 21:16:36 2006 @@ -53,9 +53,8 @@ ((type) == KdbAccessReadWrite ? "rdwr" : "exec"))) #define NPX_STATE_TO_STRING(state) \ - ((state) == NPX_STATE_INVALID ? "Invalid" : \ - ((state) == NPX_STATE_VALID ? "Valid" : \ - ((state) == NPX_STATE_DIRTY ? "Dirty" : "Unknown"))) + ((state) == NPX_STATE_LOADED ? "Loaded" : \ + ((state) == NPX_STATE_NOT_LOADED ? "Not loaded" : "Unknown")) /* PROTOTYPES ****************************************************************/

1 0

[greatlrd] 23642: Update version number to 0.3.x
by greatlrd＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: greatlrd Date: Mon Aug 21 19:04:20 2006 New Revision: 23642 URL: http://svn.reactos.org/svn/reactos?rev=23642&view=rev Log: Update version number to 0.3.x Modified: trunk/reactos/README Modified: trunk/reactos/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/README?rev=23642&r1=23641&… ============================================================================== --- trunk/reactos/README (original) +++ trunk/reactos/README Mon Aug 21 19:04:20 2006 @@ -1,6 +1,6 @@ ======================== -ReactOS Version 0.2.x -Updated June 23rd, 2004 +ReactOS Version 0.3.x +Updated Aug 21rd, 2005 ======================== 1. What is ReactOS?

1 0

[janderwald] 23641: * colors.c: add error checking * console.c: add defaults * layout: halfplement layout dialog
by janderwald＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: janderwald Date: Mon Aug 21 14:57:14 2006 New Revision: 23641 URL: http://svn.reactos.org/svn/reactos?rev=23641&view=rev Log: * colors.c: add error checking * console.c: add defaults * layout: halfplement layout dialog Modified: trunk/reactos/dll/win32/console/colors.c trunk/reactos/dll/win32/console/console.c trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/en.rc trunk/reactos/dll/win32/console/layout.c Modified: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (original) +++ trunk/reactos/dll/win32/console/colors.c Mon Aug 21 14:57:14 2006 @@ -57,6 +57,12 @@ hBrush = CreateSolidBrush(nbkColor); ntColor = pConInfo->PopupText; } + + if (!hBrush) + { + return FALSE; + } + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); DeleteObject((HGDIOBJ)hBrush); ptColor = SetTextColor(drawItem->hDC, ntColor); Modified: trunk/reactos/dll/win32/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.c (original) +++ trunk/reactos/dll/win32/console/console.c Mon Aug 21 14:57:14 2006 @@ -59,7 +59,9 @@ pConInfo->ScreenBackground = RGB(0, 0, 0); pConInfo->PopupText = RGB(128, 0, 128); pConInfo->PopupBackground = RGB(255, 255, 255); - + pConInfo->WindowSize = (DWORD)MAKELONG(80, 25); + pConInfo->WindowPosition = -1; + pConInfo->ScreenBuffer = MAKELONG(80, 300); GetModuleFileName(NULL, pConInfo->szProcessName, MAX_PATH); //MessageBox(hwnd, pConInfo->szProcessName, _T("GetModuleFileName"), MB_OK); Modified: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (original) +++ trunk/reactos/dll/win32/console/console.h Mon Aug 21 14:57:14 2006 @@ -29,6 +29,12 @@ DWORD QuickEdit; DWORD InsertMode; + DWORD ScreenBuffer; + DWORD WindowSize; + DWORD WindowPosition; + + + DWORD ActiveStaticControl; COLORREF ScreenText; COLORREF ScreenBackground; Modified: trunk/reactos/dll/win32/console/en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/en.rc?re… ============================================================================== --- trunk/reactos/dll/win32/console/en.rc (original) +++ trunk/reactos/dll/win32/console/en.rc Mon Aug 21 14:57:14 2006 @@ -64,21 +64,21 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Window Preview", -1, 10, 10, 65, 10 -CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_BLACKRECT | SS_SUNKEN, 10, 20, 100, 70 +CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 100, 70 GROUPBOX "Screen Buffer Size", -1, 115, 15, 115, 40 LTEXT "&Width:", -1, 120, 30, 25, 10 LTEXT "&Height:", -1, 120, 40, 25, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 +EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 +EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP +CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 GROUPBOX "Window Size", -1, 115, 60, 115, 40 LTEXT "&W&idth:", -1, 120, 70, 25, 10 LTEXT "&H&eight:", -1, 120, 80, 25, 10 EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 +CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 +CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 GROUPBOX "Window Position", -1, 115, 105, 115, 55 LTEXT "&Left:", -1, 120, 120, 25, 10 LTEXT "&Top:", -1, 120, 130, 25, 10 @@ -146,5 +146,5 @@ IDS_CPLNAME "Console" IDS_CPLDESCRIPTION "Configures console properties." IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" END Modified: trunk/reactos/dll/win32/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/layout.c… ============================================================================== --- trunk/reactos/dll/win32/console/layout.c (original) +++ trunk/reactos/dll/win32/console/layout.c Mon Aug 21 14:57:14 2006 @@ -27,9 +27,95 @@ { case WM_INITDIALOG: { + DWORD xres, yres; + HDC hDC; pConInfo = (PConsoleInfo) ((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_HEIGHT, HIWORD(pConInfo->ScreenBuffer), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, LOWORD(pConInfo->ScreenBuffer), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_HEIGHT, HIWORD(pConInfo->WindowSize), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, LOWORD(pConInfo->WindowSize), FALSE); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_HEIGHT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_SCREEN_BUFFER_WIDTH), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_HEIGHT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_SIZE_WIDTH), UDM_SETRANGE, 0, (LPARAM)MAKELONG(9999, 0)); + + hDC = GetDC(NULL); + xres = GetDeviceCaps(hDC, HORZRES); + yres = GetDeviceCaps(hDC, VERTRES); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), UDM_SETRANGE, 0, (LPARAM)MAKELONG(xres, 0)); + SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), UDM_SETRANGE, 0, (LPARAM)MAKELONG(yres, 0)); + + if (pConInfo->WindowPosition != -1) + { + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, LOWORD(pConInfo->WindowPosition), FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, HIWORD(pConInfo->WindowPosition), FALSE); + } + else + { + //FIXME calculate window pos from xres, yres + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, 88, FALSE); + SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, 88, FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), FALSE); + SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_SYSTEM_POS_WINDOW), BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + } + return TRUE; + } + case WM_DRAWITEM: + { + COLORREF bkColor; + HBRUSH hBrush; + LPDRAWITEMSTRUCT drawItem; + + bkColor = GetSysColor(COLOR_BACKGROUND); + hBrush = CreateSolidBrush(bkColor); + drawItem = (LPDRAWITEMSTRUCT) lParam; + + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + //TODO draw console image +// MoveToEx(drawItem->hDC, 0, 0, NULL); +// LineTo(drawItem->hDC, 10, 10); +// MoveToEx(drawItem->hDC, 30, 30, NULL); +// LineTo(drawItem->hDC, 40, 40); + + DeleteObject((HGDIOBJ)hBrush); + return TRUE; + } + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDC_CHECK_SYSTEM_POS_WINDOW: + { + LONG res = SendMessage((HWND)lParam, BM_GETCHECK, 0, 0); + if (res == BST_CHECKED) + { + ULONG left, top; + + left = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, NULL, FALSE); + top = GetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, NULL, FALSE); + pConInfo->WindowPosition = MAKELONG(left, top); + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), TRUE); + } + else if (res == BST_UNCHECKED) + { + pConInfo->WindowPosition = -1; + SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_TOP), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_LEFT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_UPDOWN_WINDOW_POS_TOP), FALSE); + } + } + } } default: break;

1 0

[greatlrd] 23640: revers 23614 it cause unexped regress in some api, the code need be goto thung pretty hard even try remove hardcode font in win32k, and it cause regress there and there. and cause regreess on boot time to time. sorry it took me most night figout out why. But I do not yet how to solv it.
by greatlrd＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: greatlrd Date: Mon Aug 21 09:14:22 2006 New Revision: 23640 URL: http://svn.reactos.org/svn/reactos?rev=23640&view=rev Log: revers 23614 it cause unexped regress in some api, the code need be goto thung pretty hard even try remove hardcode font in win32k, and it cause regress there and there. and cause regreess on boot time to time. sorry it took me most night figout out why. But I do not yet how to solv it. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Aug 21 09:14:22 2006 @@ -916,7 +916,7 @@ static LOGFONTW DefaultFont = { -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, - L"MS Sans Serif" + L"Bitstream Vera Sans" }; RtlZeroMemory(&QueryTable, sizeof(QueryTable)); Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c Mon Aug 21 09:14:22 2006 @@ -80,11 +80,11 @@ static LOGFONTW OEMFixedFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, OEM_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Bitstream Vera Sans Mono" }; static LOGFONTW AnsiFixedFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Bitstream Vera Sans Mono" }; /*static LOGFONTW AnsiVarFont = *{ 10, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, @@ -92,20 +92,20 @@ static LOGFONTW SystemFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Courier New" }; //Bitstream Vera Sans + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Bitstream Vera Sans" }; static LOGFONTW DeviceDefaultFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Bitstream Vera Sans" }; static LOGFONTW SystemFixedFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Courier New" }; //Bitstream Vera Sans Mono - + 0, 0, DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN, L"Bitstream Vera Sans Mono" }; + /* FIXME: Is this correct? */ static LOGFONTW DefaultGuiFont = { 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, - 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"MS Sans Serif" }; //Bitstream Vera Sans + 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Bitstream Vera Sans" }; #define NB_STOCK_OBJECTS (DEFAULT_GUI_FONT + 1)

1 0

[arty] 23639: Added gdi32, because we depend on CreateSolidBrush and kin.
by arty＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: arty Date: Mon Aug 21 08:41:11 2006 New Revision: 23639 URL: http://svn.reactos.org/svn/reactos?rev=23639&view=rev Log: Added gdi32, because we depend on CreateSolidBrush and kin. Modified: trunk/reactos/dll/win32/console/console.rbuild Modified: trunk/reactos/dll/win32/console/console.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.rbuild (original) +++ trunk/reactos/dll/win32/console/console.rbuild Mon Aug 21 08:41:11 2006 @@ -10,6 +10,7 @@ <library>kernel32</library> <library>user32</library> <library>comctl32</library> + <library>gdi32</library> <file>console.c</file> <file>options.c</file> <file>font.c</file>

1 0

[arty] 23638: - Fixed timeout calculation. - Fixed a couple of leaks.
by arty＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: arty Date: Mon Aug 21 07:59:02 2006 New Revision: 23638 URL: http://svn.reactos.org/svn/reactos?rev=23638&view=rev Log: - Fixed timeout calculation. - Fixed a couple of leaks. Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c Mon Aug 21 07:59:02 2006 @@ -597,11 +597,7 @@ ULONG i, j = 0, x; HANDLE SockEvent; BOOL HandleCounted; - - Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, - NULL, 1, FALSE ); - - if( !NT_SUCCESS(Status) ) return SOCKET_ERROR; + LARGE_INTEGER Timeout; /* Find out how many sockets we have, and how large the buffer needs * to be */ @@ -613,30 +609,54 @@ if( HandleCount < 0 || nfds != 0 ) HandleCount = nfds * 3; - PollBufferSize = sizeof(*PollInfo) + - (HandleCount * sizeof(AFD_HANDLE)); + PollBufferSize = sizeof(*PollInfo) + (HandleCount * sizeof(AFD_HANDLE)); AFD_DbgPrint(MID_TRACE,("HandleCount: %d BufferSize: %d\n", HandleCount, PollBufferSize)); + /* Convert Timeout to NT Format */ + if (timeout == NULL) { + Timeout.u.LowPart = -1; + Timeout.u.HighPart = 0x7FFFFFFF; + AFD_DbgPrint(MAX_TRACE,("Infinite timeout\n")); + } else { + Timeout = RtlEnlargedIntegerMultiply + ((timeout->tv_sec * 1000) + (timeout->tv_usec / 1000), -10000); + /* Negative timeouts are illegal. Since the kernel represents an + * incremental timeout as a negative number, we check for a positive + * result. + */ + if (Timeout.QuadPart > 0) { + if (lpErrno) *lpErrno = WSAEINVAL; + return SOCKET_ERROR; + } + AFD_DbgPrint(MAX_TRACE,("Timeout: Orig %d.%06d kernel %d\n", + timeout->tv_sec, timeout->tv_usec, + Timeout.u.LowPart)); + } + + Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + NULL, 1, FALSE ); + + if( !NT_SUCCESS(Status) ) return SOCKET_ERROR; + /* Allocate */ PollBuffer = HeapAlloc(GlobalHeap, 0, PollBufferSize); + + if (!PollBuffer) { + if (*lpErrno) *lpErrno = WSAEFAULT; + NtClose(SockEvent); + return SOCKET_ERROR; + } + PollInfo = (PAFD_POLL_INFO)PollBuffer; - + RtlZeroMemory( PollInfo, PollBufferSize ); - /* Convert Timeout to NT Format */ - if (timeout == NULL) { - PollInfo->Timeout.u.LowPart = -1; - PollInfo->Timeout.u.HighPart = 0x7FFFFFFF; - } else { - PollInfo->Timeout = RtlEnlargedIntegerMultiply - ((timeout->tv_sec * 1000) + timeout->tv_usec, -10000); - } - /* Number of handles for AFD to Check */ PollInfo->HandleCount = HandleCount; PollInfo->Exclusive = FALSE; + PollInfo->Timeout = Timeout; if (readfds != NULL) { for (i = 0; i < readfds->fd_count; i++, j++) { @@ -734,6 +754,7 @@ } } + HeapFree( GlobalHeap, 0, PollBuffer ); NtClose( SockEvent ); AFD_DbgPrint(MID_TRACE,("lpErrno = %x\n", lpErrno));

1 0

[ion] 23637: - Delete bios.c and usertrap.c - Add Ke entries to KernelFun!
by ion＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: ion Date: Mon Aug 21 07:49:02 2006 New Revision: 23637 URL: http://svn.reactos.org/svn/reactos?rev=23637&view=rev Log: - Delete bios.c and usertrap.c - Add Ke entries to KernelFun! Removed: trunk/reactos/ntoskrnl/ke/i386/bios.c trunk/reactos/ntoskrnl/ke/i386/usertrap.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/v86m.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=236… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Mon Aug 21 07:49:02 2006 @@ -24,6 +24,20 @@ // - Add Directory Lock. // - Use Object Type Mutex/Lock. // +// Ke: +// - Make sure IRQ trap code is synchronized with current trap code. +// - Reimplement the V86 support using a mode that will be compatible with +// VDM and the future and use ABIOS gates. +// - Implement Invalid Opcode and GPD handlers for V86-mode. +// - Implement stack fault and segment fault handlers. +// - Implement kernel-mode GPF handler, possibly fixing below: +// - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, +// and only when called from user-mode, and returning to user-mode. +// - Figure out what the DEBUGEIP hack is for and how it can be moved away. +// - Add DR macro/save and VM macro/save. +// - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. +// +// // Ex: // - Use pushlocks for handle implementation. // Removed: trunk/reactos/ntoskrnl/ke/i386/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/bios.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/bios.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/bios.c (removed) @@ -1,78 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/bios.c - * PURPOSE: Support for calling the BIOS in v86 mode - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* GLOBALS *******************************************************************/ - -#define TRAMPOLINE_BASE (0x10000) - -extern VOID Ki386RetToV86Mode(PKV86M_REGISTERS InRegs, - PKV86M_REGISTERS OutRegs); - -/* FUNCTIONS *****************************************************************/ - -NTSTATUS STDCALL -Ke386CallBios(ULONG Int, PCONTEXT regs) -{ - PUCHAR Ip; - KV86M_REGISTERS ORegs; - NTSTATUS Status; - PKV86M_REGISTERS Regs = (PKV86M_REGISTERS)regs; - - /* - * Set up a trampoline for executing the BIOS interrupt - */ - Ip = (PUCHAR)TRAMPOLINE_BASE; - Ip[0] = 0xCD; /* int XX */ - Ip[1] = Int; - Ip[2] = 0x63; /* arpl ax, ax */ - Ip[3] = 0xC0; - Ip[4] = 0x90; /* nop */ - Ip[5] = 0x90; /* nop */ - - /* - * Munge the registers - */ - Regs->Eip = 0; - Regs->Cs = TRAMPOLINE_BASE / 16; - Regs->Esp = 0xFFFF; - Regs->Ss = TRAMPOLINE_BASE / 16; - Regs->Eflags = (1 << 1) | (1 << 17) | (1 << 9); /* VM, IF */ - Regs->RecoveryAddress = TRAMPOLINE_BASE + 2; - Regs->RecoveryInstruction[0] = 0x63; /* arpl ax, ax */ - Regs->RecoveryInstruction[1] = 0xC0; - Regs->RecoveryInstruction[2] = 0x90; /* nop */ - Regs->RecoveryInstruction[3] = 0x90; /* nop */ - Regs->Flags = KV86M_EMULATE_CLI_STI | KV86M_ALLOW_IO_PORT_ACCESS; - Regs->Vif = 1; - Regs->PStatus = &Status; - - /* - * Execute the BIOS interrupt - */ - Ki386RetToV86Mode(Regs, &ORegs); - - /* - * Copy the return values back to the caller - */ - memcpy(Regs, &ORegs, sizeof(KV86M_REGISTERS)); - - return(Status); -} - - - - - 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Mon Aug 21 07:49:02 2006 @@ -11,17 +11,6 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix - -/* - * FIXMEs: - * - Implement kernel-mode GPF handler, possibly fixing below: - * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, - * and only when called from user-mode, and returning to user-mode. - * - Implement Invalid Opcode handler. - * - Figure out what the DEBUGEIP hack is for and how it can be moved away. - * - Add DR macro/save and VM macro/save. - * - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. - */ /* GLOBALS ******************************************************************/ Removed: trunk/reactos/ntoskrnl/ke/i386/usertrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usertrap.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usertrap.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/usertrap.c (removed) @@ -1,1 +1,0 @@ - Modified: trunk/reactos/ntoskrnl/ke/i386/v86m.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86m.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86m.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86m.c Mon Aug 21 07:49:02 2006 @@ -23,6 +23,10 @@ #define VALID_FLAGS (0xDFF) +#define TRAMPOLINE_BASE (0x10000) + +VOID Ki386RetToV86Mode(KV86M_REGISTERS* InRegs, + KV86M_REGISTERS* OutRegs); /* FUNCTIONS *****************************************************************/ ULONG @@ -807,5 +811,52 @@ } } - - +NTSTATUS STDCALL +Ke386CallBios(ULONG Int, PCONTEXT regs) +{ + PUCHAR Ip; + KV86M_REGISTERS ORegs; + NTSTATUS Status; + PKV86M_REGISTERS Regs = (PKV86M_REGISTERS)regs; + + /* + * Set up a trampoline for executing the BIOS interrupt + */ + Ip = (PUCHAR)TRAMPOLINE_BASE; + Ip[0] = 0xCD; /* int XX */ + Ip[1] = Int; + Ip[2] = 0x63; /* arpl ax, ax */ + Ip[3] = 0xC0; + Ip[4] = 0x90; /* nop */ + Ip[5] = 0x90; /* nop */ + + /* + * Munge the registers + */ + Regs->Eip = 0; + Regs->Cs = TRAMPOLINE_BASE / 16; + Regs->Esp = 0xFFFF; + Regs->Ss = TRAMPOLINE_BASE / 16; + Regs->Eflags = (1 << 1) | (1 << 17) | (1 << 9); /* VM, IF */ + Regs->RecoveryAddress = TRAMPOLINE_BASE + 2; + Regs->RecoveryInstruction[0] = 0x63; /* arpl ax, ax */ + Regs->RecoveryInstruction[1] = 0xC0; + Regs->RecoveryInstruction[2] = 0x90; /* nop */ + Regs->RecoveryInstruction[3] = 0x90; /* nop */ + Regs->Flags = KV86M_EMULATE_CLI_STI | KV86M_ALLOW_IO_PORT_ACCESS; + Regs->Vif = 1; + Regs->PStatus = &Status; + + /* + * Execute the BIOS interrupt + */ + Ki386RetToV86Mode(Regs, &ORegs); + + /* + * Copy the return values back to the caller + */ + memcpy(Regs, &ORegs, sizeof(KV86M_REGISTERS)); + + return(Status); +} + Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Aug 21 07:49:02 2006 @@ -27,7 +27,6 @@ <if property="ARCH" value="i386"> <directory name="i386"> <file first="true">main_asm.S</file> - <file>bios.c</file> <file>cpu.S</file> <file>ctxswitch.S</file> <file>exp.c</file> @@ -41,7 +40,6 @@ <file>trap.s</file> <file>tss.c</file> <file>usercall_asm.S</file> - <file>usertrap.c</file> <file>v86m.c</file> <file>v86m_sup.S</file> <file>vdm.c</file>

1 0

[ion] 23636: - Gutted out KiTrapHandler. Now it is only a gateway for GPF/UD for V86 mode. - Removed all the code in userptrap.c and removed KiKernelTrapHandler. - Set Traps 11, 12, 16 and 17 as unhandled for now(Segment fault, stack fault, fpu fault and alignment fault). We weren't really "handling" them in the past either. - I probably need to implement GPF handler for non-V86 mode to support Lazy segment loading and fix the vmware syscall bug that has been haunting me for two years.
by ion＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: ion Date: Mon Aug 21 07:31:53 2006 New Revision: 23636 URL: http://svn.reactos.org/svn/reactos?rev=23636&view=rev Log: - Gutted out KiTrapHandler. Now it is only a gateway for GPF/UD for V86 mode. - Removed all the code in userptrap.c and removed KiKernelTrapHandler. - Set Traps 11, 12, 16 and 17 as unhandled for now(Segment fault, stack fault, fpu fault and alignment fault). We weren't really "handling" them in the past either. - I probably need to implement GPF handler for non-V86 mode to support Lazy segment loading and fix the vmware syscall bug that has been haunting me for two years. Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/usertrap.c trunk/reactos/ntoskrnl/mm/i386/pfault.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Mon Aug 21 07:31:53 2006 @@ -142,43 +142,6 @@ } while(++i <= 1); return(FALSE); -} - -ULONG -KiKernelTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID Cr2) -{ - EXCEPTION_RECORD Er; - - Er.ExceptionFlags = 0; - Er.ExceptionRecord = NULL; - Er.ExceptionAddress = (PVOID)Tf->Eip; - - if (ExceptionNr == 14) - { - Er.ExceptionCode = STATUS_ACCESS_VIOLATION; - Er.NumberParameters = 2; - Er.ExceptionInformation[0] = Tf->ErrCode & 0x1; - Er.ExceptionInformation[1] = (ULONG)Cr2; - } - else - { - if (ExceptionNr < ARRAY_SIZE(ExceptionToNtStatus)) - { - Er.ExceptionCode = ExceptionToNtStatus[ExceptionNr]; - } - else - { - Er.ExceptionCode = STATUS_ACCESS_VIOLATION; - } - Er.NumberParameters = 0; - } - - /* FIXME: Which exceptions are noncontinuable? */ - Er.ExceptionFlags = 0; - - KiDispatchException(&Er, NULL, Tf, KernelMode, TRUE); - - return(0); } VOID @@ -266,13 +229,7 @@ */ { ULONG_PTR cr2; - ULONG Esp0; - - ASSERT(ExceptionNr != 14); - ASSERT((ExceptionNr != 7 && ExceptionNr != 16 && ExceptionNr != 19)); - - /* Use the address of the trap frame as approximation to the ring0 esp */ - Esp0 = (ULONG)&Tf->Eip; + ASSERT(ExceptionNr == 13 || ExceptionNr == 6); /* Get CR2 */ cr2 = Ke386GetCr2(); @@ -286,56 +243,7 @@ DPRINT("Tf->Eflags, %x, Tf->Eip %x, ExceptionNr: %d\n", Tf->EFlags, Tf->Eip, ExceptionNr); return(KeV86Exception(ExceptionNr, Tf, cr2)); } - - /* - * Check for stack underflow, this may be obsolete - */ - DPRINT1("Exception: %x\n", ExceptionNr); - if (PsGetCurrentThread() != NULL && - Esp0 < (ULONG)PsGetCurrentThread()->Tcb.StackLimit) - { - DPRINT1("Stack underflow (tf->esp %x Limit %x Eip %x)\n", - Esp0, (ULONG)PsGetCurrentThread()->Tcb.StackLimit, Tf->Eip); - ExceptionNr = 12; - } - - if (ExceptionNr == 15) - { - /* - * FIXME: - * This exception should never occur. The P6 has a bug, which does sometimes deliver - * the apic spurious interrupt as exception 15. On an athlon64, I get one exception - * in the early boot phase in apic mode (using the smp build). I've looked to the linux - * sources. Linux does ignore this exception. - * - */ - DPRINT1("Ignoring P6 Local APIC Spurious Interrupt Bug...\n"); - return(0); - } - - /* - * Check for a breakpoint that was only for the attention of the debugger. - */ - if (ExceptionNr == 3 && Tf->Eip == ((ULONG)DbgBreakPointNoBugCheck) + 1) - { - /* - EIP is already adjusted by the processor to point to the instruction - after the breakpoint. - */ - return(0); - } - - /* - * Handle user exceptions differently - */ - if ((Tf->SegCs & 0xFFFF) == (KGDT_R3_CODE | RPL_MASK)) - { - return(KiUserTrapHandler(Tf, ExceptionNr, (PVOID)cr2)); - } - else - { - return(KiKernelTrapHandler(Tf, ExceptionNr, (PVOID)cr2)); - } + return 0; } ULONG 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Mon Aug 21 07:31:53 2006 @@ -14,8 +14,10 @@ /* * FIXMEs: + * - Implement kernel-mode GPF handler, possibly fixing below: * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, * and only when called from user-mode, and returning to user-mode. + * - Implement Invalid Opcode handler. * - Figure out what the DEBUGEIP hack is for and how it can be moved away. * - Add DR macro/save and VM macro/save. * - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. @@ -977,6 +979,7 @@ int 3 .endfunc +.func KiTrap6 _KiTrap6: /* Push error code */ push 0 @@ -996,6 +999,7 @@ /* Return to caller */ jne _Kei386EoiHelper@0 jmp _KiV86Complete +.endfunc .func KiTrap7 _KiTrap7: @@ -1186,40 +1190,27 @@ jmp _KiSystemFatalException .endfunc +.func KiTrap11 _KiTrap11: /* Enter trap */ TRAP_PROLOG(11) - /* Call the C exception handler */ - push 11 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - + /* FIXME: ROS Doesn't handle segment faults yet */ + mov eax, 11 + jmp _KiSystemFatalException +.endfunc + +.func KiTrap12 _KiTrap12: /* Enter trap */ TRAP_PROLOG(12) - /* Call the C exception handler */ - push 12 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - + /* FIXME: ROS Doesn't handle stack faults yet */ + mov eax, 12 + jmp _KiSystemFatalException +.endfunc + +.func KiTrap13 _KiTrap13: /* Enter trap */ TRAP_PROLOG(13) @@ -1236,7 +1227,9 @@ /* Return to caller */ jne _Kei386EoiHelper@0 jmp _KiV86Complete - +.endfunc + +.func KiTrap14 _KiTrap14: /* Enter trap */ TRAP_PROLOG(14) @@ -1247,13 +1240,11 @@ call _KiPageFaultHandler add esp, 8 - /* Check for v86 recovery */ - cmp eax, 1 - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - + jmp _Kei386EoiHelper@0 +.endfunc + +.func KiTrap0F _KiTrap0F: /* Push error code */ push 0 @@ -1265,7 +1256,9 @@ /* Raise a fatal exception */ mov eax, 15 jmp _KiSystemFatalException - +.endfunc + +.func KiTrap16 _KiTrap16: /* Push error code */ push 0 @@ -1273,19 +1266,12 @@ /* Enter trap */ TRAP_PROLOG(16) - /* Call the C exception handler */ - push 16 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - + /* FIXME: ROS Doesn't handle FPU faults yet */ + mov eax, 16 + jmp _KiSystemFatalException +.endfunc + +.func KiTrap17 _KiTrap17: /* Push error code */ push 0 @@ -1293,18 +1279,10 @@ /* Enter trap */ TRAP_PROLOG(17) - /* Call the C exception handler */ - push 17 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete + /* FIXME: ROS Doesn't handle alignment faults yet */ + mov eax, 17 + jmp _KiSystemFatalException +.endfunc .func KiSystemFatalException _KiSystemFatalException: Modified: trunk/reactos/ntoskrnl/ke/i386/usertrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usertrap.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usertrap.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/usertrap.c Mon Aug 21 07:31:53 2006 @@ -1,133 +1,1 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/usertrap.c - * PURPOSE: Handling usermode exceptions. - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* FUNCTIONS ****************************************************************/ - -BOOLEAN -print_user_address(PVOID address) -{ - PLIST_ENTRY current_entry; - PLDR_DATA_TABLE_ENTRY current; - PEPROCESS CurrentProcess; - PPEB Peb = NULL; - ULONG_PTR RelativeAddress; - PPEB_LDR_DATA Ldr; - NTSTATUS Status = STATUS_SUCCESS; - - CurrentProcess = PsGetCurrentProcess(); - if (NULL != CurrentProcess) - { - Peb = CurrentProcess->Peb; - } - - if (NULL == Peb) - { - DbgPrint("<%x>", address); - return(TRUE); - } - - _SEH_TRY - { - RtlCopyMemory(&Ldr, - &Peb->Ldr, - sizeof(PPEB_LDR_DATA)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - if (!NT_SUCCESS(Status)) - { - DbgPrint("<%x>", address); - return(TRUE); - } - current_entry = Ldr->InLoadOrderModuleList.Flink; - - while (current_entry != &Ldr->InLoadOrderModuleList && - current_entry != NULL) - { - current = - CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - - if (address >= (PVOID)current->DllBase && - address < (PVOID)((char*)current->DllBase + current->SizeOfImage)) - { - RelativeAddress = - (ULONG_PTR) address - (ULONG_PTR)current->DllBase; - DbgPrint("<%wZ: %x>", &current->BaseDllName, RelativeAddress); - return(TRUE); - } - - current_entry = current_entry->Flink; - } - return(FALSE); -} - -ULONG -NTAPI -KiUserTrapHandler(PKTRAP_FRAME Tf, ULONG ExceptionNr, PVOID Cr2) -{ - EXCEPTION_RECORD Er; - - if (ExceptionNr == 0) - { - Er.ExceptionCode = STATUS_INTEGER_DIVIDE_BY_ZERO; - } - else if (ExceptionNr == 1) - { - Er.ExceptionCode = STATUS_SINGLE_STEP; - } - else if (ExceptionNr == 3) - { - Er.ExceptionCode = STATUS_BREAKPOINT; - } - else if (ExceptionNr == 4) - { - Er.ExceptionCode = STATUS_INTEGER_OVERFLOW; - } - else if (ExceptionNr == 5) - { - Er.ExceptionCode = STATUS_ARRAY_BOUNDS_EXCEEDED; - } - else if (ExceptionNr == 6) - { - Er.ExceptionCode = STATUS_ILLEGAL_INSTRUCTION; - } - else - { - Er.ExceptionCode = STATUS_ACCESS_VIOLATION; - } - Er.ExceptionFlags = 0; - Er.ExceptionRecord = NULL; - Er.ExceptionAddress = (PVOID)Tf->Eip; - if (ExceptionNr == 14) - { - Er.NumberParameters = 2; - Er.ExceptionInformation[0] = Tf->ErrCode & 0x1; - Er.ExceptionInformation[1] = (ULONG)Cr2; - } - else - { - Er.NumberParameters = 0; - } - - /* FIXME: Which exceptions are noncontinuable? */ - Er.ExceptionFlags = 0; - - KiDispatchException(&Er, 0, Tf, UserMode, TRUE); - return(0); -} Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pfault.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pfault.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/pfault.c Mon Aug 21 07:31:53 2006 @@ -32,6 +32,7 @@ ULONG_PTR cr2; NTSTATUS Status; KPROCESSOR_MODE Mode; + EXCEPTION_RECORD Er; ASSERT(ExceptionNr == 14); @@ -120,16 +121,18 @@ return 0; } - /* - * Handle user exceptions differently - */ - if (Mode == KernelMode) - { - return(KiKernelTrapHandler(Tf, 14, (PVOID)cr2)); - } - else - { - return(KiUserTrapHandler(Tf, 14, (PVOID)cr2)); - } + Er.ExceptionCode = STATUS_ACCESS_VIOLATION; + Er.ExceptionFlags = 0; + Er.ExceptionRecord = NULL; + Er.ExceptionAddress = (PVOID)Tf->Eip; + Er.NumberParameters = 2; + Er.ExceptionInformation[0] = Tf->ErrCode & 0x1; + Er.ExceptionInformation[1] = (ULONG)cr2; + + /* FIXME: Which exceptions are noncontinuable? */ + Er.ExceptionFlags = 0; + + KiDispatchException(&Er, 0, Tf, Mode, TRUE); + return 0; }

1 0

[ion] 23635: - Call KiSystemFatalException directly instead of duplicating the code 5 times.
by ion＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: ion Date: Mon Aug 21 07:03:52 2006 New Revision: 23635 URL: http://svn.reactos.org/svn/reactos?rev=23635&view=rev Log: - Call KiSystemFatalException directly instead of duplicating the code 5 times. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Mon Aug 21 07:03:52 2006 @@ -841,12 +841,8 @@ _KiTrap2: /* FIXME: This is an NMI, nothing like a normal exception */ - push 0 - push 0 - push 0 - push 2 - push UNEXPECTED_KERNEL_MODE_TRAP - call _KeBugCheckEx@20 + mov eax, 2 + jmp _KiSystemFatalException .endfunc .func KiTrap3 @@ -954,12 +950,8 @@ jnz CheckMode /* It did, and this should never happen */ - push 0 - push 0 - push 0 - push 5 - push UNEXPECTED_KERNEL_MODE_TRAP - call _KeBugCheckEx@20 + mov eax, 5 + jmp _KiSystemFatalException /* Check the old mode */ CheckMode: @@ -1147,12 +1139,8 @@ _KiTrap8: /* Can't really do too much */ - push 0 - push 0 - push 0 - push 8 - push UNEXPECTED_KERNEL_MODE_TRAP - call _KeBugCheckEx@20 + mov eax, 8 + jmp _KiSystemFatalException .endfunc .func KiTrap9 @@ -1165,12 +1153,8 @@ /* Enable interrupts and bugcheck */ sti - push 0 - push 0 - push 0 - push 9 - push UNEXPECTED_KERNEL_MODE_TRAP - call _KeBugCheckEx@20 + mov eax, 9 + jmp _KiSystemFatalException .endfunc .func KiTrap10 @@ -1198,12 +1182,8 @@ Fatal: /* TSS failure for some other reason: crash */ - push 0 - push 0 - push 0 - push 10 - push UNEXPECTED_KERNEL_MODE_TRAP - call _KeBugCheckEx@20 + mov eax, 10 + jmp _KiSystemFatalException .endfunc _KiTrap11:

1 0

[ion] 23634: - Convert 8, 9, 10, 15/F
by ion＠svn.reactos.org 21 Aug '06

21 Aug '06

Author: ion Date: Mon Aug 21 07:01:47 2006 New Revision: 23634 URL: http://svn.reactos.org/svn/reactos?rev=23634&view=rev Log: - Convert 8, 9, 10, 15/F Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c Mon Aug 21 07:01:47 2006 @@ -179,215 +179,6 @@ KiDispatchException(&Er, NULL, Tf, KernelMode, TRUE); return(0); -} - -VOID -KiDoubleFaultHandler(VOID) -{ -#if 0 - unsigned int cr2; - ULONG StackLimit; - ULONG StackBase; - ULONG Esp0; - ULONG ExceptionNr = 8; - KTSS* OldTss; - PULONG Frame; - ULONG OldCr3; -#if 0 - ULONG i, j; - static PVOID StackTrace[MM_STACK_SIZE / sizeof(PVOID)]; - static ULONG StackRepeatCount[MM_STACK_SIZE / sizeof(PVOID)]; - static ULONG StackRepeatLength[MM_STACK_SIZE / sizeof(PVOID)]; - ULONG TraceLength; - BOOLEAN FoundRepeat; -#endif - - OldTss = KeGetCurrentKPCR()->TSS; - Esp0 = OldTss->Esp0; - - /* Get CR2 */ - cr2 = Ke386GetCr2(); - if (PsGetCurrentThread() != NULL && - PsGetCurrentThread()->ThreadsProcess != NULL) - { - OldCr3 = (ULONG) - PsGetCurrentThread()->ThreadsProcess->Pcb.DirectoryTableBase.QuadPart; - } - else - { - OldCr3 = 0xBEADF0AL; - } - - /* - * Check for stack underflow - */ - if (PsGetCurrentThread() != NULL && - Esp0 < (ULONG)PsGetCurrentThread()->Tcb.StackLimit) - { - DbgPrint("Stack underflow (tf->esp %x Limit %x)\n", - Esp0, (ULONG)PsGetCurrentThread()->Tcb.StackLimit); - ExceptionNr = 12; - } - - /* - * Print out the CPU registers - */ - if (ExceptionNr < ARRAY_SIZE(ExceptionTypeStrings)) - { - DbgPrint("%s Exception: %d(%x)\n", ExceptionTypeStrings[ExceptionNr], - ExceptionNr, 0); - } - else - { - DbgPrint("Exception: %d(%x)\n", ExceptionNr, 0); - } - DbgPrint("CS:EIP %x:%x ", OldTss->Cs, OldTss->Eip); - KeRosPrintAddress((PVOID)OldTss->Eip); - DbgPrint("\n"); - DbgPrint("cr2 %x cr3 %x ", cr2, OldCr3); - DbgPrint("Proc: %x ",PsGetCurrentProcess()); - if (PsGetCurrentProcess() != NULL) - { - DbgPrint("Pid: %x <", PsGetCurrentProcess()->UniqueProcessId); - DbgPrint("%.16s> ", PsGetCurrentProcess()->ImageFileName); - } - if (PsGetCurrentThread() != NULL) - { - DbgPrint("Thrd: %x Tid: %x", - PsGetCurrentThread(), - PsGetCurrentThread()->Cid.UniqueThread); - } - DbgPrint("\n"); - DbgPrint("DS %x ES %x FS %x GS %x\n", OldTss->Ds, OldTss->Es, - OldTss->Fs, OldTss->Gs); - DbgPrint("EAX: %.8x EBX: %.8x ECX: %.8x\n", OldTss->Eax, OldTss->Ebx, - OldTss->Ecx); - DbgPrint("EDX: %.8x EBP: %.8x ESI: %.8x\nESP: %.8x ", OldTss->Edx, - OldTss->Ebp, OldTss->Esi, Esp0); - DbgPrint("EDI: %.8x EFLAGS: %.8x ", OldTss->Edi, OldTss->Eflags); - if (OldTss->Cs == KGDT_R0_CODE) - { - DbgPrint("kESP %.8x ", Esp0); - if (PsGetCurrentThread() != NULL) - { - DbgPrint("kernel stack base %x\n", - PsGetCurrentThread()->Tcb.StackLimit); - - } - } - else - { - DbgPrint("User ESP %.8x\n", OldTss->Esp); - } - if ((OldTss->Cs & 0xffff) == KGDT_R0_CODE) - { - if (PsGetCurrentThread() != NULL) - { - StackLimit = (ULONG)PsGetCurrentThread()->Tcb.StackBase; - StackBase = (ULONG)PsGetCurrentThread()->Tcb.StackLimit; - } - else - { - StackLimit = (ULONG)init_stack_top; - StackBase = (ULONG)init_stack; - } - - /* - Change to an #if 0 to reduce the amount of information printed on - a recursive stack trace. - */ -#if 1 - DbgPrint("Frames: "); - Frame = (PULONG)OldTss->Ebp; - while (Frame != NULL && (ULONG)Frame >= StackBase) - { - KeRosPrintAddress((PVOID)Frame[1]); - Frame = (PULONG)Frame[0]; - DbgPrint("\n"); - } -#else - DbgPrint("Frames: "); - i = 0; - Frame = (PULONG)OldTss->Ebp; - while (Frame != NULL && (ULONG)Frame >= StackBase) - { - StackTrace[i] = (PVOID)Frame[1]; - Frame = (PULONG)Frame[0]; - i++; - } - TraceLength = i; - - i = 0; - while (i < TraceLength) - { - StackRepeatCount[i] = 0; - j = i + 1; - FoundRepeat = FALSE; - while ((j - i) <= (TraceLength - j) && FoundRepeat == FALSE) - { - if (memcmp(&StackTrace[i], &StackTrace[j], - (j - i) * sizeof(PVOID)) == 0) - { - StackRepeatCount[i] = 2; - StackRepeatLength[i] = j - i; - FoundRepeat = TRUE; - } - else - { - j++; - } - } - if (FoundRepeat == FALSE) - { - i++; - continue; - } - j = j + StackRepeatLength[i]; - while ((TraceLength - j) >= StackRepeatLength[i] && - FoundRepeat == TRUE) - { - if (memcmp(&StackTrace[i], &StackTrace[j], - StackRepeatLength[i] * sizeof(PVOID)) == 0) - { - StackRepeatCount[i]++; - j = j + StackRepeatLength[i]; - } - else - { - FoundRepeat = FALSE; - } - } - i = j; - } - - i = 0; - while (i < TraceLength) - { - if (StackRepeatCount[i] == 0) - { - KeRosPrintAddress(StackTrace[i]); - i++; - } - else - { - DbgPrint("{"); - if (StackRepeatLength[i] == 0) - { - for(;;); -} - for (j = 0; j < StackRepeatLength[i]; j++) - { - KeRosPrintAddress(StackTrace[i + j]); - } - DbgPrint("}*%d", StackRepeatCount[i]); - i = i + StackRepeatLength[i] * StackRepeatCount[i]; - } - } -#endif - } -#endif - DbgPrint("\n"); - for(;;); } VOID 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Mon Aug 21 07:01:47 2006 @@ -41,7 +41,7 @@ idt _KiTrap12, INT_32_DPL0 /* INT 0C: Stack Fault Exception (#SS) */ idt _KiTrap13, INT_32_DPL0 /* INT 0D: General Protection (#GP) */ idt _KiTrap14, INT_32_DPL0 /* INT 0E: Page-Fault Exception (#PF) */ -idt _KiTrap15, INT_32_DPL0 /* INT 0F: RESERVED [FIXME: HBIRR HACK] */ +idt _KiTrap0F, INT_32_DPL0 /* INT 0F: RESERVED */ idt _KiTrap16, INT_32_DPL0 /* INT 10: x87 FPU Error (#MF) */ idt _KiTrap17, INT_32_DPL0 /* INT 11: Align Check Exception (#AC) */ idt _KiTrap0F, INT_32_DPL0 /* INT 12: Machine Check Exception (#MC)*/ @@ -1143,10 +1143,19 @@ .endfunc .globl _KiTrap8 +.func KiTrap8 _KiTrap8: - call _KiDoubleFaultHandler - iret - + + /* Can't really do too much */ + push 0 + push 0 + push 0 + push 8 + push UNEXPECTED_KERNEL_MODE_TRAP + call _KeBugCheckEx@20 +.endfunc + +.func KiTrap9 _KiTrap9: /* Push error code */ push 0 @@ -1154,37 +1163,48 @@ /* Enter trap */ TRAP_PROLOG(9) - /* Call the C exception handler */ + /* Enable interrupts and bugcheck */ + sti + push 0 + push 0 + push 0 push 9 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - -#if 1 + push UNEXPECTED_KERNEL_MODE_TRAP + call _KeBugCheckEx@20 +.endfunc + +.func KiTrap10 _KiTrap10: /* Enter trap */ TRAP_PROLOG(10) - /* Call the C exception handler */ + /* Check for V86 */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86IntA + + /* Check if the frame was from kernelmode */ + test word ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz Fatal + +V86IntA: + /* Check if OF was set during iretd */ + test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAG_ZERO + sti + jz Fatal + + /* It was, just mask it out */ + and dword ptr [ebp+KTRAP_FRAME_EFLAGS], ~EFLAG_ZERO + jmp _Kei386EoiHelper@0 + +Fatal: + /* TSS failure for some other reason: crash */ + push 0 + push 0 + push 0 push 10 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete -#endif + push UNEXPECTED_KERNEL_MODE_TRAP + call _KeBugCheckEx@20 +.endfunc _KiTrap11: /* Enter trap */ @@ -1220,7 +1240,6 @@ jne _Kei386EoiHelper@0 jmp _KiV86Complete -#if 1 _KiTrap13: /* Enter trap */ TRAP_PROLOG(13) @@ -1237,7 +1256,6 @@ /* Return to caller */ jne _Kei386EoiHelper@0 jmp _KiV86Complete -#endif _KiTrap14: /* Enter trap */ @@ -1256,25 +1274,17 @@ jne _Kei386EoiHelper@0 jmp _KiV86Complete -_KiTrap15: +_KiTrap0F: /* Push error code */ push 0 /* Enter trap */ TRAP_PROLOG(15) - - /* Call the C exception handler */ - push 15 - push ebp - call _KiTrapHandler - add esp, 8 - - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete + sti + + /* Raise a fatal exception */ + mov eax, 15 + jmp _KiSystemFatalException _KiTrap16: /* Push error code */ @@ -1316,18 +1326,6 @@ jne _Kei386EoiHelper@0 jmp _KiV86Complete -_KiTrap0F: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG(15) - sti - - /* Raise a fatal exception */ - mov eax, 15 - jmp _KiSystemFatalException - .func KiSystemFatalException _KiSystemFatalException:

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