Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[janderwald] 55989: [KS] - Fix property item merge in KsMergeAutomationTable

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Mar 4 04:44:48 2012 New Revision: 55989 URL: http://svn.reactos.org/svn/reactos?rev=55989&view=rev Log: [KS] - Fix property item merge in KsMergeAutomationTable Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/filter.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Sun Mar 4 04:44:48 2012 @@ -2087,15 +2087,100 @@ return STATUS_SUCCESS; } +VOID +KspAddPropertyItem( + OUT PKSPROPERTY_SET OutPropertySet, + IN PKSPROPERTY_ITEM PropertyItem, + IN ULONG PropertyItemSize) +{ + PKSPROPERTY_ITEM CurrentPropertyItem; + ULONG Index; + + // check if the property item is already present + CurrentPropertyItem = (PKSPROPERTY_ITEM)OutPropertySet->PropertyItem; + for(Index = 0; Index < OutPropertySet->PropertiesCount; Index++) + { + if (CurrentPropertyItem->PropertyId == PropertyItem->PropertyId) + { + // item already present + return; + } + + // next item + CurrentPropertyItem = (PKSPROPERTY_ITEM)((ULONG_PTR)CurrentPropertyItem + PropertyItemSize); + } + // add item + RtlCopyMemory(CurrentPropertyItem, PropertyItem, PropertyItemSize); + OutPropertySet->PropertiesCount++; +} + +NTSTATUS +KspMergePropertySet( + OUT PKSAUTOMATION_TABLE Table, + OUT PKSPROPERTY_SET OutPropertySet, + IN PKSPROPERTY_SET PropertySetA, + IN PKSPROPERTY_SET PropertySetB, + IN KSOBJECT_BAG Bag OPTIONAL) +{ + ULONG PropertyCount, Index; + PKSPROPERTY_ITEM PropertyItem, CurrentPropertyItem; + NTSTATUS Status; + + // max properties + PropertyCount = PropertySetA->PropertiesCount + PropertySetB->PropertiesCount; + + // allocate items + PropertyItem = AllocateItem(NonPagedPool, Table->PropertyItemSize * PropertyCount); + if (!PropertyItem) + return STATUS_INSUFFICIENT_RESOURCES; + + if (Bag) + { + /* add table to object bag */ + Status = KsAddItemToObjectBag(Bag, PropertyItem, NULL); + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* free table */ + FreeItem(Table); + return Status; + } + } + + // copy entries from dominant table + RtlCopyMemory(PropertyItem, PropertySetA->PropertyItem, Table->PropertyItemSize * PropertySetA->PropertiesCount); + + // init property set + OutPropertySet->PropertiesCount = PropertySetA->PropertiesCount; + OutPropertySet->PropertyItem = PropertyItem; + + // copy other entries + CurrentPropertyItem = (PKSPROPERTY_ITEM)PropertySetB->PropertyItem; + for(Index = 0; Index < PropertySetB->PropertiesCount; Index++) + { + + // add entries + KspAddPropertyItem(OutPropertySet, CurrentPropertyItem, Table->PropertyItemSize); + + // next entry + CurrentPropertyItem = (PKSPROPERTY_ITEM)((ULONG_PTR)CurrentPropertyItem + Table->PropertyItemSize); + } + + // done + return STATUS_SUCCESS; +} + NTSTATUS KspCopyPropertySets( OUT PKSAUTOMATION_TABLE Table, IN PKSAUTOMATION_TABLE AutomationTableA OPTIONAL, - IN PKSAUTOMATION_TABLE AutomationTableB OPTIONAL) + IN PKSAUTOMATION_TABLE AutomationTableB OPTIONAL, + IN KSOBJECT_BAG Bag OPTIONAL) { ULONG Index, SubIndex, Count; BOOL bFound; + NTSTATUS Status; if (!AutomationTableA) { @@ -2137,6 +2222,17 @@ RtlMoveMemory((PVOID)&Table->PropertySets[Count], &AutomationTableB->PropertySets[Index], sizeof(KSPROPERTY_SET)); Count++; } + else + { + // merge property sets + Status = KspMergePropertySet(Table, (PKSPROPERTY_SET)&Table->PropertySets[SubIndex], (PKSPROPERTY_SET)&AutomationTableA->PropertySets[SubIndex], (PKSPROPERTY_SET)&AutomationTableB->PropertySets[Index], Bag); + if (!NT_SUCCESS(Status)) + { + // failed to merge + DPRINT1("[KS] Failed to merge %x\n", Status); + return Status; + } + } } return STATUS_SUCCESS; @@ -2249,6 +2345,12 @@ { /* use item size from 2nd automation table */ Table->PropertyItemSize = AutomationTableB->PropertyItemSize; + } + + if (AutomationTableA && AutomationTableB) + { + // FIXME handle different propery item sizes + ASSERT(AutomationTableA->PropertyItemSize == AutomationTableB->PropertyItemSize); } /* now allocate the property sets */ @@ -2272,7 +2374,7 @@ } } /* now copy the property sets */ - Status = KspCopyPropertySets(Table, AutomationTableA, AutomationTableB); + Status = KspCopyPropertySets(Table, AutomationTableA, AutomationTableB, Bag); if(!NT_SUCCESS(Status)) goto cleanup; Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Sun Mar 4 04:44:48 2012 @@ -955,7 +955,7 @@ UNIMPLEMENTED Status = STATUS_NOT_FOUND; } - //DPRINT("KspPinPropertyHandler Pins %lu Request->Id %lu Status %lx\n", This->PinDescriptorCount, Request->Id, Status); + DPRINT("KspPinPropertyHandler Pins %lu Request->Id %lu Status %lx\n", This->Filter.Descriptor->PinDescriptorsCount, Request->Id, Status); return Status; @@ -1029,6 +1029,9 @@ SetCount = FilterInstance->Descriptor->AutomationTable->PropertySetsCount; PropertySet = FilterInstance->Descriptor->AutomationTable->PropertySets; PropertyItemSize = FilterInstance->Descriptor->AutomationTable->PropertyItemSize; + // FIXME: handle variable sized property items + ASSERT(PropertyItemSize == sizeof(KSPROPERTY_ITEM)); + PropertyItemSize = 0; } /* needed for our property handlers */ @@ -1063,6 +1066,7 @@ } RtlStringFromGUID(&Property->Set, &GuidString); + DPRINT("IKsFilter_DispatchDeviceIoControl property PinCount %x\n", FilterInstance->Descriptor->PinDescriptorsCount); DPRINT("IKsFilter_DispatchDeviceIoControl property Set |%S| Id %u Flags %x Status %lx ResultLength %lu\n", GuidString.Buffer, Property->Id, Property->Flags, Status, Irp->IoStatus.Information); RtlFreeUnicodeString(&GuidString);

12 years, 8 months

[sir_richard] 55988: [NTOS]: Release the *right* lock. "Fix the fix" as the yuppies say.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sun Mar 4 03:18:47 2012 New Revision: 55988 URL: http://svn.reactos.org/svn/reactos?rev=55988&view=rev Log: [NTOS]: Release the *right* lock. "Fix the fix" as the yuppies say. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Mar 4 03:18:47 2012 @@ -4068,7 +4068,7 @@ // return whatever failure code was sent. // FailPath: - MiUnlockWorkingSet(CurrentThread, AddressSpace); + MmUnlockAddressSpace(AddressSpace); if (Attached) KeUnstackDetachProcess(&ApcState); if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); return Status;

12 years, 8 months

[ion] 55987: [WIN32K]: Should fix usb/livecd failure reported by igorko. bug 6696..or something?

by ion＠svn.reactos.org

Author: ion Date: Sun Mar 4 03:06:20 2012 New Revision: 55987 URL: http://svn.reactos.org/svn/reactos?rev=55987&view=rev Log: [WIN32K]: Should fix usb/livecd failure reported by igorko. bug 6696..or something? Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h Modified: trunk/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sun Mar 4 03:06:20 2012 @@ -10,9 +10,13 @@ #pragma once +#if 0 #ifndef _MSC_VER #define PLACE_IN_SECTION(s) __attribute__((section(s))) #define INIT_FUNCTION PLACE_IN_SECTION("INIT") +#else +#define INIT_FUNCTION +#endif #else #define INIT_FUNCTION #endif

12 years, 8 months

[ion] 55986: [SMSS]: No longer fail on invalid known DLL checksum until I can fix the loader API.

by ion＠svn.reactos.org

Author: ion Date: Sun Mar 4 03:00:01 2012 New Revision: 55986 URL: http://svn.reactos.org/svn/reactos?rev=55986&view=rev Log: [SMSS]: No longer fail on invalid known DLL checksum until I can fix the loader API. Modified: trunk/reactos/base/system/smss2/sminit.c Modified: trunk/reactos/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c… ============================================================================== --- trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Sun Mar 4 03:00:01 2012 @@ -1533,10 +1533,9 @@ SmpProcessModuleImports, RegEntry, &ImageCharacteristics); +#if 0 if (!NT_SUCCESS(Status)) { - DPRINT1("Hey ReactOS -- you suck! Please fix the checksum (or the API) behind: %wZ\n", &RegEntry->Value); - #if 0 /* Checksum failed, so don't even try going further -- kill SMSS */ RtlInitUnicodeString(&ErrorResponse, L"Verification of a KnownDLL failed."); @@ -1544,9 +1543,10 @@ ErrorParameters[1] = Status; ErrorParameters[2] = (ULONG)&RegEntry->Value; SmpTerminate(ErrorParameters, 5, RTL_NUMBER_OF(ErrorParameters)); - #endif - } - else if (!(ImageCharacteristics & IMAGE_FILE_DLL)) + } + else +#endif + if (!(ImageCharacteristics & IMAGE_FILE_DLL)) { /* An invalid known DLL entry will also kill SMSS */ RtlInitUnicodeString(&ErrorResponse,

12 years, 8 months

[sir_richard] 55985: [NTOS]: Don't keep the address space locked when failing in NtFreeVirtualMemory. Dang this testbot is good at catching those bugs.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sun Mar 4 02:56:16 2012 New Revision: 55985 URL: http://svn.reactos.org/svn/reactos?rev=55985&view=rev Log: [NTOS]: Don't keep the address space locked when failing in NtFreeVirtualMemory. Dang this testbot is good at catching those bugs. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Mar 4 02:56:16 2012 @@ -1825,7 +1825,6 @@ // if (PteCount) MiProcessValidPteList(ValidPteList, PteCount); MiUnlockWorkingSet(CurrentThread, &Process->Vm); - if (CommitReduction) DPRINT1("DBG-REDUCE: %lx\n", CommitReduction); return CommitReduction; } @@ -3870,7 +3869,7 @@ // // Finally lock the working set and remove the VAD from the VAD tree // - MiLockWorkingSet(CurrentThread, &Process->Vm); + MiLockWorkingSet(CurrentThread, AddressSpace); ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); } @@ -3900,7 +3899,7 @@ // the code path above when the caller sets a zero region size // and the whole VAD is destroyed // - MiLockWorkingSet(CurrentThread, &Process->Vm); + MiLockWorkingSet(CurrentThread, AddressSpace); ASSERT(Process->VadRoot.NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, &Process->VadRoot); } @@ -3972,7 +3971,7 @@ // around with process pages. // MiDeleteVirtualAddresses(StartingAddress, EndingAddress, NULL); - MiUnlockWorkingSet(CurrentThread, &Process->Vm); + MiUnlockWorkingSet(CurrentThread, AddressSpace); Status = STATUS_SUCCESS; FinalPath: @@ -4069,6 +4068,7 @@ // return whatever failure code was sent. // FailPath: + MiUnlockWorkingSet(CurrentThread, AddressSpace); if (Attached) KeUnstackDetachProcess(&ApcState); if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); return Status;

12 years, 8 months

[janderwald] 55984: [KS] - Handle custom sized nodes

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Mar 4 02:39:37 2012 New Revision: 55984 URL: http://svn.reactos.org/svn/reactos?rev=55984&view=rev Log: [KS] - Handle custom sized nodes Modified: trunk/reactos/drivers/ksfilter/ks/filter.c Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Sun Mar 4 02:39:37 2012 @@ -1104,6 +1104,7 @@ { ULONG Index = 0; NTSTATUS Status; + PKSNODE_DESCRIPTOR NodeDescriptor; /* initialize pin descriptors */ This->FirstPin = NULL; @@ -1190,8 +1191,8 @@ /* sanity check */ ASSERT(FilterDescriptor->NodeDescriptors); - /* FIXME handle variable sized node descriptors */ - ASSERT(FilterDescriptor->NodeDescriptorSize == sizeof(KSNODE_DESCRIPTOR)); + /* sanity check */ + ASSERT(FilterDescriptor->NodeDescriptorSize >= sizeof(KSNODE_DESCRIPTOR)); This->Topology.TopologyNodes = AllocateItem(NonPagedPool, sizeof(GUID) * FilterDescriptor->NodeDescriptorsCount); /* allocate topology node types array */ @@ -1211,17 +1212,21 @@ } DPRINT("NodeDescriptorCount %lu\n", FilterDescriptor->NodeDescriptorsCount); + NodeDescriptor = (PKSNODE_DESCRIPTOR)FilterDescriptor->NodeDescriptors; for(Index = 0; Index < FilterDescriptor->NodeDescriptorsCount; Index++) { - DPRINT("Index %lu Type %p Name %p\n", Index, FilterDescriptor->NodeDescriptors[Index].Type, FilterDescriptor->NodeDescriptors[Index].Name); + DPRINT("Index %lu Type %p Name %p\n", Index, NodeDescriptor->Type, NodeDescriptor->Name); /* copy topology type */ - if (FilterDescriptor->NodeDescriptors[Index].Type) - RtlMoveMemory((PVOID)&This->Topology.TopologyNodes[Index], FilterDescriptor->NodeDescriptors[Index].Type, sizeof(GUID)); + if (NodeDescriptor->Type) + RtlMoveMemory((PVOID)&This->Topology.TopologyNodes[Index], NodeDescriptor->Type, sizeof(GUID)); /* copy topology name */ - if (FilterDescriptor->NodeDescriptors[Index].Name) - RtlMoveMemory((PVOID)&This->Topology.TopologyNodesNames[Index], FilterDescriptor->NodeDescriptors[Index].Name, sizeof(GUID)); + if (NodeDescriptor->Name) + RtlMoveMemory((PVOID)&This->Topology.TopologyNodesNames[Index], NodeDescriptor->Name, sizeof(GUID)); + + // next node descriptor + NodeDescriptor = (PKSNODE_DESCRIPTOR)((ULONG_PTR)NodeDescriptor + FilterDescriptor->NodeDescriptorSize); } } /* done! */

12 years, 8 months

[janderwald] 55983: [USBHUB] - Implement retrieving USB_BUS_INTERFACE_USBDI_GUID interface [KS] - Add PnP hack for IoSetDeviceInterfaceState

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Mar 4 02:17:13 2012 New Revision: 55983 URL: http://svn.reactos.org/svn/reactos?rev=55983&view=rev Log: [USBHUB] - Implement retrieving USB_BUS_INTERFACE_USBDI_GUID interface [KS] - Add PnP hack for IoSetDeviceInterfaceState Modified: trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/misc.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbhub/usbhub.h Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Sun Mar 4 02:17:13 2012 @@ -605,6 +605,16 @@ /* get device header */ DeviceHeader = DeviceExtension->DeviceHeader; + if (IoStack->FileObject->FileName.Buffer == NULL) + { + // ReactOS PnPMgr still sucks + ASSERT(IoStack->FileObject->FileName.Length == 0); + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + DPRINT1("ReactOS PnP hack\n"); + return STATUS_SUCCESS; + } + /* acquire list lock */ IKsDevice_fnAcquireDevice((IKsDevice*)&DeviceHeader->BasicHeader.OuterUnknown); Modified: trunk/reactos/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/fdo.c [iso-8859-1] Sun Mar 4 02:17:13 2012 @@ -1198,6 +1198,10 @@ UsbChildExtension->ParentDeviceObject = UsbHubDeviceObject; UsbChildExtension->PortNumber = PortId; + // copy device interface + RtlCopyMemory(&UsbChildExtension->DeviceInterface, &HubDeviceExtension->DeviceInterface, sizeof(USB_BUS_INTERFACE_USBDI_V2)); + + // // Create the UsbDeviceObject // @@ -1211,6 +1215,12 @@ DPRINT1("USBHUB: CreateUsbDevice failed with status %x\n", Status); goto Cleanup; } + + // copy device interface + RtlCopyMemory(&UsbChildExtension->DeviceInterface, &HubDeviceExtension->DeviceInterface, sizeof(USB_BUS_INTERFACE_USBDI_V2)); + + // FIXME replace buscontext + UsbChildExtension->DeviceInterface.BusContext = UsbChildExtension->UsbDeviceHandle; // // Initialize UsbDevice @@ -1806,6 +1816,9 @@ HubDeviceExtension->ConfigurationHandle = ConfigUrb->UrbSelectConfiguration.ConfigurationHandle; HubDeviceExtension->PipeHandle = ConfigUrb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; DPRINT("Configuration Handle %x\n", HubDeviceExtension->ConfigurationHandle); + + FDO_QueryInterface(DeviceObject, &HubDeviceExtension->DeviceInterface); + // free urb ExFreePool(ConfigUrb); Modified: trunk/reactos/drivers/usb/usbhub/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/misc.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/misc.c [iso-8859-1] Sun Mar 4 02:17:13 2012 @@ -208,3 +208,84 @@ return Status; } + +NTSTATUS +NTAPI +FDO_QueryInterfaceCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + /* Set event */ + KeSetEvent((PRKEVENT)Context, 0, FALSE); + + /* Completion is done in the HidClassFDO_QueryCapabilities routine */ + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +FDO_QueryInterface( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PUSB_BUS_INTERFACE_USBDI_V2 Interface) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + PHUB_DEVICE_EXTENSION HubDeviceExtension; + + /* Get device extension */ + HubDeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(HubDeviceExtension->Common.IsFDO); + + /* Init event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Now allocte the irp */ + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + /* No memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + + /* Init stack location */ + IoStack->MajorFunction = IRP_MJ_PNP; + IoStack->MinorFunction = IRP_MN_QUERY_INTERFACE; + IoStack->Parameters.QueryInterface.Interface = (PINTERFACE)Interface; + IoStack->Parameters.QueryInterface.InterfaceType = &USB_BUS_INTERFACE_USBDI_GUID; + IoStack->Parameters.QueryInterface.Version = USB_BUSIF_USBDI_VERSION_2; + IoStack->Parameters.QueryInterface.Size = sizeof(USB_BUS_INTERFACE_USBDI_V2); + + + /* Set completion routine */ + IoSetCompletionRoutine(Irp, + FDO_QueryInterfaceCompletionRoutine, + (PVOID)&Event, + TRUE, + TRUE, + TRUE); + + /* Pnp irps have default completion code */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + + /* Call lower device */ + Status = IoCallDriver(HubDeviceExtension->LowerDeviceObject, Irp); + if (Status == STATUS_PENDING) + { + /* Wait for completion */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + } + + /* Get status */ + Status = Irp->IoStatus.Status; + + /* Complete request */ + IoFreeIrp(Irp); + + /* Done */ + return Status; +} Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Sun Mar 4 02:17:13 2012 @@ -713,6 +713,21 @@ Information = 0; break; } + case IRP_MN_QUERY_INTERFACE: + { + DPRINT1("IRP_MN_QUERY_INTERFACE\n"); + if (IsEqualGUIDAligned(Stack->Parameters.QueryInterface.InterfaceType, &USB_BUS_INTERFACE_USBDI_GUID)) + { + DPRINT1("USB_BUS_INTERFACE_USBDI_GUID\n"); + RtlCopyMemory(Stack->Parameters.QueryInterface.Interface, &UsbChildExtension->DeviceInterface, Stack->Parameters.QueryInterface.Size); + Status = STATUS_SUCCESS; + break; + } + + // pass irp down + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(UsbChildExtension->ParentDeviceObject, Irp); + } default: { DPRINT1("PDO IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); Modified: trunk/reactos/drivers/usb/usbhub/usbhub.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/usbhub.… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/usbhub.h [iso-8859-1] Sun Mar 4 02:17:13 2012 @@ -67,6 +67,7 @@ USB_DEVICE_DESCRIPTOR DeviceDesc; PUSB_CONFIGURATION_DESCRIPTOR FullConfigDesc; UNICODE_STRING SymbolicLinkName; + USB_BUS_INTERFACE_USBDI_V2 DeviceInterface; } HUB_CHILDDEVICE_EXTENSION, *PHUB_CHILDDEVICE_EXTENSION; typedef struct _HUB_DEVICE_EXTENSION @@ -100,6 +101,8 @@ USBD_CONFIGURATION_HANDLE ConfigurationHandle; USBD_PIPE_HANDLE PipeHandle; PVOID RootHubHandle; + USB_BUS_INTERFACE_USBDI_V2 DeviceInterface; + UNICODE_STRING SymbolicLinkName; } HUB_DEVICE_EXTENSION, *PHUB_DEVICE_EXTENSION; @@ -149,6 +152,11 @@ OUT PVOID OutParameter1, OUT PVOID OutParameter2); +NTSTATUS +FDO_QueryInterface( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PUSB_BUS_INTERFACE_USBDI_V2 Interface); + // pdo.c NTSTATUS USBHUB_PdoHandlePnp(

12 years, 8 months

[sir_richard] 55982: [NTOS]: Delete anonmem.c and move the ARM3-compatible code to ARM3/virtual.c. Whatever remained is for sections only, so move it to mm/section.c [NTOS]: Fix some broken asserti...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sun Mar 4 02:03:46 2012 New Revision: 55982 URL: http://svn.reactos.org/svn/reactos?rev=55982&view=rev Log: [NTOS]: Delete anonmem.c and move the ARM3-compatible code to ARM3/virtual.c. Whatever remained is for sections only, so move it to mm/section.c [NTOS]: Fix some broken assertions in NtFreeVirtualMemory. Lesson: Do not try to "optimize" Microsoft's ASSERTs. Removed: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/section.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… Removed: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=…

12 years, 8 months

[sir_richard] 55981: [RTL]: Sorry, forgot this critical part of the VAD commit.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sun Mar 4 00:47:20 2012 New Revision: 55981 URL: http://svn.reactos.org/svn/reactos?rev=55981&view=rev Log: [RTL]: Sorry, forgot this critical part of the VAD commit. Modified: trunk/reactos/lib/rtl/avlsupp.c Modified: trunk/reactos/lib/rtl/avlsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avlsupp.c?rev=5598… ============================================================================== --- trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] Sun Mar 4 00:47:20 2012 @@ -224,7 +224,8 @@ { /* This is the new root node */ RtlInsertAsRightChildAvl(&Table->BalancedRoot, NewNode); - MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree); + //MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree); + if (RtlBalance(NewNode) != RtlBalancedAvlTree) DPRINT1("Warning: Root node unbalanced?\n"); /* On AVL trees, we also update the depth */ ASSERT(Table->DepthOfTree == 0); @@ -243,7 +244,8 @@ } /* Little cheat to save on loop processing, taken from Timo */ - MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree); + //MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree); + if (RtlBalance(NewNode) != RtlBalancedAvlTree) DPRINT1("Warning: Root node unbalanced?\n"); RtlSetBalance(&Table->BalancedRoot, RtlLeftHeavyAvlTree); /*

12 years, 8 months

[cgutman] 55980: [UNIATA] - Try to fix KVM testbot

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Mar 3 23:13:21 2012 New Revision: 55980 URL: http://svn.reactos.org/svn/reactos?rev=55980&view=rev Log: [UNIATA] - Try to fix KVM testbot Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sat Mar 3 23:13:21 2012 @@ -8862,11 +8862,6 @@ PrimaryClaimed = TRUE; if(GlobalConfig->AtDiskSecondaryAddressClaimed) SecondaryClaimed = TRUE; - - if(PrimaryClaimed && SecondaryClaimed) { - KdPrint2((PRINT_PREFIX "Both legacy channels claimed\n")); - break; - } BMList[i].AltInitMasterDev = (UCHAR)0xff;

12 years, 8 months

← Newer
1
...
28
29
30
31
32
33
34
35
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2012