Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 10 16:21:50 2007 New Revision: 28988 URL: http://svn.reactos.org/svn/reactos?rev=28988&view=rev Log: Fix rbuild files Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild trunk/reactos/dll/directx/dsound/dsound.rbuild Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild (original) +++ trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild Mon Sep 10 16:21:50 2007 @@ -1,215 +1,256 @@ - <module name="mesa32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true"> - <importlibrary definition="src/drivers/windows/icd/mesa.def" /> - <linkerflag>-Wl,--enable-stdcall-fixup</linkerflag> - <library>ntdll</library> - <library>kernel32</library> - <library>msvcrt</library> - <library>user32</library> - <define name="__USE_W32API" /> - <define name="USE_EXTERNAL_DXTN_LIB" /> -  - <library>gdi32</library> - <define name="BUILD_GL32" /> - <define name="_OPENGL32_" /> - <define name="USE_EXTERNAL_DXTN_LIB=1" /> - <define name="USE_MGL_NAMESPACE" /> - <define name="USE_X86_ASM" /> - <define name="USE_MMX_ASM" /> - <define name="USE_SSE_ASM" /> - <define name="USE_3DNOW_ASM" /> - <include base="mesa32">include</include> - <include base="mesa32">src</include> - <include base="mesa32">src/main</include> - <include base="mesa32">src/glapi</include> - <include base="mesa32">src/math</include> - <include base="mesa32">src/tnl</include> - <include base="mesa32">src/shader</include> - <include base="mesa32">src/shader/grammar</include> - <include base="mesa32">src/shader/slang</include> - <include base="mesa32">src/shader/slang/OSDependent/Linux</include> - <include base="mesa32">src/shader/slang/OGLCompilersDLL</include> - <file>src/main/api_arrayelt.c</file> - <file>src/main/api_loopback.c</file> - <file>src/main/api_noop.c</file> - <file>src/main/api_validate.c</file> - <file>src/main/accum.c</file> - <file>src/main/attrib.c</file> - <file>src/main/blend.c</file> - <file>src/main/bufferobj.c</file> - <file>src/main/buffers.c</file> - <file>src/main/clip.c</file> - <file>src/main/colortab.c</file> - <file>src/main/context.c</file> - <file>src/main/convolve.c</file> - <file>src/main/debug.c</file> - <file>src/main/depth.c</file> - <file>src/main/dispatch.c</file> - <file>src/main/dlist.c</file> - <file>src/main/drawpix.c</file> - <file>src/main/enable.c</file> - <file>src/main/enums.c</file> - <file>src/main/eval.c</file> - <file>src/main/execmem.c</file> - <file>src/main/extensions.c</file> - <file>src/main/fbobject.c</file> - <file>src/main/feedback.c</file> - <file>src/main/fog.c</file> - <file>src/main/framebuffer.c</file> - <file>src/main/get.c</file> - <file>src/main/getstring.c</file> - <file>src/main/hash.c</file> - <file>src/main/hint.c</file> - <file>src/main/histogram.c</file> - <file>src/main/image.c</file> - <file>src/main/imports.c</file> - <file>src/main/light.c</file> - <file>src/main/lines.c</file> - <file>src/main/matrix.c</file> - <file>src/main/mm.c</file> - <file>src/main/occlude.c</file> - <file>src/main/pixel.c</file> - <file>src/main/points.c</file> - <file>src/main/polygon.c</file> - <file>src/main/rastpos.c</file> - <file>src/main/renderbuffer.c</file> - <file>src/main/state.c</file> - <file>src/main/stencil.c</file> - <file>src/main/texcompress.c</file> - <file>src/main/texcompress_s3tc.c</file> - <file>src/main/texcompress_fxt1.c</file> - <file>src/main/texenvprogram.c</file> - <file>src/main/texformat.c</file> - <file>src/main/teximage.c</file> - <file>src/main/texrender.c</file> - <file>src/main/texobj.c</file> - <file>src/main/texstate.c</file> - <file>src/main/texstore.c</file> - <file>src/main/varray.c</file> - <file>src/main/vtxfmt.c</file> - <file>src/glapi/glapi.c</file> - <file>src/glapi/glthread.c</file> - <file>src/math/m_debug_clip.c</file> - <file>src/math/m_debug_norm.c</file> - <file>src/math/m_debug_xform.c</file> - <file>src/math/m_eval.c</file> - <file>src/math/m_matrix.c</file> - <file>src/math/m_translate.c</file> - <file>src/math/m_vector.c</file> - <file>src/math/m_xform.c</file> - <file>src/array_cache/ac_context.c</file> - <file>src/array_cache/ac_import.c</file> - <file>src/tnl/t_array_api.c</file> - <file>src/tnl/t_array_import.c</file> - <file>src/tnl/t_context.c</file> - <file>src/tnl/t_pipeline.c</file> - <file>src/tnl/t_save_api.c</file> - <file>src/tnl/t_save_loopback.c</file> - <file>src/tnl/t_save_playback.c</file> - <file>src/tnl/t_vb_arbprogram.c</file> - <file>src/tnl/t_vb_arbprogram_sse.c</file> - <file>src/tnl/t_vb_program.c</file> - <file>src/tnl/t_vb_render.c</file> - <file>src/tnl/t_vb_texgen.c</file> - <file>src/tnl/t_vb_texmat.c</file> - <file>src/tnl/t_vb_vertex.c</file> - <file>src/tnl/t_vb_cull.c</file> - <file>src/tnl/t_vb_fog.c</file> - <file>src/tnl/t_vb_light.c</file> - <file>src/tnl/t_vb_normals.c</file> - <file>src/tnl/t_vb_points.c</file> - <file>src/tnl/t_vp_build.c</file> - <file>src/tnl/t_vertex.c</file> - <file>src/tnl/t_vertex_sse.c</file> - <file>src/tnl/t_vertex_generic.c</file> - <file>src/tnl/t_vtx_api.c</file> - <file>src/tnl/t_vtx_generic.c</file> - <file>src/tnl/t_vtx_x86.c</file> - <file>src/tnl/t_vtx_eval.c</file> - <file>src/tnl/t_vtx_exec.c</file> - <file>src/shader/arbfragparse.c</file> - <file>src/shader/arbprogparse.c</file> - <file>src/shader/arbprogram.c</file> - <file>src/shader/arbvertparse.c</file> - <file>src/shader/atifragshader.c</file> - <file>src/shader/grammar/grammar_mesa.c</file> - <file>src/shader/nvfragparse.c</file> - <file>src/shader/nvprogram.c</file> - <file>src/shader/nvvertexec.c</file> - <file>src/shader/nvvertparse.c</file> - <file>src/shader/program.c</file> - <file>src/shader/shaderobjects.c</file> - <file>src/shader/shaderobjects_3dlabs.c</file> - <file>src/swrast/s_fragprog_to_c.c</file> - <file>src/swrast/s_aaline.c</file> - <file>src/swrast/s_aatriangle.c</file> - <file>src/swrast/s_accum.c</file> - <file>src/swrast/s_alpha.c</file> - <file>src/swrast/s_atifragshader.c</file> - <file>src/swrast/s_bitmap.c</file> - <file>src/swrast/s_blend.c</file> - <file>src/swrast/s_buffers.c</file> - <file>src/swrast/s_copypix.c</file> - <file>src/swrast/s_context.c</file> - <file>src/swrast/s_depth.c</file> - <file>src/swrast/s_drawpix.c</file> - <file>src/swrast/s_feedback.c</file> - <file>src/swrast/s_fog.c</file> - <file>src/swrast/s_imaging.c</file> - <file>src/swrast/s_lines.c</file> - <file>src/swrast/s_logic.c</file> - <file>src/swrast/s_masking.c</file> - <file>src/swrast/s_nvfragprog.c</file> - <file>src/swrast/s_pixeltex.c</file> - <file>src/swrast/s_points.c</file> - <file>src/swrast/s_readpix.c</file> - <file>src/swrast/s_span.c</file> - <file>src/swrast/s_stencil.c</file> - <file>src/swrast/s_tcc.c</file> - <file>src/swrast/s_texture.c</file> - <file>src/swrast/s_texstore.c</file> - <file>src/swrast/s_triangle.c</file> - <file>src/swrast/s_zoom.c</file> - <file>src/swrast_setup/ss_context.c</file> - <file>src/swrast_setup/ss_triangle.c</file> - <file>src/x86/common_x86.c</file> - <file>src/x86/x86.c</file> - <file>src/x86/3dnow.c</file> - <file>src/x86/sse.c</file> - <file>src/x86/rtasm/x86sse.c</file> - <file>src/sparc/sparc.c</file> - <file>src/ppc/common_ppc.c</file> - <file>src/x86-64/x86-64.c</file> - <file>src/shader/slang/slang_assemble.c</file> - <file>src/shader/slang/slang_assemble_assignment.c</file> - <file>src/shader/slang/slang_assemble_conditional.c</file> - <file>src/shader/slang/slang_assemble_constructor.c</file> - <file>src/shader/slang/slang_assemble_typeinfo.c</file> - <file>src/shader/slang/slang_compile.c</file> - <file>src/shader/slang/slang_execute.c</file> - <file>src/shader/slang/slang_preprocess.c</file> - <file>src/shader/slang/slang_storage.c</file> - <file>src/shader/slang/slang_utility.c</file> - <file>src/x86/common_x86_asm.S</file> - <file>src/x86/x86_xform2.S</file> - <file>src/x86/x86_xform3.S</file> - <file>src/x86/x86_xform4.S</file> - <file>src/x86/x86_cliptest.S</file> - <file>src/x86/mmx_blend.S</file> - <file>src/x86/3dnow_xform1.S</file> - <file>src/x86/3dnow_xform2.S</file> - <file>src/x86/3dnow_xform3.S</file> - <file>src/x86/3dnow_xform4.S</file> - <file>src/x86/3dnow_normal.S</file> - <file>src/x86/sse_xform1.S</file> - <file>src/x86/sse_xform2.S</file> - <file>src/x86/sse_xform3.S</file> - <file>src/x86/sse_xform4.S</file> - <file>src/x86/sse_normal.S</file> - <file>src/x86/read_rgba_span_x86.S</file> - <file>src/tnl/t_vtx_x86_gcc.S</file> - <file>src/x86/glapi_x86.S</file> - <file>src/drivers/common/driverfuncs.c</file> - <file>src/drivers/windows/gdi/wmesa.c</file> - <file>src/drivers/windows/icd/icd.c</file> + <importlibrary definition="src/drivers/windows/icd/mesa.def" /> + <linkerflag>-Wl,--enable-stdcall-fixup</linkerflag> + <library>ntdll</library> + <library>kernel32</library> + <library>msvcrt</library> + <library>user32</library> + <define name="__USE_W32API" /> + <define name="USE_EXTERNAL_DXTN_LIB" /> +  + <library>gdi32</library> + <define name="BUILD_GL32" /> + <define name="_OPENGL32_" /> + <define name="USE_EXTERNAL_DXTN_LIB=1" /> + <define name="USE_MGL_NAMESPACE" /> + <define name="USE_X86_ASM" /> + <define name="USE_MMX_ASM" /> + <define name="USE_SSE_ASM" /> + <define name="USE_3DNOW_ASM" /> + <include base="mesa32">include</include> + <include base="mesa32">src</include> + <include base="mesa32">src/main</include> + <include base="mesa32">src/glapi</include> + <include base="mesa32">src/math</include> + <include base="mesa32">src/tnl</include> + <include base="mesa32">src/shader</include> + <include base="mesa32">src/shader/grammar</include> + <include base="mesa32">src/shader/slang</include> + <include base="mesa32">src/shader/slang/OSDependent/Linux</include> + <include base="mesa32">src/shader/slang/OGLCompilersDLL</include> + <directory name="src"> + <directory name="array_cache"> + <file>ac_context.c</file> + <file>ac_import.c</file> + </directory> + <directory name="drivers"> + <directory name="common"> + <file>driverfuncs.c</file> + </directory> + <directory name="windows"> + <directory name="gdi"> + <file>wmesa.c</file> + </directory> + <directory name="icd"> + <file>icd.c</file> + </directory> + </directory> + </directory> + <directory name="glapi"> + <file>glapi.c</file> + <file>glthread.c</file> + </directory> + <directory name="main"> + <file>api_arrayelt.c</file> + <file>api_loopback.c</file> + <file>api_noop.c</file> + <file>api_validate.c</file> + <file>accum.c</file> + <file>attrib.c</file> + <file>blend.c</file> + <file>bufferobj.c</file> + <file>buffers.c</file> + <file>clip.c</file> + <file>colortab.c</file> + <file>context.c</file> + <file>convolve.c</file> + <file>debug.c</file> + <file>depth.c</file> + <file>dispatch.c</file> + <file>dlist.c</file> + <file>drawpix.c</file> + <file>enable.c</file> + <file>enums.c</file> + <file>eval.c</file> + <file>execmem.c</file> + <file>extensions.c</file> + <file>fbobject.c</file> + <file>feedback.c</file> + <file>fog.c</file> + <file>framebuffer.c</file> + <file>get.c</file> + <file>getstring.c</file> + <file>hash.c</file> + <file>hint.c</file> + <file>histogram.c</file> + <file>image.c</file> + <file>imports.c</file> + <file>light.c</file> + <file>lines.c</file> + <file>matrix.c</file> + <file>mm.c</file> + <file>occlude.c</file> + <file>pixel.c</file> + <file>points.c</file> + <file>polygon.c</file> + <file>rastpos.c</file> + <file>renderbuffer.c</file> + <file>state.c</file> + <file>stencil.c</file> + <file>texcompress.c</file> + <file>texcompress_s3tc.c</file> + <file>texcompress_fxt1.c</file> + <file>texenvprogram.c</file> + <file>texformat.c</file> + <file>teximage.c</file> + <file>texrender.c</file> + <file>texobj.c</file> + <file>texstate.c</file> + <file>texstore.c</file> + <file>varray.c</file> + <file>vtxfmt.c</file> + </directory> + <directory name="math"> + <file>m_debug_clip.c</file> + <file>m_debug_norm.c</file> + <file>m_debug_xform.c</file> + <file>m_eval.c</file> + <file>m_matrix.c</file> + <file>m_translate.c</file> + <file>m_vector.c</file> + <file>m_xform.c</file> + </directory> + <directory name="ppc"> + <file>common_ppc.c</file> + </directory> + <directory name="shader"> + <directory name="grammar"> + <file>grammar_mesa.c</file> + </directory> + <directory name="slang"> + <file>slang_assemble.c</file> + <file>slang_assemble_assignment.c</file> + <file>slang_assemble_conditional.c</file> + <file>slang_assemble_constructor.c</file> + <file>slang_assemble_typeinfo.c</file> + <file>slang_compile.c</file> + <file>slang_execute.c</file> + <file>slang_preprocess.c</file> + <file>slang_storage.c</file> + <file>slang_utility.c</file> + </directory> + <file>arbfragparse.c</file> + <file>arbprogparse.c</file> + <file>arbprogram.c</file> + <file>arbvertparse.c</file> + <file>atifragshader.c</file> + <file>nvfragparse.c</file> + <file>nvprogram.c</file> + <file>nvvertexec.c</file> + <file>nvvertparse.c</file> + <file>program.c</file> + <file>shaderobjects.c</file> + <file>shaderobjects_3dlabs.c</file> + </directory> + <directory name="sparc"> + <file>sparc.c</file> + </directory> + <directory name="swrast"> + <file>s_fragprog_to_c.c</file> + <file>s_aaline.c</file> + <file>s_aatriangle.c</file> + <file>s_accum.c</file> + <file>s_alpha.c</file> + <file>s_atifragshader.c</file> + <file>s_bitmap.c</file> + <file>s_blend.c</file> + <file>s_buffers.c</file> + <file>s_copypix.c</file> + <file>s_context.c</file> + <file>s_depth.c</file> + <file>s_drawpix.c</file> + <file>s_feedback.c</file> + <file>s_fog.c</file> + <file>s_imaging.c</file> + <file>s_lines.c</file> + <file>s_logic.c</file> + <file>s_masking.c</file> + <file>s_nvfragprog.c</file> + <file>s_pixeltex.c</file> + <file>s_points.c</file> + <file>s_readpix.c</file> + <file>s_span.c</file> + <file>s_stencil.c</file> + <file>s_tcc.c</file> + <file>s_texture.c</file> + <file>s_texstore.c</file> + <file>s_triangle.c</file> + <file>s_zoom.c</file> + </directory> + <directory name="swrast_setup"> + <file>ss_context.c</file> + <file>ss_triangle.c</file> + </directory> + <directory name="tnl"> + <file>t_array_api.c</file> + <file>t_array_import.c</file> + <file>t_context.c</file> + <file>t_pipeline.c</file> + <file>t_save_api.c</file> + <file>t_save_loopback.c</file> + <file>t_save_playback.c</file> + <file>t_vb_arbprogram.c</file> + <file>t_vb_arbprogram_sse.c</file> + <file>t_vb_program.c</file> + <file>t_vb_render.c</file> + <file>t_vb_texgen.c</file> + <file>t_vb_texmat.c</file> + <file>t_vb_vertex.c</file> + <file>t_vb_cull.c</file> + <file>t_vb_fog.c</file> + <file>t_vb_light.c</file> + <file>t_vb_normals.c</file> + <file>t_vb_points.c</file> + <file>t_vp_build.c</file> + <file>t_vertex.c</file> + <file>t_vertex_sse.c</file> + <file>t_vertex_generic.c</file> + <file>t_vtx_api.c</file> + <file>t_vtx_generic.c</file> + <file>t_vtx_eval.c</file> + <file>t_vtx_exec.c</file> + <file>t_vtx_x86.c</file> + <file>t_vtx_x86_gcc.S</file> + </directory> + <directory name="x86"> + <directory name="rtasm"> + <file>x86sse.c</file> + </directory> + <file>3dnow.c</file> + <file>3dnow_normal.S</file> + <file>3dnow_xform1.S</file> + <file>3dnow_xform2.S</file> + <file>3dnow_xform3.S</file> + <file>3dnow_xform4.S</file> + <file>common_x86.c</file> + <file>common_x86_asm.S</file> + <file>glapi_x86.S</file> + <file>mmx_blend.S</file> + <file>read_rgba_span_x86.S</file> + <file>sse_normal.S</file> + <file>sse_xform1.S</file> + <file>sse_xform2.S</file> + <file>sse_xform3.S</file> + <file>sse_xform4.S</file> + <file>x86.c</file> + <file>x86_cliptest.S</file> + <file>x86_xform2.S</file> + <file>x86_xform3.S</file> + <file>x86_xform4.S</file> + <file>sse.c</file> + </directory> + <directory name="x86-64"> + <file>x86-64.c</file> + </directory> + </directory> </module> Modified: trunk/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound.… ============================================================================== --- trunk/reactos/dll/directx/dsound/dsound.rbuild (original) +++ trunk/reactos/dll/directx/dsound/dsound.rbuild Mon Sep 10 16:21:50 2007 @@ -29,9 +29,11 @@ <file>propset.c</file> <file>regsvr.c</file> <file>sound3d.c</file> - <file>dxroslayer/dxrosdrv_querydsounddesc.c</file> - <file>dxroslayer/dxrosdrv_querydsoundiface.c</file> - <file>dxroslayer/dxroslayer.c</file> - <file>dxroslayer/getguidfromstring.c</file> + <directory name="dxroslayer"> + <file>dxrosdrv_querydsounddesc.c</file> + <file>dxrosdrv_querydsoundiface.c</file> + <file>dxroslayer.c</file> + <file>getguidfromstring.c</file> + </directory> <file>dsound.spec</file> </module>

17 years

[dreimer] 28987: Bug 2643: Ukrainian translation update (temarez@yandex.ru) Fixes in English RC file of Input and a German Translation by myself.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Sep 10 14:59:21 2007 New Revision: 28987 URL: http://svn.reactos.org/svn/reactos?rev=28987&view=rev Log: Bug 2643: Ukrainian translation update (temarez(a)yandex.ru) Fixes in English RC file of Input and a German Translation by myself. Added: trunk/reactos/dll/cpl/input/lang/de-DE.rc trunk/reactos/dll/cpl/input/lang/uk-UA.rc Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/dll/cpl/input/input.rc trunk/reactos/dll/cpl/input/lang/en-US.rc trunk/reactos/dll/cpl/intl/lang/uk-UA.rc trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc trunk/reactos/dll/win32/newdev/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc Mon Sep 10 14:59:21 2007 @@ -1,7 +1,7 @@ /* * Regedit (Ukrainian resources) * - * Copyright 2006 Artem Reznikov + * Copyright 2006,2007 Artem Reznikov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,10 +57,10 @@ MENUITEM "Çàâàíòàæèòè âóëèê...", ID_REGISTRY_LOADHIVE, GRAYED MENUITEM "Âèâàíòàæèòè âóëèê...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Ï³äêëþ÷èòè ìåðåæåâèé ðåã³ñòð...", + MENUITEM "&Ï³äêëþ÷èòè ìåðåæåâèé ðåºñòð...", ID_REGISTRY_CONNECTNETWORKREGISTRY - MENUITEM "&Â³äêëþ÷èòè ìåðåæåâèé ðåã³ñòð...", + MENUITEM "&Â³äêëþ÷èòè ìåðåæåâèé ðåºñòð...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY , GRAYED MENUITEM SEPARATOR @@ -112,7 +112,7 @@ BEGIN MENUITEM "&Çì³ñò\tF1", ID_HELP_HELPTOPICS MENUITEM SEPARATOR - MENUITEM "&Ïðî ðåäàêòîð ðåã³ñòðà", ID_HELP_ABOUT + MENUITEM "&Ïðî ðåäàêòîð ðåºñòðà", ID_HELP_ABOUT END END @@ -238,18 +238,18 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_TITLE "Ðåäàêòîð ðåã³ñòðà" + IDS_APP_TITLE "Ðåäàêòîð ðåºñòðà" IDC_REGEDIT "REGEDIT" IDC_REGEDIT_FRAME "REGEDIT_FRAME" END STRINGTABLE DISCARDABLE BEGIN - ID_REGISTRY_MENU "Ì³ñòèòü êîìàíäè äëÿ ðîáîòè ç ðåã³ñòðîì ó ö³ëîìó" + ID_REGISTRY_MENU "Ì³ñòèòü êîìàíäè äëÿ ðîáîòè ç ðåºñòðîì ó ö³ëîìó" ID_EDIT_MENU "Ì³ñòèòü êîìàíäè äëÿ ðåäàãóâàííÿ çíà÷åíü àáî ðîçä³ë³â" - ID_VIEW_MENU "Ì³ñòèòü êîìàíäè äëÿ íàñòðîþâàííÿ â³êíà ðåã³ñòðà" + ID_VIEW_MENU "Ì³ñòèòü êîìàíäè äëÿ íàñòðîþâàííÿ â³êíà ðåºñòðà" ID_FAVOURITES_MENU "Ì³ñòèòü êîìàíäè äëÿ äîñòóïó äî ðîçä³ë³â, ùî ÷àñòî âæèâàþòüñÿ" - ID_HELP_MENU "Ì³ñòèòü êîìàíäè äëÿ â³äîáðàæåííÿ äîâ³äêè òà ³íôîðìàö³¿ ïðî ðåäàêòîð ðåã³ñòðà" + ID_HELP_MENU "Ì³ñòèòü êîìàíäè äëÿ â³äîáðàæåííÿ äîâ³äêè òà ³íôîðìàö³¿ ïðî ðåäàêòîð ðåºñòðà" ID_EDIT_NEW_MENU "Ì³ñòèòü êîìàíäè äëÿ ñòâîðåííÿ íîâèõ ðîçä³ë³â àáî çíà÷åíü" END @@ -260,21 +260,21 @@ ID_EDIT_NEW_STRINGVALUE "Äîäàº íîâå ðÿäêîâå çíà÷åííÿ" ID_EDIT_NEW_BINARYVALUE "Äîäàº íîâå äâ³éêîâå çíà÷åííÿ" ID_EDIT_NEW_DWORDVALUE "Äîäàº íîâå DWORD-çíà÷åííÿ" - ID_REGISTRY_IMPORTREGISTRYFILE "²ìïîðòóº òåêñòîâèé ôàéë äî ðåã³ñòðà" + ID_REGISTRY_IMPORTREGISTRYFILE "²ìïîðòóº òåêñòîâèé ôàéë äî ðåºñòðà" ID_REGISTRY_EXPORTREGISTRYFILE - "Åêñïîðòóº âåñü ðåã³ñòð àáî éîãî ÷àñòèíó â òåêñòîâèé ôàéë" + "Åêñïîðòóº âåñü ðåºñòð àáî éîãî ÷àñòèíó â òåêñòîâèé ôàéë" ID_REGISTRY_CONNECTNETWORKREGISTRY - "Ï³äêëþ÷àºòüñÿ äî ðåã³ñòðó â³ääàëåíîãî êîìï'þòåðà" + "Ï³äêëþ÷àºòüñÿ äî ðåºñòðó â³ääàëåíîãî êîìï'þòåðà" ID_REGISTRY_DISCONNECTNETWORKREGISTRY - "Â³äêëþ÷àºòüñÿ â³ä ðåã³ñòðó â³ääàëåíîãî êîìï'þòåðà" - ID_REGISTRY_PRINT "Äðóêóº âåñü ðåã³ñòð àáî éîãî ÷àñòèíó" -/* ID_HELP_HELPTOPICS "Â³äêðèâàº äîâ³äêó ðåäàêòîðà ðåã³ñòðà" */ + "Â³äêëþ÷àºòüñÿ â³ä ðåºñòðó â³ääàëåíîãî êîìï'þòåðà" + ID_REGISTRY_PRINT "Äðóêóº âåñü ðåºñòð àáî éîãî ÷àñòèíó" +/* ID_HELP_HELPTOPICS "Â³äêðèâàº äîâ³äêó ðåäàêòîðà ðåºñòðà" */ ID_HELP_ABOUT "Â³äîáðàæàº ³íôîðìàö³þ ïðî ïðîãðàìó, íîìåð âåðñ³¿ òà àâòîðñòâî" END STRINGTABLE DISCARDABLE BEGIN - ID_REGISTRY_EXIT "Âèõîäèòü ç ðåäàêòîðà ðåã³ñòðà" + ID_REGISTRY_EXIT "Âèõîäèòü ç ðåäàêòîðà ðåºñòðà" ID_FAVOURITES_ADDTOFAVOURITES "Äîäàº ðîçä³ë äî îáðàíîãî" ID_FAVOURITES_REMOVEFAVOURITE "Âèäàëÿº ðîçä³ë ç îáðàíîãî" ID_VIEW_STATUSBAR "Â³äîáðàæóº àáî õîâàº ðÿäîê ñòàíó" @@ -295,7 +295,7 @@ IDS_BAD_VALUE "Íå ìîæó çàïðîñèòè çíà÷åííÿ '%s'" IDS_UNSUPPORTED_TYPE "Íå ìîæó ðåäàãóâàòè ðîçä³ëè öüîãî òèïó (%ld)" IDS_TOO_BIG_VALUE "Çíà÷åííÿ çàâåëèêå (%ld)" - IDS_MULTI_SZ_EMPTY_STRING "Äàí³ òèïó REG_MULTI_SZ íå ìîæóòü ì³ñòèòè ïîðîæí³ ðÿäêè\nÏîðîæí³ ðÿä-êè áóëè âèäàëåí³ ç³ ñïèñêó." + IDS_MULTI_SZ_EMPTY_STRING "Äàí³ òèïó REG_MULTI_SZ íå ìîæóòü ì³ñòèòè ïîðîæí³ ðÿäêè\nÏîðîæí³ ðÿäêè áóëè âèäàëåí³ ç³ ñïèñêó." IDS_QUERY_DELETE_KEY_ONE "Âè âïåâíåí³, ùî õî÷åòå âèäàëèòè öåé ðîçä³ë?" IDS_QUERY_DELETE_KEY_MORE "Âè âïåâíåí³, ùî õî÷åòå âèäàëèòè ö³ ðîçä³ëè?" IDS_QUERY_DELETE_KEY_CONFIRM "Ï³äòâåðäæåííÿ âèäàëåííÿ ðîçä³ëó" @@ -304,8 +304,8 @@ IDS_QUERY_DELETE_CONFIRM "Ï³äòâåðäæåííÿ âèäàëåííÿ çíà÷åííÿ" IDS_ERR_DELVAL_CAPTION "Ïîìèëêà ïðè âèäàëåíí³ çíà÷åíü" IDS_ERR_DELETEVALUE "Íåìîæëèâî âèäàëèòè óñ³ çàäàí³ çíà÷åííÿ!" - IDS_ERR_RENVAL_CAPTION "Ïîìèëêà ïðè ïåðåéìåíóâàíí³ çíà÷åíÿ" - IDS_ERR_RENVAL_TOEMPTY "Íå ìîæó ïåðåéìåíóâàòè %s. ²ì'ÿ çàäàíîãî çíà÷åííÿ ïîðîæíº. Ñïðîáóéòå ³í-øå ³ì'ÿ òà ïîâòîð³òü ñïðîáó." + IDS_ERR_RENVAL_CAPTION "Ïîìèëêà ïðè ïåðåéìåíóâàíí³ çíà÷åííÿ" + IDS_ERR_RENVAL_TOEMPTY "Íå ìîæó ïåðåéìåíóâàòè %s. ²ì'ÿ çàäàíîãî çíà÷åííÿ ïîðîæíº. Ñïðîáóéòå ³íøå ³ì'ÿ òà ïîâòîð³òü ñïðîáó." IDS_NEW_KEY "Íîâèé ðîçä³ë #%d" IDS_NEW_VALUE "Íîâå çíà÷åííÿ #%d" END @@ -317,16 +317,16 @@ IDS_VALUE_NOT_SET "(çíà÷åííÿ íå âñòàíîâëåíå)" IDS_UNKNOWN_TYPE "Íåâ³äîìèé òèï: (0x%lx)" IDS_MY_COMPUTER "Ì³é êîìï'þòåð" - IDS_IMPORT_REG_FILE "²ìïîðòóâàòè ôàéë ðåã³ñòðó" - IDS_EXPORT_REG_FILE "Åêñïîðòóâàòè ôàéë ðåã³ñòðó" + IDS_IMPORT_REG_FILE "²ìïîðòóâàòè ôàéë ðåºñòðó" + IDS_EXPORT_REG_FILE "Åêñïîðòóâàòè ôàéë ðåºñòðó" IDS_INVALID_DWORD "(Íåïðàâèëüíå çíà÷åííÿ DWORD)" END STRINGTABLE DISCARDABLE BEGIN - IDS_FLT_REGFILES "Ôàéëè ðåã³ñòðó" + IDS_FLT_REGFILES "Ôàéëè ðåºñòðó" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Ôàéëè ðåã³ñòðó Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4 "Ôàéëè ðåºñòðó Win9x/NT4 (REGEDIT4)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "Óñ³ ôàéëè (*.*)" IDS_FLT_ALLFILES_FLT "*.*" @@ -360,7 +360,7 @@ IDS_EXPAND "&Ðîçãîðíóòè" IDS_COLLAPSE "&Çãîðíóòè" IDS_GOTO_SUGGESTED_KEY "&Ïåðåéòè äî '%s'" - IDS_FINISHEDFIND "Ïîøóê ó ðåã³ñòð³ çàâåðøåíèé." + IDS_FINISHEDFIND "Ïîøóê ó ðåºñòð³ çàâåðøåíèé." END /*****************************************************************/ @@ -376,7 +376,7 @@ FONT 8, "MS Sans Serif" BEGIN GROUPBOX "Ä³àïàçîí åêñïîðòó",IDC_STATIC,2,0,366,48 - CONTROL "&Âåñü ðåã³ñòð",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 + CONTROL "&Âåñü ðåºñòð",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 CONTROL "Âèä³&ëåíà ã³ëêà",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 END @@ -434,7 +434,7 @@ BEGIN ICON IDI_REGEDIT,IDC_STATIC,7,7,20,20 PUSHBUTTON "&Ñêàñóâàòè",IDCANCEL,93,29,45,14 - LTEXT "Ïîøóê ó ðåã³ñòð³...",IDC_STATIC,33,12,83,8 + LTEXT "Ïîøóê ó ðåºñòð³...",IDC_STATIC,33,12,83,8 END /* @@ -455,7 +455,7 @@ /* *STRINGTABLE DISCARDABLE *BEGIN - * ID_HELP_HELPTOPICS "Â³äêðèâàº äîâ³äêó ðåäàêòîðà ðåã³ñòðà." + * ID_HELP_HELPTOPICS "Â³äêðèâàº äîâ³äêó ðåäàêòîðà ðåºñòðà." * ID_HELP_ABOUT "Â³äîáðàæàº ³íôîðìàö³þ ïðî ïðîãðàìó, íîìåð âåðñ³¿, òà àâòîðñüê³ ïðàâà." *END */ Modified: trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc Mon Sep 10 14:59:21 2007 @@ -1,3 +1,11 @@ +/* + * PROJECT: Matrix ScreenSaver + * LICENSE: Public Domain + * FILE: base/applications/screensavers/matrix/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for Matrix ScreenSaver + * TRANSLATOR: Artem Reznikov + */ + #include "resource.h" LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -7,7 +15,7 @@ CAPTION "Ïàðàìåòðè çàñòàâêè ""Ìàòðèöÿ""" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "&Øâèäê³ñòü Decode",IDC_STATIC,7,7,128,36 + GROUPBOX "&Øâèäê³ñòü äåêîäóâàííÿ",IDC_STATIC,7,7,128,36 LTEXT "Íèæ÷å",IDC_STATIC,13,24,22,8 CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,38,17,62,22 Modified: trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/uk… ============================================================================== --- trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc (original) +++ trunk/reactos/base/setup/vmwinst/lang/uk-UA.rc Mon Sep 10 14:59:21 2007 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS VMware(r) driver installation utility * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/setup/vmwinst/Uk.rc + * FILE: base/setup/vmwinst/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for vmwinst * TRANSLATOR: Artem Reznikov */ @@ -14,7 +14,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS âèÿâèëà, ùî Âè çàïóñòèëè ReactOS âñåðåäåí³ VMware(r).", -1, 100, 8, 160, 24 - LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü 'Äàë³', ³íàêøå íàòèñí³òü 'Ñêàñóâàòè'.", -1, 100, 140, 160, 17 + LTEXT "ßêùî Âè áàæàºòå âñòàíîâèòè SVGA äðàéâåð VMware(r), íàòèñí³òü ""Äàë³"", ³íàêøå íàòèñí³òü ""Ñêàñóâàòè"".", -1, 100, 140, 160, 17 END IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -22,7 +22,7 @@ CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå âêëþ÷àº SVGA äðàéâåð VMware(r).\n\nÒîìó éä³òü äî ìåíþ 'VM' ó VMware(r) workstation ³ âèáåð³òü 'Install VMware tools...'\n\n\nÍàòèñí³òü 'Äàë³' äëÿ ïðîäîâæåííÿ àáî 'Ñêàñóâàòè', ùîá ïðîïóñòèòè óñòàíîâêó SVGA äðàéâåðà.",-1,25,25,225,85 + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå âêëþ÷àº SVGA äðàéâåð VMware(r).\n\nÒîìó éä³òü äî ìåíþ ""VM"" ó VMware(r) workstation ³ âèáåð³òü ""Install VMware tools...""\n\n\nÍàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ àáî ""Ñêàñóâàòè"", ùîá ïðîïóñòèòè óñòàíîâêó SVGA äðàéâåðà.",-1,25,25,225,85 END IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -60,7 +60,7 @@ CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà âñòàíîâèòè SVGA äðàéâåð VMware(r).\n\n\nÍàòèñí³òü 'Çàâåðøèòè' äëÿ ïðîäîâæåííÿ ïðîöåñó óñòàíîâêè.",-1,25,25,225,85 + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS íå çìîãëà âñòàíîâèòè SVGA äðàéâåð VMware(r).\n\n\nÍàòèñí³òü ""Çàâåðøèòè"" äëÿ ïðîäîâæåííÿ ïðîöåñó óñòàíîâêè.",-1,25,25,225,85 END IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -72,7 +72,7 @@ PUSHBUTTON "Íàëàøòóâàòè ïàðàìåòðè åêðàíó", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Ñêîðèñòàòèñÿ ³íøèì ãðàô³÷íèì äðàéâåðîì", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON PUSHBUTTON "Âèäàëèòè SVGA äðàéâåð VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON - LTEXT "Íàòèñí³òü 'Äàë³' äëÿ ïðîäîâæåííÿ àáî 'Ñêàñóâàòè' äëÿ âèõîäó ç ìàéñòðà.", -1, 25, 93, 225, 12 + LTEXT "Íàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ àáî ""Ñêàñóâàòè"" äëÿ âèõîäó ç ìàéñòðà.", -1, 25, 93, 225, 12 END IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -83,7 +83,7 @@ LTEXT "Áóäü ëàñêà îáåð³òü ãðàô³÷íèé äðàéâåð, ÿêèé Âè õîò³ëè á âèêîðèñòîâóâàòè:",-1,25,25,225,15 PUSHBUTTON "ReactOS VGA äðàéâåð", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON PUSHBUTTON "ReactOS VBE äðàéâåð (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON - LTEXT "Íàòèñí³òü 'Çàâåðøèòè' äëÿ çàâåðøåííÿ îïåðàö³¿ àáî 'Ñêàñóâàòè' äëÿ âèõîäó ç ïðîãðàìè óñòàíîâêè áåç çáåðåæåííÿ çì³í.", -1, 25, 93, 225, 20 + LTEXT "Íàòèñí³òü ""Çàâåðøèòè"" äëÿ çàâåðøåííÿ îïåðàö³¿ àáî ""Ñêàñóâàòè"" äëÿ âèõîäó ç ïðîãðàìè óñòàíîâêè áåç çáåðåæåííÿ çì³í.", -1, 25, 93, 225, 20 END IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT @@ -91,7 +91,7 @@ CAPTION "Óñòàíîâêà â³äåîäðàéâåðà" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS ãîòîâà âèäàëèòè SVGA äðàéâåð VMWare(r)!!!\n\n\nÍàòèñí³òü 'Çàâåðøèòè' äëÿ âèäàëåííÿ äðàéâåðà àáî 'Ñêàñóâàòè' ùîá çàëèøèòè éîãî ÿê º.",-1,25,25,225,85 + LTEXT "Ïðîãðàìà óñòàíîâêè ReactOS ãîòîâà âèäàëèòè SVGA äðàéâåð VMWare(r)!!!\n\n\nÍàòèñí³òü ""Çàâåðøèòè"" äëÿ âèäàëåííÿ äðàéâåðà àáî ""Ñêàñóâàòè"" ùîá çàëèøèòè éîãî ÿê º.",-1,25,25,225,85 END STRINGTABLE Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc Mon Sep 10 14:59:21 2007 @@ -1,7 +1,7 @@ /* * PROJECT: Command-line interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/shell/cmd/Uk.rc + * FILE: base/shell/cmd/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for Command-line interface * TRANSLATOR: Artem Reznikov */ @@ -210,7 +210,7 @@ STRING_DIR_HELP3, " Volume in drive %c has no label.\n" STRING_DIR_HELP4, " Volume Serial Number is %04X-%04X\n" STRING_DIR_HELP5, "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" -STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" +STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes free\n" STRING_DIR_HELP7, "\n Directory of %s\n\n" STRING_DIR_HELP8, "%16i File(s)% 14s bytes\n" @@ -243,7 +243,10 @@ STRING_ECHO_HELP5, "ECHO is %s\n" -STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT\n" +STRING_EXIT_HELP, "Exits the command line interpreter.\n\nEXIT [/b] [ExitCode]\n\n\ + /B Exits a batch file only. \n\ + If run outside of a batch file it will exit cmd.exe\n\ + ExitCode This value will be assigned to ERRORLEVEL on exit\n" STRING_FOR_HELP1, "Runs a specified command for each file in a set of files\n\n\ FOR %variable IN (set) DO command [parameters]\n\n\ @@ -396,8 +399,8 @@ STRING_SCREEN_HELP, "move cursor and optionally print text\n\n\ SCREEN row col [text]\n\n\ - row row to wich move the cursor\n\ - col column to wich move the cursor" + row row to which move the cursor\n\ + col column to which move the cursor" STRING_SET_HELP, "Displays, sets, or removes environment variables.\n\n\ SET [variable[=][string]]\n\n\ @@ -499,7 +502,7 @@ STRING_WINDOW_HELP2, "change console window aspect\n\n\ ACTIVATE 'window' [/POS[=]left,top,width,heigth]\n\ [MIN|MAX|RESTORE] ['title']\n\n\ -window tile of window on wich perform actions\n\ +window tile of window on which perform actions\n\ /POS specify window placement and dimensions\n\ MIN minimize the window\n\ MAX maximize the window\n\ @@ -620,34 +623,34 @@ STRING_WINDOW_ERROR1, "window not found" -STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n" -STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n" -STRING_ERROR_TOO_MANY_PARAMETERS, "Too many parameters - %s\n" -STRING_ERROR_PATH_NOT_FOUND, "Path not found\n" -STRING_ERROR_FILE_NOT_FOUND, "File not found\n" -STRING_ERROR_REQ_PARAM_MISSING, "Required parameter missing\n" +STRING_ERROR_PARAMETERF_ERROR, "Íåïðàâèëüíèé ôîðìàò ïàðàìåòðà - %c\n" +STRING_ERROR_INVALID_SWITCH, "Íåâ³ðíà îïö³ÿ - /%c\n" +STRING_ERROR_TOO_MANY_PARAMETERS, "Çàáàãàòî ïàðàìåòð³â - %s\n" +STRING_ERROR_PATH_NOT_FOUND, "Øëÿõ íå çíàéäåíèé\n" +STRING_ERROR_FILE_NOT_FOUND, "Ôàéë íå çíàéäåíèé\n" +STRING_ERROR_REQ_PARAM_MISSING, "Â³äñóòí³é îáîâ'ÿçêîâèé ïàðàìåòð\n" STRING_ERROR_INVALID_DRIVE, "Invalid drive specification\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Invalid parameter format - %s\n" STRING_ERROR_BADCOMMAND, "Íåâ³ðíà êîìàíäà àáî ³ì'ÿ ôàéëó\n" -STRING_ERROR_OUT_OF_MEMORY, "Out of memory error.\n" +STRING_ERROR_OUT_OF_MEMORY, "Íåäîñòàòíüî ïàì'ÿò³.\n" STRING_ERROR_CANNOTPIPE, "Error! Cannot pipe! Cannot open temporary file!\n" -STRING_ERROR_D_PAUSEMSG, "Press any key to continue . . ." -STRING_ERROR_DRIVER_NOT_READY, "Drive not ready" +STRING_ERROR_D_PAUSEMSG, "Íàòèñí³òü áóäü-ÿêó êëàâ³øó äëÿ ïðîäîâæåííÿ . . ." +STRING_ERROR_DRIVER_NOT_READY, "Ïðèñòð³é íå ãîòîâèé" STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" STRING_VERSION_RUNVER, " running on %s" -STRING_COPY_FILE , " %d file(s) copied\n" +STRING_COPY_FILE , " %d ôàéë(³â) ñêîï³éîâàíî\n" STRING_DELETE_WIPE, "wiped" STRING_FOR_ERROR, "bad variable specification." -STRING_SCREEN_COL, "invalid value for col" -STRING_SCREEN_ROW, "invalid value for row" -STRING_TIMER_TIME "Timer %d is %s: " - -STRING_INVALID_OPERAND, "Invalid operand." -STRING_EXPECTED_CLOSE_PAREN, "Expected ')'." -STRING_EXPECTED_NUMBER_OR_VARIABLE,"Expected number or variable name." -STRING_SYNTAX_COMMAND_INCORRECT, "The syntax of the command is incorrect." +STRING_SCREEN_COL, "íåïðàâèëüíå çíà÷åííÿ col" +STRING_SCREEN_ROW, "íåïðàâèëüíå çíà÷åííÿ row" +STRING_TIMER_TIME "Òàéìåð %d - %s: " + +STRING_INVALID_OPERAND, "Íåâ³ðíèé îïåðàíä." +STRING_EXPECTED_CLOSE_PAREN, "Î÷³êóºòüñÿ ')'." +STRING_EXPECTED_NUMBER_OR_VARIABLE,"Î÷³êóºòüñÿ ÷èñëî àáî ³ì'ÿ çì³ííî¿." +STRING_SYNTAX_COMMAND_INCORRECT, "Íåêîðåêòíèé ñèíòàêñèñ êîìàíäè." } Modified: trunk/reactos/dll/cpl/input/input.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/input.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/input/input.rc (original) +++ trunk/reactos/dll/cpl/input/input.rc Mon Sep 10 14:59:21 2007 @@ -25,4 +25,6 @@ * a neutral version. This is to get localized bitmaps for example. */ +#include "lang/de-DE.rc" #include "lang/en-US.rc" +#include "lang/uk-UA.rc" Added: trunk/reactos/dll/cpl/input/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/de-DE.rc (added) +++ trunk/reactos/dll/cpl/input/lang/de-DE.rc Mon Sep 10 14:59:21 2007 @@ -1,0 +1,247 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Einstellungen" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "&Standard Eingabesprache", -1, 7,7,231,53 + LTEXT "Wählen Sie eine der installieren Sprachen aus, die Sie beim Einschalten des PCs nutzen wollen ",-1,14,18,220,17 + COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST + GROUPBOX "Installierte &Dienste", -1, 7,65,231,115 + LTEXT "Wählen Sie die Dienste, die Sie für jede Eingabesprache in der Liste sehen wollen. Nutzen Sie die ""Hinzufügen"" und ""Entfernen"" Schaltflächen um diese Liste zu bearbeiten.",-1,14,75,220,17 + CONTROL "TEXT", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 + PUSHBUTTON "&Als Standard setzen", IDC_SET_DEFAULT, 179, 106, 53, 14 + PUSHBUTTON "&Hinzufügen...", IDC_ADD_BUTTON, 179, 124, 53, 14 + PUSHBUTTON "Ent&fernen...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 + PUSHBUTTON "&Eigenschaften...", IDC_PROP_BUTTON, 179, 160, 53, 14 + GROUPBOX "&Einstellungen", -1, 7,185,231,36 + PUSHBUTTON "Sprach&leiste...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "&Tasteneinstellungen...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Erweitert" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX Kompatibilitäts-Konfiguration", -1, 7,7,231,60 + AUTOCHECKBOX "&Erweiterte Textdienste in allen Programmen verwenden.", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Aktivieren Sie diese Funktion, um alle Erweiterten Textdienste in Notepad und anderen Programmen zu aktivieren, die normalerweise keine Sprach- und Handschrifterkennung oder andere Erweiterte Textdienste unterstützen.",-1,14,33,220,25 + GROUPBOX "Systemkonfiguration", -1, 7,74,231,60 + AUTOCHECKBOX "Erweiterte Textdienste d&eaktivieren", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Wählen Sie diese Option, um alle Erweiterten Textdienste in allen Programmen zu deaktivieren. Dies ist für Ostasiatische Sprachen nicht empfohlen, da somit die Sprachleiste geschlossen wird.",-1,14,100,220,25 +END + +IDD_LANGBAR DIALOG 20, 20, 240, 120 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Sprachleisten-Einstellungen" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 7, 7, 226, 85 + AUTOCHECKBOX "&Die Sprachleiste auf dem Desktop anzeigen", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP + AUTOCHECKBOX "Die Sprachleis&te transparent anzeigen wenn inaktiv", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 + AUTOCHECKBOX "Weitere Sprachleistenicons anzeigen", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 + AUTOCHECKBOX "T&extlabels in der Sprachleiste anzeiegen", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 + AUTOCHECKBOX "E&rweiterte Textdienste deaktivieren", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 + DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 182, 99, 50, 14 +} + +IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Erweiterte Tasteneinstellungen" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Um Caps Lock zu deaktivieren", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "Caps &Lock Taste drücken", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "&Shift Taste drücken", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Schnelltasten für Eingabesprachen", -1, 7, 37, 258, 95 + LTEXT "Aktion", -1, 14, 47, 60, 9 + RTEXT "Tasten&kombination", -1, 177, 47, 79, 9 + LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Tastenkombination änder&n...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 146, 140, 70, 14 +} + +IDD_ADD DIALOG 20, 20, 227, 90 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Eingabesprache hinzufügen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Eingabesprache:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "&Tastaturlayout/IME:", -1, 7, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 169, 68, 50, 14 +} + +IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Tastenkombination ändern" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", -1, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "Tastenkombination aktivi&eren", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + CHECKBOX "&STRG", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP + CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Taste:", -1, 110, 37, 14, 10 + COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 212, 47, 50, 14 +} + +IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Eingabesprache Einstellungen" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Eingabesprache:", -1, 7, 7, 61, 8 + LTEXT "", -1, 73, 7, 129, 8 + LTEXT "&Tastaturlayout/IME:", -1, 7, 21, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 169, 53, 52, 14 +} + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Textdienste und Eingabesprachen" + IDS_CPLSYSTEMDESCRIPTION "Ändert die Einstellungen der Texteingabe einer Sprache." + IDS_US_LAYOUT, "US" + IDS_BELGIAN_LAYOUT, "Belgian (Period)" + IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Canadian French" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Canadian French (Legacy)" + IDS_DANISH_LAYOUT, "Danish" + IDS_DUTCH_LAYOUT, "Dutch" + IDS_FINNISH_LAYOUT, "Finnish" + IDS_FRENCH_LAYOUT, "French" + IDS_GERMAN_LAYOUT, "German" + IDS_GERMAN_IBM_LAYOUT, "German (IBM)" + IDS_ICELANDIC_LAYOUT, "Icelandic" + IDS_IRISH_LAYOUT, "Irish" + IDS_ITALIAN_LAYOUT, "Italian" + IDS_ITALIAN_142_LAYOUT, "Italian (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Latin American" + IDS_NORWEGIAN_LAYOUT, "Norwegian" + IDS_PORTUGUESE_LAYOUT, "Portuguese" + IDS_SPANISH_LAYOUT, "Spanish" + IDS_SPANISH_VARIANTION_LAYOUT, "Spanish Variation" + IDS_SWEDISH_LAYOUT, "Swedish" + IDS_SWISS_FRENCH_LAYOUT, "Swiss French" + IDS_SWISS_GERMAN_LAYOUT, "Swiss German" + IDS_UNITED_KINGDOM_LAYOUT, "United Kingdom" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "United States-Dvorak for left hand" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" + IDS_ALBANIAN_LAYOUT, "Albanian" + IDS_CROATIAN_LAYOUT, "Croatian" + IDS_CZECH_LAYOUT, "Czech" + IDS_CZECH_QWERTY_LAYOUT, "Czech (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Hungarian" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Hungarian 101-key" + IDS_POLISH_LAYOUT, "Polish (Programmers)" + IDS_POLISH_214_LAYOUT, "Polish (214)" + IDS_ROMANIAN_LAYOUT, "Romanian" + IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" + IDS_SLOVAK_LAYOUT, "Slovak" + IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Slovenian" + IDS_ESTONIAN_LAYOUT, "Estonian" + IDS_LATVIAN_LAYOUT, "Latvian" + IDS_LATVIAN_QWERTY_LAYOUT, "Latvian (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Lithuanian IBM" + IDS_GREEK_LAYOUT, "Greek" + IDS_GREEK_LATIN_LAYOUT, "Greek Latin" + IDS_GREEK_220_LAYOUT, "Greek (220)" + IDS_GREEK_319_LAYOUT, "Greek (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Greek (220) Latin" + IDS_GREEK_319_LATIN_LAYOUT, "Greek (319) Latin" + IDS_BELARUSIAN_LAYOUT, "Belarusian" + IDS_BULGARIAN_LAYOUT, "Bulgarian" + IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" + IDS_RUSSIAN_LAYOUT, "Russian" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" + IDS_UKRAINIAN_LAYOUT, "Ukrainian" + IDS_TURKISH_F_LAYOUT, "Turkish F" + IDS_TURKISH_Q_LAYOUT, "Turkish Q" + IDS_JAPANESE_LAYOUT, "Japanese" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "Japanese Input System (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Korean" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Korean Input System (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Chinese (Traditional) - US Keyboard" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Chinese (Traditional) - Phonetic" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Chinese (Traditional) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Chinese (Traditional) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Chinese (Traditional) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Chinese (Traditional) - Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Chinese (Traditional) - Alphanumeric" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Chinese (Simplified) - US Keyboard" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Chinese (Simplified) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Chinese (Simplified) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Chinese (Simplified) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Chinese (Simplified) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Thai Kedmanee" + IDS_THAI_PATTACHOTE_LAYOUT, "Thai Pattachote" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Thai Kedmanee (non-ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Thai Pattachote (non-ShiftLock)" + IDS_HEBREW_LAYOUT, "Hebrew" + IDS_ARABIC_101_LAYOUT, "Arabic (101)" + IDS_ARABIC_102_LAYOUT, "Arabic (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabic (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Czech Programmers" + IDS_LITHUANIAN_LAYOUT, "Lithuanian" + IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Chinese (Traditional) - New Phonetic" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Chinese (Simplified) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - New ChangJie" + IDS_ASSAMESE_LAYOUT, "Assamese" + IDS_BENGALI_LAYOUT, "Bengali" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" + IDS_GUJARATI_LAYOUT, "Gujarati" + IDS_KANNADA_LAYOUT, "Kannada" + IDS_MALAYALAM_LAYOUT, "Malayalam" + IDS_ORIYA_LAYOUT, "Oriya" + IDS_PUNJABI_LAYOUT, "Punjabi" + IDS_TAMIL_LAYOUT, "Tamil" + IDS_TELUGU_LAYOUT, "Telugu" + IDS_MARATHI_LAYOUT, "Marathi" + IDS_HINDI_TRADITIONAL_LAYOUT, "Hindi Traditional" + IDS_CANTONESE_PHONETIC_LAYOUT, "Cantonese Phonetic" + IDS_FAEROESE_LAYOUT, "Faeroese" + IDS_FYRO_MACEDONIAN_LAYOUT, "FYRO Macedonian" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Canadian Multilingual Standard" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Chinese (Traditional) - Quick" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Chinese (Traditional) - Array" + IDS_KAZAKH_LAYOUT, "Kazakh" + IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" + IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" + IDS_TATAR_LAYOUT, "Tatar" + IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" + IDS_VIETNAMESE_LAYOUT, "Vietnamese" + IDS_GEORGIAN_LAYOUT, "Georgian" + IDS_ARMENIAN_EASTERN_LAYOUT, "Armenian Eastern" + IDS_ARMENIAN_WESTERN_LAYOUT, "Armenian Western" + IDS_GREEK_POLYTONIC_LAYOUT, "Greek Polytonic" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" + IDS_FARSI_LAYOUT, "Farsi" + IDS_GAELIC_LAYOUT, "Gaelic" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" + IDS_URDU_LAYOUT, "Urdu" + IDS_SYRIAC_LAYOUT, "Syriac" + IDS_SYRIAC_PHONETIC_LAYOUT, "Syriac Phonetic" + IDS_DIVEHI_PHONETIC_LAYOUT, "Divehi Phonetic" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" +END Modified: trunk/reactos/dll/cpl/input/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/input/lang/en-US.rc Mon Sep 10 14:59:21 2007 @@ -6,7 +6,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Default input language", -1, 7,7,231,53 - LTEXT "Select one of the installed input languages to use when you start your coputer.",-1,14,18,220,17 + LTEXT "Select one of the installed input languages to use when you start your computer.",-1,14,18,220,17 COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST GROUPBOX "&Installed services", -1, 7,65,231,115 LTEXT "Select the services that you want for each input language shown in the list. Use the Add and Remove buttons to modify this list.",-1,14,75,220,17 @@ -15,7 +15,7 @@ PUSHBUTTON "A&dd...", IDC_ADD_BUTTON, 179, 124, 53, 14 PUSHBUTTON "&Remove...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 PUSHBUTTON "&Properties...", IDC_PROP_BUTTON, 179, 160, 53, 14 - GROUPBOX "Proferences", -1, 7,185,231,36 + GROUPBOX "Preferences", -1, 7,185,231,36 PUSHBUTTON "Language &Bar...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 PUSHBUTTON "&Key Settings...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 END @@ -27,10 +27,10 @@ BEGIN GROUPBOX "Compatibility Configuration", -1, 7,7,231,60 AUTOCHECKBOX "&Extend support of advanced text services to all programs", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP - LTEXT "Select this check box to on advanced text services in Notepad and other programs that do not normally support speech and handwriting recognition or other advanced input services.",-1,14,33,220,25 + LTEXT "Select this check box to on for active advanced text services in Notepad and other programs that do not normally support speech and handwriting recognition or other advanced input services.",-1,14,33,220,25 GROUPBOX "System Configuration", -1, 7,74,231,60 AUTOCHECKBOX "&Turn off advanced text services", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP - LTEXT "Select this chack box to turn off advanced text services in all programs. Not recommended for East Asian users because this closes the language bar.",-1,14,100,220,25 + LTEXT "Select this check box to turn off advanced text services in all programs. Not recommended for East Asian users because this closes the language bar.",-1,14,100,220,25 END IDD_LANGBAR DIALOG 20, 20, 240, 120 Added: trunk/reactos/dll/cpl/input/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/uk-UA.rc (added) +++ trunk/reactos/dll/cpl/input/lang/uk-UA.rc Mon Sep 10 14:59:21 2007 @@ -1,0 +1,255 @@ +/* + * PROJECT: Text Input DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/cpl/input/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for input.dll + * PROGRAMMERS: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +IDD_PROPPAGESETTINGS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ïàðàìåòðè" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Ìîâà ââîäó çà çàìîâ÷óâàííÿì", -1, 7,7,231,53 + LTEXT "Âèáåð³òü îäíó ç óñòàíîâëåíèõ ìîâ ââîäó, ÿêà âèêîðèñòîâóâàòèìåòüñÿ ïðè çàïóñêó êîìï'þòåðà.",-1,14,18,220,17 + COMBOBOX IDC_DEFAULT_INPUT_LANG, 14, 40, 218, 46, CBS_DROPDOWNLIST + GROUPBOX "Óñòàíîâëåí³ ñëóæáè", -1, 7,65,231,115 + LTEXT "Âèáåð³òü ïîòð³áí³ ñëóæáè äëÿ êîæíî¿ ìîâè ââîäó ç³ ñïèñêó. Çì³íèòè ñïèñîê ìîæíà çà äîïîìîãîþ êíîïîê ""Äîäàòè"" òà ""Âèäàëèòè"".",-1,14,75,220,17 + CONTROL "Òåêñò", IDC_KEYLAYOUT_TREE, "SysTreeView32", WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x00000034, 14, 96, 160, 78 + PUSHBUTTON "Çàìîâ&÷óâàííÿ", IDC_SET_DEFAULT, 179, 106, 53, 14 + PUSHBUTTON "&Äîäàòè...", IDC_ADD_BUTTON, 179, 124, 53, 14 + PUSHBUTTON "Â&èäàëèòè...", IDC_REMOVE_BUTTON, 179, 142, 53, 14 + PUSHBUTTON "Â&ëàñòèâîñò³...", IDC_PROP_BUTTON, 179, 160, 53, 14 + GROUPBOX "Íàñòðîéêà", -1, 7,185,231,36 + PUSHBUTTON "&Ìîâíà ïàíåëü...", IDC_LANG_BAR_BUTTON, 14, 198, 70, 14 + PUSHBUTTON "&Ïàðàìåòðè êëàâ³àòóðè...", IDC_KEY_SETTINGS_BUTTON, 90, 198, 70, 14 +END + +IDD_PROPPAGEADVANCED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Äîäàòêîâî" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Íàñòðîéêà ñóì³ñíîñò³", -1, 7,7,231,60 + AUTOCHECKBOX "&Ðîçïîâñþäèòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá íà âñ³ ïðîãðàìè", IDC_SUPPORT_ADV_SERV_CHECKBOX, 14, 19, 210, 10, WS_GROUP + LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá ââ³ìêíóòè ï³äòðèìêó äîäàòêîâèõ òåêñòîâèõ ñëóæá â ïðîãðàì³ ""Áëîêíîò"" ³ ³íøèõ ïðîãðàìàõ, ÿê³ íå ï³äòðèìóþòü ðîçï³çíàâàííÿ ìîâè, ðóêîïèñíîãî òåêñòó àáî ³íøèõ äîäàòêîâèõ ñëóæá ââîäó.",-1,14,33,220,25 + GROUPBOX "Íàñòðîéêà ñèñòåìè", -1, 7,74,231,60 + AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_TURNOFF_ADV_TXTSERV_CHECKBOX, 14, 86, 210, 10, WS_GROUP + LTEXT "Âñòàíîâ³òü öåé ïðàïîðåöü ùîá âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè äëÿ âñ³õ ïðîãðàì. Íå ðåêîìåíäîâàíî äëÿ ìîâ ñõ³äíî¿ Àç³¿, îñê³ëüêè ìîâíà ïàíåëü áóäå çàêðèòà.",-1,14,100,220,25 +END + +IDD_LANGBAR DIALOG 20, 20, 240, 120 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Ïàðàìåòðè ìîâíî¿ ïàíåë³" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "", -1, 7, 7, 226, 85 + AUTOCHECKBOX "Ï&îêàçóâàòè ïàíåëü ìîâè íà ðîáî÷îìó ñòîë³", IDC_LANGBAR_ON_DESK_CHECKBOX, 17, 17, 210, 10, WS_GROUP + AUTOCHECKBOX "&Ïîêàçóâàòè ïàíåëü ìîâè ïðîçîðîþ, êîëè âîíà íåàêòèâíà", IDC_LANGBAR_TRANSP_INACT_CHECKBOX, 17, 32, 210, 10 + AUTOCHECKBOX "Ïîêà&çóâàòè äîäàòêîâ³ çíà÷êè ïàíåë³ ìîâè â îáëàñò³ ñïîâ³ùåíü", IDC_ADDIT_LANGBAR_ICON_NOTIFYAREA_CHECKBOX, 17, 47, 210, 10 + AUTOCHECKBOX "Ïîêàçóâà&òè ï³äïèñè íà ïàíåë³ ìîâè", IDC_TEXTLABEL_ON_LANGBAR_CHECKBOX, 17, 62, 210, 10 + AUTOCHECKBOX "&Âèìêíóòè äîäàòêîâ³ òåêñòîâ³ ñëóæáè", IDC_OFF_ADVAN_TEXTSERV_CHECKBOX, 17, 77, 200, 10 + DEFPUSHBUTTON "OK", IDOK, 129, 99, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 182, 99, 50, 14 +} + +IDD_KEYSETTINGS DIALOG 0, 0, 272, 163 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîäàòêîâ³ ïàðàìåòðè êëàâ³àòóðè" +FONT 8, "MS Shell Dlg" +{ + GROUPBOX "Âèìêíåííÿ ðåæèìó Caps Lock", -1, 7, 7, 258, 26 + AUTORADIOBUTTON "&ïðè íàòèñíåíí³ êëàâ³ø³ CAPS LOCK", IDC_PRESS_CAPSLOCK_KEY_RADIOBTN, 14, 17, 120, 11, WS_GROUP + AUTORADIOBUTTON "ïðè &íàòèñíåíí³ êëàâ³ø³ SHIFT", IDC_PRESS_SHIFT_KEY_RADIOBTN, 144, 17, 120, 11, NOT WS_TABSTOP + GROUPBOX "Ñïîëó÷åííÿ êëàâ³ø äëÿ ìîâ ââîäó", -1, 7, 37, 258, 95 + LTEXT "Ä³ÿ", -1, 14, 47, 60, 9 + RTEXT "&Ñïîëó÷åííÿ êëàâ³ø", -1, 177, 47, 79, 9 + LISTBOX IDC_KEY_LISTBOX, 14, 57, 244, 52, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Ç&ì³íà ñïîëó÷åííÿ êëàâ³ø...", IDC_CHANGE_KEY_SEQ_BUTTON, 152, 113, 106, 14, WS_GROUP + DEFPUSHBUTTON "OK", IDOK, 66, 140, 70, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 146, 140, 70, 14 +} + +IDD_ADD DIALOG 20, 20, 227, 90 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Äîäàâàííÿ ìîâè ââîäó" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&Ìîâà ââîäó:", -1, 7, 7, 61, 10 + COMBOBOX IDC_INPUT_LANGUAGE_COMBO, 7, 17, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 36, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_COMBO, 7, 47, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 68, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 68, 50, 14 +} + +IDD_CHANGE_KEY_SEQ DIALOG 5, 100, 269, 78 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Çì³íà ñïîëó÷åííÿ êëàâ³ø" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", -1, 16, 5, 250, 10 + GROUPBOX "", -1, 12, 17, 184, 48 + AUTOCHECKBOX "&Ââ³ìêíóòè ñïîëó÷åííÿ êëàâ³ø", IDC_ENABLE_KEY_SEQ_CHECKBOX, 17, 17, 85, 8 + CTEXT "SHIFT", -1, 68, 37, 27, 12 + CTEXT "+", -1, 57, 37, 8, 9 + CTEXT "+", -1, 98, 37, 8, 10 + CHECKBOX "&CTRL", IDC_CTRL_CHECKBOX, 24, 31, 30, 11, NOT WS_TABSTOP + CHECKBOX "&ALT", IDC_ALT_CHECKBOX, 24, 45, 40, 12, NOT WS_TABSTOP + LTEXT "&Êëàâ³øà:", -1, 110, 37, 14, 10 + COMBOBOX IDC_CKEY_COMBOBOX, 127, 34, 46, 48, CBS_DROPDOWNLIST | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 212, 25, 50, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 212, 47, 50, 14 +} + +IDD_INPUT_LANG_PROP DIALOG 20, 20, 227, 75 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION +CAPTION "Âëàñòèâîñò³ ìîâè ââîäó" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Ìîâà ââîäó:", -1, 7, 7, 61, 8 + LTEXT "", -1, 73, 7, 129, 8 + LTEXT "&Ðîçêëàäêà êëàâ³àòóðè àáî çàñ³á ââîäó (IME):", -1, 7, 21, 110, 10 + COMBOBOX IDC_KEYBOARD_LAYOUT_IME_COMBO, 7, 32, 212, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 116, 53, 52, 14 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 169, 53, 52, 14 +} + +STRINGTABLE +BEGIN + IDS_CPLSYSTEMNAME "Ìîâè òà ñëóæáè òåêñòîâîãî ââîäó" + IDS_CPLSYSTEMDESCRIPTION "Íàëàøòîâóº ïàðàìåòðè äëÿ òåêñòîâîãî ââîäó." + IDS_US_LAYOUT, "ÑØÀ" + IDS_BELGIAN_LAYOUT, "Áåëüã³éñüêà (³ç êðàïêîþ)" + IDS_BELGIAN_FRENCH_LAYOUT, "Ôðàíöóçüêà (Áåëüã³ÿ)" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Ïîðòóãàëüñüêà (Áðàçèë³ÿ ABNT)" + IDS_CANADIAN_FRENCH_LAYOUT, "Ôðàíöóçüêà (Êàíàäà)" + IDS_CANADIAN_FRENCH_LEGACY_LAYOUT, "Ôðàíöóçüêà (Êàíàäà, òðàäèö³éíà)" + IDS_DANISH_LAYOUT, "Äàòñüêà" + IDS_DUTCH_LAYOUT, "Í³äåðëàíäñüêà" + IDS_FINNISH_LAYOUT, "Ô³íñüêà" + IDS_FRENCH_LAYOUT, "Ôðàíöóçüêà" + IDS_GERMAN_LAYOUT, "Í³ìåöüêà" + IDS_GERMAN_IBM_LAYOUT, "Í³ìåöüêà (IBM)" + IDS_ICELANDIC_LAYOUT, "²ñëàíäñüêà" + IDS_IRISH_LAYOUT, "²ðëàíäñüêà" + IDS_ITALIAN_LAYOUT, "²òàë³éñüêà" + IDS_ITALIAN_142_LAYOUT, "²òàë³éñüêà (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Ëàòèíñüêà Àìåðèêà" + IDS_NORWEGIAN_LAYOUT, "Íîðâåçüêà" + IDS_PORTUGUESE_LAYOUT, "Ïîðòóãàëüñüêà" + IDS_SPANISH_LAYOUT, "²ñïàíñüêà" + IDS_SPANISH_VARIANTION_LAYOUT, "²ñïàíñüêà 2" + IDS_SWEDISH_LAYOUT, "Øâåäñüêà" + IDS_SWISS_FRENCH_LAYOUT, "Ôðàíöóçüêà (Øâåéöàð³ÿ)" + IDS_SWISS_GERMAN_LAYOUT, "Í³ìåöüêà (Øâåéöàð³ÿ)" + IDS_UNITED_KINGDOM_LAYOUT, "Âåëèêîáðèòàí³ÿ" + IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "ÑØÀ - ì³æíàðîäíà" + IDS_UNITED_STATES_DVORAK_FOR_LEFT_HAND_LAYOUT, "ÑØÀ - Äâîðàê (äëÿ ë³âî¿ ðóêè)" + IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "ÑØÀ - Äâîðàê (äëÿ ïðàâî¿ ðóêè)" + IDS_ALBANIAN_LAYOUT, "Àëáàíñüêà" + IDS_CROATIAN_LAYOUT, "Õîðâàòñüêà" + IDS_CZECH_LAYOUT, "×åñüêà" + IDS_CZECH_QWERTY_LAYOUT, "×åñüêà (QWERTY)" + IDS_HUNGARIAN_LAYOUT, "Óãîðñüêà" + IDS_HUNGARIAN_101_KEY_LAYOUT, "Óãîðñüêà (101 êëàâ³øà)" + IDS_POLISH_LAYOUT, "Ïîëüñüêà (ïðîãðàì³ñòñüêà)" + IDS_POLISH_214_LAYOUT, "Ïîëüñüêà (214)" + IDS_ROMANIAN_LAYOUT, "Ðóìóíñüêà" + IDS_SERBIAN_LATIN_LAYOUT, "Ñåðáñüêà (ëàòèíèöÿ)" + IDS_SLOVAK_LAYOUT, "Ñëîâàöüêà" + IDS_SLOVAK_QWERTY_LAYOUT, "Ñëîâàöüêà (QWERTY)" + IDS_SLOVENIAN_LAYOUT, "Ñëîâåíñüêà" + IDS_ESTONIAN_LAYOUT, "Åñòîíñüêà" + IDS_LATVIAN_LAYOUT, "Ëàòâ³éñüêà" + IDS_LATVIAN_QWERTY_LAYOUT, "Ëàòâ³éñüêà (QWERTY)" + IDS_LITHUANIAN_IBM_LAYOUT, "Ëèòîâñüêà (IBM)" + IDS_GREEK_LAYOUT, "Ãðåöüêà" + IDS_GREEK_LATIN_LAYOUT, "Ãðåöüêà (ëàòèíèöÿ)" + IDS_GREEK_220_LAYOUT, "Ãðåöüêà (220)" + IDS_GREEK_319_LAYOUT, "Ãðåöüêà (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Ãðåöüêà (220, ëàòèíèöÿ)" + IDS_GREEK_319_LATIN_LAYOUT, "Ãðåöüêà (319, ëàòèíèöÿ)" + IDS_BELARUSIAN_LAYOUT, "Á³ëîðóñüêà" + IDS_BULGARIAN_LAYOUT, "Áîëãàðñüêà" + IDS_BULGARIAN_LATIN_LAYOUT, "Áîëãàðñüêà (ëàòèíèöÿ)" + IDS_RUSSIAN_LAYOUT, "Ðîñ³éñüêà" + IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Ðîñ³éñüêà (äðóêàðñüêà ìàøèíêà)" + IDS_SERBIAN_CYRILLIC_LAYOUT, "Ñåðáñüêà (êèðèëèöÿ)" + IDS_UKRAINIAN_LAYOUT, "Óêðà¿íñüêà" + IDS_TURKISH_F_LAYOUT, "Òóðåöüêà F" + IDS_TURKISH_Q_LAYOUT, "Òóðåöüêà Q" + IDS_JAPANESE_LAYOUT, "ßïîíñüêà" + IDS_JAPANESE_INPUT_SYSTEM_MSIME2002_LAYOUT, "ßïîíñüêèé çàñ³á ââîäó (MS-IME2002)" + IDS_KOREAN_LAYOUT, "Êîðåéñüêà" + IDS_KOREAN_INPUT_SYSTEM_MSIME2002_LAYOUT, "Êîðåéñüêèé çàñ³á ââîäó (MS-IME2002)" + IDS_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - ÑØÀ" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - ôîíåòè÷íà" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - Þí³êîä" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - àëôàâ³òíî-öèôðîâà" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - ÑØÀ" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - NeiMa" + IDS_THAI_KEDMANEE_LAYOUT, "Òàéñüêà Êåäìàí³" + IDS_THAI_PATTACHOTE_LAYOUT, "Òàéñüêà Ïàòàøîò" + IDS_THAI_KEDMANEE_NONSHIFTLOCK_LAYOUT, "Òàéñüêà Êåäìàí³ (áåç ShiftLock)" + IDS_THAI_PATTACHOTE_NONSHIFTLOCK_LAYOUT, "Òàéñüêà Ïàòàøîò (áåç ShiftLock)" + IDS_HEBREW_LAYOUT, "²âðèò" + IDS_ARABIC_101_LAYOUT, "Àðàáñüêà (101)" + IDS_ARABIC_102_LAYOUT, "Àðàáñüêà (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Àðàáñüêà (102) AZERTY" + IDS_CZECH_PROGRAMMERS_LAYOUT, "×åñüêà (ïðîãðàì³ñòñüêà)" + IDS_LITHUANIAN_LAYOUT, "Ëèòîâñüêà" + IDS_BELGIAN_COMMA_LAYOUT, "Áåëüã³éñüêà (ç êîìîþ)" + IDS_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - íîâà ôîíåòè÷íà" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Êèòàéñüêà (ñïðîùåíå ïèñüìî) - Microsoft Pinyin IME 3.0" + IDS_UNITED_STATES_DVIRAK_LAYOUT, "ÑØÀ - Äâîðàê" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - íîâà ChangJie" + IDS_ASSAMESE_LAYOUT, "Àññàìñüêà" + IDS_BENGALI_LAYOUT, "Áåíãàë³" + IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Äåâàíàãàð³ (INSCRIPT)" + IDS_GUJARATI_LAYOUT, "Ãóäæàðàò³" + IDS_KANNADA_LAYOUT, "Êàííàäà" + IDS_MALAYALAM_LAYOUT, "Ìàëàÿëàì" + IDS_ORIYA_LAYOUT, "Îð³ÿ" + IDS_PUNJABI_LAYOUT, "Ïàíäæàá³" + IDS_TAMIL_LAYOUT, "Òàì³ëüñüêà" + IDS_TELUGU_LAYOUT, "Òåëóãó" + IDS_MARATHI_LAYOUT, "Ìàðàòõ³" + IDS_HINDI_TRADITIONAL_LAYOUT, "Õ³íä³ (òðàäèö³éíà)" + IDS_CANTONESE_PHONETIC_LAYOUT, "Êàíòîíñüêà (ôîíåòè÷íà)" + IDS_FAEROESE_LAYOUT, "Ôàðåðñüêà" + IDS_FYRO_MACEDONIAN_LAYOUT, "Ìàêåäîíñüêà (Ìàêåäîí³ÿ)" + IDS_CANADIAN_MULTILINGUAL_STD_LAYOUT, "Êàíàäñüêà ñòàíäàðòíà (áàãàòîìîâíà)" + IDS_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - øâèäêà" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Êèòàéñüêà (òðàäèö³éíå ïèñüìî) - òàáëè÷íà" + IDS_KAZAKH_LAYOUT, "Êàçàõñüêà" + IDS_UZBEK_CYRILLIC_LAYOUT, "Óçáåöüêà (êèðèëèöÿ)" + IDS_AZERI_CYRILLIC_LAYOUT, "Àçåðáàéäæàíñüêà (êèðèëèöÿ)" + IDS_TATAR_LAYOUT, "Òàòàðñüêà" + IDS_AZERI_LATIN_LAYOUT, "Àçåðáàéäæàíñüêà (ëàòèíèöÿ)" + IDS_VIETNAMESE_LAYOUT, "Â'ºòíàìñüêà" + IDS_GEORGIAN_LAYOUT, "Ãðóçèíñüêà" + IDS_ARMENIAN_EASTERN_LAYOUT, "Â³ðìåíñüêà (ñõ³äíà)" + IDS_ARMENIAN_WESTERN_LAYOUT, "Â³ðìåíñüêà (çàõ³äíà)" + IDS_GREEK_POLYTONIC_LAYOUT, "Ãðåöüêà (ïîë³òîí³÷íà)" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "Àíãë³éñüêà òàáëè÷íà (ÑØÀ) äëÿ àðàáñüêî¿ (IBM, 238_L)" + IDS_FARSI_LAYOUT, "Ïåðñüêà" + IDS_GAELIC_LAYOUT, "Ãåëüñüêà" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Ïîðòóãàëüñüêà (Áðàçèë³ÿ ABNT2)" + IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Ìîíãîëüñüêà (êèðèëèöÿ)" + IDS_KYRGYZ_CYRILLIC_LAYOUT, "Êèðãèçüêà (êèðèëèöÿ)" + IDS_URDU_LAYOUT, "Óðäó" + IDS_SYRIAC_LAYOUT, "Ñèð³éñüêà" + IDS_SYRIAC_PHONETIC_LAYOUT, "Ñèð³éñüêà (ôîíåòè÷íà)" + IDS_DIVEHI_PHONETIC_LAYOUT, "Ìàëüä³âñüêà (ôîíåòè÷íà)" + IDS_DIVEHI_TYPEWRITER_LAYOUT, "Ìàëüä³âñüêà (äðóêàðñüêà ìàøèíêà)" +END Modified: trunk/reactos/dll/cpl/intl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/intl/lang/uk-UA.rc Mon Sep 10 14:59:21 2007 @@ -183,12 +183,12 @@ IDD_SORTPAGE DIALOGEX 0, 0, 246, 234 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Sorting" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Sorting", -1, 7, 7, 230, 74 - LTEXT "Sorting methods define the sorting order of characters, words, files and folders.", -1, 14, 17, 220, 25 - LTEXT "Select a sorting method for your language:", -1, 14, 37, 220, 22 +CAPTION "Ñîðòóâàííÿ" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ñîðòóâàííÿ", -1, 7, 7, 230, 74 + LTEXT "Ìåòîäè ñîðòóâàííÿ âèçíà÷àþòü ïîðÿäîê ñîðòóâàííÿ ñèìâîë³â, ñë³â, ³ìåí ôàéë³â ³ ïàïîê.", -1, 14, 17, 220, 25 + LTEXT "Âèáðàòè ìåòîä ñîðòóâàííÿ äëÿ Âàøî¿ ìîâè:", -1, 14, 37, 220, 22 COMBOBOX IDC_SORTLIST_COMBO, 14, 56, 217, 83, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL END @@ -196,7 +196,7 @@ STRINGTABLE BEGIN IDS_CUSTOMIZE_TITLE "Íàñòðîéêà ðåã³îíàëüíèõ ïàðàìåòð³â" - IDS_SPAIN "Spanish (Spain)" + IDS_SPAIN "²ñïàíñüêà (²ñïàí³ÿ)" END STRINGTABLE Modified: trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/ncpa/lang/uk-UA.rc Mon Sep 10 14:59:21 2007 @@ -49,17 +49,17 @@ LTEXT "Òðèâàë³ñòü:", -1, 19, 34, 60, 8 LTEXT "Øâèäê³ñòü:", -1, 19, 48, 60, 8 GROUPBOX "Àêòèâí³ñòü", -1, 9, 74, 182, 70, BS_GROUPBOX - RTEXT "Â³äïðàâëåíî", -1, 26, 90, 60, 8 + RTEXT "Íàä³ñëàíî", -1, 26, 90, 60, 8 ICON IDI_HORIZONTAL, -1, 90, 85, 18, 20 ICON IDI_NETSTAT, -1, 110, 85, 18, 20 ICON IDI_HORIZONTAL, -1, 130, 85, 18, 20 - LTEXT "Ïðèéíÿòî", -1, 149, 90, 37, 8 + LTEXT "Îòðèìàíî", -1, 149, 90, 37, 8 LTEXT "Ïàêåò³â:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 ICON IDI_VERTICAL, -1, 110, 108, 18, 20 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "&Âëàñòèâîñò³", IDC_PROPERTIES, 10, 150, 50, 14 - PUSHBUTTON "Â&³äêëþ÷èòè", IDC_ENDISABLE, 66, 150, 50, 14 + PUSHBUTTON "Âëàñ&òèâîñò³", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "Âè&ìêíóòè", IDC_ENDISABLE, 66, 150, 50, 14 END IDD_CARDSUPPORT DIALOG DISCARDABLE 0, 0, 200,180 @@ -67,7 +67,7 @@ CAPTION "Ï³äòðèìêà" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Connection Status", -1, 9, 8, 200, 88, BS_GROUPBOX + GROUPBOX "Ñòàí ï³äêëþ÷åííÿ", -1, 9, 8, 200, 88, BS_GROUPBOX LTEXT "Òèï àäðåñè:", -1, 22, 20, 80, 8 LTEXT "IP-àäðåñà:", -1, 22, 34, 80, 8 LTEXT "Ìàñêà ï³äìåðåæ³:", -1, 22, 48, 80, 8 @@ -78,7 +78,7 @@ RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 - PUSHBUTTON "&Ïîäðîáèö³...", IDC_DETAILS, 22, 76, 62, 14 + PUSHBUTTON "&Ñêëàä...", IDC_DETAILS, 22, 76, 62, 14 END IDD_TCPIPPROPERTIES DIALOG DISCARDABLE 0, 0, 246, 228 @@ -115,8 +115,8 @@ STRINGTABLE BEGIN - IDS_ASSIGNED_DHCP "Ïðèçíà÷åíèé DHCP" - IDS_ASSIGNED_MANUAL "Íàñòðîºíèé óðó÷íó" + IDS_ASSIGNED_DHCP "Íàäàíî DHCP" + IDS_ASSIGNED_MANUAL "Íàëàøòîâàíî âðó÷íó" END STRINGTABLE Modified: trunk/reactos/dll/win32/newdev/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/newdev/lang/uk-UA.rc Mon Sep 10 14:59:21 2007 @@ -1,7 +1,7 @@ /* * PROJECT: New device installer * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/newdev/Uk.rc + * FILE: dll/win32/newdev/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for newdev * TRANSLATOR: Artem Reznikov */ @@ -17,7 +17,7 @@ LTEXT "Ëàñêàâî ïðîñèìî",IDC_WELCOMETITLE,120,8,195,24 LTEXT "Öåé ìàéñòåð âñòàíîâëþº íîâèé äðàéâåð ïðèñòðîþ äëÿ:", IDC_STATIC,120,21,195,16 - LTEXT "Íàòèñí³òü 'Äàë³' äëÿ ïðîäîâæåííÿ.",IDC_STATIC,120,169,195,17 + LTEXT "Íàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ.",IDC_STATIC,120,169,195,17 LTEXT "ÍÅÂ²ÄÎÌÈÉ ÏÐÈÑÒÐ²É",IDC_DEVICE,134,36,164,11 LTEXT "ÏÎÏÅÐÅÄÆÅÍÍß! ÓÑÒÀÍÎÂÊÀ ÑÏÅÖ²ÀËÜÍÎÃÎ ÏÐÈÑÒÐÎÞ ÌÎÆÅ ÇÀÌÎÐÎÇÈÒÈ ÂÀØ ÊÎÌÏ'ÞÒÅÐ ÀÁÎ ÇÐÎÁÈÒÈ ÉÎÃÎ ÍÅÇÄÀÒÍÈÌ ÄÎ ÇÀÂÀÍÒÀÆÅÍÍß!",IDC_STATIC,120,59,195,16 CONTROL "Âñòàíîâèòè äðàéâåð àâòîìàòè÷íî",IDC_RADIO_AUTO,"Button", @@ -35,7 +35,7 @@ LTEXT "Óñòàíîâêà íå âäàëàñÿ",IDC_FINISHTITLE,120,8,195,24 LTEXT "Ïðèñòð³é íå âñòàíîâëåíî, òîìó ùî äðàéâåð íå çíàéäåíî.", IDC_STATIC,120,40,195,19 - LTEXT "Íàòèñí³òü 'Íàçàä', ÿêùî ó Âàñ º äèñê äðàéâåðà àáî çíàºòå øëÿõ äî äðàéâåðà.", + LTEXT "Íàòèñí³òü ""Íàçàä"", ÿêùî ó Âàñ º äèñê äðàéâåðà àáî çíàºòå øëÿõ äî äðàéâåðà.", IDC_STATIC,120,98,181,24 CONTROL "Á³ëüøå íå ïîêàçóâàòè öåé ä³àëîã",IDC_DONOTSHOWDLG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 @@ -96,7 +96,7 @@ LTEXT "Óñòàíîâêà çàâåðøåíà",IDC_FINISHTITLE,120,8,195,11 LTEXT "Âè ìàºòå ïåðåçàïóñòèòè êîìïþòåð, ùîá çàê³í÷èòè óñòàíîâêó:", IDC_STATIC,120,32,195,19 - LTEXT "Íàòèñí³òü 'Çàâåðøèòè' äëÿ âèõîäó ç ìàéñòðà.",IDC_STATIC,120,174, + LTEXT "Íàòèñí³òü ""Çàâåðøèòè"" äëÿ âèõîäó ç ìàéñòðà.",IDC_STATIC,120,174, 179,11 LTEXT "ÍÅÂ²ÄÎÌÈÉ ÏÐÈÑÒÐ²É",IDC_DEVICE,148,53,147,12 END @@ -110,8 +110,9 @@ LTEXT "Óñòàíîâêà çàâåðøåíà",IDC_FINISHTITLE,120,8,195,11 LTEXT "Ìàéñòåð çàê³í÷èâ óñòàíîâêó äðàéâåðà äëÿ:", IDC_STATIC,120,32,195,19 - LTEXT "Íàòèñí³òü 'Çàâåðøèòè' äëÿ âèõîäó ç ìàéñòðà.",IDC_STATIC,120,174, + LTEXT "Íàòèñí³òü ""Çàâåðøèòè"" äëÿ âèõîäó ç ìàéñòðà.",IDC_STATIC,120,174, 179,11 LTEXT "ÍÅÂ²ÄÎÌÈÉ ÏÐÈÑÒÐ²É",IDC_DEVICE,148,53,147,12 END + Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Mon Sep 10 14:59:21 2007 @@ -18,7 +18,7 @@ LTEXT "Öåé ìàéñòåð âñòàíîâëþº ReactOS íà Âàø êîìï'þòåð. Éîìó "\ "ïîòð³áíî ç³áðàòè äåÿê³ â³äîìîñò³ ïðî Âàñ ³ Âàø êîìï'þòåð "\ "ùîá óñòàíîâèòè ReactOS íàëåæíèì ÷èíîì.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "Íàòèñí³òü 'Äàë³', ùîá ïðîäîâæèòè óñòàíîâêó.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "Íàòèñí³òü ""Äàë³"", ùîá ïðîäîâæèòè óñòàíîâêó.", IDC_STATIC, 115, 169, 195, 17 END @@ -36,7 +36,7 @@ "àáî ïîøèðþâàòè éîãî (÷àñòèíè), Âè ìàºòå ïîâàæàòè GPL", IDC_STATIC,15,110,227,19 PUSHBUTTON "&Ïåðåãëÿä GPL...",IDC_VIEWGPL,251,110,50,19 - LTEXT "Íàòèñí³òü 'Äàë³', ùîá ïðîäîâæèòè óñòàíîâêó.",IDC_STATIC,15,136, + LTEXT "Íàòèñí³òü ""Äàë³"", ùîá ïðîäîâæèòè óñòàíîâêó.",IDC_STATIC,15,136, 195,17 END @@ -86,13 +86,13 @@ "âèêîðèñòîâóâàòè. Ìîâà êîðèñòóâà÷à çàäàº ôîðìàò âèâåäåííÿ, "\ "÷èñåë, ãðîøîâèõ îäèíèöü ³ äàò.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "Äëÿ çì³íè ìîâè ñèñòåìè àáî ìîâè êîðèñòóâà÷à íàòèñí³òü 'Íàëàøòóâàòè'.", + LTEXT "Äëÿ çì³íè ìîâè ñèñòåìè àáî ìîâè êîðèñòóâà÷à íàòèñí³òü ""Íàëàøòóâàòè"".", IDC_STATIC, 53, 60, 184, 8 PUSHBUTTON "Íà&ëàøòóâàòè...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "Ðîçêëàäêà êëàâ³àòóðè çàäàº ñèìâîëè, ùî ââîäÿòüñÿ ïðè íàòèñíåíí³ êëàâ³ø.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 - LTEXT "Äëÿ çì³íè ðîçêëàäêè êëàâ³àòóðè íàòèñí³òü 'Íàëàøòóâàòè'.", + LTEXT "Äëÿ çì³íè ðîçêëàäêè êëàâ³àòóðè íàòèñí³òü ""Íàëàøòóâàòè"".", IDC_STATIC, 53, 126, 184, 8 PUSHBUTTON "Íàë&àøòóâàòè...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 END @@ -135,10 +135,10 @@ BEGIN LTEXT "Çàâåðøåííÿ óñòàíîâêè ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Âè óñï³øíî çàâåðøèëè óñòàíîâêó ReactOS.\n\n" \ - "Ï³ñëÿ íàòèñíåííÿ êíîïêè 'Çàâåðøèòè' êîìï'þòåð áóäå ïåðåçàâàíòàæåíèé.", IDC_STATIC, 115, 40, 195, 100 + "Ï³ñëÿ íàòèñíåííÿ êíîïêè ""Çàâåðøèòè"" êîìï'þòåð áóäå ïåðåçàâàíòàæåíèé.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 LTEXT "ßêùî â äèñêîâîä âñòàâëåíèé êîìïàêò-äèñê, âèéì³òü éîãî. Ïîò³ì "\ - "äëÿ ïåðåçàâàíòàæåííÿ Âàøîãî êîìï'þòåðà íàòèñòí³òü 'Çàâåðøèòè'.", IDC_STATIC, 115, 169, 195, 17 + "äëÿ ïåðåçàâàíòàæåííÿ Âàøîãî êîìï'þòåðà íàòèñòí³òü ""Çàâåðøèòè"".", IDC_STATIC, 115, 169, 195, 17 END

17 years

[hpoussin] 28986: Continue rbuild cleanup (Include class)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Sep 10 10:52:07 2007 New Revision: 28986 URL: http://svn.reactos.org/svn/reactos?rev=28986&view=rev Log: Continue rbuild cleanup (Include class) Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp trunk/reactos/tools/rbuild/include.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.h trunk/reactos/tools/rbuild/wineresource.cpp Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/automaticdepe… ============================================================================== --- trunk/reactos/tools/rbuild/automaticdependency.cpp (original) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp Mon Sep 10 10:52:07 2007 @@ -367,11 +367,36 @@ } bool -AutomaticDependency::LocateIncludedFile ( const string& directory, +AutomaticDependency::LocateIncludedFile ( const FileLocation& directory, const string& includedFilename, string& resolvedFilename ) { - string normalizedFilename = NormalizeFilename ( directory + sSep + includedFilename ); + string path; + switch ( directory.directory ) + { + case SourceDirectory: + path = ""; + break; + case IntermediateDirectory: + path = Environment::GetIntermediatePath (); + break; + case OutputDirectory: + path = Environment::GetOutputPath (); + break; + default: + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid directory %d.", + directory.directory ); + } + if ( directory.relative_path.length () > 0 ) + { + if ( path.length () > 0 ) + path += sSep; + path += directory.relative_path; + } + + string normalizedFilename = NormalizeFilename ( path + sSep + includedFilename ); FILE* f = fopen ( normalizedFilename.c_str (), "rb" ); if ( f != NULL ) { @@ -418,12 +443,12 @@ string& resolvedFilename ) { vector<Include*> includes; - Include currentDirectory ( module.project, ".", sourceFile->directoryPart ); + Include currentDirectory ( module.project, SourceDirectory, sourceFile->directoryPart ); GetIncludeDirectories ( includes, module, currentDirectory, searchCurrentDirectory ); for ( size_t j = 0; j < includes.size (); j++ ) { Include& include = *includes[j]; - if ( LocateIncludedFile ( include.directory, + if ( LocateIncludedFile ( *include.directory, includedFilename, resolvedFilename ) ) { @@ -433,6 +458,9 @@ return true; } } + /*printf ( "Unable to find %s, included in %s.\n", + includedFilename.c_str (), + sourceFile->filename.c_str () );*/ resolvedFilename = ""; return false; } Modified: trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/codeb… ============================================================================== --- trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp (original) +++ trunk/reactos/tools/rbuild/backend/codeblocks/codeblocks.cpp Mon Sep 10 10:52:07 2007 @@ -429,7 +429,7 @@ for ( i = 0; i < incs.size(); i++ ) { string path = Path::RelativeFromDirectory ( - incs[i]->directory, + incs[i]->directory->relative_path, module.output->relative_path ); includes.push_back ( path ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Sep 10 10:52:07 2007 @@ -105,6 +105,8 @@ { switch ( file->directory ) { + case SourceDirectory: + break; case IntermediateDirectory: backend->AddDirectoryTarget ( file->relative_path, backend->intermediateDirectory ); break; @@ -670,14 +672,7 @@ Include& include = *includes[i]; if ( parameters.length () > 0 ) parameters += " "; - if ( include.root == "intermediate" ) - path_prefix = "$(INTERMEDIATE)" + sSep; - else if (include.root == "output" ) - path_prefix = "$(OUTPUT)" + sSep; - else - path_prefix = ""; - - parameters += "-I" + path_prefix + include.directory; + parameters += "-I" + strDirectory ( include.directory );; } return parameters; } @@ -783,33 +778,11 @@ for ( i = 0; i < data.includes.size(); i++ ) { const Include& include = *data.includes[i]; - string includeDirectory, path_prefix; - if ( include.baseModule != NULL && - ( include.baseModule->type == RpcServer || - include.baseModule->type == RpcClient || - include.baseModule->type == IdlHeader) ) - { - path_prefix = "$(INTERMEDIATE)" + sSep; - includeDirectory = NormalizeFilename ( include.directory ); - } - else - includeDirectory = include.directory; - - if ( include.root == "intermediate" ) - path_prefix = "$(INTERMEDIATE)" + sSep; - else if (include.root == "output" ) - path_prefix = "$(OUTPUT)" + sSep; - else if ( include.root != "" ) - throw InvalidOperationException ( __FILE__, - __LINE__, - "Unsupported root prefix '%s'", - include.root.c_str () ); - + const FileLocation* includeDirectory = include.directory; fprintf ( fMakefile, - " -I%s%s", - path_prefix.c_str(), - includeDirectory.c_str() ); + " -I%s", + strDirectory ( includeDirectory ).c_str() ); } for ( i = 0; i < data.defines.size(); i++ ) { Modified: trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msbui… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp Mon Sep 10 10:52:07 2007 @@ -120,7 +120,7 @@ for ( i = 0; i < incs.size(); i++ ) { string path = Path::RelativeFromDirectory ( - incs[i]->directory, + incs[i]->directory->relative_path, module.output->relative_path ); includes.push_back ( path ); Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Mon Sep 10 10:52:07 2007 @@ -118,15 +118,15 @@ { // explicitly omit win32api directories - if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) ) + if ( !strncmp(incs[i]->directory->relative_path.c_str(), "w32api", 6 ) ) continue; // explicitly omit include/wine directories - if ( !strncmp(incs[i]->directory.c_str(), "include\\wine", 12 ) ) + if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\wine", 12 ) ) continue; string path = Path::RelativeFromDirectory ( - incs[i]->directory, + incs[i]->directory->relative_path, module.output->relative_path ); includes.push_back ( path ); } Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Mon Sep 10 10:52:07 2007 @@ -171,7 +171,7 @@ for ( i = 0; i < incs.size(); i++ ) { string path = Path::RelativeFromDirectory ( - incs[i]->directory, + incs[i]->directory->relative_path, module.output->relative_path ); if ( module.type != RpcServer && module.type != RpcClient ) { @@ -182,12 +182,12 @@ } } // add to another list win32api and include/wine directories - if ( !strncmp(incs[i]->directory.c_str(), "include\\ddk", 11 ) || - !strncmp(incs[i]->directory.c_str(), "include\\crt", 11 ) || - !strncmp(incs[i]->directory.c_str(), "include\\GL", 10 ) || - !strncmp(incs[i]->directory.c_str(), "include\\ddk", 11 ) || - !strncmp(incs[i]->directory.c_str(), "include\\psdk", 12 ) || - !strncmp(incs[i]->directory.c_str(), "include\\reactos\\wine", 20 ) ) + if ( !strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\crt", 11 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\GL", 10 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\ddk", 11 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\psdk", 12 ) || + !strncmp(incs[i]->directory->relative_path.c_str(), "include\\reactos\\wine", 20 ) ) { includes_ros.push_back ( path ); } Modified: trunk/reactos/tools/rbuild/include.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/include.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/include.cpp (original) +++ trunk/reactos/tools/rbuild/include.cpp Mon Sep 10 10:52:07 2007 @@ -25,95 +25,98 @@ Include::Include ( const Project& project, const XMLElement* includeNode ) - : project ( project ), - module ( NULL ), + : directory ( NULL ), + project ( project ), node ( includeNode ), - baseModule ( NULL ) + module ( NULL ) { } Include::Include ( const Project& project, - const Module* module, - const XMLElement* includeNode ) - : project ( project ), - module ( module ), + const XMLElement* includeNode, + const Module* module ) + : directory ( NULL ), + project ( project ), node ( includeNode ), - baseModule ( NULL ) + module ( module ) { } Include::Include ( const Project& project, - string directory, - string basePath ) + DirectoryLocation root, + const std::string& relative_path ) : project ( project ), - module ( NULL ), - node ( NULL ), - baseModule ( NULL ) + node ( NULL ) { - this->directory = NormalizeFilename ( basePath + sSep + directory ); - this->basePath = NormalizeFilename ( basePath ); + directory = new FileLocation ( root, relative_path, "" ); } -Include::~Include () +Include::~Include() { } void -Include::ProcessXML() +Include::ProcessXML () { - const XMLAttribute* att; - att = node->GetAttribute ( "base", false ); + DirectoryLocation root = SourceDirectory; + + string relative_path; + const XMLAttribute* att = node->GetAttribute ( "base", false ); if ( att ) { - bool referenceResolved = false; - if ( !module ) - { throw XMLInvalidBuildFileException ( node->location, "'base' attribute illegal from global <include>" ); + + if ( att->value == project.name ) + { + relative_path = node->value; } + else + { + const Module* base = project.LocateModule ( att->value ); + if ( !base ) + throw XMLInvalidBuildFileException ( + node->location, + "<include> attribute 'base' references non-existant project or module '%s'", + att->value.c_str() ); + root = GetDefaultDirectoryTree ( base ); - if ( !referenceResolved ) - { - if ( att->value == project.name ) - { - basePath = "."; - referenceResolved = true; - } - else - { - const Module* base = project.LocateModule ( att->value ); - if ( base != NULL ) - { - baseModule = base; - basePath = base->output->relative_path; - referenceResolved = true; - } - } + relative_path = base->output->relative_path; + if ( node->value.length () > 0 && node->value != "." ) + relative_path += sSep + node->value; } - - if ( !referenceResolved ) - throw XMLInvalidBuildFileException ( - node->location, - "<include> attribute 'base' references non-existant project or module '%s'", - att->value.c_str() ); - directory = NormalizeFilename ( basePath + sSep + node->value ); } else - directory = NormalizeFilename ( node->value ); + relative_path = node->value; att = node->GetAttribute ( "root", false ); if ( att ) { - if ( att->value != "intermediate" && att->value != "output" ) - { - throw InvalidAttributeValueException ( - node->location, - "root", - att->value ); - } + if ( att->value == "intermediate" ) + root = IntermediateDirectory; + else if ( att->value == "output" ) + root = OutputDirectory; + else + throw InvalidAttributeValueException ( node->location, + "root", + att->value ); + } - root = att->value; - } + directory = new FileLocation ( root, + relative_path, + "" ); } + +DirectoryLocation +Include::GetDefaultDirectoryTree ( const Module* module ) const +{ + if ( module != NULL && + ( module->type == RpcServer || + module->type == RpcClient || + module->type == IdlHeader) ) + return IntermediateDirectory; + else + return SourceDirectory; +} Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Sep 10 10:52:07 2007 @@ -289,6 +289,10 @@ else extension = GetDefaultModuleExtension (); + output = new FileLocation ( GetTargetDirectoryTree (), + modulePath, + name + extension ); + att = moduleNode.GetAttribute ( "unicode", false ); if ( att != NULL ) { @@ -485,9 +489,6 @@ } } - output = new FileLocation ( GetTargetDirectoryTree (), - modulePath, - name + extension ); SetImportLibrary ( NULL ); } @@ -658,7 +659,7 @@ } else if ( e.name == "include" ) { - Include* include = new Include ( project, this, &e ); + Include* include = new Include ( project, &e, this ); if ( parseContext.ifData ) parseContext.ifData->data.includes.push_back ( include ); else @@ -948,7 +949,9 @@ return IntermediateDirectory; } throw InvalidOperationException ( __FILE__, - __LINE__ ); + __LINE__, + "Invalid module type %d.", + type ); } string Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Mon Sep 10 10:52:07 2007 @@ -110,7 +110,8 @@ relative_path[0] == '\\' || relative_path.find ( '$' ) != string::npos || ( relative_path.length () > 1 && ( relative_path[1] == ':' || - relative_path.find_last_of ( "/\\" ) == relative_path.length () - 1 ) ) + relative_path.find_last_of ( "/\\" ) == relative_path.length () - 1 ) ) || + ( relative_path.length () > 3 && relative_path.find ( ':' ) != string::npos ) ) { throw InvalidOperationException ( __FILE__, @@ -119,7 +120,7 @@ relative_path.c_str () ); } - if ( strpbrk ( name.c_str (), "/\\:" ) ) + if ( name.find_first_of ( "/\\:" ) != string::npos ) { throw InvalidOperationException ( __FILE__, __LINE__, Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Sep 10 10:52:07 2007 @@ -386,25 +386,23 @@ class Include { public: - const Project& project; - const Module* module; - const XMLElement* node; - const Module* baseModule; - std::string directory; - std::string basePath; - std::string root; + FileLocation *directory; Include ( const Project& project, const XMLElement* includeNode ); Include ( const Project& project, - const Module* module, - const XMLElement* includeNode ); + const XMLElement* includeNode, + const Module* module ); Include ( const Project& project, - std::string directory, - std::string basePath ); + DirectoryLocation directory, + const std::string& relative_path ); ~Include (); - void ProcessXML(); -private: + void ProcessXML (); +private: + const Project& project; + const XMLElement* node; + const Module* module; + DirectoryLocation GetDefaultDirectoryTree ( const Module* module ) const; }; @@ -769,7 +767,7 @@ AutomaticDependency ( const Project& project ); ~AutomaticDependency (); std::string GetFilename ( const std::string& filename ); - bool LocateIncludedFile ( const std::string& directory, + bool LocateIncludedFile ( const FileLocation& directory, const std::string& includedFilename, std::string& resolvedFilename ); bool LocateIncludedFile ( SourceFile* sourceFile, Modified: trunk/reactos/tools/rbuild/wineresource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/wineresource.… ============================================================================== --- trunk/reactos/tools/rbuild/wineresource.cpp (original) +++ trunk/reactos/tools/rbuild/wineresource.cpp Mon Sep 10 10:52:07 2007 @@ -120,6 +120,6 @@ exitcode ); } module.non_if_data.includes.push_back( new Include ( module.project, - module.output->relative_path, - "$(INTERMEDIATE)" ) ); + IntermediateDirectory, + module.output->relative_path ) ); }

17 years

[jimtabor] 28985: We are using it now, , , so clean up before use.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Sep 10 09:37:57 2007 New Revision: 28985 URL: http://svn.reactos.org/svn/reactos?rev=28985&view=rev Log: We are using it now,,, so clean up before use. Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c Modified: trunk/reactos/dll/win32/gdi32/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/main/dllma… ============================================================================== --- trunk/reactos/dll/win32/gdi32/main/dllmain.c (original) +++ trunk/reactos/dll/win32/gdi32/main/dllmain.c Mon Sep 10 09:37:57 2007 @@ -69,10 +69,8 @@ NtCurrentTeb()->GdiTebBatch.Offset = 0; NtCurrentTeb()->GdiBatchCount = 0; #endif -#if 0 // Very simple, the list will fill itself as it is needed. RtlZeroMemory( &stock_objects, NB_STOCK_OBJECTS); //Assume Ros is dirty. -#endif return TRUE; }

17 years

[fireball] 28984: - Use IoBuildAsynchronousFsdRequest() instead of IoBuildDeviceIoControlRequest() - Use completion routine for completing that type of requests

by fireball＠svn.reactos.org

Author: fireball Date: Sun Sep 9 22:32:30 2007 New Revision: 28984 URL: http://svn.reactos.org/svn/reactos?rev=28984&view=rev Log: - Use IoBuildAsynchronousFsdRequest() instead of IoBuildDeviceIoControlRequest() - Use completion routine for completing that type of requests Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c Sun Sep 9 22:32:30 2007 @@ -106,6 +106,13 @@ IN PIRP Irp, IN PVOID Context ); + +NTSTATUS +STDCALL +ClassCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context); + NTSTATUS STDCALL @@ -1837,7 +1844,7 @@ { PDEVICE_EXTENSION deviceExtension = DeviceObject->DeviceExtension; IO_STATUS_BLOCK ioStatus; - ULONG controlType; + ULONG controlType, mjFunction; PIRP irp; PIO_STACK_LOCATION irpStack; KEVENT event; @@ -1845,8 +1852,11 @@ ULONG retryCount = MAXIMUM_RETRIES; NTSTATUS status; BOOLEAN retry; + LARGE_INTEGER dummy; PAGED_CODE(); + + dummy.QuadPart = 0; // // Write length to SRB. @@ -1917,12 +1927,13 @@ controlType = IOCTL_SCSI_EXECUTE_OUT; Srb->SrbFlags = SRB_FLAGS_DATA_OUT; + mjFunction = IRP_MJ_WRITE; } else { controlType = IOCTL_SCSI_EXECUTE_IN; Srb->SrbFlags = SRB_FLAGS_DATA_IN; - + mjFunction = IRP_MJ_READ; } } else { @@ -1930,21 +1941,19 @@ BufferLength = 0; controlType = IOCTL_SCSI_EXECUTE_NONE; Srb->SrbFlags = SRB_FLAGS_NO_DATA_TRANSFER; + mjFunction = IRP_MJ_FLUSH_BUFFERS; } // // Build device I/O control request with data transfer. // - - irp = IoBuildDeviceIoControlRequest(controlType, - deviceExtension->PortDeviceObject, - NULL, - 0, - BufferAddress, - BufferLength, - TRUE, - &event, - &ioStatus); + irp = IoBuildAsynchronousFsdRequest( + mjFunction, + deviceExtension->DeviceObject, + BufferAddress, + (BufferAddress) ? BufferLength : 0, + &dummy, + &ioStatus); if (irp == NULL) { ExFreePool(senseInfoBuffer); @@ -1952,6 +1961,9 @@ return(STATUS_INSUFFICIENT_RESOURCES); } + // Set event field + irp->UserEvent = &event; + // // Disable synchronous transfer for these requests. // @@ -1971,11 +1983,23 @@ Srb->ScsiStatus = Srb->SrbStatus = 0; Srb->NextSrb = 0; + // Set completion routine + IoSetCompletionRoutine( + irp, + ClassCompletionRoutine, + NULL, + TRUE, + TRUE, + TRUE); + // // Get next stack location. // irpStack = IoGetNextIrpStackLocation(irp); + + irpStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + irpStack->Parameters.DeviceIoControl.IoControlCode = controlType; // // Set up SRB for execute scsi request. Save SRB address in next stack @@ -3551,11 +3575,12 @@ NTSTATUS status; ULONG modifiedIoControlCode; - // Class can't handle RESET_DEVICE ioctl - if (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_STORAGE_RESET_DEVICE) - { - status = Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + if (irpStack->Parameters.DeviceIoControl.IoControlCode == + IOCTL_STORAGE_RESET_DEVICE) { + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); + status = STATUS_UNSUCCESSFUL; goto SetStatusAndReturn; } @@ -4770,3 +4795,39 @@ return STATUS_MORE_PROCESSING_REQUIRED; } + +NTSTATUS +STDCALL +ClassCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PIO_STATUS_BLOCK IoStatusBlock = Irp->UserIosb; + PKEVENT Event = Irp->UserEvent; + PMDL Mdl; + + *IoStatusBlock = Irp->IoStatus; + Irp->UserIosb = NULL; + Irp->UserEvent = NULL; + + if(Irp->MdlAddress) + { + Mdl = Irp->MdlAddress; + + // if necessary - unlock pages + if ((Mdl->MdlFlags & MDL_PAGES_LOCKED) && + !(Mdl->MdlFlags & MDL_PARTIAL_HAS_BEEN_MAPPED)) + { + MmUnlockPages(Mdl); + } + + // free this mdl + IoFreeMdl(Mdl); + } + + // free irp and set event to unsignaled state + IoFreeIrp(Irp); + KeSetEvent(Event, IO_NO_INCREMENT, FALSE); + + return STATUS_MORE_PROCESSING_REQUIRED; +}

17 years

[fireball] 28983: - Make sure CLASS2 driver returns STATUS_UNSUCCESSFUL if receiving a RESET_DEVICE ioctl.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Sep 9 21:06:14 2007 New Revision: 28983 URL: http://svn.reactos.org/svn/reactos?rev=28983&view=rev Log: - Make sure CLASS2 driver returns STATUS_UNSUCCESSFUL if receiving a RESET_DEVICE ioctl. Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c Sun Sep 9 21:06:14 2007 @@ -3551,6 +3551,14 @@ NTSTATUS status; ULONG modifiedIoControlCode; + // Class can't handle RESET_DEVICE ioctl + if (irpStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_STORAGE_RESET_DEVICE) + { + status = Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + goto SetStatusAndReturn; + } + // // If this is a pass through I/O control, set the minor function code // and device address and pass it to the port driver.

17 years

[fireball] 28982: - IoMapTransfer(NULL, ..) is an old-fashioned way, for DMA master. Changing this back to NULL, since ReactOS's implementation seem to take this into account.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Sep 9 20:19:24 2007 New Revision: 28982 URL: http://svn.reactos.org/svn/reactos?rev=28982&view=rev Log: - IoMapTransfer(NULL, ..) is an old-fashioned way, for DMA master. Changing this back to NULL, since ReactOS's implementation seem to take this into account. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sun Sep 9 20:19:24 2007 @@ -3098,7 +3098,7 @@ break; ScatterGatherList->Length = Srb->DataTransferLength - TotalLength; - ScatterGatherList->PhysicalAddress = IoMapTransfer(DeviceExtension->AdapterObject, + ScatterGatherList->PhysicalAddress = IoMapTransfer(NULL, Irp->MdlAddress, MapRegisterBase, DataVA + TotalLength,

17 years

[fireball] 28981: Merge 28980.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Sep 9 19:04:06 2007 New Revision: 28981 URL: http://svn.reactos.org/svn/reactos?rev=28981&view=rev Log: Merge 28980. Modified: branches/ros-branch-0_3_3-new/reactos/drivers/storage/scsiport/scsiport.c Modified: branches/ros-branch-0_3_3-new/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3-new/reactos/dr… ============================================================================== --- branches/ros-branch-0_3_3-new/reactos/drivers/storage/scsiport/scsiport.c (original) +++ branches/ros-branch-0_3_3-new/reactos/drivers/storage/scsiport/scsiport.c Sun Sep 9 19:04:06 2007 @@ -2527,7 +2527,6 @@ { /* Get next logical unit request */ SpiGetNextRequestFromLun(DeviceExtension, LunExtension); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); /* SpiGetNextRequestFromLun() releases the spinlock */ KeLowerIrql(Irql); @@ -4167,7 +4166,6 @@ { /* Start the next packet */ SpiGetNextRequestFromLun(DeviceExtension, LunExtension); - KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); } else { @@ -4175,7 +4173,7 @@ KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); } - DPRINT("IoCompleting request IRP 0x%08p\n", Irp); + DPRINT("IoCompleting request IRP 0x%p\n", Irp); IoCompleteRequest(Irp, IO_DISK_INCREMENT); @@ -4283,10 +4281,7 @@ && (Srb->SrbFlags & SRB_FLAGS_NO_QUEUE_FREEZE)) { if (LunExtension->RequestTimeout == -1) - { SpiGetNextRequestFromLun(DeviceExtension, LunExtension); - KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); - } else KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); }

17 years

[fireball] 28980: - Revert 27476: another attempt (previously, dgorbachev tried to "fix" this code) to double-release spinlocks. There are even comments in some uncertain cases about this. For future generations: Have a look at SpiGetNextLunRequest(), it's full of KeReleaseSpinLock()s.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Sep 9 18:45:38 2007 New Revision: 28980 URL: http://svn.reactos.org/svn/reactos?rev=28980&view=rev Log: - Revert 27476: another attempt (previously, dgorbachev tried to "fix" this code) to double-release spinlocks. There are even comments in some uncertain cases about this. For future generations: Have a look at SpiGetNextLunRequest(), it's full of KeReleaseSpinLock()s. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sun Sep 9 18:45:38 2007 @@ -2527,7 +2527,6 @@ { /* Get next logical unit request */ SpiGetNextRequestFromLun(DeviceExtension, LunExtension); - KeReleaseSpinLock(&DeviceExtension->SpinLock, Irql); /* SpiGetNextRequestFromLun() releases the spinlock */ KeLowerIrql(Irql); @@ -4167,7 +4166,6 @@ { /* Start the next packet */ SpiGetNextRequestFromLun(DeviceExtension, LunExtension); - KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); } else { @@ -4175,7 +4173,7 @@ KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); } - DPRINT("IoCompleting request IRP 0x%08p\n", Irp); + DPRINT("IoCompleting request IRP 0x%p\n", Irp); IoCompleteRequest(Irp, IO_DISK_INCREMENT); @@ -4283,10 +4281,7 @@ && (Srb->SrbFlags & SRB_FLAGS_NO_QUEUE_FREEZE)) { if (LunExtension->RequestTimeout == -1) - { SpiGetNextRequestFromLun(DeviceExtension, LunExtension); - KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); - } else KeReleaseSpinLockFromDpcLevel(&DeviceExtension->SpinLock); }

17 years

[cfinck] 28979: Revert r28972, the pshpack*.h and poppack.h headers are in "include/psdk". So we're still sharing some small headers with host and target :-(

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Sep 9 17:12:28 2007 New Revision: 28979 URL: http://svn.reactos.org/svn/reactos?rev=28979&view=rev Log: Revert r28972, the pshpack*.h and poppack.h headers are in "include/psdk". So we're still sharing some small headers with host and target :-( Modified: trunk/reactos/tools/unicode/unicode.mak trunk/reactos/tools/wmc/wmc.mak trunk/reactos/tools/wrc/wrc.mak Modified: trunk/reactos/tools/unicode/unicode.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.mak?… ============================================================================== --- trunk/reactos/tools/unicode/unicode.mak (original) +++ trunk/reactos/tools/unicode/unicode.mak Sun Sep 9 17:12:28 2007 @@ -96,7 +96,7 @@ UNICODE_HOST_CFLAGS = \ -D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \ - -I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/reactos \ + -I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/psdk -Iinclude/reactos \ $(TOOLS_CFLAGS) .PHONY: unicode Modified: trunk/reactos/tools/wmc/wmc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.mak?rev=2897… ============================================================================== --- trunk/reactos/tools/wmc/wmc.mak (original) +++ trunk/reactos/tools/wmc/wmc.mak Sun Sep 9 17:12:28 2007 @@ -34,7 +34,7 @@ WMC_HOST_CFLAGS = -I$(WMC_BASE) $(TOOLS_CFLAGS) \ -D__USE_W32API -DWINE_UNICODE_API= -I$(UNICODE_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \ + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ -I$(INTERMEDIATE_)/include WMC_HOST_LFLAGS = $(TOOLS_LFLAGS) Modified: trunk/reactos/tools/wrc/wrc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev=2897… ============================================================================== --- trunk/reactos/tools/wrc/wrc.mak (original) +++ trunk/reactos/tools/wrc/wrc.mak Sun Sep 9 17:12:28 2007 @@ -57,7 +57,7 @@ WRC_HOST_CFLAGS = -I$(WRC_BASE) $(TOOLS_CFLAGS) \ -D__USE_W32API -DWINE_UNICODE_API= \ -I$(UNICODE_BASE) -I$(WPP_BASE) \ - -Iinclude/reactos/wine -Iinclude/reactos -Iinclude \ + -Iinclude/reactos/wine -Iinclude/reactos -Iinclude -Iinclude/psdk \ -I$(INTERMEDIATE_)include WRC_HOST_LFLAGS = $(TOOLS_LFLAGS)

17 years

← Newer
1
...
31
32
33
34
35
36
37
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2007