diff --git a/src/sys/create.c b/src/sys/create.c index 7e2876de..f8cb76a0 100644 --- a/src/sys/create.c +++ b/src/sys/create.c @@ -34,5 +34,19 @@ FspCreate( IoCompleteRequest(Irp, IO_NO_INCREMENT); Result = STATUS_INVALID_DEVICE_REQUEST; - FSP_LEAVE_MJ("", 0); + FSP_LEAVE_MJ( + "FileObject=%p:\"%wZ\", " + "DesiredAccess=%#lx, " + "ShareAccess=%#x, " + "Options=%#lx, " + "FileAttributes=%#x, " + "AllocationSize=%#lx:%#lx, " + "Ea=%p, EaLength=%ld", + IrpSp->FileObject->RelatedFileObject, IrpSp->FileObject->FileName, + IrpSp->Parameters.Create.SecurityContext->DesiredAccess, + IrpSp->Parameters.Create.ShareAccess, + IrpSp->Parameters.Create.Options, + IrpSp->Parameters.Create.FileAttributes, + Irp->Overlay.AllocationSize.HighPart, Irp->Overlay.AllocationSize.LowPart, + Irp->AssociatedIrp.SystemBuffer, IrpSp->Parameters.Create.EaLength); } diff --git a/src/sys/debug.c b/src/sys/debug.c index 39192f74..6827eb90 100644 --- a/src/sys/debug.c +++ b/src/sys/debug.c @@ -14,7 +14,7 @@ static ANSI_STRING DbgBreakPointInc = RTL_CONSTANT_STRING("Fsp*"); BOOLEAN HasDbgBreakPoint(const char *Function) { /* poor man's breakpoints; work around 32 breakpoints kernel limit */ - if (KeGetCurrentIrql() > APC_LEVEL) + if (KeGetCurrentIrql() > APC_LEVEL) /* FsRtlIsDbcsInExpression restriction */ return TRUE; ANSI_STRING Name; RtlInitAnsiString(&Name, Function); diff --git a/src/sys/driver.h b/src/sys/driver.h index 7db6a292..d6338421 100644 --- a/src/sys/driver.h +++ b/src/sys/driver.h @@ -62,9 +62,10 @@ FSP_ENTER_(__VA_ARGS__) #define FSP_LEAVE_MJ(fmt, ...) \ FSP_LEAVE_(" = %s", NtStatusSym(Result),\ - "'%c', %s%s, Flags=%x, " \ + "%c%c, %s%s, IrpSp->Flags=%x, " \ fmt, \ FspDeviceExtension(DeviceObject)->Kind,\ + Irp->RequestorMode == KernelMode ? 'K' : 'U',\ IrpMajorFunctionSym(IrpSp->MajorFunction),\ IrpMinorFunctionSym(IrpSp->MajorFunction, IrpSp->MajorFunction),\ IrpSp->Flags, \