Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 39729: - Fix Portcls release build by putting a variable inside a DBG #define as it is only used in an ASSERT()

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Tue Feb 24 01:19:58 2009 New Revision: 39729 URL: http://svn.reactos.org/svn/reactos?rev=39729&view=rev Log: - Fix Portcls release build by putting a variable inside a DBG #define as it is only used in an ASSERT() Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Tue Feb 24 01:19:58 2009 @@ -145,8 +145,9 @@ PIO_STACK_LOCATION IoStack; ISubdevice *SubDevice = NULL; SUBDEVICE_DESCRIPTOR * Descriptor; - +#if defined(DBG) IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; +#endif IoStack = IoGetCurrentIrpStackLocation(Irp); ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY);

16 years, 4 months

[janderwald] 39728: - Set a completion routine for irps send to lower devices by KsSynchronousIoControlDevice - Fix a bug in PcPropertyHandler - Implement more aspects of IOCTL_GETCAPABILITIES

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 24 00:51:41 2009 New Revision: 39728 URL: http://svn.reactos.org/svn/reactos?rev=39728&view=rev Log: - Set a completion routine for irps send to lower devices by KsSynchronousIoControlDevice - Fix a bug in PcPropertyHandler - Implement more aspects of IOCTL_GETCAPABILITIES Modified: trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Tue Feb 24 00:51:41 2009 @@ -227,6 +227,21 @@ UNIMPLEMENTED; } +NTSTATUS +NTAPI +CompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PIO_STATUS_BLOCK IoStatusBlock = (PIO_STATUS_BLOCK)Context; + + IoStatusBlock->Information = Irp->IoStatus.Information; + IoStatusBlock->Status = Irp->IoStatus.Status; + + return STATUS_SUCCESS; +} + /* @implemented */ @@ -269,14 +284,17 @@ IoStack = IoGetNextIrpStackLocation(Irp); IoStack->FileObject = FileObject; + IoSetCompletionRoutine(Irp, CompletionRoutine, (PVOID)&IoStatusBlock, TRUE, TRUE, TRUE); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, RequestorMode, FALSE, NULL); + Status = IoStatusBlock.Status; } *BytesReturned = IoStatusBlock.Information; - return IoStatusBlock.Status; + return Status; } 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] Tue Feb 24 00:51:41 2009 @@ -145,7 +145,7 @@ { for(Index = 0; Index < Descriptor->DeviceDescriptor->AutomationTable->PropertyCount; Index++) { - if (IsEqualGUID(&Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Set, &Property->Set)) + if (IsEqualGUID(Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Set, &Property->Set)) { if (Descriptor->DeviceDescriptor->AutomationTable->Properties[Index].Id == Property->Id) { @@ -171,17 +171,14 @@ } } - DPRINT("Num of Property Sets %u\n", Descriptor->FilterPropertySet.FreeKsPropertySetOffset); for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) { if (IsEqualGUIDAligned(&Property->Set, Descriptor->FilterPropertySet.Properties[Index].Set)) { - 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) { - DPRINT("Found property set identifier %u\n", Property->Id); if (Property->Flags & KSPROPERTY_TYPE_SET) PropertyHandler = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].SetPropertyHandler; @@ -215,7 +212,7 @@ /* the information member is set by the handler */ Irp->IoStatus.Status = Status; - DPRINT("Result %x\n", Status); + DPRINT("Result %x Length %u\n", Status, Irp->IoStatus.Information); IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } 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] Tue Feb 24 00:51:41 2009 @@ -8,6 +8,7 @@ */ #include "wdmaud.h" +const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Sysaudio = {0xCBE3FAA0L, 0xCC75, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6}}; const GUID KSPROPSETID_General = {0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; @@ -371,42 +372,55 @@ IN PWDMAUD_CLIENT ClientInfo) { KSP_PIN PinProperty; - KSPROPERTY Property; KSCOMPONENTID ComponentId; KSMULTIPLE_ITEM * MultipleItem; ULONG BytesReturned; PKSDATARANGE_AUDIO DataRangeAudio; PKSDATARANGE DataRange; - NTSTATUS Status; + 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; + ULONG PinId; + + DPRINT("WdmAudCapabilities entered\n"); + + PinProperty.PinId = DeviceInfo->DeviceIndex; // used as index of the virtual audio device + PinProperty.Property.Set = KSPROPSETID_Sysaudio; + PinProperty.Property.Id = KSPROPERTY_SYSAUDIO_COMPONENT_ID; + PinProperty.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 + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinProperty, sizeof(KSP_PIN), (PVOID)&ComponentId, sizeof(KSCOMPONENTID), &BytesReturned); + if (NT_SUCCESS(Status)) + { + DeviceInfo->u.WaveOutCaps.wMid = ComponentId.Manufacturer.Data1 - 0xd5a47fa7; + DeviceInfo->u.WaveOutCaps.vDriverVersion = MAKELONG(ComponentId.Version, ComponentId.Revision); + } + + //FIXME + // Reserved index defines the audio device index + // pin offset should be first determined + // by determing the pin type of the target filter + PinId = 0; + + PinProperty.Reserved = DeviceInfo->DeviceIndex; + PinProperty.PinId = PinId; 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); + + BytesReturned = 0; + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinProperty, sizeof(KSP_PIN), (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) @@ -415,7 +429,7 @@ return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); } - Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSPROPERTY), (PVOID)MultipleItem, BytesReturned, &BytesReturned); + Status = KsSynchronousIoControlDevice(ClientInfo->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinProperty, sizeof(KSP_PIN), (PVOID)MultipleItem, BytesReturned, &BytesReturned); if (!NT_SUCCESS(Status)) { ExFreePool(MultipleItem); @@ -452,8 +466,8 @@ 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); + + ExFreePool(MultipleItem); return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Tue Feb 24 00:51:41 2009 @@ -261,14 +261,14 @@ ASSERT(WorkerContext->DispatchContext->FileObject != NULL); ASSERT(WorkerContext->DispatchContext->Handle != NULL); ASSERT(WorkerContext->AudioClient); - ASSERT(WorkerContext->AudioClient->Handels); + ASSERT(WorkerContext->AudioClient->Handels); ASSERT(WorkerContext->AudioClient->Handels[WorkerContext->AudioClient->NumDevices -1] == NULL); /* store pin context */ FileObject->FsContext2 = (PVOID)WorkerContext->DispatchContext; /* store pin handle in client specific struct */ - WorkerContext->AudioClient->Handels[WorkerContext->AudioClient->NumDevices-1] = PinHandle; + WorkerContext->AudioClient->Handels[WorkerContext->AudioClient->NumDevices-1] = PinHandle; DPRINT1("Successfully created Pin %p\n", WorkerContext->Irp); *((PHANDLE)WorkerContext->Irp->UserBuffer) = PinHandle; @@ -319,7 +319,37 @@ Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; DeviceExtension = (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension; - if (IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Sysaudio)) + if (IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Pin)) + { + /* ros specific request */ + if (Property->Id == KSPROPERTY_PIN_DATARANGES) + { + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSP_PIN)) + { + /* too small buffer */ + return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPROPERTY) + sizeof(ULONG)); + } + + Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, ((KSP_PIN*)Property)->Reserved); + if (!Entry) + { + /* too small buffer */ + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, + (PVOID)IoStack->Parameters.DeviceIoControl.Type3InputBuffer, + IoStack->Parameters.DeviceIoControl.InputBufferLength, + Irp->UserBuffer, + IoStack->Parameters.DeviceIoControl.OutputBufferLength, + &BytesReturned); + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = BytesReturned; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + } + else if (IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Sysaudio)) { if (Property->Id == KSPROPERTY_SYSAUDIO_COMPONENT_ID) { @@ -350,7 +380,7 @@ PropertyRequest.Flags = KSPROPERTY_TYPE_GET; /* call the filter */ - Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&ComponentId, sizeof(KSCOMPONENTID), &BytesReturned); + Status = KsSynchronousIoControlDevice(Entry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&ComponentId, sizeof(KSCOMPONENTID), &BytesReturned); if (!NT_SUCCESS(Status)) { DPRINT1("KsSynchronousIoControlDevice failed with %x for KSPROPERTY_GENERAL_COMPONENTID\n", Status); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c [iso-8859-1] Tue Feb 24 00:51:41 2009 @@ -27,8 +27,6 @@ DPRINT1("Dispatch_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); IoStack = IoGetCurrentIrpStackLocation(Irp); - - if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY) { return SysAudioHandleProperty(DeviceObject, Irp); @@ -87,26 +85,26 @@ DPRINT1("Dispatch_fnClose called DeviceObject %p Irp %p\n", DeviceObject); - IoStatus = IoGetCurrentIrpStackLocation(Irp); + IoStatus = IoGetCurrentIrpStackLocation(Irp); Client = (PSYSAUDIO_CLIENT)IoStatus->FileObject->FsContext2; DPRINT1("Client %p NumDevices %u\n", Client, Client->NumDevices); for(Index = 0; Index < Client->NumDevices; Index++) - { + { if (Client->Handels[Index]) - { + { ZwClose(Client->Handels[Index]); - } - } - - if (Client->Handels) - ExFreePool(Client->Handels); - - if (Client->Devices) - ExFreePool(Client->Devices); - - ExFreePool(Client); + } + } + + if (Client->Handels) + ExFreePool(Client->Handels); + + if (Client->Devices) + ExFreePool(Client->Devices); + + ExFreePool(Client); //FIXME // cleanup resources

16 years, 4 months

[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/

16 years, 4 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

16 years, 4 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

16 years, 4 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);

16 years, 4 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);

16 years, 4 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 *******************************************************************/

16 years, 4 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();

16 years, 4 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 */

16 years, 4 months

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