Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[cfinck] 39727: SVN maintenance: Delete the silverblade-audio branch on silverblade's request. Work on the sound stuff happens in trunk now.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Feb 23 22:21:32 2009 New Revision: 39727 URL: http://svn.reactos.org/svn/reactos?rev=39727&view=rev Log: SVN maintenance: Delete the silverblade-audio branch on silverblade's request. Work on the sound stuff happens in trunk now. Removed: branches/silverblade-audio/

15 years, 10 months

[dgorbachev] 39723: Remove a hack from KiTrap14. Put a hack in other place.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Feb 23 16:18:28 2009 New Revision: 39723 URL: http://svn.reactos.org/svn/reactos?rev=39723&view=rev Log: Remove a hack from KiTrap14. Put a hack in other place. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Mon Feb 23 16:18:28 2009 @@ -389,6 +389,9 @@ /* Checking NPX, disable interrupts now */ mov eax, [esi+KTHREAD_INITIAL_STACK] + + /* HACK */ + mov ecx, [eax - 4] cli /* Get the NPX State */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Mon Feb 23 16:18:28 2009 @@ -1924,10 +1924,6 @@ NoFixUp: mov edi, cr2 - /* ROS HACK: Sometimes we get called with INTS DISABLED! WTF? */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK - je HandlePf - /* Enable interrupts and check if we got here with interrupts disabled */ sti test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_INTERRUPT_MASK

15 years, 10 months

[dgorbachev] 39726: Fix compilation of wdmaud.sys

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Feb 23 17:42:13 2009 New Revision: 39726 URL: http://svn.reactos.org/svn/reactos?rev=39726&view=rev Log: Fix compilation of wdmaud.sys Modified: trunk/reactos/include/psdk/mmreg.h 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] Mon Feb 23 17:42:13 2009 @@ -76,6 +76,8 @@ WORD wBitsPerSample; WORD cbSize; } WAVEFORMATEX, *PWAVEFORMATEX, *NPWAVEFORMATEX, *LPWAVEFORMATEX; + +typedef const struct _WAVEFORMATEX *LPCWAVEFORMATEX; #endif /* _WAVEFORMATEX_ */ #ifndef WAVE_FORMAT_PCM

15 years, 10 months

[dgorbachev] 39725: Fix mmsystem.h

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Feb 23 16:54:05 2009 New Revision: 39725 URL: http://svn.reactos.org/svn/reactos?rev=39725&view=rev Log: Fix mmsystem.h Modified: trunk/reactos/include/psdk/mmsystem.h Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Mon Feb 23 16:54:05 2009 @@ -1,3 +1,6 @@ +/* + * Multimedia declarations + */ #ifndef _MMSYSTEM_H #define _MMSYSTEM_H @@ -1045,7 +1048,7 @@ WORD cbSize; } WAVEFORMATEX,*PWAVEFORMATEX,*LPWAVEFORMATEX; -typedef const WAVEFORMATEX *LPCWAVEFORMATEX; +typedef const struct tWAVEFORMATEX *LPCWAVEFORMATEX; #endif DECLARE_HANDLE(HMIDI);

15 years, 10 months

[dgorbachev] 39724: Trying to fix r39718, r39719...

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Feb 23 16:40:50 2009 New Revision: 39724 URL: http://svn.reactos.org/svn/reactos?rev=39724&view=rev Log: Trying to fix r39718, r39719... Modified: trunk/reactos/dll/win32/winmm/winmm.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/include/psdk/mmsystem.h Modified: trunk/reactos/dll/win32/winmm/winmm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm.c?re… ============================================================================== --- trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/winmm.c [iso-8859-1] Mon Feb 23 16:40:50 2009 @@ -2551,7 +2551,7 @@ /************************************************************************** * waveInOpen [WINMM.@] */ -MMRESULT WINAPI waveInOpen(HWAVEIN* lphWaveIn, UINT uDeviceID, +MMRESULT WINAPI waveInOpen(LPHWAVEIN lphWaveIn, UINT uDeviceID, LPCWAVEFORMATEX lpFormat, DWORD_PTR dwCallback, DWORD_PTR dwInstance, DWORD dwFlags) { Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Mon Feb 23 16:40:50 2009 @@ -352,7 +352,7 @@ if (DataRangeAudio->MaximumBitsPerSample <= 16 && DataRangeAudio->MaximumBitsPerSample >= 16) { - Result |= Monot16; + Result |= Mono16Bit; if (DataRangeAudio->MaximumChannels >= 2) { Result |= Stereo8Bit; Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Mon Feb 23 16:40:50 2009 @@ -1660,7 +1660,7 @@ MMRESULT WINAPI waveOutSetVolume(HWAVEOUT,DWORD); MMRESULT WINAPI waveOutGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI waveOutGetErrorTextW(MMRESULT,LPWSTR,UINT); -MMRESULT WINAPI waveOutOpen(LPHWAVEOUT,UINT,LPWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI waveOutOpen(LPHWAVEOUT,UINT,LPCWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI waveOutClose(HWAVEOUT); MMRESULT WINAPI waveOutPrepareHeader(HWAVEOUT,LPWAVEHDR,UINT); MMRESULT WINAPI waveOutUnprepareHeader(HWAVEOUT,LPWAVEHDR,UINT); @@ -1687,7 +1687,7 @@ MMRESULT WINAPI waveInGetDevCapsW(UINT_PTR,LPWAVEINCAPSW,UINT); MMRESULT WINAPI waveInGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI waveInGetErrorTextW(MMRESULT,LPWSTR,UINT); -MMRESULT WINAPI waveInOpen(LPHWAVEIN,UINT,LPWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI waveInOpen(LPHWAVEIN,UINT,LPCWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI waveInClose(HWAVEIN); MMRESULT WINAPI waveInPrepareHeader(HWAVEIN,LPWAVEHDR,UINT); MMRESULT WINAPI waveInUnprepareHeader(HWAVEIN,LPWAVEHDR,UINT);

15 years, 10 months

[dgorbachev] 39722: - Reenable ACPI, it works now. Patch by Cameron Gutman. Bug #3363. - But disable ACPIEnumerateDevices().

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Feb 23 16:17:48 2009 New Revision: 39722 URL: http://svn.reactos.org/svn/reactos?rev=39722&view=rev Log: - Reenable ACPI, it works now. Patch by Cameron Gutman. Bug #3363. - But disable ACPIEnumerateDevices(). Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/drivers/bus/acpi/ospm/fdo.c trunk/reactos/drivers/bus/acpi/ospm/osl.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c 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] Mon Feb 23 16:17:48 2009 @@ -560,6 +560,7 @@ media\inf\cdrom.inf 6 media\inf\display.inf 6 media\inf\font.inf 6 +media\inf\fdc.inf 6 media\inf\hdc.inf 6 media\inf\intl.inf 6 media\inf\layout.inf 6 Modified: trunk/reactos/drivers/bus/acpi/ospm/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/fdo.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/ospm/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/ospm/fdo.c [iso-8859-1] Mon Feb 23 16:17:48 2009 @@ -775,7 +775,9 @@ KeInitializeSpinLock(&DeviceExtension->DeviceListLock); DeviceExtension->DeviceListCount = 0; +#if 0 ACPIEnumerateDevices(DeviceExtension); +#endif ACPIInitializeInternalDrivers(DeviceExtension); Modified: trunk/reactos/drivers/bus/acpi/ospm/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/ospm/osl.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/ospm/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/ospm/osl.c [iso-8859-1] Mon Feb 23 16:17:48 2009 @@ -635,7 +635,7 @@ DPRINT("Waiting for semaphore[%p|%d|%d]\n", handle, units, timeout); - //ExAcquireFastMutex(Mutex); + ExAcquireFastMutex(Mutex); return AE_OK; } @@ -654,7 +654,7 @@ DPRINT("Signaling semaphore[%p|%d]\n", handle, units); - //ExReleaseFastMutex(Mutex); + ExReleaseFastMutex(Mutex); return AE_OK; } Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Feb 23 16:17:48 2009 @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -//#define ENABLE_ACPI +#define ENABLE_ACPI /* GLOBALS *******************************************************************/

15 years, 10 months

[dgorbachev] 39721: Call IopEnumerateDevice() later, after IopCreateArcNames().

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Feb 23 16:17:07 2009 New Revision: 39721 URL: http://svn.reactos.org/svn/reactos?rev=39721&view=rev Log: Call IopEnumerateDevice() later, after IopCreateArcNames(). Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Mon Feb 23 16:17:07 2009 @@ -496,9 +496,6 @@ /* Call back drivers that asked for */ IopReinitializeBootDrivers(); - /* Initialize PnP root relations */ - IopEnumerateDevice(IopRootDeviceNode->PhysicalDeviceObject); - /* Check if this was a ramdisk boot */ if (!_strnicmp(LoaderBlock->ArcBootDeviceName, "ramdisk(0)", 10)) { @@ -512,6 +509,9 @@ /* Mark the system boot partition */ if (!IopMarkBootPartition(LoaderBlock)) return FALSE; + /* Initialize PnP root relations */ + IopEnumerateDevice(IopRootDeviceNode->PhysicalDeviceObject); + #ifndef _WINKD_ /* Read KDB Data */ KdbInit();

15 years, 10 months

[dgorbachev] 39720: Allow shared interrupts.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Feb 23 16:16:43 2009 New Revision: 39720 URL: http://svn.reactos.org/svn/reactos?rev=39720&view=rev Log: Allow shared interrupts. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/irqobj.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=3972… ============================================================================== --- trunk/reactos/include/ndk/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/asm.h [iso-8859-1] Mon Feb 23 16:16:43 2009 @@ -227,12 +227,13 @@ // // KINTERRUPT Offsets // +#define KINTERRUPT_INTERRUPT_LIST_HEAD 0x04 #define KINTERRUPT_SERVICE_ROUTINE 0x0C #define KINTERRUPT_SERVICE_CONTEXT 0x10 #define KINTERRUPT_TICK_COUNT 0x18 #define KINTERRUPT_ACTUAL_LOCK 0x1C -#define KINTERRUPT_IRQL 0x20 #define KINTERRUPT_VECTOR 0x24 +#define KINTERRUPT_IRQL 0x28 #define KINTERRUPT_SYNCHRONIZE_IRQL 0x29 #define KINTERRUPT_DISPATCH_COUNT 0x38 Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Mon Feb 23 16:16:43 2009 @@ -1334,7 +1334,7 @@ mov [edi+KINTERRUPT_TICK_COUNT], eax jmp VfRstDef_&Label -.1: +1: /* Check if the debugger is enabled */ cmp byte ptr __KdDebuggerEnabled, 0 jnz 1f Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Mon Feb 23 16:16:43 2009 @@ -281,13 +281,17 @@ (Dispatch.Interrupt->Mode == Interrupt->Mode)) { /* The vector is shared and the interrupts are compatible */ - ASSERT(FALSE); // FIXME: NOT YET SUPPORTED/TESTED Interrupt->Connected = Connected = TRUE; - ASSERT(Irql <= SYNCH_LEVEL); + + /* FIXME */ + // ASSERT(Irql <= SYNCH_LEVEL); /* Check if this is the first chain */ if (Dispatch.Type != ChainConnect) { + /* This is not supported */ + ASSERT(Dispatch.Interrupt->Mode != Latched); + /* Setup the chainned handler */ KiConnectVectorToInterrupt(Dispatch.Interrupt, ChainConnect); } Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Mon Feb 23 16:16:43 2009 @@ -2533,8 +2533,81 @@ .func KiChainedDispatch2ndLvl@0 _KiChainedDispatch2ndLvl@0: - /* Not yet supported */ - UNHANDLED_PATH +NextSharedInt: + /* Raise IRQL if necessary */ + mov cl, [edi+KINTERRUPT_SYNCHRONIZE_IRQL] + cmp cl, [edi+KINTERRUPT_IRQL] + je 1f + call @KfRaiseIrql@4 + +1: + /* Acquire the lock */ + mov esi, [edi+KINTERRUPT_ACTUAL_LOCK] +GetIntLock2: + ACQUIRE_SPINLOCK(esi, IntSpin2) + + /* Make sure that this interrupt isn't storming */ + VERIFY_INT kid2 + + /* Save the tick count */ + mov esi, _KeTickCount + + /* Call the ISR */ + mov eax, [edi+KINTERRUPT_SERVICE_CONTEXT] + push eax + push edi + call [edi+KINTERRUPT_SERVICE_ROUTINE] + + /* Save the ISR result */ + mov bl, al + + /* Check if the ISR timed out */ + add esi, _KiISRTimeout + cmp _KeTickCount, esi + jnc ChainedIsrTimeout + +ReleaseLock2: + /* Release the lock */ + mov esi, [edi+KINTERRUPT_ACTUAL_LOCK] + RELEASE_SPINLOCK(esi) + + /* Lower IRQL if necessary */ + mov cl, [edi+KINTERRUPT_IRQL] + cmp cl, [edi+KINTERRUPT_SYNCHRONIZE_IRQL] + je 1f + call @KfLowerIrql@4 + +1: + /* Check if the interrupt is handled */ + or bl, bl + jnz 1f + + /* Try the next shared interrupt handler */ + mov eax, [edi+KINTERRUPT_INTERRUPT_LIST_HEAD] + lea edi, [eax-KINTERRUPT_INTERRUPT_LIST_HEAD] + jmp NextSharedInt + +1: + ret + +#ifdef CONFIG_SMP +IntSpin2: + SPIN_ON_LOCK(esi, GetIntLock2) +#endif + +ChainedIsrTimeout: + /* Print warning message */ + push [edi+KINTERRUPT_SERVICE_ROUTINE] + push offset _IsrTimeoutMsg + call _DbgPrint + add esp,8 + + /* Break into debugger, then continue */ + int 3 + jmp ReleaseLock2 + + /* Cleanup verification */ + VERIFY_INT_END kid2, 0 .endfunc .func KiChainedDispatch@0 @@ -2599,8 +2672,8 @@ jz SpuriousInt /* Acquire the lock */ + mov esi, [edi+KINTERRUPT_ACTUAL_LOCK] GetIntLock: - mov esi, [edi+KINTERRUPT_ACTUAL_LOCK] ACQUIRE_SPINLOCK(esi, IntSpin) /* Make sure that this interrupt isn't storming */

15 years, 10 months

[janderwald] 39719: - Extend test prog for quering capabilities - Store PCFILTER in subdevice filter - Call driver provided property request handlers - partly implement waveout get capabilties (WIP) - remove definitions for waveoutcaps, auxcaps, waveincaps, they are defined in mmsystem.h

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 23 14:13:35 2009 New Revision: 39719 URL: http://svn.reactos.org/svn/reactos?rev=39719&view=rev Log: - Extend test prog for quering capabilities - Store PCFILTER in subdevice filter - Call driver provided property request handlers - partly implement waveout get capabilties (WIP) - remove definitions for waveoutcaps, auxcaps, waveincaps, they are defined in mmsystem.h Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] Mon Feb 23 14:13:35 2009 @@ -47,6 +47,7 @@ DeviceInfo.DeviceType = WAVE_OUT_DEVICE_TYPE; + Status = DeviceIoControl(hWdmAud, IOCTL_GETNUMDEVS_TYPE, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); if (!Status) @@ -74,6 +75,15 @@ DeviceInfo.u.WaveFormatEx.nAvgBytesPerSec = 48000 * 4; DeviceInfo.u.WaveFormatEx.wBitsPerSample = 16; + Status = DeviceIoControl(hWdmAud, IOCTL_GETCAPABILITIES, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); + + if (!Status) + { + if (WaitForSingleObject(&Overlapped.hEvent, 5000) != WAIT_OBJECT_0) + { + printf("Failed to get iocaps %lx\n", GetLastError()); + } + } Status = DeviceIoControl(hWdmAud, IOCTL_OPEN_WDMAUD, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); @@ -86,6 +96,9 @@ return -1; } } + + + // // Allocate a buffer for 1 second @@ -119,7 +132,7 @@ return -1; } } - + // // Play our 1-second buffer // @@ -136,6 +149,8 @@ } } + printf("WDMAUD: Played buffer\n"); + DeviceInfo.State = KSSTATE_STOP; Status = DeviceIoControl(hWdmAud, IOCTL_SETDEVICE_STATE, (LPVOID)&DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &DeviceInfo, sizeof(WDMAUD_DEVICE_INFO), &BytesReturned, &Overlapped); if (!Status) @@ -147,6 +162,9 @@ return -1; } } + printf("WDMAUD: STOPPED\n"); CloseHandle(hWdmAud); + CloseHandle(&Overlapped.hEvent); + printf("WDMAUD: COMPLETE\n"); return 0; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Mon Feb 23 14:13:35 2009 @@ -128,6 +128,8 @@ GUID *Interfaces; KSPIN_FACTORY Factory; KSPROPERTY_SET_LIST FilterPropertySet; + + PPCFILTER_DESCRIPTOR DeviceDescriptor; }SUBDEVICE_DESCRIPTOR, *PSUBDEVICE_DESCRIPTOR; #undef INTERFACE Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Mon Feb 23 14:13:35 2009 @@ -133,27 +133,55 @@ PFNKSHANDLER PropertyHandler = NULL; UNICODE_STRING GuidString; NTSTATUS Status = STATUS_UNSUCCESSFUL; + PCPROPERTY_REQUEST PropertyRequest; IoStack = IoGetCurrentIrpStackLocation(Irp); Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; ASSERT(Property); - DPRINT1("Num of Property Sets %u\n", Descriptor->FilterPropertySet.FreeKsPropertySetOffset); + /* check properties provided by the driver */ + if (Descriptor->DeviceDescriptor->AutomationTable) + { + for(Index = 0; Index < Descriptor->DeviceDescriptor->AutomationTable->PropertyCount; Index++) + { + if (IsEqualGUID(&Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Set, &Property->Set)) + { + if (Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Id == Property->Id) + { + if(Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Flags & Property->Flags) + { + RtlZeroMemory(&PropertyRequest, sizeof(PCPROPERTY_REQUEST)); + PropertyRequest.PropertyItem = &Descriptor->DeviceDescriptor->AutomationTable->Properties[Index]; + PropertyRequest.Verb = Property->Flags; + PropertyRequest.Value = Irp->UserBuffer; + PropertyRequest.ValueSize = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + PropertyRequest.Irp = Irp; + + DPRINT("Calling handler %p\n", Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Handler); + Status = Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Handler(&PropertyRequest); + + Irp->IoStatus.Information = PropertyRequest.ValueSize; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + } + } + } + } + + DPRINT("Num of Property Sets %u\n", Descriptor->FilterPropertySet.FreeKsPropertySetOffset); for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) { - RtlStringFromGUID ((GUID*)Descriptor->FilterPropertySet.Properties[Index].Set, &GuidString); - DPRINT1("Current GUID %S\n", GuidString.Buffer); - RtlFreeUnicodeString(&GuidString); - if (IsEqualGUIDAligned(&Property->Set, Descriptor->FilterPropertySet.Properties[Index].Set)) { - DPRINT1("Found Property Set Properties %u\n", Descriptor->FilterPropertySet.Properties[Index].PropertiesCount); + DPRINT("Found Property Set Properties %u\n", Descriptor->FilterPropertySet.Properties[Index].PropertiesCount); for(ItemIndex = 0; ItemIndex < Descriptor->FilterPropertySet.Properties[Index].PropertiesCount; ItemIndex++) { if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].PropertyId == Property->Id) { - DPRINT1("Found property set identifier %u\n", Property->Id); + DPRINT("Found property set identifier %u\n", Property->Id); if (Property->Flags & KSPROPERTY_TYPE_SET) PropertyHandler = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].SetPropertyHandler; @@ -165,6 +193,7 @@ /* too small input buffer */ Irp->IoStatus.Information = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinProperty; Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; } @@ -173,19 +202,20 @@ /* too small output buffer */ Irp->IoStatus.Information = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinData; Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; } if (PropertyHandler) { KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PVOID)Descriptor; - DPRINT1("Calling property handler %p\n", PropertyHandler); + DPRINT("Calling property handler %p\n", PropertyHandler); Status = PropertyHandler(Irp, Property, Irp->UserBuffer); } /* the information member is set by the handler */ Irp->IoStatus.Status = Status; - DPRINT1("Result %x\n", Status); + DPRINT("Result %x\n", Status); IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c [iso-8859-1] Mon Feb 23 14:13:35 2009 @@ -204,7 +204,7 @@ Descriptor->Factory.Instances[Index].MinFilterInstanceCount = FilterDescription->Pins[Index].MinFilterInstanceCount; } } - + Descriptor->DeviceDescriptor = FilterDescription; *OutSubdeviceDescriptor = Descriptor; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Mon Feb 23 14:13:35 2009 @@ -16,7 +16,6 @@ const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; - NTSTATUS SetIrpIoStatus( @@ -324,17 +323,140 @@ Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, (PVOID)Packet, sizeof(KSSTREAM_HEADER), NULL, 0, &BytesReturned); DPRINT1("KsSynchronousIoControlDevice result %x\n", Status); - - IoMarkIrpPending(Irp); - Irp->IoStatus.Information = DeviceInfo->BufferSize; - Irp->IoStatus.Status = Status; - ExFreePool(Buffer); - return Status; -} - - + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); +} + +ULONG +CheckFormatSupport( + IN PKSDATARANGE_AUDIO DataRangeAudio, + ULONG SampleFrequency, + ULONG Mono8Bit, + ULONG Stereo8Bit, + ULONG Mono16Bit, + ULONG Stereo16Bit) +{ + ULONG Result = 0; + + if (DataRangeAudio->MinimumSampleFrequency <= SampleFrequency && DataRangeAudio->MaximumSampleFrequency >= SampleFrequency) + { + if (DataRangeAudio->MinimumBitsPerSample <= 8 && DataRangeAudio->MaximumBitsPerSample >= 8) + { + Result |= Mono8Bit; + if (DataRangeAudio->MaximumChannels >= 2) + { + Result |= Stereo8Bit; + } + } + + if (DataRangeAudio->MaximumBitsPerSample <= 16 && DataRangeAudio->MaximumBitsPerSample >= 16) + { + Result |= Monot16; + if (DataRangeAudio->MaximumChannels >= 2) + { + Result |= Stereo8Bit; + } + } + } + return Result; + +} + +NTSTATUS +WdmAudCapabilities( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN PWDMAUD_CLIENT ClientInfo) +{ + KSP_PIN PinProperty; + KSPROPERTY Property; + KSCOMPONENTID ComponentId; + KSMULTIPLE_ITEM * MultipleItem; + ULONG BytesReturned; + PKSDATARANGE_AUDIO DataRangeAudio; + PKSDATARANGE DataRange; + NTSTATUS Status; + ULONG Index; + ULONG wChannels = 0; + ULONG dwFormats = 0; + ULONG dwSupport = 0; + + Property.Set = KSPROPSETID_General; + Property.Id = KSPROPERTY_GENERAL_COMPONENTID; + Property.Flags = KSPROPERTY_TYPE_GET; + + RtlZeroMemory(&ComponentId, sizeof(KSCOMPONENTID)); + + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), (PVOID)&ComponentId, sizeof(KSCOMPONENTID), &BytesReturned); + if (!NT_SUCCESS(Status)) + { + DPRINT1("KSPROPERTY_GENERAL_COMPONENTID failed with %x\n", Status); + return SetIrpIoStatus(Irp, Status, 0); + } + + PinProperty.PinId = 0; //FIXME + PinProperty.Property.Set = KSPROPSETID_Pin; + PinProperty.Property.Id = KSPROPERTY_PIN_DATARANGES; + PinProperty.Property.Flags = KSPROPERTY_TYPE_GET; + + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), (PVOID)NULL, 0, &BytesReturned); + if (Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT1("KSPROPERTY_PIN_DATARANGES failed with %x\n", Status); + return SetIrpIoStatus(Irp, Status, 0); + } + + MultipleItem = ExAllocatePool(NonPagedPool, BytesReturned); + if (!MultipleItem) + { + /* no memory */ + return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); + } + + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), (PVOID)MultipleItem, BytesReturned, &BytesReturned); + if (!NT_SUCCESS(Status)) + { + ExFreePool(MultipleItem); + return SetIrpIoStatus(Irp, Status, 0); + } + + DataRange = (PKSDATARANGE) (MultipleItem + 1); + for(Index = 0; Index < MultipleItem->Count; Index++) + { + if (DeviceInfo->DeviceType == WAVE_OUT_DEVICE_TYPE || DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE) + { + if (DataRange->FormatSize == sizeof(KSDATARANGE_AUDIO)) + { + DataRangeAudio = (PKSDATARANGE_AUDIO)DataRange; + + if (IsEqualGUIDAligned(&DataRangeAudio->DataRange.MajorFormat, &KSDATAFORMAT_TYPE_AUDIO) && + IsEqualGUIDAligned(&DataRangeAudio->DataRange.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM) && + IsEqualGUIDAligned(&DataRangeAudio->DataRange.Specifier, &KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)) + { + dwFormats |= CheckFormatSupport(DataRangeAudio, 11025, WAVE_FORMAT_1M08, WAVE_FORMAT_1S08, WAVE_FORMAT_1M16, WAVE_FORMAT_1S16); + dwFormats |= CheckFormatSupport(DataRangeAudio, 22050, WAVE_FORMAT_2M08, WAVE_FORMAT_2S08, WAVE_FORMAT_2M16, WAVE_FORMAT_2S16); + dwFormats |= CheckFormatSupport(DataRangeAudio, 44100, WAVE_FORMAT_4M08, WAVE_FORMAT_4S08, WAVE_FORMAT_4M16, WAVE_FORMAT_4S16); + dwFormats |= CheckFormatSupport(DataRangeAudio, 48000, WAVE_FORMAT_48M08, WAVE_FORMAT_48S08, WAVE_FORMAT_48M16, WAVE_FORMAT_48S16); + dwFormats |= CheckFormatSupport(DataRangeAudio, 96000, WAVE_FORMAT_96M08, WAVE_FORMAT_96S08, WAVE_FORMAT_96M16, WAVE_FORMAT_96S16); + + wChannels = DataRangeAudio->MaximumChannels; + dwSupport = WAVECAPS_VOLUME; //FIXME get info from nodes + } + } + } + + } + + DeviceInfo->u.WaveOutCaps.dwFormats = dwFormats; + DeviceInfo->u.WaveOutCaps.dwSupport = dwSupport; + DeviceInfo->u.WaveOutCaps.wChannels = wChannels; + DeviceInfo->u.WaveOutCaps.wMid = ComponentId.Manufacturer.Data1 - 0xd5a47fa7; + DeviceInfo->u.WaveOutCaps.vDriverVersion = MAKELONG(ComponentId.Version, ComponentId.Revision); + + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); +} NTSTATUS NTAPI @@ -386,12 +508,13 @@ return WdmAudControlDeviceState(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_WRITEDATA: return WdmAudControlWriteData(DeviceObject, Irp, DeviceInfo, ClientInfo); - + case IOCTL_GETCAPABILITIES: + return WdmAudCapabilities(DeviceObject, Irp, DeviceInfo, ClientInfo); case IOCTL_CLOSE_WDMAUD: case IOCTL_GETDEVID: case IOCTL_GETVOLUME: case IOCTL_SETVOLUME: - case IOCTL_GETCAPABILITIES: + DPRINT1("Unhandeled %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); break; } Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Mon Feb 23 14:13:35 2009 @@ -8,55 +8,7 @@ #define YDEBUG #include <debug.h> #include <ksmedia.h> - - -#ifndef MAXPNAMELEN -#define MAXPNAMELEN 32 -#endif - -#ifndef WAVEOUTCAPS - -typedef struct -{ - USHORT wMid; - USHORT wPid; - ULONG vDriverVersion; - WCHAR szPname[MAXPNAMELEN]; - ULONG dwFormats; - USHORT wChannels; - USHORT wReserved1; - ULONG dwSupport; -} WAVEOUTCAPS; - -#endif - -#ifndef AUXCAPS - -typedef struct { - USHORT wMid; - USHORT wPid; - ULONG vDriverVersion; - WCHAR szPname[MAXPNAMELEN]; - USHORT wTechnology; - USHORT wReserved1; - ULONG dwSupport; -} AUXCAPS; - -#endif - -#ifndef WAVEINCAPS - -typedef struct -{ - USHORT wMid; - USHORT wPid; - ULONG vDriverVersion; - WCHAR szPname[MAXPNAMELEN]; - ULONG dwFormats; - USHORT wChannels; - USHORT wReserved1; -} WAVEINCAPS; -#endif +#include <mmsystem.h> #include "interface.h"

15 years, 10 months

[janderwald] 39718: - Add KSDATARANGE_AUDIO - Fix prototype for waveOutOpen, waveInOpen

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 23 14:09:32 2009 New Revision: 39718 URL: http://svn.reactos.org/svn/reactos?rev=39718&view=rev Log: - Add KSDATARANGE_AUDIO - Fix prototype for waveOutOpen, waveInOpen Modified: trunk/reactos/include/psdk/ksmedia.h trunk/reactos/include/psdk/mmsystem.h 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] Mon Feb 23 14:09:32 2009 @@ -134,6 +134,15 @@ } KSDATAFORMAT_WAVEFORMATEX, *PKSDATAFORMAT_WAVEFORMATEX; //#endif + +typedef struct { + KSDATARANGE DataRange; + ULONG MaximumChannels; + ULONG MinimumBitsPerSample; + ULONG MaximumBitsPerSample; + ULONG MinimumSampleFrequency; + ULONG MaximumSampleFrequency; +} KSDATARANGE_AUDIO, *PKSDATARANGE_AUDIO; // 'vids' #define STATIC_KSDATAFORMAT_TYPE_VIDEO \ Modified: trunk/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmsystem.h?re… ============================================================================== --- trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmsystem.h [iso-8859-1] Mon Feb 23 14:09:32 2009 @@ -1660,7 +1660,7 @@ MMRESULT WINAPI waveOutSetVolume(HWAVEOUT,DWORD); MMRESULT WINAPI waveOutGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI waveOutGetErrorTextW(MMRESULT,LPWSTR,UINT); -MMRESULT WINAPI waveOutOpen(LPHWAVEOUT,UINT,LPCWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI waveOutOpen(LPHWAVEOUT,UINT,LPWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI waveOutClose(HWAVEOUT); MMRESULT WINAPI waveOutPrepareHeader(HWAVEOUT,LPWAVEHDR,UINT); MMRESULT WINAPI waveOutUnprepareHeader(HWAVEOUT,LPWAVEHDR,UINT); @@ -1687,7 +1687,7 @@ MMRESULT WINAPI waveInGetDevCapsW(UINT_PTR,LPWAVEINCAPSW,UINT); MMRESULT WINAPI waveInGetErrorTextA(MMRESULT,LPSTR,UINT); MMRESULT WINAPI waveInGetErrorTextW(MMRESULT,LPWSTR,UINT); -MMRESULT WINAPI waveInOpen(LPHWAVEIN,UINT,LPCWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD); +MMRESULT WINAPI waveInOpen(LPHWAVEIN,UINT,LPWAVEFORMATEX,DWORD_PTR,DWORD_PTR,DWORD); MMRESULT WINAPI waveInClose(HWAVEIN); MMRESULT WINAPI waveInPrepareHeader(HWAVEIN,LPWAVEHDR,UINT); MMRESULT WINAPI waveInUnprepareHeader(HWAVEIN,LPWAVEHDR,UINT);

15 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009