Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Don't use KeBugCheck(0) -- 0 is an invalid bugcode. Use a proper bugcode, DbgBreakPoint or UNIMPLEMENTED instead depending on how the old call was used.

Browse source 
- Remove some unused and deprecated macros from the network stack that did this.
- fastfat_new: Use FAT_FILE_SYSTEM instead of magic 0x23.

svn path=/trunk/; revision=43673
This commit is contained in:
Stefan Ginsberg 2009-10-21 17:52:11 +00:00
parent f2e66d0408
commit 3a16c5a061
29 changed files with 48 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/filesystems/fastfat/fcb.c
View file

@ -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;

1
reactos/drivers/filesystems/fastfat/vfat.h
View file

@ -1,4 +1,5 @@
#include <ntifs.h>
#include <bugcodes.h>
#include <ntdddisk.h>
#include <debug.h>

2
reactos/drivers/filesystems/fastfat_new/create.c
View file

@ -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);
}
}

1
reactos/drivers/filesystems/fastfat_new/fastfat.h
View file

@ -1,4 +1,5 @@
#include <ntifs.h>
#include <bugcodes.h>
#include <ntdddisk.h>
#include <debug.h>
#include <pseh/pseh2.h>

2
reactos/drivers/filesystems/fastfat_new/fcb.c
View file

@ -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);
}

2
reactos/drivers/network/afd/include/debug.h
View file

@ -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))

12
reactos/drivers/network/dd/ne2000/include/debug.h
View file

@ -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))

12
reactos/drivers/network/dd/ne2000/ne2000/main.c
View file

@ -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");

12
reactos/drivers/network/lan/include/debug.h
View file

@ -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 */

2
reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp
View file

@ -232,7 +232,7 @@ PcRegisterSubdevice(
if (!DeviceExt)
{
// should not happen
KeBugCheck(0);
DbgBreakPoint();
return STATUS_UNSUCCESSFUL;
}

3
reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp
View file

@ -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);

3
reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp
View file

@ -869,7 +869,8 @@ CPortPinWaveCyclic::Init(
else
{
DPRINT("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow);
KeBugCheck(0);
DbgBreakPoint();
while(TRUE);
}

3
reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp
View file

@ -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,

1
reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp
View file

@ -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);

3
reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp
View file

@ -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

2
reactos/drivers/wdm/audio/backpln/portcls/purecall.cpp
View file

@ -16,7 +16,7 @@ extern "C" {
{
// put error handling here
KeBugCheck(0);
DbgBreakPoint();
}
}

6
reactos/hal/halamd64/generic/hal.c
View file

@ -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;
}

6
reactos/hal/halarm/generic/hal.c
View file

@ -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;
}

2
reactos/hal/halppc/generic/bus.c
View file

@ -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) &&

8
reactos/hal/halppc/generic/irql.c
View file

@ -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();
}
}

6
reactos/hal/halppc/generic/profil.c
View file

@ -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;
}

3
reactos/hal/halx86/generic/bios.c
View file

@ -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;
}

6
reactos/hal/halx86/generic/profil.c
View file

@ -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;
}

2
reactos/hal/halx86/mp/mpconfig.c
View file

@ -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;
}

2
reactos/lib/drivers/ip/network/arp.c
View file

@ -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;
}

12
reactos/lib/drivers/oskittcp/include/oskitdebug.h
View file

@ -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 */

2
reactos/ntoskrnl/ke/powerpc/exp.c
View file

@ -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);
}
/*

2
reactos/ntoskrnl/ke/powerpc/kiinit.c
View file

@ -352,6 +352,6 @@ KiInitMachineDependent(VOID)
void abort()
{
KeBugCheck(0);
KeBugCheck(KMODE_EXCEPTION_NOT_HANDLED);
while(1);
}

4
reactos/ntoskrnl/mm/ppool.c
View file

@ -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_