Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 40641: - Implement KSPROPERTY_PIN_CTYPE, KSPROPERTY_PIN_DATAFLOW, KSPROPERTY_PIN_COMMUNICATION for fast property handler
by janderwald＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: janderwald Date: Wed Apr 22 02:05:33 2009 New Revision: 40641 URL: http://svn.reactos.org/svn/reactos?rev=40641&view=rev Log: - Implement KSPROPERTY_PIN_CTYPE, KSPROPERTY_PIN_DATAFLOW, KSPROPERTY_PIN_COMMUNICATION for fast property handler Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Wed Apr 22 02:05:33 2009 @@ -217,6 +217,7 @@ { PFNKSHANDLER PropertyHandler = NULL; NTSTATUS Status = STATUS_UNSUCCESSFUL; + KSP_PIN * Pin; ASSERT(Descriptor); @@ -236,37 +237,64 @@ switch(Property->Id) { case KSPROPERTY_PIN_CTYPES: + (*(PULONG)Data) = Descriptor->Factory.PinDescriptorCount; + IoStatus->Information = sizeof(ULONG); + IoStatus->Status = Status = STATUS_SUCCESS; + break; case KSPROPERTY_PIN_DATAFLOW: + Pin = (KSP_PIN*)Property; + if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount) + { + IoStatus->Status = Status = STATUS_INVALID_PARAMETER; + IoStatus->Information = 0; + break; + } + + *((KSPIN_DATAFLOW*)Data) = Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataFlow; + IoStatus->Information = sizeof(KSPIN_DATAFLOW); + IoStatus->Status = Status = STATUS_SUCCESS; + break; + case KSPROPERTY_PIN_COMMUNICATION: + Pin = (KSP_PIN*)Property; + if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount) + { + IoStatus->Status = Status = STATUS_INVALID_PARAMETER; + IoStatus->Information = 0; + break; + } + + *((KSPIN_COMMUNICATION*)Data) = Descriptor->Factory.KsPinDescriptor[Pin->PinId].Communication; + IoStatus->Status = Status = STATUS_SUCCESS; + IoStatus->Information = sizeof(KSPIN_COMMUNICATION); + break; + + case KSPROPERTY_PIN_GLOBALCINSTANCES: + Status = HandlePropertyInstances(IoStatus, Property, Data, Descriptor, TRUE); + break; + case KSPROPERTY_PIN_CINSTANCES: + Status = HandlePropertyInstances(IoStatus, Property, Data, Descriptor, FALSE); + break; + case KSPROPERTY_PIN_NECESSARYINSTANCES: + Status = HandleNecessaryPropertyInstances(IoStatus, Property, Data, Descriptor); + break; + + case KSPROPERTY_PIN_DATAINTERSECTION: + Status = HandleDataIntersection(IoStatus, Property, Data, DataLength, Descriptor, SubDevice); + break; + case KSPROPERTY_PIN_PHYSICALCONNECTION: + case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: case KSPROPERTY_PIN_DATARANGES: case KSPROPERTY_PIN_INTERFACES: case KSPROPERTY_PIN_MEDIUMS: - case KSPROPERTY_PIN_COMMUNICATION: case KSPROPERTY_PIN_CATEGORY: case KSPROPERTY_PIN_NAME: case KSPROPERTY_PIN_PROPOSEDATAFORMAT: - Status = KsFastPropertyHandler(FileObject, Property, PropertyLength, Data, DataLength, IoStatus, PropertySetsCount, PropertySet); - break; - case KSPROPERTY_PIN_GLOBALCINSTANCES: - Status = HandlePropertyInstances(IoStatus, Property, Data, Descriptor, TRUE); - break; - case KSPROPERTY_PIN_CINSTANCES: - Status = HandlePropertyInstances(IoStatus, Property, Data, Descriptor, FALSE); - break; - case KSPROPERTY_PIN_NECESSARYINSTANCES: - Status = HandleNecessaryPropertyInstances(IoStatus, Property, Data, Descriptor); - break; - - case KSPROPERTY_PIN_DATAINTERSECTION: - Status = HandleDataIntersection(IoStatus, Property, Data, DataLength, Descriptor, SubDevice); - break; - case KSPROPERTY_PIN_PHYSICALCONNECTION: - case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: UNIMPLEMENTED Status = STATUS_NOT_IMPLEMENTED; break; default: UNIMPLEMENTED - Status = STATUS_UNSUCCESSFUL; + Status = STATUS_NOT_IMPLEMENTED; } return Status; }

1 0

[janderwald] 40640: - Implement FastDeviceIoControl for IPortFilterWavePci - Partly implement fast property handler
by janderwald＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: janderwald Date: Wed Apr 22 01:44:15 2009 New Revision: 40640 URL: http://svn.reactos.org/svn/reactos?rev=40640&view=rev Log: - Implement FastDeviceIoControl for IPortFilterWavePci - Partly implement fast property handler Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] Wed Apr 22 01:44:15 2009 @@ -244,7 +244,6 @@ { This->Pins[Index]->lpVtbl->Close(This->Pins[Index], DeviceObject, NULL); } - } @@ -298,8 +297,49 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED - return FALSE; + ULONG Index; + PKSPROPERTY Property; + NTSTATUS Status; + ISubdevice * SubDevice = NULL; + PSUBDEVICE_DESCRIPTOR Descriptor = NULL; + IPortFilterWavePciImpl * This = (IPortFilterWavePciImpl *)iface; + + Property = (PKSPROPERTY)InputBuffer; + + if (InputBufferLength < sizeof(KSPROPERTY)) + return FALSE; + + + /* get private interface */ + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); + if (!NT_SUCCESS(Status)) + return FALSE; + + /* get descriptor */ + Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); + if (!NT_SUCCESS(Status)) + { + SubDevice->lpVtbl->Release(SubDevice); + return FALSE; + } + + Status = STATUS_UNSUCCESSFUL; + for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) + { + if (IsEqualGUIDAligned(&Property->Set, Descriptor->FilterPropertySet.Properties[Index].Set)) + { + Status = FastPropertyHandler(FileObject, (PKSPROPERTY)InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, StatusBlock, + 1, + &Descriptor->FilterPropertySet.Properties[Index], + Descriptor, SubDevice); + break; + } + } + + if (NT_SUCCESS(Status)) + return TRUE; + else + return FALSE; } /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Wed Apr 22 01:44:15 2009 @@ -248,6 +248,20 @@ PcPropertyHandler( IN PIRP Irp, IN PSUBDEVICE_DESCRIPTOR Descriptor); + +NTSTATUS +NTAPI +FastPropertyHandler( + IN PFILE_OBJECT FileObject, + IN PKSPROPERTY UNALIGNED Property, + IN ULONG PropertyLength, + IN OUT PVOID UNALIGNED Data, + IN ULONG DataLength, + OUT PIO_STATUS_BLOCK IoStatus, + IN ULONG PropertySetsCount, + IN const KSPROPERTY_SET *PropertySet, + IN PSUBDEVICE_DESCRIPTOR Descriptor, + IN ISubdevice *SubDevice); PDEVICE_OBJECT GetDeviceObject( Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Wed Apr 22 01:44:15 2009 @@ -9,8 +9,17 @@ #include "private.h" NTSTATUS +FindPropertyHandler( + IN PIO_STATUS_BLOCK IoStatus, + IN PSUBDEVICE_DESCRIPTOR Descriptor, + IN PKSPROPERTY Property, + IN ULONG InputBufferLength, + IN ULONG OutputBufferLength, + OUT PFNKSHANDLER *PropertyHandler); + +NTSTATUS HandlePropertyInstances( - IN PIRP Irp, + IN PIO_STATUS_BLOCK IoStatus, IN PKSIDENTIFIER Request, IN OUT PVOID Data, IN PSUBDEVICE_DESCRIPTOR Descriptor, @@ -21,8 +30,8 @@ if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoStatus->Information = 0; + IoStatus->Status = STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER; } @@ -35,14 +44,14 @@ Instances->CurrentCount = Descriptor->Factory.Instances[Pin->PinId].CurrentPinInstanceCount; - Irp->IoStatus.Information = sizeof(KSPIN_CINSTANCES); - Irp->IoStatus.Status = STATUS_SUCCESS; + IoStatus->Information = sizeof(KSPIN_CINSTANCES); + IoStatus->Status = STATUS_SUCCESS; return STATUS_SUCCESS; } NTSTATUS HandleNecessaryPropertyInstances( - IN PIRP Irp, + IN PIO_STATUS_BLOCK IoStatus, IN PKSIDENTIFIER Request, IN OUT PVOID Data, IN PSUBDEVICE_DESCRIPTOR Descriptor) @@ -52,36 +61,78 @@ if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount) { - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; + IoStatus->Information = 0; + IoStatus->Status = STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER; } Result = (PULONG)Data; *Result = Descriptor->Factory.Instances[Pin->PinId].MinFilterInstanceCount; - Irp->IoStatus.Information = sizeof(ULONG); - Irp->IoStatus.Status = STATUS_SUCCESS; + IoStatus->Information = sizeof(ULONG); + IoStatus->Status = STATUS_SUCCESS; return STATUS_SUCCESS; } NTSTATUS HandleDataIntersection( - IN PIRP Irp, + IN PIO_STATUS_BLOCK IoStatus, IN PKSIDENTIFIER Request, IN OUT PVOID Data, - IN PSUBDEVICE_DESCRIPTOR Descriptor) -{ + IN ULONG DataLength, + IN PSUBDEVICE_DESCRIPTOR Descriptor, + IN ISubdevice *SubDevice) +{ + KSP_PIN * Pin = (KSP_PIN*)Request; + PKSMULTIPLE_ITEM MultipleItem; + PKSDATARANGE DataRange; + NTSTATUS Status = STATUS_NO_MATCH; + ULONG Index, Length; + + /* Access parameters */ + MultipleItem = (PKSMULTIPLE_ITEM)(Pin + 1); + DataRange = (PKSDATARANGE)(MultipleItem + 1); + + for(Index = 0; Index < MultipleItem->Count; Index++) + { + /* Call miniport's properitary handler */ + ASSERT(Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRangesCount); + ASSERT(Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[0]); + Status = SubDevice->lpVtbl->DataRangeIntersection(SubDevice, Pin->PinId, DataRange, (PKSDATARANGE)Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[0], + DataLength, Data, &Length); + + if (Status == STATUS_SUCCESS) + { + IoStatus->Information = Length; + break; + } + DataRange = UlongToPtr(PtrToUlong(DataRange) + DataRange->FormatSize); + } + + IoStatus->Status = Status; + return Status; +} + + +NTSTATUS +NTAPI +PinPropertyHandler( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + PKSOBJECT_CREATE_ITEM CreateItem; + PSUBDEVICE_DESCRIPTOR Descriptor; + PIO_STACK_LOCATION IoStack; IIrpTarget * IrpTarget; IPort *Port; ISubdevice *SubDevice; - KSP_PIN * Pin = (KSP_PIN*)Request; - PKSOBJECT_CREATE_ITEM CreateItem; - PKSMULTIPLE_ITEM MultipleItem; - PKSDATARANGE DataRange; - PIO_STACK_LOCATION IoStack; - NTSTATUS Status; - ULONG Index, Length; + + + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + ASSERT(Descriptor); /* Access the create item */ CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); @@ -105,49 +156,8 @@ KeBugCheck(0); } - /* Access parameters */ - MultipleItem = (PKSMULTIPLE_ITEM)(Pin + 1); - DataRange = (PKSDATARANGE)(MultipleItem + 1); - - /* Get current stack location */ + /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - - for(Index = 0; Index < MultipleItem->Count; Index++) - { - /* Call miniport's properitary handler */ - ASSERT(Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRangesCount); - ASSERT(Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[0]); - Status = SubDevice->lpVtbl->DataRangeIntersection(SubDevice, Pin->PinId, DataRange, (PKSDATARANGE)Descriptor->Factory.KsPinDescriptor[Pin->PinId].DataRanges[0], - IoStack->Parameters.DeviceIoControl.OutputBufferLength, Data, &Length); - - if (Status == STATUS_SUCCESS) - { - Irp->IoStatus.Information = Length; - break; - } - DataRange = UlongToPtr(PtrToUlong(DataRange) + DataRange->FormatSize); - } - - /* Release reference */ - Port->lpVtbl->Release(Port); - - Irp->IoStatus.Status = Status; - return Status; -} - - -NTSTATUS -NTAPI -PinPropertyHandler( - IN PIRP Irp, - IN PKSIDENTIFIER Request, - IN OUT PVOID Data) -{ - PSUBDEVICE_DESCRIPTOR Descriptor; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - - Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); - ASSERT(Descriptor); switch(Request->Id) { @@ -163,27 +173,101 @@ Status = KsPinPropertyHandler(Irp, Request, Data, Descriptor->Factory.PinDescriptorCount, Descriptor->Factory.KsPinDescriptor); break; case KSPROPERTY_PIN_GLOBALCINSTANCES: - Status = HandlePropertyInstances(Irp, Request, Data, Descriptor, TRUE); + Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, TRUE); break; case KSPROPERTY_PIN_CINSTANCES: - Status = HandlePropertyInstances(Irp, Request, Data, Descriptor, FALSE); + Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, FALSE); break; case KSPROPERTY_PIN_NECESSARYINSTANCES: - Status = HandleNecessaryPropertyInstances(Irp, Request, Data, Descriptor); + Status = HandleNecessaryPropertyInstances(&Irp->IoStatus, Request, Data, Descriptor); break; case KSPROPERTY_PIN_DATAINTERSECTION: - Status = HandleDataIntersection(Irp, Request, Data, Descriptor); + Status = HandleDataIntersection(&Irp->IoStatus, Request, Data, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Descriptor, SubDevice); break; case KSPROPERTY_PIN_PHYSICALCONNECTION: case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: - DPRINT1("Unhandled %x\n", Request->Id); - Status = STATUS_SUCCESS; + UNIMPLEMENTED + Status = STATUS_NOT_IMPLEMENTED; break; default: - Status = STATUS_NOT_FOUND; - } - + UNIMPLEMENTED + Status = STATUS_UNSUCCESSFUL; + } + + /* Release reference */ + Port->lpVtbl->Release(Port); + + return Status; +} + +NTSTATUS +NTAPI +FastPropertyHandler( + IN PFILE_OBJECT FileObject, + IN PKSPROPERTY UNALIGNED Property, + IN ULONG PropertyLength, + IN OUT PVOID UNALIGNED Data, + IN ULONG DataLength, + OUT PIO_STATUS_BLOCK IoStatus, + IN ULONG PropertySetsCount, + IN const KSPROPERTY_SET *PropertySet, + IN PSUBDEVICE_DESCRIPTOR Descriptor, + IN ISubdevice *SubDevice) +{ + PFNKSHANDLER PropertyHandler = NULL; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + ASSERT(Descriptor); + + if (!IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Pin)) + { + /* the fast handler only supports pin properties */ + return Status; + } + + /* property handler is used to verify input parameters */ + Status = FindPropertyHandler(IoStatus, Descriptor, Property, PropertyLength, DataLength, &PropertyHandler); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + switch(Property->Id) + { + case KSPROPERTY_PIN_CTYPES: + case KSPROPERTY_PIN_DATAFLOW: + case KSPROPERTY_PIN_DATARANGES: + case KSPROPERTY_PIN_INTERFACES: + case KSPROPERTY_PIN_MEDIUMS: + case KSPROPERTY_PIN_COMMUNICATION: + case KSPROPERTY_PIN_CATEGORY: + case KSPROPERTY_PIN_NAME: + case KSPROPERTY_PIN_PROPOSEDATAFORMAT: + Status = KsFastPropertyHandler(FileObject, Property, PropertyLength, Data, DataLength, IoStatus, PropertySetsCount, PropertySet); + break; + case KSPROPERTY_PIN_GLOBALCINSTANCES: + Status = HandlePropertyInstances(IoStatus, Property, Data, Descriptor, TRUE); + break; + case KSPROPERTY_PIN_CINSTANCES: + Status = HandlePropertyInstances(IoStatus, Property, Data, Descriptor, FALSE); + break; + case KSPROPERTY_PIN_NECESSARYINSTANCES: + Status = HandleNecessaryPropertyInstances(IoStatus, Property, Data, Descriptor); + break; + + case KSPROPERTY_PIN_DATAINTERSECTION: + Status = HandleDataIntersection(IoStatus, Property, Data, DataLength, Descriptor, SubDevice); + break; + case KSPROPERTY_PIN_PHYSICALCONNECTION: + case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: + UNIMPLEMENTED + Status = STATUS_NOT_IMPLEMENTED; + break; + default: + UNIMPLEMENTED + Status = STATUS_UNSUCCESSFUL; + } return Status; } @@ -202,12 +286,61 @@ } NTSTATUS +FindPropertyHandler( + IN PIO_STATUS_BLOCK IoStatus, + IN PSUBDEVICE_DESCRIPTOR Descriptor, + IN PKSPROPERTY Property, + IN ULONG InputBufferLength, + IN ULONG OutputBufferLength, + OUT PFNKSHANDLER *PropertyHandler) +{ + ULONG Index, ItemIndex; + + for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) + { + if (IsEqualGUIDAligned(&Property->Set, Descriptor->FilterPropertySet.Properties[Index].Set)) + { + for(ItemIndex = 0; ItemIndex < Descriptor->FilterPropertySet.Properties[Index].PropertiesCount; ItemIndex++) + { + if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].PropertyId == Property->Id) + { + if (Property->Flags & KSPROPERTY_TYPE_SET) + *PropertyHandler = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].SetPropertyHandler; + + if (Property->Flags & KSPROPERTY_TYPE_GET) + *PropertyHandler = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].GetPropertyHandler; + + if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinProperty > InputBufferLength) + { + /* too small input buffer */ + IoStatus->Information = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinProperty; + IoStatus->Status = STATUS_BUFFER_TOO_SMALL; + return STATUS_BUFFER_TOO_SMALL; + } + + if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinData > OutputBufferLength) + { + /* too small output buffer */ + IoStatus->Information = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinData; + IoStatus->Status = STATUS_BUFFER_TOO_SMALL; + return STATUS_BUFFER_TOO_SMALL; + } + return STATUS_SUCCESS; + } + } + } + } + return STATUS_UNSUCCESSFUL; +} + + +NTSTATUS NTAPI PcPropertyHandler( IN PIRP Irp, IN PSUBDEVICE_DESCRIPTOR Descriptor) { - ULONG Index, ItemIndex; + ULONG Index; PIO_STACK_LOCATION IoStack; PKSPROPERTY Property; PFNKSHANDLER PropertyHandler = NULL; @@ -259,60 +392,21 @@ } } - for(Index = 0; Index < Descriptor->FilterPropertySet.FreeKsPropertySetOffset; Index++) - { - if (IsEqualGUIDAligned(&Property->Set, Descriptor->FilterPropertySet.Properties[Index].Set)) - { - for(ItemIndex = 0; ItemIndex < Descriptor->FilterPropertySet.Properties[Index].PropertiesCount; ItemIndex++) - { - if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].PropertyId == Property->Id) - { - if (Property->Flags & KSPROPERTY_TYPE_SET) - PropertyHandler = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].SetPropertyHandler; - - if (Property->Flags & KSPROPERTY_TYPE_GET) - PropertyHandler = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].GetPropertyHandler; - - if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinProperty > IoStack->Parameters.DeviceIoControl.InputBufferLength) - { - /* too small input buffer */ - Irp->IoStatus.Information = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinProperty; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_BUFFER_TOO_SMALL; - } - - if (Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinData > IoStack->Parameters.DeviceIoControl.OutputBufferLength) - { - /* too small output buffer */ - Irp->IoStatus.Information = Descriptor->FilterPropertySet.Properties[Index].PropertyItem[ItemIndex].MinData; - Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_BUFFER_TOO_SMALL; - } - - if (PropertyHandler) - { - KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PVOID)Descriptor; - DPRINT("Calling property handler %p\n", PropertyHandler); - Status = PropertyHandler(Irp, Property, Irp->UserBuffer); - } - - /* the information member is set by the handler */ - Irp->IoStatus.Status = Status; - DPRINT("Result %x Length %u\n", Status, Irp->IoStatus.Information); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; - } - } - } + Status = FindPropertyHandler(&Irp->IoStatus, Descriptor, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &PropertyHandler); + if (PropertyHandler) + { + KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PVOID)Descriptor; + DPRINT("Calling property handler %p\n", PropertyHandler); + Status = PropertyHandler(Irp, Property, Irp->UserBuffer); } RtlStringFromGUID(&Property->Set, &GuidString); DPRINT1("Unhandeled property: Set %S Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); RtlFreeUnicodeString(&GuidString); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + + /* the information member is set by the handler */ + Irp->IoStatus.Status = Status; + DPRINT("Result %x Length %u\n", Status, Irp->IoStatus.Information); IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; -} + return Status; +}

1 0

[cwittich] 40639: fix formatting
by cwittich＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: cwittich Date: Wed Apr 22 01:40:31 2009 New Revision: 40639 URL: http://svn.reactos.org/svn/reactos?rev=40639&view=rev Log: fix formatting Modified: trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/virt.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=40639&r1=… ============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Wed Apr 22 01:40:31 2009 @@ -145,7 +145,7 @@ virConnectPtr vConn = NULL; virDomainPtr vDom; virDomainInfo info; - int Crashes; + int Crashes; int Stage; char qemu_img_cmdline[300]; FILE* file; @@ -169,7 +169,7 @@ { /* SysregPrintf("Error: Virtual Machine is already running.\n"); goto cleanup; */ - system("virsh destroy ReactOS"); + system("virsh destroy ReactOS"); } /* If the HD image already exists, delete it */

1 0

[cfinck] 40638: Change some leftover .rbuild files from compiler="cpp" to compiler="cxx"
by cfinck＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: cfinck Date: Tue Apr 21 23:53:10 2009 New Revision: 40638 URL: http://svn.reactos.org/svn/reactos?rev=40638&view=rev Log: Change some leftover .rbuild files from compiler="cpp" to compiler="cxx" Modified: trunk/rosapps/applications/net/netreg/netreg.rbuild trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild trunk/rostests/rosautotest/rosautotest.rbuild Modified: trunk/rosapps/applications/net/netreg/netreg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/netreg/ne… ============================================================================== --- trunk/rosapps/applications/net/netreg/netreg.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/net/netreg/netreg.rbuild [iso-8859-1] Tue Apr 21 23:53:10 2009 @@ -4,7 +4,7 @@ <library>user32</library> <library>ws2_32</library> <library>advapi32</library> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> + <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> <file>netreg.cpp</file> <file>netreg.rc</file> </module> Modified: trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/… ============================================================================== --- trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild [iso-8859-1] Tue Apr 21 23:53:10 2009 @@ -6,7 +6,7 @@ <library>kernel32</library> <library>ws2_32</library> <library>user32</library> - <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> + <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> <file>config.cpp</file> <file>error.cpp</file> <file>http.cpp</file> Modified: trunk/rostests/rosautotest/rosautotest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/rosautotest.r… ============================================================================== --- trunk/rostests/rosautotest/rosautotest.rbuild [iso-8859-1] (original) +++ trunk/rostests/rosautotest/rosautotest.rbuild [iso-8859-1] Tue Apr 21 23:53:10 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="rosautotest" type="win32cui" installbase="system32" installname="rosautotest.exe" unicode="yes"> - <compilerflag compiler="cpp">-fno-rtti</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> <include base="rosautotest">.</include> <library>advapi32</library> <library>kernel32</library>

1 0

[hpoussin] 40637: Fix warning
by hpoussin＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: hpoussin Date: Tue Apr 21 23:19:48 2009 New Revision: 40637 URL: http://svn.reactos.org/svn/reactos?rev=40637&view=rev Log: Fix warning Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Tue Apr 21 23:19:48 2009 @@ -500,7 +500,9 @@ ULONG Signature; CHAR Identifier[20]; CHAR ArcName[256]; +#if 0 PARTITION_TABLE_ENTRY PartitionTableEntry; +#endif /* Read the MBR */ if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER))

1 0

[hpoussin] 40636: Disable partition table exploration, as long as it displays an error message if disk is not partitioned
by hpoussin＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: hpoussin Date: Tue Apr 21 23:05:07 2009 New Revision: 40636 URL: http://svn.reactos.org/svn/reactos?rev=40636&view=rev Log: Disable partition table exploration, as long as it displays an error message if disk is not partitioned Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Tue Apr 21 23:05:07 2009 @@ -536,6 +536,7 @@ sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)partition(0)", DriveNumber - 0x80); FsRegisterDevice(ArcName, &DiskVtbl); +#if 0 /* Add partitions */ i = 0; while (MachDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) @@ -547,6 +548,7 @@ } i++; } +#endif /* Convert checksum and signature to identifier string */ Identifier[0] = Hex[(Checksum >> 28) & 0x0F];

1 0

[tkreuzer] 40635: Some work on freetype font driver
by tkreuzer＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: tkreuzer Date: Tue Apr 21 22:54:36 2009 New Revision: 40635 URL: http://svn.reactos.org/svn/reactos?rev=40635&view=rev Log: Some work on freetype font driver Modified: trunk/reactos/drivers/video/font/ftfd/enable.c trunk/reactos/drivers/video/font/ftfd/font.c trunk/reactos/drivers/video/font/ftfd/ftfd.h Modified: trunk/reactos/drivers/video/font/ftfd/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/en… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/enable.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/enable.c [iso-8859-1] Tue Apr 21 22:54:36 2009 @@ -77,6 +77,7 @@ IN HANDLE hDriver) { DbgPrint("FtfdEnablePDEV(hdev=%p)\n", hdev); + DbgBreakPoint(); /* Return a dummy DHPDEV */ Modified: trunk/reactos/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/fo… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] Tue Apr 21 22:54:36 2009 @@ -13,12 +13,10 @@ ULONG cjView) { CHAR *pc; - CHAR c; pc = EngAllocMem(0, cjView, 'tmp '); memcpy(pc, pvView, cjView); - c = *pc; *pc = 0; return pc; @@ -179,12 +177,14 @@ PIFIMETRICS pifi; FT_Face ftface; FT_Error fterror; + ULONG i; DbgPrint("FtfdQueryFont()\n"); /* Validate parameters */ if (iFace > pfile->cNumFaces || !pid) { + DbgPrint("iFace > pfile->cNumFaces || !pid\n"); return NULL; } @@ -195,6 +195,7 @@ &ftface); if (fterror) { + DbgPrint("FT_New_Memory_Face failed\n"); return NULL; } @@ -211,34 +212,52 @@ pifi = &pifiX->ifim; pifi->cjThis = sizeof(FTFD_IFIMETRICS); pifi->cjIfiExtra = 0; + + /* Relative offsets */ pifi->dpwszFamilyName = FIELD_OFFSET(FTFD_IFIMETRICS, wszFamilyName); - pifi->dpwszStyleName = FIELD_OFFSET(FTFD_IFIMETRICS, wszFamilyName); + pifi->dpwszStyleName = FIELD_OFFSET(FTFD_IFIMETRICS, wszStyleName); pifi->dpwszFaceName = FIELD_OFFSET(FTFD_IFIMETRICS, wszFaceName); pifi->dpwszUniqueName = FIELD_OFFSET(FTFD_IFIMETRICS, wszFaceName); + pifi->dpCharSets = FIELD_OFFSET(FTFD_IFIMETRICS, ajCharSet); pifi->dpFontSim = 0; + + /* Charsets */ + pifi->jWinCharSet = ANSI_CHARSET; + pifiX->ajCharSet[0] = pifi->jWinCharSet; + for (i = 1; i < 16; i++) + { + pifiX->ajCharSet[i] = DEFAULT_CHARSET; + } + pifi->lEmbedId = 0; pifi->lItalicAngle = 0; pifi->lCharBias = 0; - pifi->dpCharSets = 0; -// pifi->jWinCharSet = pFontInfo->dfCharSet; -// pifi->jWinPitchAndFamily = pFontInfo->dfPitchAndFamily; -// pifi->usWinWeight = GETVAL(pFontInfo->dfWeight); -// pifi->flInfo = pface->flInfo; + pifi->jWinPitchAndFamily = VARIABLE_PITCH | FF_DONTCARE; // FIXME + pifi->usWinWeight = FW_MEDIUM; // FIXME + pifi->flInfo = FM_INFO_TECH_TRUETYPE | FM_INFO_ARB_XFORMS | + FM_INFO_1BPP | FM_INFO_4BPP | + FM_INFO_RETURNS_OUTLINES | + FM_INFO_RETURNS_BITMAPS | + FM_INFO_RIGHT_HANDED; pifi->fsSelection = 0; pifi->fsType = 0; -// pifi->fwdUnitsPerEm = GETVAL(pFontInfo->dfPixHeight); - pifi->fwdLowestPPEm = 0; -// pifi->fwdWinAscender = GETVAL(pFontInfo->dfAscent); - pifi->fwdWinDescender = pifi->fwdUnitsPerEm - pifi->fwdWinAscender; + + /* Font resolution */ + pifi->fwdUnitsPerEm = ftface->units_per_EM; + pifi->fwdLowestPPEm = 8; // FIXME + + /* Font metrics */ + pifi->fwdWinAscender = ftface->ascender; + pifi->fwdWinDescender = - ftface->descender; pifi->fwdMacAscender = pifi->fwdWinAscender; pifi->fwdMacDescender = - pifi->fwdWinDescender; pifi->fwdMacLineGap = 0; pifi->fwdTypoAscender = pifi->fwdWinAscender; - pifi->fwdTypoDescender = - pifi->fwdWinDescender; + pifi->fwdTypoDescender = 0; // FIXME!!! - pifi->fwdWinDescender; pifi->fwdTypoLineGap = 0; -// pifi->fwdAveCharWidth = GETVAL(pFontInfo->dfAvgWidth); -// pifi->fwdMaxCharInc = GETVAL(pFontInfo->dfMaxWidth); -// pifi->fwdCapHeight = pifi->fwdUnitsPerEm / 2; + pifi->fwdAveCharWidth = 1085; // FIXME + pifi->fwdMaxCharInc = ftface->max_advance_width; + pifi->fwdCapHeight = pifi->fwdUnitsPerEm / 2; pifi->fwdXHeight = pifi->fwdUnitsPerEm / 4; pifi->fwdSubscriptXSize = 0; pifi->fwdSubscriptYSize = 0; @@ -248,41 +267,64 @@ pifi->fwdSuperscriptYSize = 0; pifi->fwdSuperscriptXOffset = 0; pifi->fwdSuperscriptYOffset = 0; - pifi->fwdUnderscoreSize = 01; + pifi->fwdUnderscoreSize = 1; pifi->fwdUnderscorePosition = -1; pifi->fwdStrikeoutSize = 1; pifi->fwdStrikeoutPosition = pifi->fwdXHeight + 1; -// pifi->chFirstChar = pFontInfo->dfFirstChar; -// pifi->chLastChar = pFontInfo->dfLastChar; -// pifi->chDefaultChar = pFontInfo->dfFirstChar + pFontInfo->dfDefaultChar; -// pifi->chBreakChar = pFontInfo->dfFirstChar + pFontInfo->dfBreakChar; -// pifi->wcFirstChar = pface->wcFirstChar; -// pifi->wcLastChar = pface->wcLastChar; -// pifi->wcDefaultChar = pface->wcDefaultChar; -// pifi->wcBreakChar = pface->wcBreakChar; + pifi->ptlBaseline.x = 1; pifi->ptlBaseline.y = 0; -// pifi->ptlAspect.x = pFontInfo->dfVertRes; // CHECKME -// pifi->ptlAspect.y = pFontInfo->dfHorizRes; + pifi->ptlAspect.x = 1; + pifi->ptlAspect.y = 1; pifi->ptlCaret.x = 0; pifi->ptlCaret.y = 1; - pifi->rclFontBox.left = 0; - pifi->rclFontBox.right = pifi->fwdAveCharWidth; - pifi->rclFontBox.top = pifi->fwdWinAscender; - pifi->rclFontBox.bottom = - pifi->fwdWinDescender; + + /* Set the biggest characters bounding box */ + pifi->rclFontBox.left = ftface->bbox.xMin; + pifi->rclFontBox.right = ftface->bbox.xMax; + pifi->rclFontBox.top = ftface->bbox.yMax; + pifi->rclFontBox.bottom = ftface->bbox.yMin; + + /* Special characters */ + pifi->chFirstChar = 0x1c; // FIXME + pifi->chLastChar = 0x79; + pifi->chDefaultChar = 0x1d; + pifi->chBreakChar = 0x1e; + pifi->wcFirstChar = 0x1e; + pifi->wcLastChar = 0x79; + pifi->wcDefaultChar = 0x1d; + pifi->wcBreakChar = 0x1e; + + *(DWORD*)&pifi->achVendId = 0x30303030; // FIXME pifi->cKerningPairs = 0; pifi->ulPanoseCulture = FM_PANOSE_CULTURE_LATIN; // pifi->panose = panose; - /* Set char sets */ - pifiX->ajCharSet[0] = pifi->jWinCharSet; - pifiX->ajCharSet[1] = DEFAULT_CHARSET; + EngMultiByteToUnicodeN(pifiX->wszFamilyName, + LF_FACESIZE, + NULL, + ftface->family_name, + strnlen(ftface->family_name, MAX_PATH)); + + EngMultiByteToUnicodeN(pifiX->wszStyleName, + LF_FACESIZE, + NULL, + ftface->style_name, + strnlen(ftface->style_name, MAX_PATH)); + + EngMultiByteToUnicodeN(pifiX->wszFaceName, + LF_FACESIZE, + NULL, + ftface->family_name, + strnlen(ftface->family_name, MAX_PATH)); FT_Done_Face(ftface); - - return 0; + DbgPrint("Finished with the ifi: %p\n", pifiX); + DbgBreakPoint(); + + return pifi; } @@ -336,28 +378,37 @@ &ftface); if (fterror) { - return NULL; - } - - cGlyphs = ftface->num_glyphs; - cRuns = 1; - + DbgPrint("FT_New_Memory_Face() failed.\n"); + return NULL; + } + + /* Get inital value for cGlyphs from ftface */ + cGlyphs = ftface->num_glyphs + 1; + + /* Allocate a buffer for the char codes and glyph indexes */ pcp = EngAllocMem(0, cGlyphs * sizeof(FTFD_CHARPAIR), 'pcp '); if (!pcp) { - return NULL; - } - - charcode = FT_Get_First_Char(ftface, &pcp[0].index); - for (i = 0; i < cGlyphs && charcode != 0; i++) - { - pcp[i].charcode = charcode; + DbgPrint("EngAllocMem() failed.\n"); + return NULL; + } + + /* Gather char codes and indexes and count WCRUNs */ + pcp[0].code = FT_Get_First_Char(ftface, &pcp[0].index); + charcode = pcp[0].code; + for (i = 1, cRuns = 1; charcode && i < cGlyphs; i++) + { charcode = FT_Get_Next_Char(ftface, charcode, &pcp[i].index); - if (charcode != pcp[i - 1].charcode + 1) + DbgPrint("charcode=0x%lx, index=0x%lx\n", charcode, pcp[i].index); + pcp[i].code = charcode; + if (charcode != pcp[i - 1].code + 1) { cRuns++; } } + + /* Update cGlyphs to real value */ + cGlyphs = i - 1; /* Calculate FD_GLYPHSET size */ cjSize = sizeof(FD_GLYPHSET) @@ -368,6 +419,7 @@ pGlyphSet = EngAllocMem(0, cjSize, TAG_GLYPHSET); if (!pGlyphSet) { + DbgPrint("EngAllocMem() failed.\n"); return NULL; } @@ -380,10 +432,12 @@ /* Initialize 1st WCRUN */ pwcrun = pGlyphSet->awcrun; phglyphs = (PHGLYPH)&pGlyphSet->awcrun[cRuns]; - pwcrun[0].wcLow = pcp[0].charcode; + pwcrun[0].wcLow = pcp[0].code; pwcrun[0].cGlyphs = 1; - pwcrun[0].phg = phglyphs; + pwcrun[0].phg = &phglyphs[0]; phglyphs[0] = pcp[0].index; + +DbgPrint("pcp[0].index = 0x%lx\n", pcp[0].index); /* Walk through all supported chars */ for (i = 1, j = 0; i < cGlyphs; i++) @@ -392,7 +446,7 @@ phglyphs[i] = pcp[i].index; /* Check whether we can append the wchar to a run */ - if (pcp[i].charcode == pcp[i - 1].charcode + 1) + if (pcp[i].code == pcp[i - 1].code + 1) { /* Append to current WCRUN */ pwcrun[j].cGlyphs++; @@ -400,14 +454,24 @@ else { /* Add a new WCRUN */ + DbgPrint("adding new run\n"); j++; - pwcrun[j].wcLow = pcp[i].charcode; + pwcrun[j].wcLow = pcp[i].code; pwcrun[j].cGlyphs = 1; pwcrun[j].phg = &phglyphs[i]; } } - return NULL; + /* Free the temporary buffer */ + EngFreeMem(pcp); + + /* Set *pid to the allocated structure for use in FtfdFree */ + *pid = (ULONG_PTR)pGlyphSet; + +DbgPrint("pGlyphSet=%p\n", pGlyphSet); +DbgBreakPoint(); + + return pGlyphSet; } VOID Modified: trunk/reactos/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ft… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Tue Apr 21 22:54:36 2009 @@ -23,7 +23,7 @@ typedef struct { FT_UInt index; - FT_ULong charcode; + FT_ULong code; } FTFD_CHARPAIR; typedef struct @@ -41,6 +41,7 @@ { IFIMETRICS ifim; BYTE ajCharSet[16]; + FONTSIM fontsim; WCHAR wszFamilyName[LF_FACESIZE]; WCHAR wszFaceName[LF_FACESIZE]; WCHAR wszStyleName[MAX_STYLESIZE];

1 0

[dreimer] 40634: a working and hopefully final sulution. Dedicated to Physicus. This should fix your problem. If anyone dislikes this bad workaround, I will hit him with a big large endlocal!
by dreimer＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: dreimer Date: Tue Apr 21 17:20:51 2009 New Revision: 40634 URL: http://svn.reactos.org/svn/reactos?rev=40634&view=rev Log: a working and hopefully final sulution. Dedicated to Physicus. This should fix your problem. If anyone dislikes this bad workaround, I will hit him with a big large endlocal! Removed: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Tue Apr 21 17:20:51 2009 @@ -8,6 +8,7 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: + @echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @@ -66,7 +67,7 @@ goto :EndCommandParse ) else ( cls - set _ROSBE_ARCH=%1 + set ROS_ARCH=%1 call :RosBE4 ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue Apr 21 17:20:51 2009 @@ -24,9 +24,9 @@ set _1=%1 ) if /i "%_1%" == "i386" ( - set _ROSBE_ARCH= + set ROS_ARCH= ) else ( - set _ROSBE_ARCH=%_1% + set ROS_ARCH=%_1% ) goto :EOA Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Tue Apr 21 17:20:51 2009 @@ -23,19 +23,51 @@ set _ROSBE_ORIGINALPATH=%PATH% ) -:: -:: Set the Arch Variables -:: -set ROS_ARCH= -set ROS_PREFIX= - if "%1" == "chdefgcc" ( goto :main ) -set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% -set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% -"%_ROSBE_BASEDIR%\setlocal.cmd" +setlocal enabledelayedexpansion + +set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH! +set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH! + +if not "!ROS_ARCH!" == "" ( + set ROS_PREFIX=!ROS_ARCH!-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\!ROS_ARCH! + + if "!ROS_ARCH!" == "arm" ( + set _ROSBE_OBJPATH=!_ROSBE_ARM_OBJPATH! + set _ROSBE_OUTPATH=!_ROSBE_ARM_OUTPATH! + ) + if "!ROS_ARCH!" == "ppc" ( + set _ROSBE_OBJPATH=!_ROSBE_PPC_OBJPATH! + set _ROSBE_OUTPATH=!_ROSBE_PPC_OUTPATH! + ) + if "!ROS_ARCH!" == "amd64" ( + set _ROSBE_OBJPATH=!_ROSBE_AMD64_OBJPATH! + set _ROSBE_OUTPATH=!_ROSBE_AMD64_OUTPATH! + set ROS_PREFIX=x86_64-pc-mingw32 + set _ROSBE_TARGET_MINGWPATH=!_ROSBE_BASEDIR!\x86_64 + ) +) + +REM Check if existant arch + +if not exist "!_ROSBE_TARGET_MINGWPATH!\." ( + echo Unsupported arch specified. Fallback to Default. + pause + set _ROSBE_OBJPATH=!_ROSBE_i386_OBJPATH! + set _ROSBE_OUTPATH=!_ROSBE_i386_OUTPATH! + set ROS_ARCH= + set ROS_PREFIX= + set _ROSBE_TARGET_MINGWPATH=!_ROSBE_HOST_MINGWPATH! +) + +REM HAXX + +endlocal & set ROS_ARCH=%ROS_ARCH%& set ROS_PREFIX=%ROS_PREFIX%& set _ROSBE_OBJPATH=%_ROSBE_OBJPATH%& set _ROSBE_OUTPATH=%_ROSBE_OUTPATH%& set _ROSBE_TARGET_MINGWPATH=%_ROSBE_TARGET_MINGWPATH%& set _ROSBE_HOST_MINGWPATH=%_ROSBE_HOST_MINGWPATH%& set _ROSBE_MODE=%_ROSBE_MODE%& set _ROSBE_ORIGINALPATH=%_ROSBE_ORIGINALPATH% + :: :: Set up the GCC 4.x.x build environment. :: Removed: trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/set… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/setlocal.cmd (removed) @@ -1,49 +1,0 @@ -:: -:: PROJECT: RosBE - ReactOS Build Environment for Windows -:: LICENSE: GNU General Public License v2. (see LICENSE.txt) -:: FILE: Root/setlocal.cmd -:: PURPOSE: Bypass for the stupid setlocal in CMD Batch -:: COPYRIGHT: Copyright 2009 Daniel Reimer <reimer.daniel(a)freenet.de> -:: -:: -@echo off -if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 1 ( - @echo on -) - - -if not "%_ROSBE_ARCH%" == "" ( - set ROS_ARCH=%_ROSBE_ARCH% - set ROS_PREFIX=%_ROSBE_ARCH%-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%_ROSBE_ARCH% - - REM HAXX - - if "%_ROSBE_ARCH%" == "arm" ( - set _ROSBE_OBJPATH=%_ROSBE_ARM_OBJPATH% - set _ROSBE_OUTPATH=%_ROSBE_ARM_OUTPATH% - ) - if "%_ROSBE_ARCH%" == "ppc" ( - set _ROSBE_OBJPATH=%_ROSBE_PPC_OBJPATH% - set _ROSBE_OUTPATH=%_ROSBE_PPC_OUTPATH% - ) - if "%_ROSBE_ARCH%" == "amd64" ( - set _ROSBE_OBJPATH=%_ROSBE_AMD64_OBJPATH% - set _ROSBE_OUTPATH=%_ROSBE_AMD64_OUTPATH% - set ROS_PREFIX=x86_64-pc-mingw32 - set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 - ) - - REM Check if existant arch - - if not exist "%_ROSBE_TARGET_MINGWPATH%\." ( - echo Unsupported arch specified. Fallback to Default. - pause - set _ROSBE_OBJPATH=%_ROSBE_i386_OBJPATH% - set _ROSBE_OUTPATH=%_ROSBE_i386_OUTPATH% - set ROS_ARCH= - set ROS_PREFIX= - set _ROSBE_TARGET_MINGWPATH= - ) -)

1 0

[janderwald] 40633: - Implement handling a FastDeviceIoControl path (not yet used in portcls)
by janderwald＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: janderwald Date: Tue Apr 21 14:02:57 2009 New Revision: 40633 URL: http://svn.reactos.org/svn/reactos?rev=40633&view=rev Log: - Implement handling a FastDeviceIoControl path (not yet used in portcls) Modified: trunk/reactos/drivers/ksfilter/ks/misc.c Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Tue Apr 21 14:02:57 2009 @@ -265,6 +265,7 @@ IN ULONG OutSize, OUT PULONG BytesReturned) { + PKSIOBJECT_HEADER ObjectHeader; PDEVICE_OBJECT DeviceObject; KEVENT Event; PIRP Irp; @@ -281,6 +282,23 @@ if (!DeviceObject) return STATUS_UNSUCCESSFUL; + /* get object header */ + ObjectHeader = (PKSIOBJECT_HEADER)FileObject->FsContext; + /* check if there is fast device io function */ + if (ObjectHeader->DispatchTable.FastDeviceIoControl) + { + /* it is send the request */ + Status = ObjectHeader->DispatchTable.FastDeviceIoControl(FileObject, TRUE, InBuffer, InSize, OutBuffer, OutSize, IoControl, &IoStatusBlock, DeviceObject); + /* check if the request was handled */ + if (Status) + { + /* store bytes returned */ + *BytesReturned = IoStatusBlock.Information; + /* return status */ + return IoStatusBlock.Status; + } + } + /* initialize the event */ KeInitializeEvent(&Event, NotificationEvent, FALSE);

1 0

[janderwald] 40632: - Fix return type of FastDeviceIo / FastRead / FastWrite
by janderwald＠svn.reactos.org 21 Apr '09

21 Apr '09

Author: janderwald Date: Tue Apr 21 13:56:20 2009 New Revision: 40632 URL: http://svn.reactos.org/svn/reactos?rev=40632&view=rev Log: - Fix return type of FastDeviceIo / FastRead / FastWrite Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Tue Apr 21 13:56:20 2009 @@ -284,7 +284,7 @@ /* * @implemented */ -NTSTATUS +BOOLEAN NTAPI IPortFilterWaveCyclic_fnFastDeviceIoControl( IN IPortFilterWaveCyclic* iface, @@ -299,13 +299,13 @@ IN PDEVICE_OBJECT DeviceObject) { UNIMPLEMENTED - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS + return FALSE; +} + +/* + * @implemented + */ +BOOLEAN NTAPI IPortFilterWaveCyclic_fnFastRead( IN IPortFilterWaveCyclic* iface, @@ -319,13 +319,13 @@ IN PDEVICE_OBJECT DeviceObject) { UNIMPLEMENTED - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS + return FALSE; +} + +/* + * @implemented + */ +BOOLEAN NTAPI IPortFilterWaveCyclic_fnFastWrite( IN IPortFilterWaveCyclic* iface, @@ -339,7 +339,7 @@ IN PDEVICE_OBJECT DeviceObject) { UNIMPLEMENTED - return STATUS_SUCCESS; + return FALSE; } /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.c [iso-8859-1] Tue Apr 21 13:56:20 2009 @@ -284,7 +284,7 @@ /* * @implemented */ -NTSTATUS +BOOLEAN NTAPI IPortFilterWavePci_fnFastDeviceIoControl( IN IPortFilterWavePci* iface, @@ -299,13 +299,13 @@ IN PDEVICE_OBJECT DeviceObject) { UNIMPLEMENTED - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS + return FALSE; +} + +/* + * @implemented + */ +BOOLEAN NTAPI IPortFilterWavePci_fnFastRead( IN IPortFilterWavePci* iface, @@ -319,13 +319,13 @@ IN PDEVICE_OBJECT DeviceObject) { UNIMPLEMENTED - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS + return FALSE; +} + +/* + * @implemented + */ +BOOLEAN NTAPI IPortFilterWavePci_fnFastWrite( IN IPortFilterWavePci* iface, @@ -339,7 +339,7 @@ IN PDEVICE_OBJECT DeviceObject) { UNIMPLEMENTED - return STATUS_SUCCESS; + return FALSE; } /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Tue Apr 21 13:56:20 2009 @@ -49,7 +49,7 @@ IN PDEVICE_OBJECT DeviceObject, \ IN PIRP Irp)PURE; \ \ - STDMETHOD_(NTSTATUS, FastDeviceIoControl)(THIS_ \ + STDMETHOD_(BOOLEAN, FastDeviceIoControl)(THIS_ \ IN PFILE_OBJECT FileObject, \ IN BOOLEAN Wait, \ IN PVOID InputBuffer, \ @@ -60,7 +60,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, \ IN PDEVICE_OBJECT DeviceObject)PURE; \ \ - STDMETHOD_(NTSTATUS, FastRead)(THIS_ \ + STDMETHOD_(BOOLEAN, FastRead)(THIS_ \ IN PFILE_OBJECT FileObject, \ IN PLARGE_INTEGER FileOffset, \ IN ULONG Length, \ @@ -70,7 +70,7 @@ OUT PIO_STATUS_BLOCK StatusBlock, \ IN PDEVICE_OBJECT DeviceObject)PURE; \ \ - STDMETHOD_(NTSTATUS, FastWrite)(THIS_ \ + STDMETHOD_(BOOLEAN, FastWrite)(THIS_ \ IN PFILE_OBJECT FileObject, \ IN PLARGE_INTEGER FileOffset, \ IN ULONG Length, \ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Tue Apr 21 13:56:20 2009 @@ -764,7 +764,7 @@ /* * @implemented */ -NTSTATUS +BOOLEAN NTAPI IPortPinWaveCyclic_fnFastDeviceIoControl( IN IPortPinWaveCyclic* iface, @@ -778,14 +778,14 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - - return STATUS_SUCCESS; -} - -/* - * @implemented - */ -NTSTATUS + UNIMPLEMENTED + return FALSE; +} + +/* + * @implemented + */ +BOOLEAN NTAPI IPortPinWaveCyclic_fnFastRead( IN IPortPinWaveCyclic* iface, @@ -829,7 +829,7 @@ /* * @implemented */ -NTSTATUS +BOOLEAN NTAPI IPortPinWaveCyclic_fnFastWrite( IN IPortPinWaveCyclic* iface,

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