Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[janderwald] 41468: - Make ks.h and drmk.h msvc compatible
by janderwald＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: janderwald Date: Fri Jun 19 16:07:17 2009 New Revision: 41468 URL: http://svn.reactos.org/svn/reactos?rev=41468&view=rev Log: - Make ks.h and drmk.h msvc compatible Modified: trunk/reactos/include/ddk/drmk.h trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/ddk/drmk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/drmk.h?rev=414… ============================================================================== --- trunk/reactos/include/ddk/drmk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/drmk.h [iso-8859-1] Fri Jun 19 16:07:17 2009 @@ -35,40 +35,47 @@ { #endif -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmAddContentHandlers( IN ULONG ContentId, IN PVOID *paHandlers, IN ULONG NumHandlers); -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmCreateContentMixed( IN PULONG paContentId, IN ULONG cContentId, OUT PULONG pMixedContentId); -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmDestroyContent( IN ULONG ContentId); -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmForwardContentToDeviceObject( IN ULONG ContentId, IN PVOID Reserved, IN PCDRMFORWARD DrmForward); -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmForwardContentToFileObject( IN ULONG ContentId, IN PFILE_OBJECT FileObject); -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmForwardContentToInterface( IN ULONG ContentId, IN PUNKNOWN pUnknown, IN ULONG NumMethods); -NTAPI NTSTATUS +NTSTATUS +NTAPI DrmGetContentRights( IN ULONG ContentId, OUT PDRMRIGHTS DrmRights); Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4146… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Fri Jun 19 16:07:17 2009 @@ -249,8 +249,18 @@ typedef KSIDENTIFIER KSPIN_INTERFACE, *PKSPIN_INTERFACE; typedef KSIDENTIFIER KSPIN_MEDIUM, *PKSPIN_MEDIUM; -typedef union -{ +#if !defined( _MSC_VER ) +typedef struct { + ULONG FormatSize; + ULONG Flags; + ULONG SampleSize; + ULONG Reserved; + GUID MajorFormat; + GUID SubFormat; + GUID Specifier; +} KSDATAFORMAT, *PKSDATAFORMAT, KSDATARANGE, *PKSDATARANGE; +#else +typedef union { struct { ULONG FormatSize; ULONG Flags; @@ -262,9 +272,13 @@ }; LONGLONG Alignment; } KSDATAFORMAT, *PKSDATAFORMAT, KSDATARANGE, *PKSDATARANGE; - -typedef struct -{ +#endif + +typedef struct +{ + ULONG Size; + ULONG Flags; + GUID Attribute; } KSATTRIBUTE, *PKSATTRIBUTE; @@ -1171,20 +1185,37 @@ typedef struct { + ULONG MinFrameSize; + ULONG MaxFrameSize; + ULONG Stepping; +} KS_FRAMING_RANGE, *PKS_FRAMING_RANGE; + +typedef struct +{ + KS_FRAMING_RANGE Range; + ULONG InPlaceWeight; + ULONG NotInPlaceWeight; +} KS_FRAMING_RANGE_WEIGHTED, *PKS_FRAMING_RANGE_WEIGHTED; + +typedef struct +{ + GUID MemoryType; + GUID BusType; + ULONG MemoryFlags; + ULONG BusFlags; + ULONG Flags; + ULONG Frames; + ULONG FileAlignment; + ULONG MemoryTypeWeight; + KS_FRAMING_RANGE PhysicalRange; + KS_FRAMING_RANGE_WEIGHTED FramingRange; } KS_FRAMING_ITEM, *PKS_FRAMING_ITEM; typedef struct { -} KS_FRAMING_RANGE, *PKS_FRAMING_RANGE; - -typedef struct -{ - /* Obsolete */ -} KS_FRAMING_RANGE_WEIGHTED, *PKS_FRAMING_RANGE_WEIGHTED; - -/* ??? */ -typedef struct -{ + ULONG RatioNumerator; + ULONG RatioDenominator; + ULONG RatioConstantMargin; } KS_COMPRESSION, *PKS_COMPRESSION; @@ -1236,11 +1267,47 @@ #define KSPROPERTY_ITEM_IRP_STORAGE(Irp) (*(const KSPROPERTY_ITEM**)&(Irp)->Tail.Overlay.DriverContext[3]) #define KSPROPERTY_ATTRIBUTES_IRP_STORAGE(Irp) (*(PKSATTRIBUTE_LIST*)&(Irp)->Tail.Overlay.DriverContext[2]) -#endif - -typedef struct -{ +typedef +VOID +(*PFNREFERENCEDEVICEOBJECT)( + IN PVOID Context + ); + +typedef +VOID +(*PFNDEREFERENCEDEVICEOBJECT)( + IN PVOID Context + ); + +typedef +NTSTATUS +(*PFNQUERYREFERENCESTRING)( + IN PVOID Context, + IN OUT PWCHAR *String + ); + +typedef struct +{ + INTERFACE Interface; + PFNREFERENCEDEVICEOBJECT ReferenceDeviceObject; + PFNDEREFERENCEDEVICEOBJECT DereferenceDeviceObject; + PFNQUERYREFERENCESTRING QueryReferenceString; } BUS_INTERFACE_REFERENCE, *PBUS_INTERFACE_REFERENCE; + +typedef struct +{ + KDPC Dpc; + ULONG ReferenceCount; + KSPIN_LOCK AccessLock; +} KSDPC_ITEM, *PKSDPC_ITEM; + +typedef struct +{ + KSDPC_ITEM DpcItem; + LIST_ENTRY BufferList; +} KSBUFFER_ITEM, *PKSBUFFER_ITEM; + +#endif typedef struct { @@ -1252,10 +1319,6 @@ ULONG Revision; } KSCOMPONENTID, *PKSCOMPONENTID; -typedef struct -{ -} KSBUFFER_ITEM, *PKSBUFFER_ITEM; - /* =============================================================== Properties */ @@ -1265,40 +1328,85 @@ #define KSPROPERTY_MEMBER_VALUES 0x00000003 #define KSPROPERTY_MEMBER_FLAG_DEFAULT KSPROPERTY_MEMBER_RANGES -typedef struct -{ +typedef enum { + KS_SEEKING_NoPositioning, + KS_SEEKING_AbsolutePositioning, + KS_SEEKING_RelativePositioning, + KS_SEEKING_IncrementalPositioning, + KS_SEEKING_PositioningBitsMask = 0x3, + KS_SEEKING_SeekToKeyFrame, + KS_SEEKING_ReturnTime = 0x8 +} KS_SEEKING_FLAGS; + +typedef struct +{ + LONGLONG Current; + LONGLONG Stop; + KS_SEEKING_FLAGS CurrentFlags; + KS_SEEKING_FLAGS StopFlags; } KSPROPERTY_POSITIONS, *PKSPROPERTY_POSITIONS; typedef struct { + GUID PropertySet; + ULONG Count; +} KSPROPERTY_SERIALHDR, *PKSPROPERTY_SERIALHDR; + +typedef struct +{ + KSIDENTIFIER PropTypeSet; + ULONG Id; + ULONG PropertyLength; } KSPROPERTY_SERIAL, *PKSPROPERTY_SERIAL; -typedef struct -{ -} KSPROPERTY_SERIALHDR, *PKSPROPERTY_SERIALHDR; - -typedef struct -{ -#if defined( _KS_NO_ANONYMOUS_STRUCTURES_ ) - struct _SIGNED { -#else + +typedef union +{ struct { -#endif LONG SignedMinimum; LONG SignedMaximum; - }; + #if defined( _KS_NO_ANONYMOUS_STRUCTURES_ ) - struct _UNSIGNED { + }_SIGNED; #else - struct { -#endif + }; +#endif + + struct { ULONG UnsignedMinimum; ULONG UnsignedMaximum; - }; +#if defined( _KS_NO_ANONYMOUS_STRUCTURES_ ) + }_UNSIGNED; +#else + }; +#endif + } KSPROPERTY_BOUNDS_LONG, *PKSPROPERTY_BOUNDS_LONG; -typedef struct -{ +typedef union +{ + struct { + LONGLONG SignedMinimum; + LONGLONG SignedMaximum; +#if defined( _KS_NO_ANONYMOUS_STRUCTURES_ ) + }_SIGNED64; +#else + }; +#endif + + struct { +#if defined(_NTDDK_) + ULONGLONG UnsignedMinimum; + ULONGLONG UnsignedMaximum; +#else + DWORDLONG UnsignedMinimum; + DWORDLONG UnsignedMaximum; +#endif +#if defined( _KS_NO_ANONYMOUS_STRUCTURES_ ) + }_UNSIGNED64; +#else + }; +#endif } KSPROPERTY_BOUNDS_LONGLONG, *PKSPROPERTY_BOUNDS_LONGLONG; typedef struct @@ -1312,6 +1420,8 @@ typedef struct { + LONGLONG Earliest; + LONGLONG Latest; } KSPROPERTY_MEDIAAVAILABLE, *PKSPROPERTY_MEDIAAVAILABLE; @@ -1406,10 +1516,13 @@ typedef struct { +#if defined(_NTDDK_) + ULONGLONG SteppingDelta; +#else + DWORDLONG SteppingDelta; +#endif + KSPROPERTY_BOUNDS_LONGLONG Bounds; } KSPROPERTY_STEPPING_LONGLONG, *PKSPROPERTY_STEPPING_LONGLONG; - - - /* =============================================================== Allocator Framing @@ -1434,6 +1547,11 @@ typedef struct { + ULONG CountItems; // count of FramingItem-s below. + ULONG PinFlags; + KS_COMPRESSION OutputCompression; + ULONG PinWeight; // this pin framing's Weight graph-wide + KS_FRAMING_ITEM FramingItem[1]; } KSALLOCATOR_FRAMING_EX, *PKSALLOCATOR_FRAMING_EX; @@ -1443,6 +1561,9 @@ typedef struct { + PVOID Context; + ULONG Proportion; + LONGLONG DeltaTime; } KSQUALITY, *PKSQUALITY; typedef struct @@ -1453,10 +1574,17 @@ typedef struct { + LONGLONG PresentationStart; + LONGLONG Duration; + KSPIN_INTERFACE Interface; + LONG Rate; + ULONG Flags; } KSRATE, *PKSRATE; typedef struct { + KSPROPERTY Property; + KSRATE Rate; } KSRATE_CAPABILITY, *PKSRATE_CAPABILITY; typedef struct @@ -1467,6 +1595,62 @@ typedef struct { + ULONG NotificationType; + union { + struct { + HANDLE Event; + ULONG_PTR Reserved[2]; + } EventHandle; + struct { + HANDLE Semaphore; + ULONG Reserved; + LONG Adjustment; + } SemaphoreHandle; +#if defined(_NTDDK_) + struct { + PVOID Event; + KPRIORITY Increment; + ULONG_PTR Reserved; + } EventObject; + struct { + PVOID Semaphore; + KPRIORITY Increment; + LONG Adjustment; + } SemaphoreObject; + struct { + PKDPC Dpc; + ULONG ReferenceCount; + ULONG_PTR Reserved; + } Dpc; + struct { + PWORK_QUEUE_ITEM WorkQueueItem; + WORK_QUEUE_TYPE WorkQueueType; + ULONG_PTR Reserved; + } WorkItem; + struct { + PWORK_QUEUE_ITEM WorkQueueItem; + PKSWORKER KsWorkerObject; + ULONG_PTR Reserved; + } KsWorkItem; +#endif + struct { + PVOID Unused; + LONG_PTR Alignment[2]; + } Alignment; + }; +} KSEVENTDATA, *PKSEVENTDATA; + +typedef struct +{ + ULONG Size; + ULONG Flags; + union { + HANDLE ObjectHandle; + PVOID ObjectPointer; + }; + PVOID Reserved; + KSEVENT Event; + KSEVENTDATA EventData; } KSRELATIVEEVENT, *PKSRELATIVEEVENT; @@ -1483,6 +1667,8 @@ typedef struct { + LONGLONG Time; + LONGLONG SystemTime; } KSCORRELATED_TIME, *PKSCORRELATED_TIME; typedef struct @@ -1495,10 +1681,15 @@ typedef struct { + LONGLONG TimeBase; + LONGLONG Interval; } KSINTERVAL, *PKSINTERVAL; typedef struct { + LONGLONG Duration; + ULONG FrameFlags; + ULONG Reserved; } KSFRAMETIME, *PKSFRAMETIME; @@ -1506,23 +1697,39 @@ Clocks */ -typedef struct -{ -} KSCLOCK, *PKSCLOCK, *PKSDEFAULTCLOCK; /* OK ? */ - -typedef struct -{ +typedef PVOID PKSDEFAULTCLOCK; + +typedef struct +{ + ULONG CreateFlags; } KSCLOCK_CREATE, *PKSCLOCK_CREATE; -typedef struct -{ +#if defined(_NTDDK_) + +typedef +LONGLONG +(FASTCALL *PFNKSCLOCK_GETTIME)( + IN PFILE_OBJECT FileObject + ); +typedef +LONGLONG +(FASTCALL *PFNKSCLOCK_CORRELATEDTIME)( + IN PFILE_OBJECT FileObject, + OUT PLONGLONG SystemTime); + +typedef struct +{ + PFNKSCLOCK_GETTIME GetTime; + PFNKSCLOCK_GETTIME GetPhysicalTime; + PFNKSCLOCK_CORRELATEDTIME GetCorrelatedTime; + PFNKSCLOCK_CORRELATEDTIME GetCorrelatedPhysicalTime; } KSCLOCK_FUNCTIONTABLE, *PKSCLOCK_FUNCTIONTABLE; /* =============================================================== Objects ??? SORT ME! */ -#if defined(_NTDDK_) + typedef struct { PDRIVER_DISPATCH Create; @@ -1551,34 +1758,55 @@ typedef struct { + KSEVENT Event; + PKSEVENTDATA EventData; + PVOID Reserved; } KSQUERYBUFFER, *PKSQUERYBUFFER; typedef struct { + PVOID Context; + ULONG Status; } KSERROR, *PKSERROR; -typedef struct -{ -} KSDPC_ITEM, *PKSDPC_ITEM; - - /* =============================================================== Methods */ - -typedef struct -{ +#if defined(_NTDDK_) + +typedef struct +{ + ULONG MethodId; + union { + PFNKSHANDLER MethodHandler; + BOOLEAN MethodSupported; + }; + ULONG MinMethod; + ULONG MinData; + PFNKSHANDLER SupportHandler; + ULONG Flags; +} KSMETHOD_ITEM, *PKSMETHOD_ITEM; + + +typedef struct +{ + ULONG MethodId; + union { + PFNKSFASTHANDLER MethodHandler; + BOOLEAN MethodSupported; + }; +} KSFASTMETHOD_ITEM, *PKSFASTMETHOD_ITEM; + +typedef struct +{ + const GUID* Set; + ULONG MethodsCount; + const KSMETHOD_ITEM* MethodItem; + ULONG FastIoCount; + const KSFASTMETHOD_ITEM*FastIoTable; } KSMETHOD_SET, *PKSMETHOD_SET; -typedef struct -{ -} KSMETHOD_ITEM, *PKSMETHOD_ITEM; - -typedef struct -{ -} KSFASTMETHOD_ITEM, *PKSFASTMETHOD_ITEM; - - +#endif /* =============================================================== Nodes */ @@ -1599,51 +1827,222 @@ typedef struct { + KSEVENT Event; + ULONG NodeId; + ULONG Reserved; } KSE_NODE, *PKSE_NODE; -typedef struct -{ +typedef struct { + ULONG CreateFlags; + ULONG Node; } KSNODE_CREATE, *PKSNODE_CREATE; /* =============================================================== Events */ - -typedef struct -{ +typedef struct _KSEVENT_ENTRY KSEVENT_ENTRY, *PKSEVENT_ENTRY; + +#if defined(_NTDDK_) +typedef struct +{ + KSEVENTDATA EventData; + LONGLONG MarkTime; } KSEVENT_TIME_MARK, *PKSEVENT_TIME_MARK; typedef struct { + KSEVENTDATA EventData; + LONGLONG TimeBase; + LONGLONG Interval; } KSEVENT_TIME_INTERVAL, *PKSEVENT_TIME_INTERVAL; -typedef struct -{ +typedef NTSTATUS (*PFNKSADDEVENT)( + IN PIRP Irp, + IN PKSEVENTDATA EventData, + IN struct _KSEVENT_ENTRY* EventEntry); + +typedef +VOID +(*PFNKSREMOVEEVENT)( + IN PFILE_OBJECT FileObject, + IN struct _KSEVENT_ENTRY* EventEntry + ); + +typedef struct +{ + ULONG EventId; + ULONG DataInput; + ULONG ExtraEntryData; + PFNKSADDEVENT AddHandler; + PFNKSREMOVEEVENT RemoveHandler; + PFNKSHANDLER SupportHandler; +} KSEVENT_ITEM, *PKSEVENT_ITEM; + +typedef struct +{ + const GUID* Set; + ULONG EventsCount; + const KSEVENT_ITEM* EventItem; } KSEVENT_SET, *PKSEVENT_SET; -typedef struct -{ -} KSEVENT_ITEM, *PKSEVENT_ITEM; - -typedef struct _KSEVENT_ENTRY -{ -} KSEVENT_ENTRY, *PKSEVENT_ENTRY; - -typedef struct -{ -} KSEVENTDATA, *PKSEVENTDATA; - - +struct _KSEVENT_ENTRY +{ + LIST_ENTRY ListEntry; + PVOID Object; + union { + PKSDPC_ITEM DpcItem; + PKSBUFFER_ITEM BufferItem; + }; + PKSEVENTDATA EventData; + ULONG NotificationType; + const KSEVENT_SET* EventSet; + const KSEVENT_ITEM* EventItem; + PFILE_OBJECT FileObject; + ULONG SemaphoreAdjustment; + ULONG Reserved; + ULONG Flags; +}; + +#endif /* =============================================================== Pins */ -typedef struct -{ +#if defined(_NTDDK_) + +typedef struct _KSPIN KSPIN, *PKSPIN; +typedef struct _KSSTREAM_POINTER KSSTREAM_POINTER, *PKSSTREAM_POINTER; +typedef struct _KSSTREAM_POINTER_OFFSET KSSTREAM_POINTER_OFFSET, *PKSSTREAM_POINTER_OFFSET; +typedef struct _KSMAPPING KSMAPPING, *PKSMAPPING; +typedef struct _KSPROCESSPIN KSPROCESSPIN, *PKSPROCESSPIN; + +typedef +NTSTATUS +(*PFNKSPINIRP)( + IN PKSPIN Pin, + IN PIRP Irp + ); + +typedef +NTSTATUS +(*PFNKSPIN)( + IN PKSPIN Pin + ); + +typedef +void +(*PFNKSPINVOID)( + IN PKSPIN Pin + ); + +typedef +void +(*PFNKSSTREAMPOINTER)( + IN PKSSTREAM_POINTER StreamPointer + ); + +typedef struct { + ULONG Count; + PKSATTRIBUTE* Attributes; +} KSATTRIBUTE_LIST, *PKSATTRIBUTE_LIST; + +typedef +NTSTATUS +(*PFNKSPINSETDATAFORMAT)( + IN PKSPIN Pin, + IN PKSDATAFORMAT OldFormat OPTIONAL, + IN PKSMULTIPLE_ITEM OldAttributeList OPTIONAL, + IN const KSDATARANGE* DataRange, + IN const KSATTRIBUTE_LIST* AttributeRange OPTIONAL + ); + +typedef +NTSTATUS +(*PFNKSPINSETDEVICESTATE)( + IN PKSPIN Pin, + IN KSSTATE ToState, + IN KSSTATE FromState + ); + +typedef struct _KSCLOCK_DISPATCH KSCLOCK_DISPATCH, *PKSCLOCK_DISPATCH; +typedef struct _KSALLOCATOR_DISPATCH KSALLOCATOR_DISPATCH, *PKSALLOCATOR_DISPATCH; + +typedef struct +{ + PFNKSPINIRP Create; + PFNKSPINIRP Close; + PFNKSPIN Process; + PFNKSPINVOID Reset; + PFNKSPINSETDATAFORMAT SetDataFormat; + PFNKSPINSETDEVICESTATE SetDeviceState; + PFNKSPIN Connect; + PFNKSPINVOID Disconnect; + const KSCLOCK_DISPATCH* Clock; + const KSALLOCATOR_DISPATCH* Allocator; } KSPIN_DISPATCH, *PKSPIN_DISPATCH; -#if defined(_NTDDK_) +typedef +BOOLEAN +(*PFNKSPINSETTIMER)( + IN PKSPIN Pin, + IN PKTIMER Timer, + IN LARGE_INTEGER DueTime, + IN PKDPC Dpc + ); + +typedef +BOOLEAN +(*PFNKSPINCANCELTIMER)( + IN PKSPIN Pin, + IN PKTIMER Timer + ); + +typedef +LONGLONG +(FASTCALL *PFNKSPINCORRELATEDTIME)( + IN PKSPIN Pin, + OUT PLONGLONG SystemTime + ); + +typedef +void +(*PFNKSPINRESOLUTION)( + IN PKSPIN Pin, + OUT PKSRESOLUTION Resolution + ); + +struct _KSCLOCK_DISPATCH { + PFNKSPINSETTIMER SetTimer; + PFNKSPINCANCELTIMER CancelTimer; + PFNKSPINCORRELATEDTIME CorrelatedTime; + PFNKSPINRESOLUTION Resolution; +}; + +typedef +NTSTATUS +(*PFNKSPININITIALIZEALLOCATOR)( + IN PKSPIN Pin, + IN PKSALLOCATOR_FRAMING AllocatorFraming, + OUT PVOID* Context + ); + +typedef PVOID (*PFNKSDELETEALLOCATOR)( + IN PVOID Context); + +typedef PVOID (*PFNKSDEFAULTALLOCATE)( + IN PVOID Context); + +typedef PVOID (*PFNKSDEFAULTFREE)( + IN PVOID Context, + IN PVOID Buffer); + +struct _KSALLOCATOR_DISPATCH { + PFNKSPININITIALIZEALLOCATOR InitializeAllocator; + PFNKSDELETEALLOCATOR DeleteAllocator; + PFNKSDEFAULTALLOCATE Allocate; + PFNKSDEFAULTFREE Free; +}; typedef struct { @@ -1741,7 +2140,7 @@ #define KSPIN_FLAG_DENY_USERMODE_ACCESS #define KSPIN_FLAG_IMPLEMENT_CLOCK -typedef struct +struct _KSPIN { const KSPIN_DESCRIPTOR_EX* Descriptor; KSOBJECT_BAG Bag; @@ -1759,7 +2158,7 @@ KSSTATE DeviceState; KSRESET ResetState; KSSTATE ClientState; -} KSPIN, *PKSPIN; +}; #define DEFINE_KSPROPERTY_ITEM_PIN_CINSTANCES(Handler)\ DEFINE_KSPROPERTY_ITEM(\ @@ -2008,31 +2407,16 @@ /* TODO */ typedef void* UNKNOWN; -typedef PVOID (*PFNKSDEFAULTALLOCATE)( - IN PVOID Context); - -typedef PVOID (*PFNKSDEFAULTFREE)( - IN PVOID Context, - IN PVOID Buffer); - typedef PVOID (*PFNKSINITIALIZEALLOCATOR)( IN PVOID InitialContext, IN PKSALLOCATOR_FRAMING AllocatorFraming, OUT PVOID* Context); - -typedef PVOID (*PFNKSDELETEALLOCATOR)( - IN PVOID Context); #if defined(_NTDDK_) typedef NTSTATUS (*PFNKSALLOCATOR)( IN PIRP Irp, IN ULONG BufferSize, IN BOOLEAN InputOperation); - -typedef NTSTATUS (*PFNKSADDEVENT)( - IN PIRP Irp, - IN PKSEVENTDATA EventData, - IN struct _KSEVENT_ENTRY* EventEntry); typedef NTSTATUS (*PFNKINTERSECTHANDLEREX)( IN PVOID Context, @@ -2088,17 +2472,59 @@ XP / DX8 */ -typedef struct -{ - /* TODO */ -} KSPROCESSPIN, *PKSPROCESSPIN; +struct _KSMAPPING { + PHYSICAL_ADDRESS PhysicalAddress; + ULONG ByteCount; + ULONG Alignment; +}; + +struct _KSSTREAM_POINTER_OFFSET +{ +#if defined(_NTDDK_) + union { + PUCHAR Data; + PKSMAPPING Mappings; + }; +#else + PUCHAR Data; +#endif +#if !defined(_WIN64) + PVOID Alignment; +#endif + ULONG Count; + ULONG Remaining; +}; +#if defined(_NTDDK_) +struct _KSSTREAM_POINTER +{ + PVOID Context; + PKSPIN Pin; + PKSSTREAM_HEADER StreamHeader; + PKSSTREAM_POINTER_OFFSET Offset; + KSSTREAM_POINTER_OFFSET OffsetIn; + KSSTREAM_POINTER_OFFSET OffsetOut; +}; + +struct _KSPROCESSPIN +{ + PKSPIN Pin; + PKSSTREAM_POINTER StreamPointer; + PKSPROCESSPIN InPlaceCounterpart; + PKSPROCESSPIN DelegateBranch; + PKSPROCESSPIN CopySource; + PVOID Data; + ULONG BytesAvailable; + ULONG BytesUsed; + ULONG Flags; + BOOLEAN Terminate; +}; typedef struct { PKSPROCESSPIN* Pins; ULONG Count; } KSPROCESSPIN_INDEXENTRY, *PKSPROCESSPIN_INDEXENTRY; - +#endif /* =============================================================== Device Dispatch

1 0

[janderwald] 41467: - Improve user mode buffer probing
by janderwald＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: janderwald Date: Fri Jun 19 14:50:19 2009 New Revision: 41467 URL: http://svn.reactos.org/svn/reactos?rev=41467&view=rev Log: - Improve user mode buffer probing Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Fri Jun 19 14:50:19 2009 @@ -679,6 +679,8 @@ PCONTEXT_WRITE Packet; PFILE_OBJECT FileObject; IO_STATUS_BLOCK IoStatusBlock; + PMDL Mdl; + PVOID SystemBuffer; IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -746,10 +748,19 @@ } Packet->Header.Data = Buffer; + Mdl = IoAllocateMdl(DeviceInfo->Buffer, DeviceInfo->BufferSize, FALSE, FALSE, FALSE); + if (!Mdl) + { + /* no memory */ + ExFreePool(Packet); + ObDereferenceObject(FileObject); + ExFreePool(Buffer); + return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); + } + _SEH2_TRY { - ProbeForRead(DeviceInfo->Buffer, DeviceInfo->BufferSize, TYPE_ALIGNMENT(char)); - RtlMoveMemory(Buffer, DeviceInfo->Buffer, DeviceInfo->BufferSize); + MmProbeAndLockPages(Mdl, UserMode, IoReadAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -763,9 +774,25 @@ DPRINT1("Invalid buffer supplied\n"); ExFreePool(Buffer); ExFreePool(Packet); + IoFreeMdl(Mdl); ObDereferenceObject(FileObject); return SetIrpIoStatus(Irp, Status, 0); } + + SystemBuffer = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority ); + if (!SystemBuffer) + { + DPRINT1("Invalid buffer supplied\n"); + ExFreePool(Buffer); + ExFreePool(Packet); + IoFreeMdl(Mdl); + ObDereferenceObject(FileObject); + return SetIrpIoStatus(Irp, Status, 0); + } + + RtlMoveMemory(Buffer, SystemBuffer, DeviceInfo->BufferSize); + MmUnlockPages(Mdl); + IoFreeMdl(Mdl); KsStreamIo(FileObject, NULL, NULL, NULL, NULL, 0, &IoStatusBlock, Packet, sizeof(CONTEXT_WRITE), KSSTREAM_WRITE, KernelMode); ObDereferenceObject(FileObject); Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/entry.c [iso-8859-1] Fri Jun 19 14:50:19 2009 @@ -204,6 +204,7 @@ { for (Index = 0; Index < pClient->NumPins; Index++) { + DPRINT("Index %u Pin %p Type %x\n", Index, pClient->hPins[Index].Handle, pClient->hPins[Index].Type); if (pClient->hPins[Index].Handle && pClient->hPins[Index].Type != MIXER_DEVICE_TYPE) { ZwClose(pClient->hPins[Index].Handle);

1 0

[dchapyshev] 41466: - Add target process reference/dereference in ProcessWow64Information case of NtQueryInformationProcess. - Check buffer length
by dchapyshev＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: dchapyshev Date: Fri Jun 19 12:49:01 2009 New Revision: 41466 URL: http://svn.reactos.org/svn/reactos?rev=41466&view=rev Log: - Add target process reference/dereference in ProcessWow64Information case of NtQueryInformationProcess. - Check buffer length Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Fri Jun 19 12:49:01 2009 @@ -447,6 +447,29 @@ /* WOW64: Not implemented */ case ProcessWow64Information: + + /* Set the return length */ + Length = sizeof(ULONG_PTR); + + if (ProcessInformationLength != Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Reference the process */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_QUERY_INFORMATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) break; + + DPRINT1("Not implemented: ProcessWow64Information\n"); + + /* Dereference the process */ + ObDereferenceObject(Process); Status = STATUS_NOT_IMPLEMENTED; break;

1 0

[dchapyshev] 41465: - Check buffer length for ProcessQuotaLimits/ProcessBasePriority/ProcessRaisePriority/ProcessWx86Information/ProcessDebugPort cases
by dchapyshev＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: dchapyshev Date: Fri Jun 19 12:22:24 2009 New Revision: 41465 URL: http://svn.reactos.org/svn/reactos?rev=41465&view=rev Log: - Check buffer length for ProcessQuotaLimits/ProcessBasePriority/ProcessRaisePriority/ProcessWx86Information/ProcessDebugPort cases Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Fri Jun 19 12:22:24 2009 @@ -1057,10 +1057,72 @@ Status = STATUS_SUCCESS; break; + case ProcessQuotaLimits: + + /* Check buffer length */ + if (ProcessInformationLength != sizeof(QUOTA_LIMITS)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + DPRINT1("Not implemented: ProcessQuotaLimits\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessBasePriority: + + /* Check buffer length */ + if (ProcessInformationLength != sizeof(KPRIORITY)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + DPRINT1("Not implemented: ProcessBasePriority\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessRaisePriority: + + /* Check buffer length */ + if (ProcessInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + DPRINT1("Not implemented: ProcessRaisePriority\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessWx86Information: + + /* Check buffer length */ + if (ProcessInformationLength != sizeof(HANDLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + DPRINT1("Not implemented: ProcessWx86Information\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case ProcessDebugPort: + + /* Check buffer length */ + if (ProcessInformationLength != sizeof(HANDLE)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + DPRINT1("Not implemented: ProcessDebugPort\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + /* We currently don't implement any of these */ - case ProcessQuotaLimits: - case ProcessBasePriority: - case ProcessRaisePriority: case ProcessLdtInformation: case ProcessLdtSize: case ProcessIoPortHandlers: @@ -1077,10 +1139,8 @@ case ProcessIoCounters: case ProcessTimes: case ProcessPooledUsageAndLimits: - case ProcessWx86Information: case ProcessHandleCount: case ProcessWow64Information: - case ProcessDebugPort: default: DPRINT1("Unsupported or unimplemented: %lx\n", ProcessInformationClass); Status = STATUS_INVALID_INFO_CLASS;

1 0

[dchapyshev] 41464: - Add probing of the result buffers
by dchapyshev＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: dchapyshev Date: Fri Jun 19 11:46:46 2009 New Revision: 41464 URL: http://svn.reactos.org/svn/reactos?rev=41464&view=rev Log: - Add probing of the result buffers Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Fri Jun 19 11:46:46 2009 @@ -80,17 +80,25 @@ ULONG Cookie; PAGED_CODE(); - /* Check validity of Information Class */ -#if 0 - Status = DefaultQueryInfoBufferCheck(ProcessInformationClass, - PsProcessInfoClass, - RTL_NUMBER_OF(PsProcessInfoClass), - ProcessInformation, - ProcessInformationLength, - ReturnLength, - PreviousMode); - if (!NT_SUCCESS(Status)) return Status; -#endif + /* Check for user-mode caller */ + if (PreviousMode != KernelMode) + { + /* Prepare to probe parameters */ + _SEH2_TRY + { + ProbeForWrite(ProcessInformation, + ProcessInformationLength, + sizeof(ULONG)); + if (ReturnLength) ProbeForWriteUlong(ReturnLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the error code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if(!NT_SUCCESS(Status)) return Status; + } if((ProcessInformationClass == ProcessCookie) && (ProcessHandle != NtCurrentProcess()))

1 0

[cgutman] 41463: - Fix 2 typos
by cgutman＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: cgutman Date: Fri Jun 19 11:34:34 2009 New Revision: 41463 URL: http://svn.reactos.org/svn/reactos?rev=41463&view=rev Log: - Fix 2 typos Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Fri Jun 19 11:34:34 2009 @@ -470,7 +470,7 @@ if (NumberOfDescriptors > 0xffff) { - NDIS_DbgPrint(MIN_TRACE, ("Invalid number of descriptors (%lx)\n")) + NDIS_DbgPrint(MIN_TRACE, ("Invalid number of descriptors (%lx)\n", NumberOfDescriptors)) *Status = NDIS_STATUS_RESOURCES; } else @@ -478,7 +478,7 @@ NumberOfDescriptors += NumberOfOverflowDescriptors; if (NumberOfDescriptors > 0xffff) { - NDIS_DbgPrint(MIN_TRACE, ("Total number of descriptors > 0xffff (%lx)\n")); + NDIS_DbgPrint(MIN_TRACE, ("Total number of descriptors > 0xffff (%lx)\n", NumberOfDescriptors)); NumberOfDescriptors = 0xffff; }

1 0

[cgutman] 41462: - Report that we are NDIS 5.1
by cgutman＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: cgutman Date: Fri Jun 19 10:53:58 2009 New Revision: 41462 URL: http://svn.reactos.org/svn/reactos?rev=41462&view=rev Log: - Report that we are NDIS 5.1 Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Fri Jun 19 10:53:58 2009 @@ -33,7 +33,7 @@ #include "ndissys.h" -#define NDIS_VERSION 0x00050000 /* the version of NDIS we claim to be to miniport drivers */ +#define NDIS_VERSION 0x00050001 /* the version of NDIS we claim to be to miniport drivers */ #define PARAMETERS_KEY L"Parameters" /* The parameters subkey under the device-specific key */ /*

1 0

[cgutman] 41461: - Big debugging update - Also fix some little bugs and reduce code duplication
by cgutman＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: cgutman Date: Fri Jun 19 10:47:00 2009 New Revision: 41461 URL: http://svn.reactos.org/svn/reactos?rev=41461&view=rev Log: - Big debugging update - Also fix some little bugs and reduce code duplication Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/efilter.c trunk/reactos/drivers/network/ndis/ndis/hardware.c trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/memory.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -357,6 +357,7 @@ (*Buffer)->Next = NULL; *Status = NDIS_STATUS_SUCCESS; } else { + NDIS_DbgPrint(MIN_TRACE, ("IoAllocateMdl failed (%x, %lx)\n", VirtualAddress, Length)); *Status = NDIS_STATUS_FAILURE; } } @@ -401,43 +402,13 @@ * PoolHandle = Handle returned by NdisAllocatePacketPool */ { - KIRQL OldIrql; - PNDIS_PACKET Temp; PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)PoolHandle; - NDIS_DbgPrint(MAX_TRACE, ("Status (0x%X) Packet (0x%X) PoolHandle (0x%X).\n", - Status, Packet, PoolHandle)); - - *Packet = NULL; - - if (Pool == NULL) - { - *Status = NDIS_STATUS_FAILURE; - return; - } - - KeAcquireSpinLock(&Pool->SpinLock.SpinLock, &OldIrql); - - if (Pool->FreeList) { - Temp = Pool->FreeList; - Pool->FreeList = (PNDIS_PACKET)Temp->Reserved[0]; - - KeReleaseSpinLock(&Pool->SpinLock.SpinLock, OldIrql); - - RtlZeroMemory(Temp, Pool->PacketLength); - Temp->Private.Pool = Pool; - Temp->Private.ValidCounts = TRUE; - Temp->Private.NdisPacketFlags = fPACKET_ALLOCATED_BY_NDIS; - Temp->Private.NdisPacketOobOffset = Pool->PacketLength - - (sizeof(NDIS_PACKET_OOB_DATA) + - sizeof(NDIS_PACKET_EXTENSION)); - - *Packet = Temp; - *Status = NDIS_STATUS_SUCCESS; - } else { - *Status = NDIS_STATUS_RESOURCES; - KeReleaseSpinLock(&Pool->SpinLock.SpinLock, OldIrql); - } + KeAcquireSpinLock(&Pool->SpinLock.SpinLock, &Pool->SpinLock.OldIrql); + NdisDprAllocatePacketNonInterlocked(Status, + Packet, + PoolHandle); + KeReleaseSpinLock(&Pool->SpinLock.SpinLock, Pool->SpinLock.OldIrql); } @@ -499,6 +470,7 @@ if (NumberOfDescriptors > 0xffff) { + NDIS_DbgPrint(MIN_TRACE, ("Invalid number of descriptors (%lx)\n")) *Status = NDIS_STATUS_RESOURCES; } else @@ -506,6 +478,7 @@ NumberOfDescriptors += NumberOfOverflowDescriptors; if (NumberOfDescriptors > 0xffff) { + NDIS_DbgPrint(MIN_TRACE, ("Total number of descriptors > 0xffff (%lx)\n")); NumberOfDescriptors = 0xffff; } @@ -533,8 +506,10 @@ } Packet->Reserved[0] = 0; } - else + else { + NDIS_DbgPrint(MIN_TRACE, ("Attempted to allocate a packet pool with 0 descriptors\n")); Pool->FreeList = NULL; + } *Status = NDIS_STATUS_SUCCESS; *PoolHandle = (PNDIS_HANDLE)Pool; @@ -689,6 +664,33 @@ * PoolHandle = Handle returned by NdisAllocatePacketPool */ { + PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)PoolHandle; + + KeAcquireSpinLockAtDpcLevel(&Pool->SpinLock.SpinLock); + NdisDprAllocatePacketNonInterlocked(Status, + Packet, + PoolHandle); + KeReleaseSpinLockFromDpcLevel(&Pool->SpinLock.SpinLock); +} + + +/* + * @implemented + */ +VOID +EXPORT +NdisDprAllocatePacketNonInterlocked( + OUT PNDIS_STATUS Status, + OUT PNDIS_PACKET *Packet, + IN NDIS_HANDLE PoolHandle) +/* + * FUNCTION: Allocates a packet at IRQL DISPATCH_LEVEL (w/o synchronization) + * ARGUMENTS: + * Status = Address of buffer to place status of operation + * Packet = Address of buffer to place a pointer to a packet descriptor + * PoolHandle = Handle returned by NdisAllocatePacketPool + */ +{ PNDIS_PACKET Temp; PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)PoolHandle; @@ -700,16 +702,13 @@ if (Pool == NULL) { *Status = NDIS_STATUS_FAILURE; + NDIS_DbgPrint(MIN_TRACE, ("Called passed a bad pool handle\n")); return; } - - KeAcquireSpinLockAtDpcLevel(&Pool->SpinLock.SpinLock); if (Pool->FreeList) { Temp = Pool->FreeList; Pool->FreeList = (PNDIS_PACKET)Temp->Reserved[0]; - - KeReleaseSpinLockFromDpcLevel(&Pool->SpinLock.SpinLock); RtlZeroMemory(Temp, Pool->PacketLength); Temp->Private.Pool = Pool; @@ -722,58 +721,7 @@ *Packet = Temp; *Status = NDIS_STATUS_SUCCESS; } else { - *Status = NDIS_STATUS_RESOURCES; - KeReleaseSpinLockFromDpcLevel(&Pool->SpinLock.SpinLock); - } -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisDprAllocatePacketNonInterlocked( - OUT PNDIS_STATUS Status, - OUT PNDIS_PACKET *Packet, - IN NDIS_HANDLE PoolHandle) -/* - * FUNCTION: Allocates a packet at IRQL DISPATCH_LEVEL (w/o synchronization) - * ARGUMENTS: - * Status = Address of buffer to place status of operation - * Packet = Address of buffer to place a pointer to a packet descriptor - * PoolHandle = Handle returned by NdisAllocatePacketPool - */ -{ - PNDIS_PACKET Temp; - PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)PoolHandle; - - NDIS_DbgPrint(MAX_TRACE, ("Status (0x%X) Packet (0x%X) PoolHandle (0x%X).\n", - Status, Packet, PoolHandle)); - - *Packet = NULL; - - if (Pool == NULL) - { - *Status = NDIS_STATUS_FAILURE; - return; - } - - if (Pool->FreeList) { - Temp = Pool->FreeList; - Pool->FreeList = (PNDIS_PACKET)Temp->Reserved[0]; - - RtlZeroMemory(Temp, Pool->PacketLength); - Temp->Private.Pool = Pool; - Temp->Private.ValidCounts = TRUE; - Temp->Private.NdisPacketFlags = fPACKET_ALLOCATED_BY_NDIS; - Temp->Private.NdisPacketOobOffset = Pool->PacketLength - - (sizeof(NDIS_PACKET_OOB_DATA) + - sizeof(NDIS_PACKET_EXTENSION)); - - *Packet = Temp; - *Status = NDIS_STATUS_SUCCESS; - } else { + NDIS_DbgPrint(MIN_TRACE, ("No more free descriptors\n")); *Status = NDIS_STATUS_RESOURCES; } } @@ -792,12 +740,11 @@ * Packet = Pointer to packet to free */ { - NDIS_DbgPrint(MAX_TRACE, ("Packet (0x%X).\n", Packet)); - - KeAcquireSpinLockAtDpcLevel(&((NDISI_PACKET_POOL*)Packet->Private.Pool)->SpinLock.SpinLock); - Packet->Reserved[0] = (ULONG_PTR)((NDISI_PACKET_POOL*)Packet->Private.Pool)->FreeList; - ((NDISI_PACKET_POOL*)Packet->Private.Pool)->FreeList = Packet; - KeReleaseSpinLockFromDpcLevel(&((NDISI_PACKET_POOL*)Packet->Private.Pool)->SpinLock.SpinLock); + PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)Packet->Private.Pool; + + KeAcquireSpinLockAtDpcLevel(&Pool->SpinLock.SpinLock); + NdisDprFreePacketNonInterlocked(Packet); + KeReleaseSpinLockFromDpcLevel(&Pool->SpinLock.SpinLock); } @@ -885,14 +832,11 @@ * Packet = Pointer to packet descriptor */ { - KIRQL OldIrql; - - NDIS_DbgPrint(MAX_TRACE, ("Packet (0x%X).\n", Packet)); - - KeAcquireSpinLock(&((NDISI_PACKET_POOL*)Packet->Private.Pool)->SpinLock.SpinLock, &OldIrql); - Packet->Reserved[0] = (ULONG_PTR)((NDISI_PACKET_POOL*)Packet->Private.Pool)->FreeList; - ((NDISI_PACKET_POOL*)Packet->Private.Pool)->FreeList = Packet; - KeReleaseSpinLock(&((NDISI_PACKET_POOL*)Packet->Private.Pool)->SpinLock.SpinLock, OldIrql); + PNDISI_PACKET_POOL Pool = (PNDISI_PACKET_POOL)Packet->Private.Pool; + + KeAcquireSpinLock(&Pool->SpinLock.SpinLock, &Pool->SpinLock.OldIrql); + NdisDprFreePacketNonInterlocked(Packet); + KeReleaseSpinLock(&Pool->SpinLock.SpinLock, Pool->SpinLock.OldIrql); } @@ -951,6 +895,7 @@ *_FirstBufferVA = MmGetSystemAddressForMdl(Buffer); Buffer = Buffer->Next; } else { + NDIS_DbgPrint(MIN_TRACE, ("No buffers linked to this packet\n")); *_FirstBufferLength = 0; *_FirstBufferVA = NULL; } @@ -986,6 +931,7 @@ *_FirstBufferVA = MmGetSystemAddressForMdlSafe(Buffer, Priority); Buffer = Buffer->Next; } else { + NDIS_DbgPrint(MIN_TRACE, ("No buffers linked to this packet\n")); *_FirstBufferLength = 0; *_FirstBufferVA = NULL; } @@ -1088,6 +1034,7 @@ &NdisBuffer, NULL); if (!NdisBuffer) { + NDIS_DbgPrint(MIN_TRACE, ("No buffer to unchain\n")); *Buffer = NULL; return; } @@ -1136,6 +1083,7 @@ &NdisBuffer, NULL); if (!NdisBuffer) { + NDIS_DbgPrint(MIN_TRACE, ("No buffer to unchain\n")); *Buffer = NULL; return; } @@ -1182,6 +1130,7 @@ *Buffer = IoAllocateMdl(CurrentVa, Length, FALSE, FALSE, NULL); if (!*Buffer) { + NDIS_DbgPrint(MIN_TRACE, ("IoAllocateMdl failed (%x, %lx)\n", CurrentVa, Length)); *Status = NDIS_STATUS_FAILURE; return; } Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -68,6 +68,8 @@ PVOID Data; WCHAR Buff[25]; + NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); + /* reset parameter type to standard reg types */ switch(ParameterType) { @@ -114,9 +116,10 @@ *Status = ZwSetValueKey(((PMINIPORT_CONFIGURATION_CONTEXT)ConfigurationHandle)->Handle, Keyword, 0, ParameterType, Data, DataSize); - if(*Status != STATUS_SUCCESS) - *Status = NDIS_STATUS_FAILURE; - else + if(*Status != STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwSetValueKey failed (%x)\n", *Status)); + *Status = NDIS_STATUS_FAILURE; + } else *Status = NDIS_STATUS_SUCCESS; } @@ -189,7 +192,7 @@ DUPLICATE_SAME_ACCESS); if(!NT_SUCCESS(*Status)) { - NDIS_DbgPrint(MID_TRACE, ("Failed to open registry configuration for this miniport\n")); + NDIS_DbgPrint(MIN_TRACE, ("Failed to open registry configuration for this miniport\n")); *Status = NDIS_STATUS_FAILURE; return; } @@ -263,6 +266,7 @@ if(*Status != NDIS_STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwOpenKey failed (%x)\n", *Status)); *ConfigurationHandle = NULL; *Status = NDIS_STATUS_FAILURE; return; @@ -330,7 +334,7 @@ ParameterType != NdisParameterBinary ) { - NDIS_DbgPrint(MID_TRACE,("unsupported parameter type\n")); + NDIS_DbgPrint(MIN_TRACE,("unsupported parameter type\n")); *Status = NDIS_STATUS_NOT_SUPPORTED; return; } @@ -339,7 +343,7 @@ if (ConfigurationContext == NULL) { - NDIS_DbgPrint(MID_TRACE,("invalid parameter ConfigurationContext (0x%x)\n",ConfigurationContext)); + NDIS_DbgPrint(MIN_TRACE,("invalid parameter ConfigurationContext (0x%x)\n",ConfigurationContext)); return; } @@ -460,7 +464,7 @@ *Status = ZwQueryValueKey(ConfigurationContext->Handle, Keyword, KeyValuePartialInformation, NULL, 0, &KeyDataLength); if(*Status != STATUS_BUFFER_OVERFLOW && *Status != STATUS_BUFFER_TOO_SMALL && *Status != STATUS_SUCCESS) { - NDIS_DbgPrint(MID_TRACE,("ZwQueryValueKey #1 failed for %wZ, status 0x%x\n", Keyword, *Status)); + NDIS_DbgPrint(MIN_TRACE,("ZwQueryValueKey #1 failed for %wZ, status 0x%x\n", Keyword, *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -480,7 +484,7 @@ if(*Status != STATUS_SUCCESS) { ExFreePool(KeyInformation); - NDIS_DbgPrint(MID_TRACE,("ZwQueryValueKey #2 failed for %wZ, status 0x%x\n", Keyword, *Status)); + NDIS_DbgPrint(MIN_TRACE,("ZwQueryValueKey #2 failed for %wZ, status 0x%x\n", Keyword, *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -551,7 +555,7 @@ if(KeyInformation->Type != REG_SZ && KeyInformation->Type != REG_MULTI_SZ) { - NDIS_DbgPrint(MID_TRACE,("requested type does not match actual value type\n")); + NDIS_DbgPrint(MIN_TRACE,("requested type does not match actual value type\n")); ExFreePool(KeyInformation); *ParameterValue = NULL; *Status = NDIS_STATUS_FAILURE; @@ -721,6 +725,7 @@ NdisReadConfiguration(Status, &ParameterValue, ConfigurationHandle, &Keyword, NdisParameterString); if(*Status != NDIS_STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("NdisReadConfiguration failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -808,6 +813,7 @@ *Status = ZwEnumerateKey(ConfigurationHandle, Index, KeyBasicInformation, NULL, 0, &KeyInformationLength); if(*Status != STATUS_BUFFER_TOO_SMALL && *Status != STATUS_BUFFER_OVERFLOW && *Status != STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwEnumerateKey failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -825,6 +831,7 @@ if(*Status != STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwEnumerateKey failed (%x)\n", *Status)); ExFreePool(KeyInformation); *Status = NDIS_STATUS_FAILURE; return; @@ -842,6 +849,7 @@ if(*Status != STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwOpenKey failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; return; } @@ -901,6 +909,7 @@ if(*Status != STATUS_SUCCESS) { + NDIS_DbgPrint(MIN_TRACE, ("ZwOpenKey failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; return; } Modified: trunk/reactos/drivers/network/ndis/ndis/efilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/efilter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/efilter.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -44,8 +44,12 @@ *Filter = (PETH_FILTER)NewFilter; return TRUE; } - *Filter = NULL; - return FALSE; + else + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); + *Filter = NULL; + return FALSE; + } } @@ -88,7 +92,10 @@ /* Not sure if this is a valid thing to do, but we do arrive here early * in the boot process with Filter NULL. We need to investigate whether * this should be handled or not allowed. */ - if( !Filter ) return; + if( !Filter ) { + NDIS_DbgPrint(MIN_TRACE, ("Filter is NULL\n")); + return; + } MiniIndicateData((PLOGICAL_ADAPTER)((PETHI_FILTER)Filter)->Miniport, MacReceiveContext, HeaderBuffer, @@ -118,7 +125,10 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - if( !Filter ) return; + if( !Filter ) { + NDIS_DbgPrint(MIN_TRACE, ("Filter is NULL\n")); + return; + } Adapter = (PLOGICAL_ADAPTER)((PETHI_FILTER)Filter)->Miniport; Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -68,6 +68,7 @@ if (Adapter->NdisMiniportBlock.BusType != NdisInterfacePci || Adapter->NdisMiniportBlock.AllocatedResources == NULL) { + NDIS_DbgPrint(MIN_TRACE, ("Bad bus type or no resources\n")); *AssignedResources = NULL; return NDIS_STATUS_FAILURE; } Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -68,12 +68,14 @@ NDIS_DbgPrint(MAX_TRACE, ("Called. Interrupt (0x%X)\n", NdisInterrupt)); if (NdisInterrupt->IsrRequested) { + NDIS_DbgPrint(MAX_TRACE, ("Calling MiniportISR\n")); (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.ISRHandler)( &InterruptRecognized, &QueueMiniportHandleInterrupt, NdisMiniportBlock->MiniportAdapterContext); } else if (NdisMiniportBlock->DriverHandle->MiniportCharacteristics.DisableInterruptHandler) { + NDIS_DbgPrint(MAX_TRACE, ("Calling MiniportDisableInterrupt\n")); (*NdisMiniportBlock->DriverHandle->MiniportCharacteristics.DisableInterruptHandler)( NdisMiniportBlock->MiniportAdapterContext); QueueMiniportHandleInterrupt = TRUE; @@ -276,8 +278,10 @@ ASSERT(Adapter); /* only bus masters may call this routine */ - if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) + if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) { + NDIS_DbgPrint(MIN_TRACE, ("Not a bus master\n")); return NDIS_STATUS_NOT_SUPPORTED; + } DeviceObject = Adapter->NdisMiniportBlock.DeviceObject; @@ -564,10 +568,11 @@ ASSERT(Adapter); /* only bus masters may call this routine */ - ASSERT(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER); if(!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER) || - Adapter->NdisMiniportBlock.SystemAdapterObject == NULL) + Adapter->NdisMiniportBlock.SystemAdapterObject == NULL) { + NDIS_DbgPrint(MIN_TRACE, ("Not bus master or bad adapter object\n")); return; + } MapRegistersPerBaseRegister = ((Adapter->NdisMiniportBlock.MaximumPhysicalMapping - 2) / PAGE_SIZE) + 2; @@ -717,12 +722,15 @@ DmaBlock = ExAllocatePool(NonPagedPool, sizeof(NDIS_DMA_BLOCK)); - if (!DmaBlock) + if (!DmaBlock) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } DmaBlock->SystemAdapterObject = (PVOID)IoGetDmaAdapter(Adapter->NdisMiniportBlock.PhysicalDeviceObject, &DeviceDesc, &MapRegisters); if (!DmaBlock->SystemAdapterObject) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); ExFreePool(DmaBlock); return NDIS_STATUS_RESOURCES; } @@ -882,8 +890,10 @@ *PortOffset = MmMapIoSpace(TranslatedAddress, NumberOfPorts, MmNonCached); NDIS_DbgPrint(MAX_TRACE, ("Returning 0x%x for port range\n", *PortOffset)); - if(!*PortOffset) + if(!*PortOffset) { + NDIS_DbgPrint(MIN_TRACE, ("MmMapIoSpace failed\n")); return NDIS_STATUS_RESOURCES; + } return NDIS_STATUS_SUCCESS; } @@ -941,8 +951,10 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - if (!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) + if (!(Adapter->NdisMiniportBlock.Flags & NDIS_ATTRIBUTE_BUS_MASTER)) { + NDIS_DbgPrint(MIN_TRACE, ("Not a bus master\n")); return NDIS_STATUS_NOT_SUPPORTED; + } RtlZeroMemory(&DeviceDesc, sizeof(DEVICE_DESCRIPTION)); Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -41,8 +41,10 @@ Block = ExAllocatePoolWithTag(NonPagedPool, Length, Tag); *VirtualAddress = Block; - if (!Block) + if (!Block) { + NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate memory (%lx)\n", Length)); return NDIS_STATUS_FAILURE; + } return NDIS_STATUS_SUCCESS; } @@ -94,8 +96,10 @@ *VirtualAddress = ExAllocatePool(NonPagedPool, Length); } - if (!*VirtualAddress) + if (!*VirtualAddress) { + NDIS_DbgPrint(MIN_TRACE, ("Allocation failed (%lx, %lx)\n", MemoryFlags, Length)); return NDIS_STATUS_FAILURE; + } return NDIS_STATUS_SUCCESS; } @@ -241,7 +245,7 @@ if(!Memory) { - NDIS_DbgPrint(MID_TRACE, ("Insufficient resources\n")); + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return; } @@ -319,7 +323,7 @@ if(!Memory) { - NDIS_DbgPrint(MID_TRACE, ("Insufficient resources\n")); + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_FAILURE; } 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] Fri Jun 19 10:47:00 2009 @@ -210,7 +210,7 @@ if (CurrentEntry == &Adapter->ProtocolListHead) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("WARNING: No upper protocol layer.\n")); + NDIS_DbgPrint(MIN_TRACE, ("WARNING: No upper protocol layer.\n")); } while (CurrentEntry != &Adapter->ProtocolListHead) @@ -523,13 +523,13 @@ #if DBG if(!Adapter) { - NDIS_DbgPrint(MID_TRACE, ("Adapter object was null\n")); + NDIS_DbgPrint(MIN_TRACE, ("Adapter object was null\n")); return FALSE; } if(!Packet) { - NDIS_DbgPrint(MID_TRACE, ("Packet was null\n")); + NDIS_DbgPrint(MIN_TRACE, ("Packet was null\n")); return FALSE; } #endif @@ -538,7 +538,7 @@ if (!NdisBuffer) { - NDIS_DbgPrint(MID_TRACE, ("Packet contains no buffers.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Packet contains no buffers.\n")); return FALSE; } @@ -560,7 +560,7 @@ if (BufferLength < Length) { - NDIS_DbgPrint(MID_TRACE, ("Buffer is too small.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Buffer is too small.\n")); return FALSE; } @@ -597,7 +597,7 @@ if(IsListEmpty(&AdapterListHead)) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("No registered miniports for protocol to bind to\n")); + NDIS_DbgPrint(MIN_TRACE, ("No registered miniports for protocol to bind to\n")); return NULL; } @@ -632,7 +632,7 @@ } else { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Leaving (adapter not found).\n")); + NDIS_DbgPrint(MIN_TRACE, ("Leaving (adapter not found for %wZ).\n", AdapterName)); } return Adapter; @@ -654,13 +654,8 @@ * Size = Size of the passed buffer * Buffer = Buffer for the output * BytesWritten = Address of buffer to place number of bytes written - * NOTES: - * If the specified buffer is too small, a new buffer is allocated, - * and the query is attempted again * RETURNS: * Status of operation - * TODO: - * Is there any way to use the buffer provided by the protocol? */ { NDIS_STATUS NdisStatus; @@ -669,7 +664,10 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); NdisRequest = ExAllocatePool(NonPagedPool, sizeof(NDIS_REQUEST)); - if (!NdisRequest) return NDIS_STATUS_RESOURCES; + if (!NdisRequest) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); + return NDIS_STATUS_RESOURCES; + } RtlZeroMemory(NdisRequest, sizeof(NDIS_REQUEST)); @@ -903,6 +901,8 @@ } else { + NDIS_DbgPrint(MIN_TRACE, ("No work item to dequeue\n")); + return NDIS_STATUS_FAILURE; } } @@ -956,6 +956,7 @@ break; default: + NDIS_DbgPrint(MIN_TRACE, ("Bad request type\n")); Status = NDIS_STATUS_FAILURE; } } @@ -1747,6 +1748,7 @@ ExAllocatePool(PagedPool, ResourceListSize); if (Adapter->NdisMiniportBlock.AllocatedResources == NULL) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1755,6 +1757,7 @@ ExAllocatePool(PagedPool, ResourceListSize); if (!Adapter->NdisMiniportBlock.Resources) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); ExFreePool(Adapter->NdisMiniportBlock.AllocatedResources); ExInterlockedRemoveEntryList(&Adapter->ListEntry, &AdapterListLock); return STATUS_INSUFFICIENT_RESOURCES; @@ -1781,6 +1784,7 @@ ExAllocatePool(PagedPool, ResourceListSize); if (Adapter->NdisMiniportBlock.AllocatedResourcesTranslated == NULL) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1890,7 +1894,7 @@ if (SelectedMediumIndex >= MEDIA_ARRAY_SIZE) { - NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() failed for an adapter\n")); + NDIS_DbgPrint(MIN_TRACE, ("MiniportInitialize() selected a bad index\n")); ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return NDIS_STATUS_UNSUPPORTED_MEDIA; } @@ -1912,7 +1916,7 @@ if (NdisStatus != NDIS_STATUS_SUCCESS) { ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); - NDIS_DbgPrint(MAX_TRACE, ("MiniQueryInformation failed (%x)\n", NdisStatus)); + NDIS_DbgPrint(MIN_TRACE, ("MiniQueryInformation failed (%x)\n", NdisStatus)); return NdisStatus; } @@ -1930,14 +1934,13 @@ /* FIXME: Support other types of media */ NDIS_DbgPrint(MIN_TRACE, ("error: unsupported media\n")); ASSERT(FALSE); -/* FIXME - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); */ ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_UNSUCCESSFUL; } if (NdisStatus != NDIS_STATUS_SUCCESS) { - NDIS_DbgPrint(MAX_TRACE, ("couldn't create filter (%x)\n", NdisStatus)); + NDIS_DbgPrint(MIN_TRACE, ("couldn't create filter (%x)\n", NdisStatus)); return NdisStatus; } @@ -2100,6 +2103,8 @@ { Status = NdisIPnPStartDevice(DeviceObject, Irp); } + else + NDIS_DbgPrint(MIN_TRACE, ("Lower driver failed device start\n")); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); break; @@ -2110,6 +2115,8 @@ { Status = NdisIPnPStopDevice(DeviceObject, Irp); } + else + NDIS_DbgPrint(MIN_TRACE, ("Lower driver failed device stop\n")); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); break; @@ -2176,8 +2183,8 @@ MiniportPtr = IoGetDriverObjectExtension(DriverObject, (PVOID)TAG('D','I','M','N')); if (MiniportPtr == NULL) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get driver object extension.\n")); - return STATUS_UNSUCCESSFUL; + NDIS_DbgPrint(MIN_TRACE, ("Can't get driver object extension.\n")); + return NDIS_STATUS_FAILURE; } Miniport = *MiniportPtr; @@ -2193,7 +2200,7 @@ 0, NULL, &DriverKeyLength); if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_SUCCESS) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key length.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Can't get miniport driver key length.\n")); return Status; } @@ -2201,7 +2208,7 @@ sizeof(ClassKeyName) + sizeof(LinkageKeyName)); if (LinkageKeyBuffer == NULL) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't allocate memory for driver key name.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Can't allocate memory for driver key name.\n")); return STATUS_INSUFFICIENT_RESOURCES; } @@ -2211,7 +2218,7 @@ &DriverKeyLength); if (!NT_SUCCESS(Status)) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Can't get miniport driver key.\n")); ExFreePool(LinkageKeyBuffer); return Status; } @@ -2239,7 +2246,7 @@ ExFreePool(LinkageKeyBuffer); if (!NT_SUCCESS(Status)) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport device name. (%x)\n", Status)); + NDIS_DbgPrint(MIN_TRACE, ("Can't get miniport device name. (%x)\n", Status)); return Status; } @@ -2428,7 +2435,7 @@ sizeof(PNDIS_M_DRIVER_BLOCK), (PVOID*)&MiniportPtr); if (!NT_SUCCESS(Status)) { - NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't allocate driver object extension.\n")); + NDIS_DbgPrint(MIN_TRACE, ("Can't allocate driver object extension.\n")); return NDIS_STATUS_RESOURCES; } @@ -2718,8 +2725,10 @@ AdapterName.Length = 0; AdapterName.MaximumLength = Adapter->NdisMiniportBlock.MiniportName.MaximumLength; AdapterName.Buffer = ExAllocatePool(PagedPool, AdapterName.MaximumLength); - if (!AdapterName.Buffer) + if (!AdapterName.Buffer) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } RtlCopyUnicodeString(&AdapterName, &Adapter->NdisMiniportBlock.MiniportName); @@ -2865,6 +2874,7 @@ if (!NT_SUCCESS(Status)) { + NDIS_DbgPrint(MIN_TRACE, ("IoCreateDevice failed (%x)\n", Status)); return Status; } @@ -2872,6 +2882,7 @@ if (!NT_SUCCESS(Status)) { + NDIS_DbgPrint(MIN_TRACE, ("IoCreateSymbolicLink failed (%x)\n", Status)); IoDeleteDevice(DeviceObject); return Status; } @@ -2880,6 +2891,7 @@ if (!DeviceBlock) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); IoDeleteDevice(DeviceObject); IoDeleteSymbolicLink(SymbolicName); return NDIS_STATUS_RESOURCES; Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Fri Jun 19 10:47:00 2009 @@ -158,6 +158,7 @@ if (HandleObject->Mapped) { /* If a file already mapped we will return an error code */ + NDIS_DbgPrint(MIN_TRACE, ("File already mapped\n")); *Status = NDIS_STATUS_ALREADY_MAPPED; return; } @@ -247,6 +248,7 @@ if ( !FullFileName.Buffer ) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); *Status = NDIS_STATUS_RESOURCES; goto cleanup; } @@ -254,6 +256,7 @@ FileHandleObject = ExAllocatePool ( NonPagedPool, sizeof(NDIS_HANDLE_OBJECT) ); if ( !FileHandleObject ) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); *Status = NDIS_STATUS_RESOURCES; goto cleanup; } @@ -263,6 +266,7 @@ *Status = RtlAppendUnicodeStringToString ( &FullFileName, FileName ); if ( !NT_SUCCESS(*Status) ) { + NDIS_DbgPrint(MIN_TRACE, ("RtlAppendUnicodeStringToString failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; goto cleanup; } @@ -288,6 +292,7 @@ if ( !NT_SUCCESS(*Status) ) { + NDIS_DbgPrint(MIN_TRACE, ("ZwCreateFile failed (%x)\n", *Status)); *Status = NDIS_STATUS_FAILURE; } 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] Fri Jun 19 10:47:00 2009 @@ -36,8 +36,10 @@ PNET_PNP_EVENT PnPEvent; PnPEvent = ExAllocatePool(PagedPool, sizeof(NET_PNP_EVENT)); - if (!PnPEvent) + if (!PnPEvent) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NULL; + } RtlZeroMemory(PnPEvent, sizeof(NET_PNP_EVENT)); @@ -48,6 +50,7 @@ PnPEvent->Buffer = ExAllocatePool(PagedPool, EventBufferLength); if (!PnPEvent->Buffer) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); ExFreePool(PnPEvent); return NULL; } @@ -117,8 +120,10 @@ ASSERT(Stack->Parameters.Power.Type == DevicePowerState); PnPEvent = ProSetupPnPEvent(NetEventSetPower, &Stack->Parameters.Power.State, sizeof(NDIS_DEVICE_POWER_STATE)); - if (!PnPEvent) + if (!PnPEvent) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp); } @@ -136,8 +141,10 @@ ASSERT(Stack->Parameters.Power.Type == DevicePowerState); PnPEvent = ProSetupPnPEvent(NetEventQueryPower, &Stack->Parameters.Power.State, sizeof(NDIS_DEVICE_POWER_STATE)); - if (!PnPEvent) + if (!PnPEvent) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp); } @@ -153,8 +160,10 @@ PNET_PNP_EVENT PnPEvent; PnPEvent = ProSetupPnPEvent(NetEventQueryRemoveDevice, NULL, 0); - if (!PnPEvent) + if (!PnPEvent) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp); } @@ -169,8 +178,10 @@ PNET_PNP_EVENT PnPEvent; PnPEvent = ProSetupPnPEvent(NetEventCancelRemoveDevice, NULL, 0); - if (!PnPEvent) + if (!PnPEvent) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } return ProSendAndFreePnPEvent(Adapter, PnPEvent, Irp); } @@ -198,7 +209,10 @@ { PROTOCOL_BINDING *Protocol = (PROTOCOL_BINDING *)BindAdapterContext; - if (!NT_SUCCESS(Status)) return; + if (!NT_SUCCESS(Status)) { + NDIS_DbgPrint(MIN_TRACE, ("Binding failed (%x)\n", Status)); + return; + } /* Put protocol binding struct on global list */ ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); @@ -219,7 +233,10 @@ PROTOCOL_BINDING *Protocol = (PROTOCOL_BINDING *)UnbindAdapterContext; - if (!NT_SUCCESS(Status)) return; + if (!NT_SUCCESS(Status)) { + NDIS_DbgPrint(MIN_TRACE, ("Unbinding failed (%x)\n", Status)); + return; + } ExInterlockedRemoveEntryList(&Protocol->ListEntry, &ProtocolListLock); } @@ -252,8 +269,10 @@ #endif LookaheadBuffer = ExAllocatePool(NonPagedPool, Adapter->NdisMiniportBlock.CurrentLookahead + Adapter->MediumHeaderSize); - if (!LookaheadBuffer) + if (!LookaheadBuffer) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } NdisQueryPacket(Packet, NULL, NULL, NULL, &PacketLength); @@ -497,8 +516,10 @@ &PacketLength); Context = ExAllocatePool(NonPagedPool, sizeof(DMA_CONTEXT)); - if (!Context) + if (!Context) { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n")); return NDIS_STATUS_RESOURCES; + } Context->Adapter = Adapter; Context->Packet = Packet; @@ -520,7 +541,7 @@ KeLowerIrql(OldIrql); if (!NT_SUCCESS(NdisStatus)) { - NDIS_DbgPrint(MIN_TRACE, ("GetScatterGatherList failed!\n")); + NDIS_DbgPrint(MIN_TRACE, ("GetScatterGatherList failed! (%x)\n", NdisStatus)); return NdisStatus; } @@ -760,7 +781,7 @@ if(!NdisProtocolHandle) { - NDIS_DbgPrint(MAX_TRACE, ("NdisProtocolHandle is NULL\n")); + NDIS_DbgPrint(MIN_TRACE, ("NdisProtocolHandle is NULL\n")); *OpenErrorStatus = *Status = NDIS_STATUS_FAILURE; return; } @@ -973,7 +994,7 @@ if(BindHandler) BindHandler(Status, BindContext, &DeviceName, &RegistryPath, 0); else - NDIS_DbgPrint(MID_TRACE, ("No protocol bind handler specified\n")); + NDIS_DbgPrint(MIN_TRACE, ("No protocol bind handler specified\n")); } } @@ -1081,6 +1102,7 @@ if (*Status == NDIS_STATUS_SUCCESS) { ExInterlockedInsertTailList(&ProtocolListHead, &Protocol->ListEntry, &ProtocolListLock); } else { + NDIS_DbgPrint(MIN_TRACE, ("Binding failed (%x)\n", *Status)); ExFreePool(Protocol); *NdisProtocolHandle = NULL; } @@ -1225,6 +1247,7 @@ if (!Binding) { + NDIS_DbgPrint(MIN_TRACE, ("Bad binding handle\n")); *NdisDriverHandle = NULL; return; }

1 0

[cgutman] 41460: - Make CancelId a LONG
by cgutman＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: cgutman Date: Fri Jun 19 09:12:20 2009 New Revision: 41460 URL: http://svn.reactos.org/svn/reactos?rev=41460&view=rev Log: - Make CancelId a LONG Modified: trunk/reactos/drivers/network/ndis/ndis/main.c trunk/reactos/drivers/network/ndis/ndis/misc.c Modified: trunk/reactos/drivers/network/ndis/ndis/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/main.c [iso-8859-1] Fri Jun 19 09:12:20 2009 @@ -21,7 +21,7 @@ #endif /* DBG */ -UCHAR CancelId; +LONG CancelId; VOID NTAPI MainUnload( Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Fri Jun 19 09:12:20 2009 @@ -6,7 +6,7 @@ #include "ndissys.h" -extern UCHAR CancelId; +extern LONG CancelId; /* * @implemented @@ -522,7 +522,7 @@ { UCHAR PartialCancelId; - PartialCancelId = InterlockedIncrement((PLONG)&CancelId); + PartialCancelId = (UCHAR)InterlockedIncrement(&CancelId); NDIS_DbgPrint(MAX_TRACE, ("Cancel ID %u\n", PartialCancelId));

1 0

[hyperion] 41459: modified tools/rbuild/backend/mingw/compilers/gcc.mak modified tools/rbuild/backend/mingw/compilers/msc.mak New rules for C preprocessor that compiles to standard output (RBUILD_PIPE_CPP, RBUILD_PIPE_CXX_CPP) modified tools/rbuild/backend/mingw/rules.mak Use RBUILD_PIPE_CPP in RBUILD_WRC_RULE, instead of hardcoding GCC
by hyperion＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: hyperion Date: Fri Jun 19 06:28:33 2009 New Revision: 41459 URL: http://svn.reactos.org/svn/reactos?rev=41459&view=rev Log: modified tools/rbuild/backend/mingw/compilers/gcc.mak modified tools/rbuild/backend/mingw/compilers/msc.mak New rules for C preprocessor that compiles to standard output (RBUILD_PIPE_CPP, RBUILD_PIPE_CXX_CPP) modified tools/rbuild/backend/mingw/rules.mak Use RBUILD_PIPE_CPP in RBUILD_WRC_RULE, instead of hardcoding GCC Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak trunk/reactos/tools/rbuild/backend/mingw/rules.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Fri Jun 19 06:28:33 2009 @@ -30,12 +30,16 @@ endef +#(source, cflags) +RBUILD_PIPE_CPP=$${gcc} $(2) -xc -E $(1) +RBUILD_PIPE_CXX_CPP=$${gpp} $(2) -E $(1) + #(module, source, dependencies, cflags, output) define RBUILD_CPP $(5): $(2) $(3) | ${call RBUILD_dir,$(5)} $$(ECHO_CPP) - $${gcc} -xc -E $(4) $$< > $$@ + ${call RBUILD_PIPE_CPP,$$<,$(4)} > $$@ endef @@ -44,7 +48,7 @@ $(5): $(2) $(3) | ${call RBUILD_dir,$(5)} $$(ECHO_CPP) - $${gpp} -E $(4) $$< > $$@ + ${call RBUILD_PIPE_CXX_CPP,$$<,$(4)} > $$@ endef Modified: trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/compilers/msc.mak [iso-8859-1] Fri Jun 19 06:28:33 2009 @@ -23,17 +23,22 @@ RBUILD_DEPENDS=${call RBUILD_CL_DEPENDS,$(1),$(2),$(3),$(4) /TC,$(5)} RBUILD_CXX_DEPENDS=${call RBUILD_CL_DEPENDS,$(1),$(2),$(3),$(4) /TP,$(5)} +#(source, cflags) +RBUILD_PIPE_CL_CPP=$${cl} $(2) /E $(1) +RBUILD_PIPE_CPP=${call RBUILD_PIPE_CL_CPP,$(1),$(2) /TC} +RBUILD_PIPE_CXX_CPP=${call RBUILD_PIPE_CL_CPP,$(1),$(2) /TP} + #(module, source, dependencies, cflags, output) define RBUILD_CL_CPP $(5): $(2) $(3) $$(RBUILD_HELPER_TARGET) | ${call RBUILD_dir,$(5)} $$(ECHO_CPP) - $${cl} /E $(4) $$< > $$@ + ${call RBUILD_PIPE_CL_CPP,$$<,$(4)} > $$@ endef RBUILD_CPP=${call RBUILD_CL_CPP,$(1),$(2),$(3),$(4) /TC,$(5)} -RBUILD_CXX_CPP=${call RBUILD_CL_CPP,$(1),$(2),$(3),$(4) /TPP,$(5)} +RBUILD_CXX_CPP=${call RBUILD_CL_CPP,$(1),$(2),$(3),$(4) /TP,$(5)} #(module, source, dependencies, cflags, output) define RBUILD_CC Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/rules.mak [iso-8859-1] Fri Jun 19 06:28:33 2009 @@ -209,13 +209,13 @@ ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res.d $(3) $$(WRC_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_RC) - $${gcc} -xc ${call RBUILD_rc_pp_flags,$(1),$(4)} -E $$< | $$(WRC_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} + ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(WRC_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} else ${call RBUILD_intermediate_path_unique,$(1),$(2)}.res: $(2) $(3) $$(WRC_TARGET) | ${call RBUILD_intermediate_dir,$(2)} $$(ECHO_RC) - $${gcc} -xc ${call RBUILD_rc_pp_flags,$(1),$(4)} -E $$< | $$(WRC_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} + ${call RBUILD_PIPE_CPP,$$<,${call RBUILD_rc_pp_flags,$(1),$(4)}} | $$(WRC_TARGET) -o $$@ ${call RBUILD_rc_flags,$(1),$(4),-I${call RBUILD_dir,$(2)}} endif

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
50
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009