- Disable ASSERTMSG macro to fix compilation

- Fix definition of PCPROPERTY_REQUEST

svn path=/trunk/; revision=39824

diff --git a/reactos/include/ddk/ntstrsafe.h b/reactos/include/ddk/ntstrsafe.h
index c231c8d..6886142 100644 (file)
--- a/reactos/include/ddk/ntstrsafe.h
+++ b/reactos/include/ddk/ntstrsafe.h
@@ -104,7 +104,7 @@ RtlStringExValidateDestA(IN OUT PCHAR *Destination,
                          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 @@ RtlStringExValidateSrcA(IN OUT PCCHAR *Source OPTIONAL,
                         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 @@ RtlStringCbPrintfExA(OUT PCHAR Destination,
     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 @@ RtlStringCbCopyExA(OUT PCHAR Destination,
     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 @@ RtlStringCbCatExA(IN OUT PCHAR Destination,
     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,

diff --git a/reactos/include/ddk/portcls.h b/reactos/include/ddk/portcls.h
index dcfdff0..5c78718 100644 (file)
--- a/reactos/include/ddk/portcls.h
+++ b/reactos/include/ddk/portcls.h
@@ -265,7 +265,7 @@ typedef struct
 PCPROPERTY_ITEM, *PPCPROPERTY_ITEM;
 
 
-typedef struct _PCPROPERTY_REQUEST
+struct _PCPROPERTY_REQUEST
 {
     PUNKNOWN                MajorTarget;
     PUNKNOWN                MinorTarget;
@@ -277,7 +277,7 @@ typedef struct _PCPROPERTY_REQUEST
     ULONG                   ValueSize;
     PVOID                   Value;
     PIRP                    Irp;
-}PCPROPERTY_REQUEST, *PPCPROPERTY_REQUEST;
+};
 
 struct _PCEVENT_REQUEST;
 
@@ -1458,7 +1458,7 @@ DECLARE_INTERFACE_(IMiniportWaveCyclic, IMiniport)
         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;