Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 65585: [NTOSKRNL] Addendum to r65584: don't forget to commit the header~
by pschweitzer＠svn.reactos.org 07 Dec '14

07 Dec '14

Author: pschweitzer Date: Sun Dec 7 18:02:04 2014 New Revision: 65585 URL: http://svn.reactos.org/svn/reactos?rev=65585&view=rev Log: [NTOSKRNL] Addendum to r65584: don't forget to commit the header~ Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Sun Dec 7 18:02:04 2014 @@ -1210,6 +1210,14 @@ IN BOOLEAN Define ); +VOID +NTAPI +IopDoNameTransmogrify( + IN PIRP Irp, + IN PFILE_OBJECT FileObject, + IN PREPARSE_DATA_BUFFER DataBuffer +); + // // I/O Timer Routines //

1 0

[pschweitzer] 65584: [NTOSKRNL] Implement support for (some) reparse points in Io manager. Ob should be already fine. - Implement the IopDoNameTransmogrify() function. This one is responsible for c...
by pschweitzer＠svn.reactos.org 07 Dec '14

07 Dec '14

Author: pschweitzer Date: Sun Dec 7 17:59:58 2014 New Revision: 65584 URL: http://svn.reactos.org/svn/reactos?rev=65584&view=rev Log: [NTOSKRNL] Implement support for (some) reparse points in Io manager. Ob should be already fine. - Implement the IopDoNameTransmogrify() function. This one is responsible for checking the correct data for the reparse point and to update the path name in the file object. It will also free the memory buffer allocated by the driver to communicate the reparse information. - Fix the support for reparse points in IopCompleteRequest(). If we receive reparse status + reparse tag we know, we call IopDoNameTransmogrify() to update file objet. - Fix the support for reparse points in IopParseDevice() (oh! you again? :-)). When we complete the IRP ourselves, act as in IopCompleteRequest(). Then, we properly update objects manipulated by Io for the create request and we return STATUS_REPARSE so that Ob can update and recall us afterwards so that we complete. Some parts are left unimplemented when it comes to reparse tags which are not IO_REPARSE_TAG_MOUNT_POINT. But still less than previously ;-). Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sun Dec 7 17:59:58 2014 @@ -160,6 +160,107 @@ InterlockedIncrement(&DeviceObject->ReferenceCount); return STATUS_SUCCESS; } +} + +VOID +NTAPI +IopDoNameTransmogrify(IN PIRP Irp, + IN PFILE_OBJECT FileObject, + IN PREPARSE_DATA_BUFFER DataBuffer) +{ + PWSTR Buffer; + USHORT Length; + USHORT RequiredLength; + PWSTR NewBuffer; + + PAGED_CODE(); + + ASSERT(Irp->IoStatus.Status == STATUS_REPARSE); + ASSERT(Irp->IoStatus.Information == IO_REPARSE_TAG_MOUNT_POINT); + ASSERT(Irp->Tail.Overlay.AuxiliaryBuffer != NULL); + ASSERT(DataBuffer != NULL); + ASSERT(DataBuffer->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT); + ASSERT(DataBuffer->ReparseDataLength < MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + ASSERT(DataBuffer->Reserved < MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + + /* First of all, validate data */ + if (DataBuffer->ReparseDataLength < REPARSE_DATA_BUFFER_HEADER_SIZE || + (DataBuffer->SymbolicLinkReparseBuffer.PrintNameLength + + DataBuffer->SymbolicLinkReparseBuffer.SubstituteNameLength + + FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer.PathBuffer[0])) > MAXIMUM_REPARSE_DATA_BUFFER_SIZE) + { + Irp->IoStatus.Status = STATUS_IO_REPARSE_DATA_INVALID; + } + + /* Everything went right */ + if (NT_SUCCESS(Irp->IoStatus.Status)) + { + /* Compute buffer & length */ + Buffer = (PWSTR)((ULONG_PTR)DataBuffer->MountPointReparseBuffer.PathBuffer + + DataBuffer->MountPointReparseBuffer.SubstituteNameOffset); + Length = DataBuffer->MountPointReparseBuffer.SubstituteNameLength; + + /* Check we don't overflow */ + if ((MAXUSHORT - DataBuffer->Reserved) <= (Length + sizeof(UNICODE_NULL))) + { + Irp->IoStatus.Status = STATUS_IO_REPARSE_DATA_INVALID; + } + else + { + /* Compute how much mem we'll need */ + RequiredLength = DataBuffer->Reserved + Length + sizeof(UNICODE_NULL); + + /* Check if FileObject can already hold what we need */ + if (FileObject->FileName.MaximumLength >= RequiredLength) + { + NewBuffer = FileObject->FileName.Buffer; + } + else + { + /* Allocate otherwise */ + NewBuffer = ExAllocatePoolWithTag(PagedPool, RequiredLength, TAG_IO_NAME); + if (NewBuffer == NULL) + { + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + } + } + + /* Everything went right */ + if (NT_SUCCESS(Irp->IoStatus.Status)) + { + /* Copy reserved */ + if (DataBuffer->Reserved) + { + RtlMoveMemory((PWSTR)((ULONG_PTR)NewBuffer + Length), + (PWSTR)((ULONG_PTR)FileObject->FileName.Buffer + FileObject->FileName.Length - DataBuffer->Reserved), + DataBuffer->Reserved); + } + + /* Then, buffer */ + if (Length) + { + RtlCopyMemory(NewBuffer, Buffer, Length); + } + + /* And finally replace buffer if new one was allocated */ + FileObject->FileName.Length = RequiredLength - sizeof(UNICODE_NULL); + if (NewBuffer != FileObject->FileName.Buffer) + { + if (FileObject->FileName.Buffer) + { + ExFreePoolWithTag(FileObject->FileName.Buffer, TAG_IO_NAME); + } + + FileObject->FileName.Buffer = NewBuffer; + FileObject->FileName.MaximumLength = RequiredLength; + FileObject->FileName.Buffer[RequiredLength / sizeof(WCHAR) - 1] = UNICODE_NULL; + } + } + + /* We don't need them anymore - it was allocated by the driver */ + ExFreePool(DataBuffer); } NTSTATUS @@ -206,6 +307,23 @@ /* Validate the open packet */ if (!IopValidateOpenPacket(OpenPacket)) return STATUS_OBJECT_TYPE_MISMATCH; + /* Valide reparse point in case we traversed a mountpoint */ + if (OpenPacket->TraversedMountPoint) + { + /* This is a reparse point we understand */ + ASSERT(OpenPacket->Information == IO_REPARSE_TAG_MOUNT_POINT); + + /* Make sure we're dealing with correct DO */ + if (OriginalDeviceObject->DeviceType != FILE_DEVICE_DISK && + OriginalDeviceObject->DeviceType != FILE_DEVICE_CD_ROM && + OriginalDeviceObject->DeviceType != FILE_DEVICE_VIRTUAL_DISK && + OriginalDeviceObject->DeviceType != FILE_DEVICE_TAPE) + { + OpenPacket->FinalStatus = STATUS_IO_REPARSE_DATA_INVALID; + return STATUS_IO_REPARSE_DATA_INVALID; + } + } + /* Check if we have a related file object */ if (OpenPacket->RelatedFileObject) { @@ -404,6 +522,7 @@ /* Check if we can simply use a dummy file */ UseDummyFile = ((OpenPacket->QueryOnly) || (OpenPacket->DeleteOnly)); +#if 1 /* FIXME: Small hack still exists, have to check why... * This is triggered multiple times by usetup and then once per boot. */ @@ -424,6 +543,7 @@ WRITE_DAC)); DirectOpen = TRUE; } +#endif /* Check if this is a direct open */ if (!(RemainingName->Length) && @@ -482,6 +602,12 @@ /* Get the attached device */ DeviceObject = IoGetAttachedDevice(DeviceObject); } + } + + /* If we traversed a mount point, reset the information */ + if (OpenPacket->TraversedMountPoint) + { + OpenPacket->TraversedMountPoint = FALSE; } /* Check if this is a secure FSD */ @@ -740,6 +866,26 @@ ASSERT(!Irp->PendingReturned); ASSERT(!Irp->MdlAddress); + /* Handle name change if required */ + if (Status == STATUS_REPARSE) + { + /* Check this is a mount point */ + if (OpenPacket->Information == IO_REPARSE_TAG_MOUNT_POINT) + { + PREPARSE_DATA_BUFFER ReparseData; + + /* Reparse point attributes were passed by the driver in the auxiliary buffer */ + ASSERT(Irp->Tail.Overlay.AuxiliaryBuffer != NULL); + ReparseData = (PREPARSE_DATA_BUFFER)Irp->Tail.Overlay.AuxiliaryBuffer; + + ASSERT(ReparseData->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT); + ASSERT(ReparseData->ReparseDataLength < MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + ASSERT(ReparseData->Reserved < MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + + IopDoNameTransmogrify(Irp, FileObject, ReparseData); + } + } + /* Completion happens at APC_LEVEL */ KeRaiseIrql(APC_LEVEL, &OldIrql); @@ -805,7 +951,90 @@ } else if (Status == STATUS_REPARSE) { - /* FIXME: We don't handle this at all! */ + if (OpenPacket->Information == IO_REPARSE || + OpenPacket->Information == IO_REPARSE_TAG_MOUNT_POINT) + { + /* Update CompleteName with reparse info which got updated in IopDoNameTransmogrify() */ + if (CompleteName->MaximumLength < FileObject->FileName.Length) + { + PWSTR NewCompleteName; + + /* Allocate a new buffer for the string */ + NewCompleteName = ExAllocatePoolWithTag(PagedPool, FileObject->FileName.Length, TAG_IO_NAME); + if (NewCompleteName == NULL) + { + OpenPacket->FinalStatus = STATUS_INSUFFICIENT_RESOURCES; + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Release the old one */ + if (CompleteName->Buffer != NULL) + { + ExFreePoolWithTag(CompleteName->Buffer, TAG_IO_NAME); + } + + /* And setup the new one */ + CompleteName->Buffer = NewCompleteName; + CompleteName->MaximumLength = FileObject->FileName.Length; + } + + /* Copy our new complete name */ + RtlCopyUnicodeString(CompleteName, &FileObject->FileName); + + if (OpenPacket->Information == IO_REPARSE_TAG_MOUNT_POINT) + { + OpenPacket->RelatedFileObject = NULL; + } + } + + /* Check if we have a name */ + if (FileObject->FileName.Length) + { + /* Free it */ + ExFreePoolWithTag(FileObject->FileName.Buffer, TAG_IO_NAME); + FileObject->FileName.Length = 0; + } + + /* Clear its device object */ + FileObject->DeviceObject = NULL; + + /* Clear the file object in the open packet */ + OpenPacket->FileObject = NULL; + + /* Dereference the file object */ + if (!UseDummyFile) ObDereferenceObject(FileObject); + + /* Dereference the device object */ + IopDereferenceDeviceObject(OriginalDeviceObject, FALSE); + + /* Unless the driver cancelled the open, dereference the VPB */ + if (Vpb != NULL) IopDereferenceVpbAndFree(Vpb); + + if (OpenPacket->Information != IO_REMOUNT) + { + OpenPacket->RelatedFileObject = NULL; + + /* Inform we traversed a mount point for later attempt */ + if (OpenPacket->Information == IO_REPARSE_TAG_MOUNT_POINT) + { + OpenPacket->TraversedMountPoint = 1; + } + + /* In case we override checks, but got this on volume open, fail hard */ + if (OpenPacket->Override) + { + KeBugCheckEx(DRIVER_RETURNED_STATUS_REPARSE_FOR_VOLUME_OPEN, + (ULONG_PTR)OriginalDeviceObject, + (ULONG_PTR)DeviceObject, + (ULONG_PTR)CompleteName, + OpenPacket->Information); + } + + /* Return to IO/OB so that information can be upgraded */ + return STATUS_REPARSE; + } + + /* FIXME: At that point, we should loop again and reattempt an opening */ ASSERT(FALSE); } Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sun Dec 7 17:59:58 2014 @@ -264,9 +264,15 @@ if ((Irp->IoStatus.Status == STATUS_REPARSE) && (Irp->IoStatus.Information == IO_REPARSE_TAG_MOUNT_POINT)) { - /* We should never get this yet */ - UNIMPLEMENTED_DBGBREAK("Reparse support not yet present!\n"); - return; + PREPARSE_DATA_BUFFER ReparseData; + + ReparseData = (PREPARSE_DATA_BUFFER)*SystemArgument2; + + ASSERT(ReparseData->ReparseTag == IO_REPARSE_TAG_MOUNT_POINT); + ASSERT(ReparseData->ReparseDataLength < MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + ASSERT(ReparseData->Reserved < MAXIMUM_REPARSE_DATA_BUFFER_SIZE); + + IopDoNameTransmogrify(Irp, FileObject, ReparseData); } }

1 0

[aandrejevic] 65583: [SHELL32:ICONS] Replace the old "My Computer" icon with a new one. New icon by: Ismael Ferreras Morezuelas. CORE-8890 #resolve #comment Committed in revision r65583. Thanks!
by aandrejevic＠svn.reactos.org 07 Dec '14

07 Dec '14

Author: aandrejevic Date: Sun Dec 7 17:53:08 2014 New Revision: 65583 URL: http://svn.reactos.org/svn/reactos?rev=65583&view=rev Log: [SHELL32:ICONS] Replace the old "My Computer" icon with a new one. New icon by: Ismael Ferreras Morezuelas. CORE-8890 #resolve #comment Committed in revision r65583. Thanks! Modified: trunk/reactos/dll/win32/shell32/res/icons/16.ico Modified: trunk/reactos/dll/win32/shell32/res/icons/16.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/icon… ============================================================================== Binary files - no diff available.

1 0

[pschweitzer] 65582: [BUGCODES] Add bug check code 0xF9 DRIVER_RETURNED_STATUS_REPARSE_FOR_VOLUME_OPEN Ref: http://msdn.microsoft.com/en-us/library/windows/hardware/ff560396%28v=vs.85%29.aspx
by pschweitzer＠svn.reactos.org 07 Dec '14

07 Dec '14

Author: pschweitzer Date: Sun Dec 7 16:54:27 2014 New Revision: 65582 URL: http://svn.reactos.org/svn/reactos?rev=65582&view=rev Log: [BUGCODES] Add bug check code 0xF9 DRIVER_RETURNED_STATUS_REPARSE_FOR_VOLUME_OPEN Ref: http://msdn.microsoft.com/en-us/library/windows/hardware/ff560396%28v=vs.85… Modified: trunk/reactos/include/reactos/mc/bugcodes.mc Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sun Dec 7 16:54:27 2014 @@ -1586,6 +1586,14 @@ An initialization failure occurred while attempting to boot from the RAM disk. . +MessageId=0xF9 +Severity=Success +Facility=System +SymbolicName=DRIVER_RETURNED_STATUS_REPARSE_FOR_VOLUME_OPEN +Language=English +STATUS_REPARSE was returned from a FSD when trying to open a volume. +. + MessageId=0xFA Severity=Success Facility=System

1 0

[pschweitzer] 65581: [NTFS] Implement NtfsFsdDeviceControl()
by pschweitzer＠svn.reactos.org 07 Dec '14

07 Dec '14

Author: pschweitzer Date: Sun Dec 7 14:16:13 2014 New Revision: 65581 URL: http://svn.reactos.org/svn/reactos?rev=65581&view=rev Log: [NTFS] Implement NtfsFsdDeviceControl() Added: trunk/reactos/drivers/filesystems/ntfs/devctl.c (with props) Modified: trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] Sun Dec 7 14:16:13 2014 @@ -4,6 +4,7 @@ blockdev.c close.c create.c + devctl.c dirctl.c dispatch.c fastio.c Added: trunk/reactos/drivers/filesystems/ntfs/devctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/devctl.c (added) +++ trunk/reactos/drivers/filesystems/ntfs/devctl.c [iso-8859-1] Sun Dec 7 14:16:13 2014 @@ -0,0 +1,46 @@ +/* + * ReactOS kernel + * Copyright (C) 2014 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/filesystem/ntfs/devctl.c + * PURPOSE: NTFS filesystem driver + * PROGRAMMERS: Pierre Schweitzer (pierre(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ + +#include "ntfs.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +NTSTATUS +NTAPI +NtfsFsdDeviceControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PDEVICE_EXTENSION DeviceExt; + + DeviceExt = DeviceObject->DeviceExtension; + IoSkipCurrentIrpStackLocation(Irp); + + return IoCallDriver(DeviceExt->StorageDevice, Irp); +} Propchange: trunk/reactos/drivers/filesystems/ntfs/devctl.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Sun Dec 7 14:16:13 2014 @@ -135,6 +135,7 @@ DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = NtfsFsdDirectoryControl; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = NtfsFsdFileSystemControl; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = NtfsFsdDeviceControl; return; } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Dec 7 14:16:13 2014 @@ -519,6 +519,14 @@ PIRP Irp); +/* devctl.c */ + +DRIVER_DISPATCH NtfsFsdDeviceControl; +NTSTATUS NTAPI +NtfsFsdDeviceControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp); + + /* dirctl.c */ DRIVER_DISPATCH NtfsFsdDirectoryControl;

1 0

[pschweitzer] 65580: [NTFS] Allow direct opening of a reparse point, but don't handle yet reparse itself
by pschweitzer＠svn.reactos.org 07 Dec '14

07 Dec '14

Author: pschweitzer Date: Sun Dec 7 14:05:47 2014 New Revision: 65580 URL: http://svn.reactos.org/svn/reactos?rev=65580&view=rev Log: [NTFS] Allow direct opening of a reparse point, but don't handle yet reparse itself Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun Dec 7 14:05:47 2014 @@ -245,6 +245,23 @@ return STATUS_NOT_A_DIRECTORY; } + /* Properly handle reparse points: + * - likely overwrite FO name + * - return STATUS_REPARSE to IO manager + * - Do we have to attach reparse data to Irp->Tail.Overlay.AuxiliaryBuffer? + * See: http://www.osronline.com/showThread.cfm?link=6623 + * + * If it is a reparse point & FILE_OPEN_REPARSE_POINT, then allow opening it + * as a normal file. + */ + if (NtfsFCBIsReparsePoint(Fcb) && + ((RequestedOptions & FILE_OPEN_REPARSE_POINT) != FILE_OPEN_REPARSE_POINT)) + { + DPRINT1("Reparse point not handled!\n"); + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_NOT_IMPLEMENTED; + } + /* HUGLY HACK: remain RO so far... */ if (RequestedDisposition == FILE_OVERWRITE || RequestedDisposition == FILE_OVERWRITE_IF ||

1 0

[pschweitzer] 65579: [NTFS] Implement NtfsFCBIsReparsePoint() which returns true in case current FCB is a reparse point
by pschweitzer＠svn.reactos.org 07 Dec '14

07 Dec '14

Author: pschweitzer Date: Sun Dec 7 13:30:13 2014 New Revision: 65579 URL: http://svn.reactos.org/svn/reactos?rev=65579&view=rev Log: [NTFS] Implement NtfsFCBIsReparsePoint() which returns true in case current FCB is a reparse point Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sun Dec 7 13:30:13 2014 @@ -125,6 +125,13 @@ BOOLEAN +NtfsFCBIsReparsePoint(PNTFS_FCB Fcb) +{ + return ((Fcb->Entry.FileAttributes & NTFS_FILE_TYPE_REPARSE) == NTFS_FILE_TYPE_REPARSE); +} + + +BOOLEAN NtfsFCBIsRoot(PNTFS_FCB Fcb) { return (wcscmp(Fcb->PathName, L"\\") == 0); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun Dec 7 13:30:13 2014 @@ -565,6 +565,9 @@ NtfsFCBIsDirectory(PNTFS_FCB Fcb); BOOLEAN +NtfsFCBIsReparsePoint(PNTFS_FCB Fcb); + +BOOLEAN NtfsFCBIsRoot(PNTFS_FCB Fcb); VOID

1 0

[gadamopoulos] 65578: [EXPLORER] - Add accelerator table for the taskbar. It is unused for now.
by gadamopoulos＠svn.reactos.org 07 Dec '14

07 Dec '14

Author: gadamopoulos Date: Sun Dec 7 11:07:51 2014 New Revision: 65578 URL: http://svn.reactos.org/svn/reactos?rev=65578&view=rev Log: [EXPLORER] - Add accelerator table for the taskbar. It is unused for now. Modified: trunk/reactos/base/shell/explorer/explorer.rc trunk/reactos/base/shell/explorer/resource.h Modified: trunk/reactos/base/shell/explorer/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] Sun Dec 7 11:07:51 2014 @@ -29,6 +29,21 @@ BEGIN //IDS_HELP_COMMAND "helpctr.exe>-FromStartHelp" IDS_HELP_COMMAND "https://www.reactos.org/" +END + +IDA_TASKBAR ACCELERATORS +BEGIN + "s", IDMA_START, ALT + VK_F6, IDMA_CYCLE_FOCUS, VIRTKEY + VK_TAB, IDMA_CYCLE_FOCUS, VIRTKEY + VK_TAB, IDMA_CYCLE_FOCUS, VIRTKEY, CONTROL + VK_TAB, IDMA_CYCLE_FOCUS, VIRTKEY, SHIFT + VK_TAB, IDMA_CYCLE_FOCUS, VIRTKEY, CONTROL, SHIFT + VK_F3, IDMA_SEARCH, VIRTKEY + //VK_F5, 41061, VIRTKEY + VK_RETURN, IDM_TASKBARANDSTARTMENU, VIRTKEY, ALT + "Z", IDMA_RESTORE_OPEN, VIRTKEY, CONTROL + "M", IDMA_MINIMIZE_ALL, VIRTKEY, ALT END /* UTF-8 */ Modified: trunk/reactos/base/shell/explorer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/resour… ============================================================================== --- trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/resource.h [iso-8859-1] Sun Dec 7 11:07:51 2014 @@ -16,6 +16,14 @@ #define IDM_STARTMENU 102 #define IDB_STARTMENU 101 + +#define IDA_TASKBAR 251 + +#define IDMA_START 305 +#define IDMA_CYCLE_FOCUS 41008 +#define IDMA_SEARCH 41093 +#define IDMA_RESTORE_OPEN 416 +#define IDMA_MINIMIZE_ALL 419 #define ID_SHELL_CMD_FIRST 0xF #define ID_SHELL_CMD_LAST 0x7FEF

1 0

[dreimer] 65577: [OSK] Update keyboard layout to become bigger, text fitting in the buttons and bein easier to use Part 2/2 + small fixes.
by dreimer＠svn.reactos.org 07 Dec '14

07 Dec '14

Author: dreimer Date: Sun Dec 7 01:33:46 2014 New Revision: 65577 URL: http://svn.reactos.org/svn/reactos?rev=65577&view=rev Log: [OSK] Update keyboard layout to become bigger, text fitting in the buttons and bein easier to use Part 2/2 + small fixes. Modified: trunk/reactos/base/applications/osk/lang/ar-DZ.rc trunk/reactos/base/applications/osk/lang/de-DE.rc trunk/reactos/base/applications/osk/lang/en-GB.rc trunk/reactos/base/applications/osk/lang/en-US.rc trunk/reactos/base/applications/osk/lang/es-ES.rc trunk/reactos/base/applications/osk/lang/fr-CA.rc trunk/reactos/base/applications/osk/lang/fr-FR.rc trunk/reactos/base/applications/osk/lang/it-IT.rc trunk/reactos/base/applications/osk/lang/pl-PL.rc trunk/reactos/base/applications/osk/lang/ru-RU.rc Modified: trunk/reactos/base/applications/osk/lang/ar-DZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/ar-DZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/ar-DZ.rc [iso-8859-1] Sun Dec 7 01:33:46 2014 @@ -8,121 +8,121 @@ LANGUAGE LANG_ARABIC, SUBLANG_DEFAULT -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108 +MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "On screen keyboard" FONT 8, "MS Shell Dlg" EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE BEGIN - PUSHBUTTON "Esc",SCAN_CODE_110,3,3,14,13 - PUSHBUTTON "F1",SCAN_CODE_112,39,3,14,13 - PUSHBUTTON "F2",SCAN_CODE_113,56,3,14,13 - PUSHBUTTON "F3",SCAN_CODE_114,74,3,14,13 - PUSHBUTTON "F4",SCAN_CODE_115,92,3,14,13 - PUSHBUTTON "F5",SCAN_CODE_116,117,3,14,13 - PUSHBUTTON "F6",SCAN_CODE_117,135,3,14,13 - PUSHBUTTON "F7",SCAN_CODE_118,152,3,14,13 - PUSHBUTTON "F8",SCAN_CODE_119,170,3,14,13 - PUSHBUTTON "F9",SCAN_CODE_120,195,3,14,13 - PUSHBUTTON "F10",SCAN_CODE_121,213,3,14,13 - PUSHBUTTON "F11",SCAN_CODE_122,231,3,14,13 - PUSHBUTTON "F12",SCAN_CODE_123,248,3,14,13 - PUSHBUTTON "Prn",SCAN_CODE_124,273,3,14,13 - PUSHBUTTON "Stop",SCAN_CODE_125,291,3,14,13 - PUSHBUTTON "Attn",SCAN_CODE_126,309,3,14,13 - PUSHBUTTON "Ø°",SCAN_CODE_1,3,26,14,13 - PUSHBUTTON "1",SCAN_CODE_2,21,26,14,13 - PUSHBUTTON "2",SCAN_CODE_3,39,26,14,13 - PUSHBUTTON "3",SCAN_CODE_4,56,26,14,13 - PUSHBUTTON "4",SCAN_CODE_5,74,26,14,13 - PUSHBUTTON "5",SCAN_CODE_6,92,26,14,13 - PUSHBUTTON "6",SCAN_CODE_7,110,26,14,13 - PUSHBUTTON "7",SCAN_CODE_8,128,26,14,13 - PUSHBUTTON "8",SCAN_CODE_9,145,26,14,13 - PUSHBUTTON "9",SCAN_CODE_10,163,26,14,13 - PUSHBUTTON "0",SCAN_CODE_11,181,26,14,13 - PUSHBUTTON "-",SCAN_CODE_12,199,26,14,13 - PUSHBUTTON "=",SCAN_CODE_13,216,26,14,13 - PUSHBUTTON "<--",SCAN_CODE_15,234,26,28,13,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,43,21,13,BS_ICON - PUSHBUTTON "Ø¶",SCAN_CODE_17,28,43,14,13 - PUSHBUTTON "Øµ",SCAN_CODE_18,46,43,14,13 - PUSHBUTTON "Ø«",SCAN_CODE_19,64,43,14,13 - PUSHBUTTON "Ù",SCAN_CODE_20,81,43,14,13 - PUSHBUTTON "Ù",SCAN_CODE_21,99,43,14,13 - PUSHBUTTON "Øº",SCAN_CODE_22,117,43,14,13 - PUSHBUTTON "Ø¹",SCAN_CODE_23,135,43,14,13 - PUSHBUTTON "Ù",SCAN_CODE_24,152,43,14,13 - PUSHBUTTON "Ø®",SCAN_CODE_25,170,43,14,13 - PUSHBUTTON "Ø",SCAN_CODE_26,188,43,14,13 - PUSHBUTTON "Ø¬",SCAN_CODE_27,206,43,14,13 - PUSHBUTTON "Ø¯",SCAN_CODE_28,224,43,14,13 - PUSHBUTTON "\\",SCAN_CODE_29,242,43,20,13 - PUSHBUTTON "Verr maj",SCAN_CODE_30,3,60,28,13,BS_ICON - PUSHBUTTON "Ø´",SCAN_CODE_31,35,60,14,13 - PUSHBUTTON "Ø³",SCAN_CODE_32,53,60,14,13 - PUSHBUTTON "Ù",SCAN_CODE_33,71,60,14,13 - PUSHBUTTON "Ø¨",SCAN_CODE_34,88,60,14,13 - PUSHBUTTON "Ù",SCAN_CODE_35,106,60,14,13 - PUSHBUTTON "Ø§",SCAN_CODE_36,124,60,14,13 - PUSHBUTTON "Øª",SCAN_CODE_37,142,60,14,13 - PUSHBUTTON "Ù",SCAN_CODE_38,160,60,14,13 - PUSHBUTTON "Ù",SCAN_CODE_39,177,60,14,13 - PUSHBUTTON "Ù",SCAN_CODE_40,195,60,14,13 - PUSHBUTTON "Ø·",SCAN_CODE_41,213,60,14,13 - PUSHBUTTON "ret",SCAN_CODE_43,231,60,31,13,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,77,35,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Ø¦",SCAN_CODE_46,42,77,14,13 - PUSHBUTTON "Ø¡",SCAN_CODE_47,60,77,14,13 - PUSHBUTTON "Ø¤",SCAN_CODE_48,78,77,14,13 - PUSHBUTTON "Ø±",SCAN_CODE_49,96,77,14,13 - PUSHBUTTON "ï»»",SCAN_CODE_50,113,77,14,13 - PUSHBUTTON "ï»¯",SCAN_CODE_51,131,77,14,13 - PUSHBUTTON "ïº",SCAN_CODE_52,149,77,14,13 - PUSHBUTTON "Ù",SCAN_CODE_53,167,77,14,13 - PUSHBUTTON "Ø²",SCAN_CODE_54,184,77,14,13 - PUSHBUTTON "Ø¸",SCAN_CODE_55,202,77,14,13 - PUSHBUTTON "shift",SCAN_CODE_57,220,77,43,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,94,25,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,32,94,18,13,BS_ICON - PUSHBUTTON "alt",SCAN_CODE_60,53,94,18,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,74,94,100,13 - PUSHBUTTON "alt gr",SCAN_CODE_62,177,94,18,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,199,94,18,13,BS_ICON - PUSHBUTTON "menu",SCAN_CODE_129,220,94,18,13,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,241,94,21,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,273,26,14,13 - PUSHBUTTON "del",SCAN_CODE_76,273,43,14,13 - PUSHBUTTON "home",SCAN_CODE_80,291,26,14,13,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,291,43,14,13 - PUSHBUTTON "pg AR",SCAN_CODE_85,309,26,14,13,BS_ICON - PUSHBUTTON "pg AV",SCAN_CODE_86,309,43,14,13,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,273,94,14,13,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,291,77,14,13,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,291,94,14,13,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,309,94,14,13,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,334,26,14,13 - PUSHBUTTON "7",SCAN_CODE_91,334,43,14,13 - PUSHBUTTON "4",SCAN_CODE_92,334,60,14,13 - PUSHBUTTON "1",SCAN_CODE_93,334,77,14,13 - PUSHBUTTON "/",SCAN_CODE_95,352,26,14,13 - PUSHBUTTON "8",SCAN_CODE_96,352,43,14,13 - PUSHBUTTON "5",SCAN_CODE_97,352,60,14,13 - PUSHBUTTON "2",SCAN_CODE_98,352,77,14,13 - PUSHBUTTON "0",SCAN_CODE_99,334,94,32,13 - PUSHBUTTON "*",SCAN_CODE_100,369,26,14,13 - PUSHBUTTON "9",SCAN_CODE_101,369,43,14,13 - PUSHBUTTON "6",SCAN_CODE_102,369,60,14,13 - PUSHBUTTON "3",SCAN_CODE_103,369,77,14,13 - PUSHBUTTON ".",SCAN_CODE_104,369,94,14,13 - PUSHBUTTON "-",SCAN_CODE_105,387,26,14,13 - PUSHBUTTON "+",SCAN_CODE_106,387,43,14,30 - PUSHBUTTON "ent",SCAN_CODE_108,387,77,14,30 - CTEXT "Num",IDC_STATIC,334,4,18,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,341,16,4,3 - CTEXT "Caps",IDC_STATIC,359,4,18,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,366,16,4,3 - CTEXT "Scroll",IDC_STATIC,384,4,18,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,391,16,4,3 + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 + PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 + PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 + PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 + PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 + PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 + PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 + PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 + PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 + PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 + PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 + PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 + PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 + PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 + PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 + PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 + PUSHBUTTON "Ø°",SCAN_CODE_1,3,35,23,22 + PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 + PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 + PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 + PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 + PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 + PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 + PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 + PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 + PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 + PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 + PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 + PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON + PUSHBUTTON "Ø¶",SCAN_CODE_17,42,61,23,22 + PUSHBUTTON "Øµ",SCAN_CODE_18,69,61,23,22 + PUSHBUTTON "Ø«",SCAN_CODE_19,96,61,23,22 + PUSHBUTTON "Ù",SCAN_CODE_20,123,61,23,22 + PUSHBUTTON "Ù",SCAN_CODE_21,150,61,23,22 + PUSHBUTTON "Øº",SCAN_CODE_22,177,61,23,22 + PUSHBUTTON "Ø¹",SCAN_CODE_23,204,61,23,22 + PUSHBUTTON "Ù",SCAN_CODE_24,231,61,23,22 + PUSHBUTTON "Ø®",SCAN_CODE_25,258,61,23,22 + PUSHBUTTON "Ø",SCAN_CODE_26,285,61,23,22 + PUSHBUTTON "Ø¬",SCAN_CODE_27,312,61,23,22 + PUSHBUTTON "Ø¯",SCAN_CODE_28,339,61,23,22 + PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 + PUSHBUTTON "Verr maj",SCAN_CODE_30,3,87,46,22,BS_ICON + PUSHBUTTON "Ø´",SCAN_CODE_31,53,87,23,22 + PUSHBUTTON "Ø³",SCAN_CODE_32,80,87,23,22 + PUSHBUTTON "Ù",SCAN_CODE_33,107,87,23,22 + PUSHBUTTON "Ø¨",SCAN_CODE_34,134,87,23,22 + PUSHBUTTON "Ù",SCAN_CODE_35,161,87,23,22 + PUSHBUTTON "Ø§",SCAN_CODE_36,188,87,23,22 + PUSHBUTTON "Øª",SCAN_CODE_37,215,87,23,22 + PUSHBUTTON "Ù",SCAN_CODE_38,242,87,23,22 + PUSHBUTTON "Ù",SCAN_CODE_39,269,87,23,22 + PUSHBUTTON "Ù",SCAN_CODE_40,296,87,23,22 + PUSHBUTTON "Ø·",SCAN_CODE_41,323,87,23,22 + PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Ø¦",SCAN_CODE_46,64,113,23,22 + PUSHBUTTON "Ø¡",SCAN_CODE_47,91,113,23,22 + PUSHBUTTON "Ø¤",SCAN_CODE_48,118,113,23,22 + PUSHBUTTON "Ø±",SCAN_CODE_49,145,113,23,22 + PUSHBUTTON "ï»»",SCAN_CODE_50,172,113,23,22 + PUSHBUTTON "ï»¯",SCAN_CODE_51,199,113,23,22 + PUSHBUTTON "ïº",SCAN_CODE_52,226,113,23,22 + PUSHBUTTON "Ù",SCAN_CODE_53,253,113,23,22 + PUSHBUTTON "Ø²",SCAN_CODE_54,280,113,23,22 + PUSHBUTTON "Ø¸",SCAN_CODE_55,307,113,23,22 + PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 + PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 + PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 + PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON + PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 + PUSHBUTTON "pg AR",SCAN_CODE_85,465,35,23,22,BS_ICON + PUSHBUTTON "pg AV",SCAN_CODE_86,465,61,23,22,BS_ICON + PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON + PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON + PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 + PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 + PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 + PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 + PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 + PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 + PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 + PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 + PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 + PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 + PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 + PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 + PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 + PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 + PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 + PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 + PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 + CTEXT "Num",IDC_STATIC,510,4,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 + CTEXT "Caps",IDC_STATIC,540,4,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 + CTEXT "Scroll",IDC_STATIC,572,4,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END /* EOF */ Modified: trunk/reactos/base/applications/osk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/de-DE.rc [iso-8859-1] Sun Dec 7 01:33:46 2014 @@ -42,7 +42,7 @@ PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 PUSHBUTTON "Ã",SCAN_CODE_12,300,35,23,22 PUSHBUTTON "Â´",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,46,22,BS_ICON + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 @@ -56,7 +56,7 @@ PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 PUSHBUTTON "Ã",SCAN_CODE_27,312,61,23,22 PUSHBUTTON "+",SCAN_CODE_28,339,61,23,22 - PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON + PUSHBUTTON "Feststell",SCAN_CODE_30,3,87,46,22,BS_ICON PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 @@ -70,7 +70,7 @@ PUSHBUTTON "Ã",SCAN_CODE_41,323,87,23,22 PUSHBUTTON "#",SCAN_CODE_42,350,87,23,22 PUSHBUTTON "Ent",SCAN_CODE_43,377,61,23,48,BS_ICON - PUSHBUTTON "Shift",SCAN_CODE_44,3,113,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Umsch",SCAN_CODE_44,3,113,30,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "<",SCAN_CODE_45,37,113,23,22 PUSHBUTTON "Y",SCAN_CODE_46,64,113,23,22 PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 @@ -82,7 +82,7 @@ PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 PUSHBUTTON "-",SCAN_CODE_55,307,113,23,22 - PUSHBUTTON "Shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Umsch",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "Strg",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON PUSHBUTTON "Alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX Modified: trunk/reactos/base/applications/osk/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/en-GB.rc [iso-8859-1] Sun Dec 7 01:33:46 2014 @@ -42,7 +42,7 @@ PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,46,22,BS_ICON + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 Modified: trunk/reactos/base/applications/osk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/en-US.rc [iso-8859-1] Sun Dec 7 01:33:46 2014 @@ -8,121 +8,121 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108 +MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "On screen keyboard" FONT 8, "MS Shell Dlg" EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE BEGIN - PUSHBUTTON "Esc",SCAN_CODE_110,3,3,14,13 - PUSHBUTTON "F1",SCAN_CODE_112,39,3,14,13 - PUSHBUTTON "F2",SCAN_CODE_113,56,3,14,13 - PUSHBUTTON "F3",SCAN_CODE_114,74,3,14,13 - PUSHBUTTON "F4",SCAN_CODE_115,92,3,14,13 - PUSHBUTTON "F5",SCAN_CODE_116,117,3,14,13 - PUSHBUTTON "F6",SCAN_CODE_117,135,3,14,13 - PUSHBUTTON "F7",SCAN_CODE_118,152,3,14,13 - PUSHBUTTON "F8",SCAN_CODE_119,170,3,14,13 - PUSHBUTTON "F9",SCAN_CODE_120,195,3,14,13 - PUSHBUTTON "F10",SCAN_CODE_121,213,3,14,13 - PUSHBUTTON "F11",SCAN_CODE_122,231,3,14,13 - PUSHBUTTON "F12",SCAN_CODE_123,248,3,14,13 - PUSHBUTTON "Prn",SCAN_CODE_124,273,3,14,13 - PUSHBUTTON "Stop",SCAN_CODE_125,291,3,14,13 - PUSHBUTTON "Attn",SCAN_CODE_126,309,3,14,13 - PUSHBUTTON "`",SCAN_CODE_1,3,26,14,13 - PUSHBUTTON "1",SCAN_CODE_2,21,26,14,13 - PUSHBUTTON "2",SCAN_CODE_3,39,26,14,13 - PUSHBUTTON "3",SCAN_CODE_4,56,26,14,13 - PUSHBUTTON "4",SCAN_CODE_5,74,26,14,13 - PUSHBUTTON "5",SCAN_CODE_6,92,26,14,13 - PUSHBUTTON "6",SCAN_CODE_7,110,26,14,13 - PUSHBUTTON "7",SCAN_CODE_8,128,26,14,13 - PUSHBUTTON "8",SCAN_CODE_9,145,26,14,13 - PUSHBUTTON "9",SCAN_CODE_10,163,26,14,13 - PUSHBUTTON "0",SCAN_CODE_11,181,26,14,13 - PUSHBUTTON "-",SCAN_CODE_12,199,26,14,13 - PUSHBUTTON "=",SCAN_CODE_13,216,26,14,13 - PUSHBUTTON "<--",SCAN_CODE_15,234,26,28,13,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,43,21,13,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,28,43,14,13 - PUSHBUTTON "W",SCAN_CODE_18,46,43,14,13 - PUSHBUTTON "E",SCAN_CODE_19,64,43,14,13 - PUSHBUTTON "R",SCAN_CODE_20,81,43,14,13 - PUSHBUTTON "T",SCAN_CODE_21,99,43,14,13 - PUSHBUTTON "Y",SCAN_CODE_22,117,43,14,13 - PUSHBUTTON "U",SCAN_CODE_23,135,43,14,13 - PUSHBUTTON "I",SCAN_CODE_24,152,43,14,13 - PUSHBUTTON "O",SCAN_CODE_25,170,43,14,13 - PUSHBUTTON "P",SCAN_CODE_26,188,43,14,13 - PUSHBUTTON "[",SCAN_CODE_27,206,43,14,13 - PUSHBUTTON "]",SCAN_CODE_28,224,43,14,13 - PUSHBUTTON "\\",SCAN_CODE_29,242,43,20,13 - PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,60,28,13,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,35,60,14,13 - PUSHBUTTON "S",SCAN_CODE_32,53,60,14,13 - PUSHBUTTON "D",SCAN_CODE_33,71,60,14,13 - PUSHBUTTON "F",SCAN_CODE_34,88,60,14,13 - PUSHBUTTON "G",SCAN_CODE_35,106,60,14,13 - PUSHBUTTON "H",SCAN_CODE_36,124,60,14,13 - PUSHBUTTON "J",SCAN_CODE_37,142,60,14,13 - PUSHBUTTON "K",SCAN_CODE_38,160,60,14,13 - PUSHBUTTON "L",SCAN_CODE_39,177,60,14,13 - PUSHBUTTON ";",SCAN_CODE_40,195,60,14,13 - PUSHBUTTON "'",SCAN_CODE_41,213,60,14,13 - PUSHBUTTON "ret",SCAN_CODE_43,231,60,31,13,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,77,35,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Z",SCAN_CODE_46,42,77,14,13 - PUSHBUTTON "X",SCAN_CODE_47,60,77,14,13 - PUSHBUTTON "C",SCAN_CODE_48,78,77,14,13 - PUSHBUTTON "V",SCAN_CODE_49,96,77,14,13 - PUSHBUTTON "B",SCAN_CODE_50,113,77,14,13 - PUSHBUTTON "N",SCAN_CODE_51,131,77,14,13 - PUSHBUTTON "M",SCAN_CODE_52,149,77,14,13 - PUSHBUTTON ",",SCAN_CODE_53,167,77,14,13 - PUSHBUTTON ".",SCAN_CODE_54,184,77,14,13 - PUSHBUTTON "/",SCAN_CODE_55,202,77,14,13 - PUSHBUTTON "shift",SCAN_CODE_57,220,77,43,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,94,25,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,32,94,18,13,BS_ICON - PUSHBUTTON "alt",SCAN_CODE_60,53,94,18,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,74,94,100,13 - PUSHBUTTON "alt gr",SCAN_CODE_62,177,94,18,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,199,94,18,13,BS_ICON - PUSHBUTTON "menu",SCAN_CODE_129,220,94,18,13,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,241,94,21,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,273,26,14,13 - PUSHBUTTON "del",SCAN_CODE_76,273,43,14,13 - PUSHBUTTON "home",SCAN_CODE_80,291,26,14,13,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,291,43,14,13 - PUSHBUTTON "pg up",SCAN_CODE_85,309,26,14,13,BS_ICON - PUSHBUTTON "pg down",SCAN_CODE_86,309,43,14,13,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,273,94,14,13,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,291,77,14,13,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,291,94,14,13,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,309,94,14,13,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,334,26,14,13 - PUSHBUTTON "7",SCAN_CODE_91,334,43,14,13 - PUSHBUTTON "4",SCAN_CODE_92,334,60,14,13 - PUSHBUTTON "1",SCAN_CODE_93,334,77,14,13 - PUSHBUTTON "/",SCAN_CODE_95,352,26,14,13 - PUSHBUTTON "8",SCAN_CODE_96,352,43,14,13 - PUSHBUTTON "5",SCAN_CODE_97,352,60,14,13 - PUSHBUTTON "2",SCAN_CODE_98,352,77,14,13 - PUSHBUTTON "0",SCAN_CODE_99,334,94,32,13 - PUSHBUTTON "*",SCAN_CODE_100,369,26,14,13 - PUSHBUTTON "9",SCAN_CODE_101,369,43,14,13 - PUSHBUTTON "6",SCAN_CODE_102,369,60,14,13 - PUSHBUTTON "3",SCAN_CODE_103,369,77,14,13 - PUSHBUTTON ".",SCAN_CODE_104,369,94,14,13 - PUSHBUTTON "-",SCAN_CODE_105,387,26,14,13 - PUSHBUTTON "+",SCAN_CODE_106,387,43,14,30 - PUSHBUTTON "ent",SCAN_CODE_108,387,77,14,30 - CTEXT "Num",IDC_STATIC,334,4,18,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,341,16,4,3 - CTEXT "Caps",IDC_STATIC,359,4,18,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,366,16,4,3 - CTEXT "Scroll",IDC_STATIC,384,4,18,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,391,16,4,3 + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 + PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 + PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 + PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 + PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 + PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 + PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 + PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 + PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 + PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 + PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 + PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 + PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 + PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 + PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 + PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 + PUSHBUTTON "`",SCAN_CODE_1,3,35,23,22 + PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 + PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 + PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 + PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 + PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 + PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 + PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 + PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 + PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 + PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 + PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 + PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON + PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 + PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 + PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 + PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 + PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 + PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 + PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 + PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 + PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 + PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 + PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 + PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 + PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 + PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON + PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 + PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 + PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 + PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 + PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 + PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 + PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 + PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 + PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 + PUSHBUTTON ";",SCAN_CODE_40,296,87,23,22 + PUSHBUTTON "'",SCAN_CODE_41,323,87,23,22 + PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 + PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 + PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 + PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 + PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 + PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 + PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 + PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 + PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 + PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 + PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 + PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 + PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 + PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON + PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 + PUSHBUTTON "pg up",SCAN_CODE_85,465,35,23,22,BS_ICON + PUSHBUTTON "pg down",SCAN_CODE_86,465,61,23,22,BS_ICON + PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON + PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON + PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 + PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 + PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 + PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 + PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 + PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 + PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 + PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 + PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 + PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 + PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 + PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 + PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 + PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 + PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 + PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 + PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 + CTEXT "Num",IDC_STATIC,510,4,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 + CTEXT "Caps",IDC_STATIC,540,4,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 + CTEXT "Scroll",IDC_STATIC,572,4,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END /* EOF */ Modified: trunk/reactos/base/applications/osk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/es-ES.rc [iso-8859-1] Sun Dec 7 01:33:46 2014 @@ -42,7 +42,7 @@ PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 PUSHBUTTON "'",SCAN_CODE_12,300,35,23,22 PUSHBUTTON "Â¡",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,46,22,BS_ICON + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 Modified: trunk/reactos/base/applications/osk/lang/fr-CA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/fr-CA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/fr-CA.rc [iso-8859-1] Sun Dec 7 01:33:46 2014 @@ -42,7 +42,7 @@ PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,46,22,BS_ICON + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 Modified: trunk/reactos/base/applications/osk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/fr-FR.rc [iso-8859-1] Sun Dec 7 01:33:46 2014 @@ -42,7 +42,7 @@ PUSHBUTTON "Ã ",SCAN_CODE_11,273,35,23,22 PUSHBUTTON ")",SCAN_CODE_12,300,35,23,22 PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,46,22,BS_ICON + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON PUSHBUTTON "A",SCAN_CODE_17,42,61,23,22 PUSHBUTTON "Z",SCAN_CODE_18,69,61,23,22 Modified: trunk/reactos/base/applications/osk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/it-IT.rc [iso-8859-1] Sun Dec 7 01:33:46 2014 @@ -42,7 +42,7 @@ PUSHBUTTON "0Â ",SCAN_CODE_11,273,35,23,22 PUSHBUTTON "'",SCAN_CODE_12,300,35,23,22 PUSHBUTTON "|",SCAN_CODE_13,327,35,23,22 - PUSHBUTTON "<--",SCAN_CODE_15,354,35,46,22,BS_ICON + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 Modified: trunk/reactos/base/applications/osk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/pl-PL.rc [iso-8859-1] Sun Dec 7 01:33:46 2014 @@ -8,121 +8,121 @@ LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108 +MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "Klawiatura Ekranowa" FONT 8, "MS Shell Dlg" EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE BEGIN - PUSHBUTTON "Esc",SCAN_CODE_110,3,3,14,13 - PUSHBUTTON "F1",SCAN_CODE_112,39,3,14,13 - PUSHBUTTON "F2",SCAN_CODE_113,56,3,14,13 - PUSHBUTTON "F3",SCAN_CODE_114,74,3,14,13 - PUSHBUTTON "F4",SCAN_CODE_115,92,3,14,13 - PUSHBUTTON "F5",SCAN_CODE_116,117,3,14,13 - PUSHBUTTON "F6",SCAN_CODE_117,135,3,14,13 - PUSHBUTTON "F7",SCAN_CODE_118,152,3,14,13 - PUSHBUTTON "F8",SCAN_CODE_119,170,3,14,13 - PUSHBUTTON "F9",SCAN_CODE_120,195,3,14,13 - PUSHBUTTON "F10",SCAN_CODE_121,213,3,14,13 - PUSHBUTTON "F11",SCAN_CODE_122,231,3,14,13 - PUSHBUTTON "F12",SCAN_CODE_123,248,3,14,13 - PUSHBUTTON "Prn",SCAN_CODE_124,273,3,14,13 - PUSHBUTTON "Stop",SCAN_CODE_125,291,3,14,13 - PUSHBUTTON "Attn",SCAN_CODE_126,309,3,14,13 - PUSHBUTTON "`",SCAN_CODE_1,3,26,14,13 - PUSHBUTTON "1",SCAN_CODE_2,21,26,14,13 - PUSHBUTTON "2",SCAN_CODE_3,39,26,14,13 - PUSHBUTTON "3",SCAN_CODE_4,56,26,14,13 - PUSHBUTTON "4",SCAN_CODE_5,74,26,14,13 - PUSHBUTTON "5",SCAN_CODE_6,92,26,14,13 - PUSHBUTTON "6",SCAN_CODE_7,110,26,14,13 - PUSHBUTTON "7",SCAN_CODE_8,128,26,14,13 - PUSHBUTTON "8",SCAN_CODE_9,145,26,14,13 - PUSHBUTTON "9",SCAN_CODE_10,163,26,14,13 - PUSHBUTTON "0",SCAN_CODE_11,181,26,14,13 - PUSHBUTTON "-",SCAN_CODE_12,199,26,14,13 - PUSHBUTTON "=",SCAN_CODE_13,216,26,14,13 - PUSHBUTTON "<--",SCAN_CODE_15,234,26,28,13,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,43,21,13,BS_ICON - PUSHBUTTON "Q",SCAN_CODE_17,28,43,14,13 - PUSHBUTTON "W",SCAN_CODE_18,46,43,14,13 - PUSHBUTTON "E",SCAN_CODE_19,64,43,14,13 - PUSHBUTTON "R",SCAN_CODE_20,81,43,14,13 - PUSHBUTTON "T",SCAN_CODE_21,99,43,14,13 - PUSHBUTTON "Y",SCAN_CODE_22,117,43,14,13 - PUSHBUTTON "U",SCAN_CODE_23,135,43,14,13 - PUSHBUTTON "I",SCAN_CODE_24,152,43,14,13 - PUSHBUTTON "O",SCAN_CODE_25,170,43,14,13 - PUSHBUTTON "P",SCAN_CODE_26,188,43,14,13 - PUSHBUTTON "[",SCAN_CODE_27,206,43,14,13 - PUSHBUTTON "]",SCAN_CODE_28,224,43,14,13 - PUSHBUTTON "\\",SCAN_CODE_29,242,43,20,13 - PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,60,28,13,BS_ICON - PUSHBUTTON "A",SCAN_CODE_31,35,60,14,13 - PUSHBUTTON "S",SCAN_CODE_32,53,60,14,13 - PUSHBUTTON "D",SCAN_CODE_33,71,60,14,13 - PUSHBUTTON "F",SCAN_CODE_34,88,60,14,13 - PUSHBUTTON "G",SCAN_CODE_35,106,60,14,13 - PUSHBUTTON "H",SCAN_CODE_36,124,60,14,13 - PUSHBUTTON "J",SCAN_CODE_37,142,60,14,13 - PUSHBUTTON "K",SCAN_CODE_38,160,60,14,13 - PUSHBUTTON "L",SCAN_CODE_39,177,60,14,13 - PUSHBUTTON ";",SCAN_CODE_40,195,60,14,13 - PUSHBUTTON "'",SCAN_CODE_41,213,60,14,13 - PUSHBUTTON "ret",SCAN_CODE_43,231,60,31,13,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,77,35,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Z",SCAN_CODE_46,42,77,14,13 - PUSHBUTTON "X",SCAN_CODE_47,60,77,14,13 - PUSHBUTTON "C",SCAN_CODE_48,78,77,14,13 - PUSHBUTTON "V",SCAN_CODE_49,96,77,14,13 - PUSHBUTTON "B",SCAN_CODE_50,113,77,14,13 - PUSHBUTTON "N",SCAN_CODE_51,131,77,14,13 - PUSHBUTTON "M",SCAN_CODE_52,149,77,14,13 - PUSHBUTTON ",",SCAN_CODE_53,167,77,14,13 - PUSHBUTTON ".",SCAN_CODE_54,184,77,14,13 - PUSHBUTTON "/",SCAN_CODE_55,202,77,14,13 - PUSHBUTTON "shift",SCAN_CODE_57,220,77,43,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,94,25,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,32,94,18,13,BS_ICON - PUSHBUTTON "alt",SCAN_CODE_60,53,94,18,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,74,94,100,13 - PUSHBUTTON "alt gr",SCAN_CODE_62,177,94,18,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,199,94,18,13,BS_ICON - PUSHBUTTON "menu",SCAN_CODE_129,220,94,18,13,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,241,94,21,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,273,26,14,13 - PUSHBUTTON "del",SCAN_CODE_76,273,43,14,13 - PUSHBUTTON "home",SCAN_CODE_80,291,26,14,13,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,291,43,14,13 - PUSHBUTTON "pg AR",SCAN_CODE_85,309,26,14,13,BS_ICON - PUSHBUTTON "pg AV",SCAN_CODE_86,309,43,14,13,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,273,94,14,13,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,291,77,14,13,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,291,94,14,13,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,309,94,14,13,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,334,26,14,13 - PUSHBUTTON "7",SCAN_CODE_91,334,43,14,13 - PUSHBUTTON "4",SCAN_CODE_92,334,60,14,13 - PUSHBUTTON "1",SCAN_CODE_93,334,77,14,13 - PUSHBUTTON "/",SCAN_CODE_95,352,26,14,13 - PUSHBUTTON "8",SCAN_CODE_96,352,43,14,13 - PUSHBUTTON "5",SCAN_CODE_97,352,60,14,13 - PUSHBUTTON "2",SCAN_CODE_98,352,77,14,13 - PUSHBUTTON "0",SCAN_CODE_99,334,94,32,13 - PUSHBUTTON "*",SCAN_CODE_100,369,26,14,13 - PUSHBUTTON "9",SCAN_CODE_101,369,43,14,13 - PUSHBUTTON "6",SCAN_CODE_102,369,60,14,13 - PUSHBUTTON "3",SCAN_CODE_103,369,77,14,13 - PUSHBUTTON ".",SCAN_CODE_104,369,94,14,13 - PUSHBUTTON "-",SCAN_CODE_105,387,26,14,13 - PUSHBUTTON "+",SCAN_CODE_106,387,43,14,30 - PUSHBUTTON "ent",SCAN_CODE_108,387,77,14,30 - CTEXT "Num",IDC_STATIC,334,4,18,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,341,16,4,3 - CTEXT "Caps",IDC_STATIC,359,4,18,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,366,16,4,3 - CTEXT "Scroll",IDC_STATIC,384,4,18,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,391,16,4,3 + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 + PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 + PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 + PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 + PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 + PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 + PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 + PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 + PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 + PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 + PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 + PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 + PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 + PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 + PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 + PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 + PUSHBUTTON "`",SCAN_CODE_1,3,35,23,22 + PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 + PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 + PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 + PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 + PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 + PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 + PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 + PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 + PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 + PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 + PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 + PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON + PUSHBUTTON "Q",SCAN_CODE_17,42,61,23,22 + PUSHBUTTON "W",SCAN_CODE_18,69,61,23,22 + PUSHBUTTON "E",SCAN_CODE_19,96,61,23,22 + PUSHBUTTON "R",SCAN_CODE_20,123,61,23,22 + PUSHBUTTON "T",SCAN_CODE_21,150,61,23,22 + PUSHBUTTON "Y",SCAN_CODE_22,177,61,23,22 + PUSHBUTTON "U",SCAN_CODE_23,204,61,23,22 + PUSHBUTTON "I",SCAN_CODE_24,231,61,23,22 + PUSHBUTTON "O",SCAN_CODE_25,258,61,23,22 + PUSHBUTTON "P",SCAN_CODE_26,285,61,23,22 + PUSHBUTTON "[",SCAN_CODE_27,312,61,23,22 + PUSHBUTTON "]",SCAN_CODE_28,339,61,23,22 + PUSHBUTTON "\\",SCAN_CODE_29,366,61,35,22 + PUSHBUTTON "Caps Lock",SCAN_CODE_30,3,87,46,22,BS_ICON + PUSHBUTTON "A",SCAN_CODE_31,53,87,23,22 + PUSHBUTTON "S",SCAN_CODE_32,80,87,23,22 + PUSHBUTTON "D",SCAN_CODE_33,107,87,23,22 + PUSHBUTTON "F",SCAN_CODE_34,134,87,23,22 + PUSHBUTTON "G",SCAN_CODE_35,161,87,23,22 + PUSHBUTTON "H",SCAN_CODE_36,188,87,23,22 + PUSHBUTTON "J",SCAN_CODE_37,215,87,23,22 + PUSHBUTTON "K",SCAN_CODE_38,242,87,23,22 + PUSHBUTTON "L",SCAN_CODE_39,269,87,23,22 + PUSHBUTTON ";",SCAN_CODE_40,296,87,23,22 + PUSHBUTTON "'",SCAN_CODE_41,323,87,23,22 + PUSHBUTTON "ret",SCAN_CODE_43,350,87,51,22,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Z",SCAN_CODE_46,64,113,23,22 + PUSHBUTTON "X",SCAN_CODE_47,91,113,23,22 + PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 + PUSHBUTTON "V",SCAN_CODE_49,145,113,23,22 + PUSHBUTTON "B",SCAN_CODE_50,172,113,23,22 + PUSHBUTTON "N",SCAN_CODE_51,199,113,23,22 + PUSHBUTTON "M",SCAN_CODE_52,226,113,23,22 + PUSHBUTTON ",",SCAN_CODE_53,253,113,23,22 + PUSHBUTTON ".",SCAN_CODE_54,280,113,23,22 + PUSHBUTTON "/",SCAN_CODE_55,307,113,23,22 + PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 + PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 + PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 + PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON + PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 + PUSHBUTTON "pg AR",SCAN_CODE_85,465,35,23,22,BS_ICON + PUSHBUTTON "pg AV",SCAN_CODE_86,465,61,23,22,BS_ICON + PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON + PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON + PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 + PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 + PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 + PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 + PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 + PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 + PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 + PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 + PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 + PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 + PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 + PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 + PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 + PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 + PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 + PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 + PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 + CTEXT "Num",IDC_STATIC,510,4,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 + CTEXT "Caps",IDC_STATIC,540,4,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 + CTEXT "Scroll",IDC_STATIC,572,4,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END /* EOF */ Modified: trunk/reactos/base/applications/osk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/lang… ============================================================================== --- trunk/reactos/base/applications/osk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/osk/lang/ru-RU.rc [iso-8859-1] Sun Dec 7 01:33:46 2014 @@ -8,121 +8,121 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_NEUTRAL -MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 404, 108 +MAIN_DIALOG DIALOGEX DISCARDABLE 0, 0, 608, 164 CAPTION "ÐÐ»Ð°Ð²Ð¸Ð°ÑÑÑÐ° Ð²Ð¸Ð·ÑÐ°Ð»ÑÐ½ÑÐ¹" FONT 8, "MS Shell Dlg" EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE BEGIN - PUSHBUTTON "Esc",SCAN_CODE_110,3,3,14,13 - PUSHBUTTON "F1",SCAN_CODE_112,39,3,14,13 - PUSHBUTTON "F2",SCAN_CODE_113,56,3,14,13 - PUSHBUTTON "F3",SCAN_CODE_114,74,3,14,13 - PUSHBUTTON "F4",SCAN_CODE_115,92,3,14,13 - PUSHBUTTON "F5",SCAN_CODE_116,117,3,14,13 - PUSHBUTTON "F6",SCAN_CODE_117,135,3,14,13 - PUSHBUTTON "F7",SCAN_CODE_118,152,3,14,13 - PUSHBUTTON "F8",SCAN_CODE_119,170,3,14,13 - PUSHBUTTON "F9",SCAN_CODE_120,195,3,14,13 - PUSHBUTTON "F10",SCAN_CODE_121,213,3,14,13 - PUSHBUTTON "F11",SCAN_CODE_122,231,3,14,13 - PUSHBUTTON "F12",SCAN_CODE_123,248,3,14,13 - PUSHBUTTON "Prn",SCAN_CODE_124,273,3,14,13 - PUSHBUTTON "Stop",SCAN_CODE_125,291,3,14,13 - PUSHBUTTON "Attn",SCAN_CODE_126,309,3,14,13 - PUSHBUTTON "Ã",SCAN_CODE_1,3,26,14,13 - PUSHBUTTON "1",SCAN_CODE_2,21,26,14,13 - PUSHBUTTON "2",SCAN_CODE_3,39,26,14,13 - PUSHBUTTON "3",SCAN_CODE_4,56,26,14,13 - PUSHBUTTON "4",SCAN_CODE_5,74,26,14,13 - PUSHBUTTON "5",SCAN_CODE_6,92,26,14,13 - PUSHBUTTON "6",SCAN_CODE_7,110,26,14,13 - PUSHBUTTON "7",SCAN_CODE_8,128,26,14,13 - PUSHBUTTON "8",SCAN_CODE_9,145,26,14,13 - PUSHBUTTON "9",SCAN_CODE_10,163,26,14,13 - PUSHBUTTON "0",SCAN_CODE_11,180,26,14,13 - PUSHBUTTON "-",SCAN_CODE_12,197,26,14,13 - PUSHBUTTON "=",SCAN_CODE_13,214,26,14,13 - PUSHBUTTON "\\",SCAN_CODE_42,231,26,14,13 - PUSHBUTTON "<--",SCAN_CODE_15,248,26,14,13,BS_ICON - PUSHBUTTON "Tab",SCAN_CODE_16,3,43,21,13,BS_ICON - PUSHBUTTON "Ð",SCAN_CODE_17,28,43,14,13 - PUSHBUTTON "Ð¦",SCAN_CODE_18,46,43,14,13 - PUSHBUTTON "Ð£",SCAN_CODE_19,64,43,14,13 - PUSHBUTTON "Ð",SCAN_CODE_20,81,43,14,13 - PUSHBUTTON "E",SCAN_CODE_21,99,43,14,13 - PUSHBUTTON "Ð",SCAN_CODE_22,117,43,14,13 - PUSHBUTTON "Ð",SCAN_CODE_23,135,43,14,13 - PUSHBUTTON "Ð¨",SCAN_CODE_24,152,43,14,13 - PUSHBUTTON "Ð©",SCAN_CODE_25,170,43,14,13 - PUSHBUTTON "Ð",SCAN_CODE_26,188,43,14,13 - PUSHBUTTON "X",SCAN_CODE_27,206,43,14,13 - PUSHBUTTON "Ðª",SCAN_CODE_28,224,43,14,13 - PUSHBUTTON "Caps lock",SCAN_CODE_30,3,60,28,13,BS_ICON - PUSHBUTTON "Ð¤",SCAN_CODE_31,35,60,14,13 - PUSHBUTTON "Ð«",SCAN_CODE_32,53,60,14,13 - PUSHBUTTON "Ð",SCAN_CODE_33,71,60,14,13 - PUSHBUTTON "A",SCAN_CODE_34,88,60,14,13 - PUSHBUTTON "Ð",SCAN_CODE_35,106,60,14,13 - PUSHBUTTON "P",SCAN_CODE_36,124,60,14,13 - PUSHBUTTON "O",SCAN_CODE_37,142,60,14,13 - PUSHBUTTON "Ð",SCAN_CODE_38,160,60,14,13 - PUSHBUTTON "Ð",SCAN_CODE_39,177,60,14,13 - PUSHBUTTON "Ð",SCAN_CODE_40,195,60,14,13 - PUSHBUTTON "Ð",SCAN_CODE_41,213,60,14,13 - PUSHBUTTON "ret",SCAN_CODE_43,242,43,20,30,BS_ICON - PUSHBUTTON "shift",SCAN_CODE_44,3,77,35,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "Ð¯",SCAN_CODE_46,42,77,14,13 - PUSHBUTTON "Ð§",SCAN_CODE_47,60,77,14,13 - PUSHBUTTON "C",SCAN_CODE_48,78,77,14,13 - PUSHBUTTON "M",SCAN_CODE_49,96,77,14,13 - PUSHBUTTON "Ð",SCAN_CODE_50,113,77,14,13 - PUSHBUTTON "T",SCAN_CODE_51,131,77,14,13 - PUSHBUTTON "b",SCAN_CODE_52,149,77,14,13 - PUSHBUTTON "Ð",SCAN_CODE_53,167,77,14,13 - PUSHBUTTON "Ð®",SCAN_CODE_54,184,77,14,13 - PUSHBUTTON ".",SCAN_CODE_55,202,77,14,13 - PUSHBUTTON "shift",SCAN_CODE_57,220,77,43,13,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ctrl",SCAN_CODE_58,3,94,25,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_127,32,94,18,13,BS_ICON - PUSHBUTTON "alt",SCAN_CODE_60,53,94,18,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "",SCAN_CODE_61,74,94,100,13 - PUSHBUTTON "alt gr",SCAN_CODE_62,177,94,18,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ROS",SCAN_CODE_128,199,94,18,13,BS_ICON - PUSHBUTTON "menu",SCAN_CODE_129,220,94,18,13,BS_ICON - PUSHBUTTON "ctrl",SCAN_CODE_64,241,94,21,13,BS_PUSHLIKE|BS_AUTOCHECKBOX - PUSHBUTTON "ins",SCAN_CODE_75,273,26,14,13 - PUSHBUTTON "del",SCAN_CODE_76,273,43,14,13 - PUSHBUTTON "home",SCAN_CODE_80,291,26,14,13,BS_ICON - PUSHBUTTON "end",SCAN_CODE_81,291,43,14,13 - PUSHBUTTON "pg AR",SCAN_CODE_85,309,26,14,13,BS_ICON - PUSHBUTTON "pg AV",SCAN_CODE_86,309,43,14,13,BS_ICON - PUSHBUTTON "<-",SCAN_CODE_79,273,94,14,13,BS_ICON - PUSHBUTTON "^",SCAN_CODE_83,291,77,14,13,BS_ICON - PUSHBUTTON "v",SCAN_CODE_84,291,94,14,13,BS_ICON - PUSHBUTTON "->",SCAN_CODE_89,309,94,14,13,BS_ICON - PUSHBUTTON "num",SCAN_CODE_90,334,26,14,13 - PUSHBUTTON "7",SCAN_CODE_91,334,43,14,13 - PUSHBUTTON "4",SCAN_CODE_92,334,60,14,13 - PUSHBUTTON "1",SCAN_CODE_93,334,77,14,13 - PUSHBUTTON "/",SCAN_CODE_95,352,26,14,13 - PUSHBUTTON "8",SCAN_CODE_96,352,43,14,13 - PUSHBUTTON "5",SCAN_CODE_97,352,60,14,13 - PUSHBUTTON "2",SCAN_CODE_98,352,77,14,13 - PUSHBUTTON "0",SCAN_CODE_99,334,94,32,13 - PUSHBUTTON "*",SCAN_CODE_100,369,26,14,13 - PUSHBUTTON "9",SCAN_CODE_101,369,43,14,13 - PUSHBUTTON "6",SCAN_CODE_102,369,60,14,13 - PUSHBUTTON "3",SCAN_CODE_103,369,77,14,13 - PUSHBUTTON ".",SCAN_CODE_104,369,94,14,13 - PUSHBUTTON "-",SCAN_CODE_105,387,26,14,13 - PUSHBUTTON "+",SCAN_CODE_106,387,43,14,30 - PUSHBUTTON "ent",SCAN_CODE_108,387,77,14,30 - CTEXT "Num",IDC_STATIC,334,4,18,8 - CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,341,16,4,3 - CTEXT "Caps",IDC_STATIC,359,4,18,8 - CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,366,16,4,3 - CTEXT "Scroll",IDC_STATIC,384,4,18,8 - CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,391,16,4,3 + PUSHBUTTON "Esc",SCAN_CODE_110,3,3,23,22 + PUSHBUTTON "F1",SCAN_CODE_112,48,3,23,22 + PUSHBUTTON "F2",SCAN_CODE_113,75,3,23,22 + PUSHBUTTON "F3",SCAN_CODE_114,101,3,23,22 + PUSHBUTTON "F4",SCAN_CODE_115,128,3,23,22 + PUSHBUTTON "F5",SCAN_CODE_116,173,3,23,22 + PUSHBUTTON "F6",SCAN_CODE_117,199,3,23,22 + PUSHBUTTON "F7",SCAN_CODE_118,225,3,23,22 + PUSHBUTTON "F8",SCAN_CODE_119,251,3,23,22 + PUSHBUTTON "F9",SCAN_CODE_120,296,3,23,22 + PUSHBUTTON "F10",SCAN_CODE_121,323,3,23,22 + PUSHBUTTON "F11",SCAN_CODE_122,350,3,23,22 + PUSHBUTTON "F12",SCAN_CODE_123,377,3,23,22 + PUSHBUTTON "Prn",SCAN_CODE_124,411,3,23,22 + PUSHBUTTON "Stop",SCAN_CODE_125,438,3,23,22 + PUSHBUTTON "Attn",SCAN_CODE_126,465,3,23,22 + PUSHBUTTON "Ã",SCAN_CODE_1,3,35,23,22 + PUSHBUTTON "1",SCAN_CODE_2,30,35,23,22 + PUSHBUTTON "2",SCAN_CODE_3,57,35,23,22 + PUSHBUTTON "3",SCAN_CODE_4,84,35,23,22 + PUSHBUTTON "4",SCAN_CODE_5,111,35,23,22 + PUSHBUTTON "5",SCAN_CODE_6,138,35,23,22 + PUSHBUTTON "6",SCAN_CODE_7,165,35,23,22 + PUSHBUTTON "7",SCAN_CODE_8,192,35,23,22 + PUSHBUTTON "8",SCAN_CODE_9,219,35,23,22 + PUSHBUTTON "9",SCAN_CODE_10,246,35,23,22 + PUSHBUTTON "0",SCAN_CODE_11,273,35,23,22 + PUSHBUTTON "-",SCAN_CODE_12,300,35,23,22 + PUSHBUTTON "=",SCAN_CODE_13,327,35,23,22 + PUSHBUTTON "<--",SCAN_CODE_15,354,35,47,22,BS_ICON + PUSHBUTTON "Tab",SCAN_CODE_16,3,61,35,22,BS_ICON + PUSHBUTTON "Ð",SCAN_CODE_17,42,61,23,22 + PUSHBUTTON "Ð¦",SCAN_CODE_18,69,61,23,22 + PUSHBUTTON "Ð£",SCAN_CODE_19,96,61,23,22 + PUSHBUTTON "Ð",SCAN_CODE_20,123,61,23,22 + PUSHBUTTON "E",SCAN_CODE_21,150,61,23,22 + PUSHBUTTON "Ð",SCAN_CODE_22,177,61,23,22 + PUSHBUTTON "Ð",SCAN_CODE_23,204,61,23,22 + PUSHBUTTON "Ð¨",SCAN_CODE_24,231,61,23,22 + PUSHBUTTON "Ð©",SCAN_CODE_25,258,61,23,22 + PUSHBUTTON "Ð",SCAN_CODE_26,285,61,23,22 + PUSHBUTTON "X",SCAN_CODE_27,312,61,23,22 + PUSHBUTTON "Ðª",SCAN_CODE_28,339,61,23,22 + PUSHBUTTON "Caps lock",SCAN_CODE_30,3,87,46,22,BS_ICON + PUSHBUTTON "Ð¤",SCAN_CODE_31,53,87,23,22 + PUSHBUTTON "Ð«",SCAN_CODE_32,80,87,23,22 + PUSHBUTTON "Ð",SCAN_CODE_33,107,87,23,22 + PUSHBUTTON "A",SCAN_CODE_34,134,87,23,22 + PUSHBUTTON "Ð",SCAN_CODE_35,161,87,23,22 + PUSHBUTTON "P",SCAN_CODE_36,188,87,23,22 + PUSHBUTTON "O",SCAN_CODE_37,215,87,23,22 + PUSHBUTTON "Ð",SCAN_CODE_38,242,87,23,22 + PUSHBUTTON "Ð",SCAN_CODE_39,269,87,23,22 + PUSHBUTTON "Ð",SCAN_CODE_40,296,87,23,22 + PUSHBUTTON "Ð",SCAN_CODE_41,323,87,23,22 + PUSHBUTTON "\\",SCAN_CODE_42,350,87,23,22 + PUSHBUTTON "ret",SCAN_CODE_43,377,61,23,48,BS_ICON + PUSHBUTTON "shift",SCAN_CODE_44,3,113,57,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "Ð¯",SCAN_CODE_46,64,113,23,22 + PUSHBUTTON "Ð§",SCAN_CODE_47,91,113,23,22 + PUSHBUTTON "C",SCAN_CODE_48,118,113,23,22 + PUSHBUTTON "M",SCAN_CODE_49,145,113,23,22 + PUSHBUTTON "Ð",SCAN_CODE_50,172,113,23,22 + PUSHBUTTON "T",SCAN_CODE_51,199,113,23,22 + PUSHBUTTON "b",SCAN_CODE_52,226,113,23,22 + PUSHBUTTON "Ð",SCAN_CODE_53,253,113,23,22 + PUSHBUTTON "Ð®",SCAN_CODE_54,280,113,23,22 + PUSHBUTTON ".",SCAN_CODE_55,307,113,23,22 + PUSHBUTTON "shift",SCAN_CODE_57,334,113,67,22,BS_ICON|BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ctrl",SCAN_CODE_58,3,139,41,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_127,48,139,30,22,BS_ICON + PUSHBUTTON "alt",SCAN_CODE_60,82,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "",SCAN_CODE_61,116,139,143,22 + PUSHBUTTON "alt gr",SCAN_CODE_62,264,139,30,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ROS",SCAN_CODE_128,298,139,30,22,BS_ICON + PUSHBUTTON "menu",SCAN_CODE_129,332,139,30,22,BS_ICON + PUSHBUTTON "ctrl",SCAN_CODE_64,366,139,35,22,BS_PUSHLIKE|BS_AUTOCHECKBOX + PUSHBUTTON "ins",SCAN_CODE_75,411,35,23,22 + PUSHBUTTON "del",SCAN_CODE_76,411,61,23,22 + PUSHBUTTON "home",SCAN_CODE_80,438,35,23,22,BS_ICON + PUSHBUTTON "end",SCAN_CODE_81,438,61,23,22 + PUSHBUTTON "pg AR",SCAN_CODE_85,465,35,23,22,BS_ICON + PUSHBUTTON "pg AV",SCAN_CODE_86,465,61,23,22,BS_ICON + PUSHBUTTON "<-",SCAN_CODE_79,411,139,23,22,BS_ICON + PUSHBUTTON "^",SCAN_CODE_83,438,113,23,22,BS_ICON + PUSHBUTTON "v",SCAN_CODE_84,438,139,23,22,BS_ICON + PUSHBUTTON "->",SCAN_CODE_89,465,139,23,22,BS_ICON + PUSHBUTTON "num",SCAN_CODE_90,500,35,23,22 + PUSHBUTTON "7",SCAN_CODE_91,500,61,23,22 + PUSHBUTTON "4",SCAN_CODE_92,500,87,23,22 + PUSHBUTTON "1",SCAN_CODE_93,500,113,23,22 + PUSHBUTTON "/",SCAN_CODE_95,527,35,23,22 + PUSHBUTTON "8",SCAN_CODE_96,527,61,23,22 + PUSHBUTTON "5",SCAN_CODE_97,527,87,23,22 + PUSHBUTTON "2",SCAN_CODE_98,527,113,23,22 + PUSHBUTTON "0",SCAN_CODE_99,500,139,50,22 + PUSHBUTTON "*",SCAN_CODE_100,554,35,23,22 + PUSHBUTTON "9",SCAN_CODE_101,554,61,23,22 + PUSHBUTTON "6",SCAN_CODE_102,554,87,23,22 + PUSHBUTTON "3",SCAN_CODE_103,554,113,23,22 + PUSHBUTTON ".",SCAN_CODE_104,554,139,23,22 + PUSHBUTTON "-",SCAN_CODE_105,581,35,23,22 + PUSHBUTTON "+",SCAN_CODE_106,581,61,23,48 + PUSHBUTTON "ent",SCAN_CODE_108,581,113,23,48 + CTEXT "Num",IDC_STATIC,510,4,21,8 + CONTROL "",IDC_LED_NUM,"Static",SS_CENTER|SS_NOTIFY,518,16,4,3 + CTEXT "Caps",IDC_STATIC,540,4,21,8 + CONTROL "",IDC_LED_CAPS,"Static",SS_CENTER|SS_NOTIFY,548,16,4,3 + CTEXT "Scroll",IDC_STATIC,572,4,21,8 + CONTROL "",IDC_LED_SCROLL,"Static",SS_CENTER|SS_NOTIFY,580,16,4,3 END /* EOF */

1 0

[hbelusca] 65576: [OSK]: Add a better keyboard icon, copied from cpl/main/resources/keyboard.ico (it's keyboard tango icon). Pointed by swyter.
by hbelusca＠svn.reactos.org 06 Dec '14

06 Dec '14

Author: hbelusca Date: Sat Dec 6 19:58:28 2014 New Revision: 65576 URL: http://svn.reactos.org/svn/reactos?rev=65576&view=rev Log: [OSK]: Add a better keyboard icon, copied from cpl/main/resources/keyboard.ico (it's keyboard tango icon). Pointed by swyter. Modified: trunk/reactos/base/applications/osk/res/osk.ico Modified: trunk/reactos/base/applications/osk/res/osk.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/osk/res/… ============================================================================== Binary files - no diff available.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs