Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[janderwald] 51343: [USBEHCI_NEW] - Implement CHCDController::Initialize, CHCDController::HandlePnp for PDO / FDO, - Partly implement CHCDController::HandleDeviceControl - Based on mjmartin usbehci...

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Apr 14 16:42:02 2011 New Revision: 51343 URL: http://svn.reactos.org/svn/reactos?rev=51343&view=rev Log: [USBEHCI_NEW] - Implement CHCDController::Initialize, CHCDController::HandlePnp for PDO / FDO, - Partly implement CHCDController::HandleDeviceControl - Based on mjmartin usbehci sources - Driver now startups and acquires pnp resources - Fails in HandleDeviceControl with IOCTL_GET_HCD_DRIVERKEY_NAME when usbview is launched - Tested in Windows XP SP2 + Vmware Server 2.0.2 Added: branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp (with props) Modified: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h Modified: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] Thu Apr 14 16:42:02 2011 @@ -8,6 +8,7 @@ usbehci.cpp hcd_controller.cpp hardware.cpp + misc.cpp usbehci.rc) target_link_libraries(usbehci Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Thu Apr 14 16:42:02 2011 @@ -1,13 +1,14 @@ /* * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbehci_new/hcd_controller.cpp + * FILE: drivers/usb/usbehci/hcd_controller.cpp * PURPOSE: USB EHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ +#define INITGUID #include "usbehci.h" class CHCDController : public IHCDController @@ -38,12 +39,29 @@ NTSTATUS HandlePower(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); + // local functions + NTSTATUS CreateFDO(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT * OutDeviceObject); + NTSTATUS CreatePDO(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT * OutDeviceObject); + NTSTATUS HandleQueryInterface(PIO_STACK_LOCATION IoStack); + NTSTATUS SetDeviceInterface(BOOLEAN bEnable); + // constructor / destructor CHCDController(IUnknown *OuterUnknown){} virtual ~CHCDController(){} protected: LONG m_Ref; + PROOTHDCCONTROLLER m_RootController; + PDRIVER_OBJECT m_DriverObject; + PDEVICE_OBJECT m_PhysicalDeviceObject; + PDEVICE_OBJECT m_FunctionalDeviceObject; + PDEVICE_OBJECT m_NextDeviceObject; + PUSBHARDWAREDEVICE m_Hardware; + PDEVICE_OBJECT m_BusPDO; + UNICODE_STRING m_HubDeviceInterfaceString; + BOOLEAN m_InterfaceEnabled; + ULONG m_PDODeviceNumber; + ULONG m_FDODeviceNumber; }; //================================================================================================= @@ -67,23 +85,237 @@ return STATUS_UNSUCCESSFUL; } +//------------------------------------------------------------------------------------------------- NTSTATUS CHCDController::Initialize( IN PROOTHDCCONTROLLER RootHCDController, IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PCOMMON_DEVICE_EXTENSION DeviceExtension; + + // + // create usb hardware + // + Status = CreateUSBHardware(&m_Hardware); + if (!NT_SUCCESS(Status)) + { + // + // failed to create hardware object + // + DPRINT1("Failed to create hardware object\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize members + // + m_DriverObject = DriverObject; + m_PhysicalDeviceObject = PhysicalDeviceObject; + m_RootController = RootHCDController; + + // + // create FDO + // + Status = CreateFDO(m_DriverObject, &m_FunctionalDeviceObject); + if (!NT_SUCCESS(Status)) + { + // + // failed to create PDO + // + return Status; + } + + // + // now attach to device stack + // + m_NextDeviceObject = IoAttachDeviceToDeviceStack(m_FunctionalDeviceObject, m_PhysicalDeviceObject); + if (!m_NextDeviceObject) + { + // + // failed to attach to device stack + // + IoDeleteDevice(m_FunctionalDeviceObject); + m_FunctionalDeviceObject = 0; + + return STATUS_NO_SUCH_DEVICE; + } + + // + // initialize hardware object + // + Status = m_Hardware->Initialize(m_DriverObject, m_FunctionalDeviceObject, m_PhysicalDeviceObject, m_NextDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to initialize hardware object %x\n", Status); + + // + // failed to initialize hardware object, detach from device stack + // + IoDetachDevice(m_NextDeviceObject); + + // + // now delete the device + // + IoDeleteDevice(m_FunctionalDeviceObject); + + // + // nullify pointers :) + // + m_FunctionalDeviceObject = 0; + m_NextDeviceObject = 0; + + return Status; + } + + + // + // set device flags + // + m_FunctionalDeviceObject->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; + + + // + // get device extension + // + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)m_FunctionalDeviceObject->DeviceExtension; + PC_ASSERT(DeviceExtension); + + // + // initialize device extension + // + DeviceExtension->IsFDO = TRUE; + DeviceExtension->IsHub = FALSE; + DeviceExtension->HcdController = PHCDCONTROLLER(this); + + // + // device is initialized + // + m_FunctionalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + + // + // is there a root controller + // + if (m_RootController) + { + // + // add reference + // + m_RootController->AddRef(); + + // + // register with controller + // + m_RootController->RegisterHCD(this); + } + + + // + // done + // + return STATUS_SUCCESS; } +//------------------------------------------------------------------------------------------------- NTSTATUS CHCDController::HandleDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PCOMMON_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + PUSB_HCD_DRIVERKEY_NAME DriverKey; + ULONG ResultLength; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get device extension + // + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + + DPRINT1("HandleDeviceControl>Type: FDO %u IoCtl %x InputBufferLength %lu OutputBufferLength %lu NOT IMPLEMENTED\n", + DeviceExtension->IsFDO, + IoStack->Parameters.DeviceIoControl.IoControlCode, + IoStack->Parameters.DeviceIoControl.InputBufferLength, + IoStack->Parameters.DeviceIoControl.OutputBufferLength); + + // + // get device type + // + if (DeviceExtension->IsFDO) + { + // + // perform ioctl for FDO + // + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_GET_HCD_DRIVERKEY_NAME) + { + // + // check if sizee is at least >= USB_HCD_DRIVERKEY_NAME + // + if(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(USB_HCD_DRIVERKEY_NAME)) + { + // + // get device property size + // + Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, 0, NULL, &ResultLength); + + DriverKey = (PUSB_HCD_DRIVERKEY_NAME)Irp->AssociatedIrp.SystemBuffer; + + // + // check result + // + if (Status == STATUS_BUFFER_TOO_SMALL) + { + // + // does the caller provide enough buffer space + // + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength >= ResultLength) + { + // + // it does + // + Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, IoStack->Parameters.DeviceIoControl.OutputBufferLength, DriverKey->DriverKeyName, &ResultLength); + + //DPRINT1("Result %S\n", DriverKey->DriverKeyName); + } + + // + // FIXME + // + + // + // store result + // + DriverKey->ActualLength = ResultLength; + Irp->IoStatus.Information = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + Status = STATUS_BUFFER_OVERFLOW; + } + } + else + { + // + // buffer is certainly too small + // + Status = STATUS_BUFFER_OVERFLOW; + Irp->IoStatus.Information = sizeof(USB_HCD_DRIVERKEY_NAME); + } + } + } + +// + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } NTSTATUS @@ -91,12 +323,336 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED - - Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + PIO_STACK_LOCATION IoStack; + PCOMMON_DEVICE_EXTENSION DeviceExtension; + PCM_RESOURCE_LIST RawResourceList; + PCM_RESOURCE_LIST TranslatedResourceList; + PDEVICE_RELATIONS DeviceRelations; + PDEVICE_CAPABILITIES DeviceCapabilities; + LPGUID Guid; + NTSTATUS Status; + ULONG Index; + + DPRINT("HandlePnp\n"); + + // + // get device extension + // + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + switch(IoStack->MinorFunction) + { + case IRP_MN_START_DEVICE: + { + DPRINT1("IRP_MN_START FDO: %lu\n", DeviceExtension->IsFDO); + + if (DeviceExtension->IsFDO) + { + // + // first start lower device object + // + Status = SyncForwardIrp(m_NextDeviceObject, Irp); + + if (NT_SUCCESS(Status)) + { + // + // operation succeeded, lets start the device + // + RawResourceList = IoStack->Parameters.StartDevice.AllocatedResources; + TranslatedResourceList = IoStack->Parameters.StartDevice.AllocatedResourcesTranslated; + + if (m_Hardware) + { + // + // start the hardware + // + Status = m_Hardware->PnpStart(RawResourceList, TranslatedResourceList); + } + } + + // + // HACK / FIXME: Windows XP SP3 fails to enumerate the PDO correctly, which + // causes the PDO device never to startup. + // + Status = SetDeviceInterface(TRUE); + } + else + { + // + // start the PDO device + // + ASSERT(0); + + // + //FIXME create the parent root hub device + // + + // + // register device interface + // + Status = SetDeviceInterface(TRUE); + } + + DPRINT1("IRP_MN_START FDO: %lu Status %x\n", DeviceExtension->IsFDO, Status); + + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + DPRINT1("IRP_MN_QUERY_DEVICE_RELATIONS Type %lx FDO: \n", IoStack->Parameters.QueryDeviceRelations.Type, DeviceExtension->IsFDO); + + if (m_BusPDO == NULL) + { + // + // create bus PDO + // + Status = CreatePDO(m_DriverObject, &m_BusPDO); + + if (!NT_SUCCESS(Status)) + { + // + // failed to create bus device object + // + break; + } + + // + // initialize extension + // + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)m_BusPDO->DeviceExtension; + DeviceExtension->IsFDO = FALSE; + DeviceExtension->IsHub = FALSE; + DeviceExtension->HcdController = (this); + + // + // clear init flag + // + m_BusPDO->Flags &= ~DO_DEVICE_INITIALIZING; + } + + if (IoStack->Parameters.QueryDeviceRelations.Type == BusRelations) + { + // + // allocate device relations + // + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS)); + + if (!DeviceRelations) + { + // + // no memory + // + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + // + // init device relations + // + DeviceRelations->Count = 1; + DeviceRelations->Objects [0] = m_BusPDO; + + ObReferenceObject(m_BusPDO); + + // + // store result + // + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + Status = STATUS_SUCCESS; + } + break; + } + + case IRP_MN_STOP_DEVICE: + { + DPRINT1("IRP_MN_STOP_DEVICE FDO: %lu\n", DeviceExtension->IsFDO); + + if (m_Hardware) + { + // + // stop the hardware + // + Status = m_Hardware->PnpStop(); + } + else + { + // + // fake success + // + Status = STATUS_SUCCESS; + } + + if (NT_SUCCESS(Status)) + { + // + // stop lower device + // + Status = SyncForwardIrp(m_NextDeviceObject, Irp); + } + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + DPRINT1("IRP_MN_QUERY_CAPABILITIES FDO: %lu\n", DeviceExtension->IsFDO); + + if (DeviceExtension->IsFDO == FALSE) + { + DeviceCapabilities = (PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities; + + DeviceCapabilities->LockSupported = FALSE; + DeviceCapabilities->EjectSupported = FALSE; + DeviceCapabilities->Removable = FALSE; + DeviceCapabilities->DockDevice = FALSE; + DeviceCapabilities->UniqueID = FALSE; + DeviceCapabilities->SilentInstall = FALSE; + DeviceCapabilities->RawDeviceOK = FALSE; + DeviceCapabilities->SurpriseRemovalOK = FALSE; + DeviceCapabilities->Address = 0; + DeviceCapabilities->UINumber = 0; + DeviceCapabilities->DeviceD2 = 1; + + /* FIXME */ + DeviceCapabilities->HardwareDisabled = FALSE; + DeviceCapabilities->NoDisplayInUI = FALSE; + DeviceCapabilities->DeviceState[0] = PowerDeviceD0; + for (Index = 0; Index < PowerSystemMaximum; Index++) + DeviceCapabilities->DeviceState[Index] = PowerDeviceD3; + DeviceCapabilities->DeviceWake = PowerDeviceUnspecified; + DeviceCapabilities->D1Latency = 0; + DeviceCapabilities->D2Latency = 0; + DeviceCapabilities->D3Latency = 0; + + Status = STATUS_SUCCESS; + } + else + { + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(m_NextDeviceObject, Irp); + } + + break; + } + case IRP_MN_QUERY_INTERFACE: + { + DPRINT1("IRP_MN_QUERY_INTERFACE FDO %u\n", DeviceExtension->IsFDO); + // + // check if the device is FDO + // + if (DeviceExtension->IsFDO) + { + // + // just pass the irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(m_NextDeviceObject, Irp); + } + + // + // handle device interface requests + // + Status = HandleQueryInterface(IoStack); + break; + } + case IRP_MN_QUERY_BUS_INFORMATION: + { + DPRINT1("IRP_MN_QUERY_BUS_INFORMATION FDO %lx\n", DeviceExtension->IsFDO); + + if (DeviceExtension->IsFDO == FALSE) + { + // + // allocate buffer for bus guid + // + Guid = (LPGUID)ExAllocatePool(PagedPool, sizeof(GUID)); + if (Guid) + { + // + // copy BUS guid + // + RtlMoveMemory(Guid, &GUID_BUS_TYPE_USB, sizeof(GUID)); + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = (ULONG_PTR)Guid; + } + } + break; + } + case IRP_MN_REMOVE_DEVICE: + { + DPRINT1("IRP_MN_REMOVE_DEVICE FDO: %lu\n", DeviceExtension->IsFDO); + + if (DeviceExtension->IsFDO == FALSE) + { + // + // deactivate device interface for BUS PDO + // + SetDeviceInterface(FALSE); + + // + // complete the request first + // + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // + // now delete device + // + IoDeleteDevice(m_BusPDO); + + // + // nullify pointer + // + m_BusPDO = 0; + return STATUS_SUCCESS; + } + else + { + // + // detach device from device stack + // + IoDetachDevice(m_NextDeviceObject); + + // + // delete device + // + IoDeleteDevice(m_FunctionalDeviceObject); + } + + Status = STATUS_SUCCESS; + break; + } + default: + { + if (DeviceExtension->IsFDO) + { + DPRINT1("HandlePnp> FDO Dispatch to lower device object %lu\n", IoStack->MinorFunction); + + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(m_NextDeviceObject, Irp); + } + else + { + DPRINT1("UNHANDLED PDO Request %lu\n", IoStack->MinorFunction); + } + } + } + + // + // store result and complete request + // + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_IMPLEMENTED; + return Status; } NTSTATUS @@ -112,8 +668,263 @@ return STATUS_NOT_IMPLEMENTED; } - - +NTSTATUS +CHCDController::HandleQueryInterface( + PIO_STACK_LOCATION IoStack) +{ + UNICODE_STRING GuidBuffer; + NTSTATUS Status; + + if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType, USB_BUS_INTERFACE_HUB_GUID)) + { + DPRINT1("HandleQueryInterface> UNIMPLEMENTED USB_BUS_INTERFACE_HUB_GUID Version %x\n", IoStack->Parameters.QueryInterface.Version); + + } + else if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType, USB_BUS_INTERFACE_USBDI_GUID)) + { + DPRINT1("HandleQueryInterface> UNIMPLEMENTED USB_BUS_INTERFACE_USBDI_GUID Version %x\n", IoStack->Parameters.QueryInterface.Version); + } + else + { + // + // convert guid to string + // + Status = RtlStringFromGUID(*IoStack->Parameters.QueryInterface.InterfaceType, &GuidBuffer); + if (NT_SUCCESS(Status)) + { + // + // print interface + // + DPRINT1("HandleQueryInterface GUID: %wZ Version %x\n", &GuidBuffer, IoStack->Parameters.QueryInterface.Version); + + // + // free guid buffer + // + RtlFreeUnicodeString(&GuidBuffer); + } + } + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +CHCDController::CreateFDO( + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT * OutDeviceObject) +{ + WCHAR CharDeviceName[64]; + NTSTATUS Status; + ULONG UsbDeviceNumber = 0; + UNICODE_STRING DeviceName; + + while (TRUE) + { + // + // construct device name + // + swprintf(CharDeviceName, L"\\Device\\USBFDO-%d", UsbDeviceNumber); + + // + // initialize device name + // + RtlInitUnicodeString(&DeviceName, CharDeviceName); + + // + // create device + // + Status = IoCreateDevice(DriverObject, + sizeof(COMMON_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_CONTROLLER, + 0, + FALSE, + OutDeviceObject); + + // + // check for success + // + if (NT_SUCCESS(Status)) + break; + + // + // is there a device object with that same name + // + if ((Status == STATUS_OBJECT_NAME_EXISTS) || (Status == STATUS_OBJECT_NAME_COLLISION)) + { + // + // Try the next name + // + UsbDeviceNumber++; + continue; + } + + // + // bail out on other errors + // + if (!NT_SUCCESS(Status)) + { + DPRINT1("CreateFDO: Failed to create %wZ, Status %x\n", &DeviceName, Status); + return Status; + } + } + + // + // store FDO number + // + m_FDODeviceNumber = UsbDeviceNumber; + + DPRINT1("CreateFDO: DeviceName %wZ\n", &DeviceName); + + /* done */ + return Status; +} + +NTSTATUS +CHCDController::SetDeviceInterface( + BOOLEAN Enable) +{ + NTSTATUS Status; + WCHAR LinkName[32]; + WCHAR FDOName[32]; + UNICODE_STRING Link, FDO; + + if (Enable) + { + // + // register device interface + // + Status = IoRegisterDeviceInterface(m_PhysicalDeviceObject, &GUID_DEVINTERFACE_USB_HUB, 0, &m_HubDeviceInterfaceString); + + if (NT_SUCCESS(Status)) + { + // + // now enable the device interface + // + Status = IoSetDeviceInterfaceState(&m_HubDeviceInterfaceString, TRUE); + + // + // enable interface + // + m_InterfaceEnabled = TRUE; + } + + // + // create legacy link + // + swprintf(LinkName, L"\\DosDevices\\HCD%d", m_PDODeviceNumber); + swprintf(FDOName, L"\\Device\\USBFDO-%d", m_FDODeviceNumber); + RtlInitUnicodeString(&Link, LinkName); + RtlInitUnicodeString(&FDO, FDOName); + + // + // create symbolic link + // + Status = IoCreateSymbolicLink(&Link, &FDO); + + if (!NT_SUCCESS(Status)) + { + // + // FIXME: handle me + // + ASSERT(0); + } + } + else if (m_InterfaceEnabled) + { + // + // disable device interface + // + Status = IoSetDeviceInterfaceState(&m_HubDeviceInterfaceString, FALSE); + + if (NT_SUCCESS(Status)) + { + // + // now delete interface string + // + RtlFreeUnicodeString(&m_HubDeviceInterfaceString); + } + + // + // disable interface + // + m_InterfaceEnabled = FALSE; + + } + + // + // done + // + return Status; +} + +NTSTATUS +CHCDController::CreatePDO( + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT * OutDeviceObject) +{ + WCHAR CharDeviceName[64]; + NTSTATUS Status; + ULONG UsbDeviceNumber = 0; + UNICODE_STRING DeviceName; + + while (TRUE) + { + // + // construct device name + // + swprintf(CharDeviceName, L"\\Device\\USBPDO-%d", UsbDeviceNumber); + + // + // initialize device name + // + RtlInitUnicodeString(&DeviceName, CharDeviceName); + + // + // create device + // + Status = IoCreateDevice(DriverObject, + sizeof(COMMON_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_CONTROLLER, + 0, + FALSE, + OutDeviceObject); + + /* check for success */ + if (NT_SUCCESS(Status)) + break; + + // + // is there a device object with that same name + // + if ((Status == STATUS_OBJECT_NAME_EXISTS) || (Status == STATUS_OBJECT_NAME_COLLISION)) + { + // + // Try the next name + // + UsbDeviceNumber++; + continue; + } + + // + // bail out on other errors + // + if (!NT_SUCCESS(Status)) + { + DPRINT1("CreatePDO: Failed to create %wZ, Status %x\n", &DeviceName, Status); + return Status; + } + } + + // + // store PDO number + // + m_PDODeviceNumber = UsbDeviceNumber; + + DPRINT1("CreateFDO: DeviceName %wZ\n", &DeviceName); + + /* done */ + return Status; +} NTSTATUS CreateHCDController( @@ -121,14 +932,30 @@ { PHCDCONTROLLER This; + // + // allocate controller + // This = new(NonPagedPool, 0) CHCDController(0); if (!This) + { + // + // failed to allocate + // return STATUS_INSUFFICIENT_RESOURCES; - + } + + // + // add reference count + // This->AddRef(); + // // return result + // *OutHcdController = (PHCDCONTROLLER)This; + // + // done + // return STATUS_SUCCESS; } Added: branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp [iso-8859-1] Thu Apr 14 16:42:02 2011 @@ -1,0 +1,82 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/misc.cpp + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbehci.h" + +// +// driver verifier +// +IO_COMPLETION_ROUTINE SyncForwardIrpCompletionRoutine; + +NTSTATUS +NTAPI +SyncForwardIrpCompletionRoutine( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) +{ + if (Irp->PendingReturned) + { + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + } + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +SyncForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + KEVENT Event; + NTSTATUS Status; + + // + // initialize event + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + // + // copy irp stack location + // + IoCopyCurrentIrpStackLocationToNext(Irp); + + // + // set completion routine + // + IoSetCompletionRoutine(Irp, SyncForwardIrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + + // + // call driver + // + Status = IoCallDriver(DeviceObject, Irp); + + + // + // check if pending + // + if (Status == STATUS_PENDING) + { + // + // wait for the request to finish + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + // + // copy status code + // + Status = Irp->IoStatus.Status; + } + + // + // done + // + return Status; +} + Propchange: branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Thu Apr 14 16:42:02 2011 @@ -50,4 +50,9 @@ // NTSTATUS CreateUSBHardware(PUSBHARDWAREDEVICE *OutHardware); +// +// misc.cpp +// +NTSTATUS NTAPI SyncForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp); + #endif

13 years, 8 months

[janderwald] 51342: [USBEHCI_NEW] - Fix build breakage from 51341

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Apr 14 13:03:01 2011 New Revision: 51342 URL: http://svn.reactos.org/svn/reactos?rev=51342&view=rev Log: [USBEHCI_NEW] - Fix build breakage from 51341 Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Apr 14 13:03:01 2011 @@ -41,6 +41,7 @@ NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager); NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); NTSTATUS ResetController(); + NTSTATUS ResetPort(ULONG PortIndex); KIRQL AcquireDeviceLock(void); VOID ReleaseDeviceLock(KIRQL OldLevel); // local @@ -75,8 +76,6 @@ IN REFIID refiid, OUT PVOID* Output) { - UNICODE_STRING GuidString; - if (IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PUNKNOWN(this));

13 years, 8 months

[janderwald] 51341: [USBEHCI_NEW] - Implement CUSBHardwareDevice::Initialize, CUSBHardwareDevice::AcquireDeviceLock, CUSBHardwareDevice::ReleaseDeviceLock - Partly implement CUSBHardwareDevice::Pnp...

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Apr 14 12:55:41 2011 New Revision: 51341 URL: http://svn.reactos.org/svn/reactos?rev=51341&view=rev Log: [USBEHCI_NEW] - Implement CUSBHardwareDevice::Initialize, CUSBHardwareDevice::AcquireDeviceLock, CUSBHardwareDevice::ReleaseDeviceLock - Partly implement CUSBHardwareDevice::PnpStart - Code from CUSBHardwareDevice::PnpStart was taken from mjmartin usbehci implementation Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Apr 14 12:55:41 2011 @@ -1,13 +1,14 @@ /* * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbehci_new/hcd_controller.cpp + * FILE: drivers/usb/usbehci/hcd_controller.cpp * PURPOSE: USB EHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) */ +#define INITGUID #include "usbehci.h" class CUSBHardwareDevice : public IUSBHardwareDevice @@ -40,9 +41,13 @@ NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager); NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); NTSTATUS ResetController(); - NTSTATUS ResetPort(ULONG PortIndex); KIRQL AcquireDeviceLock(void); VOID ReleaseDeviceLock(KIRQL OldLevel); + // local + BOOLEAN InterruptService(); + + // friend function + friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); // constructor / destructor CUSBHardwareDevice(IUnknown *OuterUnknown){} @@ -50,8 +55,15 @@ protected: LONG m_Ref; + PDRIVER_OBJECT m_DriverObject; + PDEVICE_OBJECT m_PhysicalDeviceObject; + PDEVICE_OBJECT m_FunctionalDeviceObject; + PDEVICE_OBJECT m_NextDeviceObject; KSPIN_LOCK m_Lock; - + PKINTERRUPT m_Interrupt; + PULONG m_Base; + PDMA_ADAPTER m_Adapter; + ULONG m_MapRegisters; }; //================================================================================================= @@ -82,8 +94,23 @@ PDEVICE_OBJECT PhysicalDeviceObject, PDEVICE_OBJECT LowerDeviceObject) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + + DPRINT1("CUSBHardwareDevice::Initialize\n"); + + // + // store device objects + // + m_DriverObject = DriverObject; + m_FunctionalDeviceObject = FunctionalDeviceObject; + m_PhysicalDeviceObject = PhysicalDeviceObject; + m_NextDeviceObject = LowerDeviceObject; + + // + // initialize device lock + // + KeInitializeSpinLock(&m_Lock); + + return STATUS_SUCCESS; } @@ -92,8 +119,100 @@ PCM_RESOURCE_LIST RawResources, PCM_RESOURCE_LIST TranslatedResources) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + ULONG Index; + PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; + DEVICE_DESCRIPTION DeviceDescription; + PVOID ResourceBase; + NTSTATUS Status; + + DPRINT1("CUSBHardwareDevice::PnpStart\n"); + for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++) + { + // + // get resource descriptor + // + ResourceDescriptor = &TranslatedResources->List[0].PartialResourceList.PartialDescriptors[Index]; + + switch(ResourceDescriptor->Type) + { + case CmResourceTypeInterrupt: + { + Status = IoConnectInterrupt(&m_Interrupt, + InterruptServiceRoutine, + (PVOID)this, + NULL, + ResourceDescriptor->u.Interrupt.Vector, + (KIRQL)ResourceDescriptor->u.Interrupt.Level, + (KIRQL)ResourceDescriptor->u.Interrupt.Level, + (KINTERRUPT_MODE)(ResourceDescriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED), + (ResourceDescriptor->ShareDisposition != CmResourceShareDeviceExclusive), + ResourceDescriptor->u.Interrupt.Affinity, + FALSE); + + if (!NT_SUCCESS(Status)) + { + // + // failed to register interrupt + // + DPRINT1("IoConnect Interrupt failed with %x\n", Status); + return Status; + } + break; + } + case CmResourceTypeMemory: + { + // + // get resource base + // + ResourceBase = MmMapIoSpace(ResourceDescriptor->u.Memory.Start, ResourceDescriptor->u.Memory.Length, MmNonCached); + if (!ResourceBase) + { + // + // failed to map registers + // + DPRINT1("MmMapIoSpace failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + //FIXME: query capabilities and update m_Base + // + break; + } + } + } + + + // + // zero device description + // + RtlZeroMemory(&DeviceDescription, sizeof(DEVICE_DESCRIPTION)); + + // + // initialize device description + // + DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; + DeviceDescription.Master = TRUE; + DeviceDescription.ScatterGather = TRUE; + DeviceDescription.Dma32BitAddresses = TRUE; + DeviceDescription.DmaWidth = Width32Bits; + DeviceDescription.InterfaceType = PCIBus; + DeviceDescription.MaximumLength = MAXULONG; + + // + // get dma adapter + // + m_Adapter = IoGetDmaAdapter(m_PhysicalDeviceObject, &DeviceDescription, &m_MapRegisters); + if (!m_Adapter) + { + // + // failed to get dma adapter + // + DPRINT1("Failed to acquire dma adapter\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + return STATUS_SUCCESS; } NTSTATUS @@ -159,10 +278,25 @@ KIRQL CUSBHardwareDevice::AcquireDeviceLock(void) { - KIRQL OldLevel = 0; - - UNIMPLEMENTED + KIRQL OldLevel; + + // + // acquire lock + // + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // + // return old irql + // return OldLevel; +} + + +VOID +CUSBHardwareDevice::ReleaseDeviceLock( + KIRQL OldLevel) +{ + KeReleaseSpinLock(&m_Lock, OldLevel); } BOOLEAN @@ -175,14 +309,6 @@ return FALSE; } -VOID -CUSBHardwareDevice::ReleaseDeviceLock( - KIRQL OldLevel) -{ - UNIMPLEMENTED -} - - NTSTATUS CreateUSBHardware( PUSBHARDWAREDEVICE *OutHardware)

13 years, 8 months

[akhaldi] 51340: [CMAKE] * Sync with trunk r51339. * Move the static lib creation command from the toolchain file to gcc.cmake

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 14 12:50:32 2011 New Revision: 51340 URL: http://svn.reactos.org/svn/reactos?rev=51340&view=rev Log: [CMAKE] * Sync with trunk r51339. * Move the static lib creation command from the toolchain file to gcc.cmake Added: branches/cmake-bringup/dll/cpl/usrmgr/lang/uk-UA.rc - copied unchanged from r51338, trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c branches/cmake-bringup/base/applications/cmdutils/doskey/lang/uk-UA.rc branches/cmake-bringup/base/applications/cmdutils/more/lang/uk-UA.rc branches/cmake-bringup/base/applications/dxdiag/lang/ua-UA.rc branches/cmake-bringup/base/applications/fontview/lang/uk-UA.rc branches/cmake-bringup/base/applications/mmc/lang/uk-UA.rc branches/cmake-bringup/base/applications/network/ping/lang/uk-UA.rc branches/cmake-bringup/base/applications/sndvol32/lang/uk-UA.rc branches/cmake-bringup/base/applications/taskmgr/trayicon.c branches/cmake-bringup/base/setup/reactos/lang/bg-BG.rc branches/cmake-bringup/base/setup/reactos/lang/cs-CZ.rc branches/cmake-bringup/base/setup/reactos/lang/de-DE.rc branches/cmake-bringup/base/setup/reactos/lang/el-GR.rc branches/cmake-bringup/base/setup/reactos/lang/en-US.rc branches/cmake-bringup/base/setup/reactos/lang/es-ES.rc branches/cmake-bringup/base/setup/reactos/lang/et-EE.rc branches/cmake-bringup/base/setup/reactos/lang/fi-FI.rc branches/cmake-bringup/base/setup/reactos/lang/fr-FR.rc branches/cmake-bringup/base/setup/reactos/lang/hu-HU.rc branches/cmake-bringup/base/setup/reactos/lang/it-IT.rc branches/cmake-bringup/base/setup/reactos/lang/no-NO.rc branches/cmake-bringup/base/setup/reactos/lang/pl-PL.rc branches/cmake-bringup/base/setup/reactos/lang/pt-BR.rc branches/cmake-bringup/base/setup/reactos/lang/ro-RO.rc branches/cmake-bringup/base/setup/reactos/lang/ru-RU.rc branches/cmake-bringup/base/setup/reactos/lang/sk-SK.rc branches/cmake-bringup/base/setup/reactos/lang/uk-UA.rc branches/cmake-bringup/base/setup/vmwinst/lang/uk-UA.rc branches/cmake-bringup/base/shell/explorer-new/lang/uk-UA.rc branches/cmake-bringup/base/shell/explorer/desktop/desktop.cpp branches/cmake-bringup/base/shell/explorer/explorer-uk.rc branches/cmake-bringup/base/system/format/lang/uk-UA.rc branches/cmake-bringup/dll/cpl/usrmgr/rsrc.rc branches/cmake-bringup/drivers/usb/CMakeLists.txt branches/cmake-bringup/drivers/usb/usbehci/common.c branches/cmake-bringup/drivers/usb/usbehci/fdo.c branches/cmake-bringup/drivers/usb/usbehci/hardware.c branches/cmake-bringup/drivers/usb/usbehci/hardware.h branches/cmake-bringup/drivers/usb/usbehci/hwiface.c branches/cmake-bringup/drivers/usb/usbehci/hwiface.h branches/cmake-bringup/drivers/usb/usbehci/irp.c branches/cmake-bringup/drivers/usb/usbehci/pdo.c branches/cmake-bringup/drivers/usb/usbehci/physmem.c branches/cmake-bringup/drivers/usb/usbehci/physmem.h branches/cmake-bringup/drivers/usb/usbehci/transfer.c branches/cmake-bringup/drivers/usb/usbehci/transfer.h branches/cmake-bringup/drivers/usb/usbehci/usbehci.c branches/cmake-bringup/drivers/usb/usbehci/usbehci.h branches/cmake-bringup/drivers/usb/usbehci/usbiffn.c branches/cmake-bringup/gcc.cmake branches/cmake-bringup/lib/rtl/actctx.c branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/uk-UA.rc branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c branches/cmake-bringup/subsystems/win32/win32k/objects/coord.c branches/cmake-bringup/toolchain-mingw32.cmake [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/more/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/dxdiag/lang/ua-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mmc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/network/ping/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/taskmgr/trayicon.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/vmwinst/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins… Modified: branches/cmake-bringup/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/system/format/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/forma… Modified: branches/cmake-bringup/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/usrmgr/rs… Modified: branches/cmake-bringup/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/CMake… Modified: branches/cmake-bringup/drivers/usb/usbehci/common.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/hwiface.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/hwiface.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/physmem.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/physmem.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/transfer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/transfer.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=513… Modified: branches/cmake-bringup/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/actctx.c?… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32…

13 years, 8 months

[fireball] 51339: [RTL] - If there is no data provided and parameters are valid, fail with STATUS_SXS_KEY_NOT_FOUND.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Apr 14 12:20:47 2011 New Revision: 51339 URL: http://svn.reactos.org/svn/reactos?rev=51339&view=rev Log: [RTL] - If there is no data provided and parameters are valid, fail with STATUS_SXS_KEY_NOT_FOUND. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=51339… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Thu Apr 14 12:20:47 2011 @@ -2710,6 +2710,10 @@ status = STATUS_SXS_KEY_NOT_FOUND; + /* if there is no data, but params are valid, + we return that sxs key is not found to be at least somehow compatible */ + if (!data) return status; + ASSERT(NtCurrentTeb()); ASSERT(NtCurrentTeb()->ActivationContextStackPointer);

13 years, 8 months

[akhaldi] 51338: [TRANSLATIONS] Igor Paliychuk (mansonigor at gmail dot com): * Update Ukrainian localization. * Leftover from r51055: Update reactos.exe strings and resource sizes. * Fix displayin...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 14 12:13:38 2011 New Revision: 51338 URL: http://svn.reactos.org/svn/reactos?rev=51338&view=rev Log: [TRANSLATIONS] Igor Paliychuk (mansonigor at gmail dot com): * Update Ukrainian localization. * Leftover from r51055: Update reactos.exe strings and resource sizes. * Fix displaying of doskey localizations. Added: trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc trunk/reactos/base/applications/fontview/lang/uk-UA.rc trunk/reactos/base/applications/mmc/lang/uk-UA.rc trunk/reactos/base/applications/network/ping/lang/uk-UA.rc trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/el-GR.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/et-EE.rc trunk/reactos/base/setup/reactos/lang/fi-FI.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/hu-HU.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pl-PL.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/ru-RU.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/uk-UA.rc trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc trunk/reactos/base/shell/explorer/explorer-uk.rc trunk/reactos/base/system/format/lang/uk-UA.rc trunk/reactos/dll/cpl/usrmgr/rsrc.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -2,6 +2,7 @@ #include <stdio.h> #include <wchar.h> #include <assert.h> +#include <locale.h> #include "doskey.h" #define MAX_STRING 2000 @@ -190,6 +191,8 @@ int wmain(VOID) { + setlocale(LC_ALL, ""); + /* Get the full command line using GetCommandLine(). We can't just use argv, * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ WCHAR *pArgStart; Modified: trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/cmdutils/doskey/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for ReactOS DOSKey - * TRANSLATOR: Sakara Yevhen + * TRANSLATOR: Sakara Yevhen, Igor Paliychuk */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -11,25 +11,25 @@ STRINGTABLE DISCARDABLE BEGIN -IDS_HELP, "Ìåíåäæåð êîìàíäíîãî ðÿäêà äëÿ ðåäàãóâàííÿ íàëàøòóâàíü, ³ñòîð³¿ òà ìàêðîñ³â.\n\ +IDS_HELP, "Ìåíåäæåð êîìàíäíîãî ðÿäêà äëÿ ðåäàãóâàííÿ íàëàøòóâàíü, iñòîði¿ òà ìàêðîñiâ.\n\ \n\ DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\ [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\ \n\ - /INSERT Äîçâ³ë âêëþ÷åííÿ ðåæèìó.\n\ - /OVERSTRIKE Çàáîðîíà âêëþ÷åííÿ ðåæèìó.\n\ - /EXENAME=exename Âñòàíîâëåííÿ ³ì'ÿ ïðîãðàìè äëÿ ïåðåãëÿäó/çì³íè ³ñòîð³¿\n\ - ³ ìàêðîñ³â. Çíà÷åííÿ çà çàìîâ÷óâàííÿì cmd.exe.\n\ - /HISTORY Â³äîáðàæåííÿ ³ñòîð³¿ êîìàíä.\n\ - /LISTSIZE=size Âñòàíîâëåííÿ ê³ëüêîñò³ êîìàíä çà ³ñòîð³þ áóôåðà.\n\ - /REINSTALL Î÷èùåííÿ ³ñòîð³¿ êîìàíä.\n\ - /MACROS Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü.\n\ - /MACROS:exename Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü äëÿ êîíêðåòíî¿ ïðîãðàìè.\n\ - /MACROS:ALL Â³äîáðàæåííÿ ìàêðîñ³ âèçíà÷åíü äëÿ âñ³õ ïðîãðàì.\n\ - /MACROFILE=filename Çàâàíòàæåííÿ ìàêðîñ³ âèçíà÷åíü ç ôàéëó.\n\ - macroname Âèçíà÷åííÿ ³ì'ÿ ìàêðîñó äëÿ ñòâîðåííÿ.\n\ - text Âèçíà÷åííÿ çàì³íè òåêñòó â ìàêðîñ³.\n" + /INSERT Âêëþ÷àº ðåæèì âñòàâêè.\n\ + /OVERSTRIKE Âiäêëþ÷àº ðåæèì âñòàâêè.\n\ + /EXENAME=exename Âñòàíîâëåííÿ íàçâè ïðîãðàìè äëÿ ïåðåãëÿäó/çìiíè iñòîði¿\n\ + i ìàêðîñiâ. Çíà÷åííÿ çà çàìîâ÷óâàííÿì cmd.exe.\n\ + /HISTORY Âiäîáðàæåííÿ iñòîði¿ êîìàíä.\n\ + /LISTSIZE=size Âñòàíîâëåííÿ êiëüêîñòi êîìàíä â áóôåð³ iñòîði¿.\n\ + /REINSTALL Î÷èùåííÿ iñòîði¿ êîìàíä.\n\ + /MACROS Âiäîáðàæåííÿ âèçíà÷åíü ìàêðîñiâ.\n\ + /MACROS:exename Âiäîáðàæåííÿ âèçíà÷åíü ìàêðîñiâ äëÿ êîíêðåòíî¿ ïðîãðàìè.\n\ + /MACROS:ALL Âiäîáðàæåííÿ âèçíà÷åíü ìàêðîñiâ äëÿ âñiõ ïðîãðàì.\n\ + /MACROFILE=filename Çàâàíòàæåííÿ âèçíà÷åíü ìàêðîñiâ ç ôàéëó.\n\ + macroname Âèçíà÷åííÿ iìåíi ìàêðîñó äëÿ ñòâîðåííÿ.\n\ + text Âèçíà÷åííÿ çàìiíè òåêñòó â ìàêðîñi.\n" -IDS_INVALID_MACRO_DEF, "Íåä³éñíèé ìàêðîñ âèçíà÷åííÿ: %s\n" +IDS_INVALID_MACRO_DEF, "Íåäiéñíèé ìàêðîñ âèçíà÷åííÿ: %s\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -9,15 +9,15 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_USAGE, "Âèâîäèòü ³íôðìàö³þ ïîåêðàííî. Âèêîðèñòàííÿ:\n\n\ - MORE < [Drive:][Path]²ì'ÿ_ôàéëó\n\ + IDS_USAGE, "Âèâîäèòü iíôðìàö³þ ïîåêðàííî. Âèêîðèñòàííÿ:\n\n\ + MORE < [Äèñê:][Øëÿõ]Iì'ÿ_ôàéëó\n\ Command | MORE \n\ - MORE [Drive:][Path]²ì'ÿ_ôàéëó\n\n\ + MORE [Äèñê:][Øëÿõ]Iì'ÿ_ôàéëó\n\n\ Äå: \n\ - [Drive:][Path]²ì'ÿ_ôàéëó Ôàéë, âì³ñò ÿêîãî òðåáà âèâåñòè íà åêðàí.\n\ + [Äèñê:][Øëÿõ]²ì'ÿ_ôàéëó Ôàéë, âìiñò ÿêîãî òðåáà âèâåñòè íà åêðàí.\n\ Command\t\t Êîìàíäà, ðåçóëüòàò ðîáîòè ÿêî¿ òðåáà âèâåñòè íà åêðàí.\n\n\ - Íà çàïðîøåííÿ ""-- Äàë³ --"" Âè ìîæåòå íàòèñíóòè áóäü-ÿêó êëàâ³øó ùîá ïîáà÷èòè íàñòóïíó ñòîð³íêó.\n" + Íà çàïðîøåííÿ ""-- Äàëi --"" Âè ìîæåòå íàòèñíóòè áóäü-ÿêó êëàâiøó ùîá ïîáà÷èòè íàñòóïíó ñòîðiíêó.\n" - IDS_CONTINUE, " -- Äàë³ (100%) -- " + IDS_CONTINUE, " -- Äàëi (100%) -- " IDS_FILE_ACCESS, "Íå ìîæó îòðèìàòè äîñòóï äî ôàéëà %s." END Modified: trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/ua-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -219,7 +219,7 @@ IDS_REG_SUCCESS "Òàê" IDS_REG_FAIL "Ïîìèëêà" IDS_DDTEST_ERROR "Çá³é ó ïåðåâ³ðö³!" - IDS_DDTEST_DESCRIPTION "Áóäå âèêîíàíà ïåðåâ³ðêà DirecDraw íà öåé ïðèñòð³é. Ïðîäîâæèòè?" + IDS_DDTEST_DESCRIPTION "Áóäå âèêîíàíà ïåðåâ³ðêà ³íòåðôåéñó DirecDraw. Ïðîäîâæèòè?" IDS_DDPRIMARY_DESCRIPTION "Öåé òåñò áóäå âèêîðèñòîâóâàòè DirectDraw äëÿ ìàëþâàííÿ íà ïåðâèíí³é ïîâåðõí³. Áóäóòü âèâîäèòèñü ÷îðí³ òà á³ë³ ïðÿìîêóòíèêè. Ïðîäîâæèòè?" IDS_DDPRIMARY_RESULT "Âè áà÷èëè ÷îðí³ òà á³ë³ ïðÿìîêóòíèêè?" IDS_DDOFFSCREEN_DESCRIPTION "Öåé òåñò áóäå âèêîðèñòîâóâàòè DirectDraw äëÿ ìàëþâàííÿ â çàêàäðîâèé áóôåð. Ïîâèíåí ðóõàòèñü á³ëèé ïðÿìîêóòíèê. Ïðîäîâæèòè?" @@ -229,4 +229,6 @@ IDS_FORMAT_ADAPTER_MEM "%u Ìá" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u á³ò)(%uÃö)" IDS_OPTION_NO "Í³" -END + IDS_D3DTEST_DESCRIPTION "Áóäå âèêîíàíà ïåðåâ³ðêà ³íòåðôåéñó Direct3D. Ïðîäîâæèòè?" + IDS_D3DTEST_D3Dx "Öåé òåñò âèêîðèñòàº àïàðàòíî-ïðèñêîðåíèé Direct3D ³íòåðôåéñ %u." +END Modified: trunk/reactos/base/applications/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -14,7 +14,7 @@ IDS_PRINT, "Äðóê" IDS_STRING, "Jackdaws love my big sphinx of quartz. 1234567890" IDS_ERROR, "Ïîìèëêà" - IDS_ERROR_NOMEM, "Íåäîñòàòíüî ïàì'ÿò³ äëÿ çàâåðøåííÿ îïåðàö³þ." + IDS_ERROR_NOMEM, "Íåäîñòàòíüî ïàì'ÿò³ äëÿ çàâåðøåííÿ îïåðàö³¿." IDS_ERROR_NOFONT, "Ôàéë %1 íå º êîðåêòíèì ôàéëîì øðèôòó." IDS_ERROR_NOCLASS, "Íåìîæëèâî ³í³ö³àë³çóâàòè â³êîííèé êëàñ." IDS_ERROR_BADCMD, "Íå âêàçàíèé ôàéë øðèôòó.\nÑèíòàêñèñ:\n fontview.exe <ôàéë øðèôòó>" Modified: trunk/reactos/base/applications/mmc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -25,5 +25,5 @@ STRINGTABLE DISCARDABLE BEGIN IDS_APPTITLE "Êîíñîëü êåðóâàííÿ ReactOS" - IDS_CONSOLETITLE "Console%1!u!" + IDS_CONSOLETITLE "Êîíñîëü%1!u!" END Modified: trunk/reactos/base/applications/network/ping/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -12,9 +12,9 @@ BEGIN IDS_USAGE "\nÂèêîðèñòàííÿ: ping [-t] [-n count] [-l size] [-w timeout] õîñò\n\n\ Îïö³¿:\n\ - -t Ï³íã âêàçàíîãî âóçëà ïîêè íå áóäå çä³éñòåíà ðó÷íà çóïèíêà.\n\ + -t Ï³íã âêàçàíîãî âóçëà ïîêè íå áóäå çä³éñíåíà ðó÷íà çóïèíêà.\n\ Äëÿ çóïèíêè íàòèñí³òü Control-C.\n\ - -n count ×èñëî çàïèò³â, ÿê³ áóäóòü ï³äïðàâëåí³.\n\ + -n count Ê³ëüê³ñòü çàïèò³â, ÿê³ áóäóòü ï³äïðàâëåí³.\n\ -l size Ðîçì³ð áóôåðà â³äïðàâêè.\n\ -w timeout ×àñ î÷³êóâàííÿ êîæíî¿ â³äïîâ³ä³ â ì³ë³ñåêóíäàõ.\n\n\0" @@ -28,7 +28,7 @@ IDS_SETSOCKOPT_FAILED "setsockopt íåâäàëèé (%1!d!).\n\0" IDS_COULD_NOT_CREATE_SOCKET "Íå âäàëîñÿ ñòâîðèòè ñîêåò (#%1!d!).\n\0" IDS_COULD_NOT_INIT_WINSOCK "Íå âäàëîñÿ ³í³ö³àë³çóâàòè winsock dll.\n\0" - IDS_DEST_MUST_BE_SPECIFIED "²ì'ÿ àáî IP-àäðåñà õîñòó ïîâèííå áóòè âêàçàíå.\n\0" + IDS_DEST_MUST_BE_SPECIFIED "²ì'ÿ àáî IP-àäðåñà õîñòó ïîâèíí³ áóòè âêàçàí³.\n\0" IDS_BAD_PARAMETER "Ïîãàíèé ïàðàìåòð %1.\n\0" IDS_BAD_OPTION_FORMAT "Íåâ³ðíèé ôîðìàò îïö³¿ %1.\n\0" IDS_BAD_OPTION "Ïîãàíà îïö³ÿ %1.\n\0" Modified: trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… ============================================================================== --- trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndvol32/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -54,12 +54,12 @@ STYLE WS_POPUP | WS_BORDER FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Master", IDC_LINE_NAME, 4, 7, 100, 15 + LTEXT "Ãîëîâíà", IDC_LINE_NAME, 4, 7, 100, 15 CONTROL "", -1, "static", SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE, 4, 30, 82, 1 - LTEXT "Balance", -1, 4, 35, 80, 42 - LTEXT "Volume", -1, 4, 100, 77, 108 + LTEXT "Áàëàíñ", -1, 4, 35, 80, 42 + LTEXT "Ãó÷í³ñòü", -1, 4, 100, 77, 108 CONTROL "", IDC_LINE_SLIDER_HORZ, "msctls_trackbar32", TBS_HORZ | TBS_AUTOTICKS | TBS_BOTH | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 85, 30 CONTROL "", IDC_LINE_SLIDER_VERT, "msctls_trackbar32", TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_DOWNISLEFT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 32, 115, 30, 70 - CHECKBOX "&Mute", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX + CHECKBOX "&Òèøà", IDC_LINE_SWITCH, 4, 190, 90, 12, BS_AUTOCHECKBOX CONTROL "", IDC_LINE_SEP, "static", SS_ETCHEDVERT | WS_CHILD | WS_VISIBLE, 130, 7, 1, 200 END Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/bg-BG.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -81,7 +81,7 @@ PUSHBUTTON "&Îòêàç",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Ðàçøèðåíè äÿëîâè íàñòðîéñêè" FONT 8, "MS Shell Dlg" @@ -89,12 +89,13 @@ CONTROL "Ïàïêà çà ñëàãàíå", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Ñëàãàíå íà çàðåæäà÷", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Ñëàãàíå íà çàðåæäà÷", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Ñëàãàíå íà íà÷àëåí çàðåæäà÷ (MBR) íà òâúðäèÿ äèñê", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Áåç ñëàãàíå íà íà÷àëåí çàðåæäà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&Äîáðå", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Îòêàç", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Ñëàãàíå íà íà÷àëåí çàðåæäà÷ (MBR è VBR) íà òâúðäèÿ äèñê", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Ñëàãàíå íà íà÷àëåí çàðåæäà÷ (ñàìî VBR) íà òâúðäèÿ äèñê", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Áåç ñëàãàíå íà íà÷àëåí çàðåæäà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&Äîáðå", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Îòêàç", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/cs-CZ.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -85,7 +85,7 @@ PUSHBUTTON "&Storno",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Pokroèilá nastavení oddílu" FONT 8, "MS Shell Dlg" @@ -93,13 +93,13 @@ CONTROL "Instalaèní sloka", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Instalace zavadìèe", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Instalace zavadìèe", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Nainstalovat zavadìè na pevný disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Nainstalovat zavadìè na pevný disk (jen VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "Zavadìè neinstalovat", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Storno", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Storno", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -81,7 +81,7 @@ PUSHBUTTON "&Abbrechen",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Erweiterte Partitionseinstellungen" FONT 8, "MS Shell Dlg" @@ -89,13 +89,13 @@ CONTROL "Installationsverzeichnis", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Bootloader-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Bootloader-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Installiere Bootloader auf Festplatte (MBR und VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Installiere Bootloader auf Festplatte (VBR nur)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "Keine Bootloader-Installation", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Abbrechen", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Abbrechen", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/el… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&¢êõñï",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Ñõèìßóåéò Partition ãéá ðñï÷ùñçìÝíïõò" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "ÖÜêåëïò åãêáôÜóôáóçò", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "ÅãêáôÜóôáóç Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "ÅãêáôÜóôáóç Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "ÅãêáôÜóôáóç boot loader óôï óêëçñü äßóêï (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Íá ìç ãßíåé åãêáôÜóôáóç ôïõ bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&¢êõñï", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "ÅãêáôÜóôáóç boot loader óôï óêëçñü äßóêï (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "ÅãêáôÜóôáóç boot loader óôï óêëçñü äßóêï (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Íá ìç ãßíåé åãêáôÜóôáóç ôïõ bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&¢êõñï", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -81,7 +81,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" @@ -89,13 +89,13 @@ CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/es-ES.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -83,7 +83,7 @@ PUSHBUTTON "&Cancelar",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Ajustes avanzados de la partición" FONT 8, "MS Shell Dlg" @@ -91,12 +91,13 @@ CONTROL "Carpeta de instalación", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Instalación del cargador de arranque", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Instalación del cargador de arranque", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Instalar el cargador de arranque en el disco duro (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&Aceptar", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancelar", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Instalar el cargador de arranque en el disco duro (MBR y VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Instalar el cargador de arranque en el disco duro (solo VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "No instalar el cargador de arranque", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&Aceptar", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancelar", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/et… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/et-EE.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Tühista",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Täpsemad vormindamise seaded" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "Paigaldamise kaust", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Alglaaduri paigaldamine", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Alglaaduri paigaldamine", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Paigalda alglaadur kõvakettale (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Ära paigalda alglaadurit", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&Olgu", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Tühista", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Paigalda alglaadur kõvakettale (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Paigalda alglaadur kõvakettale (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Ära paigalda alglaadurit", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&Olgu", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Tühista", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fi… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fi-FI.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/fr-FR.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" @@ -87,13 +87,13 @@ CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/hu… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/hu-HU.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -81,7 +81,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" @@ -89,12 +89,13 @@ CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/it-IT.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Annulla",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Impostazioni avanzate delle partizioni" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "Cartella di installazione", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Installazione del Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Installazione del Boot loader", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Installazione del Boot loader sul disco fisso (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Non installare il Boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Annulla", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Installazione del Boot loader sul disco fisso (MBR e VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Installazione del Boot loader sul disco fisso (solo VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Non installare il Boot loader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Annulla", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Avbryt",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Avansert partisjon innstillinger" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "Installasjon mappe", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Oppstartslaster installasjon", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Oppstartslaster installasjon", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Installer oppstartslaster på harddiskens (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Ikke installer oppstartslaster", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Avbryt", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Installer oppstartslaster på harddiskens (MBR og VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Installer oppstartslaster på harddiskens (bare VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Ikke installer oppstartslaster", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Avbryt", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pl… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pl-PL.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -88,7 +88,7 @@ PUSHBUTTON "&Anuluj",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Zaawansowane ustawienia partycji" FONT 8, "MS Shell Dlg" @@ -96,13 +96,13 @@ CONTROL "Folder instalacji", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Instalacja bootloadera", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Instalacja bootloadera", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Wgraj bootloader na dysk twardy (MBR i VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Wgraj bootloader na dysk twardy (tylko VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 - CONTROL "Pomiñ wgrywanie bootloadera", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Anuluj", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Pomiñ wgrywanie bootloadera", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Anuluj", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/pt-BR.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Cancel",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Advanced Partition Settings" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Install boot loader on the hard disk (MBR and VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Install boot loader on the hard disk (VBR only)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Cancel", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ro-RO.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -79,7 +79,7 @@ PUSHBUTTON "&Revocare",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Setari avansate partitie" FONT 8, "MS Shell Dlg" @@ -87,12 +87,13 @@ CONTROL "Folder instalare", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Instalare incarcator", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Instalare incarcator", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Instalare incarcator pe hard disc (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Nu se instaleaza incarcator", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Revocare", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Instalare incarcator pe hard disc (MBR si VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Instalare incarcator pe hard disc (numai VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Nu se instaleaza incarcator", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Revocare", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ru… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/ru-RU.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -81,7 +81,7 @@ PUSHBUTTON "&Îòñòàâèòü",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Äîïîëíèòåëüíûå ïàðàìåòðû óñòàíîâêè" FONT 8, "MS Shell Dlg" @@ -89,12 +89,13 @@ CONTROL "Áàçîâûé êàòàëîã", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,12,283,14, WS_VISIBLE - CONTROL "Óñòàíîâêà çàãðóç÷èêà", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Óñòàíîâêà çàãðóç÷èêà", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,49,278,11 - CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,60,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Îòìåíà", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (MBR è VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,49,278,11 + CONTROL "Óñòàíîâèòü çàãðóç÷èê íà äèñê (òîëüêî VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Íå óñòàíàâëèâàòü çàãðóç÷èê", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Îòìåíà", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/sk-SK.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -84,7 +84,7 @@ PUSHBUTTON "&Zrui",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Rozírené nastavenia partície" FONT 8, "MS Shell Dlg" @@ -92,13 +92,13 @@ CONTROL "Intalaèný prieèinok", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Intalácia zavádzaèa systému", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Intalácia zavádzaèa systému", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 CONTROL "Naintalova zavádzaè systému na pevný disk (MBR a VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Naintalova zavádzaè systému na pevný disk (iba VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 CONTROL "Nenaintalova zavádzaè systému", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Zrui", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Zrui", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -67,7 +67,7 @@ PUSHBUTTON "&Ñòâîðèòè", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Âèäàëèòè", IDC_PARTDELETE, 76,155,50,15 PUSHBUTTON "Ä&ðàéâåð", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED - PUSHBUTTON "&Äîäàòêîâ³ ïàðàìåòðè...", IDC_PARTMOREOPTS, 218,155,80,15 + PUSHBUTTON "&Äîäàòêîâ³ Îïö³¿...", IDC_PARTMOREOPTS, 218,155,80,15 LTEXT "Äëÿ ïî÷àòêó âñòàíîâëåííÿ íàòèñí³òü Äàë³", IDC_STATIC, 10, 180 ,277, 20 END @@ -87,20 +87,21 @@ PUSHBUTTON "&Ñêàñóâàòè",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END -IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 +IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 116 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "Äîäàòêîâ³ ïàðàìåòðè âñòàíîâëåííÿ" +CAPTION "Ðîçøèðåí³ ïàðàìåòðè ðîçä³ëó" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Áàçîâèé êàòàëîã", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + CONTROL "Òåêà âñòàíîâëåííÿ", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Âñòàíîâëåííÿ çàâàíòàæóâà÷à", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Âñòàíîâëåííÿ çàâàíòàæóâà÷à", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,52 - CONTROL "Âñòàíîâèòè çàâàíòàæóâà÷ íà äèñê (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "Íå âñòàíîâëþâàòè çàâàíòàæóâà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 - PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Ñêàñóâàòè", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + CONTROL "Âñòàíîâèòè çàâàíòàæóâà÷ íà æîñòêèé äèñê (MBR òà VBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Âñòàíîâèòè çàâàíòàæóâà÷ íà æîñòêèé äèñê (ëèøå VBR)", IDC_INSTVBRONLY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,57,278,11 + CONTROL "Íå âñòàíîâëþâàòè çàâàíòàæóâà÷", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,68,278,11 + PUSHBUTTON "&OK", IDOK, 180,94,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Ñêàñóâàòè", IDCANCEL, 240,94,50,15, WS_TABSTOP | WS_VISIBLE END IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 @@ -108,7 +109,7 @@ CAPTION "Âñòàíîâëåííÿ ReactOS" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Âñòàíîâëåííÿ Àêàóíòà", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "²íôîðìàö³ÿ ïðî Âñòàíîâëåííÿ", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Äëÿ ïî÷àòêó âñòàíîâëåííÿ íàòèñí³òü Äàë³.", IDC_STATIC, 10, 180 ,277, 20 END @@ -151,8 +152,8 @@ IDS_PROCESSSUBTITLE "Ñòâîðåííÿ ðîçä³ëó íà äèñêó, êîï³þâàííÿ ôàéë³â, âñòàíîâëåííÿ çàâàíòàæóâà÷à" IDS_RESTARTTITLE "Ïåðøèé åòàï âñòàíîâëåííÿ çàâåðøåíî" IDS_RESTARTSUBTITLE "Ïåðøèé åòàï çàâåðøåíî, äëÿ ïðîäîâæåííÿ ïîòð³áíå ïåðåçàâàíòàæåííÿ" - IDS_SUMMARYTITLE "Âñòàíîâëåííÿ Àêàóíòà" - IDS_SUMMARYSUBTITLE "Ñïèñîê âñòàíîâëåííÿ âëàñòèâîñòåé äëÿ ïåðåâ³ðêè, ïåðø í³æ çâåðíóòèñÿ ïðè âñòàíîâëåíí³ ïðèñòðî¿â" + IDS_SUMMARYTITLE "²íôîðìàö³ÿ ïðî Âñòàíîâëåííÿ" + IDS_SUMMARYSUBTITLE "Ïåðåâ³ðòå ñïèñîê âëàñòèâîñòåé âñòàíîâëåííÿ, ïåðø í³æ ïî÷àòè âñòàíîâëåííÿ ñèñòåìè" IDS_ABORTSETUP "ReactOS âñòàíîâëåíèé íà êîìï'þòåð íå ïîâí³ñòþ. ßêùî âè çàêðèºòå ïðîãðàìó âñòàíîâëåííÿ çàðàç, â ïîäàëüøîìó âàì äîâåäåòüñÿ ïîâòîðèòè âñòàíîâëåííÿ ReactOS. Âè âïåâíåí³, ùî íåîáõ³äíî ïåðåðâàòè âñòàíîâëåííÿ?" IDS_ABORTSETUP2 "Ïåðåðâàòè âñòàíîâëåííÿ?" END Modified: trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/uk… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -10,24 +10,24 @@ IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS âèÿâèëà, ùî Âè çàïóñòèëè ReactOS âñåðåäåí³ VMware(r).", -1, 117, 8, 140, 24 - LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü ""Äàë³"", ³íàêøå íàòèñí³òü ""Ñêàñóâàòè"".", -1, 117, 140, 140, 17 + LTEXT "Ïðîãðàìà âñòàíîâëåííÿ ReactOS âèÿâèëà, ùî Âè çàïóñòèëè ReactOS âñåðåäåí³ VMware(r).", -1, 117, 8, 140, 24 + LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü ""Äàë³"", ³íàêøå íàòèñí³òü ""Ñêàñóâàòè"".", -1, 117, 140, 140, 24 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå âêëþ÷àº SVGA äðàéâåð VMware(r).\n\nÒîìó éä³òü äî ìåíþ ""VM"" ó VMware(r) workstation ³ âèáåð³òü ""Install VMware tools...""\n\n\nÍàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ àáî ""Ñêàñóâàòè"", ùîá ïðîïóñòèòè óñòàíîâêó SVGA äðàéâåðà.",-1,25,25,225,85 + LTEXT "Ïðîãðàìà âñòàíîâëåííÿ ReactOS íå âêëþ÷àº SVGA äðàéâåð VMware(r).\n\nÒîìó éä³òü äî ìåíþ ""VM"" ó VMware(r) workstation ³ âèáåð³òü ""Install VMware tools...""\n\n\nÍàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ àáî ""Ñêàñóâàòè"", ùîá ïðîïóñòèòè âñòàíîâëåííÿ SVGA äðàéâåðà.",-1,25,25,225,85 END IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 @@ -36,10 +36,10 @@ IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Óñòàíîâêó SVGA äðàéâåðà VMware(r) çàâåðøåíî óñï³øíî. Îáåð³òü ïåðåâàæíó ðîçä³ëüíó çäàòí³ñòü åêðàíó:",-1,25,5,225,20 + LTEXT "Âñòàíîâëåííÿ SVGA äðàéâåðà VMware(r) çàâåðøåíî óñï³øíî. Îáåð³òü ïîòð³áíó ðîçä³ëüíó çäàòí³ñòü åêðàíó:",-1,25,5,225,20 PUSHBUTTON "640x480", 1120, 25, 30, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON @@ -57,48 +57,48 @@ IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà âñòàíîâèòè SVGA äðàéâåð VMware(r).\n\n\nÍàòèñí³òü ""Çàâåðøèòè"" äëÿ ïðîäîâæåííÿ ïðîöåñó óñòàíîâêè.",-1,25,25,225,85 + LTEXT "Ïðîãðàìà âñòàíîâëåííÿ ReactOS íå çìîãëà âñòàíîâèòè SVGA äðàéâåð VMware(r).\n\n\nÍàòèñí³òü ""Çàâåðøèòè"" äëÿ ïðîäîâæåííÿ ïðîöåñó âñòàíîâëåííÿ.",-1,25,25,225,85 END IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "SVGA äðàéâåð VMware(r) SVGA âæå âñòàíîâëåíèé.\n\nÎáåð³òü, ùî Âè õî÷åòå çðîáèòè:",-1,25,5,225,30 PUSHBUTTON "Íàëàøòóâàòè ïàðàìåòðè åêðàíó", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Ñêîðèñòàòèñÿ ³íøèì ãðàô³÷íèì äðàéâåðîì", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Âèäàëèòè SVGA äðàéâåð VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Íàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ àáî ""Ñêàñóâàòè"" äëÿ âèõîäó ç ìàéñòðà.", -1, 25, 93, 225, 12 + LTEXT "Íàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ àáî ""Ñêàñóâàòè"" äëÿ âèõîäó ç ìàéñòðà.", -1, 25, 93, 225, 17 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Áóäü ëàñêà îáåð³òü ãðàô³÷íèé äðàéâåð, ÿêèé Âè õîò³ëè á âèêîðèñòîâóâàòè:",-1,25,25,225,15 PUSHBUTTON "ReactOS VGA äðàéâåð", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON PUSHBUTTON "ReactOS VBE äðàéâåð (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON - LTEXT "Íàòèñí³òü ""Çàâåðøèòè"" äëÿ çàâåðøåííÿ îïåðàö³¿ àáî ""Ñêàñóâàòè"" äëÿ âèõîäó ç ïðîãðàìè óñòàíîâêè áåç çáåðåæåííÿ çì³í.", -1, 25, 93, 225, 20 + LTEXT "Íàòèñí³òü ""Çàâåðøèòè"" äëÿ çàâåðøåííÿ îïåðàö³¿ àáî ""Ñêàñóâàòè"" äëÿ âèõîäó ç ïðîãðàìè âñòàíîâëåííÿ áåç çáåðåæåííÿ çì³í.", -1, 25, 93, 225, 20 END IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" +CAPTION "Âñòàíîâëåííÿ â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS ãîòîâà âèäàëèòè SVGA äðàéâåð VMWare(r)!!!\n\n\nÍàòèñí³òü ""Çàâåðøèòè"" äëÿ âèäàëåííÿ äðàéâåðà àáî ""Ñêàñóâàòè"" ùîá çàëèøèòè éîãî ÿê º.",-1,25,25,225,85 + LTEXT "Ïðîãðàìà âñòàíîâëåííÿ ReactOS ãîòîâà âèäàëèòè SVGA äðàéâåð VMWare(r)!!!\n\n\nÍàòèñí³òü ""Çàâåðøèòè"" äëÿ âèäàëåííÿ äðàéâåðà àáî ""Ñêàñóâàòè"" ùîá çàëèøèòè éîãî ÿê º.",-1,25,25,225,85 END STRINGTABLE BEGIN IDS_WIZARD_NAME "Âèÿâëåíèé VMware(r)" - IDS_FAILEDTOLOCATEDRIVERS "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà çíàéòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé." - IDS_FAILEDTOCOPYFILES "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà ñêîï³þâàòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé.\n" + IDS_FAILEDTOLOCATEDRIVERS "Ïðîãðàìà âñòàíîâëåííÿ ReactOS íå çìîãëà çíàéòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé." + IDS_FAILEDTOCOPYFILES "Ïðîãðàìà âñòàíîâëåííÿ ReactOS íå çìîãëà ñêîï³þâàòè íåîáõ³äí³ ôàéëè.\nÏåðåêîíàéòåñÿ, ùî CD-ROM VMware(r) tools âñòàâëåíèé.\n" IDS_FAILEDTOACTIVATEDRIVER "Íå âäàëîñÿ çàïóñòèòè SVGA äðàéâåð VMware(r)!" IDS_FAILEDTOSELVGADRIVER "Íå âäàëîñÿ çàïóñòèòè ReactOS VGA äðàéâåð!" IDS_FAILEDTOSELVBEDRIVER "Íå âäàëîñÿ çàïóñòèòè ReactOS VBE äðàéâåð!" @@ -122,18 +122,18 @@ STRINGTABLE BEGIN - IDD_INSERT_VMWARE_TOOLSTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSERT_VMWARE_TOOLSTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" IDD_INSERT_VMWARE_TOOLSSUBTITLE "Áóäü ëàñêà âñòàâòå äèñê VMware tools." - IDD_INSTALLING_VMWARE_TOOLSTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_INSTALLING_VMWARE_TOOLSTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "Ïîøóê ³ êîï³þâàííÿ SVGA äðàéâåðà VMware (r)." - IDD_CONFIGTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" - IDD_CONFIGSUBTITLE "Îáåð³òü Âàøó óëþáëåíó ðîçä³ëüíó çäàòí³ñòü åêðàíó." - IDD_INSTALLATION_FAILEDTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" - IDD_INSTALLATION_FAILEDSUBTITLE "Óñòàíîâêà SVGA äðàéâåðà VMware (r) íå âäàëàñÿ." - IDD_CHOOSEACTIONTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_CONFIGTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" + IDD_CONFIGSUBTITLE "Îáåð³òü ïîòð³áíó Âàì ðîçä³ëüíó çäàòí³ñòü åêðàíó." + IDD_INSTALLATION_FAILEDTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" + IDD_INSTALLATION_FAILEDSUBTITLE "Âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r) íå âäàëàñÿ." + IDD_CHOOSEACTIONTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" IDD_CHOOSEACTIONSUBTITLE "Âèáåð³òü, ùî Âè õî÷åòå çðîáèòè." - IDD_SELECTDRIVERTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_SELECTDRIVERTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" IDD_SELECTDRIVERSUBTITLE "Îáðàòè äðàéâåð." - IDD_DOUNINSTALLTITLE "Ìàéñòåð óñòàíîâêè SVGA äðàéâåðà VMware (r)" + IDD_DOUNINSTALLTITLE "Ìàéñòåð âñòàíîâëåííÿ SVGA äðàéâåðà VMware (r)" IDD_DOUNINSTALLSUBTITLE "Âèäàëèòè äðàéâåð." END Modified: trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -128,7 +128,7 @@ IDS_PROPERTIES "Â&ëàñòèâîñò³" IDS_OPEN_ALL_USERS "&Âñ³ êîðèñòóâà÷³" IDS_EXPLORE_ALL_USERS "&Îãëÿä âñ³õ êîðèñòóâà÷³â" - IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable." + IDS_STARTUP_ERROR "Ñèñòåìà íå ìîæå ñòàðòóâàòè explorer, îñê³ëüêè ðåºñòð ïîøêîäæåíèé àáî â³äñóòí³é." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-uk.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -174,27 +174,27 @@ BEGIN LTEXT "Îáåð³òü íàéá³ëüø çðó÷íèé äëÿ âàñ àëãîðèòì âèð³âíþâàííÿ çíà÷ê³â:", IDC_STATIC,7,7,166,16 - CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + CONTROL "ë³â/âåðõ íèç",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 - CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + CONTROL "ë³â/âåðõ ïðâ",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 - CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + CONTROL "ïðâ/âåðõ ë³â",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 - CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + CONTROL "ïðâ/âåðõ íèç",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 - CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + CONTROL "ë³â/íèç âåðõ",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 - CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + CONTROL "ë³â/íèç ïðàâ",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 - CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + CONTROL "ïðàâ/íèç ë³â",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 - CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + CONTROL "ïðâ/íèç âåðõ",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 - CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + CONTROL "ïî êðàÿõ",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 - CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + CONTROL "âåðõí³ êóòè",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 - CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + CONTROL "íàâêîëî",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 Modified: trunk/reactos/base/system/format/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/uk… ============================================================================== --- trunk/reactos/base/system/format/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -69,7 +69,7 @@ STRING_NO_LABEL "Íå ìîæó âñòàíîâèòè ì³òêó äèñêó" -STRING_FREE_SPACE "\n%I64d áàéò³â íà äèñêó.\n%I64d áàéò³â íàÿâíî íà äèñêó.\n" +STRING_FREE_SPACE "\n%I64d áàéò³â íà äèñêó.\n%I64d áàéò³â äîñòóïíî íà äèñêó.\n" STRING_SERIAL_NUMBER "\nÑåð³éíèé íîìåð äèñêó - %04X-%04X\n" END Added: trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc (added) +++ trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -1,0 +1,223 @@ +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +/* + * Attention Translators: + * DO NOT TRANSLATE THESE RESOURCES YET! + */ + +/* Dialogs */ + +IDD_USERS DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Êîðèñòóâà÷³" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_USERS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 7, 238, 85, WS_EX_CLIENTEDGE +END + + +IDD_GROUPS DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ãðóïè" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_GROUPS_LIST, "SysListView32", LVS_REPORT | LVS_EDITLABELS | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 7, 238, 85, WS_EX_CLIENTEDGE +END + + +IDD_EXTRA DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Äîäàòêîâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Öå ì³ñöå íàâìèñíî çàëèøåíå ïîðîæí³ì", IDC_STATIC, 66, 90, 112, 8 +END + + +IDD_USER_GENERAL DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_USER_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "Ïîâíå ²ì'ÿ:", -1, 7, 46, 63, 8 + EDITTEXT IDC_USER_GENERAL_FULL_NAME,77,43,168,13,ES_AUTOHSCROLL + LTEXT "Îïèñ:", -1, 7, 64, 63, 8 + EDITTEXT IDC_USER_GENERAL_DESCRIPTION,77,61,168,13,ES_AUTOHSCROLL + AUTOCHECKBOX "Êîðèñòóâà÷ ìàº çì³íèòè ïàðîëü ïðè ïåðøîìó âõîä³",IDC_USER_GENERAL_FORCE_CHANGE,7,82,210,10 + AUTOCHECKBOX "Êîðèñòóâà÷ íå ìîæå çì³íþâàòè ïàðîëü",IDC_USER_GENERAL_CANNOT_CHANGE,7,95,210,10 + AUTOCHECKBOX "Òåðì³í ä³¿ ïàðîëþ íåîáìåæåíèé",IDC_USER_GENERAL_NEVER_EXPIRES,7,108,210,10 + AUTOCHECKBOX "Îáë³êîâèé çàïèñ âèìêíåíî",IDC_USER_GENERAL_DISABLED,7,121,210,10 + AUTOCHECKBOX "Îáë³êîâèé çàïèñ çàáëîêîâàíî",IDC_USER_GENERAL_LOCKED,7,134,210,10 +END + + +IDD_USER_MEMBERSHIP DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "×ëåíñòâî" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "×ëåí Ãðóïè:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 18, 238, 173, WS_EX_CLIENTEDGE + PUSHBUTTON "Äîäàòè...", IDC_USER_MEMBERSHIP_ADD, 7, 197, 50, 14 + PUSHBUTTON "Âèëó÷èòè", IDC_USER_MEMBERSHIP_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + + +IDD_USER_PROFILE DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ïðîô³ëü" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ïðîô³ëü Êîðèñòóâà÷à", -1, 7, 7, 238, 54 + LTEXT "Øëÿõ äî Ïðîô³ëþ:", -1, 16, 22, 55, 8 + EDITTEXT IDC_USER_PROFILE_PATH, 78, 19, 160, 13, ES_AUTOHSCROLL + LTEXT "Ñöåíàð³é âõîäó:", -1, 16, 40, 55, 8 + EDITTEXT IDC_USER_PROFILE_SCRIPT, 78, 37, 160, 13, ES_AUTOHSCROLL + + GROUPBOX "Äîìàøíÿ òåêà", -1, 7, 68, 238, 54 + AUTORADIOBUTTON "Ëîêàëüíèé øëÿõ:", IDC_USER_PROFILE_LOCAL, 16, 83, 60, 10 + AUTORADIOBUTTON "Ï³ä'ºäíàòè:", IDC_USER_PROFILE_REMOTE, 16, 100, 60, 10 + EDITTEXT IDC_USER_PROFILE_LOCAL_PATH, 78, 81, 160, 13, ES_AUTOHSCROLL + COMBOBOX IDC_USER_PROFILE_DRIVE, 78, 99, 26, 160, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + LTEXT "äî:", -1, 112, 101, 12, 8 + EDITTEXT IDC_USER_PROFILE_REMOTE_PATH, 130, 99, 108, 13, ES_AUTOHSCROLL +END + + +IDD_GROUP_GENERAL DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Çàãàëüí³" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "", IDC_GROUP_GENERAL_NAME, 7, 12, 112, 8 + LTEXT "Îïèñ:", -1, 7, 45, 46, 8 + EDITTEXT IDC_GROUP_GENERAL_DESCRIPTION,65,42,180,13,ES_AUTOHSCROLL + LTEXT "×ëåíè:", -1, 7, 63, 45, 8 + CONTROL "", IDC_GROUP_GENERAL_MEMBERS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 74, 238, 117, WS_EX_CLIENTEDGE + PUSHBUTTON "Äîäàòè...", IDC_GROUP_GENERAL_ADD, 7, 197, 50, 14 + PUSHBUTTON "Âèëó÷èòè", IDC_GROUP_GENERAL_REMOVE, 61, 197, 50, 14, WS_DISABLED +END + + +IDD_CHANGE_PASSWORD DIALOGEX DISCARDABLE 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Çì³íà Ïàðîëþ" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_EDIT_PASSWORD1,107,7,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Íîâèé Ïàðîëü:", -1,7,10,96,8 + EDITTEXT IDC_EDIT_PASSWORD2,107,25,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Ïîâòîð Ïàðîëþ:", -1,7,28,96,8 + DEFPUSHBUTTON "OK",IDOK,156,53,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,210,53,50,14 +END + + +IDD_USER_NEW DIALOGEX DISCARDABLE 0, 0, 267, 200 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Íîâèé Êîðèñòóâà÷" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_USER_NEW_NAME,107,7,153,14,ES_AUTOHSCROLL + RTEXT "²ì'ÿ Êîðèñòóâà÷à:", -1,7,10,96,8 + EDITTEXT IDC_USER_NEW_FULL_NAME,107,25,153,14,ES_AUTOHSCROLL + RTEXT "Ïîâíå ²ì'ÿ Êîðèñòóâà÷à:", -1,7,28,96,8 + EDITTEXT IDC_USER_NEW_DESCRIPTION,107,43,153,14,ES_AUTOHSCROLL + RTEXT "Îïèñ:", -1,7,46,96,8 + EDITTEXT IDC_USER_NEW_PASSWORD1,107,67,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Ïàðîëü:", -1,7,70,96,8 + EDITTEXT IDC_USER_NEW_PASSWORD2,107,85,153,14,ES_AUTOHSCROLL | ES_PASSWORD + RTEXT "Ïîâòîð Ïàðîëþ:", -1,7,88,96,8 + AUTOCHECKBOX "Êîðèñòóâà÷ ìàº çì³íèòè ïàðîëü ïðè ïåðøîìó âõîä³",IDC_USER_NEW_FORCE_CHANGE,7,109,200,10 + AUTOCHECKBOX "Êîðèñòóâà÷ íå ìîæå çì³íþâàòè ïàðîëü",IDC_USER_NEW_CANNOT_CHANGE,7,123,200,10,WS_DISABLED + AUTOCHECKBOX "Òåðì³í ä³¿ ïàðîëþ íåîáìåæåíèé",IDC_USER_NEW_NEVER_EXPIRES,7,137,200,10,WS_DISABLED + AUTOCHECKBOX "Îáë³êîâèé çàïèñ âèìêíåíî",IDC_USER_NEW_DISABLED,7,151,200,10 + DEFPUSHBUTTON "OK",IDOK,156,179,50,14,WS_DISABLED + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,210,179,50,14 +END + + +IDD_GROUP_NEW DIALOGEX DISCARDABLE 0, 0, 267, 74 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "Íîâà Ãðóïà" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_GROUP_NEW_NAME,107,7,153,14,ES_AUTOHSCROLL + RTEXT "Íàçâà Ãðóïè:", -1,7,10,96,8 + EDITTEXT IDC_GROUP_NEW_DESCRIPTION,107,25,153,14,ES_AUTOHSCROLL + RTEXT "Îïèñ:", -1,7,28,96,8 + DEFPUSHBUTTON "OK",IDOK,156,53,50,14,WS_DISABLED + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,210,53,50,14 +END + + +IDD_USER_ADD_MEMBERSHIP DIALOGEX DISCARDABLE 0, 0, 252, 223 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "×ëåíñòâî â Ãðóïàõ" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "×ëåí Ãðóïè:", -1, 7, 7, 56, 8 + CONTROL "", IDC_USER_ADD_MEMBERSHIP_LIST, "SysListView32", LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, + 7, 18, 238, 173, WS_EX_CLIENTEDGE + DEFPUSHBUTTON "OK",IDOK,141,197,50,14 + PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,195,197,50,14 +END + + +/* Menus */ + +IDM_POPUP_GROUP MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Ñòâîðèòè Ãðóïó...", IDM_GROUP_NEW + END + POPUP "" + BEGIN + MENUITEM "Äîäàòè â Ãðóïó", IDM_GROUP_ADD_MEMBER, GRAYED + MENUITEM SEPARATOR + MENUITEM "Âèäàëèòè", IDM_GROUP_DELETE + MENUITEM "Ïåðåéìåíóâàòè", IDM_GROUP_RENAME + MENUITEM SEPARATOR + MENUITEM "Âëàñòèâîñò³", IDM_GROUP_PROPERTIES + END +END + + +IDM_POPUP_USER MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Íîâèé Êîðèñòóâà÷...", IDM_USER_NEW + END + POPUP "" + BEGIN + MENUITEM "Çì³íèòè Ïàðîëü", IDM_USER_CHANGE_PASSWORD + MENUITEM SEPARATOR + MENUITEM "Âèäàëèòè", IDM_USER_DELETE + MENUITEM "Ïåðåéìåíóâàòè", IDM_USER_RENAME + MENUITEM SEPARATOR + MENUITEM "Âëàñòèâîñò³", IDM_USER_PROPERTIES + END +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_CPLNAME "Îáë³êîâ³ çàïèñè êîðèñòóâà÷³â" + IDS_CPLDESCRIPTION "Êåðóâàííÿ Êîðèñòóâà÷àìè òà Ãðóïàìè." +END + +STRINGTABLE +BEGIN + IDS_NAME "²ì'ÿ" + IDS_FULLNAME "Ïîâíå ²ì'ÿ" + IDS_DESCRIPTION "Îïèñ" +END Propchange: trunk/reactos/dll/cpl/usrmgr/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/usrmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/rsrc.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/rsrc.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -7,3 +7,4 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc [iso-8859-1] Thu Apr 14 12:13:38 2011 @@ -62,5 +62,5 @@ IDS_SCROLLUP "Ïðîêðóòèòè äîãîðè" IDS_SCROLLDOWN "Ïðîêðóòèòè äîíèçó" - IDS_COMMAND_PROMPT "Command Prompt" + IDS_COMMAND_PROMPT "Êîìàíäíèé ðÿäîê" END

13 years, 8 months

[janderwald] 51337: [USBEHCI_NEW] - Implement stubs for classes CHCDController and CUSBHardwareDevice - Implement CreateHCDController, CreateUSBHardware - Implement CUSBHardwareDevice::QueryInterfa...

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Apr 14 11:58:07 2011 New Revision: 51337 URL: http://svn.reactos.org/svn/reactos?rev=51337&view=rev Log: [USBEHCI_NEW] - Implement stubs for classes CHCDController and CUSBHardwareDevice - Implement CreateHCDController, CreateUSBHardware - Implement CUSBHardwareDevice::QueryInterface, CUSBHardwareDevice::AddRef, CUSBHardwareDevice::Release - Implement CHCDController::AddRef, CHCDController::Release, CHCDController::QueryInterface Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Apr 14 11:58:07 2011 @@ -10,9 +10,193 @@ #include "usbehci.h" +class CUSBHardwareDevice : public IUSBHardwareDevice +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + // com + NTSTATUS Initialize(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT FunctionalDeviceObject, PDEVICE_OBJECT PhysicalDeviceObject, PDEVICE_OBJECT LowerDeviceObject); + NTSTATUS PnpStart(PCM_RESOURCE_LIST RawResources, PCM_RESOURCE_LIST TranslatedResources); + NTSTATUS PnpStop(void); + NTSTATUS HandlePower(PIRP Irp); + NTSTATUS GetDeviceDetails(PULONG VendorId, PULONG DeviceId, PULONG NumberOfPorts, PULONG Speed); + NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager); + NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); + NTSTATUS ResetController(); + NTSTATUS ResetPort(ULONG PortIndex); + KIRQL AcquireDeviceLock(void); + VOID ReleaseDeviceLock(KIRQL OldLevel); + + // constructor / destructor + CUSBHardwareDevice(IUnknown *OuterUnknown){} + virtual ~CUSBHardwareDevice(){} + +protected: + LONG m_Ref; + KSPIN_LOCK m_Lock; + +}; + +//================================================================================================= +// COM +// +NTSTATUS +STDMETHODCALLTYPE +CUSBHardwareDevice::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + UNICODE_STRING GuidString; + + if (IsEqualGUIDAligned(refiid, IID_IUnknown)) + { + *Output = PVOID(PUNKNOWN(this)); + PUNKNOWN(*Output)->AddRef(); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +CUSBHardwareDevice::Initialize( + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT FunctionalDeviceObject, + PDEVICE_OBJECT PhysicalDeviceObject, + PDEVICE_OBJECT LowerDeviceObject) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +CUSBHardwareDevice::PnpStart( + PCM_RESOURCE_LIST RawResources, + PCM_RESOURCE_LIST TranslatedResources) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBHardwareDevice::PnpStop(void) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBHardwareDevice::HandlePower( + PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBHardwareDevice::GetDeviceDetails( + OUT OPTIONAL PULONG VendorId, + OUT OPTIONAL PULONG DeviceId, + OUT OPTIONAL PULONG NumberOfPorts, + OUT OPTIONAL PULONG Speed) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +CUSBHardwareDevice::GetDmaMemoryManager( + OUT struct IDMAMemoryManager **OutMemoryManager) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +CUSBHardwareDevice::GetUSBQueue( + OUT struct IUSBQueue **OutUsbQueue) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +CUSBHardwareDevice::ResetController(void) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBHardwareDevice::ResetPort( + IN ULONG PortIndex) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +KIRQL +CUSBHardwareDevice::AcquireDeviceLock(void) +{ + KIRQL OldLevel = 0; + + UNIMPLEMENTED + return OldLevel; +} + +BOOLEAN +NTAPI +InterruptServiceRoutine( + IN PKINTERRUPT Interrupt, + IN PVOID ServiceContext) +{ + UNIMPLEMENTED + return FALSE; +} + +VOID +CUSBHardwareDevice::ReleaseDeviceLock( + KIRQL OldLevel) +{ + UNIMPLEMENTED +} + + NTSTATUS CreateUSBHardware( PUSBHARDWAREDEVICE *OutHardware) { - return STATUS_NOT_IMPLEMENTED; -} + PUSBHARDWAREDEVICE This; + + This = new(NonPagedPool, 0) CUSBHardwareDevice(0); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->AddRef(); + + // return result + *OutHardware = (PUSBHARDWAREDEVICE)This; + + return STATUS_SUCCESS; +} Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Thu Apr 14 11:58:07 2011 @@ -10,9 +10,125 @@ #include "usbehci.h" +class CHCDController : public IHCDController +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + + // interface functions + NTSTATUS Initialize(IN PROOTHDCCONTROLLER RootHCDController, IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject); + NTSTATUS HandlePnp(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); + NTSTATUS HandlePower(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); + NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); + + // constructor / destructor + CHCDController(IUnknown *OuterUnknown){} + virtual ~CHCDController(){} + +protected: + LONG m_Ref; +}; + +//================================================================================================= +// COM +// +NTSTATUS +STDMETHODCALLTYPE +CHCDController::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + UNICODE_STRING GuidString; + + if (IsEqualGUIDAligned(refiid, IID_IUnknown)) + { + *Output = PVOID(PUNKNOWN(this)); + PUNKNOWN(*Output)->AddRef(); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +CHCDController::Initialize( + IN PROOTHDCCONTROLLER RootHCDController, + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CHCDController::HandleDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CHCDController::HandlePnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CHCDController::HandlePower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_NOT_IMPLEMENTED; +} + + + + NTSTATUS CreateHCDController( PHCDCONTROLLER *OutHcdController) { - return STATUS_NOT_IMPLEMENTED; + PHCDCONTROLLER This; + + This = new(NonPagedPool, 0) CHCDController(0); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->AddRef(); + + // return result + *OutHcdController = (PHCDCONTROLLER)This; + + return STATUS_SUCCESS; }

13 years, 8 months

[akhaldi] 51336: [CMAKE] - Reflect the recent user32_apitest changes. Please consider updating the cmake files when you alter the rbuild files in the future.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Apr 14 11:55:40 2011 New Revision: 51336 URL: http://svn.reactos.org/svn/reactos?rev=51336&view=rev Log: [CMAKE] - Reflect the recent user32_apitest changes. Please consider updating the cmake files when you alter the rbuild files in the future. Modified: trunk/rostests/apitests/user32/CMakeLists.txt Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Thu Apr 14 11:55:40 2011 @@ -2,14 +2,16 @@ add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE + DeferWindowPos.c + GetIconInfo.c + GetKeyState.c + GetPeekMessage.c + GetSystemMetrics.c InitializeLpkHooks.c RealGetWindowClass.c ScrollDC.c ScrollWindowEx.c - GetSystemMetrics.c - GetIconInfo.c - GetPeekMessage.c - DeferWindowPos.c + SetCursorPos.c testlist.c user32_apitest.rc)

13 years, 8 months

[janderwald] 51335: [USBEHCI_NEW] - Create empty USB EHCI driver in c++ - Design & review the interfaces with mjmartin - Create stubs for creating IUSBHardwareDevice / IHCDController classes - Impl...

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Apr 14 11:35:16 2011 New Revision: 51335 URL: http://svn.reactos.org/svn/reactos?rev=51335&view=rev Log: [USBEHCI_NEW] - Create empty USB EHCI driver in c++ - Design & review the interfaces with mjmartin - Create stubs for creating IUSBHardwareDevice / IHCDController classes - Implement DriverEntry, EHCI_AddDevice and EHCI_Dispatch Added: branches/usb-bringup/drivers/usb/usbehci_new/ (with props) branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt (with props) branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp (with props) branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp (with props) branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h (with props) branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp (with props) branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h (with props) branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc (with props) Modified: branches/usb-bringup/drivers/usb/CMakeLists.txt Modified: branches/usb-bringup/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/CMakeLi… ============================================================================== --- branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,6 +1,6 @@ add_subdirectory(nt4compat) add_subdirectory(usbd) -add_subdirectory(usbehci) +add_subdirectory(usbehci_new) #add_subdirectory(usbhub) Compiles, just skipped in trunk #add_subdirectory(usbstor) Compiles, just skipped in trunk Propchange: branches/usb-bringup/drivers/usb/usbehci_new/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Apr 14 11:35:16 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/usb/usbehci_new/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/usb/usbehci_new/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/usb/usbehci_new/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,28 @@ + +set_cpp() + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_library(usbehci SHARED + usbehci.cpp + hcd_controller.cpp + hardware.cpp + usbehci.rc) + +target_link_libraries(usbehci + libcntpr + stlport + ${PSEH_LIB}) + +if(MSVC) + set_target_properties(usbehci PROPERTIES COMPILE_FLAGS "/GR-") +else() + target_link_libraries(usbehci -lgcc) + set_target_properties(usbehci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") +endif(MSVC) + +set_module_type(usbehci kernelmodedriver) +add_importlibs(usbehci ntoskrnl ks drmk hal) + +add_cab_target(usbehci 2) Propchange: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,18 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci_new/hcd_controller.cpp + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbehci.h" + +NTSTATUS +CreateUSBHardware( + PUSBHARDWAREDEVICE *OutHardware) +{ + return STATUS_NOT_IMPLEMENTED; +} Propchange: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,18 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci_new/hcd_controller.cpp + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbehci.h" + +NTSTATUS +CreateHCDController( + PHCDCONTROLLER *OutHcdController) +{ + return STATUS_NOT_IMPLEMENTED; +} Propchange: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,490 @@ + +#ifndef INTERFACES_HPP +#define INTERFACES_HPP + +//--------------------------------------------------------------------------- +// +// Object Hierachy +// -------------------------------------------------------------------- +// | IRootHCDController | +// | IHCDController Intel USB Universal Host Controller - 3A37 | +// | IHCDController - Intel USB Universal HostController - 3A38 | +// | IHCDController - Intel USB Universal HostController - 3A38 | +// |------------------------------------------------------------------| +// +// +// IHCDController Intel USB Universal Host Controller - 3A37 +// IHubController +// IUSBHardwareDevice +// IDMAMemoryManager +// IUSBQueue <- interacts with -> IUSBRequest +// +// +// Each IHCDController creates an IUSBHardwareDevice class upon initialization. The +// IUSBHardwardeDevice class is used to abstract usb controller specifics. The IHubController +// manages all attached devices and handles hub control ioctl requests. +// +// Each IUSBHardwareDevice has one IDMAMemoryManager and one IUSBQueue. The IDMAMemoryManager +// is used to handle dma memory allocations. The IUSBQueue manages requests which are send to the +// usb hardware. See IUSBRequest class for details. +// + + +//========================================================================================= +// +// class IRootHCDController +// +// Description: This class serves as the root host controller. The host controller mantains +// a list of registered controllers and provides support functions for the host controllers + +struct IHCDController; + +DECLARE_INTERFACE_(IRootHCDController, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: This function initializes the root host controller. It allocates the resources +// required to manage the registered controllers + + virtual NTSTATUS Initialize() = 0; + +//----------------------------------------------------------------------------------------- +// +// RegisterHCD +// +// Description: this function registers a host controller with the root host controller + + virtual NTSTATUS RegisterHCD(struct IHCDController * Controller) = 0; + +//----------------------------------------------------------------------------------------- +// +// UnregisterHCD +// +// Description: this function unregistes a host controller + + virtual NTSTATUS UnregisterHCD(struct IHCDController * Controller) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetControllerCount +// +// Description: returns the number of host controllers registered + + virtual ULONG GetControllerCount() = 0; + +}; + +typedef IRootHCDController *PROOTHDCCONTROLLER; + +//========================================================================================= +// +// class IHCDController +// +// Description: This class is used to manage a single USB host controller +// + +DECLARE_INTERFACE_(IHCDController, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: This function initializes the IHCDController implementation. +// It creates an IUSBHardwareDevice object and initializes it. It also registeres itself with +// the IRootHCDController +// + virtual NTSTATUS Initialize(IN PROOTHDCCONTROLLER RootHCDController, + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandlePnp +// +// Description: This function handles all pnp requests + + virtual NTSTATUS HandlePnp(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandlePower +// +// Description: This function handles all power pnp requests +// + virtual NTSTATUS HandlePower(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandleDeviceControl +// +// Description: handles device io control requests + + virtual NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; + +}; + +typedef IHCDController *PHCDCONTROLLER; + + +//========================================================================================= +// +// class IUSBHardwareDevice +// +// Description: This class provides access to the usb hardware controller +// + +struct IDMAMemoryManager; +struct IUSBQueue; + +DECLARE_INTERFACE_(IUSBHardwareDevice, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: Initializes the usb device controller + + virtual NTSTATUS Initialize(PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT FunctionalDeviceObject, + PDEVICE_OBJECT PhysicalDeviceObject, + PDEVICE_OBJECT LowerDeviceObject) = 0; + +//----------------------------------------------------------------------------------------- +// +// PnpStart +// +// Description: handles pnp start request from device. It registeres the interrupt, +// sets up the ports and prepares the device. It then starts the controller + + virtual NTSTATUS PnpStart(PCM_RESOURCE_LIST RawResources, + PCM_RESOURCE_LIST TranslatedResources) = 0; + +//----------------------------------------------------------------------------------------- +// +// PnpStop +// +// Description: handles pnp stop request from device. It unregisteres the interrupt, releases ports and dma object. + + virtual NTSTATUS PnpStop(void) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandlePower +// +// Description: handles power requests + + virtual NTSTATUS HandlePower(PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetDeviceDetails +// +// Description: returns the device details such as vendor id, device id, number of ports and speed + + virtual NTSTATUS GetDeviceDetails(OUT OPTIONAL PULONG VendorId, + OUT OPTIONAL PULONG DeviceId, + OUT OPTIONAL PULONG NumberOfPorts, + OUT OPTIONAL PULONG Speed) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetDmaMemoryManager +// +// Description: returns interface to DMAMemoryManager +// Interface is reference counted, you need to call Release method when you are done with it +// Do not call Initialize on IDMAMemoryManager, the object is already initialized + + virtual NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetUSBQueue +// +// Description: returns interface to internal IUSBQueue +// Interface is reference counted, you need to call release method when you are done with it +// Do not call Initialize on IUSBQueue, the object is already initialized + + virtual NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue) = 0; + +//----------------------------------------------------------------------------------------- +// +// ResetController() +// +// Description: this function resets the controller +// Returns STATUS_SUCCESS when the controller was successfully reset + + virtual NTSTATUS ResetController() = 0; + +//----------------------------------------------------------------------------------------- +// +// ResetPort +// +// Description: this functions resets the port on the controller +// + + virtual NTSTATUS ResetPort(ULONG PortNumber) = 0; + +//----------------------------------------------------------------------------------------- +// +// AcquireDeviceLock +// +// Description: acquires the device lock + + virtual KIRQL AcquireDeviceLock(void) = 0; + +//----------------------------------------------------------------------------------------- +// +// ReleaseLock +// +// Description: releases the device lock + + virtual void ReleaseDeviceLock(KIRQL OldLevel) = 0; +}; + +typedef IUSBHardwareDevice *PUSBHARDWAREDEVICE; + + +//========================================================================================= +// +// class IDMAMemoryManager +// +// Description: This class provides access to the dma buffer. It provides methods to +// allocate and free from the dma buffer +// + +DECLARE_INTERFACE_(IDMAMemoryManager, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: initializes the memory manager + + virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Device, + IN PKSPIN_LOCK Lock, + IN ULONG DmaBufferSize, + IN PVOID VirtualBase, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG DefaultBlockSize) = 0; + +//----------------------------------------------------------------------------------------- +// +// Allocate +// +// Description: allocates block of memory from allocator + + virtual NTSTATUS Allocate(IN ULONG Size, + OUT PVOID *OutVirtualBase, + OUT PPHYSICAL_ADDRESS *OutPhysicalAddress) = 0; + + +//----------------------------------------------------------------------------------------- +// +// Free +// +// Description: releases memory block + + virtual NTSTATUS Release(IN PVOID VirtualBase, + IN ULONG Size) = 0; + +}; + +typedef IDMAMemoryManager *PDMAMEMORYMANAGER; + + +//========================================================================================= +// +// class IUSBRequest +// +// Description: This class is used to issue request to usb controller. The class is +// initialized using InitializeXXX methods. You also need to call SetEndpoint to define the endpoint +// In addition you can call SetCompletionDetails if you need to wait for the end of +// the request or want to complete an irp. You call AddUSBRequest to add the request to the queue. +// Once the request is completed the CompletionCallback is invoked. The CompletionCallback +// will take care of any completion details which have been set. If the request is cancelled, the +// CancelCallback routine is invoked. +// + +DECLARE_INTERFACE_(IUSBRequest, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// InitializeWithSetupPacket +// +// Description: initializes the request packet with an setup packet +// If there is a TransferBuffer, the TransferBufferLength contains the length of the buffer + + + virtual NTSTATUS InitializeWithSetupPacket(IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, + IN ULONG TransferBufferLength, + IN PVOID TransferBuffer) = 0; + +// +//TODO: find required parameters for different packet types +// + + +//----------------------------------------------------------------------------------------- +// +// SetEndPoint +// +// Description: sets the endpoint of the request. + + virtual NTSTATUS SetEndPoint(PUSB_ENDPOINT_DESCRIPTOR EndPoint); + +//----------------------------------------------------------------------------------------- +// +// SetCompletionDetails +// +// Description: sets up how the request should be completed +// If an irp is passed, then it is completed with status code of the +// CompletionCallback or CancelCallback +// If an event is passed, then the event is signaled + + virtual NTSTATUS SetCompletionDetails(IN OPTIONAL PIRP Irp, + IN OPTIONAL PKEVENT Event) = 0; + +//----------------------------------------------------------------------------------------- +// +// CompletionCallback +// +// Description: called when request has been completed. It is called when +// IUSBQueue completes the request + + virtual VOID CompletionCallback(IN NTSTATUS NtStatusCode, + IN ULONG UrbStatusCode) = 0; + +//----------------------------------------------------------------------------------------- +// +// CancelCallback +// +// Description: called when request is cancelled. Called by IUSBQueue + + virtual VOID CancelCallback(IN NTSTATUS NtStatusCode) = 0; + +}; + +//========================================================================================= +// +// class IUSBQueue +// +// Description: This class manages pending requests +// + +DECLARE_INTERFACE_(IUSBQueue, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: initializes the object + + virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, + IN OPTIONAL PKSPIN_LOCK Lock, + IN PDMAMEMORYMANAGER MemoryManager) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetPendingRequestCount +// +// Description: returns the number of pending requests + + virtual ULONG GetPendingRequestCount() = 0; + +//----------------------------------------------------------------------------------------- +// +// AddUSBRequest +// +// Description: adds an usb request to the queue. +// Returns status success when successful + + virtual NTSTATUS AddUSBRequest(IUSBRequest * Request) = 0; + +//----------------------------------------------------------------------------------------- +// +// CancelRequests() +// +// Description: cancels all requests + + virtual NTSTATUS CancelRequests() = 0; + +//----------------------------------------------------------------------------------------- +// +// CreateUSBRequest +// +// Description: creates an usb request + + virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest) = 0; +}; + +//========================================================================================= +// +// class IHubController +// +// Description: This class implements a hub controller +// + +DECLARE_INTERFACE_(IHubController, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//---------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: Initializes the hub controller + + virtual NTSTATUS Initialize(IN PHCDCONTROLLER Controller, + IN PUSBHARDWAREDEVICE Device, + IN BOOLEAN IsRootHubDevice, + IN ULONG DeviceAddress); + +//----------------------------------------------------------------------------------------- +// +// HandlePnp +// +// Description: This function handles all pnp requests + + virtual NTSTATUS HandlePnp(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandlePower +// +// Description: This function handles all power pnp requests +// + virtual NTSTATUS HandlePower(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandleDeviceControl +// +// Description: handles device io control requests + + virtual NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; +}; + +typedef IHubController *PHUBCONTROLLER; + + +#endif Propchange: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,161 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/usbehci.cpp + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbehci.h" + +// +// driver verifier +// +DRIVER_ADD_DEVICE EHCI_AddDevice; + +NTSTATUS +NTAPI +EHCI_AddDevice( + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT PhysicalDeviceObject) +{ + NTSTATUS Status; + PHCDCONTROLLER HcdController; + + DPRINT1("EHCI_AddDevice\n"); + + /* first create the controller object */ + Status = CreateHCDController(&HcdController); + if (!NT_SUCCESS(Status)) + { + /* failed to create hcd */ + DPRINT1("AddDevice: Failed to create hcd with %x\n", Status); + return Status; + } + + /* initialize the hcd */ + Status = HcdController->Initialize(NULL, // FIXME + DriverObject, + PhysicalDeviceObject); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed to initialize device */ + DPRINT1("AddDevice: failed to initialize\n"); + + /* release object */ + HcdController->Release(); + } + + return Status; + +} + +NTSTATUS +NTAPI +EHCI_Dispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PCOMMON_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + DPRINT1("EHCI_Dispatch\n"); + + // + // get common device extension + // + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // sanity checks + // + PC_ASSERT(DeviceExtension->HcdController); + + // + // FIXME: support bus device + // + PC_ASSERT(DeviceExtension->IsHub == FALSE); + + switch(IoStack->MajorFunction) + { + case IRP_MJ_PNP: + { + // + // dispatch pnp + // + return DeviceExtension->HcdController->HandlePnp(DeviceObject, Irp); + } + + case IRP_MJ_POWER: + { + // + // dispatch pnp + // + return DeviceExtension->HcdController->HandlePower(DeviceObject, Irp); + } + case IRP_MJ_SYSTEM_CONTROL: + case IRP_MJ_DEVICE_CONTROL: + { + // + // dispatch pnp + // + return DeviceExtension->HcdController->HandleDeviceControl(DeviceObject, Irp); + } + case IRP_MJ_CREATE: + { + // + // dispatch create request + // + Status = STATUS_SUCCESS; + + break; + } + default: + { + DPRINT1("EHCI_Dispatch> Major %lu Minor %lu not supported\n", IoStack->MajorFunction, IoStack->MinorFunction); + Status = STATUS_NOT_SUPPORTED; + } + } + + // + // complete request + // + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + + return Status; +} + +extern +"C" +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + + /* initialize driver object*/ + DriverObject->DriverExtension->AddDevice = EHCI_AddDevice; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = EHCI_Dispatch; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = EHCI_Dispatch; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = EHCI_Dispatch; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = EHCI_Dispatch; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = EHCI_Dispatch; + DriverObject->MajorFunction[IRP_MJ_PNP] = EHCI_Dispatch; + + return STATUS_SUCCESS; +} Propchange: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,53 @@ +#ifndef USBEHCI_H__ +#define USBEHCI_H__ + +#include <ntddk.h> +#define YDEBUG +#include <debug.h> +#include <hubbusif.h> +#include <usbbusif.h> +#include <usbioctl.h> +#include <usb.h> +#include <stdio.h> +#include <wdmguid.h> + +// +// FIXME: +// the following includes are required to get kcom to compile +// +#include <portcls.h> +#include <dmusicks.h> +#include <kcom.h> + +#include "interfaces.h" + +typedef struct +{ + BOOLEAN IsFDO; // is device a FDO or PDO + BOOLEAN IsHub; // is device a hub / child - not yet used + union + { + PHCDCONTROLLER HcdController; // hcd controller + PHUBCONTROLLER HubController; // hub controller + }; +}COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; + + +// +// assert for c++ - taken from portcls +// +#define PC_ASSERT(exp) \ + (VOID)((!(exp)) ? \ + RtlAssert((PVOID) #exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE) + +// +// hcd_controller.cpp +// +NTSTATUS CreateHCDController(PHCDCONTROLLER *HcdController); + +// +// hardware.cpp +// +NTSTATUS CreateUSBHardware(PUSBHARDWAREDEVICE *OutHardware); + +#endif Propchange: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USBEHCI Driver API\0" +#define REACTOS_STR_INTERNAL_NAME "usbehci\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbehci.sys\0" +#include <reactos/version.rc> Propchange: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 8 months

[janderwald] 51334: [USB-BRINGUP] - Create branch for usb work

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Apr 14 10:52:43 2011 New Revision: 51334 URL: http://svn.reactos.org/svn/reactos?rev=51334&view=rev Log: [USB-BRINGUP] - Create branch for usb work Added: branches/usb-bringup/ (props changed) - copied from r51333, branches/cmake-bringup/ Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Apr 14 10:52:43 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Apr 14 10:52:43 2011 @@ -1,0 +1,16 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +build* +*.patch +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Apr 14 10:52:43 2011 @@ -1,0 +1,6 @@ +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/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 +/trunk/reactos:48236-51323 Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

13 years, 8 months

← Newer
1
...
15
16
17
18
19
20
21
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2011