Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 67561: [NTVDM] The DOS CON driver should support extended keystrokes.
by aandrejevic＠svn.reactos.org 05 May '15

05 May '15

Author: aandrejevic Date: Tue May 5 17:56:37 2015 New Revision: 67561 URL: http://svn.reactos.org/svn/reactos?rev=67561&view=rev Log: [NTVDM] The DOS CON driver should support extended keystrokes. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Tue May 5 17:56:37 2015 @@ -42,8 +42,8 @@ { if (!ExtendedCode) { - /* Call the BIOS INT 16h, AH=00h "Get Keystroke" */ - setAH(0x00); + /* Call the BIOS INT 16h, AH=10h "Get Extended Keystroke" */ + setAH(0x10); Int32Call(&DosContext, BIOS_KBD_INTERRUPT); /* Retrieve the character in AL (scan code is in AH) */ @@ -59,7 +59,7 @@ } /* Check if this is a special character */ - if (Character == 0) ExtendedCode = getAH(); + if (Character == 0 || Character == 0xE0) ExtendedCode = getAH(); if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); Pointer[BytesRead++] = Character;

1 0

[aandrejevic] 67560: [NTVDM] Fix the BIOS handling of extended scancodes.
by aandrejevic＠svn.reactos.org 05 May '15

05 May '15

Author: aandrejevic Date: Tue May 5 17:37:06 2015 New Revision: 67560 URL: http://svn.reactos.org/svn/reactos?rev=67560&view=rev Log: [NTVDM] Fix the BIOS handling of extended scancodes. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Tue May 5 17:37:06 2015 @@ -87,7 +87,7 @@ /* Wait for keystroke and read */ case 0x00: /* Wait for extended keystroke and read */ - case 0x10: // FIXME: Temporarily do the same as INT 16h, 00h + case 0x10: { WORD Character; @@ -99,6 +99,12 @@ break; } + if (getAH() == 0x00 && LOBYTE(Character) == 0xE0) + { + /* Clear the extended code */ + Character &= 0xFF00; + } + BiosKbdBufferPop(); setAX(Character); @@ -108,7 +114,7 @@ /* Get keystroke status */ case 0x01: /* Get extended keystroke status */ - case 0x11: // FIXME: Temporarily do the same as INT 16h, 01h + case 0x11: { WORD Character; @@ -122,6 +128,12 @@ { /* No character, set ZF */ Stack[STACK_FLAGS] |= EMULATOR_FLAG_ZF; + } + + if (getAH() == 0x01 && LOBYTE(Character) == 0xE0) + { + /* Clear the extended code */ + Character &= 0xFF00; } break; @@ -176,6 +188,7 @@ // Keyboard IRQ 1 static VOID WINAPI BiosKeyboardIrq(LPWORD Stack) { + static BOOLEAN Extended = FALSE; BOOLEAN SkipScanCode; BYTE ScanCode, VirtualKey; WORD Character; @@ -204,6 +217,12 @@ setAX(AX); setCF(CF); + if (ScanCode == 0xE0) + { + Extended = TRUE; + goto Quit; + } + /* Check whether CF is clear. If so, skip the scan code. */ if (SkipScanCode) goto Quit; @@ -242,10 +261,10 @@ default: { - Character = 0; - - /* If ALT isn't held down, find out which character this is */ - if (!(Bda->KeybdShiftFlags & (BDA_KBDFLAG_ALT | BDA_KBDFLAG_LALT | BDA_KBDFLAG_RALT))) + Character = Extended ? 0xE0 : 0x00; + + /* If this is not an extended scancode, and ALT isn't held down, find out which character this is */ + if (!Extended && !(Bda->KeybdShiftFlags & (BDA_KBDFLAG_ALT | BDA_KBDFLAG_LALT | BDA_KBDFLAG_RALT))) { if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) == 0) { @@ -287,6 +306,9 @@ if (BiosKeyboardMap[VK_CAPITAL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CAPSLOCK; if (BiosKeyboardMap[VK_INSERT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_INSERT; + /* Clear the extended key flag */ + Extended = FALSE; + DPRINT("BiosKeyboardIrq - Character = 0x%X, ScanCode = 0x%X, KeybdShiftFlags = 0x%X\n", Character, ScanCode, Bda->KeybdShiftFlags);

1 0

[dreimer] 67559: [ROSAPPS] After r67555 regexpl builds fine on MSVC. So reactivate it. Thx goes to ThFabba
by dreimer＠svn.reactos.org 05 May '15

05 May '15

Author: dreimer Date: Tue May 5 17:02:28 2015 New Revision: 67559 URL: http://svn.reactos.org/svn/reactos?rev=67559&view=rev Log: [ROSAPPS] After r67555 regexpl builds fine on MSVC. So reactivate it. Thx goes to ThFabba Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt trunk/rosapps/applications/sysutils/regexpl/CMakeLists.txt Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Tue May 5 17:02:28 2015 @@ -7,7 +7,7 @@ add_subdirectory(lsdd) add_subdirectory(man) add_subdirectory(pedump) -#add_subdirectory(regexpl) +add_subdirectory(regexpl) add_subdirectory(rosddt) add_subdirectory(screenshot) add_subdirectory(systeminfo) Modified: trunk/rosapps/applications/sysutils/regexpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege… ============================================================================== --- trunk/rosapps/applications/sysutils/regexpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/regexpl/CMakeLists.txt [iso-8859-1] Tue May 5 17:02:28 2015 @@ -32,5 +32,5 @@ add_executable(regexpl ${SOURCE} regexpl.rc) set_module_type(regexpl win32cui) -add_importlibs(regexpl user32 advapi32 msvcrt kernel32) +add_importlibs(regexpl user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET regexpl DESTINATION reactos/system32 FOR all)

1 0

[cwittich] 67558: [NTVDM] addenum to r67557
by cwittich＠svn.reactos.org 05 May '15

05 May '15

Author: cwittich Date: Tue May 5 08:11:22 2015 New Revision: 67558 URL: http://svn.reactos.org/svn/reactos?rev=67558&view=rev Log: [NTVDM] addenum to r67557 Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Tue May 5 08:11:22 2015 @@ -192,7 +192,6 @@ { if (Timer->Flags & HARDWARE_TIMER_ENABLED) RemoveEntryList(&Timer->Link); RtlFreeHeap(RtlGetProcessHeap(), 0, Timer); - Timer = NULL; } }

1 0

[cwittich] 67557: [NTVDM] don't try to deference an uninitialized Timer
by cwittich＠svn.reactos.org 05 May '15

05 May '15

Author: cwittich Date: Tue May 5 08:07:08 2015 New Revision: 67557 URL: http://svn.reactos.org/svn/reactos?rev=67557&view=rev Log: [NTVDM] don't try to deference an uninitialized Timer Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Tue May 5 08:07:08 2015 @@ -188,8 +188,12 @@ VOID DestroyHardwareTimer(PHARDWARE_TIMER Timer) { - if (Timer->Flags & HARDWARE_TIMER_ENABLED) RemoveEntryList(&Timer->Link); - RtlFreeHeap(RtlGetProcessHeap(), 0, Timer); + if (Timer) + { + if (Timer->Flags & HARDWARE_TIMER_ENABLED) RemoveEntryList(&Timer->Link); + RtlFreeHeap(RtlGetProcessHeap(), 0, Timer); + Timer = NULL; + } } BOOLEAN ClockInitialize(VOID)

1 0

[aandrejevic] 67556: [NTVDM] In DosTerminateProcess, McbSegment is the segment of the MCB itself, not the data it contains.
by aandrejevic＠svn.reactos.org 05 May '15

05 May '15

Author: aandrejevic Date: Tue May 5 03:52:25 2015 New Revision: 67556 URL: http://svn.reactos.org/svn/reactos?rev=67556&view=rev Log: [NTVDM] In DosTerminateProcess, McbSegment is the segment of the MCB itself, not the data it contains. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Tue May 5 03:52:25 2015 @@ -839,7 +839,7 @@ if (KeepResident) { /* Check if this is the PSP block and we should reduce its size */ - if (McbSegment == Psp && KeepResident < CurrentMcb->Size) + if ((McbSegment + 1) == Psp && KeepResident < CurrentMcb->Size) { /* Reduce the size of the block */ DosResizeMemory(McbSegment + 1, KeepResident, NULL);

1 0

[tfaber] 67555: [C++] - Add nothrow versions of new/delete operators - Add <cassert> - Fix a TODO and add missing dependency to <exception> header
by tfaber＠svn.reactos.org 05 May '15

05 May '15

Author: tfaber Date: Tue May 5 02:44:17 2015 New Revision: 67555 URL: http://svn.reactos.org/svn/reactos?rev=67555&view=rev Log: [C++] - Add nothrow versions of new/delete operators - Add <cassert> - Fix a TODO and add missing dependency to <exception> header Added: trunk/reactos/include/c++/cassert (with props) trunk/reactos/lib/sdk/cpprt/new_nothrow.cpp (with props) Modified: trunk/reactos/include/c++/exception trunk/reactos/lib/sdk/cpprt/CMakeLists.txt trunk/reactos/lib/sdk/cpprt/i386/cpprt.s trunk/reactos/lib/sdk/cpprt/typeinfo.cpp Added: trunk/reactos/include/c++/cassert URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/cassert?re… ============================================================================== --- trunk/reactos/include/c++/cassert (added) +++ trunk/reactos/include/c++/cassert [iso-8859-1] Tue May 5 02:44:17 2015 @@ -0,0 +1,5 @@ +// C++ forwarding C assert header. + +#pragma once + +#include <assert.h> Propchange: trunk/reactos/include/c++/cassert ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/c++/exception URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/c%2B%2B/exception?… ============================================================================== --- trunk/reactos/include/c++/exception [iso-8859-1] (original) +++ trunk/reactos/include/c++/exception [iso-8859-1] Tue May 5 02:44:17 2015 @@ -2,6 +2,8 @@ #ifndef __EXCEPTION__ #define __EXCEPTION__ + +#include <crtdefs.h> extern "C++" { Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] Tue May 5 02:44:17 2015 @@ -1,10 +1,13 @@ set_cpp(WITH_EXCEPTIONS) -include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/sdk/crt/include + ${REACTOS_SOURCE_DIR}/include/c++) list(APPEND SOURCE ehvec.cpp + new_nothrow.cpp typeinfo.cpp) if(ARCH STREQUAL "i386") Modified: trunk/reactos/lib/sdk/cpprt/i386/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/i386/cpprt.s… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/i386/cpprt.s [iso-8859-1] Tue May 5 02:44:17 2015 @@ -39,4 +39,10 @@ ; void __cdecl operator delete(void *,unsigned int) DEFINE_ALIAS ??3@YAXPAXI@Z, ??3@YAXPAX@Z +; void __cdecl operator delete(void *,struct std::nothrow_t const &) +DEFINE_ALIAS ??3@YAXPAXABUnothrow_t@std@@@Z, ??3@YAXPAX@Z + +; void __cdecl operator delete[](void *,struct std::nothrow_t const &) +DEFINE_ALIAS ??_V@YAXPAXABUnothrow_t@std@@@Z, ??3@YAXPAX@Z + END Added: trunk/reactos/lib/sdk/cpprt/new_nothrow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/new_nothrow.… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/new_nothrow.cpp (added) +++ trunk/reactos/lib/sdk/cpprt/new_nothrow.cpp [iso-8859-1] Tue May 5 02:44:17 2015 @@ -0,0 +1,37 @@ +/* + * PROJECT: ReactOS C++ runtime library + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: nothrow version of the new operators + * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include <new> + +void* operator new (std::size_t) throw(std::bad_alloc); +void* operator new[] (std::size_t) throw(std::bad_alloc); + +const std::nothrow_t std::nothrow; + +void* operator new (std::size_t size, const std::nothrow_t& nothrow_constant) throw() +{ + try + { + return operator new (size); + } + catch (std::bad_alloc) + { + return NULL; + } +} + +void* operator new[] (std::size_t size, const std::nothrow_t& nothrow_constant) throw() +{ + try + { + return operator new[] (size); + } + catch (std::bad_alloc) + { + return NULL; + } +} Propchange: trunk/reactos/lib/sdk/cpprt/new_nothrow.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/cpprt/typeinfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/typeinfo.cpp… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/typeinfo.cpp [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/typeinfo.cpp [iso-8859-1] Tue May 5 02:44:17 2015 @@ -5,14 +5,7 @@ * PROGRAMMER: Thomas Faber (thomas.faber(a)reactos.org) */ -/* TODO: #include <exception> instead */ -class type_info { -public: - __declspec(dllimport) virtual ~type_info(); -private: - type_info(const type_info &); - type_info &operator=(const type_info &); -}; +#include <typeinfo> /* These stubs don't need to do anything (those private functions are never * called). They need to be in cpprt, though, in order to have the vtable

1 0

[dreimer] 67554: oooops
by dreimer＠svn.reactos.org 05 May '15

05 May '15

Author: dreimer Date: Tue May 5 01:27:21 2015 New Revision: 67554 URL: http://svn.reactos.org/svn/reactos?rev=67554&view=rev Log: oooops Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Tue May 5 01:27:21 2015 @@ -7,7 +7,7 @@ add_subdirectory(lsdd) add_subdirectory(man) add_subdirectory(pedump) -//add_subdirectory(regexpl) +#add_subdirectory(regexpl) add_subdirectory(rosddt) add_subdirectory(screenshot) add_subdirectory(systeminfo)

1 0

[dreimer] 67553: [ROSAPPS] Disable regexpl for now because this is a strange MSVC build error...
by dreimer＠svn.reactos.org 05 May '15

05 May '15

Author: dreimer Date: Tue May 5 01:25:11 2015 New Revision: 67553 URL: http://svn.reactos.org/svn/reactos?rev=67553&view=rev Log: [ROSAPPS] Disable regexpl for now because this is a strange MSVC build error... Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt Modified: trunk/rosapps/applications/sysutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/CMak… ============================================================================== --- trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/CMakeLists.txt [iso-8859-1] Tue May 5 01:25:11 2015 @@ -7,7 +7,7 @@ add_subdirectory(lsdd) add_subdirectory(man) add_subdirectory(pedump) -add_subdirectory(regexpl) +//add_subdirectory(regexpl) add_subdirectory(rosddt) add_subdirectory(screenshot) add_subdirectory(systeminfo)

1 0

[dreimer] 67552: [ROSAPPS] Add some missing german translations Add some missing manifests Improve some resources Add possibility to build an application with one language
by dreimer＠svn.reactos.org 05 May '15

05 May '15

Author: dreimer Date: Tue May 5 01:07:42 2015 New Revision: 67552 URL: http://svn.reactos.org/svn/reactos?rev=67552&view=rev Log: [ROSAPPS] Add some missing german translations Add some missing manifests Improve some resources Add possibility to build an application with one language Added: trunk/rosapps/applications/screensavers/circles/lang/de-DE.rc (with props) trunk/rosapps/applications/screensavers/ssstars/lang/de-DE.rc (with props) Modified: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc trunk/rosapps/applications/imagesoft/rsrc.rc trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc trunk/rosapps/applications/screensavers/butterflies/rsrc.rc trunk/rosapps/applications/screensavers/circles/circles.rc trunk/rosapps/applications/screensavers/matrix/rsrc.rc trunk/rosapps/applications/screensavers/ssstars/lang/en-US.rc trunk/rosapps/applications/screensavers/ssstars/lang/it-IT.rc trunk/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc trunk/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc trunk/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc trunk/rosapps/applications/screensavers/ssstars/resource.rc trunk/rosapps/applications/screensavers/starfield/starfield.rc trunk/rosapps/applications/sysutils/ctm/ctm.rc trunk/rosapps/templates/old_wordpad/rsrc.rc Modified: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -31,6 +31,8 @@ IDB_EDIT_GLYPH_TOOLBOX BITMAP "res/toolbox.bmp" IDI_MAIN ICON "res/main.ico" IDI_DOC ICON "res/doc.ico" + +#include <reactos/manifest_exe.rc> /* UTF-8 */ #pragma code_page(65001) Modified: trunk/rosapps/applications/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/rsr… ============================================================================== --- trunk/rosapps/applications/imagesoft/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/rsrc.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -1,5 +1,7 @@ #include <windows.h> #include "resource.h" + +#include <reactos/manifest_exe.rc> /* include localised resources */ // UTF-8 Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -10,18 +10,44 @@ #define REACTOS_STR_ORIGINAL_FILENAME "scrnsave.scr\0" #include <reactos/version.rc> +#include <reactos/manifest_exe.rc> + /* UTF-8 */ #pragma code_page(65001) -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/lt-LT.rc" -#include "lang/nl-NL.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" -#include "lang/sk-SK.rc" -#include "lang/uk-UA.rc" +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.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_LT_LT + #include "lang/lt-LT.rc" +#endif +#ifdef LANGUAGE_NL_NL + #include "lang/nl-NL.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -1,14 +1,38 @@ /* UTF-8 */ #pragma code_page(65001) -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/lt-LT.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" -#include "lang/sk-SK.rc" -#include "lang/uk-UA.rc" +#include <reactos/manifest_exe.rc> + +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.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_LT_LT + #include "lang/lt-LT.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Modified: trunk/rosapps/applications/screensavers/circles/circles.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -11,13 +11,32 @@ #include <reactos/version.rc> +#include <reactos/manifest_exe.rc> + /* UTF-8 */ #pragma code_page(65001) -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/no-NO.rc" -#include "lang/ro-RO.rc" -#include "lang/sk-SK.rc" -#include "lang/uk-UA.rc" +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.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_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Added: trunk/rosapps/applications/screensavers/circles/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/lang/de-DE.rc (added) +++ trunk/rosapps/applications/screensavers/circles/lang/de-DE.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -0,0 +1,7 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Kreise" + IDS_TEXT "Keine Einstellungen notwendig." +END Propchange: trunk/rosapps/applications/screensavers/circles/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/matrix/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/matrix/rsrc.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -7,19 +7,47 @@ IDC_BLANKCURSOR CURSOR DISCARDABLE "cursor1.cur" IDI_ICON1 ICON DISCARDABLE "icon1.ico" +#include <reactos/manifest_exe.rc> + /* UTF-8 */ #pragma code_page(65001) -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/lt-LT.rc" -#include "lang/nl-NL.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" -#include "lang/sk-SK.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.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_LT_LT + #include "lang/lt-LT.rc" +#endif +#ifdef LANGUAGE_NL_NL + #include "lang/nl-NL.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_TH_TH + #include "lang/th-TH.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Added: trunk/rosapps/applications/screensavers/ssstars/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/de-DE.rc (added) +++ trunk/rosapps/applications/screensavers/ssstars/lang/de-DE.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -0,0 +1,52 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +// Dialog + +DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 292, 282 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION +CAPTION "Einstellungen" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Optionen",IDC_STATIC,16,100,260,76 + RTEXT "Anzahl an Sternen:",IDC_STATIC,24,116,68,12, + SS_CENTERIMAGE + CONTROL "Slider1",IDC_SLIDER_NUM_OF_STARS,"msctls_trackbar32", + TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,96,116,140,12 + CTEXT "Static",IDC_TEXT_NUM_OF_STARS,240,116,24,12, + SS_CENTERIMAGE,WS_EX_STATICEDGE + RTEXT "Geschwindigkeit:",IDC_STATIC,24,137,68,12,SS_CENTERIMAGE + CONTROL "Slider1",IDC_SLIDER_SPEED,"msctls_trackbar32",TBS_BOTH | + TBS_NOTICKS | WS_TABSTOP,96,137,140,12 + CTEXT "Static",IDC_TEXT_SPEED,240,137,24,12,SS_CENTERIMAGE, + WS_EX_STATICEDGE + RTEXT "Rotation:",IDC_STATIC,24,156,68,12,SS_CENTERIMAGE + COMBOBOX IDC_COMBO_ROTATION,100,156,80,60,CBS_DROPDOWNLIST | + WS_TABSTOP + CONTROL "",IDC_IMAGE_COSMOS,"Static",SS_BITMAP | SS_CENTERIMAGE, + 4,4,284,92 + GROUPBOX "Erweitert",IDC_STATIC,16,180,260,72 + CONTROL "Hintergrund-Blending aktivieren",IDC_CHECK_DOBLENDING, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 + CONTROL "Genaue Perspektivenkorrektur aktivieren", + IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,24,208,160,10 + CONTROL "Texturfilterung aktivieren",IDC_CHECK_FILTERING, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 + CONTROL "Weiche Schattierungen aktivieren",IDC_CHECK_SHADING,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 + PUSHBUTTON "OK",IDOK,60,260,52,16 + PUSHBUTTON "Abbrechen",IDCANCEL,120,260,52,16 + PUSHBUTTON "Ãber",IDC_BUTTON_ABOUT,179,260,52,16 +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Starfield" + IDS_ROTATION_NONE "Keine" + IDS_ROTATION_LINEAR "Linear" + IDS_ROTATION_PERIODIC "Periodisch" + IDS_LICENSE "Starfield ist freie Software verÃ¶ffentlicht unter der GNU GPL Lizenz." + IDS_AUTHOR "Erstellt von Carlo Bramini" +END Propchange: trunk/rosapps/applications/screensavers/ssstars/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/ssstars/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/en-US.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/lang/en-US.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -26,14 +26,14 @@ 4,4,284,92 GROUPBOX "Advanced",IDC_STATIC,16,180,260,72 CONTROL "Enable background blending",IDC_CHECK_DOBLENDING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 CONTROL "Enable accurate perspective correction", IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,24,208,142,10 + WS_TABSTOP,24,208,160,10 CONTROL "Enable texture filtering",IDC_CHECK_FILTERING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 CONTROL "Enable smooth shading",IDC_CHECK_SHADING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10 + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 PUSHBUTTON "OK",IDOK,60,260,52,16 PUSHBUTTON "Cancel",IDCANCEL,120,260,52,16 PUSHBUTTON "About",IDC_BUTTON_ABOUT,179,260,52,16 Modified: trunk/rosapps/applications/screensavers/ssstars/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/lang/it-IT.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -26,14 +26,14 @@ 4,4,284,92 GROUPBOX "Avanzate",IDC_STATIC,16,180,260,72 CONTROL "Attiva blending sullo sfondo",IDC_CHECK_DOBLENDING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,102,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 CONTROL "Attiva correzione prospettica accurata", IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,24,208,135,10 + WS_TABSTOP,24,208,160,10 CONTROL "Attiva filtraggio delle texture",IDC_CHECK_FILTERING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,110,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 CONTROL "Attiva illuminazione accurata",IDC_CHECK_SHADING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,24,232,110,10 + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 PUSHBUTTON "OK",IDOK,60,260,52,16 PUSHBUTTON "Annulla",IDCANCEL,120,260,52,16 PUSHBUTTON "Info",IDC_BUTTON_ABOUT,179,260,52,16 Modified: trunk/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/lang/pl-PL.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -26,14 +26,14 @@ 4,4,284,92 GROUPBOX "Zaawansowane",IDC_STATIC,16,180,260,72 CONTROL "WÅÄcz ÅÄczenie tÅa",IDC_CHECK_DOBLENDING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 CONTROL "WÅÄcz precyzyjnÄ poprawÄ perspektywy", IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,24,208,142,10 + WS_TABSTOP,24,208,160,10 CONTROL "WÅÄcz filtrowanie tekstur",IDC_CHECK_FILTERING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 CONTROL "WÅÄcz wygÅadzanie cieni",IDC_CHECK_SHADING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10 + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 PUSHBUTTON "OK",IDOK,60,260,52,16 PUSHBUTTON "Anuluj",IDCANCEL,120,260,52,16 PUSHBUTTON "O wygaszaczu",IDC_BUTTON_ABOUT,179,260,52,16 Modified: trunk/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/lang/ro-RO.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -34,14 +34,14 @@ 4,4,284,92 GROUPBOX "A&vansateâ¦",IDC_STATIC,16,180,260,72 CONTROL "ActiveazÄ &Wamestec de fundal",IDC_CHECK_DOBLENDING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 CONTROL "ActiveazÄ &corecÈie finÄ de perspectivÄ", IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,24,208,142,10 + WS_TABSTOP,24,208,160,10 CONTROL "Activea&zÄ filtrarea texturilor",IDC_CHECK_FILTERING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 CONTROL "ActiveazÄ umbrire omogenÄ",IDC_CHECK_SHADING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10 + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 PUSHBUTTON "Con&firmÄ",IDOK,60,260,52,16 PUSHBUTTON "A&nuleazÄ",IDCANCEL,120,260,52,16 PUSHBUTTON "&Despreâ¦",IDC_BUTTON_ABOUT,179,260,52,16 Modified: trunk/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/lang/ru-RU.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -26,14 +26,14 @@ 4,4,284,92 GROUPBOX "ÐÐ¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸",IDC_STATIC,16,180,260,72 CONTROL "ÐÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¾Ð½Ð¾Ð²Ð¾Ðµ ÑÐ¼ÐµÑÐ¸Ð²Ð°Ð½Ð¸Ðµ",IDC_CHECK_DOBLENDING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,110,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,196,160,10 CONTROL "ÐÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¾ÑÐ½ÑÑ ÐºÐ¾ÑÑÐµÐºÑÐ¸Ñ Ð¿ÐµÑÑÐ¿ÐµÐºÑÐ¸Ð²Ñ", IDC_CHECK_PERSPECTIVE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,24,208,142,10 + WS_TABSTOP,24,208,160,10 CONTROL "ÐÐºÐ»ÑÑÐ¸ÑÑ ÑÐ¸Ð»ÑÑÑÐ°ÑÐ¸Ñ ÑÐµÐºÑÑÑÑ",IDC_CHECK_FILTERING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,90,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,24,220,160,10 CONTROL "ÐÐºÐ»ÑÑÐ¸ÑÑ Ð¼ÑÐ³ÐºÐ¸Ðµ ÑÐµÐ½Ð¸",IDC_CHECK_SHADING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,24,232,100,10 + BS_AUTOCHECKBOX | WS_TABSTOP,24,232,160,10 PUSHBUTTON "OK",IDOK,60,260,52,16 PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,120,260,52,16 PUSHBUTTON "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ",IDC_BUTTON_ABOUT,179,260,52,16 Modified: trunk/rosapps/applications/screensavers/ssstars/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/ssstars/resource.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/ssstars/resource.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -39,13 +39,27 @@ IDB_COSMOS BITMAP DISCARDABLE "res/cosmicfractal.bmp" IDB_STAR BITMAP DISCARDABLE "res/star.bmp" +#include <reactos/manifest_exe.rc> // Language resources /* UTF-8 */ #pragma code_page(65001) -#include "lang/en-US.rc" -#include "lang/it-IT.rc" -#include "lang/ro-RO.rc" -#include "lang/ru-RU.rc" -#include "lang/pl-PL.rc" +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#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 Modified: trunk/rosapps/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/starfield.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/starfield/starfield.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -28,7 +28,7 @@ #ifdef LANGUAGE_ES_ES #include "lang/es-ES.rc" #endif -#ifdef LANGUAGE_ES_ES +#ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif #ifdef LANGUAGE_LT_LT Modified: trunk/rosapps/applications/sysutils/ctm/ctm.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/ctm/… ============================================================================== --- trunk/rosapps/applications/sysutils/ctm/ctm.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/ctm/ctm.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -11,11 +11,27 @@ /* UTF-8 */ #pragma code_page(65001) -#include "lang/en-US.rc" -#include "lang/fr-FR.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/no-NO.rc" -#include "lang/ro-RO.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" +#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_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Modified: trunk/rosapps/templates/old_wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/old_wordpad/rsrc… ============================================================================== --- trunk/rosapps/templates/old_wordpad/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/templates/old_wordpad/rsrc.rc [iso-8859-1] Tue May 5 01:07:42 2015 @@ -2,20 +2,50 @@ #include <commctrl.h> #include "resource.h" +#include <reactos/manifest_exe.rc> + /* UTF-8 */ #pragma code_page(65001) -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/el-GR.rc" -#include "lang/en-US.rc" -#include "lang/fi-FI.rc" -#include "lang/fr-FR.rc" -#include "lang/it-IT.rc" -#include "lang/no-NO.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/th-TH.rc" -#include "lang/uk-UA.rc" -#include "lang/zh-CN.rc" +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.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_FI_FI + #include "lang/fi-FI.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif +#ifdef LANGUAGE_NL_NL + #include "lang/nl-NL.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif +#ifdef LANGUAGE_TH_TH + #include "lang/th-TH.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif +#ifdef LANGUAGE_ZH_CN + #include "lang/zh-CN.rc" +#endif

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs