[ros-diffs] [janderwald] 39824: - Disable ASSERTMSG macro to fix compilation - Fix definition of PCPROPERTY_REQUEST

[janderwald at svn.reactos.org]

Author: janderwald
Date: Sun Mar  1 16:10:33 2009
New Revision: 39824

URL: http://svn.reactos.org/svn/reactos?rev=39824&view=rev
Log:
- Disable ASSERTMSG macro to fix compilation
- Fix definition of PCPROPERTY_REQUEST

Modified:
    trunk/reactos/include/ddk/ntstrsafe.h
    trunk/reactos/include/ddk/portcls.h

Modified: trunk/reactos/include/ddk/ntstrsafe.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?rev=39824&r1=39823&r2=39824&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Sun Mar  1 16:10:33 2009
@@ -104,7 +104,7 @@
                          IN SIZE_T MaxLength,
                          IN DWORD Flags)
 {
-    ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0);
+    //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0);
     return RtlStringValidateDestA(*Destination,
                                   *DestinationLength,
                                   ReturnLength,
@@ -120,7 +120,7 @@
                         IN DWORD Flags)
 {
     NTSTATUS Status = STATUS_SUCCESS;
-    ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0);
+    //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0);
 
     if ((ReturnLength) && (*ReturnLength >= MaxLength))
     {
@@ -251,7 +251,7 @@
     SIZE_T CharLength = Length / sizeof(CHAR), Remaining, LocalNewLength = 0;
     PCHAR LocalDestinationEnd;
     va_list argList;
-    ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0);
+    //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0);
 
     Status = RtlStringExValidateDestA(&Destination,
                                       &CharLength,
@@ -330,7 +330,7 @@
     NTSTATUS Status;
     SIZE_T CharLength = Length / sizeof(CHAR), Copied = 0, Remaining;
     PCHAR LocalDestinationEnd;
-    ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0);
+    //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0);
 
     Status = RtlStringExValidateDestA(&Destination,
                                       &Length,
@@ -421,7 +421,7 @@
     SIZE_T CharLength = Length / sizeof(CHAR);
     SIZE_T DestinationLength, Remaining, Copied = 0;
     PCHAR LocalDestinationEnd;
-    ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0);
+    //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0);
 
     Status = RtlStringExValidateDestA(&Destination,
                                       &CharLength,

Modified: trunk/reactos/include/ddk/portcls.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=39824&r1=39823&r2=39824&view=diff
==============================================================================
--- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Sun Mar  1 16:10:33 2009
@@ -265,7 +265,7 @@
 PCPROPERTY_ITEM, *PPCPROPERTY_ITEM;
 
 
-typedef struct _PCPROPERTY_REQUEST
+struct _PCPROPERTY_REQUEST
 {
     PUNKNOWN                MajorTarget;
     PUNKNOWN                MinorTarget;
@@ -277,7 +277,7 @@
     ULONG                   ValueSize;
     PVOID                   Value;
     PIRP                    Irp;
-}PCPROPERTY_REQUEST, *PPCPROPERTY_REQUEST;
+};
 
 struct _PCEVENT_REQUEST;
 
@@ -1458,7 +1458,7 @@
         IN PUNKNOWN  OuterUnknown  OPTIONAL,
         IN POOL_TYPE  PoolType,
         IN ULONG  Pin,
-        IN BOOL  Capture,
+        IN BOOLEAN  Capture,
         IN PKSDATAFORMAT  DataFormat,
         OUT PDMACHANNEL  *DmaChannel,
         OUT PSERVICEGROUP  *ServiceGroup) PURE;