Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 23704: * share common painting code * align static control in same way
by janderwald＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: janderwald Date: Fri Aug 25 16:19:42 2006 New Revision: 23704 URL: http://svn.reactos.org/svn/reactos?rev=23704&view=rev Log: * share common painting code * align static control in same way Modified: trunk/reactos/dll/win32/console/colors.c trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/en.rc trunk/reactos/dll/win32/console/font.c 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 Fri Aug 25 16:19:42 2006 @@ -8,7 +8,6 @@ */ #include "console.h" - static COLORREF s_Colors[] = { @@ -30,7 +29,6 @@ RGB(255, 255, 255) }; -static TCHAR szText[1024]; static @@ -39,43 +37,6 @@ { HBRUSH hBrush; DWORD index; - - if (drawItem->CtlID < IDC_STATIC_COLOR1 || drawItem->CtlID > IDC_STATIC_COLOR16) - { - COLORREF pbkColor, ptColor; - COLORREF nbkColor, ntColor; - /* draw static controls */ - if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR) - { - nbkColor = pConInfo->ScreenBackground; - hBrush = CreateSolidBrush(nbkColor); - ntColor = pConInfo->ScreenText; - } - else - { - nbkColor = pConInfo->PopupBackground; - hBrush = CreateSolidBrush(nbkColor); - ntColor = pConInfo->PopupText; - } - - if (!hBrush) - { - return FALSE; - } - - FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); - DeleteObject((HGDIOBJ)hBrush); - ptColor = SetTextColor(drawItem->hDC, ntColor); - pbkColor = SetBkColor(drawItem->hDC, nbkColor); - if (ntColor != nbkColor) - { - /* hide text when it has same background color as text color */ - DrawText(drawItem->hDC, szText, _tcslen(szText), &drawItem->rcItem, 0); - } - SetTextColor(drawItem->hDC, ptColor); - SetBkColor(drawItem->hDC, pbkColor); - return TRUE; - } index = drawItem->CtlID - IDC_STATIC_COLOR1; hBrush = CreateSolidBrush(s_Colors[index]); @@ -101,6 +62,7 @@ PConsoleInfo pConInfo; LPNMUPDOWN lpnmud; LPPSHNOTIFY lppsn; + LPDRAWITEMSTRUCT drawItem; DWORD red = -1; DWORD green = -1; DWORD blue = -1; @@ -113,8 +75,6 @@ { pConInfo = (PConsoleInfo) ((LPPROPSHEETPAGE)lParam)->lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); - ZeroMemory(szText, sizeof(szText)); - LoadString(hApplet, IDS_SCREEN_TEXT, szText, sizeof(szText) / sizeof(TCHAR)); SendMessage(GetDlgItem(hwndDlg, IDC_RADIO_SCREEN_BACKGROUND), BM_SETCHECK, BST_CHECKED, 0); SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_SETRANGE, 0, (LPARAM)MAKELONG(255, 0)); @@ -124,7 +84,16 @@ } case WM_DRAWITEM: { - return PaintStaticControls(hwndDlg, pConInfo, (LPDRAWITEMSTRUCT) lParam); + drawItem = (LPDRAWITEMSTRUCT)lParam; + if (drawItem->CtlID >= IDC_STATIC_COLOR1 && drawItem->CtlID <= IDC_STATIC_COLOR16) + { + return PaintStaticControls(hwndDlg, pConInfo, drawItem); + } + else if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR || drawItem->CtlID == IDC_STATIC_POPUP_COLOR) + { + PaintText(drawItem, pConInfo); + return TRUE; + } } case WM_NOTIFY: { 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 Fri Aug 25 16:19:42 2006 @@ -41,6 +41,8 @@ BOOL WriteConsoleOptions(PConsoleInfo pConInfo); void ApplyConsoleInfo(HWND hwndDlg, PConsoleInfo pConInfo); +void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo); +void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo); //globals 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 Fri Aug 25 16:19:42 2006 @@ -45,13 +45,13 @@ BEGIN LTEXT "Window Preview", -1, 10, 7, 65, 10 LTEXT "Size", -1, 130, 10, 30, 10 -CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_BLACKRECT | SS_SUNKEN, 10, 20, 115, 70 +CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font", -1, 10, 105, 35, 10 CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 -CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_BLACKRECT | SS_SUNKEN, 15, 165, 95, 35 +CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 LTEXT "Each character is:", -1, 130, 165, 75, 10 LTEXT "screen pixel wide\nscreen pixel high", -1, 140, 180, 65, 20 LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 @@ -63,30 +63,30 @@ CAPTION "Layout" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Window Preview", -1, 10, 10, 65, 10 -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 +LTEXT "Window Preview", -1, 10, 7, 65, 10 +CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 +GROUPBOX "Screen Buffer Size", -1, 130, 15, 115, 40 +LTEXT "&Width:", -1, 135, 30, 25, 10 +LTEXT "&Height:", -1, 135, 40, 25, 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 +GROUPBOX "Window Size", -1, 130, 60, 115, 40 +LTEXT "&W&idth:", -1, 135, 70, 25, 10 +LTEXT "&H&eight:", -1, 135, 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, 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, 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 +GROUPBOX "Window Position", -1, 130, 105, 115, 55 +LTEXT "&Left:", -1, 135, 120, 25, 10 +LTEXT "&Top:", -1, 135, 130, 25, 10 EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 30, 10, ES_RIGHT | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 170, 30, 30, 10 -CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 120, 145, 100, 10 +CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 END IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 Modified: trunk/reactos/dll/win32/console/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/font.c?r… ============================================================================== --- trunk/reactos/dll/win32/console/font.c (original) +++ trunk/reactos/dll/win32/console/font.c Fri Aug 25 16:19:42 2006 @@ -19,6 +19,9 @@ LPARAM lParam ) { + LPDRAWITEMSTRUCT drawItem; + PConsoleInfo pConInfo = (PConsoleInfo)GetWindowLongPtr(hwndDlg, DWLP_USER); + UNREFERENCED_PARAMETER(hwndDlg); UNREFERENCED_PARAMETER(wParam); @@ -26,10 +29,28 @@ switch(uMsg) { case WM_INITDIALOG: + { + pConInfo = (PConsoleInfo) ((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pConInfo); return TRUE; - + } + case WM_DRAWITEM: + { + drawItem = (LPDRAWITEMSTRUCT)lParam; + if (drawItem->CtlID == IDC_STATIC_FONT_WINDOW_PREVIEW) + { + PaintConsole(drawItem, pConInfo); + } + else if (drawItem->CtlID == IDC_STATIC_SELECT_FONT_PREVIEW) + { + PaintText(drawItem, pConInfo); + } + return TRUE; + } default: + { break; + } } return FALSE; 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 Fri Aug 25 16:19:42 2006 @@ -8,6 +8,69 @@ */ #include "console.h" + + + +void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo) +{ + COLORREF bkColor; + HBRUSH hBrush; + + bkColor = GetSysColor(COLOR_BACKGROUND); + hBrush = CreateSolidBrush(bkColor); + + 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); +} + +void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo) +{ + COLORREF pbkColor, ptColor; + COLORREF nbkColor, ntColor; + HBRUSH hBrush; + TCHAR szText[1024]; + + ZeroMemory(szText, sizeof(szText)); + LoadString(hApplet, IDS_SCREEN_TEXT, szText, sizeof(szText) / sizeof(TCHAR)); + + if (drawItem->CtlID == IDC_STATIC_SCREEN_COLOR) + { + nbkColor = pConInfo->ScreenBackground; + hBrush = CreateSolidBrush(nbkColor); + ntColor = pConInfo->ScreenText; + } + else + { + nbkColor = pConInfo->PopupBackground; + hBrush = CreateSolidBrush(nbkColor); + ntColor = pConInfo->PopupText; + } + + if (!hBrush) + { + return; + } + + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + DeleteObject((HGDIOBJ)hBrush); + ptColor = SetTextColor(drawItem->hDC, ntColor); + pbkColor = SetBkColor(drawItem->hDC, nbkColor); + if (ntColor != nbkColor) + { + /* hide text when it has same background color as text color */ + DrawText(drawItem->hDC, szText, _tcslen(szText), &drawItem->rcItem, 0); + } + SetTextColor(drawItem->hDC, ptColor); + SetBkColor(drawItem->hDC, pbkColor); +} + + INT_PTR CALLBACK @@ -67,22 +130,7 @@ } 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); + PaintConsole((LPDRAWITEMSTRUCT)lParam, pConInfo); return TRUE; } case WM_COMMAND:

1 0

[gedmurphy] 23703: delete old dir
by gedmurphy＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: gedmurphy Date: Fri Aug 25 14:12:28 2006 New Revision: 23703 URL: http://svn.reactos.org/svn/reactos?rev=23703&view=rev Log: delete old dir Removed: trunk/reactos/base/applications/cmdutils/uptime/ Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cmdutils.rbuild (original) +++ trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Fri Aug 25 14:12:28 2006 @@ -5,7 +5,4 @@ <directory name="more"> <xi:include href="more/more.rbuild" /> </directory> -<directory name="uptime"> - <xi:include href="uptime/uptime.rbuild" /> -</directory> </group>

1 0

[gedmurphy] 23702: move uptime to rosapps so Alex doesn't blow up into teeny weeny pieces ; )
by gedmurphy＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: gedmurphy Date: Fri Aug 25 14:11:57 2006 New Revision: 23702 URL: http://svn.reactos.org/svn/reactos?rev=23702&view=rev Log: move uptime to rosapps so Alex doesn't blow up into teeny weeny pieces ;) Added: trunk/rosapps/cmdutils/uptime/ - copied from r23696, trunk/reactos/base/applications/cmdutils/uptime/

1 0

[ion] 23701: - Add some debugging code to see why trap frames are screwed up.
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 08:11:45 2006 New Revision: 23701 URL: http://svn.reactos.org/svn/reactos?rev=23701&view=rev Log: - Add some debugging code to see why trap frames are screwed up. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/trap.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 (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Fri Aug 25 08:11:45 2006 @@ -570,7 +570,7 @@ 5: #ifdef DBG sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - //jnz 0f // FIXME: ROS IS BROKEN + jnz 0f /* Assert FS */ mov bx, fs @@ -752,12 +752,26 @@ jmp 3b .endif +#if DBG 0: +#if 0 + /* Print a message */ + mov esi, [esp+KTRAP_FRAME_DEBUGARGMARK] + mov edi, [esp+KTRAP_FRAME_DEBUGARGMARK-4] + push edi + push esi + push offset Broken + call _DbgPrint + add esp, 12 +#endif + jmp 2b // ros hack + /* Fix up the mask */ add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 6: int 3 jmp 5b +#endif 2: /* Check if this was V86 mode */ 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 Fri Aug 25 08:11:45 2006 @@ -84,6 +84,9 @@ _UnexpectedMsg: .asciz "\n\x7\x7!!! Unexpected Interrupt %02lx !!!\n" +Broken: + .asciz "\n\x7\x7!!! Broken TrapFrame. Magic: %08lx MagicB: %08lx!!!\n" + /* SOFTWARE INTERRUPT SERVICES ***********************************************/ _KiGetTickCount:

1 0

[ion] 23700: - We do not speak about the v86 hack. - This should fix the V86 GPF error.
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 06:23:47 2006 New Revision: 23700 URL: http://svn.reactos.org/svn/reactos?rev=23700&view=rev Log: - We do not speak about the v86 hack. - This should fix the V86 GPF error. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/thread.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 (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Fri Aug 25 06:23:47 2006 @@ -44,6 +44,8 @@ #define FRAME_EDITED 0xFFF8 +#define WE_DO_NOT_SPEAK_ABOUT_THE_V86_HACK 1 + #ifndef __ASM__ extern ULONG Ke386CacheAlignment; 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 (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Fri Aug 25 06:23:47 2006 @@ -299,6 +299,11 @@ /* Save the Exception list */ push [ebx+KPCR_EXCEPTION_LIST] +#if WE_DO_NOT_SPEAK_ABOUT_THE_V86_HACK // V86 HACK + mov ecx, [ebx+KPCR_TSS] + push [ecx+KTSS_ESP0] +#endif + /* DPC shouldn't be active */ cmp byte ptr [ebx+KPCR_PRCB_DPC_ROUTINE_ACTIVE], 0 jnz BugCheckDpc @@ -393,6 +398,11 @@ inc dword ptr [esi+KTHREAD_CONTEXT_SWITCHES] //inc dword ptr [esi+KPRC_PRCB_CONTEXT_SWITCHES] +#if WE_DO_NOT_SPEAK_ABOUT_THE_V86_HACK + mov ebp, [ebx+KPCR_TSS] + pop [ebp+KTSS_ESP0] +#endif + /* Restore exception list */ pop [ebx+KPCR_EXCEPTION_LIST] Modified: trunk/reactos/ntoskrnl/ke/i386/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thread.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thread.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/thread.c Fri Aug 25 06:23:47 2006 @@ -14,6 +14,9 @@ typedef struct _KSHARED_CTXSWITCH_FRAME { +#if WE_DO_NOT_SPEAK_ABOUT_THE_V86_HACK // V86 HACK + ULONG_PTR Esp0; +#endif PVOID ExceptionList; KIRQL WaitIrql; PVOID RetEip; @@ -233,6 +236,11 @@ CtxSwitchFrame->RetEip = KiThreadStartup; CtxSwitchFrame->WaitIrql = APC_LEVEL; CtxSwitchFrame->ExceptionList = (PVOID)0xFFFFFFFF; +#if WE_DO_NOT_SPEAK_ABOUT_THE_V86_HACK // V86 HACK + CtxSwitchFrame->Esp0 = (ULONG_PTR)Thread->InitialStack - + sizeof(FX_SAVE_AREA) - + 0x10; +#endif /* Save back the new value of the kernel stack. */ DPRINT("Final Kernel Stack: %x \n", CtxSwitchFrame);

1 0

[ion] 23699: - Get rid of some code.
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 06:22:50 2006 New Revision: 23699 URL: http://svn.reactos.org/svn/reactos?rev=23699&view=rev Log: - Get rid of some code. Modified: trunk/reactos/ntoskrnl/ke/i386/v86m.c 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 Fri Aug 25 06:22:50 2006 @@ -50,6 +50,7 @@ while (!Exit) { + //DPRINT1("ip: %lx\n", ip[i]); switch (ip[i]) { /* 32-bit data prefix */ @@ -688,127 +689,26 @@ NTAPI KeV86Exception(ULONG ExceptionNr, PKTRAP_FRAME Tf, ULONG address) { - PUCHAR Ip; - PKV86M_TRAP_FRAME VTf; - - ASSERT (ExceptionNr != 14); - - VTf = (PKV86M_TRAP_FRAME)Tf; - - /* FIXME: This should use ->VdmObjects */ - if(KeGetCurrentProcess()->Unused) - { - VTf->regs->PStatus = (PNTSTATUS) ExceptionNr; - return 1; - } - - /* - * Check if we have reached the recovery instruction - */ - Ip = (PUCHAR)((Tf->SegCs & 0xFFFF) * 16 + (Tf->Eip & 0xFFFF)); - - DPRINT("ExceptionNr %d Ip[0] %x Ip[1] %x Ip[2] %x Ip[3] %x Tf->SegCs %x " - "Tf->Eip %x\n", ExceptionNr, Ip[0], Ip[1], Ip[2], Ip[3], Tf->SegCs, - Tf->Eip); - DPRINT("VTf %x VTf->regs %x\n", VTf, VTf->regs); - - if (ExceptionNr == 6 && - memcmp(Ip, VTf->regs->RecoveryInstruction, 4) == 0 && - (Tf->SegCs * 16 + Tf->Eip) == VTf->regs->RecoveryAddress) + PUCHAR Ip; + PKV86M_TRAP_FRAME VTf; + + VTf = (PKV86M_TRAP_FRAME)Tf; + + /* + * Check if we have reached the recovery instruction + */ + Ip = (PUCHAR)((Tf->SegCs & 0xFFFF) * 16 + (Tf->Eip & 0xFFFF)); + + if (ExceptionNr == 6 && + memcmp(Ip, VTf->regs->RecoveryInstruction, 4) == 0 && + (Tf->SegCs * 16 + Tf->Eip) == VTf->regs->RecoveryAddress) { - *VTf->regs->PStatus = STATUS_SUCCESS; - return(1); + *VTf->regs->PStatus = STATUS_SUCCESS; + return(1); } - /* - * Handle the exceptions - */ - switch (ExceptionNr) - { - /* Divide error */ - case 0: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Single step */ - case 1: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* NMI */ - case 2: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Breakpoint */ - case 3: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Overflow */ - case 4: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Array bounds check */ - case 5: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Invalid opcode */ - case 6: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Device not available */ - case 7: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Double fault */ - case 8: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Intel reserved */ - case 9: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Invalid TSS */ - case 10: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Segment not present */ - case 11: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Stack fault */ - case 12: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* General protection fault */ - case 13: - return(KeV86GPF(VTf, Tf)); - - /* Intel reserved */ - case 15: - case 16: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - /* Alignment check */ - case 17: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - - default: - *VTf->regs->PStatus = STATUS_NONCONTINUABLE_EXCEPTION; - return(1); - } + ASSERT(ExceptionNr == 13); + return(KeV86GPF(VTf, Tf)); } NTSTATUS STDCALL

1 0

[ion] 23698: - If SeCaptureSubjectContextEx is called without a process, at least NULL-initialize the context to catch dereferences of invalid pointers.
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 05:04:44 2006 New Revision: 23698 URL: http://svn.reactos.org/svn/reactos?rev=23698&view=rev Log: - If SeCaptureSubjectContextEx is called without a process, at least NULL-initialize the context to catch dereferences of invalid pointers. Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Fri Aug 25 05:04:44 2006 @@ -426,7 +426,13 @@ PAGED_CODE(); /* ROS HACK */ - if (!Process) return; + if (!Process) + { + SubjectContext->PrimaryToken = NULL; + SubjectContext->ProcessAuditId = 0; + SubjectContext->ClientToken = NULL; + return; + } /* Save the unique ID */ SubjectContext->ProcessAuditId = Process->UniqueProcessId;

1 0

[ion] 23697: - Fix compiling/linking problems. - Remove KrnlFun entry - IRQs are now done through a typical NT/ROS trap frame and are synchronized and compatible with trap.S. - Enable 2nd entry interrupt calls in HalBeginSystemInterrupt, since IRQs now use the right trap frame.
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 04:46:41 2006 New Revision: 23697 URL: http://svn.reactos.org/svn/reactos?rev=23697&view=rev Log: - Fix compiling/linking problems. - Remove KrnlFun entry - IRQs are now done through a typical NT/ROS trap frame and are synchronized and compatible with trap.S. - Enable 2nd entry interrupt calls in HalBeginSystemInterrupt, since IRQs now use the right trap frame. Modified: trunk/reactos/hal/halx86/generic/halinit.c trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/systimer.S trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/mp/apic.c trunk/reactos/hal/halx86/mp/halinit_mp.c trunk/reactos/hal/halx86/up/halinit_up.c trunk/reactos/hal/halx86/xbox/halinit_xbox.c trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ke/i386/clock.S Modified: trunk/reactos/hal/halx86/generic/halinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/halinit… ============================================================================== --- trunk/reactos/hal/halx86/generic/halinit.c (original) +++ trunk/reactos/hal/halx86/generic/halinit.c Fri Aug 25 04:46:41 2006 @@ -19,7 +19,6 @@ PVOID HalpZeroPageMapping = NULL; HALP_HOOKS HalpHooks; -VOID NTAPI HalpClockInterrupt(VOID); /* FUNCTIONS ***************************************************************/ @@ -43,12 +42,8 @@ } else if (BootPhase == 1) { - /* Enable the clock interrupt */ - ((PKIPCR)KeGetPcr())->IDT[IRQ2VECTOR(0)].ExtendedOffset = - (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[IRQ2VECTOR(0)].Offset = - (USHORT)HalpClockInterrupt; - HalEnableSystemInterrupt(IRQ2VECTOR(0), CLOCK2_LEVEL, Latched); + /* Initialize the clock interrupt */ + HalpInitPhase1(); /* Initialize display and make the screen black */ HalInitializeDisplay ((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S (original) +++ trunk/reactos/hal/halx86/generic/irq.S Fri Aug 25 04:46:41 2006 @@ -10,9 +10,6 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix - -.extern _Kei386EoiHelper@0 -.extern _KiUnexpectedInterrupt /* GLOBALS *******************************************************************/ @@ -393,10 +390,8 @@ DoCall: /* There are pending software interrupts, call their handlers */ - /* FIXME: Because ROS IRQs don't setup a nice trap frame yet, we can't optimize a 2nd entry */ - //add esp, 12 - //jmp SoftIntHandlerTable2[eax*4] - call SoftIntHandlerTable[eax*4] + add esp, 12 + jmp SoftIntHandlerTable2[eax*4] ret 8 .endfunc Modified: trunk/reactos/hal/halx86/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… ============================================================================== --- trunk/reactos/hal/halx86/generic/systimer.S (original) +++ trunk/reactos/hal/halx86/generic/systimer.S Fri Aug 25 04:46:41 2006 @@ -10,9 +10,6 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix - -.extern _Kei386EoiHelper@0 -.extern _KeUpdateSystemTime@0 /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h (original) +++ trunk/reactos/hal/halx86/include/halp.h Fri Aug 25 04:46:41 2006 @@ -48,6 +48,8 @@ /* Non-generic initialization */ VOID HalpInitPhase0 (PROS_LOADER_PARAMETER_BLOCK LoaderBlock); +VOID HalpInitPhase1(VOID); +VOID NTAPI HalpClockInterrupt(VOID); /* sysinfo.c */ NTSTATUS STDCALL Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=2… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c (original) +++ trunk/reactos/hal/halx86/mp/apic.c Fri Aug 25 04:46:41 2006 @@ -815,14 +815,15 @@ Count[CPU]++; #endif + /* FIXME: SMP is totally broken */ MpsIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); if (KeGetCurrentProcessorNumber() == 0) { - KeUpdateSystemTime(&KernelTrapFrame, oldIrql, 100000); // FIXME: CLOCK_INCREMENT? + //KeUpdateSystemTime(&KernelTrapFrame, oldIrql); } else { - KeUpdateRunTime(&KernelTrapFrame, oldIrql); + //KeUpdateRunTime(&KernelTrapFrame, oldIrql); } Ki386DisableInterrupts(); Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halinit_mp.c… ============================================================================== --- trunk/reactos/hal/halx86/mp/halinit_mp.c (original) +++ trunk/reactos/hal/halx86/mp/halinit_mp.c Fri Aug 25 04:46:41 2006 @@ -52,4 +52,9 @@ } +VOID +HalpInitPhase1(VOID) +{ +} + /* EOF */ Modified: trunk/reactos/hal/halx86/up/halinit_up.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halinit_up.c… ============================================================================== --- trunk/reactos/hal/halx86/up/halinit_up.c (original) +++ trunk/reactos/hal/halx86/up/halinit_up.c Fri Aug 25 04:46:41 2006 @@ -26,4 +26,15 @@ HalpCalibrateStallExecution(); } +VOID +HalpInitPhase1(VOID) +{ + /* Enable the clock interrupt */ + ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset = + (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[0x30].Offset = + (USHORT)HalpClockInterrupt; + HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched); +} + /* EOF */ Modified: trunk/reactos/hal/halx86/xbox/halinit_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/halinit_xb… ============================================================================== --- trunk/reactos/hal/halx86/xbox/halinit_xbox.c (original) +++ trunk/reactos/hal/halx86/xbox/halinit_xbox.c Fri Aug 25 04:46:41 2006 @@ -31,4 +31,15 @@ HalpXboxInitPartIo(); } +VOID +HalpInitPhase1(VOID) +{ + /* Enable the clock interrupt */ + ((PKIPCR)KeGetPcr())->IDT[0x30].ExtendedOffset = + (USHORT)(((ULONG_PTR)HalpClockInterrupt >> 16) & 0xFFFF); + ((PKIPCR)KeGetPcr())->IDT[0x30].Offset = + (USHORT)HalpClockInterrupt; + HalEnableSystemInterrupt(0x30, CLOCK2_LEVEL, Latched); +} + /* EOF */ 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 Fri Aug 25 04:46:41 2006 @@ -25,7 +25,6 @@ // - 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. Modified: trunk/reactos/ntoskrnl/ke/i386/clock.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/clock.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/clock.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/clock.S Fri Aug 25 04:46:41 2006 @@ -10,14 +10,6 @@ #include <asm.h> #include <internal/i386/asmmacro.S> .intel_syntax noprefix - -/* GLOBALS *******************************************************************/ - -.extern _KeTimeAdjustment -.extern _KiTickOffset -.extern _KeTickCount -.extern _KeMaximumIncrement -.extern _KiExpireTimerDpc /* FUNCTIONS ******************************************************************/

1 0

[gedmurphy] 23696: add an 'uptime' command. Available in either Windows or Linux output. (defaulted to Windows)
by gedmurphy＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: gedmurphy Date: Fri Aug 25 04:33:27 2006 New Revision: 23696 URL: http://svn.reactos.org/svn/reactos?rev=23696&view=rev Log: add an 'uptime' command. Available in either Windows or Linux output. (defaulted to Windows) Added: trunk/reactos/base/applications/cmdutils/uptime/ trunk/reactos/base/applications/cmdutils/uptime/uptime.c trunk/reactos/base/applications/cmdutils/uptime/uptime.rbuild trunk/reactos/base/applications/cmdutils/uptime/uptime.rc Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cmdutils.rbuild (original) +++ trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Fri Aug 25 04:33:27 2006 @@ -5,4 +5,7 @@ <directory name="more"> <xi:include href="more/more.rbuild" /> </directory> +<directory name="uptime"> + <xi:include href="uptime/uptime.rbuild" /> +</directory> </group> Added: trunk/reactos/base/applications/cmdutils/uptime/uptime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/uptime/uptime.c (added) +++ trunk/reactos/base/applications/cmdutils/uptime/uptime.c Fri Aug 25 04:33:27 2006 @@ -1,0 +1,34 @@ +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> +#include <windows.h> +#include <tchar.h> + +int main(int argc, char* argv[]) +{ + SYSTEMTIME SystemTime; + LARGE_INTEGER liCount, liFreq; + + GetLocalTime(&SystemTime); + + if (QueryPerformanceCounter(&liCount) && + QueryPerformanceFrequency(&liFreq)) + { + LONGLONG TotalSecs = liCount.QuadPart / liFreq.QuadPart; + LONGLONG Days = (TotalSecs / 86400); + LONGLONG Hours = ((TotalSecs % 86400) / 3600); + LONGLONG Mins = ((TotalSecs % 86400) % 3600) / 60; + LONGLONG Secs = ((TotalSecs % 86400) % 3600) % 60; + +#ifdef LINUX_OUTPUT + UNREFERENCED_PARAMETER(Secs); + _tprintf(_T(" %.2u:%.2u "), SystemTime.wHour, SystemTime.wMinute); + _tprintf(_T("up %I64u days, %I64u:%I64u\n"), Days, Hours, Mins); /*%.2I64u secs*/ +#else + _tprintf(_T("System Up Time:\t\t%I64u days, %I64u Hours, %I64u Minutes, %.2I64u Seconds\n"), + Days, Hours, Mins, Secs); +#endif + return 0; + } + + return -1; +} Added: trunk/reactos/base/applications/cmdutils/uptime/uptime.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/uptime/uptime.rbuild (added) +++ trunk/reactos/base/applications/cmdutils/uptime/uptime.rbuild Fri Aug 25 04:33:27 2006 @@ -1,0 +1,9 @@ +<module name="uptime" type="win32cui" installbase="system32" installname="uptime.exe"> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + + <library>kernel32</library> + <file>uptime.c</file> + <file>uptime.rc</file> +</module> Added: trunk/reactos/base/applications/cmdutils/uptime/uptime.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/uptime/uptime.rc (added) +++ trunk/reactos/base/applications/cmdutils/uptime/uptime.rc Fri Aug 25 04:33:27 2006 @@ -1,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS uptime\0" +#define REACTOS_STR_INTERNAL_NAME "uptime\0" +#define REACTOS_STR_ORIGINAL_FILENAME "uptime.exe\0" +#include <reactos/version.rc>

1 0

[ion] 23695: - The last piece of the puzzle: we had to initialize the IDR in HalInitProcessor to set it to the default of 0xFFFFFFB so that we don't get IRQ 0 and IRQ 1 until we're ready to handle them, which was causing the clock interrupt to be called too early. - Remove irqhand.S and all other remaining pieces of deprecated code.
by ion＠svn.reactos.org 25 Aug '06

25 Aug '06

Author: ion Date: Fri Aug 25 04:30:26 2006 New Revision: 23695 URL: http://svn.reactos.org/svn/reactos?rev=23695&view=rev Log: - The last piece of the puzzle: we had to initialize the IDR in HalInitProcessor to set it to the default of 0xFFFFFFB so that we don't get IRQ 0 and IRQ 1 until we're ready to handle them, which was causing the clock interrupt to be called too early. - Remove irqhand.S and all other remaining pieces of deprecated code. Removed: trunk/reactos/ntoskrnl/ke/i386/irqhand.s Modified: trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/i386/irq.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c (original) +++ trunk/reactos/hal/halx86/generic/processor.c Fri Aug 25 04:30:26 2006 @@ -25,6 +25,9 @@ PLOADER_PARAMETER_BLOCK LoaderBlock) { DPRINT("HalInitializeProcessor(%lu %p)\n", ProcessorNumber, LoaderBlock); + /* Set default IDR */ + KeGetPcr()->IDR = 0xFFFFFFFB; + KeGetPcr()->StallScaleFactor = INITIAL_STALL_COUNT; } BOOLEAN STDCALL Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Fri Aug 25 04:30:26 2006 @@ -94,6 +94,11 @@ #define IPI_FREEZE 4 #define IPI_PACKET_READY 8 #define IPI_SYNCH_REQUEST 16 + +// +// HAL Variables +// +#define INITIAL_STALL_COUNT 0x64 // // Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Fri Aug 25 04:30:26 2006 @@ -78,7 +78,6 @@ { TIME_FIELDS TimeFields; - DPRINT1("KiInitializeSystemClock()\n"); InitializeListHead(&KiTimerListHead); KeInitializeDpc(&KiExpireTimerDpc, (PKDEFERRED_ROUTINE)KiExpireTimers, 0); @@ -95,9 +94,6 @@ SharedUserData->SystemTime.High2Time = SystemBootTime.u.HighPart; SharedUserData->SystemTime.LowPart = SystemBootTime.u.LowPart; SharedUserData->SystemTime.High1Time = SystemBootTime.u.HighPart; - - KiClockSetupComplete = TRUE; - DPRINT1("Finished KiInitializeSystemClock()\n"); } VOID Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irq.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irq.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c Fri Aug 25 04:30:26 2006 @@ -14,21 +14,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -/* DEPRECATED FUNCTIONS ******************************************************/ - -void irq_handler_0(void); -extern IDT_DESCRIPTOR KiIdt[256]; - -VOID -INIT_FUNCTION -NTAPI -KeInitInterrupts (VOID) -{ - KiIdt[0x30].a=((ULONG)irq_handler_0&0xffff)+(KGDT_R0_CODE<<16); - KiIdt[0x30].b=((ULONG)irq_handler_0&0xffff0000)+0x8000+ - 0xe00; -} /* PRIVATE FUNCTIONS *********************************************************/ Removed: trunk/reactos/ntoskrnl/ke/i386/irqhand.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqhand.s… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqhand.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqhand.s (removed) @@ -1,55 +1,0 @@ -/* - * FILE: ntoskrnl/ke/i386/clock.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: System Clock Management - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -#include <internal/i386/asmmacro.S> -.intel_syntax noprefix - -/* GLOBALS *******************************************************************/ - -#include <ndk/asm.h> -#include <../hal/halx86/include/halirq.h> - -.global _irq_handler_0 -_irq_handler_0: - pusha - cld - push ds - push es - push fs - push gs - push 0xCEAFBEEF - mov eax, KGDT_R0_DATA - mov ds, eax - mov es, eax - mov gs, eax - mov eax, KGDT_R0_PCR - mov fs, eax - - /* Increase interrupt count */ - inc dword ptr [fs:KPCR_PRCB_INTERRUPT_COUNT] - - /* Put vector in EBX and make space for KIRQL */ - sub esp, 4 - - /* Begin interrupt */ - push esp - push 0x30 - push HIGH_LEVEL - call _HalBeginSystemInterrupt@12 - - cli - call _HalEndSystemInterrupt@8 - - pop gs - pop fs - pop es - pop ds - popa - iret Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Fri Aug 25 04:30:26 2006 @@ -380,7 +380,6 @@ InitializeListHead(&KPCR->PrcbData.WaitListHead); KeInitExceptions (); - KeInitInterrupts (); KeActiveProcessors |= 1 << 0; 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 Fri Aug 25 04:30:26 2006 @@ -34,7 +34,6 @@ <file>fpu.c</file> <file>gdt.c</file> <file>irq.c</file> - <file>irqhand.s</file> <file>kernel.c</file> <file>ldt.c</file> <file>thread.c</file>

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