Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[tkreuzer] 57208: [CRT_APITEST] Fix broken test.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Aug 31 17:20:56 2012 New Revision: 57208 URL: http://svn.reactos.org/svn/reactos?rev=57208&view=rev Log: [CRT_APITEST] Fix broken test. Modified: trunk/rostests/apitests/crt/_vscwprintf.c Modified: trunk/rostests/apitests/crt/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] Fri Aug 31 17:20:56 2012 @@ -16,13 +16,14 @@ /* Test the basic functionality */ va_start(args, formatString); ret = _vscwprintf(formatString, args); - ok(expected_ret == ret, "Test failed: expected %i, got %i.\n", expected_ret, ret); + ok(expected_ret == ret, "expected %i, got %i.\n", expected_ret, ret); } START_TEST(_vscwprintf) { /* Lesson of the day: don't mix wide and ansi char */ - call_varargs(19, L"%s world!", "hello"); + /* Lesson of the week: don't ignore the lesson of the day */ + call_varargs(12, L"%hs world!", "hello"); call_varargs(12, L"%s world!", L"hello"); call_varargs(17, L"Jack ate %u pies", 100); /* Do not test NULL argument. That is verified to SEGV on a */

12 years

[mnordell] 57207: Stop erroneous reporting of SEGV from test case. MS own CRT SEGV on NULL format string

by mnordell＠svn.reactos.org

Author: mnordell Date: Fri Aug 31 14:16:17 2012 New Revision: 57207 URL: http://svn.reactos.org/svn/reactos?rev=57207&view=rev Log: Stop erroneous reporting of SEGV from test case. MS own CRT SEGV on NULL format string Modified: trunk/rostests/apitests/crt/_vscprintf.c trunk/rostests/apitests/crt/_vscwprintf.c Modified: trunk/rostests/apitests/crt/_vscprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscprintf.c… ============================================================================== --- trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscprintf.c [iso-8859-1] Fri Aug 31 14:16:17 2012 @@ -25,7 +25,6 @@ call_varargs(12, "%S world!", L"hello"); call_varargs(12, "%s world!", "hello"); call_varargs(11, "%u cookies", 100); - /* Test NULL argument */ - call_varargs(-1, NULL); - ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); + /* Do not test NULL argument. That is verified to SEGV on a */ + /* release-build with VC10 and MS' msvcrt. */ } Modified: trunk/rostests/apitests/crt/_vscwprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/_vscwprintf.… ============================================================================== --- trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] (original) +++ trunk/rostests/apitests/crt/_vscwprintf.c [iso-8859-1] Fri Aug 31 14:16:17 2012 @@ -25,10 +25,6 @@ call_varargs(19, L"%s world!", "hello"); call_varargs(12, L"%s world!", L"hello"); call_varargs(17, L"Jack ate %u pies", 100); - - /* Test NULL argument */ - call_varargs(-1, NULL); -#if defined(TEST_MSVCRT) /* NTDLL doesn't use/set errno */ - ok(errno == EINVAL, "Expected EINVAL, got %u\n", errno); -#endif + /* Do not test NULL argument. That is verified to SEGV on a */ + /* release-build with VC10 and MS' msvcrt. */ }

12 years

[tkreuzer] 57206: Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 30 10:16:13 2012 New Revision: 57206 URL: http://svn.reactos.org/svn/reactos?rev=57206&view=rev Log: Fix build Modified: trunk/reactos/lib/sdk/crt/string/is_wctype.c Modified: trunk/reactos/lib/sdk/crt/string/is_wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/is_wcty… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/is_wctype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/is_wctype.c [iso-8859-1] Thu Aug 30 10:16:13 2012 @@ -1,6 +1,6 @@ #include <string.h> -extern const unsigned short wine_wctype_table[]; +int iswctype(wint_t wc, wctype_t wctypeFlags); /* * obsolete

12 years

[tkreuzer] 57205: [FREELDR/CRT] Freeldr size is currently limited to 448 KB. On MSVC it was already at 442 KB, before wine's wctype table was used. The new wctype table is itself 37 KB. This lead t...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Aug 30 10:12:55 2012 New Revision: 57205 URL: http://svn.reactos.org/svn/reactos?rev=57205&view=rev Log: [FREELDR/CRT] Freeldr size is currently limited to 448 KB. On MSVC it was already at 442 KB, before wine's wctype table was used. The new wctype table is itself 37 KB. This lead to freeldr overflowing into memory regions that were used for the filesystem buffer, causing bootfailures. Fix this by giving freeldr it's own using _isctype(), since freeldr casts WCHAR to CHAR anyway. Added: trunk/reactos/lib/sdk/crt/string/is_wctype.c (with props) trunk/reactos/lib/sdk/crt/string/iswctype.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/string/ctype.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -57,6 +57,8 @@ } // We need to emulate these, because the original ones don't work in freeldr +// These functions are here, because they need to be in the main compilation unit +// and cannot be in a library. int __cdecl wctomb(char *mbchar, wchar_t wchar) { *mbchar = (char)wchar; @@ -68,3 +70,10 @@ *wchar = (wchar_t)*mbchar; return 1; } + +// The wctype table is 144 KB, too much for poor freeldr +int iswctype(wint_t wc, wctype_t wctypeFlags) +{ + return _isctype((char)wc, wctypeFlags); +} + Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -252,6 +252,8 @@ string/atoi64.c string/atol.c string/ctype.c + string/iswctype.c + string/is_wctype.c string/itoa.c string/itow.c string/scanf.c Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -27,6 +27,8 @@ search/lfind.c stdlib/qsort.c string/ctype.c + string/iswctype.c + string/is_wctype.c string/scanf.c string/strcspn.c string/stricmp.c @@ -182,7 +184,7 @@ endif() add_library(libcntpr ${LIBCNTPR_SOURCE}) -add_target_compile_definitions(libcntpr +add_target_compile_definitions(libcntpr NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ Modified: trunk/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/ctype.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -587,24 +587,6 @@ /* * @implemented */ -int iswctype(wint_t wc, wctype_t wctypeFlags) -{ - return (wine_wctype_table[wine_wctype_table[wc >> 8] + (wc & 0xff)] & wctypeFlags); -} - -/* - * obsolete - * - * @implemented - */ -int is_wctype(wint_t wc, wctype_t wctypeFlags) -{ - return (wine_wctype_table[wine_wctype_table[wc >> 8] + (wc & 0xff)] & wctypeFlags); -} - -/* - * @implemented - */ int isalpha(int c) { return(_isctype(c, _ALPHA)); Added: trunk/reactos/lib/sdk/crt/string/is_wctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/is_wcty… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/is_wctype.c (added) +++ trunk/reactos/lib/sdk/crt/string/is_wctype.c [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -1,0 +1,13 @@ +#include <string.h> + +extern const unsigned short wine_wctype_table[]; + +/* + * obsolete + * + * @implemented + */ +int is_wctype(wint_t wc, wctype_t wctypeFlags) +{ + return iswctype(wc, wctypeFlags); +} Propchange: trunk/reactos/lib/sdk/crt/string/is_wctype.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/string/iswctype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/iswctyp… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/iswctype.c (added) +++ trunk/reactos/lib/sdk/crt/string/iswctype.c [iso-8859-1] Thu Aug 30 10:12:55 2012 @@ -1,0 +1,12 @@ +#include <string.h> + +extern const unsigned short wine_wctype_table[]; + +/* + * @implemented + */ +int iswctype(wint_t wc, wctype_t wctypeFlags) +{ + return (wine_wctype_table[wine_wctype_table[wc >> 8] + (wc & 0xff)] & wctypeFlags); +} + Propchange: trunk/reactos/lib/sdk/crt/string/iswctype.c ------------------------------------------------------------------------------ svn:eol-style = native

12 years

[jgardou] 57204: [MESA] - fix build

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Aug 30 00:57:44 2012 New Revision: 57204 URL: http://svn.reactos.org/svn/reactos?rev=57204&view=rev Log: [MESA] - fix build Added: trunk/reactos/dll/opengl/mesa/generated/mesa/matypes.h (with props) Added: trunk/reactos/dll/opengl/mesa/generated/mesa/matypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… ============================================================================== --- trunk/reactos/dll/opengl/mesa/generated/mesa/matypes.h (added) +++ trunk/reactos/dll/opengl/mesa/generated/mesa/matypes.h [iso-8859-1] Thu Aug 30 00:57:44 2012 @@ -1,0 +1,162 @@ +/* + * This file is automatically generated from the Mesa internal type + * definitions. Do not edit directly. + */ + +#ifndef __ASM_TYPES_H__ +#define __ASM_TYPES_H__ + + + +/* ============================================================= + * Offsets for struct gl_context + */ + +#define CTX_DRIVER_CTX 880 + +#define CTX_LIGHT_ENABLED 39932 +#define CTX_LIGHT_SHADE_MODEL 39936 +#define CTX_LIGHT_COLOR_MAT_FACE 39944 +#define CTX_LIGHT_COLOR_MAT_MODE 39948 +#define CTX_LIGHT_COLOR_MAT_MASK 39952 +#define CTX_LIGHT_COLOR_MAT_ENABLED 39956 +#define CTX_LIGHT_ENABLED_LIST 39968 +#define CTX_LIGHT_NEED_VERTS 44321 +#define CTX_LIGHT_FLAGS 44324 +#define CTX_LIGHT_BASE_COLOR 44328 + + +/* ============================================================= + * Offsets for struct vertex_buffer + */ + +#define VB_SIZE 0 +#define VB_COUNT 4 + +#define VB_ELTS 8 +#define VB_OBJ_PTR 60 +#define VB_EYE_PTR 12 +#define VB_CLIP_PTR 16 +#define VB_PROJ_CLIP_PTR 20 +#define VB_CLIP_OR_MASK 24 +#define VB_CLIP_MASK 28 +#define VB_NORMAL_PTR 68 +#define VB_EDGE_FLAG 36 +#define VB_TEX0_COORD_PTR 92 +#define VB_TEX1_COORD_PTR 96 +#define VB_TEX2_COORD_PTR 100 +#define VB_TEX3_COORD_PTR 104 +#define VB_INDEX_PTR 84 +#define VB_COLOR_PTR 72 +#define VB_SECONDARY_COLOR_PTR 76 +#define VB_FOG_COORD_PTR 80 +#define VB_PRIMITIVE 52 + + +/* + * Flags for struct vertex_buffer + */ + +#define VERT_BIT_OBJ 0x1 +#define VERT_BIT_NORM 0x4 +#define VERT_BIT_RGBA 0x8 +#define VERT_BIT_SPEC_RGB 0x10 +#define VERT_BIT_FOG_COORD 0x20 +#define VERT_BIT_TEX0 0x100 +#define VERT_BIT_TEX1 0x200 +#define VERT_BIT_TEX2 0x400 +#define VERT_BIT_TEX3 0x800 + + +/* ============================================================= + * Offsets for GLvector4f + */ + +#define V4F_DATA 0 +#define V4F_START 4 +#define V4F_COUNT 8 +#define V4F_STRIDE 12 +#define V4F_SIZE 16 +#define V4F_FLAGS 20 + +/* + * Flags for GLvector4f + */ + +#define VEC_MALLOC 0x10 +#define VEC_NOT_WRITEABLE 0x40 +#define VEC_BAD_STRIDE 0x100 + +#define VEC_SIZE_1 0x1 +#define VEC_SIZE_2 0x3 +#define VEC_SIZE_3 0x7 +#define VEC_SIZE_4 0xf + + +/* ============================================================= + * Offsets for GLmatrix + */ + +#define MATRIX_DATA 0 +#define MATRIX_INV 4 +#define MATRIX_FLAGS 8 +#define MATRIX_TYPE 12 + + +/* ============================================================= + * Offsets for struct gl_light + */ + +#define LIGHT_NEXT 0 +#define LIGHT_PREV 4 + +#define LIGHT_AMBIENT 8 +#define LIGHT_DIFFUSE 24 +#define LIGHT_SPECULAR 40 +#define LIGHT_EYE_POSITION 56 +#define LIGHT_SPOT_DIRECTION 72 +#define LIGHT_SPOT_EXPONENT 88 +#define LIGHT_SPOT_CUTOFF 92 +#define LIGHT_COS_CUTOFF 100 +#define LIGHT_CONST_ATTEN 104 +#define LIGHT_LINEAR_ATTEN 108 +#define LIGHT_QUADRATIC_ATTEN 112 +#define LIGHT_ENABLED 116 + +#define LIGHT_FLAGS 120 + +#define LIGHT_POSITION 124 +#define LIGHT_VP_INF_NORM 140 +#define LIGHT_H_INF_NORM 152 +#define LIGHT_NORM_DIRECTION 164 +#define LIGHT_VP_INF_SPOT_ATTEN 180 + +#define LIGHT_SPOT_EXP_TABLE 184 +#define LIGHT_MAT_AMBIENT 4280 +#define LIGHT_MAT_DIFFUSE 4304 +#define LIGHT_MAT_SPECULAR 4328 + +#define SIZEOF_GL_LIGHT 4352 + +/* + * Flags for struct gl_light + */ + +#define LIGHT_SPOT 0x1 +#define LIGHT_LOCAL_VIEWER 0x2 +#define LIGHT_POSITIONAL 0x4 + +#define LIGHT_NEED_VERTICES 0x6 + + +/* ============================================================= + * Offsets for struct gl_lightmodel + */ + +#define LIGHT_MODEL_AMBIENT 0 +#define LIGHT_MODEL_LOCAL_VIEWER 16 +#define LIGHT_MODEL_TWO_SIDE 17 +#define LIGHT_MODEL_COLOR_CONTROL 20 + + +#endif /* __ASM_TYPES_H__ */ Propchange: trunk/reactos/dll/opengl/mesa/generated/mesa/matypes.h ------------------------------------------------------------------------------ svn:eol-style = native

12 years

[jgardou] 57203: [LIBMESA] - Use x86 ASM optimizations on GCC - Don't compile useless stuff

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Aug 30 00:51:00 2012 New Revision: 57203 URL: http://svn.reactos.org/svn/reactos?rev=57203&view=rev Log: [LIBMESA] - Use x86 ASM optimizations on GCC - Don't compile useless stuff Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/ (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/ (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/Makefile (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/calling_convention.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/x86-64.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/x86-64.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/xform4.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_normal.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform1.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform2.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform3.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform4.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/Makefile (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/assyntax.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/clip_args.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_asm.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_asm.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_features.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/gen_matypes.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx_blend.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx_blendtmp.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/norm_args.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/read_rgba_span_x86.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/read_rgba_span_x86.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/rtasm/ (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/rtasm/x86sse.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/rtasm/x86sse.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_normal.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform1.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform2.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform3.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform4.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_cliptest.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform.c (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform.h (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform2.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform3.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform4.S (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/xform_args.h (with props) Modified: trunk/reactos/dll/opengl/mesa/src/glsl/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_x86.S trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/src/glsl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/C… Modified: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Modified: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapi_x86.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/C… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/calling_convention.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/x86-64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/x86-64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_normal.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform1.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform3.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/3dnow_xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/assyntax.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/clip_args.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/common_x86_features.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/gen_matypes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx_blend.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/mmx_blendtmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/norm_args.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/read_rgba_span_x86.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/read_rgba_span_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/rtasm/x86sse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/rtasm/x86sse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_normal.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform1.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform3.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/sse_xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_cliptest.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform3.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/x86_xform4.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/xform_args.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x…

12 years

[spetreolle] 57202: [ROSAPPS] Add the imagesoft CMakeLists.txt (forgotten in previous commit.)

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Aug 29 21:07:55 2012 New Revision: 57202 URL: http://svn.reactos.org/svn/reactos?rev=57202&view=rev Log: [ROSAPPS] Add the imagesoft CMakeLists.txt (forgotten in previous commit.) Added: trunk/rosapps/applications/imagesoft/CMakeLists.txt (with props) Added: trunk/rosapps/applications/imagesoft/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/CMa… ============================================================================== --- trunk/rosapps/applications/imagesoft/CMakeLists.txt (added) +++ trunk/rosapps/applications/imagesoft/CMakeLists.txt [iso-8859-1] Wed Aug 29 21:07:55 2012 @@ -1,0 +1,25 @@ + +set_rc_compiler() + +list(APPEND SOURCE + about.c + adjust.c + brightness.c + contrast.c + custcombo.c + floatwindow.c + font.c + imagesoft.c + imgedwnd.c + mainwnd.c + misc.c + opensave.c + tooldock.c + imagesoft.rc) + +add_pch(imagesoft precomp.h) +add_executable(imagesoft ${SOURCE}) +set_module_type(imagesoft win32gui UNICODE) +add_importlibs(imagesoft gdi32 user32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) + +add_cd_file(TARGET imagesoft DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/imagesoft/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

12 years

[spetreolle] 57201: [ROSAPPS] Move imagesoft to applications and add it to build. Convert lang files to UTF-8. Fix casts and x64 warnings. Patch by Hermes Belusca. See bug 7185 for details.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Aug 29 20:44:54 2012 New Revision: 57201 URL: http://svn.reactos.org/svn/reactos?rev=57201&view=rev Log: [ROSAPPS] Move imagesoft to applications and add it to build. Convert lang files to UTF-8. Fix casts and x64 warnings. Patch by Hermes Belusca. See bug 7185 for details. Added: trunk/rosapps/applications/imagesoft/ - copied from r57199, trunk/rosapps/templates/imagesoft/ Removed: trunk/rosapps/templates/imagesoft/ Modified: trunk/rosapps/applications/CMakeLists.txt trunk/rosapps/applications/applications.rbuild trunk/rosapps/applications/imagesoft/custcombo.c trunk/rosapps/applications/imagesoft/floatwindow.c trunk/rosapps/applications/imagesoft/font.c trunk/rosapps/applications/imagesoft/imagesoft.c trunk/rosapps/applications/imagesoft/imagesoft.rbuild trunk/rosapps/applications/imagesoft/imagesoft.rc trunk/rosapps/applications/imagesoft/imgedwnd.c trunk/rosapps/applications/imagesoft/lang/bg-BG.rc trunk/rosapps/applications/imagesoft/lang/en-GB.rc trunk/rosapps/applications/imagesoft/lang/en-US.rc trunk/rosapps/applications/imagesoft/lang/es-ES.rc trunk/rosapps/applications/imagesoft/lang/fr-FR.rc trunk/rosapps/applications/imagesoft/lang/id-ID.rc trunk/rosapps/applications/imagesoft/lang/it-IT.rc trunk/rosapps/applications/imagesoft/lang/no-NO.rc trunk/rosapps/applications/imagesoft/lang/pl-PL.rc trunk/rosapps/applications/imagesoft/lang/ru-RU.rc trunk/rosapps/applications/imagesoft/lang/sk-SK.rc trunk/rosapps/applications/imagesoft/lang/th-TH.rc trunk/rosapps/applications/imagesoft/lang/uk-UA.rc trunk/rosapps/applications/imagesoft/mainwnd.c trunk/rosapps/applications/imagesoft/rsrc.rc trunk/rosapps/applications/imagesoft/tooldock.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rosapps/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.tx… Modified: trunk/rosapps/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.… Modified: trunk/rosapps/applications/imagesoft/custcombo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/cus… Modified: trunk/rosapps/applications/imagesoft/floatwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/flo… Modified: trunk/rosapps/applications/imagesoft/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/fon… Modified: trunk/rosapps/applications/imagesoft/imagesoft.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/ima… Modified: trunk/rosapps/applications/imagesoft/imagesoft.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/ima… Modified: trunk/rosapps/applications/imagesoft/imagesoft.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/ima… Modified: trunk/rosapps/applications/imagesoft/imgedwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/img… Modified: trunk/rosapps/applications/imagesoft/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/lan… Modified: trunk/rosapps/applications/imagesoft/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/mai… Modified: trunk/rosapps/applications/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/rsr… Modified: trunk/rosapps/applications/imagesoft/tooldock.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/too…

12 years

[spetreolle] 57200: [ROSAPPS] Add vgafontedit to build. Convert the language resource files into UTF-8. Fix x64 warnings. Patch by Hermes Belusca. Bug 7152.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Aug 29 18:06:24 2012 New Revision: 57200 URL: http://svn.reactos.org/svn/reactos?rev=57200&view=rev Log: [ROSAPPS] Add vgafontedit to build. Convert the language resource files into UTF-8. Fix x64 warnings. Patch by Hermes Belusca. Bug 7152. Added: trunk/rosapps/applications/devutils/CMakeLists.txt (with props) trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt (with props) trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc (with props) trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc (with props) Removed: trunk/rosapps/applications/devutils/vgafontedit/main.rc Modified: trunk/rosapps/applications/CMakeLists.txt trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild Modified: trunk/rosapps/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.tx… ============================================================================== --- trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -1,5 +1,5 @@ add_subdirectory(cmdutils) -#add_subdirectory(devutils) +add_subdirectory(devutils) #add_subdirectory(fraginator) #add_subdirectory(net) add_subdirectory(notevil) Added: trunk/rosapps/applications/devutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/CMak… ============================================================================== --- trunk/rosapps/applications/devutils/CMakeLists.txt (added) +++ trunk/rosapps/applications/devutils/CMakeLists.txt [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -1,0 +1,6 @@ +#add_subdirectory(gdb2) +#add_subdirectory(gdihv) +#add_subdirectory(genguid) +#add_subdirectory(symdump) +#add_subdirectory(syscalldump) +add_subdirectory(vgafontedit) Propchange: trunk/rosapps/applications/devutils/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt (added) +++ trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -1,0 +1,20 @@ + +set_rc_compiler() + +list(APPEND SOURCE + aboutdlg.c + editglyphdlg.c + fontboxeswnd.c + fontwnd.c + main.c + mainwnd.c + misc.c + opensave.c + vgafontedit.rc) + +add_pch(vgafontedit precomp.h) +add_executable(vgafontedit ${SOURCE}) +set_module_type(vgafontedit win32gui UNICODE) +add_importlibs(vgafontedit user32 gdi32 comdlg32 msvcrt kernel32) + +add_cd_file(TARGET vgafontedit DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/editglyphdlg.c [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -40,7 +40,7 @@ // Add the Toolbox bitmaps tbab.hInst = hInstance; tbab.nID = IDB_EDIT_GLYPH_TOOLBOX; - iBitmap = SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); + iBitmap = (INT)SendMessageW(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); AddToolboxButton(hToolbar, iBitmap + TOOLBOX_PEN, ID_TOOLBOX_PEN, TBSTATE_ENABLED | TBSTATE_CHECKED); } Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -11,84 +11,84 @@ IDD_ABOUT DIALOGEX 10, 10, 185, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Çà" +CAPTION "ÐÐ°" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT "Øðèôòîâèÿ îáðàáîò÷èê íà ÐåàêòÎÑ", IDC_STATIC, 37, 10, 145, 10 - LTEXT "Âúçïðîèçâîäñòâåíî ïðàâî 2008 Colin Finck", IDC_STATIC, 37, 20, 145, 10 - DEFPUSHBUTTON "Äîáðå", IDCANCEL, 70, 44, 55, 15 + LTEXT "Ð¨ÑÐ¸ÑÑÐ¾Ð²Ð¸Ñ Ð¾Ð±ÑÐ°Ð±Ð¾ÑÑÐ¸Ðº Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡", IDC_STATIC, 37, 10, 145, 10 + LTEXT "ÐÑÐ·Ð¿ÑÐ¾Ð¸Ð·Ð²Ð¾Ð´ÑÑÐ²ÐµÐ½Ð¾ Ð¿ÑÐ°Ð²Ð¾ 2008 Colin Finck", IDC_STATIC, 37, 20, 145, 10 + DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDCANCEL, 70, 44, 55, 15 END IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Îáðàáîòêà íà çíàê" +CAPTION "ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° Ð·Ð½Ð°Ðº" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 CONTROL "", IDC_EDIT_GLYPH_EDIT, EDIT_GLYPH_EDIT_CLASSW, 0, 39, 5, 160, 160 CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 - DEFPUSHBUTTON "Äîáðå", IDOK, 48, 177, 70, 14 - PUSHBUTTON "Îòêàç", IDCANCEL, 125, 177, 70, 14 + DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 48, 177, 70, 14 + PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 125, 177, 70, 14 END IDM_MAINMENU MENU BEGIN - POPUP "&Ôàéë" + POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "&Íîâ\tCtrl+N", ID_FILE_NEW - MENUITEM "&Îòâàðÿíå...\tCtrl+O", ID_FILE_OPEN - MENUITEM "Çàòâàðÿíå", ID_FILE_CLOSE + MENUITEM "&ÐÐ¾Ð²\tCtrl+N", ID_FILE_NEW + MENUITEM "&ÐÑÐ²Ð°ÑÑÐ½Ðµ...\tCtrl+O", ID_FILE_OPEN + MENUITEM "ÐÐ°ÑÐ²Ð°ÑÑÐ½Ðµ", ID_FILE_CLOSE MENUITEM SEPARATOR - MENUITEM "Çàïèñ\tCtrl+S", ID_FILE_SAVE - MENUITEM "Çàïèñ êàòî...", ID_FILE_SAVE_AS + MENUITEM "ÐÐ°Ð¿Ð¸Ñ\tCtrl+S", ID_FILE_SAVE + MENUITEM "ÐÐ°Ð¿Ð¸Ñ ÐºÐ°ÑÐ¾...", ID_FILE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Èçõîä êàòî\tAlt+F4", ID_FILE_EXIT + MENUITEM "ÐÐ·ÑÐ¾Ð´ ÐºÐ°ÑÐ¾\tAlt+F4", ID_FILE_EXIT END - POPUP "&Îáðàáîòêà" + POPUP "&ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ°" BEGIN - MENUITEM "&Çàïîìíÿíå\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Ïîñòàâÿíå\tCtrl+V", ID_EDIT_PASTE + MENUITEM "&ÐÐ°Ð¿Ð¾Ð¼Ð½ÑÐ½Ðµ\tCtrl+C", ID_EDIT_COPY + MENUITEM "&ÐÐ¾ÑÑÐ°Ð²ÑÐ½Ðµ\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Îáðàáîòêà íà çíàê...", ID_EDIT_GLYPH + MENUITEM "ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° Ð·Ð½Ð°Ðº...", ID_EDIT_GLYPH END - POPUP "&Ïðîçîðåö" + POPUP "&ÐÑÐ¾Ð·Ð¾ÑÐµÑ" BEGIN - MENUITEM "&Íàäèïëÿíå", ID_WINDOW_CASCADE - MENUITEM "&Âîäîðàâíî íàñòåëâàíå", ID_WINDOW_TILE_HORZ - MENUITEM "&Îòâåñíî íàñòåëâàíå", ID_WINDOW_TILE_VERT - MENUITEM "Ïîä&ðåæäàíå íà çíà÷åòàòà", ID_WINDOW_ARRANGE + MENUITEM "&ÐÐ°Ð´Ð¸Ð¿Ð»ÑÐ½Ðµ", ID_WINDOW_CASCADE + MENUITEM "&ÐÐ¾Ð´Ð¾ÑÐ°Ð²Ð½Ð¾ Ð½Ð°ÑÑÐµÐ»Ð²Ð°Ð½Ðµ", ID_WINDOW_TILE_HORZ + MENUITEM "&ÐÑÐ²ÐµÑÐ½Ð¾ Ð½Ð°ÑÑÐµÐ»Ð²Ð°Ð½Ðµ", ID_WINDOW_TILE_VERT + MENUITEM "ÐÐ¾Ð´&ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð·Ð½Ð°ÑÐµÑÐ°ÑÐ°", ID_WINDOW_ARRANGE MENUITEM SEPARATOR - MENUITEM "&Ñëåäâàù\tCtrl+F6", ID_WINDOW_NEXT + MENUITEM "&Ð¡Ð»ÐµÐ´Ð²Ð°Ñ\tCtrl+F6", ID_WINDOW_NEXT END - POPUP "Ïîìî&ù" + POPUP "ÐÐ¾Ð¼Ð¾&Ñ" BEGIN - MENUITEM "&Çà...", ID_HELP_ABOUT + MENUITEM "&ÐÐ°...", ID_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_OPENFILTER, "Âñè÷êè ïîääúðæàíè ôîðìàòè (*.bin,*.psf)|*.bin;*.psf|Äâîè÷åí øðèôòîâ ôàéë (*.bin)|*.bin|Åêðàíåí øðèôò çà ËÑ, âåðñèÿ 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Äâîè÷íè øðèôòîâè ôàéëîâå (*.bin)|*.bin|" - IDS_OPENERROR, "Ãðåøêà ïðè îòâàðÿíå íà ôàéëà! (Ãðåøêà %1!u!)" - IDS_READERROR, "Ãðåøêà ïðè ÷åòåíå íà ôàéëà! (Ãðåøêà %1!u!)" - IDS_WRITEERROR, "Ãðåøêà ïðè çàïèñâàíå íà ôàéëà! (Ãðåøêà %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Íåïîääúðæàí ôàéëîâ ôîðìàò!" - IDS_UNSUPPORTEDPSF, "Íåïîääúðæàí ôîðìàò øðèôò PSF! Îáðàáîò÷èêúò ïîääúðæà ñàìî øðèôòîâå 8x8, áåç ðàøèðåíè ðåæèìè." - IDS_DOCNAME, "Øðèôò %1!u!" - IDS_SAVEPROMPT, "Ôàéëúò ""%1"" å ïðîìåíåí, íî íå å ñúõðàíåí.\n\nèñêàòå ëè äà ãî ñúõðíàèòå?" - IDS_APPTITLE, "Îáðàáîò÷èêúò íà ÐåàêòÎÑ çà VGA øðèôòîâå" - IDS_CLOSEEDIT, "Ïúðâî çàòâîðåòå âñè÷êè ïðîçîðöè çà îáðàáîòêà!" + IDS_OPENFILTER, "ÐÑÐ¸ÑÐºÐ¸ Ð¿Ð¾Ð´Ð´ÑÑÐ¶Ð°Ð½Ð¸ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ (*.bin,*.psf)|*.bin;*.psf|ÐÐ²Ð¾Ð¸ÑÐµÐ½ ÑÑÐ¸ÑÑÐ¾Ð² ÑÐ°Ð¹Ð» (*.bin)|*.bin|ÐÐºÑÐ°Ð½ÐµÐ½ ÑÑÐ¸ÑÑ Ð·Ð° ÐÐ¡, Ð²ÐµÑÑÐ¸Ñ 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "ÐÐ²Ð¾Ð¸ÑÐ½Ð¸ ÑÑÐ¸ÑÑÐ¾Ð²Ð¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ (*.bin)|*.bin|" + IDS_OPENERROR, "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐ²Ð°ÑÑÐ½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð°! (ÐÑÐµÑÐºÐ° %1!u!)" + IDS_READERROR, "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ ÑÐµÑÐµÐ½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð°! (ÐÑÐµÑÐºÐ° %1!u!)" + IDS_WRITEERROR, "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð¸ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ°Ð¹Ð»Ð°! (ÐÑÐµÑÐºÐ° %1!u!)" + IDS_UNSUPPORTEDFORMAT, "ÐÐµÐ¿Ð¾Ð´Ð´ÑÑÐ¶Ð°Ð½ ÑÐ°Ð¹Ð»Ð¾Ð² ÑÐ¾ÑÐ¼Ð°Ñ!" + IDS_UNSUPPORTEDPSF, "ÐÐµÐ¿Ð¾Ð´Ð´ÑÑÐ¶Ð°Ð½ ÑÐ¾ÑÐ¼Ð°Ñ ÑÑÐ¸ÑÑ PSF! ÐÐ±ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÑÑ Ð¿Ð¾Ð´Ð´ÑÑÐ¶Ð° ÑÐ°Ð¼Ð¾ ÑÑÐ¸ÑÑÐ¾Ð²Ðµ 8x8, Ð±ÐµÐ· ÑÐ°ÑÐ¸ÑÐµÐ½Ð¸ ÑÐµÐ¶Ð¸Ð¼Ð¸." + IDS_DOCNAME, "Ð¨ÑÐ¸ÑÑ %1!u!" + IDS_SAVEPROMPT, "Ð¤Ð°Ð¹Ð»ÑÑ ""%1"" Ðµ Ð¿ÑÐ¾Ð¼ÐµÐ½ÐµÐ½, Ð½Ð¾ Ð½Ðµ Ðµ ÑÑÑÑÐ°Ð½ÐµÐ½.\n\nÐ¸ÑÐºÐ°ÑÐµ Ð»Ð¸ Ð´Ð° Ð³Ð¾ ÑÑÑÑÐ½Ð°Ð¸ÑÐµ?" + IDS_APPTITLE, "ÐÐ±ÑÐ°Ð±Ð¾ÑÑÐ¸ÐºÑÑ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡ Ð·Ð° VGA ÑÑÐ¸ÑÑÐ¾Ð²Ðµ" + IDS_CLOSEEDIT, "ÐÑÑÐ²Ð¾ Ð·Ð°ÑÐ²Ð¾ÑÐµÑÐµ Ð²ÑÐ¸ÑÐºÐ¸ Ð¿ÑÐ¾Ð·Ð¾ÑÑÐ¸ Ð·Ð° Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐºÐ°!" - IDS_TOOLTIP_NEW, "Íîâ" - IDS_TOOLTIP_OPEN, "Îòâàðÿíå" - IDS_TOOLTIP_SAVE, "Çàïèñ" - IDS_TOOLTIP_EDIT_GLYPH, "Îáðàáîòêà íà çíàê" - IDS_TOOLTIP_COPY, "Çàïîìíÿíå" - IDS_TOOLTIP_PASTE, "Ïîñòàâÿíå" + IDS_TOOLTIP_NEW, "ÐÐ¾Ð²" + IDS_TOOLTIP_OPEN, "ÐÑÐ²Ð°ÑÑÐ½Ðµ" + IDS_TOOLTIP_SAVE, "ÐÐ°Ð¿Ð¸Ñ" + IDS_TOOLTIP_EDIT_GLYPH, "ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° Ð·Ð½Ð°Ðº" + IDS_TOOLTIP_COPY, "ÐÐ°Ð¿Ð¾Ð¼Ð½ÑÐ½Ðµ" + IDS_TOOLTIP_PASTE, "ÐÐ¾ÑÑÐ°Ð²ÑÐ½Ðµ" END Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -38,8 +38,8 @@ POPUP "&Datei" BEGIN MENUITEM "&Neu\tStrg+N", ID_FILE_NEW - MENUITEM "&Öffnen...\tStrg+O", ID_FILE_OPEN - MENUITEM "Schließen", ID_FILE_CLOSE + MENUITEM "&Ãffnen...\tStrg+O", ID_FILE_OPEN + MENUITEM "SchlieÃen", ID_FILE_CLOSE MENUITEM SEPARATOR MENUITEM "Speichern\tStrg+S", ID_FILE_SAVE MENUITEM "Speichern unter...", ID_FILE_SAVE_AS @@ -50,19 +50,19 @@ POPUP "&Bearbeiten" BEGIN MENUITEM "Kopieren\tStrg+C", ID_EDIT_COPY - MENUITEM "Einfügen\tStrg+V", ID_EDIT_PASTE + MENUITEM "EinfÃ¼gen\tStrg+V", ID_EDIT_PASTE MENUITEM SEPARATOR MENUITEM "Schriftzeichen bearbeiten...", ID_EDIT_GLYPH END POPUP "&Fenster" BEGIN - MENUITEM "&Überlappend", ID_WINDOW_CASCADE + MENUITEM "&Ãberlappend", ID_WINDOW_CASCADE MENUITEM "&Horizontal teilen", ID_WINDOW_TILE_HORZ MENUITEM "&Vertikal teilen", ID_WINDOW_TILE_VERT MENUITEM "&Symbole anordnen", ID_WINDOW_ARRANGE MENUITEM SEPARATOR - MENUITEM "Nächs&tes\tStrg+F6", ID_WINDOW_NEXT + MENUITEM "NÃ¤chs&tes\tStrg+F6", ID_WINDOW_NEXT END POPUP "&Hilfe" @@ -73,22 +73,22 @@ STRINGTABLE BEGIN - IDS_OPENFILTER, "Alle unterstützten Formate (*.bin,*.psf)|*.bin;*.psf|Binäre Schriftdateien (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Binäre Schriftdateien (*.bin)|*.bin|" - IDS_OPENERROR, "Fehler beim Öffnen der Datei! (Fehlernummer %1!u!)" + IDS_OPENFILTER, "Alle unterstÃ¼tzten Formate (*.bin,*.psf)|*.bin;*.psf|BinÃ¤re Schriftdateien (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "BinÃ¤re Schriftdateien (*.bin)|*.bin|" + IDS_OPENERROR, "Fehler beim Ãffnen der Datei! (Fehlernummer %1!u!)" IDS_READERROR, "Fehler beim Lesen der Datei! (Fehlernummer %1!u!)" IDS_WRITEERROR, "Fehler beim Schreiben der Datei! (Fehlernummer %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Nicht unterstütztes Dateiformat!" - IDS_UNSUPPORTEDPSF, "Nicht unterstütztes PSF-Format! Der Editor unterstützt nur Fonts im Format 8x8 ohne spezielle Modi." + IDS_UNSUPPORTEDFORMAT, "Nicht unterstÃ¼tztes Dateiformat!" + IDS_UNSUPPORTEDPSF, "Nicht unterstÃ¼tztes PSF-Format! Der Editor unterstÃ¼tzt nur Fonts im Format 8x8 ohne spezielle Modi." IDS_DOCNAME, "Font %1!u!" - IDS_SAVEPROMPT, "Die Datei ""%1"" wurde geändert.\n\nMöchten Sie die Änderungen speichern?" + IDS_SAVEPROMPT, "Die Datei ""%1"" wurde geÃ¤ndert.\n\nMÃ¶chten Sie die Ãnderungen speichern?" IDS_APPTITLE, "ReactOS VGA Font Editor" - IDS_CLOSEEDIT, "Bitte schließen Sie zuerst alle offenen Bearbeitungs-Fenster!" + IDS_CLOSEEDIT, "Bitte schlieÃen Sie zuerst alle offenen Bearbeitungs-Fenster!" IDS_TOOLTIP_NEW, "Neu" - IDS_TOOLTIP_OPEN, "Öffnen" + IDS_TOOLTIP_OPEN, "Ãffnen" IDS_TOOLTIP_SAVE, "Speichern" IDS_TOOLTIP_EDIT_GLYPH, "Schriftzeichen bearbeiten" IDS_TOOLTIP_COPY, "Kopieren" - IDS_TOOLTIP_PASTE, "Einfügen" + IDS_TOOLTIP_PASTE, "EinfÃ¼gen" END Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -47,7 +47,7 @@ MENUITEM "Salir\tAlt+F4", ID_FILE_EXIT END - POPUP "&Edición" + POPUP "&EdiciÃ³n" BEGIN MENUITEM "Copiar\tCtrl+C", ID_EDIT_COPY MENUITEM "Pegar\tCtrl+V", ID_EDIT_PASTE @@ -73,17 +73,17 @@ STRINGTABLE BEGIN - IDS_OPENFILTER, "Todos los formatos soportados (*.bin,*.psf)|*.bin;*.psf|Archivos binarios de Fuentes (*.bin)|*.bin|Fuente de pantalla de PC Versión 1 (*.psf)|*.psf|" + IDS_OPENFILTER, "Todos los formatos soportados (*.bin,*.psf)|*.bin;*.psf|Archivos binarios de Fuentes (*.bin)|*.bin|Fuente de pantalla de PC VersiÃ³n 1 (*.psf)|*.psf|" IDS_SAVEFILTER, "Archivos binarios de Fuentes (*.bin)|*.bin|" - IDS_OPENERROR, "¡Error al abrir el archivo! (Error número %1!u!)" - IDS_READERROR, "¡Error al leer el archivo! (Error número %1!u!)" - IDS_WRITEERROR, "¡Error al escribir el archivo! (Error número %1!u!)" - IDS_UNSUPPORTEDFORMAT, "¡Formato de archivo no soportado!" - IDS_UNSUPPORTEDPSF, "¡Formato de fuente PSF no soportado! El editor sólo soporta fuentes 8x8 fonts sin modos especiales." + IDS_OPENERROR, "Â¡Error al abrir el archivo! (Error nÃºmero %1!u!)" + IDS_READERROR, "Â¡Error al leer el archivo! (Error nÃºmero %1!u!)" + IDS_WRITEERROR, "Â¡Error al escribir el archivo! (Error nÃºmero %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Â¡Formato de archivo no soportado!" + IDS_UNSUPPORTEDPSF, "Â¡Formato de fuente PSF no soportado! El editor sÃ³lo soporta fuentes 8x8 fonts sin modos especiales." IDS_DOCNAME, "Fuente %1!u!" - IDS_SAVEPROMPT, "El archivo ""%1"" ha sido modificado, pero no guardado.\n\n¿Quiere guardarlo ahora?" + IDS_SAVEPROMPT, "El archivo ""%1"" ha sido modificado, pero no guardado.\n\nÂ¿Quiere guardarlo ahora?" IDS_APPTITLE, "ReactOS VGA Font Editor" - IDS_CLOSEEDIT, "¡Por favor, cierre todas las ventanas de Edición abiertas primero!" + IDS_CLOSEEDIT, "Â¡Por favor, cierre todas las ventanas de EdiciÃ³n abiertas primero!" IDS_TOOLTIP_NEW, "Nuevo" IDS_TOOLTIP_OPEN, "Abrir" Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -11,18 +11,18 @@ IDD_ABOUT DIALOGEX 10, 10, 130, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "À propos de" +CAPTION "Ã propos de" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT "Éditeur de police VGA ReactOS", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Ãditeur de police VGA ReactOS", IDC_STATIC, 37, 10, 93, 10 LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Éditer le glyphe" +CAPTION "Ãditer le glyphe" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -47,48 +47,48 @@ MENUITEM "Quitter\tAlt+F4", ID_FILE_EXIT END - POPUP "&Édition" + POPUP "&Ãdition" BEGIN MENUITEM "Copier\tCtrl+C", ID_EDIT_COPY MENUITEM "Coller\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Éditer le glyphe...", ID_EDIT_GLYPH + MENUITEM "Ãditer le glyphe...", ID_EDIT_GLYPH END - POPUP "Fenêtres" + POPUP "FenÃªtres" BEGIN MENUITEM "En &cascade", ID_WINDOW_CASCADE - MENUITEM "Mosaïque &horizontale", ID_WINDOW_TILE_HORZ - MENUITEM "Mosaïque &verticale", ID_WINDOW_TILE_VERT - MENUITEM "&Arranger les icônes", ID_WINDOW_ARRANGE + MENUITEM "MosaÃ¯que &horizontale", ID_WINDOW_TILE_HORZ + MENUITEM "MosaÃ¯que &verticale", ID_WINDOW_TILE_VERT + MENUITEM "&Arranger les icÃ´nes", ID_WINDOW_ARRANGE MENUITEM SEPARATOR MENUITEM "Suivan&te\tCtrl+F6", ID_WINDOW_NEXT END POPUP "Aide" BEGIN - MENUITEM "&À propos de...", ID_HELP_ABOUT + MENUITEM "&Ã propos de...", ID_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_OPENFILTER, "Tous les formats supportés (*.bin,*.psf)|*.bin;*.psf|Fichiers police binaires (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" + IDS_OPENFILTER, "Tous les formats supportÃ©s (*.bin,*.psf)|*.bin;*.psf|Fichiers police binaires (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" IDS_SAVEFILTER, "Fichiers police binaires (*.bin)|*.bin|" - IDS_OPENERROR, "Erreur lors de l'ouverture du fichier ! (Erreur numéro %1!u!)" - IDS_READERROR, "Erreur lors de la lecture du fichier ! (Erreur numéro %1!u!)" - IDS_WRITEERROR, "Erreur lors de l'écriture du fichier ! (Erreur numéro %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Format de fichier non supporté!" - IDS_UNSUPPORTEDPSF, "Format de police PSF non supporté ! L'éditeur supporte seulement les polices 8x8 sans aucun mode spécial." + IDS_OPENERROR, "Erreur lors de l'ouverture du fichier ! (Erreur numÃ©ro %1!u!)" + IDS_READERROR, "Erreur lors de la lecture du fichier ! (Erreur numÃ©ro %1!u!)" + IDS_WRITEERROR, "Erreur lors de l'Ã©criture du fichier ! (Erreur numÃ©ro %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Format de fichier non supportÃ©!" + IDS_UNSUPPORTEDPSF, "Format de police PSF non supportÃ© ! L'Ã©diteur supporte seulement les polices 8x8 sans aucun mode spÃ©cial." IDS_DOCNAME, "Police %1!u!" - IDS_SAVEPROMPT, "Le fichier ""%1"" a été modifié mais pas enregistré.\n\nVoulez-vous l'enregistrer ?" - IDS_APPTITLE, "Éditeur de police VGA ReactOS" - IDS_CLOSEEDIT, "Veuillez d'abord fermer toutes les fenêtres d'édition !" + IDS_SAVEPROMPT, "Le fichier ""%1"" a Ã©tÃ© modifiÃ© mais pas enregistrÃ©.\n\nVoulez-vous l'enregistrer ?" + IDS_APPTITLE, "Ãditeur de police VGA ReactOS" + IDS_CLOSEEDIT, "Veuillez d'abord fermer toutes les fenÃªtres d'Ã©dition !" IDS_TOOLTIP_NEW, "Nouveau" IDS_TOOLTIP_OPEN, "Ouvrir" IDS_TOOLTIP_SAVE, "Enregistrer" - IDS_TOOLTIP_EDIT_GLYPH, "Éditer le glyphe" + IDS_TOOLTIP_EDIT_GLYPH, "Ãditer le glyphe" IDS_TOOLTIP_COPY, "Copier" IDS_TOOLTIP_PASTE, "Coller" END Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -81,7 +81,7 @@ IDS_UNSUPPORTEDFORMAT, "Formato non supportato!" IDS_UNSUPPORTEDPSF, "Formato font PSF non supportato! L'editor supporta esclusivamente i font 8x8 senza modi speciali." IDS_DOCNAME, "Font %1!u!" - IDS_SAVEPROMPT, "Il file ""%1"" è stato modificato, ma non salvato.\n\nVolete salvarlo ora?" + IDS_SAVEPROMPT, "Il file ""%1"" Ã¨ stato modificato, ma non salvato.\n\nVolete salvarlo ora?" IDS_APPTITLE, "ReactOS VGA Font Editor" IDS_CLOSEEDIT, "Prima chiudere tutte le finestre di Edit!" Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/no-NO.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -38,7 +38,7 @@ POPUP "&Fil" BEGIN MENUITEM "&Ny\tCtrl+N", ID_FILE_NEW - MENUITEM "&Åpne...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Ãpne...\tCtrl+O", ID_FILE_OPEN MENUITEM "Lukk", ID_FILE_CLOSE MENUITEM SEPARATOR MENUITEM "Lagre\tCtrl+S", ID_FILE_SAVE @@ -73,20 +73,20 @@ STRINGTABLE BEGIN - IDS_OPENFILTER, "Alle støttet formater (*.bin,*.psf)|*.bin;*.psf|Binære skrifttype filer (*.bin)|*.bin|PC skjerm skrifttype versjon 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Binære skrifttype filer (*.bin)|*.bin|" - IDS_OPENERROR, "Feil med å åpne filen! (Feil nummer %1!u!)" - IDS_READERROR, "Feil med å lese filen! (Feil nummer %1!u!)" - IDS_WRITEERROR, "Feil med å lagre filen! (Feil nummer %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Filformatet er ikke støttet!" - IDS_UNSUPPORTEDPSF, "Ikke støttet PSF filformat/skriftformat! Programmet støtter bare 8x8 skrift med ingen spesielle modus." + IDS_OPENFILTER, "Alle stÃ¸ttet formater (*.bin,*.psf)|*.bin;*.psf|BinÃ¦re skrifttype filer (*.bin)|*.bin|PC skjerm skrifttype versjon 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "BinÃ¦re skrifttype filer (*.bin)|*.bin|" + IDS_OPENERROR, "Feil med Ã¥ Ã¥pne filen! (Feil nummer %1!u!)" + IDS_READERROR, "Feil med Ã¥ lese filen! (Feil nummer %1!u!)" + IDS_WRITEERROR, "Feil med Ã¥ lagre filen! (Feil nummer %1!u!)" + IDS_UNSUPPORTEDFORMAT, "Filformatet er ikke stÃ¸ttet!" + IDS_UNSUPPORTEDPSF, "Ikke stÃ¸ttet PSF filformat/skriftformat! Programmet stÃ¸tter bare 8x8 skrift med ingen spesielle modus." IDS_DOCNAME, "Skrifttype %1!u!" IDS_SAVEPROMPT, "Filen ""%1"" har blitt endret, men har ikke blitt lagret.\n\nVil du lagre denne?" IDS_APPTITLE, "ReactOS VGA Skriftredigering" - IDS_CLOSEEDIT, "Vennligst lukk alle åpne vinduer først!" + IDS_CLOSEEDIT, "Vennligst lukk alle Ã¥pne vinduer fÃ¸rst!" IDS_TOOLTIP_NEW, "Ny" - IDS_TOOLTIP_OPEN, "Åpne" + IDS_TOOLTIP_OPEN, "Ãpne" IDS_TOOLTIP_SAVE, "Lagre" IDS_TOOLTIP_EDIT_GLYPH, "Rediger Glyph" IDS_TOOLTIP_COPY, "Kopier" Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -22,7 +22,7 @@ IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Edycja Glifów" +CAPTION "Edycja GlifÃ³w" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -38,13 +38,13 @@ POPUP "&Plik" BEGIN MENUITEM "&Nowy\tCtrl+N", ID_FILE_NEW - MENUITEM "&Otwórz.\tCtrl+O", ID_FILE_OPEN + MENUITEM "&OtwÃ³rz.\tCtrl+O", ID_FILE_OPEN MENUITEM "Zamknij", ID_FILE_CLOSE MENUITEM SEPARATOR MENUITEM "Zapisz\tCtrl+S", ID_FILE_SAVE MENUITEM "Zapisz jako", ID_FILE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Wyjd\tAlt+F4", ID_FILE_EXIT + MENUITEM "WyjdÅº\tAlt+F4", ID_FILE_EXIT END POPUP "&Edit" @@ -60,9 +60,9 @@ MENUITEM "&Kaskadowo", ID_WINDOW_CASCADE MENUITEM "Ustaw &poziomo", ID_WINDOW_TILE_HORZ MENUITEM "Ustaw pio&nowo", ID_WINDOW_TILE_VERT - MENUITEM "&Uporz¹dkuj ikony", ID_WINDOW_ARRANGE + MENUITEM "&UporzÄdkuj ikony", ID_WINDOW_ARRANGE MENUITEM SEPARATOR - MENUITEM "Nas&têpne\tCtrl+F6", ID_WINDOW_NEXT + MENUITEM "Nas&tÄpne\tCtrl+F6", ID_WINDOW_NEXT END POPUP "&Pomoc" @@ -73,20 +73,20 @@ STRINGTABLE BEGIN - IDS_OPENFILTER, "Wszystkie obs³ugiwane (*.bin,*.psf)|*.bin;*.psf|Czcionki binarne (*.bin)|*.bin|Czcionki PSF V1 (*.psf)|*.psf|" + IDS_OPENFILTER, "Wszystkie obsÅugiwane (*.bin,*.psf)|*.bin;*.psf|Czcionki binarne (*.bin)|*.bin|Czcionki PSF V1 (*.psf)|*.psf|" IDS_SAVEFILTER, "Czcionki binarne (*.bin)|*.bin|" - IDS_OPENERROR, "B³¹d poczas otwierania pliku! (B³¹d nr. %1!u!)" - IDS_READERROR, "B³¹d poczas wczytywania pliku! (B³¹d nr. %1!u!)" - IDS_WRITEERROR, "B³¹d podczas zapisu do pliku! (B³¹d nr. %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Nieobs³ugiwany format czcionki!" - IDS_UNSUPPORTEDPSF, "Nieobs³ugiwana wersja PSF! Edytor obs³uguje wy³¹cznie czcionki rozmiaru 8x8, bez dodatków." + IDS_OPENERROR, "BÅÄd poczas otwierania pliku! (BÅÄd nr. %1!u!)" + IDS_READERROR, "BÅÄd poczas wczytywania pliku! (BÅÄd nr. %1!u!)" + IDS_WRITEERROR, "BÅÄd podczas zapisu do pliku! (BÅÄd nr. %1!u!)" + IDS_UNSUPPORTEDFORMAT, "NieobsÅugiwany format czcionki!" + IDS_UNSUPPORTEDPSF, "NieobsÅugiwana wersja PSF! Edytor obsÅuguje wyÅÄcznie czcionki rozmiaru 8x8, bez dodatkÃ³w." IDS_DOCNAME, "Czcionka %1!u!" - IDS_SAVEPROMPT, "Plik ""%1"" zosta³ zmieniony, ale nie zapisany.\n\nCzy chcesz zapisaæ zmiany?" + IDS_SAVEPROMPT, "Plik ""%1"" zostaÅ zmieniony, ale nie zapisany.\n\nCzy chcesz zapisaÄ zmiany?" IDS_APPTITLE, "Edytor czcionek VGA dla ReactOS" - IDS_CLOSEEDIT, "Proszê najpierw zamkn¹æ wszystkie okna Edycji!" + IDS_CLOSEEDIT, "ProszÄ najpierw zamknÄÄ wszystkie okna Edycji!" IDS_TOOLTIP_NEW, "Nowy" - IDS_TOOLTIP_OPEN, "Otwórz" + IDS_TOOLTIP_OPEN, "OtwÃ³rz" IDS_TOOLTIP_SAVE, "Zapisz" IDS_TOOLTIP_EDIT_GLYPH, "Edytuj Glify" IDS_TOOLTIP_COPY, "Copy" Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -11,18 +11,18 @@ IDD_ABOUT DIALOGEX 10, 10, 130, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Î ïðîãðàììå" +CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT "Ðåäàêòîð VGA-øðèôòîâ ReactOS", IDC_STATIC, 37, 10, 93, 10 - LTEXT "Àâòîðñêèå ïðàâà 2008 Êîëèí Ôèíê", IDC_STATIC, 37, 20, 93, 17 + LTEXT "Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ VGA-ÑÑÐ¸ÑÑÐ¾Ð² ReactOS", IDC_STATIC, 37, 10, 93, 10 + LTEXT "ÐÐ²ÑÐ¾ÑÑÐºÐ¸Ðµ Ð¿ÑÐ°Ð²Ð° 2008 ÐÐ¾Ð»Ð¸Ð½ Ð¤Ð¸Ð½Ðº", IDC_STATIC, 37, 20, 93, 17 DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ðåäàêòèðîâàíèå ñèìâîëà" +CAPTION "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -30,65 +30,65 @@ CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 DEFPUSHBUTTON "OK", IDOK, 48, 177, 70, 14 - PUSHBUTTON "Îòìåíà", IDCANCEL, 125, 177, 70, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 125, 177, 70, 14 END IDM_MAINMENU MENU BEGIN - POPUP "&Ôàéë" + POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "&Íîâûé\tCtrl+N", ID_FILE_NEW - MENUITEM "&Îòêðûòü...\tCtrl+O", ID_FILE_OPEN - MENUITEM "Çàêðûòü", ID_FILE_CLOSE + MENUITEM "&ÐÐ¾Ð²ÑÐ¹\tCtrl+N", ID_FILE_NEW + MENUITEM "&ÐÑÐºÑÑÑÑ...\tCtrl+O", ID_FILE_OPEN + MENUITEM "ÐÐ°ÐºÑÑÑÑ", ID_FILE_CLOSE MENUITEM SEPARATOR - MENUITEM "Ñîõðàíèòü\tCtrl+S", ID_FILE_SAVE - MENUITEM "Ñîõðàíèòü êàê...", ID_FILE_SAVE_AS + MENUITEM "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ\tCtrl+S", ID_FILE_SAVE + MENUITEM "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÐºÐ°Ðº...", ID_FILE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Âûõîä\tAlt+F4", ID_FILE_EXIT + MENUITEM "ÐÑÑÐ¾Ð´\tAlt+F4", ID_FILE_EXIT END - POPUP "&Ïðàâêà" + POPUP "&ÐÑÐ°Ð²ÐºÐ°" BEGIN - MENUITEM "Êîïèðîâàòü\tCtrl+C", ID_EDIT_COPY - MENUITEM "Âñòàâèòü\tCtrl+V", ID_EDIT_PASTE + MENUITEM "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ\tCtrl+C", ID_EDIT_COPY + MENUITEM "ÐÑÑÐ°Ð²Ð¸ÑÑ\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Èçìåíèòü ñèìâîë...", ID_EDIT_GLYPH + MENUITEM "ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»...", ID_EDIT_GLYPH END - POPUP "&Îêíà" + POPUP "&ÐÐºÐ½Ð°" BEGIN - MENUITEM "&Êàñêàäîì", ID_WINDOW_CASCADE - MENUITEM "&Ïî ãîðèçîíòàëè", ID_WINDOW_TILE_HORZ - MENUITEM "Ï&î âåðòèêàëè", ID_WINDOW_TILE_VERT - MENUITEM "&Óïîðÿäî÷èòü çíà÷êè", ID_WINDOW_ARRANGE + MENUITEM "&ÐÐ°ÑÐºÐ°Ð´Ð¾Ð¼", ID_WINDOW_CASCADE + MENUITEM "&ÐÐ¾ Ð³Ð¾ÑÐ¸Ð·Ð¾Ð½ÑÐ°Ð»Ð¸", ID_WINDOW_TILE_HORZ + MENUITEM "Ð&Ð¾ Ð²ÐµÑÑÐ¸ÐºÐ°Ð»Ð¸", ID_WINDOW_TILE_VERT + MENUITEM "&Ð£Ð¿Ð¾ÑÑÐ´Ð¾ÑÐ¸ÑÑ Ð·Ð½Ð°ÑÐºÐ¸", ID_WINDOW_ARRANGE MENUITEM SEPARATOR - MENUITEM "&Ñëåäóþùåå\tCtrl+F6", ID_WINDOW_NEXT + MENUITEM "&Ð¡Ð»ÐµÐ´ÑÑÑÐµÐµ\tCtrl+F6", ID_WINDOW_NEXT END - POPUP "&Ñïðàâêà" + POPUP "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN - MENUITEM "&Î ïðîãðàììå...", ID_HELP_ABOUT + MENUITEM "&Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ...", ID_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_OPENFILTER, "Âñå ïîääåðæèâàåìûå ôîðìàòû (*.bin,*.psf)|*.bin;*.psf|Äâîè÷íûå ôàéëû øðèôòîâ (*.bin)|*.bin|Ýêðàííûå øðèôòû PC âåðñèè 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Äâîè÷íûå ôàéëû øðèôòîâ (*.bin)|*.bin|" - IDS_OPENERROR, "Îøèáêà îòêðûòèÿ ôàéëà! (Îøèáêà íîìåð %1!u!)" - IDS_READERROR, "Îøèáêà ÷òåíèÿ ôàéëà! (Îøèáêà íîìåð %1!u!)" - IDS_WRITEERROR, "Îøèáêà çàïèñè ôàéëà! (Îøèáêà íîìåð %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Íåïîääåðæèâàåìûé ôîðìàò ôàéëà!" - IDS_UNSUPPORTEDPSF, "Íåïîääåðæèâàåìûé PSF-ôîðìàò øðèôòà! Ðåäàêòîð ïîääåðæèâàåò òîëüêî øðèôòû ðàçìåðîì 8x8 áåç ñïåöèàëüíûõ ðåæèìîâ." - IDS_DOCNAME, "Øðèôò %1!u!" - IDS_SAVEPROMPT, "Ôàéë ""%1"" áûë èçìåíåí è èçìåíåíèÿ íå áûëè ñîõðàíåíû.\n\nÑîõðàíèòü?" - IDS_APPTITLE, "Ðåäàêòîð VGA-øðèôòîâ ReactOS" - IDS_CLOSEEDIT, "Ïîæàëóéñòà, çàêðîéòå ñíà÷àëà âñå îòêðûòûå îêíà ðåäàêòèðîâàíèÿ!" + IDS_OPENFILTER, "ÐÑÐµ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐµ ÑÐ¾ÑÐ¼Ð°ÑÑ (*.bin,*.psf)|*.bin;*.psf|ÐÐ²Ð¾Ð¸ÑÐ½ÑÐµ ÑÐ°Ð¹Ð»Ñ ÑÑÐ¸ÑÑÐ¾Ð² (*.bin)|*.bin|ÐÐºÑÐ°Ð½Ð½ÑÐµ ÑÑÐ¸ÑÑÑ PC Ð²ÐµÑÑÐ¸Ð¸ 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "ÐÐ²Ð¾Ð¸ÑÐ½ÑÐµ ÑÐ°Ð¹Ð»Ñ ÑÑÐ¸ÑÑÐ¾Ð² (*.bin)|*.bin|" + IDS_OPENERROR, "ÐÑÐ¸Ð±ÐºÐ° Ð¾ÑÐºÑÑÑÐ¸Ñ ÑÐ°Ð¹Ð»Ð°! (ÐÑÐ¸Ð±ÐºÐ° Ð½Ð¾Ð¼ÐµÑ %1!u!)" + IDS_READERROR, "ÐÑÐ¸Ð±ÐºÐ° ÑÑÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð°! (ÐÑÐ¸Ð±ÐºÐ° Ð½Ð¾Ð¼ÐµÑ %1!u!)" + IDS_WRITEERROR, "ÐÑÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿Ð¸ÑÐ¸ ÑÐ°Ð¹Ð»Ð°! (ÐÑÐ¸Ð±ÐºÐ° Ð½Ð¾Ð¼ÐµÑ %1!u!)" + IDS_UNSUPPORTEDFORMAT, "ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ ÑÐ¾ÑÐ¼Ð°Ñ ÑÐ°Ð¹Ð»Ð°!" + IDS_UNSUPPORTEDPSF, "ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÐ¼ÑÐ¹ PSF-ÑÐ¾ÑÐ¼Ð°Ñ ÑÑÐ¸ÑÑÐ°! Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑ ÑÐ¾Ð»ÑÐºÐ¾ ÑÑÐ¸ÑÑÑ ÑÐ°Ð·Ð¼ÐµÑÐ¾Ð¼ 8x8 Ð±ÐµÐ· ÑÐ¿ÐµÑÐ¸Ð°Ð»ÑÐ½ÑÑ ÑÐµÐ¶Ð¸Ð¼Ð¾Ð²." + IDS_DOCNAME, "Ð¨ÑÐ¸ÑÑ %1!u!" + IDS_SAVEPROMPT, "Ð¤Ð°Ð¹Ð» ""%1"" Ð±ÑÐ» Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ðµ Ð±ÑÐ»Ð¸ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ.\n\nÐ¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ?" + IDS_APPTITLE, "Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ VGA-ÑÑÐ¸ÑÑÐ¾Ð² ReactOS" + IDS_CLOSEEDIT, "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ°, Ð·Ð°ÐºÑÐ¾Ð¹ÑÐµ ÑÐ½Ð°ÑÐ°Ð»Ð° Ð²ÑÐµ Ð¾ÑÐºÑÑÑÑÐµ Ð¾ÐºÐ½Ð° ÑÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ!" - IDS_TOOLTIP_NEW, "Íîâûé" - IDS_TOOLTIP_OPEN, "Îòêðûòü" - IDS_TOOLTIP_SAVE, "Ñîõðàíèòü" - IDS_TOOLTIP_EDIT_GLYPH, "Ðåäàêòèðîâàòü ñèìâîë" - IDS_TOOLTIP_COPY, "Êîïèðîâàòü" - IDS_TOOLTIP_PASTE, "Âñòàâèòü" + IDS_TOOLTIP_NEW, "ÐÐ¾Ð²ÑÐ¹" + IDS_TOOLTIP_OPEN, "ÐÑÐºÑÑÑÑ" + IDS_TOOLTIP_SAVE, "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ" + IDS_TOOLTIP_EDIT_GLYPH, "Ð ÐµÐ´Ð°ÐºÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ¸Ð¼Ð²Ð¾Ð»" + IDS_TOOLTIP_COPY, "ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ" + IDS_TOOLTIP_PASTE, "ÐÑÑÐ°Ð²Ð¸ÑÑ" END Modified: trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -11,18 +11,18 @@ IDD_ABOUT DIALOGEX 10, 10, 130, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Ïðî ïðîãðàìó" +CAPTION "ÐÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT "Ðåäàêòîð VGA-øðèôò³â ReactOS", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ VGA-ÑÑÐ¸ÑÑÑÐ² ReactOS", IDC_STATIC, 37, 10, 93, 10 LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ðåäàãóâàííÿ ñèìâîëà" +CAPTION "Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°Ð½Ð½Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð°" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -30,65 +30,65 @@ CONTROL "", IDC_EDIT_GLYPH_PREVIEW, EDIT_GLYPH_PREVIEW_CLASSW, 0, 209, 5, 32, 32 DEFPUSHBUTTON "OK", IDOK, 48, 177, 70, 14 - PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 125, 177, 70, 14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 125, 177, 70, 14 END IDM_MAINMENU MENU BEGIN - POPUP "&Ôàéë" + POPUP "&Ð¤Ð°Ð¹Ð»" BEGIN - MENUITEM "&Ñòâîðèòè\tCtrl+N", ID_FILE_NEW - MENUITEM "&Â³äêðèòè...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Çàêðèòè", ID_FILE_CLOSE + MENUITEM "&Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸\tCtrl+N", ID_FILE_NEW + MENUITEM "&ÐÑÐ´ÐºÑÐ¸ÑÐ¸...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&ÐÐ°ÐºÑÐ¸ÑÐ¸", ID_FILE_CLOSE MENUITEM SEPARATOR - MENUITEM "Ç&áåðåãòè\tCtrl+S", ID_FILE_SAVE - MENUITEM "Çáåðåãòè &ÿê...", ID_FILE_SAVE_AS + MENUITEM "Ð&Ð±ÐµÑÐµÐ³ÑÐ¸\tCtrl+S", ID_FILE_SAVE + MENUITEM "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ &ÑÐº...", ID_FILE_SAVE_AS MENUITEM SEPARATOR - MENUITEM "Â&èõ³ä\tAlt+F4", ID_FILE_EXIT + MENUITEM "Ð&Ð¸ÑÑÐ´\tAlt+F4", ID_FILE_EXIT END - POPUP "&Ïðàâêà" + POPUP "&ÐÑÐ°Ð²ÐºÐ°" BEGIN - MENUITEM "Êîï³þâàòè\tCtrl+C", ID_EDIT_COPY - MENUITEM "Âñòàâèòè\tCtrl+V", ID_EDIT_PASTE + MENUITEM "ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸\tCtrl+C", ID_EDIT_COPY + MENUITEM "ÐÑÑÐ°Ð²Ð¸ÑÐ¸\tCtrl+V", ID_EDIT_PASTE MENUITEM SEPARATOR - MENUITEM "Ðåäàãóâàòè ñèìâîë...", ID_EDIT_GLYPH + MENUITEM "Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸ ÑÐ¸Ð¼Ð²Ð¾Ð»...", ID_EDIT_GLYPH END - POPUP "&Â³êíî" + POPUP "&ÐÑÐºÐ½Ð¾" BEGIN - MENUITEM "&Êàñêàäîì", ID_WINDOW_CASCADE - MENUITEM "&Ãîðèçîíòàëüíî", ID_WINDOW_TILE_HORZ - MENUITEM "&Âåðòèêàëüíî", ID_WINDOW_TILE_VERT - MENUITEM "Óïîðÿäêóâàòè &çíà÷êè", ID_WINDOW_ARRANGE + MENUITEM "&ÐÐ°ÑÐºÐ°Ð´Ð¾Ð¼", ID_WINDOW_CASCADE + MENUITEM "&ÐÐ¾ÑÐ¸Ð·Ð¾Ð½ÑÐ°Ð»ÑÐ½Ð¾", ID_WINDOW_TILE_HORZ + MENUITEM "&ÐÐµÑÑÐ¸ÐºÐ°Ð»ÑÐ½Ð¾", ID_WINDOW_TILE_VERT + MENUITEM "Ð£Ð¿Ð¾ÑÑÐ´ÐºÑÐ²Ð°ÑÐ¸ &Ð·Ð½Ð°ÑÐºÐ¸", ID_WINDOW_ARRANGE MENUITEM SEPARATOR - MENUITEM "&Íàñòóïíå\tCtrl+F6", ID_WINDOW_NEXT + MENUITEM "&ÐÐ°ÑÑÑÐ¿Ð½Ðµ\tCtrl+F6", ID_WINDOW_NEXT END - POPUP "&Äîâ³äêà" + POPUP "&ÐÐ¾Ð²ÑÐ´ÐºÐ°" BEGIN - MENUITEM "&Ïðî ïðîãðàìó...", ID_HELP_ABOUT + MENUITEM "&ÐÑÐ¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ...", ID_HELP_ABOUT END END STRINGTABLE BEGIN - IDS_OPENFILTER, "Âñ³ ï³äòðèìóâàí³ ôîðìàòè (*.bin,*.psf)|*.bin;*.psf|Äâ³éêîâ³ ôàéëè øðèôò³â (*.bin)|*.bin|Åêðàíí³ øðèôòè ÏÊ âåðñ³¿ 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Äâ³éêîâ³ ôàéëè øðèôò³â (*.bin)|*.bin|" - IDS_OPENERROR, "Ïîìèëêà ïðè â³äêðèòò³ ôàéëó! (Íîìåð ïîìèëêè %1!u!)" - IDS_READERROR, "Ïîìèëêà ïðè ÷èòàíí³ ôàéëó! (Íîìåð ïîìèëêè %1!u!)" - IDS_WRITEERROR, "Ïîìèëêà ïðè çàïèñó ôàéëó! (Íîìåð ïîìèëêè %1!u!)" - IDS_UNSUPPORTEDFORMAT, "Íåï³äòðèìóâàíèé ôîðìàò ôàéëó!" - IDS_UNSUPPORTEDPSF, "Íåï³äòðèìóâàíèé ôîðìàò PSF øðèôòà! Ðåäàêòîð ï³äòðèìóº ò³ëüêè øðèôòè 8x8 áåç ñïåö³àëüíèõ ðåæèì³â." - IDS_DOCNAME, "Øðèôò %1!u!" - IDS_SAVEPROMPT, "Ôàéë ""%1"" áóâ çì³íåíèé, àëå íå çáåðåæåíèé.\n\nÇáåðåãòè éîãî?" - IDS_APPTITLE, "Ðåäàêòîð VGA-øðèôò³â ReactOS" - IDS_CLOSEEDIT, "Áóäü ëàñêà çàêðèéòå âñ³ â³äêðèò³ â³êíà Ðåäàãóâàííÿ ñïî÷àòêó!" + IDS_OPENFILTER, "ÐÑÑ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÐ²Ð°Ð½Ñ ÑÐ¾ÑÐ¼Ð°ÑÐ¸ (*.bin,*.psf)|*.bin;*.psf|ÐÐ²ÑÐ¹ÐºÐ¾Ð²Ñ ÑÐ°Ð¹Ð»Ð¸ ÑÑÐ¸ÑÑÑÐ² (*.bin)|*.bin|ÐÐºÑÐ°Ð½Ð½Ñ ÑÑÐ¸ÑÑÐ¸ ÐÐ Ð²ÐµÑÑÑÑ 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "ÐÐ²ÑÐ¹ÐºÐ¾Ð²Ñ ÑÐ°Ð¹Ð»Ð¸ ÑÑÐ¸ÑÑÑÐ² (*.bin)|*.bin|" + IDS_OPENERROR, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð²ÑÐ´ÐºÑÐ¸ÑÑÑ ÑÐ°Ð¹Ð»Ñ! (ÐÐ¾Ð¼ÐµÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ %1!u!)" + IDS_READERROR, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ ÑÐ¸ÑÐ°Ð½Ð½Ñ ÑÐ°Ð¹Ð»Ñ! (ÐÐ¾Ð¼ÐµÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ %1!u!)" + IDS_WRITEERROR, "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð¸ÑÑ ÑÐ°Ð¹Ð»Ñ! (ÐÐ¾Ð¼ÐµÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸ %1!u!)" + IDS_UNSUPPORTEDFORMAT, "ÐÐµÐ¿ÑÐ´ÑÑÐ¸Ð¼ÑÐ²Ð°Ð½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ ÑÐ°Ð¹Ð»Ñ!" + IDS_UNSUPPORTEDPSF, "ÐÐµÐ¿ÑÐ´ÑÑÐ¸Ð¼ÑÐ²Ð°Ð½Ð¸Ð¹ ÑÐ¾ÑÐ¼Ð°Ñ PSF ÑÑÐ¸ÑÑÐ°! Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ Ð¿ÑÐ´ÑÑÐ¸Ð¼ÑÑ ÑÑÐ»ÑÐºÐ¸ ÑÑÐ¸ÑÑÐ¸ 8x8 Ð±ÐµÐ· ÑÐ¿ÐµÑÑÐ°Ð»ÑÐ½Ð¸Ñ ÑÐµÐ¶Ð¸Ð¼ÑÐ²." + IDS_DOCNAME, "Ð¨ÑÐ¸ÑÑ %1!u!" + IDS_SAVEPROMPT, "Ð¤Ð°Ð¹Ð» ""%1"" Ð±ÑÐ² Ð·Ð¼ÑÐ½ÐµÐ½Ð¸Ð¹, Ð°Ð»Ðµ Ð½Ðµ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð¸Ð¹.\n\nÐÐ±ÐµÑÐµÐ³ÑÐ¸ Ð¹Ð¾Ð³Ð¾?" + IDS_APPTITLE, "Ð ÐµÐ´Ð°ÐºÑÐ¾Ñ VGA-ÑÑÐ¸ÑÑÑÐ² ReactOS" + IDS_CLOSEEDIT, "ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ° Ð·Ð°ÐºÑÐ¸Ð¹ÑÐµ Ð²ÑÑ Ð²ÑÐ´ÐºÑÐ¸ÑÑ Ð²ÑÐºÐ½Ð° Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°Ð½Ð½Ñ ÑÐ¿Ð¾ÑÐ°ÑÐºÑ!" - IDS_TOOLTIP_NEW, "Ñòâîðèòè" - IDS_TOOLTIP_OPEN, "Â³äêðèòè" - IDS_TOOLTIP_SAVE, "Çáåðåãòè" - IDS_TOOLTIP_EDIT_GLYPH, "Ðåäàãóâàòè ñèìâîë" - IDS_TOOLTIP_COPY, "Êîï³þâàòè" - IDS_TOOLTIP_PASTE, "Âñòàâèòè" + IDS_TOOLTIP_NEW, "Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸" + IDS_TOOLTIP_OPEN, "ÐÑÐ´ÐºÑÐ¸ÑÐ¸" + IDS_TOOLTIP_SAVE, "ÐÐ±ÐµÑÐµÐ³ÑÐ¸" + IDS_TOOLTIP_EDIT_GLYPH, "Ð ÐµÐ´Ð°Ð³ÑÐ²Ð°ÑÐ¸ ÑÐ¸Ð¼Ð²Ð¾Ð»" + IDS_TOOLTIP_COPY, "ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸" + IDS_TOOLTIP_PASTE, "ÐÑÑÐ°Ð²Ð¸ÑÐ¸" END Removed: trunk/rosapps/applications/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/main.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/main.rc (removed) @@ -1,43 +1,0 @@ -/* - * PROJECT: ReactOS VGA Font Editor - * LICENSE: GNU General Public License Version 2.0 or any later version - * FILE: devutils/vgafontedit/main.rc - * PURPOSE: Main resource file - * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> - */ - -#include <windows.h> -#include <commctrl.h> -#include "resource.h" -#include "customwndclasses.h" - -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS VGA Font Editor" -#define REACTOS_STR_INTERNAL_NAME "vgafontedit" -#define REACTOS_STR_ORIGINAL_FILENAME "vgafontedit.exe" -#include <reactos/version.rc> - -IDA_MAINACCELERATORS ACCELERATORS -BEGIN - "N", ID_FILE_NEW, VIRTKEY, CONTROL - "O", ID_FILE_OPEN, VIRTKEY, CONTROL - "S", ID_FILE_SAVE, VIRTKEY, CONTROL - "C", ID_EDIT_COPY, VIRTKEY, CONTROL - "V", ID_EDIT_PASTE, VIRTKEY, CONTROL -END - -IDB_MAIN_TOOLBAR BITMAP "res/toolbar.bmp" -IDB_EDIT_GLYPH_TOOLBOX BITMAP "res/toolbox.bmp" -IDI_MAIN ICON "res/main.ico" -IDI_DOC ICON "res/doc.ico" - -// Languages -#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/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" -#include "lang/it-IT.rc" -#include "lang/no-NO.rc" Modified: trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/mainwnd.c [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -137,11 +137,11 @@ // Add the toolbar bitmaps tbab.hInst = HINST_COMMCTRL; tbab.nID = IDB_STD_SMALL_COLOR; - iStandardBitmaps = SendMessageW(Info->hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); + iStandardBitmaps = (INT)SendMessageW(Info->hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); tbab.hInst = hInstance; tbab.nID = IDB_MAIN_TOOLBAR; - iCustomBitmaps = SendMessageW(Info->hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); + iCustomBitmaps = (INT)SendMessageW(Info->hToolbar, TB_ADDBITMAP, 0, (LPARAM)&tbab); // Add the toolbar buttons AddToolbarButton(Info, iStandardBitmaps + STD_FILENEW, ID_FILE_NEW, IDS_TOOLTIP_NEW); Added: trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc (added) +++ trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -1,0 +1,45 @@ +/* + * PROJECT: ReactOS VGA Font Editor + * LICENSE: GNU General Public License Version 2.0 or any later version + * FILE: devutils/vgafontedit/rsrc.rc + * PURPOSE: Localized resource file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include <windows.h> +#include "resource.h" +#include "customwndclasses.h" + +/* include localised resources */ +// UTF-8 +#pragma code_page(65001) +#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_IT_IT + #include "lang/it-IT.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_UK_UA + #include "lang/uk-UA.rc" +#endif Propchange: trunk/rosapps/applications/devutils/vgafontedit/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -10,7 +10,7 @@ <file>fontboxeswnd.c</file> <file>fontwnd.c</file> <file>main.c</file> - <file>main.rc</file> + <file>vgafontedit.rc</file> <file>mainwnd.c</file> <file>misc.c</file> <file>opensave.c</file> Added: 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 (added) +++ trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc [iso-8859-1] Wed Aug 29 18:06:24 2012 @@ -1,0 +1,35 @@ +/* + * PROJECT: ReactOS VGA Font Editor + * LICENSE: GNU General Public License Version 2.0 or any later version + * FILE: devutils/vgafontedit/vgafontedit.rc + * PURPOSE: Main resource file + * COPYRIGHT: Copyright 2008 Colin Finck <mail(a)colinfinck.de> + */ + +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + +/* define language neutral resources */ +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS VGA Font Editor" +#define REACTOS_STR_INTERNAL_NAME "vgafontedit" +#define REACTOS_STR_ORIGINAL_FILENAME "vgafontedit.exe" +#include <reactos/version.rc> + +IDA_MAINACCELERATORS ACCELERATORS +BEGIN + "N", ID_FILE_NEW, VIRTKEY, CONTROL + "O", ID_FILE_OPEN, VIRTKEY, CONTROL + "S", ID_FILE_SAVE, VIRTKEY, CONTROL + "C", ID_EDIT_COPY, VIRTKEY, CONTROL + "V", ID_EDIT_PASTE, VIRTKEY, CONTROL +END + +IDB_MAIN_TOOLBAR BITMAP "res/toolbar.bmp" +IDB_EDIT_GLYPH_TOOLBOX BITMAP "res/toolbox.bmp" +IDI_MAIN ICON "res/main.ico" +IDI_DOC ICON "res/doc.ico" + +#include "rsrc.rc" Propchange: trunk/rosapps/applications/devutils/vgafontedit/vgafontedit.rc ------------------------------------------------------------------------------ svn:eol-style = native

12 years

[cgutman] 57199: [WS2_32] - Fix a memory overwrite bug in some crappy WINE code that leads to nasty memory corruption of the service cache entry. This corrupts the first field of the cache, causing...

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Aug 29 14:23:40 2012 New Revision: 57199 URL: http://svn.reactos.org/svn/reactos?rev=57199&view=rev Log: [WS2_32] - Fix a memory overwrite bug in some crappy WINE code that leads to nasty memory corruption of the service cache entry. This corrupts the first field of the cache, causing it to always reallocate memory because it thinks the size is 0. This would be even worse if the code didn't overwrite the other 12 bytes of corruption with proper data on the next lines. This also caused the aliases value to be garbage because it pointed at uninitialized data. Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c Modified: trunk/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/ns.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/ns.c [iso-8859-1] Wed Aug 29 14:23:40 2012 @@ -1275,7 +1275,7 @@ WS_DbgPrint(MAX_TRACE,("Aliase %d: %s\n", i, Aliases[i])); } - memcpy(p->Getservbyname, + memcpy(p->Getservbyname->Aliases, Aliases, sizeof(Aliases)); @@ -1457,7 +1457,7 @@ WS_DbgPrint(MAX_TRACE,("Aliases %d: %s\n", i, Aliases[i])); } - memcpy(p->Getservbyport,Aliases,sizeof(Aliases)); + memcpy(p->Getservbyport->Aliases,Aliases,sizeof(Aliases)); /* Create the struct proper */ p->Getservbyport->ServerEntry.s_name = ServiceName;

12 years

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 August 2012