Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[cgutman] 48720: [LWIP] - Initial drop of lwIP 1.3.2

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Sep 7 13:18:26 2010 New Revision: 48720 URL: http://svn.reactos.org/svn/reactos?rev=48720&view=rev Log: [LWIP] - Initial drop of lwIP 1.3.2 Added: branches/tcp-rewrite-branch/lib/drivers/lwip/ branches/tcp-rewrite-branch/lib/drivers/lwip/CHANGELOG (with props) branches/tcp-rewrite-branch/lib/drivers/lwip/COPYING (with props) branches/tcp-rewrite-branch/lib/drivers/lwip/FILES (with props) branches/tcp-rewrite-branch/lib/drivers/lwip/… [View More]

14 years, 7 months

[mjmartin] 48719: [usb/usbhub] - Add function for dumping the Device and Configuration Descriptors. - Implement WaitForUsbDeviceArrivalNotification, used to send a URB transaction to the Status Cha...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Tue Sep 7 11:44:03 2010 New Revision: 48719 URL: http://svn.reactos.org/svn/reactos?rev=48719&view=rev Log: [usb/usbhub] - Add function for dumping the Device and Configuration Descriptors. - Implement WaitForUsbDeviceArrivalNotification, used to send a URB transaction to the Status Change Endpoint of the RootHubs pdo. The RootHubs pdo will queue this request until a new usb device connects. - Call above function at the end of UsbhubFdoQueryBusRelations, which will … [View More]be called by the pnp manager after the hub driver creates a new child device. - Change the URB to be allocated from the pool at IRP_MN_START_DEVICE. - Call QueryRootHub with the RootHub Pdo and not the hub drivers DeviceObject. - Implement selecting a configuration for the RootHub. Modified: trunk/reactos/drivers/usb/usbhub/fdo.c trunk/reactos/drivers/usb/usbhub/usbhub.h 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] Tue Sep 7 11:44:03 2010 @@ -16,6 +16,145 @@ #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) +VOID DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) +{ + DPRINT1("Dumping Device Descriptor %x\n", DeviceDescriptor); + DPRINT1("bLength %x\n", DeviceDescriptor->bLength); + DPRINT1("bDescriptorType %x\n", DeviceDescriptor->bDescriptorType); + DPRINT1("bcdUSB %x\n", DeviceDescriptor->bcdUSB); + DPRINT1("bDeviceClass %x\n", DeviceDescriptor->bDeviceClass); + DPRINT1("bDeviceSubClass %x\n", DeviceDescriptor->bDeviceSubClass); + DPRINT1("bDeviceProtocol %x\n", DeviceDescriptor->bDeviceProtocol); + DPRINT1("bMaxPacketSize0 %x\n", DeviceDescriptor->bMaxPacketSize0); + DPRINT1("idVendor %x\n", DeviceDescriptor->idVendor); + DPRINT1("idProduct %x\n", DeviceDescriptor->idProduct); + DPRINT1("bcdDevice %x\n", DeviceDescriptor->bcdDevice); + DPRINT1("iManufacturer %x\n", DeviceDescriptor->iManufacturer); + DPRINT1("iProduct %x\n", DeviceDescriptor->iProduct); + DPRINT1("iSerialNumber %x\n", DeviceDescriptor->iSerialNumber); + DPRINT1("bNumConfigurations %x\n", DeviceDescriptor->bNumConfigurations); +} + +VOID DumpFullConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +{ + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + LONG i, j; + + DPRINT1("Duming ConfigurationDescriptor %x\n", ConfigurationDescriptor); + DPRINT1("bLength %x\n", ConfigurationDescriptor->bLength); + DPRINT1("bDescriptorType %x\n", ConfigurationDescriptor->bDescriptorType); + DPRINT1("wTotalLength %x\n", ConfigurationDescriptor->wTotalLength); + DPRINT1("bNumInterfaces %x\n", ConfigurationDescriptor->bNumInterfaces); + DPRINT1("bConfigurationValue %x\n", ConfigurationDescriptor->bConfigurationValue); + DPRINT1("iConfiguration %x\n", ConfigurationDescriptor->iConfiguration); + DPRINT1("bmAttributes %x\n", ConfigurationDescriptor->bmAttributes); + DPRINT1("MaxPower %x\n", ConfigurationDescriptor->MaxPower); + + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR) ((ULONG_PTR)ConfigurationDescriptor + sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + for (i=0; i < ConfigurationDescriptor->bNumInterfaces; i++) + { + DPRINT1("bLength %x\n", InterfaceDescriptor->bLength); + DPRINT1("bDescriptorType %x\n", InterfaceDescriptor->bDescriptorType); + DPRINT1("bInterfaceNumber %x\n", InterfaceDescriptor->bInterfaceNumber); + DPRINT1("bAlternateSetting %x\n", InterfaceDescriptor->bAlternateSetting); + DPRINT1("bNumEndpoints %x\n", InterfaceDescriptor->bNumEndpoints); + DPRINT1("bInterfaceClass %x\n", InterfaceDescriptor->bInterfaceClass); + DPRINT1("bInterfaceSubClass %x\n", InterfaceDescriptor->bInterfaceSubClass); + DPRINT1("bInterfaceProtocol %x\n", InterfaceDescriptor->bInterfaceProtocol); + DPRINT1("iInterface %x\n", InterfaceDescriptor->iInterface); + + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR) ((ULONG_PTR)InterfaceDescriptor + sizeof(USB_INTERFACE_DESCRIPTOR)); + + for (j=0; j < InterfaceDescriptor->bNumEndpoints; j++) + { + DPRINT1("bLength %x\n", EndpointDescriptor->bLength); + DPRINT1("bDescriptorType %x\n", EndpointDescriptor->bDescriptorType); + DPRINT1("bEndpointAddress %x\n", EndpointDescriptor->bEndpointAddress); + DPRINT1("bmAttributes %x\n", EndpointDescriptor->bmAttributes); + DPRINT1("wMaxPacketSize %x\n", EndpointDescriptor->wMaxPacketSize); + DPRINT1("bInterval %x\n", EndpointDescriptor->bInterval); + } + + InterfaceDescriptor += sizeof(USB_ENDPOINT_DESCRIPTOR); + } + +} +NTSTATUS +DeviceArrivalCompletion(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context) +{ + + PHUB_DEVICE_EXTENSION DeviceExtension; + LONG i; + + DeviceExtension = (PHUB_DEVICE_EXTENSION)((PDEVICE_OBJECT)Context)->DeviceExtension; + + /* FIXME: Need to use the number of ports returned from miniport at device start */ + for (i=0; i < 8; i++) + DPRINT1("Port %x DeviceExtension->PortStatus %x\n",i, DeviceExtension->PortStatus[i]); + + return STATUS_SUCCESS; +} + + +NTSTATUS +WaitForUsbDeviceArrivalNotification(PDEVICE_OBJECT DeviceObject) +{ + PURB Urb; + PIRP Irp; + NTSTATUS Status; + PIO_STACK_LOCATION Stack = NULL; + IO_STATUS_BLOCK IoStatus; + PHUB_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = (PHUB_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB), USB_HUB_TAG); + + /* Send URB to the miniports Status Change Endpoint SCE */ + UsbBuildInterruptOrBulkTransferRequest(Urb, + sizeof(struct _URB_BULK_OR_INTERRUPT_TRANSFER), + DeviceExtension->PipeHandle, + &DeviceExtension->PortStatus, + NULL, + sizeof(ULONG) * 2, + USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK, + NULL); + + Urb->UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; + + Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_USB_SUBMIT_URB, + DeviceExtension->RootHubPdo, + NULL, 0, + NULL, 0, + TRUE, + NULL, + &IoStatus); + + if (Irp == NULL) + { + DPRINT("Usbhub: IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize the status block before sending the IRP */ + IoStatus.Status = STATUS_NOT_SUPPORTED; + IoStatus.Information = 0; + + Stack = IoGetNextIrpStackLocation(Irp); + + Stack->Parameters.Others.Argument1 = Urb; + Stack->Parameters.Others.Argument2 = NULL; + + IoSetCompletionRoutineEx(DeviceExtension->RootHubPdo, Irp, (PIO_COMPLETION_ROUTINE)DeviceArrivalCompletion, DeviceObject, TRUE, TRUE, TRUE); + + Status = IoCallDriver(DeviceExtension->RootHubPdo, Irp); + + return STATUS_MORE_PROCESSING_REQUIRED; + +} + NTSTATUS QueryRootHub(IN PDEVICE_OBJECT Pdo, IN ULONG IoControlCode, OUT PVOID OutParameter1, OUT PVOID OutParameter2) { @@ -42,7 +181,6 @@ } /* Initialize the status block before sending the IRP */ - IoStatus.Status = STATUS_NOT_SUPPORTED; IoStatus.Information = 0; @@ -185,9 +323,12 @@ DeviceRelations->Objects[Children++] = DeviceExtension->Children[i]; } } + ASSERT(Children == DeviceRelations->Count); - *pDeviceRelations = DeviceRelations; + + WaitForUsbDeviceArrivalNotification(DeviceObject); + return STATUS_SUCCESS; } @@ -195,7 +336,7 @@ UsbhubPnpFdo(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION IrpSp; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; ULONG MinorFunction; ULONG_PTR Information = 0; PHUB_DEVICE_EXTENSION DeviceExtension; @@ -209,12 +350,15 @@ { case IRP_MN_START_DEVICE: /* 0x0 */ { - URB Urb; + PURB Urb; ULONG Result = 0; - USB_DEVICE_INFORMATION_0 DeviceInformation; /* We differ from windows on hubpdo because we dont have usbport.sys which manages all usb device objects */ - DPRINT("Usbhub: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + DPRINT1("Usbhub: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + + /* Allocating size including the sizeof USBD_INTERFACE_LIST_ENTRY */ + Urb = ExAllocatePoolWithTag(NonPagedPool, sizeof(URB) + sizeof(USBD_INTERFACE_LIST_ENTRY), USB_HUB_TAG); + RtlZeroMemory(Urb, sizeof(URB) + sizeof(USBD_INTERFACE_LIST_ENTRY)); /* Get the hubs PDO */ QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO, &DeviceExtension->RootHubPdo, &DeviceExtension->RootHubFdo); @@ -223,6 +367,7 @@ /* Send the START_DEVICE irp down to the PDO of RootHub */ Status = ForwardIrpAndWait(DeviceExtension->RootHubPdo, Irp); + if (!NT_SUCCESS(Status)) { DPRINT1("Failed to start the RootHub PDO\n"); @@ -230,17 +375,25 @@ } /* Get the current number of hubs */ - QueryRootHub(DeviceObject,IOCTL_INTERNAL_USB_GET_HUB_COUNT, &DeviceExtension->HubCount, NULL); + QueryRootHub(DeviceExtension->RootHubPdo,IOCTL_INTERNAL_USB_GET_HUB_COUNT, &DeviceExtension->HubCount, NULL); /* Get the Direct Call Interfaces */ - Status = QueryInterface(DeviceObject, USB_BUS_INTERFACE_HUB_GUID, sizeof(USB_BUS_INTERFACE_HUB_V5), 5, (PVOID)&DeviceExtension->HubInterface); + Status = QueryInterface(DeviceExtension->RootHubPdo, + USB_BUS_INTERFACE_HUB_GUID, + sizeof(USB_BUS_INTERFACE_HUB_V5), + 5, + (PVOID)&DeviceExtension->HubInterface); if (!NT_SUCCESS(Status)) { DPRINT1("UsbhubM Failed to get HUB_GUID interface with status 0x%08lx\n", Status); return STATUS_UNSUCCESSFUL; } - Status = QueryInterface(DeviceObject, USB_BUS_INTERFACE_USBDI_GUID, sizeof(USB_BUS_INTERFACE_USBDI_V2), 2, (PVOID)&DeviceExtension->UsbDInterface); + Status = QueryInterface(DeviceExtension->RootHubPdo, + USB_BUS_INTERFACE_USBDI_GUID, + sizeof(USB_BUS_INTERFACE_USBDI_V2), + 2, + (PVOID)&DeviceExtension->UsbDInterface); if (!NT_SUCCESS(Status)) { DPRINT1("UsbhubM Failed to get USBDI_GUID interface with status 0x%08lx\n", Status); @@ -248,33 +401,32 @@ } /* Get roothub device handle */ - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, &DeviceExtension->RootHubUsbDevice, NULL); + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE, &DeviceExtension->RootHubUsbDevice, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Usbhub: GetRootHubDeviceHandle failed with status 0x%08lx\n", Status); return Status; } - RtlZeroMemory(&DeviceInformation, sizeof(USB_DEVICE_INFORMATION_0)); - + /* FIXME: This gets nothing from MS miniport */ Status = DeviceExtension->HubInterface.QueryDeviceInformation(DeviceExtension->RootHubPdo, DeviceExtension->RootHubUsbDevice, - &DeviceInformation, + &DeviceExtension->DeviceInformation, sizeof(USB_DEVICE_INFORMATION_0), &Result); + DPRINT1("Status %x, Result %x\n", Status, Result); - DPRINT1("InformationLevel %x\n", DeviceInformation.InformationLevel); - DPRINT1("ActualLength %x\n", DeviceInformation.ActualLength); - DPRINT1("PortNumber %x\n", DeviceInformation.PortNumber); - DPRINT1("DeviceDescriptor %x\n", DeviceInformation.DeviceDescriptor); - DPRINT1("HubAddress %x\n", DeviceInformation.HubAddress); - DPRINT1("NumberofPipes %x\n", DeviceInformation.NumberOfOpenPipes); - - - - UsbBuildGetDescriptorRequest(&Urb, - sizeof(Urb.UrbControlDescriptorRequest), + DPRINT1("InformationLevel %x\n", DeviceExtension->DeviceInformation.InformationLevel); + DPRINT1("ActualLength %x\n", DeviceExtension->DeviceInformation.ActualLength); + DPRINT1("PortNumber %x\n", DeviceExtension->DeviceInformation.PortNumber); + DPRINT1("DeviceDescriptor %x\n", DeviceExtension->DeviceInformation.DeviceDescriptor); + DPRINT1("HubAddress %x\n", DeviceExtension->DeviceInformation.HubAddress); + DPRINT1("NumberofPipes %x\n", DeviceExtension->DeviceInformation.NumberOfOpenPipes); + + /* Get roothubs device descriptor */ + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), USB_DEVICE_DESCRIPTOR_TYPE, 0, 0, @@ -283,30 +435,38 @@ sizeof(USB_DEVICE_DESCRIPTOR), NULL); - Urb.UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; - - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, &Urb, NULL); + Urb->UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; + + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Usbhub: Failed to get HubDeviceDescriptor!\n"); } - UsbBuildGetDescriptorRequest(&Urb, - sizeof(Urb.UrbControlDescriptorRequest), + DumpDeviceDescriptor(&DeviceExtension->HubDeviceDescriptor); + + /* Get roothubs configuration descriptor */ + UsbBuildGetDescriptorRequest(Urb, + sizeof(Urb->UrbControlDescriptorRequest), USB_CONFIGURATION_DESCRIPTOR_TYPE, 0, 0, - &DeviceExtension->HubConfig, + &DeviceExtension->HubConfigDescriptor, NULL, - sizeof(USB_CONFIGURATION_DESCRIPTOR), + sizeof(USB_CONFIGURATION_DESCRIPTOR) + sizeof(USB_INTERFACE_DESCRIPTOR) + sizeof(USB_ENDPOINT_DESCRIPTOR), NULL); - Urb.UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; - - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, &Urb, NULL); + Urb->UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; + + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Usbhub: Failed to get HubConfig!\n"); - } + DPRINT1("Usbhub: Failed to get RootHub Configuration with status %x\n", Status); + ASSERT(FALSE); + } + ASSERT(DeviceExtension->HubConfigDescriptor.wTotalLength); + + DumpFullConfigurationDescriptor(&DeviceExtension->HubConfigDescriptor); + //DPRINT1("DeviceExtension->HubConfigDescriptor.wTotalLength %x\n", DeviceExtension->HubConfigDescriptor.wTotalLength); Status = DeviceExtension->HubInterface.GetExtendedHubInformation(DeviceExtension->RootHubPdo, DeviceExtension->RootHubPdo, @@ -321,10 +481,9 @@ DPRINT1("DeviceExtension->UsbExtHubInfo.NumberOfPorts %x\n", DeviceExtension->UsbExtHubInfo.NumberOfPorts); - /* FIXME: HubDescriptor is empty and shouldnt be but Status is success */ - UsbBuildVendorRequest(&Urb, + UsbBuildVendorRequest(Urb, URB_FUNCTION_CLASS_DEVICE, - sizeof(Urb.UrbControlVendorClassRequest), + sizeof(Urb->UrbControlVendorClassRequest), USBD_TRANSFER_DIRECTION_IN, 0, USB_DEVICE_CLASS_RESERVED, @@ -335,13 +494,34 @@ sizeof(USB_HUB_DESCRIPTOR), NULL); - Urb.UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; - - Status = QueryRootHub(DeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, &Urb, NULL); + Urb->UrbHeader.UsbdDeviceHandle = DeviceExtension->RootHubUsbDevice; + + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); DPRINT1("bDescriptorType %x\n", DeviceExtension->HubDescriptor.bDescriptorType); + /* Select the configuration */ + /* FIXME: Use USBD_CreateConfigurationRequestEx instead */ + RtlZeroMemory(Urb, sizeof(URB)); + UsbBuildSelectConfigurationRequest(Urb, + sizeof(Urb->UrbSelectConfiguration), + &DeviceExtension->HubConfigDescriptor); + + Urb->UrbSelectConfiguration.Interface.Length = sizeof(USBD_INTERFACE_INFORMATION); + Urb->UrbSelectConfiguration.Interface.NumberOfPipes = 1; + Urb->UrbSelectConfiguration.Interface.Pipes[0].MaximumTransferSize = 4096; + + Status = QueryRootHub(DeviceExtension->RootHubPdo, IOCTL_INTERNAL_USB_SUBMIT_URB, Urb, NULL); + + DPRINT1("Status %x\n", Status); + + DeviceExtension->ConfigurationHandle = Urb->UrbSelectConfiguration.ConfigurationHandle; + DeviceExtension->PipeHandle = Urb->UrbSelectConfiguration.Interface.Pipes[0].PipeHandle; + DPRINT1("Configuration Handle %x\n", DeviceExtension->ConfigurationHandle); + Status = DeviceExtension->HubInterface.Initialize20Hub(DeviceExtension->RootHubPdo, DeviceExtension->RootHubUsbDevice, 1); + + DPRINT1("Status %x\n", Status); break; } @@ -372,27 +552,21 @@ } break; } -case IRP_MN_QUERY_BUS_INFORMATION: -{ -DPRINT1("IRP_MN_QUERY_BUS_INFORMATION\n"); -break; -} - -case IRP_MN_QUERY_ID: -{ -DPRINT1("IRP_MN_QUERY_ID\n"); -break; -} - - -case IRP_MN_QUERY_CAPABILITIES: -{ -DPRINT1("IRP_MN_QUERY_CAPABILITIES\n"); -break; -} - - - + case IRP_MN_QUERY_BUS_INFORMATION: + { + DPRINT1("IRP_MN_QUERY_BUS_INFORMATION\n"); + break; + } + case IRP_MN_QUERY_ID: + { + DPRINT1("IRP_MN_QUERY_ID\n"); + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + DPRINT1("IRP_MN_QUERY_CAPABILITIES\n"); + break; + } default: { DPRINT1("Usbhub: 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] Tue Sep 7 11:44:03 2010 @@ -79,14 +79,23 @@ ULONG HubCount; + ULONG PortStatus[256]; + USB_BUS_INTERFACE_HUB_V5 HubInterface; USB_BUS_INTERFACE_USBDI_V2 UsbDInterface; USB_HUB_DESCRIPTOR HubDescriptor; USB_DEVICE_DESCRIPTOR HubDeviceDescriptor; - USB_CONFIGURATION_DESCRIPTOR HubConfig; + + USB_CONFIGURATION_DESCRIPTOR HubConfigDescriptor; + USB_INTERFACE_DESCRIPTOR HubInterfaceDescriptor; + USB_ENDPOINT_DESCRIPTOR HubEndPointDescriptor; + USB_EXTHUB_INFORMATION_0 UsbExtHubInfo; + USB_DEVICE_INFORMATION_0 DeviceInformation; + USBD_CONFIGURATION_HANDLE ConfigurationHandle; + USBD_PIPE_HANDLE PipeHandle; /* Fields valid only when IsFDO == FALSE */ UNICODE_STRING DeviceId; // REG_SZ UNICODE_STRING InstanceId; // REG_SZ [View Less]

14 years, 7 months

[mjmartin] 48718: [USETUP] - Translation updates by Pierre Schweitzer.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Tue Sep 7 09:40:53 2010 New Revision: 48718 URL: http://svn.reactos.org/svn/reactos?rev=48718&view=rev Log: [USETUP] - Translation updates by Pierre Schweitzer. Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/… [View More]

14 years, 7 months

[ekohl] 48717: Improvements to NtAdjustPrivilegesToken part 3: - Simplify the privilege modification code.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Sep 7 09:32:30 2010 New Revision: 48717 URL: http://svn.reactos.org/svn/reactos?rev=48717&view=rev Log: Improvements to NtAdjustPrivilegesToken part 3: - Simplify the privilege modification code. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=48… ============================================================================== --- trunk/reactos/… [View More]ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Tue Sep 7 09:32:30 2010 @@ -1962,8 +1962,6 @@ PTOKEN Token; ULONG i; ULONG j; - ULONG k; - ULONG Count; NTSTATUS Status; PAGED_CODE(); @@ -2074,7 +2072,7 @@ { if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) { - DPRINT("Attribute enabled\n"); + DPRINT("Privilege enabled\n"); ChangeCount++; } @@ -2137,40 +2135,30 @@ } } - - if (PreviousState != NULL) - PreviousState->PrivilegeCount = 0; - - k = 0; - if (DisableAllPrivileges == TRUE) - { - for (i = 0; i < Token->PrivilegeCount; i++) + /* Change the privilege attributes */ + ChangeCount = 0; + for (i = 0; i < Token->PrivilegeCount; i++) + { + if (DisableAllPrivileges == TRUE) { if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) { - DPRINT ("Attributes enabled\n"); - - /* Save current privilege */ + DPRINT ("Privilege enabled\n"); + + /* Save the current privilege */ if (PreviousState != NULL) { - PreviousState->PrivilegeCount++; - PreviousState->Privileges[k].Luid = Token->Privileges[i].Luid; - PreviousState->Privileges[k].Attributes = Token->Privileges[i].Attributes; - - k++; - } - - /* Update current privlege */ + PreviousState->Privileges[ChangeCount].Luid = Token->Privileges[i].Luid; + PreviousState->Privileges[ChangeCount].Attributes = Token->Privileges[i].Attributes; + } + + /* Disable the current privlege */ Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; - } - } - - Status = STATUS_SUCCESS; - } - else - { - Count = 0; - for (i = 0; i < Token->PrivilegeCount; i++) + + ChangeCount++; + } + } + else { for (j = 0; j < CapturedCount; j++) { @@ -2179,6 +2167,7 @@ { DPRINT ("Found privilege\n"); + /* Check whether the attributes differ */ if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED)) { @@ -2187,32 +2176,33 @@ Token->Privileges[i].Attributes, CapturedPrivileges[j].Attributes); - /* Save current privilege */ + /* Save the current privilege */ if (PreviousState != NULL) { - PreviousState->PrivilegeCount++; - PreviousState->Privileges[k].Luid = Token->Privileges[i].Luid; - PreviousState->Privileges[k].Attributes = Token->Privileges[i].Attributes; - - k++; + PreviousState->Privileges[ChangeCount].Luid = Token->Privileges[i].Luid; + PreviousState->Privileges[ChangeCount].Attributes = Token->Privileges[i].Attributes; } - /* Update current privlege */ + /* Update the current privlege */ Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; Token->Privileges[i].Attributes |= (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED); DPRINT ("New attributes %lx\n", Token->Privileges[i].Attributes); - } - - Count++; - } - } - } - - Status = (Count < CapturedCount) ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; - } - + + ChangeCount++; + } + } + } + } + } + + /* Set the number of saved privileges */ + if (PreviousState != NULL) + PreviousState->PrivilegeCount = ChangeCount; + + /* Set the status */ + Status = (ChangeCount < CapturedCount) ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; /* Dereference the token */ ObDereferenceObject (Token); [View Less]

14 years, 7 months

[sir_richard] 48716: [GDI32]: Don't destroy the heap when calling GetSystemPaletteEntries. Note to whoever wrote "//make this work": (&array[x]) is defintely not equal to (&array + x). This is why ...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Sep 7 07:50:51 2010 New Revision: 48716 URL: http://svn.reactos.org/svn/reactos?rev=48716&view=rev Log: [GDI32]: Don't destroy the heap when calling GetSystemPaletteEntries. Note to whoever wrote "//make this work": (&array[x]) is defintely not equal to (&array + x). This is why we don't use pointers-to-arrays, among other reasons. [GDI32]: Reformat GetSystemPaletteEntries away from grotesque 5-space identation (who does that?). [GDI32]: Optimize … [View More]GetSystemPaletteEntries by not zeroing over fields that get overwritten anyway. [GDI32]: Simplify loop control, remove not-needed local variable in GetSystemPaletteEntries. Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c Modified: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c [iso-8859-1] Tue Sep 7 07:50:51 2010 @@ -86,34 +86,36 @@ UINT cEntries, LPPALETTEENTRY ppe) { - PALETTEENTRY ippe[256]; - // Make this work! - if ((INT)cEntries < 0 ) return 0; - - if ( GetDeviceCaps(hDC, RASTERCAPS) & RC_PALETTE ) - return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); - else - { - if (ppe) + PALETTEENTRY ippe[256]; + + if ((INT)cEntries >= 0) + { + if (GetDeviceCaps(hDC, RASTERCAPS) & RC_PALETTE) { - RtlZeroMemory( &ippe, sizeof(ippe) ); - RtlCopyMemory( &ippe, &sys_pal_template, 10 * sizeof(PALETTEENTRY) ); - RtlCopyMemory( &ippe + 246 , &sys_pal_template + 10 , 10 * sizeof(PALETTEENTRY) ); - - if (iStartIndex < 256) - { - UINT Index = 256 - iStartIndex; - - if ( Index > cEntries ) Index = cEntries; - - RtlCopyMemory( ppe, - &ippe[iStartIndex], - Index*sizeof(PALETTEENTRY)); - } + return NtGdiDoPalette(hDC, + iStartIndex, + cEntries, + ppe, + GdiPalGetSystemEntries, + FALSE); } - } - - return 0; + else if (ppe) + { + RtlCopyMemory(ippe, sys_pal_template, 10 * sizeof(PALETTEENTRY)); + RtlCopyMemory(&ippe[246], &sys_pal_template[10], 10 * sizeof(PALETTEENTRY)); + RtlZeroMemory(&ippe[10], sizeof(ippe) - 20 * sizeof(PALETTEENTRY)); + + if (iStartIndex < 256) + { + RtlCopyMemory(ppe, + &ippe[iStartIndex], + min(256 - iStartIndex, cEntries) * + sizeof(PALETTEENTRY)); + } + } + } + + return 0; } UINT [View Less]

14 years, 7 months

[sir_richard] 48715: [PSDK]: Get rid of unused variable.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Tue Sep 7 05:22:13 2010 New Revision: 48715 URL: http://svn.reactos.org/svn/reactos?rev=48715&view=rev Log: [PSDK]: Get rid of unused variable. Modified: trunk/reactos/include/psdk/ws2tcpip.h Modified: trunk/reactos/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2tcpip.h?re… ============================================================================== --- trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] (… [View More]

14 years, 7 months

[cgutman] 48714: Create a branch for work on porting an alternate TCP library with the main focus on stability

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Sep 7 03:33:36 2010 New Revision: 48714 URL: http://svn.reactos.org/svn/reactos?rev=48714&view=rev Log: Create a branch for work on porting an alternate TCP library with the main focus on stability Added: branches/tcp-rewrite-branch/ (props changed) - copied from r48713, trunk/reactos/ Propchange: branches/tcp-rewrite-branch/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:… [View More]logregex Tue Sep 7 03:33:36 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/tcp-rewrite-branch/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/tcp-rewrite-branch/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/tcp-rewrite-branch/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Sep 7 03:33:36 2010 @@ -1,0 +1,14 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/tcp-rewrite-branch/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Sep 7 03:33:36 2010 @@ -1,0 +1,4 @@ +/branches/header-work:45691-47721 +/branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 Propchange: branches/tcp-rewrite-branch/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 [View Less]

14 years, 7 months

[cgutman] 48713: [FREELOADER] - Don't zero the target of an uninitialized pointer - Thanks to arty for finding the issue

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Sep 7 01:31:24 2010 New Revision: 48713 URL: http://svn.reactos.org/svn/reactos?rev=48713&view=rev Log: [FREELOADER] - Don't zero the target of an uninitialized pointer - Thanks to arty for finding the issue Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… =================================================… [View More]

14 years, 7 months

[sir_richard] 48712: [WIN32K]: Fix large amount of set-but-unused variables. Most of these seemed to be old/unfinished code, however in IntGdiPaintRgn an actual bug seems to have been found. [WIN32...

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Mon Sep 6 23:55:53 2010 New Revision: 48712 URL: http://svn.reactos.org/svn/reactos?rev=48712&view=rev Log: [WIN32K]: Fix large amount of set-but-unused variables. Most of these seemed to be old/unfinished code, however in IntGdiPaintRgn an actual bug seems to have been found. [WIN32K]: Make IntGdiPaintRgn return the status of the operation, not always TRUE. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c trunk/reactos/subsystems/win32/… [View More]

14 years, 7 months

[tkreuzer] 48711: [USETUP] - When creating fresh partitions, set the HiddenSectors mamber. Fixes fat32 installation.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Sep 6 17:02:47 2010 New Revision: 48711 URL: http://svn.reactos.org/svn/reactos?rev=48711&view=rev Log: [USETUP] - When creating fresh partitions, set the HiddenSectors mamber. Fixes fat32 installation. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… =====================================================================… [View More]========= --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Mon Sep 6 17:02:47 2010 @@ -1956,6 +1956,8 @@ PartEntry->FormatState = Unformatted; PartEntry->PartInfo[0].StartingOffset.QuadPart = PartEntry->UnpartitionedOffset + DiskEntry->TrackSize; + PartEntry->PartInfo[0].HiddenSectors = + PartEntry->PartInfo[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector; PartEntry->PartInfo[0].PartitionLength.QuadPart = PartEntry->UnpartitionedLength - DiskEntry->TrackSize; PartEntry->PartInfo[0].PartitionType = PARTITION_ENTRY_UNUSED; @@ -1985,6 +1987,8 @@ PrevPartEntry->PartInfo[1].StartingOffset.QuadPart = PartEntry->PartInfo[0].StartingOffset.QuadPart - DiskEntry->TrackSize; + PrevPartEntry->PartInfo[1].HiddenSectors = + PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector; if (DiskEntry->PartListHead.Flink == &PrevPartEntry->ListEntry) { @@ -2011,6 +2015,8 @@ PrevPartEntry->PartInfo[1].StartingOffset.QuadPart = PartEntry->PartInfo[0].StartingOffset.QuadPart - DiskEntry->TrackSize; + PrevPartEntry->PartInfo[1].HiddenSectors = + PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector; if (DiskEntry->PartListHead.Flink == &PrevPartEntry->ListEntry) { @@ -2066,6 +2072,8 @@ NewPartEntry->FormatState = Unformatted; NewPartEntry->PartInfo[0].StartingOffset.QuadPart = PartEntry->UnpartitionedOffset + DiskEntry->TrackSize; + NewPartEntry->PartInfo[0].HiddenSectors = + NewPartEntry->PartInfo[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector; NewPartEntry->PartInfo[0].PartitionLength.QuadPart = PartitionSize - DiskEntry->TrackSize; NewPartEntry->PartInfo[0].PartitionType = PARTITION_ENTRY_UNUSED; @@ -2095,6 +2103,8 @@ PrevPartEntry->PartInfo[1].StartingOffset.QuadPart = NewPartEntry->PartInfo[0].StartingOffset.QuadPart - DiskEntry->TrackSize; + PrevPartEntry->PartInfo[1].HiddenSectors = + PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector; if (DiskEntry->PartListHead.Flink == &PrevPartEntry->ListEntry) { @@ -2121,6 +2131,8 @@ PrevPartEntry->PartInfo[1].StartingOffset.QuadPart = NewPartEntry->PartInfo[0].StartingOffset.QuadPart - DiskEntry->TrackSize; + PrevPartEntry->PartInfo[1].HiddenSectors = + PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector; if (DiskEntry->PartListHead.Flink == &PrevPartEntry->ListEntry) { [View Less]

14 years, 7 months

← Newer
1
...
21
22
23
24
25
26
27
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2010