Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 42580: [WDMAUD] - Remove ReactOS specific pin creation hack [SYSAUDIO] - Refactor sysaudio pin creation - Remove ReactOS specific pin creation hack - Remove unused functions
by janderwald＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: janderwald Date: Mon Aug 10 09:14:04 2009 New Revision: 42580 URL: http://svn.reactos.org/svn/reactos?rev=42580&view=rev Log: [WDMAUD] - Remove ReactOS specific pin creation hack [SYSAUDIO] - Refactor sysaudio pin creation - Remove ReactOS specific pin creation hack - Remove unused functions Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/sysaudio/control.c trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c trunk/reactos/drivers/wdm/audio/sysaudio/dispatcher.c trunk/reactos/drivers/wdm/audio/sysaudio/pin.c trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h 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 Aug 10 09:14:04 2009 @@ -135,7 +135,7 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo) { - PSYSAUDIO_INSTANCE_INFO InstanceInfo; + SYSAUDIO_INSTANCE_INFO InstanceInfo; PWDMAUD_DEVICE_EXTENSION DeviceExtension; ULONG BytesReturned; NTSTATUS Status; @@ -185,21 +185,16 @@ } - Length = sizeof(KSDATAFORMAT_WAVEFORMATEX) + sizeof(KSPIN_CONNECT) + sizeof(SYSAUDIO_INSTANCE_INFO); - InstanceInfo = ExAllocatePool(NonPagedPool, Length); - if (!InstanceInfo) + Length = sizeof(KSDATAFORMAT_WAVEFORMATEX) + sizeof(KSPIN_CONNECT); + PinConnect = ExAllocatePool(NonPagedPool, Length); + if (!PinConnect) { /* no memory */ return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); } - InstanceInfo->Property.Set = KSPROPSETID_Sysaudio; - InstanceInfo->Property.Id = KSPROPERTY_SYSAUDIO_INSTANCE_INFO; - InstanceInfo->Property.Flags = KSPROPERTY_TYPE_SET; - InstanceInfo->Flags = 0; - InstanceInfo->DeviceNumber = FilterId; - DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE || DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE || DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) @@ -214,9 +209,6 @@ { DesiredAccess |= GENERIC_WRITE; } - - PinConnect = (KSPIN_CONNECT*)(InstanceInfo + 1); - PinConnect->Interface.Set = KSINTERFACESETID_Standard; PinConnect->Interface.Id = KSINTERFACE_STANDARD_STREAMING; @@ -224,8 +216,8 @@ PinConnect->Medium.Set = KSMEDIUMSETID_Standard; PinConnect->Medium.Id = KSMEDIUM_TYPE_ANYINSTANCE; PinConnect->Medium.Flags = 0; + PinConnect->PinToHandle = NULL; PinConnect->PinId = PinId; - PinConnect->PinToHandle = DeviceExtension->hSysAudio; PinConnect->Priority.PriorityClass = KSPRIORITY_NORMAL; PinConnect->Priority.PrioritySubClass = 1; @@ -247,9 +239,29 @@ DataFormat->DataFormat.Specifier = KSDATAFORMAT_SPECIFIER_WAVEFORMATEX; DataFormat->DataFormat.SampleSize = 4; - /* ros specific pin creation request */ - InstanceInfo->Property.Id = (ULONG)-1; - Status = KsSynchronousIoControlDevice(DeviceExtension->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)InstanceInfo, Length, &PinHandle, sizeof(HANDLE), &BytesReturned); + /* setup property request */ + InstanceInfo.Property.Set = KSPROPSETID_Sysaudio; + InstanceInfo.Property.Id = KSPROPERTY_SYSAUDIO_INSTANCE_INFO; + InstanceInfo.Property.Flags = KSPROPERTY_TYPE_SET; + InstanceInfo.Flags = 0; + InstanceInfo.DeviceNumber = FilterId; + + /* first open the virtual device */ + Status = KsSynchronousIoControlDevice(DeviceExtension->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&InstanceInfo, sizeof(SYSAUDIO_INSTANCE_INFO), NULL, 0, &BytesReturned); + + if (!NT_SUCCESS(Status)) + { + /* failed */ + ExFreePool(PinConnect); + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); + } + + /* now create the pin */ + Status = KsCreatePin(DeviceExtension->hSysAudio, PinConnect, DesiredAccess, &PinHandle); + + /* free create info */ + ExFreePool(PinConnect); + if (NT_SUCCESS(Status)) { PWDMAUD_HANDLE Handels; 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] Mon Aug 10 09:14:04 2009 @@ -19,15 +19,6 @@ const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; NTSTATUS -ComputeCompatibleFormat( - IN PKSAUDIO_DEVICE_ENTRY Entry, - IN ULONG PinId, - IN PSYSAUDIODEVEXT DeviceExtension, - IN PKSDATAFORMAT_WAVEFORMATEX ClientFormat, - OUT PKSDATAFORMAT_WAVEFORMATEX MixerFormat); - - -NTSTATUS SetIrpIoStatus( IN PIRP Irp, IN NTSTATUS Status, @@ -70,11 +61,13 @@ PSYSAUDIODEVEXT DeviceExtension) { PKSAUDIO_DEVICE_ENTRY Entry; - PKSOBJECT_CREATE_ITEM CreateItem; - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - ASSERT(CreateItem); + PIO_STACK_LOCATION IoStack; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity check */ + ASSERT(IoStack->FileObject); if (DeviceNumber >= DeviceExtension->NumberOfKsAudioDevices) { @@ -86,262 +79,12 @@ Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, DeviceNumber); ASSERT(Entry != NULL); + /* store device entry in FsContext2 + * see pin.c DispatchCreateSysAudioPin for details + */ + IoStack->FileObject->FsContext2 = (PVOID)Entry; + return SetIrpIoStatus(Irp, STATUS_SUCCESS, 0); -} - -NTSTATUS -SetMixerInputOutputFormat( - IN PFILE_OBJECT FileObject, - IN PKSDATAFORMAT InputFormat, - IN PKSDATAFORMAT OutputFormat) -{ - KSP_PIN PinRequest; - ULONG BytesReturned; - NTSTATUS Status; - - /* re-using pin */ - PinRequest.Property.Set = KSPROPSETID_Connection; - PinRequest.Property.Flags = KSPROPERTY_TYPE_SET; - PinRequest.Property.Id = KSPROPERTY_CONNECTION_DATAFORMAT; - - /* set the input format */ - PinRequest.PinId = 0; - DPRINT("InputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", InputFormat, InputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, - (PVOID)&PinRequest, - sizeof(KSP_PIN), - (PVOID)InputFormat, - InputFormat->FormatSize, - &BytesReturned); - if (!NT_SUCCESS(Status)) - return Status; - - /* set the the output format */ - PinRequest.PinId = 1; - DPRINT("OutputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", OutputFormat, OutputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); - Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, - (PVOID)&PinRequest, - sizeof(KSP_PIN), - (PVOID)OutputFormat, - OutputFormat->FormatSize, - &BytesReturned); - return Status; -} - - -NTSTATUS -CreateMixerPinAndSetFormat( - IN HANDLE KMixerHandle, - IN KSPIN_CONNECT *PinConnect, - IN PKSDATAFORMAT InputFormat, - IN PKSDATAFORMAT OutputFormat, - OUT PHANDLE MixerPinHandle) -{ - NTSTATUS Status; - HANDLE PinHandle; - PFILE_OBJECT FileObject; - - Status = KsCreatePin(KMixerHandle, PinConnect, GENERIC_READ | GENERIC_WRITE, &PinHandle); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create Mixer Pin with %x\n", Status); - return STATUS_UNSUCCESSFUL; - } - - Status = ObReferenceObjectByHandle(PinHandle, - GENERIC_READ | GENERIC_WRITE, - IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get file object with %x\n", Status); - return STATUS_UNSUCCESSFUL; - } - - Status = SetMixerInputOutputFormat(FileObject, InputFormat, OutputFormat); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(FileObject); - ZwClose(PinHandle); - } - - ObDereferenceObject(FileObject); - - *MixerPinHandle = PinHandle; - return Status; -} - - -VOID -NTAPI -CreatePinWorkerRoutine( - IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context) -{ - NTSTATUS Status; - HANDLE RealPinHandle = NULL, VirtualPinHandle = NULL, Filter; - PFILE_OBJECT VirtualFileObject = NULL; - PKSDATAFORMAT_WAVEFORMATEX InputFormat; - PKSDATAFORMAT_WAVEFORMATEX OutputFormat = NULL; - PKSPIN_CONNECT MixerPinConnect = NULL; - PPIN_WORKER_CONTEXT WorkerContext = (PPIN_WORKER_CONTEXT)Context; - - Filter = WorkerContext->PinConnect->PinToHandle; - - WorkerContext->PinConnect->PinToHandle = NULL; - - DPRINT("CreatePinWorkerRoutine entered\n"); - - ASSERT(WorkerContext->Entry); - ASSERT(WorkerContext->PinConnect); - ASSERT(WorkerContext->Entry->Pins); - ASSERT(WorkerContext->Entry->NumberOfPins > WorkerContext->PinConnect->PinId); - - /* Fetch input format */ - InputFormat = (PKSDATAFORMAT_WAVEFORMATEX)(WorkerContext->PinConnect + 1); - - - /* Let's try to create the audio irp pin */ - Status = KsCreatePin(WorkerContext->Entry->Handle, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); - - if (!NT_SUCCESS(Status)) - { - /* the audio irp pin didnt accept the input format - * let's compute a compatible format - */ - - MixerPinConnect = ExAllocatePool(NonPagedPool, sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX)); - if (!MixerPinConnect) - { - SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); - ExFreePool(WorkerContext->DispatchContext); - IoFreeWorkItem(WorkerContext->WorkItem); - ExFreePool(WorkerContext); - return; - } - - /* Zero pin connect */ - RtlZeroMemory(MixerPinConnect, sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX)); - - /* Copy initial connect details */ - RtlMoveMemory(MixerPinConnect, WorkerContext->PinConnect, sizeof(KSPIN_CONNECT)); - - - OutputFormat = (PKSDATAFORMAT_WAVEFORMATEX)(MixerPinConnect + 1); - - Status = ComputeCompatibleFormat(WorkerContext->Entry, WorkerContext->PinConnect->PinId, WorkerContext->DeviceExtension, InputFormat, OutputFormat); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ComputeCompatibleFormat failed with %x\n", Status); - SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); - ExFreePool(WorkerContext->DispatchContext); - ExFreePool(MixerPinConnect); - IoFreeWorkItem(WorkerContext->WorkItem); - ExFreePool(WorkerContext); - return; - } - - /* Retry with Mixer format */ - Status = KsCreatePin(WorkerContext->Entry->Handle, MixerPinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); //, WorkerContext->Entry->ObjectClass); - if (!NT_SUCCESS(Status)) - { - /* This should not fail */ - DPRINT1("KsCreatePin failed with %x\n", Status); - DPRINT1(" InputFormat: SampleRate %u Bits %u Channels %u\n", InputFormat->WaveFormatEx.nSamplesPerSec, InputFormat->WaveFormatEx.wBitsPerSample, InputFormat->WaveFormatEx.nChannels); - DPRINT1("OutputFormat: SampleRate %u Bits %u Channels %u\n", OutputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.wBitsPerSample, OutputFormat->WaveFormatEx.nChannels); - - SetIrpIoStatus(WorkerContext->Irp, STATUS_UNSUCCESSFUL, 0); - ExFreePool(WorkerContext->DispatchContext); - ExFreePool(MixerPinConnect); - IoFreeWorkItem(WorkerContext->WorkItem); - ExFreePool(WorkerContext); - return; - } - } - - ASSERT(WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].MaxPinInstanceCount); - - WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References = 0; - WorkerContext->DispatchContext->Handle = RealPinHandle; - WorkerContext->DispatchContext->PinId = WorkerContext->PinConnect->PinId; - WorkerContext->DispatchContext->AudioEntry = WorkerContext->Entry; - - /* Do we need to transform the audio stream */ - if (OutputFormat != NULL) - { - /* Now create the mixer pin */ - Status = CreateMixerPinAndSetFormat(WorkerContext->DeviceExtension->KMixerHandle, - MixerPinConnect, - (PKSDATAFORMAT)InputFormat, - (PKSDATAFORMAT)OutputFormat, - &WorkerContext->DispatchContext->hMixerPin); - - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create Mixer Pin with %x\n", Status); - goto cleanup; - } - - } - - DPRINT1("creating virtual pin\n"); - /* now create the virtual audio pin which is exposed to wdmaud */ - Status = KsCreatePin(Filter, WorkerContext->PinConnect, GENERIC_READ | GENERIC_WRITE, &VirtualPinHandle); //, L"SysAudio"); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create virtual pin %x\n", Status); - goto cleanup; - } - - /* get pin file object */ - Status = ObReferenceObjectByHandle(VirtualPinHandle, - GENERIC_READ | GENERIC_WRITE, - IoFileObjectType, KernelMode, (PVOID*)&VirtualFileObject, NULL); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to get file object with %x\n", Status); - goto cleanup; - } - - ASSERT(WorkerContext->Entry->Pins != NULL); - ASSERT(WorkerContext->Entry->NumberOfPins > WorkerContext->PinConnect->PinId); - - /* increment reference count */ - WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].References++; - - /* store the pin handle there if the pin can only be instantiated once*/ - WorkerContext->Entry->Pins[WorkerContext->PinConnect->PinId].PinHandle = VirtualPinHandle; - - /* store pin context */ - VirtualFileObject->FsContext2 = (PVOID)WorkerContext->DispatchContext; - - /* release virtual file object */ - ObDereferenceObject(VirtualFileObject); - - DPRINT("Successfully created virtual pin %p\n", VirtualPinHandle); - *((PHANDLE)WorkerContext->Irp->UserBuffer) = VirtualPinHandle; - - SetIrpIoStatus(WorkerContext->Irp, STATUS_SUCCESS, sizeof(HANDLE)); - IoFreeWorkItem(WorkerContext->WorkItem); - ExFreePool(WorkerContext); - return; - -cleanup: - if (RealPinHandle) - ZwClose(RealPinHandle); - - if (WorkerContext->DispatchContext->hMixerPin) - ZwClose(WorkerContext->DispatchContext->hMixerPin); - - - ExFreePool(WorkerContext->DispatchContext); - SetIrpIoStatus(WorkerContext->Irp, Status, 0); - IoFreeWorkItem(WorkerContext->WorkItem); - ExFreePool(WorkerContext); } NTSTATUS @@ -382,7 +125,7 @@ return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); } - if (Entry->NumberOfPins <= Pin->PinId) + if (Entry->PinDescriptorsCount <= Pin->PinId) { /* invalid pin id */ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); @@ -396,7 +139,7 @@ return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(ULONG)); } /* store result */ - *((PULONG)Irp->UserBuffer) = Entry->NumberOfPins; + *((PULONG)Irp->UserBuffer) = Entry->PinDescriptorsCount; return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(ULONG)); } else if (Property->Id == KSPROPERTY_PIN_COMMUNICATION) @@ -407,7 +150,7 @@ return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPIN_COMMUNICATION)); } /* store result */ - *((KSPIN_COMMUNICATION*)Irp->UserBuffer) = Entry->Pins[Pin->PinId].Communication; + *((KSPIN_COMMUNICATION*)Irp->UserBuffer) = Entry->PinDescriptors[Pin->PinId].Communication; return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(KSPIN_COMMUNICATION)); } @@ -419,7 +162,7 @@ return SetIrpIoStatus(Irp, STATUS_BUFFER_TOO_SMALL, sizeof(KSPIN_DATAFLOW)); } /* store result */ - *((KSPIN_DATAFLOW*)Irp->UserBuffer) = Entry->Pins[Pin->PinId].DataFlow; + *((KSPIN_DATAFLOW*)Irp->UserBuffer) = Entry->PinDescriptors[Pin->PinId].DataFlow; return SetIrpIoStatus(Irp, STATUS_SUCCESS, sizeof(KSPIN_DATAFLOW)); } else @@ -441,7 +184,6 @@ ComputeCompatibleFormat( IN PKSAUDIO_DEVICE_ENTRY Entry, IN ULONG PinId, - IN PSYSAUDIODEVEXT DeviceExtension, IN PKSDATAFORMAT_WAVEFORMATEX ClientFormat, OUT PKSDATAFORMAT_WAVEFORMATEX MixerFormat) { @@ -592,149 +334,6 @@ } NTSTATUS -HandleSysAudioFilterPinCreation( - PIRP Irp, - PKSPROPERTY Property, - PSYSAUDIODEVEXT DeviceExtension, - PDEVICE_OBJECT DeviceObject) -{ - ULONG Length; - PKSAUDIO_DEVICE_ENTRY Entry; - KSPIN_CONNECT * PinConnect; - PIO_STACK_LOCATION IoStack; - PSYSAUDIO_INSTANCE_INFO InstanceInfo; - PKSOBJECT_CREATE_ITEM CreateItem; - NTSTATUS Status; - KSPIN_CINSTANCES PinInstances; - PPIN_WORKER_CONTEXT WorkerContext; - PDISPATCH_CONTEXT DispatchContext; - PIO_WORKITEM WorkItem; - - IoStack = IoGetCurrentIrpStackLocation(Irp); - - Length = sizeof(KSDATAFORMAT) + sizeof(KSPIN_CONNECT) + sizeof(SYSAUDIO_INSTANCE_INFO); - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < Length || - IoStack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HANDLE)) - { - /* invalid parameters */ - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - /* access the create item */ - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - - /* get input parameter */ - InstanceInfo = (PSYSAUDIO_INSTANCE_INFO)Property; - if (DeviceExtension->NumberOfKsAudioDevices <= InstanceInfo->DeviceNumber) - { - /* invalid parameters */ - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - /* get sysaudio entry */ - Entry = GetListEntry(&DeviceExtension->KsAudioDeviceList, InstanceInfo->DeviceNumber); - if (!Entry) - { - /* invalid device index */ - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - if (!Entry->Pins) - { - /* should not happen */ - return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); - } - - /* get connect details */ - PinConnect = (KSPIN_CONNECT*)(InstanceInfo + 1); - - if (Entry->NumberOfPins <= PinConnect->PinId) - { - DPRINT("Invalid PinId %x\n", PinConnect->PinId); - return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); - } - - /* query instance count */ - Status = GetPinInstanceCount(Entry, &PinInstances, PinConnect); - if (!NT_SUCCESS(Status)) - { - DPRINT("Property Request KSPROPERTY_PIN_GLOBALCINSTANCES failed with %x\n", Status); - return SetIrpIoStatus(Irp, Status, 0); - } - - if (PinInstances.PossibleCount == 0) - { - /* caller wanted to open an instance-less pin */ - return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); - } - - if (PinInstances.CurrentCount == PinInstances.PossibleCount) - { - /* pin already exists */ - ASSERT(Entry->Pins[PinConnect->PinId].PinHandle != NULL); - ASSERT(Entry->Pins[PinConnect->PinId].References); - - DPRINT1("Device %u Pin %u References %u is already occupied, try later\n", InstanceInfo->DeviceNumber, PinConnect->PinId, Entry->Pins[PinConnect->PinId].References); - return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); - } - /* create dispatch pin context */ - DispatchContext = ExAllocatePool(NonPagedPool, sizeof(DISPATCH_CONTEXT)); - if (!DispatchContext) - { - /* no memory */ - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - - /* allocate worker context */ - WorkerContext = ExAllocatePool(NonPagedPool, sizeof(PIN_WORKER_CONTEXT)); - if (!WorkerContext) - { - /* no memory */ - ExFreePool(DispatchContext); - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - - /* allocate work item */ - WorkItem = IoAllocateWorkItem(DeviceObject); - if (!WorkerContext) - { - /* no memory */ - ExFreePool(DispatchContext); - ExFreePool(WorkerContext); - return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); - } - - /* prepare context */ - RtlZeroMemory(WorkerContext, sizeof(PIN_WORKER_CONTEXT)); - RtlZeroMemory(DispatchContext, sizeof(DISPATCH_CONTEXT)); - - DPRINT("PinInstances.CurrentCount %u\n", PinInstances.CurrentCount); - - if (PinInstances.CurrentCount < PinInstances.PossibleCount) - { - WorkerContext->CreateRealPin = TRUE; - } - - /* set up context */ - WorkerContext->DispatchContext = DispatchContext; - WorkerContext->Entry = Entry; - WorkerContext->Irp = Irp; - WorkerContext->PinConnect = PinConnect; - WorkerContext->DeviceExtension = DeviceExtension; - WorkerContext->WorkItem = WorkItem; - - DPRINT("Queing Irp %p\n", Irp); - /* queue the work item */ - IoMarkIrpPending(Irp); - Irp->IoStatus.Status = STATUS_PENDING; - Irp->IoStatus.Information = 0; - IoQueueWorkItem(WorkItem, CreatePinWorkerRoutine, DelayedWorkQueue, (PVOID)WorkerContext); - - /* mark irp as pending */ - return STATUS_PENDING; -} - -NTSTATUS SysAudioHandleProperty( PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -874,12 +473,6 @@ return SysAudioOpenVirtualDevice(Irp, InstanceInfo->DeviceNumber, DeviceExtension); } } - else if (Property->Id == (ULONG)-1) - { - /* ros specific pin creation request */ - DPRINT("Initiating create request\n"); - return HandleSysAudioFilterPinCreation(Irp, Property, DeviceExtension, DeviceObject); - } } RtlStringFromGUID(&Property->Set, &GuidString); Modified: trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/deviface.c [iso-8859-1] Mon Aug 10 09:14:04 2009 @@ -16,74 +16,34 @@ #define IOCTL_KS_OBJECT_CLASS CTL_CODE(FILE_DEVICE_KS, 0x7, METHOD_NEITHER, FILE_ANY_ACCESS) -VOID -QueryFilterRoutine( - IN PKSAUDIO_DEVICE_ENTRY DeviceEntry) -{ - KSPROPERTY PropertyRequest; +NTSTATUS +BuildPinDescriptor( + IN PKSAUDIO_DEVICE_ENTRY DeviceEntry, + IN ULONG Count) +{ + ULONG Index; KSP_PIN PinRequest; KSPIN_DATAFLOW DataFlow; KSPIN_COMMUNICATION Communication; - KSPIN_CINSTANCES PinInstances; - ULONG Count, Index; + ULONG NumWaveOutPin, NumWaveInPin; NTSTATUS Status; ULONG BytesReturned; - ULONG NumWaveOutPin, NumWaveInPin; - - DPRINT("Querying filter...\n"); - - PropertyRequest.Set = KSPROPSETID_Pin; - PropertyRequest.Flags = KSPROPERTY_TYPE_GET; - PropertyRequest.Id = KSPROPERTY_PIN_CTYPES; - - /* query for num of pins */ - Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to query number of pins Status %x\n", Status); - return; - } - - if (!Count) - { - DPRINT1("Filter has no pins!\n"); - return; - } - - /* allocate pin array */ - DeviceEntry->Pins = ExAllocatePool(NonPagedPool, Count * sizeof(PIN_INFO)); - if (!DeviceEntry->Pins) - { - /* no memory */ - DPRINT1("Failed to allocate memory Pins %u Block %x\n", Count, Count * sizeof(PIN_INFO)); - return; - } - /* clear array */ - RtlZeroMemory(DeviceEntry->Pins, sizeof(PIN_INFO) * Count); - DeviceEntry->NumberOfPins = Count; NumWaveInPin = 0; NumWaveOutPin = 0; for(Index = 0; Index < Count; Index++) { - /* get max instance count */ + /* retrieve data flow */ PinRequest.PinId = Index; PinRequest.Property.Set = KSPROPSETID_Pin; PinRequest.Property.Flags = KSPROPERTY_TYPE_GET; - PinRequest.Property.Id = KSPROPERTY_PIN_CINSTANCES; - - Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&PinInstances, sizeof(KSPIN_CINSTANCES), &BytesReturned); - if (NT_SUCCESS(Status)) - { - DeviceEntry->Pins[Index].MaxPinInstanceCount = PinInstances.PossibleCount; - } /* get dataflow direction */ PinRequest.Property.Id = KSPROPERTY_PIN_DATAFLOW; Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&DataFlow, sizeof(KSPIN_DATAFLOW), &BytesReturned); if (NT_SUCCESS(Status)) { - DeviceEntry->Pins[Index].DataFlow = DataFlow; + DeviceEntry->PinDescriptors[Index].DataFlow = DataFlow; } /* get irp flow direction */ @@ -91,7 +51,7 @@ Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PinRequest, sizeof(KSP_PIN), (PVOID)&Communication, sizeof(KSPIN_COMMUNICATION), &BytesReturned); if (NT_SUCCESS(Status)) { - DeviceEntry->Pins[Index].Communication = Communication; + DeviceEntry->PinDescriptors[Index].Communication = Communication; } if (Communication == KSPIN_COMMUNICATION_SINK && DataFlow == KSPIN_DATAFLOW_IN) @@ -100,9 +60,72 @@ if (Communication == KSPIN_COMMUNICATION_SINK && DataFlow == KSPIN_DATAFLOW_OUT) NumWaveInPin++; - } - - DPRINT("Num Pins %u Num WaveIn Pins %u Name WaveOut Pins %u\n", DeviceEntry->NumberOfPins, NumWaveInPin, NumWaveOutPin); + /* FIXME query for interface, dataformat etc */ + } + + DPRINT("Num Pins %u Num WaveIn Pins %u Name WaveOut Pins %u\n", DeviceEntry->PinDescriptorsCount, NumWaveInPin, NumWaveOutPin); + return STATUS_SUCCESS; +} + +VOID +QueryFilterRoutine( + IN PKSAUDIO_DEVICE_ENTRY DeviceEntry) +{ + KSPROPERTY PropertyRequest; + ULONG Count; + NTSTATUS Status; + ULONG BytesReturned; + + DPRINT("Querying filter...\n"); + + PropertyRequest.Set = KSPROPSETID_Pin; + PropertyRequest.Flags = KSPROPERTY_TYPE_GET; + PropertyRequest.Id = KSPROPERTY_PIN_CTYPES; + + /* query for num of pins */ + Status = KsSynchronousIoControlDevice(DeviceEntry->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&PropertyRequest, sizeof(KSPROPERTY), (PVOID)&Count, sizeof(ULONG), &BytesReturned); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to query number of pins Status %x\n", Status); + return; + } + + if (!Count) + { + DPRINT1("Filter has no pins!\n"); + return; + } + + /* allocate pin descriptor array */ + DeviceEntry->PinDescriptors = ExAllocatePool(NonPagedPool, Count * sizeof(KSPIN_DESCRIPTOR)); + if (!DeviceEntry->PinDescriptors) + { + /* no memory */ + return; + } + + /* zero array pin descriptor array */ + RtlZeroMemory(DeviceEntry->PinDescriptors, Count * sizeof(KSPIN_DESCRIPTOR)); + + /* build the device descriptor */ + Status = BuildPinDescriptor(DeviceEntry, Count); + if (!NT_SUCCESS(Status)) + return; + + + /* allocate pin array */ + DeviceEntry->Pins = ExAllocatePool(NonPagedPool, Count * sizeof(PIN_INFO)); + if (!DeviceEntry->Pins) + { + /* no memory */ + DPRINT1("Failed to allocate memory Pins %u Block %x\n", Count, Count * sizeof(PIN_INFO)); + return; + } + + /* clear array */ + RtlZeroMemory(DeviceEntry->Pins, sizeof(PIN_INFO) * Count); + DeviceEntry->PinDescriptorsCount = Count; + } VOID 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] Mon Aug 10 09:14:04 2009 @@ -31,44 +31,6 @@ NTSTATUS NTAPI -Dispatch_fnRead( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - /* unsupported request */ - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -Dispatch_fnWrite( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - /* unsupported request */ - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -Dispatch_fnFlush( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI Dispatch_fnClose( PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -81,122 +43,19 @@ return STATUS_SUCCESS; } -NTSTATUS -NTAPI -Dispatch_fnQuerySecurity( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - DPRINT("Dispatch_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -NTSTATUS -NTAPI -Dispatch_fnSetSecurity( - PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ - - DPRINT("Dispatch_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -BOOLEAN -NTAPI -Dispatch_fnFastDeviceIoControl( - PFILE_OBJECT FileObject, - BOOLEAN Wait, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - ULONG IoControlCode, - PIO_STATUS_BLOCK IoStatus, - PDEVICE_OBJECT DeviceObject) -{ - DPRINT("Dispatch_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); - - - return FALSE; -} - - -BOOLEAN -NTAPI -Dispatch_fnFastRead( - PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Wait, - ULONG LockKey, - PVOID Buffer, - PIO_STATUS_BLOCK IoStatus, - PDEVICE_OBJECT DeviceObject) -{ - DPRINT("Dispatch_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); - - return FALSE; - -} - -BOOLEAN -NTAPI -Dispatch_fnFastWrite( - PFILE_OBJECT FileObject, - PLARGE_INTEGER FileOffset, - ULONG Length, - BOOLEAN Wait, - ULONG LockKey, - PVOID Buffer, - PIO_STATUS_BLOCK IoStatus, - PDEVICE_OBJECT DeviceObject) -{ - DPRINT("Dispatch_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); - - return FALSE; -} - static KSDISPATCH_TABLE DispatchTable = { Dispatch_fnDeviceIoControl, - Dispatch_fnRead, - Dispatch_fnWrite, - Dispatch_fnFlush, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, Dispatch_fnClose, - Dispatch_fnQuerySecurity, - Dispatch_fnSetSecurity, - Dispatch_fnFastDeviceIoControl, - Dispatch_fnFastRead, - Dispatch_fnFastWrite, + KsDispatchInvalidDeviceRequest, + KsDispatchInvalidDeviceRequest, + KsDispatchFastIoDeviceControlFailure, + KsDispatchFastReadFailure, + KsDispatchFastWriteFailure, }; - -NTSTATUS -NTAPI -DispatchCreateSysAudioPin( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - NTSTATUS Status; - - DPRINT("DispatchCreateSysAudio entered\n"); - /* create the virtual pin */ - Status = CreateSysAudioPin(Irp); - - /* store result */ - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; -} NTSTATUS NTAPI @@ -208,9 +67,7 @@ KSOBJECT_HEADER ObjectHeader; PKSOBJECT_CREATE_ITEM CreateItem; - static LPWSTR KS_NAME_PIN = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}"; - - DPRINT("DispatchCreateSysAudio entered\n"); + DPRINT1("DispatchCreateSysAudio entered\n"); /* allocate create item */ CreateItem = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); @@ -227,12 +84,12 @@ /* setup create context */ CreateItem->Create = DispatchCreateSysAudioPin; - RtlInitUnicodeString(&CreateItem->ObjectClass, KS_NAME_PIN); + RtlInitUnicodeString(&CreateItem->ObjectClass, KSSTRING_Pin); /* allocate object header */ Status = KsAllocateObjectHeader(&ObjectHeader, 1, CreateItem, Irp, &DispatchTable); - DPRINT("KsAllocateObjectHeader result %x\n", Status); + DPRINT1("KsAllocateObjectHeader result %x\n", Status); /* complete the irp */ Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Mon Aug 10 09:14:04 2009 @@ -420,13 +420,287 @@ }; NTSTATUS -CreateSysAudioPin( +SetMixerInputOutputFormat( + IN PFILE_OBJECT FileObject, + IN PKSDATAFORMAT InputFormat, + IN PKSDATAFORMAT OutputFormat) +{ + KSP_PIN PinRequest; + ULONG BytesReturned; + NTSTATUS Status; + + /* re-using pin */ + PinRequest.Property.Set = KSPROPSETID_Connection; + PinRequest.Property.Flags = KSPROPERTY_TYPE_SET; + PinRequest.Property.Id = KSPROPERTY_CONNECTION_DATAFORMAT; + + /* set the input format */ + PinRequest.PinId = 0; + DPRINT("InputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", InputFormat, InputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, + (PVOID)&PinRequest, + sizeof(KSP_PIN), + (PVOID)InputFormat, + InputFormat->FormatSize, + &BytesReturned); + if (!NT_SUCCESS(Status)) + return Status; + + /* set the the output format */ + PinRequest.PinId = 1; + DPRINT("OutputFormat %p Size %u WaveFormatSize %u DataFormat %u WaveEx %u\n", OutputFormat, OutputFormat->FormatSize, sizeof(KSDATAFORMAT_WAVEFORMATEX), sizeof(KSDATAFORMAT), sizeof(WAVEFORMATEX)); + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, + (PVOID)&PinRequest, + sizeof(KSP_PIN), + (PVOID)OutputFormat, + OutputFormat->FormatSize, + &BytesReturned); + return Status; +} + + +NTSTATUS +CreateMixerPinAndSetFormat( + IN HANDLE KMixerHandle, + IN KSPIN_CONNECT *PinConnect, + IN PKSDATAFORMAT InputFormat, + IN PKSDATAFORMAT OutputFormat, + OUT PHANDLE MixerPinHandle) +{ + NTSTATUS Status; + HANDLE PinHandle; + PFILE_OBJECT FileObject; + + Status = KsCreatePin(KMixerHandle, PinConnect, GENERIC_READ | GENERIC_WRITE, &PinHandle); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create Mixer Pin with %x\n", Status); + return STATUS_UNSUCCESSFUL; + } + + Status = ObReferenceObjectByHandle(PinHandle, + GENERIC_READ | GENERIC_WRITE, + IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get file object with %x\n", Status); + return STATUS_UNSUCCESSFUL; + } + + Status = SetMixerInputOutputFormat(FileObject, InputFormat, OutputFormat); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(FileObject); + ZwClose(PinHandle); + } + + ObDereferenceObject(FileObject); + + *MixerPinHandle = PinHandle; + return Status; +} + + +NTSTATUS +NTAPI +InstantiatePins( + IN PKSAUDIO_DEVICE_ENTRY DeviceEntry, + IN PKSPIN_CONNECT Connect, + IN PDISPATCH_CONTEXT DispatchContext, + IN PSYSAUDIODEVEXT DeviceExtension) +{ + NTSTATUS Status; + HANDLE RealPinHandle; + PKSDATAFORMAT_WAVEFORMATEX InputFormat; + PKSDATAFORMAT_WAVEFORMATEX OutputFormat = NULL; + PKSPIN_CONNECT MixerPinConnect = NULL; + KSPIN_CINSTANCES PinInstances; + + DPRINT("InstantiatePins entered\n"); + + /* query instance count */ + Status = GetPinInstanceCount(DeviceEntry, &PinInstances, Connect); + if (!NT_SUCCESS(Status)) + { + /* failed to query instance count */ + return Status; + } + + /* can be the pin be instantiated */ + if (PinInstances.PossibleCount == 0) + { + /* caller wanted to open an instance-less pin */ + return STATUS_UNSUCCESSFUL; + } + + /* has the maximum instance count been exceeded */ + if (PinInstances.CurrentCount == PinInstances.PossibleCount) + { + /* FIXME pin already exists + * and kmixer infrastructure is not implemented + */ + return STATUS_UNSUCCESSFUL; + } + + /* Fetch input format */ + InputFormat = (PKSDATAFORMAT_WAVEFORMATEX)(Connect + 1); + + /* Let's try to create the audio irp pin */ + Status = KsCreatePin(DeviceEntry->Handle, Connect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); + + if (!NT_SUCCESS(Status)) + { + /* the audio irp pin didnt accept the input format + * let's compute a compatible format + */ + MixerPinConnect = ExAllocatePool(NonPagedPool, sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX)); + if (!MixerPinConnect) + { + /* not enough memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Zero pin connect */ + RtlZeroMemory(MixerPinConnect, sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT_WAVEFORMATEX)); + + /* Copy initial connect details */ + RtlMoveMemory(MixerPinConnect, Connect, sizeof(KSPIN_CONNECT)); + + + OutputFormat = (PKSDATAFORMAT_WAVEFORMATEX)(MixerPinConnect + 1); + + Status = ComputeCompatibleFormat(DeviceEntry, Connect->PinId, InputFormat, OutputFormat); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ComputeCompatibleFormat failed with %x\n", Status); + ExFreePool(MixerPinConnect); + return Status; + } + + /* Retry with Mixer format */ + Status = KsCreatePin(DeviceEntry->Handle, MixerPinConnect, GENERIC_READ | GENERIC_WRITE, &RealPinHandle); + if (!NT_SUCCESS(Status)) + { + /* This should not fail */ + DPRINT1("KsCreatePin failed with %x\n", Status); + DPRINT1(" InputFormat: SampleRate %u Bits %u Channels %u\n", InputFormat->WaveFormatEx.nSamplesPerSec, InputFormat->WaveFormatEx.wBitsPerSample, InputFormat->WaveFormatEx.nChannels); + DPRINT1("OutputFormat: SampleRate %u Bits %u Channels %u\n", OutputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.wBitsPerSample, OutputFormat->WaveFormatEx.nChannels); + + ExFreePool(MixerPinConnect); + return Status; + } + } + + DeviceEntry->Pins[Connect->PinId].References = 0; + + /* initialize dispatch context */ + DispatchContext->Handle = RealPinHandle; + DispatchContext->PinId = Connect->PinId; + DispatchContext->AudioEntry = DeviceEntry; + + + /* Do we need to transform the audio stream */ + if (OutputFormat != NULL) + { + /* Now create the mixer pin */ + Status = CreateMixerPinAndSetFormat(DeviceExtension->KMixerHandle, + MixerPinConnect, + (PKSDATAFORMAT)InputFormat, + (PKSDATAFORMAT)OutputFormat, + &DispatchContext->hMixerPin); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create Mixer Pin with %x\n", Status); + ExFreePool(MixerPinConnect); + } + } + /* done */ + return Status; +} + +NTSTATUS +NTAPI +DispatchCreateSysAudioPin( + IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; KSOBJECT_HEADER ObjectHeader; + PIO_STACK_LOCATION IoStack; + PKSAUDIO_DEVICE_ENTRY DeviceEntry; + PKSPIN_CONNECT Connect = NULL; + PDISPATCH_CONTEXT DispatchContext; + + DPRINT("DispatchCreateSysAudioPin entered\n"); + + /* get current stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity checks */ + ASSERT(IoStack->FileObject); + ASSERT(IoStack->FileObject->RelatedFileObject); + ASSERT(IoStack->FileObject->RelatedFileObject->FsContext2); + + /* get current attached virtual device */ + DeviceEntry = (PKSAUDIO_DEVICE_ENTRY)IoStack->FileObject->RelatedFileObject->FsContext2; + + /* now validate pin connect request */ + Status = KsValidateConnectRequest(Irp, DeviceEntry->PinDescriptorsCount, DeviceEntry->PinDescriptors, &Connect); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* allocate dispatch context */ + DispatchContext = ExAllocatePool(NonPagedPool, sizeof(DISPATCH_CONTEXT)); + if (!DispatchContext) + { + /* failed */ + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* zero dispatch context */ + RtlZeroMemory(DispatchContext, sizeof(DISPATCH_CONTEXT)); /* allocate object header */ Status = KsAllocateObjectHeader(&ObjectHeader, 0, NULL, Irp, &PinTable); + if (!NT_SUCCESS(Status)) + { + /* failed */ + ExFreePool(DispatchContext); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* now instantiate the pins */ + Status = InstantiatePins(DeviceEntry, Connect, DispatchContext, (PSYSAUDIODEVEXT)DeviceObject->DeviceExtension); + if (!NT_SUCCESS(Status)) + { + /* failed */ + KsFreeObjectHeader(ObjectHeader); + ExFreePool(DispatchContext); + } + else + { + /* store dispatch context */ + IoStack->FileObject->FsContext2 = (PVOID)DispatchContext; + } + + + /* FIXME create items for clocks / allocators */ + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/sysaudio.h [iso-8859-1] Mon Aug 10 09:14:04 2009 @@ -13,11 +13,8 @@ typedef struct { - ULONG MaxPinInstanceCount; // maximum times a audio irp pin can be instantiated HANDLE PinHandle; // handle to audio irp pin ULONG References; // number of clients having a reference to this audio irp pin - KSPIN_DATAFLOW DataFlow; // specifies data flow - KSPIN_COMMUNICATION Communication; // pin type }PIN_INFO; typedef struct @@ -28,9 +25,9 @@ HANDLE Handle; // handle to audio sub device PFILE_OBJECT FileObject; // file objecto to audio sub device - ULONG NumberOfPins; // number of pins of audio device PIN_INFO * Pins; // array of PIN_INFO - + ULONG PinDescriptorsCount; // number of pin descriptors + KSPIN_DESCRIPTOR *PinDescriptors; // pin descriptors array }KSAUDIO_DEVICE_ENTRY, *PKSAUDIO_DEVICE_ENTRY; typedef struct @@ -64,24 +61,6 @@ HANDLE hMixerPin; // handle to mixer pin }DISPATCH_CONTEXT, *PDISPATCH_CONTEXT; - -// struct PIN_WORKER_CONTEXT -// -// This structure holds all information required -// to create audio irp pin, mixer pin and virtual sysaudio pin -// -typedef struct -{ - PIRP Irp; - BOOL CreateRealPin; - BOOL CreateMixerPin; - PKSAUDIO_DEVICE_ENTRY Entry; - KSPIN_CONNECT * PinConnect; - PDISPATCH_CONTEXT DispatchContext; - PSYSAUDIODEVEXT DeviceExtension; - PKSDATAFORMAT_WAVEFORMATEX MixerFormat; - PIO_WORKITEM WorkItem; -}PIN_WORKER_CONTEXT, *PPIN_WORKER_CONTEXT; typedef struct { @@ -131,12 +110,28 @@ IN ULONG Index); NTSTATUS -CreateSysAudioPin( - IN PIRP Irp); +NTAPI +DispatchCreateSysAudioPin( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); ULONG GetDeviceCount( PSYSAUDIODEVEXT DeviceExtension, BOOL WaveIn); +NTSTATUS +GetPinInstanceCount( + PKSAUDIO_DEVICE_ENTRY Entry, + PKSPIN_CINSTANCES PinInstances, + PKSPIN_CONNECT PinConnect); + +NTSTATUS +ComputeCompatibleFormat( + IN PKSAUDIO_DEVICE_ENTRY Entry, + IN ULONG PinId, + IN PKSDATAFORMAT_WAVEFORMATEX ClientFormat, + OUT PKSDATAFORMAT_WAVEFORMATEX MixerFormat); + + #endif

1 0

[jimtabor] 42579: - Changes to file header.
by jimtabor＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: jimtabor Date: Mon Aug 10 06:57:22 2009 New Revision: 42579 URL: http://svn.reactos.org/svn/reactos?rev=42579&view=rev Log: - Changes to file header. 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] Mon Aug 10 06:57:22 2009 @@ -1,23 +1,4 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Menus

1 0

[cgutman] 42578: - Rewrite most of the loopback code - The new code is faster, uses less memory, and is less complex than the previous code - Add a NULL check to fix a potential crash
by cgutman＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: cgutman Date: Mon Aug 10 05:27:39 2009 New Revision: 42578 URL: http://svn.reactos.org/svn/reactos?rev=42578&view=rev Log: - Rewrite most of the loopback code - The new code is faster, uses less memory, and is less complex than the previous code - Add a NULL check to fix a potential crash Modified: trunk/reactos/lib/drivers/ip/network/loopback.c Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Mon Aug 10 05:27:39 2009 @@ -11,118 +11,6 @@ #include "precomp.h" PIP_INTERFACE Loopback = NULL; -typedef struct _LAN_WQ_ITEM { - LIST_ENTRY ListEntry; - PNDIS_PACKET Packet; - PLAN_ADAPTER Adapter; - UINT BytesTransferred; -} LAN_WQ_ITEM, *PLAN_WQ_ITEM; - -/* Work around being called back into afd at Dpc level */ -KSPIN_LOCK LoopWorkLock; -LIST_ENTRY LoopWorkList; -WORK_QUEUE_ITEM LoopWorkItem; -BOOLEAN LoopReceiveWorkerBusy = FALSE; - -VOID NTAPI LoopReceiveWorker( PVOID Context ) { - PLIST_ENTRY ListEntry; - PLAN_WQ_ITEM WorkItem; - PNDIS_PACKET Packet; - PLAN_ADAPTER Adapter; - UINT BytesTransferred; - PNDIS_BUFFER NdisBuffer; - IP_PACKET IPPacket; - KIRQL OldIrql; - - TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); - - TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); - while( !IsListEmpty(&LoopWorkList) ) - { - ListEntry = RemoveHeadList( &LoopWorkList ); - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); - - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - - TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); - - Packet = WorkItem->Packet; - Adapter = WorkItem->Adapter; - BytesTransferred = WorkItem->BytesTransferred; - - exFreePool( WorkItem ); - - IPInitializePacket(&IPPacket, 0); - - IPPacket.NdisPacket = Packet; - - TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", - Packet, Adapter, BytesTransferred)); - - NdisGetFirstBufferFromPacket(Packet, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); - - IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; - /* Determine which upper layer protocol that should receive - this packet and pass it to the correct receive handler */ - - TI_DbgPrint - (MID_TRACE, - ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", - IPPacket.ContigSize, IPPacket.TotalSize, - BytesTransferred)); - - IPPacket.Position = 0; - - IPReceive(Loopback, &IPPacket); - - FreeNdisPacket( Packet ); - TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); - } - TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n")); - LoopReceiveWorkerBusy = FALSE; - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); -} - -VOID LoopSubmitReceiveWork( - NDIS_HANDLE BindingContext, - PNDIS_PACKET Packet, - NDIS_STATUS Status, - UINT BytesTransferred) { - PLAN_WQ_ITEM WQItem; - PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; - KIRQL OldIrql; - - TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); - - WQItem = exAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); - if( !WQItem ) { - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); - return; - } - - WQItem->Packet = Packet; - WQItem->Adapter = Adapter; - WQItem->BytesTransferred = BytesTransferred; - InsertTailList( &LoopWorkList, &WQItem->ListEntry ); - - TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x BytesTrans %x\n", - Packet, Adapter, BytesTransferred)); - - if( !LoopReceiveWorkerBusy ) { - LoopReceiveWorkerBusy = TRUE; - ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); - TI_DbgPrint(DEBUG_DATALINK, - ("Work item inserted %x %x\n", &LoopWorkItem, WQItem)); - } else { - TI_DbgPrint(DEBUG_DATALINK, - ("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem)); - } - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); -} VOID LoopTransmit( PVOID Context, @@ -144,6 +32,8 @@ UINT PacketLength; PNDIS_PACKET XmitPacket; NDIS_STATUS NdisStatus; + IP_PACKET IPPacket; + PNDIS_BUFFER NdisBuffer; ASSERT_KM_POINTER(NdisPacket); ASSERT_KM_POINTER(PC(NdisPacket)); @@ -156,13 +46,24 @@ NdisStatus = AllocatePacketWithBuffer ( &XmitPacket, PacketBuffer, PacketLength ); + (PC(NdisPacket)->DLComplete) + ( PC(NdisPacket)->Context, NdisPacket, NdisStatus ); + if( NT_SUCCESS(NdisStatus) ) { - LoopSubmitReceiveWork - ( NULL, XmitPacket, STATUS_SUCCESS, PacketLength ); + IPInitializePacket(&IPPacket, 0); + + IPPacket.NdisPacket = XmitPacket; + + NdisGetFirstBufferFromPacket(XmitPacket, + &NdisBuffer, + &IPPacket.Header, + &IPPacket.ContigSize, + &IPPacket.TotalSize); + + IPReceive(Loopback, &IPPacket); + + FreeNdisPacket(XmitPacket); } - - (PC(NdisPacket)->DLComplete) - ( PC(NdisPacket)->Context, NdisPacket, STATUS_SUCCESS ); TI_DbgPrint(MAX_TRACE, ("Done\n")); } @@ -179,15 +80,9 @@ * Status of operation */ { - NDIS_STATUS Status; LLIP_BIND_INFO BindInfo; - Status = NDIS_STATUS_SUCCESS; - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - InitializeListHead( &LoopWorkList ); - ExInitializeWorkItem( &LoopWorkItem, LoopReceiveWorker, NULL ); /* Bind the adapter to network (IP) layer */ BindInfo.Context = NULL; @@ -199,6 +94,7 @@ BindInfo.Transmit = LoopTransmit; Loopback = IPCreateInterface(&BindInfo); + if (!Loopback) return NDIS_STATUS_RESOURCES; Loopback->Name.Buffer = L"Loopback"; Loopback->Name.MaximumLength = Loopback->Name.Length = @@ -213,7 +109,7 @@ TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - return Status; + return NDIS_STATUS_SUCCESS; }

1 0

[cgutman] 42577: - Fix a bug which resulted in the first letter of each quote (except the first one) being skipped - Fix some quote typos
by cgutman＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: cgutman Date: Mon Aug 10 00:53:26 2009 New Revision: 42577 URL: http://svn.reactos.org/svn/reactos?rev=42577&view=rev Log: - Fix a bug which resulted in the first letter of each quote (except the first one) being skipped - Fix some quote typos Modified: trunk/reactos/base/services/tcpsvcs/qotd.c trunk/reactos/base/services/tcpsvcs/quotes Modified: trunk/reactos/base/services/tcpsvcs/qotd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/qotd… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/qotd.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/qotd.c [iso-8859-1] Mon Aug 10 00:53:26 2009 @@ -114,7 +114,7 @@ lpStr++; /* move past % and RN */ - lpStr += 3; + lpStr += 2; } } Modified: trunk/reactos/base/services/tcpsvcs/quotes URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/quot… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/quotes [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/quotes [iso-8859-1] Mon Aug 10 00:53:26 2009 @@ -1,6 +1,6 @@ "Et tu... Brute? What are you doing, Dave...? % -"So long, and thanks for all the fish" +"So long, and thanks for all the fish % "I think you ought to know I'm feeling very depressed % @@ -34,7 +34,7 @@ % "Oh i'm boring eh? % -"Its been great, maybe we can do this again sometime. +"It's been great, maybe we can do this again sometime. % ""Come blade, my breast imbrue." - William Shakespeare % @@ -56,7 +56,7 @@ % "That's the way the cookie crumbles % -""NOO!! DONT HIT THE BUTTON! I wouldnt do it to you. +"NOO!! DONT HIT THE BUTTON! I wouldnt do it to you. % "Don't abandon your computer, he wouldnt to it to you. % @@ -101,4 +101,4 @@ "All your base are belong to us. % ""An odd game, the only way to win is not to play." -% +%

1 0

[pschweitzer] 42576: Other resync. Now branch builds up to cmd.
by pschweitzer＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: pschweitzer Date: Mon Aug 10 00:30:16 2009 New Revision: 42576 URL: http://svn.reactos.org/svn/reactos?rev=42576&view=rev Log: Other resync. Now branch builds up to cmd. Added: branches/pierre-fsd/drivers/base/bootvid/bootvid.spec (with props) Removed: branches/pierre-fsd/drivers/base/bootvid/bootvid_arm.def branches/pierre-fsd/drivers/base/bootvid/bootvid_i386.def Modified: branches/pierre-fsd/drivers/base/bootvid/bootvid.rbuild branches/pierre-fsd/drivers/base/bootvid/i386/bootvid.c branches/pierre-fsd/drivers/network/afd/afd/main.c branches/pierre-fsd/include/ddk/winddi.h Modified: branches/pierre-fsd/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/base/bootvid… ============================================================================== --- branches/pierre-fsd/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/base/bootvid/bootvid.rbuild [iso-8859-1] Mon Aug 10 00:30:16 2009 @@ -14,7 +14,7 @@ </directory> </if> <if property="ARCH" value="arm"> - <directory name="arm"> + <directory name="arm"> <file>bootvid.c</file> <file>bootdata.c</file> </directory> Added: branches/pierre-fsd/drivers/base/bootvid/bootvid.spec URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/base/bootvid… ============================================================================== --- branches/pierre-fsd/drivers/base/bootvid/bootvid.spec (added) +++ branches/pierre-fsd/drivers/base/bootvid/bootvid.spec [iso-8859-1] Mon Aug 10 00:30:16 2009 @@ -1,0 +1,11 @@ +@ stdcall VidBitBlt(ptr long long) +@ stdcall VidBufferToScreenBlt(ptr long long long long long) +@ stdcall VidCleanUp() +@ stdcall VidDisplayString(str) +@ stdcall VidDisplayStringXY(str long long long) +@ stdcall VidInitialize(long) +@ stdcall VidResetDisplay(long) +@ stdcall VidScreenToBufferBlt(ptr long long long long long) +@ stdcall VidSetScrollRegion(long long long long) +@ stdcall VidSetTextColor(long) +@ stdcall VidSolidColorFill(long long long long long) Propchange: branches/pierre-fsd/drivers/base/bootvid/bootvid.spec ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/pierre-fsd/drivers/base/bootvid/bootvid_arm.def URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/base/bootvid… ============================================================================== --- branches/pierre-fsd/drivers/base/bootvid/bootvid_arm.def [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/base/bootvid/bootvid_arm.def (removed) @@ -1,15 +1,0 @@ -LIBRARY BOOTVID.DLL - -EXPORTS -VidBitBlt -VidBufferToScreenBlt -VidCleanUp -VidDisplayString -VidDisplayStringXY -VidInitialize -VidResetDisplay -VidScreenToBufferBlt -VidSetScrollRegion -VidSetTextColor -VidSolidColorFill - Removed: branches/pierre-fsd/drivers/base/bootvid/bootvid_i386.def URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/base/bootvid… ============================================================================== --- branches/pierre-fsd/drivers/base/bootvid/bootvid_i386.def [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/base/bootvid/bootvid_i386.def (removed) @@ -1,15 +1,0 @@ -LIBRARY BOOTVID.DLL - -EXPORTS -VidBitBlt@12 -VidBufferToScreenBlt@24 -VidCleanUp@0 -VidDisplayString@4 -VidDisplayStringXY -VidInitialize@4 -VidResetDisplay@4 -VidScreenToBufferBlt@24 -VidSetScrollRegion@16 -VidSetTextColor@4 -VidSolidColorFill@20 - Modified: branches/pierre-fsd/drivers/base/bootvid/i386/bootvid.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/base/bootvid… ============================================================================== --- branches/pierre-fsd/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/base/bootvid/i386/bootvid.c [iso-8859-1] Mon Aug 10 00:30:16 2009 @@ -301,10 +301,10 @@ } /* Write the registers we read earlier */ - WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CF, VgaReg); + WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CF, VgaReg2); WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CE, 8); - WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CF, VgaReg2); - WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CE, VgaReg3); + WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CF, VgaReg3); + WRITE_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3CE, VgaReg); /* Read sequencer address */ SeqReg = READ_PORT_UCHAR((PUCHAR)VgaRegisterBase + 0x3C4); Modified: branches/pierre-fsd/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/network/afd/… ============================================================================== --- branches/pierre-fsd/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/network/afd/afd/main.c [iso-8859-1] Mon Aug 10 00:30:16 2009 @@ -178,16 +178,19 @@ InFlightRequest[0] = &FCB->ListenIrp; InFlightRequest[1] = &FCB->ReceiveIrp; InFlightRequest[2] = &FCB->SendIrp; + InFlightRequest[3] = &FCB->ConnectIrp; /* Return early here because we might be called in the mean time. */ if( FCB->Critical || FCB->ListenIrp.InFlightRequest || FCB->ReceiveIrp.InFlightRequest || - FCB->SendIrp.InFlightRequest ) { - AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x)\n", + FCB->SendIrp.InFlightRequest || + FCB->ConnectIrp.InFlightRequest ) { + AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x %x)\n", FCB->ListenIrp.InFlightRequest, FCB->ReceiveIrp.InFlightRequest, - FCB->SendIrp.InFlightRequest)); + FCB->SendIrp.InFlightRequest, + FCB->ConnectIrp.InFlightRequest)); ReturnEarly = TRUE; } @@ -196,7 +199,6 @@ /* Cancel our pending requests */ for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) { - NTSTATUS Status = STATUS_NO_SUCH_FILE; if( InFlightRequest[i]->InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n", i, InFlightRequest[i]->InFlightRequest)); Modified: branches/pierre-fsd/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/winddi.h… ============================================================================== --- branches/pierre-fsd/include/ddk/winddi.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/winddi.h [iso-8859-1] Mon Aug 10 00:30:16 2009 @@ -540,11 +540,15 @@ FWORD fwdKern; } FD_KERNINGPAIR; +#if defined(_X86_) && !defined(USERMODE_DRIVER) typedef struct _FLOATOBJ { ULONG ul1; ULONG ul2; } FLOATOBJ, *PFLOATOBJ; +#else +typedef FLOAT FLOATOBJ, *PFLOATOBJ; +#endif typedef struct _FLOATOBJ_XFORM { FLOATOBJ eM11; @@ -2294,6 +2298,7 @@ IN DWORD cbBuf, OUT LPDWORD pcWritten); +#if defined(_X86_) && !defined(USERMODE_DRIVER) WIN32KAPI VOID APIENTRY @@ -3803,12 +3808,6 @@ IN POINTL *pptlBrushOrg, IN MIX mix); -typedef VOID -(APIENTRY *PFN_DrvMovePanning)( - IN LONG x, - IN LONG y, - IN FLONG fl); - typedef BOOL (APIENTRY *PFN_DrvPlgBlt)( IN SURFOBJ *psoTrg,

1 0

[hpoussin] 42575: [rbuild] Remove distinction between Iso/IsoRegTest, and LiveIso/LiveIsoRegTest module types Better dependency tracking for iso module type
by hpoussin＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: hpoussin Date: Mon Aug 10 00:03:04 2009 New Revision: 42575 URL: http://svn.reactos.org/svn/reactos?rev=42575&view=rev Log: [rbuild] Remove distinction between Iso/IsoRegTest, and LiveIso/LiveIsoRegTest module types Better dependency tracking for iso module type Modified: trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild trunk/reactos/boot/bootdata/bootdata.rbuild trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -1,5 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="bootcdregtest" type="isoregtest" output="ReactOS-RegTest.iso"> +<module name="bootcdregtest" type="iso" output="ReactOS-RegTest.iso"> <bootsector>isobtrt</bootsector> + <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> </module> Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -11,7 +11,7 @@ <cdfile installbase="$(CDOUTPUT)" nameoncd="hivesft.inf">hivesft_$(ARCH).inf</cdfile> <cdfile installbase="$(CDOUTPUT)" nameoncd="hivesys.inf">hivesys_$(ARCH).inf</cdfile> <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> - <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)" nameoncd="unattend.inf.sample">unattend.inf</cdfile> <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> Modified: trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -1,5 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="livecdregtest" type="liveisoregtest" output="ReactOS-LiveCD-RegTest.iso"> +<module name="livecdregtest" type="liveiso" output="ReactOS-LiveCD-RegTest.iso"> <bootsector>isobtrt</bootsector> </module> Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -317,9 +317,7 @@ Module& module = *p->second; if ((module.type != Iso) && - (module.type != LiveIso) && - (module.type != IsoRegTest) && - (module.type != LiveIsoRegTest)) + (module.type != LiveIso)) { std::string Cbp_file = CbpFileName ( module ); fprintf ( OUT, "\t\t<Project filename=\"%s\">\r\n", Cbp_file.c_str()); @@ -384,8 +382,6 @@ { case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: return; default: break; Modified: trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/depen… ============================================================================== --- trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/dependencymap/dependencymap.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -98,9 +98,7 @@ { Module& module = *p->second; if ((module.type != Iso) && - (module.type != LiveIso) && - (module.type != IsoRegTest) && - (module.type != LiveIsoRegTest)) + (module.type != LiveIso)) { vector<const IfableData*> ifs_list; ifs_list.push_back ( &module.project.non_if_data ); Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -59,8 +59,6 @@ { HostFalse, "", "", "" }, // Win32SCR { HostFalse, "", "", "" }, // IdlHeader { HostFalse, "", "", "" }, // IdlInterface - { HostFalse, "", "", "" }, // IsoRegTest - { HostFalse, "", "", "" }, // LiveIsoRegTest { HostFalse, "", "", "" }, // EmbeddedTypeLib { HostFalse, "", "", "" }, // ElfExecutable { HostFalse, "", "", "" }, // RpcProxy @@ -544,10 +542,6 @@ return false; if ( module.type == LiveIso ) return false; - if ( module.type == IsoRegTest ) - return false; - if ( module.type == LiveIsoRegTest ) - return false; if ( module.type == Test ) return false; if ( module.type == Alias ) Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -232,12 +232,6 @@ handler = new MingwIsoModuleHandler ( module ); break; case LiveIso: - handler = new MingwLiveIsoModuleHandler ( module ); - break; - case IsoRegTest: - handler = new MingwIsoModuleHandler ( module ); - break; - case LiveIsoRegTest: handler = new MingwLiveIsoModuleHandler ( module ); break; case Test: @@ -2973,7 +2967,8 @@ void MingwIsoModuleHandler::OutputBootstrapfileCopyCommands ( - const string& bootcdDirectory ) + const string& bootcdDirectory, + vector<FileLocation>& destinations ) { for ( std::map<std::string, Module*>::const_iterator p = module.project.modules.begin (); p != module.project.modules.end (); ++ p ) { @@ -2987,14 +2982,16 @@ ? bootcdDirectory + sSep + m.bootstrap->base : bootcdDirectory, m.bootstrap->nameoncd ); - OutputCopyCommand ( *m.output, targetFile ); + OutputCopyCommandSingle ( *m.output, targetFile ); + destinations.push_back ( targetFile ); } } } void MingwIsoModuleHandler::OutputCdfileCopyCommands ( - const string& bootcdDirectory ) + const string& bootcdDirectory, + std::vector<FileLocation>& destinations ) { for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) { @@ -3004,7 +3001,19 @@ ? bootcdDirectory + sSep + cdfile.target->relative_path : bootcdDirectory, cdfile.target->name ); - OutputCopyCommand ( *cdfile.source, targetFile ); + OutputCopyCommandSingle ( *cdfile.source, targetFile ); + destinations.push_back ( targetFile ); + } + for ( size_t i = 0; i < module.cdfiles.size (); i++ ) + { + const CDFile& cdfile = *module.cdfiles[i]; + FileLocation targetFile ( OutputDirectory, + cdfile.target->relative_path.length () > 0 + ? bootcdDirectory + sSep + cdfile.target->relative_path + : bootcdDirectory, + cdfile.target->name ); + OutputCopyCommandSingle ( *cdfile.source, targetFile ); + destinations.push_back ( targetFile ); } } @@ -3092,25 +3101,13 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget () { fprintf ( fMakefile, "# ISO MODULE TARGET\n" ); - string bootcdDirectory = "cd"; + string bootcdDirectory = module.name; FileLocation bootcd ( OutputDirectory, bootcdDirectory, "" ); FileLocation bootcdReactos ( OutputDirectory, bootcdDirectory + sSep + Environment::GetCdOutputPath (), "" ); - vector<FileLocation> vSourceFiles, vCdFiles; - vector<FileLocation> vCdDirectories; - - // unattend.inf - FileLocation srcunattend ( SourceDirectory, - "boot" + sSep + "bootdata" + sSep + "bootcdregtest", - "unattend.inf" ); - FileLocation tarunattend ( bootcdReactos.directory, - bootcdReactos.relative_path, - "unattend.inf" ); - if (module.type == IsoRegTest) - vSourceFiles.push_back ( srcunattend ); // bootsector const Module* bootModule = module.bootSector->bootSectorModule; @@ -3124,7 +3121,6 @@ } const FileLocation *isoboot = bootModule->output; - vSourceFiles.push_back ( *isoboot ); // prepare reactos.dff and reactos.inf FileLocation reactosDff ( SourceDirectory, @@ -3134,31 +3130,18 @@ bootcdReactos.relative_path, "reactos.inf" ); - vSourceFiles.push_back ( reactosDff ); - /* We use only the name and not full FileLocation(ouput) because Iso/LiveIso are an exception to the general rule. Iso/LiveIso outputs are generated in code base root */ string IsoName = module.output->name; - string sourceFiles = v2s ( backend, vSourceFiles, 5 ); - - // fill cdrom - GetCdDirectories ( vCdDirectories, bootcdDirectory ); - GetCdFiles ( vCdFiles ); - string cdDirectories = "";//v2s ( vCdDirectories, 5 ); - string cdFiles = v2s ( backend, vCdFiles, 5 ); - - fprintf ( fMakefile, ".PHONY: %s\n\n", - module.name.c_str ()); - fprintf ( fMakefile, - "%s: all %s %s %s $(CABMAN_TARGET) $(CDMAKE_TARGET) %s\n", + fprintf ( fMakefile, ".PHONY: %s_CABINET\n\n", + module.name.c_str () ); + fprintf ( fMakefile, "%s_CABINET: all $(CABMAN_TARGET) %s | %s\n", module.name.c_str (), - backend->GetFullName ( *isoboot ).c_str (), - sourceFiles.c_str (), - cdFiles.c_str (), - cdDirectories.c_str () ); + backend->GetFullName ( reactosDff ).c_str (), + backend->GetFullPath ( bootcdReactos ).c_str () ); fprintf ( fMakefile, "\t$(Q)$(CABMAN_TARGET) -C %s -L %s -I -P $(OUTPUT)\n", backend->GetFullName ( reactosDff ).c_str (), @@ -3169,13 +3152,29 @@ backend->GetFullName ( reactosInf ).c_str (), backend->GetFullPath ( bootcdReactos ).c_str ()); fprintf ( fMakefile, - "\t-@${rm} %s 2>$(NUL)\n", + "\t-@${rm} %s 2>$(NUL)\n\n", backend->GetFullName ( reactosInf ).c_str () ); - OutputBootstrapfileCopyCommands ( bootcdDirectory ); - OutputCdfileCopyCommands ( bootcdDirectory ); - - if (module.type == IsoRegTest) - OutputCopyCommand ( srcunattend, tarunattend ); + + std::vector<FileLocation> sourceFiles; + OutputBootstrapfileCopyCommands ( bootcdDirectory, sourceFiles ); + OutputCdfileCopyCommands ( bootcdDirectory, sourceFiles ); + + fprintf( fMakefile, + "\n%s_OBJS := %s\n\n", + module.name.c_str (), + v2s ( backend, sourceFiles, 5 ).c_str () ); + + fprintf ( fMakefile, ".PHONY: %s\n\n", + module.name.c_str ()); + fprintf ( fMakefile, + "%s: $(%s_OBJS) %s_CABINET %s $(CDMAKE_TARGET) | %s\n", + module.name.c_str (), + module.name.c_str (), + module.name.c_str (), + backend->GetFullName ( *isoboot ).c_str (), + backend->GetFullPath ( FileLocation ( OutputDirectory, + bootcdDirectory, + "" ) ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -323,8 +323,10 @@ void GetBootstrapCdFiles ( std::vector<FileLocation>& out ) const; void GetNonModuleCdFiles ( std::vector<FileLocation>& out ) const; void GetCdFiles ( std::vector<FileLocation>& out ) const; - void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory ); - void OutputCdfileCopyCommands ( const std::string& bootcdDirectory ); + void OutputBootstrapfileCopyCommands ( const std::string& bootcdDirectory, + std::vector<FileLocation>& destinations ); + void OutputCdfileCopyCommands ( const std::string& bootcdDirectory, + std::vector<FileLocation>& destinations ); }; Modified: trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/versi… ============================================================================== --- trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/versionreport/versionreport.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -96,9 +96,7 @@ { Module& module = *p->second; if ((module.type != Iso) && - (module.type != LiveIso) && - (module.type != IsoRegTest) && - (module.type != LiveIsoRegTest)) + (module.type != LiveIso)) { Module& module = *p->second; Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -63,8 +63,6 @@ case ObjectLibrary: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case Test: case RpcServer: case RpcClient: Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -525,6 +525,8 @@ delete linkerFlags[i]; for ( i = 0; i < stubbedComponents.size(); i++ ) delete stubbedComponents[i]; + for ( i = 0; i < cdfiles.size (); i++ ) + delete cdfiles[i]; if ( linkerScript ) delete linkerScript; if ( pch ) @@ -917,6 +919,12 @@ autoRegister = new AutoRegister ( project, this, e ); subs_invalid = true; } + else if ( e.name == "cdfile" ) + { + CDFile* cdfile = new CDFile ( project, e, subpath ); + cdfiles.push_back ( cdfile ); + subs_invalid = true; + } if ( subs_invalid && e.subElements.size() > 0 ) { throw XMLInvalidBuildFileException ( @@ -924,6 +932,8 @@ "<%s> cannot have sub-elements", e.name.c_str() ); } + for ( size_t i = 0; i < cdfiles.size (); i++ ) + cdfiles[i]->ProcessXML (); for ( size_t i = 0; i < e.subElements.size (); i++ ) ProcessXMLSubElement ( *e.subElements[i], subdirectory, subpath, parseContext ); parseContext.compilationUnit = pOldCompilationUnit; @@ -972,10 +982,6 @@ return Iso; if ( attribute.value == "liveiso" ) return LiveIso; - if ( attribute.value == "isoregtest" ) - return IsoRegTest; - if ( attribute.value == "liveisoregtest" ) - return LiveIsoRegTest; if ( attribute.value == "test" ) return Test; if ( attribute.value == "rpcserver" ) @@ -1026,8 +1032,6 @@ case BootProgram: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case ElfExecutable: case Cabinet: return OutputDirectory; @@ -1089,8 +1093,6 @@ return ".o"; case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: return ".iso"; case Test: return ".exe"; @@ -1149,8 +1151,6 @@ case BootSector: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case RpcServer: case RpcClient: case RpcProxy: @@ -1202,8 +1202,6 @@ case BootSector: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case RpcServer: case RpcClient: case RpcProxy: @@ -1259,8 +1257,6 @@ case BootSector: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case RpcServer: case RpcClient: case RpcProxy: @@ -1317,8 +1313,6 @@ case BootProgram: case Iso: case LiveIso: - case IsoRegTest: - case LiveIsoRegTest: case RpcServer: case RpcClient: case RpcProxy: @@ -1762,9 +1756,7 @@ Bootsector::IsSupportedModuleType ( ModuleType type ) { if ( type == Iso || - type == LiveIso || - type == IsoRegTest || - type == LiveIsoRegTest ) + type == LiveIso ) { return true; } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Mon Aug 10 00:03:04 2009 @@ -315,8 +315,6 @@ Win32SCR, IdlHeader, IdlInterface, - IsoRegTest, - LiveIsoRegTest, EmbeddedTypeLib, ElfExecutable, RpcProxy, @@ -392,6 +390,7 @@ std::vector<CompilerFlag*> compilerFlags; std::vector<LinkerFlag*> linkerFlags; std::vector<StubbedComponent*> stubbedComponents; + std::vector<CDFile*> cdfiles; LinkerScript* linkerScript; PchFile* pch; bool cplusplus;

1 0

[pschweitzer] 42574: Fixed various badly sync files. Reduce warnings, etc...
by pschweitzer＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: pschweitzer Date: Sun Aug 9 23:41:20 2009 New Revision: 42574 URL: http://svn.reactos.org/svn/reactos?rev=42574&view=rev Log: Fixed various badly sync files. Reduce warnings, etc... Modified: branches/pierre-fsd/Makefile branches/pierre-fsd/ReactOS-arm.rbuild branches/pierre-fsd/ReactOS-ppc.rbuild branches/pierre-fsd/config-arm.template.rbuild branches/pierre-fsd/config-ppc.template.rbuild branches/pierre-fsd/config.template.rbuild branches/pierre-fsd/tools/buildno/buildno.cpp Modified: branches/pierre-fsd/Makefile URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/Makefile?rev=42574&r… ============================================================================== --- branches/pierre-fsd/Makefile [iso-8859-1] (original) +++ branches/pierre-fsd/Makefile [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -38,7 +38,7 @@ # This can require several minutes to complete. If you only need to check # dependencies for a single or few modules then you can use the # module_depends targets instead. This target can also repair a damaged or -# missing makefile-{ROS_ARCH}.auto if needed. +# missing makefile-${ROS_ARCH}.auto if needed. # # module_depends # These targets do a dependency check of individual modules. Replace module @@ -127,7 +127,7 @@ # -r Input XML # # ROS_AUTOMAKE -# Alternate name of makefile.auto +# Alternate name of makefile-${ROS_ARCH}.auto # # ROS_BUILDENGINE # The Build engine to be used. The variable defaults to rbuild (RBUILD_TARGET) @@ -160,7 +160,11 @@ endif ifeq ($(ROS_AUTOMAKE),) -ROS_AUTOMAKE=makefile.auto + ifeq ($(ARCH),i386) + ROS_AUTOMAKE=makefile.auto + else + ROS_AUTOMAKE=makefile-$(ARCH).auto + endif endif all: $(ROS_AUTOMAKE) Modified: branches/pierre-fsd/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ReactOS-arm.rbuild?r… ============================================================================== --- branches/pierre-fsd/ReactOS-arm.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/ReactOS-arm.rbuild [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-arm.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-arm.rbuild"> <xi:fallback> <xi:include href="config-arm.template.rbuild" /> @@ -66,6 +66,7 @@ <compilerflag>-O3</compilerflag> </if> + <define name="__MSVCRT__"/> <compilerflag>-Wno-attributes</compilerflag> <compilerflag>-fno-strict-aliasing</compilerflag> <linkerflag>--strip-debug</linkerflag> @@ -115,9 +116,18 @@ <xi:include href="lib/sdk/crt/crt.rbuild" /> <xi:include href="lib/sdk/crt/libcntpr.rbuild" /> </directory> + <directory name="nt"> + <xi:include href="lib/sdk/nt/nt.rbuild" /> + </directory> <directory name="wdmguid"> <xi:include href="lib/sdk/wdmguid/wdmguid.rbuild" /> </directory> + </directory> + <directory name="ntdllsys"> + <xi:include href="lib/ntdllsys/ntdllsys.rbuild" /> + </directory> + <directory name="smlib"> + <xi:include href="lib/smlib/smlib.rbuild" /> </directory> </directory> <directory name="include"> @@ -154,8 +164,8 @@ </directory> </directory> <directory name="filesystems"> - <directory name="cdfs"> - <xi:include href="drivers/filesystems/cdfs/cdfs.rbuild" /> + <directory name="fastfat"> + <xi:include href="drivers/filesystems/fastfat/vfatfs.rbuild" /> </directory> </directory> <directory name="base"> @@ -166,5 +176,17 @@ <xi:include href="drivers/base/bootvid/bootvid.rbuild" /> </directory> </directory> - </directory> + </directory> + <directory name="dll"> + <directory name="ntdll"> + <xi:include href="dll/ntdll/ntdll.rbuild" /> + </directory> + </directory> + <directory name="base"> + <directory name="system"> + <directory name="smss"> + <xi:include href="base/system/smss/smss.rbuild" /> + </directory> + </directory> + </directory> </project> Modified: branches/pierre-fsd/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ReactOS-ppc.rbuild?r… ============================================================================== --- branches/pierre-fsd/ReactOS-ppc.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/ReactOS-ppc.rbuild [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.ppc" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-ppc.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config-ppc.rbuild"> <xi:fallback> <xi:include href="config-ppc.template.rbuild" /> Modified: branches/pierre-fsd/config-arm.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/config-arm.template.… ============================================================================== --- branches/pierre-fsd/config-arm.template.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/config-arm.template.rbuild [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -85,4 +85,10 @@ --> <property name="_WINKD_" value="0" /> + +<property name="_ELF_" value="0" /> + </group> Modified: branches/pierre-fsd/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/config-ppc.template.… ============================================================================== --- branches/pierre-fsd/config-ppc.template.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/config-ppc.template.rbuild [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -65,4 +65,10 @@ --> <property name="NSWPAT" value="0" /> + +<property name="_ELF_" value="0" /> + </group> Modified: branches/pierre-fsd/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/config.template.rbui… ============================================================================== --- branches/pierre-fsd/config.template.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/config.template.rbuild [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -90,6 +90,12 @@ <property name="_WINKD_" value="0" />  +<property name="_ELF_" value="0" /> + + <property name="BUILD_MP" value="1" /> Modified: branches/pierre-fsd/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/buildno/buildn… ============================================================================== --- branches/pierre-fsd/tools/buildno/buildno.cpp [iso-8859-1] (original) +++ branches/pierre-fsd/tools/buildno/buildno.cpp [iso-8859-1] Sun Aug 9 23:41:20 2009 @@ -33,11 +33,11 @@ #define FALSE 0 #define TRUE 1 -static char * argv0 = ""; +static const char * argv0 = ""; static char * filename = NULL; static char * build_tag = NULL; -int count_wide_string( wchar_t *str ) +int count_wide_string( const wchar_t *str ) { int i; for( i = 0; str[i]; i++ )

1 0

[fireball] 42573: - Get back exception.h include to winbase16.h, but guard it with #ifndef _NTNDK_ so that exception record structure won't get redefined. Wine incompatibly places this structure to psdk/winnt.h. - Add two missing definitions to commctrl.h. - Remove unneeded wine/winbase.h and wine/windef.h. - Sync up winbase16.h with trunk.
by fireball＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: fireball Date: Sun Aug 9 22:23:50 2009 New Revision: 42573 URL: http://svn.reactos.org/svn/reactos?rev=42573&view=rev Log: - Get back exception.h include to winbase16.h, but guard it with #ifndef _NTNDK_ so that exception record structure won't get redefined. Wine incompatibly places this structure to psdk/winnt.h. - Add two missing definitions to commctrl.h. - Remove unneeded wine/winbase.h and wine/windef.h. - Sync up winbase16.h with trunk. Removed: branches/arwinss/reactos/include/reactos/wine/winbase.h branches/arwinss/reactos/include/reactos/wine/windef.h Modified: branches/arwinss/reactos/dll/win32/dbghelp/stack.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/include/psdk/commctrl.h branches/arwinss/reactos/include/reactos/wine/winbase16.h branches/arwinss/reactos/include/reactos/wine/windef16.h Modified: branches/arwinss/reactos/dll/win32/dbghelp/stack.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/dbghe… ============================================================================== --- branches/arwinss/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/dbghelp/stack.c [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -31,7 +31,6 @@ #define WIN32_NO_STATUS #include "dbghelp_private.h" #include "winternl.h" -#include <exception.h> #include "wine/winbase16.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -14,10 +14,10 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winuser16.h" #include "wingdi.h" #define NTOS_USER_MODE #include <ndk/ntndk.h> +#include "winuser16.h" #include "ntrosgdi.h" #include "win32k/rosuser.h" #include "winent.h" Modified: branches/arwinss/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/co… ============================================================================== --- branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/commctrl.h [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -3749,6 +3749,11 @@ SNDMSGA(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMA)&_LVi);} #define ListView_GetItemState(hwnd,i,mask) \ (BOOL)SNDMSGA((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) +#define ListView_SetCheckState(hwndLV, i, bCheck) \ + { LVITEM _LVi; _LVi.state = INDEXTOSTATEIMAGEMASK((bCheck)?2:1); _LVi.stateMask = LVIS_STATEIMAGEMASK; \ + SNDMSG(hwndLV, LVM_SETITEMSTATE, (WPARAM)(UINT)(i), (LPARAM)(LPLVITEM)&_LVi);} +#define ListView_GetCheckState(hwndLV, i) \ + (((UINT)SNDMSG((hwndLV), LVM_GETITEMSTATE, (i), LVIS_STATEIMAGEMASK) >> 12) - 1) #define ListView_GetCountPerPage(hwnd) \ (BOOL)SNDMSGW((hwnd),LVM_GETCOUNTPERPAGE,0,0L) #define ListView_GetImageList(hwnd,iImageList) \ Removed: branches/arwinss/reactos/include/reactos/wine/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/winbase.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/winbase.h (removed) @@ -1,15 +1,0 @@ -#ifndef __WINE_WINBASE_H -#define __WINE_WINBASE_H - -#include_next <winbase.h> - -/* undocumented functions */ - -typedef struct tagSYSLEVEL -{ - CRITICAL_SECTION crst; - INT level; -} SYSLEVEL; - - -#endif /* __WINE_WINBASE_H */ Modified: branches/arwinss/reactos/include/reactos/wine/winbase16.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/winbase16.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/winbase16.h [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -165,6 +165,8 @@ DWORD dwAllocCount; } WINDEBUGINFO16, *LPWINDEBUGINFO16; +/* definitions specific to Wine 16-bit relaying support */ + /* 32-bit stack layout after __wine_call_to_16() */ typedef struct _STACK32FRAME { @@ -202,6 +204,19 @@ WORD cs; /* 2e */ } STACK16FRAME; +/* argument type flags for relay debugging */ +enum arg_types +{ + ARG_NONE = 0, /* indicates end of arg list */ + ARG_WORD, /* unsigned word */ + ARG_SWORD, /* signed word */ + ARG_LONG, /* long or segmented pointer */ + ARG_PTR, /* linear pointer */ + ARG_STR, /* linear pointer to null-terminated string */ + ARG_SEGSTR, /* segmented pointer to null-terminated string */ + ARG_VARARG /* start of varargs */ +}; + #include <poppack.h> #define INVALID_HANDLE_VALUE16 ((HANDLE16) -1) @@ -301,6 +316,13 @@ #define __AHSHIFT 3 /* don't change! */ #define __AHINCR (1 << __AHSHIFT) + + +typedef struct tagSYSLEVEL +{ + CRITICAL_SECTION crst; + INT level; +} SYSLEVEL; /* undocumented functions */ WORD WINAPI AllocCStoDSAlias16(WORD); Removed: branches/arwinss/reactos/include/reactos/wine/windef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/windef.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/windef.h (removed) @@ -1,1 +1,0 @@ -#include "../../psdk/windef.h" Modified: branches/arwinss/reactos/include/reactos/wine/windef16.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/windef16.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/windef16.h [iso-8859-1] Sun Aug 9 22:23:50 2009 @@ -28,6 +28,9 @@ #endif #include <windef.h> #include <winbase.h> +#ifndef _NTNDK_ +#include <exception.h> // ROS Hack +#endif /* Standard data types */ typedef unsigned short BOOL16;

1 0

[pschweitzer] 42572: Fixed winebuild build. Also fixed bad *.def usage in ntdll.rbuild
by pschweitzer＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: pschweitzer Date: Sun Aug 9 21:46:27 2009 New Revision: 42572 URL: http://svn.reactos.org/svn/reactos?rev=42572&view=rev Log: Fixed winebuild build. Also fixed bad *.def usage in ntdll.rbuild Modified: branches/pierre-fsd/dll/ntdll/ntdll.rbuild branches/pierre-fsd/tools/winebuild/build.h branches/pierre-fsd/tools/winebuild/parser.c branches/pierre-fsd/tools/winebuild/spec32.c Modified: branches/pierre-fsd/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/dll/ntdll/ntdll.rbui… ============================================================================== --- branches/pierre-fsd/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ branches/pierre-fsd/dll/ntdll/ntdll.rbuild [iso-8859-1] Sun Aug 9 21:46:27 2009 @@ -6,7 +6,7 @@ </module> <module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll" iscrt="yes"> <bootstrap installbase="$(CDOUTPUT)/system32" /> - <importlibrary definition="def/ntdll.def" /> + <importlibrary definition="def/ntdll_$(ARCH).def" /> <include base="ntdll">include</include> <include base="ntdll" root="intermediate"></include> <include base="ReactOS">include/reactos/subsys</include> Modified: branches/pierre-fsd/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/winebuild/buil… ============================================================================== --- branches/pierre-fsd/tools/winebuild/build.h [iso-8859-1] (original) +++ branches/pierre-fsd/tools/winebuild/build.h [iso-8859-1] Sun Aug 9 21:46:27 2009 @@ -40,6 +40,7 @@ TYPE_STDCALL, /* stdcall function (Win32) */ TYPE_CDECL, /* cdecl function (Win32) */ TYPE_VARARGS, /* varargs function (Win32) */ + TYPE_FASTCALL, /* fastcall function (Win32) */ TYPE_EXTERN, /* external symbol (Win32) */ TYPE_NBTYPES } ORD_TYPE; Modified: branches/pierre-fsd/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/winebuild/pars… ============================================================================== --- branches/pierre-fsd/tools/winebuild/parser.c [iso-8859-1] (original) +++ branches/pierre-fsd/tools/winebuild/parser.c [iso-8859-1] Sun Aug 9 21:46:27 2009 @@ -57,6 +57,7 @@ "stdcall", /* TYPE_STDCALL */ "cdecl", /* TYPE_CDECL */ "varargs", /* TYPE_VARARGS */ + "fastcall", /* TYPE_FASTCALL */ "extern" /* TYPE_EXTERN */ }; @@ -513,6 +514,7 @@ case TYPE_STDCALL: case TYPE_VARARGS: case TYPE_CDECL: + case TYPE_FASTCALL: if (!parse_spec_export( odp, spec )) goto error; break; case TYPE_ABS: Modified: branches/pierre-fsd/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/tools/winebuild/spec… ============================================================================== --- branches/pierre-fsd/tools/winebuild/spec32.c [iso-8859-1] (original) +++ branches/pierre-fsd/tools/winebuild/spec32.c [iso-8859-1] Sun Aug 9 21:46:27 2009 @@ -624,9 +624,6 @@ if (!(odp->flags & FLAG_PRIVATE)) total++; - - output( " %s", name ); - switch(odp->type) { case TYPE_EXTERN: @@ -635,12 +632,14 @@ case TYPE_VARARGS: case TYPE_CDECL: /* try to reduce output */ + output( " %s", name ); if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) output( "=%s", odp->link_name ); break; case TYPE_STDCALL: { int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); + output( " %s", name ); if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); if (odp->flags & FLAG_FORWARD) { @@ -677,6 +676,7 @@ } case TYPE_STUB: { + output( " %s", name ); if (!kill_at) { const char *check = name + strlen(name);

1 0

[gschneider] 42571: Revert r42536 for build server diagnosis
by gschneider＠svn.reactos.org 09 Aug '09

09 Aug '09

Author: gschneider Date: Sun Aug 9 21:30:35 2009 New Revision: 42571 URL: http://svn.reactos.org/svn/reactos?rev=42571&view=rev Log: Revert r42536 for build server diagnosis Modified: trunk/reactos/dll/win32/kernel32/misc/commdcb.c Modified: trunk/reactos/dll/win32/kernel32/misc/commdcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/commdcb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/commdcb.c [iso-8859-1] Sun Aug 9 21:30:35 2009 @@ -627,7 +627,7 @@ DWORD dwErr; dwErr = ERROR_INVALID_PARAMETER; - cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, NULL, 0, NULL, NULL); + cchAscii = WideCharToMultiByte(20127, 0, lpDef, -1, NULL, 0, NULL, NULL); bRet = cchAscii > 0; @@ -641,7 +641,7 @@ if(bRet) { bInvalidChars = FALSE; - cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); + cchAscii = WideCharToMultiByte(20127, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); bRet = cchAscii > 0 && !bInvalidChars;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs