Author: hbelusca
Date: Fri Jul 19 13:11:25 2013
New Revision: 59510
URL:
http://svn.reactos.org/svn/reactos?rev=59510&view=rev
Log:
Fix ASSERTMSG definition and usage (which is: ASSERTMSG(Message, expression) and not the
other way around, see
http://msdn.microsoft.com/en-us/library/windows/hardware/ff542113(v=vs.85).… ,
http://www.osronline.com/DDKx/ddtools/debugfns_41yr.htm and google...) (Part 3/4)
NOTE: Fixing builds ;)
Modified:
trunk/reactos/base/system/smss/smss.c
trunk/reactos/drivers/bus/pcix/arb/tr_irq.c
trunk/reactos/drivers/bus/pcix/enum.c
trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c
trunk/reactos/drivers/bus/pcix/intrface/busintrf.c
trunk/reactos/drivers/bus/pcix/intrface/cardbus.c
trunk/reactos/drivers/bus/pcix/intrface/devhere.c
trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c
trunk/reactos/drivers/bus/pcix/intrface/locintrf.c
trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c
trunk/reactos/drivers/bus/pcix/intrface/routintf.c
trunk/reactos/drivers/bus/pcix/utils.c
Modified: trunk/reactos/base/system/smss/smss.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.c?re…
==============================================================================
--- trunk/reactos/base/system/smss/smss.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/smss/smss.c [iso-8859-1] Fri Jul 19 13:11:25 2013
@@ -67,7 +67,7 @@
if (!NT_SUCCESS(Status))
{
/* This is a pretty bad failure. ASSERT on checked builds and exit */
- ASSERTMSG(NT_SUCCESS(Status), "RtlCreateProcessParameters");
+ ASSERTMSG("RtlCreateProcessParameters", NT_SUCCESS(Status));
DPRINT1("SMSS: RtlCreateProcessParameters failed for %wZ - Status ==
%lx\n",
FileName, Status);
return Status;
Modified: trunk/reactos/drivers/bus/pcix/arb/tr_irq.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/tr_ir…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/arb/tr_irq.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/arb/tr_irq.c [iso-8859-1] Fri Jul 19 13:11:25 2013
@@ -35,7 +35,7 @@
{
UNREFERENCED_PARAMETER(Instance);
/* PnP Interfaces don't get Initialized */
- ASSERTMSG(FALSE, "PCI tranirq_Initializer, unexpected call.");
+ ASSERTMSG("PCI tranirq_Initializer, unexpected call.", FALSE);
return STATUS_UNSUCCESSFUL;
}
Modified: trunk/reactos/drivers/bus/pcix/enum.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Fri Jul 19 13:11:25 2013
@@ -1127,7 +1127,7 @@
else
{
/* Logic error in the driver */
- ASSERTMSG(FALSE, "PCI Skip Function - Operation type unknown.");
+ ASSERTMSG("PCI Skip Function - Operation type unknown.", FALSE);
}
/* Check for legacy bridges during resource enumeration */
@@ -2171,7 +2171,7 @@
if (!PcipIsSameDevice(PdoExtension, &PciData))
{
/* Fail */
- ASSERTMSG(FALSE, "PCI Set resources - not same device");
+ ASSERTMSG("PCI Set resources - not same device", FALSE);
return STATUS_DEVICE_DOES_NOT_EXIST;
}
Modified: trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] Fri Jul 19 13:11:25
2013
@@ -35,7 +35,7 @@
{
UNREFERENCED_PARAMETER(Instance);
/* PnP Interfaces don't get Initialized */
- ASSERTMSG(FALSE, "PCI agpintrf_Initializer, unexpected call.");
+ ASSERTMSG("PCI agpintrf_Initializer, unexpected call.", FALSE);
return STATUS_UNSUCCESSFUL;
}
Modified: trunk/reactos/drivers/bus/pcix/intrface/busintrf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/intrface/busintrf.c [iso-8859-1] Fri Jul 19 13:11:25
2013
@@ -35,7 +35,7 @@
{
UNREFERENCED_PARAMETER(Instance);
/* PnP Interfaces don't get Initialized */
- ASSERTMSG(FALSE, "PCI busintrf_Initializer, unexpected call.");
+ ASSERTMSG("PCI busintrf_Initializer, unexpected call.", FALSE);
return STATUS_UNSUCCESSFUL;
}
Modified: trunk/reactos/drivers/bus/pcix/intrface/cardbus.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/intrface/cardbus.c [iso-8859-1] Fri Jul 19 13:11:25
2013
@@ -99,7 +99,7 @@
{
UNREFERENCED_PARAMETER(Instance);
/* PnP Interfaces don't get Initialized */
- ASSERTMSG(FALSE, "PCI pcicbintrf_Initializer, unexpected call.");
+ ASSERTMSG("PCI pcicbintrf_Initializer, unexpected call.", FALSE);
return STATUS_UNSUCCESSFUL;
}
Modified: trunk/reactos/drivers/bus/pcix/intrface/devhere.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/intrface/devhere.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/intrface/devhere.c [iso-8859-1] Fri Jul 19 13:11:25
2013
@@ -35,7 +35,7 @@
{
UNREFERENCED_PARAMETER(Instance);
/* PnP Interfaces don't get Initialized */
- ASSERTMSG(FALSE, "PCI devpresent_Initializer, unexpected call.");
+ ASSERTMSG("PCI devpresent_Initializer, unexpected call.", FALSE);
return STATUS_UNSUCCESSFUL;
}
Modified: trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/intrface/lddintrf.c [iso-8859-1] Fri Jul 19 13:11:25
2013
@@ -35,7 +35,7 @@
{
UNREFERENCED_PARAMETER(Instance);
/* PnP Interfaces don't get Initialized */
- ASSERTMSG(FALSE, "PCI lddintrf_Initializer, unexpected call.");
+ ASSERTMSG("PCI lddintrf_Initializer, unexpected call.", FALSE);
return STATUS_UNSUCCESSFUL;
}
Modified: trunk/reactos/drivers/bus/pcix/intrface/locintrf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/intrface/locintrf.c [iso-8859-1] Fri Jul 19 13:11:25
2013
@@ -35,7 +35,7 @@
{
UNREFERENCED_PARAMETER(Instance);
/* PnP Interfaces don't get Initialized */
- ASSERTMSG(FALSE, "PCI locintrf_Initializer, unexpected call.");
+ ASSERTMSG("PCI locintrf_Initializer, unexpected call.", FALSE);
return STATUS_UNSUCCESSFUL;
}
Modified: trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/intrface/pmeintf.c [iso-8859-1] Fri Jul 19 13:11:25
2013
@@ -35,7 +35,7 @@
{
UNREFERENCED_PARAMETER(Instance);
/* PnP Interfaces don't get Initialized */
- ASSERTMSG(FALSE, "PCI PciPmeInterfaceInitializer, unexpected call.");
+ ASSERTMSG("PCI PciPmeInterfaceInitializer, unexpected call.", FALSE);
return STATUS_UNSUCCESSFUL;
}
Modified: trunk/reactos/drivers/bus/pcix/intrface/routintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/intrface/routintf.c [iso-8859-1] Fri Jul 19 13:11:25
2013
@@ -37,7 +37,7 @@
{
UNREFERENCED_PARAMETER(Instance);
/* PnP Interfaces don't get Initialized */
- ASSERTMSG(FALSE, "PCI routeintrf_Initializer, unexpected call.");
+ ASSERTMSG("PCI routeintrf_Initializer, unexpected call.", FALSE);
return STATUS_UNSUCCESSFUL;
}
Modified: trunk/reactos/drivers/bus/pcix/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/utils.c?r…
==============================================================================
--- trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/pcix/utils.c [iso-8859-1] Fri Jul 19 13:11:25 2013
@@ -493,7 +493,7 @@
Status,
STATUS_BUFFER_TOO_SMALL);
*OutputBuffer = NULL;
- ASSERTMSG(FALSE, "PCI Successfully did the impossible!");
+ ASSERTMSG("PCI Successfully did the impossible!", FALSE);
break;
}