Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[dgorbachev] 44864: Fix parameter type of NtQueryInformationThread; do not call ExitThread from itself. Bug #5076.
by dgorbachev＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: dgorbachev Date: Sat Jan 2 00:14:10 2010 New Revision: 44864 URL: http://svn.reactos.org/svn/reactos?rev=44864&view=rev Log: Fix parameter type of NtQueryInformationThread; do not call ExitThread from itself. Bug #5076. Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Sat Jan 2 00:14:10 2010 @@ -242,7 +242,7 @@ ExitThread(DWORD uExitCode) { NTSTATUS Status; - BOOLEAN LastThread; + ULONG LastThread; /* * Terminate process if this is the last thread @@ -251,7 +251,7 @@ Status = NtQueryInformationThread(NtCurrentThread(), ThreadAmILastThread, &LastThread, - sizeof(BOOLEAN), + sizeof(LastThread), NULL); if (NT_SUCCESS(Status) && LastThread) { @@ -266,8 +266,9 @@ NtCurrentTeb()->FreeStackOnTermination = TRUE; NtTerminateThread(NULL, uExitCode); - /* We will never reach this place. This silences the compiler */ - ExitThread(uExitCode); + /* We should never reach this place */ + DPRINT1("It should not happen\n"); + while (TRUE) ; } /*

1 0

[ros-arm-bringup] 44863: NMI Support Patch 7 Build Fixer: [HAL]: Define HalpNMIInProgress as an external in the HAL private headers.
by ros-arm-bringup＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: ros-arm-bringup Date: Fri Jan 1 22:07:22 2010 New Revision: 44863 URL: http://svn.reactos.org/svn/reactos?rev=44863&view=rev Log: NMI Support Patch 7 Build Fixer: [HAL]: Define HalpNMIInProgress as an external in the HAL private headers. Modified: trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Fri Jan 1 22:07:22 2010 @@ -244,6 +244,8 @@ #endif // !CONFIG_SMP #endif // _M_AMD64 +extern BOOLEAN HalpNMIInProgress; + extern PVOID HalpRealModeStart; extern PVOID HalpRealModeEnd;

1 0

[ros-arm-bringup] 44862: NMI Support Patch 7 Straggler: [HAL]: Piggyback on V8086 handler (don't restore kernel GPF handler) during an NMI, so that we don't enter another fault context during a recursive NMI after display reset. If another NMI does happen, the V8086 GPF handler will just spin.
by ros-arm-bringup＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: ros-arm-bringup Date: Fri Jan 1 22:05:41 2010 New Revision: 44862 URL: http://svn.reactos.org/svn/reactos?rev=44862&view=rev Log: NMI Support Patch 7 Straggler: [HAL]: Piggyback on V8086 handler (don't restore kernel GPF handler) during an NMI, so that we don't enter another fault context during a recursive NMI after display reset. If another NMI does happen, the V8086 GPF handler will just spin. Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Fri Jan 1 22:05:41 2010 @@ -313,9 +313,19 @@ HalpRestoreTrapHandlers(VOID) { // - // We're back, restore the handlers we over-wrote - // - KeRegisterInterruptHandler(13, HalpGpfHandler); + // Keep dummy GPF handler in case we get an NMI during V8086 + // + if (!HalpNMIInProgress) + { + // + // Not an NMI -- put back the original handler + // + KeRegisterInterruptHandler(13, HalpGpfHandler); + } + + // + // Restore invalid opcode handler + // KeRegisterInterruptHandler(6, HalpBopHandler); }

1 0

[ros-arm-bringup] 44861: NMI Support Patch 7: [NTOS]: Improve UNHANDLED_PATH macro with a new "Reason" parameter which displays why the path is unhandled (ie: what the unexpected/unlikely/untested scenario is). This is better than just displaying the current PC which is typically useless. [NTOS]: Separate UNHANDLED_PATH from UNHANDLED_V86_PATH which is specifically for paths that are unimplemented due to lack of VDM support. [HAL]: Update to new macros in V8086 support, and handle invalid opcode
by ros-arm-bringup＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: ros-arm-bringup Date: Fri Jan 1 22:03:22 2010 New Revision: 44861 URL: http://svn.reactos.org/svn/reactos?rev=44861&view=rev Log: NMI Support Patch 7: [NTOS]: Improve UNHANDLED_PATH macro with a new "Reason" parameter which displays why the path is unhandled (ie: what the unexpected/unlikely/untested scenario is). This is better than just displaying the current PC which is typically useless. [NTOS]: Separate UNHANDLED_PATH from UNHANDLED_V86_PATH which is specifically for paths that are unimplemented due to lack of VDM support. [HAL]: Update to new macros in V8086 support, and handle invalid opcode errors with a debug print (I encountered these when the NMI TSS was being used, since the IOPM was invalid). [HAL]: If the V8086 GPF handler is called outside of V8086 mode, assume an NMI happened around the BIOS Call and just spin forever. We'll piggyback on the V8086 GPF handler during an NMI, in order to avoid the kernel's GPF handler which would attempt to panic/reset the display again (and cause endless NMI recursion/corruption). Modified: trunk/reactos/hal/halx86/generic/v86.s trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/hal/halx86/generic/v86.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/v86.s?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/v86.s [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/v86.s [iso-8859-1] Fri Jan 1 22:03:22 2010 @@ -34,8 +34,14 @@ _HalpSavedEsp: .long 0 +_InvalidMsg: + .asciz "HAL: An invalid V86 opcode was encountered at address %x:%x\n" + +_InvalidGpfMsg: + .asciz "HAL: Trap0D while not in V86 mode\n" + _UnhandledMsg: - .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" + .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx [%s]!!!\n" /* FUNCTIONS *****************************************************************/ @@ -143,8 +149,15 @@ .func HalpOpcodeInvalid@0 _HalpOpcodeInvalid@0: - /* Unhandled */ - UNHANDLED_PATH + /* This should never happen -- is the IOPM damaged? */ + push [esi+HALP_BIOS_FRAME_EIP] + push [esi+HALP_BIOS_FRAME_CS] + push offset _InvalidMsg + call _DbgPrint + add esp, 12 + + /* Break */ + int 3 /* Nothing to return */ xor eax, eax @@ -376,7 +389,7 @@ add esp, [eax+KTHREAD_INITIAL_STACK] /* Switch to good stack segment */ - UNHANDLED_PATH + UNHANDLED_PATH "16-Bit Stack" .endfunc .globl _HalpTrap0D@0 @@ -391,8 +404,13 @@ test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK jnz DoDispatch - /* Unhandled */ - UNHANDLED_PATH + /* This is weird -- but might happen during an NMI */ + push offset _InvalidGpfMsg + call _DbgPrint + add esp, 4 + + /* Loop forever */ + jmp $ DoDispatch: /* Handle the opcode */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Fri Jan 1 22:03:22 2010 @@ -87,18 +87,47 @@ // // @name UNHANDLED_PATH // -// This macro TODO +// This macro prints out that the current code path is not expected yet // // @param None // // @remark None. // -.macro UNHANDLED_PATH +.macro UNHANDLED_PATH Reason + + /* Push reason */ + push offset 1f + /* Get EIP */ call $+5 /* Print debug message */ push offset _UnhandledMsg + call _DbgPrint + add esp, 12 + + /* Loop indefinitely */ + jmp $ + +1: + .asciz \Reason +.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 Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Fri Jan 1 22:03:22 2010 @@ -91,8 +91,11 @@ _UnexpectedMsg: .asciz "\n\x7\x7!!! Unexpected Interrupt %02lx !!!\n" +_V86UnhandledMsg: + .asciz "\n\x7\x7!!! Unhandled V8086 (VDM) support at line: %lx!!!\n" + _UnhandledMsg: - .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" + .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx [%s]!!!\n" _IsrTimeoutMsg: .asciz "\n*** ISR at %lx took over .5 second\n" @@ -133,7 +136,7 @@ _KiGetTickCount: _KiCallbackReturn: /* FIXME: TODO */ - UNHANDLED_PATH + UNHANDLED_PATH "TickCount/Callback Interrupts\n" .func KiSystemService TRAP_FIXUPS kss_a, kss_t, DoNotFixupV86, DoNotFixupAbios @@ -458,7 +461,7 @@ AbiosExit: /* FIXME: TODO */ - UNHANDLED_PATH + UNHANDLED_PATH "ABIOS Exit" .func KiRaiseAssertion TRAP_FIXUPS kira_a, kira_t, DoFixupV86, DoFixupAbios @@ -697,7 +700,7 @@ _KiFixupFrame: /* TODO: Routine to fixup a KTRAP_FRAME when faulting from a syscall. */ - UNHANDLED_PATH + UNHANDLED_PATH "Trap Frame Fixup" .endfunc .func KiTrap0 @@ -738,7 +741,7 @@ /* We don't support this yet! */ V86Int0: /* FIXME: TODO */ - UNHANDLED_PATH + UNHANDLED_V86_PATH .endfunc .func KiTrap1 @@ -781,7 +784,7 @@ jz EnableInterrupts /* We don't support VDM! */ - UNHANDLED_PATH + UNHANDLED_V86_PATH .endfunc .globl _KiTrap2 @@ -847,7 +850,7 @@ jz EnableInterrupts3 /* We don't support VDM! */ - UNHANDLED_PATH + UNHANDLED_V86_PATH .endfunc .func KiTrap4 @@ -888,7 +891,7 @@ /* We don't support this yet! */ V86Int4: - UNHANDLED_PATH + UNHANDLED_V86_PATH .endfunc .func KiTrap5 @@ -933,7 +936,7 @@ /* We don't support this yet! */ V86Int5: - UNHANDLED_PATH + UNHANDLED_V86_PATH .endfunc .func KiTrap6 @@ -949,7 +952,7 @@ VdmOpCodeFault: /* Not yet supported (Invalid OPCODE from V86) */ - UNHANDLED_PATH + UNHANDLED_V86_PATH NotV86UD: /* Push error code */ @@ -1025,7 +1028,7 @@ IsVdmOpcode: /* Unhandled yet */ - UNHANDLED_PATH + UNHANDLED_V86_PATH /* Return to caller */ jmp _Kei386EoiHelper@0 @@ -1332,7 +1335,7 @@ jz HandleUserNpx /* V86 NPX not handled */ - UNHANDLED_PATH + UNHANDLED_V86_PATH EmulationEnabled: /* Did this come from kernel-mode? */ @@ -1499,7 +1502,7 @@ jnz NoReflect /* FIXME: TODO */ - UNHANDLED_PATH + UNHANDLED_V86_PATH NoReflect: @@ -1540,7 +1543,7 @@ jae KmodeGpf /* FIXME: TODO */ - UNHANDLED_PATH + UNHANDLED_PATH "Double GPF" /* Get the opcode and trap frame */ KmodeGpf: @@ -1629,7 +1632,7 @@ MsrCheck: /* FIXME: Handle RDMSR/WRMSR */ - UNHANDLED_PATH + UNHANDLED_PATH "RDMSR/WRMSR" NotIretGpf: @@ -1913,7 +1916,7 @@ DispatchV86Gpf: /* FIXME */ - UNHANDLED_PATH + UNHANDLED_V86_PATH .endfunc .func KiTrap14 @@ -2003,12 +2006,12 @@ jnz CheckVdmPf /* FIXME: TODO */ - UNHANDLED_PATH + UNHANDLED_PATH "SYSENTER Fault" jmp _Kei386EoiHelper@0 SysCallCopyFault: /* FIXME: TODO */ - UNHANDLED_PATH + UNHANDLED_PATH "SYSENTER Fault" jmp _Kei386EoiHelper@0 /* Check if the fault occured in a V86 mode */ @@ -2033,7 +2036,7 @@ VdmPF: /* FIXME: TODO */ - UNHANDLED_PATH + UNHANDLED_V86_PATH /* Save EIP and check what kind of status failure we got */ CheckStatus: @@ -2067,7 +2070,7 @@ SlistFault: /* FIXME: TODO */ - UNHANDLED_PATH + UNHANDLED_PATH "SLIST Fault" IllegalState: @@ -2083,7 +2086,7 @@ VdmAlertGpf: /* FIXME: NOT SUPPORTED */ - UNHANDLED_PATH + UNHANDLED_V86_PATH HandleLockErrata: @@ -2328,7 +2331,7 @@ V86Xmmi: /* V86 XMMI not handled */ - UNHANDLED_PATH + UNHANDLED_V86_PATH KernelXmmi: /* Another weird situation */ @@ -2394,7 +2397,7 @@ add esp, [eax+KTHREAD_INITIAL_STACK] /* Switch to good stack segment */ - UNHANDLED_PATH + UNHANDLED_PATH "16-Bit Stack" .endfunc /* UNEXPECTED INTERRUPT HANDLERS **********************************************/

1 0

[ros-arm-bringup] 44860: NMI Support Patch 6: [HAL]: Fix NMI recursion issues. [HAL]: Reset the display during NMI and paint the NMI Screen of Death.
by ros-arm-bringup＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: ros-arm-bringup Date: Fri Jan 1 21:55:15 2010 New Revision: 44860 URL: http://svn.reactos.org/svn/reactos?rev=44860&view=rev Log: NMI Support Patch 6: [HAL]: Fix NMI recursion issues. [HAL]: Reset the display during NMI and paint the NMI Screen of Death. Modified: trunk/reactos/hal/halx86/generic/misc.c Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Fri Jan 1 21:55:15 2010 @@ -1,25 +1,30 @@ /* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/generic/misc.c - * PURPOSE: Miscellanous Routines - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) - */ - -/* INCLUDES ******************************************************************/ + * PROJECT: ReactOS Hardware Abstraction Layer (HAL) + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: halx86/generic/misc.c + * PURPOSE: NMI, I/O Mapping and x86 Subs + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ #include <hal.h> #define NDEBUG #include <debug.h> -/* PRIVATE FUNCTIONS *********************************************************/ +/* GLOBALS *******************************************************************/ + +BOOLEAN HalpNMIInProgress; + +/* PRIVATE FUNCTIONS **********************************************************/ VOID NTAPI HalpCheckPowerButton(VOID) { - /* Nothing to do on non-ACPI */ + // + // Nothing to do on non-ACPI + // return; } @@ -28,7 +33,9 @@ HalpMapPhysicalMemory64(IN PHYSICAL_ADDRESS PhysicalAddress, IN ULONG NumberPage) { - /* Use kernel memory manager I/O map facilities */ + // + // Use kernel memory manager I/O map facilities + // return MmMapIoSpace(PhysicalAddress, NumberPage << PAGE_SHIFT, MmNonCached); @@ -39,7 +46,9 @@ HalpUnmapVirtualAddress(IN PVOID VirtualAddress, IN ULONG NumberPages) { - /* Use kernel memory manager I/O map facilities */ + // + // Use kernel memory manager I/O map facilities + // MmUnmapIoSpace(VirtualAddress, NumberPages << PAGE_SHIFT); } @@ -112,32 +121,96 @@ NTAPI HalHandleNMI(IN PVOID NmiInfo) { - UCHAR ucStatus; - - /* Get the NMI Flag */ - ucStatus = READ_PORT_UCHAR((PUCHAR)0x61); - - /* Display NMI failure string */ - HalDisplayString ("\n*** Hardware Malfunction\n\n"); - HalDisplayString ("Call your hardware vendor for support\n\n"); - - /* Check for parity error */ - if (ucStatus & 0x80) - { - /* Display message */ - HalDisplayString ("NMI: Parity Check / Memory Parity Error\n"); - } - - /* Check for I/O failure */ - if (ucStatus & 0x40) - { - /* Display message */ - HalDisplayString ("NMI: Channel Check / IOCHK\n"); - } - - /* Halt the system */ + UCHAR NmiStatus; + + // + // Don't recurse + // + if (HalpNMIInProgress++) while (TRUE); + + // + // Get the NMI Flag + // + NmiStatus = READ_PORT_UCHAR((PUCHAR)0x61); + + // + // Switch to boot vieo + // + if (InbvIsBootDriverInstalled()) + { + // + // Acquire ownership + // + InbvAcquireDisplayOwnership(); + InbvResetDisplay(); + + // + // Fill the screen + // + InbvSolidColorFill(0, 0, 639, 479, 1); + InbvSetScrollRegion(0, 0, 639, 479); + + // + // Enable text + // + InbvSetTextColor(15); + InbvInstallDisplayStringFilter(NULL); + InbvEnableDisplayString(TRUE); + } + + // + // Display NMI failure string + // + HalDisplayString("\n*** Hardware Malfunction\n\n"); + HalDisplayString("Call your hardware vendor for support\n\n"); + + // + // Check for parity error + // + if (NmiStatus & 0x80) + { + // + // Display message + // + HalDisplayString("NMI: Parity Check / Memory Parity Error\n"); + } + + // + // Check for I/O failure + // + if (NmiStatus & 0x40) + { + // + // Display message + // + HalDisplayString("NMI: Channel Check / IOCHK\n"); + } + + // + // Check for EISA systems + // + if (HalpBusType == MACHINE_TYPE_EISA) + { + // + // FIXME: Not supported + // + UNIMPLEMENTED; + } + + // + // Halt the system + // HalDisplayString("\n*** The system has halted ***\n"); - //KeEnterKernelDebugger(); + + // + // Enter the debugger if possible + // + //if (!KdDebuggerNotPresent && KdDebuggerEnabled) KeEnterKernelDebugger(); + + // + // Freeze the system + // + while (TRUE); } /* @@ -149,7 +222,9 @@ OUT PKINTERRUPT_ROUTINE **FlatDispatch, OUT PKINTERRUPT_ROUTINE *NoConnection) { - /* Not implemented on x86 */ + // + // Not implemented on x86 + // return 0; } @@ -160,6 +235,8 @@ NTAPI KeFlushWriteBuffer(VOID) { - /* Not implemented on x86 */ + // + // Not implemented on x86 + // return; }

1 0

[dchapyshev] 44859: - Update Russian translation
by dchapyshev＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: dchapyshev Date: Fri Jan 1 20:09:55 2010 New Revision: 44859 URL: http://svn.reactos.org/svn/reactos?rev=44859&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ru-RU.rc [iso-8859-1] Fri Jan 1 20:09:55 2010 @@ -38,7 +38,7 @@ IDS_DEV_ENTRY_IS_WRONG_TYPE "This device is not working properly because one of its drivers may be bad, or your registry may be bad." IDS_DEV_LACKED_ARBITRATOR "The driver for this device requested a resource that ReactOS does not know how to handle." IDS_DEV_BOOT_CONFIG_CONFLICT "Another device is using the resources this device needs." - IDS_DEV_FAILED_FILTER "The drivers for this device need to be reinstalled." + IDS_DEV_FAILED_FILTER "Äðàéâåðû äëÿ ýòîãî óñòðîéñòâà äîëæíû áûòü ïåðåóñòàíîâëåíû." IDS_DEV_DEVLOADER_NOT_FOUND "This device is not working properly because ReactOS cannot load the file $1 that loads the drivers for the device." IDS_DEV_DEVLOADER_NOT_FOUND2 "This device is not working properly because the file $1 that loads the drivers for this device is bad." IDS_DEV_DEVLOADER_NOT_FOUND3 "Device failure: Try changing the driver for this device. If that doesn\'t work, see your hardware documentation." @@ -50,20 +50,20 @@ IDS_DEV_NOT_VERIFIED "Äàííîå óñòðîéñòâî ÿâëÿåòñÿ íåèçâåñòíûì, ðàáîòàåò íåêîððåêòíî èëè íå èìååò óñòàíîâëåííûõ äðàéâåðîâ." IDS_DEV_NEED_RESTART "Äàííîå óñòðîéñòâî íå ñìîæåò êîððåêòíî ðàáîòàòü äî âûïîëíåíèÿ ïåðåçàãðóçêè." IDS_DEV_REENUMERATION "Äàííîå óñòðîéñòâî âûçâàëî êîíôëèêò ðåñóðñîâ." - IDS_DEV_PARTIAL_LOG_CONF "ReactOS could not identify all the resources this device uses." + IDS_DEV_PARTIAL_LOG_CONF "ReactOS íå ìîæåò èäåíòèôèöèðîâàòü ðåñóðñû, èñïîëüçóåìûå óñòðîéñòâîì." IDS_DEV_UNKNOWN_RESOURCE "The driver information file $1 is telling this child device to use a resource that the parent device does not have or recognize." IDS_DEV_REINSTALL "Äðàéâåðû ýòîãî óñòðîéñòâà äîëæíû áûòü ïåðåóñòàíîâëåíû." IDS_DEV_REGISTRY "Âàø ñèñòåìíûé ðååñòð ïîâðåæäåí." IDS_DEV_WILL_BE_REMOVED "ReactOS óäàëèò ýòî óñòðîéñòâî." IDS_DEV_DISABLED "Ýòî óñòðîéñòâî íå çàïóùåíî." IDS_DEV_DISABLED2 "Ýòî óñòðîéñòâî îòêëþ÷åíî." - IDS_DEV_DEVLOADER_NOT_READY "The loaders for this device cannot load the required drivers." + IDS_DEV_DEVLOADER_NOT_READY "Çàãðóç÷èê ýòîãî óñòðîéñòâà íå ìîæåò çàãðóçèòü íåîáõîäèìûå äðàéâåðû." IDS_DEV_DEVLOADER_NOT_READY2 "Ýòîò àäàïòåð ýêðàíà ôóíêöèîíèðóåò êîððåêòíî." - IDS_DEV_DEVLOADER_NOT_READY3 "The loaders for this device cannot load the required drivers." - IDS_DEV_DEVICE_NOT_THERE "This device is either not present, not working properly, or does not have all the drivers installed." - IDS_DEV_MOVED "ReactOS is in the process of setting up this device." - IDS_DEV_TOO_EARLY "ReactOS is in the process of setting up this device." - IDS_DEV_NO_VALID_LOG_CONF "ReactOS can\'t specify the resources for this device." + IDS_DEV_DEVLOADER_NOT_READY3 "Çàãðóç÷èê ýòîãî óñòðîéñòâà íå ìîæåò çàãðóçèòü íåîáõîäèìûå äðàéâåðû." + IDS_DEV_DEVICE_NOT_THERE "Óñòðîéñòâî îòñóòñòâóåò, ðàáîòàåò íåïðàâèëüíî èëè äëÿ íåãî óñòàíîâëåíû íå âñå äðàéâåðû." + IDS_DEV_MOVED "ReactOS íàñòðàèâàåò ýòî óñòðîéñòâî." + IDS_DEV_TOO_EARLY "ReactOS íàñòðàèâàåò ýòî óñòðîéñòâî." + IDS_DEV_NO_VALID_LOG_CONF "ReactOS íå ìîæåò óêàçàòü ðåñóðñû äëÿ ýòîãî óñòðîéñòâà." IDS_DEV_FAILED_INSTALL "Äðàéâåðû äëÿ ýòîãî óñòðîéñòâà íå óñòàíîâëåíû." IDS_DEV_HARDWARE_DISABLED "This device is disabled because the BIOS for the device did not give it any resources." IDS_DEV_CANT_SHARE_IRQ "This device is using an Interrupt Request (IRQ) resource that is in use by another device and cannot be shared.\nYou must change the conflicting setting or remove the real-mode driver causing the conflict." @@ -73,7 +73,7 @@ IDS_DEV_NO_SOFTCONFIG "ReactOS cannot determine the settings for this device. Consult the documentation that came with this device and use the Resource tab to set the configuration." IDS_DEV_BIOS_TABLE "Your computer\'s system firmware does not include enough information to properly configure and use this device. \nTo use this device, contact your computer manufacturer to obtain a firmware or BIOS update." IDS_DEV_IRQ_TRANSLATION_FAILED "This device is requesting a PCI interrupt but is configured for an ISA interrupt (or vice versa). \nPlease use the computer\'s system setup program to reconfigure the interrupt for this device." - IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS cannot initialize the device driver for this hardware." + IDS_DEV_FAILED_DRIVER_ENTRY "ReactOS íå ìîæåò èíèöèàëèçèðîâàòü äðàéâåð óñòðîéñòâà äëÿ äàííîãî îáîðóäîâàíèÿ." IDS_DEV_DRIVER_FAILED_PRIOR_UNLOAD "ReactOS cannot load the device driver for this hardware because a previous instance of the device driver is still in memory." IDS_DEV_DRIVER_FAILED_LOAD "ReactOS cannot load the device driver for this hardware. The driver may be corrupted or missing." IDS_DEV_DRIVER_SERVICE_KEY_INVALID "ReactOS cannot access this hardware because its service key information in the registry is missing or recorded incorrectly." @@ -81,7 +81,7 @@ IDS_DEV_DUPLICATE_DEVICE "ReactOS cannot load the device driver for this hardware because there is a duplicate device already running in the system." IDS_DEV_FAILED_POST_START "ReactOS îñòàíîâèë äàííîå óñòðîéñòâî, òàê êàê â åãî ðàáîòå îáíàðóæèëèñü ïðîáëåìû." IDS_DEV_HALTED "Ïðèëîæåíèå èëè ñëóæáà îòêëþ÷èëè äàííîå óñòðîéñòâî." - IDS_DEV_PHANTOM "Currently, this hardware device is not connected to the computer." + IDS_DEV_PHANTOM "Â íàñòîÿùåå âðåìÿ äàííîå óñòðîéñòâî íå ïîäêëþ÷åíî ê êîìïüþòåðó." IDS_DEV_SYSTEM_SHUTDOWN "ReactOS cannot gain access to this hardware device because the operating system is in the process of shutting down." IDS_DEV_HELD_FOR_EJECT "ReactOS cannot use this hardware device because it has been prepared for safe removal, but it has not been removed from the computer" IDS_DEV_DRIVER_BLOCKED "The software for this device has been blocked from starting because it is known to have problems with ReactOS. Contact the hardware vendor for a new driver." @@ -97,7 +97,7 @@ IDS_PROP_MATCHINGDEVICEID "Ñîîòâåòñòâóþùèé êîä (ID) óñòðîéñòâà" IDS_PROP_SERVICE "Ñëóæáà" IDS_PROP_ENUMERATOR "Ïåðå÷èñëèòåëü" - IDS_PROP_CAPABILITIES "Capabilities" + IDS_PROP_CAPABILITIES "Õàðàêòåðèñòèêè" IDS_PROP_DEVNODEFLAGS "Ôëàãè Devnode" IDS_PROP_CONFIGFLAGS "Ôëàãè Config" IDS_PROP_CSCONFIGFLAGS "Ôëàãè CSConfig" @@ -111,10 +111,10 @@ IDS_PROP_CLASSINSTALLER "Óñòàíîâùèê êëàññîâ" IDS_PROP_CLASSCOINSTALLER "Ñîóñòàíîâùèêè êëàññîâ" IDS_PROP_DEVICECOINSTALLER "Ñîóñòàíîâùèêè óñòðîéñòâ" - IDS_PROP_FIRMWAREREVISION "Firmware Revision" - IDS_PROP_CURRENTPOWERSTATE "Current Power State" - IDS_PROP_POWERCAPABILITIES "Power Capabilities" - IDS_PROP_POWERSTATEMAPPINGS "Power State Mappings" + IDS_PROP_FIRMWAREREVISION "Ìèêðîïðîãðàììà" + IDS_PROP_CURRENTPOWERSTATE "Òåêóøåå ñîñòîÿíèå ýëåêòðîïèòàíèÿ" + IDS_PROP_POWERCAPABILITIES "Âîçìîæíîñòè ýëåêòðîïèòàíèÿ" + IDS_PROP_POWERSTATEMAPPINGS "Ñîïîñòàâëåíèÿ ýíåðãîñáåðåæåíèÿ" END IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400

1 0

[ekohl] 44858: [devmgr] - Display 'Capabilities' and 'Config Flags' flags separately.
by ekohl＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: ekohl Date: Fri Jan 1 18:23:40 2010 New Revision: 44858 URL: http://svn.reactos.org/svn/reactos?rev=44858&view=rev Log: [devmgr] - Display 'Capabilities' and 'Config Flags' flags separately. Modified: trunk/reactos/dll/win32/devmgr/advprop.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Fri Jan 1 18:23:40 2010 @@ -633,8 +633,61 @@ } else if (dwType == REG_DWORD) { - swprintf(dap->szTemp, L"0x%08x", *lpBuffer); - SetListViewText(hwndListView, 0, dap->szTemp); + switch (dwProperty) + { + case SPDRP_CAPABILITIES: + index = 0; + if (*lpBuffer & CM_DEVCAP_LOCKSUPPORTED) + SetListViewText(hwndListView, index++, L"CM_DEVCAP_LOCKSUPPORTED"); + if (*lpBuffer & CM_DEVCAP_EJECTSUPPORTED) + SetListViewText(hwndListView, index++, L"CM_DEVCAP_EJECTSUPPORTED"); + if (*lpBuffer & CM_DEVCAP_REMOVABLE) + SetListViewText(hwndListView, index++, L"CM_DEVCAP_REMOVABLE"); + if (*lpBuffer & CM_DEVCAP_DOCKDEVICE) + SetListViewText(hwndListView, index++, L"CM_DEVCAP_DOCKDEVICE"); + if (*lpBuffer & CM_DEVCAP_UNIQUEID) + SetListViewText(hwndListView, index++, L"CM_DEVCAP_UNIQUEID"); + if (*lpBuffer & CM_DEVCAP_SILENTINSTALL) + SetListViewText(hwndListView, index++, L"CM_DEVCAP_SILENTINSTALL"); + if (*lpBuffer & CM_DEVCAP_RAWDEVICEOK) + SetListViewText(hwndListView, index++, L"CM_DEVCAP_RAWDEVICEOK"); + if (*lpBuffer & CM_DEVCAP_SURPRISEREMOVALOK) + SetListViewText(hwndListView, index++, L"CM_DEVCAP_SURPRISEREMOVALOK"); + if (*lpBuffer & CM_DEVCAP_HARDWAREDISABLED) + SetListViewText(hwndListView, index++, L"CM_DEVCAP_HARDWAREDISABLED"); + if (*lpBuffer & CM_DEVCAP_NONDYNAMIC) + SetListViewText(hwndListView, index++, L"CM_DEVCAP_NONDYNAMIC"); + break; + + case SPDRP_CONFIGFLAGS: + index = 0; + if (*lpBuffer & CONFIGFLAG_DISABLED) + SetListViewText(hwndListView, index++, L"CONFIGFLAG_DISABLED"); + if (*lpBuffer & CONFIGFLAG_REMOVED) + SetListViewText(hwndListView, index++, L"CONFIGFLAG_REMOVED"); + if (*lpBuffer & CONFIGFLAG_MANUAL_INSTALL) + SetListViewText(hwndListView, index++, L"CONFIGFLAG_MANUAL_INSTALL"); + if (*lpBuffer & CONFIGFLAG_IGNORE_BOOT_LC) + SetListViewText(hwndListView, index++, L"CONFIGFLAG_IGNORE_BOOT_LC"); + if (*lpBuffer & CONFIGFLAG_NET_BOOT) + SetListViewText(hwndListView, index++, L"CONFIGFLAG_NET_BOOT"); + if (*lpBuffer & CONFIGFLAG_REINSTALL) + SetListViewText(hwndListView, index++, L"CONFIGFLAG_REINSTALL"); + if (*lpBuffer & CONFIGFLAG_FAILEDINSTALL) + SetListViewText(hwndListView, index++, L"CONFIGFLAG_FAILEDINSTALL"); + if (*lpBuffer & CONFIGFLAG_CANTSTOPACHILD) + SetListViewText(hwndListView, index++, L"CONFIGFLAG_CANTSTOPACHILD"); + if (*lpBuffer & CONFIGFLAG_OKREMOVEROM) + SetListViewText(hwndListView, index++, L"CONFIGFLAG_OKREMOVEROM"); + if (*lpBuffer & CONFIGFLAG_NOREMOVEEXIT) + SetListViewText(hwndListView, index++, L"CONFIGFLAG_NOREMOVEEXIT"); + break; + + default: + swprintf(dap->szTemp, L"0x%08x", *lpBuffer); + SetListViewText(hwndListView, 0, dap->szTemp); + break; + } } else {

1 0

[ekohl] 44857: Add missing device capabilities flags.
by ekohl＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: ekohl Date: Fri Jan 1 18:02:37 2010 New Revision: 44857 URL: http://svn.reactos.org/svn/reactos?rev=44857&view=rev Log: Add missing device capabilities flags. Modified: trunk/reactos/include/ddk/cfgmgr32.h Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/cfgmgr32.h [iso-8859-1] Fri Jan 1 18:02:37 2010 @@ -230,6 +230,16 @@ #define CM_REGISTRY_CONFIG 0x00000200 #define CM_REGISTRY_BITS 0x00000301 +#define CM_DEVCAP_LOCKSUPPORTED 0x00000001 +#define CM_DEVCAP_EJECTSUPPORTED 0x00000002 +#define CM_DEVCAP_REMOVABLE 0x00000004 +#define CM_DEVCAP_DOCKDEVICE 0x00000008 +#define CM_DEVCAP_UNIQUEID 0x00000010 +#define CM_DEVCAP_SILENTINSTALL 0x00000020 +#define CM_DEVCAP_RAWDEVICEOK 0x00000040 +#define CM_DEVCAP_SURPRISEREMOVALOK 0x00000080 +#define CM_DEVCAP_HARDWAREDISABLED 0x00000100 +#define CM_DEVCAP_NONDYNAMIC 0x00000200 typedef struct BusNumber_Des_s { DWORD BUSD_Count;

1 0

[ros-arm-bringup] 44856: NMI Support Patch 5: [HAL]: Do correct TLB flushing for systems with global page support. [HAL]: Clean leading whitespace and comments.
by ros-arm-bringup＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: ros-arm-bringup Date: Fri Jan 1 17:37:34 2010 New Revision: 44856 URL: http://svn.reactos.org/svn/reactos?rev=44856&view=rev Log: NMI Support Patch 5: [HAL]: Do correct TLB flushing for systems with global page support. [HAL]: Clean leading whitespace and comments. Modified: trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Fri Jan 1 17:37:34 2010 @@ -14,12 +14,27 @@ /* GLOBALS ********************************************************************/ +// +// PTE Data +// ULONG HalpSavedPfn; HARDWARE_PTE HalpSavedPte; + +// +// IDT Data +// PVOID HalpGpfHandler; PVOID HalpBopHandler; + +// +// TSS Data +// ULONG HalpSavedEsp0; USHORT HalpSavedTss; + +// +// IOPM Data +// USHORT HalpSavedIopmBase; PUSHORT HalpSavedIoMap; USHORT HalpSavedIoMapData[32][2]; @@ -184,47 +199,65 @@ { PHARDWARE_PTE Pte, V86Pte; ULONG i; - - /* Get the page table directory for the lowest meg of memory */ + + // + // Get the page table directory for the lowest meg of memory + // Pte = HalAddressToPde(0); HalpSavedPfn = Pte->PageFrameNumber; HalpSavedPte = *Pte; - - /* Map it to the HAL reserved region and make it valid */ + + // + // Map it to the HAL reserved region and make it valid + // Pte->Valid = 1; Pte->Write = 1; Pte->Owner = 1; Pte->PageFrameNumber = (HalAddressToPde(0xFFC00000))->PageFrameNumber; - - /* Flush the TLB by resetting CR3 */ - __writecr3(__readcr3()); - - /* Now loop the first meg of memory */ + + // + // Flush the TLB + // + HalpFlushTLB(); + + // + // Now loop the first meg of memory + // for (i = 0; i < 0x100000; i += PAGE_SIZE) { - /* Identity map it */ + // + // Identity map it + // Pte = HalAddressToPte(i); Pte->PageFrameNumber = i >> PAGE_SHIFT; Pte->Valid = 1; Pte->Write = 1; Pte->Owner = 1; } - - /* Now get the entry for our real mode V86 code and the target */ + + // + // Now get the entry for our real mode V86 code and the target + // Pte = HalAddressToPte(0x20000); V86Pte = HalAddressToPte(&HalpRealModeStart); do { - /* Map the physical address into our real-mode region */ + // + // Map the physical address into our real-mode region + // Pte->PageFrameNumber = V86Pte->PageFrameNumber; - /* Keep going until we've reached the end of our region */ + // + // Keep going until we've reached the end of our region + // Pte++; V86Pte++; } while (V86Pte <= HalAddressToPte(&HalpRealModeEnd)); - - /* Flush the TLB by resetting CR3 */ - __writecr3(__readcr3()); + + // + // Flush the TLB + // + HalpFlushTLB(); } VOID @@ -252,18 +285,26 @@ NTAPI HalpSetupRealModeIoPermissionsAndTask(VOID) { - /* Switch to valid TSS */ + // + // Switch to valid TSS + // HalpBorrowTss(); - /* Save a copy of the I/O Map and delete it */ + // + // Save a copy of the I/O Map and delete it + // HalpSavedIoMap = (PUSHORT)&(KeGetPcr()->TSS->IoMaps[0]); HalpStoreAndClearIopm(); - - /* Save the IOPM and switch to the real-mode one */ + + // + // Save the IOPM and switch to the real-mode one + // HalpSavedIopmBase = KeGetPcr()->TSS->IoMapBase; KeGetPcr()->TSS->IoMapBase = KiComputeIopmOffset(1); - - /* Save our stack pointer */ + + // + // Save our stack pointer + // HalpSavedEsp0 = KeGetPcr()->TSS->Esp0; } @@ -282,16 +323,24 @@ NTAPI HalpRestoreIoPermissionsAndTask(VOID) { - /* Restore the stack pointer */ + // + // Restore the stack pointer + // KeGetPcr()->TSS->Esp0 = HalpSavedEsp0; - - /* Restore the I/O Map */ + + // + // Restore the I/O Map + // HalpRestoreIopm(); - - /* Restore the IOPM */ + + // + // Restore the IOPM + // KeGetPcr()->TSS->IoMapBase = HalpSavedIopmBase; - /* Restore the TSS */ + // + // Restore the TSS + // if (HalpSavedTss) HalpReturnTss(); } @@ -302,24 +351,32 @@ ULONG i; PHARDWARE_PTE Pte; - /* Loop the first meg of memory */ + // + // Loop the first meg of memory + // for (i = 0; i < 0x100000; i += PAGE_SIZE) { - /* Invalidate each PTE */ + // + // Invalidate each PTE + // Pte = HalAddressToPte(i); Pte->Valid = 0; Pte->Write = 0; Pte->Owner = 0; Pte->PageFrameNumber = 0; } - - /* Restore the PDE for the lowest megabyte of memory */ + + // + // Restore the PDE for the lowest megabyte of memory + // Pte = HalAddressToPde(0); *Pte = HalpSavedPte; Pte->PageFrameNumber = HalpSavedPfn; - - /* Flush the TLB by resetting CR3 */ - __writecr3(__readcr3()); + + // + // Flush the TLB + // + HalpFlushTLB(); } BOOLEAN @@ -330,43 +387,63 @@ PHARDWARE_PTE IdtPte; BOOLEAN RestoreWriteProtection = FALSE; - /* Disable interrupts */ + // + // Disable interrupts + // Flags = __readeflags(); _disable(); - /* Map memory available to the V8086 real-mode code */ + // + // Map memory available to the V8086 real-mode code + // HalpMapRealModeMemory(); - /* - * On P5, the first 7 entries of the IDT are write protected to work around - * the cmpxchg8b lock errata. Unprotect them here so we can set our custom - * invalid op-code handler. - */ + // + // On P5, the first 7 entries of the IDT are write protected to work around + // the cmpxchg8b lock errata. Unprotect them here so we can set our custom + // invalid op-code handler. + // IdtPte = HalAddressToPte(((PKIPCR)KeGetPcr())->IDT); RestoreWriteProtection = IdtPte->Write; - /* Use special invalid opcode and GPF trap handlers */ + // + // Use special invalid opcode and GPF trap handlers + // HalpSwitchToRealModeTrapHandlers(); - /* Configure the IOPM and TSS */ + // + // Configure the IOPM and TSS + // HalpSetupRealModeIoPermissionsAndTask(); - /* Now jump to real mode */ + // + // Now jump to real mode + // HalpBiosCall(); - /* Restore kernel trap handlers */ + // + // Restore kernel trap handlers + // HalpRestoreTrapHandlers(); - /* Restore write permission */ + // + // Restore write permission + // IdtPte->Write = RestoreWriteProtection; - /* Restore TSS and IOPM */ + // + // Restore TSS and IOPM + // HalpRestoreIoPermissionsAndTask(); - /* Restore low memory mapping */ + // + // Restore low memory mapping + // HalpUnmapRealModeMemory(); - /* Restore interrupts if they were previously enabled */ + // + // Restore interrupts if they were previously enabled + // __writeeflags(Flags); return TRUE; } Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Fri Jan 1 17:37:34 2010 @@ -41,6 +41,66 @@ { /* Use kernel memory manager I/O map facilities */ MmUnmapIoSpace(VirtualAddress, NumberPages << PAGE_SHIFT); +} + +VOID +NTAPI +HalpFlushTLB(VOID) +{ + ULONG Flags, Cr4; + INT CpuInfo[4]; + ULONG_PTR PageDirectory; + + // + // Disable interrupts + // + Flags = __readeflags(); + _disable(); + + // + // Get page table directory base + // + PageDirectory = __readcr3(); + + // + // Check for CPUID support + // + if (KeGetCurrentPrcb()->CpuID) + { + // + // Check for global bit in CPU features + // + __cpuid(CpuInfo, 1); + if (CpuInfo[3] & 0x2000) + { + // + // Get current CR4 value + // + Cr4 = __readcr4(); + + // + // Disable global pit + // + __writecr4(Cr4 & ~CR4_PGE); + + // + // Flush TLB and re-enable global bit + // + __writecr3(PageDirectory); + __writecr4(Cr4); + + // + // Restore interrupts + // + __writeeflags(Flags); + } + } + + // + // Legacy: just flush TLB + // + __writecr3(PageDirectory); + __writeeflags(Flags); } /* 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 [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Fri Jan 1 17:37:34 2010 @@ -106,6 +106,10 @@ VOID NTAPI HalpClockInterrupt(VOID); VOID NTAPI HalpProfileInterrupt(VOID); +VOID +NTAPI +HalpFlushTLB(VOID); + // // KD Support //

1 0

[ros-arm-bringup] 44855: NMI Support Patch 4: [HAL]: Use Mm headers to support PTE/PDE address translation instead of a hardcoded, homegrown macro. WARNING: The current HAL code is not PAE compatible (as it already wasn't). [NTOS]: Define an inline function to set and query an interrupt handler associated with a given IDT vector. This results in much cleaner code as the uglyness of manually setting up an IDT handler isn't duplicated 10 times. Additionally, it fixes some callers which had not bee
by ros-arm-bringup＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: ros-arm-bringup Date: Fri Jan 1 16:09:14 2010 New Revision: 44855 URL: http://svn.reactos.org/svn/reactos?rev=44855&view=rev Log: NMI Support Patch 4: [HAL]: Use Mm headers to support PTE/PDE address translation instead of a hardcoded, homegrown macro. WARNING: The current HAL code is not PAE compatible (as it already wasn't). [NTOS]: Define an inline function to set and query an interrupt handler associated with a given IDT vector. This results in much cleaner code as the uglyness of manually setting up an IDT handler isn't duplicated 10 times. Additionally, it fixes some callers which had not been using HalVectorToIDTEntry to make the initial translation. Modified: trunk/reactos/hal/halx86/generic/bios.c trunk/reactos/hal/halx86/include/hal.h trunk/reactos/hal/halx86/include/halp.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/irqobj.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Fri Jan 1 16:09:14 2010 @@ -16,17 +16,14 @@ ULONG HalpSavedPfn; HARDWARE_PTE HalpSavedPte; -ULONG HalpGpfHandler; -ULONG HalpBopHandler; +PVOID HalpGpfHandler; +PVOID HalpBopHandler; ULONG HalpSavedEsp0; USHORT HalpSavedTss; USHORT HalpSavedIopmBase; PUSHORT HalpSavedIoMap; USHORT HalpSavedIoMapData[32][2]; ULONG HalpSavedIoMapEntries; - -#define GetPdeAddress(x) (PHARDWARE_PTE)(((((ULONG_PTR)(x)) >> 22) << 2) + 0xC0300000) -#define GetPteAddress(x) (PHARDWARE_PTE)(((((ULONG_PTR)(x)) >> 12) << 2) + 0xC0000000) /* FUNCTIONS ******************************************************************/ @@ -189,7 +186,7 @@ ULONG i; /* Get the page table directory for the lowest meg of memory */ - Pte = GetPdeAddress(0); + Pte = HalAddressToPde(0); HalpSavedPfn = Pte->PageFrameNumber; HalpSavedPte = *Pte; @@ -197,7 +194,7 @@ Pte->Valid = 1; Pte->Write = 1; Pte->Owner = 1; - Pte->PageFrameNumber = (GetPdeAddress(0xFFC00000))->PageFrameNumber; + Pte->PageFrameNumber = (HalAddressToPde(0xFFC00000))->PageFrameNumber; /* Flush the TLB by resetting CR3 */ __writecr3(__readcr3()); @@ -206,7 +203,7 @@ for (i = 0; i < 0x100000; i += PAGE_SIZE) { /* Identity map it */ - Pte = GetPteAddress((PVOID)i); + Pte = HalAddressToPte(i); Pte->PageFrameNumber = i >> PAGE_SHIFT; Pte->Valid = 1; Pte->Write = 1; @@ -214,8 +211,8 @@ } /* Now get the entry for our real mode V86 code and the target */ - Pte = GetPteAddress(0x20000); - V86Pte = GetPteAddress(&HalpRealModeStart); + Pte = HalAddressToPte(0x20000); + V86Pte = HalAddressToPte(&HalpRealModeStart); do { /* Map the physical address into our real-mode region */ @@ -224,7 +221,7 @@ /* Keep going until we've reached the end of our region */ Pte++; V86Pte++; - } while (V86Pte <= GetPteAddress(&HalpRealModeEnd)); + } while (V86Pte <= HalAddressToPte(&HalpRealModeEnd)); /* Flush the TLB by resetting CR3 */ __writecr3(__readcr3()); @@ -234,27 +231,21 @@ NTAPI HalpSwitchToRealModeTrapHandlers(VOID) { - ULONG Handler; - - /* Save the current Invalid Opcode and General Protection Fault Handlers */ - HalpGpfHandler = ((((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset << 16) & - 0xFFFF0000) | - (((PKIPCR)KeGetPcr())->IDT[13].Offset & 0xFFFF); - HalpBopHandler = ((((PKIPCR)KeGetPcr())->IDT[6].ExtendedOffset << 16) & - 0xFFFF0000) | - (((PKIPCR)KeGetPcr())->IDT[6].Offset & 0xFFFF); - - /* Now set our own GPF handler to handle exceptions while in real mode */ - Handler = (ULONG_PTR)HalpTrap0D; - ((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset = - (USHORT)((Handler >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[13].Offset = (USHORT)Handler; - - /* And our own invalid opcode handler to detect the BOP to get us out */ - Handler = (ULONG_PTR)HalpTrap06; - ((PKIPCR)KeGetPcr())->IDT[6].ExtendedOffset = - (USHORT)((Handler >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[6].Offset = (USHORT)Handler; + // + // Save the current Invalid Opcode and General Protection Fault Handlers + // + HalpGpfHandler = KeQueryInterruptHandler(13); + HalpBopHandler = KeQueryInterruptHandler(6); + + // + // Now set our own GPF handler to handle exceptions while in real mode + // + KeRegisterInterruptHandler(13, HalpTrap0D); + + // + // And our own invalid opcode handler to detect the BOP to get us out + // + KeRegisterInterruptHandler(6, HalpTrap06); } VOID @@ -280,13 +271,11 @@ NTAPI HalpRestoreTrapHandlers(VOID) { - /* We're back, restore the handlers we over-wrote */ - ((PKIPCR)KeGetPcr())->IDT[13].ExtendedOffset = - (USHORT)((HalpGpfHandler >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[13].Offset = (USHORT)HalpGpfHandler; - ((PKIPCR)KeGetPcr())->IDT[6].ExtendedOffset = - (USHORT)((HalpBopHandler >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[6].Offset = (USHORT)HalpBopHandler; + // + // We're back, restore the handlers we over-wrote + // + KeRegisterInterruptHandler(13, HalpGpfHandler); + KeRegisterInterruptHandler(6, HalpBopHandler); } VOID @@ -317,7 +306,7 @@ for (i = 0; i < 0x100000; i += PAGE_SIZE) { /* Invalidate each PTE */ - Pte = GetPteAddress((PVOID)i); + Pte = HalAddressToPte(i); Pte->Valid = 0; Pte->Write = 0; Pte->Owner = 0; @@ -325,7 +314,7 @@ } /* Restore the PDE for the lowest megabyte of memory */ - Pte = GetPdeAddress(0); + Pte = HalAddressToPde(0); *Pte = HalpSavedPte; Pte->PageFrameNumber = HalpSavedPfn; @@ -353,7 +342,7 @@ * the cmpxchg8b lock errata. Unprotect them here so we can set our custom * invalid op-code handler. */ - IdtPte = GetPteAddress(((PKIPCR)KeGetPcr())->IDT); + IdtPte = HalAddressToPte(((PKIPCR)KeGetPcr())->IDT); RestoreWriteProtection = IdtPte->Write; /* Use special invalid opcode and GPF trap handlers */ Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Fri Jan 1 16:09:14 2010 @@ -29,6 +29,9 @@ /* Internal kernel headers */ #include "internal/pci.h" +#define KeGetCurrentThread _KeGetCurrentThread +#include <internal/i386/ke.h> +#include <internal/i386/mm.h> #ifdef _M_AMD64 #include "internal/amd64/intrin_i.h" #else Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Fri Jan 1 16:09:14 2010 @@ -34,7 +34,13 @@ (((bcd & 0xF0) >> 4) * 10 + (bcd & 0x0F)) #define INT_BCD(int) \ (UCHAR)(((int / 10) << 4) + (int % 10)) - + +// +// Mm PTE/PDE to Hal PTE/PDE +// +#define HalAddressToPde(x) (PHARDWARE_PTE)MiAddressToPde(x) +#define HalAddressToPte(x) (PHARDWARE_PTE)MiAddressToPte(x) + typedef struct _IDTUsageFlags { UCHAR Flags; 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] Fri Jan 1 16:09:14 2010 @@ -65,6 +65,53 @@ // #define KeGetTrapFrameInterruptState(TrapFrame) \ BooleanFlagOn((TrapFrame)->EFlags, EFLAGS_INTERRUPT_MASK) + +// +// Registers an interrupt handler with an IDT vector +// +FORCEINLINE +VOID +KeRegisterInterruptHandler(IN ULONG Vector, + IN PVOID Handler) +{ + UCHAR Entry; + ULONG_PTR Address; + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + + // + // Get the entry from the HAL + // + Entry = HalVectorToIDTEntry(Vector); + Address = PtrToUlong(Handler); + + // + // Now set the data + // + Pcr->IDT[Entry].ExtendedOffset = (USHORT)(Address >> 16); + Pcr->IDT[Entry].Offset = (USHORT)Address; +} + +// +// Returns the registered interrupt handler for a given IDT vector +// +FORCEINLINE +PVOID +KeQueryInterruptHandler(IN ULONG Vector) +{ + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + UCHAR Entry; + + // + // Get the entry from the HAL + // + Entry = HalVectorToIDTEntry(Vector); + + // + // Read the entry from the IDT + // + return (PVOID)(((Pcr->IDT[Entry].ExtendedOffset << 16) & 0xFFFF0000) | + (Pcr->IDT[Entry].Offset & 0xFFFF)); +} // // Invalidates the TLB entry for a specified address Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Fri Jan 1 16:09:14 2010 @@ -29,7 +29,7 @@ IN PDISPATCH_INFO Dispatch) { PKINTERRUPT_ROUTINE Handler; - ULONG Current; + PVOID Current; UCHAR Type; UCHAR Entry; @@ -54,9 +54,7 @@ Dispatch->FlatDispatch = NULL; /* Get the current handler */ - Current = ((((PKIPCR)KeGetPcr())->IDT[Entry].ExtendedOffset << 16) - & 0xFFFF0000) | - (((PKIPCR)KeGetPcr())->IDT[Entry].Offset & 0xFFFF); + Current = KeQueryInterruptHandler(Vector); /* Set the interrupt */ Dispatch->Interrupt = CONTAINING_RECORD(Current, @@ -100,7 +98,6 @@ DISPATCH_INFO Dispatch; PKINTERRUPT_ROUTINE Handler; PULONG Patch = &Interrupt->DispatchCode[0]; - UCHAR Entry; /* Get vector data */ KiGetVectorDispatch(Interrupt->Vector, &Dispatch); @@ -135,14 +132,8 @@ Handler = (PVOID)&Interrupt->DispatchCode; } - /* Get the IDT entry for this vector */ - Entry = HalVectorToIDTEntry(Interrupt->Vector); - - /* Set the pointer in the IDT */ - ((PKIPCR)KeGetPcr())->IDT[Entry].ExtendedOffset = - (USHORT)(((ULONG_PTR)Handler >> 16) & 0xFFFF); - ((PKIPCR)KeGetPcr())->IDT[Entry].Offset = - (USHORT)PtrToUlong(Handler); + /* Register the interrupt */ + KeRegisterInterruptHandler(Interrupt->Vector, Handler); } /* PUBLIC FUNCTIONS **********************************************************/

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010