Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 41472: better stub for LsaEnumerateAccountRights
by cwittich＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: cwittich Date: Sat Jun 20 01:54:19 2009 New Revision: 41472 URL: http://svn.reactos.org/svn/reactos?rev=41472&view=rev Log: better stub for LsaEnumerateAccountRights Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Sat Jun 20 01:54:19 2009 @@ -228,7 +228,9 @@ PULONG CountOfRights) { FIXME("(%p,%p,%p,%p) stub\n", PolicyHandle, AccountSid, UserRights, CountOfRights); - return STATUS_NOT_IMPLEMENTED; + *UserRights = 0; + *CountOfRights = 0; + return STATUS_OBJECT_NAME_NOT_FOUND; } /*

1 0

[sginsberg] 41471: - Define noreturn attribute for KeBugCheck/Ex in a msvc-compatible way
by sginsberg＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: sginsberg Date: Fri Jun 19 23:43:41 2009 New Revision: 41471 URL: http://svn.reactos.org/svn/reactos?rev=41471&view=rev Log: - Define noreturn attribute for KeBugCheck/Ex in a msvc-compatible way Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Fri Jun 19 23:43:41 2009 @@ -8165,16 +8165,16 @@ VOID); NTKERNELAPI -VOID -NTAPI -__declspec(noreturn) +DECLSPEC_NORETURN +VOID +NTAPI KeBugCheck( IN ULONG BugCheckCode); NTKERNELAPI -VOID -NTAPI -__declspec(noreturn) +DECLSPEC_NORETURN +VOID +NTAPI KeBugCheckEx( IN ULONG BugCheckCode, IN ULONG_PTR BugCheckParameter1,

1 0

[sginsberg] 41470: - Define UNREFERENCED_PARAMETER for cmlib when built as host and reapply 41455.
by sginsberg＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: sginsberg Date: Fri Jun 19 20:05:16 2009 New Revision: 41470 URL: http://svn.reactos.org/svn/reactos?rev=41470&view=rev Log: - Define UNREFERENCED_PARAMETER for cmlib when built as host and reapply 41455. Modified: trunk/reactos/lib/cmlib/cmlib.h trunk/reactos/lib/cmlib/hivecell.c trunk/reactos/lib/cmlib/hiveinit.c Modified: trunk/reactos/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=4147… ============================================================================== --- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Fri Jun 19 20:05:16 2009 @@ -59,6 +59,7 @@ IN PRTL_BITMAP BitMapHeader); #define RtlCheckBit(BMH,BP) (((((PLONG)(BMH)->Buffer)[(BP) / 32]) >> ((BP) % 32)) & 0x1) + #define UNREFERENCED_PARAMETER(P) {(P)=(P);} #define PKTHREAD PVOID #define PKGUARDED_MUTEX PVOID Modified: trunk/reactos/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hivecell.c?rev=4… ============================================================================== --- trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hivecell.c [iso-8859-1] Fri Jun 19 20:05:16 2009 @@ -79,6 +79,7 @@ PHHIVE RegistryHive, PVOID Cell) { + UNREFERENCED_PARAMETER(RegistryHive); return ((PHCELL)Cell - 1)->Size; } @@ -88,6 +89,8 @@ { PHCELL CellHeader; LONG Size; + + UNREFERENCED_PARAMETER(Hive); CellHeader = (PHCELL)Address - 1; Size = CellHeader->Size * -1; Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=4… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Fri Jun 19 20:05:16 2009 @@ -445,6 +445,9 @@ NTSTATUS Status; PHHIVE Hive = RegistryHive; + UNREFERENCED_PARAMETER(HiveType); + UNREFERENCED_PARAMETER(FileName); + /* * Create a new hive structure that will hold all the maintenance data. */

1 0

[janderwald] 41469: - Fix build
by janderwald＠svn.reactos.org 19 Jun '09

19 Jun '09

Author: janderwald Date: Fri Jun 19 17:59:27 2009 New Revision: 41469 URL: http://svn.reactos.org/svn/reactos?rev=41469&view=rev Log: - Fix build Modified: trunk/reactos/include/psdk/ks.h 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 17:59:27 2009 @@ -2471,12 +2471,13 @@ /* =============================================================== XP / DX8 */ - +#if defined(_NTDDK_) struct _KSMAPPING { PHYSICAL_ADDRESS PhysicalAddress; ULONG ByteCount; ULONG Alignment; }; +#endif struct _KSSTREAM_POINTER_OFFSET {

1 0

[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

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