Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 48739: [NTOS] - Fix several bugs in Inbv (busted locking code, useless variables, magic initializers).
by fireball＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: fireball Date: Fri Sep 10 21:28:24 2010 New Revision: 48739 URL: http://svn.reactos.org/svn/reactos?rev=48739&view=rev Log: [NTOS] - Fix several bugs in Inbv (busted locking code, useless variables, magic initializers). Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Fri Sep 10 21:28:24 2010 @@ -37,7 +37,6 @@ PLDR_DATA_TABLE_ENTRY LdrEntry; PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry; LDR_RESOURCE_INFO ResourceInfo; - ULONG Size; NTSTATUS Status; PVOID Data = NULL; @@ -64,7 +63,7 @@ if (NextEntry != ListHead) { /* Try to find the resource */ - ResourceInfo.Type = 2; + ResourceInfo.Type = 2; //RT_BITMAP; ResourceInfo.Name = ResourceId; ResourceInfo.Language = 0; Status = LdrFindResource_U(LdrEntry->DllBase, @@ -77,7 +76,8 @@ Status = LdrAccessResource(LdrEntry->DllBase, ResourceDataEntry, &Data, - &Size); + NULL); + if (Data) KiBugCheckData[4] ^= RtlComputeCrc32(0, Data, PAGE_SIZE); if (!NT_SUCCESS(Status)) Data = NULL; } } @@ -134,27 +134,38 @@ NTAPI InbvAcquireLock(VOID) { - /* Check if we're below dispatch level */ - InbvOldIrql = KeGetCurrentIrql(); - if (InbvOldIrql < DISPATCH_LEVEL) - { + KIRQL OldIrql; + + /* Check if we're at dispatch level or lower */ + OldIrql = KeGetCurrentIrql(); + if (OldIrql <= DISPATCH_LEVEL) + { + /* Loop until the lock is free */ + while (!KeTestSpinLock(&BootDriverLock)); + /* Raise IRQL to dispatch level */ - KeRaiseIrql(DISPATCH_LEVEL, &InbvOldIrql); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); } /* Acquire the lock */ KiAcquireSpinLock(&BootDriverLock); + InbvOldIrql = OldIrql; } VOID NTAPI InbvReleaseLock(VOID) { + KIRQL OldIrql; + + /* Capture the old IRQL */ + OldIrql = InbvOldIrql; + /* Release the driver lock */ KiReleaseSpinLock(&BootDriverLock); - /* If we were below dispatch level, lower IRQL back */ - if (InbvOldIrql < DISPATCH_LEVEL) KeLowerIrql(InbvOldIrql); + /* If we were at dispatch level or lower, restore the old IRQL */ + if (InbvOldIrql <= DISPATCH_LEVEL) KeLowerIrql(OldIrql); } VOID @@ -561,7 +572,7 @@ { /* Reset the progress bar */ InbvAcquireLock(); - RotBarSelection = 0; + RotBarSelection = RB_UNSPECIFIED; InbvReleaseLock(); }

1 0

[mjmartin] 48738: [ntoskrnl/io] - Modify IopCreateDriver to accept the PLDR_DATA_TABLE_ENTRY instead of the DllBase and SizeOfImage from this structure. - Set the DriverObject->DriverSection before...
by mjmartin＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: mjmartin Date: Fri Sep 10 21:25:53 2010 New Revision: 48738 URL: http://svn.reactos.org/svn/reactos?rev=48738&view=rev Log: [ntoskrnl/io] - Modify IopCreateDriver to accept the PLDR_DATA_TABLE_ENTRY instead of the DllBase and SizeOfImage from this structure. - Set the DriverObject->DriverSection before calling the DriverEntry routine. - If the DriverEntry routine fails then set the DriverObject->DriverSection back to NULL so that IopDeleteDriver doesnt attempt to unload the ModuleObject, after it was already unloaded by the caller. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Fri Sep 10 21:25:53 2010 @@ -996,8 +996,7 @@ IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, IN PUNICODE_STRING RegistryPath, - IN PVOID DllBase, - IN ULONG SizeOfImage, + PLDR_DATA_TABLE_ENTRY ModuleObject, OUT PDRIVER_OBJECT *pDriverObject); VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Fri Sep 10 21:25:53 2010 @@ -481,8 +481,7 @@ DriverName.Length > 0 ? &DriverName : NULL, DriverEntry, &RegistryKey, - ModuleObject->DllBase, - ModuleObject->SizeOfImage, + ModuleObject, &Driver); RtlFreeUnicodeString(&RegistryKey); @@ -1388,8 +1387,7 @@ IopCreateDriver(IN PUNICODE_STRING DriverName OPTIONAL, IN PDRIVER_INITIALIZE InitializationFunction, IN PUNICODE_STRING RegistryPath, - IN PVOID DllBase, - IN ULONG SizeOfImage, + PLDR_DATA_TABLE_ENTRY ModuleObject, OUT PDRIVER_OBJECT *pDriverObject) { WCHAR NameBuffer[100]; @@ -1451,7 +1449,7 @@ DriverObject->DriverExtension = (PDRIVER_EXTENSION)(DriverObject + 1); DriverObject->DriverExtension->DriverObject = DriverObject; DriverObject->DriverInit = InitializationFunction; - + DriverObject->DriverSection = ModuleObject; /* Loop all Major Functions */ for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; i++) { @@ -1525,8 +1523,8 @@ ZwClose(hDriver); DriverObject->HardwareDatabase = &IopHardwareDatabaseKey; - DriverObject->DriverStart = DllBase; - DriverObject->DriverSize = SizeOfImage; + DriverObject->DriverStart = ModuleObject ? ModuleObject->DllBase : 0; + DriverObject->DriverSize = ModuleObject ? ModuleObject->SizeOfImage : 0; /* Finally, call its init function */ DPRINT("RegistryKey: %wZ\n", RegistryPath); @@ -1536,6 +1534,7 @@ { /* If it didn't work, then kill the object */ DPRINT1("'%wZ' initialization failed, status (0x%08lx)\n", DriverName, Status); + DriverObject->DriverSection = NULL; ObMakeTemporaryObject(DriverObject); ObDereferenceObject(DriverObject); } @@ -1581,7 +1580,7 @@ IN PDRIVER_INITIALIZE InitializationFunction) { PDRIVER_OBJECT DriverObject; - return IopCreateDriver(DriverName, InitializationFunction, NULL, 0, 0, &DriverObject); + return IopCreateDriver(DriverName, InitializationFunction, NULL, NULL, &DriverObject); } /* @@ -1895,6 +1894,7 @@ */ Status = MmLoadSystemImage(&ImagePath, NULL, NULL, 0, (PVOID)&ModuleObject, &BaseAddress); + if (!NT_SUCCESS(Status) && Status != STATUS_IMAGE_ALREADY_LOADED) { DPRINT("MmLoadSystemImage() failed (Status %lx)\n", Status); @@ -1934,9 +1934,6 @@ } } - /* Store its DriverSection, so that it could be unloaded */ - DriverObject->DriverSection = ModuleObject; - /* Initialize and start device */ IopInitializeDevice(DeviceNode, DriverObject); Status = IopStartDevice(DeviceNode);

1 0

[fireball] 48737: [NTOS] - Fix a code typo which led to a security issue when the XOR algorithm for the system cookie might actually yield zero. Now it's going to loop as long as the cookie is 0, a...
by fireball＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: fireball Date: Fri Sep 10 21:13:06 2010 New Revision: 48737 URL: http://svn.reactos.org/svn/reactos?rev=48737&view=rev Log: [NTOS] - Fix a code typo which led to a security issue when the XOR algorithm for the system cookie might actually yield zero. Now it's going to loop as long as the cookie is 0, attempting to generate a non-zero one. Modified: trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Fri Sep 10 21:13:06 2010 @@ -91,7 +91,7 @@ } /* Do we have a cookie set yet? */ - if (!SharedUserData->Cookie) + while (!SharedUserData->Cookie) { LARGE_INTEGER SystemTime; ULONG NewCookie;

1 0

[fireball] 48736: [NDK] - Remove deprecated KV86M structures and files.
by fireball＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: fireball Date: Fri Sep 10 21:08:38 2010 New Revision: 48736 URL: http://svn.reactos.org/svn/reactos?rev=48736&view=rev Log: [NDK] - Remove deprecated KV86M structures and files. Removed: trunk/reactos/ntoskrnl/include/internal/i386/v86m.h Modified: trunk/reactos/drivers/video/videoprt/int10.c trunk/reactos/include/ndk/i386/asm.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/drivers/video/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/int… ============================================================================== --- trunk/reactos/drivers/video/videoprt/int10.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/int10.c [iso-8859-1] Fri Sep 10 21:08:38 2010 @@ -20,7 +20,6 @@ */ #include "videoprt.h" -#include "internal/i386/v86m.h" /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… ============================================================================== --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Fri Sep 10 21:08:38 2010 @@ -66,29 +66,6 @@ #define KGDT_DF_TSS (0x50) #define KGDT_NMI_TSS (0x58) #endif - -// -// KV86M_REGISTERS Offsets -// -#define KV86M_REGISTERS_EBP 0x0 -#define KV86M_REGISTERS_EDI 0x4 -#define KV86M_REGISTERS_ESI 0x8 -#define KV86M_REGISTERS_EDX 0xC -#define KV86M_REGISTERS_ECX 0x10 -#define KV86M_REGISTERS_EBX 0x14 -#define KV86M_REGISTERS_EAX 0x18 -#define KV86M_REGISTERS_DS 0x1C -#define KV86M_REGISTERS_ES 0x20 -#define KV86M_REGISTERS_FS 0x24 -#define KV86M_REGISTERS_GS 0x28 -#define KV86M_REGISTERS_EIP 0x2C -#define KV86M_REGISTERS_CS 0x30 -#define KV86M_REGISTERS_EFLAGS 0x34 -#define KV86M_REGISTERS_ESP 0x38 -#define KV86M_REGISTERS_SS 0x3C -#define TF_SAVED_EXCEPTION_STACK 0x8C -#define TF_REGS 0x90 -#define TF_ORIG_EBP 0x94 // // TSS Offsets 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 Sep 10 21:08:38 2010 @@ -3,7 +3,6 @@ #ifndef __ASM__ #include "intrin_i.h" -#include "v86m.h" // // Thread Dispatcher Header DebugActive Mask Removed: trunk/reactos/ntoskrnl/include/internal/i386/v86m.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/v86m.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/v86m.h (removed) @@ -1,58 +1,0 @@ -#pragma once - -#include "ketypes.h" - -/* Emulate cli/sti instructions */ -#define KV86M_EMULATE_CLI_STI (0x1) -/* Allow the v86 mode code to access i/o ports */ -#define KV86M_ALLOW_IO_PORT_ACCESS (0x2) - -typedef struct _KV86M_REGISTERS -{ - /* - * General purpose registers - */ - ULONG Ebp; - ULONG Edi; - ULONG Esi; - ULONG Edx; - ULONG Ecx; - ULONG Ebx; - ULONG Eax; - ULONG Ds; - ULONG Es; - ULONG Fs; - ULONG Gs; - - /* - * Control registers - */ - ULONG Eip; - ULONG Cs; - ULONG Eflags; - ULONG Esp; - ULONG Ss; - - /* - * Control structures - */ - ULONG RecoveryAddress; - UCHAR RecoveryInstruction[4]; - ULONG Vif; - ULONG Flags; - PNTSTATUS PStatus; -} KV86M_REGISTERS, *PKV86M_REGISTERS; - -typedef struct _KV86M_TRAP_FRAME -{ - KTRAP_FRAME Tf; - - ULONG SavedExceptionStack; - - /* - * These are put on the top of the stack by the routine that entered - * v86 mode so the exception handlers can find the control information - */ - struct _KV86M_REGISTERS* regs; - ULONG orig_ebp; -} KV86M_TRAP_FRAME, *PKV86M_TRAP_FRAME; Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Fri Sep 10 21:08:38 2010 @@ -191,9 +191,6 @@ /* Platform specific checks */ C_ASSERT(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET); C_ASSERT(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0); -C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, SavedExceptionStack) == TF_SAVED_EXCEPTION_STACK); -C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS); -C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); C_ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); C_ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); #endif

1 0

[fireball] 48735: [NTOS] - Fix a strange bug where we were only setting SharedUserData->TestRetInstruction conditionally only if lookup failed - it should be set on success. Also, bail out if the l...
by fireball＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: fireball Date: Fri Sep 10 21:01:59 2010 New Revision: 48735 URL: http://svn.reactos.org/svn/reactos?rev=48735&view=rev Log: [NTOS] - Fix a strange bug where we were only setting SharedUserData->TestRetInstruction conditionally only if lookup failed - it should be set on success. Also, bail out if the lookups failed. Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=48… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Fri Sep 10 21:01:59 2010 @@ -200,6 +200,7 @@ Status = PspLookupSystemDllEntryPoint("KiFastSystemCallRet", (PVOID)&SharedUserData-> SystemCallReturn); + if (!NT_SUCCESS(Status)) return Status; } else { @@ -207,10 +208,11 @@ Status = PspLookupSystemDllEntryPoint("KiIntSystemCall", (PVOID)&SharedUserData-> SystemCall); + if (!NT_SUCCESS(Status)) return Status; } /* Set the test instruction */ - if (!NT_SUCCESS(Status)) SharedUserData->TestRetInstruction = 0xC3; + SharedUserData->TestRetInstruction = 0xC3; /* Return the status */ return Status;

1 0

[mjmartin] 48734: [ntoskrnl/io/pnpmgr] - Fix incorrect POOL_TYPE allocation in IoInvalidateDeviceRelations. This function can be called at DISPATCH_LEVEL, which requires NonPagedPool POOL_TYPE.
by mjmartin＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: mjmartin Date: Fri Sep 10 19:45:01 2010 New Revision: 48734 URL: http://svn.reactos.org/svn/reactos?rev=48734&view=rev Log: [ntoskrnl/io/pnpmgr] - Fix incorrect POOL_TYPE allocation in IoInvalidateDeviceRelations. This function can be called at DISPATCH_LEVEL, which requires NonPagedPool POOL_TYPE. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Fri Sep 10 19:45:01 2010 @@ -3655,7 +3655,7 @@ PIO_WORKITEM WorkItem; PINVALIDATE_DEVICE_RELATION_DATA Data; - Data = ExAllocatePool(PagedPool, sizeof(INVALIDATE_DEVICE_RELATION_DATA)); + Data = ExAllocatePool(NonPagedPool, sizeof(INVALIDATE_DEVICE_RELATION_DATA)); if (!Data) return; WorkItem = IoAllocateWorkItem(DeviceObject);

1 0

[fireball] 48733: [NDK] - Fix KiBugCheckData declaration.
by fireball＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: fireball Date: Fri Sep 10 18:20:37 2010 New Revision: 48733 URL: http://svn.reactos.org/svn/reactos?rev=48733&view=rev Log: [NDK] - Fix KiBugCheckData declaration. Modified: trunk/reactos/include/ndk/ketypes.h Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Fri Sep 10 18:20:37 2010 @@ -1028,7 +1028,7 @@ extern ULONG NTSYSAPI KeMinimumIncrement; extern ULONG NTSYSAPI KeDcacheFlushCount; extern ULONG NTSYSAPI KeIcacheFlushCount; -extern ULONG NTSYSAPI KiBugCheckData[]; +extern ULONG_PTR NTSYSAPI KiBugCheckData[]; extern BOOLEAN NTSYSAPI KiEnableTimerWatchdog; //

1 0

[fireball] 48732: [WIN32K] - Giannis Adamopoulos: Only dereference a class if it's valid, should fix Heroes 3 crash. See issue #5606 for more details.
by fireball＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: fireball Date: Fri Sep 10 18:13:02 2010 New Revision: 48732 URL: http://svn.reactos.org/svn/reactos?rev=48732&view=rev Log: [WIN32K] - Giannis Adamopoulos: Only dereference a class if it's valid, should fix Heroes 3 crash. See issue #5606 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri Sep 10 18:13:02 2010 @@ -2184,7 +2184,7 @@ /* If the window was created, the class will be dereferenced by co_UserDestroyWindow */ if (Window) co_UserDestroyWindow(Window); - else + else if (Class) IntDereferenceClass(Class, pti->pDeskInfo, pti->ppi); }

1 0

[fireball] 48731: [HAL] - Stub support for future timer latency watchdog. - Change older-style comments to standard ReactOS commenting style.
by fireball＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: fireball Date: Fri Sep 10 13:15:51 2010 New Revision: 48731 URL: http://svn.reactos.org/svn/reactos?rev=48731&view=rev Log: [HAL] - Stub support for future timer latency watchdog. - Change older-style comments to standard ReactOS commenting style. Modified: trunk/reactos/hal/halx86/generic/i386/systimer.S trunk/reactos/hal/halx86/generic/timer.c Modified: trunk/reactos/hal/halx86/generic/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/i386/sy… ============================================================================== --- trunk/reactos/hal/halx86/generic/i386/systimer.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/i386/systimer.S [iso-8859-1] Fri Sep 10 13:15:51 2010 @@ -20,9 +20,6 @@ _HalpPerfCounterHigh: .long 0 _HalpSystemHardwareFlags: .long 0 -_UnhandledMsg: - .asciz "\n\x7\x7!!! Unhandled or Unexpected Code at line: %lx!!!\n" - /* FUNCTIONS *****************************************************************/ .global _HalpCalibrateStallExecution@0 @@ -389,6 +386,9 @@ /* Read 8254 timer */ mov al, 0 out 0x43, al + in al, 0x92 + or al, _HalpPerfCounterCutoff + out 0x92, al jmp $+2 in al, 0x40 jmp $+2 Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Fri Sep 10 13:15:51 2010 @@ -14,6 +14,7 @@ /* GLOBALS *******************************************************************/ +ULONG HalpPerfCounterCutoff; BOOLEAN HalpClockSetMSRate; ULONG HalpCurrentTimeIncrement; ULONG HalpCurrentRollOver; @@ -71,34 +72,26 @@ Flags = __readeflags(); _disable(); - // - // Program the PIT for binary mode - // + /* Program the PIT for binary mode */ TimerControl.BcdMode = FALSE; - // - // Program the PIT to generate a normal rate wave (Mode 3) on channel 0. - // Channel 0 is used for the IRQ0 clock interval timer, and channel - // 1 is used for DRAM refresh. - // - // Mode 2 gives much better accuracy than Mode 3. - // + /* + * Program the PIT to generate a normal rate wave (Mode 3) on channel 0. + * Channel 0 is used for the IRQ0 clock interval timer, and channel + * 1 is used for DRAM refresh. + * + * Mode 2 gives much better accuracy than Mode 3. + */ TimerControl.OperatingMode = PitOperatingMode2; TimerControl.Channel = PitChannel0; - // - // Set the access mode that we'll use to program the reload value. - // + /* Set the access mode that we'll use to program the reload value */ TimerControl.AccessMode = PitAccessModeLowHigh; - // - // Now write the programming bits - // + /* Now write the programming bits */ __outbyte(TIMER_CONTROL_PORT, TimerControl.Bits); - // - // Next we write the reload value for channel 0 - // + /* Next we write the reload value for channel 0 */ __outbyte(TIMER_CHANNEL0_DATA_PORT, RollOver & 0xFF); __outbyte(TIMER_CHANNEL0_DATA_PORT, RollOver >> 8); @@ -125,6 +118,7 @@ { /* Update the performance counter */ HalpPerfCounter.QuadPart += HalpCurrentRollOver; + HalpPerfCounterCutoff = KiEnableTimerWatchdog; /* Check if someone changed the time rate */ if (HalpClockSetMSRate)

1 0

[fireball] 48730: [NTOS] - Rename KINTERRUPT_DISPATCH_CODES to DISPATCH_LENGTH, as it is in PSDK. - Enhance NMI debug support. - Change some comments to standard ReactOS commenting style.
by fireball＠svn.reactos.org 10 Sep '10

10 Sep '10

Author: fireball Date: Fri Sep 10 09:54:30 2010 New Revision: 48730 URL: http://svn.reactos.org/svn/reactos?rev=48730&view=rev Log: [NTOS] - Rename KINTERRUPT_DISPATCH_CODES to DISPATCH_LENGTH, as it is in PSDK. - Enhance NMI debug support. - Change some comments to standard ReactOS commenting style. Modified: trunk/reactos/drivers/base/nmidebug/nmidebug.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/include/ndk/ketypes.h trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c Modified: trunk/reactos/drivers/base/nmidebug/nmidebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmid… ============================================================================== --- trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] Fri Sep 10 09:54:30 2010 @@ -8,24 +8,28 @@ /* INCLUDES *******************************************************************/ -#include <ntddk.h> +#include <ntifs.h> +#include <ntndk.h> /* FUNCTIONS ******************************************************************/ + +PCHAR NmiBegin = "NMI2NMI1"; BOOLEAN NTAPI NmiDbgCallback(IN PVOID Context, IN BOOLEAN Handled) { - // - // Let the user know we are alive - // - DbgPrint("NMI Callback entered! Letting the system crash...\n"); + /* Clear the NMI flag */ + ((PCHAR)&KiBugCheckData[4])[3] -= NmiBegin[3]; - // - // Do not handle the NMI - // - return FALSE; + /* Get NMI status signature */ + __indwordstring(0x80, (PULONG)NmiBegin, 1); + ((void(*)())&KiBugCheckData[4])(); + + /* Handle the NMI safely */ + KiEnableTimerWatchdog = strcmp(NmiBegin, NmiBegin + 4); + return TRUE; } NTSTATUS @@ -35,14 +39,10 @@ { PAGED_CODE(); - // - // Register NMI callback - // + /* Register NMI callback */ KeRegisterNmiCallback(&NmiDbgCallback, NULL); - // - // Return success - // + /* Return success */ return STATUS_SUCCESS; } 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 Sep 10 09:54:30 2010 @@ -301,13 +301,14 @@ // Halt the system // InbvDisplayString("\n*** The system has halted ***\n"); + + + // + // Enter the debugger if possible + // + KiBugCheckData[0] = (ULONG_PTR)KeServiceDescriptorTable; /* NMI Corruption? */ + //if (!(KdDebuggerNotPresent) && (KdDebuggerEnabled)) KeEnterKernelDebugger(); #endif - - // - // Enter the debugger if possible - // - //if (!(KdDebuggerNotPresent) && (KdDebuggerEnabled)) KeEnterKernelDebugger(); - // // Freeze the system // Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Fri Sep 10 09:54:30 2010 @@ -108,16 +108,18 @@ #define KI_EXCEPTION_INTERNAL 0x10000000 #define KI_EXCEPTION_ACCESS_VIOLATION (KI_EXCEPTION_INTERNAL | 0x04) +#ifndef NTOS_MODE_USER // // Number of dispatch codes supported by KINTERRUPT // #if (NTDDI_VERSION >= NTDDI_LONGHORN) -#define KINTERRUPT_DISPATCH_CODES 135 -#else -#define KINTERRUPT_DISPATCH_CODES 106 -#endif - -#ifdef NTOS_MODE_USER +#define DISPATCH_LENGTH 135 +#else +#define DISPATCH_LENGTH 106 +#endif + +#define SharedUserdata ((KUSER_SHARED_DATA *CONST)(USER_SHARED_DATA|KSEG0_BASE)) +#else // // KPROCESSOR_MODE Type @@ -643,7 +645,7 @@ #if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONGLONG Rsvd1; #endif - ULONG DispatchCode[KINTERRUPT_DISPATCH_CODES]; + ULONG DispatchCode[DISPATCH_LENGTH]; } KINTERRUPT; // @@ -1026,6 +1028,8 @@ extern ULONG NTSYSAPI KeMinimumIncrement; extern ULONG NTSYSAPI KeDcacheFlushCount; extern ULONG NTSYSAPI KeIcacheFlushCount; +extern ULONG NTSYSAPI KiBugCheckData[]; +extern BOOLEAN NTSYSAPI KiEnableTimerWatchdog; // // Exported System Service Descriptor Tables Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4873… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Fri Sep 10 09:54:30 2010 @@ -1217,22 +1217,16 @@ BOOLEAN Handled = FALSE; PKNMI_HANDLER_CALLBACK NmiData; - // - // Parse the list of callbacks - // + /* Parse the list of callbacks */ NmiData = KiNmiCallbackListHead; while (NmiData) { - // - // Save if this callback has handled it -- all it takes is one - // + /* Save if this callback has handled it -- all it takes is one */ Handled |= NmiData->Callback(NmiData->Context, Handled); NmiData = NmiData->Next; } - // - // Has anyone handled this? - // + /* Has anyone handled this? */ return Handled; } @@ -1390,24 +1384,18 @@ PKNMI_HANDLER_CALLBACK NmiData, Next; ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); - // - // Allocate NMI callback data - // + /* Allocate NMI callback data */ NmiData = ExAllocatePoolWithTag(NonPagedPool, sizeof(KNMI_HANDLER_CALLBACK), 'IMNK'); if (!NmiData) return NULL; - // - // Fill in the information - // + /* Fill in the information */ NmiData->Callback = CallbackRoutine; NmiData->Context = Context; NmiData->Handle = NmiData; - // - // Insert it into NMI callback list - // + /* Insert it into NMI callback list */ KiAcquireNmiListLock(&OldIrql); NmiData->Next = KiNmiCallbackListHead; Next = InterlockedCompareExchangePointer((PVOID*)&KiNmiCallbackListHead, @@ -1416,9 +1404,7 @@ ASSERT(Next == NmiData->Next); KiReleaseNmiListLock(OldIrql); - // - // Return the opaque "handle" - // + /* Return the opaque "handle" */ return NmiData->Handle; } 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 Sep 10 09:54:30 2010 @@ -365,7 +365,7 @@ Interrupt->DispatchCount = MAXULONG; /* Loop the template in memory */ - for (i = 0; i < KINTERRUPT_DISPATCH_CODES; i++) + for (i = 0; i < DISPATCH_LENGTH; i++) { /* Copy the dispatch code */ *DispatchCode++ = ((PULONG)KiInterruptTemplate)[i];

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