diff --git a/reactos/drivers/filesystems/fastfat/fcb.c b/reactos/drivers/filesystems/fastfat/fcb.c index 0522bf56420..1bfc51cec39 100644 --- a/reactos/drivers/filesystems/fastfat/fcb.c +++ b/reactos/drivers/filesystems/fastfat/fcb.c @@ -81,7 +81,7 @@ vfatInitFcb(PVFATFCB Fcb, PUNICODE_STRING NameU) { /* FIXME: what to do if no more memory? */ DPRINT1("Unable to initialize FCB for filename '%wZ'\n", NameU); - KeBugCheckEx(0, (ULONG_PTR)Fcb, (ULONG_PTR)NameU, 0, 0); + KeBugCheckEx(FAT_FILE_SYSTEM, (ULONG_PTR)Fcb, (ULONG_PTR)NameU, 0, 0); } Fcb->PathNameU.Length = 0; diff --git a/reactos/drivers/filesystems/fastfat/vfat.h b/reactos/drivers/filesystems/fastfat/vfat.h index 7842ca65344..e9c37da3d63 100644 --- a/reactos/drivers/filesystems/fastfat/vfat.h +++ b/reactos/drivers/filesystems/fastfat/vfat.h @@ -1,4 +1,5 @@ #include +#include #include #include diff --git a/reactos/drivers/filesystems/fastfat_new/create.c b/reactos/drivers/filesystems/fastfat_new/create.c index e76dc9a76d6..4959048d3f7 100644 --- a/reactos/drivers/filesystems/fastfat_new/create.c +++ b/reactos/drivers/filesystems/fastfat_new/create.c @@ -895,7 +895,7 @@ FatiCreate(IN PFAT_IRP_CONTEXT IrpContext, else { /* Unexpected FCB type */ - KeBugCheckEx(/*FAT_FILE_SYSTEM*/0x23, __LINE__, (ULONG_PTR)Fcb, 0, 0); + KeBugCheckEx(FAT_FILE_SYSTEM, __LINE__, (ULONG_PTR)Fcb, 0, 0); } } diff --git a/reactos/drivers/filesystems/fastfat_new/fastfat.h b/reactos/drivers/filesystems/fastfat_new/fastfat.h index 7b5f250821c..c3d58889e0d 100644 --- a/reactos/drivers/filesystems/fastfat_new/fastfat.h +++ b/reactos/drivers/filesystems/fastfat_new/fastfat.h @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/reactos/drivers/filesystems/fastfat_new/fcb.c b/reactos/drivers/filesystems/fastfat_new/fcb.c index e863984d83b..8f7019242bd 100644 --- a/reactos/drivers/filesystems/fastfat_new/fcb.c +++ b/reactos/drivers/filesystems/fastfat_new/fcb.c @@ -389,7 +389,7 @@ FatiOpenExistingFcb(IN PFAT_IRP_CONTEXT IrpContext, else { /* We can't get here */ - KeBugCheckEx(0x23, CreateDisposition, 0, 0, 0); + KeBugCheckEx(FAT_FILE_SYSTEM, CreateDisposition, 0, 0, 0); } diff --git a/reactos/drivers/network/afd/include/debug.h b/reactos/drivers/network/afd/include/debug.h index da024f15d83..705a9d0b6ae 100644 --- a/reactos/drivers/network/afd/include/debug.h +++ b/reactos/drivers/network/afd/include/debug.h @@ -50,7 +50,7 @@ extern DWORD DebugTraceLevel; #ifdef NASSERT #define ASSERT(x) #else /* NASSERT */ -#define ASSERT(x) if (!(x)) { AFD_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); KeBugCheck(0); } +#define ASSERT(x) if (!(x)) { AFD_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); DbgBreakPoint(); } #endif /* NASSERT */ #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) diff --git a/reactos/drivers/network/dd/ne2000/include/debug.h b/reactos/drivers/network/dd/ne2000/include/debug.h index 309a8a8730c..9f352f6dba3 100644 --- a/reactos/drivers/network/dd/ne2000/include/debug.h +++ b/reactos/drivers/network/dd/ne2000/include/debug.h @@ -43,18 +43,6 @@ extern ULONG DebugTraceLevel; #endif /* _MSC_VER */ -/* Assert is defined in ndis.h */ -#if 0 -#ifdef ASSERT -#undef ASSERT -#endif - -#ifdef NASSERT -#define ASSERT(x) -#else /* NASSERT */ -#define ASSERT(x) if (!(x)) { NDIS_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); KeBugCheck(0); } -#endif /* NASSERT */ -#endif #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) #define ASSERT_IRQL_EQUAL(x) ASSERT(KeGetCurrentIrql() == (x)) diff --git a/reactos/drivers/network/dd/ne2000/ne2000/main.c b/reactos/drivers/network/dd/ne2000/ne2000/main.c index 678e959a6aa..6ecd7bd50d9 100644 --- a/reactos/drivers/network/dd/ne2000/ne2000/main.c +++ b/reactos/drivers/network/dd/ne2000/ne2000/main.c @@ -1001,7 +1001,7 @@ DriverEntry( if(Status != NDIS_STATUS_SUCCESS) { DbgPrint("ne2000!MiniportInitialize: failed to set DwordTest: 0x%x\n", Status); - KeBugCheck(0); + DbgBreakPoint(); } DbgPrint("ne2000!MiniportInitialize: DwordTest successfully set\n"); @@ -1015,7 +1015,7 @@ DriverEntry( if(Status != NDIS_STATUS_SUCCESS) { DbgPrint("ne2000!MiniportInitialize: failed to set StringTest: 0x%x\n", Status); - KeBugCheck(0); + DbgBreakPoint(); } DbgPrint("ne2000!MiniportInitialize: StringTest successfully set\n"); @@ -1031,14 +1031,14 @@ DriverEntry( if(Status != NDIS_STATUS_SUCCESS) { DbgPrint("ne2000!MiniportInitialize: failed to read DwordTest: 0x%x\n", Status); - KeBugCheck(0); + DbgBreakPoint(); } if(ParameterValue->ParameterData.IntegerData != 0x12345678) { DbgPrint("ne2000!MiniportInitialize: DwordTest value is wrong: 0x%x\n", ParameterValue->ParameterData.IntegerData); - KeBugCheck(0); + DbgBreakPoint(); } DbgPrint("ne2000!MiniportInitialize: DwordTest value was correctly read\n"); @@ -1049,7 +1049,7 @@ DriverEntry( if(Status != NDIS_STATUS_SUCCESS) { DbgPrint("ne2000!MiniportInitialize: failed to read StringTest: 0x%x\n", Status); - KeBugCheck(0); + DbgBreakPoint(); } if(wcsncmp(ParameterValue->ParameterData.StringData.Buffer, L"Testing123", @@ -1057,7 +1057,7 @@ DriverEntry( { DbgPrint("ne2000!MiniportInitialize: StringTest value is wrong: %wZ\n", &ParameterValue->ParameterData.StringData); - KeBugCheck(0); + DbgBreakPoint(); } DbgPrint("ne2000!MiniportInitialize: StringTest value was correctly read\n"); diff --git a/reactos/drivers/network/lan/include/debug.h b/reactos/drivers/network/lan/include/debug.h index af28e584a27..bef235757d8 100644 --- a/reactos/drivers/network/lan/include/debug.h +++ b/reactos/drivers/network/lan/include/debug.h @@ -57,18 +57,6 @@ extern DWORD DebugTraceLevel; #endif /* _MSC_VER */ -#if 0 -#ifdef ASSERT -#undef ASSERT -#endif - -#ifdef NASSERT -#define ASSERT(x) -#else /* NASSERT */ -#define ASSERT(x) if (!(x)) { LA_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); KeBugCheck(0); } -#endif /* NASSERT */ -#endif - #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) #else /* DBG */ diff --git a/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp b/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp index edc56736e80..5491a237bf1 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp @@ -232,7 +232,7 @@ PcRegisterSubdevice( if (!DeviceExt) { // should not happen - KeBugCheck(0); + DbgBreakPoint(); return STATUS_UNSUCCESSFUL; } diff --git a/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp b/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp index b51826131a8..07395aedc27 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp @@ -715,7 +715,8 @@ CPortPinDMus::Init( else { DPRINT("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); - KeBugCheck(0); + DbgBreakPoint(); + while(TRUE); } Status = NewIrpQueue(&m_IrpQueue); diff --git a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp index 78be09a3360..56f6217e107 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp @@ -869,7 +869,8 @@ CPortPinWaveCyclic::Init( else { DPRINT("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); - KeBugCheck(0); + DbgBreakPoint(); + while(TRUE); } diff --git a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp index 599ba53108d..79ff0a1b49b 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp @@ -981,7 +981,8 @@ CPortPinWavePci::Init( else { DPRINT("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); - KeBugCheck(0); + DbgBreakPoint(); + while(TRUE); } Status = m_Miniport->NewStream(&m_Stream, diff --git a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp index 0840319d8da..e325e49fe61 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp @@ -697,6 +697,7 @@ CPortPinWaveRT::Init( { DPRINT("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); KeBugCheck(0); + while(TRUE); } Status = m_Miniport->NewStream(&m_Stream, m_PortStream, ConnectDetails->PinId, Capture, m_Format); diff --git a/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp b/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp index 5d8559f24d3..9a4bbbd8ca0 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp @@ -212,7 +212,8 @@ PinPropertyHandler( if (!NT_SUCCESS(Status)) { DPRINT("Failed to obtain ISubdevice interface from port driver\n"); - KeBugCheck(0); + DbgBreakPoint(); + while(TRUE); } // get current stack location diff --git a/reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp b/reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp index dd92ebe7584..5de3ea02790 100644 --- a/reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp +++ b/reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp @@ -16,7 +16,7 @@ extern "C" { { // put error handling here - KeBugCheck(0); + DbgBreakPoint(); } } diff --git a/reactos/hal/halamd64/generic/hal.c b/reactos/hal/halamd64/generic/hal.c index 759c0fbefcb..fe4871f43b3 100644 --- a/reactos/hal/halamd64/generic/hal.c +++ b/reactos/hal/halamd64/generic/hal.c @@ -120,7 +120,7 @@ VOID NTAPI HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KeBugCheck(0); + UNIMPLEMENTED; return; } @@ -131,7 +131,7 @@ VOID NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KeBugCheck(0); + UNIMPLEMENTED; return; } @@ -142,7 +142,7 @@ ULONG_PTR NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - KeBugCheck(0); + UNIMPLEMENTED; return Interval; } diff --git a/reactos/hal/halarm/generic/hal.c b/reactos/hal/halarm/generic/hal.c index 584d1f63827..c35aa0d5f3d 100644 --- a/reactos/hal/halarm/generic/hal.c +++ b/reactos/hal/halarm/generic/hal.c @@ -120,7 +120,7 @@ VOID NTAPI HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KeBugCheck(0); + UNIMPLEMENTED; return; } @@ -131,7 +131,7 @@ VOID NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KeBugCheck(0); + UNIMPLEMENTED; return; } @@ -142,7 +142,7 @@ ULONG_PTR NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - KeBugCheck(0); + UNIMPLEMENTED; return Interval; } diff --git a/reactos/hal/halppc/generic/bus.c b/reactos/hal/halppc/generic/bus.c index 23bf9f685af..9b708a296a5 100644 --- a/reactos/hal/halppc/generic/bus.c +++ b/reactos/hal/halppc/generic/bus.c @@ -222,7 +222,7 @@ HalGetBusDataByOffset(IN BUS_DATA_TYPE BusDataType, else if (BusDataType == EisaConfiguration) { /* FIXME: TODO */ - KeBugCheck(0); + ASSERT(FALSE); } else if ((BusDataType == PCIConfiguration) && (HalpPCIConfigInitialized) && diff --git a/reactos/hal/halppc/generic/irql.c b/reactos/hal/halppc/generic/irql.c index 5cc5a8053ae..bc1604e6c31 100644 --- a/reactos/hal/halppc/generic/irql.c +++ b/reactos/hal/halppc/generic/irql.c @@ -216,7 +216,7 @@ KfLowerIrql (KIRQL NewIrql) { DbgPrint ("(%s:%d) NewIrql %x CurrentIrql %x\n", __FILE__, __LINE__, NewIrql, KeGetPcr()->Irql); - KeBugCheck(0); + KeBugCheck(IRQL_NOT_LESS_OR_EQUAL); for(;;); } @@ -251,7 +251,7 @@ KfRaiseIrql (KIRQL NewIrql) { DbgPrint ("%s:%d CurrentIrql %x NewIrql %x\n", __FILE__,__LINE__,KeGetPcr()->Irql,NewIrql); - KeBugCheck (0); + KeBugCheck (IRQL_NOT_GREATER_OR_EQUAL); for(;;); } @@ -424,7 +424,7 @@ HalRequestSoftwareInterrupt( break; default: - KeBugCheck(0); + DbgBreakPoint(); } } @@ -443,7 +443,7 @@ HalClearSoftwareInterrupt( break; default: - KeBugCheck(0); + DbgBreakPoint(); } } diff --git a/reactos/hal/halppc/generic/profil.c b/reactos/hal/halppc/generic/profil.c index 6a018541ff0..d7f31afe4f5 100644 --- a/reactos/hal/halppc/generic/profil.c +++ b/reactos/hal/halppc/generic/profil.c @@ -21,7 +21,7 @@ VOID NTAPI HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KeBugCheck(0); + UNIMPLEMENTED; return; } @@ -32,7 +32,7 @@ VOID NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KeBugCheck(0); + UNIMPLEMENTED; return; } @@ -43,7 +43,7 @@ ULONG_PTR NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - KeBugCheck(0); + UNIMPLEMENTED; return Interval; } diff --git a/reactos/hal/halx86/generic/bios.c b/reactos/hal/halx86/generic/bios.c index 30e22225d86..ebbbce5e977 100644 --- a/reactos/hal/halx86/generic/bios.c +++ b/reactos/hal/halx86/generic/bios.c @@ -109,7 +109,7 @@ HalpSwitchToRealModeTrapHandlers(VOID) ULONG Handler; PHARDWARE_PTE IdtPte; - /* On i586, the first 7 entries of IDT are write-protected, unprotect them. */ + /* On i586, the first 7 entries of IDT are write-protected, unprotect them. */ // Nasty hto hack if (KeGetCurrentPrcb()->CpuType == 5) { IdtPte = GetPteAddress(((PKIPCR)KeGetPcr())->IDT); @@ -197,6 +197,7 @@ HalpUnmapRealModeMemory(VOID) Pte = GetPteAddress((PVOID)i); Pte->Valid = 0; Pte->Write = 0; + //Pte->Owner = 0; // Missing this? Pte->PageFrameNumber = 0; } diff --git a/reactos/hal/halx86/generic/profil.c b/reactos/hal/halx86/generic/profil.c index 7da77ffe06e..53d653a0d1e 100644 --- a/reactos/hal/halx86/generic/profil.c +++ b/reactos/hal/halx86/generic/profil.c @@ -21,7 +21,7 @@ VOID NTAPI HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - ASSERT(FALSE); + UNIMPLEMENTED; return; } @@ -32,7 +32,7 @@ VOID NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - ASSERT(FALSE); + UNIMPLEMENTED; return; } @@ -43,6 +43,6 @@ ULONG_PTR NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - ASSERT(FALSE); + UNIMPLEMENTED; return Interval; } diff --git a/reactos/hal/halx86/mp/mpconfig.c b/reactos/hal/halx86/mp/mpconfig.c index 0ca17670d0b..b7e40ad250f 100644 --- a/reactos/hal/halx86/mp/mpconfig.c +++ b/reactos/hal/halx86/mp/mpconfig.c @@ -271,7 +271,7 @@ HaliReadMPConfigTable(PMP_CONFIGURATION_TABLE Table) DPRINT1("Bad MP configuration block signature: %c%c%c%c\n", pc[0], pc[1], pc[2], pc[3]); - KeBugCheckEx(0, pc[0], pc[1], pc[2], pc[3]); + KeBugCheckEx(HAL_INITIALIZATION_FAILED, pc[0], pc[1], pc[2], pc[3]); return FALSE; } diff --git a/reactos/lib/drivers/ip/network/arp.c b/reactos/lib/drivers/ip/network/arp.c index 08549c2fc07..368b718e03f 100644 --- a/reactos/lib/drivers/ip/network/arp.c +++ b/reactos/lib/drivers/ip/network/arp.c @@ -140,7 +140,7 @@ BOOLEAN ARPTransmit(PIP_ADDRESS Address, PVOID LinkAddress, break; default: TI_DbgPrint(DEBUG_ARP,("Bad Address Type %x\n", Address->Type)); - KeBugCheck(0); + DbgBreakPoint(); /* Should not happen */ return FALSE; } diff --git a/reactos/lib/drivers/oskittcp/include/oskitdebug.h b/reactos/lib/drivers/oskittcp/include/oskitdebug.h index 40ccd460688..32754aae1cf 100644 --- a/reactos/lib/drivers/oskittcp/include/oskitdebug.h +++ b/reactos/lib/drivers/oskittcp/include/oskitdebug.h @@ -59,18 +59,6 @@ extern OSK_UINT OskitDebugTraceLevel; #endif /* _MSC_VER */ -#if 0 -#ifdef ASSERT -#undef ASSERT -#endif - -#ifdef NASSERT -#define ASSERT(x) -#else /* NASSERT */ -#define ASSERT(x) if (!(x)) { OS_DbgPrint(MIN_TRACE, ("Assertion "#x" failed at %s:%d\n", __FILE__, __LINE__)); KeBugCheck(0); } -#endif /* NASSERT */ -#endif - #define ASSERT_IRQL(x) ASSERT(KeGetCurrentIrql() <= (x)) #else /* DBG */ diff --git a/reactos/ntoskrnl/ke/powerpc/exp.c b/reactos/ntoskrnl/ke/powerpc/exp.c index 6d75f2dfd06..28820366a76 100644 --- a/reactos/ntoskrnl/ke/powerpc/exp.c +++ b/reactos/ntoskrnl/ke/powerpc/exp.c @@ -88,7 +88,7 @@ KiDispatchException(IN PEXCEPTION_RECORD ExceptionRecord, DbgPrint("EXCEPTION! Record %08x Frame %08x\n", ExceptionRecord, ExceptionFrame); MmuDumpMap(); - KeBugCheck(0); + KeBugCheck(KMODE_EXCEPTION_NOT_HANDLED); } /* diff --git a/reactos/ntoskrnl/ke/powerpc/kiinit.c b/reactos/ntoskrnl/ke/powerpc/kiinit.c index a08987aa275..1d9c68b7f3c 100644 --- a/reactos/ntoskrnl/ke/powerpc/kiinit.c +++ b/reactos/ntoskrnl/ke/powerpc/kiinit.c @@ -352,6 +352,6 @@ KiInitMachineDependent(VOID) void abort() { - KeBugCheck(0); + KeBugCheck(KMODE_EXCEPTION_NOT_HANDLED); while(1); } diff --git a/reactos/ntoskrnl/mm/ppool.c b/reactos/ntoskrnl/mm/ppool.c index c105c25ffd3..0e3850fb617 100644 --- a/reactos/ntoskrnl/mm/ppool.c +++ b/reactos/ntoskrnl/mm/ppool.c @@ -19,7 +19,7 @@ #endif #undef ASSERT -#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); KeBugCheck(0); } +#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); } // enable "magic" //#define R_MAGIC @@ -27,7 +27,7 @@ #define R_ACQUIRE_MUTEX(pool) /*DPRINT1("Acquiring PPool Mutex\n");*/ ExAcquireFastMutex(&pool->Mutex) #define R_RELEASE_MUTEX(pool) /*DPRINT1("Releasing PPool Mutex\n");*/ ExReleaseFastMutex(&pool->Mutex) #define R_PRINT_ADDRESS(addr) KeRosPrintAddress(addr) -#define R_PANIC() KeBugCheck(0) +#define R_PANIC() KeBugCheck(MEMORY_MANAGEMENT) #define R_DEBUG DbgPrint #ifdef _ARM_