Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[dchapyshev] 39831: - Fix dmo.h and mediaerr.h
by dchapyshev＠svn.reactos.org 01 Mar '09

01 Mar '09

Author: dchapyshev Date: Sun Mar 1 20:15:00 2009 New Revision: 39831 URL: http://svn.reactos.org/svn/reactos?rev=39831&view=rev Log: - Fix dmo.h and mediaerr.h Modified: trunk/reactos/include/dxsdk/dmo.h trunk/reactos/include/dxsdk/mediaerr.h Modified: trunk/reactos/include/dxsdk/dmo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmo.h?rev=39… ============================================================================== --- trunk/reactos/include/dxsdk/dmo.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/dmo.h [iso-8859-1] Sun Mar 1 20:15:00 2009 @@ -17,3 +17,4 @@ #include "dmoreg.h" #include "dmort.h" +#endif /* __DMO_H__ */ Modified: trunk/reactos/include/dxsdk/mediaerr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/mediaerr.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/mediaerr.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/mediaerr.h [iso-8859-1] Sun Mar 1 20:15:00 2009 @@ -7,5 +7,5 @@ #define DMO_E_NOTACCEPTING 0x80040204 #define DMO_E_TYPE_NOT_ACCEPTED 0x80040205 #define DMO_E_NO_MORE_ITEMS 0x80040206 -#endif _MEDIAERR_H_ +#endif /* _MEDIAERR_H_ */

1 0

[mkupfer] 39830: Sascha Clausen <r4v3r AT hotmail DOT de> - Set menu ID. - See issue #2144 for details.
by mkupfer＠svn.reactos.org 01 Mar '09

01 Mar '09

Author: mkupfer Date: Sun Mar 1 19:12:34 2009 New Revision: 39830 URL: http://svn.reactos.org/svn/reactos?rev=39830&view=rev Log: Sascha Clausen <r4v3r AT hotmail DOT de> - Set menu ID. - See issue #2144 for details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Sun Mar 1 19:12:34 2009 @@ -1026,6 +1026,7 @@ } mii.fState = CurItem->fState; mii.fType = CurItem->fType; + mii.wID = CurItem->wID; mii.hbmpChecked = CurItem->hbmpChecked; mii.hbmpItem = CurItem->hbmpItem; mii.hbmpUnchecked = CurItem->hbmpUnchecked;

1 0

[sginsberg] 39829: - Fix 37825 -- Yes, we shouldn't check if an unsigned value is larger than or equal to zero, so just fix the check instead of...commenting out the assertion.
by sginsberg＠svn.reactos.org 01 Mar '09

01 Mar '09

Author: sginsberg Date: Sun Mar 1 18:35:31 2009 New Revision: 39829 URL: http://svn.reactos.org/svn/reactos?rev=39829&view=rev Log: - Fix 37825 -- Yes, we shouldn't check if an unsigned value is larger than or equal to zero, so just fix the check instead of...commenting out the assertion. Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c Modified: trunk/reactos/ntoskrnl/mm/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mdlsup.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mdlsup.c [iso-8859-1] Sun Mar 1 18:35:31 2009 @@ -261,7 +261,7 @@ if (Process) { /* Handle the accounting of locked pages */ - /* ASSERT(Process->NumberOfLockedPages >= 0); */ // always true + ASSERT(Process->NumberOfLockedPages > 0); InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages, -PageCount); } @@ -276,7 +276,7 @@ if (Process) { /* Handle the accounting of locked pages */ - /* ASSERT(Process->NumberOfLockedPages >= 0); */ // always true + ASSERT(Process->NumberOfLockedPages > 0); InterlockedExchangeAddSizeT(&Process->NumberOfLockedPages, -PageCount); }

1 0

[dchapyshev] 39828: - Remove duplicates
by dchapyshev＠svn.reactos.org 01 Mar '09

01 Mar '09

Author: dchapyshev Date: Sun Mar 1 17:31:31 2009 New Revision: 39828 URL: http://svn.reactos.org/svn/reactos?rev=39828&view=rev Log: - Remove duplicates Removed: trunk/reactos/media/ini/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/system.ini Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Mar 1 17:31:31 2009 @@ -598,7 +598,7 @@ media\inf\xboxdisp.inf 6 ; Ini Files -media\ini\system.ini 4 +boot\bootdata\system.ini 4 ; Subsystems subsystems\win32\csrss\csrss.exe 1 Modified: trunk/reactos/boot/bootdata/system.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/system.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/system.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/system.ini [iso-8859-1] Sun Mar 1 17:31:31 2009 @@ -1,19 +1,19 @@ +[driver32] +msacm.imaadpcm=imaadp32.acm +msacm.msadpcm=msadp32.acm +msacm.msg711=msg711.acm +msacm.winemp3=winemp3.acm +vidc.mrle=msrle32.dll +vidc.msvc=msvidc32.dll +vidc.cvid=iccvid.dll + [mci] MPEGVideo=mciqtz.drv MPEGVideo2=mciqtz.drv -avivideo=mciavi.drv -cdaudio=mcicda.drv -sequencer=mciseq.drv +AVIVideo=mciavi32.dll +CDAudio=mcicda.dll +Sequencer=mciseq.dll vcr=mcivisca.drv -; videodisc=mcipionr.drv -waveaudio=mciwave.drv +WaveAudio=mciwave.dll -[drivers32] -MSACM.imaadpcm=imaadp32.acm -MSACM.msadpcm=msadp32.acm -VIDC.MRLE=msrle32.dll -; VIDC.IV50=ir50_32.dll -; vidc.CVID=iccvid.dll -; VIDC.IV31=ir32_32.dll -; VIDC.IV32=ir32_32.dll -; vidc.MSVC=msvidc32.dll +[386enh]

1 0

[janderwald] 39827: - Fix compilation of cmidriver - Does not yet link
by janderwald＠svn.reactos.org 01 Mar '09

01 Mar '09

Author: janderwald Date: Sun Mar 1 17:29:57 2009 New Revision: 39827 URL: http://svn.reactos.org/svn/reactos?rev=39827&view=rev Log: - Fix compilation of cmidriver - Does not yet link Added: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmidriver.rbuild (with props) Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/HowToBuild.txt trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-all.bat trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x64-WaveRT.bat trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x64.bat trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x86-WaveRT.bat trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x86.bat trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/distclean.bat trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/envars.bat trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/make.bat trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/makefile trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/sources trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/update.bat Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmireg.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/debug.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/interfaces.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/property.h Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/HowToBuild.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/HowToBuild.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/HowToBuild.txt (removed) @@ -1,22 +1,0 @@ -For compiling and building the WDM driver, the following software is required: -- Microsoft Windows Driver Development Kit (http://www.microsoft.com/whdc/devtools/wdk/default.mspx) -- 7Zip (http://www.7-zip.org/) -- Sed (http://gnuwin32.sourceforge.net/packages/sed.htm) - -The directories which contain 7z.exe, sed.exe and devcon.exe need to be in your %PATH% environment variable. Replace the file 'dsound.lib' in the [WINDDK]\[xxxx]\lib\w2k\i386 folder with the version from [WINDDK]\[xxxx]\lib\wxp\i386. - -The source files should be unpacked to [WINDDK]\[xxxx]\src\[\wdm]\audio\cmedia - -envars.bat - contains some environment variables: you probably want to change them -make.bat - creates a debug build for x86 systems -update.bat - replaces the currently installed driver with the x86 debug build -build-release-x64.bat - creates a non-WaveRT deployment build for x64 systems -build-release-x64-WaveRT.bat - creates a WaveRT deployment build for x64 systems -build-release-x86.bat - creates a non-WaveRT deployment build for x86 systems -build-release-x86-WaveRT.bat - creates a WaveRT deployment build for x86 systems -distclean.bat - cleans up and packs the source -build-all.bat - builds all versions and packs the source - -For testing and debugging, DebugView (http://www.microsoft.com/technet/sysinternals/utilities/debugview.mspx) is very helpful. - -If you have questions, feel free to mail me: dogber1(a)gmail.com Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/adapter.cpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -26,20 +26,30 @@ */ #define PUT_GUIDS_HERE - +#include <initguid.h> #include "adapter.hpp" -#pragma code_seg("PAGE") - - -NTSTATUS InstallSubdevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PWCHAR Name, REFGUID PortClassId, REFGUID MiniportClassId, PFNCREATEINSTANCE MiniportCreate, PUNKNOWN UnknownAdapter, PRESOURCELIST ResourceList, REFGUID PortInterfaceId, PUNKNOWN* OutPortUnknown) -{ - PAGED_CODE(); - DBGPRINT(("InstallSubdevice()")); - +//#pragma code_seg("PAGE") + + +NTSTATUS InstallSubdevice( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PWCHAR Name, + REFGUID PortClassId, + REFGUID MiniportClassId, + PFNCREATEINSTANCE MiniportCreate, + PUNKNOWN UnknownAdapter, + PRESOURCELIST ResourceList, + REFGUID PortInterfaceId, + PUNKNOWN* OutPortUnknown) +{ NTSTATUS ntStatus; PPORT Port; PMINIPORT MiniPort; + + ////PAGED_CODE(); + DBGPRINT(("InstallSubdevice()")); ntStatus = PcNewPort(&Port, PortClassId); if (NT_SUCCESS(ntStatus)) { @@ -76,19 +86,24 @@ } -NTSTATUS ProcessResources(PRESOURCELIST ResourceList, PRESOURCELIST* UartResourceList) -{ - PAGED_CODE(); - ASSERT(ResourceList); - ASSERT(UartResourceList); - DBGPRINT(("ProcessResources()")); - DBGPRINT(("NumberOfPorts: %d, NumberOfInterrupts: %d, NumberOfDmas: %d", ResourceList->NumberOfPorts(), ResourceList->NumberOfInterrupts(), ResourceList->NumberOfDmas())); +NTSTATUS +ProcessResources( + PRESOURCELIST ResourceList, + PRESOURCELIST* UartResourceList) +{ + NTSTATUS ntStatus; + + ////PAGED_CODE(); + ////ASSERT(ResourceList); + ////ASSERT(UartResourceList); + //DBGPRINT(("ProcessResources()")); + //DBGPRINT(("NumberOfPorts: %d, NumberOfInterrupts: %d, NumberOfDmas: %d", ResourceList->NumberOfPorts(), ResourceList->NumberOfInterrupts(), ResourceList->NumberOfDmas())); #ifdef UART (*UartResourceList) = NULL; #endif - NTSTATUS ntStatus; + if ((ResourceList->NumberOfPorts() == 0) || (ResourceList->NumberOfPorts() > 2) || (ResourceList->NumberOfInterrupts() != 1) || (ResourceList->NumberOfDmas() != 0)) { DBGPRINT(("Unexpected configuration")); return STATUS_DEVICE_CONFIGURATION_ERROR; @@ -108,15 +123,16 @@ NTSTATUS StartDevice(PDEVICE_OBJECT DeviceObject, PIRP Irp, PRESOURCELIST ResourceList) { - PAGED_CODE(); - ASSERT(DeviceObject); - ASSERT(Irp); - ASSERT(ResourceList); - DBGPRINT(("StartDevice()")); - NTSTATUS ntStatus; PPORT pPort = 0; ULONG* MPUBase; +#if 0 + //PAGED_CODE(); + //ASSERT(DeviceObject); + //ASSERT(Irp); + //ASSERT(ResourceList); + DBGPRINT(("StartDevice()")); +#endif ntStatus = PcNewPort(&pPort,CLSID_PortWaveCyclic); if (NT_SUCCESS(ntStatus)) { @@ -248,22 +264,29 @@ return ntStatus; } -extern "C" NTSTATUS AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT PhysicalDeviceObject) -{ - PAGED_CODE(); - DBGPRINT(("AddDevice()")); - - return PcAddAdapterDevice(DriverObject, PhysicalDeviceObject, (PCPFNSTARTDEVICE)StartDevice, MAX_MINIPORTS, 0); +extern +"C" +NTSTATUS +NTAPI +AddDevice( + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT PhysicalDeviceObject) +{ +#if 0 + //PAGED_CODE(); + DBGPRINT(("AddDevice()")); +#endif + + return PcAddAdapterDevice(DriverObject, PhysicalDeviceObject, (PCPFNSTARTDEVICE)StartDevice, MAX_MINIPORTS, 0); } bool CopyResourceDescriptor(PIO_RESOURCE_DESCRIPTOR pInResDescriptor, PIO_RESOURCE_DESCRIPTOR pOutResDescriptor) { - PAGED_CODE(); - ASSERT(pInResDescriptor); - ASSERT(pOutResDescriptor); +#if 0 + //PAGED_CODE(); + //ASSERT(pInResDescriptor); + //ASSERT(pOutResDescriptor); DBGPRINT(("CopyResourceDescriptor()")); - -#if 0 RtlCopyMemory(pOutResDescriptor, pInResDescriptor, sizeof(IO_RESOURCE_DESCRIPTOR)); #else pOutResDescriptor->Type = pInResDescriptor->Type; @@ -283,14 +306,18 @@ pOutResDescriptor->u.Port.MaximumAddress = pInResDescriptor->u.Port.MaximumAddress; pOutResDescriptor->u.Port.Length = pInResDescriptor->u.Port.Length; pOutResDescriptor->u.Port.Alignment = pInResDescriptor->u.Port.Alignment; +#if 0 DBGPRINT((" Port: min %08x.%08x max %08x.%08x, Length: %x, Option: %x", pOutResDescriptor->u.Port.MinimumAddress.HighPart, pOutResDescriptor->u.Port.MinimumAddress.LowPart, pOutResDescriptor->u.Port.MaximumAddress.HighPart, pOutResDescriptor->u.Port.MaximumAddress.LowPart, pOutResDescriptor->u.Port.Length, pOutResDescriptor->Option)); +#endif break; case CmResourceTypeInterrupt: pOutResDescriptor->u.Interrupt.MinimumVector = pInResDescriptor->u.Interrupt.MinimumVector; pOutResDescriptor->u.Interrupt.MaximumVector = pInResDescriptor->u.Interrupt.MaximumVector; +#if 0 DBGPRINT((" IRQ: min %x max %x, Option: %d", pOutResDescriptor->u.Interrupt.MinimumVector, pOutResDescriptor->u.Interrupt.MaximumVector, pOutResDescriptor->Option)); +#endif break; default: return FALSE; @@ -299,18 +326,24 @@ #endif } -extern "C" NTSTATUS AdapterDispatchPnp(PDEVICE_OBJECT pDeviceObject, PIRP pIrp) -{ - PAGED_CODE(); - ASSERT(pDeviceObject); - ASSERT(pIrp); - DBGPRINT(("AdapterDispatchPnp()")); - +extern +"C" +NTSTATUS +NTAPI +AdapterDispatchPnp( + PDEVICE_OBJECT pDeviceObject, + PIRP pIrp) +{ NTSTATUS ntStatus = STATUS_SUCCESS; ULONG resourceListSize; PIO_RESOURCE_REQUIREMENTS_LIST resourceList, list; PIO_RESOURCE_DESCRIPTOR descriptor; PIO_STACK_LOCATION pIrpStack = IoGetCurrentIrpStackLocation(pIrp); + + ////PAGED_CODE(); + ////ASSERT(pDeviceObject); + ////ASSERT(pIrp); + DBGPRINT(("AdapterDispatchPnp()")); if (pIrpStack->MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS) { DBGPRINT(("[AdapterDispatchPnp] - IRP_MN_FILTER_RESOURCE_REQUIREMENTS")); @@ -373,7 +406,7 @@ descriptor->u.Port.Length = 1; descriptor->u.Port.Alignment = 0x10; - DBGPRINT(("number of resource list descriptors: %d", resourceList->List[0].Count)); +// DBGPRINT(("number of resource list descriptors: %d", resourceList->List[0].Count)); pIrp->IoStatus.Information = (ULONG_PTR)resourceList; @@ -387,27 +420,35 @@ return ntStatus; } -extern "C" NTSTATUS DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPathName) -{ - PAGED_CODE(); - DBGPRINT(("DriverEntry()")); - - NTSTATUS ntStatus; - - //bind the adapter driver to the portclass driver - ntStatus = PcInitializeAdapterDriver(DriverObject, RegistryPathName, AddDevice); +extern +"C" +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPathName) +{ + NTSTATUS ntStatus; + + DBGPRINT(("DriverEntry()")); + + + //bind the adapter driver to the portclass driver + ntStatus = PcInitializeAdapterDriver(DriverObject, RegistryPathName, AddDevice); + + #ifdef UART - if(NT_SUCCESS(ntStatus)) { - DriverObject->MajorFunction[IRP_MJ_PNP] = AdapterDispatchPnp; - } + if(NT_SUCCESS(ntStatus)) { + DriverObject->MajorFunction[IRP_MJ_PNP] = AdapterDispatchPnp; + } #endif #ifdef WAVERT - if (!IoIsWdmVersionAvailable(6,0)) { - ntStatus = STATUS_UNSUCCESSFUL; - } -#endif - - return ntStatus; + if (!IoIsWdmVersionAvailable(6,0)) { + ntStatus = STATUS_UNSUCCESSFUL; + } +#endif + + return ntStatus; } #pragma code_seg() Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-all.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-all.bat [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-all.bat (removed) @@ -1,6 +1,0 @@ -@echo off -start /wait cmd.exe /c distclean.bat -start /wait cmd.exe /c build-release-x64.bat -start /wait cmd.exe /c build-release-x64-WaveRT.bat -start /wait cmd.exe /c build-release-x86.bat -start /wait cmd.exe /c build-release-x86-WaveRT.bat Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x64-WaveRT.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x64-WaveRT.bat [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x64-WaveRT.bat (removed) @@ -1,32 +1,0 @@ -@echo off -call envars.bat -call %CMI_DDKDIR%\bin\setenv %CMI_DDKDIR% fre AMD64 -cd %CMI_BUILDDIR% -del CMIDriver-%CMI_VERSION%-bin-x64-WaveRT.zip -del installer\objfre_wlh_AMD64\AMD64\*.obj -del installer\objfre_wlh_AMD64\AMD64\*.exe -del cmicontrol\objfre_wlh_AMD64\AMD64\*.obj -del cmicontrol\objfre_wlh_AMD64\AMD64\*.exe -del cpl\objfre_wlh_AMD64\AMD64\*.obj -del cpl\objfre_wlh_AMD64\AMD64\*.exe -del objfre_wlh_AMD64\AMD64\*.obj -del objfre_wlh_AMD64\AMD64\*.sys -sed -i "s/CMIVERSION.*/CMIVERSION \"%CMI_VERSION%\"/" debug.hpp -sed -i "s/^\/\/#define WAVERT/#define WAVERT/" debug.hpp -nmake /x errors.err -mkdir release-x64-WaveRT -copy objfre_wlh_AMD64\AMD64\*.sys release-x64-WaveRT -sed -e "s/CMIVersion/%CMI_VERSION%/" -e "s/CMIReleaseDate/%CMI_RELEASEDATE%/" CM8738-x64-WaveRT.inf >release-x64-WaveRT\CM8738.inf -copy CHANGELOG.txt release-x64-WaveRT -cd cmicontrol -nmake /x errors.err -copy objfre_wlh_AMD64\AMD64\cmicontrol.exe ..\release-x64-WaveRT -cd ..\cpl -build -cZ -copy objfre_wlh_AMD64\AMD64\cmicpl.cpl ..\release-x64-WaveRT -cd ..\installer -build -cZ -copy objfre_wlh_AMD64\AMD64\setup.exe ..\release-x64-WaveRT -cd ..\release-x64-WaveRT -7z a -tzip ..\CMIDriver-%CMI_VERSION%-bin-x64-WaveRT.zip * -cd .. Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x64.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x64.bat [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x64.bat (removed) @@ -1,32 +1,0 @@ -@echo off -call envars.bat -call %CMI_DDKDIR%\bin\setenv %CMI_DDKDIR% fre AMD64 -cd %CMI_BUILDDIR% -del CMIDriver-%CMI_VERSION%-bin-x64.zip -del installer\objfre_wlh_AMD64\AMD64\*.obj -del installer\objfre_wlh_AMD64\AMD64\*.exe -del cmicontrol\objfre_wlh_AMD64\AMD64\*.obj -del cmicontrol\objfre_wlh_AMD64\AMD64\*.exe -del cpl\objfre_wlh_AMD64\AMD64\*.obj -del cpl\objfre_wlh_AMD64\AMD64\*.exe -del objfre_wlh_AMD64\AMD64\*.obj -del objfre_wlh_AMD64\AMD64\*.sys -sed -i "s/CMIVERSION.*/CMIVERSION \"%CMI_VERSION%\"/" debug.hpp -sed -i "s/^#define WAVERT/\/\/#define WAVERT/" debug.hpp -nmake /x errors.err -mkdir release-x64 -copy objfre_wlh_AMD64\AMD64\*.sys release-x64 -sed -e "s/CMIVersion/%CMI_VERSION%/" -e "s/CMIReleaseDate/%CMI_RELEASEDATE%/" CM8738-x64.inf >release-x64\CM8738.inf -copy CHANGELOG.txt release-x64 -cd cmicontrol -nmake /x errors.err -copy objfre_wlh_AMD64\AMD64\cmicontrol.exe ..\release-x64 -cd ..\cpl -build -cZ -copy objfre_wlh_AMD64\AMD64\cmicpl.cpl ..\release-x64 -cd ..\installer -build -cZ -copy objfre_wlh_AMD64\AMD64\setup.exe ..\release-x64 -cd ..\release-x64 -7z a -tzip ..\CMIDriver-%CMI_VERSION%-bin-x64.zip * -cd .. Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x86-WaveRT.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x86-WaveRT.bat [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x86-WaveRT.bat (removed) @@ -1,32 +1,0 @@ -@echo off -call envars.bat -call %CMI_DDKDIR%\bin\setenv %CMI_DDKDIR% fre x86 -cd %CMI_BUILDDIR% -del CMIDriver-%CMI_VERSION%-bin-x86-WaveRT.zip -del installer\objfre_wlh_x86\i386\*.obj -del installer\objfre_wlh_x86\i386\*.exe -del cmicontrol\objfre_wlh_x86\i386\*.obj -del cmicontrol\objfre_wlh_x86\i386\*.exe -del cpl\objfre_wlh_x86\i386\*.obj -del cpl\objfre_wlh_x86\i386\*.exe -del objfre_wlh_x86\i386\*.obj -del objfre_wlh_x86\i386\*.sys -sed -i "s/CMIVERSION.*/CMIVERSION \"%CMI_VERSION%\"/" debug.hpp -sed -i "s/^\/\/#define WAVERT/#define WAVERT/" debug.hpp -nmake /x errors.err -mkdir release-x86-WaveRT -copy objfre_wlh_x86\i386\*.sys release-x86-WaveRT -sed -e "s/CMIVersion/%CMI_VERSION%/" -e "s/CMIReleaseDate/%CMI_RELEASEDATE%/" CM8738-x32-WaveRT.inf >release-x86-WaveRT\CM8738.inf -copy CHANGELOG.txt release-x86-WaveRT -cd cmicontrol -nmake /x errors.err -copy objfre_wlh_x86\i386\cmicontrol.exe ..\release-x86-WaveRT -cd ..\cpl -build -cZ -copy objfre_wlh_x86\i386\cmicpl.cpl ..\release-x86-WaveRT -cd ..\installer -build -cZ -copy objfre_wlh_x86\i386\setup.exe ..\release-x86-WaveRT -cd ..\release-x86-WaveRT -7z a -tzip ..\CMIDriver-%CMI_VERSION%-bin-x86-WaveRT.zip * -cd .. Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x86.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x86.bat [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/build-release-x86.bat (removed) @@ -1,32 +1,0 @@ -@echo off -call envars.bat -call %CMI_DDKDIR%\bin\setenv %CMI_DDKDIR% fre x86 wxp -cd %CMI_BUILDDIR% -del CMIDriver-%CMI_VERSION%-bin-x86.zip -del installer\objfre_wxp_x86\i386\*.obj -del installer\objfre_wxp_x86\i386\*.exe -del cmicontrol\objfre_wxp_x86\i386\*.obj -del cmicontrol\objfre_wxp_x86\i386\*.exe -del cpl\objfre_wxp_x86\i386\*.obj -del cpl\objfre_wxp_x86\i386\*.exe -del objfre_wxp_x86\i386\*.obj -del objfre_wxp_x86\i386\*.sys -sed -i "s/CMIVERSION.*/CMIVERSION \"%CMI_VERSION%\"/" debug.hpp -sed -i "s/^#define WAVERT/\/\/#define WAVERT/" debug.hpp -nmake /x errors.err -mkdir release-x86 -copy objfre_wxp_x86\i386\*.sys release-x86 -sed -e "s/CMIVersion/%CMI_VERSION%/" -e "s/CMIReleaseDate/%CMI_RELEASEDATE%/" CM8738-x32.inf >release-x86\CM8738.inf -copy CHANGELOG.txt release-x86 -cd cmicontrol -nmake /x errors.err -copy objfre_wxp_x86\i386\cmicontrol.exe ..\release-x86 -cd ..\cpl -build -cZ -copy objfre_wxp_x86\i386\cmicpl.cpl ..\release-x86 -cd ..\installer -build -cZ -copy objfre_wxp_x86\i386\setup.exe ..\release-x86 -cd ..\release-x86 -7z a -tzip ..\CMIDriver-%CMI_VERSION%-bin-x86.zip * -cd .. Added: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmidriver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmidriver.rbuild (added) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmidriver.rbuild [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -1,0 +1,14 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../../tools/rbuild/project.dtd"> +<module name="cmidriver" type="kernelmodedriver" installbase="system32/drivers" installname="cmipci.sys" allowwarnings="true"> + <include base="mpu401">.</include> + <library>ntoskrnl</library> + <library>portcls</library> + <library>hal</library> + <library>ks</library> + <file>adapter.cpp</file> + <file>common.cpp</file> + <file>mintopo.cpp</file> + <file>minwave.cpp</file> + <file>cmipci.rc</file> +</module> Propchange: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmidriver.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmireg.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmireg.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/cmireg.hpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -170,4 +170,4 @@ #define SBREG_EXTENSION 0xF0 // Soundblaster Extension Register (8bit) #define EN_MICBOOST 0x01 // enable microphone boost for recording -#endif +#endif Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.cpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -29,22 +29,31 @@ #pragma code_seg("PAGE") -NTSTATUS NewCMIAdapter(PUNKNOWN *Unknown, REFCLSID, PUNKNOWN UnknownOuter, POOL_TYPE PoolType) -{ - PAGED_CODE(); +NTSTATUS +NewCMIAdapter( + PUNKNOWN *Unknown, + REFCLSID, + PUNKNOWN UnknownOuter, + POOL_TYPE PoolType) +{ +#if 0 + //PAGED_CODE(); DBGPRINT(("NewCMIAdapter()")); - ASSERT (Unknown); + //ASSERT (Unknown); +#endif STD_CREATE_BODY_(CCMIAdapter, Unknown, UnknownOuter, PoolType, PCMIADAPTER); } STDMETHODIMP_(NTSTATUS) CCMIAdapter::init(PRESOURCELIST ResourceList, PDEVICE_OBJECT aDeviceObject) { - PAGED_CODE(); - ASSERT(ResourceList); - ASSERT(aDeviceObject); - ASSERT(ResourceList->FindTranslatedPort(0)); +#if 0 + //PAGED_CODE(); + //ASSERT(ResourceList); + //ASSERT(aDeviceObject); + //ASSERT(ResourceList->FindTranslatedPort(0)); DBGPRINT(("CCMIAdapter[%p]::init()", this)); +#endif NTSTATUS ntStatus = STATUS_SUCCESS; @@ -110,7 +119,7 @@ CCMIAdapter::~CCMIAdapter() { - PAGED_CODE (); + //PAGED_CODE (); DBGPRINT(("CCMIAdapter[%p]::~CCMIAdapter()", this)); if (InterruptSync) { @@ -122,11 +131,11 @@ STDMETHODIMP_(NTSTATUS) CCMIAdapter::NonDelegatingQueryInterface(REFIID Interface, PVOID* Object) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CCMIAdapter[%p]::NonDelegatingQueryInterface()", this)); - ASSERT(Object); + //ASSERT(Object); // Is it IID_IUnknown? if (IsEqualGUIDAligned (Interface, IID_IUnknown)) { @@ -155,7 +164,7 @@ bool CCMIAdapter::queryChip() { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CCMIAdapter[%p]::queryChip()", this)); UInt32 version = readUInt32(REG_INTHLDCLR) & VERSION_MASK; @@ -216,7 +225,7 @@ void CCMIAdapter::resetMixer() { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CCMIAdapter[%p]::resetMixer()", this)); writeMixer(0, 0); @@ -225,8 +234,10 @@ void CCMIAdapter::resetController() { - PAGED_CODE(); +#if 0 + //PAGED_CODE(); DBGPRINT(("CCMIAdapter[%p]::resetController()", this)); +#endif writeUInt32(REG_INTHLDCLR, 0); @@ -258,10 +269,11 @@ STDMETHODIMP_(NTSTATUS) CCMIAdapter::activateMPU(ULONG* MPUBase) { - PAGED_CODE(); + UInt32 LegacyCtrl; +#if 0 + //PAGED_CODE(); DBGPRINT(("CCMIAdapter[%p]::activateMPU(%X)", this, MPUBase)); - - UInt32 LegacyCtrl; +#endif switch ((LONGLONG)MPUBase) { case 0x300: LegacyCtrl = UART_300; break; @@ -284,8 +296,10 @@ // XP's order of power states when going to hibernate: D3 -> D0, waking up: D0 -> D3. STDMETHODIMP_(void) CCMIAdapter::PowerChangeState(POWER_STATE NewState) { - PAGED_CODE(); +#if 0 + //PAGED_CODE(); DBGPRINT(("CCMIAdapter[%p]::PowerChangeState(%p)", this, NewState)); +#endif if (NewState.DeviceState == CurrentPowerState ) { return; @@ -318,25 +332,31 @@ STDMETHODIMP_(NTSTATUS) CCMIAdapter::QueryPowerChangeState(POWER_STATE NewStateQuery) { - PAGED_CODE(); +#if 0 + //PAGED_CODE(); DBGPRINT(("CCMIAdapter[%p]::QueryPowerChangeState(%p)", this, NewStateQuery)); +#endif return STATUS_SUCCESS; } STDMETHODIMP_(NTSTATUS) CCMIAdapter::QueryDeviceCapabilities(PDEVICE_CAPABILITIES PowerDeviceCaps) { - PAGED_CODE(); +#if 0 + //PAGED_CODE(); DBGPRINT(("CCMIAdapter[%p]::QueryDeviceCapabilities(%p)", this, PowerDeviceCaps)); +#endif return STATUS_SUCCESS; } STDMETHODIMP_(NTSTATUS) CCMIAdapter::loadSBMixerFromMemory() { - PAGED_CODE(); - DBGPRINT(("CCMIAdapter[%p]::loadSBMixerFromMemory()", this)); UInt8 sbIndex[] = { 0x04, 0x0A, 0x22, 0x28, 0x2E, 0x30, 0x31, 0x32, 0x33, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3C, 0x3D, 0x3E, 0xF0 }; +#if 0 + //PAGED_CODE(); + DBGPRINT(("CCMIAdapter[%p]::loadSBMixerFromMemory()", this)); +#endif for (int i = 0; i<(sizeof(sbIndex)/sizeof(sbIndex[0]));i++) { writeUInt8(REG_SBINDEX, sbIndex[i]); writeUInt8(REG_SBDATA, mixerCache[i]); @@ -431,12 +451,14 @@ NTSTATUS CCMIAdapter::InterruptServiceRoutine(PINTERRUPTSYNC InterruptSync, PVOID DynamicContext) { - ASSERT(InterruptSync); - ASSERT(DynamicContext); - UInt32 status, mask = 0; CCMIAdapter *CMIAdapter = (CCMIAdapter *)DynamicContext; + +#if 0 + //ASSERT(InterruptSync); + //ASSERT(DynamicContext); +#endif if (!(CMIAdapter->cm.WaveMiniport)) { return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/common.hpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -28,11 +28,13 @@ #ifndef _COMMON_HPP_ #define _COMMON_HPP_ +#include "ntddk.h" #include "stdunk.h" #include "portcls.h" #include "dmusicks.h" #include "ksdebug.h" #include "kcom.h" +#include "ksmedia.h" #include "interfaces.hpp" #include "debug.hpp" Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/debug.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/debug.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/debug.hpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -33,10 +33,7 @@ #define UART #if (DBG) -#define DBGPRINT(msg) \ - { \ - DbgPrint##msg; \ - } +#define DBGPRINT(msg) #define DBGBREAK \ _asm int 3; #else @@ -44,10 +41,5 @@ #define DBGBREAK #endif -#define INFOPRINT(msg) \ - { \ - DbgPrint##msg; \ - } - - -#endif +#define INFOPRINT(msg) +#endif Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/distclean.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/distclean.bat [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/distclean.bat (removed) @@ -1,53 +1,0 @@ -@echo off -call envars.bat - -rd /s /q cpl\objchk_wxp_x86 -rd /s /q cpl\objchk_wxp_amd64 -rd /s /q cpl\objfre_wxp_x86 -rd /s /q cpl\objfre_wxp_amd64 -rd /s /q cpl\objchk_wlh_x86 -rd /s /q cpl\objchk_wlh_amd64 -rd /s /q cpl\objfre_wlh_x86 -rd /s /q cpl\objfre_wlh_amd64 -del cpl\errors.err -del cpl\build*.* - -rd /s /q cmicontrol\objchk_wxp_x86 -rd /s /q cmicontrol\objchk_wxp_amd64 -rd /s /q cmicontrol\objfre_wxp_x86 -rd /s /q cmicontrol\objfre_wxp_amd64 -rd /s /q cmicontrol\objchk_wlh_x86 -rd /s /q cmicontrol\objchk_wlh_amd64 -rd /s /q cmicontrol\objfre_wlh_x86 -rd /s /q cmicontrol\objfre_wlh_amd64 -del cmicontrol\errors.err -del cmicontrol\build*.* - -rd /s /q installer\objchk_wxp_x86 -rd /s /q installer\objchk_wxp_amd64 -rd /s /q installer\objfre_wxp_x86 -rd /s /q installer\objfre_wxp_amd64 -rd /s /q installer\objchk_wlh_x86 -rd /s /q installer\objchk_wlh_amd64 -rd /s /q installer\objfre_wlh_x86 -rd /s /q installer\objfre_wlh_amd64 -del installer\errors.err -del installer\build*.* - -rd /s /q objchk_wxp_x86 -rd /s /q objchk_wxp_amd64 -rd /s /q objfre_wxp_x86 -rd /s /q objfre_wxp_amd64 -rd /s /q objchk_wlh_x86 -rd /s /q objchk_wlh_amd64 -rd /s /q objfre_wlh_x86 -rd /s /q objfre_wlh_amd64 -del errors.err - -rd /s /q release-x86 -rd /s /q release-x64 -rd /s /q release-x86-WaveRT -rd /s /q release-x64-WaveRT -rd /s /q debug-x86 -del *.zip -7z a -tzip CMIDriver-%CMI_VERSION%-src.zip * cmicontrol\* cpl\* installer\* Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/envars.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/envars.bat [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/envars.bat (removed) @@ -1,14 +1,0 @@ -@echo off -set CMI_DDKDIR=c:\WinDDK\6000 -set CMI_BUILDDIR=C:\WinDDK\6000\src\Audio\CMedia -set CMI_VERSION=1.1.3 -REM the slashes need to be escaped for sed.exe -set CMI_RELEASEDATE=06\/30\/2007 -REM wxp | wlh -set CMI_DEBUGOS=wlh -REM x86 | AMD64 -set CMI_DEBUGARCH=x86 -REM WaveRT | -set CMI_DEBUGVER= -REM find out with 'devcon dp_enum' -set CMI_OEMINF="oem1.inf" Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/interfaces.hpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -28,8 +28,10 @@ #ifndef _INTERFACES_HPP_ #define _INTERFACES_HPP_ +#include <ntddk.h> #include <portcls.h> #include <stdunk.h> +#include <debug.h> #define MAXLEN_DMA_BUFFER 0x18000 #define MAX_OUTPUT_STREAMS 1 @@ -460,4 +462,4 @@ KSNODE_WAVE_INVALID }; -#endif //_INTERFACES_HPP_ +#endif //_INTERFACES_HPP_ Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/make.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/make.bat [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/make.bat (removed) @@ -1,40 +1,0 @@ -@echo off -call envars.bat -if "%DDKBUILDENV%"=="chk" goto :AlreadyDefined -call %CMI_DDKDIR%\bin\setenv %CMI_DDKDIR% chk %CMI_DEBUGARCH% %CMI_DEBUGOS% -:AlreadyDefined -cd %CMI_BUILDDIR% - -if "%CMI_DEBUGARCH%"=="AMD64" goto :x64 -set CMI_DEBUGDIR=objchk_%CMI_DEBUGOS%_%CMI_DEBUGARCH%\i386 -mkdir %CMI_DEBUGDIR% -sed -e "s/CMIVersion/%CMI_VERSION%-dbg/" -e "s/CMIReleaseDate/%CMI_RELEASEDATE%/" CM8738-x32%WAVERTSTR%.INF >%CMI_DEBUGDIR%\CM8738.inf -goto start -:x64 -set CMI_DEBUGDIR=objchk_%CMI_DEBUGOS%_%CMI_DEBUGARCH%\AMD64 -mkdir %CMI_DEBUGDIR% -sed -e "s/CMIVersion/%CMI_VERSION%-dbg/" -e "s/CMIReleaseDate/%CMI_RELEASEDATE%/" CM8738-x64%WAVERTSTR%.inf >%CMI_DEBUGDIR%\CM8738.inf - -:start -del %CMI_DEBUGDIR%\*.obj - -sed -i "s/CMIVERSION.*/CMIVERSION \"%CMI_VERSION%-debug\"/" debug.hpp - -if "%CMI_DEBUGVER%"=="WaveRT" goto :WaveRT -sed -i "s/^#define WAVERT/\/\/#define WAVERT/" debug.hpp -goto next -:WaveRT -sed -i "s/^\/\/#define WAVERT/#define WAVERT/" debug.hpp -:next - -nmake /x errors.err - -if "%CMI_DEBUGVER%"=="WaveRT" goto :WaveRT2 -set WAVERTSTR="" -goto end -:WaveRT2 -set WAVERTSTR="-WAVERT" - -:end -sed -i "s/^cmicpl.*$//g" %CMI_DEBUGDIR%\CM8738.inf -sed -i "s/^CMICONTROL.*$//g" %CMI_DEBUGDIR%\CM8738.inf Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/makefile [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/makefile (removed) @@ -1,6 +1,0 @@ -!if defined(DDK_TARGET_OS) && "$(DDK_TARGET_OS)"!="Win2K" -!INCLUDE $(NTMAKEENV)\makefile.def -!else -!message This project is for Windows XP (or later) only. -!endif - Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.cpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -35,18 +35,18 @@ NTSTATUS CreateMiniportTopologyCMI(PUNKNOWN* Unknown, REFCLSID, PUNKNOWN UnknownOuter, POOL_TYPE PoolType) { - PAGED_CODE(); - ASSERT(Unknown); + //PAGED_CODE(); + //ASSERT(Unknown); STD_CREATE_BODY_(CCMITopology,Unknown,UnknownOuter,PoolType,PMINIPORTTOPOLOGY); } STDMETHODIMP CCMITopology::NonDelegatingQueryInterface(REFIID Interface, PVOID* Object) { - PAGED_CODE(); - ASSERT(Object); + //PAGED_CODE(); + //ASSERT(Object); DBGPRINT(("CCMITopology::NonDelegatingQueryInterface")); - if (IsEqualGUIDAligned(Interface,IID_IUnknown)) { + if (IsEqualGUIDAligned(Interface, IID_IUnknown)) { *Object = PVOID(PUNKNOWN(PMINIPORTTOPOLOGY(this))); } else if (IsEqualGUIDAligned(Interface,IID_IMiniport)) { *Object = PVOID(PMINIPORT(this)); @@ -68,7 +68,7 @@ CCMITopology::~CCMITopology() { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CCMITopology::~CCMITopology")); @@ -82,9 +82,9 @@ STDMETHODIMP CCMITopology::Init(PUNKNOWN UnknownAdapter, PRESOURCELIST ResourceList, PPORTTOPOLOGY Port) { - PAGED_CODE(); - ASSERT(UnknownAdapter); - ASSERT(Port); + //PAGED_CODE(); + //ASSERT(UnknownAdapter); + //ASSERT(Port); DBGPRINT(("CCMITopology::Init")); NTSTATUS ntStatus = UnknownAdapter->QueryInterface(IID_ICMIAdapter, (PVOID *)&CMIAdapter); @@ -111,8 +111,8 @@ STDMETHODIMP CCMITopology::GetDescription(PPCFILTER_DESCRIPTOR* OutFilterDescriptor) { - PAGED_CODE(); - ASSERT(OutFilterDescriptor); + //PAGED_CODE(); + //ASSERT(OutFilterDescriptor); DBGPRINT(("CCMITopology::GetDescription")); *OutFilterDescriptor = &MiniportFilterDescriptor; @@ -122,7 +122,7 @@ STDMETHODIMP CCMITopology::loadMixerSettingsFromRegistry() { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CCMITopology::loadMixerSettingsFromRegistry")); PREGISTRYKEY DriverKey; @@ -269,7 +269,7 @@ STDMETHODIMP CCMITopology::storeMixerSettingsToRegistry() { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CCMITopology::storeMixerSettingsToRegistry")); PREGISTRYKEY DriverKey; @@ -429,7 +429,7 @@ STDMETHODIMP CCMITopology::loadMixerSettingsFromMemory() { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CCMITopology::loadMixerSettingsFromMemory")); CMIAdapter->resetMixer(); @@ -449,7 +449,7 @@ STDMETHODIMP CCMITopology::storeMixerSettingsToMemory() { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CCMITopology::storeMixerSettingsToMemory")); mixer1Register = CMIAdapter->readUInt8(REG_MIXER1); @@ -462,10 +462,10 @@ return STATUS_SUCCESS; } -static NTSTATUS PropertyHandler_OnOff(PPCPROPERTY_REQUEST PropertyRequest) +NTSTATUS NTAPI PropertyHandler_OnOff(PPCPROPERTY_REQUEST PropertyRequest) { - PAGED_CODE(); - ASSERT(PropertyRequest); + //PAGED_CODE(); + //ASSERT(PropertyRequest); DBGPRINT(("[PropertyHandler_OnOff]")); CCMITopology *that = (CCMITopology *) ((PMINIPORTTOPOLOGY) PropertyRequest->MajorTarget); @@ -1013,8 +1013,8 @@ static NTSTATUS BasicSupportHandler(PPCPROPERTY_REQUEST PropertyRequest) { - PAGED_CODE(); - ASSERT(PropertyRequest); + //PAGED_CODE(); + //ASSERT(PropertyRequest); DBGPRINT(("[BasicSupportHandler]")); NTSTATUS ntStatus = STATUS_INVALID_DEVICE_REQUEST; @@ -1081,10 +1081,10 @@ return ntStatus; } -static NTSTATUS PropertyHandler_Level(PPCPROPERTY_REQUEST PropertyRequest) +NTSTATUS NTAPI PropertyHandler_Level(PPCPROPERTY_REQUEST PropertyRequest) { - PAGED_CODE(); - ASSERT(PropertyRequest); + //PAGED_CODE(); + //ASSERT(PropertyRequest); DBGPRINT(("[PropertyHandler_Level]")); CCMITopology *that = (CCMITopology *) ((PMINIPORTTOPOLOGY) PropertyRequest->MajorTarget); @@ -1218,11 +1218,10 @@ return ntStatus; } - -static NTSTATUS PropertyHandler_CpuResources(PPCPROPERTY_REQUEST PropertyRequest) +NTSTATUS NTAPI PropertyHandler_CpuResources(PPCPROPERTY_REQUEST PropertyRequest) { - PAGED_CODE(); - ASSERT(PropertyRequest); + //PAGED_CODE(); + //ASSERT(PropertyRequest); DBGPRINT(("[PropertyHandler_CpuResources]")); NTSTATUS ntStatus = STATUS_INVALID_DEVICE_REQUEST; @@ -1271,10 +1270,10 @@ return ntStatus; } -NTSTATUS PropertyHandler_ComponentId(PPCPROPERTY_REQUEST PropertyRequest) +NTSTATUS NTAPI PropertyHandler_ComponentId(PPCPROPERTY_REQUEST PropertyRequest) { - PAGED_CODE(); - ASSERT(PropertyRequest); + //PAGED_CODE(); + //ASSERT(PropertyRequest); DBGPRINT(("[PropertyHandler_ComponentId]")); NTSTATUS ntStatus = STATUS_INVALID_DEVICE_REQUEST; @@ -1317,10 +1316,10 @@ return ntStatus; } -NTSTATUS PropertyHandler_Private(PPCPROPERTY_REQUEST PropertyRequest) +NTSTATUS NTAPI PropertyHandler_Private(PPCPROPERTY_REQUEST PropertyRequest) { - PAGED_CODE(); - ASSERT(PropertyRequest); + //PAGED_CODE(); + //ASSERT(PropertyRequest); DBGPRINT(("[PropertyHandler_Private]")); NTSTATUS ntStatus = STATUS_INVALID_DEVICE_REQUEST; @@ -1347,8 +1346,8 @@ #endif cmiData->hardwareRevision = that->cm->chipVersion; cmiData->maxChannels = that->cm->maxChannels; - cmiData->IOBase = (USHORT)that->cm->IOBase; - cmiData->MPUBase = (USHORT)that->cm->MPUBase; + cmiData->IOBase = (USHORT)(ULONG_PTR)that->cm->IOBase; + cmiData->MPUBase = (USHORT)(ULONG_PTR)that->cm->MPUBase; cmiData->enableSPDO = that->cm->enableSPDIFOut; cmiData->enableSPDI = that->cm->enableSPDIFIn; cmiData->formatMask = that->cm->formatMask; Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopo.hpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -80,14 +80,14 @@ ); //friends - friend NTSTATUS PropertyHandler_OnOff(PPCPROPERTY_REQUEST PropertyRequest); - friend NTSTATUS PropertyHandler_Level(PPCPROPERTY_REQUEST PropertyRequest); - friend NTSTATUS PropertyHandler_CpuResources(PPCPROPERTY_REQUEST PropertyRequest); - friend NTSTATUS PropertyHandler_ComponentId(PPCPROPERTY_REQUEST PropertyRequest); - friend NTSTATUS PropertyHandler_Private(PPCPROPERTY_REQUEST PropertyRequest); - friend NTSTATUS PropertyHandler_Mux(PPCPROPERTY_REQUEST PropertyRequest); + friend NTSTATUS NTAPI PropertyHandler_OnOff(PPCPROPERTY_REQUEST PropertyRequest); + friend NTSTATUS NTAPI PropertyHandler_Level(PPCPROPERTY_REQUEST PropertyRequest); + friend NTSTATUS NTAPI PropertyHandler_CpuResources(PPCPROPERTY_REQUEST PropertyRequest); + friend NTSTATUS NTAPI PropertyHandler_ComponentId(PPCPROPERTY_REQUEST PropertyRequest); + friend NTSTATUS NTAPI PropertyHandler_Private(PPCPROPERTY_REQUEST PropertyRequest); + friend NTSTATUS NTAPI PropertyHandler_Mux(PPCPROPERTY_REQUEST PropertyRequest); - static NTSTATUS EventHandler(PPCEVENT_REQUEST EventRequest); + static NTSTATUS NTAPI EventHandler(PPCEVENT_REQUEST EventRequest); }; #endif //_MINTOPO_HPP_ Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/mintopotables.hpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -37,6 +37,11 @@ #define KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF) #endif +NTSTATUS NTAPI PropertyHandler_Level(PPCPROPERTY_REQUEST PropertyRequest); +NTSTATUS NTAPI PropertyHandler_CpuResources(PPCPROPERTY_REQUEST PropertyRequest); +NTSTATUS NTAPI PropertyHandler_OnOff(PPCPROPERTY_REQUEST PropertyRequest); +NTSTATUS NTAPI PropertyHandler_ComponentId(PPCPROPERTY_REQUEST PropertyRequest); +NTSTATUS NTAPI PropertyHandler_Private(PPCPROPERTY_REQUEST PropertyRequest); static KSDATARANGE PinDataRangesBridge[] = { @@ -292,15 +297,16 @@ &KSPROPSETID_Audio, KSPROPERTY_AUDIO_VOLUMELEVEL, KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_BASICSUPPORT, - PropertyHandler_Level + (PCPFNPROPERTY_HANDLER)PropertyHandler_Level }, { &KSPROPSETID_Audio, KSPROPERTY_AUDIO_CPU_RESOURCES, KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_BASICSUPPORT, - PropertyHandler_CpuResources + (PCPFNPROPERTY_HANDLER)PropertyHandler_CpuResources } }; + DEFINE_PCAUTOMATION_TABLE_PROP(AutomationVolume,PropertiesVolume); static PCPROPERTY_ITEM PropertiesLoudness[] = @@ -309,13 +315,13 @@ &KSPROPSETID_Audio, KSPROPERTY_AUDIO_LOUDNESS, KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_BASICSUPPORT, - PropertyHandler_OnOff + (PCPFNPROPERTY_HANDLER)PropertyHandler_OnOff }, { &KSPROPSETID_Audio, KSPROPERTY_AUDIO_CPU_RESOURCES, KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_BASICSUPPORT, - PropertyHandler_CpuResources + (PCPFNPROPERTY_HANDLER)PropertyHandler_CpuResources } }; DEFINE_PCAUTOMATION_TABLE_PROP(AutomationLoudness,PropertiesLoudness); @@ -326,13 +332,13 @@ &KSPROPSETID_Audio, KSPROPERTY_AUDIO_MUTE, KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_SET | KSPROPERTY_TYPE_BASICSUPPORT, - PropertyHandler_OnOff + (PCPFNPROPERTY_HANDLER)PropertyHandler_OnOff }, { &KSPROPSETID_Audio, KSPROPERTY_AUDIO_CPU_RESOURCES, KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_BASICSUPPORT, - PropertyHandler_CpuResources + (PCPFNPROPERTY_HANDLER)PropertyHandler_CpuResources } }; DEFINE_PCAUTOMATION_TABLE_PROP(AutomationMute,PropertiesMute); @@ -343,19 +349,19 @@ &KSPROPSETID_General, KSPROPERTY_GENERAL_COMPONENTID, KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_BASICSUPPORT, - PropertyHandler_ComponentId + (PCPFNPROPERTY_HANDLER)PropertyHandler_ComponentId }, { &KSPROPSETID_CMI, KSPROPERTY_CMI_GET, KSPROPERTY_TYPE_GET, - PropertyHandler_Private + (PCPFNPROPERTY_HANDLER)PropertyHandler_Private }, { &KSPROPSETID_CMI, KSPROPERTY_CMI_SET, KSPROPERTY_TYPE_SET, - PropertyHandler_Private + (PCPFNPROPERTY_HANDLER)PropertyHandler_Private } }; DEFINE_PCAUTOMATION_TABLE_PROP(AutomationFilter,PropertiesFilter); Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.cpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -33,8 +33,8 @@ NTSTATUS CreateMiniportWaveCMI(PUNKNOWN *Unknown, REFCLSID, PUNKNOWN UnknownOuter, POOL_TYPE PoolType) { - PAGED_CODE(); - ASSERT(Unknown); + //PAGED_CODE(); + //ASSERT(Unknown); #ifdef WAVERT STD_CREATE_BODY_(CMiniportWaveCMI,Unknown,UnknownOuter,PoolType,PMINIPORTWAVERT); #else @@ -44,8 +44,8 @@ NTSTATUS CMiniportWaveCMI::processResources(PRESOURCELIST resourceList) { - PAGED_CODE(); - ASSERT (resourceList); + //PAGED_CODE(); + //ASSERT (resourceList); DBGPRINT(("CMiniportWaveCMI[%p]::ProcessResources(%p)", this, resourceList)); if (resourceList->NumberOfInterrupts() < 1) { @@ -58,8 +58,8 @@ #ifndef WAVERT NTSTATUS CMiniportWaveCMI::newDMAChannel(PDMACHANNEL *dmaChannel, UInt32 bufferLength) { - PAGED_CODE(); - ASSERT(dmaChannel); + //PAGED_CODE(); + //ASSERT(dmaChannel); DBGPRINT(("CMiniportWaveCMI[%p]::newDMAChannel(%p)", this, dmaChannel)); NTSTATUS ntStatus; @@ -79,8 +79,8 @@ //generic crap STDMETHODIMP CMiniportWaveCMI::NonDelegatingQueryInterface(REFIID Interface, PVOID *Object) { - PAGED_CODE(); - ASSERT(Object); + //PAGED_CODE(); + //ASSERT(Object); DBGPRINT(("CMiniportWaveCMI[%p]::NonDelegatingQueryInterface")); if (IsEqualGUIDAligned(Interface,IID_IUnknown)) { @@ -113,7 +113,7 @@ CMiniportWaveCMI::~CMiniportWaveCMI(void) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveCMI[%p]::~CMiniportWaveCMI", this)); storeChannelConfigToRegistry(); //or not. during system shutdown, this doesn't seem to work. @@ -149,11 +149,11 @@ STDMETHODIMP CMiniportWaveCMI::Init(PUNKNOWN UnknownAdapter, PRESOURCELIST ResourceList, PPORTWAVECYCLIC Port_) #endif { - PAGED_CODE(); - - ASSERT(UnknownAdapter); - ASSERT(ResourceList); - ASSERT(Port_); + //PAGED_CODE(); + + //ASSERT(UnknownAdapter); + //ASSERT(ResourceList); + //ASSERT(Port_); DBGPRINT(("CMiniportWaveCMI[%p]::Init(%p, %p, %p)", this, UnknownAdapter, ResourceList, Port_)); @@ -201,8 +201,8 @@ #ifdef WAVERT STDMETHODIMP_(NTSTATUS) CMiniportWaveCMI::GetDeviceDescription(PDEVICE_DESCRIPTION OutDeviceDescriptor) { - PAGED_CODE(); - ASSERT(OutDeviceDescriptor); + //PAGED_CODE(); + //ASSERT(OutDeviceDescriptor); DBGPRINT(("CMiniportWaveCMI[%p]::GetDeviceDescription(%p)", this, OutDeviceDescriptor)); RtlZeroMemory(OutDeviceDescriptor, sizeof(DEVICE_DESCRIPTION)); @@ -218,8 +218,8 @@ STDMETHODIMP CMiniportWaveCMI::GetDescription(PPCFILTER_DESCRIPTOR *OutFilterDescriptor) { - PAGED_CODE(); - ASSERT(OutFilterDescriptor); + //PAGED_CODE(); + //ASSERT(OutFilterDescriptor); DBGPRINT(("CMiniportWaveCMI[%p]::GetDescription(%p)", this, OutFilterDescriptor)); *OutFilterDescriptor = &WaveMiniportFilterDescriptor; @@ -229,7 +229,7 @@ NTSTATUS CMiniportWaveCMI::loadChannelConfigFromRegistry() { - PAGED_CODE(); + //PAGED_CODE(); PREGISTRYKEY DriverKey; PREGISTRYKEY SettingsKey; UNICODE_STRING KeyName; @@ -291,7 +291,7 @@ NTSTATUS CMiniportWaveCMI::storeChannelConfigToRegistry() { - PAGED_CODE(); + //PAGED_CODE(); PREGISTRYKEY DriverKey; PREGISTRYKEY SettingsKey; UNICODE_STRING KeyName; @@ -339,7 +339,7 @@ STDMETHODIMP_(void) CMiniportWaveCMI::powerUp(void) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveCMI[%p]::powerUp()", this)); KSSTATE oldState[3]; @@ -365,7 +365,7 @@ STDMETHODIMP_(void) CMiniportWaveCMI::powerDown(void) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveCMI[%p]::powerDown()", this)); if (cm->TopoMiniport) { @@ -377,8 +377,8 @@ NTSTATUS CMiniportWaveCMI::isFormatAllowed(UInt32 sampleRate, BOOLEAN multiChan, BOOLEAN AC3) { - PAGED_CODE(); - ASSERT(sampleRate); + //PAGED_CODE(); + //ASSERT(sampleRate); DBGPRINT(("CMiniportWaveCMI[%p]::isFormatAllowed(%d, %d, %d)", this, sampleRate, multiChan, AC3)); if (multiChan) { @@ -410,8 +410,8 @@ NTSTATUS CMiniportWaveCMI::validateFormat(PKSDATAFORMAT format, ULONG PinID, BOOLEAN capture) { - PAGED_CODE(); - ASSERT(format); + //PAGED_CODE(); + //ASSERT(format); DBGPRINT(("CMiniportWaveCMI[%p]::validateFormat(%p, %d, %d)", this, format, PinID, capture)); PWAVEFORMATEX waveFormat = PWAVEFORMATEX(format + 1); @@ -468,7 +468,7 @@ // Tests a data range intersection STDMETHODIMP CMiniportWaveCMI::DataRangeIntersection(ULONG PinId, PKSDATARANGE ClientDataRange, PKSDATARANGE MyDataRange, ULONG OutputBufferLength, PVOID ResultantFormat, PULONG ResultantFormatLength) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveCMI[%p]::DataRangeIntersection(%d, %p, %p, %d, %p, %p)", this, PinId, ClientDataRange, MyDataRange, OutputBufferLength, ResultantFormat, ResultantFormatLength)); if (PinId == PIN_WAVE_AC3_RENDER_SINK) { @@ -722,14 +722,14 @@ STDMETHODIMP CMiniportWaveCMI::NewStream(PMINIPORTWAVECYCLICSTREAM *OutStream, PUNKNOWN OuterUnknown, POOL_TYPE PoolType, ULONG PinID, BOOLEAN Capture, PKSDATAFORMAT DataFormat, PDMACHANNEL* OutDmaChannel, PSERVICEGROUP* OutServiceGroup) #endif { - PAGED_CODE(); - ASSERT(OutStream); - ASSERT(DataFormat); + //PAGED_CODE(); + //ASSERT(OutStream); + //ASSERT(DataFormat); #ifdef WAVERT DBGPRINT(("CMiniportWaveCMI[%p]::NewStream(%p, %p, %d, %d, %p)", this, OutStream, OuterUnknown, PinID, Capture, DataFormat)); #else - ASSERT(OutDmaChannel); - ASSERT(OutServiceGroup); + //ASSERT(OutDmaChannel); + //ASSERT(OutServiceGroup); DBGPRINT(("CMiniportWaveCMI[%p]::NewStream(%p, %p, %p, %d, %d, %p, %p, %p)", this, OutStream, OuterUnknown, PoolType, PinID, Capture, DataFormat, OutDmaChannel, OutServiceGroup)); #endif @@ -820,10 +820,10 @@ return ntStatus; } -static NTSTATUS PropertyHandler_ChannelConfig(PPCPROPERTY_REQUEST PropertyRequest) -{ - PAGED_CODE(); - ASSERT(PropertyRequest); +NTSTATUS NTAPI PropertyHandler_ChannelConfig(PPCPROPERTY_REQUEST PropertyRequest) +{ + //PAGED_CODE(); + //ASSERT(PropertyRequest); DBGPRINT(("[PropertyHandler_ChannelConfig]")); #ifdef WAVERT @@ -881,7 +881,7 @@ NTSTATUS CreateMiniportWaveStreamCMI(CMiniportWaveStreamCMI **MiniportWaveStreamCMI, PUNKNOWN pUnknownOuter, POOL_TYPE PoolType) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CreateMiniportWaveStreamCMI")); #ifdef WAVERT @@ -899,7 +899,7 @@ NTSTATUS CMiniportWaveStreamCMI::prepareStream() { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::prepareStream()", this)); DBGPRINT(("---streamIndex: %d, channelNumber: %d", streamIndex, channelNumber)); @@ -982,7 +982,7 @@ NTSTATUS CMiniportWaveStreamCMI::setDACChannels() { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::setDACChannels()", this)); NTSTATUS ntStatus = STATUS_SUCCESS; @@ -1046,7 +1046,7 @@ NTSTATUS CMiniportWaveStreamCMI::setupSPDIFPlayback(bool enableSPDIF) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::setupSPDIFPlayback(%d)", this, enableSPDIF)); NTSTATUS ntStatus; @@ -1115,7 +1115,7 @@ NTSTATUS CMiniportWaveStreamCMI::setupAC3Passthru() { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::setupAC3Passthru()")); if (enableAC3Passthru) { @@ -1177,7 +1177,7 @@ CMiniportWaveStreamCMI::~CMiniportWaveStreamCMI(void) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::~CMiniportWaveStreamCMI", this)); @@ -1217,8 +1217,8 @@ STDMETHODIMP CMiniportWaveStreamCMI::NonDelegatingQueryInterface(REFIID Interface, PVOID *Object) { - PAGED_CODE(); - ASSERT(Object); + //PAGED_CODE(); + //ASSERT(Object); DBGPRINT(("CMiniportWaveStreamCMI[%p]::NonDelegatingQueryInterface(%p, %p)", this, Interface, Object)); if (IsEqualGUIDAligned(Interface,IID_IUnknown)) { @@ -1250,14 +1250,14 @@ NTSTATUS CMiniportWaveStreamCMI::Init(CMiniportWaveCMI* Miniport_, UInt32 streamIndex_, bool isCaptureStream_, PKSDATAFORMAT DataFormat, PDMACHANNEL DMAChannel_, PSERVICEGROUP* OutServiceGroup) #endif { - PAGED_CODE(); - ASSERT(Miniport_); - ASSERT(DataFormat); + //PAGED_CODE(); + //ASSERT(Miniport_); + //ASSERT(DataFormat); NTSTATUS ntStatus; #ifdef WAVERT - ASSERT(Port_); + //ASSERT(Port_); DBGPRINT(("CMiniportWaveStreamCMI[%p]::Init(%p, %d, %d, %p, %p)", this, Miniport_, streamIndex_, isCaptureStream_, DataFormat, Port_)); Port = Port_; Port->AddRef(); @@ -1303,7 +1303,7 @@ NTSTATUS CMiniportWaveStreamCMI::SetFormat(PKSDATAFORMAT Format) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::SetFormat(%p)", this, Format)); PWAVEFORMATEX waveFormat = PWAVEFORMATEX(Format + 1); NTSTATUS ntStatus = Miniport->validateFormat(Format, -1, isCaptureStream); @@ -1344,7 +1344,7 @@ // DRM crap - we're supposed to disable every digital interface here STDMETHODIMP_(NTSTATUS) CMiniportWaveStreamCMI::SetContentId(ULONG contentId, PCDRMRIGHTS drmRights) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::SetContentId(%d, %p)", this, contentId, drmRights)); return STATUS_SUCCESS; @@ -1354,7 +1354,7 @@ STDMETHODIMP_(NTSTATUS) CMiniportWaveStreamCMI::AllocateAudioBuffer(ULONG size, PMDL *userModeBuffer, ULONG *bufferSize, ULONG *bufferOffset, MEMORY_CACHING_TYPE *cacheType) { - PAGED_CODE(); + //PAGED_CODE(); PHYSICAL_ADDRESS low; PHYSICAL_ADDRESS high; @@ -1393,7 +1393,7 @@ STDMETHODIMP_(VOID) CMiniportWaveStreamCMI::FreeAudioBuffer(PMDL Mdl, ULONG Size) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::FreeAudioBuffer(%p, %x)", this, Mdl, Size)); Port->FreePagesFromMdl(Mdl); @@ -1403,7 +1403,7 @@ } STDMETHODIMP_(void) CMiniportWaveStreamCMI::GetHWLatency(PKSRTAUDIO_HWLATENCY hwLatency) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::GetHWLatency(%p)", this, hwLatency)); hwLatency->FifoSize = 32; hwLatency->ChipsetDelay = 0; @@ -1412,7 +1412,7 @@ STDMETHODIMP_(NTSTATUS) CMiniportWaveStreamCMI::GetPositionRegister(PKSRTAUDIO_HWREGISTER hwRegister) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::GetPositionRegister(%p)", this, hwRegister)); return STATUS_UNSUCCESSFUL; @@ -1420,7 +1420,7 @@ STDMETHODIMP_(NTSTATUS) CMiniportWaveStreamCMI::GetClockRegister(PKSRTAUDIO_HWREGISTER hwRegister) { - PAGED_CODE(); + //PAGED_CODE(); DBGPRINT(("CMiniportWaveStreamCMI[%p]::GetClockRegister(%p)", this, hwRegister)); return STATUS_UNSUCCESSFUL; @@ -1578,7 +1578,7 @@ #ifdef WAVERT STDMETHODIMP CMiniportWaveStreamCMI::GetPosition(PKSAUDIO_POSITION Position) { - ASSERT(Position); + //ASSERT(Position); UInt32 reg; @@ -1597,7 +1597,7 @@ #else //WaveCyclic STDMETHODIMP CMiniportWaveStreamCMI::GetPosition(PULONG Position) { - ASSERT(Position); + //ASSERT(Position); UInt32 reg; Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwave.hpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -85,7 +85,7 @@ STDMETHODIMP_(void) powerUp(); STDMETHODIMP_(void) powerDown(); - friend NTSTATUS PropertyHandler_ChannelConfig(PPCPROPERTY_REQUEST PropertyRequest); + friend NTSTATUS NTAPI PropertyHandler_ChannelConfig(PPCPROPERTY_REQUEST PropertyRequest); friend class CMiniportWaveStreamCMI; }; Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/minwavetables.hpp [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -33,6 +33,9 @@ DEFINE_GUIDSTRUCT("00000092-0000-0010-8000-00aa00389b71", KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF); #define KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_DOLBY_AC3_SPDIF) +NTSTATUS NTAPI PropertyHandler_ChannelConfig(PPCPROPERTY_REQUEST PropertyRequest); + + static KSDATARANGE_AUDIO WavePinDataRangesPCMStream[] = { { @@ -274,7 +277,7 @@ &KSPROPSETID_Audio, KSPROPERTY_AUDIO_CHANNEL_CONFIG, KSPROPERTY_TYPE_BASICSUPPORT | KSPROPERTY_TYPE_GET | KSPROPERTY_TYPE_SET, - PropertyHandler_ChannelConfig + (PCPFNPROPERTY_HANDLER)PropertyHandler_ChannelConfig } }; DEFINE_PCAUTOMATION_TABLE_PROP(AutomationChans,PropertiesChannels); Modified: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/property.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/property.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/property.h [iso-8859-1] Sun Mar 1 17:29:57 2009 @@ -83,4 +83,4 @@ UInt32 enableSPDI; } CMIDATA; -#endif //_PROPERTY_H_ +#endif //_PROPERTY_H_ Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/sources URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/sources [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/sources (removed) @@ -1,20 +1,0 @@ -TARGETNAME=cmipci -TARGETTYPE=DRIVER -TARGETPATH=obj - -TARGETLIBS= $(DDK_LIB_PATH)\portcls.lib \ - $(DDK_LIB_PATH)\stdunk.lib \ - $(SDK_LIB_PATH)\libcntpr.lib \ - $(DDK_LIB_PATH)\ntstrsafe.lib - -INCLUDES= - -MSC_WARNING_LEVEL=-WX - -C_DEFINES= $(C_DEFINES) -D_WIN32 -DUNICODE -D_UNICODE -DDEBUG_LEVEL=DEBUGLVL_TERSE - -SOURCES = adapter.cpp \ - common.cpp \ - mintopo.cpp \ - minwave.cpp \ - cmipci.rc Removed: trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/update.bat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/update.bat [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/CMIDriver/update.bat (removed) @@ -1,12 +1,0 @@ -@echo off -call envars.bat -if "%CMI_DEBUGARCH%"=="AMD64" goto :x64 -set CMI_DEBUGDIR=objchk_%CMI_DEBUGOS%_%CMI_DEBUGARCH%\i386 -goto start -:x64 -set CMI_DEBUGDIR=objchk_%CMI_DEBUGOS%_%CMI_DEBUGARCH%\AMD64 -:start -devcon remove "PCI\VEN_13F6&DEV_0111&SUBSYS_011113F6&REV_10" -devcon dp_delete %CMI_OEMINF% -devcon rescan -devcon update %CMI_DEBUGDIR%\CM8738.INF "PCI\VEN_13F6&DEV_0111&SUBSYS_011113F6&REV_10"

1 0

[dchapyshev] 39826: - Full path to mci*.dll is unneeded - Add system.ini
by dchapyshev＠svn.reactos.org 01 Mar '09

01 Mar '09

Author: dchapyshev Date: Sun Mar 1 17:16:14 2009 New Revision: 39826 URL: http://svn.reactos.org/svn/reactos?rev=39826&view=rev Log: - Full path to mci*.dll is unneeded - Add system.ini Added: trunk/reactos/media/ini/ (with props) trunk/reactos/media/ini/system.ini (with props) Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_arm.inf [iso-8859-1] Sun Mar 1 17:16:14 2009 @@ -67,10 +67,10 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","vidc.mrle",0x00000000,"c:\reactos\system32\msrle32.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","vidc.msvc",0x00000000,"c:\reactos\system32\msvidc32.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","AVIVideo",0x00000002,"c:\reactos\system32\mciavi32.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","CDAudio",0x00000002,"c:\reactos\system32\mcicda.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","Sequencer",0x00000002,"c:\reactos\system32\mciseq.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","WaveAudio",0x00000002,"c:\reactos\system32\mciwave.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","AVIVideo",0x00000002,"mciavi32.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","CDAudio",0x00000002,"mcicda.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","Sequencer",0x00000002,"mciseq.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","WaveAudio",0x00000002,"mciwave.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI Extensions","avi",0x00000002,"avivideo" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI Extensions","cda",0x00000002,"CDAudio" Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Sun Mar 1 17:16:14 2009 @@ -72,10 +72,10 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","vidc.mrle",0x00000000,"c:\reactos\system32\msrle32.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Drivers32","vidc.msvc",0x00000000,"c:\reactos\system32\msvidc32.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","AVIVideo",0x00000002,"c:\reactos\system32\mciavi32.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","CDAudio",0x00000002,"c:\reactos\system32\mcicda.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","Sequencer",0x00000002,"c:\reactos\system32\mciseq.dll" -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","WaveAudio",0x00000002,"c:\reactos\system32\mciwave.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","AVIVideo",0x00000002,"mciavi32.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","CDAudio",0x00000002,"mcicda.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","Sequencer",0x00000002,"mciseq.dll" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI32","WaveAudio",0x00000002,"mciwave.dll" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI Extensions","avi",0x00000002,"avivideo" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\MCI Extensions","cda",0x00000002,"CDAudio" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Mar 1 17:16:14 2009 @@ -597,6 +597,9 @@ media\inf\usbstor.inf 6 media\inf\xboxdisp.inf 6 +; Ini Files +media\ini\system.ini 4 + ; Subsystems subsystems\win32\csrss\csrss.exe 1 subsystems\win32\csrss\win32csr\win32csr.dll 1 Propchange: trunk/reactos/media/ini/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Mar 1 17:16:14 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/media/ini/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/media/ini/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/media/ini/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/media/ini/system.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/ini/system.ini?rev=3… ============================================================================== --- trunk/reactos/media/ini/system.ini (added) +++ trunk/reactos/media/ini/system.ini [iso-8859-1] Sun Mar 1 17:16:14 2009 @@ -1,0 +1,19 @@ +[driver32] +msacm.imaadpcm=imaadp32.acm +msacm.msadpcm=msadp32.acm +msacm.msg711=msg711.acm +msacm.winemp3=winemp3.acm +vidc.mrle=msrle32.dll +vidc.msvc=msvidc32.dll +vidc.cvid=iccvid.dll + +[mci] +MPEGVideo=mciqtz.drv +MPEGVideo2=mciqtz.drv +AVIVideo=mciavi32.dll +CDAudio=mcicda.dll +Sequencer=mciseq.dll +vcr=mcivisca.drv +WaveAudio=mciwave.dll + +[386enh] Propchange: trunk/reactos/media/ini/system.ini ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dchapyshev] 39825: - Add iccvid, imaadp32.acm, msadp32.acm, msg711.acm, msvidc32 from Wine
by dchapyshev＠svn.reactos.org 01 Mar '09

01 Mar '09

Author: dchapyshev Date: Sun Mar 1 16:42:09 2009 New Revision: 39825 URL: http://svn.reactos.org/svn/reactos?rev=39825&view=rev Log: - Add iccvid, imaadp32.acm, msadp32.acm, msg711.acm, msvidc32 from Wine Added: trunk/reactos/dll/win32/iccvid/ (with props) trunk/reactos/dll/win32/iccvid/iccvid.c (with props) trunk/reactos/dll/win32/iccvid/iccvid.rbuild (with props) trunk/reactos/dll/win32/iccvid/iccvid.spec (with props) trunk/reactos/dll/win32/iccvid/iccvid_Da.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_De.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_En.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Fr.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Hu.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Ko.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Nl.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_No.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Pl.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Pt.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Ro.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Ru.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Si.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Sv.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_Tr.rc (with props) trunk/reactos/dll/win32/iccvid/iccvid_private.h (with props) trunk/reactos/dll/win32/iccvid/rsrc.rc (with props) trunk/reactos/dll/win32/imaadp32.acm/ (with props) trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild (with props) trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.spec (with props) trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c (with props) trunk/reactos/dll/win32/msadp32.acm/ (with props) trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild (with props) trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.spec (with props) trunk/reactos/dll/win32/msadp32.acm/msadp32.c (with props) trunk/reactos/dll/win32/msg711.acm/ (with props) trunk/reactos/dll/win32/msg711.acm/msg711.acm.rbuild (with props) trunk/reactos/dll/win32/msg711.acm/msg711.acm.spec (with props) trunk/reactos/dll/win32/msg711.acm/msg711.c (with props) trunk/reactos/dll/win32/msvidc32/ (with props) trunk/reactos/dll/win32/msvidc32/msvidc32.rbuild (with props) trunk/reactos/dll/win32/msvidc32/msvidc32.spec (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Da.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_De.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_En.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Fr.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Hu.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Ko.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Nl.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_No.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Pl.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Pt.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Ro.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Ru.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Si.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Sv.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_Tr.rc (with props) trunk/reactos/dll/win32/msvidc32/msvidc32_private.h (with props) trunk/reactos/dll/win32/msvidc32/msvideo1.c (with props) trunk/reactos/dll/win32/msvidc32/rsrc.rc (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/hivesft_arm.inf trunk/reactos/boot/bootdata/hivesft_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=398… Modified: trunk/reactos/boot/bootdata/hivesft_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_arm.… Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Added: trunk/reactos/dll/win32/iccvid/iccvid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.c?… Added: trunk/reactos/dll/win32/iccvid/iccvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.rb… Added: trunk/reactos/dll/win32/iccvid/iccvid.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid.sp… Added: trunk/reactos/dll/win32/iccvid/iccvid_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Da… Added: trunk/reactos/dll/win32/iccvid/iccvid_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_De… Added: trunk/reactos/dll/win32/iccvid/iccvid_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_En… Added: trunk/reactos/dll/win32/iccvid/iccvid_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Fr… Added: trunk/reactos/dll/win32/iccvid/iccvid_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Hu… Added: trunk/reactos/dll/win32/iccvid/iccvid_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Ko… Added: trunk/reactos/dll/win32/iccvid/iccvid_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Nl… Added: trunk/reactos/dll/win32/iccvid/iccvid_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_No… Added: trunk/reactos/dll/win32/iccvid/iccvid_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Pl… Added: trunk/reactos/dll/win32/iccvid/iccvid_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Pt… Added: trunk/reactos/dll/win32/iccvid/iccvid_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Ro… Added: trunk/reactos/dll/win32/iccvid/iccvid_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Ru… Added: trunk/reactos/dll/win32/iccvid/iccvid_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Si… Added: trunk/reactos/dll/win32/iccvid/iccvid_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Sv… Added: trunk/reactos/dll/win32/iccvid/iccvid_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_Tr… Added: trunk/reactos/dll/win32/iccvid/iccvid_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/iccvid_pr… Added: trunk/reactos/dll/win32/iccvid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iccvid/rsrc.rc?r… Added: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima… Added: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima… Added: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima… Added: trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… Added: trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… Added: trunk/reactos/dll/win32/msadp32.acm/msadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… Added: trunk/reactos/dll/win32/msg711.acm/msg711.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71… Added: trunk/reactos/dll/win32/msg711.acm/msg711.acm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71… Added: trunk/reactos/dll/win32/msg711.acm/msg711.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71… Added: trunk/reactos/dll/win32/msvidc32/msvidc32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvidc32_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvidc3… Added: trunk/reactos/dll/win32/msvidc32/msvideo1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/msvideo… Added: trunk/reactos/dll/win32/msvidc32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvidc32/rsrc.rc… Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[janderwald] 39824: - Disable ASSERTMSG macro to fix compilation - Fix definition of PCPROPERTY_REQUEST
by janderwald＠svn.reactos.org 01 Mar '09

01 Mar '09

Author: janderwald Date: Sun Mar 1 16:10:33 2009 New Revision: 39824 URL: http://svn.reactos.org/svn/reactos?rev=39824&view=rev Log: - Disable ASSERTMSG macro to fix compilation - Fix definition of PCPROPERTY_REQUEST Modified: trunk/reactos/include/ddk/ntstrsafe.h trunk/reactos/include/ddk/portcls.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Sun Mar 1 16:10:33 2009 @@ -104,7 +104,7 @@ IN SIZE_T MaxLength, IN DWORD Flags) { - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); return RtlStringValidateDestA(*Destination, *DestinationLength, ReturnLength, @@ -120,7 +120,7 @@ IN DWORD Flags) { NTSTATUS Status = STATUS_SUCCESS; - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); if ((ReturnLength) && (*ReturnLength >= MaxLength)) { @@ -251,7 +251,7 @@ SIZE_T CharLength = Length / sizeof(CHAR), Remaining, LocalNewLength = 0; PCHAR LocalDestinationEnd; va_list argList; - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); Status = RtlStringExValidateDestA(&Destination, &CharLength, @@ -330,7 +330,7 @@ NTSTATUS Status; SIZE_T CharLength = Length / sizeof(CHAR), Copied = 0, Remaining; PCHAR LocalDestinationEnd; - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); Status = RtlStringExValidateDestA(&Destination, &Length, @@ -421,7 +421,7 @@ SIZE_T CharLength = Length / sizeof(CHAR); SIZE_T DestinationLength, Remaining, Copied = 0; PCHAR LocalDestinationEnd; - ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + //ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); Status = RtlStringExValidateDestA(&Destination, &CharLength, Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Sun Mar 1 16:10:33 2009 @@ -265,7 +265,7 @@ PCPROPERTY_ITEM, *PPCPROPERTY_ITEM; -typedef struct _PCPROPERTY_REQUEST +struct _PCPROPERTY_REQUEST { PUNKNOWN MajorTarget; PUNKNOWN MinorTarget; @@ -277,7 +277,7 @@ ULONG ValueSize; PVOID Value; PIRP Irp; -}PCPROPERTY_REQUEST, *PPCPROPERTY_REQUEST; +}; struct _PCEVENT_REQUEST; @@ -1458,7 +1458,7 @@ IN PUNKNOWN OuterUnknown OPTIONAL, IN POOL_TYPE PoolType, IN ULONG Pin, - IN BOOL Capture, + IN BOOLEAN Capture, IN PKSDATAFORMAT DataFormat, OUT PDMACHANNEL *DmaChannel, OUT PSERVICEGROUP *ServiceGroup) PURE;

1 0

[spetreolle] 39823: Recode rosapps French files from UTF-8 to CP-1252.
by spetreolle＠svn.reactos.org 01 Mar '09

01 Mar '09

Author: spetreolle Date: Sun Mar 1 15:47:18 2009 New Revision: 39823 URL: http://svn.reactos.org/svn/reactos?rev=39823&view=rev Log: Recode rosapps French files from UTF-8 to CP-1252. Modified: trunk/rosapps/applications/devutils/zoomin/lang/fr-FR.rc trunk/rosapps/applications/screensavers/circles/lang/fr-FR.rc trunk/rosapps/applications/screensavers/mazescr/lang/fr-FR.rc trunk/rosapps/applications/write/lang/fr-FR.rc Modified: trunk/rosapps/applications/devutils/zoomin/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/zoomin/lang/fr-FR.rc [iso-8859-1] Sun Mar 1 15:47:18 2009 @@ -27,14 +27,14 @@ BEGIN MENUITEM "Quitter\tAlt-F4", ID_EDIT_EXIT END - POPUP "&Ãdition" + POPUP "&Édition" BEGIN MENUITEM "&Copier\tCtrl+C", ID_EDIT_COPY, GRAYED - MENUITEM "&RafraÃ®chir\tF5", ID_EDIT_REFRESH + MENUITEM "&Rafraîchir\tF5", ID_EDIT_REFRESH END POPUP "&Options" BEGIN - MENUITEM "Taux de &rafraÃ®chissement...", ID_OPTIONS_REFRESH_RATE, GRAYED + MENUITEM "Taux de &rafraîchissement...", ID_OPTIONS_REFRESH_RATE, GRAYED END POPUP "Aide" BEGIN Modified: trunk/rosapps/applications/screensavers/circles/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/lang/fr-FR.rc [iso-8859-1] Sun Mar 1 15:47:18 2009 @@ -3,5 +3,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_DESCRIPTION "Cercles" - IDS_TEXT "Il n'y a aucune option Ã dÃ©finir." + IDS_TEXT "Il n'y a aucune option à définir." END Modified: trunk/rosapps/applications/screensavers/mazescr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/lang/fr-FR.rc [iso-8859-1] Sun Mar 1 15:47:18 2009 @@ -2,7 +2,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Ãcran de veille labyrinthe" - IDS_TITLE "Ã propos de" - IDS_TEXT "Il n'y a aucune option Ã dÃ©finir." + IDS_DESCRIPTION "Écran de veille labyrinthe" + IDS_TITLE "À propos de" + IDS_TEXT "Il n'y a aucune option à définir." END Modified: trunk/rosapps/applications/write/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/lang/fr… ============================================================================== --- trunk/rosapps/applications/write/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/write/lang/fr-FR.rc [iso-8859-1] Sun Mar 1 15:47:18 2009 @@ -17,13 +17,10 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#pragma code_page(65001) LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { - IDS_FAILED, "Wordpad n'a pas pu Ãªtre dÃ©marrÃ©" + IDS_FAILED, "Wordpad n'a pas pu être démarré" } - -#pragma code_page(default)

1 0

[janderwald] 39822: - Add missing guids, interfaces, structs to get CMIDriver compile
by janderwald＠svn.reactos.org 01 Mar '09

01 Mar '09

Author: janderwald Date: Sun Mar 1 15:45:32 2009 New Revision: 39822 URL: http://svn.reactos.org/svn/reactos?rev=39822&view=rev Log: - Add missing guids, interfaces, structs to get CMIDriver compile Modified: trunk/reactos/include/ddk/drmk.h trunk/reactos/include/ddk/ntstrsafe.h trunk/reactos/include/ddk/portcls.h trunk/reactos/include/ddk/stdunk.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/psdk/guiddef.h trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/ksmedia.h trunk/reactos/include/psdk/mmreg.h Modified: trunk/reactos/include/ddk/drmk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/drmk.h?rev=398… ============================================================================== --- trunk/reactos/include/ddk/drmk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/drmk.h [iso-8859-1] Sun Mar 1 15:45:32 2009 @@ -23,6 +23,7 @@ BOOL DigitalOutputDisable; } DRMRIGHTS, *PDRMRIGHTS; +typedef const DRMRIGHTS *PCDRMRIGHTS; /* =============================================================== Digital Rights Management Functions @@ -76,4 +77,31 @@ } #endif + + +DEFINE_GUID(IID_IDrmAudioStream, + 0x1915c967, 0x3299, 0x48cb, 0xa3, 0xe4, 0x69, 0xfd, 0x1d, 0x1b, 0x30, 0x6e); + +DECLARE_INTERFACE_(IDrmAudioStream, IUnknown) +{ + STDMETHOD_(NTSTATUS, QueryInterface)(THIS_ + REFIID InterfaceId, + PVOID* Interface + ) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD_(NTSTATUS,SetContentId)(THIS_ + IN ULONG ContentId, + IN PCDRMRIGHTS DrmRights) PURE; +}; + +typedef IDrmAudioStream *PDRMAUDIOSTREAM; + +#define IMP_IDrmAudioStream \ + STDMETHODIMP_(NTSTATUS) SetContentId \ + ( IN ULONG ContentId, \ + IN PCDRMRIGHTS DrmRights \ + ); + + #endif Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Sun Mar 1 15:45:32 2009 @@ -394,6 +394,19 @@ return Status; } + +NTSTATUS +NTAPI +RtlStringCbPrintfW( + LPWSTR pszDest, + IN size_t cbDest, + IN LPCWSTR pszFormat, + ...) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + FORCEINLINE NTSTATUS NTAPI Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Sun Mar 1 15:45:32 2009 @@ -164,6 +164,7 @@ /* HACK */ /* typedef PVOID CM_RESOURCE_TYPE; */ +#define _100NS_UNITS_PER_SECOND 10000000L #define PORT_CLASS_DEVICE_EXTENSION_SIZE ( 64 * sizeof(ULONG_PTR) ) @@ -236,42 +237,47 @@ struct _PCPROPERTY_REQUEST; +typedef struct _PCPROPERTY_REQUEST PCPROPERTY_REQUEST, *PPCPROPERTY_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 + IN PPCPROPERTY_REQUEST PropertyRequest); + +typedef struct +{ + const GUID * Set; + ULONG Id; + ULONG Flags; #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 +//not supported #define PCPROPERTY_ITEM_FLAG_RELATIONS KSPROPERTY_TYPE_RELATIONS #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) - +#define PCPROPERTY_ITEM_FLAG_SERIALIZESIZE KSPROPERTY_TYPE_SERIALIZESIZE +#define PCPROPERTY_ITEM_FLAG_SERIALIZE\ + (PCPROPERTY_ITEM_FLAG_SERIALIZERAW\ + |PCPROPERTY_ITEM_FLAG_UNSERIALIZERAW\ + |PCPROPERTY_ITEM_FLAG_SERIALIZESIZE\ + ) +#define PCPROPERTY_ITEM_FLAG_DEFAULTVALUES KSPROPERTY_TYPE_DEFAULTVALUES + 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; struct _PCEVENT_REQUEST; @@ -381,6 +387,16 @@ const GUID* Categories; } PCFILTER_DESCRIPTOR, *PPCFILTER_DESCRIPTOR; +#define DEFINE_PCAUTOMATION_TABLE_PROP(AutomationTable,PropertyTable)\ +const PCAUTOMATION_TABLE AutomationTable =\ +{\ + sizeof(PropertyTable[0]),\ + SIZEOF_ARRAY(PropertyTable),\ + (const PCPROPERTY_ITEM *) PropertyTable,\ + 0,0,NULL,\ + 0,0,NULL,\ + 0\ +} /* =============================================================== IResourceList Interface @@ -1011,6 +1027,10 @@ DEFINE_GUIDSTRUCT("0xB4C90A25-5791-11d0-86f9-00a0c911b544", IID_IPort); #define IID_IPort DEFINE_GUIDNAMED(IID_IPort) #endif + +DEFINE_GUID(IID_IMiniport, + 0xb4c90a24L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + DEFINE_GUID(IID_IPort, 0xb4c90a25L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); @@ -1360,6 +1380,9 @@ #undef INTERFACE #define INTERFACE IMiniportWaveCyclicStream +DEFINE_GUID(IID_IMiniportWaveCyclicStream, +0xb4c90a28L, 0x5791, 0x11d0, 0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44); + DECLARE_INTERFACE_(IMiniportWaveCyclicStream,IUnknown) { DEFINE_ABSTRACT_UNKNOWN() @@ -1386,6 +1409,29 @@ }; typedef IMiniportWaveCyclicStream *PMINIPORTWAVECYCLICSTREAM; + +#define IMP_IMiniportWaveCyclicStream\ + STDMETHODIMP_(NTSTATUS) SetFormat\ + ( IN PKSDATAFORMAT DataFormat\ + );\ + STDMETHODIMP_(ULONG) SetNotificationFreq\ + ( IN ULONG Interval,\ + OUT PULONG FrameSize\ + );\ + STDMETHODIMP_(NTSTATUS) SetState\ + ( IN KSSTATE State\ + );\ + STDMETHODIMP_(NTSTATUS) GetPosition\ + ( OUT PULONG Position\ + );\ + STDMETHODIMP_(NTSTATUS) NormalizePhysicalPosition\ + ( IN OUT PLONGLONG PhysicalPosition\ + );\ + STDMETHODIMP_(void) Silence\ + ( IN PVOID Buffer,\ + IN ULONG ByteCount\ + ) + /* =============================================================== IMiniportWaveCyclic Interface @@ -1420,6 +1466,24 @@ typedef IMiniportWaveCyclic *PMINIPORTWAVECYCLIC; #undef INTERFACE + +#define IMP_IMiniportWaveCyclic\ + IMP_IMiniport;\ + STDMETHODIMP_(NTSTATUS) Init\ + ( IN PUNKNOWN UnknownAdapter,\ + IN PRESOURCELIST ResourceList,\ + IN PPORTWAVECYCLIC Port\ + );\ + STDMETHODIMP_(NTSTATUS) NewStream\ + ( OUT PMINIPORTWAVECYCLICSTREAM * Stream,\ + IN PUNKNOWN OuterUnknown OPTIONAL,\ + IN POOL_TYPE PoolType,\ + IN ULONG Pin,\ + IN BOOLEAN Capture,\ + IN PKSDATAFORMAT DataFormat,\ + OUT PDMACHANNEL * DmaChannel,\ + OUT PSERVICEGROUP * ServiceGroup\ + ) /* =============================================================== @@ -1547,7 +1611,19 @@ IN PDEVICE_CAPABILITIES PowerDeviceCaps) PURE; }; -#define IMP_IAdapterPowerManagement +#define IMP_IAdapterPowerManagement \ + STDMETHODIMP_(void) PowerChangeState \ + ( IN POWER_STATE NewState \ + ); \ + STDMETHODIMP_(NTSTATUS) QueryPowerChangeState \ + ( IN POWER_STATE NewStateQuery \ + ); \ + STDMETHODIMP_(NTSTATUS) QueryDeviceCapabilities \ + ( IN PDEVICE_CAPABILITIES PowerDeviceCaps \ + ) + +typedef IAdapterPowerManagement *PADAPTERPOWERMANAGEMENT; + /* =============================================================== IPowerNotify Interface Modified: trunk/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/stdunk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/stdunk.h [iso-8859-1] Sun Mar 1 15:45:32 2009 @@ -164,8 +164,8 @@ Custom "new" and "delete" C++ operators */ -#ifndef ALLOCATION_OPERATORS_DEFINED -#define ALLOCATION_OPERATORS_DEFINED +#ifndef _NEW_DELETE_OPERATORS_ +#define _NEW_DELETE_OPERATORS_ inline PVOID KCOM_New( Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sun Mar 1 15:45:32 2009 @@ -95,10 +95,15 @@ #ifndef __IID_ALIGNED__ #define __IID_ALIGNED__ - - #define IsEqualGUIDAligned(guid1, guid2) \ - ( (*(PLONGLONG)(guid1) == *(PLONGLONG)(guid2)) && \ - (*((PLONGLONG)(guid1) + 1) == *((PLONGLONG)(guid2) + 1)) ) + #ifdef __cplusplus + inline int IsEqualGUIDAligned(REFGUID guid1, REFGUID guid2) + { + return ((*(PLONGLONG)(&guid1) == *(PLONGLONG)(&guid2)) && (*((PLONGLONG)(&guid1) + 1) == *((PLONGLONG)(&guid2) + 1))); + } + #else + #define IsEqualGUIDAligned(guid1, guid2) \ + ((*(PLONGLONG)(guid1) == *(PLONGLONG)(guid2)) && (*((PLONGLONG)(guid1) + 1) == *((PLONGLONG)(guid2) + 1))) + #endif #endif /* Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Sun Mar 1 15:45:32 2009 @@ -109,6 +109,8 @@ #if defined(__cplusplus) && !defined(CINTERFACE) #include <string.h> +#if !defined _SYS_GUID_OPERATOR_EQ_ && !defined _NO_SYS_GUID_OPERATOR_EQ_ +#define _SYS_GUID_OPERATOR_EQ_ inline bool operator==(const GUID& guidOne, const GUID& guidOther) { return !memcmp(&guidOne,&guidOther,sizeof(GUID)); @@ -118,5 +120,6 @@ return !(guidOne == guidOther); } #endif +#endif #endif /* _GUIDDEF_H_ */ Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3982… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sun Mar 1 15:45:32 2009 @@ -56,6 +56,11 @@ #if defined(_NTDDK_) typedef PVOID PKSWORKER; #endif + +#ifndef SIZEOF_ARRAY + #define SIZEOF_ARRAY(a) (sizeof(a)/sizeof((a)[0])) +#endif + /* =============================================================== GUID definition helpers */ @@ -600,7 +605,11 @@ Property Sets for audio drivers - TODO */ -#define KSPROPSETID_AC3 +#define STATIC_KSPROPTYPESETID_General \ + 0x97E99BA0L, 0xBDEA, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 +DEFINE_GUIDSTRUCT("97E99BA0-BDEA-11CF-A5D6-28DB04C10000", KSPROPTYPESETID_General); +#define KSPROPTYPESETID_General DEFINE_GUIDNAMED(KSPROPTYPESETID_General) + /* KSPROPERTY_AC3_ALTERNATE_AUDIO KSPROPERTY_AC3_BIT_STREAM_MODE @@ -618,7 +627,6 @@ KSPROPERTY_AEC_STATUS */ -#define KSPROPSETID_Audio /* KSPROPERTY_AUDIO_3D_INTERFACE KSPROPERTY_AUDIO_AGC @@ -943,6 +951,12 @@ TODO ... */ +#define STATIC_KSDATAFORMAT_SPECIFIER_NONE\ + 0x0F6417D6L, 0xC318, 0x11D0, 0xA4, 0x3F, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96 +DEFINE_GUIDSTRUCT("0F6417D6-C318-11D0-A43F-00A0C9223196", KSDATAFORMAT_SPECIFIER_NONE); +#define KSDATAFORMAT_SPECIFIER_NONE DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_NONE) + + /* =============================================================== KSMEMORY_TYPE_xxx @@ -1090,6 +1104,67 @@ IN PIRP Irp); #endif +#if defined(_NTDDK_) && !defined(__wtypes_h__) +enum VARENUM { + VT_EMPTY = 0, + VT_NULL = 1, + VT_I2 = 2, + VT_I4 = 3, + VT_R4 = 4, + VT_R8 = 5, + VT_CY = 6, + VT_DATE = 7, + VT_BSTR = 8, + VT_DISPATCH = 9, + VT_ERROR = 10, + VT_BOOL = 11, + VT_VARIANT = 12, + VT_UNKNOWN = 13, + VT_DECIMAL = 14, + VT_I1 = 16, + VT_UI1 = 17, + VT_UI2 = 18, + VT_UI4 = 19, + VT_I8 = 20, + VT_UI8 = 21, + VT_INT = 22, + VT_UINT = 23, + VT_VOID = 24, + VT_HRESULT = 25, + VT_PTR = 26, + VT_SAFEARRAY = 27, + VT_CARRAY = 28, + VT_USERDEFINED = 29, + VT_LPSTR = 30, + VT_LPWSTR = 31, + VT_FILETIME = 64, + VT_BLOB = 65, + VT_STREAM = 66, + VT_STORAGE = 67, + VT_STREAMED_OBJECT = 68, + VT_STORED_OBJECT = 69, + VT_BLOB_OBJECT = 70, + VT_CF = 71, + VT_CLSID = 72, + VT_VECTOR = 0x1000, + VT_ARRAY = 0x2000, + VT_BYREF = 0x4000, + VT_RESERVED = 0x8000, + VT_ILLEGAL = 0xffff, + VT_ILLEGALMASKED = 0xfff, + VT_TYPEMASK = 0xfff +}; +#endif + +#define STATIC_KSDATAFORMAT_TYPE_WILDCARD STATIC_GUID_NULL +#define KSDATAFORMAT_TYPE_WILDCARD GUID_NULL + +#define STATIC_KSDATAFORMAT_SUBTYPE_WILDCARD STATIC_GUID_NULL +#define KSDATAFORMAT_SUBTYPE_WILDCARD GUID_NULL + +#define STATIC_KSDATAFORMAT_SPECIFIER_WILDCARD STATIC_GUID_NULL +#define KSDATAFORMAT_SPECIFIER_WILDCARD GUID_NULL + /* =============================================================== Framing */ @@ -1204,6 +1279,22 @@ typedef struct { +#if defined( _KS_NO_ANONYMOUS_STRUCTURES_ ) + struct _SIGNED { +#else + struct { +#endif + LONG SignedMinimum; + LONG SignedMaximum; + }; +#if defined( _KS_NO_ANONYMOUS_STRUCTURES_ ) + struct _UNSIGNED { +#else + struct { +#endif + ULONG UnsignedMinimum; + ULONG UnsignedMaximum; + }; } KSPROPERTY_BOUNDS_LONG, *PKSPROPERTY_BOUNDS_LONG; typedef struct @@ -1212,6 +1303,11 @@ typedef struct { + ULONG AccessFlags; + ULONG DescriptionSize; + KSIDENTIFIER PropTypeSet; + ULONG MembersListCount; + ULONG Reserved; } KSPROPERTY_DESCRIPTION, *PKSPROPERTY_DESCRIPTION; typedef struct @@ -1303,6 +1399,9 @@ typedef struct { + ULONG SteppingDelta; + ULONG Reserved; + KSPROPERTY_BOUNDS_LONG Bounds; } KSPROPERTY_STEPPING_LONG, *PKSPROPERTY_STEPPING_LONG; typedef struct @@ -3062,6 +3161,14 @@ #if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) +KSDDKAPI +PUNKNOWN +NTAPI +KsGetOuterUnknown( + IN PVOID Object + ); + + PUNKNOWN NTAPI KsDeviceGetOuterUnknown( Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Sun Mar 1 15:45:32 2009 @@ -14,6 +14,8 @@ KS CATEGORIES */ +#define EXTRACT_WAVEFORMATEX_ID(Guid)\ + (USHORT)((Guid)->Data1) /* Audio device (as presented by sysaudio) */ @@ -112,6 +114,176 @@ #define STATIC_KSCATEGORY_DRM_DESCRAMBLE STATIC_KSNODETYPE_DRM_DESCRAMBLE #define KSCATEGORY_DRM_DESCRAMBLE KSNODETYPE_DRM_DESCRAMBLE + +/* + Nodes +*/ + +#define STATIC_KSNODETYPE_ADC\ + 0x4D837FE0L, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("4D837FE0-C555-11D0-8A2B-00A0C9255AC1", KSNODETYPE_ADC); +#define KSNODETYPE_ADC DEFINE_GUIDNAMED(KSNODETYPE_ADC) + +#define STATIC_KSNODETYPE_3D_EFFECTS\ + 0x55515860L, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("55515860-C559-11D0-8A2B-00A0C9255AC1", KSNODETYPE_3D_EFFECTS); +#define KSNODETYPE_3D_EFFECTS DEFINE_GUIDNAMED(KSNODETYPE_3D_EFFECTS) + +#define STATIC_KSNODETYPE_SUPERMIX\ + 0xE573ADC0L, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("E573ADC0-C555-11D0-8A2B-00A0C9255AC1", KSNODETYPE_SUPERMIX); +#define KSNODETYPE_SUPERMIX DEFINE_GUIDNAMED(KSNODETYPE_SUPERMIX) + +#define STATIC_KSNODETYPE_SRC\ + 0x9DB7B9E0L, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("9DB7B9E0-C555-11D0-8A2B-00A0C9255AC1", KSNODETYPE_SRC); +#define KSNODETYPE_SRC DEFINE_GUIDNAMED(KSNODETYPE_SRC) + +#define STATIC_KSNODETYPE_DAC\ + 0x507AE360L, 0xC554, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("507AE360-C554-11D0-8A2B-00A0C9255AC1", KSNODETYPE_DAC); +#define KSNODETYPE_DAC DEFINE_GUIDNAMED(KSNODETYPE_DAC) + +#define STATIC_KSNODETYPE_SPDIF_INTERFACE\ + DEFINE_USB_TERMINAL_GUID(0x0605) +DEFINE_GUIDSTRUCT("DFF21FE5-F70F-11D0-B917-00A0C9223196", KSNODETYPE_SPDIF_INTERFACE); +#define KSNODETYPE_SPDIF_INTERFACE DEFINE_GUIDNAMED(KSNODETYPE_SPDIF_INTERFACE) + +#define STATIC_KSNODETYPE_MICROPHONE\ + DEFINE_USB_TERMINAL_GUID(0x0201) +DEFINE_GUIDSTRUCT("DFF21BE1-F70F-11D0-B917-00A0C9223196", KSNODETYPE_MICROPHONE); +#define KSNODETYPE_MICROPHONE DEFINE_GUIDNAMED(KSNODETYPE_MICROPHONE) + +#define STATIC_KSNODETYPE_CD_PLAYER\ + DEFINE_USB_TERMINAL_GUID(0x0703) +DEFINE_GUIDSTRUCT("DFF220E3-F70F-11D0-B917-00A0C9223196", KSNODETYPE_CD_PLAYER); +#define KSNODETYPE_CD_PLAYER DEFINE_GUIDNAMED(KSNODETYPE_CD_PLAYER) + +#define STATIC_KSNODETYPE_LINE_CONNECTOR\ + DEFINE_USB_TERMINAL_GUID(0x0603) +DEFINE_GUIDSTRUCT("DFF21FE3-F70F-11D0-B917-00A0C9223196", KSNODETYPE_LINE_CONNECTOR); +#define KSNODETYPE_LINE_CONNECTOR DEFINE_GUIDNAMED(KSNODETYPE_LINE_CONNECTOR) + +#define STATIC_KSNODETYPE_ANALOG_CONNECTOR\ + DEFINE_USB_TERMINAL_GUID(0x601) +DEFINE_GUIDSTRUCT("DFF21FE1-F70F-11D0-B917-00A0C9223196", KSNODETYPE_ANALOG_CONNECTOR); +#define KSNODETYPE_ANALOG_CONNECTOR DEFINE_GUIDNAMED(KSNODETYPE_ANALOG_CONNECTOR) + +#define STATIC_KSNODETYPE_SPEAKER\ + DEFINE_USB_TERMINAL_GUID(0x0301) +DEFINE_GUIDSTRUCT("DFF21CE1-F70F-11D0-B917-00A0C9223196", KSNODETYPE_SPEAKER); +#define KSNODETYPE_SPEAKER DEFINE_GUIDNAMED(KSNODETYPE_SPEAKER) + +#define STATIC_KSAUDFNAME_RECORDING_CONTROL\ + 0x185FEDFAL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDFA-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_RECORDING_CONTROL); +#define KSAUDFNAME_RECORDING_CONTROL DEFINE_GUIDNAMED(KSAUDFNAME_RECORDING_CONTROL) + +#define STATIC_KSNODETYPE_VOLUME\ + 0x3A5ACC00L, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("3A5ACC00-C557-11D0-8A2B-00A0C9255AC1", KSNODETYPE_VOLUME); +#define KSNODETYPE_VOLUME DEFINE_GUIDNAMED(KSNODETYPE_VOLUME) + +#define STATIC_KSAUDFNAME_WAVE_VOLUME\ + 0x185FEDE5L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDE5-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_WAVE_VOLUME); +#define KSAUDFNAME_WAVE_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_WAVE_VOLUME) + +#define STATIC_KSNODETYPE_MUTE\ + 0x02B223C0L, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("02B223C0-C557-11D0-8A2B-00A0C9255AC1", KSNODETYPE_MUTE); +#define KSNODETYPE_MUTE DEFINE_GUIDNAMED(KSNODETYPE_MUTE) + +#define STATIC_KSAUDFNAME_WAVE_MUTE\ + 0x185FEDE6L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDE6-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_WAVE_MUTE); +#define KSAUDFNAME_WAVE_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_WAVE_MUTE) + +#define STATIC_KSAUDFNAME_MIC_VOLUME\ + 0x185FEDEDL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDED-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MIC_VOLUME); +#define KSAUDFNAME_MIC_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MIC_VOLUME) + +#define STATIC_KSNODETYPE_SUM\ + 0xDA441A60L, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("DA441A60-C556-11D0-8A2B-00A0C9255AC1", KSNODETYPE_SUM); +#define KSNODETYPE_SUM DEFINE_GUIDNAMED(KSNODETYPE_SUM) + +#define STATIC_KSAUDFNAME_MASTER_VOLUME\ + 0x185FEDE3L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDE3-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MASTER_VOLUME); +#define KSAUDFNAME_MASTER_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MASTER_VOLUME) + +#define STATIC_KSAUDFNAME_CD_VOLUME\ + 0x185FEDE9L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDE9-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_CD_VOLUME); +#define KSAUDFNAME_CD_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_CD_VOLUME) + +#define STATIC_KSAUDFNAME_RECORDING_SOURCE\ + 0x185FEDEFL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDEF-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_RECORDING_SOURCE); +#define KSAUDFNAME_RECORDING_SOURCE DEFINE_GUIDNAMED(KSAUDFNAME_RECORDING_SOURCE) + +#define STATIC_KSAUDFNAME_LINE_IN_VOLUME\ + 0x185FEDF4L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDF4-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_LINE_IN_VOLUME); +#define KSAUDFNAME_LINE_IN_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_LINE_IN_VOLUME) + +#define STATIC_KSAUDFNAME_AUX_VOLUME\ + 0x185FEDFCL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDFC-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_AUX_VOLUME); +#define KSAUDFNAME_AUX_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_AUX_VOLUME) + +#define STATIC_KSAUDFNAME_MIC_IN_VOLUME\ + 0x185FEDF5L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDF5-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MIC_IN_VOLUME); +#define KSAUDFNAME_MIC_IN_VOLUME DEFINE_GUIDNAMED(KSAUDFNAME_MIC_IN_VOLUME) + +#define STATIC_KSNODETYPE_LOUDNESS\ + 0x41887440L, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("41887440-C558-11D0-8A2B-00A0C9255AC1", KSNODETYPE_LOUDNESS); +#define KSNODETYPE_LOUDNESS DEFINE_GUIDNAMED(KSNODETYPE_LOUDNESS) + +#define STATIC_KSAUDFNAME_MICROPHONE_BOOST\ + 0x2bc31d6aL, 0x96e3, 0x11d2, 0xac, 0x4c, 0x0, 0xc0, 0x4f, 0x8e, 0xfb, 0x68 +DEFINE_GUIDSTRUCT("2BC31D6A-96E3-11d2-AC4C-00C04F8EFB68", KSAUDFNAME_MICROPHONE_BOOST); +#define KSAUDFNAME_MICROPHONE_BOOST DEFINE_GUIDNAMED(KSAUDFNAME_MICROPHONE_BOOST) + +#define STATIC_KSAUDFNAME_CD_MUTE\ + 0x185FEDEAL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDEA-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_CD_MUTE); +#define KSAUDFNAME_CD_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_CD_MUTE) + +#define STATIC_KSAUDFNAME_LINE_MUTE\ + 0x185FEDECL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDEC-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_LINE_MUTE); +#define KSAUDFNAME_LINE_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_LINE_MUTE) + +#define STATIC_KSAUDFNAME_MIC_MUTE\ + 0x185FEDEEL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDEE-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MIC_MUTE); +#define KSAUDFNAME_MIC_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_MIC_MUTE) + +#define STATIC_KSAUDFNAME_AUX_MUTE\ + 0x185FEDFDL, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDFD-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_AUX_MUTE); +#define KSAUDFNAME_AUX_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_AUX_MUTE) + +#define STATIC_KSAUDFNAME_VOLUME_CONTROL\ + 0x185FEDF7L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDF7-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_VOLUME_CONTROL); +#define KSAUDFNAME_VOLUME_CONTROL DEFINE_GUIDNAMED(KSAUDFNAME_VOLUME_CONTROL) + +#define STATIC_KSNODETYPE_MUX\ + 0x2CEAF780L, 0xC556, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("2CEAF780-C556-11D0-8A2B-00A0C9255AC1", KSNODETYPE_MUX); +#define KSNODETYPE_MUX DEFINE_GUIDNAMED(KSNODETYPE_MUX) + +#define STATIC_KSAUDFNAME_MASTER_MUTE\ + 0x185FEDE4L, 0x9905, 0x11D1, 0x95, 0xA9, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3 +DEFINE_GUIDSTRUCT("185FEDE4-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MASTER_MUTE); +#define KSAUDFNAME_MASTER_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_MASTER_MUTE) + /* Pins @@ -132,6 +304,17 @@ KSDATAFORMAT DataFormat; WAVEFORMATEX WaveFormatEx; } KSDATAFORMAT_WAVEFORMATEX, *PKSDATAFORMAT_WAVEFORMATEX; + +typedef struct { + ULONG Flags; + ULONG Control; + WAVEFORMATEX WaveFormatEx; +} KSDSOUND_BUFFERDESC, *PKSDSOUND_BUFFERDESC; + +typedef struct { + KSDATAFORMAT DataFormat; + KSDSOUND_BUFFERDESC BufferDesc; +} KSDATAFORMAT_DSOUND, *PKSDATAFORMAT_DSOUND; //#endif @@ -144,6 +327,22 @@ ULONG MaximumSampleFrequency; } KSDATARANGE_AUDIO, *PKSDATARANGE_AUDIO; +#if !defined( DEFINE_WAVEFORMATEX_GUID ) +#define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 +#endif + +#define STATIC_KSDATAFORMAT_SUBTYPE_WAVEFORMATEX\ + 0x00000000L, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 +DEFINE_GUIDSTRUCT("00000000-0000-0010-8000-00aa00389b71", KSDATAFORMAT_SUBTYPE_WAVEFORMATEX); +#define KSDATAFORMAT_SUBTYPE_WAVEFORMATEX DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_WAVEFORMATEX) + + +#define INIT_WAVEFORMATEX_GUID(Guid, x) \ +{ \ + *(Guid) = KSDATAFORMAT_SUBTYPE_WAVEFORMATEX; \ + (Guid)->Data1 = (USHORT)(x); \ +} + // 'vids' #define STATIC_KSDATAFORMAT_TYPE_VIDEO \ 0x73646976L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71} @@ -156,7 +355,15 @@ DEFINE_GUIDSTRUCT("73647561-0000-0010-8000-00aa00389b71", KSDATAFORMAT_TYPE_AUDIO); #define KSDATAFORMAT_TYPE_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_TYPE_AUDIO) - +#define STATIC_KSDATAFORMAT_SPECIFIER_DSOUND\ + 0x518590a2L, 0xa184, 0x11d0, 0x85, 0x22, 0x00, 0xc0, 0x4f, 0xd9, 0xba, 0xf3 +DEFINE_GUIDSTRUCT("518590a2-a184-11d0-8522-00c04fd9baf3", KSDATAFORMAT_SPECIFIER_DSOUND); +#define KSDATAFORMAT_SPECIFIER_DSOUND DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_DSOUND) + +#define STATIC_KSDATAFORMAT_SUBTYPE_ANALOG\ + 0x6dba3190L, 0x67bd, 0x11cf, 0xa0, 0xf7, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4 +DEFINE_GUIDSTRUCT("6dba3190-67bd-11cf-a0f7-0020afd156e4", KSDATAFORMAT_SUBTYPE_ANALOG); +#define KSDATAFORMAT_SUBTYPE_ANALOG DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_ANALOG) // 'txts' @@ -191,6 +398,88 @@ 0x05589f81L, 0xc356, 0x11ce, 0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a DEFINE_GUIDSTRUCT("05589f81-c356-11ce-bf01-00aa0055595a", KSDATAFORMAT_SPECIFIER_WAVEFORMATEX); #define KSDATAFORMAT_SPECIFIER_WAVEFORMATEX DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_WAVEFORMATEX) + +#define STATIC_KSDATAFORMAT_SUBTYPE_AC3_AUDIO\ + 0xe06d802cL, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea +DEFINE_GUIDSTRUCT("e06d802c-db46-11cf-b4d1-00805f6cbbea", KSDATAFORMAT_SUBTYPE_AC3_AUDIO); +#define KSDATAFORMAT_SUBTYPE_AC3_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SUBTYPE_AC3_AUDIO) + +#define STATIC_KSDATAFORMAT_SPECIFIER_AC3_AUDIO\ + 0xe06d80e4L, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea +DEFINE_GUIDSTRUCT("e06d80e4-db46-11cf-b4d1-00805f6cbbea", KSDATAFORMAT_SPECIFIER_AC3_AUDIO); +#define KSDATAFORMAT_SPECIFIER_AC3_AUDIO DEFINE_GUIDNAMED(KSDATAFORMAT_SPECIFIER_AC3_AUDIO) + +#define STATIC_KSPROPSETID_AC3\ + 0xBFABE720L, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00 +DEFINE_GUIDSTRUCT("BFABE720-6E1F-11D0-BCF2-444553540000", KSPROPSETID_AC3); +#define KSPROPSETID_AC3 DEFINE_GUIDNAMED(KSPROPSETID_AC3) + +#define STATIC_KSPROPSETID_Audio\ + 0x45FFAAA0L, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00 +DEFINE_GUIDSTRUCT("45FFAAA0-6E1B-11D0-BCF2-444553540000", KSPROPSETID_Audio); +#define KSPROPSETID_Audio DEFINE_GUIDNAMED(KSPROPSETID_Audio) + +typedef enum { + KSPROPERTY_AUDIO_LATENCY = 1, + KSPROPERTY_AUDIO_COPY_PROTECTION, + KSPROPERTY_AUDIO_CHANNEL_CONFIG, + KSPROPERTY_AUDIO_VOLUMELEVEL, + KSPROPERTY_AUDIO_POSITION, + KSPROPERTY_AUDIO_DYNAMIC_RANGE, + KSPROPERTY_AUDIO_QUALITY, + KSPROPERTY_AUDIO_SAMPLING_RATE, + KSPROPERTY_AUDIO_DYNAMIC_SAMPLING_RATE, + KSPROPERTY_AUDIO_MIX_LEVEL_TABLE, + KSPROPERTY_AUDIO_MIX_LEVEL_CAPS, + KSPROPERTY_AUDIO_MUX_SOURCE, + KSPROPERTY_AUDIO_MUTE, + KSPROPERTY_AUDIO_BASS, + KSPROPERTY_AUDIO_MID, + KSPROPERTY_AUDIO_TREBLE, + KSPROPERTY_AUDIO_BASS_BOOST, + KSPROPERTY_AUDIO_EQ_LEVEL, + KSPROPERTY_AUDIO_NUM_EQ_BANDS, + KSPROPERTY_AUDIO_EQ_BANDS, + KSPROPERTY_AUDIO_AGC, + KSPROPERTY_AUDIO_DELAY, + KSPROPERTY_AUDIO_LOUDNESS, + KSPROPERTY_AUDIO_WIDE_MODE, + KSPROPERTY_AUDIO_WIDENESS, + KSPROPERTY_AUDIO_REVERB_LEVEL, + KSPROPERTY_AUDIO_CHORUS_LEVEL, + KSPROPERTY_AUDIO_DEV_SPECIFIC, + KSPROPERTY_AUDIO_DEMUX_DEST, + KSPROPERTY_AUDIO_STEREO_ENHANCE, + KSPROPERTY_AUDIO_MANUFACTURE_GUID, + KSPROPERTY_AUDIO_PRODUCT_GUID, + KSPROPERTY_AUDIO_CPU_RESOURCES, + KSPROPERTY_AUDIO_STEREO_SPEAKER_GEOMETRY, + KSPROPERTY_AUDIO_SURROUND_ENCODE, + KSPROPERTY_AUDIO_3D_INTERFACE + +#if (NTDDI_VERSION >= NTDDI_WINXP) + , KSPROPERTY_AUDIO_PEAKMETER + , KSPROPERTY_AUDIO_ALGORITHM_INSTANCE + , KSPROPERTY_AUDIO_FILTER_STATE + , KSPROPERTY_AUDIO_PREFERRED_STATUS + +#endif +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + , KSPROPERTY_AUDIO_PEQ_MAX_BANDS + , KSPROPERTY_AUDIO_PEQ_NUM_BANDS + , KSPROPERTY_AUDIO_PEQ_BAND_CENTER_FREQ + , KSPROPERTY_AUDIO_PEQ_BAND_Q_FACTOR + , KSPROPERTY_AUDIO_PEQ_BAND_LEVEL + , KSPROPERTY_AUDIO_CHORUS_MODULATION_RATE + , KSPROPERTY_AUDIO_CHORUS_MODULATION_DEPTH + , KSPROPERTY_AUDIO_REVERB_TIME + , KSPROPERTY_AUDIO_REVERB_DELAY_FEEDBACK + , KSPROPERTY_AUDIO_POSITIONEX + , KSPROPERTY_AUDIO_MIC_ARRAY_GEOMETRY +#endif + +} KSPROPERTY_AUDIO; + /* SysAudio Properties @@ -232,4 +521,36 @@ } KSPROPERTY_SYSAUDIO_PIN; +#define KSAUDIO_CPU_RESOURCES_NOT_HOST_CPU 0x00000000 +#define KSAUDIO_CPU_RESOURCES_HOST_CPU 0x7FFFFFFF + +#if (NTDDI_VERSION >= NTDDI_WINXP) +#define KSAUDIO_SPEAKER_DIRECTOUT 0 #endif +#define KSAUDIO_SPEAKER_MONO (SPEAKER_FRONT_CENTER) +#define KSAUDIO_SPEAKER_STEREO (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT) +#define KSAUDIO_SPEAKER_QUAD (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER) +#define KSAUDIO_SPEAKER_5POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT) +#define KSAUDIO_SPEAKER_7POINT1 (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | \ + SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER) + +#if ( (NTDDI_VERSION >= NTDDI_WINXPSP2) && (NTDDI_VERSION < NTDDI_WS03) ) || (NTDDI_VERSION >= NTDDI_WS03SP1) + +#define KSAUDIO_SPEAKER_5POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) +#define KSAUDIO_SPEAKER_7POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | \ + SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | \ + SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | \ + SPEAKER_SIDE_LEFT | SPEAKER_SIDE_RIGHT) +#define KSAUDIO_SPEAKER_5POINT1_BACK KSAUDIO_SPEAKER_5POINT1 +#define KSAUDIO_SPEAKER_7POINT1_WIDE KSAUDIO_SPEAKER_7POINT1 +#endif +#endif Modified: trunk/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/mmreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmreg.h [iso-8859-1] Sun Mar 1 15:45:32 2009 @@ -117,6 +117,7 @@ #define WAVE_FORMAT_G721_ADPCM 0x0040 /* Antex Electronics Corporation */ #define WAVE_FORMAT_MPEG 0x0050 /* Microsoft Corporation */ #define WAVE_FORMAT_MPEGLAYER3 0x0055 +#define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 /* Sonic Foundry */ #define WAVE_FORMAT_CREATIVE_ADPCM 0x0200 /* Creative Labs, Inc */ #define WAVE_FORMAT_CREATIVE_FASTSPEECH8 0x0202 /* Creative Labs, Inc */ #define WAVE_FORMAT_CREATIVE_FASTSPEECH10 0x0203 /* Creative Labs, Inc */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009