2 Nov
2014
2 Nov
'14
11:30 a.m.
Author: tkreuzer
Date: Sun Nov 2 11:30:14 2014
New Revision: 65181
URL: http://svn.reactos.org/svn/reactos?rev=65181&view=rev
Log:
[HAMMERTIMESTFU]
Silence "a few" DPRINTs
Modified:
trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
trunk/reactos/base/setup/usetup/partlist.c
trunk/reactos/dll/win32/syssetup/security.c
trunk/reactos/drivers/bus/acpi/busmgr/bus.c
trunk/reactos/drivers/bus/acpi/main.c
trunk/reactos/drivers/bus/pci/pdo.c
trunk/reactos/drivers/filesystems/fastfat/close.c
trunk/reactos/drivers/filesystems/fastfat/create.c
trunk/reactos/drivers/filesystems/fastfat/fsctl.c
trunk/reactos/drivers/network/ndis/ndis/miniport.c
trunk/reactos/drivers/network/ndis/ndis/protocol.c
trunk/reactos/drivers/usb/usbhub/fdo.c
trunk/reactos/drivers/usb/usbohci/hardware.cpp
trunk/reactos/hal/halx86/acpi/halpnpdd.c
trunk/reactos/hal/halx86/legacy/halpnpdd.c
trunk/reactos/lib/cmlib/hivewrt.c
trunk/reactos/lib/drivers/libusb/hub_controller.cpp
trunk/reactos/lib/drivers/libusb/libusb.cpp
trunk/reactos/lib/lsalib/lsa.c
trunk/reactos/ntoskrnl/ex/init.c
trunk/reactos/ntoskrnl/ex/shutdown.c
trunk/reactos/ntoskrnl/io/iomgr/arcname.c
trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c
trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c
trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c
trunk/reactos/ntoskrnl/po/poshtdwn.c
trunk/reactos/ntoskrnl/po/povolume.c
trunk/reactos/ntoskrnl/po/power.c
trunk/reactos/subsystems/win32/csrsrv/init.c
trunk/reactos/win32ss/drivers/videoprt/registry.c
trunk/reactos/win32ss/user/ntuser/desktop.c
trunk/reactos/win32ss/user/ntuser/display.c
trunk/reactos/win32ss/user/ntuser/focus.c
trunk/reactos/win32ss/user/ntuser/hotkey.c
trunk/reactos/win32ss/user/ntuser/keyboard.c
trunk/reactos/win32ss/user/ntuser/msgqueue.c
trunk/reactos/win32ss/user/ntuser/ntuser.c
trunk/reactos/win32ss/user/user32/misc/dllmain.c
trunk/reactos/win32ss/user/user32/windows/window.c
trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump…
==============================================================================
--- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -1683,7 +1683,7 @@
dwInstanceNumber++;
}
while (ret == CR_ALREADY_SUCH_DEVINST);
-
+
if (ret == CR_SUCCESS)
{
/* pszDeviceID is an out parameter too for generated IDs */
@@ -3106,7 +3106,10 @@
if(ProcessInfo.hThread)
CloseHandle(ProcessInfo.hThread);
- DPRINT1("Success? %d\n", DeviceInstalled);
+ if (!DeviceInstalled)
+ {
+ DPRINT1("InstallDevice failed for DeviceInstance '%ws'\n",
DeviceInstance);
+ }
return DeviceInstalled;
}
Modified: trunk/reactos/base/setup/usetup/partlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -47,7 +47,7 @@
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 @@
PPARTENTRY NewPartEntry;
PLIST_ENTRY Entry;
- DPRINT1("ScanForUnpartitionedDiskSpace()\n");
+ DPRINT("ScanForUnpartitionedDiskSpace()\n");
if (IsListEmpty(&DiskEntry->PrimaryPartListHead))
{
@@ -741,9 +741,9 @@
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 @@
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 @@
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("ScanForUnpartitionedDiskSpace() done\n");
+ DPRINT("ScanForUnpartitionedDiskSpace() done\n");
}
@@ -1132,8 +1132,8 @@
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;
@@ -1145,7 +1145,7 @@
InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry,
DiskNumber);
/*
- * Allocate a buffer for 26 logical drives (2 entries each == 52)
+ * Allocate a buffer for 26 logical drives (2 entries each == 52)
* plus the main partiton table (4 entries). Total 56 entries.
*/
LayoutBufferSize = sizeof(DRIVE_LAYOUT_INFORMATION) +
@@ -1180,7 +1180,7 @@
{
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)
{
Modified: trunk/reactos/dll/win32/syssetup/security.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -35,7 +35,7 @@
NTSTATUS Status;
- DPRINT1("SYSSETUP: SetAccountDomain\n");
+ DPRINT("SYSSETUP: SetAccountDomain\n");
memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES));
ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES);
Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -24,7 +24,7 @@
/*
* Modified for ReactOS and latest ACPICA
- * Copyright (C)2009 Samuel Serapion
+ * Copyright (C)2009 Samuel Serapion
*/
#include <precomp.h>
@@ -219,11 +219,11 @@
}
else {
/*
- * Get the device's power state either directly (via _PSC) or
+ * Get the device's power state either directly (via _PSC) or
* indirectly (via power resources).
*/
if (device->power.flags.explicit_get) {
- status = acpi_evaluate_integer(device->handle, "_PSC",
+ status = acpi_evaluate_integer(device->handle, "_PSC",
NULL, &psc);
if (ACPI_FAILURE(status))
return_VALUE(AE_NOT_FOUND);
@@ -305,7 +305,7 @@
* On transitions to a high-powered state we first apply power (via
* power resources) then evalute _PSx. Conversly for transitions to
* a lower-powered state.
- */
+ */
if (state < device->power.state) {
if (device->power.flags.power_resources) {
result = acpi_power_transition(device, state);
@@ -313,7 +313,7 @@
goto end;
}
if (device->power.states[state].flags.explicit_set) {
- status = AcpiEvaluateObject(device->handle,
+ status = AcpiEvaluateObject(device->handle,
object_name, NULL, NULL);
if (ACPI_FAILURE(status)) {
result = AE_NOT_FOUND;
@@ -323,7 +323,7 @@
}
else {
if (device->power.states[state].flags.explicit_set) {
- status = AcpiEvaluateObject(device->handle,
+ status = AcpiEvaluateObject(device->handle,
object_name, NULL, NULL);
if (ACPI_FAILURE(status)) {
result = AE_NOT_FOUND;
@@ -464,11 +464,11 @@
struct acpi_device *device = SystemArgument1;
ULONG_PTR TypeData = (ULONG_PTR)SystemArgument2;
KIRQL OldIrql;
-
+
event = ExAllocatePoolWithTag(NonPagedPool,sizeof(struct acpi_bus_event),
'IPCA');
if (!event)
return;
-
+
sprintf(event->device_class, "%s", device->pnp.device_class);
sprintf(event->bus_id, "%s", device->pnp.bus_id);
event->type = (TypeData & 0xFF000000) >> 24;
@@ -497,10 +497,10 @@
/* drop event on the floor if no one's listening */
if (!event_is_open)
return_VALUE(0);
-
+
/* Data shouldn't even get near 24 bits */
ASSERT(!(data & 0xFF000000));
-
+
TypeData = data;
TypeData |= type << 24;
@@ -573,9 +573,9 @@
*/
static int
acpi_bus_walk (
- struct acpi_device *start,
- acpi_bus_walk_callback callback,
- int direction,
+ struct acpi_device *start,
+ acpi_bus_walk_callback callback,
+ int direction,
void *data)
{
int result = 0;
@@ -707,7 +707,7 @@
* ---------------
* Callback for all 'system-level' device notifications (values 0x00-0x7F).
*/
-static void
+static void
acpi_bus_notify (
ACPI_HANDLE handle,
UINT32 type,
@@ -724,27 +724,27 @@
switch (type) {
case ACPI_NOTIFY_BUS_CHECK:
- DPRINT("Received BUS CHECK notification for device [%s]\n",
+ DPRINT("Received BUS CHECK notification for device [%s]\n",
device->pnp.bus_id);
acpi_bus_check_scope(handle);
- /*
+ /*
* TBD: We'll need to outsource certain events to non-ACPI
* drivers via the device manager (device.c).
*/
break;
case ACPI_NOTIFY_DEVICE_CHECK:
- DPRINT("Received DEVICE CHECK notification for device [%s]\n",
+ DPRINT("Received DEVICE CHECK notification for device [%s]\n",
device->pnp.bus_id);
acpi_bus_check_device(handle);
- /*
+ /*
* TBD: We'll need to outsource certain events to non-ACPI
* drivers via the device manager (device.c).
*/
break;
case ACPI_NOTIFY_DEVICE_WAKE:
- DPRINT("Received DEVICE WAKE notification for device [%s]\n",
+ DPRINT("Received DEVICE WAKE notification for device [%s]\n",
device->pnp.bus_id);
acpi_bus_check_device(handle);
/*
@@ -754,37 +754,37 @@
break;
case ACPI_NOTIFY_EJECT_REQUEST:
- DPRINT1("Received EJECT REQUEST notification for device [%s]\n",
+ DPRINT1("Received EJECT REQUEST notification for device [%s]\n",
device->pnp.bus_id);
/* TBD */
break;
case ACPI_NOTIFY_DEVICE_CHECK_LIGHT:
- DPRINT1("Received DEVICE CHECK LIGHT notification for device [%s]\n",
+ DPRINT1("Received DEVICE CHECK LIGHT notification for device [%s]\n",
device->pnp.bus_id);
/* TBD: Exactly what does 'light' mean? */
break;
case ACPI_NOTIFY_FREQUENCY_MISMATCH:
- DPRINT1("Received FREQUENCY MISMATCH notification for device [%s]\n",
+ DPRINT1("Received FREQUENCY MISMATCH notification for device [%s]\n",
device->pnp.bus_id);
/* TBD */
break;
case ACPI_NOTIFY_BUS_MODE_MISMATCH:
- DPRINT1("Received BUS MODE MISMATCH notification for device [%s]\n",
+ DPRINT1("Received BUS MODE MISMATCH notification for device [%s]\n",
device->pnp.bus_id);
/* TBD */
break;
case ACPI_NOTIFY_POWER_FAULT:
- DPRINT1("Received POWER FAULT notification for device [%s]\n",
+ DPRINT1("Received POWER FAULT notification for device [%s]\n",
device->pnp.bus_id);
/* TBD */
break;
default:
- DPRINT1("Received unknown/unsupported notification [%08x]\n",
+ DPRINT1("Received unknown/unsupported notification [%08x]\n",
type);
break;
}
@@ -810,7 +810,7 @@
/**
- * acpi_bus_match
+ * acpi_bus_match
* --------------
* Checks the device's hardware (_HID) or compatible (_CID) ids to see if it
* matches the specified driver's criteria.
@@ -840,20 +840,20 @@
error = -2;
Done:
-
+
return error;
}
/**
- * acpi_bus_driver_init
+ * acpi_bus_driver_init
* --------------------
- * Used to initialize a device via its device driver. Called whenever a
+ * Used to initialize a device via its device driver. Called whenever a
* driver is bound to a device. Invokes the driver's add() and start() ops.
*/
static int
acpi_bus_driver_init (
- struct acpi_device *device,
+ struct acpi_device *device,
struct acpi_driver *driver)
{
int result = 0;
@@ -896,15 +896,15 @@
/**
- * acpi_bus_attach
+ * acpi_bus_attach
* -------------
- * Callback for acpi_bus_walk() used to find devices that match a specific
+ * Callback for acpi_bus_walk() used to find devices that match a specific
* driver's criteria and then attach the driver.
*/
static int
acpi_bus_attach (
- struct acpi_device *device,
- int level,
+ struct acpi_device *device,
+ int level,
void *data)
{
int result = 0;
@@ -927,7 +927,7 @@
DPRINT("Found driver [%s] for device [%s]\n",
driver->name, device->pnp.bus_id);
-
+
result = acpi_bus_driver_init(device, driver);
if (result)
return_VALUE(result);
@@ -941,15 +941,15 @@
/**
- * acpi_bus_unattach
+ * acpi_bus_unattach
* -----------------
- * Callback for acpi_bus_walk() used to find devices that match a specific
+ * Callback for acpi_bus_walk() used to find devices that match a specific
* driver's criteria and unattach the driver.
*/
static int
acpi_bus_unattach (
- struct acpi_device *device,
- int level,
+ struct acpi_device *device,
+ int level,
void *data)
{
int result = 0;
@@ -980,7 +980,7 @@
/**
- * acpi_bus_find_driver
+ * acpi_bus_find_driver
* --------------------
* Parses the list of registered drivers looking for a driver applicable for
* the specified device.
@@ -1019,8 +1019,8 @@
/**
- * acpi_bus_register_driver
- * ------------------------
+ * acpi_bus_register_driver
+ * ------------------------
* Registers a driver with the ACPI bus. Searches the namespace for all
* devices that match the driver's criteria and binds.
*/
@@ -1038,7 +1038,7 @@
list_add_tail(&driver->node, &acpi_bus_drivers);
up(&acpi_bus_drivers_lock);
- acpi_bus_walk(acpi_root, acpi_bus_attach,
+ acpi_bus_walk(acpi_root, acpi_bus_attach,
WALK_DOWN, driver);
return_VALUE(driver->references);
@@ -1046,7 +1046,7 @@
/**
- * acpi_bus_unregister_driver
+ * acpi_bus_unregister_driver
* --------------------------
* Unregisters a driver with the ACPI bus. Searches the namespace for all
* devices that match the driver's criteria and unbinds.
@@ -1075,7 +1075,7 @@
Device Enumeration
-------------------------------------------------------------------------- */
-static int
+static int
acpi_bus_get_flags (
struct acpi_device *device)
{
@@ -1125,7 +1125,7 @@
}
-int
+int
acpi_bus_add (
struct acpi_device **child,
struct acpi_device *parent,
@@ -1180,7 +1180,7 @@
buffer.Pointer = bus_id;
AcpiGetName(handle, ACPI_SINGLE_NAME, &buffer);
-
+
/* Clean up trailing underscores (if any) */
for (i = 3; i > 1; i--) {
if (bus_id[i] == '_')
@@ -1194,7 +1194,7 @@
/* HACK: Skip HPET */
if (strstr(device->pnp.bus_id, "HPET"))
{
- DPRINT1("Using HPET hack\n");
+ DPRINT("Using HPET hack\n");
result = -1;
goto end;
}
@@ -1314,7 +1314,7 @@
break;
}
- /*
+ /*
* \_SB
* ----
* Fix for the system root bus device -- the only root-level device.
@@ -1411,7 +1411,7 @@
/*
* Bind _ADR-Based Devices
* -----------------------
- * If there's a a bus address (_ADR) then we utilize the parent's
+ * If there's a a bus address (_ADR) then we utilize the parent's
* 'bind' function (if exists) to bind the ACPI- and natively-
* enumerated device representations.
*/
@@ -1451,7 +1451,7 @@
static int
acpi_bus_remove (
- struct acpi_device *device,
+ struct acpi_device *device,
int type)
{
@@ -1490,7 +1490,7 @@
parent = start;
phandle = start->handle;
-
+
/*
* Parse through the ACPI namespace, identify all 'devices', and
* create a new 'struct acpi_device' for each.
@@ -1591,7 +1591,7 @@
* power button is present.
*/
if (AcpiGbl_FADT.Flags & ACPI_FADT_POWER_BUTTON)
- result = acpi_bus_add(&device, acpi_root,
+ result = acpi_bus_add(&device, acpi_root,
NULL, ACPI_BUS_TYPE_POWER_BUTTON);
else
{
@@ -1610,7 +1610,7 @@
* the we have a control method button just like above.
*/
if (AcpiGbl_FADT.Flags & ACPI_FADT_SLEEP_BUTTON)
- result = acpi_bus_add(&device, acpi_root,
+ result = acpi_bus_add(&device, acpi_root,
NULL, ACPI_BUS_TYPE_SLEEP_BUTTON);
else
{
@@ -1635,7 +1635,7 @@
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);
@@ -1682,7 +1682,7 @@
/*
* Create the root device in the bus's device tree
*/
- result = acpi_bus_add(&acpi_root, NULL, ACPI_ROOT_OBJECT,
+ result = acpi_bus_add(&acpi_root, NULL, ACPI_ROOT_OBJECT,
ACPI_BUS_TYPE_SYSTEM);
if (result)
goto error2;
Modified: trunk/reactos/drivers/bus/acpi/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re…
==============================================================================
--- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -270,23 +270,23 @@
*/
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
Modified: trunk/reactos/drivers/bus/pci/pdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=…
==============================================================================
--- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -14,6 +14,12 @@
#define NDEBUG
#include <debug.h>
+
+#if 0
+#define DBGPRINT(...) DbgPrint(__VA_ARGS__)
+#else
+#define DBGPRINT(...)
+#endif
/*** PRIVATE *****************************************************************/
@@ -1266,7 +1272,7 @@
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 @@
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;
Modified: trunk/reactos/drivers/filesystems/fastfat/close.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] Sun Nov 2 11:30:14
2014
@@ -41,7 +41,7 @@
if (pFcb->Flags & FCB_IS_VOLUME)
{
- DPRINT1("Volume\n");
+ DPRINT("Volume\n");
FileObject->FsContext2 = NULL;
}
else
Modified: trunk/reactos/drivers/filesystems/fastfat/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sun Nov 2 11:30:14
2014
@@ -482,7 +482,7 @@
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)
Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa…
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sun Nov 2 11:30:14
2014
@@ -612,7 +612,7 @@
FsRtlNotifyInitializeSync(&DeviceExt->NotifySync);
InitializeListHead(&DeviceExt->NotifyList);
- DPRINT1("Mount success\n");
+ DPRINT("Mount success\n");
Status = STATUS_SUCCESS;
@@ -866,7 +866,7 @@
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 @@
PLIST_ENTRY NextEntry;
PVFATFCB Fcb;
- DPRINT1("VfatDismountVolume(%p)\n", IrpContext);
+ DPRINT("VfatDismountVolume(%p)\n", IrpContext);
DeviceExt = IrpContext->DeviceExt;
Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sun Nov 2 11:30:14
2014
@@ -160,7 +160,7 @@
{
Busy = TRUE;
}
- else if (Type == NdisWorkItemResetRequested &&
+ else if (Type == NdisWorkItemResetRequested &&
Adapter->NdisMiniportBlock.ResetStatus == NDIS_STATUS_PENDING)
{
Busy = TRUE;
@@ -340,7 +340,7 @@
&NdisBufferVA,
&FirstBufferLength,
&TotalBufferLength);
-
+
HeaderSize = NDIS_GET_PACKET_HEADER_SIZE(PacketArray[i]);
LookAheadSize = TotalBufferLength - HeaderSize;
@@ -352,12 +352,12 @@
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
return;
}
-
+
CopyBufferChainToBuffer(LookAheadBuffer,
NdisBuffer,
HeaderSize,
LookAheadSize);
-
+
NDIS_DbgPrint(MID_TRACE, ("Indicating packet to protocol's
legacy Receive handler\n"));
(*AdapterBinding->ProtocolBinding->Chars.ReceiveHandler)(
AdapterBinding->NdisOpenBlock.ProtocolBindingContext,
@@ -367,7 +367,7 @@
LookAheadBuffer,
LookAheadSize,
TotalBufferLength - HeaderSize);
-
+
ExFreePool(LookAheadBuffer);
}
}
@@ -506,7 +506,7 @@
Adapter->NdisMiniportBlock.PendingRequest = NULL;
KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock);
KeLowerIrql(OldIrql);
-
+
MiniWorkItemComplete(Adapter, NdisWorkItemRequest);
}
@@ -558,7 +558,7 @@
Status);
KeLowerIrql(OldIrql);
-
+
MiniWorkItemComplete(Adapter, NdisWorkItemSend);
}
@@ -702,7 +702,7 @@
KeAcquireSpinLock(&AdapterListLock, &OldIrql);
{
CurrentEntry = AdapterListHead.Flink;
-
+
while (CurrentEntry != &AdapterListHead)
{
Adapter = CONTAINING_RECORD(CurrentEntry, LOGICAL_ADAPTER, ListEntry);
@@ -902,7 +902,7 @@
NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0);
NdisMIndicateStatusComplete(Adapter);
-
+
MiniWorkItemComplete(Adapter, NdisWorkItemResetRequested);
}
@@ -2608,11 +2608,11 @@
case 0x00:
MinSize = sizeof(NDIS50_MINIPORT_CHARACTERISTICS);
break;
-
+
case 0x01:
MinSize = sizeof(NDIS51_MINIPORT_CHARACTERISTICS);
break;
-
+
default:
NDIS_DbgPrint(MIN_TRACE, ("Bad 5.x minor characteristics
version.\n"));
return NDIS_STATUS_BAD_VERSION;
@@ -2624,7 +2624,7 @@
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 @@
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)
{
@@ -3141,7 +3141,7 @@
NDIS_DbgPrint(MIN_TRACE, ("IoCreateDevice failed (%x)\n", Status));
return Status;
}
-
+
Status = IoCreateSymbolicLink(SymbolicName, DeviceName);
if (!NT_SUCCESS(Status))
Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/…
==============================================================================
--- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sun Nov 2 11:30:14
2014
@@ -424,7 +424,7 @@
NdisStatus = NDIS_STATUS_PENDING;
}
}
-
+
if (NdisStatus != NDIS_STATUS_PENDING) {
MiniWorkItemComplete(Adapter, NdisWorkItemSend);
}
@@ -451,7 +451,7 @@
NdisStatus = NDIS_STATUS_PENDING;
}
}
-
+
if (NdisStatus != NDIS_STATUS_PENDING) {
MiniWorkItemComplete(Adapter, NdisWorkItemSend);
}
@@ -602,7 +602,7 @@
else
{
if(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_DESERIALIZE)
- {
+ {
for (i = 0; i < NumberOfPackets; i++)
{
NdisStatus =
(*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)(
@@ -978,14 +978,14 @@
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;
}
@@ -1028,7 +1028,7 @@
/* It wasn't in the global miniport list, so skip the bind entry */
goto next;
}
-
+
/* Make sure this device isn't already bound to this protocol */
if (LocateAdapterBindingByName(Protocol, &DeviceName))
{
@@ -1074,10 +1074,10 @@
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:
@@ -1190,7 +1190,7 @@
InitializeListHead(&Protocol->AdapterListHead);
- /* We must set this before the call to ndisBindMiniportsToProtocol because the
protocol's
+ /* We must set this before the call to ndisBindMiniportsToProtocol because the
protocol's
* BindAdapter handler might need it */
*NdisProtocolHandle = Protocol;
Modified: trunk/reactos/drivers/usb/usbhub/fdo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r…
==============================================================================
--- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -245,7 +245,7 @@
if (PortStatus.Change & USB_PORT_STATUS_CONNECT)
{
//
- // Clear Port Connect
+ // Clear Port Connect
//
Status = ClearPortFeature(RootHubDeviceObject, PortId, C_PORT_CONNECTION);
if (!NT_SUCCESS(Status))
@@ -794,7 +794,7 @@
return TRUE;
}
- if (DeviceDescriptor->bDeviceClass == 0xEF &&
+ if (DeviceDescriptor->bDeviceClass == 0xEF &&
DeviceDescriptor->bDeviceSubClass == 0x02 &&
DeviceDescriptor->bDeviceProtocol == 0x01)
{
@@ -888,7 +888,7 @@
if (DeviceDescriptor->bDeviceClass == 0)
{
- Index += swprintf(&Buffer[Index],
+ Index += swprintf(&Buffer[Index],
L"USB\\Class_%02x&SubClass_%02x&Prot_%02x",
InterfaceDescriptor->bInterfaceClass,
InterfaceDescriptor->bInterfaceSubClass, InterfaceDescriptor->bInterfaceProtocol) +
1;
Index += swprintf(&Buffer[Index],
@@ -900,7 +900,7 @@
}
else
{
- Index += swprintf(&Buffer[Index],
+ Index += swprintf(&Buffer[Index],
L"USB\\Class_%02x&SubClass_%02x&Prot_%02x",
DeviceDescriptor->bDeviceClass,
DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol) + 1;
Index += swprintf(&Buffer[Index],
@@ -964,7 +964,7 @@
// Construct HardwareIds
//
Index = 0;
- Index += swprintf(&Buffer[Index],
+ Index += swprintf(&Buffer[Index],
L"USB\\Vid_%04x&Pid_%04x&Rev_%04x",
UsbChildExtension->DeviceDesc.idVendor,
UsbChildExtension->DeviceDesc.idProduct, UsbChildExtension->DeviceDesc.bcdDevice) +
1;
Index += swprintf(&Buffer[Index],
@@ -1146,7 +1146,7 @@
RootHubDeviceObject = HubDeviceExtension->RootHubPhysicalDeviceObject;
HubInterfaceBusContext = HubDeviceExtension->UsbDInterface.BusContext;
//
- // Find an empty slot in the child device array
+ // Find an empty slot in the child device array
//
for (ChildDeviceCount = 0; ChildDeviceCount < USB_MAXCHILDREN;
ChildDeviceCount++)
{
@@ -1318,7 +1318,7 @@
}
// query device details
- Status = HubInterface->QueryDeviceInformation(HubInterfaceBusContext,
+ Status = HubInterface->QueryDeviceInformation(HubInterfaceBusContext,
UsbChildExtension->UsbDeviceHandle,
&UsbChildExtension->DeviceInformation,
sizeof(USB_DEVICE_INFORMATION_0),
@@ -1638,13 +1638,13 @@
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 @@
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,
@@ -2222,7 +2222,7 @@
}
else
{
- DPRINT1("UNIMPLEMENTED FdoHandleDeviceControl IoCtl %x InputBufferLength %x
OutputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode,
+ DPRINT1("UNIMPLEMENTED FdoHandleDeviceControl IoCtl %x InputBufferLength %x
OutputBufferLength %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode,
IoStack->Parameters.DeviceIoControl.InputBufferLength,
IoStack->Parameters.DeviceIoControl.OutputBufferLength);
}
Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa…
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -178,7 +178,7 @@
//
// store device objects
- //
+ //
m_DriverObject = DriverObject;
m_FunctionalDeviceObject = FunctionalDeviceObject;
m_PhysicalDeviceObject = PhysicalDeviceObject;
@@ -289,7 +289,7 @@
}
//
- // Get controllers capabilities
+ // Get controllers capabilities
//
Version = READ_REGISTER_ULONG((PULONG)((ULONG_PTR)ResourceBase +
OHCI_REVISION_OFFSET));
@@ -380,7 +380,7 @@
//
// Start the controller
//
- DPRINT1("Starting Controller\n");
+ DPRINT("Starting Controller\n");
Status = StartController();
//
@@ -503,7 +503,7 @@
//
break;
}
- }
+ }
//
// if the ownership is still not changed, perform reset
@@ -521,17 +521,17 @@
//
// read contents of control register
//
-
+
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)
{
case OHCI_HC_FUNCTIONAL_STATE_RESET:
NewControl |= OHCI_HC_FUNCTIONAL_STATE_RESET;
WaitInMs = 50;
break;
-
+
case OHCI_HC_FUNCTIONAL_STATE_SUSPEND:
case OHCI_HC_FUNCTIONAL_STATE_RESUME:
NewControl |= OHCI_HC_FUNCTIONAL_STATE_RESUME;
@@ -555,13 +555,13 @@
// 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)
//
Timeout.QuadPart *= -10000;
-
+
//
// perform the wait
//
@@ -617,9 +617,9 @@
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 @@
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 @@
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 @@
//
// 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 @@
//
// 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 @@
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 @@
//
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 @@
//
// 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 @@
// 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)
@@ -1322,9 +1322,9 @@
// the interrupt was not caused by DoneHead update
// check if something important happened
//
- DPRINT("InterruptStatus %x InterruptEnable %x\n",
READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)),
+ DPRINT("InterruptStatus %x InterruptEnable %x\n",
READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_STATUS_OFFSET)),
READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_INTERRUPT_ENABLE_OFFSET)));
- Status = READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base +
OHCI_INTERRUPT_STATUS_OFFSET)) & READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base
+ OHCI_INTERRUPT_ENABLE_OFFSET)) & (~OHCI_WRITEBACK_DONE_HEAD);
+ Status = READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base +
OHCI_INTERRUPT_STATUS_OFFSET)) & READ_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base
+ OHCI_INTERRUPT_ENABLE_OFFSET)) & (~OHCI_WRITEBACK_DONE_HEAD);
if (Status == 0)
{
//
@@ -1387,7 +1387,7 @@
WRITE_REGISTER_ULONG((PULONG)((PUCHAR)This->m_Base + OHCI_CONTROL_OFFSET),
OHCI_HC_FUNCTIONAL_STATE_RESET);
}
- if (Status & OHCI_ROOT_HUB_STATUS_CHANGE)
+ if (Status & OHCI_ROOT_HUB_STATUS_CHANGE)
{
//
// disable interrupt as it will fire untill the port has been reset
Modified: trunk/reactos/hal/halx86/acpi/halpnpdd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halpnpdd.c…
==============================================================================
--- trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -822,7 +822,7 @@
HalpDispatchPower(IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp)
{
- DPRINT1("HAL: PnP Driver Power!\n");
+ DPRINT("HAL: PnP Driver Power!\n");
return STATUS_SUCCESS;
}
Modified: trunk/reactos/hal/halx86/legacy/halpnpdd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/halpnpdd…
==============================================================================
--- trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -713,14 +713,14 @@
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 @@
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 @@
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;
}
Modified: trunk/reactos/lib/cmlib/hivewrt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivewrt.c?rev=65…
==============================================================================
--- trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/hivewrt.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -22,8 +22,12 @@
ULONG LastIndex;
PVOID BlockPtr;
BOOLEAN Success;
-
- UNIMPLEMENTED;
+ static ULONG PrintCount = 0;
+
+ if (PrintCount++ == 0)
+ {
+ UNIMPLEMENTED;
+ }
return TRUE;
ASSERT(RegistryHive->ReadOnly == FALSE);
Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sun Nov 2 11:30:14
2014
@@ -312,7 +312,7 @@
// 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 @@
{
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 @@
}
}
- DPRINT1("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName);
+ DPRINT("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName);
//
// fixup device stack voodoo part #1
Modified: trunk/reactos/lib/drivers/libusb/libusb.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/libusb.…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/libusb.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/libusb.cpp [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -30,7 +30,7 @@
NTSTATUS Status;
PHCDCONTROLLER HcdController;
- DPRINT1("USBLIB_AddDevice\n");
+ DPRINT("USBLIB_AddDevice\n");
/* first create the controller object */
Status = CreateHCDController(&HcdController);
@@ -67,7 +67,7 @@
NTSTATUS
NTAPI
USBLIB_Dispatch(
- PDEVICE_OBJECT DeviceObject,
+ PDEVICE_OBJECT DeviceObject,
PIRP Irp)
{
PCOMMON_DEVICE_EXTENSION DeviceExtension;
@@ -137,4 +137,4 @@
return Status;
}
-}
+}
Modified: trunk/reactos/lib/lsalib/lsa.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lsalib/lsa.c?rev=65181…
==============================================================================
--- trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] (original)
+++ trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -36,7 +36,7 @@
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 @@
NtClose(LsaHandle);
- DPRINT1("LsaDeregisterLogonProcess() done (Status 0x%08lx)\n", Status);
+ DPRINT("LsaDeregisterLogonProcess() done (Status 0x%08lx)\n", Status);
return Status;
}
@@ -79,7 +79,7 @@
ULONG ConnectInfoLength = sizeof(ConnectInfo);
NTSTATUS Status;
- DPRINT1("LsaConnectUntrusted(%p)\n", LsaHandle);
+ DPRINT("LsaConnectUntrusted(%p)\n", LsaHandle);
RtlInitUnicodeString(&PortName,
L"\\LsaAuthenticationPort");
@@ -311,7 +311,7 @@
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)
Modified: trunk/reactos/ntoskrnl/ex/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=651…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -668,52 +668,52 @@
DPRINT1("Executive: Event Pair initialization failed\n");
return FALSE;
}
-
+
/* Initialize mutants */
if (ExpInitializeMutantImplementation() == FALSE)
{
DPRINT1("Executive: Mutant initialization failed\n");
return FALSE;
}
-
+
/* Initialize callbacks */
if (ExpInitializeCallbacks() == FALSE)
{
DPRINT1("Executive: Callback initialization failed\n");
return FALSE;
}
-
+
/* Initialize semaphores */
if (ExpInitializeSemaphoreImplementation() == FALSE)
{
DPRINT1("Executive: Semaphore initialization failed\n");
return FALSE;
}
-
+
/* Initialize timers */
if (ExpInitializeTimerImplementation() == FALSE)
{
DPRINT1("Executive: Timer initialization failed\n");
return FALSE;
}
-
+
/* Initialize profiling */
if (ExpInitializeProfileImplementation() == FALSE)
{
DPRINT1("Executive: Profile initialization failed\n");
return FALSE;
}
-
+
/* Initialize UUIDs */
ExpInitUuids();
-
+
/* Initialize keyed events */
if (ExpInitializeKeyedEventImplementation() == FALSE)
{
DPRINT1("Executive: Keyed event initialization failed\n");
return FALSE;
}
-
+
/* Initialize Win32K */
if (ExpWin32kInit() == FALSE)
{
@@ -1956,7 +1956,7 @@
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 @@
/* 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
Modified: trunk/reactos/ntoskrnl/ex/shutdown.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -10,6 +10,8 @@
/* INCLUDES *****************************************************************/
#include <ntoskrnl.h>
+
+#define NDEBUG
#include <debug.h>
/* FUNCTIONS *****************************************************************/
@@ -22,7 +24,7 @@
NtShutdownSystem(IN SHUTDOWN_ACTION Action)
{
POWER_ACTION PowerAction;
-
+
/* Convert to power action */
if (Action == ShutdownNoReboot)
{
@@ -40,9 +42,9 @@
{
return STATUS_INVALID_PARAMETER;
}
-
+
/* 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 |
Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -383,7 +383,7 @@
/* Create symbolic link */
IoAssignArcName(&ArcNameStringW, &DeviceStringW);
RtlFreeUnicodeString(&ArcNameStringW);
- DPRINT1("Boot device found\n");
+ DPRINT("Boot device found\n");
}
/* And quit, whatever happens */
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] Sun Nov 2 11:30:14 2014
@@ -390,7 +390,7 @@
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 @@
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;
}
Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo…
==============================================================================
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -350,7 +350,7 @@
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;
Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.…
==============================================================================
--- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -132,11 +132,12 @@
}
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;
}
Modified: trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/zeropage.…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/ARM3/zeropage.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -47,7 +47,7 @@
/* 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;
Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/po/poshtdwn.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -191,7 +191,7 @@
/* 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 @@
}
/* 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 @@
#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);
}
Modified: trunk/reactos/ntoskrnl/po/povolume.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/povolume.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/po/povolume.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -20,7 +20,7 @@
LONG Count;
KEVENT Wait;
} POP_FLUSH_VOLUME, *PPOP_FLUSH_VOLUME;
-
+
ULONG PopFlushPolicy = 0;
KGUARDED_MUTEX PopVolumeLock;
@@ -56,7 +56,7 @@
/* Make sure only one caller can assign dope to a device */
KeAcquireSpinLock(&PopDopeGlobalLock, &OldIrql);
-
+
/* Make sure the device still has no dope */
if (!DeviceExtension->Dope)
{
@@ -67,7 +67,7 @@
/* Allow other dope transactions now */
KeReleaseSpinLock(&PopDopeGlobalLock, OldIrql);
-
+
/* Check if someone other than us already assigned the dope, so free ours */
if (Dope) ExFreePoolWithTag(Dope, 'Dope');
@@ -92,7 +92,7 @@
/* Add this volume into the list of power-manager volumes */
if (!Dope->Volume.Flink) InsertTailList(&PopVolumeDevices,
&Dope->Volume);
-
+
/* Allow flushes to go through */
KeReleaseGuardedMutex(&PopVolumeLock);
}
@@ -167,10 +167,10 @@
/* Grab the next (ie: current) entry and remove it */
NextEntry = FlushContext->List.Flink;
RemoveEntryList(NextEntry);
-
+
/* Add it back on the volume list */
InsertTailList(&PopVolumeDevices, NextEntry);
-
+
/* Done touching the volume list */
KeReleaseGuardedMutex(&PopVolumeLock);
@@ -185,7 +185,7 @@
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 @@
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);
}
@@ -232,7 +232,7 @@
OBJECT_ATTRIBUTES ObjectAttributes;
HANDLE RegistryHandle;
PLIST_ENTRY NextEntry;
- PDEVICE_OBJECT_POWER_EXTENSION Dope;
+ PDEVICE_OBJECT_POWER_EXTENSION Dope;
ULONG VolumeCount = 0;
NTSTATUS Status;
HANDLE ThreadHandle;
@@ -247,7 +247,7 @@
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 @@
if (NT_SUCCESS(Status))
{
/* Flush the registry */
- DPRINT1("Flushing registry\n");
+ DPRINT("Flushing registry\n");
ZwFlushKey(RegistryHandle);
ZwClose(RegistryHandle);
}
@@ -265,14 +265,14 @@
/* Serialize with other flushes */
KeAcquireGuardedMutex(&PopVolumeLock);
-
+
/* Scan the volume list */
NextEntry = PopVolumeDevices.Flink;
while (NextEntry != &PopVolumeDevices)
{
/* Get the dope from the link */
Dope = CONTAINING_RECORD(NextEntry, DEVICE_OBJECT_POWER_EXTENSION, Volume);
-
+
/* Grab the next entry now, since we'll be modifying the list */
NextEntry = NextEntry->Flink;
@@ -290,7 +290,7 @@
/* Remove it from the dope and add it to the flush context list */
RemoveEntryList(&Dope->Volume);
InsertTailList(&FlushContext.List, &Dope->Volume);
-
+
/* Next */
VolumeCount++;
}
@@ -321,13 +321,13 @@
/* We will ourselves become a flusher thread */
FlushContext.Count = 1;
ThreadCount--;
-
+
/* Look for any extra ones we might need */
while (ThreadCount > 0)
{
/* 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 @@
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
Modified: trunk/reactos/ntoskrnl/po/power.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=65…
==============================================================================
--- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -46,10 +46,10 @@
{
PIO_STACK_LOCATION Stack;
PREQUEST_POWER_ITEM RequestPowerItem;
-
+
Stack = IoGetNextIrpStackLocation(Irp);
RequestPowerItem = (PREQUEST_POWER_ITEM)Context;
-
+
RequestPowerItem->CompletionRoutine(DeviceObject,
Stack->MinorFunction,
RequestPowerItem->PowerState,
@@ -161,12 +161,12 @@
{
PPOWER_STATE_TRAVERSE_CONTEXT PowerStateContext = Context;
NTSTATUS Status;
-
+
DPRINT("PopQuerySystemPowerStateTraverse(%p, %p)\n", DeviceNode, Context);
-
+
if (DeviceNode == IopRootDeviceNode)
return STATUS_SUCCESS;
-
+
if (DeviceNode->Flags & DNF_LEGACY_DRIVER)
return STATUS_SUCCESS;
@@ -177,7 +177,7 @@
{
DPRINT1("Device '%wZ' failed IRP_MN_QUERY_POWER\n",
&DeviceNode->InstancePath);
}
-
+
#if 0
return Status;
#else
@@ -191,15 +191,15 @@
{
PPOWER_STATE_TRAVERSE_CONTEXT PowerStateContext = Context;
NTSTATUS Status;
-
+
DPRINT("PopSetSystemPowerStateTraverse(%p, %p)\n", DeviceNode, Context);
-
+
if (DeviceNode == IopRootDeviceNode)
return STATUS_SUCCESS;
-
+
if (DeviceNode->PhysicalDeviceObject == PowerStateContext->PowerDevice)
return STATUS_SUCCESS;
-
+
if (DeviceNode->Flags & DNF_LEGACY_DRIVER)
return STATUS_SUCCESS;
@@ -210,7 +210,7 @@
{
DPRINT1("Device '%wZ' failed IRP_MN_SET_POWER\n",
&DeviceNode->InstancePath);
}
-
+
#if 0
return Status;
#else
@@ -227,7 +227,7 @@
NTSTATUS Status;
DEVICETREE_TRAVERSE_CONTEXT Context;
POWER_STATE_TRAVERSE_CONTEXT PowerContext;
-
+
Status = IopGetSystemPowerDeviceObject(&DeviceObject);
if (!NT_SUCCESS(Status))
{
@@ -243,34 +243,34 @@
return STATUS_UNSUCCESSFUL;
}
}
-
+
/* Set up context */
PowerContext.PowerAction = PowerAction;
PowerContext.SystemPowerState = PowerState;
PowerContext.PowerDevice = Fdo;
-
+
/* Query for system power change */
IopInitDeviceTreeTraverseContext(&Context,
IopRootDeviceNode,
PopQuerySystemPowerStateTraverse,
&PowerContext);
-
+
Status = IopTraverseDeviceTree(&Context);
if (!NT_SUCCESS(Status))
{
DPRINT1("Query system power state failed; changing state anyway\n");
}
-
+
/* Set system power change */
IopInitDeviceTreeTraverseContext(&Context,
IopRootDeviceNode,
PopSetSystemPowerStateTraverse,
&PowerContext);
-
+
IopTraverseDeviceTree(&Context);
if (!PopAcpiPresent) return STATUS_NOT_IMPLEMENTED;
-
+
if (Fdo != NULL)
{
if (PowerAction != PowerActionShutdownReset)
@@ -303,7 +303,7 @@
PopAddRemoveSysCapsCallback,
NULL,
&NotificationEntry);
-
+
/* Register lid notification */
IoRegisterPlugPlayNotification(EventCategoryDeviceInterfaceChange,
PNPNOTIFY_DEVICE_INTERFACE_INCLUDE_EXISTING_INTERFACES,
@@ -336,11 +336,11 @@
PopAcpiPresent = KeLoaderBlock->Extension->AcpiTable != NULL ? TRUE :
FALSE;
}
-
+
/* Initialize volume support */
InitializeListHead(&PopVolumeDevices);
KeInitializeGuardedMutex(&PopVolumeLock);
-
+
/* Initialize support for dope */
KeInitializeSpinLock(&PopDopeGlobalLock);
@@ -522,19 +522,19 @@
PIO_STACK_LOCATION Stack;
PIRP Irp;
PREQUEST_POWER_ITEM RequestPowerItem;
-
+
if (MinorFunction != IRP_MN_QUERY_POWER
&& MinorFunction != IRP_MN_SET_POWER
&& MinorFunction != IRP_MN_WAIT_WAKE)
return STATUS_INVALID_PARAMETER_2;
-
+
RequestPowerItem = ExAllocatePool(NonPagedPool, sizeof(REQUEST_POWER_ITEM));
if (!RequestPowerItem)
return STATUS_INSUFFICIENT_RESOURCES;
-
+
/* Always call the top of the device stack */
TopDeviceObject = IoGetAttachedDeviceReference(DeviceObject);
-
+
Irp = IoBuildAsynchronousFsdRequest(IRP_MJ_POWER,
TopDeviceObject,
NULL,
@@ -547,12 +547,12 @@
ExFreePool(RequestPowerItem);
return STATUS_INSUFFICIENT_RESOURCES;
}
-
+
/* POWER IRPs are always initialized with a status code of
STATUS_NOT_IMPLEMENTED */
Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED;
Irp->IoStatus.Information = 0;
-
+
Stack = IoGetNextIrpStackLocation(Irp);
Stack->MinorFunction = MinorFunction;
if (MinorFunction == IRP_MN_WAIT_WAKE)
@@ -562,18 +562,18 @@
Stack->Parameters.Power.Type = DevicePowerState;
Stack->Parameters.Power.State = PowerState;
}
-
+
RequestPowerItem->CompletionRoutine = CompletionFunction;
RequestPowerItem->PowerState = PowerState;
RequestPowerItem->Context = Context;
RequestPowerItem->TopDeviceObject = TopDeviceObject;
-
+
if (pIrp != NULL)
*pIrp = Irp;
-
+
IoSetCompletionRoutine(Irp, PopRequestPowerIrpCompletion, RequestPowerItem, TRUE,
TRUE, TRUE);
PoCallDriver(TopDeviceObject, Irp);
-
+
/* Always return STATUS_PENDING. The completion routine
* will call CompletionFunction and complete the Irp.
*/
@@ -663,7 +663,7 @@
PowerInformationLevel,
InputBuffer, InputBufferLength,
OutputBuffer, OutputBufferLength);
-
+
switch (PowerInformationLevel)
{
case SystemBatteryState:
@@ -841,7 +841,7 @@
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,13 +849,13 @@
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 */
PopAction = Action;
@@ -884,7 +884,7 @@
/* Check if we're still in an invalid status */
if (!NT_SUCCESS(Status)) break;
-
+
#ifndef NEWCC
/* Flush dirty cache pages */
CcRosFlushDirtyPages(-1, &Dummy, FALSE); //HACK: We really should wait here!
@@ -893,14 +893,14 @@
#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)
{
@@ -910,7 +910,7 @@
NULL);
ExQueueWorkItem(&PopShutdownWorkItem, CriticalWorkQueue);
-
+
/* Spend us -- when we wake up, the system is good to go down */
KeSuspendThread(KeGetCurrentThread());
Status = STATUS_SYSTEM_SHUTDOWN;
@@ -923,7 +923,7 @@
PopGracefulShutdown(NULL);
}
}
-
+
/* You should not have made it this far */
ASSERTMSG("System is still up and running?!", FALSE);
break;
Modified: trunk/reactos/subsystems/win32/csrsrv/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/in…
==============================================================================
--- trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrsrv/init.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -576,7 +576,7 @@
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)
Modified: trunk/reactos/win32ss/drivers/videoprt/registry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/r…
==============================================================================
--- trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/drivers/videoprt/registry.c [iso-8859-1] Sun Nov 2 11:30:14
2014
@@ -633,8 +633,8 @@
RtlAppendUnicodeToString(DeviceRegistryPath, Insert2);
}
- DbgPrint("Formatted registry key '%wZ' -> '%wZ'\n",
- DriverRegistryPath, DeviceRegistryPath);
+ DPRINT("Formatted registry key '%wZ' -> '%wZ'\n",
+ DriverRegistryPath, DeviceRegistryPath);
return STATUS_SUCCESS;
}
Modified: trunk/reactos/win32ss/user/ntuser/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -473,7 +473,7 @@
}
else
{
- ERR("Got handle: %p\n", Ret);
+ TRACE("Got handle: %p\n", Ret);
}
return Ret;
Modified: trunk/reactos/win32ss/user/ntuser/display.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -75,8 +75,8 @@
DEVMODEW dmDefault;
DWORD dwVga;
- ERR("InitDisplayDriver(%S, %S);\n",
- pwszDeviceName, pwszRegKey);
+ TRACE("InitDisplayDriver(%S, %S);\n",
+ pwszDeviceName, pwszRegKey);
/* Open the driver's registry key */
Status = RegOpenKey(pwszRegKey, &hkey);
Modified: trunk/reactos/win32ss/user/ntuser/focus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/focus.…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/focus.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -575,7 +575,7 @@
}
return FALSE;
}
- ERR("Mouse Active\n");
+ TRACE("Mouse Active\n");
co_IntSetForegroundAndFocusWindow(Wnd, TRUE);
return TRUE;
}
@@ -763,7 +763,7 @@
}
/*
Yes your eye are not deceiving you~!
-
+
First part of wines Win.c test_SetActiveWindow:
flush_events( TRUE );
Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -52,7 +52,7 @@
}
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");
}
/*
@@ -248,8 +248,8 @@
if (pHotKey->pWnd == PWND_BOTTOM)
{
if (gpqForeground != NULL)
- {
- pWnd = gpqForeground->spwndFocus;
+ {
+ pWnd = gpqForeground->spwndFocus;
}
else
return FALSE;
@@ -354,7 +354,7 @@
pHotKey = pHotKey->pNext;
}
}
-
+
pHotKey = gphkFirst;
pLink = &gphkFirst;
while (pHotKey)
Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -197,7 +197,7 @@
{
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);
@@ -820,7 +820,7 @@
TRACE("HotKey Processed\n");
bPostMsg = FALSE;
}
-
+
wFixedVk = IntFixVk(wSimpleVk, bExt); /* LSHIFT + EXT = RSHIFT */
if (wSimpleVk == VK_SHIFT) /* shift can't be extended */
bExt = FALSE;
Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -2068,7 +2068,7 @@
IntGetSysCursorInfo()->CurrentCursorObject = NULL;
}
- ERR("DereferenceObject pCursor\n");
+ TRACE("DereferenceObject pCursor\n");
UserDereferenceObject(pCursor);
}
@@ -2200,7 +2200,7 @@
{
HWND Prev;
PUSER_MESSAGE_QUEUE MessageQueue;
-
+
MessageQueue = pti->MessageQueue;
switch(Type)
Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Sun Nov 2 11:30:14 2014
@@ -164,8 +164,8 @@
{
NTSTATUS Status;
- ERR("Enter NtUserInitialize(%lx, %p, %p)\n",
- dwWinVersion, hPowerRequestEvent, hMediaRequestEvent);
+ TRACE("Enter NtUserInitialize(%lx, %p, %p)\n",
+ dwWinVersion, hPowerRequestEvent, hMediaRequestEvent);
/* Check the Windows version */
if (dwWinVersion != 0)
Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d…
==============================================================================
--- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Sun Nov 2 11:30:14
2014
@@ -250,7 +250,7 @@
// CsrConnectToUser, we'll pretend we "did something" here. Then the
rest will
// continue as normal.
//
- UNIMPLEMENTED;
+ //UNIMPLEMENTED;
return TRUE;
}
@@ -258,7 +258,7 @@
Init(VOID)
{
USERCONNECT UserCon;
-
+
/* Set PEB data */
NtCurrentPeb()->KernelCallbackTable = apfnDispatch;
NtCurrentPeb()->PostProcessInitRoutine = NULL;
@@ -379,7 +379,7 @@
g_ulSharedDelta = UserCon.siClient.ulSharedDelta;
gpsi = SharedPtrToUser(UserCon.siClient.psi);
gHandleTable = SharedPtrToUser(UserCon.siClient.aheList);
- gHandleEntries = SharedPtrToUser(gHandleTable->handles);
+ gHandleEntries = SharedPtrToUser(gHandleTable->handles);
}
@@ -387,9 +387,9 @@
WINAPI
User32CallClientThreadSetupFromKernel(PVOID Arguments, ULONG ArgumentLength)
{
- ERR("ClientThreadSetup\n");
+ TRACE("ClientThreadSetup\n");
ClientThreadSetup();
- return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS);
+ return ZwCallbackReturn(NULL, 0, STATUS_SUCCESS);
}
NTSTATUS
@@ -403,7 +403,7 @@
Ret = TranslateCharsetInfo((DWORD *)pgci->Locale, &pgci->Cs, TCI_SRCLOCALE);
- return ZwCallbackReturn(Arguments, ArgumentLength, Ret ? STATUS_SUCCESS :
STATUS_UNSUCCESSFUL);
+ return ZwCallbackReturn(Arguments, ArgumentLength, Ret ? STATUS_SUCCESS :
STATUS_UNSUCCESSFUL);
}
NTSTATUS
Modified: trunk/reactos/win32ss/user/user32/windows/window.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/window.c [iso-8859-1] Sun Nov 2 11:30:14
2014
@@ -202,7 +202,7 @@
return (HWND)0;
}
}
-
+
/* Copy it to a LARGE_STRING */
lstrClassName.Buffer = ClassName.Buffer;
lstrClassName.Length = ClassName.Length;
@@ -219,7 +219,7 @@
NTSTATUS Status;
PSTR AnsiBuffer = WindowName.Buffer;
ULONG AnsiLength = WindowName.Length;
-
+
WindowName.Length = 0;
WindowName.MaximumLength = AnsiLength * sizeof(WCHAR);
WindowName.Buffer = RtlAllocateHeap(RtlGetProcessHeap(),
@@ -311,7 +311,7 @@
{
RtlFreeUnicodeString(&ClassName);
}
-
+
RtlFreeLargeString(&WindowName);
}
@@ -343,7 +343,7 @@
if (!RegisterDefaultClasses)
{
- ERR("CreateWindowExA RegisterSystemControls\n");
+ TRACE("CreateWindowExA RegisterSystemControls\n");
RegisterSystemControls();
}
@@ -488,7 +488,7 @@
WARN("WS_EX_MDICHILD, but parent %p is not MDIClient\n",
hWndParent);
return NULL;
}
-
+
/* lpParams of WM_[NC]CREATE is different for MDI children.
* MDICREATESTRUCT members have the originally passed values.
*/
@@ -680,7 +680,7 @@
if (!dwCount)
{
if (!dwThreadId)
- return FALSE;
+ return FALSE;
else
return TRUE;
}
@@ -692,7 +692,7 @@
/* FIXME I'm only getting NULLs from Thread Enumeration, and it's
* probably because I'm not doing it right in NtUserBuildHwndList.
* Once that's fixed, we shouldn't have to check for a NULL HWND
- * here
+ * here
* This is now fixed in revision 50205. (jt)
*/
if (!pHwnd[i]) /* don't enumerate a NULL HWND */
@@ -907,7 +907,7 @@
{
HWND Ret = NULL;
PWND Ancestor, Wnd;
-
+
Wnd = ValidateHwnd(hwnd);
if (!Wnd)
return NULL;
@@ -960,7 +960,7 @@
lpRect->bottom = GetSystemMetrics(SM_CYMINIMIZED);
return TRUE;
}
- if ( hWnd != GetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP )
+ if ( hWnd != GetDesktopWindow()) // Wnd->fnid != FNID_DESKTOP )
{
/* lpRect->left = lpRect->top = 0;
lpRect->right = Wnd->rcClient.right - Wnd->rcClient.left;
@@ -977,7 +977,7 @@
/* Do this until Init bug is fixed. This sets 640x480, see InitMetrics.
lpRect->right = GetSystemMetrics(SM_CXSCREEN);
lpRect->bottom = GetSystemMetrics(SM_CYSCREEN);
-*/ }
+*/ }
return TRUE;
}
@@ -1103,7 +1103,7 @@
if (Wnd->spwndPrev != NULL)
FoundWnd = DesktopPtrToUser(Wnd->spwndPrev);
break;
-
+
case GW_CHILD:
if (Wnd->spwndChild != NULL)
FoundWnd = DesktopPtrToUser(Wnd->spwndChild);
@@ -1370,7 +1370,7 @@
if (!pWnd) return Ret;
ti = pWnd->head.pti;
-
+
if (ti)
{
if (ti == GetW32ThreadInfo())
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…
==============================================================================
--- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1]
(original)
+++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Sun Nov
2 11:30:14 2014
@@ -261,7 +261,7 @@
if (hMenu != NULL)
{
mii.cbSize = sizeof(mii);
- mii.fMask = MIIM_STRING;
+ mii.fMask = MIIM_STRING;
mii.dwTypeData = szMenuStringBack;
mii.cch = sizeof(szMenuStringBack)/sizeof(WCHAR);
@@ -711,7 +711,7 @@
{
WORD ActivationState = LOWORD(wParam);
- DPRINT1("WM_ACTIVATE - ActivationState = %d\n");
+ DPRINT("WM_ACTIVATE - ActivationState = %d\n");
if ( ActivationState == WA_ACTIVE ||
ActivationState == WA_CLICKACTIVE )