Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[hbelusca] 65643: [CONSRV]: Move all references to VDM screenbuffers from condrv back to consrv (only ConDrvWriteConsoleOutputVDM remains in condrv for now...)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 14 17:30:38 2014 New Revision: 65643 URL: http://svn.reactos.org/svn/reactos?rev=65643&view=rev Log: [CONSRV]: Move all references to VDM screenbuffers from condrv back to consrv (only ConDrvWriteConsoleOutputVDM remains in condrv for now...) Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sun Dec 14 17:30:38 2014 @@ -215,13 +215,6 @@ /* PUBLIC DRIVER APIS *********************************************************/ NTSTATUS NTAPI -ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console, - IN PTEXTMODE_SCREEN_BUFFER Buffer, - IN PCHAR_CELL CharInfo/*Buffer*/, - IN COORD CharInfoSize, - IN OUT PSMALL_RECT WriteRegion, - IN BOOLEAN DrawRegion); -NTSTATUS NTAPI ConDrvInvalidateBitMapRect(IN PCONSOLE Console, IN PCONSOLE_SCREEN_BUFFER Buffer, IN PSMALL_RECT Region) @@ -231,19 +224,6 @@ /* Validity check */ ASSERT(Console == Buffer->Header.Console); - - /* In text-mode only, draw the VDM buffer if present */ - if (GetType(Buffer) == TEXTMODE_BUFFER) - { - PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; - - /*Status =*/ ConDrvWriteConsoleOutputVDM(Buffer->Header.Console, - TextBuffer, - Console->VDMBuffer, - Console->VDMBufferSize, - Region, - FALSE); - } /* If the output buffer is the current one, redraw the correct portion of the screen */ if (Buffer == Console->ActiveBuffer) TermDrawRegion(Console, Region); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sun Dec 14 17:30:38 2014 @@ -597,14 +597,15 @@ /* * NOTE: This function is strongly inspired by ConDrvWriteConsoleOutput... + * FIXME: This function MUST be moved into consrv/conoutput.c because only + * consrv knows how to manipulate VDM screenbuffers. */ NTSTATUS NTAPI ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, IN PCHAR_CELL CharInfo/*Buffer*/, IN COORD CharInfoSize, - IN OUT PSMALL_RECT WriteRegion, - IN BOOLEAN DrawRegion) + IN PSMALL_RECT WriteRegion) { SHORT X, Y; SMALL_RECT ScreenBuffer; @@ -649,10 +650,6 @@ ++CurCharInfo; } } - - if (DrawRegion) TermDrawRegion(Console, &CapturedWriteRegion); - - *WriteRegion = CapturedWriteRegion; return STATUS_SUCCESS; } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Sun Dec 14 17:30:38 2014 @@ -16,6 +16,16 @@ /* PUBLIC SERVER APIS *********************************************************/ +/* + * FIXME: This function MUST be moved fro condrv/conoutput.c because only + * consrv knows how to manipulate VDM screenbuffers. + */ +NTSTATUS NTAPI +ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PCHAR_CELL CharInfo/*Buffer*/, + IN COORD CharInfoSize, + IN PSMALL_RECT WriteRegion); NTSTATUS NTAPI ConDrvInvalidateBitMapRect(IN PCONSOLE Console, IN PCONSOLE_SCREEN_BUFFER Buffer, @@ -32,6 +42,18 @@ InvalidateDIBitsRequest->OutputHandle, &Buffer, GENERIC_READ, TRUE); if (!NT_SUCCESS(Status)) return Status; + + /* In text-mode only, draw the VDM buffer if present */ + if (GetType(Buffer) == TEXTMODE_BUFFER) + { + PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; + + /*Status =*/ ConDrvWriteConsoleOutputVDM(Buffer->Header.Console, + TextBuffer, + Buffer->Header.Console->VDMBuffer, + Buffer->Header.Console->VDMBufferSize, + &InvalidateDIBitsRequest->Region); + } Status = ConDrvInvalidateBitMapRect(Buffer->Header.Console, Buffer, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Dec 14 17:30:38 2014 @@ -307,11 +307,11 @@ LONG ReferenceCount; /* Is incremented each time a handle to something in the console (a screen-buffer or the input buffer of this console) gets referenced */ CRITICAL_SECTION Lock; - CONSOLE_STATE State; /* State of the console */ - TERMINAL TermIFace; /* Frontend-specific interface */ - ULONG ConsoleID; /* The ID of the console */ LIST_ENTRY ListEntry; /* Entry in the list of consoles */ + + CONSOLE_STATE State; /* State of the console */ + TERMINAL TermIFace; /* Terminal-specific interface */ HANDLE UnpauseEvent; /* When != NULL, event for pausing the console */

9 years, 9 months

[hbelusca] 65642: [CONDRV]: Code reshuffling only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 14 17:02:39 2014 New Revision: 65642 URL: http://svn.reactos.org/svn/reactos?rev=65642&view=rev Log: [CONDRV]: Code reshuffling only. Added: branches/condrv_restructure/drivers/base/condrv/dispatch.c (with props) Modified: branches/condrv_restructure/drivers/base/condrv/CMakeLists.txt branches/condrv_restructure/drivers/base/condrv/condrv.c Modified: branches/condrv_restructure/drivers/base/condrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/base… ============================================================================== --- branches/condrv_restructure/drivers/base/condrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/condrv_restructure/drivers/base/condrv/CMakeLists.txt [iso-8859-1] Sun Dec 14 17:02:39 2014 @@ -1,17 +1,15 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/drivers) - -## spec2def(condrv.sys condrv.spec ADD_IMPORTLIB) list(APPEND SOURCE condrv.c control.c + dispatch.c condrv.h) add_library(condrv SHARED ${SOURCE} condrv.rc) - # ${CMAKE_CURRENT_BINARY_DIR}/condrv.def) set_module_type(condrv kernelmodedriver) target_link_libraries(condrv ${PSEH_LIB}) Modified: branches/condrv_restructure/drivers/base/condrv/condrv.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/base… ============================================================================== --- branches/condrv_restructure/drivers/base/condrv/condrv.c [iso-8859-1] (original) +++ branches/condrv_restructure/drivers/base/condrv/condrv.c [iso-8859-1] Sun Dec 14 17:02:39 2014 @@ -29,80 +29,6 @@ DRIVER_DISPATCH ConDrvCleanup; */ DRIVER_DISPATCH ConDrvDispatch; - -NTSTATUS NTAPI -CompleteRequest(IN PIRP Irp, - IN NTSTATUS Status, - IN ULONG_PTR Information) -{ - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = Information; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; -} - -NTSTATUS NTAPI -ConDrvDispatch(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) -{ -#define HANDLE_CTRL_CODE(Code) \ - case Code : \ - { \ - DPRINT1("ConDrv: " #Code ", stack->FileObject = 0x%p\n", stack->FileObject); \ - if (stack->FileObject) \ - { \ - DPRINT1("stack->FileObject->FileName = %wZ\n", &stack->FileObject->FileName); \ - } \ - break; \ - } - - PIO_STACK_LOCATION stack = IoGetCurrentIrpStackLocation(Irp); - // ULONG ctrlCode = stack->Parameters.DeviceIoControl.IoControlCode; - ULONG MajorFunction = stack->MajorFunction; - - /* Just display all the IRP codes for now... */ - switch (MajorFunction) - { - HANDLE_CTRL_CODE(IRP_MJ_CREATE); - HANDLE_CTRL_CODE(IRP_MJ_CREATE_NAMED_PIPE); - HANDLE_CTRL_CODE(IRP_MJ_CLOSE); - HANDLE_CTRL_CODE(IRP_MJ_READ); - HANDLE_CTRL_CODE(IRP_MJ_WRITE); - HANDLE_CTRL_CODE(IRP_MJ_QUERY_INFORMATION); - HANDLE_CTRL_CODE(IRP_MJ_SET_INFORMATION); - HANDLE_CTRL_CODE(IRP_MJ_QUERY_EA); - HANDLE_CTRL_CODE(IRP_MJ_SET_EA); - HANDLE_CTRL_CODE(IRP_MJ_FLUSH_BUFFERS); - HANDLE_CTRL_CODE(IRP_MJ_QUERY_VOLUME_INFORMATION); - HANDLE_CTRL_CODE(IRP_MJ_SET_VOLUME_INFORMATION); - HANDLE_CTRL_CODE(IRP_MJ_DIRECTORY_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_FILE_SYSTEM_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_INTERNAL_DEVICE_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_SHUTDOWN); - HANDLE_CTRL_CODE(IRP_MJ_LOCK_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_CLEANUP); - HANDLE_CTRL_CODE(IRP_MJ_CREATE_MAILSLOT); - HANDLE_CTRL_CODE(IRP_MJ_QUERY_SECURITY); - HANDLE_CTRL_CODE(IRP_MJ_SET_SECURITY); - HANDLE_CTRL_CODE(IRP_MJ_POWER); - HANDLE_CTRL_CODE(IRP_MJ_SYSTEM_CONTROL); - HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CHANGE); - HANDLE_CTRL_CODE(IRP_MJ_QUERY_QUOTA); - HANDLE_CTRL_CODE(IRP_MJ_SET_QUOTA); - HANDLE_CTRL_CODE(IRP_MJ_PNP); - // case IRP_MJ_PNP_POWER: - // case IRP_MJ_MAXIMUM_FUNCTION: - - default: - { - DPRINT1("Unknown Major %lu\n", MajorFunction); - break; - } - } - - return CompleteRequest(Irp, STATUS_SUCCESS, 0); -} NTSTATUS NTAPI DriverEntry(IN PDRIVER_OBJECT DriverObject, @@ -168,5 +94,4 @@ return; } - /* EOF */ Added: branches/condrv_restructure/drivers/base/condrv/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/base… ============================================================================== --- branches/condrv_restructure/drivers/base/condrv/dispatch.c (added) +++ branches/condrv_restructure/drivers/base/condrv/dispatch.c [iso-8859-1] Sun Dec 14 17:02:39 2014 @@ -0,0 +1,92 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Console Driver + * FILE: drivers/base/condrv/dispatch.c + * PURPOSE: Console Driver - Dispatching interface + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#include "condrv.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ******************************************************************/ + +NTSTATUS NTAPI +CompleteRequest(IN PIRP Irp, + IN NTSTATUS Status, + IN ULONG_PTR Information) +{ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS NTAPI +ConDrvDispatch(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ +#define HANDLE_CTRL_CODE(Code) \ + case Code : \ + { \ + DPRINT1("ConDrv: " #Code ", stack->FileObject = 0x%p\n", stack->FileObject); \ + if (stack->FileObject) \ + { \ + DPRINT1("stack->FileObject->FileName = %wZ\n", &stack->FileObject->FileName); \ + } \ + break; \ + } + + PIO_STACK_LOCATION stack = IoGetCurrentIrpStackLocation(Irp); + // ULONG ctrlCode = stack->Parameters.DeviceIoControl.IoControlCode; + ULONG MajorFunction = stack->MajorFunction; + + /* Just display all the IRP codes for now... */ + switch (MajorFunction) + { + HANDLE_CTRL_CODE(IRP_MJ_CREATE); + HANDLE_CTRL_CODE(IRP_MJ_CREATE_NAMED_PIPE); + HANDLE_CTRL_CODE(IRP_MJ_CLOSE); + HANDLE_CTRL_CODE(IRP_MJ_READ); + HANDLE_CTRL_CODE(IRP_MJ_WRITE); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_SET_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_EA); + HANDLE_CTRL_CODE(IRP_MJ_SET_EA); + HANDLE_CTRL_CODE(IRP_MJ_FLUSH_BUFFERS); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_VOLUME_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_SET_VOLUME_INFORMATION); + HANDLE_CTRL_CODE(IRP_MJ_DIRECTORY_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_FILE_SYSTEM_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_INTERNAL_DEVICE_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_SHUTDOWN); + HANDLE_CTRL_CODE(IRP_MJ_LOCK_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_CLEANUP); + HANDLE_CTRL_CODE(IRP_MJ_CREATE_MAILSLOT); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_SECURITY); + HANDLE_CTRL_CODE(IRP_MJ_SET_SECURITY); + HANDLE_CTRL_CODE(IRP_MJ_POWER); + HANDLE_CTRL_CODE(IRP_MJ_SYSTEM_CONTROL); + HANDLE_CTRL_CODE(IRP_MJ_DEVICE_CHANGE); + HANDLE_CTRL_CODE(IRP_MJ_QUERY_QUOTA); + HANDLE_CTRL_CODE(IRP_MJ_SET_QUOTA); + HANDLE_CTRL_CODE(IRP_MJ_PNP); + // case IRP_MJ_PNP_POWER: + // case IRP_MJ_MAXIMUM_FUNCTION: + + default: + { + DPRINT1("Unknown Major %lu\n", MajorFunction); + break; + } + } + + return CompleteRequest(Irp, STATUS_SUCCESS, 0); +} + +/* EOF */ Propchange: branches/condrv_restructure/drivers/base/condrv/dispatch.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 9 months

[hbelusca] 65641: [SACDRV]: Code formatting.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 14 16:54:14 2014 New Revision: 65641 URL: http://svn.reactos.org/svn/reactos?rev=65641&view=rev Log: [SACDRV]: Code formatting. Modified: trunk/reactos/drivers/sac/driver/sacdrv.h trunk/reactos/drivers/sac/driver/vtutf8chan.c Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Sun Dec 14 16:54:14 2014 @@ -1397,8 +1397,8 @@ AlteronateFont5, AlteronateFont6, AlternateFont7, - AlternatEfont8, - Alternatefont9, + AlternateFont8, + AlternateFont9, // // Additional attributes (not supported) Modified: trunk/reactos/drivers/sac/driver/vtutf8chan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/vtutf8c… ============================================================================== --- trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/vtutf8chan.c [iso-8859-1] Sun Dec 14 16:54:14 2014 @@ -1088,7 +1088,7 @@ /* Return success if there's nothing to echo */ if (!(Size / sizeof(WCHAR))) return Status; - /* Start with the input string*/ + /* Start with the input string */ pwch = (PWCHAR)String; /* First, figure out how much is outside of the block length alignment */

9 years, 9 months

[hbelusca] 65640: [CONSRV]: Use an optional parameter for passing things to the "line discipline" functions.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 14 16:53:47 2014 New Revision: 65640 URL: http://svn.reactos.org/svn/reactos?rev=65640&view=rev Log: [CONSRV]: Use an optional parameter for passing things to the "line discipline" functions. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -238,10 +238,10 @@ NTSTATUS NTAPI ConDrvReadConsole(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, - /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ IN BOOLEAN Unicode, OUT PVOID Buffer, IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN PVOID Parameter OPTIONAL, IN ULONG NumCharsToRead, OUT PULONG NumCharsRead OPTIONAL) { @@ -260,10 +260,10 @@ /* Call the line-discipline */ return TermReadStream(Console, - ExeName, Unicode, Buffer, ReadControl, + Parameter, NumCharsToRead, NumCharsRead); } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -31,11 +31,11 @@ static NTSTATUS NTAPI DummyReadStream(IN OUT PTERMINAL This, - /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ IN BOOLEAN Unicode, /**PWCHAR Buffer,**/ OUT PVOID Buffer, IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN PVOID Parameter OPTIONAL, IN ULONG NumCharsToRead, OUT PULONG NumCharsRead OPTIONAL) { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -302,10 +302,10 @@ NTSTATUS NTAPI ConDrvReadConsole(IN PCONSOLE Console, IN PCONSOLE_INPUT_BUFFER InputBuffer, - /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ IN BOOLEAN Unicode, OUT PVOID Buffer, IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN PVOID Parameter OPTIONAL, IN ULONG NumCharsToRead, OUT PULONG NumCharsRead OPTIONAL); static NTSTATUS @@ -324,7 +324,7 @@ ULONG NrCharactersRead = 0; ULONG CharSize = (ReadConsoleRequest->Unicode ? sizeof(WCHAR) : sizeof(CHAR)); - /* Compute the executable name, if needed */ + /* Retrieve the executable name, if needed */ if (ReadConsoleRequest->InitialNumBytes == 0 && ReadConsoleRequest->ExeLength <= sizeof(ReadConsoleRequest->StaticBuffer)) { @@ -366,10 +366,10 @@ DPRINT("Calling ConDrvReadConsole(%wZ)\n", &ExeName); Status = ConDrvReadConsole(InputBuffer->Header.Console, InputBuffer, - &ExeName, ReadConsoleRequest->Unicode, Buffer, &ReadControl, + &ExeName, ReadConsoleRequest->NumBytes / CharSize, // NrCharactersToRead &NrCharactersRead); DPRINT("ConDrvReadConsole returned (%d ; Status = 0x%08x)\n", Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -296,17 +296,18 @@ static NTSTATUS NTAPI ConSrvTermReadStream(IN OUT PTERMINAL This, - /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ IN BOOLEAN Unicode, /**PWCHAR Buffer,**/ OUT PVOID Buffer, IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN PVOID Parameter OPTIONAL, IN ULONG NumCharsToRead, OUT PULONG NumCharsRead OPTIONAL) { PFRONTEND FrontEnd = This->Data; PCONSRV_CONSOLE Console = FrontEnd->Console; PCONSOLE_INPUT_BUFFER InputBuffer = &Console->InputBuffer; + PUNICODE_STRING ExeName = Parameter; // STATUS_PENDING : Wait if more to read ; STATUS_SUCCESS : Don't wait. NTSTATUS Status = STATUS_PENDING; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -217,13 +217,13 @@ /* Interface used only for text-mode screen buffers */ NTSTATUS (NTAPI *ReadStream)(IN OUT PTERMINAL This, - /**/IN PUNICODE_STRING ExeName /**/OPTIONAL/**/,/**/ - IN BOOLEAN Unicode, - /**PWCHAR Buffer,**/ - OUT PVOID Buffer, - IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, - IN ULONG NumCharsToRead, - OUT PULONG NumCharsRead OPTIONAL); + IN BOOLEAN Unicode, + /**PWCHAR Buffer,**/ + OUT PVOID Buffer, + IN OUT PCONSOLE_READCONSOLE_CONTROL ReadControl, + IN PVOID Parameter OPTIONAL, + IN ULONG NumCharsToRead, + OUT PULONG NumCharsRead OPTIONAL); NTSTATUS (NTAPI *WriteStream)(IN OUT PTERMINAL This, PTEXTMODE_SCREEN_BUFFER Buff, PWCHAR Buffer, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/term.h [iso-8859-1] Sun Dec 14 16:53:47 2014 @@ -10,9 +10,9 @@ /* Macros used to call functions in the TERMINAL_VTBL virtual table */ -#define TermReadStream(Console, ExeName, /**/ Unicode, /**/ Buffer, ReadControl, NumCharsToRead, NumCharsRead) \ - (Console)->TermIFace.Vtbl->ReadStream(&(Console)->TermIFace, (ExeName), /**/ (Unicode), /**/ \ - (Buffer), (ReadControl), (NumCharsToRead), (NumCharsRead)) +#define TermReadStream(Console, /**/ Unicode, /**/ Buffer, ReadControl, Parameter, NumCharsToRead, NumCharsRead) \ + (Console)->TermIFace.Vtbl->ReadStream(&(Console)->TermIFace, /**/ (Unicode), /**/ \ + (Buffer), (ReadControl), (Parameter), (NumCharsToRead), (NumCharsRead)) #define TermWriteStream(Console, ScreenBuffer, Buffer, Length, Attrib) \ (Console)->TermIFace.Vtbl->WriteStream(&(Console)->TermIFace, (ScreenBuffer), (Buffer), \

9 years, 9 months

[pschweitzer] 65639: [NTFS] - In the VCB, directly store the total number of clusters available in the volume, this will save a few recurrent divisions - Use this everywhere it is possible - Valida...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 14 14:38:44 2014 New Revision: 65639 URL: http://svn.reactos.org/svn/reactos?rev=65639&view=rev Log: [NTFS] - In the VCB, directly store the total number of clusters available in the volume, this will save a few recurrent divisions - Use this everywhere it is possible - Validate input in GetVolumeBitmap(): make sure we don't want bitmap beyond end of the volume CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sun Dec 14 14:38:44 2014 @@ -226,6 +226,7 @@ NtfsInfo->SectorsPerCluster = BootSector->BPB.SectorsPerCluster; NtfsInfo->BytesPerCluster = BootSector->BPB.BytesPerSector * BootSector->BPB.SectorsPerCluster; NtfsInfo->SectorCount = BootSector->EBPB.SectorCount; + NtfsInfo->ClusterCount = DeviceExt->NtfsInfo.SectorCount / (ULONGLONG)DeviceExt->NtfsInfo.SectorsPerCluster; NtfsInfo->MftStart.QuadPart = BootSector->EBPB.MftLocation; NtfsInfo->MftMirrStart.QuadPart = BootSector->EBPB.MftMirrLocation; @@ -547,7 +548,7 @@ DataBuffer->VolumeSerialNumber.QuadPart = DeviceExt->NtfsInfo.SerialNumber; DataBuffer->NumberSectors.QuadPart = DeviceExt->NtfsInfo.SectorCount; - DataBuffer->TotalClusters.QuadPart = DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster; + DataBuffer->TotalClusters.QuadPart = DeviceExt->NtfsInfo.ClusterCount; DataBuffer->FreeClusters.QuadPart = NtfsGetFreeClusters(DeviceExt); DataBuffer->TotalReserved.QuadPart = 0LL; // FIXME DataBuffer->BytesPerSector = DeviceExt->NtfsInfo.BytesPerSector; @@ -664,6 +665,7 @@ NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION Stack; PVOLUME_BITMAP_BUFFER BitmapBuffer; + LONGLONG StartingLcn; DPRINT1("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); @@ -713,6 +715,13 @@ return Status; } + StartingLcn = ((PSTARTING_LCN_INPUT_BUFFER)Stack->Parameters.FileSystemControl.Type3InputBuffer)->StartingLcn.QuadPart; + if (StartingLcn > DeviceExt->NtfsInfo.ClusterCount) + { + DPRINT1("Requested bitmap start beyond partition end: %I64x %I64x\n", DeviceExt->NtfsInfo.ClusterCount, StartingLcn); + return STATUS_INVALID_PARAMETER; + } + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } 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 14 14:38:44 2014 @@ -62,6 +62,7 @@ ULONG SectorsPerCluster; ULONG BytesPerCluster; ULONGLONG SectorCount; + ULONGLONG ClusterCount; ULARGE_INTEGER MftStart; ULARGE_INTEGER MftMirrStart; ULONG BytesPerFileRecord; Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Sun Dec 14 14:38:44 2014 @@ -70,7 +70,7 @@ } BitmapDataSize = AttributeDataLength(&DataContext->Record); - ASSERT((BitmapDataSize * 8) >= (DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster)); + ASSERT((BitmapDataSize * 8) >= DeviceExt->NtfsInfo.ClusterCount); BitmapData = ExAllocatePoolWithTag(NonPagedPool, ROUND_UP(BitmapDataSize, DeviceExt->NtfsInfo.BytesPerSector), TAG_NTFS); if (BitmapData == NULL) { @@ -86,11 +86,11 @@ } ReleaseAttributeContext(DataContext); - DPRINT1("Total clusters: %I64x\n", DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster); + DPRINT1("Total clusters: %I64x\n", DeviceExt->NtfsInfo.ClusterCount); DPRINT1("Total clusters in bitmap: %I64x\n", BitmapDataSize * 8); - DPRINT1("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - (DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster)) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); - - RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster); + DPRINT1("Diff in size: %I64d B\n", ((BitmapDataSize * 8) - DeviceExt->NtfsInfo.ClusterCount) * DeviceExt->NtfsInfo.SectorsPerCluster * DeviceExt->NtfsInfo.BytesPerSector); + + RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, DeviceExt->NtfsInfo.ClusterCount); FreeClusters = RtlNumberOfClearBits(&Bitmap); ExFreePoolWithTag(BitmapData, TAG_NTFS); @@ -198,7 +198,7 @@ DeviceExt = DeviceObject->DeviceExtension; FsSizeInfo->AvailableAllocationUnits.QuadPart = NtfsGetFreeClusters(DeviceExt); - FsSizeInfo->TotalAllocationUnits.QuadPart = DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster; + FsSizeInfo->TotalAllocationUnits.QuadPart = DeviceExt->NtfsInfo.ClusterCount; FsSizeInfo->SectorsPerAllocationUnit = DeviceExt->NtfsInfo.SectorsPerCluster; FsSizeInfo->BytesPerSector = DeviceExt->NtfsInfo.BytesPerSector;

9 years, 9 months

[pschweitzer] 65638: [NTFS] - Implement NtfsGetUserBuffer() that will (attempt to) return the user output buffer for METHOD_NEITHER IOCTL. - Implement parameters checking GetVolumeBitmap() CORE-8725

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 14 12:24:18 2014 New Revision: 65638 URL: http://svn.reactos.org/svn/reactos?rev=65638&view=rev Log: [NTFS] - Implement NtfsGetUserBuffer() that will (attempt to) return the user output buffer for METHOD_NEITHER IOCTL. - Implement parameters checking GetVolumeBitmap() CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/CMakeLists.txt trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/misc.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 14 12:24:18 2014 @@ -20,6 +20,7 @@ add_library(ntfs SHARED ${SOURCE} ntfs.rc) set_module_type(ntfs kernelmodedriver) +target_link_libraries(ntfs ${PSEH_LIB}) add_importlibs(ntfs ntoskrnl hal) add_pch(ntfs ntfs.h SOURCE) add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sun Dec 14 12:24:18 2014 @@ -661,7 +661,57 @@ GetVolumeBitmap(PDEVICE_EXTENSION DeviceExt, PIRP Irp) { + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION Stack; + PVOLUME_BITMAP_BUFFER BitmapBuffer; + DPRINT1("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); + + Stack = IoGetCurrentIrpStackLocation(Irp); + + if (Stack->Parameters.FileSystemControl.InputBufferLength < sizeof(STARTING_LCN_INPUT_BUFFER)) + { + DPRINT1("Invalid input! %d\n", Stack->Parameters.FileSystemControl.InputBufferLength); + return STATUS_INVALID_PARAMETER; + } + + if (Stack->Parameters.FileSystemControl.OutputBufferLength < sizeof(VOLUME_BITMAP_BUFFER)) + { + DPRINT1("Invalid output! %d\n", Stack->Parameters.FileSystemControl.OutputBufferLength); + return STATUS_BUFFER_TOO_SMALL; + } + + BitmapBuffer = NtfsGetUserBuffer(Irp); + if (Irp->RequestorMode == UserMode) + { + _SEH2_TRY + { + ProbeForRead(Stack->Parameters.FileSystemControl.Type3InputBuffer, + Stack->Parameters.FileSystemControl.InputBufferLength, + sizeof(CHAR)); + ProbeForWrite(BitmapBuffer, Stack->Parameters.FileSystemControl.OutputBufferLength, + sizeof(CHAR)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + if (Stack->Parameters.FileSystemControl.Type3InputBuffer == NULL || + BitmapBuffer == NULL) + { + Status = STATUS_INVALID_PARAMETER; + } + } + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Invalid buffer! %p %p\n", Stack->Parameters.FileSystemControl.Type3InputBuffer, BitmapBuffer); + return Status; + } UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Sun Dec 14 12:24:18 2014 @@ -112,4 +112,17 @@ *FileAttributes = FILE_ATTRIBUTE_NORMAL; } +PVOID +NtfsGetUserBuffer(PIRP Irp) +{ + if (Irp->MdlAddress != NULL) + { + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, HighPagePriority); + } + else + { + return Irp->UserBuffer; + } +} + /* EOF */ 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 14 12:24:18 2014 @@ -2,6 +2,7 @@ #define NTFS_H #include <ntifs.h> +#include <pseh/pseh2.h> #define CACHEPAGESIZE(pDeviceExt) \ ((pDeviceExt)->NtfsInfo.UCHARsPerCluster > PAGE_SIZE ? \ @@ -729,6 +730,9 @@ NtfsAllocateIrpContext(PDEVICE_OBJECT DeviceObject, PIRP Irp); +PVOID +NtfsGetUserBuffer(PIRP Irp); + #if 0 BOOLEAN wstrcmpjoki(PWSTR s1, PWSTR s2);

9 years, 9 months

[hbelusca] 65637: [COMP]: Minor code style changes + whitespace fixes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 14 12:04:45 2014 New Revision: 65637 URL: http://svn.reactos.org/svn/reactos?rev=65637&view=rev Log: [COMP]: Minor code style changes + whitespace fixes. Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c Modified: trunk/reactos/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/comp/comp.c [iso-8859-1] Sun Dec 14 12:04:45 2014 @@ -27,7 +27,6 @@ * */ - #include <windows.h> #include <tchar.h> #include <stdio.h> @@ -43,17 +42,18 @@ return fread(buff, 1, STRBUF, in); } -INT FileSize(FILE * fd) { +INT FileSize(FILE * fd) +{ INT result = -1; if (fseek(fd, 0, SEEK_END) == 0 && (result = ftell(fd)) != -1) { - //restoring file pointer + /* Restoring file pointer */ rewind(fd); } return result; } -/* print program usage */ +/* Print program usage */ VOID Usage(VOID) { _tprintf(_T("\nCompares the contents of two files or sets of files.\n\n" @@ -68,16 +68,18 @@ int _tmain (int argc, TCHAR *argv[]) { INT i; - // file pointers + + /* File pointers */ FILE *fp1 = NULL; FILE *fp2 = NULL; + INT BufLen1, BufLen2; PTCHAR Buff1 = NULL; PTCHAR Buff2 = NULL; - TCHAR File1[_MAX_PATH + 1], // file paths + TCHAR File1[_MAX_PATH + 1], // File paths File2[_MAX_PATH + 1]; - BOOL bAscii = FALSE, // /A switch - bLineNos = FALSE; // /L switch + BOOL bAscii = FALSE, // /A switch + bLineNos = FALSE; // /L switch UINT LineNumber; UINT Offset; INT FileSizeFile1; @@ -86,24 +88,31 @@ INT FilesOK = 1; INT Status = EXIT_SUCCESS; - /* parse command line for options */ + /* Parse command line for options */ for (i = 1; i < argc; i++) { if (argv[i][0] == '/') { - switch (argv[i][1]) { - case 'A': bAscii = TRUE; - NumberOfOptions++; - break; - case 'L': bLineNos = TRUE; - NumberOfOptions++; - break; - case '?': Usage(); - return EXIT_SUCCESS; - default: - _tprintf(_T("Invalid switch - /%c\n"), argv[i][1]); - Usage(); - return EXIT_FAILURE; + switch (argv[i][1]) + { + case 'A': + bAscii = TRUE; + NumberOfOptions++; + break; + + case 'L': + bLineNos = TRUE; + NumberOfOptions++; + break; + + case '?': + Usage(); + return EXIT_SUCCESS; + + default: + _tprintf(_T("Invalid switch - /%c\n"), argv[i][1]); + Usage(); + return EXIT_FAILURE; } } } @@ -112,11 +121,13 @@ { _tcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH); _tcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH); - } else { + } + else + { _tprintf(_T("Bad command line syntax\n")); return EXIT_FAILURE; } - + Buff1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR)); if (Buff1 == NULL) { @@ -149,7 +160,7 @@ _tprintf(_T("Comparing %s and %s...\n"), File1, File2); FileSizeFile1 = FileSize(fp1); - if (FileSizeFile1 == -1) + if (FileSizeFile1 == -1) { _tprintf(_T("Can't determine size of file: %s\n"), File1); Status = EXIT_FAILURE; @@ -157,7 +168,7 @@ } FileSizeFile2 = FileSize(fp2); - if (FileSizeFile2 == -1) + if (FileSizeFile2 == -1) { _tprintf(_T("Can't determine size of file: %s\n"), File2); Status = EXIT_FAILURE; @@ -173,30 +184,30 @@ LineNumber = 1; Offset = 0; - while (1) + while (1) { BufLen1 = GetBuff(Buff1, fp1); BufLen2 = GetBuff(Buff2, fp2); - if (ferror(fp1) || ferror(fp2)) + if (ferror(fp1) || ferror(fp2)) { _tprintf(_T("Files read error.\n")); Status = EXIT_FAILURE; goto Cleanup; } - if (!BufLen1 && !BufLen2) + if (!BufLen1 && !BufLen2) break; assert(BufLen1 == BufLen2); - for (i = 0; i < BufLen1; i++) + for (i = 0; i < BufLen1; i++) { if (Buff1[i] != Buff2[i]) { FilesOK = 0; - //Reporting here a mismatch - if (bLineNos) + /* Reporting here a mismatch */ + if (bLineNos) { _tprintf(_T("Compare error at LINE %d\n"), LineNumber); } @@ -204,7 +215,7 @@ { _tprintf(_T("Compare error at OFFSET %d\n"), Offset); } - + if (bAscii) { _tprintf(_T("file1 = %c\n"), Buff1[i]); @@ -226,19 +237,19 @@ if (FilesOK) _tprintf(_T("Files compare OK\n")); - + Cleanup: - - if(fp1) + if (fp1) fclose(fp1); - if(fp2) + if (fp2) fclose(fp2); - if(Buff1) + if (Buff1) free(Buff1); - if(Buff2) + if (Buff2) free(Buff2); return Status; } + /* EOF */

9 years, 9 months

[pschweitzer] 65636: [NTFS] Stub FSCTL_GET_VOLUME_BITMAP which is required by NFI. CORE-8725

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 14 10:54:20 2014 New Revision: 65636 URL: http://svn.reactos.org/svn/reactos?rev=65636&view=rev Log: [NTFS] Stub FSCTL_GET_VOLUME_BITMAP which is required by NFI. CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Sun Dec 14 10:54:20 2014 @@ -658,6 +658,18 @@ static NTSTATUS +GetVolumeBitmap(PDEVICE_EXTENSION DeviceExt, + PIRP Irp) +{ + DPRINT1("GetVolumeBitmap(%p, %p)\n", DeviceExt, Irp); + + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +static +NTSTATUS NtfsUserFsRequest(PDEVICE_OBJECT DeviceObject, PIRP Irp) { @@ -679,6 +691,10 @@ Status = GetNtfsFileRecord(DeviceExt, Irp); break; + case FSCTL_GET_VOLUME_BITMAP: + Status = GetVolumeBitmap(DeviceExt, Irp); + break; + default: DPRINT1("Invalid user request: %x\n", Stack->Parameters.FileSystemControl.FsControlCode); Status = STATUS_INVALID_DEVICE_REQUEST;

9 years, 9 months

[cgutman] 65635: [CDFS] - Fix CD-ROM disc change handling - Fixes CORE-6119

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Dec 14 09:27:11 2014 New Revision: 65635 URL: http://svn.reactos.org/svn/reactos?rev=65635&view=rev Log: [CDFS] - Fix CD-ROM disc change handling - Fixes CORE-6119 Modified: trunk/reactos/drivers/filesystems/cdfs/create.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/create.c [iso-8859-1] Sun Dec 14 09:27:11 2014 @@ -140,10 +140,6 @@ DPRINT ("Status %lx\n", Status); if (!NT_SUCCESS(Status)) { - if (Status == STATUS_NO_MEDIA_IN_DEVICE || Status == STATUS_VERIFY_REQUIRED) - { - DeviceExt->VolumeDevice->Flags |= DO_VERIFY_VOLUME; - } DPRINT1 ("Status %lx\n", Status); return Status; } Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Sun Dec 14 09:27:11 2014 @@ -453,34 +453,25 @@ PIRP Irp) { PDEVICE_EXTENSION DeviceExt; - PDEVICE_OBJECT DeviceToVerify; PIO_STACK_LOCATION Stack; NTSTATUS Status; CDINFO CdInfo; - PLIST_ENTRY Entry; PFCB Fcb; + PVPB VpbToVerify; DPRINT1 ("CdfsVerifyVolume() called\n"); -#if 0 - if (DeviceObject != CdfsGlobalData->DeviceObject) - { - DPRINT1("DeviceObject != CdfsGlobalData->DeviceObject\n"); - return(STATUS_INVALID_DEVICE_REQUEST); - } -#endif - DeviceExt = DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation (Irp); - DeviceToVerify = Stack->Parameters.VerifyVolume.DeviceObject; + VpbToVerify = Stack->Parameters.VerifyVolume.Vpb; FsRtlEnterFileSystem(); ExAcquireResourceExclusiveLite (&DeviceExt->VcbResource, TRUE); - if (!(DeviceToVerify->Flags & DO_VERIFY_VOLUME)) + if (!(VpbToVerify->RealDevice->Flags & DO_VERIFY_VOLUME)) { DPRINT1 ("Volume has been verified!\n"); ExReleaseResourceLite (&DeviceExt->VcbResource); @@ -488,14 +479,14 @@ return STATUS_SUCCESS; } - DPRINT1 ("Device object %p Device to verify %p\n", DeviceObject, DeviceToVerify); - - Status = CdfsGetVolumeData (DeviceToVerify, + DPRINT1("Device object %p Device to verify %p\n", DeviceObject, VpbToVerify->RealDevice); + + Status = CdfsGetVolumeData(VpbToVerify->RealDevice, &CdInfo); if (NT_SUCCESS(Status) && - CdInfo.SerialNumber == DeviceToVerify->Vpb->SerialNumber && - CdInfo.VolumeLabelLength == DeviceToVerify->Vpb->VolumeLabelLength && - !wcsncmp (CdInfo.VolumeLabel, DeviceToVerify->Vpb->VolumeLabel, CdInfo.VolumeLabelLength)) + CdInfo.SerialNumber == VpbToVerify->SerialNumber && + CdInfo.VolumeLabelLength == VpbToVerify->VolumeLabelLength && + !wcsncmp(CdInfo.VolumeLabel, VpbToVerify->VolumeLabel, CdInfo.VolumeLabelLength)) { DPRINT1 ("Same volume!\n"); @@ -520,7 +511,7 @@ Status = STATUS_WRONG_VOLUME; } - DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME; + VpbToVerify->RealDevice->Flags &= ~DO_VERIFY_VOLUME; ExReleaseResourceLite (&DeviceExt->VcbResource); FsRtlExitFileSystem();

9 years, 9 months

[pschweitzer] 65634: [CALC] Apply r65633 to all the language files. CORE-7746

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 14 09:18:47 2014 New Revision: 65634 URL: http://svn.reactos.org/svn/reactos?rev=65634&view=rev Log: [CALC] Apply r65633 to all the language files. CORE-7746 Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/he-IL.rc trunk/reactos/base/applications/calc/lang/hu-HU.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ja-JP.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/pt-BR.rc trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/sq-AL.rc trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/tr-TR.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/lang/zh-CN.rc Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -336,8 +336,8 @@ END POPUP "ÐÐ·Ð³Ð»ÐµÐ´" BEGIN - MENUITEM "ÐÐ±Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ±Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·ÑÐ²Ð°Ð½Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÐµÑÑÐ½aÐ´ÐµÑÐµÑÐ¸ÑÐµÐ½\tF5", IDM_VIEW_HEX, CHECKED @@ -368,8 +368,8 @@ END POPUP "ÐÐ·Ð³Ð»ÐµÐ´" BEGIN - MENUITEM "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·ÑÐ²Ð°Ð½Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÐµÑÑÐ½aÐ´ÐµÑÐµÑÐ¸ÑÐµÐ½\tF5", IDM_VIEW_HEX, CHECKED @@ -401,8 +401,8 @@ END POPUP "ÐÐ·Ð³Ð»ÐµÐ´" BEGIN - MENUITEM "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐµÐ½", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·ÑÐ²Ð°Ð½Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð Ð°Ð·Ð´ÐµÐ»ÑÐ½Ðµ Ð½Ð° ÑÐ¸Ð»ÑÐ´Ð¸ÑÐµ", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -335,8 +335,8 @@ END POPUP "Zobrazit" BEGIN - MENUITEM "StandardnÃ", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "StandardnÃ", IDM_VIEW_STANDARD + MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "PÅevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Å estnÃ¡ctkovÄ\tF5", IDM_VIEW_HEX, CHECKED @@ -367,8 +367,8 @@ END POPUP "Zobrazit" BEGIN - MENUITEM "StandardnÃ", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "StandardnÃ", IDM_VIEW_STANDARD + MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "PÅevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Å estnÃ¡ctkovÄ\tF5", IDM_VIEW_HEX, CHECKED @@ -400,8 +400,8 @@ END POPUP "Zobrazit" BEGIN - MENUITEM "StandardnÃ", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "StandardnÃ", IDM_VIEW_STANDARD + MENUITEM "VÄdeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "PÅevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "SeskupovÃ¡nÃ ÄÃslic", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "Ansicht" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC MENUITEM "Konversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "Ansicht" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC MENUITEM "Konversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "Ansicht" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC MENUITEM "Konversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "View" BEGIN - MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD + MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC MENUITEM "ÎÎµÏÎ±ÏÏÎ¿ÏÎ®", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "View" BEGIN - MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD + MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC MENUITEM "ÎÎµÏÎ±ÏÏÎ¿ÏÎ®", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ÎÎµÎºÎ±ÎµÎ¾Î±Î´Î¹ÎºÏ\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "View" BEGIN - MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Î¤ÏÏÎ¹ÎºÎ®", IDM_VIEW_STANDARD + MENUITEM "ÎÏÎ¹ÏÏÎ·Î¼Î¿Î½Î¹ÎºÎ®", IDM_VIEW_SCIENTIFIC MENUITEM "ÎÎµÏÎ±ÏÏÎ¿ÏÎ®", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ÎÎ¼Î±Î´Î¿ÏÎ¿Î¯Î·ÏÎ· ÏÎ·ÏÎ¯ÏÎ½", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -336,8 +336,8 @@ END POPUP "Ver" BEGIN - MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversiÃ³n", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -368,8 +368,8 @@ END POPUP "Ver" BEGIN - MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversiÃ³n", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -401,8 +401,8 @@ END POPUP "Ver" BEGIN - MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "EstÃ¡ndar", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversiÃ³n", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Agrupar dÃgitos", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "Affichage" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC MENUITEM "Conversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "HexadÃ©cimal\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "Affichage" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC MENUITEM "Conversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "HexadÃ©cimal\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "Affichage" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC MENUITEM "Conversion", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Grouper les chiffres", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/he-IL.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -332,8 +332,8 @@ END POPUP "×ª×¦×××" BEGIN - MENUITEM "×¨××××", IDM_VIEW_STANDARD, CHECKED - MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "×¨××××", IDM_VIEW_STANDARD + MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC MENUITEM "×××¨×", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "××§×¡\tF5", IDM_VIEW_HEX, CHECKED @@ -364,8 +364,8 @@ END POPUP "×ª×¦×××" BEGIN - MENUITEM "×¨××××", IDM_VIEW_STANDARD, CHECKED - MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "×¨××××", IDM_VIEW_STANDARD + MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC MENUITEM "×××¨×", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "××§×¡\tF5", IDM_VIEW_HEX, CHECKED @@ -397,8 +397,8 @@ END POPUP "×ª×¦×××" BEGIN - MENUITEM "×¨××××", IDM_VIEW_STANDARD, CHECKED - MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "×¨××××", IDM_VIEW_STANDARD + MENUITEM "×××¢××ª", IDM_VIEW_SCIENTIFIC MENUITEM "×××¨×", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "×§××××¥ ×¡×¤×¨××ª", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/hu-HU.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -338,8 +338,8 @@ END POPUP "&NÃ©zet" BEGIN - MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD + MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC MENUITEM "Ãt&vÃ¡ltÃ¡s", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&HexadecimÃ¡lis\tF5", IDM_VIEW_HEX, CHECKED @@ -370,8 +370,8 @@ END POPUP "&NÃ©zet" BEGIN - MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD + MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC MENUITEM "Ãt&vÃ¡ltÃ¡s", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&HexadecimÃ¡lis\tF5", IDM_VIEW_HEX, CHECKED @@ -403,8 +403,8 @@ END POPUP "&NÃ©zet" BEGIN - MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&SzokÃ¡sos", IDM_VIEW_STANDARD + MENUITEM "&TudomÃ¡nyos", IDM_VIEW_SCIENTIFIC MENUITEM "Ãt&vÃ¡ltÃ¡s", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "SzÃ¡mjegyek &csoportosÃtÃ¡sa", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "Visualizza" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC MENUITEM "Conversione", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "Visualizza" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC MENUITEM "Conversione", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "Visualizza" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC MENUITEM "Conversione", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Raggruppamento cifre", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "è¡¨ç¤º(&V)" BEGIN - MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "1&6é²\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "è¡¨ç¤º(&V)" BEGIN - MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "1&6é²\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "è¡¨ç¤º" BEGIN - MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD, CHECKED - MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ¨æº(&T)", IDM_VIEW_STANDARD + MENUITEM "é¢æ°é»å(&S)", IDM_VIEW_SCIENTIFIC MENUITEM "å¤æ(&C)", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "æ¡ãåºåã(&I)", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -332,8 +332,8 @@ END POPUP "ë³´ê¸°" BEGIN - MENUITEM "ì¼ë°", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ì¼ë°", IDM_VIEW_STANDARD + MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC MENUITEM "ì í", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -364,8 +364,8 @@ END POPUP "ë³´ê¸°" BEGIN - MENUITEM "ì¼ë°", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ì¼ë°", IDM_VIEW_STANDARD + MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC MENUITEM "ì í", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -397,8 +397,8 @@ END POPUP "ë³´ê¸°" BEGIN - MENUITEM "ì¼ë°", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ì¼ë°", IDM_VIEW_STANDARD + MENUITEM "ê³µí", IDM_VIEW_SCIENTIFIC MENUITEM "ì í", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ìë¦¿ì êµ¬ë¶ ë¨ì", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "Beeld" BEGIN - MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standaard", IDM_VIEW_STANDARD + MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC MENUITEM "Converteren", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "Beeld" BEGIN - MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standaard", IDM_VIEW_STANDARD + MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC MENUITEM "Converteren", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "View" BEGIN - MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standaard", IDM_VIEW_STANDARD + MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC MENUITEM "Converteren", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Cijfergroeperingen", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "Vis" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "Vis" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC MENUITEM "konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "Vis" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -339,8 +339,8 @@ END POPUP "WyglÄd" BEGIN - MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standardowy", IDM_VIEW_STANDARD + MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Szesnastkowy\tF5", IDM_VIEW_HEX, CHECKED @@ -371,8 +371,8 @@ END POPUP "WyglÄd" BEGIN - MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standardowy", IDM_VIEW_STANDARD + MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Szesnastkowo\tF5", IDM_VIEW_HEX, CHECKED @@ -404,8 +404,8 @@ END POPUP "WyglÄd" BEGIN - MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standardowy", IDM_VIEW_STANDARD + MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Grupowanie cyfr", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pt-BR.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -332,8 +332,8 @@ END POPUP "Visualizar" BEGIN - MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversÃ£o", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -364,8 +364,8 @@ END POPUP "Visualizar" BEGIN - MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversÃ£o", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -397,8 +397,8 @@ END POPUP "Visualizar" BEGIN - MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD, CHECKED - MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "PadrÃ£o", IDM_VIEW_STANDARD + MENUITEM "CientÃfica", IDM_VIEW_SCIENTIFIC MENUITEM "ConversÃ£o", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Agrupar dÃgitos", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -331,8 +331,8 @@ END POPUP "&AfiÈare" BEGIN - MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Mod st&andard", IDM_VIEW_STANDARD + MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC MENUITEM "Con&versie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&Hexazecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -363,8 +363,8 @@ END POPUP "&AfiÈare" BEGIN - MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Mod st&andard", IDM_VIEW_STANDARD + MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC MENUITEM "Con&versie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&Hexazecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -396,8 +396,8 @@ END POPUP "&AfiÈare" BEGIN - MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Mod st&andard", IDM_VIEW_STANDARD + MENUITEM "Mod Ètii&nÈific", IDM_VIEW_SCIENTIFIC MENUITEM "Con&versie", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "GrupeazÄ &cifre", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "ÐÐ¸Ð´" BEGIN - MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐ°ÑÐµÑÐ¸ÑÐ½ÑÐ¹\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "ÐÐ¸Ð´" BEGIN - MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÐµÑÑÐ½Ð°Ð´ÑÐ°ÑÐµÑÐ¸ÑÐ½ÑÐ¹\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "ÐÐ¸Ð´" BEGIN - MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ±ÑÑÐ½ÑÐ¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÑÐ½ÑÐ¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÑÐµÐ¾Ð±ÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ðµ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ÐÐ¾Ð»Ð¸ÑÐµÑÑÐ²Ð¾ ÑÐ¸ÑÑ Ð² Ð³ÑÑÐ¿Ð¿Ðµ", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -337,8 +337,8 @@ END POPUP "ZobraziÅ¥" BEGIN - MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD + MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "Prevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Å estnÃ¡stkovÃ¡\tF5", IDM_VIEW_HEX, CHECKED @@ -369,8 +369,8 @@ END POPUP "ZobraziÅ¥" BEGIN - MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD + MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "Prevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Å estnÃ¡stkovÃ¡\tF5", IDM_VIEW_HEX, CHECKED @@ -402,8 +402,8 @@ END POPUP "ZobraziÅ¥" BEGIN - MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD, CHECKED - MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Å tandardnÃ¡", IDM_VIEW_STANDARD + MENUITEM "VedeckÃ¡", IDM_VIEW_SCIENTIFIC MENUITEM "Prevody", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ZoskupovaÅ¥ ÄÃslice", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sq-AL.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -334,8 +334,8 @@ END POPUP "Modifko" BEGIN - MENUITEM "Standart", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standart", IDM_VIEW_STANDARD + MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertim", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -366,8 +366,8 @@ END POPUP "VÃ«zhgo" BEGIN - MENUITEM "Standart", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standart", IDM_VIEW_STANDARD + MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC MENUITEM "Konverto", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED @@ -399,8 +399,8 @@ END POPUP "VÃ«zhgo" BEGIN - MENUITEM "Standar", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standar", IDM_VIEW_STANDARD + MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC MENUITEM "Konverto", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Grupim numeror", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sv-SE.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -337,8 +337,8 @@ END POPUP "Visa" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -369,8 +369,8 @@ END POPUP "Vis" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED @@ -402,8 +402,8 @@ END POPUP "Visa" BEGIN - MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vetenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Standard", IDM_VIEW_STANDARD + MENUITEM "Vetenskapelig", IDM_VIEW_SCIENTIFIC MENUITEM "Konvertering", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -330,8 +330,8 @@ END POPUP "&à¸¡à¸¸à¸¡à¸¡à¸à¸" BEGIN - MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD, CHECKED - MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD + MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC MENUITEM "à¸à¸§à¸²à¸¡à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "à¸à¸²à¸à¸ªà¸´à¸à¸«à¸\tF5", IDM_VIEW_HEX, CHECKED @@ -362,8 +362,8 @@ END POPUP "&à¸¡à¸¸à¸¡à¸¡à¸à¸" BEGIN - MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD, CHECKED - MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD + MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC MENUITEM "à¸à¸§à¸²à¸¡à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "à¸à¸²à¸à¸ªà¸´à¸à¸«à¸\tF5", IDM_VIEW_HEX, CHECKED @@ -395,8 +395,8 @@ END POPUP "&à¸¡à¸¸à¸¡à¸¡à¸à¸" BEGIN - MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD, CHECKED - MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "à¹à¸à¸à¸¡à¸²à¸à¸£à¸à¸²à¸", IDM_VIEW_STANDARD + MENUITEM "à¹à¸à¸à¸§à¸´à¸à¸¢à¸²à¸¨à¸²à¸ªà¸à¸£à¹", IDM_VIEW_SCIENTIFIC MENUITEM "à¸à¸§à¸²à¸¡à¹à¸à¸¥à¸µà¹à¸¢à¸à¹à¸à¸¥à¸", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "à¹à¸ªà¸à¸à¸«à¸¥à¸±à¸à¸à¸±à¸§à¹à¸¥à¸", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -332,8 +332,8 @@ END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN - MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD + MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC MENUITEM "&DÃ¶nÃ¼ÅtÃ¼rme", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&OnaltÄ±lÄ±k\tF5", IDM_VIEW_HEX, CHECKED @@ -364,8 +364,8 @@ END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN - MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD + MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC MENUITEM "&DÃ¶nÃ¼ÅtÃ¼rme", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "&OnaltÄ±lÄ±k\tF5", IDM_VIEW_HEX, CHECKED @@ -397,8 +397,8 @@ END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN - MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD, CHECKED - MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "&ÃlÃ§Ã¼nlÃ¼", IDM_VIEW_STANDARD + MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC MENUITEM "&DÃ¶nÃ¼ÅtÃ¼rme", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "B&asamaklarÄ± TakÄ±mla", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -338,8 +338,8 @@ END POPUP "ÐÐ¸Ð³Ð»ÑÐ´" BEGIN - MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÐµÑÐµÑÐ²Ð¾ÑÐµÐ½Ð½Ñ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÑÑÑÐ½Ð°Ð´ÑÑÑÐºÐ¾Ð²Ð¸Ð¹\tF5", IDM_VIEW_HEX, CHECKED @@ -370,8 +370,8 @@ END POPUP "ÐÐ¸Ð³Ð»ÑÐ´" BEGIN - MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÐµÑÐµÑÐ²Ð¾ÑÐµÐ½Ð½Ñ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "Ð¨ÑÑÑÐ½Ð°Ð´ÑÑÑÐºÐ¾Ð²Ð¸Ð¹\tF5", IDM_VIEW_HEX, CHECKED @@ -403,8 +403,8 @@ END POPUP "ÐÐ¸Ð³Ð»ÑÐ´" BEGIN - MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "ÐÐ²Ð¸ÑÐ°Ð¹Ð½Ð¸Ð¹", IDM_VIEW_STANDARD + MENUITEM "ÐÐ°ÑÐºÐ¾Ð²Ð¸Ð¹", IDM_VIEW_SCIENTIFIC MENUITEM "ÐÐµÑÐµÑÐ²Ð¾ÑÐµÐ½Ð½Ñ", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ÐÑÐ»ÑÐºÑÑÑÑ ÑÐ¸ÑÑ Ñ Ð³ÑÑÐ¿Ñ", IDM_VIEW_GROUP, CHECKED Modified: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] Sun Dec 14 09:18:47 2014 @@ -332,8 +332,8 @@ END POPUP "æ¥ç" BEGIN - MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ åå", IDM_VIEW_STANDARD + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ååè¿å¶\tF5", IDM_VIEW_HEX, CHECKED @@ -364,8 +364,8 @@ END POPUP "æ¥ç" BEGIN - MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ åå", IDM_VIEW_STANDARD + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "ååè¿å¶\tF5", IDM_VIEW_HEX, CHECKED @@ -397,8 +397,8 @@ END POPUP "æ¥ç" BEGIN - MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED - MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "æ åå", IDM_VIEW_STANDARD + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION MENUITEM SEPARATOR MENUITEM "æ°ååç»", IDM_VIEW_GROUP, CHECKED

9 years, 9 months

← Newer
1
...
26
27
28
29
30
31
32
...
39
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 December 2014