Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 41625: - Add STREAM_DEBUG_LEVEL
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Fri Jun 26 20:30:44 2009 New Revision: 41625 URL: http://svn.reactos.org/svn/reactos?rev=41625&view=rev Log: - Add STREAM_DEBUG_LEVEL Modified: trunk/reactos/include/ddk/strmini.h Modified: trunk/reactos/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/strmini.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/strmini.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/strmini.h [iso-8859-1] Fri Jun 26 20:30:44 2009 @@ -1,13 +1,23 @@ #ifndef _STREAM_H #define _STREAM_H -#include <wdm.h> -#include <windef.h> -#include <stdio.h> +#include <ntddk.h> #include <ks.h> #define STREAMAPI __stdcall #define STREAM_SYSTEM_TIME_MASK ((STREAM_SYSTEM_TIME)0x00000001FFFFFFFF) + +typedef enum +{ + DebugLevelFatal = 0, + DebugLevelError, + DebugLevelWarning, + DebugLevelInfo, + DebugLevelTrace, + DebugLevelVerbose, + DebugLevelMaximum +}STREAM_DEBUG_LEVEL; + #if DBG @@ -24,7 +34,7 @@ #define DEBUG_ASSERT(exp) #endif - + typedef PHYSICAL_ADDRESS STREAM_PHYSICAL_ADDRESS, *PSTREAM_PHYSICAL_ADDRESS; typedef unsigned __int64 STREAM_SYSTEM_TIME, *PSTREAM_SYSTEM_TIME; typedef unsigned __int64 STREAM_TIMESTAMP, *PSTREAM_TIMESTAMP; @@ -51,7 +61,7 @@ PKSEVENT_ENTRY EventEntry; PKSEVENTDATA EventData; union - { + { struct _HW_STREAM_OBJECT * StreamObject; struct _HW_DEVICE_EXTENSION *DeviceExtension; }; @@ -60,6 +70,7 @@ ULONG Reserved; } HW_EVENT_DESCRIPTOR, *PHW_EVENT_DESCRIPTOR; +struct _HW_STREAM_REQUEST_BLOCK; typedef VOID (STREAMAPI * PHW_RECEIVE_STREAM_DATA_SRB) (IN struct _HW_STREAM_REQUEST_BLOCK * SRB); typedef VOID (STREAMAPI * PHW_RECEIVE_STREAM_CONTROL_SRB) (IN struct _HW_STREAM_REQUEST_BLOCK * SRB); @@ -531,12 +542,12 @@ #define StreamClassRegisterMinidriver StreamClassRegisterAdapter -NTSTATUS +NTSTATUS StreamClassRegisterFilterWithNoKSPins( IN PDEVICE_OBJECT DeviceObject, IN const GUID * InterfaceClassGUID, IN ULONG PinCount, - IN BOOL * PinDirection, + IN BOOLEAN * PinDirection, IN KSPIN_MEDIUM * MediumList, IN GUID * CategoryList ); @@ -559,4 +570,4 @@ IN ... ); -#endif +#endif

1 0

[janderwald] 41624: - Write strmini.h for stream class driver
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Fri Jun 26 19:51:14 2009 New Revision: 41624 URL: http://svn.reactos.org/svn/reactos?rev=41624&view=rev Log: - Write strmini.h for stream class driver Added: trunk/reactos/include/ddk/strmini.h (with props) Added: trunk/reactos/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/strmini.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/strmini.h (added) +++ trunk/reactos/include/ddk/strmini.h [iso-8859-1] Fri Jun 26 19:51:14 2009 @@ -1,0 +1,562 @@ +#ifndef _STREAM_H +#define _STREAM_H + +#include <wdm.h> +#include <windef.h> +#include <stdio.h> +#include <ks.h> + +#define STREAMAPI __stdcall +#define STREAM_SYSTEM_TIME_MASK ((STREAM_SYSTEM_TIME)0x00000001FFFFFFFF) + +#if DBG + +#define DebugPrint(x) StreamClassDebugPrint x +#define DEBUG_BREAKPOINT() DbgBreakPoint() +#define DEBUG_ASSERT(exp) \ + if ( !(exp) ) { \ + StreamClassDebugAssert( __FILE__, __LINE__, #exp, exp); \ + } +#else + +#define DebugPrint(x) +#define DEBUG_BREAKPOINT() +#define DEBUG_ASSERT(exp) + +#endif + +typedef PHYSICAL_ADDRESS STREAM_PHYSICAL_ADDRESS, *PSTREAM_PHYSICAL_ADDRESS; +typedef unsigned __int64 STREAM_SYSTEM_TIME, *PSTREAM_SYSTEM_TIME; +typedef unsigned __int64 STREAM_TIMESTAMP, *PSTREAM_TIMESTAMP; + +typedef enum +{ + TIME_GET_STREAM_TIME, + TIME_READ_ONBOARD_CLOCK, + TIME_SET_ONBOARD_CLOCK +}TIME_FUNCTION; + +typedef struct _HW_TIME_CONTEXT +{ + struct _HW_DEVICE_EXTENSION *HwDeviceExtension; + struct _HW_STREAM_OBJECT *HwStreamObject; + TIME_FUNCTION Function; + ULONGLONG Time; + ULONGLONG SystemTime; +}HW_TIME_CONTEXT, *PHW_TIME_CONTEXT; + +typedef struct _HW_EVENT_DESCRIPTOR +{ + BOOLEAN Enable; + PKSEVENT_ENTRY EventEntry; + PKSEVENTDATA EventData; + union + { + struct _HW_STREAM_OBJECT * StreamObject; + struct _HW_DEVICE_EXTENSION *DeviceExtension; + }; + ULONG EnableEventSetIndex; + PVOID HwInstanceExtension; + ULONG Reserved; +} HW_EVENT_DESCRIPTOR, *PHW_EVENT_DESCRIPTOR; + + +typedef VOID (STREAMAPI * PHW_RECEIVE_STREAM_DATA_SRB) (IN struct _HW_STREAM_REQUEST_BLOCK * SRB); +typedef VOID (STREAMAPI * PHW_RECEIVE_STREAM_CONTROL_SRB) (IN struct _HW_STREAM_REQUEST_BLOCK * SRB); +typedef NTSTATUS (STREAMAPI * PHW_EVENT_ROUTINE) (IN PHW_EVENT_DESCRIPTOR EventDescriptor); +typedef VOID (STREAMAPI * PHW_CLOCK_FUNCTION) (IN PHW_TIME_CONTEXT HwTimeContext); + +typedef struct _HW_CLOCK_OBJECT +{ + PHW_CLOCK_FUNCTION HwClockFunction; + ULONG ClockSupportFlags; + ULONG Reserved[2]; +} HW_CLOCK_OBJECT, *PHW_CLOCK_OBJECT; + +#define CLOCK_SUPPORT_CAN_SET_ONBOARD_CLOCK 0x1 +#define CLOCK_SUPPORT_CAN_READ_ONBOARD_CLOCK 0x2 +#define CLOCK_SUPPORT_CAN_RETURN_STREAM_TIME 0x4 + +typedef struct _HW_STREAM_OBJECT +{ + ULONG SizeOfThisPacket; + ULONG StreamNumber; + PVOID HwStreamExtension; + PHW_RECEIVE_STREAM_DATA_SRB ReceiveDataPacket; + PHW_RECEIVE_STREAM_CONTROL_SRB ReceiveControlPacket; + HW_CLOCK_OBJECT HwClockObject; + BOOLEAN Dma; + BOOLEAN Pio; + PVOID HwDeviceExtension; + ULONG StreamHeaderMediaSpecific; + ULONG StreamHeaderWorkspace; + BOOLEAN Allocator; + PHW_EVENT_ROUTINE HwEventRoutine; + ULONG Reserved[2]; +} HW_STREAM_OBJECT, *PHW_STREAM_OBJECT; + +typedef struct _HW_STREAM_HEADER +{ + ULONG NumberOfStreams; + ULONG SizeOfHwStreamInformation; + ULONG NumDevPropArrayEntries; + PKSPROPERTY_SET DevicePropertiesArray; + ULONG NumDevEventArrayEntries; + PKSEVENT_SET DeviceEventsArray; + PKSTOPOLOGY Topology; + PHW_EVENT_ROUTINE DeviceEventRoutine; + LONG NumDevMethodArrayEntries; + PKSMETHOD_SET DeviceMethodsArray; +}HW_STREAM_HEADER, *PHW_STREAM_HEADER; + +typedef struct _HW_STREAM_INFORMATION +{ + ULONG NumberOfPossibleInstances; + KSPIN_DATAFLOW DataFlow; + BOOLEAN DataAccessible; + ULONG NumberOfFormatArrayEntries; + PKSDATAFORMAT* StreamFormatsArray; + PVOID ClassReserved[4]; + ULONG NumStreamPropArrayEntries; + PKSPROPERTY_SET StreamPropertiesArray; + ULONG NumStreamEventArrayEntries; + PKSEVENT_SET StreamEventsArray; + GUID* Category; + GUID* Name; + ULONG MediumsCount; + const KSPIN_MEDIUM* Mediums; + BOOLEAN BridgeStream; + ULONG Reserved[2]; +}HW_STREAM_INFORMATION, *PHW_STREAM_INFORMATION; + + +typedef struct _HW_STREAM_DESCRIPTOR +{ + HW_STREAM_HEADER StreamHeader; + HW_STREAM_INFORMATION StreamInfo; +} HW_STREAM_DESCRIPTOR, *PHW_STREAM_DESCRIPTOR; + +typedef struct _STREAM_TIME_REFERENCE +{ + STREAM_TIMESTAMP CurrentOnboardClockValue; + LARGE_INTEGER OnboardClockFrequency; + LARGE_INTEGER CurrentSystemTime; + ULONG Reserved[2]; +}STREAM_TIME_REFERENCE, *PSTREAM_TIME_REFERENCE; + +typedef struct _STREAM_DATA_INTERSECT_INFO +{ + ULONG StreamNumber; + PKSDATARANGE DataRange; + PVOID DataFormatBuffer; + ULONG SizeOfDataFormatBuffer; + +}STREAM_DATA_INTERSECT_INFO, *PSTREAM_DATA_INTERSECT_INFO; + +typedef struct _STREAM_PROPERTY_DESCRIPTOR +{ + PKSPROPERTY Property; + ULONG PropertySetID; + PVOID PropertyInfo; + ULONG PropertyInputSize; + ULONG PropertyOutputSize; +}STREAM_PROPERTY_DESCRIPTOR, *PSTREAM_PROPERTY_DESCRIPTOR; + +typedef struct _STREAM_METHOD_DESCRIPTOR +{ + ULONG MethodSetID; + PKSMETHOD Method; + PVOID MethodInfo; + LONG MethodInputSize; + LONG MethodOutputSize; +} STREAM_METHOD_DESCRIPTOR, *PSTREAM_METHOD_DESCRIPTOR; + +#define STREAM_REQUEST_BLOCK_SIZE sizeof(STREAM_REQUEST_BLOCK) + +typedef enum _SRB_COMMAND +{ + SRB_READ_DATA, + SRB_WRITE_DATA, + SRB_GET_STREAM_STATE, + SRB_SET_STREAM_STATE, + SRB_SET_STREAM_PROPERTY, + SRB_GET_STREAM_PROPERTY, + SRB_OPEN_MASTER_CLOCK, + + SRB_INDICATE_MASTER_CLOCK, + SRB_UNKNOWN_STREAM_COMMAND, + SRB_SET_STREAM_RATE, + SRB_PROPOSE_DATA_FORMAT, + SRB_CLOSE_MASTER_CLOCK, + SRB_PROPOSE_STREAM_RATE, + SRB_SET_DATA_FORMAT, + SRB_GET_DATA_FORMAT, + SRB_BEGIN_FLUSH, + SRB_END_FLUSH, + + SRB_GET_STREAM_INFO = 0x100, + SRB_OPEN_STREAM, + SRB_CLOSE_STREAM, + SRB_OPEN_DEVICE_INSTANCE, + SRB_CLOSE_DEVICE_INSTANCE, + SRB_GET_DEVICE_PROPERTY, + SRB_SET_DEVICE_PROPERTY, + SRB_INITIALIZE_DEVICE, + SRB_CHANGE_POWER_STATE, + SRB_UNINITIALIZE_DEVICE, + SRB_UNKNOWN_DEVICE_COMMAND, + SRB_PAGING_OUT_DRIVER, + SRB_GET_DATA_INTERSECTION, + SRB_INITIALIZATION_COMPLETE, + SRB_SURPRISE_REMOVAL + +#if (NTDDI_VERSION >= NTDDI_WINXP) + + ,SRB_DEVICE_METHOD + ,SRB_STREAM_METHOD + +#if ( (NTDDI_VERSION >= NTDDI_WINXPSP2) && (NTDDI_VERSION < NTDDI_WS03) ) || (NTDDI_VERSION >= NTDDI_WS03SP1) + + ,SRB_NOTIFY_IDLE_STATE + +#endif + +#endif + +}SRB_COMMAND; + +typedef struct +{ + PHYSICAL_ADDRESS PhysicalAddress; + ULONG Length; +} KSSCATTER_GATHER, *PKSSCATTER_GATHER; + + +typedef struct _HW_STREAM_REQUEST_BLOCK +{ + ULONG SizeOfThisPacket; + SRB_COMMAND Command; + NTSTATUS Status; + PHW_STREAM_OBJECT StreamObject; + PVOID HwDeviceExtension; + PVOID SRBExtension; + + union _CommandData + { + PKSSTREAM_HEADER DataBufferArray; + PHW_STREAM_DESCRIPTOR StreamBuffer; + KSSTATE StreamState; + PSTREAM_TIME_REFERENCE TimeReference; + PSTREAM_PROPERTY_DESCRIPTOR PropertyInfo; + PKSDATAFORMAT OpenFormat; + struct _PORT_CONFIGURATION_INFORMATION *ConfigInfo; + HANDLE MasterClockHandle; + DEVICE_POWER_STATE DeviceState; + PSTREAM_DATA_INTERSECT_INFO IntersectInfo; + +#if (NTDDI_VERSION >= NTDDI_WINXP) + PVOID MethodInfo; + LONG FilterTypeIndex; +#if ( (NTDDI_VERSION >= NTDDI_WINXPSP2) && (NTDDI_VERSION < NTDDI_WS03) ) || (NTDDI_VERSION >= NTDDI_WS03SP1) + BOOLEAN Idle; +#endif +#endif + + }CommandData; + + ULONG NumberOfBuffers; + ULONG TimeoutCounter; + ULONG TimeoutOriginal; + struct _HW_STREAM_REQUEST_BLOCK *NextSRB; + + PIRP Irp; + ULONG Flags; + PVOID HwInstanceExtension; + + union + { + ULONG NumberOfBytesToTransfer; + ULONG ActualBytesTransferred; + }; + + PKSSCATTER_GATHER ScatterGatherBuffer; + ULONG NumberOfPhysicalPages; + ULONG NumberOfScatterGatherElements; + ULONG Reserved[1]; + +}HW_STREAM_REQUEST_BLOCK, *PHW_STREAM_REQUEST_BLOCK; + +#define SRB_HW_FLAGS_DATA_TRANSFER 0x01 +#define SRB_HW_FLAGS_STREAM_REQUEST 0x2 + +typedef enum +{ + PerRequestExtension, + DmaBuffer, + SRBDataBuffer +}STREAM_BUFFER_TYPE; + +typedef struct _ACCESS_RANGE +{ + STREAM_PHYSICAL_ADDRESS RangeStart; + ULONG RangeLength; + BOOLEAN RangeInMemory; + ULONG Reserved; +}ACCESS_RANGE, *PACCESS_RANGE; + +typedef struct _PORT_CONFIGURATION_INFORMATION +{ + ULONG SizeOfThisPacket; + PVOID HwDeviceExtension; + PDEVICE_OBJECT ClassDeviceObject; + PDEVICE_OBJECT PhysicalDeviceObject; + ULONG SystemIoBusNumber; + INTERFACE_TYPE AdapterInterfaceType; + ULONG BusInterruptLevel; + ULONG BusInterruptVector; + KINTERRUPT_MODE InterruptMode; + ULONG DmaChannel; + ULONG NumberOfAccessRanges; + PACCESS_RANGE AccessRanges; + ULONG StreamDescriptorSize; + PIRP Irp; + PKINTERRUPT InterruptObject; + PADAPTER_OBJECT DmaAdapterObject; + PDEVICE_OBJECT RealPhysicalDeviceObject; + ULONG Reserved[1]; +}PORT_CONFIGURATION_INFORMATION, *PPORT_CONFIGURATION_INFORMATION; + +typedef VOID (STREAMAPI * PHW_RECEIVE_DEVICE_SRB) (IN PHW_STREAM_REQUEST_BLOCK SRB); +typedef VOID (STREAMAPI * PHW_CANCEL_SRB) (IN PHW_STREAM_REQUEST_BLOCK SRB); +typedef VOID (STREAMAPI * PHW_REQUEST_TIMEOUT_HANDLER) (IN PHW_STREAM_REQUEST_BLOCK SRB); +typedef BOOLEAN (STREAMAPI * PHW_INTERRUPT) (IN PVOID DeviceExtension); +typedef VOID (STREAMAPI * PHW_TIMER_ROUTINE) (IN PVOID Context); +typedef VOID (STREAMAPI * PHW_PRIORITY_ROUTINE) (IN PVOID Context); +typedef VOID (STREAMAPI * PHW_QUERY_CLOCK_ROUTINE) (IN PHW_TIME_CONTEXT TimeContext); +typedef BOOLEAN (STREAMAPI * PHW_RESET_ADAPTER) (IN PVOID DeviceExtension); + +typedef enum _STREAM_MINIDRIVER_STREAM_NOTIFICATION_TYPE +{ + ReadyForNextStreamDataRequest, + ReadyForNextStreamControlRequest, + HardwareStarved, + StreamRequestComplete, + SignalMultipleStreamEvents, + SignalStreamEvent, + DeleteStreamEvent, + StreamNotificationMaximum +}STREAM_MINIDRIVER_STREAM_NOTIFICATION_TYPE, *PSTREAM_MINIDRIVER_STREAM_NOTIFICATION_TYPE; + +typedef enum _STREAM_MINIDRIVER_DEVICE_NOTIFICATION_TYPE +{ + ReadyForNextDeviceRequest, + DeviceRequestComplete, + SignalMultipleDeviceEvents, + SignalDeviceEvent, + DeleteDeviceEvent, +#if (NTDDI_VERSION >= NTDDI_WINXP) + SignalMultipleDeviceInstanceEvents, +#endif + DeviceNotificationMaximum +} STREAM_MINIDRIVER_DEVICE_NOTIFICATION_TYPE, *PSTREAM_MINIDRIVER_DEVICE_NOTIFICATION_TYPE; + +#define STREAM_CLASS_VERSION_20 0x0200 + +typedef struct _HW_INITIALIZATION_DATA { +#if (NTDDI_VERSION >= NTDDI_WINXP) + union + { + ULONG HwInitializationDataSize; + struct + { + USHORT SizeOfThisPacket; + USHORT StreamClassVersion; + }; + }; +#else + ULONG HwInitializationDataSize; +#endif + + PHW_INTERRUPT HwInterrupt; + PHW_RECEIVE_DEVICE_SRB HwReceivePacket; + PHW_CANCEL_SRB HwCancelPacket; + PHW_REQUEST_TIMEOUT_HANDLER HwRequestTimeoutHandler; + ULONG DeviceExtensionSize; + ULONG PerRequestExtensionSize; + ULONG PerStreamExtensionSize; + ULONG FilterInstanceExtensionSize; + BOOLEAN BusMasterDMA; + BOOLEAN Dma24BitAddresses; + ULONG BufferAlignment; + BOOLEAN TurnOffSynchronization; + ULONG DmaBufferSize; + +#if (NTDDI_VERSION >= NTDDI_WINXP) + ULONG NumNameExtensions; + PWCHAR *NameExtensionArray; +#else + ULONG Reserved[2]; +#endif +} HW_INITIALIZATION_DATA, *PHW_INITIALIZATION_DATA; + +typedef enum _STREAM_PRIORITY +{ + High, + Dispatch, + Low, + LowToHigh +}STREAM_PRIORITY, *PSTREAM_PRIORITY; + + +VOID +StreamClassAbortOutstandingRequests( + IN PVOID HwDeviceExtension, + IN PHW_STREAM_OBJECT HwStreamObject, + IN NTSTATUS Status +); + +VOID +STREAMAPI +StreamClassCallAtNewPriority( + IN PHW_STREAM_OBJECT StreamObject, + IN PVOID HwDeviceExtension, + IN STREAM_PRIORITY Priority, + IN PHW_PRIORITY_ROUTINE PriorityRoutine, + IN PVOID Context + ); + +VOID +STREAMAPI +StreamClassCompleteRequestAndMarkQueueReady( + IN PHW_STREAM_REQUEST_BLOCK Srb +); + +VOID +STREAMAPI +StreamClassDebugAssert( + IN PCHAR File, + IN ULONG Line, + IN PCHAR AssertText, + IN ULONG AssertValue +); + +VOID +__cdecl +StreamClassDebugPrint( + IN STREAM_DEBUG_LEVEL DebugPrintLevel, + IN PCCHAR DebugMessage, + ... +); + +VOID +__cdecl +StreamClassDeviceNotification( + IN STREAM_MINIDRIVER_DEVICE_NOTIFICATION_TYPE NotificationType, + IN PVOID HwDeviceExtension, + ... +); + +VOID +STREAMAPI +StreamClassFilterReenumerateStreams( + IN PVOID HwInstanceExtension, + IN ULONG StreamDescriptorSize +); + +PVOID +STREAMAPI +StreamClassGetDmaBuffer( + IN PVOID HwDeviceExtension +); + + +PKSEVENT_ENTRY +StreamClassGetNextEvent( + IN PVOID HwInstanceExtension_OR_HwDeviceExtension, + IN PHW_STREAM_OBJECT HwStreamObject, + IN GUID * EventGuid, + IN ULONG EventItem, + IN PKSEVENT_ENTRY CurrentEvent +); + +STREAM_PHYSICAL_ADDRESS +STREAMAPI +StreamClassGetPhysicalAddress( + IN PVOID HwDeviceExtension, + IN PHW_STREAM_REQUEST_BLOCK HwSRB, + IN PVOID VirtualAddress, + IN STREAM_BUFFER_TYPE Type, + IN ULONG * Length +); + +VOID +StreamClassQueryMasterClock( + IN PHW_STREAM_OBJECT HwStreamObject, + IN HANDLE MasterClockHandle, + IN TIME_FUNCTION TimeFunction, + IN PHW_QUERY_CLOCK_ROUTINE ClockCallbackRoutine +); + +VOID +STREAMAPI +StreamClassQueryMasterClockSync( + IN HANDLE MasterClockHandle, + IN PHW_TIME_CONTEXT TimeContext +); + +BOOLEAN +STREAMAPI +StreamClassReadWriteConfig( + IN PVOID HwDeviceExtension, + IN BOOLEAN Read, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length +); + +VOID +STREAMAPI +StreamClassReenumerateStreams( + IN PVOID HwDeviceExtension, + IN ULONG StreamDescriptorSize +); + +NTSTATUS +STREAMAPI +StreamClassRegisterAdapter( + IN PVOID Argument1, + IN PVOID Argument2, + IN PHW_INITIALIZATION_DATA HwInitializationData +); + +#define StreamClassRegisterMinidriver StreamClassRegisterAdapter + +NTSTATUS +StreamClassRegisterFilterWithNoKSPins( + IN PDEVICE_OBJECT DeviceObject, + IN const GUID * InterfaceClassGUID, + IN ULONG PinCount, + IN BOOL * PinDirection, + IN KSPIN_MEDIUM * MediumList, + IN GUID * CategoryList +); + +VOID +STREAMAPI +StreamClassScheduleTimer( + IN PHW_STREAM_OBJECT StreamObject, + IN PVOID HwDeviceExtension, + IN ULONG NumberOfMicroseconds, + IN PHW_TIMER_ROUTINE TimerRoutine, + IN PVOID Context +); + +VOID +__cdecl +StreamClassStreamNotification( + IN STREAM_MINIDRIVER_STREAM_NOTIFICATION_TYPE NotificationType, + IN PHW_STREAM_OBJECT StreamObject, + IN ... +); + +#endif Propchange: trunk/reactos/include/ddk/strmini.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 41623: - Callback routine expects fdo - Fix boot
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Fri Jun 26 18:17:12 2009 New Revision: 41623 URL: http://svn.reactos.org/svn/reactos?rev=41623&view=rev Log: - Callback routine expects fdo - Fix boot Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Fri Jun 26 18:17:12 2009 @@ -158,9 +158,9 @@ /* initialize timer list */ InitializeListHead(&portcls_ext->TimerList); /* initialize io timer */ - IoInitializeTimer(PhysicalDeviceObject, PcIoTimerRoutine, NULL); + IoInitializeTimer(fdo, PcIoTimerRoutine, NULL); /* start the io timer */ - IoStartTimer(PhysicalDeviceObject); + IoStartTimer(fdo); /* set io flags */ fdo->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE;

1 0

[janderwald] 41622: - fix build broken in rev 41621
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Fri Jun 26 17:08:09 2009 New Revision: 41622 URL: http://svn.reactos.org/svn/reactos?rev=41622&view=rev Log: - fix build broken in rev 41621 Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Fri Jun 26 17:08:09 2009 @@ -288,6 +288,12 @@ NTAPI NewIPortWavePciStream( OUT PPORTWAVEPCISTREAM *Stream); + +VOID +NTAPI +PcIoTimerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context); #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\ @@ -338,6 +344,9 @@ LIST_ENTRY SubDeviceList; LIST_ENTRY PhysicalConnectionList; + LIST_ENTRY TimerList; + KSPIN_LOCK TimerListLock; + } PCLASS_DEVICE_EXTENSION, *PPCLASS_DEVICE_EXTENSION; @@ -354,4 +363,11 @@ PIRP Irp; }CLOSESTREAM_CONTEXT, *PCLOSESTREAM_CONTEXT; +typedef struct +{ + LIST_ENTRY Entry; + PIO_TIMER_ROUTINE pTimerRoutine; + PVOID Context; +}TIMER_CONTEXT, *PTIMER_CONTEXT; + #endif

1 0

[janderwald] 41621: - Rewrite PcRegisterIoTimeout, PcUnregisterIoTimeout to support more than one PIO_TIMER_ROUTINE per device object
by janderwald＠svn.reactos.org 28 Jun '09

28 Jun '09

Author: janderwald Date: Fri Jun 26 16:05:13 2009 New Revision: 41621 URL: http://svn.reactos.org/svn/reactos?rev=41621&view=rev Log: - Rewrite PcRegisterIoTimeout, PcUnregisterIoTimeout to support more than one PIO_TIMER_ROUTINE per device object Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.c [iso-8859-1] Fri Jun 26 16:05:13 2009 @@ -153,6 +153,14 @@ InitializeListHead(&portcls_ext->SubDeviceList); /* prepare the physical connection list */ InitializeListHead(&portcls_ext->PhysicalConnectionList); + /* initialize timer lock */ + KeInitializeSpinLock(&portcls_ext->TimerListLock); + /* initialize timer list */ + InitializeListHead(&portcls_ext->TimerList); + /* initialize io timer */ + IoInitializeTimer(PhysicalDeviceObject, PcIoTimerRoutine, NULL); + /* start the io timer */ + IoStartTimer(PhysicalDeviceObject); /* set io flags */ fdo->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.c [iso-8859-1] Fri Jun 26 16:05:13 2009 @@ -40,7 +40,41 @@ } /* - * @unimplemented + * @implemented + */ + +VOID +NTAPI +PcIoTimerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + PPCLASS_DEVICE_EXTENSION DeviceExtension; + KIRQL OldIrql; + PLIST_ENTRY ListEntry; + PTIMER_CONTEXT CurContext; + + if (!DeviceObject || !DeviceObject->DeviceExtension) + return; + + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + KeAcquireSpinLock(&DeviceExtension->TimerListLock, &OldIrql); + + ListEntry = DeviceExtension->TimerList.Flink; + while(ListEntry != &DeviceExtension->TimerList) + { + CurContext = (PTIMER_CONTEXT)CONTAINING_RECORD(ListEntry, TIMER_CONTEXT, Entry); + + CurContext->pTimerRoutine(DeviceObject, CurContext->Context); + ListEntry = ListEntry->Flink; + } + + KeReleaseSpinLock(&DeviceExtension->TimerListLock, OldIrql); +} + +/* + * @implemented */ NTSTATUS NTAPI PcRegisterIoTimeout( @@ -48,42 +82,107 @@ IN PIO_TIMER_ROUTINE pTimerRoutine, IN PVOID pContext) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + PTIMER_CONTEXT TimerContext, CurContext; + KIRQL OldIrql; + PLIST_ENTRY ListEntry; + BOOLEAN bFound; + PPCLASS_DEVICE_EXTENSION DeviceExtension; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - /* FIXME - * check if timer is already used - */ - - Status = IoInitializeTimer(pDeviceObject, pTimerRoutine, pContext); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IoInitializeTimer failed with %x\n", Status); - return Status; - } - - IoStartTimer(pDeviceObject); - return STATUS_SUCCESS; -} - -/* - * @unimplemented - */ -NTSTATUS NTAPI + if (!pDeviceObject || !pDeviceObject->DeviceExtension) + return STATUS_INVALID_PARAMETER; + + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension; + + TimerContext = AllocateItem(NonPagedPool, sizeof(TIMER_CONTEXT), TAG_PORTCLASS); + if (!TimerContext) + { + DPRINT1("Failed to allocate memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + KeAcquireSpinLock(&DeviceExtension->TimerListLock, &OldIrql); + + ListEntry = DeviceExtension->TimerList.Flink; + bFound = FALSE; + while(ListEntry != &DeviceExtension->TimerList) + { + CurContext = (PTIMER_CONTEXT)CONTAINING_RECORD(ListEntry, TIMER_CONTEXT, Entry); + + if (CurContext->Context == pContext && CurContext->pTimerRoutine == pTimerRoutine) + { + bFound = TRUE; + Status = STATUS_UNSUCCESSFUL; + ExFreePool(TimerContext); + break; + } + ListEntry = ListEntry->Flink; + } + + if (!bFound) + { + TimerContext->Context = pContext; + TimerContext->pTimerRoutine = pTimerRoutine; + InsertTailList(&DeviceExtension->TimerList, &TimerContext->Entry); + } + + KeReleaseSpinLock(&DeviceExtension->TimerListLock, OldIrql); + + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI PcUnregisterIoTimeout( IN PDEVICE_OBJECT pDeviceObject, IN PIO_TIMER_ROUTINE pTimerRoutine, IN PVOID pContext) { + PTIMER_CONTEXT CurContext; + KIRQL OldIrql; + PLIST_ENTRY ListEntry; + BOOLEAN bFound; + PPCLASS_DEVICE_EXTENSION DeviceExtension; + ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - /* FIXME - * check if timer is already used - */ - - IoStopTimer(pDeviceObject); - return STATUS_SUCCESS; + if (!pDeviceObject || !pDeviceObject->DeviceExtension) + return STATUS_INVALID_PARAMETER; + + + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)pDeviceObject->DeviceExtension; + + + KeAcquireSpinLock(&DeviceExtension->TimerListLock, &OldIrql); + + ListEntry = DeviceExtension->TimerList.Flink; + bFound = FALSE; + + while(ListEntry != &DeviceExtension->TimerList) + { + CurContext = (PTIMER_CONTEXT)CONTAINING_RECORD(ListEntry, TIMER_CONTEXT, Entry); + + if (CurContext->Context == pContext && CurContext->pTimerRoutine == pTimerRoutine) + { + bFound = TRUE; + RemoveEntryList(&CurContext->Entry); + ExFreePool(CurContext); + break; + } + ListEntry = ListEntry->Flink; + } + + KeReleaseSpinLock(&DeviceExtension->TimerListLock, OldIrql); + + if (bFound) + return STATUS_SUCCESS; + else + return STATUS_NOT_FOUND; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c [iso-8859-1] Fri Jun 26 16:05:13 2009 @@ -327,27 +327,3 @@ return KsValidateConnectRequest(Irp, Factory->PinDescriptorCount, Factory->KsPinDescriptor, Connect); } - -/* PcDeleteSubdeviceDescriptor */ - -/* PcFreeEventTable */ - -/* PcFreePropertyTable */ - -/* PcGenerateEventDeferredRoutine */ - -/* PcGenerateEventList */ - -/* PcHandleDisableEventWithTable */ - -/* PcHandleEnableEventWithTable */ - -/* PcHandlePropertyWithTable */ - -/* PcPinPropertyHandler */ - -/* PcTerminateConnection */ - -/* PcValidateConnectRequest */ - -/* PcVerifyFilterIsReady */

1 0

[fireball] 41620: - Implement NtSetThreadExecutionState (in place of what has been committed in r41599 and reverted in 41619).
by fireball＠svn.reactos.org 26 Jun '09

26 Jun '09

Author: fireball Date: Fri Jun 26 13:39:00 2009 New Revision: 41620 URL: http://svn.reactos.org/svn/reactos?rev=41620&view=rev Log: - Implement NtSetThreadExecutionState (in place of what has been committed in r41599 and reverted in 41619). Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Fri Jun 26 13:39:00 2009 @@ -588,6 +588,54 @@ NtSetThreadExecutionState(IN EXECUTION_STATE esFlags, OUT EXECUTION_STATE *PreviousFlags) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} + PKTHREAD Thread = KeGetCurrentThread(); + KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + EXECUTION_STATE PreviousState; + PAGED_CODE(); + + /* Validate flags */ + if (esFlags & ~(ES_CONTINUOUS | ES_USER_PRESENT)) + { + /* Fail the request */ + return STATUS_INVALID_PARAMETER; + } + + /* Check for user parameters */ + if (PreviousMode != KernelMode) + { + /* Protect the probes */ + _SEH2_TRY + { + /* Check if the pointer is valid */ + ProbeForWriteUlong(PreviousFlags); + } + _SEH2_EXCEPT(ExSystemExceptionFilter()) + { + /* It isn't -- fail */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + } + + /* Save the previous state, always masking in the continous flag */ + PreviousState = Thread->PowerState | ES_CONTINUOUS; + + /* Check if we need to update the power state */ + if (esFlags & ES_CONTINUOUS) Thread->PowerState = esFlags; + + /* Protect the write back to user mode */ + _SEH2_TRY + { + /* Return the previous flags */ + *PreviousFlags = PreviousState; + } + _SEH2_EXCEPT(ExSystemExceptionFilter()) + { + /* Something's wrong, fail */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* All is good */ + return STATUS_SUCCESS; +}

1 0

[cwittich] 41619: revert 41599
by cwittich＠svn.reactos.org 26 Jun '09

26 Jun '09

Author: cwittich Date: Fri Jun 26 11:22:34 2009 New Revision: 41619 URL: http://svn.reactos.org/svn/reactos?rev=41619&view=rev Log: revert 41599 Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Fri Jun 26 11:22:34 2009 @@ -588,16 +588,6 @@ NtSetThreadExecutionState(IN EXECUTION_STATE esFlags, OUT EXECUTION_STATE *PreviousFlags) { - static EXECUTION_STATE current = - ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; - EXECUTION_STATE old = current; - - UNIMPLEMENTED; - - if (!(current & ES_CONTINUOUS) || (esFlags & ES_CONTINUOUS)) - current = esFlags; - - *PreviousFlags = old; - - return STATUS_SUCCESS; -} + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +}

1 0

[cwittich] 41618: fix formatting
by cwittich＠svn.reactos.org 26 Jun '09

26 Jun '09

Author: cwittich Date: Fri Jun 26 10:34:25 2009 New Revision: 41618 URL: http://svn.reactos.org/svn/reactos?rev=41618&view=rev Log: fix formatting Modified: trunk/reactos/dll/win32/user32/windows/hook.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Fri Jun 26 10:34:25 2009 @@ -132,13 +132,13 @@ CBT_CREATEWNDA *cbtcwA = (CBT_CREATEWNDA *)lpMsg->lParam; CBT_CREATEWNDW cbtcwW; CREATESTRUCTW csW; - MSG Msg; - - Msg.hwnd = lpMsg->hwnd; - Msg.message = lpMsg->message; - Msg.time = lpMsg->time; - Msg.pt = lpMsg->pt; - Msg.wParam = lpMsg->wParam; + MSG Msg; + + Msg.hwnd = lpMsg->hwnd; + Msg.message = lpMsg->message; + Msg.time = lpMsg->time; + Msg.pt = lpMsg->pt; + Msg.wParam = lpMsg->wParam; cbtcwW.lpcs = &csW; cbtcwW.hwndInsertAfter = cbtcwA->hwndInsertAfter;

1 0

[jimtabor] 41617: - Fix breakage when in HCBT_CREATEWND callback.
by jimtabor＠svn.reactos.org 26 Jun '09

26 Jun '09

Author: jimtabor Date: Fri Jun 26 06:10:52 2009 New Revision: 41617 URL: http://svn.reactos.org/svn/reactos?rev=41617&view=rev Log: - Fix breakage when in HCBT_CREATEWND callback. Modified: trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/subsystems/win32/win32k/include/win32.h trunk/reactos/subsystems/win32/win32k/ntuser/callback.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Fri Jun 26 06:10:52 2009 @@ -412,10 +412,8 @@ LRESULT Result; CREATESTRUCTW Csw; CBT_CREATEWNDW CbtCreatewndw; - UNICODE_STRING UString; CREATESTRUCTA Csa; CBT_CREATEWNDA CbtCreatewnda; - ANSI_STRING AString; PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra; WPARAM wParam; LPARAM lParam; @@ -451,18 +449,6 @@ if (Common->Ansi) { memcpy(&Csa, &Csw, sizeof(CREATESTRUCTW)); - if (NULL != Csw.lpszName) - { - RtlInitUnicodeString(&UString, Csw.lpszName); - RtlUnicodeStringToAnsiString(&AString, &UString, TRUE); - Csa.lpszName = AString.Buffer; - } - if (0 != HIWORD(Csw.lpszClass)) - { - RtlInitUnicodeString(&UString, Csw.lpszClass); - RtlUnicodeStringToAnsiString(&AString, &UString, TRUE); - Csa.lpszClass = AString.Buffer; - } CbtCreatewnda.lpcs = &Csa; CbtCreatewnda.hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; lParam = (LPARAM) &CbtCreatewnda; @@ -478,22 +464,17 @@ return ZwCallbackReturn(NULL, 0, STATUS_NOT_SUPPORTED); } - Result = Common->Proc(Common->Code, wParam, lParam); + if (Common->Proc) + Result = Common->Proc(Common->Code, wParam, lParam); + else + { + ERR("Common = 0x%x, Proc = 0x%x\n",Common,Common->Proc); + } switch(Common->Code) { case HCBT_CREATEWND: - if (Common->Ansi) - { - if (0 != HIWORD(Csa.lpszClass)) - { - RtlFreeHeap(GetProcessHeap(), 0, (LPSTR) Csa.lpszClass); - } - if (NULL != Csa.lpszName) - { - RtlFreeHeap(GetProcessHeap(), 0, (LPSTR) Csa.lpszName); - } - } + CbtCreatewndExtra->WndInsertAfter = CbtCreatewndw.hwndInsertAfter; break; } break; Modified: trunk/reactos/subsystems/win32/win32k/include/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32.h [iso-8859-1] Fri Jun 26 06:10:52 2009 @@ -43,6 +43,7 @@ UINT cPaintsReady; /* Count of paints pending. */ UINT cTimersReady; /* Count of timers pending. */ ULONG fsHooks; + PHOOK sphkCurrent; LIST_ENTRY PtiLink; CLIENTTHREADINFO cti; // Used only when no Desktop or pcti NULL. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/callback.c [iso-8859-1] Fri Jun 26 06:10:52 2009 @@ -346,7 +346,7 @@ PHOOKPROC_CALLBACK_ARGUMENTS Common; CBT_CREATEWNDW *CbtCreateWnd =NULL; PCHAR Extra; - PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra ; + PHOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS CbtCreatewndExtra = NULL; UNICODE_STRING WindowName; UNICODE_STRING ClassName; PANSI_STRING asWindowName; @@ -546,6 +546,14 @@ return 0; } + if (HookId == WH_CBT && Code == HCBT_CREATEWND) + { + if (CbtCreatewndExtra) + { + CbtCreateWnd->hwndInsertAfter = CbtCreatewndExtra->WndInsertAfter; + } + } + if (Argument) IntCbFreeMemory(Argument); return Result; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Fri Jun 26 06:10:52 2009 @@ -529,7 +529,7 @@ case HCBT_CREATEWND: /* Handle Ansi? */ Size = sizeof(CBT_CREATEWND); - /* What shall we do? Size += sizeof(HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS); same ass CREATESTRUCTEX */ + /* What shall we do? Size += sizeof(HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS); same as CREATESTRUCTEX */ break; default: @@ -845,9 +845,9 @@ DPRINT1("HOOK HCBT_CREATEWND write ERROR!\n"); } /* The next call handles the structures. */ - if (!BadChk) - { -// lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); + if (!BadChk && Hook->Proc) + { + lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); } break; }

1 0

[jimtabor] 41616: - Turn off callback for HCBT_CREATEWND.
by jimtabor＠svn.reactos.org 26 Jun '09

26 Jun '09

Author: jimtabor Date: Fri Jun 26 04:30:54 2009 New Revision: 41616 URL: http://svn.reactos.org/svn/reactos?rev=41616&view=rev Log: - Turn off callback for HCBT_CREATEWND. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Fri Jun 26 04:30:54 2009 @@ -529,7 +529,7 @@ case HCBT_CREATEWND: /* Handle Ansi? */ Size = sizeof(CBT_CREATEWND); - /* What shall we do? Size += sizeof(CREATESTRUCTEX); */ + /* What shall we do? Size += sizeof(HOOKPROC_CBT_CREATEWND_EXTRA_ARGUMENTS); same ass CREATESTRUCTEX */ break; default: @@ -845,7 +845,10 @@ DPRINT1("HOOK HCBT_CREATEWND write ERROR!\n"); } /* The next call handles the structures. */ - if (!BadChk) lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); + if (!BadChk) + { +// lResult = co_HOOK_CallHookNext(Hook, Code, wParam, lParam); + } break; }

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