Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[janderwald] 73033: [USBAUDIO] - implement mute control property handler

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Oct 25 19:20:09 2016 New Revision: 73033 URL: http://svn.reactos.org/svn/reactos?rev=73033&view=rev Log: [USBAUDIO] - implement mute control property handler Modified: trunk/reactos/drivers/usb/usbaudio/filter.c trunk/reactos/drivers/usb/usbaudio/guid.c trunk/reactos/drivers/usb/usbaudio/pin.c trunk/reactos/drivers/usb/usbaudio/usbaudio.h Modified: trunk/reactos/drivers/usb/usbaudio/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/filte… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/filter.c [iso-8859-1] Tue Oct 25 19:20:09 2016 @@ -89,6 +89,155 @@ NULL, NULL }; + +NTSTATUS NTAPI FilterAudioVolumeHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); +NTSTATUS NTAPI FilterAudioMuteHandler(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + +DEFINE_KSPROPERTY_TABLE_AUDIO_VOLUME(FilterAudioVolumePropertySet, FilterAudioVolumeHandler); +DEFINE_KSPROPERTY_TABLE_AUDIO_MUTE(FilterAudioMutePropertySet, FilterAudioMuteHandler); + + +static KSPROPERTY_SET FilterAudioVolumePropertySetArray[] = +{ + { + &KSPROPSETID_Audio, + sizeof(FilterAudioVolumePropertySet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&FilterAudioVolumePropertySet, + 0, + NULL + } +}; + +static KSPROPERTY_SET FilterAudioMutePropertySetArray[] = +{ + { + &KSPROPSETID_Audio, + sizeof(FilterAudioMutePropertySet) / sizeof(KSPROPERTY_ITEM), + (const KSPROPERTY_ITEM*)&FilterAudioMutePropertySet, + 0, + NULL + } +}; + +NTSTATUS +UsbAudioGetSetProperty( + IN PDEVICE_OBJECT DeviceObject, + IN UCHAR Request, + IN USHORT Value, + IN USHORT Index, + IN PVOID TransferBuffer, + IN ULONG TransferBufferLength, + IN ULONG TransferFlags) +{ + PURB Urb; + NTSTATUS Status; + + /* allocate urb */ + Urb = AllocFunction(sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); + if (!Urb) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* format urb */ + UsbBuildVendorRequest(Urb, + URB_FUNCTION_CLASS_INTERFACE, + sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), + TransferFlags, + 0, + Request, + Value, + Index, + TransferBuffer, + NULL, + TransferBufferLength, + NULL); + + /* submit urb */ + Status = SubmitUrbSync(DeviceObject, Urb); + + DPRINT1("UsbAudioGetSetProperty Status %x\n", Status); + FreeFunction(Urb); + return Status; +} + +PNODE_CONTEXT +FindNodeContextWithNode( + IN PNODE_CONTEXT NodeContext, + IN ULONG NodeContextCount, + IN ULONG NodeId) +{ + ULONG Index, NodeIndex; + for (Index = 0; Index < NodeContextCount; Index++) + { + for (NodeIndex = 0; NodeIndex < NodeContext[Index].NodeCount; NodeIndex++) + { + if (NodeContext[Index].Nodes[NodeIndex] == NodeId) + { + return &NodeContext[Index]; + } + } + } + return NULL; +} + + +NTSTATUS +NTAPI +FilterAudioMuteHandler( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + PKSNODEPROPERTY_AUDIO_CHANNEL Property; + PKSFILTER Filter; + PFILTER_CONTEXT FilterContext; + PNODE_CONTEXT NodeContext; + PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR FeatureUnitDescriptor; + NTSTATUS Status = STATUS_INVALID_PARAMETER; + + /* get filter from irp */ + Filter = KsGetFilterFromIrp(Irp); + + if (Filter) + { + /* get property */ + Property = (PKSNODEPROPERTY_AUDIO_CHANNEL)Request; + + /* get filter context */ + FilterContext = (PFILTER_CONTEXT)Filter->Context; + + /* search for node context */ + NodeContext = FindNodeContextWithNode(FilterContext->DeviceExtension->NodeContext, FilterContext->DeviceExtension->NodeContextCount, Property->NodeProperty.NodeId); + if (NodeContext) + { + FeatureUnitDescriptor = (PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR)NodeContext->Descriptor; + if (Property->NodeProperty.Property.Flags & KSPROPERTY_TYPE_GET) + { + Status = UsbAudioGetSetProperty(FilterContext->DeviceExtension->LowerDevice, 0x81, 0x100, FeatureUnitDescriptor->bUnitID << 8, Data, 1, USBD_TRANSFER_DIRECTION_IN); + Irp->IoStatus.Information = sizeof(BOOL); + } + else + { + Status = UsbAudioGetSetProperty(FilterContext->DeviceExtension->LowerDevice, 0x01, 0x100, FeatureUnitDescriptor->bUnitID << 8, Data, 1, USBD_TRANSFER_DIRECTION_OUT); + } + } + } + return Status; +} + +NTSTATUS +NTAPI +FilterAudioVolumeHandler( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + UNIMPLEMENTED + return STATUS_SUCCESS; +} + ULONG CountTopologyComponents( @@ -200,10 +349,11 @@ PUSB_AUDIO_CONTROL_INPUT_TERMINAL_DESCRIPTOR InputTerminalDescriptor; PUSB_AUDIO_CONTROL_FEATURE_UNIT_DESCRIPTOR FeatureUnitDescriptor; PUSB_AUDIO_CONTROL_MIXER_UNIT_DESCRIPTOR MixerUnitDescriptor; - PUSB_AUDIO_CONTROL_OUTPUT_TERMINAL_DESCRIPTOR OutputTerminalDescriptor; + PUSB_AUDIO_CONTROL_OUTPUT_TERMINAL_DESCRIPTOR OutputTerminalDescriptor; PKSNODE_DESCRIPTOR NodeDescriptors; PNODE_CONTEXT NodeContext, PreviousNodeContext; PKSTOPOLOGY_CONNECTION Connections; + PKSAUTOMATION_TABLE AutomationTable; /* get device extension */ DeviceExtension = Device->Context; @@ -220,12 +370,13 @@ } FilterDescriptor->NodeDescriptorSize = sizeof(KSNODE_DESCRIPTOR); - NodeContext = AllocFunction(sizeof(NODE_CONTEXT) * ControlDescriptorCount); + DeviceExtension->NodeContext = NodeContext = AllocFunction(sizeof(NODE_CONTEXT) * ControlDescriptorCount); if (!NodeContext) { /* no memory */ return STATUS_INSUFFICIENT_RESOURCES; } + DeviceExtension->NodeContextCount = ControlDescriptorCount; DescriptorCount = 0; /* first enumerate all topology nodes */ @@ -336,7 +487,13 @@ { NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Type = &KSNODETYPE_MUTE; NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Name = &KSNODETYPE_MUTE; - NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].AutomationTable = AllocFunction(sizeof(KSAUTOMATION_TABLE)); + NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].AutomationTable = AutomationTable = AllocFunction(sizeof(KSAUTOMATION_TABLE)); + if (AutomationTable) + { + AutomationTable->PropertySets = FilterAudioMutePropertySetArray; + AutomationTable->PropertySetsCount = 1; + AutomationTable->PropertyItemSize = sizeof(KSPROPERTY_ITEM); + } /* insert into node context*/ NodeContext[DescriptorCount].Nodes[NodeContext[DescriptorCount].NodeCount] = FilterDescriptor->NodeDescriptorsCount; @@ -348,7 +505,13 @@ { NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Type = &KSNODETYPE_VOLUME; NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].Name = &KSNODETYPE_VOLUME; - NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].AutomationTable = AllocFunction(sizeof(KSAUTOMATION_TABLE)); + NodeDescriptors[FilterDescriptor->NodeDescriptorsCount].AutomationTable = AutomationTable = AllocFunction(sizeof(KSAUTOMATION_TABLE)); + if (AutomationTable) + { + AutomationTable->PropertySets = FilterAudioVolumePropertySetArray; + AutomationTable->PropertySetsCount = 1; + AutomationTable->PropertyItemSize = sizeof(KSPROPERTY_ITEM); + } /* insert into node context*/ NodeContext[DescriptorCount].Nodes[NodeContext[DescriptorCount].NodeCount] = FilterDescriptor->NodeDescriptorsCount; Modified: trunk/reactos/drivers/usb/usbaudio/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/guid.… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/guid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/guid.c [iso-8859-1] Tue Oct 25 19:20:09 2016 @@ -16,4 +16,5 @@ DEFINE_GUID(KSNODETYPE_SUPERMIX, 0xE573ADC0L, 0xC555, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSNODETYPE_VOLUME, 0x3A5ACC00L, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1); DEFINE_GUID(KSCOMPONENTID_USBAUDIO, 0x8F1275F0L, 0x26E9, 0x4264, 0xBA, 0x4D, 0x39, 0xFF, 0xF0, 0x1D, 0x94, 0xAA); +DEFINE_GUID(KSPROPSETID_Audio, 0x45FFAAA0L, 0x6E1B, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00); /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Modified: trunk/reactos/drivers/usb/usbaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pin.c… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Tue Oct 25 19:20:09 2016 @@ -88,58 +88,6 @@ *OutUrb = Urb; return STATUS_SUCCESS; -} - -NTSTATUS -UsbAudioSetMuteOff( - IN PKSPIN Pin) -{ - PURB Urb; - PVOID SampleRateBuffer; - PPIN_CONTEXT PinContext; - NTSTATUS Status; - - /* allocate sample rate buffer */ - SampleRateBuffer = AllocFunction(sizeof(ULONG)); - if (!SampleRateBuffer) - { - /* no memory */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* allocate urb */ - Urb = AllocFunction(sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST)); - if (!Urb) - { - /* no memory */ - FreeFunction(SampleRateBuffer); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* FIXME: determine controls and format urb */ - UsbBuildVendorRequest(Urb, - URB_FUNCTION_CLASS_INTERFACE, - sizeof(struct _URB_CONTROL_VENDOR_OR_CLASS_REQUEST), - USBD_TRANSFER_DIRECTION_OUT, - 0, - 0x01, - 0x100, - 0x300, - SampleRateBuffer, - NULL, - 1, - NULL); - - /* get pin context */ - PinContext = Pin->Context; - - /* submit urb */ - Status = SubmitUrbSync(PinContext->LowerDevice, Urb); - - DPRINT1("UsbAudioSetMuteOff Pin %p Status %x\n", Pin, Status); - FreeFunction(Urb); - FreeFunction(SampleRateBuffer); - return Status; } NTSTATUS @@ -696,7 +644,6 @@ } /* FIXME move to build filter topology*/ - UsbAudioSetMuteOff(Pin); UsbAudioSetVolume(Pin); /* select streaming interface */ Modified: trunk/reactos/drivers/usb/usbaudio/usbaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] Tue Oct 25 19:20:09 2016 @@ -35,6 +35,35 @@ #define USB_AUDIO_INPUT_TERMINAL (0x02) #define USB_AUDIO_OUTPUT_TERMINAL (0x03) +#define DEFINE_KSPROPERTY_ITEM_AUDIO_VOLUME(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_AUDIO_VOLUMELEVEL,\ + (Handler),\ + sizeof(KSNODEPROPERTY_AUDIO_CHANNEL),\ + sizeof(LONG),\ + (Handler), NULL, 0, NULL, NULL, 0) + + +#define DEFINE_KSPROPERTY_TABLE_AUDIO_VOLUME(TopologySet, Handler)\ +DEFINE_KSPROPERTY_TABLE(TopologySet) {\ + DEFINE_KSPROPERTY_ITEM_AUDIO_VOLUME(Handler)\ +} + +#define DEFINE_KSPROPERTY_ITEM_AUDIO_MUTE(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_AUDIO_MUTE,\ + (Handler),\ + sizeof(KSNODEPROPERTY_AUDIO_CHANNEL),\ + sizeof(BOOL),\ + (Handler), NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_TABLE_AUDIO_MUTE(TopologySet, Handler)\ +DEFINE_KSPROPERTY_TABLE(TopologySet) {\ + DEFINE_KSPROPERTY_ITEM_AUDIO_MUTE(Handler)\ +} + + + #include <pshpack1.h> typedef struct @@ -128,6 +157,13 @@ #include <poppack.h> +typedef struct +{ + PUSB_COMMON_DESCRIPTOR Descriptor; + ULONG NodeCount; + ULONG Nodes[20]; +}NODE_CONTEXT, *PNODE_CONTEXT; + typedef struct __DEVICE_EXTENSION__ { PDEVICE_OBJECT LowerDevice; /* lower device*/ @@ -135,7 +171,8 @@ PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; /* usb device descriptor */ PUSBD_INTERFACE_INFORMATION InterfaceInfo; /* interface information */ USBD_CONFIGURATION_HANDLE ConfigurationHandle; /* configuration handle */ - + PNODE_CONTEXT NodeContext; /* node context */ + ULONG NodeContextCount; /* node context count */ }DEVICE_EXTENSION, *PDEVICE_EXTENSION; typedef struct @@ -161,14 +198,6 @@ PKSWORKER StarvationWorker; /* capture worker */ }PIN_CONTEXT, *PPIN_CONTEXT; -typedef struct -{ - PUSB_COMMON_DESCRIPTOR Descriptor; - ULONG NodeCount; - ULONG Nodes[20]; -}NODE_CONTEXT, *PNODE_CONTEXT; - - /* filter.c */ NTSTATUS

8 years, 2 months

[khornicek] 73032: [GDI32] - comply with MSDN and stop enumerating font families as soon as the user provided callback returns zero - fixes bunch of user32:sysparams tests which rely on this

by khornicek＠svn.reactos.org

Author: khornicek Date: Tue Oct 25 17:08:05 2016 New Revision: 73032 URL: http://svn.reactos.org/svn/reactos?rev=73032&view=rev Log: [GDI32] - comply with MSDN and stop enumerating font families as soon as the user provided callback returns zero - fixes bunch of user32:sysparams tests which rely on this Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] Tue Oct 25 17:08:05 2016 @@ -278,6 +278,9 @@ (VOID*)&NewTextMetricExA, Info[i].FontType, lParam); } + + if(Ret == 0) + break; } RtlFreeHeap(GetProcessHeap(), 0, Info);

8 years, 2 months

[phater] 73031: [WSHTCPIP] Don't return NO_ERROR in unimplemented WSHIoctl. It only confuses programs. Return WSAEINVAL. CORE-12104

by phater＠svn.reactos.org

Author: phater Date: Tue Oct 25 09:23:40 2016 New Revision: 73031 URL: http://svn.reactos.org/svn/reactos?rev=73031&view=rev Log: [WSHTCPIP] Don't return NO_ERROR in unimplemented WSHIoctl. It only confuses programs. Return WSAEINVAL. CORE-12104 Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpi… ============================================================================== --- trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Tue Oct 25 09:23:40 2016 @@ -355,7 +355,7 @@ DPRINT1("Ioctl: Unknown IOCTL code: %d\n", IoControlCode); - return NO_ERROR; + return WSAEINVAL; }

8 years, 2 months

[phater] 73030: [MSAFD] Implement WSPIoctl overlapped. CORE-12162 #resolve

by phater＠svn.reactos.org

Author: phater Date: Tue Oct 25 07:54:00 2016 New Revision: 73030 URL: http://svn.reactos.org/svn/reactos?rev=73030&view=rev Log: [MSAFD] Implement WSPIoctl overlapped. CORE-12162 #resolve Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/event.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Tue Oct 25 07:54:00 2016 @@ -352,7 +352,13 @@ /* Save Group Info */ if (g != 0) { - GetSocketInformation(Socket, AFD_INFO_GROUP_ID_TYPE, NULL, NULL, &GroupData); + GetSocketInformation(Socket, + AFD_INFO_GROUP_ID_TYPE, + NULL, + NULL, + &GroupData, + NULL, + NULL); Socket->SharedData->GroupID = GroupData.u.LowPart; Socket->SharedData->GroupType = GroupData.u.HighPart; } @@ -362,12 +368,16 @@ AFD_INFO_SEND_WINDOW_SIZE, NULL, &Socket->SharedData->SizeOfSendBuffer, + NULL, + NULL, NULL); GetSocketInformation (Socket, AFD_INFO_RECEIVE_WINDOW_SIZE, NULL, &Socket->SharedData->SizeOfRecvBuffer, + NULL, + NULL, NULL); ok: @@ -614,7 +624,7 @@ if (!Socket) { NtClose(SockEvent); - *lpErrno = WSAENOTSOCK; + if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } @@ -640,7 +650,7 @@ { WARN("Socket is closing.\n"); NtClose(SockEvent); - *lpErrno = WSAENOTSOCK; + if (lpErrno) *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; } /* Set the state to close */ @@ -671,6 +681,8 @@ AFD_INFO_SENDS_IN_PROGRESS, NULL, &SendsInProgress, + NULL, + NULL, NULL)) { /* Bail out if anything but NO_ERROR */ @@ -696,7 +708,7 @@ WARN("Would block!\n"); NtClose(SockEvent); Socket->SharedData->State = OldState; - *lpErrno = WSAEWOULDBLOCK; + if (lpErrno) *lpErrno = WSAEWOULDBLOCK; return SOCKET_ERROR; } @@ -2182,132 +2194,154 @@ OUT LPINT lpErrno) { PSOCKET_INFORMATION Socket = NULL; - BOOLEAN NeedsCompletion; + BOOLEAN NeedsCompletion = lpOverlapped != NULL; BOOLEAN NonBlocking; - - if (!lpcbBytesReturned) - { - *lpErrno = WSAEFAULT; - return SOCKET_ERROR; - } + INT Errno = NO_ERROR, Ret = SOCKET_ERROR; + DWORD cbRet = 0; /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); if (!Socket) { - *lpErrno = WSAENOTSOCK; - return SOCKET_ERROR; - } - - *lpcbBytesReturned = 0; + if(lpErrno) + *lpErrno = WSAENOTSOCK; + return SOCKET_ERROR; + } + + if (!lpcbBytesReturned && !lpOverlapped) + { + if(lpErrno) + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } switch( dwIoControlCode ) { case FIONBIO: if( cbInBuffer < sizeof(INT) || IS_INTRESOURCE(lpvInBuffer) ) { - *lpErrno = WSAEFAULT; - return SOCKET_ERROR; + Errno = WSAEFAULT; + break; } NonBlocking = *((PULONG)lpvInBuffer) ? TRUE : FALSE; Socket->SharedData->NonBlocking = NonBlocking ? 1 : 0; - *lpErrno = SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &NonBlocking, NULL, NULL); - if (*lpErrno != NO_ERROR) - return SOCKET_ERROR; - else - return NO_ERROR; + NeedsCompletion = FALSE; + Errno = SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &NonBlocking, NULL, NULL, lpOverlapped, lpCompletionRoutine); + if (Errno == NO_ERROR) + Ret = NO_ERROR; + break; case FIONREAD: if (IS_INTRESOURCE(lpvOutBuffer) || cbOutBuffer == 0) { - *lpcbBytesReturned = sizeof(ULONG); - *lpErrno = WSAEFAULT; - return SOCKET_ERROR; + cbRet = sizeof(ULONG); + Errno = WSAEFAULT; + break; } if (cbOutBuffer < sizeof(ULONG)) { - *lpErrno = WSAEINVAL; - return SOCKET_ERROR; - } - *lpErrno = GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, NULL, (PULONG)lpvOutBuffer, NULL); - if (*lpErrno != NO_ERROR) - return SOCKET_ERROR; - else - { - *lpcbBytesReturned = sizeof(ULONG); - return NO_ERROR; - } + Errno = WSAEINVAL; + break; + } + NeedsCompletion = FALSE; + Errno = GetSocketInformation(Socket, AFD_INFO_RECEIVE_CONTENT_SIZE, NULL, (PULONG)lpvOutBuffer, NULL, lpOverlapped, lpCompletionRoutine); + if (Errno == NO_ERROR) + { + cbRet = sizeof(ULONG); + Ret = NO_ERROR; + } + break; case SIOCATMARK: if (IS_INTRESOURCE(lpvOutBuffer) || cbOutBuffer == 0) { - *lpcbBytesReturned = sizeof(BOOL); - *lpErrno = WSAEFAULT; - return SOCKET_ERROR; + cbRet = sizeof(BOOL); + Errno = WSAEFAULT; + break; } if (cbOutBuffer < sizeof(BOOL)) { - *lpErrno = WSAEINVAL; - return SOCKET_ERROR; + Errno = WSAEINVAL; + break; } /* FIXME: Return false for now */ *(BOOL*)lpvOutBuffer = FALSE; - *lpcbBytesReturned = sizeof(BOOL); - *lpErrno = NO_ERROR; - return NO_ERROR; + cbRet = sizeof(BOOL); + Errno = NO_ERROR; + Ret = NO_ERROR; + break; case SIO_GET_EXTENSION_FUNCTION_POINTER: - *lpErrno = WSAEINVAL; - return SOCKET_ERROR; - + Errno = WSAEINVAL; + break; case SIO_ADDRESS_LIST_QUERY: if (IS_INTRESOURCE(lpvOutBuffer) || cbOutBuffer == 0) { - *lpcbBytesReturned = sizeof(SOCKET_ADDRESS_LIST) + sizeof(Socket->SharedData->WSLocalAddress); - *lpErrno = WSAEFAULT; - return SOCKET_ERROR; + cbRet = sizeof(SOCKET_ADDRESS_LIST) + sizeof(Socket->SharedData->WSLocalAddress); + Errno = WSAEFAULT; + break; } if (cbOutBuffer < sizeof(INT)) { - *lpErrno = WSAEINVAL; - return SOCKET_ERROR; - } - - *lpcbBytesReturned = sizeof(SOCKET_ADDRESS_LIST) + sizeof(Socket->SharedData->WSLocalAddress); + Errno = WSAEINVAL; + break; + } + + cbRet = sizeof(SOCKET_ADDRESS_LIST) + sizeof(Socket->SharedData->WSLocalAddress); ((SOCKET_ADDRESS_LIST*)lpvOutBuffer)->iAddressCount = 1; if (cbOutBuffer < (sizeof(SOCKET_ADDRESS_LIST) + sizeof(Socket->SharedData->WSLocalAddress))) { - *lpErrno = WSAEFAULT; - return SOCKET_ERROR; + Errno = WSAEFAULT; + break; } ((SOCKET_ADDRESS_LIST*)lpvOutBuffer)->Address[0].iSockaddrLength = sizeof(Socket->SharedData->WSLocalAddress); ((SOCKET_ADDRESS_LIST*)lpvOutBuffer)->Address[0].lpSockaddr = &Socket->SharedData->WSLocalAddress; - *lpErrno = NO_ERROR; - return NO_ERROR; - + Errno = NO_ERROR; + Ret = NO_ERROR; + break; default: - *lpErrno = Socket->HelperData->WSHIoctl(Socket->HelperContext, - Handle, - Socket->TdiAddressHandle, - Socket->TdiConnectionHandle, - dwIoControlCode, - lpvInBuffer, - cbInBuffer, - lpvOutBuffer, - cbOutBuffer, - lpcbBytesReturned, - lpOverlapped, - lpCompletionRoutine, - (LPBOOL)&NeedsCompletion); - - if (*lpErrno != NO_ERROR) - return SOCKET_ERROR; - else - return NO_ERROR; - } + Errno = Socket->HelperData->WSHIoctl(Socket->HelperContext, + Handle, + Socket->TdiAddressHandle, + Socket->TdiConnectionHandle, + dwIoControlCode, + lpvInBuffer, + cbInBuffer, + lpvOutBuffer, + cbOutBuffer, + &cbRet, + lpOverlapped, + lpCompletionRoutine, + (LPBOOL)&NeedsCompletion); + + if (Errno == NO_ERROR) + Ret = NO_ERROR; + break; + } + if (lpOverlapped && NeedsCompletion) + { + lpOverlapped->Internal = Errno; + lpOverlapped->InternalHigh = cbRet; + if (lpCompletionRoutine != NULL) + { + lpCompletionRoutine(Errno, cbRet, lpOverlapped, 0); + } + if (lpOverlapped->hEvent) + SetEvent(lpOverlapped->hEvent); + if (!PostQueuedCompletionStatus((HANDLE)Handle, cbRet, 0, lpOverlapped)) + { + ERR("PostQueuedCompletionStatus failed %d\n", GetLastError()); + } + return NO_ERROR; + } + if (lpErrno) + *lpErrno = Errno; + if (lpcbBytesReturned) + *lpcbBytesReturned = cbRet; + return Ret; } @@ -2852,18 +2886,34 @@ return 0; } - +VOID +NTAPI +AfdInfoAPC(PVOID ApcContext, + PIO_STATUS_BLOCK IoStatusBlock, + ULONG Reserved) +{ + PAFDAPCCONTEXT Context = ApcContext; + + Context->lpCompletionRoutine(IoStatusBlock->Status, IoStatusBlock->Information, Context->lpOverlapped, 0); + HeapFree(GlobalHeap, 0, ApcContext); +} int GetSocketInformation(PSOCKET_INFORMATION Socket, ULONG AfdInformationClass, PBOOLEAN Boolean OPTIONAL, PULONG Ulong OPTIONAL, - PLARGE_INTEGER LargeInteger OPTIONAL) + PLARGE_INTEGER LargeInteger OPTIONAL, + LPWSAOVERLAPPED Overlapped OPTIONAL, + LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL) { - IO_STATUS_BLOCK IOSB; + PIO_STATUS_BLOCK IOSB; + IO_STATUS_BLOCK DummyIOSB; AFD_INFO InfoData; NTSTATUS Status; + PVOID APCContext; + PIO_APC_ROUTINE APCFunction; + HANDLE Event = NULL; HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, @@ -2878,12 +2928,56 @@ /* Set Info Class */ InfoData.InformationClass = AfdInformationClass; + /* Verify if we should use APC */ + if (Overlapped == NULL) + { + /* Not using Overlapped structure, so use normal blocking on event */ + APCContext = NULL; + APCFunction = NULL; + Event = SockEvent; + IOSB = &DummyIOSB; + } + else + { + /* Overlapped request for non overlapped opened socket */ + if ((Socket->SharedData->CreateFlags & SO_SYNCHRONOUS_NONALERT) != 0) + { + TRACE("Opened without flag WSA_FLAG_OVERLAPPED. Do nothing.\n"); + return 0; + } + if (CompletionRoutine == NULL) + { + /* Using Overlapped Structure, but no Completition Routine, so no need for APC */ + APCContext = Overlapped; + APCFunction = NULL; + Event = Overlapped->hEvent; + } + else + { + /* Using Overlapped Structure and a Completition Routine, so use an APC */ + APCFunction = &AfdInfoAPC; // should be a private io completition function inside us + APCContext = HeapAlloc(GlobalHeap, 0, sizeof(AFDAPCCONTEXT)); + if (!APCContext) + { + ERR("Not enough memory for APC Context\n"); + return WSAEFAULT; + } + ((PAFDAPCCONTEXT)APCContext)->lpCompletionRoutine = CompletionRoutine; + ((PAFDAPCCONTEXT)APCContext)->lpOverlapped = Overlapped; + ((PAFDAPCCONTEXT)APCContext)->lpSocket = Socket; + } + + IOSB = (PIO_STATUS_BLOCK)&Overlapped->Internal; + } + + IOSB->Status = STATUS_PENDING; + /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Socket->Handle, - SockEvent, - NULL, - NULL, - &IOSB, + Event, + APCFunction, + APCContext, + IOSB, IOCTL_AFD_GET_INFO, &InfoData, sizeof(InfoData), @@ -2891,10 +2985,18 @@ sizeof(InfoData)); /* Wait for return */ + if (Status == STATUS_PENDING && Overlapped == NULL) + { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB->Status; + } + + TRACE("Status %x Information %d\n", Status, IOSB->Information); + if (Status == STATUS_PENDING) { - WaitForSingleObject(SockEvent, INFINITE); - Status = IOSB.Status; + TRACE("Leaving (Pending)\n"); + return WSA_IO_PENDING; } if (Status != STATUS_SUCCESS) @@ -2926,11 +3028,17 @@ ULONG AfdInformationClass, PBOOLEAN Boolean OPTIONAL, PULONG Ulong OPTIONAL, - PLARGE_INTEGER LargeInteger OPTIONAL) + PLARGE_INTEGER LargeInteger OPTIONAL, + LPWSAOVERLAPPED Overlapped OPTIONAL, + LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL) { - IO_STATUS_BLOCK IOSB; + PIO_STATUS_BLOCK IOSB; + IO_STATUS_BLOCK DummyIOSB; AFD_INFO InfoData; NTSTATUS Status; + PVOID APCContext; + PIO_APC_ROUTINE APCFunction; + HANDLE Event = NULL; HANDLE SockEvent; Status = NtCreateEvent(&SockEvent, @@ -2959,12 +3067,56 @@ InfoData.Information.Boolean = *Boolean; } + /* Verify if we should use APC */ + if (Overlapped == NULL) + { + /* Not using Overlapped structure, so use normal blocking on event */ + APCContext = NULL; + APCFunction = NULL; + Event = SockEvent; + IOSB = &DummyIOSB; + } + else + { + /* Overlapped request for non overlapped opened socket */ + if ((Socket->SharedData->CreateFlags & SO_SYNCHRONOUS_NONALERT) != 0) + { + TRACE("Opened without flag WSA_FLAG_OVERLAPPED. Do nothing.\n"); + return 0; + } + if (CompletionRoutine == NULL) + { + /* Using Overlapped Structure, but no Completition Routine, so no need for APC */ + APCContext = Overlapped; + APCFunction = NULL; + Event = Overlapped->hEvent; + } + else + { + /* Using Overlapped Structure and a Completition Routine, so use an APC */ + APCFunction = &AfdInfoAPC; // should be a private io completition function inside us + APCContext = HeapAlloc(GlobalHeap, 0, sizeof(AFDAPCCONTEXT)); + if (!APCContext) + { + ERR("Not enough memory for APC Context\n"); + return WSAEFAULT; + } + ((PAFDAPCCONTEXT)APCContext)->lpCompletionRoutine = CompletionRoutine; + ((PAFDAPCCONTEXT)APCContext)->lpOverlapped = Overlapped; + ((PAFDAPCCONTEXT)APCContext)->lpSocket = Socket; + } + + IOSB = (PIO_STATUS_BLOCK)&Overlapped->Internal; + } + + IOSB->Status = STATUS_PENDING; + /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Socket->Handle, - SockEvent, - NULL, - NULL, - &IOSB, + Event, + APCFunction, + APCContext, + IOSB, IOCTL_AFD_SET_INFO, &InfoData, sizeof(InfoData), @@ -2972,13 +3124,21 @@ 0); /* Wait for return */ + if (Status == STATUS_PENDING && Overlapped == NULL) + { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB->Status; + } + + NtClose( SockEvent ); + + TRACE("Status %x Information %d\n", Status, IOSB->Information); + if (Status == STATUS_PENDING) { - WaitForSingleObject(SockEvent, INFINITE); - Status = IOSB.Status; - } - - NtClose( SockEvent ); + TRACE("Leaving (Pending)\n"); + return WSA_IO_PENDING; + } return Status == STATUS_SUCCESS ? 0 : -1; Modified: trunk/reactos/dll/win32/msafd/misc/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/event… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/event.c [iso-8859-1] Tue Oct 25 07:54:00 2016 @@ -46,7 +46,7 @@ /* Set Socket to Non-Blocking */ BlockMode = TRUE; - SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &BlockMode, NULL, NULL); + SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &BlockMode, NULL, NULL, NULL, NULL); Socket->SharedData->NonBlocking = TRUE; /* Deactivate Async Select if there is one */ Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Tue Oct 25 07:54:00 2016 @@ -45,7 +45,7 @@ /* Change the Socket to Non Blocking */ BlockMode = TRUE; - SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &BlockMode, NULL, NULL); + SetSocketInformation(Socket, AFD_INFO_BLOCKING_MODE, &BlockMode, NULL, NULL, NULL, NULL); Socket->SharedData->NonBlocking = TRUE; /* Deactive WSPEventSelect */ @@ -104,9 +104,8 @@ OUT LPDWORD lpdwFlags, OUT LPINT lpErrno) { - PIO_STATUS_BLOCK IOSB; - NTSTATUS Status; PSOCKET_INFORMATION Socket; + BOOL Ret; TRACE("Called (%x)\n", Handle); @@ -124,35 +123,11 @@ *lpErrno = WSAEFAULT; return FALSE; } - IOSB = (PIO_STATUS_BLOCK)&lpOverlapped->Internal; - if (!IOSB) - { - if (lpErrno) - *lpErrno = WSAEFAULT; - return FALSE; - } - Status = IOSB->Status; - - /* Wait for completition of overlapped */ - if (Status == STATUS_PENDING) - { - /* It's up to the protocol to time out recv. We must wait - * until the protocol decides it's had enough. - */ - if (fWait) - { - WaitForSingleObject(lpOverlapped->hEvent, INFINITE); - Status = IOSB->Status; - } - } - - TRACE("Status %x Information %d\n", Status, IOSB->Information); - - if (Status != STATUS_PENDING) + Ret = GetOverlappedResult((HANDLE)Handle, lpOverlapped, lpdwBytes, fWait); + + if (Ret) { *lpdwFlags = 0; - - *lpdwBytes = IOSB->Information; /* Re-enable Async Event */ SockReenableAsyncSelectEvent(Socket, FD_OOB); @@ -160,7 +135,7 @@ SockReenableAsyncSelectEvent(Socket, FD_READ); } - return Status == STATUS_SUCCESS; + return Ret; } VOID Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Tue Oct 25 07:54:00 2016 @@ -434,7 +434,9 @@ ULONG AfdInformationClass, PBOOLEAN Boolean OPTIONAL, PULONG Ulong OPTIONAL, - PLARGE_INTEGER LargeInteger OPTIONAL + PLARGE_INTEGER LargeInteger OPTIONAL, + LPWSAOVERLAPPED Overlapped OPTIONAL, + LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL ); int SetSocketInformation( @@ -442,7 +444,9 @@ ULONG AfdInformationClass, PBOOLEAN Boolean OPTIONAL, PULONG Ulong OPTIONAL, - PLARGE_INTEGER LargeInteger OPTIONAL + PLARGE_INTEGER LargeInteger OPTIONAL, + LPWSAOVERLAPPED Overlapped OPTIONAL, + LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL ); int CreateContext(

8 years, 2 months

[jgardou] 73029: [NTOS/MM] - Arch striking again : take everywhere into account the +1 offset introduced in r72988 CORE-12047

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Oct 23 18:59:42 2016 New Revision: 73029 URL: http://svn.reactos.org/svn/reactos?rev=73029&view=rev Log: [NTOS/MM] - Arch striking again : take everywhere into account the +1 offset introduced in r72988 CORE-12047 Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Sun Oct 23 18:59:42 2016 @@ -239,7 +239,7 @@ } i = FILE_FROM_ENTRY(SwapEntry); - offset = OFFSET_FROM_ENTRY(SwapEntry); + offset = OFFSET_FROM_ENTRY(SwapEntry) - 1; if (PagingFileList[i]->FileObject == NULL || PagingFileList[i]->FileObject->DeviceObject == NULL) @@ -396,7 +396,7 @@ KIRQL oldIrql; i = FILE_FROM_ENTRY(Entry); - off = OFFSET_FROM_ENTRY(Entry); + off = OFFSET_FROM_ENTRY(Entry) - 1; KeAcquireSpinLock(&PagingFileListLock, &oldIrql); if (PagingFileList[i] == NULL)

8 years, 2 months

[aandrejevic] 73028: [NTVDM:VBE]: Don't crash if the video mode is invalid.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Oct 23 17:21:58 2016 New Revision: 73028 URL: http://svn.reactos.org/svn/reactos?rev=73028&view=rev Log: [NTVDM:VBE]: Don't crash if the video mode is invalid. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] Sun Oct 23 17:21:58 2016 @@ -356,6 +356,7 @@ BOOLEAN WINAPI VbeSetExtendedVideoMode(BYTE ModeNumber) { PCVBE_MODE Mode = VbeGetModeByNumber(ModeNumber); + if (Mode == NULL) return FALSE; /* At this point, Mode->Registers shouldn't be NULL unless the mode is unimplemented */ if (Mode->Registers == NULL)

8 years, 2 months

[hbelusca] 73027: [CMAKE]: Introduce a evil workaround for the problem described in CORE-12205/CORE-12206, that was unveiled by commit r73024. CMake gurus, please review & make suggestions! :)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 22 22:51:34 2016 New Revision: 73027 URL: http://svn.reactos.org/svn/reactos?rev=73027&view=rev Log: [CMAKE]: Introduce a evil workaround for the problem described in CORE-12205/CORE-12206, that was unveiled by commit r73024. CMake gurus, please review & make suggestions! :) Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake Modified: trunk/reactos/sdk/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/cmake/CMakeMacros.cmak… ============================================================================== --- trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/cmake/CMakeMacros.cmake [iso-8859-1] Sat Oct 22 22:51:34 2016 @@ -496,6 +496,18 @@ function(add_library name) _add_library(${name} ${ARGN}) +## +## The following is a workaround for a CMake bug. Inspired by: +## http://stackoverflow.com/questions/24926868/cmake-3-0-add-library-of-type-i… +## +## Beginning of the workaround: + get_target_property(_TARGET_TYPE ${name} TYPE) + if(_TARGET_TYPE STREQUAL "INTERFACE_LIBRARY") + unset(_target_excluded) + else() +## +## This is the original code: +## get_target_property(_target_excluded ${name} EXCLUDE_FROM_ALL) if(_target_excluded AND ${name} MATCHES "^lib.*") set_property(TARGET "${name}" PROPERTY FOLDER "Importlibs") @@ -503,6 +515,10 @@ string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR_LENGTH} -1 CMAKE_CURRENT_SOURCE_DIR_RELATIVE) set_property(TARGET "${name}" PROPERTY FOLDER "${CMAKE_CURRENT_SOURCE_DIR_RELATIVE}") endif() +## +## End of workaround + endif() +## endfunction() function(add_executable name)

8 years, 2 months

[hbelusca] 73026: [WLANCONF]: Addendum to r73024.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 22 22:15:10 2016 New Revision: 73026 URL: http://svn.reactos.org/svn/reactos?rev=73026&view=rev Log: [WLANCONF]: Addendum to r73024. Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt Modified: trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/wlanconf/CMakeLists.txt [iso-8859-1] Sat Oct 22 22:15:10 2016 @@ -7,6 +7,6 @@ add_executable(wlanconf wlanconf.c wlanconf.rc) set_module_type(wlanconf win32cui UNICODE) -target_link_libraries(wlanconf conutils ${PSEH_LIB}) +target_link_libraries(wlanconf conutils_stream ${PSEH_LIB}) add_importlibs(wlanconf msvcrt iphlpapi kernel32) add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all)

8 years, 2 months

[hbelusca] 73025: [MORE]: Rewrite almost completely the MORE command, taking advantage of the console pager functionality of the ConUtils library (see CORE-10504 and commit r73024). - When displayi...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 22 22:07:28 2016 New Revision: 73025 URL: http://svn.reactos.org/svn/reactos?rev=73025&view=rev Log: [MORE]: Rewrite almost completely the MORE command, taking advantage of the console pager functionality of the ConUtils library (see CORE-10504 and commit r73024). - When displaying files, display the percentage of file read so far in the "Continue" prompt. Otherwise (when being piped or feeded from StdIn), just display the "Continue" prompt without percentage. - Try to detect the text file encoding (ANSI, UTF16-BE/BE w/ or w/o BOM; UTF-8 to do!!) before displaying it. See the code for more details. NOTE that the other functionalities of more (being able to scroll one line at a time, other command-line switches, etc...) are still not implemented yet. Modified: trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt trunk/reactos/base/applications/cmdutils/more/lang/bg-BG.rc trunk/reactos/base/applications/cmdutils/more/lang/ca-ES.rc trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/more/lang/el-GR.rc trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc trunk/reactos/base/applications/cmdutils/more/lang/es-ES.rc trunk/reactos/base/applications/cmdutils/more/lang/fr-FR.rc trunk/reactos/base/applications/cmdutils/more/lang/it-IT.rc trunk/reactos/base/applications/cmdutils/more/lang/lt-LT.rc trunk/reactos/base/applications/cmdutils/more/lang/no-NO.rc trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/more/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/more/lang/sk-SK.rc trunk/reactos/base/applications/cmdutils/more/lang/sq-AL.rc trunk/reactos/base/applications/cmdutils/more/lang/sv-SE.rc trunk/reactos/base/applications/cmdutils/more/lang/tr-TR.rc trunk/reactos/base/applications/cmdutils/more/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/more/lang/zh-CN.rc trunk/reactos/base/applications/cmdutils/more/lang/zh-TW.rc trunk/reactos/base/applications/cmdutils/more/more.c trunk/reactos/base/applications/cmdutils/more/more.rc trunk/reactos/base/applications/cmdutils/more/resource.h Modified: trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/CMakeLists.txt [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -1,6 +1,11 @@ + +PROJECT(more) + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) add_executable(more more.c more.rc) -set_module_type(more win32cui) +set_module_type(more win32cui UNICODE) +target_link_libraries(more conutils_pager ${PSEH_LIB}) +add_importlibs(more advapi32 user32 msvcrt kernel32) set_target_properties(more PROPERTIES SUFFIX ".com") -add_importlibs(more user32 msvcrt kernel32) add_cd_file(TARGET more DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/more/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/bg-BG.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -9,6 +9,7 @@ [Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾:][ÐÑÑ]Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð¾ Ð¸Ð¼Ðµ Ð¤Ð°Ð¹Ð», ÑÐ¸ÐµÑÐ¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½Ð¾.\n\ ÐÐ¾Ð¼Ð°Ð½Ð´Ð°\t\t ÐÐ¾Ð¼Ð°Ð½Ð´Ð°, ÑÐ¸Ð¹ÑÐ¾ Ð¸Ð·ÑÐ¾Ð´ Ð´Ð° Ð±ÑÐ´Ðµ Ð¿Ð¾ÐºÐ°Ð·Ð°Ð½.\n\n\ ÐÑÐ¸ Ð²ÑÐ¿ÑÐ¾ÑÐ° ""-- ÐÑÐ¾Ð´ÑÐ»Ð¶Ð°Ð²Ð°Ð½Ðµ --"" Ð½Ð°ÑÐ¸ÑÐ½ÐµÑÐµ Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð»ÐµÐ½ ÐºÐ»Ð°Ð²Ð¸Ñ, Ð·Ð° Ð¿Ð¾ÐºÐ°Ð·Ð°Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ»ÐµÐ´Ð²Ð°ÑÐ°ÑÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ°.\n" - IDS_CONTINUE " -- ÐÑÐ¾Ð´ÑÐ»Ð¶Ð°Ð²Ð°Ð½Ðµ (100%) -- " - IDS_FILE_ACCESS "ÐÑÐ¼Ð° Ð´Ð¾ÑÑÑÐ¿ Ð´Ð¾ ÑÐ°Ð¹Ð» %s." + IDS_CONTINUE "-- ÐÑÐ¾Ð´ÑÐ»Ð¶Ð°Ð²Ð°Ð½Ðµ --" + IDS_CONTINUE_PROGRESS "-- ÐÑÐ¾Ð´ÑÐ»Ð¶Ð°Ð²Ð°Ð½Ðµ (%d%%) --" + IDS_FILE_ACCESS "ÐÑÐ¼Ð° Ð´Ð¾ÑÑÑÐ¿ Ð´Ð¾ ÑÐ°Ð¹Ð» %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/ca-ES.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -9,6 +9,7 @@ [Unitat:][Ruta]Nom del fitxer Un fitxer, el contingut del qual serÃ mostrat.\n\ InstrucciÃ³\t\t Una instrucciÃ³, el resultat de la qual serÃ mostrada.\n\n\ Al visualitzar ""-- Continua --"" heu de premer qualsevol tecla per visualitzar la segÃ¼ent pÃ gina.\n" - IDS_CONTINUE " -- Continua (100%) -- " - IDS_FILE_ACCESS "No puc accedir al fitxer %s." + IDS_CONTINUE "-- Continua --" + IDS_CONTINUE_PROGRESS "-- Continua (%d%%) --" + IDS_FILE_ACCESS "No puc accedir al fitxer %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/cs-CZ.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -16,6 +16,7 @@ PÅÃkaz\t\t PÅÃkaz, jehoÅ¾ vÃ½stup bude zobrazen.\n\n\ PÅi vÃ½zvÄ ""-- PokraÄovat --"" lze stisknout libovolnou klÃ¡vesu\n\ pro zobrazenÃ dalÅ¡Ã strÃ¡nky.\n" - IDS_CONTINUE " -- PokraÄovat (100%) -- " - IDS_FILE_ACCESS "Nelze zÃskat pÅÃstup k souboru %s." + IDS_CONTINUE "-- PokraÄovat --" + IDS_CONTINUE_PROGRESS "-- PokraÄovat (%d%%) --" + IDS_FILE_ACCESS "Nelze zÃskat pÅÃstup k souboru %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/de-DE.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -10,6 +10,7 @@ Befehl\t\t Ein Befehl, dessen Ausgabe angezeigt werden soll.\n\n\ An der Eingabeaufforderung ""-- Fortsetzung --"" kann eine beliebige\n\ Taste gedrÃ¼ckt werden, um die nÃ¤chste Seite anzuzeigen.\n" - IDS_CONTINUE " -- Fortsetzung (100%) -- " - IDS_FILE_ACCESS "Auf die Datei %s kann nicht zugegriffen werden." + IDS_CONTINUE "-- Fortsetzung --" + IDS_CONTINUE_PROGRESS "-- Fortsetzung (%d%%) --" + IDS_FILE_ACCESS "Auf die Datei %s kann nicht zugegriffen werden.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/el-GR.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -9,6 +9,7 @@ [ÎÎ¯ÏÎºÎ¿Ï:][ÎÎ¿Î½Î¿ÏÎ¬ÏÎ¹]ÎÎ½Î¿Î¼Î± Î±ÏÏÎµÎ¯Î¿Ï Î¤Î¿ Î±ÏÏÎµÎ¯Î¿, ÏÎ± Î´ÎµÎ´Î¿Î¼ÎÎ½Î± ÏÎ¿Ï Î¿ÏÎ¿Î¯Î¿Ï Î¸Î± ÎµÎ¼ÏÎ±Î½Î¹ÏÏÎ¿ÏÎ½.\n\ ÎÎ½ÏÎ¿Î»Î®\t\t Î ÎµÎ½ÏÎ¿Î»Î®, ÏÎ·Ï Î¿ÏÎ¿Î¯Î±Ï Î· ÎÎ¾Î¿Î´Î¿Ï Î¸Î± ÎµÎ¼ÏÎ±Î½Î¹ÏÏÎµÎ¯.\n\n\ Î£ÏÎ· Î³ÏÎ±Î¼Î¼Î® ÎµÎ½ÏÎ¿Î»ÏÎ½ ""-- Î£ÏÎ½ÎÏÎµÎ¹Î± --"" Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± ÏÎ±ÏÎ®ÏÎµÏÎµ Î¿ÏÎ¿Î¹Î¿Î´Î®ÏÎ¿ÏÎµ ÎºÎ¿ÏÎ¼ÏÎ¯ Î³Î¹Î± Î½Î± Î´ÎµÎ¯ÏÎµ ÏÎ·Î½ ÎµÏÏÎ¼ÎµÎ½Î· ÏÎµÎ»Î¯Î´Î±.\n" - IDS_CONTINUE " -- Î£ÏÎ½ÎÏÎµÎ¹Î± (100%) -- " - IDS_FILE_ACCESS "ÎÎµÎ½ Î®ÏÎ±Î½ Î´ÏÎ½Î±ÏÎ® Î· ÏÏÎ¿ÏÏÎÎ»Î±ÏÎ· ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï %s." + IDS_CONTINUE "-- Î£ÏÎ½ÎÏÎµÎ¹Î± --" + IDS_CONTINUE_PROGRESS "-- Î£ÏÎ½ÎÏÎµÎ¹Î± (%d%%) --" + IDS_FILE_ACCESS "ÎÎµÎ½ Î®ÏÎ±Î½ Î´ÏÎ½Î±ÏÎ® Î· ÏÏÎ¿ÏÏÎÎ»Î±ÏÎ· ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/en-US.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -9,6 +9,7 @@ [Drive:][Path]File name A file, whose content shall be displayed.\n\ Command\t\t A command, whose output shall be displayed.\n\n\ At the prompt ""-- Continue --"" you can press any key to show the next page.\n" - IDS_CONTINUE " -- Continue (100%) -- " - IDS_FILE_ACCESS "Cannot access the file %s." + IDS_CONTINUE "-- Continue --" + IDS_CONTINUE_PROGRESS "-- Continue (%d%%) --" + IDS_FILE_ACCESS "Cannot access the file %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/es-ES.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -9,6 +9,7 @@ [Unidad:][Ruta]Nombre del archivo Un archivo, cuyo contenido pueda ser mostrado.\n\ Comando\t\t Un comando, cuya salida pueda ser mostrada.\n\n\ Al visualizar ""-- Continuar --"" presione cualquier tecla para mostrar la siguiente pÃ¡gina.\n" - IDS_CONTINUE " -- Continuar (100%) -- " - IDS_FILE_ACCESS "No se puede acceder al fichero %s." + IDS_CONTINUE "-- Continuar --" + IDS_CONTINUE_PROGRESS "-- Continuar (%d%%) --" + IDS_FILE_ACCESS "No se puede acceder al fichero %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/fr-FR.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -9,6 +9,7 @@ [Lecteur:][Chemin]Nom du fichier Un fichier, dont le contenu sera affichÃ©.\n\ Commande\t\t Une commande, dont la sortie sera affichÃ©e.\n\n\ Ã l'invite ""-- Continuer --"" Vous pouvez appuyer sur n'importe quelle touche pour afficher la page suivante.\n" - IDS_CONTINUE " -- Continuer (100%) -- " - IDS_FILE_ACCESS "Impossible d'accÃ©der au fichier %s." + IDS_CONTINUE "-- Continuer --" + IDS_CONTINUE_PROGRESS "-- Continuer (%d %%) --" + IDS_FILE_ACCESS "Impossible d'accÃ©der au fichier %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/it-IT.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -9,6 +9,7 @@ [Drive:][Path]File Il file da visualizzare.\n\ Comando\t\t Il comando di cui l'output dev'essere visualizzato.\n\n\ Alla richiesta ""-- Continua --"" premere un tasto qualsiasi per visualizzare la pagina successiva.\n" - IDS_CONTINUE " -- Continua (100%) -- " - IDS_FILE_ACCESS "Impossibile accedere al file %s." + IDS_CONTINUE "-- Continua --" + IDS_CONTINUE_PROGRESS "-- Continua (%d%%) --" + IDS_FILE_ACCESS "Impossibile accedere al file %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/lt-LT.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -21,6 +21,7 @@ bÅ«ti atvaizduotas.\n\n\ PasirodÅ¾ius raginimui ""-- Toliau --"" spauskite bet kurÄ¯ klaviÅ¡Ä, kad\n\ pamatytumÄte sekantÄ¯ puslapÄ¯.\n" - IDS_CONTINUE " -- Toliau (100%) -- " - IDS_FILE_ACCESS "Nepavyko atverti bylos %s." + IDS_CONTINUE "-- Toliau --" + IDS_CONTINUE_PROGRESS "-- Toliau (%d%%) --" + IDS_FILE_ACCESS "Nepavyko atverti bylos %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/no-NO.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -9,6 +9,7 @@ [Stasjon:][Mappe]Filnavn En fil, Velg innhold som skal vises.\n\ Command\t\t En kommando, Velg output som skal vises.\n\n\ At the prompt ""-- Fortsett --"" du kan trykke en tast for Ã¥ vise neste side.\n" - IDS_CONTINUE " -- Fortsett (100%) -- " - IDS_FILE_ACCESS "FÃ¥r ikke tilgang til filen %s." + IDS_CONTINUE "-- Fortsett --" + IDS_CONTINUE_PROGRESS "-- Fortsett (%d%%) --" + IDS_FILE_ACCESS "FÃ¥r ikke tilgang til filen %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/pl-PL.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -17,6 +17,7 @@ [NapÄd:][ÅcieÅ¼ka]Nazwa pliku Plik, ktÃ³rego zawartoÅÄ ma byÄ wyÅwietlona.\n\ Polecenie\t\t Polecenie, ktÃ³rego wynik ma byÄ wyÅwietlony.\n\n\ Po wyÅwietleniu ""-- Kontynuuj --"" moÅ¼esz nacisnÄÄ dowolny klawisz, aby przejÅÄ do nastÄpnej strony.\n" - IDS_CONTINUE " -- Kontynuuj (100%) -- " - IDS_FILE_ACCESS "Brak dostÄpu do pliku: %s." + IDS_CONTINUE "-- Kontynuuj --" + IDS_CONTINUE_PROGRESS "-- Kontynuuj (%d%%) --" + IDS_FILE_ACCESS "Brak dostÄpu do pliku: %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/ro-RO.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -18,6 +18,7 @@ ComandÄ Comanda a cÄrei ieÈire va fi afiÈatÄ.\n\n\ La vederea sugestiei ""-- ContinuÄ --"" veÈi apÄsa o tastÄ pentru afiÈarea\n\ urmÄtoarei pagini.\n" - IDS_CONTINUE " -- ContinuÄ (100%) -- " - IDS_FILE_ACCESS "FiÈierul Â«%sÂ» nu poate fi accesat!" + IDS_CONTINUE "-- ContinuÄ --" + IDS_CONTINUE_PROGRESS "-- ContinuÄ (%d%%) --" + IDS_FILE_ACCESS "FiÈierul Â«%sÂ» nu poate fi accesat!\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/ru-RU.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -17,6 +17,7 @@ [Ð´Ð¸ÑÐº:][Ð¿ÑÑÑ]Ð¸Ð¼Ñ_ÑÐ°Ð¹Ð»Ð° Ð¤Ð°Ð¹Ð», Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÐ¼ÑÐ¹ Ð¿Ð¾ ÑÑÐ°Ð³Ð¼ÐµÐ½ÑÐ°Ð¼.\n\ Ð¸Ð¼Ñ_ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ ÐÐ¾Ð¼Ð°Ð½Ð´Ð°, Ð²ÑÐ²Ð¾Ð´ ÐºÐ¾ÑÐ¾ÑÐ¾Ð¹ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶Ð°ÐµÑÑÑ Ð½Ð° ÑÐºÑÐ°Ð½Ðµ.\n\n\ ÐÑÐ¸ Ð·Ð°Ð¿ÑÐ¾ÑÐµ ""-- ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ --"" Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð½Ð°Ð¶Ð°ÑÑ Ð»ÑÐ±ÑÑ ÐºÐ»Ð°Ð²Ð¸ÑÑ Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐ»ÐµÐ´ÑÑÑÐµÐ³Ð¾ ÑÐºÑÐ°Ð½Ð°.\n" - IDS_CONTINUE " -- ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ (100%) -- " - IDS_FILE_ACCESS "ÐÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÐ°Ð¹Ð»Ñ %s." + IDS_CONTINUE "-- ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ --" + IDS_CONTINUE_PROGRESS "-- ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ (%d%%) --" + IDS_FILE_ACCESS "ÐÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº ÑÐ°Ð¹Ð»Ñ %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/sk-SK.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -14,6 +14,7 @@ PrÃkaz\t\t PrÃkaz, ktorÃ©ho vÃ½stup mÃ¡ byÅ¥ zobrazenÃ½.\n\n\ Pri vÃ½zve ""-- PokraÄujte --"" mÃ´Å¾ete stlaÄiÅ¥ Ä¾ubovoÄ¾nÃ½ klÃ¡ves\n\ k zobrazeniu nasledujÃºcej strÃ¡nky.\n" - IDS_CONTINUE " -- PokraÄujte (100%) -- " - IDS_FILE_ACCESS "Neviem zÃskaÅ¥ prÃstup k sÃºboru %s." + IDS_CONTINUE "-- PokraÄujte --" + IDS_CONTINUE_PROGRESS "-- PokraÄujte (%d%%) --" + IDS_FILE_ACCESS "Neviem zÃskaÅ¥ prÃstup k sÃºboru %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/sq-AL.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -13,6 +13,7 @@ [Drive:][Path]File name Nje dokument, pÃ«rmbajtja e tÃ« cilit do tÃ« shfaqet.\n\ KomandÃ«\t\t Nje komande, nxjerrja e te cilit do tÃ« shfaqet.\n\n\ At the prompt ""-- Vazhdo --"" ju mund tÃ« shtypni Ã§farÃ«do butoni pÃ«r tÃ« vazhduar nÃ« faqen tjetÃ«r.\n" - IDS_CONTINUE " -- Vazhdo (100%) -- " - IDS_FILE_ACCESS "Nuk mund tÃ« aksesoj dokumentin %s." + IDS_CONTINUE "-- Vazhdo --" + IDS_CONTINUE_PROGRESS "-- Vazhdo (%d%%) --" + IDS_FILE_ACCESS "Nuk mund tÃ« aksesoj dokumentin %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/sv-SE.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -16,6 +16,7 @@ [Enhet:][Mapp]Filnamn En fil, VÃ¤lj innehÃ¥ll som skall visas.\n\ Kommando\t\t Ett kommando, VÃ¤lj vad som skall visas.\n\n\ vid prompten ""-- FortsÃ¤tt --"" du kan trycka valfri knapp fÃ¶r att visa nÃ¤sta sida.\n" - IDS_CONTINUE " -- FortsÃ¤tt (100%) -- " - IDS_FILE_ACCESS "FÃ¥r inte tillgÃ¥ng till filen %s." + IDS_CONTINUE "-- FortsÃ¤tt --" + IDS_CONTINUE_PROGRESS "-- FortsÃ¤tt (%d%%) --" + IDS_FILE_ACCESS "FÃ¥r inte tillgÃ¥ng till filen %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/tr-TR.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -11,6 +11,7 @@ [SÃ¼rÃ¼cÃ¼:][Yol]KÃ¼tÃ¼k adÄ± Ä°Ã§eriÄi gÃ¶rÃ¼ntÃ¼lenecek bir kÃ¼tÃ¼k.\n\ Komut\t\t ÃÄ±kÄ±ÅÄ± gÃ¶rÃ¼ntÃ¼lenecek bir komut.\n\n\ Ä°stemde ""-- SÃ¼rdÃ¼r --"" ile bir sonraki sayfayÄ± gÃ¶stermek iÃ§in rastgele bir dÃ¼Ämeye basabilirsiniz.\n" - IDS_CONTINUE " -- SÃ¼rdÃ¼r (%100) -- " - IDS_FILE_ACCESS "%s kÃ¼tÃ¼ÄÃ¼ne eriÅilemiyor." + IDS_CONTINUE "-- SÃ¼rdÃ¼r --" + IDS_CONTINUE_PROGRESS "-- SÃ¼rdÃ¼r (%%%d) --" + IDS_FILE_ACCESS "%s kÃ¼tÃ¼ÄÃ¼ne eriÅilemiyor.\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] Sat Oct 22 22:07:28 2016 @@ -17,6 +17,7 @@ [ÐÐ¸ÑÐº:][Ð¨Ð»ÑÑ]ÐÐ¼'Ñ_ÑÐ°Ð¹Ð»Ñ Ð¤Ð°Ð¹Ð», Ð²Ð¼iÑÑ ÑÐºÐ¾Ð³Ð¾ ÑÑÐµÐ±Ð° Ð²Ð¸Ð²ÐµÑÑÐ¸ Ð½Ð° ÐµÐºÑÐ°Ð½.\n\ Command\t\t ÐÐ¾Ð¼Ð°Ð½Ð´Ð°, ÑÐµÐ·ÑÐ»ÑÑÐ°Ñ ÑÐ¾Ð±Ð¾ÑÐ¸ ÑÐºÐ¾Ñ ÑÑÐµÐ±Ð° Ð²Ð¸Ð²ÐµÑÑÐ¸ Ð½Ð° ÐµÐºÑÐ°Ð½.\n\n\ ÐÐ° Ð·Ð°Ð¿ÑÐ¾ÑÐµÐ½Ð½Ñ ""-- ÐÐ°Ð»i --"" ÐÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ Ð½Ð°ÑÐ¸ÑÐ½ÑÑÐ¸ Ð±ÑÐ´Ñ-ÑÐºÑ ÐºÐ»Ð°Ð²iÑÑ ÑÐ¾Ð± Ð¿Ð¾Ð±Ð°ÑÐ¸ÑÐ¸ Ð½Ð°ÑÑÑÐ¿Ð½Ñ ÑÑÐ¾ÑiÐ½ÐºÑ.\n" - IDS_CONTINUE " -- ÐÐ°Ð»i (100%) -- " - IDS_FILE_ACCESS "ÐÐµ Ð¼Ð¾Ð¶Ñ Ð¾ÑÑÐ¸Ð¼Ð°ÑÐ¸ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð¾ ÑÐ°Ð¹Ð»Ð° %s." + IDS_CONTINUE "-- ÐÐ°Ð»i --" + IDS_CONTINUE_PROGRESS "-- ÐÐ°Ð»i (%d%%) --" + IDS_FILE_ACCESS "ÐÐµ Ð¼Ð¾Ð¶Ñ Ð¾ÑÑÐ¸Ð¼Ð°ÑÐ¸ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð¾ ÑÐ°Ð¹Ð»Ð° %s.\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/zh-CN.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -11,6 +11,7 @@ [é©±å¨å¨:][è·¯å¾]æä»¶å ä¸ä¸ªå°è¦è¢«å¦æ¤æ¾ç¤ºåå®¹çæä»¶ã\n\ å½ä»¤\t\t ä¸ä¸ªè¾åºå°è¦è¢«å¦æ¤æ¾ç¤ºçå½ä»¤ã\n\n\ å¨ ""-- ç»§ç» --"" çæç¤ºåºç°æ¶ä½ å¯ä»¥æä»»æé®æ¥æ¾ç¤ºä¸ä¸é¡µã\n" - IDS_CONTINUE " -- ç»§ç» (100%) -- " - IDS_FILE_ACCESS "æ æ³è®¿é®æä»¶ %sã" + IDS_CONTINUE "-- ç»§ç» --" + IDS_CONTINUE_PROGRESS "-- ç»§ç» (%d%%) --" + IDS_FILE_ACCESS "æ æ³è®¿é®æä»¶ %sã\n" END Modified: trunk/reactos/base/applications/cmdutils/more/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/lang/zh-TW.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -11,6 +11,7 @@ [ç£ç¢æ©:][è·¯å¾]æªæ¡å ä¸åå°è¦è¢«å¦æ¤é¡¯ç¤ºå§å®¹çæªæ¡ã\n\ å½ä»¤\t\t ä¸åè¼¸åºå°è¦è¢«å¦æ¤é¡¯ç¤ºçå½ä»¤ã\n\n\ å¨ ""-- ç¹¼çº --"" çæç¤ºåºç¾æä½ å¯ä»¥æä»»æéµä¾é¡¯ç¤ºä¸ä¸é ã\n" - IDS_CONTINUE " -- ç¹¼çº (100%) -- " - IDS_FILE_ACCESS "ç¡æ³è¨ªåæªæ¡ %sã" + IDS_CONTINUE "-- ç¹¼çº --" + IDS_CONTINUE_PROGRESS "-- ç¹¼çº (%d%%) --" + IDS_FILE_ACCESS "ç¡æ³è¨ªåæªæ¡ %sã\n" END Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -1,3 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS More Command + * FILE: base/applications/cmdutils/more/more.c + * PURPOSE: Displays text stream from STDIN or from an arbitrary number + * of files to STDOUT, with screen capabilities (more than CAT, + * but less than LESS ^^). + * PROGRAMMERS: Paolo Pantaleo + * Timothy Schepens + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ /* * MORE.C - external command. * @@ -5,209 +16,616 @@ * * 26 Sep 1999 - Paolo Pantaleo <paolopan(a)freemail.it> * started + * * Oct 2003 - Timothy Schepens <tischepe at fastmail dot fm> * use window size instead of buffer size. */ #include <stdio.h> -#include <malloc.h> -#include <tchar.h> #include <windef.h> #include <winbase.h> +#include <winnls.h> #include <winuser.h> -#include <wincon.h> + +#include <conutils.h> #include "resource.h" -static TCHAR szCont[128]; -static DWORD szContLength; -static HINSTANCE hApp; - -/*handle for file and console*/ -HANDLE hStdIn; -HANDLE hStdOut; -HANDLE hStdErr; +/* PagePrompt statistics for the current file */ +DWORD dwFileSize; // In bytes +DWORD dwSumReadBytes, dwSumReadChars; +// The average number of bytes per character is equal to +// dwSumReadBytes / dwSumReadChars. Note that dwSumReadChars +// will never be == 0 when ConWritePaging (and possibly PagePrompt) +// is called. + +/* Handles for file and console */ +HANDLE hFile = INVALID_HANDLE_VALUE; +HANDLE hStdIn, hStdOut; HANDLE hKeyboard; -static VOID -GetScreenSize (PSHORT maxx, PSHORT maxy) +static BOOL +__stdcall +PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo (hStdOut, &csbi); - *maxx = (csbi.srWindow.Right - csbi.srWindow.Left) + 1; - *maxy = (csbi.srWindow.Bottom - csbi.srWindow.Top) - 4; - + HANDLE hInput = ConStreamGetOSHandle(StdIn); + DWORD dwMode; + KEY_EVENT_RECORD KeyEvent; + + /* + * Just use the simple prompt if the file being displayed is the STDIN, + * otherwise use the prompt with progress percentage. + * + * The progress percentage is evaluated as follows. + * So far we have read a total of 'dwSumReadBytes' bytes from the file. + * Amongst those is the latest read chunk of 'dwReadBytes' bytes, to which + * correspond a number of 'dwReadChars' characters with which we have called + * ConWritePaging who called PagePrompt. We then have: Total == dwReadChars. + * During this ConWritePaging call the PagePrompt was called after 'Done' + * number of characters over 'Total'. + * It should be noted that for 'dwSumReadBytes' number of bytes read it + * *roughly* corresponds 'dwSumReadChars' number of characters. This is + * because there may be some failures happening during the conversion of + * the bytes read to the character string for a given encoding. + * Therefore the number of characters displayed on screen is equal to: + * dwSumReadChars - Total + Done , + * but the best corresponding approximed number of bytes would be: + * dwSumReadBytes - (Total - Done) * (dwSumReadBytes / dwSumReadChars) , + * where the ratio is the average number of bytes per character. + * The percentage is then computed relative to the total file size. + */ + if (hFile == hStdIn) + { + ConResPuts(Pager->Screen->Stream, IDS_CONTINUE); + } + else + { + ConResPrintf(Pager->Screen->Stream, IDS_CONTINUE_PROGRESS, + // (dwSumReadChars - Total + Done) * 100 / dwFileSize + (dwSumReadBytes - (Total - Done) * + (dwSumReadBytes / dwSumReadChars)) * 100 / dwFileSize + ); + } + + // TODO: Implement prompt read line! + + // FIXME: Does not support TTY yet! + + /* RemoveBreakHandler */ + SetConsoleCtrlHandler(NULL, TRUE); + /* ConInDisable */ + GetConsoleMode(hInput, &dwMode); + dwMode &= ~ENABLE_PROCESSED_INPUT; + SetConsoleMode(hInput, dwMode); + + do + { + // FIXME: Does not support TTY yet! + + // ConInKey(&KeyEvent); + INPUT_RECORD ir; + DWORD dwRead; + do + { + ReadConsoleInput(hInput, &ir, 1, &dwRead); + } + while ((ir.EventType != KEY_EVENT) || (!ir.Event.KeyEvent.bKeyDown)); + + /* Got our key, return to caller */ + KeyEvent = ir.Event.KeyEvent; + } + while ((KeyEvent.wVirtualKeyCode == VK_SHIFT) || + (KeyEvent.wVirtualKeyCode == VK_MENU) || + (KeyEvent.wVirtualKeyCode == VK_CONTROL)); + + /* AddBreakHandler */ + SetConsoleCtrlHandler(NULL, FALSE); + /* ConInEnable */ + GetConsoleMode(hInput, &dwMode); + dwMode |= ENABLE_PROCESSED_INPUT; + SetConsoleMode(hInput, dwMode); + + /* + * Erase the full line where the cursor is, and move + * the cursor back to the beginning of the line. + */ + ConClearLine(Pager->Screen->Stream); + + if ((KeyEvent.wVirtualKeyCode == VK_ESCAPE) || + ((KeyEvent.wVirtualKeyCode == L'C') && + (KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)))) + { + /* We break, output a newline */ + WCHAR ch = L'\n'; + ConStreamWrite(Pager->Screen->Stream, &ch, 1); + return FALSE; + } + + return TRUE; } - -static -VOID ConOutPuts (LPTSTR szText) +/* + * See base/applications/cmdutils/clip/clip.c!IsDataUnicode() + * and base/applications/notepad/text.c!ReadText() for more details. + * Also some good code example can be found at: + * https://github.com/AutoIt/text-encoding-detect + */ +typedef enum { - DWORD dwWritten; - - WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL); - WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL); + ENCODING_ANSI = 0, + ENCODING_UTF16LE = 1, + ENCODING_UTF16BE = 2, + ENCODING_UTF8 = 3 +} ENCODING; + +static BOOL +IsDataUnicode( + IN PVOID Buffer, + IN DWORD BufferSize, + OUT ENCODING* Encoding OPTIONAL, + OUT PDWORD SkipBytes OPTIONAL) +{ + PBYTE pBytes = Buffer; + ENCODING encFile = ENCODING_ANSI; + DWORD dwPos = 0; + + /* + * See http://archives.miloush.net/michkap/archive/2007/04/22/2239345.html + * for more details about the algorithm and the pitfalls behind it. + * Of course it would be actually great to make a nice function that + * would work, once and for all, and put it into a library. + */ + + /* Look for Byte Order Marks */ + if ((BufferSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE)) + { + encFile = ENCODING_UTF16LE; + dwPos = 2; + } + else if ((BufferSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF)) + { + encFile = ENCODING_UTF16BE; + dwPos = 2; + } + else if ((BufferSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF)) + { + encFile = ENCODING_UTF8; + dwPos = 3; + } + else + { + /* + * Try using statistical analysis. Do not rely on the return value of + * IsTextUnicode as we can get FALSE even if the text is in UTF-16 BE + * (i.e. we have some of the IS_TEXT_UNICODE_REVERSE_MASK bits set). + * Instead, set all the tests we want to perform, then just check + * the passed tests and try to deduce the string properties. + */ + +/* + * This mask contains the 3 highest bits from IS_TEXT_UNICODE_NOT_ASCII_MASK + * and the 1st highest bit from IS_TEXT_UNICODE_NOT_UNICODE_MASK. + */ +#define IS_TEXT_UNKNOWN_FLAGS_MASK ((7 << 13) | (1 << 11)) + + /* Flag out the unknown flags here, the passed tests will not have them either */ + INT Tests = (IS_TEXT_UNICODE_NOT_ASCII_MASK | + IS_TEXT_UNICODE_NOT_UNICODE_MASK | + IS_TEXT_UNICODE_REVERSE_MASK | IS_TEXT_UNICODE_UNICODE_MASK) + & ~IS_TEXT_UNKNOWN_FLAGS_MASK; + INT Results; + + IsTextUnicode(Buffer, BufferSize, &Tests); + Results = Tests; + + /* + * As the IS_TEXT_UNICODE_NULL_BYTES or IS_TEXT_UNICODE_ILLEGAL_CHARS + * flags are expected to be potentially present in the result without + * modifying our expectations, filter them out now. + */ + Results &= ~(IS_TEXT_UNICODE_NULL_BYTES | IS_TEXT_UNICODE_ILLEGAL_CHARS); + + /* + * NOTE: The flags IS_TEXT_UNICODE_ASCII16 and + * IS_TEXT_UNICODE_REVERSE_ASCII16 are not reliable. + * + * NOTE2: Check for potential "bush hid the facts" effect by also + * checking the original results (in 'Tests') for the absence of + * the IS_TEXT_UNICODE_NULL_BYTES flag, as we may presumably expect + * that in UTF-16 text there will be at some point some NULL bytes. + * If not, fall back to ANSI. This shows the limitations of using the + * IsTextUnicode API to perform such tests, and the usage of a more + * improved encoding detection algorithm would be really welcome. + */ + if (!(Results & IS_TEXT_UNICODE_NOT_UNICODE_MASK) && + !(Results & IS_TEXT_UNICODE_REVERSE_MASK) && + (Results & IS_TEXT_UNICODE_UNICODE_MASK) && + (Tests & IS_TEXT_UNICODE_NULL_BYTES)) + { + encFile = ENCODING_UTF16LE; + dwPos = (Results & IS_TEXT_UNICODE_SIGNATURE) ? 2 : 0; + } + else + if (!(Results & IS_TEXT_UNICODE_NOT_UNICODE_MASK) && + !(Results & IS_TEXT_UNICODE_UNICODE_MASK) && + (Results & IS_TEXT_UNICODE_REVERSE_MASK) && + (Tests & IS_TEXT_UNICODE_NULL_BYTES)) + { + encFile = ENCODING_UTF16BE; + dwPos = (Results & IS_TEXT_UNICODE_REVERSE_SIGNATURE) ? 2 : 0; + } + else + { + /* + * Either 'Results' has neither of those masks set, as it can be + * the case for UTF-8 text (or ANSI), or it has both as can be the + * case when analysing pure binary data chunk. This is therefore + * invalid and we fall back to ANSI encoding. + * FIXME: In case of failure, assume ANSI (as long as we do not have + * correct tests for UTF8, otherwise we should do them, and at the + * very end, assume ANSI). + */ + encFile = ENCODING_ANSI; // ENCODING_UTF8; + dwPos = 0; + } + } + + if (Encoding) + *Encoding = encFile; + if (SkipBytes) + *SkipBytes = dwPos; + + return (encFile != ENCODING_ANSI); } - -static VOID -ConInKey (VOID) +/* + * Adapted from base/shell/cmd/misc.c!FileGetString(), but with correct + * text encoding support. Also please note that similar code should be + * also used in the CMD.EXE 'TYPE' command. + * Contrary to CMD's FileGetString() we do not stop at new-lines. + * + * Read text data from a file and convert it from a given encoding to UTF-16. + * + * IN OUT PVOID pCacheBuffer and IN DWORD CacheBufferLength : + * Implementation detail so that the function uses an external user-provided + * buffer to store the data temporarily read from the file. The function + * could have used an internal buffer instead. The length is in number of bytes. + * + * IN OUT PWSTR* pBuffer and IN OUT PDWORD pnBufferLength : + * Reallocated buffer containing the string data converted to UTF-16. + * In input, contains a pointer to the original buffer and its length. + * In output, contains a pointer to the reallocated buffer and its length. + * The length is in number of characters. + * + * At first call to this function, pBuffer can be set to NULL, in which case + * when the function returns the pointer will point to a valid buffer. + * After the last call to this function, free the pBuffer pointer with: + * HeapFree(GetProcessHeap(), 0, *pBuffer); + * + * If Encoding is set to ENCODING_UTF16LE or ENCODING_UTF16BE, since we are + * compiled in UNICODE, no extra conversion is performed and therefore + * pBuffer is unused (remains unallocated) and one can directly use the + * contents of pCacheBuffer as it is expected to contain valid UTF-16 text. + * + * OUT PDWORD pdwReadBytes : Number of bytes read from the file (optional). + * OUT PDWORD pdwReadChars : Corresponding number of characters read (optional). + */ +static BOOL +FileGetString( + IN HANDLE hFile, + IN ENCODING Encoding, + IN OUT PVOID pCacheBuffer, + IN DWORD CacheBufferLength, + IN OUT PWCHAR* pBuffer, + IN OUT PDWORD pnBufferLength, + OUT PDWORD pdwReadBytes OPTIONAL, + OUT PDWORD pdwReadChars OPTIONAL) { - INPUT_RECORD ir; - DWORD dwRead; - - do - { - ReadConsoleInput (hKeyboard, &ir, 1, &dwRead); - if ((ir.EventType == KEY_EVENT) && - (ir.Event.KeyEvent.bKeyDown == TRUE)) - return; - } - while (TRUE); + BOOL Success; + UINT CodePage = (UINT)-1; + DWORD dwReadBytes; + INT len; + + // ASSERT(pCacheBuffer && (CacheBufferLength > 0)); + // ASSERT(CacheBufferLength % 2 == 0); // Cache buffer length MUST BE even! + // ASSERT(pBuffer && pnBufferLength); + + /* Always reset the retrieved number of bytes/characters */ + if (pdwReadBytes) *pdwReadBytes = 0; + if (pdwReadChars) *pdwReadChars = 0; + + Success = ReadFile(hFile, pCacheBuffer, CacheBufferLength, &dwReadBytes, NULL); + if (!Success || dwReadBytes == 0) + return FALSE; + + if (pdwReadBytes) *pdwReadBytes = dwReadBytes; + + if ((Encoding == ENCODING_ANSI) || (Encoding == ENCODING_UTF8)) + { + /* Conversion is needed */ + + if (Encoding == ENCODING_ANSI) + CodePage = GetConsoleCP(); // CP_ACP; // FIXME: Cache GetConsoleCP() value. + else // if (Encoding == ENCODING_UTF8) + CodePage = CP_UTF8; + + /* Retrieve the needed buffer size */ + len = MultiByteToWideChar(CodePage, 0, pCacheBuffer, dwReadBytes, + NULL, 0); + if (len == 0) + { + /* Failure, bail out */ + return FALSE; + } + + /* Initialize the conversion buffer if needed... */ + if (*pBuffer == NULL) + { + *pnBufferLength = len; + *pBuffer = HeapAlloc(GetProcessHeap(), 0, *pnBufferLength * sizeof(WCHAR)); + if (*pBuffer == NULL) + { + // *pBuffer = NULL; + *pnBufferLength = 0; + // WARN("DEBUG: Cannot allocate memory for *pBuffer!\n"); + // ConErrFormatMessage(GetLastError()); + return FALSE; + } + } + /* ... or reallocate only if the new length is greater than the old one */ + else if (len > *pnBufferLength) + { + PWSTR OldBuffer = *pBuffer; + + *pnBufferLength = len; + *pBuffer = HeapReAlloc(GetProcessHeap(), 0, *pBuffer, *pnBufferLength * sizeof(WCHAR)); + if (*pBuffer == NULL) + { + /* Do not leak old buffer */ + HeapFree(GetProcessHeap(), 0, OldBuffer); + // *pBuffer = NULL; + *pnBufferLength = 0; + // WARN("DEBUG: Cannot reallocate memory for *pBuffer!\n"); + // ConErrFormatMessage(GetLastError()); + return FALSE; + } + } + + /* Now perform the conversion proper */ + len = MultiByteToWideChar(CodePage, 0, pCacheBuffer, dwReadBytes, + *pBuffer, len); + dwReadBytes = len; + } + else + { + /* + * No conversion needed, just convert from big to little endian if needed. + * pBuffer and pnBufferLength are left untouched and pCacheBuffer can be + * directly used. + */ + PWCHAR pWChars = pCacheBuffer; + DWORD i; + + dwReadBytes /= sizeof(WCHAR); + + if (Encoding == ENCODING_UTF16BE) + { + for (i = 0; i < dwReadBytes; i++) + { + /* Equivalent to RtlUshortByteSwap: reverse high/low bytes */ + pWChars[i] = MAKEWORD(HIBYTE(pWChars[i]), LOBYTE(pWChars[i])); + } + } + // else if (Encoding == ENCODING_UTF16LE), we are good, nothing to do. + } + + /* Return the number of characters (dwReadBytes is converted) */ + if (pdwReadChars) *pdwReadChars = dwReadBytes; + + return TRUE; } - -static VOID -WaitForKey (VOID) +// INT CommandMore(LPTSTR cmd, LPTSTR param) +int wmain(int argc, WCHAR* argv[]) { - DWORD dwWritten; - - WriteFile (hStdErr, szCont , szContLength, &dwWritten, NULL); - - ConInKey(); - - WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL); - -// FlushConsoleInputBuffer (hConsoleIn); -} - - -//INT CommandMore (LPTSTR cmd, LPTSTR param) -int main (int argc, char **argv) -{ - SHORT maxx,maxy; - SHORT line_count=0,ch_count=0; - DWORD i, last; - HANDLE hFile = INVALID_HANDLE_VALUE; - TCHAR szFullPath[MAX_PATH]; - TCHAR szMsg[1024]; - /*reading/writing buffer*/ - TCHAR *buff; - - /*bytes written by WriteFile and ReadFile*/ - DWORD dwRead,dwWritten; - - /*ReadFile() return value*/ - BOOL bRet; - - - hStdIn = GetStdHandle(STD_INPUT_HANDLE); - hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); - hStdErr = GetStdHandle(STD_ERROR_HANDLE); - hApp = GetModuleHandle(NULL); - - buff=malloc(4096); - if (!buff) - { - ConOutPuts(_T("Error: no memory")); - return 1; - } - - if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0) - { - if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < (int)(4096 / sizeof(TCHAR))) - { - CharToOem(buff, buff); - ConOutPuts(buff); - } - - free(buff); - return 0; - } - - hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ|GENERIC_WRITE, - 0,NULL,OPEN_ALWAYS,0,0); - - GetScreenSize(&maxx,&maxy); - - - - FlushConsoleInputBuffer (hKeyboard); - - if(argc > 1) - { - GetFullPathNameA(argv[1], MAX_PATH, szFullPath, NULL); - hFile = CreateFile (szFullPath, + // FIXME this stuff! + CON_SCREEN Screen = {StdOut}; + CON_PAGER Pager = {&Screen, 0}; + + int i; + + BOOL bRet, bContinue; + + ENCODING Encoding; + DWORD SkipBytes = 0; + +#define FileCacheBufferSize 4096 + PVOID FileCacheBuffer = NULL; + PWCHAR StringBuffer = NULL; + DWORD StringBufferLength = 0; + DWORD dwReadBytes, dwReadChars; + + TCHAR szFullPath[MAX_PATH]; + + hStdIn = GetStdHandle(STD_INPUT_HANDLE); + hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); + + /* Initialize the Console Standard Streams */ + ConStreamInit(StdIn , GetStdHandle(STD_INPUT_HANDLE) , UTF8Text, INVALID_CP); + ConStreamInit(StdOut, GetStdHandle(STD_OUTPUT_HANDLE), UTF8Text, INVALID_CP); + ConStreamInit(StdErr, GetStdHandle(STD_ERROR_HANDLE) , UTF8Text, INVALID_CP); + + /* + * Bad usage (too much options) or we use the /? switch. + * Display help for the MORE command. + */ + if (argc > 1 && wcscmp(argv[1], L"/?") == 0) + { + ConResPuts(StdOut, IDS_USAGE); + return 0; + } + + // FIXME: Parse all the remaining parameters. + // Then the file list can be found at the very end. + // FIXME2: Use the PARSER api that can be found in EVENTCREATE. + + // NOTE: We might try to duplicate the ConOut for read access... ? + hKeyboard = CreateFileW(L"CONIN$", GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + FlushConsoleInputBuffer(hKeyboard); + ConStreamSetOSHandle(StdIn, hKeyboard); + + + FileCacheBuffer = HeapAlloc(GetProcessHeap(), 0, FileCacheBufferSize); + if (!FileCacheBuffer) + { + ConPuts(StdErr, L"Error: no memory\n"); + CloseHandle(hKeyboard); + return 1; + } + + /* Special case where we run 'MORE' without any argument: we use STDIN */ + if (argc <= 1) + { + /* + * Assign STDIN handle to hFile so that the page prompt function will + * know the data comes from STDIN, and will take different actions. + */ + hFile = hStdIn; + + /* Update the statistics for PagePrompt */ + dwFileSize = 0; + dwSumReadBytes = dwSumReadChars = 0; + + /* We suppose we read text from the file */ + + /* For STDIN we always suppose we are in ANSI mode */ + // SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + Encoding = ENCODING_ANSI; // ENCODING_UTF8; + + bContinue = ConPutsPaging(&Pager, PagePrompt, TRUE, L""); + if (!bContinue) + goto Quit; + + do + { + bRet = FileGetString(hFile, Encoding, + FileCacheBuffer, FileCacheBufferSize, + &StringBuffer, &StringBufferLength, + &dwReadBytes, &dwReadChars); + if (!bRet || dwReadBytes == 0 || dwReadChars == 0) + { + /* We failed at reading the file, bail out */ + break; + } + + /* Update the statistics for PagePrompt */ + dwSumReadBytes += dwReadBytes; + dwSumReadChars += dwReadChars; + + bContinue = ConWritePaging(&Pager, PagePrompt, FALSE, + StringBuffer, dwReadChars); + /* If we Ctrl-C/Ctrl-Break, stop everything */ + if (!bContinue) + goto Quit; + } + while (bRet && dwReadBytes > 0); + goto Quit; + } + + /* We have files: read them and output them to STDOUT */ + for (i = 1; i < argc; i++) + { + GetFullPathNameW(argv[i], ARRAYSIZE(szFullPath), szFullPath, NULL); + hFile = CreateFileW(szFullPath, GENERIC_READ, - 0, + FILE_SHARE_READ, NULL, OPEN_EXISTING, - 0, - 0); - if (hFile == INVALID_HANDLE_VALUE) - { - if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < (int)(sizeof(szMsg) / sizeof(TCHAR))) - { - _stprintf(buff, szMsg, szFullPath); - CharToOem(buff, buff); - ConOutPuts(buff); - } - - free(buff); - return 0; - } - } - else - { - hFile = hStdIn; - } - - if (!LoadString(hApp, IDS_CONTINUE, szCont, sizeof(szCont) / sizeof(TCHAR))) - { - /* Shouldn't happen, so exit */ - free(buff); - return 1; - } - szContLength = _tcslen(szCont); - - - - do - { - bRet = ReadFile(hFile,buff,4096,&dwRead,NULL); - - for(last=i=0;i<dwRead && bRet;i++) - { - ch_count++; - if(buff[i] == _T('\n') || ch_count == maxx) - { - ch_count=0; - line_count++; - if (line_count == maxy) - { - line_count = 0; - WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL); - last=i+1; - FlushFileBuffers (hStdOut); - WaitForKey (); - } - } - } - if (last<dwRead && bRet) - WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL); - - } - while(dwRead>0 && bRet); - - free (buff); - CloseHandle (hKeyboard); - if (hFile != hStdIn) - CloseHandle (hFile); - - return 0; + 0, // FILE_ATTRIBUTE_NORMAL, + NULL); + if (hFile == INVALID_HANDLE_VALUE) + { + ConResPrintf(StdErr, IDS_FILE_ACCESS, szFullPath); + continue; + } + + /* We currently do not support files too big */ + dwFileSize = GetFileSize(hFile, NULL); + if (dwFileSize == INVALID_FILE_SIZE) + { + ConPuts(StdErr, L"ERROR: Invalid file size!\n"); + CloseHandle(hFile); + continue; + } + + /* We suppose we read text from the file */ + + /* Check whether the file is UNICODE and retrieve its encoding */ + SetFilePointer(hFile, 0, NULL, FILE_BEGIN); + bRet = ReadFile(hFile, FileCacheBuffer, FileCacheBufferSize, &dwReadBytes, NULL); + IsDataUnicode(FileCacheBuffer, dwReadBytes, &Encoding, &SkipBytes); + SetFilePointer(hFile, SkipBytes, NULL, FILE_BEGIN); + + /* Update the statistics for PagePrompt */ + dwSumReadBytes = dwSumReadChars = 0; + + bContinue = ConPutsPaging(&Pager, PagePrompt, TRUE, L""); + if (!bContinue) + { + CloseHandle(hFile); + goto Quit; + } + + do + { + bRet = FileGetString(hFile, Encoding, + FileCacheBuffer, FileCacheBufferSize, + &StringBuffer, &StringBufferLength, + &dwReadBytes, &dwReadChars); + if (!bRet || dwReadBytes == 0 || dwReadChars == 0) + { + /* + * We failed at reading the file, bail out and + * continue with the other files. + */ + break; + } + + /* Update the statistics for PagePrompt */ + dwSumReadBytes += dwReadBytes; + dwSumReadChars += dwReadChars; + + if ((Encoding == ENCODING_UTF16LE) || (Encoding == ENCODING_UTF16BE)) + { + bContinue = ConWritePaging(&Pager, PagePrompt, FALSE, + FileCacheBuffer, dwReadChars); + } + else + { + bContinue = ConWritePaging(&Pager, PagePrompt, FALSE, + StringBuffer, dwReadChars); + } + /* If we Ctrl-C/Ctrl-Break, stop everything */ + if (!bContinue) + { + CloseHandle(hFile); + goto Quit; + } + } + while (bRet && dwReadBytes > 0); + + CloseHandle(hFile); + } + +Quit: + if (StringBuffer) HeapFree(GetProcessHeap(), 0, StringBuffer); + HeapFree(GetProcessHeap(), 0, FileCacheBuffer); + CloseHandle(hKeyboard); + return 0; } /* EOF */ Modified: trunk/reactos/base/applications/cmdutils/more/more.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/more.rc [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -2,13 +2,16 @@ #include "resource.h" -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS More Command" -#define REACTOS_STR_INTERNAL_NAME "more" -#define REACTOS_STR_ORIGINAL_FILENAME "more.com" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS More Command" +#define REACTOS_STR_INTERNAL_NAME "more" +#define REACTOS_STR_ORIGINAL_FILENAME "more.com" #include <reactos/version.rc> /* UTF-8 */ #pragma code_page(65001) + #ifdef LANGUAGE_BG_BG #include "lang/bg-BG.rc" #endif @@ -71,4 +74,4 @@ #endif #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" -#endif +#endif Modified: trunk/reactos/base/applications/cmdutils/more/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/resource.h [iso-8859-1] Sat Oct 22 22:07:28 2016 @@ -2,4 +2,5 @@ #define IDS_USAGE 100 #define IDS_CONTINUE 101 -#define IDS_FILE_ACCESS 102 +#define IDS_CONTINUE_PROGRESS 102 +#define IDS_FILE_ACCESS 103

8 years, 2 months

[hbelusca] 73024: [CONUTILS] - Introduce new functionalities related to console streams, a console screen management api (almost stubbed), a console pager api (adapted from code from CMD). This new...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 22 21:54:29 2016 New Revision: 73024 URL: http://svn.reactos.org/svn/reactos?rev=73024&view=rev Log: [CONUTILS] - Introduce new functionalities related to console streams, a console screen management api (almost stubbed), a console pager api (adapted from code from CMD). This new functionality will be used in the future. See CORE-10504 for more details. - As this library is therefore growing up, split it in small parts (sublibraries) that can be used, with the following dependency scheme: base utils (standalone); streams depending on base; screen depending on streams; pager depending on screen. [APPS]: As a result, modify the CMakeLists of the different apps that use conutils to make them depend on the correct sublibrary. Added: trunk/reactos/sdk/lib/conutils/README.txt (with props) trunk/reactos/sdk/lib/conutils/pager.c (with props) trunk/reactos/sdk/lib/conutils/pager.h (with props) trunk/reactos/sdk/lib/conutils/screen.c (with props) trunk/reactos/sdk/lib/conutils/screen.h (with props) trunk/reactos/sdk/lib/conutils/stream.c - copied, changed from r73012, trunk/reactos/sdk/lib/conutils/conutils.c trunk/reactos/sdk/lib/conutils/stream.h - copied, changed from r73012, trunk/reactos/sdk/lib/conutils/conutils.h trunk/reactos/sdk/lib/conutils/utils.c - copied, changed from r73023, trunk/reactos/sdk/lib/conutils/conutils.c trunk/reactos/sdk/lib/conutils/utils.h - copied, changed from r73012, trunk/reactos/sdk/lib/conutils/conutils.h Removed: trunk/reactos/sdk/lib/conutils/conutils.c Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt trunk/reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt trunk/reactos/base/applications/cmdutils/help/CMakeLists.txt trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt trunk/reactos/base/applications/logoff/CMakeLists.txt trunk/reactos/base/applications/network/net/CMakeLists.txt trunk/reactos/base/applications/shutdown/CMakeLists.txt trunk/reactos/base/system/chkdsk/CMakeLists.txt trunk/reactos/base/system/diskpart/CMakeLists.txt trunk/reactos/base/system/format/CMakeLists.txt trunk/reactos/base/system/subst/CMakeLists.txt trunk/reactos/sdk/lib/conutils/CMakeLists.txt trunk/reactos/sdk/lib/conutils/conutils.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/CM… Modified: trunk/reactos/base/applications/cmdutils/clip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/comp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/mode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/logoff/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/C… Modified: trunk/reactos/base/applications/network/net/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/shutdown/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/system/chkdsk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/chkdsk/CMakeLi… Modified: trunk/reactos/base/system/diskpart/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/CMake… Modified: trunk/reactos/base/system/format/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/CMakeLi… Modified: trunk/reactos/base/system/subst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/CMakeLis… Modified: trunk/reactos/sdk/lib/conutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/CMakeList… Added: trunk/reactos/sdk/lib/conutils/README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/README.tx… Removed: trunk/reactos/sdk/lib/conutils/conutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/conutils.… Modified: trunk/reactos/sdk/lib/conutils/conutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/conutils.… Added: trunk/reactos/sdk/lib/conutils/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/pager.c?r… Added: trunk/reactos/sdk/lib/conutils/pager.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/pager.h?r… Added: trunk/reactos/sdk/lib/conutils/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/screen.c?… Added: trunk/reactos/sdk/lib/conutils/screen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/screen.h?… Copied: trunk/reactos/sdk/lib/conutils/stream.c (from r73012, trunk/reactos/sdk/lib/conutils/conutils.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/stream.c?… Copied: trunk/reactos/sdk/lib/conutils/stream.h (from r73012, trunk/reactos/sdk/lib/conutils/conutils.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/stream.h?… Copied: trunk/reactos/sdk/lib/conutils/utils.c (from r73023, trunk/reactos/sdk/lib/conutils/conutils.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/utils.c?p… Copied: trunk/reactos/sdk/lib/conutils/utils.h (from r73012, trunk/reactos/sdk/lib/conutils/conutils.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/utils.h?p…

8 years, 2 months

← Newer
1
...
4
5
6
7
8
9
10
...
23
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 October 2016