Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 07 Sep '10

07 Sep '10

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

1 0

[mjmartin] 48718: [USETUP] - Translation updates by Pierre Schweitzer.
by mjmartin＠svn.reactos.org 07 Sep '10

07 Sep '10

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/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Tue Sep 7 09:40:53 2010 @@ -998,13 +998,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Installer le chargeur de dmarrage sur le disque (MBR et VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Installer le chargeur de dmarrage sur le disque (VBR seulement).", TEXT_STYLE_NORMAL }, { @@ -1096,7 +1096,7 @@ { 6, 8, - "Please select a layout to be installed by default.", + "Veuillez slectionner une disposition installer par dfaut.", TEXT_STYLE_NORMAL }, { @@ -1487,18 +1487,18 @@ }, { //ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" - "ENTER = Reboot computer" + "Setup n'a pas pu ajouter les dispositions de clavier au registre.\n" + "ENTER = Redmarrer l'ordinateur" }, { //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" + "Setup n'a pas pu dfinir la geo id.\n" + "ENTER = Redmarrer l'ordinateur" }, { //ERROR_INSUFFICIENT_DISKSPACE, - "Not enough free space in the selected partition.\n" - " * Press any key to continue.", + "Pas assez d'espace libre dans la partition slectionne.\n" + " * Appuyez sur n'importe quelle touche pour continuer.", NULL }, { @@ -1715,6 +1715,6 @@ {STRING_GB, "Go"}, {STRING_ADDKBLAYOUTS, - "Adding keyboard layouts"}, + "Ajout des dispositions clavier"}, {0, 0} };

1 0

[ekohl] 48717: Improvements to NtAdjustPrivilegesToken part 3: - Simplify the privilege modification code.
by ekohl＠svn.reactos.org 07 Sep '10

07 Sep '10

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/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);

1 0

[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 07 Sep '10

07 Sep '10

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

1 0

[sir_richard] 48715: [PSDK]: Get rid of unused variable.
by sir_richard＠svn.reactos.org 07 Sep '10

07 Sep '10

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] (original) +++ trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] Tue Sep 7 05:22:13 2010 @@ -528,10 +528,9 @@ gai_strerrorA( IN int ecode) { - DWORD dwMsgLen; static char buff[GAI_STRERROR_BUFFER_SIZE + 1]; - dwMsgLen = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM + FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM |FORMAT_MESSAGE_IGNORE_INSERTS |FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL, @@ -549,10 +548,9 @@ gai_strerrorW( IN int ecode) { - DWORD dwMsgLen; static WCHAR buff[GAI_STRERROR_BUFFER_SIZE + 1]; - dwMsgLen = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM |FORMAT_MESSAGE_IGNORE_INSERTS |FORMAT_MESSAGE_MAX_WIDTH_MASK, NULL,

1 0

[cgutman] 48714: Create a branch for work on porting an alternate TCP library with the main focus on stability
by cgutman＠svn.reactos.org 07 Sep '10

07 Sep '10

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: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

1 0

[cgutman] 48713: [FREELOADER] - Don't zero the target of an uninitialized pointer - Thanks to arty for finding the issue
by cgutman＠svn.reactos.org 07 Sep '10

07 Sep '10

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/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Tue Sep 7 01:31:24 2010 @@ -1636,7 +1636,6 @@ } /* Add freeldr.sys to list of loaded executables */ - RtlZeroMemory(FreeldrDTE, sizeof(LDR_DATA_TABLE_ENTRY)); Status = WinLdrAllocateDataTableEntry(&LoaderBlock, "scsiport.sys", "FREELDR.SYS", &ImageDosHeader, &FreeldrDTE); if (!Status)

1 0

[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 06 Sep '10

06 Sep '10

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/win32k/dib/dib8bpp.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/paint.c trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/prop.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/dcattr.c trunk/reactos/subsystems/win32/win32k/objects/device.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c trunk/reactos/subsystems/win32/win32k/objects/palette.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/tools/gendib/gendib.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -82,7 +82,6 @@ int dy2; // dest y end int sy1; // src y start - int dx; int shift; BYTE srcmask, dstmask, xormask; @@ -139,12 +138,10 @@ pd = d; ps = s; srcmask = 0xff; - dx = dwx; /* dest x for this pass */ if ( dwx < dl ) { int diff = dl-dwx; srcmask &= (1<<(8-diff))-1; - dx = dl; } if ( dwx+7 > dr ) { Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -263,7 +263,7 @@ RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, wd, Dest; + ULONG RoundedRight, X, Y, SourceX = 0, SourceY = 0, Source, Dest; ULONG *DestBits; LONG DstHeight; @@ -279,7 +279,6 @@ RoundedRight = DestRect->right - ((DestRect->right - DestRect->left) & 0x3); DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + DestRect->left + (DestRect->top * DestSurf->lDelta)); - wd = DestSurf->lDelta - (DestRect->right - DestRect->left); for(Y = DestRect->top; Y < DestRect->bottom; Y++) { Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -307,11 +307,9 @@ POINTL Pt; ULONG Direction; BOOL UsesSource; - BOOL UsesPattern; POINTL AdjustedBrushOrigin; UsesSource = ROP4_USES_SOURCE(rop4); - UsesPattern = ROP4_USES_PATTERN(rop4); if (R4_NOOP == rop4) { /* Copy destination onto itself: nop */ Modified: trunk/reactos/subsystems/win32/win32k/eng/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/paint.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/paint.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -36,11 +36,9 @@ { LONG y; ULONG LineWidth; - SURFACE *psurf; ASSERT(pso); ASSERT(pRect); - psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); MouseSafetyOnDrawStart(pso, pRect->left, pRect->top, pRect->right, pRect->bottom); LineWidth = pRect->right - pRect->left; DPRINT(" LineWidth: %d, top: %d, bottom: %d\n", LineWidth, pRect->top, pRect->bottom); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -588,7 +588,7 @@ IN OUT PCLS *BaseClassLink, IN OUT PCLS *CloneLink) { - PCLS Clone, BaseClass; + PCLS Clone; ASSERT(Class->pclsBase != Class); ASSERT(Class->pclsBase->pclsClone != NULL); @@ -600,8 +600,6 @@ /* unlink the clone */ *CloneLink = Class->pclsNext; Class->pclsClone = Class->pclsBase->pclsClone; - - BaseClass = Class->pclsBase; /* update the class information to make it a base class */ Class->pclsBase = Class; @@ -1818,8 +1816,6 @@ IN BOOL Ansi, HINSTANCE hInstance) { - PPROCESSINFO pi; - if (!Class) return FALSE; lpwcx->style = Class->style; @@ -1827,8 +1823,6 @@ // If fnId is set, clear the global bit. See wine class test check_style. if (Class->fnid) lpwcx->style &= ~CS_GLOBALCLASS; - - pi = GetW32ProcessInfo(); lpwcx->lpfnWndProc = IntGetClassWndProc(Class, Ansi); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -949,7 +949,6 @@ // because pallette information may change HDC hdc; - INT ret; BITMAP bm; BITMAPINFO bi; SURFACE *psurf; @@ -975,14 +974,14 @@ bi.bmiHeader.biYPelsPerMeter = 0; bi.bmiHeader.biClrUsed = 0; - ret = NtGdiGetDIBitsInternal(hdc, hMem, 0, bm.bmHeight, NULL, &bi, DIB_RGB_COLORS, 0, 0); + NtGdiGetDIBitsInternal(hdc, hMem, 0, bm.bmHeight, NULL, &bi, DIB_RGB_COLORS, 0, 0); size = bi.bmiHeader.biSizeImage + sizeof(BITMAPINFOHEADER); hCBData = ExAllocatePoolWithTag(PagedPool, size, USERTAG_CLIPBOARD); memcpy(hCBData, &bi, sizeof(BITMAPINFOHEADER)); - ret = NtGdiGetDIBitsInternal(hdc, hMem, 0, bm.bmHeight, (LPBYTE)hCBData + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS, 0, 0); + NtGdiGetDIBitsInternal(hdc, hMem, 0, bm.bmHeight, (LPBYTE)hCBData + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS, 0, 0); UserReleaseDC(NULL, hdc, FALSE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -109,7 +109,6 @@ PCURICON_OBJECT OldCursor; HCURSOR hOldCursor = (HCURSOR)0; HDC hdcScreen; - BOOL bResult; CurInfo = IntGetSysCursorInfo(); @@ -141,13 +140,13 @@ CurInfo->CurrentCursorObject = NewCursor; /* Call GDI to set the new screen cursor */ - bResult = GreSetPointerShape(hdcScreen, - NewCursor->IconInfo.hbmMask, - NewCursor->IconInfo.hbmColor, - NewCursor->IconInfo.xHotspot, - NewCursor->IconInfo.yHotspot, - gpsi->ptCursor.x, - gpsi->ptCursor.y); + GreSetPointerShape(hdcScreen, + NewCursor->IconInfo.hbmMask, + NewCursor->IconInfo.hbmColor, + NewCursor->IconInfo.xHotspot, + NewCursor->IconInfo.yHotspot, + gpsi->ptCursor.x, + gpsi->ptCursor.y); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -181,7 +181,6 @@ { PEVENTHOOK pEH; PLIST_ENTRY pLE; - LRESULT Result; DPRINT("IntNotifyWinEvent GlobalEvents = 0x%x pWnd 0x%x\n",GlobalEvents, pWnd); @@ -204,11 +203,11 @@ if (!(pEH->idProcess) || !(pEH->idThread) || (NtCurrentTeb()->ClientId.UniqueProcess == (PVOID)(DWORD_PTR)pEH->idProcess)) { - Result = IntCallLowLevelEvent( pEH, - Event, - UserHMGetHandle(pWnd), - idObject, - idChild); + IntCallLowLevelEvent( pEH, + Event, + UserHMGetHandle(pWnd), + idObject, + idChild); } }// if ^skip own thread && ((Pid && CPid == Pid && ^skip own process) || all process) else if ( !(pEH->Flags & WINEVENT_SKIPOWNTHREAD) && @@ -217,7 +216,8 @@ !(pEH->Flags & WINEVENT_SKIPOWNPROCESS)) || !pEH->idProcess ) ) { - Result = co_IntCallEventProc( UserHMGetHandle(pEH), + // What in the deuce is this right-aligned formatting? + co_IntCallEventProc( UserHMGetHandle(pEH), Event, UserHMGetHandle(pWnd), idObject, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -1236,7 +1236,6 @@ IntKeyboardInput(KEYBDINPUT *ki) { PUSER_MESSAGE_QUEUE FocusMessageQueue; - PTHREADINFO pti; MSG Msg; LARGE_INTEGER LargeTickCount; KBDLLHOOKSTRUCT KbdHookData; @@ -1339,7 +1338,6 @@ Msg.time = ki->time; /* All messages have to contain the cursor point. */ - pti = PsGetCurrentThreadWin32Thread(); Msg.pt = gpsi->ptCursor; KbdHookData.vkCode = vk_hook; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -430,7 +430,6 @@ MSG NewMsg = { 0 }; PKBDTABLES keyLayout; BOOL Result = FALSE; - DWORD ScanCode = 0; pti = PsGetCurrentThreadWin32Thread(); keyLayout = pti->KeyboardLayout->KBTables; @@ -455,8 +454,6 @@ MsqPostMessage(pti->MessageQueue, &NewMsg, FALSE, QS_KEY); return TRUE; } - - ScanCode = (lpMsg->lParam >> 16) & 0xff; UState = ToUnicodeInner(lpMsg->wParam, HIWORD(lpMsg->lParam) & 0xff, gQueueKeyStateTable, wp, 2, 0, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -959,7 +959,6 @@ IntBuildMenuItemList(PMENU_OBJECT MenuObject, PVOID Buffer, ULONG nMax) { DWORD res = 0; - UINT sz; ROSMENUITEMINFO mii; PVOID Buf; PMENU_ITEM CurItem = MenuObject->MenuItemList; @@ -976,7 +975,6 @@ StrOut = (PWCHAR)((char *) Buffer + MenuObject->MenuInfo.MenuItemCount * sizeof(ROSMENUITEMINFO)); nMax -= MenuObject->MenuInfo.MenuItemCount * sizeof(ROSMENUITEMINFO); - sz = sizeof(ROSMENUITEMINFO); Buf = Buffer; mii.cbSize = sizeof(ROSMENUITEMINFO); mii.fMask = 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -1868,7 +1868,6 @@ ULONG_PTR PResult; PTHREADINFO pti; PWINDOW_OBJECT Window; - MSG Message; if ( !(Window = UserGetWindowObject(hWnd)) ) return FALSE; @@ -1880,11 +1879,6 @@ } else { // Handle message and callback. - Message.hwnd = hWnd; - Message.message = Msg; - Message.wParam = wParam; - Message.lParam = lParam; - Result = co_IntSendMessageTimeoutSingle( hWnd, Msg, wParam, Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -97,8 +97,6 @@ HANDLE hPowerRequestEvent, HANDLE hMediaRequestEvent) { - NTSTATUS Status; - // Set W32PF_Flags |= (W32PF_READSCREENACCESSGRANTED | W32PF_IOWINSTA) // Create Object Directory,,, Looks like create workstation. "\\Windows\\WindowStations" // Create Event for Diconnect Desktop. @@ -116,7 +114,7 @@ // Callback to User32 Client Thread Setup - Status = co_IntClientThreadSetup(); + co_IntClientThreadSetup(); // } // Set Global SERVERINFO Error flags. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -103,7 +103,6 @@ { PWND Wnd; HRGN hRgnWindow; - UINT RgnType; Wnd = Window->Wnd; if (Client) @@ -116,7 +115,7 @@ NtGdiOffsetRgn(hRgnWindow, -Wnd->rcWindow.left, -Wnd->rcWindow.top); - RgnType = NtGdiCombineRgn(hRgnWindow, hRgnWindow, Window->hrgnClip, RGN_AND); + NtGdiCombineRgn(hRgnWindow, hRgnWindow, Window->hrgnClip, RGN_AND); NtGdiOffsetRgn(hRgnWindow, Wnd->rcWindow.left, Wnd->rcWindow.top); @@ -728,15 +727,13 @@ if (WndCaret == Window || ((flags & SW_SCROLLCHILDREN) && IntIsChildWindow(Window, WndCaret))) { - POINT pt, FromOffset, ToOffset, Offset; + POINT pt, FromOffset, ToOffset; RECTL rcCaret; pt.x = CaretInfo->Pos.x; pt.y = CaretInfo->Pos.y; IntGetClientOrigin(WndCaret, &FromOffset); IntGetClientOrigin(Window, &ToOffset); - Offset.x = FromOffset.x - ToOffset.x; - Offset.y = FromOffset.y - ToOffset.y; rcCaret.left = pt.x; rcCaret.top = pt.y; rcCaret.right = pt.x + CaretInfo->Size.cx; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/prop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/prop.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -57,14 +57,12 @@ IntRemoveProp(PWINDOW_OBJECT Window, ATOM Atom) { PPROPERTY Prop; - HANDLE Data; Prop = IntGetProp(Window, Atom); if (Prop == NULL) { return FALSE; } - Data = Prop->Data; RemoveEntryList(&Prop->PropListEntry); UserHeapFree(Prop); Window->Wnd->PropListItems--; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -470,7 +470,6 @@ { PSCROLLBARINFO psbi; LPSCROLLINFO psi; - LRESULT Result; ULONG Size, s; INT i; @@ -492,9 +491,9 @@ RtlZeroMemory(Window->pSBInfo, Size); - Result = co_WinPosGetNonClientSize(Window, - &Window->Wnd->rcWindow, - &Window->Wnd->rcClient); + co_WinPosGetNonClientSize(Window, + &Window->Wnd->rcWindow, + &Window->Wnd->rcClient); for(s = SB_HORZ; s <= SB_VERT; s++) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -698,7 +698,6 @@ { DWORD Ret = 0; PWINDOW_OBJECT Window; - PWND Wnd; USER_REFERENCE_ENTRY Ref; DECLARE_RETURN(DWORD); @@ -710,8 +709,6 @@ RETURN( FALSE); } UserRefObjectCo(Window, &Ref); - - Wnd = Window->Wnd; switch (Routine) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -1562,12 +1562,11 @@ /* default positioning for overlapped windows */ if(!(Cs->style & (WS_POPUP | WS_CHILD))) { - RECTL rc, WorkArea; + RECTL WorkArea; PRTL_USER_PROCESS_PARAMETERS ProcessParams; UserSystemParametersInfo(SPI_GETWORKAREA, 0, &WorkArea, 0); - rc = WorkArea; ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters; if (IS_DEFAULT(Cs->x)) @@ -2971,9 +2970,8 @@ for (;;) { - PWINDOW_OBJECT Parent, Old; - - Old = WndAncestor; + PWINDOW_OBJECT Parent; + Parent = IntGetParent(WndAncestor); if (!Parent) @@ -3075,7 +3073,6 @@ LPPOINT ptIcon) { PWINDOW_OBJECT Window; - PWND Wnd; DWORD Ret = 0; BOOL Hit = FALSE; WINDOWPLACEMENT wndpl; @@ -3087,7 +3084,6 @@ Hit = FALSE; goto Exit; } - Wnd = Window->Wnd; _SEH2_TRY { @@ -4435,7 +4431,6 @@ if ((DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()))) { PTHREADINFO pti; - USHORT Hit; pt.x = X; pt.y = Y; @@ -4445,7 +4440,7 @@ UserRefObjectCo(DesktopWindow, &Ref); pti = PsGetCurrentThreadWin32Thread(); - Hit = co_WinPosWindowFromPoint(DesktopWindow, pti->MessageQueue, &pt, &Window); + co_WinPosWindowFromPoint(DesktopWindow, pti->MessageQueue, &pt, &Window); if(Window) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -995,7 +995,6 @@ BOOL APIENTRY NtUserSetProcessWindowStation(HWINSTA hWindowStation) { - HANDLE hOld; PWINSTATION_OBJECT NewWinSta; NTSTATUS Status; @@ -1028,7 +1027,7 @@ */ /* FIXME - dereference the old window station, etc... */ - hOld = InterlockedExchangePointer(&PsGetCurrentProcess()->Win32WindowStation, hWindowStation); + InterlockedExchangePointer(&PsGetCurrentProcess()->Win32WindowStation, hWindowStation); DPRINT("PsGetCurrentProcess()->Win32WindowStation 0x%X\n", PsGetCurrentProcess()->Win32WindowStation); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -322,7 +322,6 @@ SURFACE *BitmapDest, *BitmapSrc = NULL; HPALETTE SourcePalette = 0, DestPalette = 0; PPALETTE PalDestGDI, PalSourceGDI; - USHORT PalDestMode, PalSrcMode; ULONG TransparentColor = 0; BOOL Ret = FALSE; EXLATEOBJ exlo; @@ -387,7 +386,6 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); goto done; } - PalSrcMode = PalSourceGDI->Mode; PALETTE_UnlockPalette(PalSourceGDI); if(DestPalette != SourcePalette) @@ -397,12 +395,10 @@ SetLastWin32Error(ERROR_INVALID_HANDLE); goto done; } - PalDestMode = PalDestGDI->Mode; PALETTE_UnlockPalette(PalDestGDI); } else { - PalDestMode = PalSrcMode; PalDestGDI = PalSourceGDI; } Modified: trunk/reactos/subsystems/win32/win32k/objects/dcattr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcattr.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcattr.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -212,7 +212,6 @@ VOID CopytoUserDcAttr(PDC dc, PDC_ATTR pdcattr) { - NTSTATUS Status = STATUS_SUCCESS; dc->dcattr.mxWorldToDevice = dc->dclevel.mxWorldToDevice; dc->dcattr.mxDeviceToWorld = dc->dclevel.mxDeviceToWorld; dc->dcattr.mxWorldToPage = dc->dclevel.mxWorldToPage; @@ -228,7 +227,6 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); ASSERT(FALSE); } _SEH2_END; Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -1256,10 +1256,8 @@ IN DWORD dwflags, IN PVOID lParam OPTIONAL) { - BOOLEAN Global = FALSE; BOOLEAN NoReset = FALSE; BOOLEAN Reset = FALSE; - BOOLEAN SetPrimary = FALSE; LONG Ret = DISP_CHANGE_SUCCESSFUL; NTSTATUS Status ; @@ -1269,7 +1267,7 @@ { /* Check global, reset and noreset flags */ if ((dwflags & CDS_GLOBAL) == CDS_GLOBAL) - Global = TRUE; + DPRINT1("CDS_GLOBAL unhandled"); if ((dwflags & CDS_NORESET) == CDS_NORESET) NoReset = TRUE; dwflags &= ~(CDS_GLOBAL | CDS_NORESET); @@ -1277,7 +1275,7 @@ if ((dwflags & CDS_RESET) == CDS_RESET) Reset = TRUE; if ((dwflags & CDS_SET_PRIMARY) == CDS_SET_PRIMARY) - SetPrimary = TRUE; + DPRINT1("CDS_SET_PRIMARY unhandled"); dwflags &= ~(CDS_RESET | CDS_SET_PRIMARY); if (Reset && NoReset) Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -302,7 +302,9 @@ PSECTION_OBJECT SectionObject; ULONG ViewSize = 0; LARGE_INTEGER SectionSize; +#if 0 // Wine code FT_Fixed XScale, YScale; +#endif UNICODE_STRING FontRegPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"); /* Open the font file */ @@ -395,9 +397,9 @@ FontGDI->face = Face; /* FIXME: Complete text metrics */ +#if 0 /* This (Wine) code doesn't seem to work correctly for us */ XScale = Face->size->metrics.x_scale; YScale = Face->size->metrics.y_scale; -#if 0 /* This (Wine) code doesn't seem to work correctly for us */ FontGDI->TextMetric.tmAscent = (FT_MulFix(Face->ascender, YScale) + 32) >> 6; FontGDI->TextMetric.tmDescent = (FT_MulFix(Face->descender, YScale) + 32) >> 6; FontGDI->TextMetric.tmHeight = (FT_MulFix(Face->ascender, YScale) - Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -117,8 +117,7 @@ case GdiBCSelObj: { PGDIBSOBJECT pgO; - PTEXTOBJ pOrgFnt, pNewFnt = NULL; - HFONT hOrgFont = NULL; + PTEXTOBJ pNewFnt = NULL; if (!dc) break; pgO = (PGDIBSOBJECT) pHdr; @@ -128,15 +127,6 @@ /* LFONTOBJ use share and locking. */ pNewFnt = TEXTOBJ_LockText(pgO->hgdiobj); - pOrgFnt = dc->dclevel.plfnt; - if (pOrgFnt) - { - hOrgFont = pOrgFnt->BaseObject.hHmgr; - } - else - { - hOrgFont = pdcattr->hlfntNew; - } dc->dclevel.plfnt = pNewFnt; dc->hlfntCur = pgO->hgdiobj; pdcattr->hlfntNew = pgO->hgdiobj; Modified: trunk/reactos/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -693,7 +693,6 @@ int realized = 0; PDC dc; HPALETTE systemPalette; - USHORT sysMode, palMode; dc = DC_LockDc(hDC); if (!dc) return 0; @@ -731,8 +730,6 @@ } // need to pass this to IntEngCreateXlate with palettes unlocked - sysMode = sysGDI->Mode; - palMode = palGDI->Mode; PALETTE_UnlockPalette(sysGDI); PALETTE_UnlockPalette(palGDI); Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -98,9 +98,9 @@ FASTCALL PATH_FillPath( PDC dc, PPATH pPath ) { - INT mapMode, graphicsMode; - SIZE ptViewportExt, ptWindowExt; - POINTL ptViewportOrg, ptWindowOrg; + //INT mapMode, graphicsMode; + //SIZE ptViewportExt, ptWindowExt; + //POINTL ptViewportOrg, ptWindowOrg; XFORM xform; HRGN hrgn; PDC_ATTR pdcattr = dc->pdcattr; @@ -122,11 +122,11 @@ */ /* Save the information about the old mapping mode */ - mapMode = pdcattr->iMapMode; - ptViewportExt = pdcattr->szlViewportExt; - ptViewportOrg = pdcattr->ptlViewportOrg; - ptWindowExt = pdcattr->szlWindowExt; - ptWindowOrg = pdcattr->ptlWindowOrg; + //mapMode = pdcattr->iMapMode; + //ptViewportExt = pdcattr->szlViewportExt; + //ptViewportOrg = pdcattr->ptlViewportOrg; + //ptWindowExt = pdcattr->szlWindowExt; + //ptWindowOrg = pdcattr->ptlWindowOrg; /* Save world transform * NB: The Windows documentation on world transforms would lead one to @@ -143,7 +143,7 @@ // pdcattr->ptlWindowOrg.x = 0; // pdcattr->ptlWindowOrg.y = 0; - graphicsMode = pdcattr->iGraphicsMode; + // graphicsMode = pdcattr->iGraphicsMode; // pdcattr->iGraphicsMode = GM_ADVANCED; // IntGdiModifyWorldTransform( dc, &xform, MWT_IDENTITY ); // pdcattr->iGraphicsMode = graphicsMode; @@ -159,7 +159,7 @@ // pdcattr->ptlWindowOrg = ptWindowOrg; /* Go to GM_ADVANCED temporarily to restore the world transform */ - graphicsMode = pdcattr->iGraphicsMode; + //graphicsMode = pdcattr->iGraphicsMode; // pdcattr->iGraphicsMode = GM_ADVANCED; // IntGdiModifyWorldTransform( dc, &xform, MWT_MAX+1 ); // pdcattr->iGraphicsMode = graphicsMode; Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -2451,7 +2451,7 @@ REGION_FreeRgnByHandle(tmpVisRgn); // Fill the region - return TRUE; + return bRet; } BOOL Modified: trunk/reactos/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.c?rev=… ============================================================================== --- trunk/reactos/tools/gendib/gendib.c [iso-8859-1] (original) +++ trunk/reactos/tools/gendib/gendib.c [iso-8859-1] Mon Sep 6 23:55:53 2010 @@ -836,9 +836,8 @@ } if (ROPCODE_GENERIC == RopInfo->RopCode) { - Output(Out, "BOOLEAN UsesDest, UsesSource, UsesPattern;\n"); + Output(Out, "BOOLEAN UsesSource, UsesPattern;\n"); Output(Out, "\n"); - Output(Out, "UsesDest = ROP4_USES_DEST(BltInfo->Rop4);\n"); Output(Out, "UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);\n"); Output(Out, "UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);\n"); }

1 0

[tkreuzer] 48711: [USETUP] - When creating fresh partitions, set the HiddenSectors mamber. Fixes fat32 installation.
by tkreuzer＠svn.reactos.org 06 Sep '10

06 Sep '10

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… ============================================================================== --- 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) {

1 0

[ekohl] 48710: Improvements to NtAdjustPrivilegesToken part 2: - Check for invalid parameter combinations. - Count privileges that will be changed before changing them. - Return required buffer siz...
by ekohl＠svn.reactos.org 06 Sep '10

06 Sep '10

Author: ekohl Date: Mon Sep 6 15:26:12 2010 New Revision: 48710 URL: http://svn.reactos.org/svn/reactos?rev=48710&view=rev Log: Improvements to NtAdjustPrivilegesToken part 2: - Check for invalid parameter combinations. - Count privileges that will be changed before changing them. - Return required buffer size. - Fail if the provided buffer is too small. See issue #5497 for more details. 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/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Mon Sep 6 15:26:12 2010 @@ -1958,22 +1958,21 @@ ULONG CapturedCount = 0; ULONG CapturedLength = 0; ULONG NewStateSize = 0; - ULONG PrivilegeCount; + ULONG ChangeCount; PTOKEN Token; ULONG i; ULONG j; ULONG k; ULONG Count; -#if 0 - ULONG a; - ULONG b; - ULONG c; -#endif NTSTATUS Status; PAGED_CODE(); DPRINT ("NtAdjustPrivilegesToken() called\n"); + + /* Fail, if we do not disable all privileges but NewState is NULL */ + if (DisableAllPrivileges == FALSE && NewState == NULL) + return STATUS_INVALID_PARAMETER; PreviousMode = KeGetPreviousMode (); if (PreviousMode != KernelMode) @@ -2067,21 +2066,77 @@ return Status; } - -#if 0 - SepAdjustPrivileges(Token, - 0, - PreviousMode, - PrivilegeCount, - Privileges, - PreviousState, - &a, - &b, - &c); -#endif - - PrivilegeCount = (BufferLength - FIELD_OFFSET(TOKEN_PRIVILEGES, Privileges)) / - sizeof(LUID_AND_ATTRIBUTES); + /* Count the privileges that need to be changed */ + ChangeCount = 0; + for (i = 0; i < Token->PrivilegeCount; i++) + { + if (DisableAllPrivileges) + { + if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) + { + DPRINT("Attribute enabled\n"); + + ChangeCount++; + } + } + else + { + for (j = 0; j < CapturedCount; j++) + { + if (Token->Privileges[i].Luid.LowPart == CapturedPrivileges[j].Luid.LowPart && + Token->Privileges[i].Luid.HighPart == CapturedPrivileges[j].Luid.HighPart) + { + DPRINT("Found privilege\n"); + + if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != + (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED)) + { + DPRINT("Attributes differ\n"); + DPRINT("Current attributes %lx New attributes %lx\n", + Token->Privileges[i].Attributes, + CapturedPrivileges[j].Attributes); + + ChangeCount++; + } + } + } + } + } + + /* + * Return the required buffer size and + * check if the available buffer is large enough + */ + if (PreviousState != NULL) + { + ULONG RequiredLength = (ULONG)sizeof(TOKEN_PRIVILEGES) + + ((ChangeCount - ANYSIZE_ARRAY) * (ULONG)sizeof(LUID_AND_ATTRIBUTES)); + + /* Try to return the required buffer length */ + _SEH2_TRY + { + *ReturnLength = RequiredLength; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + _SEH2_YIELD(return _SEH2_GetExceptionCode()); + } + _SEH2_END; + + /* Fail, if the buffer length is smaller than the required length */ + if (BufferLength < RequiredLength) + { + ObDereferenceObject(Token); + if (CapturedPrivileges != NULL) + SeReleaseLuidAndAttributesArray(CapturedPrivileges, + PreviousMode, + TRUE); + + return STATUS_BUFFER_TOO_SMALL; + } + } + if (PreviousState != NULL) PreviousState->PrivilegeCount = 0; @@ -2091,27 +2146,16 @@ { for (i = 0; i < Token->PrivilegeCount; i++) { - if (Token->Privileges[i].Attributes != 0) - { - DPRINT ("Attributes differ\n"); + if (Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) + { + DPRINT ("Attributes enabled\n"); /* Save current privilege */ if (PreviousState != NULL) { - if (k < PrivilegeCount) - { - PreviousState->PrivilegeCount++; - PreviousState->Privileges[k].Luid = Token->Privileges[i].Luid; - PreviousState->Privileges[k].Attributes = Token->Privileges[i].Attributes; - } - else - { - /* - * FIXME: Should revert all the changes, calculate how - * much space would be needed, set ResultLength - * accordingly and fail. - */ - } + PreviousState->PrivilegeCount++; + PreviousState->Privileges[k].Luid = Token->Privileges[i].Luid; + PreviousState->Privileges[k].Attributes = Token->Privileges[i].Attributes; k++; } @@ -2139,27 +2183,16 @@ (CapturedPrivileges[j].Attributes & SE_PRIVILEGE_ENABLED)) { DPRINT ("Attributes differ\n"); - DPRINT ("Current attributes %lx desired attributes %lx\n", + DPRINT ("Current attributes %lx New attributes %lx\n", Token->Privileges[i].Attributes, CapturedPrivileges[j].Attributes); /* Save current privilege */ if (PreviousState != NULL) { - if (k < PrivilegeCount) - { - PreviousState->PrivilegeCount++; - PreviousState->Privileges[k].Luid = Token->Privileges[i].Luid; - PreviousState->Privileges[k].Attributes = Token->Privileges[i].Attributes; - } - else - { - /* - * FIXME: Should revert all the changes, calculate how - * much space would be needed, set ResultLength - * accordingly and fail. - */ - } + PreviousState->PrivilegeCount++; + PreviousState->Privileges[k].Luid = Token->Privileges[i].Luid; + PreviousState->Privileges[k].Attributes = Token->Privileges[i].Attributes; k++; } @@ -2177,14 +2210,9 @@ } } - Status = Count < CapturedCount ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; - } - - if (ReturnLength != NULL) - { - *ReturnLength = sizeof(TOKEN_PRIVILEGES) + - (sizeof(LUID_AND_ATTRIBUTES) * (k - 1)); - } + Status = (Count < CapturedCount) ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; + } + /* Dereference the token */ ObDereferenceObject (Token);

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