ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
April 2011
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
19 participants
296 discussions
Start a n
N
ew thread
[mkupfer] 51503: Add Python 3
by mkupfer@svn.reactos.org
Author: mkupfer Date: Sat Apr 30 11:56:02 2011 New Revision: 51503 URL:
http://svn.reactos.org/svn/reactos?rev=51503&view=rev
Log: Add Python 3 Added: trunk/reactos/base/applications/rapps/rapps/python3.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/python.txt Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] Sat Apr 30 11:56:02 2011 @@ -1,7 +1,7 @@ ; UTF-8 [Section] -Name = Python +Name = Python 2 Version = 2.7.1 Licence = GPL/LGPL Description = A remarkably powerful dynamic programming language. Added: trunk/reactos/base/applications/rapps/rapps/python3.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python3.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/python3.txt [iso-8859-1] Sat Apr 30 11:56:02 2011 @@ -1,0 +1,27 @@ +; UTF-8 + +[Section] +Name = Python 3 +Version = 3.2 +Licence = GPL/LGPL +Description = A remarkably powerful dynamic programming language. +Size = 17.2MB +Category = 7 +URLSite =
http://www.python.org/
+URLDownload =
http://www.python.org/ftp/python/3.2/python-3.2.msi
+CDPath = none + +[Section.0407] +Description = Eine sehr mächtige, dynamische Programmiersprache. + +[Section.040a] +Description = Un lenguaje de programación dinámico sumamente potente. + +[Section.040c] +Description = Un langage de programmation dynamique remarquablement puissant. + +[Section.0415] +Description = PotÄży i dynamiczny jÄzyk programowania. + +[Section.0422] +Description = ÐÑже поÑÑжна динамÑÑна мова пÑогÑамÑваннÑ. Propchange: trunk/reactos/base/applications/rapps/rapps/python3.txt ------------------------------------------------------------------------------ svn:eol-style = native
13 years, 7 months
1
0
0
0
[akhaldi] 51502: [CMAKE] * configure.cmd: formatting.
by akhaldi@svn.reactos.org
Author: akhaldi Date: Sat Apr 30 11:34:02 2011 New Revision: 51502 URL:
http://svn.reactos.org/svn/reactos?rev=51502&view=rev
Log: [CMAKE] * configure.cmd: formatting. Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev…
============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Sat Apr 30 11:34:02 2011 @@ -28,7 +28,7 @@ cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10 if not defined BUILD_ENVIRONMENT ( echo Error: Visual Studio version too old or version detection failed. - exit /b + exit /b ) echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH% if not "%1" == "VSSolution" ( @@ -57,7 +57,7 @@ :: Create directories :createdirs -set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% +set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% if "%REACTOS_SOURCE_DIR%" == "%CD%\" ( echo Creating directories in %REACTOS_OUTPUT_PATH%
13 years, 7 months
1
0
0
0
[janderwald] 51501: [USBEHCI_NEW] - Port URB_FUNCTION_CLASS_INTERFACE from mjmartin usbehci driver - Fix typo in interface declaration - Disable assert for now - Return irp status pending when irp ...
by janderwald@svn.reactos.org
Author: janderwald Date: Sat Apr 30 08:04:35 2011 New Revision: 51501 URL:
http://svn.reactos.org/svn/reactos?rev=51501&view=rev
Log: [USBEHCI_NEW] - Port URB_FUNCTION_CLASS_INTERFACE from mjmartin usbehci driver - Fix typo in interface declaration - Disable assert for now - Return irp status pending when irp is added to the queue - Fix bug in InternalGetPidDirection - More work on the bulk transfers, not yet working Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Sat Apr 30 08:04:35 2011 @@ -65,6 +65,7 @@ NTSTATUS HandleSelectConfiguration(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleSelectInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassOther(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleClassInterface(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleBulkOrInterruptTransfer(IN OUT PIRP Irp, PURB Urb); friend VOID StatusChangeEndpointCallBack(PVOID Context); @@ -1355,6 +1356,70 @@ DPRINT1("CHubController::HandleGetDescriptor DescriptorType %x unimplemented\n", Urb->UrbControlDescriptorRequest.DescriptorType); break; } + + // + // done + // + return Status; +} + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleClassInterface( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; + + // + // sanity check + // + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength); + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + + // + // check if this is a valid usb device handle + // + PC_ASSERT(ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))); + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); + DPRINT1("TransferFlags %x\n", Urb->UrbControlVendorClassRequest.TransferFlags); + DPRINT1("TransferBufferLength %x\n", Urb->UrbControlVendorClassRequest.TransferBufferLength); + DPRINT1("TransferBuffer %x\n", Urb->UrbControlVendorClassRequest.TransferBuffer); + DPRINT1("TransferBufferMDL %x\n", Urb->UrbControlVendorClassRequest.TransferBufferMDL); + DPRINT1("RequestTypeReservedBits %x\n", Urb->UrbControlVendorClassRequest.RequestTypeReservedBits); + DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request); + DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value); + DPRINT1("Index %x\n", Urb->UrbControlVendorClassRequest.Index); + + // + // initialize setup packet + // + CtrlSetup.bmRequestType.B = 0xa1; //FIXME: Const. + CtrlSetup.bRequest = Urb->UrbControlVendorClassRequest.Request; + CtrlSetup.wValue.W = Urb->UrbControlVendorClassRequest.Value; + CtrlSetup.wIndex.W = Urb->UrbControlVendorClassRequest.Index; + CtrlSetup.wLength = Urb->UrbControlVendorClassRequest.TransferBufferLength; + + // + // issue request + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, Urb->UrbControlVendorClassRequest.TransferBufferLength, Urb->UrbControlVendorClassRequest.TransferBuffer); + + // + // assert on failure + // + PC_ASSERT(NT_SUCCESS(Status)); + // // done @@ -1419,6 +1484,9 @@ case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: Status = HandleBulkOrInterruptTransfer(Irp, Urb); break; + case URB_FUNCTION_CLASS_INTERFACE: + Status = HandleClassInterface(Irp, Urb); + break; default: DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT IMPLEMENTED\n", Urb->UrbHeader.Function); break; Modified: 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 [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Sat Apr 30 08:04:35 2011 @@ -785,7 +785,7 @@ // // Description: submits an irp containing an urb - virtual NTSTATUS SubmitIrp(PIRP Urb) = 0; + virtual NTSTATUS SubmitIrp(PIRP Irp) = 0; //----------------------------------------------------------------------------------------- // Modified: branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/memory_manager.cpp [iso-8859-1] Sat Apr 30 08:04:35 2011 @@ -136,7 +136,7 @@ // sanity checks // ASSERT(Size < PAGE_SIZE); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + //ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); // // align request Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] Sat Apr 30 08:04:35 2011 @@ -484,6 +484,11 @@ Status = Request->InitializeWithIrp(m_DmaManager, Irp); // + // mark irp as pending + // + IoMarkIrpPending(Irp); + + // // now add the request // Status = m_Queue->AddUSBRequest(Request); @@ -500,7 +505,7 @@ // // done // - return Status; + return STATUS_PENDING; } //---------------------------------------------------------------------------------------- @@ -1199,6 +1204,16 @@ // // copy pipe handle // + DPRINT1("PipeIndex %lu\n", PipeIndex); + DPRINT1("EndpointAddress %x\n", InterfaceInfo->Pipes[PipeIndex].EndpointAddress); + DPRINT1("Interval %d\n", InterfaceInfo->Pipes[PipeIndex].Interval); + DPRINT1("MaximumPacketSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize); + DPRINT1("MaximumTransferSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumTransferSize); + DPRINT1("PipeFlags %d\n", InterfaceInfo->Pipes[PipeIndex].PipeFlags); + DPRINT1("PipeType %dd\n", InterfaceInfo->Pipes[PipeIndex].PipeType); + DPRINT1("UsbEndPoint %x\n", Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress); + PC_ASSERT(Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress == InterfaceInfo->Pipes[PipeIndex].EndpointAddress); + InterfaceInfo->Pipes[PipeIndex].PipeHandle = &Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor; if (Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bmAttributes & (USB_ENDPOINT_TYPE_ISOCHRONOUS | USB_ENDPOINT_TYPE_INTERRUPT)) Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Sat Apr 30 08:04:35 2011 @@ -371,6 +371,8 @@ Urb->UrbHeader.Length = 0; } + DPRINT1("Request %p Completing Irp %p NtStatusCode %x UrbStatusCode %x\n", this, m_Irp, NtStatusCode, UrbStatusCode); + // // FIXME: check if the transfer was split // if yes dont complete irp yet @@ -604,9 +606,9 @@ EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbBulkOrInterruptTransfer.PipeHandle; // - // end point is defined in the low byte of bmAttributes - // - return (EndpointDescriptor->bmAttributes & USB_ENDPOINT_DIRECTION_MASK); + // end point is defined in the low byte of bEndpointAddress + // + return (EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; } //---------------------------------------------------------------------------------------- @@ -779,8 +781,11 @@ PQUEUE_HEAD * OutHead) { NTSTATUS Status; - ULONG NumTransferDescriptors, TransferBufferRounded, NumPages, Index, FailIndex; PQUEUE_HEAD QueueHead; + ULONG TransferDescriptorCount, Index; + ULONG BytesAvailable, BufferIndex; + PVOID Base; + ULONG PageOffset; // // Allocate the queue head @@ -801,38 +806,33 @@ PC_ASSERT(QueueHead); // - // Determine number of transfer descriptors needed. Max size is 3 * 5 Pages - // FIXME: Do we need anything bigger? - // - TransferBufferRounded = ROUND_TO_PAGES(m_TransferBufferLength); - NumPages = Index = 0; - NumTransferDescriptors = 1; - while (TransferBufferRounded > 0) - { - TransferBufferRounded -= PAGE_SIZE; - NumPages++; - Index++; - if (Index == 5) - { - NumTransferDescriptors++; - Index = 0; - } - } - - DPRINT1("Need TransferDescriptors %x, Pages %x\n", NumTransferDescriptors, NumPages); - DPRINT1("This is the end of the line!!!!!!!!\n"); - return STATUS_NOT_IMPLEMENTED; - //FIXME: Below needs work. - - // - // FIXME: Handle transfers greater than 5 * PAGE_SIZE * 3 - // - if (NumTransferDescriptors > 3) NumTransferDescriptors = 3; + // FIXME: support more than one descriptor + // + PC_ASSERT(m_TransferBufferLength < PAGE_SIZE * 5); + PC_ASSERT(m_TransferBufferLength); + + TransferDescriptorCount = 1; + + // + // get virtual base of mdl + // + Base = MmGetMdlVirtualAddress(m_TransferBufferMDL); + BytesAvailable = m_TransferBufferLength; + + PC_ASSERT(m_EndpointDescriptor); + + DPRINT1("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress); + DPRINT1("EndPointDirection %x\n", USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); + + DPRINT1("Request %p Base Address %p TransferBytesLength %lu\n", this, Base, BytesAvailable); + DPRINT1("InternalGetPidDirection() %d EndPointAddress %x\n", InternalGetPidDirection(), m_EndpointDescriptor->bEndpointAddress & 0x0F); + + //PC_ASSERT(InternalGetPidDirection() == USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); // // Allocated transfer descriptors // - for (Index = 0; Index < NumTransferDescriptors; Index++) + for (Index = 0; Index < TransferDescriptorCount; Index++) { Status = CreateDescriptor(&m_TransferDescriptors[Index]); if (!NT_SUCCESS(Status)) @@ -850,10 +850,130 @@ // Free Descriptors // FIXME: Implement FreeDescriptors // - //for (FailIndex = 0; FailIndex < Index; FailIndex++) - //FreeDescriptor(m_TransferDescriptors[FailIndex]); - return Status; + } + + // + // sanity check + // + PC_ASSERT(BytesAvailable); + + // + // now setup transfer buffers + // + for(BufferIndex = 0; BufferIndex < 5; BufferIndex++) + { + // + // setup buffer + // + if (BufferIndex == 0) + { + // + // use physical address + // + m_TransferDescriptors[Index]->BufferPointer[0] = MmGetPhysicalAddress(Base).LowPart; + + // + // get offset within page + // + PageOffset = BYTE_OFFSET(m_TransferDescriptors[Index]->BufferPointer[0]); + + // + // check if request fills another page + // + if (PageOffset + BytesAvailable >= PAGE_SIZE) + { + // + // move to next page + // + Base = (PVOID)ROUND_TO_PAGES(Base); + + // + // increment transfer bytes + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = PAGE_SIZE - PageOffset; + + // + // decrement available byte count + // + BytesAvailable -= m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; + + DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + } + else + { + // + // request ends on the first buffer page + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer = BytesAvailable; + BytesAvailable = 0; + + DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + break; + } + } + else + { + // + // the following pages always start on byte zero of each page + // + PC_ASSERT(((ULONG_PTR)Base & (PAGE_SIZE-1)) == 0); + + if (BytesAvailable >= PAGE_SIZE) + { + // + // store address + // + m_TransferDescriptors[Index]->BufferPointer[BufferIndex] = MmGetPhysicalAddress(Base).LowPart; + + // + // move to next page + // + Base = (PVOID)((ULONG_PTR)Base + PAGE_SIZE); + + // + // increment transfer descriptor bytes + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer += PAGE_SIZE; + + // + // decrement available byte count + // + BytesAvailable -= PAGE_SIZE; + + DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + } + else + { + PC_ASSERT(BytesAvailable); + + // + // store address + // + m_TransferDescriptors[Index]->BufferPointer[BufferIndex] = MmGetPhysicalAddress(Base).LowPart; + + // + // increment transfer descriptor bytes + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer += BytesAvailable; + + // + // decrement available byte count + // + BytesAvailable -= BytesAvailable; + + // + // done + // + DPRINT1("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); + + break; + } + } } // @@ -863,8 +983,26 @@ { m_TransferDescriptors[Index - 1]->NextPointer = m_TransferDescriptors[Index]->PhysicalAddr; } - - } + + // + // setup direction + // + m_TransferDescriptors[Index]->Token.Bits.PIDCode = InternalGetPidDirection(); + + // + // FIXME: performance penality? + // + m_TransferDescriptors[Index]->Token.Bits.InterruptOnComplete = TRUE; + + // + // FIXME need dead queue transfer descriptor? + // + } + + // + // all bytes should have been consumed + // + PC_ASSERT(BytesAvailable == 0); // // Initialize the QueueHead @@ -881,19 +1019,20 @@ } QueueHead->Token.Bits.DataToggle = TRUE; - - // - // Setup descriptors - // - m_TransferDescriptors[0]->Token.Bits.PIDCode = InternalGetPidDirection(); - //m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer = ??? - //m_TransferDescriptors[0]->Token.Bits.DataToggle = FALSE; - - m_TransferDescriptors[Index]->Token.Bits.InterruptOnComplete = TRUE; - - ASSERT(m_TransferBufferMDL); - - + + // + // link descriptor with queue head + // + QueueHead->NextPointer = m_TransferDescriptors[0]->PhysicalAddr; + + // + // store result + // + *OutHead = QueueHead; + + // + // done + // return STATUS_SUCCESS; } @@ -1351,6 +1490,7 @@ // // release transfer descriptors // + DPRINT1("m_TransferDescriptor[0] Length %lu\n", m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer); m_DmaManager->Release(m_TransferDescriptors[0], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); m_TransferDescriptors[0] = 0; }
13 years, 7 months
1
0
0
0
[ilardig] 51500: [NOTEPAD] Revert 51497, this is really a hack, sorry.
by ilardig@svn.reactos.org
Author: ilardig Date: Sat Apr 30 00:49:10 2011 New Revision: 51500 URL:
http://svn.reactos.org/svn/reactos?rev=51500&view=rev
Log: [NOTEPAD] Revert 51497, this is really a hack, sorry. Modified: trunk/reactos/base/applications/notepad/settings.c Modified: trunk/reactos/base/applications/notepad/settings.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…
============================================================================== --- trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] Sat Apr 30 00:49:10 2011 @@ -182,6 +182,7 @@ SaveDword(hKey, _T("lfCharSet"), Globals.lfFont.lfCharSet); SaveDword(hKey, _T("lfClipPrecision"), Globals.lfFont.lfClipPrecision); SaveDword(hKey, _T("lfEscapement"), Globals.lfFont.lfEscapement); + SaveString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName); SaveDword(hKey, _T("lfItalic"), Globals.lfFont.lfItalic); SaveDword(hKey, _T("lfOrientation"), Globals.lfFont.lfOrientation); SaveDword(hKey, _T("lfOutPrecision"), Globals.lfFont.lfOutPrecision); @@ -189,27 +190,14 @@ SaveDword(hKey, _T("lfQuality"), Globals.lfFont.lfQuality); SaveDword(hKey, _T("lfStrikeOut"), Globals.lfFont.lfStrikeOut); SaveDword(hKey, _T("lfUnderline"), Globals.lfFont.lfUnderline); + SaveDword(hKey, _T("lfWeight"), Globals.lfFont.lfWeight); + SaveDword(hKey, _T("iPointSize"), PointSizeFromHeight(Globals.lfFont.lfHeight)); SaveDword(hKey, _T("fWrap"), Globals.bWrapLongLines ? 1 : 0); SaveDword(hKey, _T("fStatusBar"), Globals.bShowStatusBar ? 1 : 0); SaveDword(hKey, _T("iWindowPosX"), Globals.main_rect.left); SaveDword(hKey, _T("iWindowPosY"), Globals.main_rect.top); SaveDword(hKey, _T("iWindowPosDX"), Globals.main_rect.right - Globals.main_rect.left); SaveDword(hKey, _T("iWindowPosDY"), Globals.main_rect.bottom - Globals.main_rect.top); - - if (*Globals.lfFont.lfFaceName == '\0') - { - static const TCHAR default_font[] = _T("Tahoma"); - _tcscpy(Globals.lfFont.lfFaceName, default_font); - Globals.lfFont.lfHeight = 100; - Globals.lfFont.lfWeight = 400; - SaveDword(hKey, _T("iPointSize"), Globals.lfFont.lfHeight); - } - else - { - SaveDword(hKey, _T("iPointSize"), PointSizeFromHeight(Globals.lfFont.lfHeight)); - } - SaveDword(hKey, _T("lfWeight"), Globals.lfFont.lfWeight); - SaveString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName); RegCloseKey(hKey); }
13 years, 7 months
1
0
0
0
[gadamopoulos] 51499: [explorer] - Return 1 when explorer terminates. This value lets winlogon know that explorer terminated without errors and it doesn't need to restart
by gadamopoulos@svn.reactos.org
Author: gadamopoulos Date: Fri Apr 29 21:59:48 2011 New Revision: 51499 URL:
http://svn.reactos.org/svn/reactos?rev=51499&view=rev
Log: [explorer] - Return 1 when explorer terminates. This value lets winlogon know that explorer terminated without errors and it doesn't need to restart Modified: trunk/reactos/base/shell/explorer/explorer.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor…
============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Fri Apr 29 21:59:48 2011 @@ -968,7 +968,9 @@ } #endif - return Window::MessageLoop(); + Window::MessageLoop(); + + return 1; }
13 years, 7 months
1
0
0
0
[gadamopoulos] 51498: [taskmgr] - When terminating an application use 1 as exit code. This is used by Task Manager in windows. It also prevents explorer from restarting in windows - Disable redrawi...
by gadamopoulos@svn.reactos.org
Author: gadamopoulos Date: Fri Apr 29 21:49:37 2011 New Revision: 51498 URL:
http://svn.reactos.org/svn/reactos?rev=51498&view=rev
Log: [taskmgr] - When terminating an application use 1 as exit code. This is used by Task Manager in windows. It also prevents explorer from restarting in windows - Disable redrawing the list of processes while the list is updated. Fixes flicker in windows Modified: trunk/reactos/base/applications/taskmgr/endproc.c trunk/reactos/base/applications/taskmgr/procpage.c Modified: trunk/reactos/base/applications/taskmgr/endproc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
============================================================================== --- trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] Fri Apr 29 21:49:37 2011 @@ -50,7 +50,7 @@ return; } - if (!TerminateProcess(hProcess, 0)) + if (!TerminateProcess(hProcess, 1)) { GetLastErrorText(strErrorText, 260); LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256); Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/…
============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Fri Apr 29 21:49:37 2011 @@ -435,6 +435,8 @@ LV_ITEM item; LPPROCESS_PAGE_LIST_ITEM pData; + SendMessage(hProcessPageListCtrl, WM_SETREDRAW, FALSE, 0); + /* Remove old processes */ for (i = 0; i < ListView_GetItemCount(hProcessPageListCtrl); i++) { @@ -464,6 +466,8 @@ { (void)ListView_SortItems(hProcessPageListCtrl, ProcessPageCompareFunc, NULL); } + + SendMessage(hProcessPageListCtrl, WM_SETREDRAW, TRUE, 0); } BOOL ProcessRunning(ULONG ProcessId)
13 years, 7 months
1
0
0
0
[ilardig] 51497: [NOTEPAD] Patch by Edijs Kolesnikovics: Write default font, weight and point size when run for the first time. That's what ms notepad does too. See issue #5305 for more details.
by ilardig@svn.reactos.org
Author: ilardig Date: Fri Apr 29 21:47:53 2011 New Revision: 51497 URL:
http://svn.reactos.org/svn/reactos?rev=51497&view=rev
Log: [NOTEPAD] Patch by Edijs Kolesnikovics: Write default font, weight and point size when run for the first time. That's what ms notepad does too. See issue #5305 for more details. Modified: trunk/reactos/base/applications/notepad/settings.c Modified: trunk/reactos/base/applications/notepad/settings.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/…
============================================================================== --- trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] Fri Apr 29 21:47:53 2011 @@ -182,7 +182,6 @@ SaveDword(hKey, _T("lfCharSet"), Globals.lfFont.lfCharSet); SaveDword(hKey, _T("lfClipPrecision"), Globals.lfFont.lfClipPrecision); SaveDword(hKey, _T("lfEscapement"), Globals.lfFont.lfEscapement); - SaveString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName); SaveDword(hKey, _T("lfItalic"), Globals.lfFont.lfItalic); SaveDword(hKey, _T("lfOrientation"), Globals.lfFont.lfOrientation); SaveDword(hKey, _T("lfOutPrecision"), Globals.lfFont.lfOutPrecision); @@ -190,14 +189,27 @@ SaveDword(hKey, _T("lfQuality"), Globals.lfFont.lfQuality); SaveDword(hKey, _T("lfStrikeOut"), Globals.lfFont.lfStrikeOut); SaveDword(hKey, _T("lfUnderline"), Globals.lfFont.lfUnderline); - SaveDword(hKey, _T("lfWeight"), Globals.lfFont.lfWeight); - SaveDword(hKey, _T("iPointSize"), PointSizeFromHeight(Globals.lfFont.lfHeight)); SaveDword(hKey, _T("fWrap"), Globals.bWrapLongLines ? 1 : 0); SaveDword(hKey, _T("fStatusBar"), Globals.bShowStatusBar ? 1 : 0); SaveDword(hKey, _T("iWindowPosX"), Globals.main_rect.left); SaveDword(hKey, _T("iWindowPosY"), Globals.main_rect.top); SaveDword(hKey, _T("iWindowPosDX"), Globals.main_rect.right - Globals.main_rect.left); SaveDword(hKey, _T("iWindowPosDY"), Globals.main_rect.bottom - Globals.main_rect.top); + + if (*Globals.lfFont.lfFaceName == '\0') + { + static const TCHAR default_font[] = _T("Tahoma"); + _tcscpy(Globals.lfFont.lfFaceName, default_font); + Globals.lfFont.lfHeight = 100; + Globals.lfFont.lfWeight = 400; + SaveDword(hKey, _T("iPointSize"), Globals.lfFont.lfHeight); + } + else + { + SaveDword(hKey, _T("iPointSize"), PointSizeFromHeight(Globals.lfFont.lfHeight)); + } + SaveDword(hKey, _T("lfWeight"), Globals.lfFont.lfWeight); + SaveString(hKey, _T("lfFaceName"), Globals.lfFont.lfFaceName); RegCloseKey(hKey); }
13 years, 7 months
1
0
0
0
[gadamopoulos] 51496: [win32k] - UserSetProcessWindowStation: Use PsGetProcessWin32WindowStation and PsSetProcessWindowStation. Close the prevoious window station handle only when the window statio...
by gadamopoulos@svn.reactos.org
Author: gadamopoulos Date: Fri Apr 29 17:50:30 2011 New Revision: 51496 URL:
http://svn.reactos.org/svn/reactos?rev=51496&view=rev
Log: [win32k] - UserSetProcessWindowStation: Use PsGetProcessWin32WindowStation and PsSetProcessWindowStation. Close the prevoious window station handle only when the window station was not set by UserSetProcessWindowStation (should be the case for console apps) Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/include/ndk/psfuncs.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=…
============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Fri Apr 29 17:50:30 2011 @@ -76,6 +76,21 @@ NTAPI PsGetThreadWin32Thread( PETHREAD Thread +); + +NTKERNELAPI +PVOID +NTAPI +PsGetProcessWin32WindowStation( + PEPROCESS Process +); + +NTKERNELAPI +VOID +NTAPI +PsSetProcessWindowStation( + PEPROCESS Process, + PVOID WindowStation ); NTKERNELAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c [iso-8859-1] Fri Apr 29 17:50:30 2011 @@ -940,6 +940,7 @@ ppi = PsGetCurrentProcessWin32Process(); + /* Reference the new window station */ if(hWindowStation !=NULL) { Status = IntValidateWindowStationHandle( hWindowStation, @@ -956,27 +957,28 @@ } OldWinSta = ppi->prpwinsta; - hwinstaOld = ppi->hwinsta; + hwinstaOld = PsGetProcessWin32WindowStation(ppi->peProcess); + + /* Dereference the previous window station */ + if(OldWinSta != NULL) + { + ObDereferenceObject(OldWinSta); + } + + /* Check if we have a stale handle (it should happen for console apps) */ + if(hwinstaOld != ppi->hwinsta) + { + ObCloseHandle(hwinstaOld, UserMode); + } /* * FIXME - don't allow changing the window station if there are threads that are attached to desktops and own gui objects */ - - InterlockedExchangePointer(&PsGetCurrentProcess()->Win32WindowStation, hWindowStation); + + PsSetProcessWindowStation(ppi->peProcess, hWindowStation); ppi->prpwinsta = NewWinSta; ppi->hwinsta = hWindowStation; - - - if(OldWinSta != NULL) - { - ObDereferenceObject(OldWinSta); - } - - if(hwinstaOld != NULL) - { - ObCloseHandle(hwinstaOld, UserMode); - } return TRUE; }
13 years, 7 months
1
0
0
0
[ilardig] 51495: [DESK] French translation by Jeisson Toscano. I adjusted some dialogs to make text fit in. See issue #6028 for more details.
by ilardig@svn.reactos.org
Author: ilardig Date: Fri Apr 29 15:58:37 2011 New Revision: 51495 URL:
http://svn.reactos.org/svn/reactos?rev=51495&view=rev
Log: [DESK] French translation by Jeisson Toscano. I adjusted some dialogs to make text fit in. See issue #6028 for more details. Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc…
============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Fri Apr 29 15:58:37 2011 @@ -22,7 +22,7 @@ CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END -IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 212 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Écran de veille" FONT 8, "MS Shell Dlg", 0, 0 @@ -41,9 +41,9 @@ LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 CONTROL "À la reprise, demander un mot de &passe.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 97, 120, 138, 19 - GROUPBOX "G&estion de l'alimentation du moniteur", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + GROUPBOX "G&estion de l'alimentation du moniteur", IDC_SCREENS_DUMMY2, 6, 155, 232, 43 LTEXT "Pour modifier les paramètres de l'alimentation du moniteur, cliquez sur Gestion de l'alimentation.", - IDC_STATIC, 14, 166, 140, 20 + IDC_STATIC, 14, 166, 140, 25 PUSHBUTTON "&Gestion de l'alimentation...", IDC_SCREENS_POWER_BUTTON, 140, 171, 93, 13 END @@ -98,66 +98,66 @@ DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 END -IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 +IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 340, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE CAPTION "Effects" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 + CONTROL "&Utilisez l'effet de transition suivant pour les menus et les bulles d'aides:",IDC_EFFAPPEARANCE_ANIMATION,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 330, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 + CONTROL "U&tilisez la méthode suivante pour aplanir les bords des polices d'écran:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 330, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 - DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 -END - -IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 + CONTROL "Uti&liser de grandes icones",IDC_EFFAPPEARANCE_LARGEICONS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 330, 19 + CONTROL "&Montrer ombrage sous les menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 330, 19 + CONTROL "Montrer contenu des fenêtres lorsqu'elles sont bougés",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 330, 19 + CONTROL "&Cacher les lettres soulignées pour la navigation du clavier jusqu'à ce que j'appuie sur la touche Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 330, 19 + PUSHBUTTON "Annuler", IDCANCEL, 281, 165, 50, 14 + DEFPUSHBUTTON "Accepter", IDOK, 227, 165, 50, 14 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 207 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Paramètres" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Déplacez les icônes de moniteur pour qu'elles correspondent à l'arragement physique de vos moniteurs.",-1,3,3,240,10 - CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE - LTEXT "&Affichage :",1820,3,100,30,8 - LTEXT "<aucun>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Résolution de l'affichage",1818,3,120,115,43 + LTEXT "Déplacez les icônes de moniteur pour qu'elles correspondent à l'arragement physique de vos moniteurs.",-1,3,3,240,16 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,26,240,82,WS_EX_CLIENTEDGE + LTEXT "&Affichage :",1820,3,110,30,8 + LTEXT "<aucun>",IDC_SETTINGS_DEVICE,9,119,224,8 + GROUPBOX "&Résolution de l'affichage",1818,3,130,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", - TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 - LTEXT "Moins",1815,9,130,15,8,NOT WS_GROUP - LTEXT "Plus",1816,93,130,21,8,NOT WS_GROUP + TBS_AUTOTICKS | WS_TABSTOP, 30, 140, 58, 17 + LTEXT "Moins",1815,9,140,15,8,NOT WS_GROUP + LTEXT "Plus",1816,93,140,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Couleurs",1817,125,120,115,43 - COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + GROUPBOX "&Couleurs",1817,125,130,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,140,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,148,103,9 - PUSHBUTTON "A&vancé...",IDC_SETTINGS_ADVANCED,170,165,70,14 -END - -IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 253, 204 + CONTROL "",IDC_SETTINGS_SPECTRUM,"Static",SS_OWNERDRAW | SS_SUNKEN,131,158,103,9 + PUSHBUTTON "A&vancé...",IDC_SETTINGS_ADVANCED,170,175,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 299, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Général" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Affichage", -1, 7, 6, 237, 56, WS_GROUP + GROUPBOX "Affichage", -1, 7, 6, 284, 56, WS_GROUP LTEXT "Taille de la police :", -1, 14, 20, 222, 8 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 - GROUPBOX "Compatibilité", -1, 7, 67, 237, 97 - LTEXT "Quelques programmes peuvent mal fonctionner si vous ne redémarrez pas votre ordinateur après que vous ayiez changé les paramètres des couleurs.\r\n\nAprès que j'ai changé les paramètres des couleurs :", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&Redémarrer l'ordinateur avant d'appliquer les nouveaux paramètres des couleurs.", IDC_RESTART_RB, 14, 116, 224, 10 - AUTORADIOBUTTON "Appliquer les nouveaux paramètres des couleurs sans redémarrer.", IDC_WITHOUTREBOOT_RB, 14, 131, 224, 10 - AUTORADIOBUTTON "Me demander avant d'appliquer les nouveaux paramètres des couleurs.", IDC_ASKME_RB, 14, 146, 224, 10 + GROUPBOX "Compatibilité", -1, 7, 67, 284, 97 + LTEXT "Quelques programmes peuvent mal fonctionner si vous ne redémarrez pas votre ordinateur après que vous ayiez changé les paramètres des couleurs.\r\n\nAprès que j'ai changé les paramètres des couleurs :", -1, 12, 78, 274, 34 + AUTORADIOBUTTON "&Redémarrer l'ordinateur avant d'appliquer les nouveaux paramètres des couleurs.", IDC_RESTART_RB, 14, 116, 274, 10 + AUTORADIOBUTTON "Appliquer les nouveaux paramètres des couleurs sans redémarrer.", IDC_WITHOUTREBOOT_RB, 14, 131, 274, 10 + AUTORADIOBUTTON "Me demander avant d'appliquer les nouveaux paramètres des couleurs.", IDC_ASKME_RB, 14, 146, 274, 10 END IDR_PREVIEW_MENU MENU
13 years, 7 months
1
0
0
0
[ilardig] 51494: [rapps] Jeisson Toscano: French update + some Spanish translation updates (with corrections from vicmarcal and me) See issue #6012 for more details.
by ilardig@svn.reactos.org
Author: ilardig Date: Fri Apr 29 14:01:03 2011 New Revision: 51494 URL:
http://svn.reactos.org/svn/reactos?rev=51494&view=rev
Log: [rapps] Jeisson Toscano: French update + some Spanish translation updates (with corrections from vicmarcal and me) See issue #6012 for more details. Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt trunk/reactos/base/applications/rapps/rapps/fap.txt trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/net11.txt trunk/reactos/base/applications/rapps/rapps/net20.txt trunk/reactos/base/applications/rapps/rapps/net20sp2.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/remood.txt trunk/reactos/base/applications/rapps/rapps/steam.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/superfinder.txt trunk/reactos/base/applications/rapps/rapps/tahoma.txt trunk/reactos/base/applications/rapps/rapps/wme9.txt Modified: trunk/reactos/base/applications/rapps/rapps/abyss.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/abyss.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -14,6 +14,9 @@ [Section.0407] Description = Abyss Web Server ermöglicht es Webseiten auf Ihrem Computer zu hosten. Er unterstützt sichere SSL/TLS Verbindungen (HTTPS) sowie eine Vielfalt an Web Technologien. Er kann ebenfalls PHP, Perl, Python, ASP,
ASP.NET
, und Ruby on Rails Web Anwendungen ausführen, welche von Datenbanken, wie MySQL, SQLite, MS SQL Server, MS Access, oder Oracle unterstützt werden können. +[Section.040a] +Description = Abyss Web Server le permite alojar sitios Web en su ordenador. Soporta conexiones seguras SSL / TLS (HTTPS) asà como una gran cantidad de tecnologÃa web. También puede ejecutar aplicaciones web PHP, Perl, Python, ASP,
ASP.Net
, Ruby y Ruby on Rails, que pueden ser asociadas con bases de datos tales como MySQL, SQLite, MS SQL Server, MS Access u Oracle. + [Section.040c] Description = Abyss Web Server vous permet d'héberger vos sites internet sur votre ordinateur. Il supporte les connexions sécurisées SSL/TLS (HTTPS) ainsi qu'un grand nombre de technologies web. Il peut également faire tourner des applications web PHP, Perl, Python, ASP,
ASP.Net
, Ruby et Ruby on Rails, qui peuvent être associées à des bases de données telles que MySQL, SQLite, MS SQL Server, MS Access ou Oracle. Modified: trunk/reactos/base/applications/rapps/rapps/fap.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/fap.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -14,6 +14,9 @@ [Section.0407] Description = Kleiner und einfacher Mediaplayer. +[Section.040a] +Description = Reproductor de audio simple y ligero. + [Section.040c] Description = Lecteur audio simple et léger. Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -14,6 +14,9 @@ [Section.0407] Description = KDE für Windows. +[Section.040a] +Description = KDE para Windows. + [Section.040c] Description = KDE pour Windows. Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -11,6 +11,9 @@ URLDownload =
http://ftp.novell.com/pub/mono/archive/2.8.2/windows-installer/1/mono-2.8.2…
CDPath = none +[Section.040a] +Description = Versión open-source de .NET Framework + [Section.040c] Description = Framework .net open source. Modified: trunk/reactos/base/applications/rapps/rapps/net11.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net11.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net11.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -11,6 +11,9 @@ URLDownload =
http://download.microsoft.com/download/a/a/c/aac39226-8825-44ce-90e3-bf8203…
CDPath = none +[Section.040a] +Description = Microsoft .NET Framework versión 1.1 - Paquete redistribuible. + [Section.040c] Description = Microsoft .NET Framework version 1.1 - Paquet redistribuable. Modified: trunk/reactos/base/applications/rapps/rapps/net20.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net20.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -11,6 +11,9 @@ URLDownload =
http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-521544…
CDPath = none +[Section.040a] +Description = Microsoft .NET Framework versión 2.0 - Paquete redistribuible. + [Section.040c] Description = Microsoft .NET Framework version 2.0 - Paquet redistribuable. Modified: trunk/reactos/base/applications/rapps/rapps/net20sp2.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -11,6 +11,9 @@ URLDownload =
http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff7…
CDPath = none +[Section.040a] +Description = Microsoft .NET Framework versión 2.0 Service Pack 2. + [Section.040c] Description = Microsoft .NET Framework version 2.0 Service Pack 2. Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -14,6 +14,9 @@ [Section.0407] Description = Eine sehr mächtige, dynamische Programmiersprache. +[Section.040a] +Description = Un lenguaje de programación dinámico sumamente potente. + [Section.040c] Description = Un langage de programmation dynamique remarquablement puissant. Modified: trunk/reactos/base/applications/rapps/rapps/remood.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/remood.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -14,6 +14,9 @@ [Section.0407] Description = ReMooD ist ein Port des Doom Legacy Sources. Es versucht das klassische Legacy Erfahrung zusammen mit neuen Features und mehr Stabilität zu bieten. +[Section.040a] +Description = ReMood es un port de Doom Legacy. Su fin es proporcionar la clásica experiencia anterior con nuevas caracterÃsticas y mayor estabilidad. + [Section.040c] Description = ReMood est un portage du source de Doom Legacy. Son but est de fournir l'expérience classique de Legacy avec de nouvelles fonctionnalités et plus de stabilité. Modified: trunk/reactos/base/applications/rapps/rapps/steam.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/steam.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/steam.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -14,6 +14,9 @@ [Section.0407] Description = Die STEAM Spieleplattform, die von viele Spielen verwendet wird. +[Section.040a] +Description = La plataforma de juego STEAM usada por muchos juegos actuales. + [Section.040c] Description = La plateforme de jeu STEAM utilisée par beaucoup de jeux de nos jours. Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -14,6 +14,12 @@ [Section.0407] Description = Sumatra PDF ist ein freies, schlankes, Open-Source PDF-Anzeigeprogramm. +[Section.040a] +Description = Sumatra PDF es un lector PDF ligero, libre y open-source. + +[Section.040c] +Description = Sumatra PDF est un lecteur PDF léger, libre et open-source. + [Section.0410] Description = Sumatra PDF è un visualizzatore di file PDF. E' molto leggero ed è open source. Modified: trunk/reactos/base/applications/rapps/rapps/superfinder.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/superfinder.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/superfinder.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -14,6 +14,9 @@ [Section.0407] Description = Eine schnelle und effektive Suchanwendung. +[Section.040a] +Description = Una aplicación de búsqueda rápida llena de opciones. + [Section.040c] Description = Une application de recherche rapide et riche en fonctionnalités. Modified: trunk/reactos/base/applications/rapps/rapps/tahoma.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tahoma.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -15,6 +15,10 @@ Licence = Unbekannt Description = Tahoma Font pack, der von einigen Anwendungen benötigt wird (Steam). +[Section.040a] +Licence = Desconocida +Description = Paquete de fuente Tahoma, necesaria para ciertas aplicaciones (Steam). + [Section.040c] Licence = Inconnue Description = Package pour la police Tahoma, nécessaire pour certaines applications (Steam). Modified: trunk/reactos/base/applications/rapps/rapps/wme9.txt URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra…
============================================================================== --- trunk/reactos/base/applications/rapps/rapps/wme9.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/wme9.txt [iso-8859-1] Fri Apr 29 14:01:03 2011 @@ -17,7 +17,7 @@ [Section.040a] Licence = Desconocida -[Section.040a] +[Section.040c] Licence = Inconnue [Section.0415]
13 years, 7 months
1
0
0
0
← Newer
1
2
3
4
5
...
30
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
Results per page:
10
25
50
100
200