Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[tfaber] 64690: [NTDLL:DBG] - Use NtReadVirtualMemory instead of dereferencing a pointer from a different process in DbgUiConvertStateChangeStructure. CORE-8622 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 12 11:35:11 2014 New Revision: 64690 URL: http://svn.reactos.org/svn/reactos?rev=64690&view=rev Log: [NTDLL:DBG] - Use NtReadVirtualMemory instead of dereferencing a pointer from a different process in DbgUiConvertStateChangeStructure. CORE-8622 #resolve Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dbg/dbgui.c [iso-8859-1] Sun Oct 12 11:35:11 2014 @@ -66,6 +66,9 @@ THREAD_BASIC_INFORMATION ThreadBasicInfo; LPDEBUG_EVENT DebugEvent = Win32DebugEvent; HANDLE ThreadHandle; + HANDLE ProcessHandle; + PTEB Teb; + PVOID Pointer; /* Write common data */ DebugEvent->dwProcessId = (DWORD)WaitStateChange-> @@ -256,13 +259,31 @@ NtClose(ThreadHandle); } - /* Check if we got thread information */ + /* If we got thread information, open the process */ if (NT_SUCCESS(Status)) { - /* Save the image name from the TIB */ - DebugEvent->u.LoadDll.lpImageName = - ((PTEB)ThreadBasicInfo.TebBaseAddress)-> - NtTib.ArbitraryUserPointer; + Status = NtOpenProcess(&ProcessHandle, + PROCESS_VM_READ, + &ObjectAttributes, + &WaitStateChange->AppClientId); + } + + if (NT_SUCCESS(Status)) + { + /* Read the image name from the TIB */ + Teb = ThreadBasicInfo.TebBaseAddress; + Status = NtReadVirtualMemory(ProcessHandle, + &Teb->NtTib.ArbitraryUserPointer, + &Pointer, + sizeof(Pointer), + NULL); + NtClose(ProcessHandle); + } + + if (NT_SUCCESS(Status)) + { + /* If everything was successful, set the image name */ + DebugEvent->u.LoadDll.lpImageName = Pointer; } else {

9 years, 11 months

[tfaber] 64689: [EVENTLOG] - In ElfGetLogHandleEntryByHandle, actually verify the validity of the handle by traversing the log handle list. Fixes crash in advapi32_winetest:eventlog (double close)....

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 12 11:23:05 2014 New Revision: 64689 URL: http://svn.reactos.org/svn/reactos?rev=64689&view=rev Log: [EVENTLOG] - In ElfGetLogHandleEntryByHandle, actually verify the validity of the handle by traversing the log handle list. Fixes crash in advapi32_winetest:eventlog (double close). - Minor style improvements to ElfDeleteEventLogHandle CORE-8621 #resolve Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Sun Oct 12 11:23:05 2014 @@ -196,31 +196,40 @@ PLOGHANDLE ElfGetLogHandleEntryByHandle(IELF_HANDLE EventLogHandle) { + PLIST_ENTRY CurrentEntry; PLOGHANDLE lpLogHandle; - if (IsListEmpty(&LogHandleListHead)) - { - return NULL; - } - - lpLogHandle = CONTAINING_RECORD((PLOGHANDLE)EventLogHandle, LOGHANDLE, LogHandleListEntry); - - return lpLogHandle; + CurrentEntry = LogHandleListHead.Flink; + while (CurrentEntry != &LogHandleListHead) + { + lpLogHandle = CONTAINING_RECORD(CurrentEntry, + LOGHANDLE, + LogHandleListEntry); + CurrentEntry = CurrentEntry->Flink; + + if (lpLogHandle == EventLogHandle) + return lpLogHandle; + } + + return NULL; } static NTSTATUS -ElfDeleteEventLogHandle(IELF_HANDLE EventLogHandle) -{ - PLOGHANDLE lpLogHandle = (PLOGHANDLE)EventLogHandle; - - if (!ElfGetLogHandleEntryByHandle(lpLogHandle)) +ElfDeleteEventLogHandle(IELF_HANDLE LogHandle) +{ + PLOGHANDLE lpLogHandle; + + lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); + if (!lpLogHandle) + { return STATUS_INVALID_HANDLE; + } RemoveEntryList(&lpLogHandle->LogHandleListEntry); LogfClose(lpLogHandle->LogFile, FALSE); - HeapFree(GetProcessHeap(),0,lpLogHandle); + HeapFree(GetProcessHeap(), 0, lpLogHandle); return STATUS_SUCCESS; }

9 years, 11 months

[tfaber] 64688: [FDEBUG] - Fix build

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 12 06:21:22 2014 New Revision: 64688 URL: http://svn.reactos.org/svn/reactos?rev=64688&view=rev Log: [FDEBUG] - Fix build Added: trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt (with props) Modified: trunk/reactos/boot/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/fdebug/fdebug.c trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc Modified: trunk/reactos/boot/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/CMakeLists.tx… ============================================================================== --- trunk/reactos/boot/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/CMakeLists.txt [iso-8859-1] Sun Oct 12 06:21:22 2014 @@ -1,4 +1,5 @@ add_subdirectory(bootsect) +add_subdirectory(fdebug) add_subdirectory(freeldr) add_subdirectory(install) Added: trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/CMakeL… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt (added) +++ trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt [iso-8859-1] Sun Oct 12 06:21:22 2014 @@ -0,0 +1,4 @@ + +add_executable(fdebug fdebug.c rs232.c fdebug.rc) +set_module_type(fdebug win32gui UNICODE) +add_importlibs(fdebug comdlg32 user32 gdi32 msvcrt kernel32) Propchange: trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.c [iso-8859-1] Sun Oct 12 06:21:22 2014 @@ -99,7 +99,7 @@ wcex.cbSize = sizeof(WNDCLASSEX); wcex.style = CS_HREDRAW | CS_VREDRAW; - wcex.lpfnWndProc = (WNDPROC)WndProc; + wcex.lpfnWndProc = WndProc; wcex.cbClsExtra = 0; wcex.cbWndExtra = 0; wcex.hInstance = hInstance; @@ -283,6 +283,7 @@ break; case WM_PAINT: hdc = BeginPaint(hWnd, &ps); + (void)hdc; // FIXME EndPaint(hWnd, &ps); break; case WM_SIZE: Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] Sun Oct 12 06:21:22 2014 @@ -1,4 +1,5 @@ #include <windef.h> +#include <winuser.h> #include "resource.h" @@ -6,26 +7,64 @@ IDI_FDEBUG ICON "fdebug.ico" -#include "lang/bg-BG.rc" -#include "lang/cs-CZ.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/no-NO.rc" -#include "lang/sk-SK.rc" +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_CS_CZ + #include "lang/cs-CZ.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EL_GR + #include "lang/el-GR.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_HU_HU + #include "lang/hu-HU.rc" +#endif +#ifdef LANGUAGE_ID_ID + #include "lang/id-ID.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif +#ifdef LANGUAGE_NB_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif /* UTF-8 */ #pragma code_page(65001) -#include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" -#include "lang/ru-RU.rc" -#include "lang/sq-AL.rc" -#include "lang/tr-TR.rc" -#include "lang/uk-UA.rc" +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_SQ_AL + #include "lang/sq-AL.rc" +#endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Modified: trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc [iso-8859-1] Sun Oct 12 06:21:22 2014 @@ -66,7 +66,7 @@ LTEXT "Numele fiÈierului:", IDC_STATIC, 7, 17, 62, 8 EDITTEXT IDC_CAPTUREFILENAME, 7, 26, 181, 14, ES_AUTOHSCROLL PUSHBUTTON "&CautÄ", IDC_BROWSE, 194, 26, 50, 14 - DEFPUSHBUTTON "Con&firmÄ", 139, 74, 50, 14 + DEFPUSHBUTTON "Con&firmÄ", IDOK, 139, 74, 50, 14 PUSHBUTTON "A&nuleazÄ", IDCANCEL, 194, 74, 50, 14 END

9 years, 11 months

[hbelusca] 64687: [FAST486] - fastcall'ize some functions, - code formatting.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 12 00:10:44 2014 New Revision: 64687 URL: http://svn.reactos.org/svn/reactos?rev=64687&view=rev Log: [FAST486] - fastcall'ize some functions, - code formatting. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.h trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/extraops.c trunk/reactos/lib/fast486/extraops.h trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/fpu.c trunk/reactos/lib/fast486/opcodes.c trunk/reactos/lib/fast486/opcodes.h trunk/reactos/lib/fast486/opgroups.c trunk/reactos/lib/fast486/opgroups.h Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -160,9 +160,8 @@ return Fast486WriteLinearMemory(State, LinearAddress, Buffer, Size); } -static -inline -BOOLEAN +static inline BOOLEAN +FASTCALL Fast486GetIntVector(PFAST486_STATE State, UCHAR Number, PFAST486_IDT_ENTRY IdtEntry) @@ -208,14 +207,15 @@ return TRUE; } -static -inline -BOOLEAN +static inline BOOLEAN +FASTCALL Fast486InterruptInternal(PFAST486_STATE State, - USHORT SegmentSelector, - ULONG Offset, - ULONG GateType) -{ + PFAST486_IDT_ENTRY IdtEntry) +{ + USHORT SegmentSelector = IdtEntry->Selector; + ULONG Offset = MAKELONG(IdtEntry->Offset, IdtEntry->OffsetHigh); + ULONG GateType = IdtEntry->Type; + BOOLEAN GateSize = (GateType == FAST486_IDT_INT_GATE_32) || (GateType == FAST486_IDT_TRAP_GATE_32); BOOLEAN Success = FALSE; @@ -355,6 +355,7 @@ } BOOLEAN +FASTCALL Fast486PerformInterrupt(PFAST486_STATE State, UCHAR Number) { @@ -368,10 +369,7 @@ } /* Perform the interrupt */ - if (!Fast486InterruptInternal(State, - IdtEntry.Selector, - MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), - IdtEntry.Type)) + if (!Fast486InterruptInternal(State, &IdtEntry)) { /* Exception occurred */ return FALSE; Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.h [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -154,6 +154,7 @@ ); BOOLEAN +FASTCALL Fast486PerformInterrupt ( PFAST486_STATE State, Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -53,6 +53,7 @@ FORCEINLINE INT +FASTCALL Fast486GetCurrentPrivLevel(PFAST486_STATE State) { /* Return the CPL, or 3 if we're in virtual 8086 mode */ @@ -61,6 +62,7 @@ FORCEINLINE ULONG +FASTCALL Fast486GetPageTableEntry(PFAST486_STATE State, ULONG VirtualAddress, BOOLEAN MarkAsDirty) @@ -145,6 +147,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486ReadLinearMemory(PFAST486_STATE State, ULONG LinearAddress, PVOID Buffer, @@ -211,6 +214,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486WriteLinearMemory(PFAST486_STATE State, ULONG LinearAddress, PVOID Buffer, @@ -279,6 +283,7 @@ FORCEINLINE VOID +FASTCALL Fast486Exception(PFAST486_STATE State, FAST486_EXCEPTIONS ExceptionCode) { @@ -288,6 +293,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486StackPush(PFAST486_STATE State, ULONG Value) { @@ -344,6 +350,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486StackPop(PFAST486_STATE State, PULONG Value) { @@ -418,6 +425,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486LoadSegment(PFAST486_STATE State, FAST486_SEG_REGS Segment, USHORT Selector) @@ -628,6 +636,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486FetchByte(PFAST486_STATE State, PUCHAR Data) { @@ -658,6 +667,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486FetchWord(PFAST486_STATE State, PUSHORT Data) { @@ -689,6 +699,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486FetchDword(PFAST486_STATE State, PULONG Data) { @@ -720,6 +731,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486CalculateParity(UCHAR Number) { // See http://graphics.stanford.edu/~seander/bithacks.html#ParityLookupTable too... @@ -728,6 +740,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486ParseModRegRm(PFAST486_STATE State, BOOLEAN AddressSize, PFAST486_MOD_REG_RM ModRegRm) @@ -995,6 +1008,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486ReadModrmByteOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, PUCHAR RegValue, @@ -1061,6 +1075,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486ReadModrmWordOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, PUSHORT RegValue, @@ -1109,6 +1124,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486ReadModrmDwordOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, PULONG RegValue, @@ -1157,6 +1173,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486WriteModrmByteOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, BOOLEAN WriteRegister, @@ -1221,6 +1238,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486WriteModrmWordOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, BOOLEAN WriteRegister, @@ -1267,6 +1285,7 @@ FORCEINLINE BOOLEAN +FASTCALL Fast486WriteModrmDwordOperands(PFAST486_STATE State, PFAST486_MOD_REG_RM ModRegRm, BOOLEAN WriteRegister, @@ -1315,7 +1334,9 @@ FORCEINLINE VOID -Fast486FpuNormalize(PFAST486_STATE State, PFAST486_FPU_DATA_REG Data) +FASTCALL +Fast486FpuNormalize(PFAST486_STATE State, + PFAST486_FPU_DATA_REG Data) { UINT LeadingZeros; @@ -1346,6 +1367,7 @@ FORCEINLINE USHORT +FASTCALL Fast486GetValueTag(PFAST486_FPU_DATA_REG Data) { if (FPU_IS_ZERO(Data)) return FPU_TAG_ZERO; @@ -1355,6 +1377,7 @@ FORCEINLINE VOID +FASTCALL Fast486FpuPush(PFAST486_STATE State, PFAST486_FPU_DATA_REG Data) { @@ -1370,6 +1393,7 @@ FORCEINLINE VOID +FASTCALL Fast486FpuPop(PFAST486_STATE State) { if (FPU_GET_TAG(0) != FPU_TAG_EMPTY) Modified: trunk/reactos/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -2385,3 +2385,4 @@ } } +/* EOF */ Modified: trunk/reactos/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/extraops.h?rev… ============================================================================== --- trunk/reactos/lib/fast486/extraops.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/extraops.h [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -64,4 +64,3 @@ #endif // _EXTRAOPS_H_ /* EOF */ - Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -43,9 +43,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static -inline -VOID +static inline VOID NTAPI Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command) { Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6468… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -32,9 +32,10 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static ULONGLONG UnsignedMult128(ULONGLONG Multiplicand, - ULONGLONG Multiplier, - ULONGLONG *HighProduct) +static ULONGLONG +UnsignedMult128(ULONGLONG Multiplicand, + ULONGLONG Multiplier, + ULONGLONG *HighProduct) { ULONG MultiplicandLow, MultiplicandHigh, MultiplierLow, MultiplierHigh; ULONG IntermediateLow, IntermediateHigh; @@ -63,9 +64,10 @@ return LowProduct; } -static VOID Fast486FpuGetSingleReal(PFAST486_STATE State, - ULONG Value, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuGetSingleReal(PFAST486_STATE State, + ULONG Value, + PFAST486_FPU_DATA_REG Result) { /* Extract the sign, exponent and mantissa */ Result->Sign = (UCHAR)(Value >> 31); @@ -83,9 +85,10 @@ } } -static VOID Fast486FpuGetDoubleReal(PFAST486_STATE State, - ULONGLONG Value, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuGetDoubleReal(PFAST486_STATE State, + ULONGLONG Value, + PFAST486_FPU_DATA_REG Result) { /* Extract the sign, exponent and mantissa */ Result->Sign = (UCHAR)(Value >> 63); @@ -103,10 +106,11 @@ } } -static VOID Fast486FpuAdd(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuAdd(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG FirstAdjusted = *FirstOperand; FAST486_FPU_DATA_REG SecondAdjusted = *SecondOperand; @@ -182,10 +186,11 @@ *Result = TempResult; } -static VOID Fast486FpuSubtract(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuSubtract(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG NegativeSecondOperand = *SecondOperand; @@ -196,9 +201,10 @@ Fast486FpuAdd(State, Result, FirstOperand, &NegativeSecondOperand); } -static VOID Fast486FpuCompare(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand) +static VOID +Fast486FpuCompare(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand) { if (FPU_IS_NAN(FirstOperand) || FPU_IS_NAN(SecondOperand)) { @@ -248,10 +254,11 @@ } } -static VOID Fast486FpuMultiply(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuMultiply(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG TempResult; @@ -273,10 +280,11 @@ *Result = TempResult; } -static VOID Fast486FpuDivide(PFAST486_STATE State, - PFAST486_FPU_DATA_REG FirstOperand, - PFAST486_FPU_DATA_REG SecondOperand, - PFAST486_FPU_DATA_REG Result) +static VOID +Fast486FpuDivide(PFAST486_STATE State, + PFAST486_FPU_DATA_REG FirstOperand, + PFAST486_FPU_DATA_REG SecondOperand, + PFAST486_FPU_DATA_REG Result) { FAST486_FPU_DATA_REG TempResult; Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -6314,3 +6314,5 @@ /* Return success */ return TRUE; } + +/* EOF */ Modified: trunk/reactos/lib/fast486/opcodes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.h?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -157,3 +157,5 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeOuts); #endif // _OPCODES_H_ + +/* EOF */ Modified: trunk/reactos/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.c?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.c [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -32,8 +32,8 @@ /* PRIVATE FUNCTIONS **********************************************************/ +static inline -static ULONG Fast486ArithmeticOperation(PFAST486_STATE State, INT Operation, Modified: trunk/reactos/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opgroups.h?rev… ============================================================================== --- trunk/reactos/lib/fast486/opgroups.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opgroups.h [iso-8859-1] Sun Oct 12 00:10:44 2014 @@ -50,4 +50,3 @@ #endif // _OPGROUPS_H_ /* EOF */ -

9 years, 11 months

[hbelusca] 64686: [FAST486] - In order to always check for opcode handler being NULL, replace the only NULL handler by a non-NULL one that handles the invalid opcodes. - To quickly retrieve opcode ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 11 23:12:30 2014 New Revision: 64686 URL: http://svn.reactos.org/svn/reactos?rev=64686&view=rev Log: [FAST486] - In order to always check for opcode handler being NULL, replace the only NULL handler by a non-NULL one that handles the invalid opcodes. - To quickly retrieve opcode numbers, add their numbers in regard to their handlers. Modified: trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/opcodes.c trunk/reactos/lib/fast486/opcodes.h Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sat Oct 11 23:12:30 2014 @@ -50,6 +50,7 @@ Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command) { UCHAR Opcode; + FAST486_OPCODE_HANDLER_PROC CurrentHandler; INT ProcedureCallCount = 0; /* Main execution loop */ @@ -68,22 +69,12 @@ // TODO: Check for CALL/RET to update ProcedureCallCount. - if (Fast486OpcodeHandlers[Opcode] != NULL) - { - /* Call the opcode handler */ - Fast486OpcodeHandlers[Opcode](State, Opcode); - } - else - { - /* This is not a valid opcode */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - } - - if (Fast486OpcodeHandlers[Opcode] == Fast486OpcodePrefix) - { - /* This is a prefix, go to the next instruction immediately */ - continue; - } + /* Call the opcode handler */ + CurrentHandler = Fast486OpcodeHandlers[Opcode]; + CurrentHandler(State, Opcode); + + /* If this is a prefix, go to the next instruction immediately */ + if (CurrentHandler == Fast486OpcodePrefix) continue; /* A non-prefix opcode has been executed, reset the prefix flags */ State->PrefixFlags = 0; @@ -100,9 +91,8 @@ /* Clear the interrupt status */ State->IntStatus = FAST486_INT_NONE; } - else if (State->Flags.If - && (State->IntAckCallback != NULL) - && (State->IntStatus == FAST486_INT_SIGNAL)) + else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL) + && (State->IntAckCallback != NULL)) { /* Acknowledge the interrupt to get the number */ State->PendingIntNum = State->IntAckCallback(State); @@ -116,10 +106,10 @@ State->IntStatus = FAST486_INT_EXECUTE; } } - while ((Command == FAST486_CONTINUE) - || (Command == FAST486_STEP_OVER && ProcedureCallCount > 0) - || (Command == FAST486_STEP_OUT && ProcedureCallCount >= 0) - || (Fast486OpcodeHandlers[Opcode] == Fast486OpcodePrefix)); + while ((CurrentHandler == Fast486OpcodePrefix) || + (Command == FAST486_CONTINUE) || + (Command == FAST486_STEP_OVER && ProcedureCallCount > 0) || + (Command == FAST486_STEP_OUT && ProcedureCallCount >= 0)); } /* DEFAULT CALLBACKS **********************************************************/ Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sat Oct 11 23:12:30 2014 @@ -38,70 +38,71 @@ FAST486_OPCODE_HANDLER_PROC Fast486OpcodeHandlers[FAST486_NUM_OPCODE_HANDLERS] = { - Fast486OpcodeAddByteModrm, + Fast486OpcodeAddByteModrm, /* 0x00 - 0x03 */ Fast486OpcodeAddModrm, Fast486OpcodeAddByteModrm, Fast486OpcodeAddModrm, - Fast486OpcodeAddAl, - Fast486OpcodeAddEax, - Fast486OpcodePushEs, - Fast486OpcodePopEs, - Fast486OpcodeOrByteModrm, + Fast486OpcodeAddAl, /* 0x04 */ + Fast486OpcodeAddEax, /* 0x05 */ + Fast486OpcodePushEs, /* 0x06 */ + Fast486OpcodePopEs, /* 0x07 */ + Fast486OpcodeOrByteModrm, /* 0x08 - 0x0B */ Fast486OpcodeOrModrm, Fast486OpcodeOrByteModrm, Fast486OpcodeOrModrm, - Fast486OpcodeOrAl, - Fast486OpcodeOrEax, - Fast486OpcodePushCs, - Fast486OpcodeExtended, - Fast486OpcodeAdcByteModrm, + Fast486OpcodeOrAl, /* 0x0C */ + Fast486OpcodeOrEax, /* 0x0D */ + Fast486OpcodePushCs, /* 0x0E */ + Fast486OpcodeExtended, /* 0x0F */ + Fast486OpcodeAdcByteModrm, /* 0x10 - 0x13 */ Fast486OpcodeAdcModrm, Fast486OpcodeAdcByteModrm, Fast486OpcodeAdcModrm, - Fast486OpcodeAdcAl, - Fast486OpcodeAdcEax, - Fast486OpcodePushSs, - Fast486OpcodePopSs, - Fast486OpcodeSbbByteModrm, + Fast486OpcodeAdcAl, /* 0x14 */ + Fast486OpcodeAdcEax, /* 0x15 */ + Fast486OpcodePushSs, /* 0x16 */ + Fast486OpcodePopSs, /* 0x17 */ + Fast486OpcodeSbbByteModrm, /* 0x18 - 0x1B */ Fast486OpcodeSbbModrm, Fast486OpcodeSbbByteModrm, Fast486OpcodeSbbModrm, - Fast486OpcodeSbbAl, - Fast486OpcodeSbbEax, - Fast486OpcodePushDs, - Fast486OpcodePopDs, - Fast486OpcodeAndByteModrm, + Fast486OpcodeSbbAl, /* 0x1C */ + Fast486OpcodeSbbEax, /* 0x1D */ + Fast486OpcodePushDs, /* 0x1E */ + Fast486OpcodePopDs, /* 0x1F */ + Fast486OpcodeAndByteModrm, /* 0x20 - 0x23 */ Fast486OpcodeAndModrm, Fast486OpcodeAndByteModrm, Fast486OpcodeAndModrm, - Fast486OpcodeAndAl, - Fast486OpcodeAndEax, - Fast486OpcodePrefix, - Fast486OpcodeDaa, - Fast486OpcodeCmpSubByteModrm, + Fast486OpcodeAndAl, /* 0x24 */ + Fast486OpcodeAndEax, /* 0x25 */ + Fast486OpcodePrefix, /* 0x26 */ + Fast486OpcodeDaa, /* 0x27 */ + Fast486OpcodeCmpSubByteModrm, /* 0x28 - 0x2B */ Fast486OpcodeCmpSubModrm, Fast486OpcodeCmpSubByteModrm, Fast486OpcodeCmpSubModrm, - Fast486OpcodeCmpSubAl, - Fast486OpcodeCmpSubEax, - Fast486OpcodePrefix, - Fast486OpcodeDas, - Fast486OpcodeXorByteModrm, + Fast486OpcodeCmpSubAl, /* 0x2C */ + Fast486OpcodeCmpSubEax, /* 0x2D */ + Fast486OpcodePrefix, /* 0x2E */ + Fast486OpcodeDas, /* 0x2F */ + Fast486OpcodeXorByteModrm, /* 0x30 - 0x33 */ Fast486OpcodeXorModrm, Fast486OpcodeXorByteModrm, Fast486OpcodeXorModrm, - Fast486OpcodeXorAl, - Fast486OpcodeXorEax, - Fast486OpcodePrefix, - Fast486OpcodeAaa, - Fast486OpcodeCmpSubByteModrm, + Fast486OpcodeXorAl, /* 0x34 */ + Fast486OpcodeXorEax, /* 0x35 */ + Fast486OpcodePrefix, /* 0x36 */ + Fast486OpcodeAaa, /* 0x37 */ + Fast486OpcodeCmpSubByteModrm, /* 0x38 - 0x3B */ Fast486OpcodeCmpSubModrm, Fast486OpcodeCmpSubByteModrm, Fast486OpcodeCmpSubModrm, - Fast486OpcodeCmpSubAl, - Fast486OpcodeCmpSubEax, - Fast486OpcodePrefix, - Fast486OpcodeAas, + Fast486OpcodeCmpSubAl, /* 0x3C */ + Fast486OpcodeCmpSubEax, /* 0x3D */ + Fast486OpcodePrefix, /* 0x3E */ + Fast486OpcodeAas, /* 0x3F */ + Fast486OpcodeIncrement, /* 0x40 - 0x47 */ Fast486OpcodeIncrement, Fast486OpcodeIncrement, Fast486OpcodeIncrement, @@ -109,7 +110,7 @@ Fast486OpcodeIncrement, Fast486OpcodeIncrement, Fast486OpcodeIncrement, - Fast486OpcodeIncrement, + Fast486OpcodeDecrement, /* 0x48 - 0x4F */ Fast486OpcodeDecrement, Fast486OpcodeDecrement, Fast486OpcodeDecrement, @@ -117,7 +118,7 @@ Fast486OpcodeDecrement, Fast486OpcodeDecrement, Fast486OpcodeDecrement, - Fast486OpcodeDecrement, + Fast486OpcodePushReg, /* 0x50 - 0x57 */ Fast486OpcodePushReg, Fast486OpcodePushReg, Fast486OpcodePushReg, @@ -125,7 +126,7 @@ Fast486OpcodePushReg, Fast486OpcodePushReg, Fast486OpcodePushReg, - Fast486OpcodePushReg, + Fast486OpcodePopReg, /* 0x58 - 0x5F */ Fast486OpcodePopReg, Fast486OpcodePopReg, Fast486OpcodePopReg, @@ -133,23 +134,23 @@ Fast486OpcodePopReg, Fast486OpcodePopReg, Fast486OpcodePopReg, - Fast486OpcodePopReg, - Fast486OpcodePushAll, - Fast486OpcodePopAll, - Fast486OpcodeBound, - Fast486OpcodeArpl, + Fast486OpcodePushAll, /* 0x60 */ + Fast486OpcodePopAll, /* 0x61 */ + Fast486OpcodeBound, /* 0x62 */ + Fast486OpcodeArpl, /* 0x63 */ + Fast486OpcodePrefix, /* 0x64 - 0x67 */ Fast486OpcodePrefix, Fast486OpcodePrefix, Fast486OpcodePrefix, - Fast486OpcodePrefix, - Fast486OpcodePushImm, - Fast486OpcodeImulModrmImm, - Fast486OpcodePushByteImm, - Fast486OpcodeImulModrmImm, - Fast486OpcodeIns, - Fast486OpcodeIns, - Fast486OpcodeOuts, - Fast486OpcodeOuts, + Fast486OpcodePushImm, /* 0x68 */ + Fast486OpcodeImulModrmImm, /* 0x69 */ + Fast486OpcodePushByteImm, /* 0x6A */ + Fast486OpcodeImulModrmImm, /* 0x6B */ + Fast486OpcodeIns, /* 0x6C */ + Fast486OpcodeIns, /* 0x6D */ + Fast486OpcodeOuts, /* 0x6E */ + Fast486OpcodeOuts, /* 0x6F */ + Fast486OpcodeShortConditionalJmp, /* 0x70 - 0x7F */ Fast486OpcodeShortConditionalJmp, Fast486OpcodeShortConditionalJmp, Fast486OpcodeShortConditionalJmp, @@ -165,55 +166,55 @@ Fast486OpcodeShortConditionalJmp, Fast486OpcodeShortConditionalJmp, Fast486OpcodeShortConditionalJmp, - Fast486OpcodeShortConditionalJmp, - Fast486OpcodeGroup8082, - Fast486OpcodeGroup81, - Fast486OpcodeGroup8082, - Fast486OpcodeGroup83, - Fast486OpcodeTestByteModrm, - Fast486OpcodeTestModrm, - Fast486OpcodeXchgByteModrm, - Fast486OpcodeXchgModrm, - Fast486OpcodeMovByteModrm, - Fast486OpcodeMovModrm, - Fast486OpcodeMovByteModrm, - Fast486OpcodeMovModrm, - Fast486OpcodeMovStoreSeg, - Fast486OpcodeLea, - Fast486OpcodeMovLoadSeg, - Fast486OpcodeGroup8F, - Fast486OpcodeNop, + Fast486OpcodeGroup8082, /* 0x80 */ + Fast486OpcodeGroup81, /* 0x81 */ + Fast486OpcodeGroup8082, /* 0x82 */ + Fast486OpcodeGroup83, /* 0x83 */ + Fast486OpcodeTestByteModrm, /* 0x84 */ + Fast486OpcodeTestModrm, /* 0x85 */ + Fast486OpcodeXchgByteModrm, /* 0x86 */ + Fast486OpcodeXchgModrm, /* 0x87 */ + Fast486OpcodeMovByteModrm, /* 0x88 */ + Fast486OpcodeMovModrm, /* 0x89 */ + Fast486OpcodeMovByteModrm, /* 0x8A */ + Fast486OpcodeMovModrm, /* 0x8B */ + Fast486OpcodeMovStoreSeg, /* 0x8C */ + Fast486OpcodeLea, /* 0x8D */ + Fast486OpcodeMovLoadSeg, /* 0x8E */ + Fast486OpcodeGroup8F, /* 0x8F */ + Fast486OpcodeNop, /* 0x90 */ + Fast486OpcodeExchangeEax, /* 0x91 - 0x97 */ Fast486OpcodeExchangeEax, Fast486OpcodeExchangeEax, Fast486OpcodeExchangeEax, Fast486OpcodeExchangeEax, Fast486OpcodeExchangeEax, Fast486OpcodeExchangeEax, - Fast486OpcodeExchangeEax, - Fast486OpcodeCwde, - Fast486OpcodeCdq, - Fast486OpcodeCallAbs, - Fast486OpcodeWait, - Fast486OpcodePushFlags, - Fast486OpcodePopFlags, - Fast486OpcodeSahf, - Fast486OpcodeLahf, - Fast486OpcodeMovAlOffset, - Fast486OpcodeMovEaxOffset, - Fast486OpcodeMovOffsetAl, - Fast486OpcodeMovOffsetEax, - Fast486OpcodeMovs, - Fast486OpcodeMovs, - Fast486OpcodeCmps, - Fast486OpcodeCmps, - Fast486OpcodeTestAl, - Fast486OpcodeTestEax, - Fast486OpcodeStos, - Fast486OpcodeStos, - Fast486OpcodeLods, - Fast486OpcodeLods, - Fast486OpcodeScas, - Fast486OpcodeScas, + Fast486OpcodeCwde, /* 0x98 */ + Fast486OpcodeCdq, /* 0x99 */ + Fast486OpcodeCallAbs, /* 0x9A */ + Fast486OpcodeWait, /* 0x9B */ + Fast486OpcodePushFlags, /* 0x9C */ + Fast486OpcodePopFlags, /* 0x9D */ + Fast486OpcodeSahf, /* 0x9E */ + Fast486OpcodeLahf, /* 0x9F */ + Fast486OpcodeMovAlOffset, /* 0xA0 */ + Fast486OpcodeMovEaxOffset, /* 0xA1 */ + Fast486OpcodeMovOffsetAl, /* 0xA2 */ + Fast486OpcodeMovOffsetEax, /* 0xA3 */ + Fast486OpcodeMovs, /* 0xA4 */ + Fast486OpcodeMovs, /* 0xA5 */ + Fast486OpcodeCmps, /* 0xA6 */ + Fast486OpcodeCmps, /* 0xA7 */ + Fast486OpcodeTestAl, /* 0xA8 */ + Fast486OpcodeTestEax, /* 0xA9 */ + Fast486OpcodeStos, /* 0xAA */ + Fast486OpcodeStos, /* 0xAB */ + Fast486OpcodeLods, /* 0xAC */ + Fast486OpcodeLods, /* 0xAD */ + Fast486OpcodeScas, /* 0xAE */ + Fast486OpcodeScas, /* 0xAF */ + Fast486OpcodeMovByteRegImm, /* 0xB0 - 0xB7 */ Fast486OpcodeMovByteRegImm, Fast486OpcodeMovByteRegImm, Fast486OpcodeMovByteRegImm, @@ -221,7 +222,7 @@ Fast486OpcodeMovByteRegImm, Fast486OpcodeMovByteRegImm, Fast486OpcodeMovByteRegImm, - Fast486OpcodeMovByteRegImm, + Fast486OpcodeMovRegImm, /* 0xB8 - 0xBF */ Fast486OpcodeMovRegImm, Fast486OpcodeMovRegImm, Fast486OpcodeMovRegImm, @@ -229,32 +230,31 @@ Fast486OpcodeMovRegImm, Fast486OpcodeMovRegImm, Fast486OpcodeMovRegImm, - Fast486OpcodeMovRegImm, - Fast486OpcodeGroupC0, - Fast486OpcodeGroupC1, - Fast486OpcodeRet, - Fast486OpcodeRet, - Fast486OpcodeLdsLes, - Fast486OpcodeLdsLes, - Fast486OpcodeGroupC6, - Fast486OpcodeGroupC7, - Fast486OpcodeEnter, - Fast486OpcodeLeave, - Fast486OpcodeRetFar, - Fast486OpcodeRetFar, - Fast486OpcodeInt, - Fast486OpcodeInt, - Fast486OpcodeInt, - Fast486OpcodeIret, - Fast486OpcodeGroupD0, + Fast486OpcodeGroupC0, /* 0xC0 */ + Fast486OpcodeGroupC1, /* 0xC1 */ + Fast486OpcodeRet, /* 0xC2 */ + Fast486OpcodeRet, /* 0xC3 */ + Fast486OpcodeLdsLes, /* 0xC4 */ + Fast486OpcodeLdsLes, /* 0xC5 */ + Fast486OpcodeGroupC6, /* 0xC6 */ + Fast486OpcodeGroupC7, /* 0xC7 */ + Fast486OpcodeEnter, /* 0xC8 */ + Fast486OpcodeLeave, /* 0xC9 */ + Fast486OpcodeRetFar, /* 0xCA */ + Fast486OpcodeRetFar, /* 0xCB */ + Fast486OpcodeInt, /* 0xCC */ + Fast486OpcodeInt, /* 0xCD */ + Fast486OpcodeInt, /* 0xCE */ + Fast486OpcodeIret, /* 0xCF */ + Fast486OpcodeGroupD0, /* 0xD0 - 0xD3 */ Fast486OpcodeGroupD1, Fast486OpcodeGroupD2, Fast486OpcodeGroupD3, - Fast486OpcodeAam, - Fast486OpcodeAad, - Fast486OpcodeSalc, - Fast486OpcodeXlat, - Fast486FpuOpcodeD8DC, + Fast486OpcodeAam, /* 0xD4 */ + Fast486OpcodeAad, /* 0xD5 */ + Fast486OpcodeSalc, /* 0xD6 */ + Fast486OpcodeXlat, /* 0xD7 */ + Fast486FpuOpcodeD8DC, /* 0xD8 - 0xDF */ Fast486FpuOpcodeD9, Fast486FpuOpcodeDA, Fast486FpuOpcodeDB, @@ -262,41 +262,48 @@ Fast486FpuOpcodeDD, Fast486FpuOpcodeDE, Fast486FpuOpcodeDF, + Fast486OpcodeLoop, /* 0xE0 - 0xE2 */ Fast486OpcodeLoop, Fast486OpcodeLoop, - Fast486OpcodeLoop, - Fast486OpcodeJecxz, - Fast486OpcodeInByte, - Fast486OpcodeIn, - Fast486OpcodeOutByte, - Fast486OpcodeOut, - Fast486OpcodeCall, - Fast486OpcodeJmp, - Fast486OpcodeJmpAbs, - Fast486OpcodeShortJump, - Fast486OpcodeInByte, - Fast486OpcodeIn, - Fast486OpcodeOutByte, - Fast486OpcodeOut, - Fast486OpcodePrefix, - NULL, // Invalid - Fast486OpcodePrefix, - Fast486OpcodePrefix, - Fast486OpcodeHalt, - Fast486OpcodeComplCarry, - Fast486OpcodeGroupF6, - Fast486OpcodeGroupF7, - Fast486OpcodeClearCarry, - Fast486OpcodeSetCarry, - Fast486OpcodeClearInt, - Fast486OpcodeSetInt, - Fast486OpcodeClearDir, - Fast486OpcodeSetDir, - Fast486OpcodeGroupFE, - Fast486OpcodeGroupFF, + Fast486OpcodeJecxz, /* 0xE3 */ + Fast486OpcodeInByte, /* 0xE4 */ + Fast486OpcodeIn, /* 0xE5 */ + Fast486OpcodeOutByte, /* 0xE6 */ + Fast486OpcodeOut, /* 0xE7 */ + Fast486OpcodeCall, /* 0xE8 */ + Fast486OpcodeJmp, /* 0xE9 */ + Fast486OpcodeJmpAbs, /* 0xEA */ + Fast486OpcodeShortJump, /* 0xEB */ + Fast486OpcodeInByte, /* 0xEC */ + Fast486OpcodeIn, /* 0xED */ + Fast486OpcodeOutByte, /* 0xEE */ + Fast486OpcodeOut, /* 0xEF */ + Fast486OpcodePrefix, /* 0xF0 */ + Fast486OpcodeInvalid, /* 0xF1 */ // Invalid opcode + Fast486OpcodePrefix, /* 0xF2 */ + Fast486OpcodePrefix, /* 0xF3 */ + Fast486OpcodeHalt, /* 0xF4 */ + Fast486OpcodeComplCarry, /* 0xF5 */ + Fast486OpcodeGroupF6, /* 0xF6 */ + Fast486OpcodeGroupF7, /* 0xF7 */ + Fast486OpcodeClearCarry, /* 0xF8 */ + Fast486OpcodeSetCarry, /* 0xF9 */ + Fast486OpcodeClearInt, /* 0xFA */ + Fast486OpcodeSetInt, /* 0xFB */ + Fast486OpcodeClearDir, /* 0xFC */ + Fast486OpcodeSetDir, /* 0xFD */ + Fast486OpcodeGroupFE, /* 0xFE */ + Fast486OpcodeGroupFF, /* 0xFF */ }; /* PUBLIC FUNCTIONS ***********************************************************/ + +FAST486_OPCODE_HANDLER(Fast486OpcodeInvalid) +{ + /* This is not a valid opcode */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; +} FAST486_OPCODE_HANDLER(Fast486OpcodePrefix) { Modified: trunk/reactos/lib/fast486/opcodes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.h?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.h [iso-8859-1] Sat Oct 11 23:12:30 2014 @@ -36,6 +36,8 @@ extern FAST486_OPCODE_HANDLER_PROC Fast486OpcodeHandlers[FAST486_NUM_OPCODE_HANDLERS]; + +FAST486_OPCODE_HANDLER(Fast486OpcodeInvalid); FAST486_OPCODE_HANDLER(Fast486OpcodePrefix); FAST486_OPCODE_HANDLER(Fast486OpcodeIncrement);

9 years, 11 months

[tfaber] 64685: [NTOS:KE] - Make fastfail exception noncontinuable CORE-8419

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 11 23:07:04 2014 New Revision: 64685 URL: http://svn.reactos.org/svn/reactos?rev=64685&view=rev Log: [NTOS:KE] - Make fastfail exception noncontinuable CORE-8419 Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/exp.c trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Sat Oct 11 23:07:04 2014 @@ -504,6 +504,7 @@ NTAPI KiDispatchExceptionFromTrapFrame( IN NTSTATUS Code, + IN ULONG Flags, IN ULONG_PTR Address, IN ULONG ParameterCount, IN ULONG_PTR Parameter1, @@ -623,7 +624,7 @@ IN PKTRAP_FRAME TrapFrame) { /* Helper for exceptions with no arguments */ - KiDispatchExceptionFromTrapFrame(Code, Address, 0, 0, 0, 0, TrapFrame); + KiDispatchExceptionFromTrapFrame(Code, 0, Address, 0, 0, 0, 0, TrapFrame); } // @@ -638,7 +639,7 @@ IN PKTRAP_FRAME TrapFrame) { /* Helper for exceptions with no arguments */ - KiDispatchExceptionFromTrapFrame(Code, Address, 1, P1, 0, 0, TrapFrame); + KiDispatchExceptionFromTrapFrame(Code, 0, Address, 1, P1, 0, 0, TrapFrame); } // @@ -654,7 +655,7 @@ IN PKTRAP_FRAME TrapFrame) { /* Helper for exceptions with no arguments */ - KiDispatchExceptionFromTrapFrame(Code, Address, 2, P1, P2, 0, TrapFrame); + KiDispatchExceptionFromTrapFrame(Code, 0, Address, 2, P1, P2, 0, TrapFrame); } // Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Sat Oct 11 23:07:04 2014 @@ -1097,6 +1097,7 @@ VOID NTAPI KiDispatchExceptionFromTrapFrame(IN NTSTATUS Code, + IN ULONG Flags, IN ULONG_PTR Address, IN ULONG ParameterCount, IN ULONG_PTR Parameter1, @@ -1108,7 +1109,7 @@ /* Build the exception record */ ExceptionRecord.ExceptionCode = Code; - ExceptionRecord.ExceptionFlags = 0; + ExceptionRecord.ExceptionFlags = Flags; ExceptionRecord.ExceptionRecord = NULL; ExceptionRecord.ExceptionAddress = (PVOID)Address; ExceptionRecord.NumberParameters = ParameterCount; Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Oct 11 23:07:04 2014 @@ -223,6 +223,7 @@ /* Dispatch the exception */ KiDispatchExceptionFromTrapFrame(STATUS_BREAKPOINT, + 0, TrapFrame->Eip - 1, 3, Parameter1, @@ -1311,6 +1312,7 @@ /* Only other choice is an in-page error, with 3 parameters */ KiDispatchExceptionFromTrapFrame(STATUS_IN_PAGE_ERROR, + 0, TrapFrame->Eip, 3, TrapFrame->ErrCode & 2 ? TRUE : FALSE, @@ -1474,10 +1476,14 @@ if (KiUserTrap(TrapFrame)) { /* Dispatch exception to user mode */ - KiDispatchException1Args(STATUS_STACK_BUFFER_OVERRUN, - TrapFrame->Eip, - TrapFrame->Ecx, - TrapFrame); + KiDispatchExceptionFromTrapFrame(STATUS_STACK_BUFFER_OVERRUN, + EXCEPTION_NONCONTINUABLE, + TrapFrame->Eip, + 1, + TrapFrame->Ecx, + 0, + 0, + TrapFrame); } else {

9 years, 11 months

[akhaldi] 64684: [README.WINE] * Mark extrac32 and expand as synced with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 11 19:43:36 2014 New Revision: 64684 URL: http://svn.reactos.org/svn/reactos?rev=64684&view=rev Log: [README.WINE] * Mark extrac32 and expand as synced with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Oct 11 19:43:36 2014 @@ -238,14 +238,14 @@ reactos/base/applications/cmdutils/wmic # Synced to Wine-1.7.27 reactos/base/applications/cmdutils/xcopy # Synced to Wine-1.7.27 reactos/base/applications/games/winmine # Forked at Wine-1_3_5 -reactos/base/applications/extrac32 # Synced to Wine-1.7.1 +reactos/base/applications/extrac32 # Synced to Wine-1.7.27 reactos/base/applications/iexplore # Synced to Wine-1.7.27 reactos/base/applications/notepad # Forked at Wine-20041201 reactos/base/applications/regedit # Out of sync reactos/base/applications/winhlp32 # Synced to Wine-1.7.27 reactos/base/applications/wordpad # Synced to Wine-1.7.27 reactos/base/services/rpcss # Synced to Wine-1.7.27 -reactos/base/system/expand # Synced to Wine-1.7.1 +reactos/base/system/expand # Synced to Wine-1.7.27 reactos/base/system/msiexec # Synced to Wine-1.7.27 reactos/modules/rosapps/winfile # Autosync

9 years, 11 months

[akhaldi] 64683: [WORDPAD] * Fix an inconsistency between resource compilers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 11 19:06:53 2014 New Revision: 64683 URL: http://svn.reactos.org/svn/reactos?rev=64683&view=rev Log: [WORDPAD] * Fix an inconsistency between resource compilers. Modified: trunk/reactos/base/applications/wordpad/lang/Da.rc trunk/reactos/base/applications/wordpad/lang/De.rc trunk/reactos/base/applications/wordpad/lang/En.rc trunk/reactos/base/applications/wordpad/lang/Fr.rc trunk/reactos/base/applications/wordpad/lang/He.rc trunk/reactos/base/applications/wordpad/lang/Hu.rc trunk/reactos/base/applications/wordpad/lang/It.rc trunk/reactos/base/applications/wordpad/lang/Ja.rc trunk/reactos/base/applications/wordpad/lang/Ko.rc trunk/reactos/base/applications/wordpad/lang/Lt.rc trunk/reactos/base/applications/wordpad/lang/Nl.rc trunk/reactos/base/applications/wordpad/lang/Pl.rc trunk/reactos/base/applications/wordpad/lang/Pt.rc trunk/reactos/base/applications/wordpad/lang/Ro.rc trunk/reactos/base/applications/wordpad/lang/Ru.rc trunk/reactos/base/applications/wordpad/lang/Si.rc trunk/reactos/base/applications/wordpad/lang/Sq.rc trunk/reactos/base/applications/wordpad/lang/Sv.rc trunk/reactos/base/applications/wordpad/lang/Tr.rc trunk/reactos/base/applications/wordpad/lang/Uk.rc trunk/reactos/base/applications/wordpad/lang/Zh.rc Modified: trunk/reactos/base/applications/wordpad/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Da.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Da.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -79,9 +79,9 @@ POPUP "F&ormat" BEGIN MENUITEM "&Skrifttype...", ID_FONTSETTINGS - MENUITEM "&Bullets" ID_BULLET - MENUITEM "&Afsnit..." ID_PARAFORMAT - MENUITEM "&Tabulatorer..." ID_TABSTOPS + MENUITEM "&Bullets", ID_BULLET + MENUITEM "&Afsnit...", ID_PARAFORMAT + MENUITEM "&Tabulatorer...", ID_TABSTOPS POPUP "&Baggrund" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 @@ -90,7 +90,7 @@ END POPUP "&HjÃ¦lp" BEGIN - MENUITEM "&Om Wine Wordpad" ID_ABOUT + MENUITEM "&Om Wine Wordpad", ID_ABOUT END END @@ -102,8 +102,8 @@ MENUITEM "K&opier", ID_EDIT_COPY MENUITEM "&IndsÃ¦t", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullets" ID_BULLET - MENUITEM "&Afsnit..." ID_PARAFORMAT + MENUITEM "&Bullets", ID_BULLET + MENUITEM "&Afsnit...", ID_PARAFORMAT END END @@ -114,20 +114,20 @@ MENUITEM "Sort", ID_COLOR_BLACK MENUITEM "MÃ¸rkerÃ¸d", ID_COLOR_MAROON MENUITEM "GrÃ¸n", ID_COLOR_GREEN - MENUITEM "Oliven" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Lilla" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "GrÃ¥" ID_COLOR_GRAY - MENUITEM "SÃ¸lv" ID_COLOR_SILVER - MENUITEM "RÃ¸d" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Gul" ID_COLOR_YELLOW - MENUITEM "BlÃ¥" ID_COLOR_BLUE - MENUITEM "Violet" ID_COLOR_FUCHSIA - MENUITEM "Cyan" ID_COLOR_AQUA - MENUITEM "Hvid" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Oliven", ID_COLOR_OLIVE + MENUITEM "Navy", ID_COLOR_NAVY + MENUITEM "Lilla", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "GrÃ¥", ID_COLOR_GRAY + MENUITEM "SÃ¸lv", ID_COLOR_SILVER + MENUITEM "RÃ¸d", ID_COLOR_RED + MENUITEM "Lime", ID_COLOR_LIME + MENUITEM "Gul", ID_COLOR_YELLOW + MENUITEM "BlÃ¥", ID_COLOR_BLUE + MENUITEM "Violet", ID_COLOR_FUCHSIA + MENUITEM "Cyan", ID_COLOR_AQUA + MENUITEM "Hvid", ID_COLOR_WHITE + MENUITEM "Automatic", ID_COLOR_AUTOMATIC END END @@ -206,7 +206,7 @@ IDD_NEWFILE DIALOG 30, 20, 140, 80 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU CAPTION "Ny" -FONT 10, "MS Sans Serif" +FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ny dokumenttype",-1,3,2,100,15 LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT Modified: trunk/reactos/base/applications/wordpad/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/De.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/De.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -78,9 +78,9 @@ POPUP "Forma&t" BEGIN MENUITEM "Sch&riftart...", ID_FONTSETTINGS - MENUITEM "Auf&zÃ¤hlungszeichen" ID_BULLET - MENUITEM "&Absatz..." ID_PARAFORMAT - MENUITEM "&Tabstopps..." ID_TABSTOPS + MENUITEM "Auf&zÃ¤hlungszeichen", ID_BULLET + MENUITEM "&Absatz...", ID_PARAFORMAT + MENUITEM "&Tabstopps...", ID_TABSTOPS POPUP "&Hintergrund" BEGIN MENUITEM "&System\tStrg+1", ID_BACK_1 @@ -89,7 +89,7 @@ END POPUP "&?" BEGIN - MENUITEM "Ã&ber Wine Wordpad" ID_ABOUT + MENUITEM "Ã&ber Wine Wordpad", ID_ABOUT END END @@ -101,8 +101,8 @@ MENUITEM "&Kopieren", ID_EDIT_COPY MENUITEM "&EinfÃ¼gen", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Auf&zÃ¤hlungszeichen" ID_BULLET - MENUITEM "&Absatz..." ID_PARAFORMAT + MENUITEM "Auf&zÃ¤hlungszeichen", ID_BULLET + MENUITEM "&Absatz...", ID_PARAFORMAT END END @@ -113,20 +113,20 @@ MENUITEM "Schwarz", ID_COLOR_BLACK MENUITEM "Kastanienbraun", ID_COLOR_MAROON MENUITEM "GrÃ¼n", ID_COLOR_GREEN - MENUITEM "OlivgrÃ¼n" ID_COLOR_OLIVE - MENUITEM "Dunkelblau" ID_COLOR_NAVY - MENUITEM "Lila" ID_COLOR_PURPLE - MENUITEM "BlaugrÃ¼n" ID_COLOR_TEAL - MENUITEM "Grau" ID_COLOR_GRAY - MENUITEM "Silber" ID_COLOR_SILVER - MENUITEM "Rot" ID_COLOR_RED - MENUITEM "HellgrÃ¼n" ID_COLOR_LIME - MENUITEM "Gelb" ID_COLOR_YELLOW - MENUITEM "Blau" ID_COLOR_BLUE - MENUITEM "Pink" ID_COLOR_FUCHSIA - MENUITEM "Aquamarin" ID_COLOR_AQUA - MENUITEM "WeiÃ" ID_COLOR_WHITE - MENUITEM "Automatisch" ID_COLOR_AUTOMATIC + MENUITEM "OlivgrÃ¼n", ID_COLOR_OLIVE + MENUITEM "Dunkelblau", ID_COLOR_NAVY + MENUITEM "Lila", ID_COLOR_PURPLE + MENUITEM "BlaugrÃ¼n", ID_COLOR_TEAL + MENUITEM "Grau", ID_COLOR_GRAY + MENUITEM "Silber", ID_COLOR_SILVER + MENUITEM "Rot", ID_COLOR_RED + MENUITEM "HellgrÃ¼n", ID_COLOR_LIME + MENUITEM "Gelb", ID_COLOR_YELLOW + MENUITEM "Blau", ID_COLOR_BLUE + MENUITEM "Pink", ID_COLOR_FUCHSIA + MENUITEM "Aquamarin", ID_COLOR_AQUA + MENUITEM "WeiÃ", ID_COLOR_WHITE + MENUITEM "Automatisch", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/En.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/En.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -76,9 +76,9 @@ POPUP "F&ormat" BEGIN MENUITEM "&Font...", ID_FONTSETTINGS - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph..." ID_PARAFORMAT - MENUITEM "&Tabs..." ID_TABSTOPS + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "&Paragraph...", ID_PARAFORMAT + MENUITEM "&Tabs...", ID_TABSTOPS POPUP "Backgroun&d" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 @@ -87,7 +87,7 @@ END POPUP "&Help" BEGIN - MENUITEM "&About Wine Wordpad" ID_ABOUT + MENUITEM "&About Wine Wordpad", ID_ABOUT END END @@ -99,8 +99,8 @@ MENUITEM "&Copy", ID_EDIT_COPY MENUITEM "&Paste", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph..." ID_PARAFORMAT + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "&Paragraph...", ID_PARAFORMAT END END @@ -111,20 +111,20 @@ MENUITEM "Black", ID_COLOR_BLACK MENUITEM "Maroon", ID_COLOR_MAROON MENUITEM "Green", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Purple" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gray" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "Red" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Yellow" ID_COLOR_YELLOW - MENUITEM "Blue" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "White" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Olive", ID_COLOR_OLIVE + MENUITEM "Navy", ID_COLOR_NAVY + MENUITEM "Purple", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "Gray", ID_COLOR_GRAY + MENUITEM "Silver", ID_COLOR_SILVER + MENUITEM "Red", ID_COLOR_RED + MENUITEM "Lime", ID_COLOR_LIME + MENUITEM "Yellow", ID_COLOR_YELLOW + MENUITEM "Blue", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Aqua", ID_COLOR_AQUA + MENUITEM "White", ID_COLOR_WHITE + MENUITEM "Automatic", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Fr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Fr.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -23,16 +23,16 @@ BEGIN POPUP "&Fichier" BEGIN - MENUITEM "&Nouveau...\tCtrl+N", ID_FILE_NEW - MENUITEM "&Ouvrir...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Enregistrer\tCtrl+S", ID_FILE_SAVE - MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS - MENUITEM SEPARATOR - MENUITEM "&Imprimer...\tCtrl+P", ID_PRINT - MENUITEM "A&perÃ§u avant impression...", ID_PREVIEW - MENUITEM "&Mise en page...", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "&Quitter", ID_FILE_EXIT + MENUITEM "&Nouveau...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Ouvrir...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Enregistrer\tCtrl+S", ID_FILE_SAVE + MENUITEM "Enregistrer &sous...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Imprimer...\tCtrl+P", ID_PRINT + MENUITEM "A&perÃ§u avant impression...", ID_PREVIEW + MENUITEM "&Mise en page...", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "&Quitter", ID_FILE_EXIT END POPUP "Ã&dition" BEGIN @@ -77,9 +77,9 @@ POPUP "Forma&t" BEGIN MENUITEM "&Police...", ID_FONTSETTINGS - MENUITEM "Pu&ces" ID_BULLET - MENUITEM "Para&graphe..." ID_PARAFORMAT - MENUITEM "&Tabulations..." ID_TABSTOPS + MENUITEM "Pu&ces", ID_BULLET + MENUITEM "Para&graphe...", ID_PARAFORMAT + MENUITEM "&Tabulations...", ID_TABSTOPS POPUP "&ArriÃ¨re-plan" BEGIN MENUITEM "&SystÃ¨me\tCtrl+1", ID_BACK_1 @@ -88,7 +88,7 @@ END POPUP "Aid&e" BEGIN - MENUITEM "Ã &propos du Wordpad de Wine" ID_ABOUT + MENUITEM "Ã &propos du Wordpad de Wine", ID_ABOUT END END @@ -100,8 +100,8 @@ MENUITEM "Co&pier", ID_EDIT_COPY MENUITEM "C&oller", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "P&uces" ID_BULLET - MENUITEM "Para&graphe" ID_PARAFORMAT + MENUITEM "P&uces", ID_BULLET + MENUITEM "Para&graphe", ID_PARAFORMAT END END @@ -112,20 +112,20 @@ MENUITEM "Noir", ID_COLOR_BLACK MENUITEM "Marron", ID_COLOR_MAROON MENUITEM "Vert", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Bleu marine" ID_COLOR_NAVY - MENUITEM "Pourpre" ID_COLOR_PURPLE - MENUITEM "Sarcelle" ID_COLOR_TEAL - MENUITEM "Gris" ID_COLOR_GRAY - MENUITEM "Argent" ID_COLOR_SILVER - MENUITEM "Rouge" ID_COLOR_RED - MENUITEM "Citron vert" ID_COLOR_LIME - MENUITEM "Jaune" ID_COLOR_YELLOW - MENUITEM "Bleu" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Eau" ID_COLOR_AQUA - MENUITEM "Blanc" ID_COLOR_WHITE - MENUITEM "Automatique" ID_COLOR_AUTOMATIC + MENUITEM "Olive", ID_COLOR_OLIVE + MENUITEM "Bleu marine",ID_COLOR_NAVY + MENUITEM "Pourpre", ID_COLOR_PURPLE + MENUITEM "Sarcelle", ID_COLOR_TEAL + MENUITEM "Gris", ID_COLOR_GRAY + MENUITEM "Argent", ID_COLOR_SILVER + MENUITEM "Rouge", ID_COLOR_RED + MENUITEM "Citron vert",ID_COLOR_LIME + MENUITEM "Jaune", ID_COLOR_YELLOW + MENUITEM "Bleu", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Eau", ID_COLOR_AQUA + MENUITEM "Blanc", ID_COLOR_WHITE + MENUITEM "Automatique",ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/He.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -81,9 +81,9 @@ POPUP "×¢××¦××" BEGIN MENUITEM "×××¤×...", ID_FONTSETTINGS - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "×¤×¡×§×..." ID_PARAFORMAT - MENUITEM "&Tabs..." ID_TABSTOPS + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "×¤×¡×§×...", ID_PARAFORMAT + MENUITEM "&Tabs...", ID_TABSTOPS POPUP "×¨×§×¢" BEGIN MENUITEM "××¢×¨××ª\tCtrl+1", ID_BACK_1 @@ -104,8 +104,8 @@ MENUITEM "××¢×ª×§", ID_EDIT_COPY MENUITEM "××××§", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "×¤××¡×§×..." ID_PARAFORMAT + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "×¤××¡×§×...", ID_PARAFORMAT END END @@ -116,20 +116,20 @@ MENUITEM "×©×××¨", ID_COLOR_BLACK MENUITEM "Maroon", ID_COLOR_MAROON MENUITEM "××¨××§", ID_COLOR_GREEN - MENUITEM "××¨××§ ×××ª" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "×¡×××" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "××¤××¨" ID_COLOR_GRAY - MENUITEM "××¡××£" ID_COLOR_SILVER - MENUITEM "××××" ID_COLOR_RED - MENUITEM "××¨××§ ××××" ID_COLOR_LIME - MENUITEM "×¦×××" ID_COLOR_YELLOW - MENUITEM "××××" ID_COLOR_BLUE - MENUITEM "×¤××§×¡××" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "×××" ID_COLOR_WHITE - MENUITEM "×××××××" ID_COLOR_AUTOMATIC + MENUITEM "××¨××§ ×××ª", ID_COLOR_OLIVE + MENUITEM "Navy", ID_COLOR_NAVY + MENUITEM "×¡×××", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "××¤××¨", ID_COLOR_GRAY + MENUITEM "××¡××£", ID_COLOR_SILVER + MENUITEM "××××", ID_COLOR_RED + MENUITEM "××¨××§ ××××", ID_COLOR_LIME + MENUITEM "×¦×××", ID_COLOR_YELLOW + MENUITEM "××××", ID_COLOR_BLUE + MENUITEM "×¤××§×¡××", ID_COLOR_FUCHSIA + MENUITEM "Aqua", ID_COLOR_AQUA + MENUITEM "×××", ID_COLOR_WHITE + MENUITEM "×××××××", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Hu.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Hu.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -76,9 +76,9 @@ POPUP "F&ormátum" BEGIN MENUITEM "&Font...", ID_FONTSETTINGS - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph..." ID_PARAFORMAT - MENUITEM "&Tabs..." ID_TABSTOPS + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "&Paragraph...", ID_PARAFORMAT + MENUITEM "&Tabs...", ID_TABSTOPS POPUP "&Háttér" BEGIN MENUITEM "&Rendszer\tCtrl+1", ID_BACK_1 @@ -87,7 +87,7 @@ END POPUP "&Help" BEGIN - MENUITEM "&About Wine Wordpad" ID_ABOUT + MENUITEM "&About Wine Wordpad", ID_ABOUT END END @@ -99,8 +99,8 @@ MENUITEM "Má&solás\tCtrl+C", ID_EDIT_COPY MENUITEM "&Beillesztés\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraph..." ID_PARAFORMAT + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "&Paragraph...", ID_PARAFORMAT END END @@ -111,20 +111,20 @@ MENUITEM "Black", ID_COLOR_BLACK MENUITEM "Maroon", ID_COLOR_MAROON MENUITEM "Green", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Purple" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gray" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "Red" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Yellow" ID_COLOR_YELLOW - MENUITEM "Blue" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "White" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Olive", ID_COLOR_OLIVE + MENUITEM "Navy", ID_COLOR_NAVY + MENUITEM "Purple", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "Gray", ID_COLOR_GRAY + MENUITEM "Silver", ID_COLOR_SILVER + MENUITEM "Red", ID_COLOR_RED + MENUITEM "Lime", ID_COLOR_LIME + MENUITEM "Yellow", ID_COLOR_YELLOW + MENUITEM "Blue", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Aqua", ID_COLOR_AQUA + MENUITEM "White", ID_COLOR_WHITE + MENUITEM "Automatic", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/It.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/It.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -80,9 +80,9 @@ POPUP "F&ormato" BEGIN MENUITEM "&Carattere...", ID_FONTSETTINGS - MENUITEM "&Elenco" ID_BULLET - MENUITEM "&Paragrafo..." ID_PARAFORMAT - MENUITEM "&Tabulazioni..." ID_TABSTOPS + MENUITEM "&Elenco", ID_BULLET + MENUITEM "&Paragrafo...", ID_PARAFORMAT + MENUITEM "&Tabulazioni...", ID_TABSTOPS POPUP "Sfon&do" BEGIN MENUITEM "Di &sistema\tCtrl+1", ID_BACK_1 @@ -91,7 +91,7 @@ END POPUP "&Aiuto" BEGIN - MENUITEM "&Riguardo a Wine Wordpad" ID_ABOUT + MENUITEM "&Riguardo a Wine Wordpad", ID_ABOUT END END @@ -103,8 +103,8 @@ MENUITEM "&Copia", ID_EDIT_COPY MENUITEM "&Incolla", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Elenco" ID_BULLET - MENUITEM "&Paragrafo..." ID_PARAFORMAT + MENUITEM "&Elenco", ID_BULLET + MENUITEM "&Paragrafo...", ID_PARAFORMAT END END @@ -115,20 +115,20 @@ MENUITEM "Nero", ID_COLOR_BLACK MENUITEM "Marrone rossiccio", ID_COLOR_MAROON MENUITEM "Verde", ID_COLOR_GREEN - MENUITEM "Verde oliva" ID_COLOR_OLIVE - MENUITEM "Blu oltremare" ID_COLOR_NAVY - MENUITEM "Porpora" ID_COLOR_PURPLE - MENUITEM "Foglia di TÃ¨" ID_COLOR_TEAL - MENUITEM "Grigio" ID_COLOR_GRAY - MENUITEM "Argento" ID_COLOR_SILVER - MENUITEM "Rosso" ID_COLOR_RED - MENUITEM "Verde cedro" ID_COLOR_LIME - MENUITEM "Giallo" ID_COLOR_YELLOW - MENUITEM "Blu" ID_COLOR_BLUE - MENUITEM "Fucsia" ID_COLOR_FUCHSIA - MENUITEM "Acqua" ID_COLOR_AQUA - MENUITEM "Bianco" ID_COLOR_WHITE - MENUITEM "Automatico" ID_COLOR_AUTOMATIC + MENUITEM "Verde oliva", ID_COLOR_OLIVE + MENUITEM "Blu oltremare", ID_COLOR_NAVY + MENUITEM "Porpora", ID_COLOR_PURPLE + MENUITEM "Foglia di TÃ¨", ID_COLOR_TEAL + MENUITEM "Grigio", ID_COLOR_GRAY + MENUITEM "Argento", ID_COLOR_SILVER + MENUITEM "Rosso", ID_COLOR_RED + MENUITEM "Verde cedro", ID_COLOR_LIME + MENUITEM "Giallo", ID_COLOR_YELLOW + MENUITEM "Blu", ID_COLOR_BLUE + MENUITEM "Fucsia", ID_COLOR_FUCHSIA + MENUITEM "Acqua", ID_COLOR_AQUA + MENUITEM "Bianco", ID_COLOR_WHITE + MENUITEM "Automatico", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Ja.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Ja.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -102,8 +102,8 @@ MENUITEM "ã³ãã¼(&C)", ID_EDIT_COPY MENUITEM "è²¼ãä»ã(&P)", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "ç®æ¡æ¸ã(&B)" ID_BULLET - MENUITEM "æ®µè½(&P)..." ID_PARAFORMAT + MENUITEM "ç®æ¡æ¸ã(&B)", ID_BULLET + MENUITEM "æ®µè½(&P)...", ID_PARAFORMAT END END @@ -114,20 +114,20 @@ MENUITEM "é»", ID_COLOR_BLACK MENUITEM "è¶è²", ID_COLOR_MAROON MENUITEM "ç·", ID_COLOR_GREEN - MENUITEM "ãªãªã¼ã" ID_COLOR_OLIVE - MENUITEM "ç´º" ID_COLOR_NAVY - MENUITEM "ç´«" ID_COLOR_PURPLE - MENUITEM "éç·" ID_COLOR_TEAL - MENUITEM "ç°è²" ID_COLOR_GRAY - MENUITEM "éè²" ID_COLOR_SILVER - MENUITEM "èµ¤" ID_COLOR_RED - MENUITEM "é»ç·" ID_COLOR_LIME - MENUITEM "é»" ID_COLOR_YELLOW - MENUITEM "é" ID_COLOR_BLUE - MENUITEM "èµ¤ç´«" ID_COLOR_FUCHSIA - MENUITEM "æ°´è²" ID_COLOR_AQUA - MENUITEM "ç½" ID_COLOR_WHITE - MENUITEM "èªå" ID_COLOR_AUTOMATIC + MENUITEM "ãªãªã¼ã", ID_COLOR_OLIVE + MENUITEM "ç´º", ID_COLOR_NAVY + MENUITEM "ç´«", ID_COLOR_PURPLE + MENUITEM "éç·", ID_COLOR_TEAL + MENUITEM "ç°è²", ID_COLOR_GRAY + MENUITEM "éè²", ID_COLOR_SILVER + MENUITEM "èµ¤", ID_COLOR_RED + MENUITEM "é»ç·", ID_COLOR_LIME + MENUITEM "é»", ID_COLOR_YELLOW + MENUITEM "é", ID_COLOR_BLUE + MENUITEM "èµ¤ç´«", ID_COLOR_FUCHSIA + MENUITEM "æ°´è²", ID_COLOR_AQUA + MENUITEM "ç½", ID_COLOR_WHITE + MENUITEM "èªå", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Ko.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Ko.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -77,9 +77,9 @@ POPUP "Çü½Ä(&O)" BEGIN MENUITEM "±Û²Ã(&F)...", ID_FONTSETTINGS - MENUITEM "°Á¶ Á¡(&U)" ID_BULLET - MENUITEM "´Ü¶ô(&P)..." ID_PARAFORMAT - MENUITEM "ÅÇ(&T)..." ID_TABSTOPS + MENUITEM "°Á¶ Á¡(&U)", ID_BULLET + MENUITEM "´Ü¶ô(&P)...", ID_PARAFORMAT + MENUITEM "ÅÇ(&T)...", ID_TABSTOPS POPUP "¹è°æ(&B)" BEGIN MENUITEM "½Ã½ºÅÛ(&S)\tCtrl+1", ID_BACK_1 @@ -88,7 +88,7 @@ END POPUP "µµ¿ò¸»(&H)" BEGIN - MENUITEM "Wine ¿öµåÆÐµå Á¤º¸(&A)" ID_ABOUT + MENUITEM "Wine ¿öµåÆÐµå Á¤º¸(&A)", ID_ABOUT END END @@ -100,8 +100,8 @@ MENUITEM "º¹»ç(&C)", ID_EDIT_COPY MENUITEM "ºÙ¿©³Ö±â(&P)", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "°Á¶Á¡(&B)" ID_BULLET - MENUITEM "´Ü¶ô(&P)..." ID_PARAFORMAT + MENUITEM "°Á¶Á¡(&B)", ID_BULLET + MENUITEM "´Ü¶ô(&P)...", ID_PARAFORMAT END END @@ -112,20 +112,20 @@ MENUITEM "°ËÁ¤", ID_COLOR_BLACK MENUITEM "¹ã»ö", ID_COLOR_MAROON MENUITEM "³ì»ö", ID_COLOR_GREEN - MENUITEM "¿Ã¸®ºê»ö" ID_COLOR_OLIVE - MENUITEM "Â£Àº ³²»ö" ID_COLOR_NAVY - MENUITEM "½ÉÈ«»ö" ID_COLOR_PURPLE - MENUITEM "°ËÀº ¹°¿À¸®»ö" ID_COLOR_TEAL - MENUITEM "È¸»ö" ID_COLOR_GRAY - MENUITEM "Àº»ö" ID_COLOR_SILVER - MENUITEM "»¡°" ID_COLOR_RED - MENUITEM "¶óÀÓ»ö" ID_COLOR_LIME - MENUITEM "³ë¶û" ID_COLOR_YELLOW - MENUITEM "ÆÄ¶û" ID_COLOR_BLUE - MENUITEM "ÀÚÈ«»ö" ID_COLOR_FUCHSIA - MENUITEM "¹°»ö" ID_COLOR_AQUA - MENUITEM "ÇÏ¾ç" ID_COLOR_WHITE - MENUITEM "ÀÚµ¿" ID_COLOR_AUTOMATIC + MENUITEM "¿Ã¸®ºê»ö", ID_COLOR_OLIVE + MENUITEM "Â£Àº ³²»ö", ID_COLOR_NAVY + MENUITEM "½ÉÈ«»ö", ID_COLOR_PURPLE + MENUITEM "°ËÀº ¹°¿À¸®»ö",ID_COLOR_TEAL + MENUITEM "È¸»ö", ID_COLOR_GRAY + MENUITEM "Àº»ö", ID_COLOR_SILVER + MENUITEM "»¡°", ID_COLOR_RED + MENUITEM "¶óÀÓ»ö", ID_COLOR_LIME + MENUITEM "³ë¶û", ID_COLOR_YELLOW + MENUITEM "ÆÄ¶û", ID_COLOR_BLUE + MENUITEM "ÀÚÈ«»ö", ID_COLOR_FUCHSIA + MENUITEM "¹°»ö", ID_COLOR_AQUA + MENUITEM "ÇÏ¾ç", ID_COLOR_WHITE + MENUITEM "ÀÚµ¿", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Lt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Lt.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -79,9 +79,9 @@ POPUP "F&ormatas" BEGIN MENUITEM "&Å riftas...", ID_FONTSETTINGS - MENUITEM "&Å½enkleliai" ID_BULLET - MENUITEM "&Pastraipa..." ID_PARAFORMAT - MENUITEM "&Tabuliavimo Å¾ymÄs..." ID_TABSTOPS + MENUITEM "&Å½enkleliai", ID_BULLET + MENUITEM "&Pastraipa...", ID_PARAFORMAT + MENUITEM "&Tabuliavimo Å¾ymÄs...", ID_TABSTOPS POPUP "&Fonas" BEGIN MENUITEM "&Sistemos\tCtrl+1", ID_BACK_1 @@ -90,7 +90,7 @@ END POPUP "&Å½inynas" BEGIN - MENUITEM "&Apie Wine Wordpad" ID_ABOUT + MENUITEM "&Apie Wine Wordpad", ID_ABOUT END END @@ -102,8 +102,8 @@ MENUITEM "&Kopijuoti", ID_EDIT_COPY MENUITEM "Ä®&dÄti", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Å½enkleliai" ID_BULLET - MENUITEM "&Pastraipa..." ID_PARAFORMAT + MENUITEM "&Å½enkleliai", ID_BULLET + MENUITEM "&Pastraipa...",ID_PARAFORMAT END END @@ -111,23 +111,23 @@ BEGIN POPUP "" BEGIN - MENUITEM "Juoda" ID_COLOR_BLACK - MENUITEM "KaÅ¡toninÄ" ID_COLOR_MAROON - MENUITEM "Å½alia" ID_COLOR_GREEN - MENUITEM "AlyvinÄ" ID_COLOR_OLIVE - MENUITEM "Ultramarinas" ID_COLOR_NAVY - MENUITEM "PurpurinÄ" ID_COLOR_PURPLE - MENUITEM "Neutrali ciano" ID_COLOR_TEAL - MENUITEM "Pilka" ID_COLOR_GRAY - MENUITEM "SidabrinÄ" ID_COLOR_SILVER - MENUITEM "Raudona" ID_COLOR_RED - MENUITEM "Gelsvai Å¾alsva" ID_COLOR_LIME - MENUITEM "Geltona" ID_COLOR_YELLOW - MENUITEM "MÄlyna" ID_COLOR_BLUE - MENUITEM "Fuksija" ID_COLOR_FUCHSIA - MENUITEM "Å½ydra" ID_COLOR_AQUA - MENUITEM "Balta" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Juoda", ID_COLOR_BLACK + MENUITEM "KaÅ¡toninÄ", ID_COLOR_MAROON + MENUITEM "Å½alia", ID_COLOR_GREEN + MENUITEM "AlyvinÄ", ID_COLOR_OLIVE + MENUITEM "Ultramarinas", ID_COLOR_NAVY + MENUITEM "PurpurinÄ", ID_COLOR_PURPLE + MENUITEM "Neutrali ciano",ID_COLOR_TEAL + MENUITEM "Pilka", ID_COLOR_GRAY + MENUITEM "SidabrinÄ", ID_COLOR_SILVER + MENUITEM "Raudona", ID_COLOR_RED + MENUITEM "Gelsvai Å¾alsva",ID_COLOR_LIME + MENUITEM "Geltona", ID_COLOR_YELLOW + MENUITEM "MÄlyna", ID_COLOR_BLUE + MENUITEM "Fuksija", ID_COLOR_FUCHSIA + MENUITEM "Å½ydra", ID_COLOR_AQUA + MENUITEM "Balta", ID_COLOR_WHITE + MENUITEM "Automatic", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Nl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Nl.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -79,9 +79,9 @@ POPUP "&Opmaak" BEGIN MENUITEM "&Lettertype...", ID_FONTSETTINGS - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraaf..." ID_PARAFORMAT - MENUITEM "&Tabs..." ID_TABSTOPS + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "&Paragraaf...", ID_PARAFORMAT + MENUITEM "&Tabs...", ID_TABSTOPS POPUP "&Achtergrond" BEGIN MENUITEM "&Systeem\tCtrl+1", ID_BACK_1 @@ -90,7 +90,7 @@ END POPUP "&Help" BEGIN - MENUITEM "&Over Wine Wordpad" ID_ABOUT + MENUITEM "&Over Wine Wordpad", ID_ABOUT END END @@ -102,8 +102,8 @@ MENUITEM "&KopiÃ«ren", ID_EDIT_COPY MENUITEM "&Plakken", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Bullet points" ID_BULLET - MENUITEM "&Paragraaf..." ID_PARAFORMAT + MENUITEM "&Bullet points", ID_BULLET + MENUITEM "&Paragraaf...", ID_PARAFORMAT END END @@ -114,20 +114,20 @@ MENUITEM "Zwart", ID_COLOR_BLACK MENUITEM "Kastanjebruin", ID_COLOR_MAROON MENUITEM "Groen", ID_COLOR_GREEN - MENUITEM "Olijfgroen" ID_COLOR_OLIVE - MENUITEM "Marineblauw" ID_COLOR_NAVY - MENUITEM "Paars" ID_COLOR_PURPLE - MENUITEM "Groenblauw" ID_COLOR_TEAL - MENUITEM "Grijs" ID_COLOR_GRAY - MENUITEM "Zilver" ID_COLOR_SILVER - MENUITEM "Rood" ID_COLOR_RED - MENUITEM "Lichtgroen" ID_COLOR_LIME - MENUITEM "Geel" ID_COLOR_YELLOW - MENUITEM "Blauw" ID_COLOR_BLUE - MENUITEM "Fuchsiapaars" ID_COLOR_FUCHSIA - MENUITEM "Zeeblauw" ID_COLOR_AQUA - MENUITEM "Wit" ID_COLOR_WHITE - MENUITEM "Automatisch" ID_COLOR_AUTOMATIC + MENUITEM "Olijfgroen", ID_COLOR_OLIVE + MENUITEM "Marineblauw", ID_COLOR_NAVY + MENUITEM "Paars", ID_COLOR_PURPLE + MENUITEM "Groenblauw", ID_COLOR_TEAL + MENUITEM "Grijs", ID_COLOR_GRAY + MENUITEM "Zilver", ID_COLOR_SILVER + MENUITEM "Rood", ID_COLOR_RED + MENUITEM "Lichtgroen", ID_COLOR_LIME + MENUITEM "Geel", ID_COLOR_YELLOW + MENUITEM "Blauw", ID_COLOR_BLUE + MENUITEM "Fuchsiapaars", ID_COLOR_FUCHSIA + MENUITEM "Zeeblauw", ID_COLOR_AQUA + MENUITEM "Wit", ID_COLOR_WHITE + MENUITEM "Automatisch", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Pl.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Pl.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -78,9 +78,9 @@ POPUP "For&mat" BEGIN MENUITEM "&Czcionka...", ID_FONTSETTINGS - MENUITEM "&Wypunktowanie" ID_BULLET - MENUITEM "&Akapit..." ID_PARAFORMAT - MENUITEM "&Tabulatory..." ID_TABSTOPS + MENUITEM "&Wypunktowanie", ID_BULLET + MENUITEM "&Akapit...", ID_PARAFORMAT + MENUITEM "&Tabulatory...", ID_TABSTOPS POPUP "T³&o" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 @@ -89,7 +89,7 @@ END POPUP "Pomo&c" BEGIN - MENUITEM "Wine Wordpad - &informacje" ID_ABOUT + MENUITEM "Wine Wordpad - &informacje", ID_ABOUT END END @@ -101,8 +101,8 @@ MENUITEM "&Kopiuj", ID_EDIT_COPY MENUITEM "Wkl&ej", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Wypunktowanie" ID_BULLET - MENUITEM "&Akapit..." ID_PARAFORMAT + MENUITEM "&Wypunktowanie", ID_BULLET + MENUITEM "&Akapit...", ID_PARAFORMAT END END @@ -113,20 +113,20 @@ MENUITEM "Czarny", ID_COLOR_BLACK MENUITEM "Kasztanowy", ID_COLOR_MAROON MENUITEM "Zielony", ID_COLOR_GREEN - MENUITEM "Oliwkowy" ID_COLOR_OLIVE - MENUITEM "Granatowy" ID_COLOR_NAVY - MENUITEM "Purpurowy" ID_COLOR_PURPLE - MENUITEM "Zielonomodry" ID_COLOR_TEAL - MENUITEM "Szary" ID_COLOR_GRAY - MENUITEM "Srebrny" ID_COLOR_SILVER - MENUITEM "Czerwony" ID_COLOR_RED - MENUITEM "Limonowy" ID_COLOR_LIME - MENUITEM "¯ó³ty" ID_COLOR_YELLOW - MENUITEM "Niebieski" ID_COLOR_BLUE - MENUITEM "Fuksja" ID_COLOR_FUCHSIA - MENUITEM "Akwamaryna" ID_COLOR_AQUA - MENUITEM "Bia³y" ID_COLOR_WHITE - MENUITEM "Automatycznie" ID_COLOR_AUTOMATIC + MENUITEM "Oliwkowy", ID_COLOR_OLIVE + MENUITEM "Granatowy", ID_COLOR_NAVY + MENUITEM "Purpurowy", ID_COLOR_PURPLE + MENUITEM "Zielonomodry", ID_COLOR_TEAL + MENUITEM "Szary", ID_COLOR_GRAY + MENUITEM "Srebrny", ID_COLOR_SILVER + MENUITEM "Czerwony", ID_COLOR_RED + MENUITEM "Limonowy", ID_COLOR_LIME + MENUITEM "¯ó³ty", ID_COLOR_YELLOW + MENUITEM "Niebieski", ID_COLOR_BLUE + MENUITEM "Fuksja", ID_COLOR_FUCHSIA + MENUITEM "Akwamaryna", ID_COLOR_AQUA + MENUITEM "Bia³y", ID_COLOR_WHITE + MENUITEM "Automatycznie",ID_COLOR_AUTOMATIC END END @@ -198,7 +198,7 @@ BEGIN LTEXT "Dostêpne formaty",-1,3,2,100,15 LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY - PUSHBUTTON "&OK",IDOK,87,12,40,12 + DEFPUSHBUTTON "&OK",IDOK,87,12,40,12 PUSHBUTTON "&Anuluj",IDCANCEL,87,26,40,12 END Modified: trunk/reactos/base/applications/wordpad/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Pt.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Pt.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -83,7 +83,7 @@ MENUITEM "&Fonte...", ID_FONTSETTINGS MENUITEM "&Marcadores", ID_BULLET MENUITEM "&ParÃ¡grafo...", ID_PARAFORMAT - MENUITEM "T&abulaÃ§Ã£o..." ID_TABSTOPS + MENUITEM "T&abulaÃ§Ã£o...", ID_TABSTOPS POPUP "&Fundo" BEGIN MENUITEM "&Sistema\tCtrl+1", ID_BACK_1 @@ -92,7 +92,7 @@ END POPUP "&Ajuda" BEGIN - MENUITEM "&Sobre Wine Wordpad" ID_ABOUT + MENUITEM "&Sobre Wine Wordpad", ID_ABOUT END END @@ -104,8 +104,8 @@ MENUITEM "C&opiar", ID_EDIT_COPY MENUITEM "Co&lar", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Marcadores" ID_BULLET - MENUITEM "&ParÃ¡grafo..." ID_PARAFORMAT + MENUITEM "&Marcadores", ID_BULLET + MENUITEM "&ParÃ¡grafo...", ID_PARAFORMAT END END @@ -116,20 +116,20 @@ MENUITEM "Preto", ID_COLOR_BLACK MENUITEM "Castanho", ID_COLOR_MAROON MENUITEM "Verde", ID_COLOR_GREEN - MENUITEM "Verde-oliva" ID_COLOR_OLIVE - MENUITEM "Azul-marinho" ID_COLOR_NAVY - MENUITEM "Roxo" ID_COLOR_PURPLE - MENUITEM "Azul-petrÃ³leo" ID_COLOR_TEAL - MENUITEM "Cinza" ID_COLOR_GRAY - MENUITEM "Prateado" ID_COLOR_SILVER - MENUITEM "Vermelho" ID_COLOR_RED - MENUITEM "Verde-limÃ£o" ID_COLOR_LIME - MENUITEM "Amarelo" ID_COLOR_YELLOW - MENUITEM "Azul" ID_COLOR_BLUE - MENUITEM "FÃºcsia" ID_COLOR_FUCHSIA - MENUITEM "Azul-piscina" ID_COLOR_AQUA - MENUITEM "Branco" ID_COLOR_WHITE - MENUITEM "AutomÃ¡tico" ID_COLOR_AUTOMATIC + MENUITEM "Verde-oliva", ID_COLOR_OLIVE + MENUITEM "Azul-marinho", ID_COLOR_NAVY + MENUITEM "Roxo", ID_COLOR_PURPLE + MENUITEM "Azul-petrÃ³leo",ID_COLOR_TEAL + MENUITEM "Cinza", ID_COLOR_GRAY + MENUITEM "Prateado", ID_COLOR_SILVER + MENUITEM "Vermelho", ID_COLOR_RED + MENUITEM "Verde-limÃ£o", ID_COLOR_LIME + MENUITEM "Amarelo", ID_COLOR_YELLOW + MENUITEM "Azul", ID_COLOR_BLUE + MENUITEM "FÃºcsia", ID_COLOR_FUCHSIA + MENUITEM "Azul-piscina", ID_COLOR_AQUA + MENUITEM "Branco", ID_COLOR_WHITE + MENUITEM "AutomÃ¡tico", ID_COLOR_AUTOMATIC END END @@ -325,9 +325,9 @@ POPUP "F&ormato" BEGIN MENUITEM "&Tipo de Letra...", ID_FONTSETTINGS - MENUITEM "&Lista de marcas" ID_BULLET - MENUITEM "&ParÃ¡grafo..." ID_PARAFORMAT - MENUITEM "T&abulaÃ§Ãµes..." ID_TABSTOPS + MENUITEM "&Lista de marcas", ID_BULLET + MENUITEM "&ParÃ¡grafo...", ID_PARAFORMAT + MENUITEM "T&abulaÃ§Ãµes...", ID_TABSTOPS POPUP "&Fundo" BEGIN MENUITEM "&Sistema\tCtrl+1", ID_BACK_1 @@ -336,7 +336,7 @@ END POPUP "&Ajuda" BEGIN - MENUITEM "&Sobre Wine Wordpad" ID_ABOUT + MENUITEM "&Sobre Wine Wordpad", ID_ABOUT END END @@ -348,8 +348,8 @@ MENUITEM "C&opiar", ID_EDIT_COPY MENUITEM "Co&lar", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&Lista de marcas" ID_BULLET - MENUITEM "&ParÃ¡grafo..." ID_PARAFORMAT + MENUITEM "&Lista de marcas", ID_BULLET + MENUITEM "&ParÃ¡grafo...", ID_PARAFORMAT END END @@ -360,20 +360,20 @@ MENUITEM "Preto", ID_COLOR_BLACK MENUITEM "Castanho", ID_COLOR_MAROON MENUITEM "Verde", ID_COLOR_GREEN - MENUITEM "Verde-oliva" ID_COLOR_OLIVE - MENUITEM "Azul-marinho" ID_COLOR_NAVY + MENUITEM "Verde-oliva", ID_COLOR_OLIVE + MENUITEM "Azul-marinho", ID_COLOR_NAVY MENUITEM "Roxo", ID_COLOR_PURPLE - MENUITEM "Azul-petrÃ³leo" ID_COLOR_TEAL - MENUITEM "Cinza" ID_COLOR_GRAY - MENUITEM "Prateado" ID_COLOR_SILVER - MENUITEM "Vermelho" ID_COLOR_RED - MENUITEM "Verde-limÃ£o" ID_COLOR_LIME - MENUITEM "Amarelo" ID_COLOR_YELLOW - MENUITEM "Azul" ID_COLOR_BLUE - MENUITEM "FÃºcsia" ID_COLOR_FUCHSIA - MENUITEM "Azul-piscina" ID_COLOR_AQUA - MENUITEM "Branco" ID_COLOR_WHITE - MENUITEM "AutomÃ¡tico" ID_COLOR_AUTOMATIC + MENUITEM "Azul-petrÃ³leo",ID_COLOR_TEAL + MENUITEM "Cinza", ID_COLOR_GRAY + MENUITEM "Prateado", ID_COLOR_SILVER + MENUITEM "Vermelho", ID_COLOR_RED + MENUITEM "Verde-limÃ£o", ID_COLOR_LIME + MENUITEM "Amarelo", ID_COLOR_YELLOW + MENUITEM "Azul", ID_COLOR_BLUE + MENUITEM "FÃºcsia", ID_COLOR_FUCHSIA + MENUITEM "Azul-piscina", ID_COLOR_AQUA + MENUITEM "Branco", ID_COLOR_WHITE + MENUITEM "AutomÃ¡tico", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Ro.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Ro.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -92,7 +92,7 @@ END POPUP "&?" BEGIN - MENUITEM "&Despre Wine Wordpadâ¦" ID_ABOUT + MENUITEM "&Despre Wine Wordpadâ¦", ID_ABOUT END END @@ -104,8 +104,8 @@ MENUITEM "&CopiazÄ", ID_EDIT_COPY MENUITEM "&LipeÈte", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Punct &bulinÄ" ID_BULLET - MENUITEM "&Paragrafâ¦" ID_PARAFORMAT + MENUITEM "Punct &bulinÄ", ID_BULLET + MENUITEM "&Paragrafâ¦", ID_PARAFORMAT END END @@ -116,20 +116,20 @@ MENUITEM "Negru", ID_COLOR_BLACK MENUITEM "Maro", ID_COLOR_MAROON MENUITEM "Verde", ID_COLOR_GREEN - MENUITEM "Oliv" ID_COLOR_OLIVE - MENUITEM "Bleumarin" ID_COLOR_NAVY - MENUITEM "Violet" ID_COLOR_PURPLE - MENUITEM "Verde-albÄstrui" ID_COLOR_TEAL - MENUITEM "Gri" ID_COLOR_GRAY - MENUITEM "Argintiu" ID_COLOR_SILVER - MENUITEM "RoÈu" ID_COLOR_RED - MENUITEM "LÄmÃ¢ie verde" ID_COLOR_LIME - MENUITEM "Galben" ID_COLOR_YELLOW - MENUITEM "Albastru" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Culoarea apei" ID_COLOR_AQUA - MENUITEM "Alb" ID_COLOR_WHITE - MENUITEM "AutomatÄ" ID_COLOR_AUTOMATIC + MENUITEM "Oliv", ID_COLOR_OLIVE + MENUITEM "Bleumarin", ID_COLOR_NAVY + MENUITEM "Violet", ID_COLOR_PURPLE + MENUITEM "Verde-albÄstrui",ID_COLOR_TEAL + MENUITEM "Gri", ID_COLOR_GRAY + MENUITEM "Argintiu", ID_COLOR_SILVER + MENUITEM "RoÈu", ID_COLOR_RED + MENUITEM "LÄmÃ¢ie verde", ID_COLOR_LIME + MENUITEM "Galben", ID_COLOR_YELLOW + MENUITEM "Albastru", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Culoarea apei", ID_COLOR_AQUA + MENUITEM "Alb", ID_COLOR_WHITE + MENUITEM "AutomatÄ", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Ru.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Ru.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -79,9 +79,9 @@ POPUP "Ð¤Ð¾Ñ&Ð¼Ð°Ñ" BEGIN MENUITEM "&Ð¨ÑÐ¸ÑÑ...", ID_FONTSETTINGS - MENUITEM "&ÐÐ°ÑÐºÐµÑ" ID_BULLET - MENUITEM "&ÐÐ±Ð·Ð°Ñ..." ID_PARAFORMAT - MENUITEM "&Ð¢Ð°Ð±ÑÐ»ÑÑÐ¸Ñ..." ID_TABSTOPS + MENUITEM "&ÐÐ°ÑÐºÐµÑ", ID_BULLET + MENUITEM "&ÐÐ±Ð·Ð°Ñ...", ID_PARAFORMAT + MENUITEM "&Ð¢Ð°Ð±ÑÐ»ÑÑÐ¸Ñ...", ID_TABSTOPS POPUP "&Ð¤Ð¾Ð½" BEGIN MENUITEM "&Ð¡Ð¸ÑÑÐµÐ¼Ð½ÑÐ¹\tCtrl+1", ID_BACK_1 @@ -90,7 +90,7 @@ END POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN - MENUITEM "&Ð Wine Wordpad" ID_ABOUT + MENUITEM "&Ð Wine Wordpad", ID_ABOUT END END @@ -102,8 +102,8 @@ MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ\tCtrl+C", ID_EDIT_COPY MENUITEM "ÐÑÑ&Ð°Ð²Ð¸ÑÑ", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&ÐÐ°ÑÐºÐµÑ" ID_BULLET - MENUITEM "&ÐÐ±Ð·Ð°Ñ..." ID_PARAFORMAT + MENUITEM "&ÐÐ°ÑÐºÐµÑ", ID_BULLET + MENUITEM "&ÐÐ±Ð·Ð°Ñ...", ID_PARAFORMAT END END @@ -114,20 +114,20 @@ MENUITEM "Ð§ÑÑÐ½ÑÐ¹", ID_COLOR_BLACK MENUITEM "Ð¢ÑÐ¼Ð½Ð¾-Ð±Ð¾ÑÐ´Ð¾Ð²ÑÐ¹", ID_COLOR_MAROON MENUITEM "ÐÐµÐ»ÑÐ½ÑÐ¹", ID_COLOR_GREEN - MENUITEM "ÐÐ»Ð¸Ð²ÐºÐ¾Ð²ÑÐ¹" ID_COLOR_OLIVE - MENUITEM "Ð¢ÑÐ¼Ð½Ð¾-ÑÐ¸Ð½Ð¸Ð¹" ID_COLOR_NAVY - MENUITEM "ÐÑÑÐ¿ÑÑÐ½ÑÐ¹" ID_COLOR_PURPLE - MENUITEM "ÐÐ¾ÑÑÐºÐ¾Ð¹ Ð²Ð¾Ð»Ð½Ñ" ID_COLOR_TEAL - MENUITEM "Ð¡ÐµÑÑÐ¹" ID_COLOR_GRAY - MENUITEM "Ð¡ÐµÑÐµÐ±ÑÑÐ½ÑÐ¹" ID_COLOR_SILVER - MENUITEM "ÐÑÐ°ÑÐ½ÑÐ¹" ID_COLOR_RED - MENUITEM "ÐÐ¸Ð¼Ð¾Ð½Ð½ÑÐ¹" ID_COLOR_LIME - MENUITEM "ÐÑÐ»ÑÑÐ¹" ID_COLOR_YELLOW - MENUITEM "Ð¡Ð¸Ð½Ð¸Ð¹" ID_COLOR_BLUE - MENUITEM "Ð¯ÑÐºÐ¾-ÑÐ¾Ð·Ð¾Ð²ÑÐ¹" ID_COLOR_FUCHSIA - MENUITEM "ÐÐ¾Ð»ÑÐ±Ð¾Ð¹" ID_COLOR_AQUA - MENUITEM "ÐÐµÐ»ÑÐ¹" ID_COLOR_WHITE - MENUITEM "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸" ID_COLOR_AUTOMATIC + MENUITEM "ÐÐ»Ð¸Ð²ÐºÐ¾Ð²ÑÐ¹", ID_COLOR_OLIVE + MENUITEM "Ð¢ÑÐ¼Ð½Ð¾-ÑÐ¸Ð½Ð¸Ð¹", ID_COLOR_NAVY + MENUITEM "ÐÑÑÐ¿ÑÑÐ½ÑÐ¹", ID_COLOR_PURPLE + MENUITEM "ÐÐ¾ÑÑÐºÐ¾Ð¹ Ð²Ð¾Ð»Ð½Ñ", ID_COLOR_TEAL + MENUITEM "Ð¡ÐµÑÑÐ¹", ID_COLOR_GRAY + MENUITEM "Ð¡ÐµÑÐµÐ±ÑÑÐ½ÑÐ¹", ID_COLOR_SILVER + MENUITEM "ÐÑÐ°ÑÐ½ÑÐ¹", ID_COLOR_RED + MENUITEM "ÐÐ¸Ð¼Ð¾Ð½Ð½ÑÐ¹", ID_COLOR_LIME + MENUITEM "ÐÑÐ»ÑÑÐ¹", ID_COLOR_YELLOW + MENUITEM "Ð¡Ð¸Ð½Ð¸Ð¹", ID_COLOR_BLUE + MENUITEM "Ð¯ÑÐºÐ¾-ÑÐ¾Ð·Ð¾Ð²ÑÐ¹", ID_COLOR_FUCHSIA + MENUITEM "ÐÐ¾Ð»ÑÐ±Ð¾Ð¹", ID_COLOR_AQUA + MENUITEM "ÐÐµÐ»ÑÐ¹", ID_COLOR_WHITE + MENUITEM "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Si.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Si.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -89,7 +89,7 @@ END POPUP "&PomoÄ" BEGIN - MENUITEM "&O Wine Wordpadu" ID_ABOUT + MENUITEM "&O Wine Wordpadu", ID_ABOUT END END @@ -101,8 +101,8 @@ MENUITEM "&Kopiraj", ID_EDIT_COPY MENUITEM "&Prilepi", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&VrstiÄne oznake" ID_BULLET - MENUITEM "O&dstavek ..." ID_PARAFORMAT + MENUITEM "&VrstiÄne oznake", ID_BULLET + MENUITEM "O&dstavek ...", ID_PARAFORMAT END END @@ -113,20 +113,20 @@ MENUITEM "Ärna", ID_COLOR_BLACK MENUITEM "Kostanjeva", ID_COLOR_MAROON MENUITEM "Zelena", ID_COLOR_GREEN - MENUITEM "Olivna" ID_COLOR_OLIVE - MENUITEM "MornariÅ¡ka" ID_COLOR_NAVY - MENUITEM "VijoliÄna" ID_COLOR_PURPLE - MENUITEM "Zelenomodra" ID_COLOR_TEAL - MENUITEM "Siva" ID_COLOR_GRAY - MENUITEM "Srebrna" ID_COLOR_SILVER - MENUITEM "RdeÄa" ID_COLOR_RED - MENUITEM "Citronska" ID_COLOR_LIME - MENUITEM "Rumena" ID_COLOR_YELLOW - MENUITEM "Modra" ID_COLOR_BLUE - MENUITEM "Roza" ID_COLOR_FUCHSIA - MENUITEM "Akvamarin" ID_COLOR_AQUA - MENUITEM "Bela" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Olivna", ID_COLOR_OLIVE + MENUITEM "MornariÅ¡ka", ID_COLOR_NAVY + MENUITEM "VijoliÄna", ID_COLOR_PURPLE + MENUITEM "Zelenomodra",ID_COLOR_TEAL + MENUITEM "Siva", ID_COLOR_GRAY + MENUITEM "Srebrna", ID_COLOR_SILVER + MENUITEM "RdeÄa", ID_COLOR_RED + MENUITEM "Citronska", ID_COLOR_LIME + MENUITEM "Rumena", ID_COLOR_YELLOW + MENUITEM "Modra", ID_COLOR_BLUE + MENUITEM "Roza", ID_COLOR_FUCHSIA + MENUITEM "Akvamarin", ID_COLOR_AQUA + MENUITEM "Bela", ID_COLOR_WHITE + MENUITEM "Automatic", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Sq.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Sq.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -77,9 +77,9 @@ POPUP "F&ormat" BEGIN MENUITEM "&Font...", ID_FONTSETTINGS - MENUITEM "Pika" ID_BULLET - MENUITEM "&Paragraf..." ID_PARAFORMAT - MENUITEM "&Tabs..." ID_TABSTOPS + MENUITEM "Pika", ID_BULLET + MENUITEM "&Paragraf...", ID_PARAFORMAT + MENUITEM "&Tabs...", ID_TABSTOPS POPUP "Sfon&d" BEGIN MENUITEM "&Sisteme\tCtrl+1", ID_BACK_1 @@ -88,7 +88,7 @@ END POPUP "NdihmÃ«" BEGIN - MENUITEM "Rreth Wordpad" ID_ABOUT + MENUITEM "Rreth Wordpad", ID_ABOUT END END @@ -100,8 +100,8 @@ MENUITEM "Kopjo", ID_EDIT_COPY MENUITEM "Ngjit", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Pika" ID_BULLET - MENUITEM "&Paragraf..." ID_PARAFORMAT + MENUITEM "Pika", ID_BULLET + MENUITEM "&Paragraf...", ID_PARAFORMAT END END @@ -111,21 +111,21 @@ BEGIN MENUITEM "E Zeze", ID_COLOR_BLACK MENUITEM "Geshtenje", ID_COLOR_MAROON - MENUITEM "Jeshil", ID_COLOR_GREEN - MENUITEM "Ulliri" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Lelja" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gri" ID_COLOR_GRAY - MENUITEM "Argjend" ID_COLOR_SILVER - MENUITEM "Kuqe" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "E Verdhe" ID_COLOR_YELLOW - MENUITEM "Blu" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Uje" ID_COLOR_AQUA - MENUITEM "E Bardhe" ID_COLOR_WHITE - MENUITEM "Automatike" ID_COLOR_AUTOMATIC + MENUITEM "Jeshil", ID_COLOR_GREEN + MENUITEM "Ulliri", ID_COLOR_OLIVE + MENUITEM "Navy", ID_COLOR_NAVY + MENUITEM "Lelja", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "Gri", ID_COLOR_GRAY + MENUITEM "Argjend", ID_COLOR_SILVER + MENUITEM "Kuqe", ID_COLOR_RED + MENUITEM "Lime", ID_COLOR_LIME + MENUITEM "E Verdhe", ID_COLOR_YELLOW + MENUITEM "Blu", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Uje", ID_COLOR_AQUA + MENUITEM "E Bardhe", ID_COLOR_WHITE + MENUITEM "Automatike", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Sv.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Sv.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -78,9 +78,9 @@ POPUP "F&ormat" BEGIN MENUITEM "T&ecken...", ID_FONTSETTINGS - MENUITEM "&PunktuppstÃ¤llning" ID_BULLET - MENUITEM "&Stycke..." ID_PARAFORMAT - MENUITEM "&Tabulatorer..." ID_TABSTOPS + MENUITEM "&PunktuppstÃ¤llning", ID_BULLET + MENUITEM "&Stycke...", ID_PARAFORMAT + MENUITEM "&Tabulatorer...", ID_TABSTOPS POPUP "&Bakgrund" BEGIN MENUITEM "&System\tCtrl+1", ID_BACK_1 @@ -89,7 +89,7 @@ END POPUP "&HjÃ¤lp" BEGIN - MENUITEM "&Om Wine Wordpad" ID_ABOUT + MENUITEM "&Om Wine Wordpad", ID_ABOUT END END @@ -101,8 +101,8 @@ MENUITEM "&Kopiera", ID_EDIT_COPY MENUITEM "Klistra &in", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&PunktuppstÃ¤llning" ID_BULLET - MENUITEM "&Stycke..." ID_PARAFORMAT + MENUITEM "&PunktuppstÃ¤llning", ID_BULLET + MENUITEM "&Stycke...", ID_PARAFORMAT END END @@ -113,20 +113,20 @@ MENUITEM "Svart", ID_COLOR_BLACK MENUITEM "RÃ¶dbrun", ID_COLOR_MAROON MENUITEM "GrÃ¶n", ID_COLOR_GREEN - MENUITEM "Oliv" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Lila" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "GrÃ¥" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "RÃ¶d" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Gul" ID_COLOR_YELLOW - MENUITEM "BlÃ¥" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "Vit" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Oliv", ID_COLOR_OLIVE + MENUITEM "Navy", ID_COLOR_NAVY + MENUITEM "Lila", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "GrÃ¥", ID_COLOR_GRAY + MENUITEM "Silver", ID_COLOR_SILVER + MENUITEM "RÃ¶d", ID_COLOR_RED + MENUITEM "Lime", ID_COLOR_LIME + MENUITEM "Gul", ID_COLOR_YELLOW + MENUITEM "BlÃ¥", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Aqua", ID_COLOR_AQUA + MENUITEM "Vit", ID_COLOR_WHITE + MENUITEM "Automatic", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Tr.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -78,9 +78,9 @@ POPUP "&BiÃ§im" BEGIN MENUITEM "&YazÄ± Tipi...", ID_FONTSETTINGS - MENUITEM "&ÃÄe Ä°mleri" ID_BULLET - MENUITEM "&Paragraf..." ID_PARAFORMAT - MENUITEM "&Sekme DuraklarÄ±..." ID_TABSTOPS + MENUITEM "&ÃÄe Ä°mleri", ID_BULLET + MENUITEM "&Paragraf...", ID_PARAFORMAT + MENUITEM "&Sekme DuraklarÄ±...", ID_TABSTOPS POPUP "&Arka Plan" BEGIN MENUITEM "&Dizge Rengi\tCtrl+1", ID_BACK_1 @@ -89,7 +89,7 @@ END POPUP "&YardÄ±m" BEGIN - MENUITEM "&Ãzerine..." ID_ABOUT + MENUITEM "&Ãzerine...", ID_ABOUT END END @@ -101,8 +101,8 @@ MENUITEM "&ÃoÄalt", ID_EDIT_COPY MENUITEM "&YapÄ±ÅtÄ±r", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&ÃÄe Ä°mleri" ID_BULLET - MENUITEM "&Paragraf..." ID_PARAFORMAT + MENUITEM "&ÃÄe Ä°mleri", ID_BULLET + MENUITEM "&Paragraf...", ID_PARAFORMAT END END @@ -113,20 +113,20 @@ MENUITEM "Kara", ID_COLOR_BLACK MENUITEM "ViÅne ÃÃ¼rÃ¼ÄÃ¼", ID_COLOR_MAROON MENUITEM "YeÅil", ID_COLOR_GREEN - MENUITEM "ZeytinyaÄÄ±" ID_COLOR_OLIVE - MENUITEM "Deniz MÃ¢visi" ID_COLOR_NAVY - MENUITEM "Mor" ID_COLOR_PURPLE - MENUITEM "Ãamurcun" ID_COLOR_TEAL - MENUITEM "KÃ¼l Rengi" ID_COLOR_GRAY - MENUITEM "GÃ¼mÃ¼Å" ID_COLOR_SILVER - MENUITEM "Al" ID_COLOR_RED - MENUITEM "Misket Limonu" ID_COLOR_LIME - MENUITEM "SarÄ±" ID_COLOR_YELLOW - MENUITEM "MÃ¢vi" ID_COLOR_BLUE - MENUITEM "KÃ¼pe ÃiÃ§eÄi" ID_COLOR_FUCHSIA - MENUITEM "Turkuaz" ID_COLOR_AQUA - MENUITEM "Ak" ID_COLOR_WHITE - MENUITEM "Dizge Rengi" ID_COLOR_AUTOMATIC + MENUITEM "ZeytinyaÄÄ±", ID_COLOR_OLIVE + MENUITEM "Deniz MÃ¢visi", ID_COLOR_NAVY + MENUITEM "Mor", ID_COLOR_PURPLE + MENUITEM "Ãamurcun", ID_COLOR_TEAL + MENUITEM "KÃ¼l Rengi", ID_COLOR_GRAY + MENUITEM "GÃ¼mÃ¼Å", ID_COLOR_SILVER + MENUITEM "Al", ID_COLOR_RED + MENUITEM "Misket Limonu",ID_COLOR_LIME + MENUITEM "SarÄ±", ID_COLOR_YELLOW + MENUITEM "MÃ¢vi", ID_COLOR_BLUE + MENUITEM "KÃ¼pe ÃiÃ§eÄi", ID_COLOR_FUCHSIA + MENUITEM "Turkuaz", ID_COLOR_AQUA + MENUITEM "Ak", ID_COLOR_WHITE + MENUITEM "Dizge Rengi", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Uk.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Uk.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -83,9 +83,9 @@ POPUP "Ð¤&Ð¾ÑÐ¼Ð°Ñ" BEGIN MENUITEM "&Ð¨ÑÐ¸ÑÑ...", ID_FONTSETTINGS - MENUITEM "&ÐÐ°ÑÐºÐµÑÐ¸" ID_BULLET - MENUITEM "&ÐÐ±Ð·Ð°Ñ..." ID_PARAFORMAT - MENUITEM "&Ð¢Ð°Ð±ÑÐ»ÑÑÑÑ..." ID_TABSTOPS + MENUITEM "&ÐÐ°ÑÐºÐµÑÐ¸", ID_BULLET + MENUITEM "&ÐÐ±Ð·Ð°Ñ...", ID_PARAFORMAT + MENUITEM "&Ð¢Ð°Ð±ÑÐ»ÑÑÑÑ...", ID_TABSTOPS POPUP "&Ð¤Ð¾Ð½" BEGIN MENUITEM "&Ð¡Ð¸ÑÑÐµÐ¼Ð½Ð¸Ð¹\tCtrl+1", ID_BACK_1 @@ -94,7 +94,7 @@ END POPUP "&ÐÐ¾Ð²ÑÐ´ÐºÐ°" BEGIN - MENUITEM "&ÐÑÐ¾ Wine Wordpad" ID_ABOUT + MENUITEM "&ÐÑÐ¾ Wine Wordpad", ID_ABOUT END END @@ -106,8 +106,8 @@ MENUITEM "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸", ID_EDIT_COPY MENUITEM "&ÐÑÑÐ°Ð²Ð¸ÑÐ¸", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "&ÐÐ°ÑÐºÐµÑÐ¸" ID_BULLET - MENUITEM "&ÐÐ±Ð·Ð°Ñ..." ID_PARAFORMAT + MENUITEM "&ÐÐ°ÑÐºÐµÑÐ¸", ID_BULLET + MENUITEM "&ÐÐ±Ð·Ð°Ñ...", ID_PARAFORMAT END END @@ -118,20 +118,20 @@ MENUITEM "Ð§Ð¾ÑÐ½Ð¸Ð¹", ID_COLOR_BLACK MENUITEM "ÐÐ¾ÑÐ¸ÑÐ½ÐµÐ²Ð¸Ð¹", ID_COLOR_MAROON MENUITEM "ÐÐµÐ»ÐµÐ½Ð¸Ð¹", ID_COLOR_GREEN - MENUITEM "ÐÐ»Ð¸Ð²ÐºÐ¾Ð²Ð¸Ð¹" ID_COLOR_OLIVE - MENUITEM "Ð¢ÐµÐ¼Ð½Ð¾-ÑÐ¸Ð½ÑÐ¹" ID_COLOR_NAVY - MENUITEM "ÐÑÑÐ¿ÑÑÐ¾Ð²Ð¸Ð¹" ID_COLOR_PURPLE - MENUITEM "Ð¡Ð¸Ð½ÑÐ¾-Ð·ÐµÐ»ÐµÐ½Ð¸Ð¹" ID_COLOR_TEAL - MENUITEM "Ð¡ÑÑÐ¸Ð¹" ID_COLOR_GRAY - MENUITEM "Ð¡ÑÑÐ±Ð»ÑÑÑÐ¸Ð¹" ID_COLOR_SILVER - MENUITEM "Ð§ÐµÑÐ²Ð¾Ð½Ð¸Ð¹" ID_COLOR_RED - MENUITEM "Ð¡Ð°Ð»Ð°ÑÐ¾Ð²Ð¸Ð¹" ID_COLOR_LIME - MENUITEM "ÐÐ¾Ð²ÑÐ¸Ð¹" ID_COLOR_YELLOW - MENUITEM "Ð¡Ð¸Ð½ÑÐ¹" ID_COLOR_BLUE - MENUITEM "ÐÐ°Ð»Ð¸Ð½Ð¾Ð²Ð¸Ð¹" ID_COLOR_FUCHSIA - MENUITEM "ÐÐ»Ð°ÐºÐ¸ÑÐ½Ð¸Ð¹" ID_COLOR_AQUA - MENUITEM "ÐÑÐ»Ð¸Ð¹" ID_COLOR_WHITE - MENUITEM "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾" ID_COLOR_AUTOMATIC + MENUITEM "ÐÐ»Ð¸Ð²ÐºÐ¾Ð²Ð¸Ð¹", ID_COLOR_OLIVE + MENUITEM "Ð¢ÐµÐ¼Ð½Ð¾-ÑÐ¸Ð½ÑÐ¹", ID_COLOR_NAVY + MENUITEM "ÐÑÑÐ¿ÑÑÐ¾Ð²Ð¸Ð¹", ID_COLOR_PURPLE + MENUITEM "Ð¡Ð¸Ð½ÑÐ¾-Ð·ÐµÐ»ÐµÐ½Ð¸Ð¹",ID_COLOR_TEAL + MENUITEM "Ð¡ÑÑÐ¸Ð¹", ID_COLOR_GRAY + MENUITEM "Ð¡ÑÑÐ±Ð»ÑÑÑÐ¸Ð¹", ID_COLOR_SILVER + MENUITEM "Ð§ÐµÑÐ²Ð¾Ð½Ð¸Ð¹", ID_COLOR_RED + MENUITEM "Ð¡Ð°Ð»Ð°ÑÐ¾Ð²Ð¸Ð¹", ID_COLOR_LIME + MENUITEM "ÐÐ¾Ð²ÑÐ¸Ð¹", ID_COLOR_YELLOW + MENUITEM "Ð¡Ð¸Ð½ÑÐ¹", ID_COLOR_BLUE + MENUITEM "ÐÐ°Ð»Ð¸Ð½Ð¾Ð²Ð¸Ð¹", ID_COLOR_FUCHSIA + MENUITEM "ÐÐ»Ð°ÐºÐ¸ÑÐ½Ð¸Ð¹", ID_COLOR_AQUA + MENUITEM "ÐÑÐ»Ð¸Ð¹", ID_COLOR_WHITE + MENUITEM "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾", ID_COLOR_AUTOMATIC END END Modified: trunk/reactos/base/applications/wordpad/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Zh.rc [iso-8859-1] Sat Oct 11 19:06:53 2014 @@ -82,9 +82,9 @@ POPUP "æ ¼å¼(&O)" BEGIN MENUITEM "åä½(&F)..", ID_FONTSETTINGS - MENUITEM "é¡¹ç®ç¬¦å·(&B)" ID_BULLET - MENUITEM "æ®µè½(&P)..." ID_PARAFORMAT - MENUITEM "å¶è¡¨ä½(&T)..." ID_TABSTOPS + MENUITEM "é¡¹ç®ç¬¦å·(&B)", ID_BULLET + MENUITEM "æ®µè½(&P)...", ID_PARAFORMAT + MENUITEM "å¶è¡¨ä½(&T)...", ID_TABSTOPS POPUP "èæ¯(&D)" BEGIN MENUITEM "ç³»ç»(&S)\tCtrl+1", ID_BACK_1 @@ -105,8 +105,8 @@ MENUITEM "å¤å¶(&C)", ID_EDIT_COPY MENUITEM "ç²è´´(&P)", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "é¡¹ç®ç¬¦å·(&B)" ID_BULLET - MENUITEM "æ®µè½(&P)..." ID_PARAFORMAT + MENUITEM "é¡¹ç®ç¬¦å·(&B)", ID_BULLET + MENUITEM "æ®µè½(&P)...", ID_PARAFORMAT END END @@ -117,20 +117,20 @@ MENUITEM "é»è²", ID_COLOR_BLACK /* æªæ¾å°âæ åè¯åè¡¨â */ MENUITEM "æ è²", ID_COLOR_MAROON MENUITEM "ç»¿è²", ID_COLOR_GREEN - MENUITEM "æ©æ¦è²" ID_COLOR_OLIVE - MENUITEM "èé" ID_COLOR_NAVY - MENUITEM "ç´«è²" ID_COLOR_PURPLE - MENUITEM "é¸ç¿ç»¿" ID_COLOR_TEAL - MENUITEM "ç°è²" ID_COLOR_GRAY - MENUITEM "é¶è²" ID_COLOR_SILVER - MENUITEM "çº¢è²" ID_COLOR_RED - MENUITEM "éæ è²" ID_COLOR_LIME - MENUITEM "é»è²" ID_COLOR_YELLOW - MENUITEM "èè²" ID_COLOR_BLUE - MENUITEM "æ´çº¢" ID_COLOR_FUCHSIA /* =magenta? */ - MENUITEM "æ°´ç»¿" ID_COLOR_AQUA - MENUITEM "ç½è²" ID_COLOR_WHITE - MENUITEM "èªå¨" ID_COLOR_AUTOMATIC + MENUITEM "æ©æ¦è²", ID_COLOR_OLIVE + MENUITEM "èé", ID_COLOR_NAVY + MENUITEM "ç´«è²", ID_COLOR_PURPLE + MENUITEM "é¸ç¿ç»¿", ID_COLOR_TEAL + MENUITEM "ç°è²", ID_COLOR_GRAY + MENUITEM "é¶è²", ID_COLOR_SILVER + MENUITEM "çº¢è²", ID_COLOR_RED + MENUITEM "éæ è²", ID_COLOR_LIME + MENUITEM "é»è²", ID_COLOR_YELLOW + MENUITEM "èè²", ID_COLOR_BLUE + MENUITEM "æ´çº¢", ID_COLOR_FUCHSIA /* =magenta? */ + MENUITEM "æ°´ç»¿", ID_COLOR_AQUA + MENUITEM "ç½è²", ID_COLOR_WHITE + MENUITEM "èªå¨", ID_COLOR_AUTOMATIC END END @@ -326,9 +326,9 @@ POPUP "æ ¼å¼(&O)" BEGIN MENUITEM "åå(&F)..", ID_FONTSETTINGS - MENUITEM "åå½é»(&B)" ID_BULLET - MENUITEM "æ®µè½(&P)..." ID_PARAFORMAT - MENUITEM "æ¨ç±¤(&T)..." ID_TABSTOPS + MENUITEM "åå½é»(&B)", ID_BULLET + MENUITEM "æ®µè½(&P)...", ID_PARAFORMAT + MENUITEM "æ¨ç±¤(&T)...", ID_TABSTOPS POPUP "èæ¯(&D)" BEGIN MENUITEM "ç³»çµ±(&S)\tCtrl+1", ID_BACK_1 @@ -337,7 +337,7 @@ END POPUP "å¹«å©(&H)" BEGIN - MENUITEM "éæ¼ &Wine å¯«åæ¿" ID_ABOUT + MENUITEM "éæ¼ &Wine å¯«åæ¿", ID_ABOUT END END @@ -349,8 +349,8 @@ MENUITEM "è¤è£½(&C)", ID_EDIT_COPY MENUITEM "è²¼ä¸(&P)", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "åå½é»(&B)" ID_BULLET - MENUITEM "æ®µè½(&P)..." ID_PARAFORMAT + MENUITEM "åå½é»(&B)", ID_BULLET + MENUITEM "æ®µè½(&P)...", ID_PARAFORMAT END END @@ -361,20 +361,20 @@ MENUITEM "Black", ID_COLOR_BLACK MENUITEM "Maroon", ID_COLOR_MAROON MENUITEM "Green", ID_COLOR_GREEN - MENUITEM "Olive" ID_COLOR_OLIVE - MENUITEM "Navy" ID_COLOR_NAVY - MENUITEM "Purple" ID_COLOR_PURPLE - MENUITEM "Teal" ID_COLOR_TEAL - MENUITEM "Gray" ID_COLOR_GRAY - MENUITEM "Silver" ID_COLOR_SILVER - MENUITEM "Red" ID_COLOR_RED - MENUITEM "Lime" ID_COLOR_LIME - MENUITEM "Yellow" ID_COLOR_YELLOW - MENUITEM "Blue" ID_COLOR_BLUE - MENUITEM "Fuchsia" ID_COLOR_FUCHSIA - MENUITEM "Aqua" ID_COLOR_AQUA - MENUITEM "White" ID_COLOR_WHITE - MENUITEM "Automatic" ID_COLOR_AUTOMATIC + MENUITEM "Olive", ID_COLOR_OLIVE + MENUITEM "Navy", ID_COLOR_NAVY + MENUITEM "Purple", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "Gray", ID_COLOR_GRAY + MENUITEM "Silver", ID_COLOR_SILVER + MENUITEM "Red", ID_COLOR_RED + MENUITEM "Lime", ID_COLOR_LIME + MENUITEM "Yellow", ID_COLOR_YELLOW + MENUITEM "Blue", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Aqua", ID_COLOR_AQUA + MENUITEM "White", ID_COLOR_WHITE + MENUITEM "Automatic", ID_COLOR_AUTOMATIC END END

9 years, 11 months

[hbelusca] 64682: errm... proper commenting.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 11 18:40:08 2014 New Revision: 64682 URL: http://svn.reactos.org/svn/reactos?rev=64682&view=rev Log: errm... proper commenting. Modified: trunk/reactos/lib/fast486/common.inl Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Sat Oct 11 18:40:08 2014 @@ -27,13 +27,13 @@ #if defined (__GNUC__) #define CountLeadingZeros64(x) __builtin_clzll(x) -#if 0 +/* #elif (_MSC_VER >= 1500) && defined(_WIN64) #define CountLeadingZeros64(x) __lzcnt64(x) #elif (_MSC_VER >= 1500) #define CountLeadingZeros64(x) ((x) > 0xFFFFFFFFULL) ? __lzcnt((x) >> 32) \ : (__lzcnt(x) + 32) -#endif +*/ #else FORCEINLINE

9 years, 11 months

[akhaldi] 64681: [WORDPAD] * Sync with Wine 1.7.27. CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 11 18:39:41 2014 New Revision: 64681 URL: http://svn.reactos.org/svn/reactos?rev=64681&view=rev Log: [WORDPAD] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/base/applications/wordpad/lang/Da.rc trunk/reactos/base/applications/wordpad/lang/De.rc trunk/reactos/base/applications/wordpad/lang/En.rc trunk/reactos/base/applications/wordpad/lang/Fr.rc trunk/reactos/base/applications/wordpad/lang/He.rc trunk/reactos/base/applications/wordpad/lang/Hu.rc trunk/reactos/base/applications/wordpad/lang/It.rc trunk/reactos/base/applications/wordpad/lang/Ja.rc trunk/reactos/base/applications/wordpad/lang/Ko.rc trunk/reactos/base/applications/wordpad/lang/Lt.rc trunk/reactos/base/applications/wordpad/lang/Nl.rc trunk/reactos/base/applications/wordpad/lang/No.rc trunk/reactos/base/applications/wordpad/lang/Pl.rc trunk/reactos/base/applications/wordpad/lang/Pt.rc trunk/reactos/base/applications/wordpad/lang/Ro.rc trunk/reactos/base/applications/wordpad/lang/Ru.rc trunk/reactos/base/applications/wordpad/lang/Si.rc trunk/reactos/base/applications/wordpad/lang/Sq.rc trunk/reactos/base/applications/wordpad/lang/Sv.rc trunk/reactos/base/applications/wordpad/lang/Tr.rc trunk/reactos/base/applications/wordpad/lang/Uk.rc trunk/reactos/base/applications/wordpad/lang/Zh.rc trunk/reactos/base/applications/wordpad/res/wordpad.ico trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/wordpad/lang/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/lang/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/res/wordpad.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

9 years, 11 months

← Newer
1
...
45
46
47
48
49
50
51
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014