Ros-diffs

ros-diffs@reactos.org

81390 discussions

[peterw] 25109: - Revert 25108, requested by silverblade.
by peterw＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: peterw Date: Sun Dec 10 08:43:49 2006 New Revision: 25109 URL: http://svn.reactos.org/svn/reactos?rev=25109&view=rev Log: - Revert 25108, requested by silverblade. Added: trunk/reactos/drivers/multimedia/ - copied from r25107, trunk/reactos/drivers/multimedia/ trunk/reactos/drivers/multimedia/directory.rbuild - copied unchanged from r25107, trunk/reactos/drivers/multimedia/directory.rbuild Modified: trunk/reactos/drivers/multimedia/audio/mpu401/ (props changed) trunk/reactos/drivers/multimedia/audio/sndblst/ (props changed) trunk/reactos/drivers/multimedia/audio/sound/ (props changed) trunk/reactos/drivers/multimedia/portcls/ (props changed)

1 0

[silverblade] 25108: Further stubbing of Kernel Streaming APIs (corrective path fix to follow...)
by silverblade＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: silverblade Date: Sun Dec 10 07:16:35 2006 New Revision: 25108 URL: http://svn.reactos.org/svn/reactos?rev=25108&view=rev Log: Further stubbing of Kernel Streaming APIs (corrective path fix to follow...) Added: trunk/reactos/drivers/multimedia/ trunk/reactos/drivers/multimedia/directory.rbuild (with props) trunk/reactos/drivers/multimedia/drmk/ trunk/reactos/drivers/multimedia/drmk/drmk.def trunk/reactos/drivers/multimedia/drmk/drmk.rbuild trunk/reactos/drivers/multimedia/drmk/drmk.rc trunk/reactos/drivers/multimedia/drmk/stubs.c trunk/reactos/drivers/multimedia/portcls.NEW/ - copied from r25106, trunk/reactos/drivers/multimedia/portcls/ trunk/reactos/drivers/multimedia/portcls.NEW/adapter.c trunk/reactos/drivers/multimedia/portcls.NEW/dll.c trunk/reactos/drivers/multimedia/portcls.NEW/drm.c trunk/reactos/drivers/multimedia/portcls.NEW/stubs.c trunk/reactos/drivers/multimedia/x/ - copied from r25107, trunk/reactos/drivers/multimedia/ks/ trunk/reactos/drivers/multimedia/x/ks.rc Modified: trunk/reactos/drivers/multimedia/portcls.NEW/portcls.def trunk/reactos/drivers/multimedia/portcls.NEW/portcls.rbuild trunk/reactos/drivers/multimedia/x/ks.rbuild Added: trunk/reactos/drivers/multimedia/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/directo… ============================================================================== --- trunk/reactos/drivers/multimedia/directory.rbuild (added) +++ trunk/reactos/drivers/multimedia/directory.rbuild Sun Dec 10 07:16:35 2006 @@ -1,0 +1,29 @@ +<directory name="audio"> + <xi:include href="audio/directory.rbuild" /> +</directory> + + + + + +<directory name="ks"> + <xi:include href="ks/ks.rbuild" /> +</directory> + +<directory name="portcls"> + <xi:include href="portcls/portcls.rbuild" /> +</directory> + +<directory name="drmk"> + <xi:include href="drmk/drmk.rbuild" /> +</directory> + + Propchange: trunk/reactos/drivers/multimedia/directory.rbuild ------------------------------------------------------------------------------ svn:executable = * Added: trunk/reactos/drivers/multimedia/drmk/drmk.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/drmk/dr… ============================================================================== --- trunk/reactos/drivers/multimedia/drmk/drmk.def (added) +++ trunk/reactos/drivers/multimedia/drmk/drmk.def Sun Dec 10 07:16:35 2006 @@ -1,0 +1,12 @@ +; +; Exports definition file for drmk.sys +; + +EXPORTS +DrmAddContentHandlers@12 +DrmCreateContentMixed@12 +DrmDestroyContent@4 +DrmForwardContentToDeviceObject@12 +DrmForwardContentToFileObject@8 +DrmForwardContentToInterface@12 +DrmGetContentRights@8 Added: trunk/reactos/drivers/multimedia/drmk/drmk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/drmk/dr… ============================================================================== --- trunk/reactos/drivers/multimedia/drmk/drmk.rbuild (added) +++ trunk/reactos/drivers/multimedia/drmk/drmk.rbuild Sun Dec 10 07:16:35 2006 @@ -1,0 +1,11 @@ +<module name="drmk" type="exportdriver" installbase="system32/drivers" installname="drmk.sys" allowwarnings="true"> + <include base="drmk">.</include> + <include base="drmk">..</include> + <include base="drmk">../include</include> + <importlibrary definition="drmk.def" /> + <library>ntoskrnl</library> + <define name="__USE_W32API" /> + <define name="BUILDING_DRMK" /> + <file>drmk.rc</file> + <file>stubs.c</file> +</module> Added: trunk/reactos/drivers/multimedia/drmk/drmk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/drmk/dr… ============================================================================== --- trunk/reactos/drivers/multimedia/drmk/drmk.rc (added) +++ trunk/reactos/drivers/multimedia/drmk/drmk.rc Sun Dec 10 07:16:35 2006 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Digital Rights Management\0" +#define REACTOS_STR_INTERNAL_NAME "drmk\0" +#define REACTOS_STR_ORIGINAL_FILENAME "drmk.sys\0" +#include <reactos/version.rc> Added: trunk/reactos/drivers/multimedia/drmk/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/drmk/st… ============================================================================== --- trunk/reactos/drivers/multimedia/drmk/stubs.c (added) +++ trunk/reactos/drivers/multimedia/drmk/stubs.c Sun Dec 10 07:16:35 2006 @@ -1,0 +1,131 @@ +/* + ReactOS Kernel Streaming + Digital Rights Management + + Please see COPYING in the top-level directory for license information. + + Author: Andrew Greenwood + + Notes: + This is just a file containing stub functions. The DRMK kernel library + deals with Digital Rights Management. This is not essential for the + operation of audio/video (except in the cases where content has digital + rights information) but is needed for linking with PORTCLS. +*/ + +#include <drmk.h> + +/* + Provide a driver interface consisting of functions for handling DRM + protected content +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmAddContentHandlers( + IN ULONG ContentId, + IN PVOID *paHandlers, + IN ULONG NumHandlers) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Creates a DRM content ID to identify a KS audio stream containing + mixed content from several input streams. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmCreateContentMixed( + IN PULONG paContentId, + IN ULONG cContentId, + OUT PULONG pMixedContentId) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Deletes a DRM content ID. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmDestroyContent( + IN ULONG ContentId) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Authenticates a driver, then passes it the DRM content ID, along with + the content rights which have been assigned to a stream. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmForwardContentToDeviceObject( + IN ULONG ContentId, + IN PVOID Reserved, + IN PCDRMFORWARD DrmForward) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Obsolete because it forces the system to run at a lower DRM security + level. Returns STATUS_NOT_IMPLEMENTED if a pin associated with + FileObject doesnt support the rights assigned to ContentId. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmForwardContentToFileObject( + IN ULONG ContentId, + IN PFILE_OBJECT FileObject) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Similar to DrmForwardContentToDeviceObject, except this works with a driver + object rather than just a driver. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmForwardContentToInterface( + IN ULONG ContentId, + IN PUNKNOWN pUnknown, + IN ULONG NumMethods) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + Retrieves DRM Content rights that have been assigend to a DRM Content ID. +*/ +/* + * @unimplemented + */ +NTAPI NTSTATUS +DrmGetContentRights( + IN ULONG ContentId, + OUT PDRMRIGHTS DrmRights) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + Added: trunk/reactos/drivers/multimedia/portcls.NEW/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls.NEW/adapter.c (added) +++ trunk/reactos/drivers/multimedia/portcls.NEW/adapter.c Sun Dec 10 07:16:35 2006 @@ -1,0 +1,87 @@ +/* + ReactOS Kernel Streaming + Port Class API: Adapter initialization + + Author: Andrew Greenwood + +*/ + +#include <portcls.h> + + +NTSTATUS +PcStartIo( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + /* Internal function */ + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +PcUnload( + IN PDRIVER_OBJECT DriverObject) +{ + /* Internal function */ + return STATUS_UNSUCCESSFUL; +} + + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcInitializeAdapterDriver( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPathName, + IN PDRIVER_ADD_DEVICE AddDevice) +{ + /* + This is effectively a common DriverEntry function for PortCls drivers. + So it has similar responsibilities to a normal driver. + + First 2 parameters are from DriverEntry. + Installs the supplied AddDevice routine in the driver object?s driver extension and installs the PortCls driver?s IRP handlers in the driver object itself. + */ + + DriverObject->DriverExtension->AddDevice = AddDevice; + + /* + TODO: (* = implement here, otherwise KS default) + IRP_MJ_CLOSE + * IRP_MJ_CREATE + IRP_MJ_DEVICE_CONTROL + IRP_MJ_FLUSH_BUFFERS + * IRP_MJ_PNP + * IRP_MJ_POWER + IRP_MJ_QUERY_SECURITY + IRP_MJ_READ + IRP_MJ_SET_SECURITY + * IRP_MJ_SYSTEM_CONTROL + IRP_MJ_WRITE + */ + + UNIMPLEMENTED; + + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcAddAdapterDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PCPFNSTARTDEVICE StartDevice, + IN ULONG MaxObjects, + IN ULONG DeviceExtensionSize) +{ + /* + Note - after this has been called, we can + handle IRP_MN_START_DEVICE by calling StartDevice + */ + + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} Added: trunk/reactos/drivers/multimedia/portcls.NEW/dll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls.NEW/dll.c (added) +++ trunk/reactos/drivers/multimedia/portcls.NEW/dll.c Sun Dec 10 07:16:35 2006 @@ -1,0 +1,29 @@ +/* + ReactOS Kernel Streaming + Port Class / Library Init and Cleanup + + Author: Andrew Greenwood + + Notes: + - +*/ + +#include <ntddk.h> + +/* + * @implemented + */ +ULONG STDCALL +DllInitialize(ULONG Unknown) +{ + return 0; +} + +/* + * @implemented + */ +ULONG STDCALL +DllUnload(VOID) +{ + return 0; +} Added: trunk/reactos/drivers/multimedia/portcls.NEW/drm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls.NEW/drm.c (added) +++ trunk/reactos/drivers/multimedia/portcls.NEW/drm.c Sun Dec 10 07:16:35 2006 @@ -1,0 +1,73 @@ +/* + ReactOS Kernel Streaming + Port Class / Digital Rights Management + + Author: Andrew Greenwood + + Notes: + These are convenience functions for accessing DRM facilities, as + documented here: + http://www.osronline.com/ddkx/stream/aud-prop_9f77.htm +*/ + +#include <portcls.h> +#include <drmk.h> + +PORTCLASSAPI NTSTATUS NTAPI +PcAddContentHandlers( + IN ULONG ContentId, + IN PVOID *paHandlers, + IN ULONG NumHandlers) +{ + return DrmAddContentHandlers(ContentId, paHandlers, NumHandlers); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcCreateContentMixed( + IN PULONG paContentId, + IN ULONG cContentId, + OUT PULONG pMixedContentId) +{ + return DrmCreateContentMixed(paContentId, cContentId, pMixedContentId); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcDestroyContent( + IN ULONG ContentId) +{ + return DrmDestroyContent(ContentId); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcForwardContentToDeviceObject( + IN ULONG ContentId, + IN PVOID Reserved, + IN PCDRMFORWARD DrmForward) +{ + return DrmForwardContentToDeviceObject(ContentId, Reserved, DrmForward); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcForwardContentToFileObject( + IN ULONG ContentId, + IN PFILE_OBJECT FileObject) +{ + return DrmForwardContentToFileObject(ContentId, FileObject); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcForwardContentToInterface( + IN ULONG ContentId, + IN PUNKNOWN pUnknown, + IN ULONG NumMethods) +{ + return DrmForwardContentToInterface(ContentId, pUnknown, NumMethods); +} + +PORTCLASSAPI NTSTATUS NTAPI +PcGetContentRights( + IN ULONG ContentId, + OUT PDRMRIGHTS DrmRights) +{ + return DrmGetContentRights(ContentId, DrmRights); +} Modified: trunk/reactos/drivers/multimedia/portcls.NEW/portcls.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls.NEW/portcls.def (original) +++ trunk/reactos/drivers/multimedia/portcls.NEW/portcls.def Sun Dec 10 07:16:35 2006 @@ -2,21 +2,14 @@ ; Exports definition file for portcls.sys ; EXPORTS +DllInitialize@4 +DllUnload@0 + +; Adapters (adapter.c) PcAddAdapterDevice@20 -PcAddContentHandlers@12 -PcCompleteIrp@12 -PcCompletePendingPropertyRequest@8 -PcCreateContentMixed@12 -PcDestroyContent@4 -PcDispatchIrp@8 -PcForwardContentToDeviceObject@12 -PcForwardContentToFileObject@8 -PcForwardContentToInterface@12 -PcForwardIrpSynchronous@8 -PcGetContentRights@8 -PcGetDeviceProperty@20 -PcGetTimeInterval@8 PcInitializeAdapterDriver@12 + +; Factories PcNewDmaChannel@20 PcNewInterruptSync@20 PcNewMiniport@8 @@ -25,12 +18,38 @@ PcNewResourceList@20 PcNewResourceSublist@20 PcNewServiceGroup@8 -PcRegisterAdapterPowerManagement@8 -PcRegisterIoTimeout@12 + +; Digital Rights Management (drm.c) +PcAddContentHandlers@12 +PcCreateContentMixed@12 +PcDestroyContent@4 +PcForwardContentToDeviceObject@12 +PcForwardContentToFileObject@8 +PcForwardContentToInterface@12 +PcGetContentRights@8 + +; IRP Helpers +PcCompleteIrp@12 +PcDispatchIrp@8 +PcForwardIrpSynchronous@8 + +; Misc +PcGetTimeInterval@8 +PcRegisterSubdevice@12 + +; Physical Connections PcRegisterPhysicalConnection@20 PcRegisterPhysicalConnectionFromExternal@20 PcRegisterPhysicalConnectionToExternal@20 -PcRegisterSubdevice@12 + +; Power Management +PcRegisterAdapterPowerManagement@8 PcRequestNewPowerState@8 + +; Properties +PcCompletePendingPropertyRequest@8 +PcGetDeviceProperty@20 + +; Timeouts +PcRegisterIoTimeout@12 PcUnregisterIoTimeout@12 - Modified: trunk/reactos/drivers/multimedia/portcls.NEW/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls.NEW/portcls.rbuild (original) +++ trunk/reactos/drivers/multimedia/portcls.NEW/portcls.rbuild Sun Dec 10 07:16:35 2006 @@ -1,8 +1,12 @@ -<module name="portcls" type="exportdriver" installbase="system32/drivers" installname="portcls.sys"> +<module name="portcls" type="exportdriver" installbase="system32/drivers" installname="portcls.sys" allowwarnings="true"> <importlibrary definition="portcls.def" /> <define name="__USE_W32API" /> + <include base="portcls">../include</include> <library>ntoskrnl</library> - <library>hal</library> - <file>portcls.c</file> + <library>drmk</library> + <file>dll.c</file> + <file>adapter.c</file> + <file>drm.c</file> + <file>stubs.c</file> <file>portcls.rc</file> </module> Added: trunk/reactos/drivers/multimedia/portcls.NEW/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/portcls… ============================================================================== --- trunk/reactos/drivers/multimedia/portcls.NEW/stubs.c (added) +++ trunk/reactos/drivers/multimedia/portcls.NEW/stubs.c Sun Dec 10 07:16:35 2006 @@ -1,0 +1,338 @@ +/* + Port Class API + Stubbed functions +*/ + +#include <portcls.h> + +/* + Factory Stubs +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewDmaChannel( + OUT PDMACHANNEL* OutDmaChannel, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PDEVICE_DESCRIPTION DeviceDescription, + IN PDEVICE_OBJECT DeviceObject) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewInterruptSync( + OUT PINTERRUPTSYNC* OUtInterruptSync, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN PRESOURCELIST ResourceList, + IN ULONG ResourceIndex, + IN INTERRUPTSYNCMODE Mode) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewMiniport( + OUT PMINIPORT* OutMiniport, + IN REFCLSID ClassId) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewPort( + OUT PPORT* OutPort, + IN REFCLSID ClassId) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewRegistryKey( + OUT PREGISTRYKEY* OutRegistryKey, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN PVOID DeviceObject OPTIONAL, + IN PVOID SubDevice OPTIONAL, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewResourceList( + OUT PRESOURCELIST* OutResourceList, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PCM_RESOURCE_LIST TranslatedResources, + IN PCM_RESOURCE_LIST UntranslatedResources) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewResourceSublist( + OUT PRESOURCELIST* OutResourceList, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PRESOURCELIST ParentList, + IN ULONG MaximumEntries) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcNewServiceGroup( + OUT PSERVICEGROUP* OutServiceGroup, + IN PUNKNOWN OuterUnknown OPTIONAL) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + IRP Handling +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcDispatchIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcCompleteIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN NTSTATUS Status) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcForwardIrpSynchronous( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + Power Management +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterAdapterPowerManagement( + IN PUNKNOWN pUnknown, + IN PVOID pvContext1) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRequestNewPowerState( + IN PDEVICE_OBJECT pDeviceObject, + IN DEVICE_POWER_STATE RequestedNewState) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + Properties +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcGetDeviceProperty( + IN PVOID DeviceObject, + IN DEVICE_REGISTRY_PROPERTY DeviceProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ResultLength) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcCompletePendingPropertyRequest( + IN PPCPROPERTY_REQUEST PropertyRequest, + IN NTSTATUS NtStatus) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + I/O Timeouts +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterIoTimeout( + IN PDEVICE_OBJECT pDeviceObject, + IN PIO_TIMER_ROUTINE pTimerRoutine, + IN PVOID pContext) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcUnregisterIoTimeout( + IN PDEVICE_OBJECT pDeviceObject, + IN PIO_TIMER_ROUTINE pTimerRoutine, + IN PVOID pContext) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + Physical Connections +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterPhysicalConnection( + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterPhysicalConnectionFromExternal( + IN PDEVICE_OBJECT DeviceObject, + IN PUNICODE_STRING FromString, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterPhysicalConnectionToExternal( + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNICODE_STRING ToString, + IN ULONG ToPin) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + + +/* =============================================================== + Misc +*/ + +/* + * @unimplemented + */ +PORTCLASSAPI ULONGLONG NTAPI +PcGetTimeInterval( + IN ULONGLONG Since) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterSubdevice( + IN PDEVICE_OBJECT DeviceObject, + IN PWCHAR Name, + IN PUNKNOWN Unknown) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} Modified: trunk/reactos/drivers/multimedia/x/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/x/ks.rb… ============================================================================== --- trunk/reactos/drivers/multimedia/x/ks.rbuild (original) +++ trunk/reactos/drivers/multimedia/x/ks.rbuild Sun Dec 10 07:16:35 2006 @@ -6,6 +6,7 @@ <library>ntoskrnl</library> <define name="__USE_W32API" /> <define name="BUILDING_KS" /> + <file>ks.rc</file> <file>allocators.c</file> <file>clocks.c</file> <file>connectivity.c</file> Added: trunk/reactos/drivers/multimedia/x/ks.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/x/ks.rc… ============================================================================== --- trunk/reactos/drivers/multimedia/x/ks.rc (added) +++ trunk/reactos/drivers/multimedia/x/ks.rc Sun Dec 10 07:16:35 2006 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Kernel Streaming API\0" +#define REACTOS_STR_INTERNAL_NAME "ks\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ks.sys\0" +#include <reactos/version.rc>

1 0

[silverblade] 25107: These files aren't complete yet, but this will put them at least in their right place...
by silverblade＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: silverblade Date: Sun Dec 10 07:04:03 2006 New Revision: 25107 URL: http://svn.reactos.org/svn/reactos?rev=25107&view=rev Log: These files aren't complete yet, but this will put them at least in their right place... Added: trunk/reactos/include/ddk/drmk.h trunk/reactos/include/ddk/ks.h trunk/reactos/include/ddk/portcls.h trunk/reactos/include/ddk/punknown.h Added: trunk/reactos/include/ddk/drmk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/drmk.h?rev=251… ============================================================================== --- trunk/reactos/include/ddk/drmk.h (added) +++ trunk/reactos/include/ddk/drmk.h Sun Dec 10 07:04:03 2006 @@ -1,0 +1,75 @@ +/* + ReactOS Kernel Streaming + Digital Rights Management + + Author: Andrew Greenwood +*/ + +#ifndef DRMK_H +#define DRMK_H + +#include <ntddk.h> +#include <ks.h> +#include <punknown.h> + +typedef struct +{ + DWORD Flags; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject; + PVOID Context; +} DRMFORWARD, *PDRMFORWARD, *PCDRMFORWARD; + +typedef struct +{ + BOOL CopyProtect; + ULONG Reserved; + BOOL DigitalOutputDisable; +} DRMRIGHTS, *PDRMRIGHTS; + + +/* =============================================================== + Digital Rights Management Functions + TODO: Check calling convention +*/ + +NTAPI NTSTATUS +DrmAddContentHandlers( + IN ULONG ContentId, + IN PVOID *paHandlers, + IN ULONG NumHandlers); + +NTAPI NTSTATUS +DrmCreateContentMixed( + IN PULONG paContentId, + IN ULONG cContentId, + OUT PULONG pMixedContentId); + +NTAPI NTSTATUS +DrmDestroyContent( + IN ULONG ContentId); + +NTAPI NTSTATUS +DrmForwardContentToDeviceObject( + IN ULONG ContentId, + IN PVOID Reserved, + IN PCDRMFORWARD DrmForward); + +NTAPI NTSTATUS +DrmForwardContentToFileObject( + IN ULONG ContentId, + IN PFILE_OBJECT FileObject); + +NTAPI NTSTATUS +DrmForwardContentToInterface( + IN ULONG ContentId, + IN PUNKNOWN pUnknown, + IN ULONG NumMethods); + +NTAPI NTSTATUS +DrmGetContentRights( + IN ULONG ContentId, + OUT PDRMRIGHTS DrmRights); + + +#endif Added: trunk/reactos/include/ddk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ks.h?rev=25107… ============================================================================== --- trunk/reactos/include/ddk/ks.h (added) +++ trunk/reactos/include/ddk/ks.h Sun Dec 10 07:04:03 2006 @@ -1,0 +1,2481 @@ +/* + ReactOS + Kernel Streaming API + + by Andrew Greenwood + + NOTES: + This is a basic stubbing of the Kernel Streaming API header. It is + very incomplete - a lot of the #defines are not set to any value at all. + + Some of the structs/funcs may be incorrectly grouped. + + GUIDs need to be defined properly. + + AVStream functionality (XP and above, DirectX 8.0 and above) will NOT + implemented for a while. + + Some example code for interaction from usermode: + DeviceIoControl( + FilterHandle, + IOCTL_KS_PROPERTY, + &Property, + sizeof(KSPROPERTY), + &SeekingCapabilities, + sizeof(KS_SEEKING_CAPABILITIES), + &BytesReturned, + &Overlapped); +*/ + +#ifndef KS_H +#define KS_H + +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef BUILDING_KS + #define KSDDKAPI +#else + #define KSDDKAPI DECLSPEC_IMPORT +#endif + +#include <reactos/debug.h> +#include <ntddk.h> + +/* TODO */ +#define KSDDKAPI + + +typedef PVOID PKSWORKER; + +/* =============================================================== + I/O Control Codes +*/ + +#define IOCTL_KS_DISABLE_EVENT \ + CTL_CODE( \ + FILE_DEVICE_KS, \ + 0x000, \ + METHOD_NEITHER, \ + FILE_ANY_ACCESS) + +#define IOCTL_KS_ENABLE_EVENT \ + CTL_CODE( \ + FILE_DEVICE_KS, \ + 0x001, \ + METHOD_NEITHER, \ + FILE_ANY_ACCESS) + +#define IOCTL_KS_METHOD \ + CTL_CODE( \ + FILE_DEVICE_KS, \ + 0x002, \ + METHOD_NEITHER, \ + FILE_ANY_ACCESS) + +#define IOCTL_KS_PROPERTY \ + CTL_CODE( \ + FILE_DEVICE_KS, \ + 0x003, \ + METHOD_NEITHER, \ + FILE_ANY_ACCESS) + +#define IOCTL_KS_WRITE_STREAM \ + CTL_CODE( \ + FILE_DEVICE_KS, \ + 0x004, \ + METHOD_NEITHER, \ + FILE_WRITE_ACCESS) + +#define IOCTL_KS_READ_STREAM \ + CTL_CODE( \ + FILE_DEVICE_KS, \ + 0x005, \ + METHOD_NEITHER, \ + FILE_READ_ACCESS) + +#define IOCTL_KS_RESET_STATE \ + CTL_CODE( \ + FILE_DEVICE_KS, \ + 0x006, \ + METHOD_NEITHER, \ + FILE_ANY_ACCESS) + + +/* =============================================================== + Clock Properties/Methods/Events +*/ + +#define KSPROPSETID_Clock \ + 0xDF12A4C0L, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + +typedef enum +{ + KSPROPERTY_CLOCK_TIME, + KSPROPERTY_CLOCK_PHYSICALTIME, + KSPROPERTY_CORRELATEDTIME, + KSPROPERTY_CORRELATEDPHYSICALTIME, + KSPROPERTY_CLOCK_RESOLUTION, + KSPROPERTY_CLOCK_STATE, + KSPROPERTY_CLOCK_FUNCTIONTABLE +} KSPROPERTY_CLOCK; + +#define KSEVENTSETID_Clock \ + 0x364D8E20L, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + +typedef enum +{ + KSEVENT_CLOCK_INTERVAL_MARK, + KSEVENT_CLOCK_POSITION_MARK +} KSEVENT_CLOCK_POSITION; + + +/* =============================================================== + Connection Properties/Methods/Events +*/ + +#define KSPROPSETID_Connection \ + 0x1D58C920L, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + +typedef enum +{ + KSPROPERTY_CONNECTION_STATE, + KSPROPERTY_CONNECTION_PRIORITY, + KSPROPERTY_CONNECTION_DATAFORMAT, + KSPROPERTY_CONNECTION_ALLOCATORFRAMING, + KSPROPERTY_CONNECTION_PROPOSEDATAFORMAT, + KSPROPERTY_CONNECTION_ACQUIREORDERING, + KSPROPERTY_CONNECTION_ALLOCATORFRAMING_EX, + KSPROPERTY_CONNECTION_STARTAT +} KSPROPERTY_CONNECTION; + +#define KSEVENTSETID_Connection \ + 0x7f4bcbe0L, 0x9ea5, 0x11cf, 0xa5, 0xd6, 0x28, 0xdb, 0x04, 0xc1, 0x00, 0x00 + +typedef enum +{ + KSEVENT_CONNECTION_POSITIONUPDATE, + KSEVENT_CONNECTION_DATADISCONTINUITY, + KSEVENT_CONNECTION_TIMEDISCONTINUITY, + KSEVENT_CONNECTION_PRIORITY, + KSEVENT_CONNECTION_ENDOFSTREAM +} KSEVENT_CONNECTION; + + +/* =============================================================== + General + Properties/Methods/Events +*/ + +#define KSPROPSETID_General \ + 0x1464EDA5L, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + +typedef enum +{ + KSPROPERTY_GENERAL_COMPONENTID +} KSPROPERTY_GENERAL; + + +/* =============================================================== + Graph Manager + Properties/Methods/Events +*/ + +#define KSPROPSETID_GM \ + 0xAF627536L, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D + +typedef enum +{ + KSPROPERTY_GM_GRAPHMANAGER, + KSPROPERTY_GM_TIMESTAMP_CLOCK, + KSPROPERTY_GM_RATEMATCH, + KSPROPERTY_GM_RENDERCLOCK +} KSPROPERTY_GM; + + +/* =============================================================== + Media Seeking + Properties/Methods/Events +*/ + +#define KSPROPSETID_MediaSeeking \ + 0xEE904F0CL, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + +typedef enum +{ + KSPROPERTY_MEDIASEEKING_CAPABILITIES, + KSPROPERTY_MEDIASEEKING_FORMATS, + KSPROPERTY_MEDIASEEKING_TIMEFORMAT, + KSPROPERTY_MEDIASEEKING_POSITION, + KSPROPERTY_MEDIASEEKING_STOPPOSITION, + KSPROPERTY_MEDIASEEKING_POSITIONS, + KSPROPERTY_MEDIASEEKING_DURATION, + KSPROPERTY_MEDIASEEKING_AVAILABLE, + KSPROPERTY_MEDIASEEKING_PREROLL, + KSPROPERTY_MEDIASEEKING_CONVERTTIMEFORMAT +} KSPROPERTY_MEDIASEEKING; + + +/* =============================================================== + Pin + Properties/Methods/Events +*/ + +#define KSPROPSETID_Pin \ + 0x8C134960L, 0x51AD, 0x11CF, 0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00 + +typedef enum +{ + KSPROPERTY_PIN_CINSTANCES, + KSPROPERTY_PIN_CTYPES, + KSPROPERTY_PIN_DATAFLOW, + KSPROPERTY_PIN_DATARANGES, + KSPROPERTY_PIN_DATAINTERSECTION, + KSPROPERTY_PIN_INTERFACES, + KSPROPERTY_PIN_MEDIUMS, + KSPROPERTY_PIN_COMMUNICATION, + KSPROPERTY_PIN_GLOBALCINSTANCES, + KSPROPERTY_PIN_NECESSARYINSTANCES, + KSPROPERTY_PIN_PHYSICALCONNECTION, + KSPROPERTY_PIN_CATEGORY, + KSPROPERTY_PIN_NAME, + KSPROPERTY_PIN_CONSTRAINEDDATARANGES, + KSPROPERTY_PIN_PROPOSEDATAFORMAT +} KSPROPERTY_PIN; + + +/* =============================================================== + Quality + Properties/Methods/Events +*/ + +#define KSPROPSETID_Quality \ + 0xD16AD380L, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + +typedef enum +{ + KSPROPERTY_QUALITY_REPORT, + KSPROPERTY_QUALITY_ERROR +} KSPROPERTY_QUALITY; + + +/* =============================================================== + Stream + Properties/Methods/Events +*/ + +#define KSPROPSETID_Stream \ + 0x65aaba60L, 0x98ae, 0x11cf, 0xa1, 0x0d, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 + +typedef enum +{ + KSPROPERTY_STREAM_ALLOCATOR, + KSPROPERTY_STREAM_QUALITY, + KSPROPERTY_STREAM_DEGRADATION, + KSPROPERTY_STREAM_MASTERCLOCK, + KSPROPERTY_STREAM_TIMEFORMAT, + KSPROPERTY_STREAM_PRESENTATIONTIME, + KSPROPERTY_STREAM_PRESENTATIONEXTENT, + KSPROPERTY_STREAM_FRAMETIME, + KSPROPERTY_STREAM_RATECAPABILITY, + KSPROPERTY_STREAM_RATE, + KSPROPERTY_STREAM_PIPE_ID +} KSPROPERTY_STREAM; + + +/* =============================================================== + StreamAllocator + Properties/Methods/Events +*/ + +#define KSPROPSETID_StreamAllocator \ + 0xcf6e4342L, 0xec87, 0x11cf, 0xa1, 0x30, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 + +typedef enum +{ + KSPROPERTY_STREAMALLOCATOR_FUNCTIONTABLE, + KSPROPERTY_STREAMALLOCATOR_STATUS +} KSPROPERTY_STREAMALLOCATOR; + +#define KSMETHODSETID_StreamAllocator \ + 0xcf6e4341L, 0xec87, 0x11cf, 0xa1, 0x30, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 + +typedef enum +{ + KSMETHOD_STREAMALLOCATOR_ALLOC, + KSMETHOD_STREAMALLOCATOR_FREE +} KSMETHOD_STREAMALLOCATOR; + + +#define KSEVENTSETID_StreamAllocator + +typedef enum +{ + KSEVENT_STREAMALLOCATOR_INTERNAL_FREEFRAME, + KSEVENT_STREAMALLOCATOR_FREEFRAME +} KSEVENT_STREAMALLOCATOR; + + +/* =============================================================== + StreamInterface + Properties/Methods/Events +*/ + +#define KSPROPSETID_StreamInterface \ + 0x1fdd8ee1L, 0x9cd3, 0x11d0, 0x82, 0xaa, 0x00, 0x00, 0xf8, 0x22, 0xfe, 0x8a + +typedef enum +{ + KSPROPERTY_STREAMINTERFACE_HEADERSIZE +} KSPROPERTY_STREAMINTERFACE; + + +/* =============================================================== + Topology + Properties/Methods/Events +*/ + +#define KSPROPSETID_Topology \ + 0x720D4AC0L, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + +typedef enum +{ + KSPROPERTY_TOPOLOGY_CATEGORIES, + KSPROPERTY_TOPOLOGY_CONNECTIONS, + KSPROPERTY_TOPOLOGY_NAME, + KSPROPERTY_TOPOLOGY_NODES +} KSPROPERTY_TOPOLOGY; + + + +/* =============================================================== + Property Sets for audio drivers - TODO +*/ + +#define KSPROPSETID_AC3 +/* + KSPROPERTY_AC3_ALTERNATE_AUDIO + KSPROPERTY_AC3_BIT_STREAM_MODE + KSPROPERTY_AC3_DIALOGUE_LEVEL + KSPROPERTY_AC3_DOWNMIX + KSPROPERTY_AC3_ERROR_CONCEALMENT + KSPROPERTY_AC3_LANGUAGE_CODE + KSPROPERTY_AC3_ROOM_TYPE +*/ + +#define KSPROPSETID_Acoustic_Echo_Cancel +/* + KSPROPERTY_AEC_MODE + KSPROPERTY_AEC_NOISE_FILL_ENABLE + KSPROPERTY_AEC_STATUS +*/ + +#define KSPROPSETID_Audio +/* + KSPROPERTY_AUDIO_3D_INTERFACE + KSPROPERTY_AUDIO_AGC + KSPROPERTY_AUDIO_ALGORITHM_INSTANCE + KSPROPERTY_AUDIO_BASS + KSPROPERTY_AUDIO_BASS_BOOST + KSPROPERTY_AUDIO_CHANNEL_CONFIG + KSPROPERTY_AUDIO_CHORUS_LEVEL + KSPROPERTY_AUDIO_COPY_PROTECTION + KSPROPERTY_AUDIO_CPU_RESOURCES + KSPROPERTY_AUDIO_DELAY + KSPROPERTY_AUDIO_DEMUX_DEST + KSPROPERTY_AUDIO_DEV_SPECIFIC + KSPROPERTY_AUDIO_DYNAMIC_RANGE + KSPROPERTY_AUDIO_DYNAMIC_SAMPLING_RATE + KSPROPERTY_AUDIO_EQ_BANDS + KSPROPERTY_AUDIO_EQ_LEVEL + KSPROPERTY_AUDIO_FILTER_STATE + KSPROPERTY_AUDIO_LATENCY + KSPROPERTY_AUDIO_LOUDNESS + KSPROPERTY_AUDIO_MANUFACTURE_GUID + KSPROPERTY_AUDIO_MID + KSPROPERTY_AUDIO_MIX_LEVEL_CAPS + KSPROPERTY_AUDIO_MIX_LEVEL_TABLE + KSPROPERTY_AUDIO_MUTE + KSPROPERTY_AUDIO_MUX_SOURCE + KSPROPERTY_AUDIO_NUM_EQ_BANDS + KSPROPERTY_AUDIO_PEAKMETER + KSPROPERTY_AUDIO_POSITION + KSPROPERTY_AUDIO_PREFERRED_STATUS + KSPROPERTY_AUDIO_PRODUCT_GUID + KSPROPERTY_AUDIO_QUALITY + KSPROPERTY_AUDIO_REVERB_LEVEL + KSPROPERTY_AUDIO_SAMPLING_RATE + KSPROPERTY_AUDIO_STEREO_ENHANCE + KSPROPERTY_AUDIO_STEREO_SPEAKER_GEOMETRY + KSPROPERTY_AUDIO_SURROUND_ENCODE + KSPROPERTY_AUDIO_TREBLE + KSPROPERTY_AUDIO_VOLUMELEVEL + KSPROPERTY_AUDIO_WIDE_MODE + KSPROPERTY_AUDIO_WIDENESS +*/ + +#define KSPROPSETID_AudioGfx +/* + KSPROPERTY_AUDIOGFX_CAPTURETARGETDEVICEID + KSPROPERTY_AUDIOGFX_RENDERTARGETDEVICEID +*/ + +#define KSPROPSETID_DirectSound3DBuffer +/* + KSPROPERTY_DIRECTSOUND3DBUFFER_ALL + KSPROPERTY_DIRECTSOUND3DBUFFER_CONEANGLES + KSPROPERTY_DIRECTSOUND3DBUFFER_CONEORIENTATION + KSPROPERTY_DIRECTSOUND3DBUFFER_CONEOUTSIDEVOLUME + KSPROPERTY_DIRECTSOUND3DBUFFER_MAXDISTANCE + KSPROPERTY_DIRECTSOUND3DBUFFER_MINDISTANCE + KSPROPERTY_DIRECTSOUND3DBUFFER_MODE + KSPROPERTY_DIRECTSOUND3DBUFFER_POSITION + KSPROPERTY_DIRECTSOUND3DBUFFER_VELOCITY +*/ + +#define KSPROPSETID_DirectSound3DListener +/* + KSPROPERTY_DIRECTSOUND3DLISTENER_ALL + KSPROPERTY_DIRECTSOUND3DLISTENER_ALLOCATION + KSPROPERTY_DIRECTSOUND3DLISTENER_BATCH + KSPROPERTY_DIRECTSOUND3DLISTENER_DISTANCEFACTOR + KSPROPERTY_DIRECTSOUND3DLISTENER_DOPPLERFACTOR + KSPROPERTY_DIRECTSOUND3DLISTENER_ORIENTATION + KSPROPERTY_DIRECTSOUND3DLISTENER_POSITION + KSPROPERTY_DIRECTSOUND3DLISTENER_ROLLOFFFACTOR + KSPROPERTY_DIRECTSOUND3DLISTENER_VELOCITY +*/ + +#define KSPROPSETID_DrmAudioStream +/* + KSPROPERTY_DRMAUDIOSTREAM_CONTENTID +*/ + +#define KSPROPSETID_Hrtf3d +/* + KSPROPERTY_HRTF3D_FILTER_FORMAT + KSPROPERTY_HRTF3D_INITIALIZE + KSPROPERTY_HRTF3D_PARAMS +*/ + +#define KSPROPSETID_Itd3d +/* + KSPROPERTY_ITD3D_PARAMS +*/ + +#define KSPROPSETID_Synth +/* + KSPROPERTY_SYNTH_CAPS + KSPROPERTY_SYNTH_CHANNELGROUPS + KSPROPERTY_SYNTH_LATENCYCLOCK + KSPROPERTY_SYNTH_MASTERCLOCK + KSPROPERTY_SYNTH_PORTPARAMETERS + KSPROPERTY_SYNTH_RUNNINGSTATS + KSPROPERTY_SYNTH_VOICEPRIORITY + KSPROPERTY_SYNTH_VOLUME + KSPROPERTY_SYNTH_VOLUMEBOOST +*/ + +#define KSPROPSETID_Synth_Dls +/* + KSPROPERTY_SYNTH_DLS_APPEND + KSPROPERTY_SYNTH_DLS_COMPACT + KSPROPERTY_SYNTH_DLS_DOWNLOAD + KSPROPERTY_SYNTH_DLS_UNLOAD + KSPROPERTY_SYNTH_DLS_WAVEFORMAT +*/ + +#define KSPROPSETID_Sysaudio +/* + KSPROPERTY_SYSAUDIO_COMPONENT_ID + KSPROPERTY_SYSAUDIO_CREATE_VIRTUAL_SOURCE + KSPROPERTY_SYSAUDIO_DEVICE_COUNT + KSPROPERTY_SYSAUDIO_DEVICE_FRIENDLY_NAME + KSPROPERTY_SYSAUDIO_DEVICE_INSTANCE + KSPROPERTY_SYSAUDIO_DEVICE_INTERFACE_NAME + KSPROPERTY_SYSAUDIO_INSTANCE_INFO + KSPROPERTY_SYSAUDIO_SELECT_GRAPH +*/ + +#define KSPROPSETID_Sysaudio_Pin +/* + KSPROPERTY_SYSAUDIO_ATTACH_VIRTUAL_SOURCE +*/ + +#define KSPROPSETID_TopologyNode +/* + KSPROPERTY_TOPOLOGYNODE_ENABLE + KSPROPERTY_TOPOLOGYNODE_RESET +*/ + + +/* =============================================================== + Interface Sets - TODO +*/ + +#define KSINTERFACESETID_Media + +#define KSINTERFACESETID_Standard +#define KSINTERFACE_STANDARD_STREAMING +#define KSINTERFACE_STANDARD_LOOPED_STREAMING +#define KSINTERFACE_STANDARD_CONTROL + + +/* =============================================================== + Event Sets for audio drivers - TODO +*/ +#define KSEVENTSETID_AudioControlChange +/* + KSEVENT_CONTROL_CHANGE +*/ + + + +/* =============================================================== + Node Types +*/ +/* + KSNODETYPE_3D_EFFECTS + KSNODETYPE_ACOUSTIC_ECHO_CANCEL + KSNODETYPE_ADC + KSNODETYPE_AGC + KSNODETYPE_CHORUS + KSNODETYPE_DAC + KSNODETYPE_DELAY + KSNODETYPE_DEMUX + KSNODETYPE_DEV_SPECIFIC + KSNODETYPE_DMSYNTH + KSNODETYPE_DMSYNTH_CAPS + KSNODETYPE_DRM_DESCRAMBLE + KSNODETYPE_EQUALIZER + KSNODETYPE_LOUDNESS + KSNODETYPE_MUTE + KSNODETYPE_MUX + KSNODETYPE_PEAKMETER + KSNODETYPE_PROLOGIC_DECODER + KSNODETYPE_PROLOGIC_ENCODER + KSNODETYPE_REVERB + KSNODETYPE_SRC + KSNODETYPE_STEREO_ENHANCE + KSNODETYPE_STEREO_WIDE + KSNODETYPE_SUM + KSNODETYPE_SUPERMIX + KSNODETYPE_SWMIDI + KSNODETYPE_SWSYNTH + KSNODETYPE_SYNTHESIZER + KSNODETYPE_TONE + KSNODETYPE_VOLUME +*/ + + +typedef PVOID KSDEVICE_HEADER, + KSOBJECT_HEADER, + KSOBJECT_BAG; + + + + +/* =============================================================== + Method Types +*/ + +#define KSMETHOD_TYPE_NONE 0x00000000 +#define KSMETHOD_TYPE_READ 0x00000001 +#define KSMETHOD_TYPE_WRITE 0x00000002 +#define KSMETHOD_TYPE_MODIFY 0x00000003 +#define KSMETHOD_TYPE_SOURCE 0x00000004 +#define KSMETHOD_TYPE_SEND 0x00000001 +#define KSMETHOD_TYPE_SETSUPPORT 0x00000100 +#define KSMETHOD_TYPE_BASICSUPPORT 0x00000200 + + +/* =============================================================== + Property Types +*/ + +#define KSPROPERTY_TYPE_GET 0x00000001 +#define KSPROPERTY_TYPE_SET 0x00000002 +#define KSPROPERTY_TYPE_SETSUPPORT 0x00000100 +#define KSPROPERTY_TYPE_BASICSUPPORT 0x00000200 +#define KSPROPERTY_TYPE_RELATIONS 0x00000400 +#define KSPROPERTY_TYPE_SERIALIZESET 0x00000800 +#define KSPROPERTY_TYPE_UNSERIALIZESET 0x00001000 +#define KSPROPERTY_TYPE_SERIALIZERAW 0x00002000 +#define KSPROPERTY_TYPE_UNSERIALIZERAW 0x00004000 +#define KSPROPERTY_TYPE_SERIALIZESIZE 0x00008000 +#define KSPROPERTY_TYPE_DEFAULT_VALUES 0x00010000 + + +/* =============================================================== + Topology Methods/Properties +*/ + +#define KSMETHOD_TYPE_TOPOLOGY 0x10000000 +#define KSPROPERTY_TYPE_TOPOLOGY 0x10000000 + +/* +#define DEFINE_KS_GUID(GA,GB,GC,GD,GE,GF,GG,GH,GI,GJ,GK) \ + DEFINE_GUID(??, 0x#GA#L, 0xGB, 0xGC, 0xGD, 0xGE, 0xGF, 0xGG, 0xGH, 0xGI, 0xGJ, 0xGK) \ + "GA-GB-GC-GDGE-GFGGGHGIGJGK" +*/ + +/* =============================================================== + KS Category GUIDs + + BRIDGE - 0x085AFF00L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + CAPTURE - 0x65E8773DL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + RENDER - 0x65E8773EL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + MIXER - 0xAD809C00L, 0x7B88, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + SPLITTER - 0x0A4252A0L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + DATACOMPRESSOR - 0x1E84C900L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + DATADECOMPRESSOR - 0x2721AE20L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + DATATRANSFORM - 0x2EB07EA0L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + COMMUNICATIONSTRANSFORM - 0xCF1DDA2CL, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + INTERFACETRANSFORM - 0xCF1DDA2DL, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + MEDIUMTRANSFORM - 0xCF1DDA2EL, 0x9743, 0x11D0, 0xA3, 0xEE, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + FILESYSTEM - 0x760FED5EL, 0x9357, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + CLOCK - 0x53172480L, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + PROXY - 0x97EBAACAL, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + QUALITY - 0x97EBAACBL, 0x95BD, 0x11D0, 0xA3, 0xEA, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +*/ + +/* =============================================================== + KSNAME GUIDs (defined also as KSSTRING_Xxx L"{...}" + + Filter - 0x9b365890L, 0x165f, 0x11d0, 0xa1, 0x95, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 + Pin - 0x146F1A80L, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + Clock - 0x53172480L, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + Allocator - 0x642F5D00L, 0x4791, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + TopologyNode - 0x0621061AL, 0xEE75, 0x11D0, 0xB9, 0x15, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +*/ + +/* =============================================================== + Interface GUIDs + + Standard - 0x1A8766A0L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + FileIo - 0x8C6F932CL, 0xE771, 0x11D0, 0xB8, 0xFF, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +*/ + +/* =============================================================== + Medium Type GUIDs + + Standard - 0x4747B320L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +*/ + +/* =============================================================== + Property Set GUIDs + + General - 0x1464EDA5L, 0x6A8F, 0x11D1, 0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + StreamIo - 0x65D003CAL, 0x1523, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + MediaSeeking - 0xEE904F0CL, 0xD09B, 0x11D0, 0xAB, 0xE9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 + Topology - 0x720D4AC0L, 0x7533, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + GM - 0xAF627536L, 0xE719, 0x11D2, 0x8A, 0x1D, 0x00, 0x60, 0x97, 0xD2, 0xDF, 0x5D + Quality - 0xD16AD380L, 0xAC1A, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + Connection - 0x1D58C920L, 0xAC9B, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +*/ + +/* =============================================================== + StreamAllocator Sets + + Event set - 0x75d95571L, 0x073c, 0x11d0, 0xa1, 0x61, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 + Method set - 0xcf6e4341L, 0xec87, 0x11cf, 0xa1, 0x30, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 + Property set - 0xcf6e4342L, 0xec87, 0x11cf, 0xa1, 0x30, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 +*/ + +/* =============================================================== + StreamInterface Sets + + Property set - 0x1fdd8ee1L, 0x9cd3, 0x11d0, 0x82, 0xaa, 0x00, 0x00, 0xf8, 0x22, 0xfe, 0x8a +*/ + +/* =============================================================== + Clock Sets + + Property set - 0xDF12A4C0L, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + Event sets - 0x364D8E20L, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +*/ + +/* =============================================================== + Connection Sets + + Event set - 0x7f4bcbe0L, 0x9ea5, 0x11cf, 0xa5, 0xd6, 0x28, 0xdb, 0x04, 0xc1, 0x00, 0x00 +*/ + +/* =============================================================== + Time Format GUIDs + + KSTIME_FORMAT_NONE (null guid) + FRAME - 0x7b785570L, 0x8c82, 0x11cf, 0xbc, 0x0c, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6 + BYTE - 0x7b785571L, 0x8c82, 0x11cf, 0xbc, 0x0c, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6 + SAMPLE - 0x7b785572L, 0x8c82, 0x11cf, 0xbc, 0x0c, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6 + FIELD - 0x7b785573L, 0x8c82, 0x11cf, 0xbc, 0x0c, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6 + MEDIA_TIME - 0x7b785574L, 0x8c82, 0x11cf, 0xbc, 0x0c, 0x00, 0xaa, 0x00, 0xac, 0x74, 0xf6 +*/ + +/* =============================================================== + Media Type GUIDs + + NULL + Stream - + None - + + TODO ... +*/ + +/* =============================================================== + KSMEMORY_TYPE_xxx + + WILDCARD, DONT_CARE = NULL + SYSTEM - 0x091bb638L, 0x603f, 0x11d1, 0xb0, 0x67, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02 + USER - 0x8cb0fc28L, 0x7893, 0x11d1, 0xb0, 0x69, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02 + KERNEL_PAGED - 0xd833f8f8L, 0x7894, 0x11d1, 0xb0, 0x69, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02 + KERNEL_NONPAGED - 0x4a6d5fc4L, 0x7895, 0x11d1, 0xb0, 0x69, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02 + DEVICE_UNKNOWN - 0x091bb639L, 0x603f, 0x11d1, 0xb0, 0x67, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02 +*/ + +/* =============================================================== + Enums + (values have been checked) +*/ + +typedef enum +{ + KsObjectTypeDevice, + KsObjectTypeFilterFactory, + KsObjectTypeFilter, + KsObjectTypePin +} KSOBJECTTYPE; + +typedef enum +{ + KSSTATE_STOP, + KSSTATE_ACQUIRE, + KSSTATE_PAUSE, + KSSTATE_RUN +} KSSTATE; + +typedef enum +{ + KSTARGET_STATE_DISABLED, + KSTARGET_STATE_ENABLED +} KSTARGET_STATE; + +typedef enum +{ + KSRESET_BEGIN, + KSRESET_END +} KSRESET; + +typedef enum +{ + KSEVENTS_NONE, + KSEVENTS_SPINLOCK, + KSEVENTS_MUTEX, + KSEVENTS_FMUTEX, + KSEVENTS_FMUTEXUNSAFE, + KSEVENTS_INTERRUPT, + KSEVENTS_ERESOURCE +} KSEVENTS_LOCKTYPE; + +typedef enum +{ + KSDEGRADE_STANDARD_SIMPLE, + KSDEGRADE_STANDARD_QUALITY, + KSDEGRADE_STANDARD_COMPUTATION, + KSDEGRADE_STANDARD_SKIP +} KSDEGRADE_STANDARD; + +typedef enum +{ + KSPIN_DATAFLOW_IN = 1, + KSPIN_DATAFLOW_OUT +} KSPIN_DATAFLOW; + +typedef enum +{ + KSPIN_COMMUNICATION_NONE, + KSPIN_COMMUNICATION_SINK, + KSPIN_COMMUNICATION_SOURCE, + KSPIN_COMMUNICATION_BOTH, + KSPIN_COMMUNICATION_BRIDGE +} KSPIN_COMMUNICATION; + +typedef enum +{ + KsListEntryTail, + KsListEntryHead +} KSLIST_ENTRY_LOCATION; + +typedef enum +{ + KsStackCopyToNewLocation, + KsStackReuseCurrentLocation, + KsStackUseNewLocation +} KSSTACK_USE; + +typedef enum +{ + KsAcquireOnly, + KsAcquireAndRemove, + KsAcquireOnlySingleItem, + KsAcquireAndRemoveOnlySingleItem +} KSIRP_REMOVAL_OPERATION; + +typedef enum +{ + KsInvokeOnSuccess = 1, + KsInvokeOnError = 2, + KsInvokeOnCancel = 4 +} KSCOMPLETION_INVOCATION; + + + +/* MOVE ME */ +typedef NTSTATUS (*PFNKSCONTEXT_DISPATCH)( + IN PVOID Context, + IN PIRP Irp); + + +/* =============================================================== + Framing +*/ + +typedef struct +{ +} 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 +{ +} KS_COMPRESSION, *PKS_COMPRESSION; + + +/* =============================================================== + Common +*/ + +typedef struct +{ + GUID Set; + ULONG Id; + ULONG Flags; +} KSIDENTIFIER, *PKSIDENTIFIER; + +typedef KSIDENTIFIER KSPROPERTY, *PKSPROPERTY; +typedef KSIDENTIFIER KSMETHOD, *PKSMETHOD; +typedef KSIDENTIFIER KSEVENT, *PKSEVENT; + +typedef KSIDENTIFIER KSDEGRADE, *PKSDEGRADE; + +typedef KSIDENTIFIER KSPIN_INTERFACE, *PKSPIN_INTERFACE; +typedef KSIDENTIFIER KSPIN_MEDIUM, *PKSPIN_MEDIUM; + +typedef struct +{ +} KSDATARANGE, *PKSDATARANGE; + +typedef struct +{ +} KSDATAFORMAT, *PKSDATAFORMAT; + +typedef struct +{ +} KSATTRIBUTE, *PKSATTRIBUTE; + + +/* =============================================================== + Priorities +*/ + +#define KSPRIORITY_LOW 0x00000001 +#define KSPRIORITY_NORMAL 0x40000000 +#define KSPRIORITY_HIGH 0x80000000 +#define KSPRIORITY_EXCLUSIVE 0xFFFFFFFF + +typedef struct +{ + ULONG PriorityClass; + ULONG PrioritySubClass; +} KSPRIORITY, *PKSPRIORITY; + + +/* =============================================================== */ + +typedef struct +{ +} KSDISPATCH_TABLE, *PKSDISPATCH_TABLE; + +typedef struct +{ +} BUS_INTERFACE_REFERENCE, *PBUS_INTERFACE_REFERENCE; + +typedef struct +{ +} KSCOMPONENTID, *PKSCOMPONENTID; + +typedef struct +{ +} KSBUFFER_ITEM, *PKSBUFFER_ITEM; + +/* =============================================================== + Properties +*/ + +#define KSPROPERTY_MEMBER_RANGES 0x00000001 +#define KSPROPERTY_MEMBER_STEPPEDRANGES 0x00000002 +#define KSPROPERTY_MEMBER_VALUES 0x00000003 +#define KSPROPERTY_MEMBER_FLAG_DEFAULT KSPROPERTY_MEMBER_RANGES + +typedef struct +{ +} KSPROPERTY_BOUNDS_LONG, *PKSPROPERTY_BOUNDS_LONG; + +typedef struct +{ +} KSPROPERTY_BOUNDS_LONGLONG, *PKSPROPERTY_BOUNDS_LONGLONG; + +typedef struct +{ +} KSPROPERTY_DESCRIPTION, *PKSPROPERTY_DESCRIPTION; + +typedef struct +{ +} KSPROPERTY_ITEM, *PKSPROPERTY_ITEM; + +typedef struct +{ +} KSPROPERTY_MEDIAAVAILABLE, *PKSPROPERTY_MEDIAAVAILABLE; + +typedef struct +{ +} KSPROPERTY_MEMBERSHEADER, *PKSPROPERTY_MEMBERSHEADER; + +typedef struct +{ +} KSPROPERTY_MEMBERSLIST, *PKSPROPERTY_MEMBERSLIST; + +typedef struct +{ +} KSPROPERTY_POSITIONS, *PKSPROPERTY_POSITIONS; + +typedef struct +{ +} KSPROPERTY_SERIAL, *PKSPROPERTY_SERIAL; + +typedef struct +{ +} KSPROPERTY_SERIALHDR, *PKSPROPERTY_SERIALHDR; + +typedef struct +{ +} KSPROPERTY_SET, *PKSPROPERTY_SET; + +typedef struct +{ +} KSPROPERTY_STEPPING_LONG, *PKSPROPERTY_STEPPING_LONG; + +typedef struct +{ +} KSPROPERTY_STEPPING_LONGLONG, *PKSPROPERTY_STEPPING_LONGLONG; + +typedef struct +{ +} KSPROPERTY_VALUES, *PKSPROPERTY_VALUES; + + +/* =============================================================== + Allocator Framing +*/ + +typedef struct +{ +} KSALLOCATOR_FRAMING, *PKSALLOCATOR_FRAMING; + +typedef struct +{ +} KSALLOCATOR_FRAMING_EX, *PKSALLOCATOR_FRAMING_EX; + + +/* =============================================================== + Quality +*/ + +typedef struct +{ +} KSQUALITY, *PKSQUALITY; + +typedef struct +{ + HANDLE QualityManager; + PVOID Context; +} KSQUALITY_MANAGER, *PKSQUALITY_MANAGER; + +typedef struct +{ +} KSRATE, *PKSRATE; + +typedef struct +{ +} KSRATE_CAPABILITY, *PKSRATE_CAPABILITY; + +typedef struct +{ + LONGLONG Granularity; + LONGLONG Error; +} KSRESOLUTION, *PKSRESOLUTION; + +typedef struct +{ +} KSRELATIVEEVENT, *PKSRELATIVEEVENT; + + +/* =============================================================== + Timing +*/ + +typedef struct +{ + LONGLONG Time; + ULONG Numerator; + ULONG Denominator; +} KSTIME, *PKSTIME; + +typedef struct +{ +} KSCORRELATED_TIME, *PKSCORRELATED_TIME; + +typedef struct +{ + KSPROPERTY Property; + GUID SourceFormat; + GUID TargetFormat; + LONGLONG Time; +} KSP_TIMEFORMAT, *PKSP_TIMEFORMAT; + +typedef struct +{ +} KSINTERVAL, *PKSINTERVAL; + +typedef struct +{ +} KSFRAMETIME, *PKSFRAMETIME; + + +/* =============================================================== + Clocks +*/ + +typedef struct +{ +} KSCLOCK, *PKSCLOCK, *PKSDEFAULTCLOCK; /* OK ? */ + +typedef struct +{ +} KSCLOCK_CREATE, *PKSCLOCK_CREATE; + +typedef struct +{ +} KSCLOCK_FUNCTIONTABLE, *PKSCLOCK_FUNCTIONTABLE; + + +/* =============================================================== + Objects ??? SORT ME! +*/ + +typedef struct +{ +} KSOBJECT_CREATE, *PKSOBJECT_CREATE; + +typedef struct +{ +} KSOBJECT_CREATE_ITEM, *PKSOBJECT_CREATE_ITEM; + +typedef VOID (*PFNKSITEMFREECALLBACK)( + IN PKSOBJECT_CREATE_ITEM CreateItem); + +typedef struct +{ +} KSMULTIPLE_ITEM, *PKSMULTIPLE_ITEM; + +typedef struct +{ +} KSQUERYBUFFER, *PKSQUERYBUFFER; + +typedef struct +{ +} KSERROR, *PKSERROR; + +typedef struct +{ +} KSDPC_ITEM, *PKSDPC_ITEM; + + +/* =============================================================== + Methods +*/ + +typedef struct +{ +} KSMETHOD_SET, *PKSMETHOD_SET; + +typedef struct +{ +} KSMETHOD_ITEM, *PKSMETHOD_ITEM; + +typedef struct +{ +} KSFASTMETHOD_ITEM, *PKSFASTMETHOD_ITEM; + + +/* =============================================================== + Nodes +*/ + +typedef struct +{ +} KSP_NODE, *PKSP_NODE; + +typedef struct +{ + KSMETHOD Method; + ULONG NodeID; + ULONG Reserved; +} KSM_NODE, *PKSM_NODE; + +typedef struct +{ +} KSE_NODE, *PKSE_NODE; + +typedef struct +{ +} KSNODE_CREATE, *PKSNODE_CREATE; + + +/* =============================================================== + Properties? +*/ + +typedef struct +{ +} KSFASTPROPERTY_ITEM, *PKSFASTPROPERTY_ITEM; + + +/* =============================================================== + Events +*/ + +typedef struct +{ +} KSEVENT_TIME_MARK, *PKSEVENT_TIME_MARK; + +typedef struct +{ +} KSEVENT_TIME_INTERVAL, *PKSEVENT_TIME_INTERVAL; + +typedef struct +{ +} KSEVENT_SET, *PKSEVENT_SET; + +typedef struct +{ +} KSEVENT_ITEM, *PKSEVENT_ITEM; + +typedef struct _KSEVENT_ENTRY +{ +} KSEVENT_ENTRY, *PKSEVENT_ENTRY; + +typedef struct +{ +} KSEVENTDATA, *PKSEVENTDATA; + + +/* =============================================================== + Pins +*/ + +typedef struct +{ +} KSPIN_DISPATCH, *PKSPIN_DISPATCH; + +typedef struct +{ +} KSAUTOMATION_TABLE, *PKSAUTOMATION_TABLE; + +typedef struct +{ +} KSPIN_DESCRIPTOR, *PKSPIN_DESCRIPTOR; + +/* TODO */ +/* This is just to shut the compiler up so DON'T USE IT! */ +typedef void (*PFNKSINTERSECTHANDLER)(void); +typedef void (*PFNKSINTERSECTHANDLEREX)(void); + +typedef struct +{ + const KSPIN_DISPATCH* Dispatch; + const KSAUTOMATION_TABLE* AutomationTable; + KSPIN_DESCRIPTOR PinDescriptor; + ULONG Flags; + ULONG InstancesPossible; + ULONG InstancesNecessary; + const KSALLOCATOR_FRAMING_EX* AllocatorFraming; + PFNKSINTERSECTHANDLEREX IntersectHandler; +} KSPIN_DESCRIPTOR_EX, *PKSPIN_DESCRIPTOR_EX; + +/* TODO */ +#define KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING +#define KSPIN_FLAG_CRITICAL_PROCESSING +#define KSPIN_FLAG_HYPERCRITICAL_PROCESSING +#define KSPIN_FLAG_ASYNCHRONOUS_PROCESSING +#define KSPIN_FLAG_DO_NOT_INITIATE_PROCESSING +#define KSPIN_FLAG_INITIATE_PROCESSING_ON_EVERY_ARRIVAL +#define KSPIN_FLAG_FRAMES_NOT_REQUIRED_FOR_PROCESSING +#define KSPIN_FLAG_ENFORCE_FIFO +#define KSPIN_FLAG_GENERATE_MAPPINGS +#define KSPIN_FLAG_DISTINCT_TRAILING_EDGE +#define KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY +#define KSPIN_FLAG_SPLITTER +#define KSPIN_FLAG_USE_STANDARD_TRANSPORT +#define KSPIN_FLAG_DO_NOT_USE_STANDARD_TRANSPORT +#define KSPIN_FLAG_FIXED_FORMAT +#define KSPIN_FLAG_GENERATE_EOS_EVENTS +#define KSPIN_FLAG_RENDERER +#define KSPIN_FLAG_SOME_FRAMES_REQUIRED_FOR_PROCESSING +#define KSPIN_FLAG_PROCESS_IF_ANY_IN_RUN_STATE +#define KSPIN_FLAG_DENY_USERMODE_ACCESS +#define KSPIN_FLAG_IMPLEMENT_CLOCK + +typedef struct +{ + const KSPIN_DESCRIPTOR_EX* Descriptor; + KSOBJECT_BAG Bag; + PVOID Context; + ULONG Id; + KSPIN_COMMUNICATION Communication; + BOOLEAN ConnectionIsExternal; + KSPIN_INTERFACE ConnectionInterface; + KSPIN_MEDIUM ConnectionMedium; + KSPRIORITY ConnectionPriority; + PKSDATAFORMAT ConnectionFormat; + PKSMULTIPLE_ITEM AttributeList; + ULONG StreamHeaderSize; + KSPIN_DATAFLOW DataFlow; + KSSTATE DeviceState; + KSRESET ResetState; + KSSTATE ClientState; +} KSPIN, *PKSPIN; + +typedef struct +{ + KSPIN_INTERFACE Interface; + KSPIN_MEDIUM Medium; + ULONG PinId; + HANDLE PinToHandle; + KSPRIORITY Priority; +} KSPIN_CONNECT, *PKSPIN_CONNECT; + +typedef struct +{ +} KSP_PIN, *PKSP_PIN; + +typedef struct +{ +} KSPIN_PHYSICALCONNECTION, *PKSPIN_PHYSICALCONNECTION; + + +/* =============================================================== + Topology +*/ + +typedef struct +{ + ULONG FromNode; + ULONG FromNodePin; + ULONG ToNode; + ULONG ToNodePin; +} KSTOPOLOGY_CONNECTION, *PKSTOPOLOGY_CONNECTION; + +typedef struct +{ + ULONG CategoriesCount; + const GUID* Categories; + ULONG TopologyNodesCount; + const GUID* TopologyNodes; + ULONG TopologyConnectionsCount; + const KSTOPOLOGY_CONNECTION* TopologyConnections; + const GUID* TopologyNodesNames; + ULONG Reserved; +} KSTOPOLOGY, *PKSTOPOLOGY; + + +/* =============================================================== + ??? SORT ME +*/ + +/* 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); + + +typedef NTSTATUS (*PFNKSALLOCATOR)( + IN PIRP Irp, + IN ULONG BufferSize, + IN BOOL InputOperation); + +typedef NTSTATUS (*PFNKSHANDLER)( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data); + +typedef BOOLEAN (*PFNKSFASTHANDLER)( + IN PFILE_OBJECT FileObject, + IN PKSIDENTIFIER UNALIGNED Request, + IN ULONG RequestLength, + IN OUT PVOID UNALIGNED Data, + IN ULONG DataLength, + OUT PIO_STATUS_BLOCK IoStatus); + +typedef NTSTATUS (*PFNKSADDEVENT)( + IN PIRP Irp, + IN PKSEVENTDATA EventData, + IN struct _KSEVENT_ENTRY* EventEntry); + +typedef NTSTATUS (*PFNKINTERSECTHANDLEREX)( + IN PVOID Context, + IN PIRP Irp, + IN PKSP_PIN Pin, + IN PKSDATARANGE DataRange, + IN PKSDATARANGE MatchingDataRange, + IN ULONG DataBufferSize, + OUT PVOID Data OPTIONAL, + OUT PULONG DataSize); + +typedef UNKNOWN PFNALLOCATORE_ALLOCATEFRAME; +typedef UNKNOWN PFNALLOCATOR_FREEFRAME; + +/* +typedef struct +{ + PFNALLOCATOR_ALLOCATEFRAME AllocateFrame; + PFNALLOCATOR_FREEFRAME FreeFrame; +} +*/ + +typedef struct +{ + KSALLOCATOR_FRAMING Framing; + ULONG AllocatedFrames; + ULONG Reserved; +} KSSTREAMALLOCATOR_STATUS, *PKSSTREAMALLOCATOR_STATUS; + +typedef struct +{ + KSALLOCATOR_FRAMING_EX Framing; + ULONG AllocatedFrames; + ULONG Reserved; +} KSSTREAMALLOCATOR_STATUS_EX, *PKSSTREAMALLOCATOR_STATUS_EX; + +typedef struct +{ + ULONG Size; + ULONG TypeSpecificFlags; + KSTIME PresentationTime; + LONGLONG Duration; + ULONG FrameExtent; + ULONG DataUsed; + PVOID Data; + ULONG OptionsFlags; +} KSSTREAM_HEADER, *PKSSTREAM_HEADER; + + + +/* =============================================================== + XP / DX8 +*/ + +typedef struct +{ + /* TODO */ +} KSPROCESSPIN, *PKSPROCESSPIN; + +typedef struct +{ + PKSPROCESSPIN* Pins; + ULONG Count; +} KSPROCESSPIN_INDEXENTRY, *PKSPROCESSPIN_INDEXENTRY; + + +/* =============================================================== + Device Dispatch +*/ + +typedef struct +{ + /* TODO */ +} KSDEVICE, *PKSDEVICE; + +typedef NTSTATUS (*PFNKSDEVICECREATE)( + IN PKSDEVICE Device); + +typedef NTSTATUS (*PFNKSDEVICEPNPSTART)( + IN PKSDEVICE Device, + IN PIRP Irp, + IN PCM_RESOURCE_LIST TranslatedResourceList OPTIONAL, + IN PCM_RESOURCE_LIST UntranslatedResourceList OPTIONAL); + +typedef NTSTATUS (*PFNKSDEVICE)( + IN PKSDEVICE Device); + +typedef NTSTATUS (*PFNKSDEVICEIRP)( + IN PKSDEVICE Device, + IN PIRP Irp); + +typedef VOID (*PFNKSDEVICEIRPVOID)( + IN PKSDEVICE Device, + IN PIRP Irp); + +typedef NTSTATUS (*PFNKSDEVICEQUERYCAPABILITIES)( + IN PKSDEVICE Device, + IN PIRP Irp, + IN OUT PDEVICE_CAPABILITIES Capabilities); + +typedef NTSTATUS (*PFNKSDEVICEQUERYPOWER)( + IN PKSDEVICE Device, + IN PIRP Irp, + IN DEVICE_POWER_STATE DeviceTo, + IN DEVICE_POWER_STATE DeviceFrom, + IN SYSTEM_POWER_STATE SystemTo, + IN SYSTEM_POWER_STATE SystemFrom, + IN POWER_ACTION Action); + +typedef VOID (*PFNKSDEVICESETPOWER)( + IN PKSDEVICE Device, + IN PIRP Irp, + IN DEVICE_POWER_STATE To, + IN DEVICE_POWER_STATE From); + +typedef struct _KSDEVICE_DISPATCH +{ + PFNKSDEVICECREATE Add; + PFNKSDEVICEPNPSTART Start; + PFNKSDEVICE PostStart; + PFNKSDEVICEIRP QueryStop; + PFNKSDEVICEIRPVOID CancelStop; + PFNKSDEVICEIRPVOID Stop; + PFNKSDEVICEIRP QueryRemove; + PFNKSDEVICEIRPVOID CancelRemove; + PFNKSDEVICEIRPVOID Remove; + PFNKSDEVICEQUERYCAPABILITIES QueryCapabilities; + PFNKSDEVICEIRPVOID SurpriseRemoval; + PFNKSDEVICEQUERYPOWER Querypower; + PFNKSDEVICESETPOWER SetPower; +} KSDEVICE_DISPATCH, *PKSDEVICE_DISPATCH; + + +/* =============================================================== + Filter Dispatch +*/ + +typedef struct +{ +} KSFILTER, *PKSFILTER; + +typedef NTSTATUS (*PFNKSFILTERIRP)( + IN PKSFILTER Filter, + IN PIRP Irp); + +typedef NTSTATUS (*PFNKSFILTERPROCESS)( + IN PKSFILTER FIlter, + IN PKSPROCESSPIN_INDEXENTRY ProcessPinsIndex); + +typedef NTSTATUS (*PFNKSFILTERVOID)( + IN PKSFILTER Filter); + +typedef struct _KSFILTER_DISPATCH +{ + PFNKSFILTERIRP Create; + PFNKSFILTERIRP Close; + PFNKSFILTERPROCESS Process; + PFNKSFILTERVOID Reset; +} KSFILTER_DISPATCH, *PKSFILTER_DISPATCH; + + +/* =============================================================== + Minidriver Callbacks +*/ + +typedef NTSTATUS (*KStrMethodHandler)( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data); + +typedef NTSTATUS (*KStrSupportHandler)( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data); + + +/* =============================================================== + Allocator Functions +*/ + +KSDDKAPI NTSTATUS NTAPI +KsCreateAllocator( + IN HANDLE ConnectionHandle, + IN PKSALLOCATOR_FRAMING AllocatorFraming, + OUT PHANDLE AllocatorHandle); + +KSDDKAPI NTSTATUS NTAPI +KsCreateDefaultAllocator( + IN PIRP Irp); + +KSDDKAPI NTSTATUS NTAPI +KsValidateAllocatorCreateRequest( + IN PIRP Irp, + OUT PKSALLOCATOR_FRAMING* AllocatorFraming); + +KSDDKAPI NTSTATUS NTAPI +KsCreateDefaultAllocatorEx( + IN PIRP Irp, + IN PVOID InitializeContext OPTIONAL, + IN PFNKSDEFAULTALLOCATE DefaultAllocate OPTIONAL, + IN PFNKSDEFAULTFREE DefaultFree OPTIONAL, + IN PFNKSINITIALIZEALLOCATOR InitializeAllocator OPTIONAL, + IN PFNKSDELETEALLOCATOR DeleteAllocator OPTIONAL); + +KSDDKAPI NTSTATUS NTAPI +KsValidateAllocatorFramingEx( + IN PKSALLOCATOR_FRAMING_EX Framing, + IN ULONG BufferSize, + IN const KSALLOCATOR_FRAMING_EX* PinFraming); + + +/* =============================================================== + Clock Functions +*/ + +typedef BOOLEAN (*PFNKSSETTIMER)( + IN PVOID Context, + IN PKTIMER Timer, + IN LARGE_INTEGER DueTime, + IN PKDPC Dpc); + +typedef BOOLEAN (*PFNKSCANCELTIMER)( + IN PVOID Context, + IN PKTIMER Timer); + +typedef LONGLONG (FASTCALL *PFNKSCORRELATEDTIME)( + IN PVOID Context, + OUT PLONGLONG SystemTime); + +KSDDKAPI NTSTATUS NTAPI +KsCreateClock( + IN HANDLE ConnectionHandle, + IN PKSCLOCK_CREATE ClockCreate, + OUT PHANDLE ClockHandle); + +KSDDKAPI NTSTATUS NTAPI +KsCreateDefaultClock( + IN PIRP Irp, + IN PKSDEFAULTCLOCK DefaultClock); + +KSDDKAPI NTSTATUS NTAPI +KsAllocateDefaultClock( + OUT PKSDEFAULTCLOCK* DefaultClock); + +KSDDKAPI NTSTATUS NTAPI +KsAllocateDefaultClockEx( + OUT PKSDEFAULTCLOCK* DefaultClock, + IN PVOID Context OPTIONAL, + IN PFNKSSETTIMER SetTimer OPTIONAL, + IN PFNKSCANCELTIMER CancelTimer OPTIONAL, + IN PFNKSCORRELATEDTIME CorrelatedTime OPTIONAL, + IN const KSRESOLUTION* Resolution OPTIONAL, + IN ULONG Flags); + +KSDDKAPI VOID NTAPI +KsFreeDefaultClock( + IN PKSDEFAULTCLOCK DefaultClock); + +KSDDKAPI NTSTATUS NTAPI +KsValidateClockCreateRequest( + IN PIRP Irp, + OUT PKSCLOCK_CREATE* ClockCreate); + +KSDDKAPI KSSTATE NTAPI +KsGetDefaultClockState( + IN PKSDEFAULTCLOCK DefaultClock); + +KSDDKAPI VOID NTAPI +KsSetDefaultClockState( + IN PKSDEFAULTCLOCK DefaultClock, + IN KSSTATE State); + +KSDDKAPI LONGLONG NTAPI +KsGetDefaultClockTime( + IN PKSDEFAULTCLOCK DefaultClock); + +KSDDKAPI VOID NTAPI +KsSetDefaultClockTime( + IN PKSDEFAULTCLOCK DefaultClock, + IN LONGLONG Time); + + +/* =============================================================== + Method Functions +*/ + +/* Method sets - TODO: Make into macros! */ + +#if 0 +VOID +KSMETHOD_SET_IRP_STORAGE( + IN IRP Irp); + +VOID +KSMETHOD_ITEM_IRP_STORAGE( + IN IRP Irp); + +VOID +KSMETHOD_TYPE_IRP_STORAGE( + IN IRP Irp); +#endif + +KSDDKAPI NTSTATUS NTAPI +KsMethodHandler( + IN PIRP Irp, + IN ULONG MethodSetsCount, + IN PKSMETHOD_SET MethodSet); + +KSDDKAPI NTSTATUS NTAPI +KsMethodHandlerWithAllocator( + IN PIRP Irp, + IN ULONG MethodSetsCount, + IN PKSMETHOD_SET MethodSet, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG MethodItemSize OPTIONAL); + +KSDDKAPI BOOLEAN NTAPI +KsFastMethodHandler( + IN PFILE_OBJECT FileObject, + IN PKSMETHOD UNALIGNED Method, + IN ULONG MethodLength, + IN OUT PVOID UNALIGNED Data, + IN ULONG DataLength, + OUT PIO_STATUS_BLOCK IoStatus, + IN ULONG MethodSetsCount, + IN const KSMETHOD_SET* MethodSet); + + +/* =============================================================== + Property Functions +*/ + +KSDDKAPI NTSTATUS NTAPI +KsPropertyHandler( + IN PIRP Irp, + IN ULONG PropertySetsCount, + IN const KSPROPERTY_SET* PropertySet); + +KSDDKAPI NTSTATUS NTAPI +KsPropertyHandlerWithAllocator( + IN PIRP Irp, + IN ULONG PropertySetsCount, + IN PKSPROPERTY_SET PropertySet, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG PropertyItemSize OPTIONAL); + +KSDDKAPI NTSTATUS NTAPI +KsUnserializeObjectPropertiesFromRegistry( + IN PFILE_OBJECT FileObject, + IN HANDLE ParentKey OPTIONAL, + IN PUNICODE_STRING RegistryPath OPTIONAL); + +KSDDKAPI BOOLEAN NTAPI +KsFastPropertyHandler( + IN PFILE_OBJECT FileObject, + IN PKSPROPERTY UNALIGNED Property, + IN ULONG PropertyLength, + IN OUT PVOID UNALIGNED Data, + IN ULONG DataLength, + OUT PIO_STATUS_BLOCK IoStatus, + IN ULONG PropertySetsCount, + IN const KSPROPERTY_SET* PropertySet); + + +/* =============================================================== + Event Functions +*/ + +KSDDKAPI NTSTATUS NTAPI +KsGenerateEvent( + IN PKSEVENT_ENTRY EntryEvent); + +KSDDKAPI NTSTATUS NTAPI +KsEnableEventWithAllocator( + IN PIRP Irp, + IN ULONG EventSetsCount, + IN PKSEVENT_SET EventSet, + IN OUT PLIST_ENTRY EventsList OPTIONAL, + IN KSEVENTS_LOCKTYPE EventsFlags OPTIONAL, + IN PVOID EventsLock OPTIONAL, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG EventItemSize OPTIONAL); + +KSDDKAPI NTSTATUS NTAPI +KsGenerateDataEvent( + IN PKSEVENT_ENTRY EventEntry, + IN ULONG DataSize, + IN PVOID Data); + +KSDDKAPI NTSTATUS NTAPI +KsEnableEvent( + IN PIRP Irp, + IN ULONG EventSetsCount, + IN KSEVENT_SET* EventSet, + IN OUT PLIST_ENTRY EventsList OPTIONAL, + IN KSEVENTS_LOCKTYPE EventsFlags OPTIONAL, + IN PVOID EventsLock OPTIONAL); + +KSDDKAPI VOID NTAPI +KsDiscardEvent( + IN PKSEVENT_ENTRY EventEntry); + +KSDDKAPI NTSTATUS NTAPI +KsDisableEvent( + IN PIRP Irp, + IN OUT PLIST_ENTRY EventsList, + IN KSEVENTS_LOCKTYPE EventsFlags, + IN PVOID EventsLock); + +KSDDKAPI VOID NTAPI +KsFreeEventList( + IN PFILE_OBJECT FileObject, + IN OUT PLIST_ENTRY EventsList, + IN KSEVENTS_LOCKTYPE EVentsFlags, + IN PVOID EventsLock); + + +/* =============================================================== + Topology Functions +*/ + +KSDDKAPI NTSTATUS NTAPI +KsValidateTopologyNodeCreateRequest( + IN PIRP Irp, + IN PKSTOPOLOGY Topology, + OUT PKSNODE_CREATE* NodeCreate); + +KSDDKAPI NTSTATUS NTAPI +KsCreateTopologyNode( + IN HANDLE ParentHandle, + IN PKSNODE_CREATE NodeCreate, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE NodeHandle); + +KSDDKAPI NTSTATUS NTAPI +KsTopologyPropertyHandler( + IN PIRP Irp, + IN PKSPROPERTY Property, + IN OUT PVOID Data, + IN const KSTOPOLOGY* Topology); + + + +/* =============================================================== + Connectivity Functions +*/ + +KSDDKAPI NTSTATUS NTAPI +KsCreatePin( + IN HANDLE FilterHandle, + IN PKSPIN_CONNECT Connect, + IN ACCESS_MASK DesiredAccess, + OUT PHANDLE ConnectionHandle); + +KSDDKAPI NTSTATUS NTAPI +KsValidateConnectRequest( + IN PIRP Irp, + IN ULONG DescriptorsCount, + IN KSPIN_DESCRIPTOR* Descriptor, + OUT PKSPIN_CONNECT* Connect); + +KSDDKAPI NTSTATUS NTAPI +KsPinPropertyHandler( + IN PIRP Irp, + IN PKSPROPERTY Property, + IN OUT PVOID Data, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor); + +KSDDKAPI NTSTATUS NTAPI +KsPinDataIntersection( + IN PIRP Irp, + IN PKSPIN Pin, + OUT PVOID Data, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor, + IN PFNKSINTERSECTHANDLER IntersectHandler); + +KSDDKAPI NTSTATUS NTAPI +KsPinDataIntersectionEx( + IN PIRP Irp, + IN PKSP_PIN Pin, + OUT PVOID Data, + IN ULONG DescriptorsCount, + IN const KSPIN_DESCRIPTOR* Descriptor, + IN ULONG DescriptorSize, + IN PFNKSINTERSECTHANDLEREX IntersectHandler OPTIONAL, + IN PVOID HandlerContext OPTIONAL); + +/* Does this belong here? */ + +KSDDKAPI NTSTATUS NTAPI +KsHandleSizedListQuery( + IN PIRP Irp, + IN ULONG DataItemsCount, + IN ULONG DataItemSize, + IN const VOID* DataItems); + + +/* =============================================================== + IRP Helper Functions +*/ + +typedef NTSTATUS (*PFNKSIRPLISTCALLBACK)( + IN PIRP Irp, + IN PVOID Context); + +KSDDKAPI NTSTATUS NTAPI +KsAcquireResetValue( + IN PIRP Irp, + OUT KSRESET* ResetValue); + +KSDDKAPI VOID NTAPI +KsAddIrpToCancelableQueue( + IN OUT PLIST_ENTRY QueueHead, + IN PKSPIN_LOCK SpinLock, + IN PIRP Irp, + IN KSLIST_ENTRY_LOCATION ListLocation, + IN PDRIVER_CANCEL DriverCancel OPTIONAL); + +KSDDKAPI NTSTATUS NTAPI +KsAddObjectCreateItemToDeviceHeader( + IN KSDEVICE_HEADER Header, + IN PDRIVER_DISPATCH Create, + IN PVOID Context, + IN PWCHAR ObjectClass, + IN PSECURITY_DESCRIPTOR SecurityDescriptor); + +KSDDKAPI NTSTATUS NTAPI +KsAddObjectCreateItemToObjectHeader( + IN KSOBJECT_HEADER Header, + IN PDRIVER_DISPATCH Create, + IN PVOID Context, + IN PWCHAR ObjectClass, + IN PSECURITY_DESCRIPTOR SecurityDescriptor); + +KSDDKAPI NTSTATUS NTAPI +KsAllocateDeviceHeader( + OUT PVOID Header, + IN ULONG ItemsCount, + IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL); + +KSDDKAPI NTSTATUS NTAPI +KsAllocateExtraData( + IN PIRP Irp, + IN ULONG ExtraSize, + OUT PVOID* ExtraBuffer); + +KSDDKAPI NTSTATUS NTAPI +KsAllocateObjectCreateItem( + IN KSDEVICE_HEADER Header, + IN PKSOBJECT_CREATE_ITEM CreateItem, + IN BOOL AllocateEntry, + IN PFNKSITEMFREECALLBACK ItemFreeCallback OPTIONAL); + +KSDDKAPI NTSTATUS NTAPI +KsAllocateObjectHeader( + OUT PVOID Header, + IN ULONG ItemsCount, + IN PKSOBJECT_CREATE_ITEM ItemsList OPTIONAL, + IN PIRP Irp, + IN KSDISPATCH_TABLE* Table); + +KSDDKAPI VOID NTAPI +KsCancelIo( + IN OUT PLIST_ENTRY QueueHead, + IN PKSPIN_LOCK SpinLock); + +KSDDKAPI VOID NTAPI +KsCancelRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +KSDDKAPI NTSTATUS NTAPI +KsDefaultDeviceIoCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/* ELSEWHERE +KSDDKAPI ULONG NTAPI +KsDecrementCountedWorker( + IN PKSWORKER Worker); +*/ + +KSDDKAPI BOOLEAN NTAPI +KsDispatchFastIoDeviceControlFailure( + IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer OPTIONAL, + IN ULONG OutputBufferLength, + IN ULONG IoControlCode, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject); /* always return false */ + +KSDDKAPI BOOLEAN NTAPI +KsDispatchFastReadFailure( + IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject); /* always return false */ + +/* This function does the same as the above */ +#define KsDispatchFastWriteFailure KsDispatchFastReadFailure + +KSDDKAPI NTSTATUS NTAPI +KsDispatchInvalidDeviceRequest( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +KSDDKAPI NTSTATUS NTAPI +KsDispatchIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +KSDDKAPI NTSTATUS NTAPI +KsDispatchSpecificMethod( + IN PIRP Irp, + IN PFNKSHANDLER Handler); + +KSDDKAPI NTSTATUS NTAPI +KsDispatchSpecificProperty( + IN PIRP Irp, + IN PFNKSHANDLER Handler); + +KSDDKAPI NTSTATUS NTAPI +KsForwardAndCatchIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PFILE_OBJECT FileObject, + IN KSSTACK_USE StackUse); + +KSDDKAPI NTSTATUS NTAPI +KsForwardIrp( + IN PIRP Irp, + IN PFILE_OBJECT FileObject, + IN BOOLEAN ReuseStackLocation); + +KSDDKAPI VOID NTAPI +KsFreeDeviceHeader( + IN PVOID Header); + +KSDDKAPI VOID NTAPI +KsFreeObjectHeader( + IN PVOID Header); + +KSDDKAPI NTSTATUS NTAPI +KsGetChildCreateParameter( + IN PIRP Irp, + OUT PVOID* CreateParameter); + +KSDDKAPI NTSTATUS NTAPI +KsMoveIrpsOnCancelableQueue( + IN OUT PLIST_ENTRY SourceList, + IN PKSPIN_LOCK SourceLock, + IN OUT PLIST_ENTRY DestinationList, + IN PKSPIN_LOCK DestinationLock OPTIONAL, + IN KSLIST_ENTRY_LOCATION ListLocation, + IN PFNKSIRPLISTCALLBACK ListCallback, + IN PVOID Context); + +KSDDKAPI NTSTATUS NTAPI +KsProbeStreamIrp( + IN PIRP Irp, + IN ULONG ProbeFlags, + IN ULONG HeaderSize); + +KSDDKAPI NTSTATUS NTAPI +KsQueryInformationFile( + IN PFILE_OBJECT FileObject, + OUT PVOID FileInformation, + IN ULONG Length, + IN FILE_INFORMATION_CLASS FileInformationClass); + +KSDDKAPI ACCESS_MASK NTAPI +KsQueryObjectAccessMask( + IN KSOBJECT_HEADER Header); + +KSDDKAPI PKSOBJECT_CREATE_ITEM NTAPI +KsQueryObjectCreateItem( + IN KSOBJECT_HEADER Header); + +KSDDKAPI NTSTATUS NTAPI +KsReadFile( + IN PFILE_OBJECT FileObject, + IN PKEVENT Event OPTIONAL, + IN PVOID PortContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + OUT PVOID Buffer, + IN ULONG Length, + IN ULONG Key OPTIONAL, + IN KPROCESSOR_MODE RequestorMode); + +KSDDKAPI VOID NTAPI +KsReleaseIrpOnCancelableQueue( + IN PIRP Irp, + IN PDRIVER_CANCEL DriverCancel OPTIONAL); + +KSDDKAPI PIRP NTAPI +KsRemoveIrpFromCancelableQueue( + IN OUT PLIST_ENTRY QueueHead, + IN PKSPIN_LOCK SpinLock, + IN KSLIST_ENTRY_LOCATION ListLocation, + IN KSIRP_REMOVAL_OPERATION RemovalOperation); + +KSDDKAPI VOID NTAPI +KsRemoveSpecificIrpFromCancelableQueue( + IN PIRP Irp); + +KSDDKAPI NTSTATUS NTAPI +KsSetInformationFile( + IN PFILE_OBJECT FileObject, + IN PVOID FileInformation, + IN ULONG Length, + IN FILE_INFORMATION_CLASS FileInformationClass); + +KSDDKAPI NTSTATUS NTAPI +KsSetMajorFunctionHandler( + IN PDRIVER_OBJECT DriverObject, + IN ULONG MajorFunction); + +KSDDKAPI NTSTATUS NTAPI +KsStreamIo( + IN PFILE_OBJECT FileObject, + IN PKEVENT Event OPTIONAL, + IN PVOID PortContext OPTIONAL, + IN PIO_COMPLETION_ROUTINE CompletionRoutine OPTIONAL, + IN PVOID CompletionContext OPTIONAL, + IN KSCOMPLETION_INVOCATION CompletionInvocationFlags OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN OUT PVOID StreamHeaders, + IN ULONG Length, + IN ULONG Flags, + IN KPROCESSOR_MODE RequestorMode); + +KSDDKAPI NTSTATUS NTAPI + KsWriteFile( + IN PFILE_OBJECT FileObject, + IN PKEVENT Event OPTIONAL, + IN PVOID PortContext OPTIONAL, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PVOID Buffer, + IN ULONG Length, + IN ULONG Key OPTIONAL, + IN KPROCESSOR_MODE RequestorMode); + + +/* =============================================================== + Worker Management Functions +*/ + +KSDDKAPI NTSTATUS NTAPI +KsRegisterWorker( + IN WORK_QUEUE_TYPE WorkQueueType, + OUT PKSWORKER* Worker); + +KSDDKAPI VOID NTAPI +KsUnregisterWorker( + IN PKSWORKER Worker); + +KSDDKAPI NTSTATUS NTAPI +KsRegisterCountedWorker( + IN WORK_QUEUE_TYPE WorkQueueType, + IN PWORK_QUEUE_ITEM CountedWorkItem, + OUT PKSWORKER* Worker); + +KSDDKAPI ULONG NTAPI +KsDecrementCountedWorker( + IN PKSWORKER Worker); + +KSDDKAPI ULONG NTAPI +KsIncrementCountedWorker( + IN PKSWORKER Worker); + +KSDDKAPI NTSTATUS NTAPI +KsQueueWorkItem( + IN PKSWORKER Worker, + IN PWORK_QUEUE_ITEM WorkItem); + + +/* =============================================================== + Resources / Images +*/ + +KSDDKAPI NTSTATUS NTAPI +KsLoadResource( + IN PVOID ImageBase, + IN POOL_TYPE PoolType, + IN ULONG_PTR ResourceName, + IN ULONG ResourceType, + OUT PVOID* Resource, + OUT PULONG ResourceSize); + +/* TODO: Implement +KSDDKAPI NTSTATUS NTAPI +KsGetImageNameAndResourceId( + IN HANDLE RegKey, + OUT PUNICODE_STRING ImageName, + OUT PULONG_PTR ResourceId, + OUT PULONG ValueType); + +KSDDKAPI NTSTATUS NTAPI +KsMapModuleName( + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PUNICODE_STRING ModuleName, + OUT PUNICODE_STRING ImageName, + OUT PULONG_PTR ResourceId, + OUT PULONG ValueType); +*/ + + +/* =============================================================== + Misc. Helper Functions +*/ + +KSDDKAPI NTSTATUS NTAPI +KsCacheMedium( + IN PUNICODE_STRING SymbolicLink, + IN PKSPIN_MEDIUM Medium, + IN DWORD PinDirection); + +KSDDKAPI NTSTATUS NTAPI +KsDefaultDispatchPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +KSDDKAPI VOID NTAPI +KsSetDevicePnpAndBaseObject( + IN KSDEVICE_HEADER Header, + IN PDEVICE_OBJECT PnpDeviceObject, + IN PDEVICE_OBJECT BaseDevice); + +KSDDKAPI NTSTATUS NTAPI +KsDefaultDispatchPower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +KSDDKAPI VOID NTAPI +KsSetPowerDispatch( + IN KSOBJECT_HEADER Header, + IN PFNKSCONTEXT_DISPATCH PowerDispatch OPTIONAL, + IN PVOID PowerContext OPTIONAL); + +KSDDKAPI NTSTATUS NTAPI +KsReferenceBusObject( + IN KSDEVICE_HEADER Header); + +KSDDKAPI VOID NTAPI +KsDereferenceBusObject( + IN KSDEVICE_HEADER Header); + +KSDDKAPI NTSTATUS NTAPI +KsFreeObjectCreateItem( + IN KSDEVICE_HEADER Header, + IN PUNICODE_STRING CreateItem); + +KSDDKAPI NTSTATUS NTAPI +KsFreeObjectCreateItemsByContext( + IN KSDEVICE_HEADER Header, + IN PVOID Context); + +VOID +KsNullDriverUnload( + IN PDRIVER_OBJECT DriverObject); + +KSDDKAPI PDEVICE_OBJECT NTAPI +KsQueryDevicePnpObject( + IN KSDEVICE_HEADER Header); + +KSDDKAPI VOID NTAPI +KsRecalculateStackDepth( + IN KSDEVICE_HEADER Header, + IN BOOLEAN ReuseStackLocation); + +KSDDKAPI VOID NTAPI +KsSetTargetDeviceObject( + IN KSOBJECT_HEADER Header, + IN PDEVICE_OBJECT TargetDevice OPTIONAL); + +KSDDKAPI VOID NTAPI +KsSetTargetState( + IN KSOBJECT_HEADER Header, + IN KSTARGET_STATE TargetState); + +KSDDKAPI NTSTATUS NTAPI +KsSynchronousIoControlDevice( + IN PFILE_OBJECT FileObject, + IN KPROCESSOR_MODE RequestorMode, + IN DWORD IoControl, + IN PVOID InBuffer, + IN ULONG InSize, + OUT PVOID OutBuffer, + IN ULONG OUtSize, + OUT PULONG BytesReturned); + + +/* =============================================================== + AVStream Functions (XP / DirectX 8) + NOT IMPLEMENTED YET + http://www.osronline.com/ddkx/stream/avstream_5q9f.htm +*/ + +#if 0 +typedef void (*PFNKSFILTERFACTORYPOWER)( + IN PKSFILTERFACTORY FilterFactory, + IN DEVICE_POWER_STATE State); + +KSDDKAPI NTSTATUS NTAPI +_KsEdit( + IN KSOBJECT_BAG ObjectBag, + IN OUT PVOID* PointerToPointerToItem, + IN ULONG NewSize, + IN ULONG OldSize, + IN ULONG Tag); + +VOID +KsAcquireControl( + IN PVOID Object) +{ +} + +VOID +KsAcquireDevice( + IN PKSDEVICE Device) +{ +} + +NTSTATUS +KsAddDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ +} + +VOID +KsAddEvent( + IN PVOID Object, + IN PKSEVENT_ENTRY EventEntry) +{ +} + +NTSTATUS +KsAddItemToObjectBag( + IN KSOBJECT_BAG ObjectBag, + IN PVOID Item, + IN PFNKSFREE Free OPTIONAL) +{ +} + +NTSTATUS +KsAllocateObjectBag( + IN PKSDEVICE Device, + OUT KSOBJECT_BAG* ObjectBag) +{ +} + +VOID +KsCompletePendingRequest( + IN PIRP Irp) +{ +} + +NTSTATUS +KsCopyObjectBagItems( + IN KSOBJECT_BAG ObjectBagDestination, + IN KSOBJECT_BAG ObjectBagSource) +{ +} + +NTSTATUS +KsCreateDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL, + IN ULONG ExtensionSize OPTIONAL, + OUT PKSDEVICE* Device OPTIONAL) +{ +} + +NTSTATUS +KsCreateFilterFactory( + IN PDEVICE_OBJECT DeviceObject, + IN const KSFILTER_DESCRIPTOR* Descriptor, + IN PWCHAR RefString OPTIONAL, + IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL, + IN ULONG CreateItemFlags, + IN PFNKSFILTERFACTORYPOWER SleepCallback OPTIONAL, + IN PFNKSFILTERFACTORYPOWER WakeCallback OPTIONAL, + OUT PKFSFILTERFACTORY FilterFactory OPTIONAL) +{ +} + +NTSTATUS +KsDefaultAddEventHandler( + IN PIRP Irp, + IN PKSEVENTDATA EventData, + IN OUT PKSEVENT_ENTRY EventEntry) +{ +} + +NTSTATUS +KsDeleteFilterFactory( + IN PKSFILTERFACTORY FilterFactory) +{ +} + +ULONG +KsDeviceGetBusData( + IN PKSDEVICE Device, + IN ULONG DataType, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length) +{ +} + +PKSFILTERFACTORY +KsDeviceGetFirstChildFilterFactory( + IN PKSDEVICE Device) +{ +} + +PUNKNOWN +KsDeviceGetOuterUnknown( + IN PKSDEVICE Device) +{ +} + +VOID +KsDeviceRegisterAdapterObject( + IN PKSDEVICE Device, + IN PADAPTER_OBJECT AdapterObject, + IN ULONG MaxMappingByteCount, + IN ULONG MappingTableStride) +{ +} + +KSDDKAPI PUNKNOWN NTAPI +KsDeviceRegisterAggregatedClientUnknown( + IN PKSDEVICE Device, + IN PUNKNOWN ClientUnknown); + +ULONG +KsDeviceSetBusData( + IN PKSDEVICE Device, + IN ULONG DataType, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length) +{ +} + +#define KsDiscard(object, pointer) \ + KsRemoveItemFromObjectBag(object->Bag, pointer, TRUE) + +VOID +KsFilterAcquireControl( + IN PKSFILTER Filter) +{ +} + +VOID +KsFilterAcquireProcessingMutex( + IN PKSFILTER Filter); + +VOID +KsFilterAddEvent( + IN PKSFILTER Filter, + IN PKSEVENT_ENTRY EventEntry) +{ +} + +KSDDKAPI NTSTATUS NTAPI +KsFilterAddTopologyConnections( + IN PKSFILTER Filter, + IN ULONG NewConnectionsCount, + IN const KSTOPOLOGY_CONNECTION* NewTopologyConnections); + +VOID +KsFilterAttemptProcessing( + IN PKSFILTER Filter, + IN BOOLEAN Asynchronous); + +KSDDKAPI NTSTATUS NTAPI +KsFilterCreateNode( + IN PKSFILTER Filter, + IN const KSNODE_DESCRIPTOR* NodeDescriptor, + OUT PULONG NodeID); + +KSDDKAPI NTSTATUS NTAPI +KsFilterCreatePinFactory( + IN PKSFILTER Filter, + IN const KSPIN_DESCRIPTOR_EX* PinDescriptor, + OUT PULONG PinID); + +PKSDEVICE __inline +KsFilterFactoryGetDevice( + IN PKSFILTERFACTORY FilterFactory); + +/* etc. */ +#endif /* avstream */ + +#ifdef __cplusplus +} +#endif + +#endif Added: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h (added) +++ trunk/reactos/include/ddk/portcls.h Sun Dec 10 07:04:03 2006 @@ -1,0 +1,1232 @@ +/* + ReactOS Kernel Streaming + Port Class + + Andrew Greenwood + + NOTES: + Does not support PC_OLD_NAMES (which is required for backwards-compatibility + with older code) + + Obsolete macros are not implemented. For more info: + http://www.osronline.com/ddkx/stream/audpc-struct_167n.htm + + + == EXPORTS == + DRM (new in XP): + * PcAddContentHandlers + * PcCreateContentMixed + * PcDestroyContent + * PcForwardContentToDeviceObject + * PcForwardContentToFileObject + * PcForwardContentToInterface + * PcGetContentRights + + IRP HANDLING: + * PcCompleteIrp + * PcDispatchIrp + * PcForwardIrpSynchronous + + ADAPTER: + * PcAddAdapterDevice + * PcInitializeAdapterDriver + + FACTORIES: + * PcNewDmaChannel + * PcNewInterruptSync + * PcNewMiniport + * PcNewPort + * PcNewRegistryKey + * PcNewResourceList + * PcNewResourceSublist + * PcNewServiceGroup + + POWER MANAGEMENT: + * PcRegisterAdapterPowerManagement + * PcRequestNewPowerState + + PROPERTIES: + * PcCompletePendingPropertyRequest + * PcGetDeviceProperty + + IO TIMEOUTS: + * PcRegisterIoTimeout + * PcUnregisterIoTimeout + + PHYSICAL CONNECTIONS: + * PcRegisterPhysicalConnection + * PcRegisterPhysicalConnectionFromExternal + * PcRegisterPhysicalConnectionToExternal + + MISC: + * PcGetTimeInterval + * PcRegisterSubdevice + + + == AUDIO HELPER OBJECT INTERFACES == + IDmaChannel + IDmaChannelSlave + IDmaOperations + IDrmPort (XP) + IDrmPort2 (XP) + IInterruptSync + IMasterClock + IPortClsVersion (XP) + IPortEvents + IPreFetchOffset (XP) + IRegistryKey + IResourceList + IServiceGroup + IServiceSink + IUnregisterPhysicalConnection (Vista) + IUnregisterSubdevice (Vista) + + == AUDIO PORT OBJECT INTERFACES == + IPort + IPortDMus + IPortMidi + IPortTopology + IPortWaveCyclic + IPortWavePci + + == AUDIO MINIPORT OBJECT INTERFACES == + IMiniport + IMiniportDMus + IMiniportMidi + IMiniportTopology + IMiniportWaveCyclic + IMiniportWavePci + + == AUDIO MINIPORT AUXILIARY INTERFACES == + IMusicTechnology (XP) + IPinCount (XP) + + == AUDIO STREAM OBJECT INTERFACES == + IAllocatorMXF + IDrmAudioStream (XP) + IMiniportMidiStream + IMiniportWaveCyclicStream + IMiniportWavePciStream + IMXF + IPortWavePciStream + ISynthSinkDMus + + == DIRECTMUSIC USERMODE SYNTH AND SYNTH SINK INTERFACES == + IDirectMusicSynth + IDirectMusicSynthSink + + == AUDIO POWER MANAGEMENT INTERFACES == + IAdapterPowerManagement + IPowerNotify +*/ + +#ifndef PORTCLS_H +#define PORTCLS_H + +/*#include <windef.h>*/ +#include <ks.h> +#include <drmk.h> + +/* TODO */ +#define PORTCLASSAPI EXTERN_C + +#define PCFILTER_NODE ((ULONG) -1) + +/* HACK */ +typedef PVOID CM_RESOURCE_TYPE; + + + +/* =============================================================== + Class IDs - TODO +*/ +//#define CLSID_PortDMus /* dmusicks.h */ +#define CLSID_PortMidi +#define CLSID_PortTopology +#define CLSID_PortWaveCyclic +#define CLSID_PortWavePci + +/* first 2 are dmusicks.h */ +#define CLSID_MiniportDriverDMusUART +#define CLSID_MiniportDriverDMusUARTCapture +#define CLSID_MiniportDriverFmSynth +#define CLSID_MiniportDriverFmSynthWithVol +#define CLSID_MiniportDriverUart + + +/* =============================================================== + Event Item Flags - TODO +*/ +#define PCEVENT_ITEM_FLAG_ENABLE KSEVENT_TYPE_ENABLE +#define PCEVENT_ITEM_FLAG_ONESHOT KSEVENT_TYPE_ONESHOT +#define PCEVENT_ITEM_FLAG_BASICSUPPORT KSEVENT_TYPE_BASICSUPPORT + + +/* =============================================================== + Event Verbs - TODO +*/ +#define PCEVENT_VERB_NONE 0 +#define PCEVENT_VERB_ADD 1 +#define PCEVENT_VERB_REMOVE 2 +#define PCEVENT_VERB_SUPPORT 4 + + +/* =============================================================== + Method Item Flags - TODO +*/ +#define PCMETHOD_ITEM_FLAG_NONE KSMETHOD_TYPE_NONE +#define PCMETHOD_ITEM_FLAG_READ KSMETHOD_TYPE_READ +#define PCMETHOD_ITEM_FLAG_WRITE KSMETHOD_TYPE_WRITE +#define PCMETHOD_ITEM_FLAG_MODIFY KSMETHOD_TYPE_MODIFY +#define PCMETHOD_ITEM_FLAG_SOURCE KSMETHOD_TYPE_SOURCE + + +/* =============================================================== + Method Verbs - TODO +*/ +#define PCMETHOD_ITEM_FLAG_BASICSUPPORT KSMETHOD_TYPE_BASICSUPPORT +#define PCMETHOD_ITEM_FLAG_SEND +#define PCMETHOD_ITEM_FLAG_SETSUPPORT + + +/* =============================================================== + Versions + IoIsWdmVersionAvailable may also be used by older drivers. +*/ + +enum +{ + kVersionInvalid = -1, + + kVersionWin98, + kVersionWin98SE, + kVersionWin2K, + kVersionWin98SE_QFE2, + kVersionWin2K_SP2, + kVersionWinME, + kVersionWin98SE_QFE3, + kVersionWinME_QFE1, + kVersionWinXP, + kVersionWinXPSP1, + kVersionWinServer2003, + kVersionWin2K_UAAQFE, /* These support IUnregister* interface */ + kVersionWinXP_UAAQFE, + kVersionWinServer2003_UAAQFE +}; + +/* =============================================================== + Properties +*/ + +struct _PCPROPERTY_REQUEST; + +typedef NTSTATUS (*PCPFNPROPERTY_HANDLER)( + IN struct _PCPROPERTY_REQUEST* PropertyRequest); + +typedef struct _PCPROPERTY_ITEM +{ + const GUID* Set; + ULONG Id; + ULONG Flags; + PCPFNPROPERTY_HANDLER Handler; +} PCPROPERTY_ITEM, *PPCPROPERTY_ITEM; + +typedef struct _PCPROPERTY_REQUEST +{ + PUNKNOWN MajorTarget; + PUNKNOWN MinorTarget; + ULONG Node; + const PCPROPERTY_ITEM* PropertyItem; + ULONG Verb; + ULONG InstanceSize; + PVOID Instance; + ULONG ValueSize; + PVOID Value; + PIRP Irp; +} PCPROPERTY_REQUEST, *PPCPROPERTY_REQUEST; + +#define PCPROPERTY_ITEM_FLAG_DEFAULTVALUES KSPROPERTY_TYPE_DEFAULTVALUES +#define PCPROPERTY_ITEM_FLAG_GET KSPROPERTY_TYPE_GET +#define PCPROPERTY_ITEM_FLAG_SET KSPROPERTY_TYPE_SET +#define PCPROPERTY_ITEM_FLAG_BASICSUPPORT KSPROPERTY_TYPE_BASICSUPPORT +#define PCPROPERTY_ITEM_FLAG_SERIALIZESIZE KSPROPERTY_TYPE_SERIALIZESIZE +#define PCPROPERTY_ITEM_FLAG_SERIALIZERAW KSPROPERTY_TYPE_SERIALIZERAW +#define PCPROPERTY_ITEM_FLAG_UNSERIALIZERAW KSPROPERTY_TYPE_UNSERIALIZERAW +#define PCPROPERTY_ITEM_FLAG_SERIALIZE ( PCPROPERTY_ITEM_FLAG_SERIALIZERAW \ + | PCPROPERTY_ITEM_FLAG_UNSERIALIZERAW \ + | PCPROPERTY_ITEM_FLAG_SERIALIZESIZE) + + +struct _PCEVENT_REQUEST; + +typedef NTSTATUS (*PCPFNEVENT_HANDLER)( + IN struct _PCEVENT_REQUEST* EventRequest); + +typedef struct _PCEVENT_ITEM +{ + const GUID* Set; + ULONG Id; + ULONG Flags; + PCPFNEVENT_HANDLER Handler; +} PCEVENT_ITEM, *PPCEVENT_ITEM; + +typedef struct _PCEVENT_REQUEST +{ + PUNKNOWN MajorTarget; + PUNKNOWN MinorTarget; + ULONG Node; + const PCEVENT_ITEM* EventItem; + PKSEVENT_ENTRY EventEntry; + ULONG Verb; + PIRP Irp; +} PCEVENT_REQUEST, *PPCEVENT_REQUEST; + + + +struct _PCMETHOD_REQUEST; + +typedef NTSTATUS (*PCPFNMETHOD_HANDLER)( + IN struct _PCMETHOD_REQUEST* MethodRequest); + +typedef struct _PCMETHOD_ITEM +{ + const GUID* Set; + ULONG Id; + ULONG Flags; + PCPFNMETHOD_HANDLER Handler; +} PCMETHOD_ITEM, *PPCMETHOD_ITEM; + +typedef struct _PCMETHOD_REQUEST +{ + PUNKNOWN MajorTarget; + PUNKNOWN MinorTarget; + ULONG Node; + const PCMETHOD_ITEM* MethodItem; + ULONG Verb; +} PCMETHOD_REQUEST, *PPCMETHOD_REQUEST; + + +/* =============================================================== + Structures (unsorted) +*/ + +typedef struct +{ + ULONG PropertyItemSize; + ULONG PropertyCount; + const PCPROPERTY_ITEM* Properties; + ULONG MethodItemSize; + ULONG MethodCount; + const PCMETHOD_ITEM* Methods; + ULONG EventItemSize; + ULONG EventCount; + const PCEVENT_ITEM* Events; + ULONG Reserved; +} PCAUTOMATION_TABLE, *PPCAUTOMATION_TABLE; + +typedef struct +{ + ULONG FromNode; + ULONG FromNodePin; + ULONG ToNode; + ULONG ToNodePin; +} PCCONNECTION_DESCRIPTOR, *PPCCONNECTIONDESCRIPTOR; + +typedef struct +{ + ULONG MaxGlobalInstanceCount; + ULONG MaxFilterInstanceCount; + ULONG MinFilterInstanceCount; + const PCAUTOMATION_TABLE* AutomationTable; + KSPIN_DESCRIPTOR KsPinDescriptor; +} PCPIN_DESCRIPTOR, *PPCPIN_DESCRIPTOR; + +typedef struct +{ + ULONG Flags; + const PCAUTOMATION_TABLE* AutomationTable; + const GUID* Type; + const GUID* Name; +} PCNODE_DESCRIPTOR, *PPCNODE_DESCRIPTOR; + +typedef struct +{ + ULONG Version; + const PCAUTOMATION_TABLE* AutomationTable; + ULONG PinSize; + ULONG PinCount; + const PCPIN_DESCRIPTOR* Pins; + ULONG NodeSize; + ULONG NodeCount; + const PCNODE_DESCRIPTOR* Nodes; + ULONG ConnectionCount; + const PCCONNECTION_DESCRIPTOR* Connections; + ULONG CategoryCount; + const GUID* Categories; +} PCFILTER_DESCRIPTOR, *PPCFILTER_DESCRIPTOR; + + +/* =============================================================== + IResourceList Interface +*/ + +DECLARE_INTERFACE_(IResourceList, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(ULONG, NumberOfEntries)( THIS ) PURE; + + STDMETHOD_(ULONG, NumberOfEntriesOfType)( THIS_ + IN CM_RESOURCE_TYPE Type) PURE; + + STDMETHOD_(PCM_PARTIAL_RESOURCE_DESCRIPTOR, FindTranslatedEntry)( THIS_ + IN CM_RESOURCE_TYPE Type, + IN ULONG Index) PURE; + + STDMETHOD_(PCM_PARTIAL_RESOURCE_DESCRIPTOR, FindUntranslatedEntry)( THIS_ + IN CM_RESOURCE_TYPE Type, + IN ULONG Index) PURE; + + STDMETHOD_(NTSTATUS, AddEntry)( THIS_ + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated, + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Untranslated) PURE; + + STDMETHOD_(NTSTATUS, AddEntryFromParent)( THIS_ + IN struct IResourceList* Parent, + IN CM_RESOURCE_TYPE Type, + IN ULONG Index) PURE; + + STDMETHOD_(PCM_RESOURCE_LIST, TranslatedList)( THIS ) PURE; + STDMETHOD_(PCM_RESOURCE_LIST, UntranslatedList)( THIS ) PURE; +}; + +#define IMP_IResourceList \ + STDMETHODIMP_(ULONG) NumberOfEntries(void); \ +\ + STDMETHODIMP_(ULONG) NumberOfEntriesOfType( \ + IN CM_RESOURCE_TYPE Type); \ +\ + STDMETHODIMP_(PCM_PARTIAL_RESOURCE_DESCRIPTOR) FindTranslatedEntry( \ + IN CM_RESOURCE_TYPE Type, \ + IN ULONG Index); \ +\ + STDMETHODIMP_(PCM_PARTIAL_RESOURCE_DESCRIPTOR) FindUntranslatedEntry( \ + IN CM_RESOURCE_TYPE Type, \ + IN ULONG Index); \ +\ + STDMETHODIMP_(NTSTATUS) AddEntry( \ + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Translated, \ + IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Untranslated); \ +\ + STDMETHODIMP_(NTSTATUS) AddEntryFromParent( \ + IN struct IResourceList* Parent, \ + IN CM_RESOURCE_TYPE Type, \ + IN ULONG Index); \ +\ + STDMETHODIMP_(PCM_RESOURCE_LIST) TranslatedList(void); \ + STDMETHODIMP_(PCM_RESOURCE_LIST) UntranslatedList(void); + +typedef IResourceList *PRESOURCELIST; + +#define NumberOfPorts() \ + NumberOfEntriesOfType(CmResourceTypePort) + +#define FindTranslatedPort(n) \ + FindTranslatedEntry(CmResourceTypePort, (n)) + +#define FindUntranslatedPort(n) \ + FindUntranslatedEntry(CmResourceTypePort, (n)) + +#define AddPortFromParent(p, n) \ + AddEntryFromParent((p), CmResourceTypePort, (n)) + +/* TODO ... */ + + +/* =============================================================== + IServiceSink Interface +*/ + +DECLARE_INTERFACE_(IServiceSink, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + STDMETHOD_(void, RequestService)( THIS ) PURE; +}; + +#define IMP_IServiceSink \ + STDMETHODIMP_(void) RequestService(void); + +typedef IServiceSink *PSERVICESINK; + + +/* =============================================================== + IServiceGroup Interface +*/ + +DECLARE_INTERFACE_(IServiceGroup, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(void, RequestService)( THIS ) PURE; /* IServiceSink */ + + STDMETHOD_(NTSTATUS, AddMember)( THIS_ + IN PSERVICESINK pServiceSink) PURE; + + STDMETHOD_(void, RemoveMember)( THIS_ + IN PSERVICESINK pServiceSink) PURE; + + STDMETHOD_(void, SupportDelayedService)( THIS ) PURE; + + STDMETHOD_(void, RequestDelayedService)( THIS_ + IN ULONGLONG ullDelay) PURE; + + STDMETHOD_(void, CancelDelayedService)( THIS ) PURE; +}; + +#define IMP_IServiceGroup \ + IMP_IServiceSink; \ +\ + STDMETHODIMP_(NTSTATUS) AddMember( \ + IN PSERVICESINK pServiceSink); \ +\ + STDMETHODIMP_(void) RemoveMember( \ + IN PSERVICESINK pServiceSink); \ +\ + STDMETHODIMP_(void) SupportDelayedService(void); \ +\ + STDMETHODIMP_(void) RequestDelayedService( \ + IN ULONGLONG ullDelay); \ +\ + STDMETHODIMP_(void) CancelDelayedService(void); + +typedef IServiceGroup *PSERVICEGROUP; + + +/* =============================================================== + IRegistryKey Interface +*/ + +DECLARE_INTERFACE_(IRegistryKey, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(NTSTATUS, QueryKey)( THIS_ + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) PURE; + + STDMETHOD_(NTSTATUS, EnumerateKey)( THIS_ + IN ULONG Index, + IN KEY_INFORMATION_CLASS KeyInformationClass, + OUT PVOID KeyInformation, + IN ULONG Length, + OUT PULONG ResultLength) PURE; + + STDMETHOD_(NTSTATUS, QueryValueKey)( THIS_ + IN PUNICODE_STRING ValueName, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) PURE; + + STDMETHOD_(NTSTATUS, EnumerateValueKey)( THIS_ + IN ULONG Index, + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, + OUT PVOID KeyValueInformation, + IN ULONG Length, + OUT PULONG ResultLength) PURE; + + STDMETHOD_(NTSTATUS, SetValueKey)( THIS_ + IN PUNICODE_STRING ValueName OPTIONAL, + IN ULONG Type, + IN PVOID Data, + IN ULONG DataSize) PURE; + + STDMETHOD_(NTSTATUS, QueryRegistryValues)( THIS_ + IN PRTL_QUERY_REGISTRY_TABLE QueryTable, + IN PVOID Context OPTIONAL) PURE; + + STDMETHOD_(NTSTATUS, NewSubKey)( THIS_ + OUT IRegistryKey** RegistrySubKey, + IN PUNKNOWN OuterUnknown, + IN ACCESS_MASK DesiredAccess, + IN PUNICODE_STRING SubKeyName, + IN ULONG CreateOptions, + OUT PULONG Disposition OPTIONAL) PURE; + + STDMETHOD_(NTSTATUS, DeleteKey)( THIS ) PURE; +}; + +#define IMP_IRegistryKey \ + STDMETHODIMP_(NTSTATUS) QueryKey( \ + IN KEY_INFORMATION_CLASS KeyInformationClass, \ + OUT PVOID KeyInformation, \ + IN ULONG Length, \ + OUT PULONG ResultLength); \ +\ + STDMETHODIMP_(NTSTATUS) EnumerateKey( \ + IN ULONG Index, \ + IN KEY_INFORMATION_CLASS KeyInformationClass, \ + OUT PVOID KeyInformation, \ + IN ULONG Length, \ + OUT PULONG ResultLength); \ +\ + STDMETHODIMP_(NTSTATUS) QueryValueKey( \ + IN PUNICODE_STRING ValueName, \ + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, \ + OUT PVOID KeyValueInformation, \ + IN ULONG Length, \ + OUT PULONG ResultLength); \ +\ + STDMETHODIMP_(NTSTATUS) EnumerateValueKey( \ + IN ULONG Index, \ + IN KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass, \ + OUT PVOID KeyValueInformation, \ + IN ULONG Length, \ + OUT PULONG ResultLength); \ +\ + STDMETHODIMP_(NTSTATUS) SetValueKey( \ + IN PUNICODE_STRING ValueName OPTIONAL, \ + IN ULONG Type, \ + IN PVOID Data, \ + IN ULONG DataSize); \ +\ + STDMETHODIMP_(NTSTATUS) QueryRegistryValues( \ + IN PRTL_QUERY_REGISTRY_TABLE QueryTable, \ + IN PVOID Context OPTIONAL); \ +\ + STDMETHODIMP_(NTSTATUS) NewSubKey( \ + OUT IRegistryKey** RegistrySubKey, \ + IN PUNKNOWN OuterUnknown, \ + IN ACCESS_MASK DesiredAccess, \ + IN PUNICODE_STRING SubKeyName, \ + IN ULONG CreateOptions, \ + OUT PULONG Disposition OPTIONAL); \ +\ + STDMETHODIMP_(NTSTATUS) DeleteKey(void); + +typedef IRegistryKey *PREGISTRYKEY; + + +/* =============================================================== + IMusicTechnology Interface +*/ + +DECLARE_INTERFACE_(IMusicTechnology, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(NTSTATUS, SetTechnology)( THIS_ + IN const GUID* Technology) PURE; +}; + +#define IMP_IMusicTechnology \ + STDMETHODIMP_(NTSTATUS) SetTechnology( \ + IN const GUID* Technology); + +typedef IMusicTechnology *PMUSICTECHNOLOGY; + + +/* =============================================================== + IPort Interface +*/ + +#define DEFINE_ABSTRACT_PORT() \ + STDMETHOD_(NTSTATUS, Init)( THIS_ \ + IN PDEVICE_OBJECT DeviceObject, \ + IN PIRP Irp, \ + IN PUNKNOWN UnknownMiniport, \ + IN PUNKNOWN UnknownAdapter OPTIONAL, \ + IN PRESOURCELIST ResourceList) PURE; \ +\ + STDMETHOD_(NTSTATUS, GetDeviceProperty)( THIS_ \ + IN DEVICE_REGISTRY_PROPERTY DeviceProperty, \ + IN ULONG BufferLength, \ + OUT PVOID PropertyBuffer, \ + OUT PULONG ResultLength) PURE; \ +\ + STDMETHOD_(NTSTATUS, NewRegistryKey)( THIS_ \ + OUT PREGISTRYKEY* OutRegistryKey, \ + IN PUNKNOWN OuterUnknown OPTIONAL, \ + IN ULONG RegistryKeyType, \ + IN ACCESS_MASK DesiredAccess, \ + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, \ + IN ULONG CreateOptiona OPTIONAL, \ + OUT PULONG Disposition OPTIONAL) PURE; + +#define IMP_IPort() \ + STDMETHODIMP_(NTSTATUS) Init( \ + IN PDEVICE_OBJECT DeviceObject, \ + IN PIRP Irp, \ + IN PUNKNOWN UnknownMiniport, \ + IN PUNKNOWN UnknownAdapter OPTIONAL, \ + IN PRESOURCELIST ResourceList); \ +\ + STDMETHODIMP_(NTSTATUS) GetDeviceProperty( \ + IN DEVICE_REGISTRY_PROPERTY DeviceProperty, \ + IN ULONG BufferLength, \ + OUT PVOID PropertyBuffer, \ + OUT PULONG ResultLength); \ +\ + STDMETHOD_(NTSTATUS) NewRegistryKey( \ + OUT PREGISTRYKEY* OutRegistryKey, \ + IN PUNKNOWN OuterUnknown OPTIONAL, \ + IN ULONG RegistryKeyType, \ + IN ACCESS_MASK DesiredAccess, \ + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, \ + IN ULONG CreateOptiona OPTIONAL, \ + OUT PULONG Disposition OPTIONAL); + +DECLARE_INTERFACE_(IPort, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_PORT() +}; + +typedef IPort *PPORT; + + +/* =============================================================== + IMiniPort Interface +*/ + +#define DEFINE_ABSTRACT_MINIPORT() \ + STDMETHOD_(NTSTATUS, GetDescription)( THIS_ \ + OUT PPCFILTER_DESCRIPTOR* Description) PURE; \ +\ + STDMETHOD_(NTSTATUS, DataRangeIntersection)( THIS_ \ + IN ULONG PinId, \ + IN PKSDATARANGE DataRange, \ + IN PKSDATARANGE MatchingDataRange, \ + IN ULONG OutputBufferLength, \ + OUT PVOID ResultantFormat OPTIONAL, \ + OUT PULONG ResultantFormatLength) PURE; + +#define IMP_IMiniport \ + STDMETHODIMP_(NTSTATUS) GetDescription( \ + OUT PPCFILTER_DESCRIPTOR* Description); \ +\ + STDMETHODIMP_(NTSTATUS) DataRangeIntersection( \ + IN ULONG PinId, \ + IN PKSDATARANGE DataRange, \ + IN PKSDATARANGE MatchingDataRange, \ + IN ULONG OutputBufferLength, \ + OUT PVOID ResultantFormat OPTIONAL, \ + OUT PULONG ResultantFormatLength); + +DECLARE_INTERFACE_(IMiniport, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_MINIPORT() +}; + +typedef IMiniport *PMINIPORT; + + +/* =============================================================== + IDmaChannel Interface +*/ + +#define DEFINE_ABSTRACT_DMACHANNEL() \ + STDMETHOD_(NTSTATUS, AllocateBuffer)( THIS_ \ + IN ULONG BufferSize, \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL) PURE; \ +\ + STDMETHOD_(void, FreeBuffer)( THIS ) PURE; \ + STDMETHOD_(ULONG, TransferCount)( THIS ) PURE; \ + STDMETHOD_(ULONG, MaximumBufferSize)( THIS ) PURE; \ + STDMETHOD_(ULONG, AllocatedBufferSize)( THIS ) PURE; \ + STDMETHOD_(ULONG, BufferSize)( THIS ) PURE; \ +\ + STDMETHOD_(void, SetBufferSize)( THIS_ \ + IN ULONG BufferSize) PURE; \ +\ + STDMETHOD_(PVOID, SystemAddress)( THIS ) PURE; \ + STDMETHOD_(PHYSICAL_ADDRESS, PhysicalAddress)( THIS ) PURE; \ + STDMETHOD_(PADAPTER_OBJECT, GetAdapterObject)( THIS ) PURE; \ +\ + STDMETHOD_(void, CopyTo)( THIS_ \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) PURE; \ +\ + STDMETHOD_(void, CopyFrom)( THIS_ \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount) PURE; + +#define IMP_IDmaChannel() \ + STDMETHODIMP_(NTSTATUS) AllocateBuffer( \ + IN ULONG BufferSize, \ + IN PPHYSICAL_ADDRESS PhysicalAddressConstraint OPTIONAL); \ +\ + STDMETHODIMP_(void) FreeBuffer(void); \ + STDMETHODIMP_(ULONG) TransferCount(void); \ + STDMETHODIMP_(ULONG) MaximumBufferSize(void); \ + STDMETHODIMP_(ULONG) AllocatedBufferSize(void); \ + STDMETHODIMP_(ULONG) BufferSize(void); \ +\ + STDMETHODIMP_(void) SetBufferSize)( \ + IN ULONG BufferSize); \ +\ + STDMETHODIMP_(PVOID) SystemAddress(void); \ + STDMETHODIMP_(PHYSICAL_ADDRESS) PhysicalAddress(void); \ + STDMETHODIMP_(PADAPTER_OBJECT) GetAdapterObject(void); \ +\ + STDMETHODIMP_(void) CopyTo( \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount); \ +\ + STDMETHODIMP_(void) CopyFrom( \ + IN PVOID Destination, \ + IN PVOID Source, \ + IN ULONG ByteCount); + +DECLARE_INTERFACE_(IDmaChannel, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_DMACHANNEL() +}; + +typedef IDmaChannel *PDMACHANNEL; + + +/* =============================================================== + IDmaChannelSlave Interface +*/ + +#define DEFINE_ABSTRACT_DMACHANNELSLAVE() \ + STDMETHOD_(NTSTATUS, Start)( THIS_ \ + IN ULONG MapSize, \ + IN BOOLEAN WriteToDevice) PURE; \ +\ + STDMETHOD_(NTSTATUS, Stop)( THIS ) PURE; \ + STDMETHOD_(NTSTATUS, ReadCounter)( THIS ) PURE; \ +\ + STDMETHOD_(NTSTATUS, WaitForTC)( THIS_ \ + ULONG Timeout) PURE; + +#define IMP_IDmaChannelSlave \ + STDMETHODIMP_(NTSTATUS) Start( \ + IN ULONG MapSize, \ + IN BOOLEAN WriteToDevice); \ +\ + STDMETHODIMP_(NTSTATUS) Stop(void); \ + STDMETHODIMP_(NTSTATUS) ReadCounter)(void); \ +\ + STDMETHODIMP_(NTSTATUS, WaitForTC)( \ + ULONG Timeout); + +DECLARE_INTERFACE_(IDmaChannelSlave, IDmaChannel) +{ + DEFINE_ABSTRACT_UNKNOWN() + DEFINE_ABSTRACT_DMACHANNEL() + DEFINE_ABSTRACT_DMACHANNELSLAVE() +}; + +typedef IDmaChannelSlave *PDMACHANNELSLAVE; + + +/* =============================================================== + IInterruptSync Interface +*/ + +typedef enum +{ + InterruptSyncModeNormal = 1, + InterruptSyncModeAll, + InterruptSyncModeRepeat +} INTERRUPTSYNCMODE; + +struct IInterruptSync; + +typedef NTSTATUS (*PINTERRUPTSYNCROUTINE)( + IN struct IInterruptSync* InterruptSync, + IN PVOID DynamicContext); + +DECLARE_INTERFACE_(IInterruptSync, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + + STDMETHOD_(NTSTATUS, CallSynchronizedRoutine)( THIS_ + IN PINTERRUPTSYNCROUTINE Routine, + IN PVOID DynamicContext) PURE; + + STDMETHOD_(PKINTERRUPT, GetKInterrupt)( THIS ) PURE; + STDMETHOD_(NTSTATUS, Connect)( THIS ) PURE; + STDMETHOD_(void, Disconnect)( THIS ) PURE; + + STDMETHOD_(NTSTATUS, RegisterServiceRoutine)( THIS_ + IN PINTERRUPTSYNCROUTINE Routine, + IN PVOID DynamicContext, + IN BOOLEAN First) PURE; +}; + +#define IMP_IInterruptSync \ + STDMETHODIMP_(NTSTATUS) CallSynchronizedRoutine)( \ + IN PINTERRUPTSYNCROUTINE Routine, \ + IN PVOID DynamicContext); \ +\ + STDMETHODIMP_(PKINTERRUPT, GetKInterrupt)(void); \ + STDMETHODIMP_(NTSTATUS, Connect)(void); \ + STDMETHODIMP_(void, Disconnect)(void); \ +\ + STDMETHODIMP_(NTSTATUS, RegisterServiceRoutine)( \ + IN PINTERRUPTSYNCROUTINE Routine, \ + IN PVOID DynamicContext, \ + IN BOOLEAN First); + +typedef IInterruptSync *PINTERRUPTSYNC; + + +/* =============================================================== + IPortMidi Interface +*/ + +/* =============================================================== + IMiniportMidiStream Interface +*/ + +/* =============================================================== + IMiniportMidi Interface +*/ + +/* =============================================================== + IPortTopology Interface +*/ + +/* =============================================================== + IMiniportTopology Interface +*/ + +/* =============================================================== + IPortWaveCyclic Interface +*/ + +/* =============================================================== + IMiniportWaveCyclicStream Interface +*/ + +/* =============================================================== + IMiniportWaveCyclic Interface +*/ + +/* =============================================================== + IPortWavePci Interface +*/ + +/* =============================================================== + IPortWavePciStream Interface +*/ + +/* =============================================================== + IMiniportWavePciStream Interface +*/ + +/* =============================================================== + IMiniportWavePci Interface +*/ + +/* =============================================================== + IAdapterPowerManagement Interface +*/ + +/* =============================================================== + IPowerNotify Interface +*/ + +/* =============================================================== + IPinCount Interface +*/ + +/* =============================================================== + IPortEvents Interface +*/ + +/* =============================================================== + IDrmPort / IDrmPort2 Interfaces + These are almost identical, except for the addition of two extra methods. +*/ + +/* =============================================================== + IPortClsVersion Interface +*/ + +DECLARE_INTERFACE_(IPortClsVersion, IUnknown) +{ + STDMETHOD_(DWORD, GetVersion)(THIS) PURE; +}; + +#define IMP_IPortClsVersion \ + STDMETHODIMP_(DWORD) GetVersion(void); + +typedef IPortClsVersion *PPORTCLSVERSION; + + +/* =============================================================== + IDmaOperations Interface +*/ + +/* =============================================================== + IPreFetchOffset Interface +*/ + + + +/* =============================================================== + PortCls API Functions +*/ + +typedef NTSTATUS (*PCPFNSTARTDEVICE)( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PRESOURCELIST ResourceList); + +/* This is in NTDDK.H */ +/* +typedef NTSTATUS (*PDRIVER_ADD_DEVICE)( + IN struct _DRIVER_OBJECT* DriverObject, + IN struct _DEVICE_OBJECT* PhysicalDeviceObject); +*/ + +PORTCLASSAPI NTSTATUS NTAPI +PcAddAdapterDevice( + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PCPFNSTARTDEVICE StartDevice, + IN ULONG MaxObjects, + IN ULONG DeviceExtensionSize); + +PORTCLASSAPI NTSTATUS NTAPI +PcInitializeAdapterDriver( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPathName, + IN PDRIVER_ADD_DEVICE AddDevice); + + +/* =============================================================== + Factories (TODO: Move elsewhere) +*/ + +PORTCLASSAPI NTSTATUS NTAPI +PcNewDmaChannel( + OUT PDMACHANNEL* OutDmaChannel, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PDEVICE_DESCRIPTION DeviceDescription, + IN PDEVICE_OBJECT DeviceObject); + +PORTCLASSAPI NTSTATUS NTAPI +PcNewInterruptSync( + OUT PINTERRUPTSYNC* OUtInterruptSync, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN PRESOURCELIST ResourceList, + IN ULONG ResourceIndex, + IN INTERRUPTSYNCMODE Mode); + +PORTCLASSAPI NTSTATUS NTAPI +PcNewMiniport( + OUT PMINIPORT* OutMiniport, + IN REFCLSID ClassId); + +PORTCLASSAPI NTSTATUS NTAPI +PcNewPort( + OUT PPORT* OutPort, + IN REFCLSID ClassId); + +PORTCLASSAPI NTSTATUS NTAPI +PcNewRegistryKey( + OUT PREGISTRYKEY* OutRegistryKey, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN ULONG RegistryKeyType, + IN ACCESS_MASK DesiredAccess, + IN PVOID DeviceObject OPTIONAL, + IN PVOID SubDevice OPTIONAL, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN ULONG CreateOptions OPTIONAL, + OUT PULONG Disposition OPTIONAL); + +PORTCLASSAPI NTSTATUS NTAPI +PcNewResourceList( + OUT PRESOURCELIST* OutResourceList, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PCM_RESOURCE_LIST TranslatedResources, + IN PCM_RESOURCE_LIST UntranslatedResources); + +PORTCLASSAPI NTSTATUS NTAPI +PcNewResourceSublist( + OUT PRESOURCELIST* OutResourceList, + IN PUNKNOWN OuterUnknown OPTIONAL, + IN POOL_TYPE PoolType, + IN PRESOURCELIST ParentList, + IN ULONG MaximumEntries); + +PORTCLASSAPI NTSTATUS NTAPI +PcNewServiceGroup( + OUT PSERVICEGROUP* OutServiceGroup, + IN PUNKNOWN OuterUnknown OPTIONAL); + + +/* =============================================================== + IRP Handling +*/ + +PORTCLASSAPI NTSTATUS NTAPI +PcDispatchIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +PORTCLASSAPI NTSTATUS NTAPI +PcCompleteIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN NTSTATUS Status); + +PORTCLASSAPI NTSTATUS NTAPI +PcForwardIrpSynchronous( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + + +/* =============================================================== + Power Management +*/ + +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterAdapterPowerManagement( + IN PUNKNOWN pUnknown, + IN PVOID pvContext1); + +PORTCLASSAPI NTSTATUS NTAPI +PcRequestNewPowerState( + IN PDEVICE_OBJECT pDeviceObject, + IN DEVICE_POWER_STATE RequestedNewState); + + +/* =============================================================== + Properties +*/ + +PORTCLASSAPI NTSTATUS NTAPI +PcGetDeviceProperty( + IN PVOID DeviceObject, + IN DEVICE_REGISTRY_PROPERTY DeviceProperty, + IN ULONG BufferLength, + OUT PVOID PropertyBuffer, + OUT PULONG ResultLength); + +PORTCLASSAPI NTSTATUS NTAPI +PcCompletePendingPropertyRequest( + IN PPCPROPERTY_REQUEST PropertyRequest, + IN NTSTATUS NtStatus); + + +/* =============================================================== + I/O Timeouts +*/ + +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterIoTimeout( + IN PDEVICE_OBJECT pDeviceObject, + IN PIO_TIMER_ROUTINE pTimerRoutine, + IN PVOID pContext); + +PORTCLASSAPI NTSTATUS NTAPI +PcUnregisterIoTimeout( + IN PDEVICE_OBJECT pDeviceObject, + IN PIO_TIMER_ROUTINE pTimerRoutine, + IN PVOID pContext); + + +/* =============================================================== + Physical Connections +*/ + +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterPhysicalConnection( + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin); + +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterPhysicalConnectionFromExternal( + IN PDEVICE_OBJECT DeviceObject, + IN PUNICODE_STRING FromString, + IN ULONG FromPin, + IN PUNKNOWN ToUnknown, + IN ULONG ToPin); + +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterPhysicalConnectionToExternal( + IN PDEVICE_OBJECT DeviceObject, + IN PUNKNOWN FromUnknown, + IN ULONG FromPin, + IN PUNICODE_STRING ToString, + IN ULONG ToPin); + + +/* =============================================================== + Misc +*/ + +PORTCLASSAPI ULONGLONG NTAPI +PcGetTimeInterval( + IN ULONGLONG Since); + +PORTCLASSAPI NTSTATUS NTAPI +PcRegisterSubdevice( + IN PDEVICE_OBJECT DeviceObject, + IN PWCHAR Name, + IN PUNKNOWN Unknown); + + +/* =============================================================== + Digital Rights Management Functions + Implemented in XP and above +*/ + +PORTCLASSAPI NTSTATUS NTAPI +PcAddContentHandlers( + IN ULONG ContentId, + IN PVOID *paHandlers, + IN ULONG NumHandlers); + +PORTCLASSAPI NTSTATUS NTAPI +PcCreateContentMixed( + IN PULONG paContentId, + IN ULONG cContentId, + OUT PULONG pMixedContentId); + +PORTCLASSAPI NTSTATUS NTAPI +PcDestroyContent( + IN ULONG ContentId); + +PORTCLASSAPI NTSTATUS NTAPI +PcForwardContentToDeviceObject( + IN ULONG ContentId, + IN PVOID Reserved, + IN PCDRMFORWARD DrmForward); + +PORTCLASSAPI NTSTATUS NTAPI +PcForwardContentToFileObject( + IN ULONG ContentId, + IN PFILE_OBJECT FileObject); + +PORTCLASSAPI NTSTATUS NTAPI +PcForwardContentToInterface( + IN ULONG ContentId, + IN PUNKNOWN pUnknown, + IN ULONG NumMethods); + +PORTCLASSAPI NTSTATUS NTAPI +PcGetContentRights( + IN ULONG ContentId, + OUT PDRMRIGHTS DrmRights); + + +#endif Added: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h (added) +++ trunk/reactos/include/ddk/punknown.h Sun Dec 10 07:04:03 2006 @@ -1,0 +1,82 @@ +/* + ReactOS Kernel-Mode COM + by Andrew Greenwood + + Please see COPYING in the top-level directory for license information. +*/ + +#ifndef _UNKNOWN_H_ +#define _UNKNOWN_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <windef.h> +#define COM_NO_WINDOWS_H +#include <basetyps.h> + +#ifdef __cplusplus +} +#endif + + +/* =============================================================== + IUnknown +*/ + +DEFINE_GUID( + IID_IUnknown, + 0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x46); + +#undef INTERFACE +#define INTERFACE IUnknown + +DECLARE_INTERFACE(IUnknown) +{ + STDMETHOD_(NTSTATUS, QueryInterface)( THIS_ + IN REFIID, + OUT PVOID*) + PURE; + + STDMETHOD_(ULONG, AddRef)( THIS ) + PURE; + + STDMETHOD_(ULONG, Release)( THIS ) + PURE; +}; + +#undef INTERFACE + +typedef IUnknown *PUNKNOWN; + + +/* =============================================================== + IUnknown definition + Boilerplate code macro for use in subclassed interfaces +*/ + +#define DEFINE_ABSTRACT_UNKNOWN() \ + STDMETHOD_(NTSTATUS, QueryInterface)( THIS_ \ + REFIID InterfaceId, \ + PVOID* Interface) \ + PURE; \ +\ + STDMETHOD_(ULONG, AddRef)(THIS) \ + PURE; \ +\ + STDMETHOD_(ULONG, Release)(THIS) \ + PURE; + + +/* =============================================================== + Constructor callback definition +*/ + +typedef HRESULT (*PFNCREATEINSTANCE)( + OUT PUNKNOWN* Unknown, + IN REFCLSID ClassId, + IN PUNKNOWN OuterUnknown, + IN POOL_TYPE PoolType); + +#endif

1 0

[peterw] 25106: - Added -x2 option to automatically double the number of CPUs detected and added makex.cmd to use it. - This reflects changes added for use in the RosBE.
by peterw＠svn.reactos.org 10 Dec '06

10 Dec '06

Author: peterw Date: Sun Dec 10 06:04:27 2006 New Revision: 25106 URL: http://svn.reactos.org/svn/reactos?rev=25106&view=rev Log: - Added -x2 option to automatically double the number of CPUs detected and added makex.cmd to use it. - This reflects changes added for use in the RosBE. Added: trunk/tools/mingw-make/makex.cmd Modified: trunk/tools/mingw-make/cpucount.c trunk/tools/mingw-make/make.cmd Modified: trunk/tools/mingw-make/cpucount.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/mingw-make/cpucount.c?rev=25… ============================================================================== --- trunk/tools/mingw-make/cpucount.c (original) +++ trunk/tools/mingw-make/cpucount.c Sun Dec 10 06:04:27 2006 @@ -1,8 +1,25 @@ #include <windows.h> +#include <stdio.h> -int main() { - SYSTEM_INFO sysinfo; - GetSystemInfo(&sysinfo); - printf("%ld\n", sysinfo.dwNumberOfProcessors); +int main(int argc, char* argv[]) +{ + SYSTEM_INFO SystemInformation; + + if (argc == 1) + { + GetSystemInfo(&SystemInformation); + printf("%ld\n", SystemInformation.dwNumberOfProcessors); + return 0; + } + else if (!strcmp(argv[1], "-x2")) + { + GetSystemInfo(&SystemInformation); + printf("%ld\n", (SystemInformation.dwNumberOfProcessors + SystemInformation.dwNumberOfProcessors)); + return 0; + } + else + { + printf("Unknown parameter specified. Exiting.\n"); + return 1; + } } - Modified: trunk/tools/mingw-make/make.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/mingw-make/make.cmd?rev=2510… ============================================================================== --- trunk/tools/mingw-make/make.cmd (original) +++ trunk/tools/mingw-make/make.cmd Sun Dec 10 06:04:27 2006 @@ -1,4 +1,5 @@ @echo off -for /f "usebackq" %%i IN (`cpucount`) DO @set CPUCOUNT=%%i + +for /f "usebackq" %%i in (`cpucount`) do set CPUCOUNT=%%i echo %CPUCOUNT% Processors detected. -mingw32-make -j %CPUCOUNT% %* +rem mingw32-make -j %CPUCOUNT% %* Added: trunk/tools/mingw-make/makex.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/mingw-make/makex.cmd?rev=251… ============================================================================== --- trunk/tools/mingw-make/makex.cmd (added) +++ trunk/tools/mingw-make/makex.cmd Sun Dec 10 06:04:27 2006 @@ -1,0 +1,5 @@ +@echo off + +for /f "usebackq" %%i in (`cpucount -x2`) do set CPUCOUNT=%%i +echo %CPUCOUNT% Processors detected (Automatically doubled). +rem mingw32-make -j %CPUCOUNT% %*

1 0

[greatlrd] 25105: remove most of the hack in createsurface
by greatlrd＠svn.reactos.org 09 Dec '06

09 Dec '06

Author: greatlrd Date: Sun Dec 10 00:41:42 2006 New Revision: 25105 URL: http://svn.reactos.org/svn/reactos?rev=25105&view=rev Log: remove most of the hack in createsurface Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sun Dec 10 00:41:42 2006 @@ -205,59 +205,41 @@ } That->lpLcl = (LPDDRAWI_DDRAWSURFACE_LCL)DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_LCL)); - This->lpLcl->lpPrimary = That; - + if (That == NULL) { return E_OUTOFMEMORY; } + SurfaceMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); + if (SurfaceMore == NULL) + { + return DDERR_OUTOFMEMORY; + } + That->lpVtbl = &DirectDrawSurface7_Vtable; *ppSurf = (LPDIRECTDRAWSURFACE7)That; + That->lpLcl->lpGbl = &ddSurfGbl; That->lpLcl->lpGbl->lpDD = &ddgbl; - - - /* Code from wine cvs 24/7-2006 */ - - if (!(pDDSD->dwFlags & DDSD_CAPS)) - { - /* DVIDEO.DLL does forget the DDSD_CAPS flag ... *sigh* */ - pDDSD->dwFlags |= DDSD_CAPS; - } - if (pDDSD->ddsCaps.dwCaps == 0) - { - /* This has been checked on real Windows */ - pDDSD->ddsCaps.dwCaps = DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; - } - - - if (pDDSD->ddsCaps.dwCaps & DDSCAPS_ALLOCONLOAD) - { - /* If the surface is of the 'alloconload' type, ignore the LPSURFACE field */ - pDDSD->dwFlags &= ~DDSD_LPSURFACE; - } - - DX_STUB_str("pDDSD->ddsCaps.dwCaps ok"); - - if ((pDDSD->dwFlags & DDSD_LPSURFACE) && (pDDSD->lpSurface == NULL)) - { - /* Frank Herbert's Dune specifies a null pointer for the surface, ignore the LPSURFACE field */ - pDDSD->dwFlags &= ~DDSD_LPSURFACE; - } - - DX_STUB_str("pDDSD->dwFlags ok"); - - /* own code now */ - + That->lpLcl->lpSurfMore = SurfaceMore; + That->lpLcl->lpSurfMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + That->lpLcl->lpSurfMore->lpDD_int = This; + That->lpLcl->lpSurfMore->lpDD_lcl = This->lpLcl; + That->lpLcl->dwProcessId = GetCurrentProcessId(); + + /* this two line should be move to startup code */ + That->lpLcl->lpGbl->lpDD = This->lpLcl->lpGbl; + That->lpLcl->lpGbl->lpDDHandle = This->lpLcl->lpGbl; mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; + mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CanCreateSurface; mDdCanCreateSurface.ddRVal = DDERR_GENERIC; + mDdCreateSurface.lpDD = This->lpLcl->lpGbl; mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->cbDDCallbacks.CreateSurface; mDdCreateSurface.ddRVal = DDERR_GENERIC; mDdCreateSurface.dwSCnt = That->dwIntRefCnt + 1; // is this correct @@ -265,30 +247,13 @@ //mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; //mDdCreateSurface.lplpSList = &That->lpLcl; - SurfaceMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); - if (SurfaceMore == NULL) - { - return DDERR_OUTOFMEMORY; - } - if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; - DDSURFACEDESC mddsdPrimary; - - This->lpLcl->lpGbl->lp16DD = This->lpLcl->lpGbl; - That->lpLcl->lpSurfMore = SurfaceMore; - - ZeroMemory(&mddsdPrimary, sizeof(DDSURFACEDESC)); - mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); - mddsdPrimary.dwFlags = DDSD_CAPS; - mddsdPrimary.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_VIDEOMEMORY | DDSCAPS_VISIBLE; - mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->HALDD.CanCreateSurface; - mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; - mDdCanCreateSurface.lpDDSurfaceDesc = &mddsdPrimary; // pDDSD; - + This->lpLcl->lpPrimary = That; + That->lpLcl->lpSurfMore->slist = mpPrimaryLocals; + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED; @@ -298,31 +263,21 @@ { return DDERR_NOTINITIALIZED; } - - That->lpLcl->lpGbl->dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; - That->lpLcl->lpGbl->lpDD = This->lpLcl->lpGbl; - That->lpLcl->lpGbl->lpDDHandle = This->lpLcl->lpGbl; + + /* FIXME : + * This tree line is hack + */ That->lpLcl->lpGbl->wWidth = 1024; //(WORD)mpModeInfos[0].dwWidth; That->lpLcl->lpGbl->wHeight = 768; //(WORD)mpModeInfos[0].dwHeight; That->lpLcl->lpGbl->lPitch = 32; //mpModeInfos[0].lPitch; - - memset(SurfaceMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); - SurfaceMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); - - That->lpLcl->lpGbl = That->lpLcl->lpGbl; - That->lpLcl->lpSurfMore = SurfaceMore; - That->lpLcl->dwProcessId = GetCurrentProcessId(); + That->lpLcl->dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; - That->lpLcl->ddsCaps.dwCaps = mddsdPrimary.ddsCaps.dwCaps; + That->lpLcl->ddsCaps.dwCaps = pDDSD->ddsCaps.dwCaps; mpPrimaryLocals[0] = That->lpLcl; - - mDdCreateSurface.lpDD = This->lpLcl->lpGbl; - mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->HALDD.CreateSurface; - mDdCreateSurface.lpDDSurfaceDesc = &mddsdPrimary;//pDDSD; - mDdCreateSurface.lplpSList = mpPrimaryLocals; //cSurfaces; - mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; - + + mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; + if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) { return DDERR_NOTINITIALIZED;

1 0

[greatlrd] 25104: Test code to create surface. it is a big hack to create a primare surface. but we success create a primary surface. with this hack.
by greatlrd＠svn.reactos.org 09 Dec '06

09 Dec '06

Author: greatlrd Date: Sat Dec 9 21:31:31 2006 New Revision: 25104 URL: http://svn.reactos.org/svn/reactos?rev=25104&view=rev Log: Test code to create surface. it is a big hack to create a primare surface. but we success create a primary surface. with this hack. Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/main/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/main/ddr… ============================================================================== --- trunk/reactos/dll/directx/ddraw/main/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/main/ddraw_main.c Sat Dec 9 21:31:31 2006 @@ -185,6 +185,7 @@ LPDDRAWI_DDRAWSURFACE_INT That; DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; DDHAL_CREATESURFACEDATA mDdCreateSurface; + LPDDRAWI_DDRAWSURFACE_MORE SurfaceMore; if (pUnkOuter!=NULL) { @@ -250,6 +251,7 @@ /* own code now */ + mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; mDdCanCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; @@ -261,43 +263,77 @@ mDdCreateSurface.dwSCnt = That->dwIntRefCnt + 1; // is this correct mDdCreateSurface.lpDDSurfaceDesc = (LPDDSURFACEDESC) pDDSD; //mDdCreateSurface.lplpSList = That->lpLcl->lpSurfMore->slist; - mDdCreateSurface.lplpSList = &That->lpLcl; + //mDdCreateSurface.lplpSList = &That->lpLcl; + + SurfaceMore = DxHeapMemAlloc(sizeof(DDRAWI_DDRAWSURFACE_MORE)); + if (SurfaceMore == NULL) + { + return DDERR_OUTOFMEMORY; + } + + if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; + DDSURFACEDESC mddsdPrimary; + + This->lpLcl->lpGbl->lp16DD = This->lpLcl->lpGbl; + That->lpLcl->lpSurfMore = SurfaceMore; + + ZeroMemory(&mddsdPrimary, sizeof(DDSURFACEDESC)); + mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + mddsdPrimary.dwFlags = DDSD_CAPS; + mddsdPrimary.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_VIDEOMEMORY | DDSCAPS_VISIBLE; + + mDdCanCreateSurface.lpDD = This->lpLcl->lpGbl; + mDdCanCreateSurface.CanCreateSurface = This->lpLcl->lpDDCB->HALDD.CanCreateSurface; + mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; + mDdCanCreateSurface.lpDDSurfaceDesc = &mddsdPrimary; // pDDSD; + + if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + return DDERR_NOTINITIALIZED; + } - - if (pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - - /* we only create one surface it is primary */ - //LPDDRAWI_DDRAWSURFACE_LCL surf; - - DX_STUB_str( "Can not create primary surface well yet"); - - if (mDdCanCreateSurface.CanCreateSurface(&mDdCanCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str( "Can not create surface "); - return DDERR_NOTINITIALIZED; - } - - if (mDdCanCreateSurface.ddRVal != DD_OK) - { - DX_STUB_str( "Fail"); - return mDdCanCreateSurface.ddRVal; - } - - DX_STUB_str( "Can not create primary surface well yet"); - - if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) - { - DX_STUB_str( "Can not create surface fail"); - return DDERR_NOTINITIALIZED; - } - - DX_STUB_str( "Can not create primary surface well yet"); - - Main_DirectDraw_AddRef((LPDIRECTDRAW7)This); - Main_DDrawSurface_AddRef((LPDIRECTDRAWSURFACE7)That); - return mDdCreateSurface.ddRVal; - + That->lpLcl->lpGbl->dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + That->lpLcl->lpGbl->lpDD = This->lpLcl->lpGbl; + That->lpLcl->lpGbl->lpDDHandle = This->lpLcl->lpGbl; + That->lpLcl->lpGbl->wWidth = 1024; //(WORD)mpModeInfos[0].dwWidth; + That->lpLcl->lpGbl->wHeight = 768; //(WORD)mpModeInfos[0].dwHeight; + That->lpLcl->lpGbl->lPitch = 32; //mpModeInfos[0].lPitch; + + memset(SurfaceMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + SurfaceMore->dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + That->lpLcl->lpGbl = That->lpLcl->lpGbl; + That->lpLcl->lpSurfMore = SurfaceMore; + That->lpLcl->dwProcessId = GetCurrentProcessId(); + That->lpLcl->dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; + That->lpLcl->ddsCaps.dwCaps = mddsdPrimary.ddsCaps.dwCaps; + + mpPrimaryLocals[0] = That->lpLcl; + + mDdCreateSurface.lpDD = This->lpLcl->lpGbl; + mDdCreateSurface.CreateSurface = This->lpLcl->lpDDCB->HALDD.CreateSurface; + mDdCreateSurface.lpDDSurfaceDesc = &mddsdPrimary;//pDDSD; + mDdCreateSurface.lplpSList = mpPrimaryLocals; //cSurfaces; + mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; + + if (mDdCreateSurface.CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + return DDERR_NOTINITIALIZED; + } + + if (mDdCreateSurface.ddRVal != DD_OK) + { + return mDdCreateSurface.ddRVal; + } + + return DD_OK; } else if (pDDSD->ddsCaps.dwCaps & DDSCAPS_OVERLAY) {

1 0

[fireball] 25103: - MM: Don't place memory allocation bitmap right into the first 16Mb of memory - revert back to the old algorithm, which places it as high as possible - MM: Mark space under the mem alloc bitmap as free right before going to virtual mode, thus it doesn't get mapped - Save NT version which user wants to boot in the extension
by fireball＠svn.reactos.org 09 Dec '06

09 Dec '06

Author: fireball Date: Sat Dec 9 19:54:37 2006 New Revision: 25103 URL: http://svn.reactos.org/svn/reactos?rev=25103&view=rev Log: - MM: Don't place memory allocation bitmap right into the first 16Mb of memory - revert back to the old algorithm, which places it as high as possible - MM: Mark space under the mem alloc bitmap as free right before going to virtual mode, thus it doesn't get mapped - Save NT version which user wants to boot in the extension Modified: branches/winldr/mm/meminit.c branches/winldr/mm/mm.c branches/winldr/windows/winldr.c branches/winldr/windows/wlmemory.c Modified: branches/winldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/mm/meminit.c?rev=25103&r… ============================================================================== --- branches/winldr/mm/meminit.c (original) +++ branches/winldr/mm/meminit.c Sat Dec 9 19:54:37 2006 @@ -1,6 +1,7 @@ /* * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2006 Aleksey Bragin <aleksey(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -211,47 +212,22 @@ RtlCopyMemory(TempBiosMemoryMap, BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); MmSortBiosMemoryMap(TempBiosMemoryMap, MapCount); - for (Index=0; Index<MapCount; Index++) + // Find a place, starting from the highest memory + // (thus leaving low memory for kernel/drivers) + for (Index=(MapCount-1); Index>=0; Index--) { // If this is usable memory with a big enough length // then we'll put our page lookup table here - - // place it somewhere @ 10Mb if possible - // (afaik no bad things are placed at 10Mb, if there are - // - we just fallback to the usual algo) // skip if this is not usable region if (TempBiosMemoryMap[Index].Type != BiosMemoryUsable) continue; - if (TempBiosMemoryMap[Index].BaseAddress <= 10 * 0x100000 && - TempBiosMemoryMap[Index].BaseAddress + TempBiosMemoryMap[Index].Length >= - 10 * 0x100000 + PageLookupTableSize) - { - PageLookupTableMemAddress = (PVOID)(10 * 0x100000); + if (TempBiosMemoryMap[Index].Length >= PageLookupTableSize) + { + PageLookupTableMemAddress = (PVOID)(ULONG) + (TempBiosMemoryMap[Index].BaseAddress + (TempBiosMemoryMap[Index].Length - PageLookupTableSize)); break; - } - } - - // Check if we found a suitable place - if (PageLookupTableMemAddress == 0) - { - // no, let's do a traditional algorithm instead - for (Index=(MapCount-1); Index>=0; Index--) - { - // If this is usable memory with a big enough length - // then we'll put our page lookup table here - - // skip if this is not usable region - if (TempBiosMemoryMap[Index].Type != BiosMemoryUsable) - continue; - - if (TempBiosMemoryMap[Index].Length >= PageLookupTableSize) - { - PageLookupTableMemAddress = (PVOID)(ULONG) - (TempBiosMemoryMap[Index].BaseAddress + (TempBiosMemoryMap[Index].Length - PageLookupTableSize)); - break; - } } } Modified: branches/winldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/mm/mm.c?rev=25103&r1=251… ============================================================================== --- branches/winldr/mm/mm.c (original) +++ branches/winldr/mm/mm.c Sat Dec 9 19:54:37 2006 @@ -1,6 +1,7 @@ /* * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2006 Aleksey Bragin <aleksey(a)reactos.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Modified: branches/winldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/winldr.c?rev=251… ============================================================================== --- branches/winldr/windows/winldr.c (original) +++ branches/winldr/windows/winldr.c Sat Dec 9 19:54:37 2006 @@ -77,7 +77,8 @@ VOID WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, PCHAR Options, - PCHAR SystemPath) + PCHAR SystemPath, + WORD VersionToBoot) { /* Examples of correct options and paths */ //CHAR Options[] = "/DEBUGPORT=COM1 /BAUDRATE=115200"; @@ -187,9 +188,10 @@ } RtlZeroMemory(Extension, sizeof(LOADER_PARAMETER_EXTENSION)); + /* Save size and version information */ Extension->Size = sizeof(LOADER_PARAMETER_EXTENSION); - Extension->MajorVersion = 4; - Extension->MinorVersion = 0; + Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8; + Extension->MinorVersion = VersionToBoot & 0xFF; LoaderBlock->Extension = PaToVa(Extension); @@ -449,7 +451,7 @@ DbgPrint((DPRINT_WINDOWS, "HAL loaded with status %d at %p\n", Status, HalBase)); /* Load kernel-debugger support dll */ - if (OperatingSystemVersion > _WIN32_WINNT_NT4) + if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) { strcpy(FileName, BootPath); strcat(FileName, "SYSTEM32\\KDCOM.DLL"); @@ -462,7 +464,7 @@ "WINNT\\SYSTEM32\\NTOSKRNL.EXE", NtosBase, &KernelDTE); WinLdrAllocateDataTableEntry(LoaderBlock, "hal.dll", "WINNT\\SYSTEM32\\HAL.DLL", HalBase, &HalDTE); - if (OperatingSystemVersion > _WIN32_WINNT_NT4) + if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) { WinLdrAllocateDataTableEntry(LoaderBlock, "kdcom.dll", "WINNT\\SYSTEM32\\KDCOM.DLL", KdComBase, &KdComDTE); @@ -485,7 +487,7 @@ DbgPrint((DPRINT_WINDOWS, "Boot drivers loaded with status %d\n", Status)); /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath); + WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath, OperatingSystemVersion); /* Alloc PCR, TSS, do magic things with the GDT/IDT */ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); @@ -507,9 +509,9 @@ DbgPrint((DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", KiSystemStartup, LoaderBlockVA)); - //WinLdrpDumpMemoryDescriptors(LoaderBlockVA); - //WinLdrpDumpBootDriver(LoaderBlockVA); - //WinLdrpDumpArcDisks(LoaderBlockVA); + WinLdrpDumpMemoryDescriptors(LoaderBlockVA); + WinLdrpDumpBootDriver(LoaderBlockVA); + WinLdrpDumpArcDisks(LoaderBlockVA); //FIXME: If I substitute this debugging checkpoint, GCC will "optimize away" the code below //while (1) {}; Modified: branches/winldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/branches/winldr/windows/wlmemory.c?rev=2… ============================================================================== --- branches/winldr/windows/wlmemory.c (original) +++ branches/winldr/windows/wlmemory.c Sat Dec 9 19:54:37 2006 @@ -336,8 +336,8 @@ ULONG TssBasePage, PVOID GdtIdt) { - ULONG i, PagesCount; - ULONG LastPageIndex, LastPageType; + ULONG i, PagesCount, MemoryMapSizeInPages; + ULONG LastPageIndex, LastPageType, MemoryMapStartPage; PPAGE_LOOKUP_TABLE_ITEM MemoryMap; ULONG NoEntries; PKTSS Tss; @@ -378,6 +378,10 @@ return FALSE; } + // Calculate parameters of the memory map + MemoryMapStartPage = (ULONG_PTR)MemoryMap >> MM_PAGE_SHIFT; + MemoryMapSizeInPages = NoEntries * sizeof(PAGE_LOOKUP_TABLE_ITEM); + DbgPrint((DPRINT_WINDOWS, "Got memory map with %d entries\n", NoEntries)); // Always contigiously map low 1Mb of memory @@ -388,12 +392,24 @@ return FALSE; } - // Construct a good memory map from what we've got + // Construct a good memory map from what we've got, + // but mark entries which the memory allocation bitmap takes + // as free entries (this is done in order to have the ability + // to place mem alloc bitmap outside lower 16Mb zone) PagesCount = 1; LastPageIndex = 0; LastPageType = MemoryMap[0].PageAllocated; for(i=1;i<NoEntries;i++) { + // Check if its memory map itself + if (i >= MemoryMapStartPage && + i < (MemoryMapStartPage+MemoryMapSizeInPages)) + { + // Exclude it if current page belongs to the memory map + MemoryMap[i].PageAllocated = LoaderFree; + } + + // Process entry if (MemoryMap[i].PageAllocated == LastPageType && (i != NoEntries-1) ) {

1 0

[ekohl] 25102: Don't show a wallpapers file extension.
by ekohl＠svn.reactos.org 09 Dec '06

09 Dec '06

Author: ekohl Date: Sat Dec 9 18:31:06 2006 New Revision: 25102 URL: http://svn.reactos.org/svn/reactos?rev=25102&view=rev Log: Don't show a wallpapers file extension. Modified: trunk/reactos/dll/cpl/desk/background.c Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Sat Dec 9 18:31:06 2006 @@ -70,6 +70,7 @@ TCHAR separators[] = TEXT(";"); TCHAR *token; HWND hwndBackgroundList; + TCHAR *p; hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); @@ -128,6 +129,9 @@ backgroundItem->bWallpaper = TRUE; _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + p = _tcsrchr(backgroundItem->szDisplayName, _T('.')); + if (p) + *p = (TCHAR)0; _tcscpy(backgroundItem->szFilename, wallpaperFilename); ZeroMemory(&listItem, sizeof(LV_ITEM)); @@ -191,6 +195,9 @@ backgroundItem->bWallpaper = TRUE; _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); + p = _tcsrchr(backgroundItem->szDisplayName, _T('.')); + if (p) + *p = (TCHAR)0; _tcscpy(backgroundItem->szFilename, filename); ZeroMemory(&listItem, sizeof(LV_ITEM));

1 0

[janderwald] 25101: - only control panel applet should be started with rundll32.exe, other modules can be started w/o it
by janderwald＠svn.reactos.org 09 Dec '06

09 Dec '06

Author: janderwald Date: Sat Dec 9 17:43:02 2006 New Revision: 25101 URL: http://svn.reactos.org/svn/reactos?rev=25101&view=rev Log: - only control panel applet should be started with rundll32.exe, other modules can be started w/o it Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Sat Dec 9 17:43:02 2006 @@ -682,8 +682,16 @@ fprintf ( OUT, "\t\t\tName=\"%s|Win32\"\r\n", cfg.name.c_str() ); fprintf ( OUT, "\t\t\t>\r\n" ); fprintf ( OUT, "\t\t\t<DebugSettings\r\n" ); - fprintf ( OUT, "\t\t\t\tCommand=\"rundll32.exe\"\r\n" ); - fprintf ( OUT, "\t\t\t\tCommandArguments=\" shell32,Control_RunDLL "$(TargetPath)",@\"\r\n" ); + if ( module_type == ".cpl" ) + { + fprintf ( OUT, "\t\t\t\tCommand=\"rundll32.exe\"\r\n" ); + fprintf ( OUT, "\t\t\t\tCommandArguments=\" shell32,Control_RunDLL "$(TargetPath)",@\"\r\n" ); + } + else + { + fprintf ( OUT, "\t\t\t\tCommand=\"$(TargetPath)\"\r\n" ); + fprintf ( OUT, "\t\t\t\tCommandArguments=\"\"\r\n" ); + } fprintf ( OUT, "\t\t\t\tAttach=\"false\"\r\n" ); fprintf ( OUT, "\t\t\t\tDebuggerType=\"3\"\r\n" ); fprintf ( OUT, "\t\t\t\tRemote=\"1\"\r\n" );

1 0

[cwittich] 25100: fix version information display when using yasm
by cwittich＠svn.reactos.org 09 Dec '06

09 Dec '06

Author: cwittich Date: Sat Dec 9 16:47:38 2006 New Revision: 25100 URL: http://svn.reactos.org/svn/reactos?rev=25100&view=rev Log: fix version information display when using yasm Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sat Dec 9 16:47:38 2006 @@ -656,7 +656,7 @@ NUL, NUL ); int exitcode = system ( command.c_str () ); - return (exitcode == 0); + return (bool) (exitcode == 0); } void @@ -714,7 +714,7 @@ NUL, NUL ); int exitcode = system ( command.c_str () ); - return (exitcode == 0); + return (bool) (exitcode == 0); } string @@ -757,10 +757,21 @@ string MingwBackend::GetNetwideAssemblerVersion ( const string& nasmCommand ) { - string versionCommand = ssprintf ( "%s -v", - nasmCommand.c_str (), - NUL, - NUL ); + string versionCommand; + if ( nasmCommand.find("yasm") != std::string::npos ) + { + versionCommand = ssprintf ( "%s --version", + nasmCommand.c_str (), + NUL, + NUL ); + } + else + { + versionCommand = ssprintf ( "%s -v", + nasmCommand.c_str (), + NUL, + NUL ); + } return GetVersionString( versionCommand ); }

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