[HAMMERTIMESTFU]

Silence "a few" DPRINTs

svn path=/trunk/; revision=65181
This commit is contained in:
Timo Kreuzer 2014-11-02 11:30:14 +00:00
parent 1087501706
commit a841fadcaa
41 changed files with 314 additions and 298 deletions

View file

@ -3106,7 +3106,10 @@ cleanup:
if(ProcessInfo.hThread)
CloseHandle(ProcessInfo.hThread);
DPRINT1("Success? %d\n", DeviceInstalled);
if (!DeviceInstalled)
{
DPRINT1("InstallDevice failed for DeviceInstance '%ws'\n", DeviceInstance);
}
return DeviceInstalled;
}

View file

@ -47,7 +47,7 @@ DumpPartitionTable(
for (i = 0; i < DiskEntry->LayoutBuffer->PartitionCount; i++)
{
PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[i];
DbgPrint("%lu: %12I64u %12I64u %10lu %2lu %2x %c %c\n",
DPRINT("\n%lu: %12I64u %12I64u %10lu %2lu %2x %c %c\n",
i,
PartitionInfo->StartingOffset.QuadPart,
PartitionInfo->PartitionLength.QuadPart,
@ -638,7 +638,7 @@ ScanForUnpartitionedDiskSpace(
PPARTENTRY NewPartEntry;
PLIST_ENTRY Entry;
DPRINT1("ScanForUnpartitionedDiskSpace()\n");
DPRINT("ScanForUnpartitionedDiskSpace()\n");
if (IsListEmpty(&DiskEntry->PrimaryPartListHead))
{
@ -741,9 +741,9 @@ DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount;
NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) -
NewPartEntry->StartSector.QuadPart;
DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart);
DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1);
DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart);
DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1);
DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
NewPartEntry->FormatState = Unformatted;
@ -819,9 +819,9 @@ DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount;
NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) -
NewPartEntry->StartSector.QuadPart;
DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart);
DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1);
DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart);
DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1);
DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
NewPartEntry->FormatState = Unformatted;
@ -859,9 +859,9 @@ DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
NewPartEntry->StartSector.QuadPart = LastStartSector + LastSectorCount;
NewPartEntry->SectorCount.QuadPart = Align(NewPartEntry->StartSector.QuadPart + LastUnusedSectorCount, DiskEntry->SectorAlignment) -
NewPartEntry->StartSector.QuadPart;
DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart);
DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1);
DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
DPRINT("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart);
DPRINT("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + NewPartEntry->SectorCount.QuadPart - 1);
DPRINT("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
NewPartEntry->FormatState = Unformatted;
@ -872,7 +872,7 @@ DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
}
}
DPRINT1("ScanForUnpartitionedDiskSpace() done\n");
DPRINT("ScanForUnpartitionedDiskSpace() done\n");
}
@ -1132,8 +1132,8 @@ AddDiskToList(
DiskEntry->SectorAlignment = DiskGeometry.SectorsPerTrack;
DPRINT1("SectorCount %I64u\n", DiskEntry->SectorCount);
DPRINT1("SectorAlignment %lu\n", DiskEntry->SectorAlignment);
DPRINT("SectorCount %I64u\n", DiskEntry->SectorCount);
DPRINT("SectorAlignment %lu\n", DiskEntry->SectorAlignment);
DiskEntry->DiskNumber = DiskNumber;
DiskEntry->Port = ScsiAddress.PortNumber;
@ -1180,7 +1180,7 @@ AddDiskToList(
{
if ((DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector) % DiskEntry->SectorsPerTrack == 0)
{
DPRINT1("Use %lu Sector alignment!\n", DiskEntry->SectorsPerTrack);
DPRINT("Use %lu Sector alignment!\n", DiskEntry->SectorsPerTrack);
}
else if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart % 1048756 == 0)
{

View file

@ -35,7 +35,7 @@ SetAccountDomain(LPCWSTR DomainName,
NTSTATUS Status;
DPRINT1("SYSSETUP: SetAccountDomain\n");
DPRINT("SYSSETUP: SetAccountDomain\n");
memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES));
ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES);

View file

@ -1194,7 +1194,7 @@ acpi_bus_add (
/* HACK: Skip HPET */
if (strstr(device->pnp.bus_id, "HPET"))
{
DPRINT1("Using HPET hack\n");
DPRINT("Using HPET hack\n");
result = -1;
goto end;
}
@ -1635,7 +1635,7 @@ acpi_bus_init (void)
int result = 0;
ACPI_STATUS status = AE_OK;
DPRINT1("acpi_bus_init\n");
DPRINT("acpi_bus_init\n");
KeInitializeDpc(&event_dpc, acpi_bus_generate_event_dpc, NULL);

View file

@ -270,23 +270,23 @@ ACPIDispatchDeviceControl(
*/
if (power_button)
{
DPRINT1("Fixed power button reported to power manager\n");
DPRINT("Fixed power button reported to power manager\n");
Caps |= SYS_BUTTON_POWER;
}
if (sleep_button)
{
DPRINT1("Fixed sleep button reported to power manager\n");
DPRINT("Fixed sleep button reported to power manager\n");
Caps |= SYS_BUTTON_SLEEP;
}
}
else if (wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"PNP0C0C"))
{
DPRINT1("Control method power button reported to power manager\n");
DPRINT("Control method power button reported to power manager\n");
Caps |= SYS_BUTTON_POWER;
}
else if (wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"PNP0C0E"))
{
DPRINT1("Control method sleep reported to power manager\n");
DPRINT("Control method sleep reported to power manager\n");
Caps |= SYS_BUTTON_SLEEP;
}
else

View file

@ -15,6 +15,12 @@
#define NDEBUG
#include <debug.h>
#if 0
#define DBGPRINT(...) DbgPrint(__VA_ARGS__)
#else
#define DBGPRINT(...)
#endif
/*** PRIVATE *****************************************************************/
static NTSTATUS
@ -1266,7 +1272,7 @@ PdoStartDevice(
if (RawPartialDesc->Type == CmResourceTypeInterrupt)
{
DPRINT1("Assigning IRQ %u to PCI device 0x%x on bus 0x%x\n",
DPRINT("Assigning IRQ %u to PCI device 0x%x on bus 0x%x\n",
RawPartialDesc->u.Interrupt.Vector,
DeviceExtension->PciDevice->SlotNumber.u.AsULONG,
DeviceExtension->PciDevice->BusNumber);
@ -1284,30 +1290,30 @@ PdoStartDevice(
Command = 0;
DPRINT1("Enabling command flags for PCI device 0x%x on bus 0x%x: ",
DBGPRINT("pci!PdoStartDevice: Enabling command flags for PCI device 0x%x on bus 0x%x: ",
DeviceExtension->PciDevice->SlotNumber.u.AsULONG,
DeviceExtension->PciDevice->BusNumber);
if (DeviceExtension->PciDevice->EnableBusMaster)
{
Command |= PCI_ENABLE_BUS_MASTER;
DbgPrint("[Bus master] ");
DBGPRINT("[Bus master] ");
}
if (DeviceExtension->PciDevice->EnableMemorySpace)
{
Command |= PCI_ENABLE_MEMORY_SPACE;
DbgPrint("[Memory space enable] ");
DBGPRINT("[Memory space enable] ");
}
if (DeviceExtension->PciDevice->EnableIoSpace)
{
Command |= PCI_ENABLE_IO_SPACE;
DbgPrint("[I/O space enable] ");
DBGPRINT("[I/O space enable] ");
}
if (Command != 0)
{
DbgPrint("\n");
DBGPRINT("\n");
/* OR with the previous value */
Command |= DeviceExtension->PciDevice->PciConfig.Command;

View file

@ -41,7 +41,7 @@ VfatCloseFile(
if (pFcb->Flags & FCB_IS_VOLUME)
{
DPRINT1("Volume\n");
DPRINT("Volume\n");
FileObject->FsContext2 = NULL;
}
else

View file

@ -482,7 +482,7 @@ VfatCreateFile(
if (FileObject->FileName.Length == 0 &&
(FileObject->RelatedFileObject == NULL || FileObject->RelatedFileObject->FsContext2 != NULL))
{
DPRINT1("Volume opening\n");
DPRINT("Volume opening\n");
if (RequestedDisposition != FILE_OPEN &&
RequestedDisposition != FILE_OPEN_IF)

View file

@ -612,7 +612,7 @@ VfatMount(
FsRtlNotifyInitializeSync(&DeviceExt->NotifySync);
InitializeListHead(&DeviceExt->NotifyList);
DPRINT1("Mount success\n");
DPRINT("Mount success\n");
Status = STATUS_SUCCESS;
@ -866,7 +866,7 @@ VfatLockOrUnlockVolume(
PFILE_OBJECT FileObject;
PDEVICE_EXTENSION DeviceExt;
DPRINT1("VfatLockOrUnlockVolume(%p, %d)\n", IrpContext, Lock);
DPRINT("VfatLockOrUnlockVolume(%p, %d)\n", IrpContext, Lock);
DeviceExt = IrpContext->DeviceExt;
FileObject = IrpContext->FileObject;
@ -912,7 +912,7 @@ VfatDismountVolume(
PLIST_ENTRY NextEntry;
PVFATFCB Fcb;
DPRINT1("VfatDismountVolume(%p)\n", IrpContext);
DPRINT("VfatDismountVolume(%p)\n", IrpContext);
DeviceExt = IrpContext->DeviceExt;

View file

@ -2624,7 +2624,7 @@ NdisMRegisterMiniport(
return NDIS_STATUS_BAD_VERSION;
}
NDIS_DbgPrint(MIN_TRACE, ("Initializing an NDIS %u.%u miniport\n",
NDIS_DbgPrint(MID_TRACE, ("Initializing an NDIS %u.%u miniport\n",
MiniportCharacteristics->MajorNdisVersion,
MiniportCharacteristics->MinorNdisVersion));
@ -2845,7 +2845,7 @@ NdisMSetAttributesEx(
if (AttributeFlags & NDIS_ATTRIBUTE_INTERMEDIATE_DRIVER)
NDIS_DbgPrint(MIN_TRACE, ("Intermediate drivers not supported yet.\n"));
NDIS_DbgPrint(MIN_TRACE, ("Miniport attribute flags: 0x%x\n", AttributeFlags));
NDIS_DbgPrint(MID_TRACE, ("Miniport attribute flags: 0x%x\n", AttributeFlags));
if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.AdapterShutdownHandler)
{

View file

@ -978,14 +978,14 @@ ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PPROTOCOL_BINDING Protoc
if (!NT_SUCCESS(NtStatus))
{
NDIS_DbgPrint(MIN_TRACE, ("Performing global bind for protocol '%wZ'\n", &ProtocolCharacteristics->Name));
NDIS_DbgPrint(MID_TRACE, ("Performing global bind for protocol '%wZ'\n", &ProtocolCharacteristics->Name));
KeyInformation = NULL;
CurrentEntry = AdapterListHead.Flink;
}
else
{
NDIS_DbgPrint(MIN_TRACE, ("Performing standard bind for protocol '%wZ'\n", &ProtocolCharacteristics->Name));
NDIS_DbgPrint(MID_TRACE, ("Performing standard bind for protocol '%wZ'\n", &ProtocolCharacteristics->Name));
DataPtr = (WCHAR*)KeyInformation->Data;
}
@ -1074,10 +1074,10 @@ ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PPROTOCOL_BINDING Protoc
if(BindHandler)
{
BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0);
NDIS_DbgPrint(MIN_TRACE, ("%wZ's BindAdapter handler returned 0x%x for %wZ\n", &ProtocolCharacteristics->Name, *Status, &DeviceName));
NDIS_DbgPrint(MID_TRACE, ("%wZ's BindAdapter handler returned 0x%x for %wZ\n", &ProtocolCharacteristics->Name, *Status, &DeviceName));
}
else
NDIS_DbgPrint(MIN_TRACE, ("No protocol bind handler specified\n"));
NDIS_DbgPrint(MID_TRACE, ("No protocol bind handler specified\n"));
}
next:

View file

@ -1638,13 +1638,13 @@ USBHUB_FdoStartDevice(
sizeof(USB_DEVICE_INFORMATION_0),
&Result);
DPRINT1("Status %x, Result 0x%08lx\n", Status, Result);
DPRINT1("InformationLevel %x\n", HubDeviceExtension->DeviceInformation.InformationLevel);
DPRINT1("ActualLength %x\n", HubDeviceExtension->DeviceInformation.ActualLength);
DPRINT1("PortNumber %x\n", HubDeviceExtension->DeviceInformation.PortNumber);
DPRINT1("DeviceDescriptor %x\n", HubDeviceExtension->DeviceInformation.DeviceDescriptor);
DPRINT1("HubAddress %x\n", HubDeviceExtension->DeviceInformation.HubAddress);
DPRINT1("NumberofPipes %x\n", HubDeviceExtension->DeviceInformation.NumberOfOpenPipes);
DPRINT("Status %x, Result 0x%08lx\n", Status, Result);
DPRINT("InformationLevel %x\n", HubDeviceExtension->DeviceInformation.InformationLevel);
DPRINT("ActualLength %x\n", HubDeviceExtension->DeviceInformation.ActualLength);
DPRINT("PortNumber %x\n", HubDeviceExtension->DeviceInformation.PortNumber);
DPRINT("DeviceDescriptor %x\n", HubDeviceExtension->DeviceInformation.DeviceDescriptor);
DPRINT("HubAddress %x\n", HubDeviceExtension->DeviceInformation.HubAddress);
DPRINT("NumberofPipes %x\n", HubDeviceExtension->DeviceInformation.NumberOfOpenPipes);
// Get Root Hubs Device Descriptor
UsbBuildGetDescriptorRequest(Urb,
@ -1737,7 +1737,7 @@ USBHUB_FdoStartDevice(
return STATUS_UNSUCCESSFUL;
}
DPRINT1("HubDeviceExtension->UsbExtHubInfo.NumberOfPorts %x\n", HubDeviceExtension->UsbExtHubInfo.NumberOfPorts);
DPRINT("HubDeviceExtension->UsbExtHubInfo.NumberOfPorts %x\n", HubDeviceExtension->UsbExtHubInfo.NumberOfPorts);
// Build hub descriptor request
UsbBuildVendorRequest(Urb,

View file

@ -380,7 +380,7 @@ CUSBHardwareDevice::PnpStart(
//
// Start the controller
//
DPRINT1("Starting Controller\n");
DPRINT("Starting Controller\n");
Status = StartController();
//
@ -523,7 +523,7 @@ CUSBHardwareDevice::StartController(void)
//
Control = (READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_CONTROL_OFFSET)) & OHCI_HC_FUNCTIONAL_STATE_MASK);
DPRINT1("Controller State %x\n", Control);
DPRINT("Controller State %x\n", Control);
switch (Control)
{
@ -555,7 +555,7 @@ retry:
// delay is 100 ms
//
Timeout.QuadPart = WaitInMs;
DPRINT1("Waiting %lu milliseconds for controller to transition state\n", Timeout.LowPart);
DPRINT("Waiting %lu milliseconds for controller to transition state\n", Timeout.LowPart);
//
// convert to 100 ns units (absolute)
@ -617,9 +617,9 @@ retry:
FrameInterval = ((FrameInterval & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE);
DPRINT1("FrameInterval %x IntervalValue %x\n", FrameInterval, m_IntervalValue);
DPRINT("FrameInterval %x IntervalValue %x\n", FrameInterval, m_IntervalValue);
FrameInterval |= OHCI_FSMPS(m_IntervalValue) | m_IntervalValue;
DPRINT1("Computed FrameInterval %x\n", FrameInterval);
DPRINT("Computed FrameInterval %x\n", FrameInterval);
//
// write frame interval
@ -627,17 +627,17 @@ retry:
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET), FrameInterval);
FrameInterval = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET));
DPRINT1("Read FrameInterval %x\n", FrameInterval);
DPRINT("Read FrameInterval %x\n", FrameInterval);
//
// 90 % periodic
//
Periodic = OHCI_PERIODIC(m_IntervalValue);
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET), Periodic);
DPRINT1("Computed Periodic Start %x\n", Periodic);
DPRINT("Computed Periodic Start %x\n", Periodic);
Periodic = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_PERIODIC_START_OFFSET));
DPRINT1("Read Periodic Start %x\n", Periodic);
DPRINT("Read Periodic Start %x\n", Periodic);
// Linux does this hack for some bad controllers
if (!(FrameInterval & 0x3FFF0000) ||
@ -680,7 +680,7 @@ retry:
m_NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor);
} while (m_NumberOfPorts == 0);
DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts);
DPRINT("NumberOfPorts %lu\n", m_NumberOfPorts);
ASSERT(m_NumberOfPorts < OHCI_MAX_PORT_COUNT);
//
@ -701,7 +701,7 @@ retry:
//
// write the configuration back
//
DPRINT1("Descriptor A: %x\n", Descriptor);
DPRINT("Descriptor A: %x\n", Descriptor);
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor);
//
@ -720,7 +720,7 @@ retry:
//
// write the configuration back
//
DPRINT1("Descriptor B: %x\n", Descriptor);
DPRINT("Descriptor B: %x\n", Descriptor);
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_B_OFFSET), Descriptor);
//
@ -730,7 +730,7 @@ retry:
KeStallExecutionProcessor(10);
Control = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_HCCA_OFFSET));
ASSERT((m_HCCAPhysicalAddress.LowPart & Control) == m_HCCAPhysicalAddress.LowPart);
DPRINT1("HCCA: %x Alignment mask: %x\n", m_HCCAPhysicalAddress.LowPart, Control);
DPRINT("HCCA: %x Alignment mask: %x\n", m_HCCAPhysicalAddress.LowPart, Control);
//
// write address of HCCA
@ -770,12 +770,12 @@ retry:
//
ASSERT((Control & OHCI_HC_FUNCTIONAL_STATE_MASK) == OHCI_HC_FUNCTIONAL_STATE_OPERATIONAL);
ASSERT((Control & OHCI_ENABLE_LIST) == OHCI_ENABLE_LIST);
DPRINT1("Control %x\n", Control);
DPRINT("Control %x\n", Control);
//
// done
//
DPRINT1("OHCI controller is operational\n");
DPRINT("OHCI controller is operational\n");
return STATUS_SUCCESS;
}
@ -1152,7 +1152,7 @@ CUSBHardwareDevice::ClearPortStatus(
//
// re-enable root hub change
//
DPRINT1("Enabling status change\n");
DPRINT("Enabling status change\n");
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE);
return STATUS_SUCCESS;
@ -1206,7 +1206,7 @@ CUSBHardwareDevice::SetPortFeature(
// delay is multiplied by 2 ms
//
Timeout.QuadPart *= 2;
DPRINT1("Waiting %lu milliseconds for port power up\n", Timeout.LowPart);
DPRINT("Waiting %lu milliseconds for port power up\n", Timeout.LowPart);
//
// convert to 100 ns units (absolute)

View file

@ -822,7 +822,7 @@ NTAPI
HalpDispatchPower(IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
DPRINT1("HAL: PnP Driver Power!\n");
DPRINT("HAL: PnP Driver Power!\n");
return STATUS_SUCCESS;
}

View file

@ -713,14 +713,14 @@ HalpDispatchPnp(IN PDEVICE_OBJECT DeviceObject,
case IRP_MN_START_DEVICE:
/* We only care about a PCI PDO */
DPRINT1("Start device received\n");
DPRINT("Start device received\n");
/* Complete the IRP normally */
break;
case IRP_MN_REMOVE_DEVICE:
/* Check if this is a PCI device */
DPRINT1("Remove device received\n");
DPRINT("Remove device received\n");
/* We're done */
Status = STATUS_SUCCESS;
@ -729,7 +729,7 @@ HalpDispatchPnp(IN PDEVICE_OBJECT DeviceObject,
case IRP_MN_SURPRISE_REMOVAL:
/* Inherit whatever status we had */
DPRINT1("Surprise removal IRP\n");
DPRINT("Surprise removal IRP\n");
Status = Irp->IoStatus.Status;
break;
@ -790,7 +790,7 @@ HalpDispatchPnp(IN PDEVICE_OBJECT DeviceObject,
default:
/* We don't handle anything else, so inherit the old state */
DPRINT("Illegal IRP: %lx\n", Minor);
DPRINT1("Illegal IRP: %lx\n", Minor);
Status = Irp->IoStatus.Status;
break;
}

View file

@ -22,8 +22,12 @@ HvpWriteLog(
ULONG LastIndex;
PVOID BlockPtr;
BOOLEAN Success;
static ULONG PrintCount = 0;
if (PrintCount++ == 0)
{
UNIMPLEMENTED;
}
return TRUE;
ASSERT(RegistryHive->ReadOnly == FALSE);

View file

@ -312,7 +312,7 @@ CHubController::QueryStatusChangeEndpoint(
// Get the number of ports and check each one for device connected
//
m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL);
DPRINT1("[%s] SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", m_USBType, Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL);
DPRINT("[%s] SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n", m_USBType, Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength, Urb->UrbBulkOrInterruptTransfer.TransferFlags, Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL);
TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer;
@ -323,7 +323,7 @@ CHubController::QueryStatusChangeEndpoint(
{
m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange);
DPRINT1("[%s] Port %d: Status %x, Change %x\n", m_USBType, PortId, PortStatus, PortChange);
DPRINT("[%s] Port %d: Status %x, Change %x\n", m_USBType, PortId, PortStatus, PortChange);
//
@ -3935,7 +3935,7 @@ CHubController::CreatePDO(
}
}
DPRINT1("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName);
DPRINT("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName);
//
// fixup device stack voodoo part #1

View file

@ -30,7 +30,7 @@ USBLIB_AddDevice(
NTSTATUS Status;
PHCDCONTROLLER HcdController;
DPRINT1("USBLIB_AddDevice\n");
DPRINT("USBLIB_AddDevice\n");
/* first create the controller object */
Status = CreateHCDController(&HcdController);

View file

@ -36,7 +36,7 @@ LsaDeregisterLogonProcess(HANDLE LsaHandle)
LSA_API_MSG ApiMessage;
NTSTATUS Status;
DPRINT1("LsaDeregisterLogonProcess()\n");
DPRINT("LsaDeregisterLogonProcess()\n");
ApiMessage.ApiNumber = LSASS_REQUEST_DEREGISTER_LOGON_PROCESS;
ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.DeregisterLogonProcess);
@ -60,7 +60,7 @@ LsaDeregisterLogonProcess(HANDLE LsaHandle)
NtClose(LsaHandle);
DPRINT1("LsaDeregisterLogonProcess() done (Status 0x%08lx)\n", Status);
DPRINT("LsaDeregisterLogonProcess() done (Status 0x%08lx)\n", Status);
return Status;
}
@ -79,7 +79,7 @@ LsaConnectUntrusted(PHANDLE LsaHandle)
ULONG ConnectInfoLength = sizeof(ConnectInfo);
NTSTATUS Status;
DPRINT1("LsaConnectUntrusted(%p)\n", LsaHandle);
DPRINT("LsaConnectUntrusted(%p)\n", LsaHandle);
RtlInitUnicodeString(&PortName,
L"\\LsaAuthenticationPort");
@ -311,7 +311,7 @@ LsaRegisterLogonProcess(PLSA_STRING LsaLogonProcessName,
ULONG ConnectInfoLength = sizeof(ConnectInfo);
NTSTATUS Status;
DPRINT1("LsaRegisterLogonProcess()\n");
DPRINT("LsaRegisterLogonProcess()\n");
/* Check the logon process name length */
if (LsaLogonProcessName->Length > LSASS_MAX_LOGON_PROCESS_NAME_LENGTH)

View file

@ -1956,7 +1956,7 @@ Phase1InitializationDiscard(IN PVOID Context)
InbvEnableDisplayString(TRUE);
/* Launch initial process */
DPRINT1("Free non-cache pages: %lx\n", MmAvailablePages + MiMemoryConsumers[MC_CACHE].PagesUsed);
DPRINT("Free non-cache pages: %lx\n", MmAvailablePages + MiMemoryConsumers[MC_CACHE].PagesUsed);
ProcessInfo = &InitBuffer->ProcessInfo;
ExpLoadInitialProcess(InitBuffer, &ProcessParameters, &Environment);
@ -1998,7 +1998,7 @@ Phase1InitializationDiscard(IN PVOID Context)
/* Free the boot buffer */
ExFreePoolWithTag(InitBuffer, TAG_INIT);
DPRINT1("Free non-cache pages: %lx\n", MmAvailablePages + MiMemoryConsumers[MC_CACHE].PagesUsed);
DPRINT("Free non-cache pages: %lx\n", MmAvailablePages + MiMemoryConsumers[MC_CACHE].PagesUsed);
}
VOID

View file

@ -10,6 +10,8 @@
/* INCLUDES *****************************************************************/
#include <ntoskrnl.h>
#define NDEBUG
#include <debug.h>
/* FUNCTIONS *****************************************************************/
@ -42,7 +44,7 @@ NtShutdownSystem(IN SHUTDOWN_ACTION Action)
}
/* Now call the power manager */
DPRINT1("Setting state to: %lx\n", PowerAction);
DPRINT("Setting state to: %lx\n", PowerAction);
return NtSetSystemPowerState(PowerAction,
PowerSystemSleeping3,
POWER_ACTION_OVERRIDE_APPS |

View file

@ -383,7 +383,7 @@ IopCreateArcNamesCd(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
/* Create symbolic link */
IoAssignArcName(&ArcNameStringW, &DeviceStringW);
RtlFreeUnicodeString(&ArcNameStringW);
DPRINT1("Boot device found\n");
DPRINT("Boot device found\n");
}
/* And quit, whatever happens */

View file

@ -390,7 +390,7 @@ IopInstallCriticalDevice(PDEVICE_NODE DeviceNode)
continue;
}
DPRINT1("Installed service '%S' for critical device '%wZ'\n", PartialInfo->Data, &ChildIdNameU);
DPRINT("Installed service '%S' for critical device '%wZ'\n", PartialInfo->Data, &ChildIdNameU);
}
else
{
@ -3212,7 +3212,7 @@ IopIsFirmwareMapperDisabled(VOID)
DPRINT1("ZwOpenKey(%wZ) failed with status 0x%08lx\n", &KeyPathU, Status);
}
DPRINT1("Firmware mapper is %s\n", KeyValue != 0 ? "disabled" : "enabled");
DPRINT("Firmware mapper is %s\n", KeyValue != 0 ? "disabled" : "enabled");
return (KeyValue != 0) ? TRUE : FALSE;
}

View file

@ -350,7 +350,7 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject,
IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL,
&DeviceNode->InstancePath);
DPRINT1("Reported device: %S (%wZ)\n", HardwareId, &DeviceNode->InstancePath);
DPRINT("Reported device: %S (%wZ)\n", HardwareId, &DeviceNode->InstancePath);
/* Return the PDO */
if (DeviceObject) *DeviceObject = Pdo;

View file

@ -132,11 +132,12 @@ IopFindPortResource(
}
else
{
DPRINT1("Satisfying port requirement with 0x%I64x (length: 0x%x)\n", Start, CmDesc->u.Port.Length);
DPRINT("Satisfying port requirement with 0x%I64x (length: 0x%x)\n", Start, CmDesc->u.Port.Length);
return TRUE;
}
}
DPRINT1("IopFindPortResource failed!\n");
return FALSE;
}

View file

@ -47,7 +47,7 @@ MmZeroPageThread(VOID)
/* Get the discardable sections to free them */
MiFindInitializationCode(&StartAddress, &EndAddress);
if (StartAddress) MiFreeInitializationCode(StartAddress, EndAddress);
DPRINT1("Free non-cache pages: %lx\n", MmAvailablePages + MiMemoryConsumers[MC_CACHE].PagesUsed);
DPRINT("Free non-cache pages: %lx\n", MmAvailablePages + MiMemoryConsumers[MC_CACHE].PagesUsed);
/* Set our priority to 0 */
Thread->BasePriority = 0;

View file

@ -191,7 +191,7 @@ PopShutdownSystem(IN POWER_ACTION SystemAction)
/* Note should notify caller of NtPowerInformation(PowerShutdownNotification) */
/* Unload symbols */
DPRINT1("It's the final countdown...%lx\n", SystemAction);
DPRINT("It's the final countdown...%lx\n", SystemAction);
DbgUnLoadImageSymbols(NULL, (PVOID)-1, 0);
/* Run the thread on the boot processor */
@ -264,15 +264,15 @@ PopGracefulShutdown(IN PVOID Context)
}
/* First, the HAL handles any "end of boot" special functionality */
DPRINT1("HAL shutting down\n");
DPRINT("HAL shutting down\n");
HalEndOfBoot();
/* In this step, the I/O manager does first-chance shutdown notification */
DPRINT1("I/O manager shutting down in phase 0\n");
DPRINT("I/O manager shutting down in phase 0\n");
IoShutdownSystem(0);
/* In this step, all workers are killed and hives are flushed */
DPRINT1("Configuration Manager shutting down\n");
DPRINT("Configuration Manager shutting down\n");
CmShutdownSystem();
/* Note that modified pages should be written here (MiShutdownSystem) */
@ -283,18 +283,18 @@ PopGracefulShutdown(IN PVOID Context)
#endif
/* In this step, the I/O manager does last-chance shutdown notification */
DPRINT1("I/O manager shutting down in phase 1\n");
DPRINT("I/O manager shutting down in phase 1\n");
IoShutdownSystem(1);
CcWaitForCurrentLazyWriterActivity();
/* Note that here, we should broadcast the power IRP to devices */
/* In this step, the HAL disables any wake timers */
DPRINT1("Disabling wake timers\n");
DPRINT("Disabling wake timers\n");
HalSetWakeEnable(FALSE);
/* And finally the power request is sent */
DPRINT1("Taking the system down\n");
DPRINT("Taking the system down\n");
PopShutdownSystem(PopAction.Action);
}

View file

@ -185,7 +185,7 @@ PopFlushVolumeWorker(IN PVOID Context)
if ((NT_SUCCESS(Status)) && (NameInfo->Name.Buffer))
{
/* Open the volume */
DPRINT1("Opening: %wZ\n", &NameInfo->Name);
DPRINT("Opening: %wZ\n", &NameInfo->Name);
InitializeObjectAttributes(&ObjectAttributes,
&NameInfo->Name,
OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
@ -205,7 +205,7 @@ PopFlushVolumeWorker(IN PVOID Context)
if (NT_SUCCESS(Status))
{
/* Flush it and close it */
DPRINT1("Sending flush to: %p\n", VolumeHandle);
DPRINT("Sending flush to: %p\n", VolumeHandle);
ZwFlushBuffersFile(VolumeHandle, &IoStatusBlock);
ZwClose(VolumeHandle);
}
@ -247,7 +247,7 @@ PopFlushVolumes(IN BOOLEAN ShuttingDown)
if ((FlushPolicy & 1))
{
/* Registry flush requested, so open it */
DPRINT1("Opening registry\n");
DPRINT("Opening registry\n");
InitializeObjectAttributes(&ObjectAttributes,
&RegistryName,
OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
@ -257,7 +257,7 @@ PopFlushVolumes(IN BOOLEAN ShuttingDown)
if (NT_SUCCESS(Status))
{
/* Flush the registry */
DPRINT1("Flushing registry\n");
DPRINT("Flushing registry\n");
ZwFlushKey(RegistryHandle);
ZwClose(RegistryHandle);
}
@ -327,7 +327,7 @@ PopFlushVolumes(IN BOOLEAN ShuttingDown)
{
/* Create a new one */
ThreadCount--;
DPRINT1("Creating flush thread\n");
DPRINT("Creating flush thread\n");
Status = PsCreateSystemThread(&ThreadHandle,
THREAD_ALL_ACCESS,
&ObjectAttributes,
@ -347,13 +347,13 @@ PopFlushVolumes(IN BOOLEAN ShuttingDown)
KeReleaseGuardedMutex(&PopVolumeLock);
/* Enter the flush work */
DPRINT1("Local flush\n");
DPRINT("Local flush\n");
PopFlushVolumeWorker(&FlushContext);
/* Wait for all flushes to be over */
DPRINT1("Waiting for flushes\n");
DPRINT("Waiting for flushes\n");
KeWaitForSingleObject(&FlushContext.Wait, Executive, KernelMode, FALSE, NULL);
DPRINT1("Flushes have completed\n");
DPRINT("Flushes have completed\n");
}
VOID

View file

@ -841,7 +841,7 @@ NtSetSystemPowerState(IN POWER_ACTION SystemAction,
if (SystemAction == PowerActionShutdown) PopReadShutdownPolicy();
/* Disable lazy flushing of registry */
DPRINT1("Stopping lazy flush\n");
DPRINT("Stopping lazy flush\n");
CmSetLazyFlushState(FALSE);
/* Setup the power action */
@ -849,11 +849,11 @@ NtSetSystemPowerState(IN POWER_ACTION SystemAction,
Action.Flags = Flags;
/* Notify callbacks */
DPRINT1("Notifying callbacks\n");
DPRINT("Notifying callbacks\n");
ExNotifyCallback(PowerStateCallback, (PVOID)3, NULL);
/* Swap in any worker thread stacks */
DPRINT1("Swapping worker threads\n");
DPRINT("Swapping worker threads\n");
ExSwapinWorkerThreads(FALSE);
/* Make our action global */
@ -893,14 +893,14 @@ NtSetSystemPowerState(IN POWER_ACTION SystemAction,
#endif
/* Flush all volumes and the registry */
DPRINT1("Flushing volumes, cache flushed %lu pages\n", Dummy);
DPRINT("Flushing volumes, cache flushed %lu pages\n", Dummy);
PopFlushVolumes(PopAction.Shutdown);
/* Set IRP for drivers */
PopAction.IrpMinor = IRP_MN_SET_POWER;
if (PopAction.Shutdown)
{
DPRINT1("Queueing shutdown thread\n");
DPRINT("Queueing shutdown thread\n");
/* Check if we are running in the system context */
if (PsGetCurrentProcess() != PsInitialSystemProcess)
{

View file

@ -576,7 +576,7 @@ CsrParseServerCommandLine(IN ULONG ArgumentCount,
ParameterValue = NULL;
ParameterValue = strchr(ParameterName, '=');
if (ParameterValue) *ParameterValue++ = ANSI_NULL;
DPRINT1("Name=%s, Value=%s\n", ParameterName, ParameterValue);
DPRINT("Name=%s, Value=%s\n", ParameterName, ParameterValue);
/* Check for Object Directory */
if (_stricmp(ParameterName, "ObjectDirectory") == 0)

View file

@ -633,7 +633,7 @@ IntCreateRegistryPath(
RtlAppendUnicodeToString(DeviceRegistryPath, Insert2);
}
DbgPrint("Formatted registry key '%wZ' -> '%wZ'\n",
DPRINT("Formatted registry key '%wZ' -> '%wZ'\n",
DriverRegistryPath, DeviceRegistryPath);
return STATUS_SUCCESS;

View file

@ -473,7 +473,7 @@ IntGetDesktopObjectHandle(PDESKTOP DesktopObject)
}
else
{
ERR("Got handle: %p\n", Ret);
TRACE("Got handle: %p\n", Ret);
}
return Ret;

View file

@ -75,7 +75,7 @@ InitDisplayDriver(
DEVMODEW dmDefault;
DWORD dwVga;
ERR("InitDisplayDriver(%S, %S);\n",
TRACE("InitDisplayDriver(%S, %S);\n",
pwszDeviceName, pwszRegKey);
/* Open the driver's registry key */

View file

@ -575,7 +575,7 @@ co_IntMouseActivateWindow(PWND Wnd)
}
return FALSE;
}
ERR("Mouse Active\n");
TRACE("Mouse Active\n");
co_IntSetForegroundAndFocusWindow(Wnd, TRUE);
return TRUE;
}

View file

@ -52,7 +52,7 @@ StartDebugHotKeys(VOID)
}
UserRegisterHotKey(PWND_BOTTOM, IDHK_SHIFTF12, MOD_SHIFT, vk);
UserRegisterHotKey(PWND_BOTTOM, IDHK_F12, 0, vk);
ERR("Start up the debugger hotkeys!! Should see this once!\n");
TRACE("Start up the debugger hotkeys!! If you see this you eneabled debugprints. Congrats!\n");
}
/*

View file

@ -197,7 +197,7 @@ UserInitKeyboard(HANDLE hKeyboardDevice)
{
ERR("NtDeviceIoControlFile() failed, ignored\n");
}
ERR("Keyboard type %d, subtype %d and number of func keys %d\n",
TRACE("Keyboard type %d, subtype %d and number of func keys %d\n",
gKeyboardInfo.KeyboardIdentifier.Type,
gKeyboardInfo.KeyboardIdentifier.Subtype,
gKeyboardInfo.NumberOfFunctionKeys);

View file

@ -2068,7 +2068,7 @@ MsqCleanupMessageQueue(PTHREADINFO pti)
IntGetSysCursorInfo()->CurrentCursorObject = NULL;
}
ERR("DereferenceObject pCursor\n");
TRACE("DereferenceObject pCursor\n");
UserDereferenceObject(pCursor);
}

View file

@ -164,7 +164,7 @@ NtUserInitialize(
{
NTSTATUS Status;
ERR("Enter NtUserInitialize(%lx, %p, %p)\n",
TRACE("Enter NtUserInitialize(%lx, %p, %p)\n",
dwWinVersion, hPowerRequestEvent, hMediaRequestEvent);
/* Check the Windows version */

View file

@ -250,7 +250,7 @@ ClientThreadSetup(VOID)
// CsrConnectToUser, we'll pretend we "did something" here. Then the rest will
// continue as normal.
//
UNIMPLEMENTED;
//UNIMPLEMENTED;
return TRUE;
}
@ -387,7 +387,7 @@ NTSTATUS
WINAPI
User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength)
{
ERR("ClientThreadSetup\n");
TRACE("ClientThreadSetup\n");
ClientThreadSetup();
return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS);
}

View file

@ -343,7 +343,7 @@ CreateWindowExA(DWORD dwExStyle,
if (!RegisterDefaultClasses)
{
ERR("CreateWindowExA RegisterSystemControls\n");
TRACE("CreateWindowExA RegisterSystemControls\n");
RegisterSystemControls();
}

View file

@ -711,7 +711,7 @@ OnActivate(PGUI_CONSOLE_DATA GuiData, WPARAM wParam)
{
WORD ActivationState = LOWORD(wParam);
DPRINT1("WM_ACTIVATE - ActivationState = %d\n");
DPRINT("WM_ACTIVATE - ActivationState = %d\n");
if ( ActivationState == WA_ACTIVE ||
ActivationState == WA_CLICKACTIVE )