- Disable ASSERTMSG macro to fix compilation

- Fix definition of PCPROPERTY_REQUEST

svn path=/trunk/; revision=39824
This commit is contained in:
Johannes Anderwald 2009-03-01 13:10:33 +00:00
parent 36586bfb83
commit 35c0dcde31
2 changed files with 8 additions and 8 deletions

View file

@ -104,7 +104,7 @@ RtlStringExValidateDestA(IN OUT PCHAR *Destination,
IN SIZE_T MaxLength, IN SIZE_T MaxLength,
IN DWORD Flags) 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, return RtlStringValidateDestA(*Destination,
*DestinationLength, *DestinationLength,
ReturnLength, ReturnLength,
@ -120,7 +120,7 @@ RtlStringExValidateSrcA(IN OUT PCCHAR *Source OPTIONAL,
IN DWORD Flags) IN DWORD Flags)
{ {
NTSTATUS Status = STATUS_SUCCESS; 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)) if ((ReturnLength) && (*ReturnLength >= MaxLength))
{ {
@ -251,7 +251,7 @@ RtlStringCbPrintfExA(OUT PCHAR Destination,
SIZE_T CharLength = Length / sizeof(CHAR), Remaining, LocalNewLength = 0; SIZE_T CharLength = Length / sizeof(CHAR), Remaining, LocalNewLength = 0;
PCHAR LocalDestinationEnd; PCHAR LocalDestinationEnd;
va_list argList; 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, Status = RtlStringExValidateDestA(&Destination,
&CharLength, &CharLength,
@ -330,7 +330,7 @@ RtlStringCbCopyExA(OUT PCHAR Destination,
NTSTATUS Status; NTSTATUS Status;
SIZE_T CharLength = Length / sizeof(CHAR), Copied = 0, Remaining; SIZE_T CharLength = Length / sizeof(CHAR), Copied = 0, Remaining;
PCHAR LocalDestinationEnd; 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, Status = RtlStringExValidateDestA(&Destination,
&Length, &Length,
@ -421,7 +421,7 @@ RtlStringCbCatExA(IN OUT PCHAR Destination,
SIZE_T CharLength = Length / sizeof(CHAR); SIZE_T CharLength = Length / sizeof(CHAR);
SIZE_T DestinationLength, Remaining, Copied = 0; SIZE_T DestinationLength, Remaining, Copied = 0;
PCHAR LocalDestinationEnd; 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, Status = RtlStringExValidateDestA(&Destination,
&CharLength, &CharLength,

View file

@ -265,7 +265,7 @@ typedef struct
PCPROPERTY_ITEM, *PPCPROPERTY_ITEM; PCPROPERTY_ITEM, *PPCPROPERTY_ITEM;
typedef struct _PCPROPERTY_REQUEST struct _PCPROPERTY_REQUEST
{ {
PUNKNOWN MajorTarget; PUNKNOWN MajorTarget;
PUNKNOWN MinorTarget; PUNKNOWN MinorTarget;
@ -277,7 +277,7 @@ typedef struct _PCPROPERTY_REQUEST
ULONG ValueSize; ULONG ValueSize;
PVOID Value; PVOID Value;
PIRP Irp; PIRP Irp;
}PCPROPERTY_REQUEST, *PPCPROPERTY_REQUEST; };
struct _PCEVENT_REQUEST; struct _PCEVENT_REQUEST;
@ -1458,7 +1458,7 @@ DECLARE_INTERFACE_(IMiniportWaveCyclic, IMiniport)
IN PUNKNOWN OuterUnknown OPTIONAL, IN PUNKNOWN OuterUnknown OPTIONAL,
IN POOL_TYPE PoolType, IN POOL_TYPE PoolType,
IN ULONG Pin, IN ULONG Pin,
IN BOOL Capture, IN BOOLEAN Capture,
IN PKSDATAFORMAT DataFormat, IN PKSDATAFORMAT DataFormat,
OUT PDMACHANNEL *DmaChannel, OUT PDMACHANNEL *DmaChannel,
OUT PSERVICEGROUP *ServiceGroup) PURE; OUT PSERVICEGROUP *ServiceGroup) PURE;