Ros-diffs November 2008

ros-diffs@reactos.org

28 participants
657 discussions

[tkreuzer] 37291: Implement rsym64. This replaces rsym on x64 target. It parses the gcc generated DWARF2 unwind info and translates it into Windows compatible unwind info. Scope tables are not yet implemented. This commit is dediated to kjk_hyperion
by tkreuzer＠svn.reactos.org 11 Nov '08

11 Nov '08

Author: tkreuzer Date: Tue Nov 11 13:51:30 2008 New Revision: 37291 URL: http://svn.reactos.org/svn/reactos?rev=37291&view=rev Log: Implement rsym64. This replaces rsym on x64 target. It parses the gcc generated DWARF2 unwind info and translates it into Windows compatible unwind info. Scope tables are not yet implemented. This commit is dediated to kjk_hyperion Added: branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h (with props) branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c (with props) branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.h (with props) Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak Added: branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h (added) +++ branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h [iso-8859-1] Tue Nov 11 13:51:30 2008 @@ -1,0 +1,832 @@ +/* Declarations and definitions of codes relating to the DWARF2 symbolic + debugging information format. + Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002, + 2003, 2004 Free Software Foundation, Inc. + + Written by Gary Funck (gary(a)intrepid.com) The Ada Joint Program + Office (AJPO), Florida State University and Silicon Graphics Inc. + provided support for this effort -- June 21, 1995. + + Derived from the DWARF 1 implementation written by Ron Guilmette + (rfg(a)netcom.com), November 1990. + + This file is part of GCC. + + GCC is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free + Software Foundation; either version 2, or (at your option) any later + version. + + GCC is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING. If not, write to the Free + Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ + +/* This file is derived from the DWARF specification (a public document) + Revision 2.0.0 (July 27, 1993) developed by the UNIX International + Programming Languages Special Interest Group (UI/PLSIG) and distributed + by UNIX International. Copies of this specification are available from + UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054. + + This file also now contains definitions from the DWARF 3 specification. */ + +/* This file is shared between GCC and GDB, and should not contain + prototypes. */ + +#ifndef GCC_DWARF2_H +#define GCC_DWARF2_H + +//#include "list.h" + +#include <pshpack1.h> +/* Structure found in the .debug_line section. */ +typedef struct +{ + unsigned char li_length [4]; + unsigned char li_version [2]; + unsigned char li_prologue_length [4]; + unsigned char li_min_insn_length [1]; + unsigned char li_default_is_stmt [1]; + unsigned char li_line_base [1]; + unsigned char li_line_range [1]; + unsigned char li_opcode_base [1]; +} +DWARF2_External_LineInfo; + +typedef struct +{ + unsigned long li_length; + unsigned short li_version; + unsigned int li_prologue_length; + unsigned char li_min_insn_length; + unsigned char li_default_is_stmt; + int li_line_base; + unsigned char li_line_range; + unsigned char li_opcode_base; +} +DWARF2_Internal_LineInfo; + +/* Structure found in .debug_pubnames section. */ +typedef struct +{ + unsigned char pn_length [4]; + unsigned char pn_version [2]; + unsigned char pn_offset [4]; + unsigned char pn_size [4]; +} +DWARF2_External_PubNames; + +typedef struct +{ + unsigned long pn_length; + unsigned short pn_version; + unsigned long pn_offset; + unsigned long pn_size; +} +DWARF2_Internal_PubNames; + +/* Structure found in .debug_info section. */ +typedef struct +{ + unsigned char cu_length [4]; + unsigned char cu_version [2]; + unsigned char cu_abbrev_offset [4]; + unsigned char cu_pointer_size [1]; +} +DWARF2_External_CompUnit; + +typedef struct +{ + unsigned long cu_length; + unsigned short cu_version; + unsigned long cu_abbrev_offset; + unsigned char cu_pointer_size; +} +DWARF2_Internal_CompUnit; + +typedef struct +{ + unsigned char ar_length [4]; + unsigned char ar_version [2]; + unsigned char ar_info_offset [4]; + unsigned char ar_pointer_size [1]; + unsigned char ar_segment_size [1]; +} +DWARF2_External_ARange; + +typedef struct +{ + unsigned long ar_length; + unsigned short ar_version; + unsigned long ar_info_offset; + unsigned char ar_pointer_size; + unsigned char ar_segment_size; +} +DWARF2_Internal_ARange; +#include <poppack.h> + +/* Tag names and codes. */ +enum dwarf_tag + { + DW_TAG_padding = 0x00, + DW_TAG_array_type = 0x01, + DW_TAG_class_type = 0x02, + DW_TAG_entry_point = 0x03, + DW_TAG_enumeration_type = 0x04, + DW_TAG_formal_parameter = 0x05, + DW_TAG_imported_declaration = 0x08, + DW_TAG_label = 0x0a, + DW_TAG_lexical_block = 0x0b, + DW_TAG_member = 0x0d, + DW_TAG_pointer_type = 0x0f, + DW_TAG_reference_type = 0x10, + DW_TAG_compile_unit = 0x11, + DW_TAG_string_type = 0x12, + DW_TAG_structure_type = 0x13, + DW_TAG_subroutine_type = 0x15, + DW_TAG_typedef = 0x16, + DW_TAG_union_type = 0x17, + DW_TAG_unspecified_parameters = 0x18, + DW_TAG_variant = 0x19, + DW_TAG_common_block = 0x1a, + DW_TAG_common_inclusion = 0x1b, + DW_TAG_inheritance = 0x1c, + DW_TAG_inlined_subroutine = 0x1d, + DW_TAG_module = 0x1e, + DW_TAG_ptr_to_member_type = 0x1f, + DW_TAG_set_type = 0x20, + DW_TAG_subrange_type = 0x21, + DW_TAG_with_stmt = 0x22, + DW_TAG_access_declaration = 0x23, + DW_TAG_base_type = 0x24, + DW_TAG_catch_block = 0x25, + DW_TAG_const_type = 0x26, + DW_TAG_constant = 0x27, + DW_TAG_enumerator = 0x28, + DW_TAG_file_type = 0x29, + DW_TAG_friend = 0x2a, + DW_TAG_namelist = 0x2b, + DW_TAG_namelist_item = 0x2c, + DW_TAG_packed_type = 0x2d, + DW_TAG_subprogram = 0x2e, + DW_TAG_template_type_param = 0x2f, + DW_TAG_template_value_param = 0x30, + DW_TAG_thrown_type = 0x31, + DW_TAG_try_block = 0x32, + DW_TAG_variant_part = 0x33, + DW_TAG_variable = 0x34, + DW_TAG_volatile_type = 0x35, + /* DWARF 3. */ + DW_TAG_dwarf_procedure = 0x36, + DW_TAG_restrict_type = 0x37, + DW_TAG_interface_type = 0x38, + DW_TAG_namespace = 0x39, + DW_TAG_imported_module = 0x3a, + DW_TAG_unspecified_type = 0x3b, + DW_TAG_partial_unit = 0x3c, + DW_TAG_imported_unit = 0x3d, + /* SGI/MIPS Extensions. */ + DW_TAG_MIPS_loop = 0x4081, + /* HP extensions. See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz . */ + DW_TAG_HP_array_descriptor = 0x4090, + /* GNU extensions. */ + DW_TAG_format_label = 0x4101, /* For FORTRAN 77 and Fortran 90. */ + DW_TAG_function_template = 0x4102, /* For C++. */ + DW_TAG_class_template = 0x4103, /* For C++. */ + DW_TAG_GNU_BINCL = 0x4104, + DW_TAG_GNU_EINCL = 0x4105, + /* Extensions for UPC. See: http://upc.gwu.edu/~upc. */ + DW_TAG_upc_shared_type = 0x8765, + DW_TAG_upc_strict_type = 0x8766, + DW_TAG_upc_relaxed_type = 0x8767, + /* PGI (STMicroelectronics) extensions. No documentation available. */ + DW_TAG_PGI_kanji_type = 0xA000, + DW_TAG_PGI_interface_block = 0xA020 + }; + +#define DW_TAG_lo_user 0x4080 +#define DW_TAG_hi_user 0xffff + +/* Flag that tells whether entry has a child or not. */ +#define DW_children_no 0 +#define DW_children_yes 1 + +/* Form names and codes. */ +enum dwarf_form + { + DW_FORM_addr = 0x01, + DW_FORM_block2 = 0x03, + DW_FORM_block4 = 0x04, + DW_FORM_data2 = 0x05, + DW_FORM_data4 = 0x06, + DW_FORM_data8 = 0x07, + DW_FORM_string = 0x08, + DW_FORM_block = 0x09, + DW_FORM_block1 = 0x0a, + DW_FORM_data1 = 0x0b, + DW_FORM_flag = 0x0c, + DW_FORM_sdata = 0x0d, + DW_FORM_strp = 0x0e, + DW_FORM_udata = 0x0f, + DW_FORM_ref_addr = 0x10, + DW_FORM_ref1 = 0x11, + DW_FORM_ref2 = 0x12, + DW_FORM_ref4 = 0x13, + DW_FORM_ref8 = 0x14, + DW_FORM_ref_udata = 0x15, + DW_FORM_indirect = 0x16 + }; + +/* Attribute names and codes. */ +enum dwarf_attribute + { + DW_AT_sibling = 0x01, + DW_AT_location = 0x02, + DW_AT_name = 0x03, + DW_AT_ordering = 0x09, + DW_AT_subscr_data = 0x0a, + DW_AT_byte_size = 0x0b, + DW_AT_bit_offset = 0x0c, + DW_AT_bit_size = 0x0d, + DW_AT_element_list = 0x0f, + DW_AT_stmt_list = 0x10, + DW_AT_low_pc = 0x11, + DW_AT_high_pc = 0x12, + DW_AT_language = 0x13, + DW_AT_member = 0x14, + DW_AT_discr = 0x15, + DW_AT_discr_value = 0x16, + DW_AT_visibility = 0x17, + DW_AT_import = 0x18, + DW_AT_string_length = 0x19, + DW_AT_common_reference = 0x1a, + DW_AT_comp_dir = 0x1b, + DW_AT_const_value = 0x1c, + DW_AT_containing_type = 0x1d, + DW_AT_default_value = 0x1e, + DW_AT_inline = 0x20, + DW_AT_is_optional = 0x21, + DW_AT_lower_bound = 0x22, + DW_AT_producer = 0x25, + DW_AT_prototyped = 0x27, + DW_AT_return_addr = 0x2a, + DW_AT_start_scope = 0x2c, + DW_AT_stride_size = 0x2e, + DW_AT_upper_bound = 0x2f, + DW_AT_abstract_origin = 0x31, + DW_AT_accessibility = 0x32, + DW_AT_address_class = 0x33, + DW_AT_artificial = 0x34, + DW_AT_base_types = 0x35, + DW_AT_calling_convention = 0x36, + DW_AT_count = 0x37, + DW_AT_data_member_location = 0x38, + DW_AT_decl_column = 0x39, + DW_AT_decl_file = 0x3a, + DW_AT_decl_line = 0x3b, + DW_AT_declaration = 0x3c, + DW_AT_discr_list = 0x3d, + DW_AT_encoding = 0x3e, + DW_AT_external = 0x3f, + DW_AT_frame_base = 0x40, + DW_AT_friend = 0x41, + DW_AT_identifier_case = 0x42, + DW_AT_macro_info = 0x43, + DW_AT_namelist_items = 0x44, + DW_AT_priority = 0x45, + DW_AT_segment = 0x46, + DW_AT_specification = 0x47, + DW_AT_static_link = 0x48, + DW_AT_type = 0x49, + DW_AT_use_location = 0x4a, + DW_AT_variable_parameter = 0x4b, + DW_AT_virtuality = 0x4c, + DW_AT_vtable_elem_location = 0x4d, + /* DWARF 3 values. */ + DW_AT_allocated = 0x4e, + DW_AT_associated = 0x4f, + DW_AT_data_location = 0x50, + DW_AT_stride = 0x51, + DW_AT_entry_pc = 0x52, + DW_AT_use_UTF8 = 0x53, + DW_AT_extension = 0x54, + DW_AT_ranges = 0x55, + DW_AT_trampoline = 0x56, + DW_AT_call_column = 0x57, + DW_AT_call_file = 0x58, + DW_AT_call_line = 0x59, + /* SGI/MIPS extensions. */ + DW_AT_MIPS_fde = 0x2001, + DW_AT_MIPS_loop_begin = 0x2002, + DW_AT_MIPS_tail_loop_begin = 0x2003, + DW_AT_MIPS_epilog_begin = 0x2004, + DW_AT_MIPS_loop_unroll_factor = 0x2005, + DW_AT_MIPS_software_pipeline_depth = 0x2006, + DW_AT_MIPS_linkage_name = 0x2007, + DW_AT_MIPS_stride = 0x2008, + DW_AT_MIPS_abstract_name = 0x2009, + DW_AT_MIPS_clone_origin = 0x200a, + DW_AT_MIPS_has_inlines = 0x200b, + /* HP extensions. */ + DW_AT_HP_block_index = 0x2000, + DW_AT_HP_unmodifiable = 0x2001, /* Same as DW_AT_MIPS_fde. */ + DW_AT_HP_actuals_stmt_list = 0x2010, + DW_AT_HP_proc_per_section = 0x2011, + DW_AT_HP_raw_data_ptr = 0x2012, + DW_AT_HP_pass_by_reference = 0x2013, + DW_AT_HP_opt_level = 0x2014, + DW_AT_HP_prof_version_id = 0x2015, + DW_AT_HP_opt_flags = 0x2016, + DW_AT_HP_cold_region_low_pc = 0x2017, + DW_AT_HP_cold_region_high_pc = 0x2018, + DW_AT_HP_all_variables_modifiable = 0x2019, + DW_AT_HP_linkage_name = 0x201a, + DW_AT_HP_prof_flags = 0x201b, /* In comp unit of procs_info for -g. */ + /* GNU extensions. */ + DW_AT_sf_names = 0x2101, + DW_AT_src_info = 0x2102, + DW_AT_mac_info = 0x2103, + DW_AT_src_coords = 0x2104, + DW_AT_body_begin = 0x2105, + DW_AT_body_end = 0x2106, + DW_AT_GNU_vector = 0x2107, + /* VMS extensions. */ + DW_AT_VMS_rtnbeg_pd_address = 0x2201, + /* UPC extension. */ + DW_AT_upc_threads_scaled = 0x3210, + /* PGI (STMicroelectronics) extensions. */ + DW_AT_PGI_lbase = 0x3a00, + DW_AT_PGI_soffset = 0x3a01, + DW_AT_PGI_lstride = 0x3a02 + }; + +#define DW_AT_lo_user 0x2000 /* Implementation-defined range start. */ +#define DW_AT_hi_user 0x3ff0 /* Implementation-defined range end. */ + +/* Location atom names and codes. */ +enum dwarf_location_atom + { + DW_OP_addr = 0x03, + DW_OP_deref = 0x06, + DW_OP_const1u = 0x08, + DW_OP_const1s = 0x09, + DW_OP_const2u = 0x0a, + DW_OP_const2s = 0x0b, + DW_OP_const4u = 0x0c, + DW_OP_const4s = 0x0d, + DW_OP_const8u = 0x0e, + DW_OP_const8s = 0x0f, + DW_OP_constu = 0x10, + DW_OP_consts = 0x11, + DW_OP_dup = 0x12, + DW_OP_drop = 0x13, + DW_OP_over = 0x14, + DW_OP_pick = 0x15, + DW_OP_swap = 0x16, + DW_OP_rot = 0x17, + DW_OP_xderef = 0x18, + DW_OP_abs = 0x19, + DW_OP_and = 0x1a, + DW_OP_div = 0x1b, + DW_OP_minus = 0x1c, + DW_OP_mod = 0x1d, + DW_OP_mul = 0x1e, + DW_OP_neg = 0x1f, + DW_OP_not = 0x20, + DW_OP_or = 0x21, + DW_OP_plus = 0x22, + DW_OP_plus_uconst = 0x23, + DW_OP_shl = 0x24, + DW_OP_shr = 0x25, + DW_OP_shra = 0x26, + DW_OP_xor = 0x27, + DW_OP_bra = 0x28, + DW_OP_eq = 0x29, + DW_OP_ge = 0x2a, + DW_OP_gt = 0x2b, + DW_OP_le = 0x2c, + DW_OP_lt = 0x2d, + DW_OP_ne = 0x2e, + DW_OP_skip = 0x2f, + DW_OP_lit0 = 0x30, + DW_OP_lit1 = 0x31, + DW_OP_lit2 = 0x32, + DW_OP_lit3 = 0x33, + DW_OP_lit4 = 0x34, + DW_OP_lit5 = 0x35, + DW_OP_lit6 = 0x36, + DW_OP_lit7 = 0x37, + DW_OP_lit8 = 0x38, + DW_OP_lit9 = 0x39, + DW_OP_lit10 = 0x3a, + DW_OP_lit11 = 0x3b, + DW_OP_lit12 = 0x3c, + DW_OP_lit13 = 0x3d, + DW_OP_lit14 = 0x3e, + DW_OP_lit15 = 0x3f, + DW_OP_lit16 = 0x40, + DW_OP_lit17 = 0x41, + DW_OP_lit18 = 0x42, + DW_OP_lit19 = 0x43, + DW_OP_lit20 = 0x44, + DW_OP_lit21 = 0x45, + DW_OP_lit22 = 0x46, + DW_OP_lit23 = 0x47, + DW_OP_lit24 = 0x48, + DW_OP_lit25 = 0x49, + DW_OP_lit26 = 0x4a, + DW_OP_lit27 = 0x4b, + DW_OP_lit28 = 0x4c, + DW_OP_lit29 = 0x4d, + DW_OP_lit30 = 0x4e, + DW_OP_lit31 = 0x4f, + DW_OP_reg0 = 0x50, + DW_OP_reg1 = 0x51, + DW_OP_reg2 = 0x52, + DW_OP_reg3 = 0x53, + DW_OP_reg4 = 0x54, + DW_OP_reg5 = 0x55, + DW_OP_reg6 = 0x56, + DW_OP_reg7 = 0x57, + DW_OP_reg8 = 0x58, + DW_OP_reg9 = 0x59, + DW_OP_reg10 = 0x5a, + DW_OP_reg11 = 0x5b, + DW_OP_reg12 = 0x5c, + DW_OP_reg13 = 0x5d, + DW_OP_reg14 = 0x5e, + DW_OP_reg15 = 0x5f, + DW_OP_reg16 = 0x60, + DW_OP_reg17 = 0x61, + DW_OP_reg18 = 0x62, + DW_OP_reg19 = 0x63, + DW_OP_reg20 = 0x64, + DW_OP_reg21 = 0x65, + DW_OP_reg22 = 0x66, + DW_OP_reg23 = 0x67, + DW_OP_reg24 = 0x68, + DW_OP_reg25 = 0x69, + DW_OP_reg26 = 0x6a, + DW_OP_reg27 = 0x6b, + DW_OP_reg28 = 0x6c, + DW_OP_reg29 = 0x6d, + DW_OP_reg30 = 0x6e, + DW_OP_reg31 = 0x6f, + DW_OP_breg0 = 0x70, + DW_OP_breg1 = 0x71, + DW_OP_breg2 = 0x72, + DW_OP_breg3 = 0x73, + DW_OP_breg4 = 0x74, + DW_OP_breg5 = 0x75, + DW_OP_breg6 = 0x76, + DW_OP_breg7 = 0x77, + DW_OP_breg8 = 0x78, + DW_OP_breg9 = 0x79, + DW_OP_breg10 = 0x7a, + DW_OP_breg11 = 0x7b, + DW_OP_breg12 = 0x7c, + DW_OP_breg13 = 0x7d, + DW_OP_breg14 = 0x7e, + DW_OP_breg15 = 0x7f, + DW_OP_breg16 = 0x80, + DW_OP_breg17 = 0x81, + DW_OP_breg18 = 0x82, + DW_OP_breg19 = 0x83, + DW_OP_breg20 = 0x84, + DW_OP_breg21 = 0x85, + DW_OP_breg22 = 0x86, + DW_OP_breg23 = 0x87, + DW_OP_breg24 = 0x88, + DW_OP_breg25 = 0x89, + DW_OP_breg26 = 0x8a, + DW_OP_breg27 = 0x8b, + DW_OP_breg28 = 0x8c, + DW_OP_breg29 = 0x8d, + DW_OP_breg30 = 0x8e, + DW_OP_breg31 = 0x8f, + DW_OP_regx = 0x90, + DW_OP_fbreg = 0x91, + DW_OP_bregx = 0x92, + DW_OP_piece = 0x93, + DW_OP_deref_size = 0x94, + DW_OP_xderef_size = 0x95, + DW_OP_nop = 0x96, + /* DWARF 3 extensions. */ + DW_OP_push_object_address = 0x97, + DW_OP_call2 = 0x98, + DW_OP_call4 = 0x99, + DW_OP_call_ref = 0x9a, + /* GNU extensions. */ + DW_OP_GNU_push_tls_address = 0xe0, + /* HP extensions. */ + DW_OP_HP_unknown = 0xe0, /* Ouch, the same as GNU_push_tls_address. */ + DW_OP_HP_is_value = 0xe1, + DW_OP_HP_fltconst4 = 0xe2, + DW_OP_HP_fltconst8 = 0xe3, + DW_OP_HP_mod_range = 0xe4, + DW_OP_HP_unmod_range = 0xe5, + DW_OP_HP_tls = 0xe6 + }; + +#define DW_OP_lo_user 0xe0 /* Implementation-defined range start. */ +#define DW_OP_hi_user 0xff /* Implementation-defined range end. */ + +/* Type encodings. */ +enum dwarf_type + { + DW_ATE_void = 0x0, + DW_ATE_address = 0x1, + DW_ATE_boolean = 0x2, + DW_ATE_complex_float = 0x3, + DW_ATE_float = 0x4, + DW_ATE_signed = 0x5, + DW_ATE_signed_char = 0x6, + DW_ATE_unsigned = 0x7, + DW_ATE_unsigned_char = 0x8, + /* DWARF 3. */ + DW_ATE_imaginary_float = 0x9, + /* HP extensions. */ + DW_ATE_HP_float80 = 0x80, /* Floating-point (80 bit). */ + DW_ATE_HP_complex_float80 = 0x81, /* Complex floating-point (80 bit). */ + DW_ATE_HP_float128 = 0x82, /* Floating-point (128 bit). */ + DW_ATE_HP_complex_float128 = 0x83, /* Complex floating-point (128 bit). */ + DW_ATE_HP_floathpintel = 0x84, /* Floating-point (82 bit IA64). */ + DW_ATE_HP_imaginary_float80 = 0x85, + DW_ATE_HP_imaginary_float128 = 0x86 + }; + +#define DW_ATE_lo_user 0x80 +#define DW_ATE_hi_user 0xff + +/* Array ordering names and codes. */ +enum dwarf_array_dim_ordering + { + DW_ORD_row_major = 0, + DW_ORD_col_major = 1 + }; + +/* Access attribute. */ +enum dwarf_access_attribute + { + DW_ACCESS_public = 1, + DW_ACCESS_protected = 2, + DW_ACCESS_private = 3 + }; + +/* Visibility. */ +enum dwarf_visibility_attribute + { + DW_VIS_local = 1, + DW_VIS_exported = 2, + DW_VIS_qualified = 3 + }; + +/* Virtuality. */ +enum dwarf_virtuality_attribute + { + DW_VIRTUALITY_none = 0, + DW_VIRTUALITY_virtual = 1, + DW_VIRTUALITY_pure_virtual = 2 + }; + +/* Case sensitivity. */ +enum dwarf_id_case + { + DW_ID_case_sensitive = 0, + DW_ID_up_case = 1, + DW_ID_down_case = 2, + DW_ID_case_insensitive = 3 + }; + +/* Calling convention. */ +enum dwarf_calling_convention + { + DW_CC_normal = 0x1, + DW_CC_program = 0x2, + DW_CC_nocall = 0x3, + DW_CC_GNU_renesas_sh = 0x40 + }; + +#define DW_CC_lo_user 0x40 +#define DW_CC_hi_user 0xff + +/* Inline attribute. */ +enum dwarf_inline_attribute + { + DW_INL_not_inlined = 0, + DW_INL_inlined = 1, + DW_INL_declared_not_inlined = 2, + DW_INL_declared_inlined = 3 + }; + +/* Discriminant lists. */ +enum dwarf_discrim_list + { + DW_DSC_label = 0, + DW_DSC_range = 1 + }; + +/* Line number opcodes. */ +enum dwarf_line_number_ops + { + DW_LNS_extended_op = 0, + DW_LNS_copy = 1, + DW_LNS_advance_pc = 2, + DW_LNS_advance_line = 3, + DW_LNS_set_file = 4, + DW_LNS_set_column = 5, + DW_LNS_negate_stmt = 6, + DW_LNS_set_basic_block = 7, + DW_LNS_const_add_pc = 8, + DW_LNS_fixed_advance_pc = 9, + /* DWARF 3. */ + DW_LNS_set_prologue_end = 10, + DW_LNS_set_epilogue_begin = 11, + DW_LNS_set_isa = 12 + }; + +/* Line number extended opcodes. */ +enum dwarf_line_number_x_ops + { + DW_LNE_end_sequence = 1, + DW_LNE_set_address = 2, + DW_LNE_define_file = 3, + /* HP extensions. */ + DW_LNE_HP_negate_is_UV_update = 0x11, + DW_LNE_HP_push_context = 0x12, + DW_LNE_HP_pop_context = 0x13, + DW_LNE_HP_set_file_line_column = 0x14, + DW_LNE_HP_set_routine_name = 0x15, + DW_LNE_HP_set_sequence = 0x16, + DW_LNE_HP_negate_post_semantics = 0x17, + DW_LNE_HP_negate_function_exit = 0x18, + DW_LNE_HP_negate_front_end_logical = 0x19, + DW_LNE_HP_define_proc = 0x20 + }; + +/* Call frame information. */ +enum dwarf_call_frame_info + { + DW_CFA_advance_loc = 0x40, + DW_CFA_offset = 0x80, + DW_CFA_restore = 0xc0, + DW_CFA_nop = 0x00, + DW_CFA_set_loc = 0x01, + DW_CFA_advance_loc1 = 0x02, + DW_CFA_advance_loc2 = 0x03, + DW_CFA_advance_loc4 = 0x04, + DW_CFA_offset_extended = 0x05, + DW_CFA_restore_extended = 0x06, + DW_CFA_undefined = 0x07, + DW_CFA_same_value = 0x08, + DW_CFA_register = 0x09, + DW_CFA_remember_state = 0x0a, + DW_CFA_restore_state = 0x0b, + DW_CFA_def_cfa = 0x0c, + DW_CFA_def_cfa_register = 0x0d, + DW_CFA_def_cfa_offset = 0x0e, + /* DWARF 3. */ + DW_CFA_def_cfa_expression = 0x0f, + DW_CFA_expression = 0x10, + DW_CFA_offset_extended_sf = 0x11, + DW_CFA_def_cfa_sf = 0x12, + DW_CFA_def_cfa_offset_sf = 0x13, + /* SGI/MIPS specific. */ + DW_CFA_MIPS_advance_loc8 = 0x1d, + /* GNU extensions. */ + DW_CFA_GNU_window_save = 0x2d, + DW_CFA_GNU_args_size = 0x2e, + DW_CFA_GNU_negative_offset_extended = 0x2f + }; + +#define DW_CIE_ID 0xffffffff +#define DW_CIE_VERSION 1 + +#define DW_CFA_extended 0 +#define DW_CFA_lo_user 0x1c +#define DW_CFA_hi_user 0x3f + +#define DW_CHILDREN_no 0x00 +#define DW_CHILDREN_yes 0x01 + +#define DW_ADDR_none 0 + +/* Source language names and codes. */ +enum dwarf_source_language + { + DW_LANG_C89 = 0x0001, + DW_LANG_C = 0x0002, + DW_LANG_Ada83 = 0x0003, + DW_LANG_C_plus_plus = 0x0004, + DW_LANG_Cobol74 = 0x0005, + DW_LANG_Cobol85 = 0x0006, + DW_LANG_Fortran77 = 0x0007, + DW_LANG_Fortran90 = 0x0008, + DW_LANG_Pascal83 = 0x0009, + DW_LANG_Modula2 = 0x000a, + DW_LANG_Java = 0x000b, + /* DWARF 3. */ + DW_LANG_C99 = 0x000c, + DW_LANG_Ada95 = 0x000d, + DW_LANG_Fortran95 = 0x000e, + /* MIPS. */ + DW_LANG_Mips_Assembler = 0x8001, + /* UPC. */ + DW_LANG_Upc = 0x8765 + }; + +#define DW_LANG_lo_user 0x8000 /* Implementation-defined range start. */ +#define DW_LANG_hi_user 0xffff /* Implementation-defined range start. */ + +/* Names and codes for macro information. */ +enum dwarf_macinfo_record_type + { + DW_MACINFO_define = 1, + DW_MACINFO_undef = 2, + DW_MACINFO_start_file = 3, + DW_MACINFO_end_file = 4, + DW_MACINFO_vendor_ext = 255 + }; + +/* @@@ For use with GNU frame unwind information. */ + +#define DW_EH_PE_absptr 0x00 +#define DW_EH_PE_omit 0xff + +#define DW_EH_PE_uleb128 0x01 +#define DW_EH_PE_udata2 0x02 +#define DW_EH_PE_udata4 0x03 +#define DW_EH_PE_udata8 0x04 +#define DW_EH_PE_sleb128 0x09 +#define DW_EH_PE_sdata2 0x0A +#define DW_EH_PE_sdata4 0x0B +#define DW_EH_PE_sdata8 0x0C +#define DW_EH_PE_signed 0x08 + +#define DW_EH_PE_pcrel 0x10 +#define DW_EH_PE_textrel 0x20 +#define DW_EH_PE_datarel 0x30 +#define DW_EH_PE_funcrel 0x40 +#define DW_EH_PE_aligned 0x50 + +#define DW_EH_PE_indirect 0x80 + +/** Private definitions ***/ + +typedef struct +{ + ULONG Length; + ULONG CiePointer; +} DW2CIEFDE; + +typedef struct +{ + ULONG Length; + char *Next; + ULONG CieId; + char Version; + ULONG ReturnAddressRegister; + ULONG AugStringLength; + char *AugString; + ULONG AugLength; + char *AugData; + ULONG CodeAlign; + LONG DataAlign; + char *Instructions; +} DW2CIE, *PDW2CIE; + +typedef struct +{ + ULONG Length; + char *Next; + char *CiePointer; + ULONG PcBegin; + ULONG PcRange; + ULONG AugLength; + char *AugData; + char *Instructions; +} DW2FDE, *PDW2FDE; + +typedef struct _CFSTATE +{ + ULONG Location; + ULONG Code; + ULONG Reg; + ULONG Reg2; + ULONG FramePtr; + ULONG FramePtrDiff; + ULONG Offset; + ULONG IsUwop; + ULONG Scope; +} DW2CFSTATE, *PDW2CFSTATE; + +#define NextCIE(p) ((void*)((char*)p + p->Length + 4)) + + + +#endif /* dwarf2.h */ Propchange: branches/ros-amd64-bringup/reactos/tools/rsym/dwarf2.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak [iso-8859-1] Tue Nov 11 13:51:30 2008 @@ -18,9 +18,15 @@ RSYM_TARGET = \ $(RSYM_OUT_)rsym$(EXEPOSTFIX) +ifeq ($(ARCH),amd64) +RSYM_SOURCES = \ + $(RSYM_BASE_)rsym64.c \ + $(RSYM_BASE_)rsym_common.c +else RSYM_SOURCES = \ $(RSYM_BASE_)rsym.c \ $(RSYM_BASE_)rsym_common.c +endif RSYM_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(RSYM_SOURCES:.c=.o)) @@ -44,6 +50,10 @@ $(ECHO_CC) ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ +$(RSYM_INT_)rsym64.o: $(RSYM_BASE_)rsym64.c | $(RSYM_INT) + $(ECHO_CC) + ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ + $(RSYM_INT_)rsym_common.o: $(RSYM_BASE_)rsym_common.c | $(RSYM_INT) $(ECHO_CC) ${host_gcc} $(RSYM_HOST_CFLAGS) -c $< -o $@ Added: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c (added) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] Tue Nov 11 13:51:30 2008 @@ -1,0 +1,680 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "rsym.h" +#include "rsym64.h" +#include "dwarf2.h" + +struct {char *name; char regnt;} regs[] = +{ {"rax", REG_RAX}, {"rdx", REG_RDX}, {"rcx", REG_RCX}, {"rbx", REG_RBX}, + {"rsi", REG_RSI}, {"rdi", REG_RDI}, {"rbp", REG_RBP}, {"rsp", REG_RSP}, + {"r8", REG_R8}, {"r9", REG_R9}, {"r10", REG_R10}, {"r11", REG_R11}, + {"r12", REG_R12}, {"r13", REG_R13}, {"r14", REG_R14}, {"r15", REG_R15}, + {"xmm0", REG_XMM0}, {"xmm1", REG_XMM1}, {"xmm2", REG_XMM2}, {"xmm3", REG_XMM3}, + {"xmm4", REG_XMM4}, {"xmm5", REG_XMM5}, {"xmm6", REG_XMM6}, {"xmm7", REG_XMM7}, + {"xmm8", REG_XMM8}, {"xmm9", REG_XMM9}, {"xmm10",REG_XMM10},{"xmm11",REG_XMM11}, + {"xmm12",REG_XMM12},{"xmm13",REG_XMM13},{"xmm14",REG_XMM14},{"xmm15",REG_XMM15}, +// "st0", "st1", "st2", "st3", +// "st4", "st5", "st6", "st7", +// "mm0", "mm1", "mm2", "mm3", +// "mm4", "mm5", "mm6", "mm7" +}; + +/** Functions for DWARF2 ******************************************************/ + +unsigned long +DwDecodeUleb128(unsigned long *pResult, char *pc) +{ + unsigned long ulResult = 0; + unsigned long ulShift = 0; + unsigned char current; + unsigned long ulSize = 0; + + do + { + current = pc[ulSize]; + ulSize++; + ulResult |= current & 0x7f << ulShift; + ulShift += 7; + } + while (current & 0x80); + + *pResult = ulResult; + return ulSize; +} + +unsigned long +DwDecodeSleb128(long *pResult, char *pc) +{ + long lResult = 0; + unsigned long ulShift = 0; + unsigned char current; + unsigned long ulSize = 0; + + do + { + current = pc[ulSize]; + ulSize++; + lResult |= current & 0x7f << ulShift; + ulShift += 7; + } + while (current & 0x80); + + if (current & 0x40) + lResult |= - (1 << (ulShift)); + + *pResult = lResult; + + return ulSize; +} + +unsigned long +DwDecodeCie(PDW2CIE Cie, char *pc) +{ + Cie->Length = *(ULONG*)pc; + Cie->Next = pc + 4 + Cie->Length; + Cie->CieId = *(ULONG*)(pc + 4); + Cie->Version = pc[8]; + Cie->AugString = pc + 9; + Cie->AugStringLength = strlen(Cie->AugString); + pc = Cie->AugString + Cie->AugStringLength + 1; + pc += DwDecodeUleb128(&Cie->CodeAlign, pc); + pc += DwDecodeSleb128(&Cie->DataAlign, pc); + pc += DwDecodeUleb128(&Cie->ReturnAddressRegister, pc); + pc += DwDecodeUleb128(&Cie->AugLength, pc); + Cie->AugData = pc; + pc += Cie->AugLength; + Cie->Instructions = pc; + + return Cie->Length; +} + +unsigned long +DwDecodeFde(PDW2FDE Fde, char *pc) +{ + Fde->Length = *(ULONG*)pc; + Fde->Next = pc + 4 + Fde->Length; + Fde->CiePointer = pc + 4 - *(ULONG*)(pc + 4); + Fde->PcBegin = *(ULONG*)(pc + 8); + Fde->PcRange = *(ULONG*)(pc + 12); + pc += 16; + pc += DwDecodeUleb128(&Fde->AugLength, pc); + Fde->AugData = pc; + Fde->Instructions = Fde->AugData + Fde->AugLength; + + return Fde->Length; +} + +unsigned long +DwExecIntruction(PDW2CFSTATE State, char *pc) +{ + unsigned char Code; + unsigned long Length; + unsigned long PrevFramePtr = State->FramePtr; + + State->Scope = 0; + State->IsUwop = 0; + State->Code = Code = *pc; + Length = 1; + if ((Code & 0xc0) == DW_CFA_advance_loc) + { + State->Code = DW_CFA_advance_loc; + State->Location += Code & 0x3f; + } + else if ((Code & 0xc0) == DW_CFA_offset) + { + State->Code = DW_CFA_offset; + State->Reg = Code & 0x3f; + Length += DwDecodeUleb128(&State->Offset, pc + 1); + State->Offset *= 8; // fixme data alignment + State->IsUwop = 1; + } + else if ((Code & 0xc0) == DW_CFA_restore) + { + State->Code = DW_CFA_restore; + State->Reg = Code & 0x3f; + } + else switch (Code) + { + case DW_CFA_nop: + break; + case DW_CFA_set_loc: + Length = 9; // address + State->Location = *(DWORD*)(pc + 1); + break; + case DW_CFA_advance_loc1: + Length = 2; + State->Location += pc[1]; + break; + case DW_CFA_advance_loc2: + Length = 3; + State->Location += *(WORD*)(pc + 1); + break; + case DW_CFA_advance_loc4: + Length = 5; + State->Location += *(DWORD*)(pc + 1); + break; + case DW_CFA_offset_extended: + Length += DwDecodeUleb128(&State->Reg, pc + Length); + Length += DwDecodeUleb128(&State->Offset, pc + Length); + State->IsUwop = 1; + break; + case DW_CFA_restore_extended: + Length += DwDecodeUleb128(&State->Reg, pc + Length); + break; + case DW_CFA_undefined: + Length += DwDecodeUleb128(&State->Reg, pc + Length); + break; + case DW_CFA_same_value: + Length += DwDecodeUleb128(&State->Reg, pc + Length); + break; + case DW_CFA_register: + Length += DwDecodeUleb128(&State->Reg, pc + Length); + Length += DwDecodeUleb128(&State->Reg2, pc + Length); + break; + case DW_CFA_remember_state: + break; + case DW_CFA_restore_state: + break; + case DW_CFA_def_cfa: + Length += DwDecodeUleb128(&State->Reg, pc + Length); + Length += DwDecodeUleb128(&State->FramePtr, pc + Length); + State->IsUwop = 1; + break; + case DW_CFA_def_cfa_register: + Length += DwDecodeUleb128(&State->Reg, pc + Length); + break; + case DW_CFA_def_cfa_offset: + Length += DwDecodeUleb128(&State->FramePtr, pc + Length); + State->IsUwop = 1; + break; + case DW_CFA_def_cfa_sf: + Length += DwDecodeUleb128(&State->Reg, pc + Length); + Length += DwDecodeSleb128((LONG*)&State->FramePtr, pc + Length); + State->FramePtr *= 8; // data alignment + State->IsUwop = 1; + break; + /* PSEH types */ + case 0x1c: + State->Scope = 1; + break; + case 0x1d: + State->Scope = 2; + break; + default: + fprintf(stderr, "unknown instruction 0x%x at 0x%p\n", Code, pc); + exit(1); + } + + State->FramePtrDiff = State->FramePtr - PrevFramePtr; + +//printf("@%p: code=%x, Loc=%lx, offset=%lx, reg=0x%lx:%s\n", pc, code, State->Location, State->Offset, State->Reg, regnames_64[State->Reg]); + return Length; +} + +/** Windows unwind data functions *********************************************/ + +ULONG +StoreUnwindCodes(PUNWIND_INFO Info, PDW2CFSTATE State, ULONG FunctionStart) +{ + ULONG cCodes = 0; + ULONG AllocSize; + UNWIND_CODE Code[3]; + int i; + + Code[0].CodeOffset = State->Location - FunctionStart; + + switch (State->Code) + { + case DW_CFA_offset: + case DW_CFA_offset_extended: + // save register at offset + Code[0].OpInfo = regs[State->Reg].regnt; + if (State->Offset <= 0x7FFF8) + { + Code[0].UnwindOp = UWOP_SAVE_NONVOL; + Code[1].FrameOffset = State->Offset / 8; + cCodes = 2; + } + else + { + Code[0].UnwindOp = UWOP_SAVE_NONVOL_FAR; + Code[1].FrameOffset = (State->Offset / 8); + Code[2].FrameOffset = (State->Offset / 8) >> 16; + cCodes = 3; + } + break; + + case DW_CFA_def_cfa: + //case DW_CFA_def_cfa_register: + case DW_CFA_def_cfa_offset: + case DW_CFA_def_cfa_sf: + AllocSize = State->FramePtrDiff; + if (AllocSize <= 128) + { + Code[0].UnwindOp = UWOP_ALLOC_SMALL; + Code[0].OpInfo = (AllocSize / 8) - 1; + cCodes = 1; + } + else if (AllocSize <= 0x7FFF8) + { + Code[0].UnwindOp = UWOP_ALLOC_LARGE; + Code[0].OpInfo = 0; + Code[1].FrameOffset = AllocSize / 8; + cCodes = 2; + } + else // if (AllocSize > 0x7FFF8) + { + Code[0].UnwindOp = UWOP_ALLOC_LARGE; + Code[0].OpInfo = 1; + Code[1].FrameOffset = (AllocSize / 8); + Code[2].FrameOffset = (AllocSize / 8) >> 16; + cCodes = 3; + } + break; + } + + if (Info) + { + /* Move old codes */ + for (i = Info->CountOfCodes - 1; i >= 0; i--) + { + Info->UnwindCode[i + cCodes] = Info->UnwindCode[i]; + } + + /* Copy new codes */ + for (i = 0; i < cCodes; i++) + { + Info->UnwindCode[i] = Code[i]; + } + + Info->CountOfCodes += cCodes; + } + + return cCodes; +} + +#define GetSectionPointer(Info, i) \ + ((void*)(Info->FilePtr + Info->SectionHeaders[i].PointerToRawData)) + +#define GetxdataSize(cFuncs, cUWOP, cScopes) \ + ( cFuncs * (sizeof(UNWIND_INFO) + 2 + 4 + 4) \ + + cUWOP * sizeof(UNWIND_CODE) \ + + cScopes * sizeof(C_SCOPE_TABLE_ENTRY) ) + +ULONG +StoreUnwindInfo(PUNWIND_INFO Info, PDW2FDE pFde, ULONG FunctionStart) +{ + ULONG cbSize; + DW2CFSTATE State; + char *pInst; + ULONG c; + DW2CIE Cie; + + cbSize = 4; // sizeof(UNWIND_INFO); + Info->Version = 1; + Info->Flags = 0; + Info->SizeOfProlog = 0; + Info->CountOfCodes = 0; + Info->FrameRegister = 0; + Info->FrameOffset = 0; + + /* Decode the CIE */ + DwDecodeCie(&Cie, pFde->CiePointer); + + /* Initialize state */ + State.Location = FunctionStart; + State.FramePtr = 0; + + /* Parse the CIE's initial instructions */ + pInst = Cie.Instructions; + while (pInst < Cie.Next) + { + pInst += DwExecIntruction(&State, pInst); + } + + /* Parse the FDE instructions */ + pInst = pFde->Instructions; + while (pInst < pFde->Next) + { + pInst += DwExecIntruction(&State, pInst); + + if (State.IsUwop) + { + c = StoreUnwindCodes(Info, &State, FunctionStart); + cbSize += c * sizeof(UNWIND_CODE); + Info->SizeOfProlog = State.Location - FunctionStart; + } +// else if + // if is scope + // if is first scope + // align 4 + // emit gcc_specific handler + // create pointer to C_SCOPE_TABLE + // + + } + cbSize = ROUND_UP(cbSize, 4); + + return cbSize; +} + +void +CountUnwindData(PFILE_INFO File) +{ + DW2CIEFDE *p; + DW2FDE Fde; + char *pInst; + DW2CFSTATE State; + + File->cFuncs = 0; + File->cScopes = 0; + File->cUWOP = 0; + State.FramePtr = 0; + + p = GetSectionPointer(File, File->eh_frame.idx); + for (; p->Length; p = NextCIE(p)) + { + /* Is this an FDE? */ + if (p->CiePointer != 0) + { + File->cFuncs++; + DwDecodeFde(&Fde, (char*)p); + + pInst = Fde.Instructions; + while (pInst < Fde.Next) + { + pInst += DwExecIntruction(&State, pInst); + File->cUWOP += StoreUnwindCodes(NULL, &State, 0); + File->cScopes += State.Scope ? 1 : 0; + } + } + } + + return; +} + +int CompFunc(const void *p1, const void *p2) +{ + PRUNTIME_FUNCTION prf1 = (void*)p1, prf2 = (void*)p2; + return (prf1->FunctionStart > prf2->FunctionStart ? 1 : -1); +} + +void +GeneratePData(PFILE_INFO File) +{ + DW2CIEFDE *p; + DW2FDE Fde; + PIMAGE_DATA_DIRECTORY Dir; + ULONG i, Offset; + void * eh_frame; + PRUNTIME_FUNCTION pdata; + ULONG xdata_va; + char *xdata_p; + ULONG cbSize; + PIMAGE_SECTION_HEADER pshp, pshx; + ULONG FileAlignment; + + FileAlignment = File->OptionalHeader->FileAlignment; + + /* Get pointer to eh_frame section */ + eh_frame = GetSectionPointer(File, File->eh_frame.idx); + + /* Get sizes */ + CountUnwindData(File); +// printf("cFuncs = %ld, cUWOPS = %ld, cScopes = %ld\n", +// File->cFuncs, File->cUWOP, File->cScopes); + + /* Allocate .pdata buffer */ + File->pdata.idx = File->UsedSections; + pshp = File->pdata.psh = &File->SectionHeaders[File->pdata.idx]; + memcpy(pshp->Name, ".pdata", 7); + pshp->Misc.VirtualSize = (File->cFuncs + 1) * sizeof(RUNTIME_FUNCTION); +// pshp->VirtualAddress = + pshp->SizeOfRawData = ROUND_UP(pshp->Misc.VirtualSize, FileAlignment); +// pshp->PointerToRawData = + pdata = File->pdata.p = malloc(pshp->SizeOfRawData); + memset(File->pdata.p, pshp->SizeOfRawData, 0); + + /* Init exception data dir */ + Dir = &File->OptionalHeader->DataDirectory[IMAGE_DIRECTORY_ENTRY_EXCEPTION]; + Dir->VirtualAddress = pshp->VirtualAddress; + Dir->Size = pshp->Misc.VirtualSize; + + /* Allocate .xdata buffer */ + File->xdata.idx = File->pdata.idx + 1; + pshx = File->xdata.psh = &File->SectionHeaders[File->xdata.idx]; + memcpy(pshx->Name, ".xdata", 7); + pshx->Misc.VirtualSize = GetxdataSize(File->cFuncs, File->cUWOP, File->cScopes); + pshx->VirtualAddress = pshp->VirtualAddress + pshp->SizeOfRawData; + pshx->SizeOfRawData = ROUND_UP(pshx->Misc.VirtualSize, FileAlignment); + pshx->PointerToRawData = pshp->PointerToRawData + pshp->SizeOfRawData; + File->xdata.p = malloc(pshx->SizeOfRawData); + memset(File->pdata.p, pshx->SizeOfRawData, 0); + + i = 0; + Offset = File->eh_frame.psh->VirtualAddress; + xdata_va = pshx->VirtualAddress; + xdata_p = File->xdata.p; + for (p = eh_frame; p->Length; p = NextCIE(p)) + { + /* Is this an FDE? */ + if (p->CiePointer != 0) + { + DwDecodeFde(&Fde, (char*)p); + pdata[i].FunctionStart = Offset + 8 + Fde.PcBegin; + pdata[i].FunctionEnd = pdata[i].FunctionStart + Fde.PcRange; + pdata[i].UnwindInfo = xdata_va; + +// printf("%ld: RUNTIME_FUNCTION: {0x%lx, 0x%lx, 0x%lx}\n", i, pdata[i].FunctionStart, pdata[i].FunctionEnd, pdata[i].UnwindInfo); + + cbSize = StoreUnwindInfo((void*)xdata_p, &Fde, pdata[i].FunctionStart); + xdata_va += cbSize; + xdata_p += cbSize; + i++; + } + Offset += 4 + p->Length; + } + + /* Sort the RUNTIME_FUNCTIONS */ + qsort(pdata, i, sizeof(RUNTIME_FUNCTION), CompFunc); + +} + +/** Functions for COFF ********************************************************/ + + +WORD +CalculateChecksum(DWORD Start, void *pFile, ULONG cbSize) +{ + WORD *Ptr = pFile; + DWORD i; + DWORD checksum = Start; + + for (i = 0; i < (cbSize + 1) / sizeof(WORD); i += 1) + { + checksum += Ptr[i]; + checksum = (checksum + (checksum >> 16)) & 0xffff; + } + + return checksum ; +} + +void +WriteOutFile(FILE *handle, PFILE_INFO File) +{ + int ret, Size, Pos; + DWORD Checksum; + + /* Correct section count */ + File->FileHeader->NumberOfSections = File->UsedSections + 2; // FIXME!!! + + /* Calculate size of file beginning */ + Size = File->SectionHeaders[File->UsedSections].PointerToRawData; + + /* Recalculate checksum */ + Checksum = CalculateChecksum(0, File->FilePtr, Size); + Checksum = CalculateChecksum(Checksum, File->pdata.p, File->pdata.psh->Misc.VirtualSize); + Checksum = CalculateChecksum(Checksum, File->xdata.p, File->xdata.psh->Misc.VirtualSize); + File->OptionalHeader->CheckSum = Checksum + Size + File->pdata.psh->Misc.VirtualSize; + + /* Write file beginning */ + ret = fwrite(File->DosHeader, 1, Size, handle); + Pos = Size; + + /* Write .pdata section */ + Size = File->pdata.psh->SizeOfRawData; + ret = fwrite(File->pdata.p, 1, Size, handle); + Pos += Size; + + /* Write .xdata section */ + Size = File->xdata.psh->SizeOfRawData; + ret = fwrite(File->xdata.p, 1, Size, handle); + Pos += Size; + +} + + +int +ParsePEHeaders(PFILE_INFO File) +{ + DWORD OldChecksum, Checksum; + int i; + + /* Check if MZ header exists */ + File->DosHeader = (PIMAGE_DOS_HEADER)File->FilePtr; + if ((File->DosHeader->e_magic != IMAGE_DOS_MAGIC) || File->DosHeader->e_lfanew == 0L) + { + perror("Input file is not a PE image.\n"); + return 0; + } + + /* Locate PE file header */ + File->FileHeader = (PIMAGE_FILE_HEADER)(File->FilePtr + + File->DosHeader->e_lfanew + sizeof(ULONG)); + if (File->FileHeader->Machine != IMAGE_FILE_MACHINE_AMD64) + { + perror("Input file is not an x64 image.\n"); + return 0; + } + + /* Locate optional header */ + File->OptionalHeader = (PIMAGE_OPTIONAL_HEADER64)(File->FileHeader + 1); + File->ImageBase = File->OptionalHeader->ImageBase; + + /* Check if checksum is correct */ + OldChecksum = File->OptionalHeader->CheckSum; + File->OptionalHeader->CheckSum = 0; + Checksum = CalculateChecksum(0, File->FilePtr, File->cbInFileSize) + + File->cbInFileSize; + if (Checksum != OldChecksum) + { + fprintf(stderr, "Input file has incorrect PE checksum: 0x%lx (calculated: 0x%lx)\n", + OldChecksum, Checksum); +// return 0; + } + + /* Locate PE section headers */ + File->SectionHeaders = (PIMAGE_SECTION_HEADER)((char*)File->OptionalHeader + + File->FileHeader->SizeOfOptionalHeader); + + File->HeaderSize = File->DosHeader->e_lfanew + + sizeof(ULONG) + + sizeof(IMAGE_FILE_HEADER) + + File->FileHeader->SizeOfOptionalHeader; + + if (!File->FileHeader->PointerToSymbolTable) + { + fprintf(stderr, "No symbol table.\n"); + return 0; + } + + File->Symbols = File->FilePtr + File->FileHeader->PointerToSymbolTable; + File->Strings = (char*)File->Symbols + File->FileHeader->NumberOfSymbols * 18; + + /* Check section names */ + File->AllSections = File->FileHeader->NumberOfSections; + File->eh_frame.idx = -1; + for (i = 0; i < File->AllSections; i++) + { + char *pName = (char*)File->SectionHeaders[i].Name; + + /* Check for long name */ + if (pName[0] == '/') + { + unsigned long index = strtoul(pName+1, 0, 10); + pName = File->Strings + index; + } + else + { + /* Mark last section with a short name */ + File->UsedSections = i + 1; + } + + if (strcmp(pName, ".eh_frame") == 0) + { + File->eh_frame.idx = i; + File->eh_frame.psh = &File->SectionHeaders[i]; + File->eh_frame.p = GetSectionPointer(File, i); + } + + } + + if (File->eh_frame.idx == -1) + { + fprintf(stderr, "No .eh_frame section found\n"); + return 0; + } + + return 1; +} + +int main(int argc, char* argv[]) +{ + char* pszInFile; + char* pszOutFile; + FILE_INFO File; + FILE* outfile; + + if (argc != 3) + { + fprintf(stderr, "Usage: rsym <exefile> <symfile>\n"); + exit(1); + } + + pszInFile = convert_path(argv[1]); + pszOutFile = convert_path(argv[2]); + + File.FilePtr = load_file(pszInFile, &File.cbInFileSize); + if (!File.FilePtr) + { + fprintf(stderr, "An error occured loading '%s'\n", pszInFile); + exit(1); + } + + if (!ParsePEHeaders(&File)) + { + free(File.FilePtr); + exit(1); + } + + File.AlignBuf = malloc(File.OptionalHeader->FileAlignment); + memset(File.AlignBuf, File.OptionalHeader->FileAlignment, 0); + + GeneratePData(&File); + + outfile = fopen(pszOutFile, "wb"); + if (outfile == NULL) + { + perror("Cannot open output file"); + free(File.FilePtr); + exit(1); + } + + WriteOutFile(outfile, &File); + + fclose(outfile); + + return 0; +} Propchange: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.h (added) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.h [iso-8859-1] Tue Nov 11 13:51:30 2008 @@ -1,0 +1,175 @@ + +#ifndef _RSYM64_H +#define _RSYM64_H + +//C_ASSERT(sizeof(ULONG) == 4); +typedef unsigned char UBYTE; +typedef unsigned __int64 ULONG64; + +#define IMAGE_FILE_MACHINE_AMD64 0x8664 +#define IMAGE_DIRECTORY_ENTRY_IMPORT 1 +#define IMAGE_DIRECTORY_ENTRY_EXCEPTION 3 + +#define UWOP_PUSH_NONVOL 0 +#define UWOP_ALLOC_LARGE 1 +#define UWOP_ALLOC_SMALL 2 +#define UWOP_SET_FPREG 3 +#define UWOP_SAVE_NONVOL 4 +#define UWOP_SAVE_NONVOL_FAR 5 +#define UWOP_SAVE_XMM 6 +#define UWOP_SAVE_XMM_FAR 7 +#define UWOP_SAVE_XMM128 8 +#define UWOP_SAVE_XMM128_FAR 9 +#define UWOP_PUSH_MACHFRAME 10 + +#define REG_RAX 0 +#define REG_RCX 1 +#define REG_RDX 2 +#define REG_RBX 3 +#define REG_RSP 4 +#define REG_RBP 5 +#define REG_RSI 6 +#define REG_RDI 7 +#define REG_R8 8 +#define REG_R9 9 +#define REG_R10 10 +#define REG_R11 11 +#define REG_R12 12 +#define REG_R13 13 +#define REG_R14 14 +#define REG_R15 15 + +#define REG_XMM0 0 +#define REG_XMM1 1 +#define REG_XMM2 2 +#define REG_XMM3 3 +#define REG_XMM4 4 +#define REG_XMM5 5 +#define REG_XMM6 6 +#define REG_XMM7 7 +#define REG_XMM8 8 +#define REG_XMM9 9 +#define REG_XMM10 10 +#define REG_XMM11 11 +#define REG_XMM12 12 +#define REG_XMM13 13 +#define REG_XMM14 14 +#define REG_XMM15 15 + + +typedef struct _IMAGE_IMPORT_DESCRIPTOR +{ + union { + DWORD Characteristics; + DWORD OriginalFirstThunk; + }; + DWORD TimeDateStamp; + DWORD ForwarderChain; + DWORD Name; + DWORD FirstThunk; +} IMAGE_IMPORT_DESCRIPTOR, *PIMAGE_IMPORT_DESCRIPTOR; + +typedef struct _IMAGE_THUNK_DATA64 +{ + union { + ULONGLONG ForwarderString; + ULONGLONG Function; + ULONGLONG Ordinal; + ULONGLONG AddressOfData; + } u1; +} IMAGE_THUNK_DATA64, *PIMAGE_THUNK_DATA64; + +typedef struct _RUNTIME_FUNCTION +{ + ULONG FunctionStart; + ULONG FunctionEnd; + ULONG UnwindInfo; +} RUNTIME_FUNCTION, *PRUNTIME_FUNCTION; + +typedef union _UNWIND_CODE +{ + struct + { + UBYTE CodeOffset; + UBYTE UnwindOp:4; + UBYTE OpInfo:4; + }; + USHORT FrameOffset; +} UNWIND_CODE, *PUNWIND_CODE; + +typedef struct _UNWIND_INFO +{ + UBYTE Version:3; + UBYTE Flags:5; + UBYTE SizeOfProlog; + UBYTE CountOfCodes; + UBYTE FrameRegister:4; + UBYTE FrameOffset:4; + UNWIND_CODE UnwindCode[1]; +/* union { + OPTIONAL ULONG ExceptionHandler; + OPTIONAL ULONG FunctionEntry; + }; + OPTIONAL ULONG ExceptionData[]; +*/ +} UNWIND_INFO, *PUNWIND_INFO; + +typedef struct _C_SCOPE_TABLE_ENTRY +{ + ULONG Begin; + ULONG End; + ULONG Handler; + ULONG Target; +} C_SCOPE_TABLE_ENTRY, *PC_SCOPE_TABLE_ENTRY; + +typedef struct _C_SCOPE_TABLE +{ + ULONG NumEntries; + C_SCOPE_TABLE_ENTRY Table[1]; +} C_SCOPE_TABLE, *PC_SCOPE_TABLE; + + +typedef struct +{ + IMAGE_SECTION_HEADER *psh; + char *pName; + void *p; + ULONG idx; +} SECTION; + +typedef struct +{ + char* FilePtr; + size_t cbInFileSize; + size_t cbNewFileSize; + + /* PE data pointers */ + PIMAGE_DOS_HEADER DosHeader; + PIMAGE_FILE_HEADER FileHeader; + PIMAGE_OPTIONAL_HEADER64 OptionalHeader; + PIMAGE_SECTION_HEADER SectionHeaders; + PIMAGE_BASE_RELOCATION Relocations; + void *Symbols; + char *Strings; + ULONG64 ImageBase; + ULONG HeaderSize; + + /* Sections */ + ULONG AllSections; + ULONG UsedSections; + + SECTION eh_frame; + SECTION pdata; + SECTION xdata; + + char *AlignBuf; + + ULONG cFuncs; + ULONG cUWOP; + ULONG cScopes; + +} FILE_INFO, *PFILE_INFO; + + + +#endif // !_RSYM64_H Propchange: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 37290: Fix smaller bug in ddraw, This allow our ddraw.dll works with our demo apps in rosapps, The DDRAWILCL_SETCOOPCALLED was wrong checked if it was set or not in Internal_CreateSurface
by greatlrd＠svn.reactos.org 11 Nov '08

11 Nov '08

Author: greatlrd Date: Tue Nov 11 11:37:58 2008 New Revision: 37290 URL: http://svn.reactos.org/svn/reactos?rev=37290&view=rev Log: Fix smaller bug in ddraw, This allow our ddraw.dll works with our demo apps in rosapps, The DDRAWILCL_SETCOOPCALLED was wrong checked if it was set or not in Internal_CreateSurface Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/createsurface.c [iso-8859-1] Tue Nov 11 11:37:58 2008 @@ -39,7 +39,7 @@ DWORD count; HRESULT ret; - if(pDDraw->lpLcl->dwLocalFlags != DDRAWILCL_SETCOOPCALLED) + if ( (pDDraw->lpLcl->dwLocalFlags & DDRAWILCL_SETCOOPCALLED) != DDRAWILCL_SETCOOPCALLED) { return DDERR_NOCOOPERATIVELEVELSET; }

1 0

[janderwald] 37289: - Fix column header order - bug 3868
by janderwald＠svn.reactos.org 11 Nov '08

11 Nov '08

Author: janderwald Date: Tue Nov 11 09:31:08 2008 New Revision: 37289 URL: http://svn.reactos.org/svn/reactos?rev=37289&view=rev Log: - Fix column header order - bug 3868 Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c Modified: trunk/reactos/dll/win32/netshell/lanstatusui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lanstat… ============================================================================== --- trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lanstatusui.c [iso-8859-1] Tue Nov 11 09:31:08 2008 @@ -398,7 +398,7 @@ hDlgCtrl = GetDlgItem(hwndDlg, IDC_DETAILS); InsertColumnToListView(hDlgCtrl, IDS_PROPERTY, 0, 80); - InsertColumnToListView(hDlgCtrl, IDS_VALUE, 0, 80); + InsertColumnToListView(hDlgCtrl, IDS_VALUE, 1, 80); dwSize = 0; pCurAdapter = NULL;

1 0

[sserapion] 37288: Don't randomly comment out code. Probably fixes kdb cont command.
by sserapion＠svn.reactos.org 11 Nov '08

11 Nov '08

Author: sserapion Date: Tue Nov 11 07:52:40 2008 New Revision: 37288 URL: http://svn.reactos.org/svn/reactos?rev=37288&view=rev Log: Don't randomly comment out code. Probably fixes kdb cont command. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Tue Nov 11 07:52:40 2008 @@ -1625,7 +1625,7 @@ TrapFrame->Dr6 &= ~0x0000e00f; /* Skip the current instruction */ -// Context->Eip++; + Context->Eip++; } return ContinueType;

1 0

[sginsberg] 37287: - Clear the flag before bugchecking
by sginsberg＠svn.reactos.org 11 Nov '08

11 Nov '08

Author: sginsberg Date: Tue Nov 11 07:23:14 2008 New Revision: 37287 URL: http://svn.reactos.org/svn/reactos?rev=37287&view=rev Log: - Clear the flag before bugchecking Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Tue Nov 11 07:23:14 2008 @@ -1605,7 +1605,8 @@ /* Check if user requested a bugcheck */ if (KdbpBugCheckRequested) { - /* Bugcheck the system */ + /* Clear the flag and bugcheck the system */ + KdbpBugCheckRequested = FALSE; KeBugCheck(MANUALLY_INITIATED_CRASH); }

1 0

[mkupfer] 37286: - set selected setup type (install/repair) when selecting next property sheet - get device data (computer, display, keyboard) from txtsetup.sif - set selected devices when selecting next property sheet - fix Englisch and German device property sheet
by mkupfer＠svn.reactos.org 11 Nov '08

11 Nov '08

Author: mkupfer Date: Tue Nov 11 04:26:02 2008 New Revision: 37286 URL: http://svn.reactos.org/svn/reactos?rev=37286&view=rev Log: - set selected setup type (install/repair) when selecting next property sheet - get device data (computer, display, keyboard) from txtsetup.sif - set selected devices when selecting next property sheet - fix Englisch and German device property sheet Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Tue Nov 11 04:26:02 2008 @@ -43,11 +43,11 @@ BEGIN CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 END Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Tue Nov 11 04:26:02 2008 @@ -43,11 +43,11 @@ BEGIN CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 END Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Tue Nov 11 04:26:02 2008 @@ -26,7 +26,6 @@ */ #include <windows.h> -#include <windowsx.h> #include <commctrl.h> #include <tchar.h> #include <setupapi.h> @@ -42,7 +41,6 @@ { TCHAR LangId[9]; TCHAR LangName[128]; - LONG DefaultKBLayout; } LANG, *PLANG; typedef struct _KBLAYOUT @@ -51,6 +49,14 @@ TCHAR LayoutName[128]; TCHAR DllName[128]; } KBLAYOUT, *PKBLAYOUT; + + +// generic entries with simple 1:1 mapping +typedef struct _GENENTRY +{ + TCHAR Id[24]; + TCHAR Value[128]; +} GENENTRY, *PGENENTRY; struct { @@ -64,14 +70,23 @@ LONG SelectedLangId; // selected language (table index) LONG SelectedKBLayout; // selected keyboard layout (table index) WCHAR InstallationDirectory[MAX_PATH]; // installation directory on hdd + LONG SelectedComputer; // selected computer type (table index) + LONG SelectedDisplay; // selected display type (table index) + LONG SelectedKeyboard; // selected keyboard type (table index) BOOLEAN RepairUpdateFlag; // flag for update/repair an installed reactos // txtsetup.sif data LONG DefaultLang; // default language (table index) - LONG DefaultKBLayout; // default keyboard layout (table index) PLANG pLanguages; LONG LangCount; + LONG DefaultKBLayout; // default keyboard layout (table index) PKBLAYOUT pKbLayouts; LONG KbLayoutCount; + PGENENTRY pComputers; + LONG CompCount; + PGENENTRY pDisplays; + LONG DispCount; + PGENENTRY pKeyboards; + LONG KeybCount; } SetupData; typedef struct _IMGINFO @@ -201,9 +216,8 @@ switch (lpnm->code) { - case PSN_SETACTIVE: // Only "Finish" for closing the App - PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_FINISH); - //PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); + case PSN_SETACTIVE: + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); break; default: break; @@ -388,6 +402,10 @@ case PSN_QUERYCANCEL: SetWindowLong(hwndDlg, DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); return TRUE; + case PSN_WIZNEXT: // set the selected data + + SetupData.RepairUpdateFlag = !(SendMessage(GetDlgItem(hwndDlg, IDC_INSTALL),BM_GETCHECK,(WPARAM)0,(LPARAM)0) == BST_CHECKED); + return TRUE; default: break; } @@ -406,6 +424,9 @@ WPARAM wParam, LPARAM lParam) { + LONG i; + LRESULT tindex; + HWND hList; switch (uMsg) { case WM_INITDIALOG: @@ -425,6 +446,27 @@ (WPARAM)hTitleFont, (LPARAM)TRUE);*/ } + hList = GetDlgItem(hwndDlg, IDC_COMPUTER); + for (i=0; i< SetupData.CompCount;i++) + { + tindex = SendMessage(hList,CB_ADDSTRING,(WPARAM)0,(LPARAM)SetupData.pComputers[i].Value); + SendMessage(hList,CB_SETITEMDATA,tindex,i); + } + SendMessage(hList,CB_SETCURSEL,0,0); // set first as default + hList = GetDlgItem(hwndDlg, IDC_DISPLAY); + for (i=0; i< SetupData.DispCount;i++) + { + tindex = SendMessage(hList,CB_ADDSTRING,(WPARAM)0,(LPARAM)SetupData.pDisplays[i].Value); + SendMessage(hList,CB_SETITEMDATA,tindex,i); + } + SendMessage(hList,CB_SETCURSEL,0,0); // set first as default + hList = GetDlgItem(hwndDlg, IDC_KEYBOARD); + for (i=0; i< SetupData.KeybCount;i++) + { + tindex = SendMessage(hList,CB_ADDSTRING,(WPARAM)0,(LPARAM)SetupData.pKeyboards[i].Value); + SendMessage(hList,CB_SETITEMDATA,tindex,i); + } + SendMessage(hList,CB_SETCURSEL,0,0); // set first as default break; case WM_NOTIFY: { @@ -438,7 +480,27 @@ case PSN_QUERYCANCEL: SetWindowLong(hwndDlg, DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); return TRUE; - default: + case PSN_WIZNEXT: // set the selected data + hList =GetDlgItem(hwndDlg, IDC_COMPUTER); + tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (tindex != CB_ERR) + { + SetupData.SelectedComputer = SendMessage(hList,CB_GETITEMDATA, (WPARAM)tindex, (LPARAM)0); + } + hList =GetDlgItem(hwndDlg, IDC_DISPLAY); + tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (tindex != CB_ERR) + { + SetupData.SelectedDisplay = SendMessage(hList,CB_GETITEMDATA, (WPARAM)tindex, (LPARAM)0); + } + hList =GetDlgItem(hwndDlg, IDC_KEYBOARD); + tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (tindex != CB_ERR) + { + SetupData.SelectedKeyboard = SendMessage(hList,CB_GETITEMDATA, (WPARAM)tindex, (LPARAM)0); + } + return TRUE; + default: break; } break; @@ -632,7 +694,6 @@ //TCHAR szValue[MAX_PATH]; DWORD LineLength; LONG Count; - //HKEY hKey; GetModuleFileNameW(NULL,szPath,MAX_PATH); ch = strrchrW(szPath,L'\\'); @@ -647,7 +708,6 @@ Count = SetupGetLineCount(hTxtsetupSif, _T("Language")); if (Count > 0) { - // TODO: alloc memory for all entries and read entries SetupData.pLanguages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LANG) * Count); if (SetupData.pLanguages != NULL) { @@ -668,7 +728,6 @@ Count = SetupGetLineCount(hTxtsetupSif, _T("KeyboardLayout")); if (Count > 0) { - // TODO: alloc memory for all entries and read entries SetupData.pKbLayouts = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KBLAYOUT) * Count); if (SetupData.pKbLayouts != NULL) { @@ -707,6 +766,66 @@ SetupData.DefaultLang = Count; break; } + } + // get computers list + Count = SetupGetLineCount(hTxtsetupSif, _T("Computer")); + if (Count > 0) + { + SetupData.pComputers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GENENTRY) * Count); + if (SetupData.pComputers != NULL) + { + SetupData.CompCount = Count; + Count = 0; + if (SetupFindFirstLine(hTxtsetupSif, _T("Computer"), + NULL,&InfContext)) + do + { + SetupGetStringField(&InfContext, 0, SetupData.pComputers[Count].Id, sizeof(SetupData.pComputers[Count].Id) / sizeof(TCHAR), &LineLength); + SetupGetStringField(&InfContext, 1, SetupData.pComputers[Count].Value, sizeof(SetupData.pComputers[Count].Value) / sizeof(TCHAR), &LineLength); + ++Count; + } + while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.CompCount); + } + } + // get display list + Count = SetupGetLineCount(hTxtsetupSif, _T("Display")); + if (Count > 0) + { + SetupData.pDisplays = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GENENTRY) * Count); + if (SetupData.pDisplays != NULL) + { + SetupData.DispCount = Count; + Count = 0; + if (SetupFindFirstLine(hTxtsetupSif, _T("Display"), + NULL,&InfContext)) + do + { + SetupGetStringField(&InfContext, 0, SetupData.pDisplays[Count].Id, sizeof(SetupData.pDisplays[Count].Id) / sizeof(TCHAR), &LineLength); + SetupGetStringField(&InfContext, 1, SetupData.pDisplays[Count].Value, sizeof(SetupData.pDisplays[Count].Value) / sizeof(TCHAR), &LineLength); + ++Count; + } + while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.DispCount); + } + } + // get keyboard list + Count = SetupGetLineCount(hTxtsetupSif, _T("Keyboard")); + if (Count > 0) + { + SetupData.pKeyboards = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GENENTRY) * Count); + if (SetupData.pKeyboards != NULL) + { + SetupData.KeybCount = Count; + Count = 0; + if (SetupFindFirstLine(hTxtsetupSif, _T("Keyboard"), + NULL,&InfContext)) + do + { + SetupGetStringField(&InfContext, 0, SetupData.pKeyboards[Count].Id, sizeof(SetupData.pKeyboards[Count].Id) / sizeof(TCHAR), &LineLength); + SetupGetStringField(&InfContext, 1, SetupData.pKeyboards[Count].Value, sizeof(SetupData.pKeyboards[Count].Value) / sizeof(TCHAR), &LineLength); + ++Count; + } + while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.KeybCount); + } } SetupCloseInfFile(hTxtsetupSif); }

1 0

[dreimer] 37285: Bug 3839: Italian resources update by Paolo Devoti Bug 3851: Korean translation of Solitaire by Seungju Kim Bug 3852: Ukrainian translation update by Artem Reznikov Bug 3866: some updates for slovak and one fix typo by Mario Kacmar
by dreimer＠svn.reactos.org 11 Nov '08

11 Nov '08

Author: dreimer Date: Tue Nov 11 03:16:49 2008 New Revision: 37285 URL: http://svn.reactos.org/svn/reactos?rev=37285&view=rev Log: Bug 3839: Italian resources update by Paolo Devoti Bug 3851: Korean translation of Solitaire by Seungju Kim Bug 3852: Ukrainian translation update by Artem Reznikov Bug 3866: some updates for slovak and one fix typo by Mario Kacmar Added: trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc (with props) Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc trunk/reactos/base/applications/notepad/lang/sk-SK.rc trunk/reactos/dll/cpl/console/lang/uk-UA.rc trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc trunk/reactos/dll/win32/netshell/lang/it-IT.rc trunk/reactos/dll/win32/netshell/lang/uk-UA.rc trunk/reactos/dll/win32/setupapi/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc Added: trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc (added) +++ trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -1,0 +1,82 @@ +/* + *Korean translation of solitaire by Seungju Kim(manatails007) (www.seungjukim.com) + */ +#include "resource.h" + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + + +/* Dialogs */ + +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +CAPTION "¿É¼Ç" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Ä«µå", -1, 7, 7, 65, 40 + AUTORADIOBUTTON "ÇÑ Àå¾¿(&O)", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "¼¼ Àå¾¿(&T)", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 + + AUTOCHECKBOX "½Ã°£ º¸ÀÌ±â(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED + AUTOCHECKBOX "»óÅÂ Ç¥½ÃÁÙ(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + + DEFPUSHBUTTON "È®ÀÎ", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 101, 97, 50, 14 +END + + +IDD_CARDBACK DIALOGEX 6, 6, 221, 96 +CAPTION "Ä«µå ¹«´Ì ¼±ÅÃ" +FONT 8, "MS Shell Dlg" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT +BEGIN + CONTROL "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 50, 61 + CONTROL "", IDC_CARDBACK2, "Static", SS_NOTIFY, 58, 7, 50, 61 + CONTROL "", IDC_CARDBACK3, "Static", SS_NOTIFY, 112, 7, 50, 61 + CONTROL "", IDC_CARDBACK4, "Static", SS_NOTIFY, 166, 7, 50, 61 + DEFPUSHBUTTON "È®ÀÎ", IDOK, 104, 77, 54, 13 + PUSHBUTTON "Ãë¼Ò", IDCANCEL, 162, 77, 54, 13 +END + + +/* Strings */ + +STRINGTABLE +BEGIN + IDS_SOL_NAME "Ä«µå³îÀÌ" + IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_QUIT "ÇöÀç °ÔÀÓÀ» ³¡³¾°¡¿ä?" + IDS_SOL_WIN "ÃàÇÏÇÕ´Ï´Ù!!" +END + + +/* Menus */ + +IDR_MENU1 MENU DISCARDABLE +BEGIN + POPUP "°ÔÀÓ(&G)" + BEGIN + MENUITEM "»õ °ÔÀÓ(&D)\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + /*FIXME : is µ¦ correct?*/ + MENUITEM "µ¦(&C)...", IDM_GAME_DECK + MENUITEM "¿É¼Ç(&O)...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "Á¾·á(&E)", IDM_GAME_EXIT + END + POPUP "µµ¿ò¸»(&H)" + BEGIN + MENUITEM "¸ñÂ÷(&C)\tF1", IDM_HELP_CONTENTS + MENUITEM "Á¤º¸(&A)", IDM_HELP_ABOUT + END +END + + + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +BEGIN + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT +END Propchange: trunk/reactos/base/applications/games/solitaire/lang/ko-KR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -16,6 +16,7 @@ #include "lang/fr-FR.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" +#include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 18-09-2008 - * LAST CHANGE: 19-09-2008 + * LAST CHANGE: 05-11-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -15,7 +15,7 @@ END POPUP "Akcia" BEGIN - MENUITEM "Connect to...", ID_CONNECT, GRAYED + MENUITEM "Pripoji sa na...", ID_CONNECT, GRAYED //Connect to... MENUITEM SEPARATOR MENUITEM "Spusti", ID_START, GRAYED MENUITEM "Zastavi", ID_STOP, GRAYED @@ -25,9 +25,9 @@ MENUITEM SEPARATOR MENUITEM "Obnovi", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Create...", ID_CREATE, GRAYED - MENUITEM "Delete...", ID_DELETE, GRAYED + MENUITEM "Upravi...", ID_EDIT, GRAYED + MENUITEM "Vytvori...", ID_CREATE, GRAYED + MENUITEM "Odstráni...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Vlastnosti...", ID_PROP, GRAYED END @@ -59,8 +59,8 @@ MENUITEM SEPARATOR MENUITEM "Obnovi", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Edit...", ID_EDIT, GRAYED - MENUITEM "Delete...", ID_DELETE, GRAYED + MENUITEM "Upravi...", ID_EDIT, GRAYED + MENUITEM "Odstráni...", ID_DELETE, GRAYED MENUITEM SEPARATOR MENUITEM "Vlastnosti...", ID_PROP, GRAYED MENUITEM SEPARATOR @@ -93,21 +93,21 @@ PUSHBUTTON "Zastavi", IDC_STOP, 68, 155, 54, 15, WS_DISABLED PUSHBUTTON "Pozastavi", IDC_PAUSE , 130, 155, 54, 15, WS_DISABLED PUSHBUTTON "Pokraèova", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED - LTEXT "Service name:", IDC_STATIC, 4, 11, 53, 11 + LTEXT "Názov sluby:", IDC_STATIC, 4, 11, 53, 11 LTEXT "Display name:", IDC_STATIC, 4, 29, 53, 11 - LTEXT "Description:", IDC_STATIC, 4, 51, 53, 11 + LTEXT "Popis:", IDC_STATIC, 4, 51, 53, 11 LTEXT "Path to executable:", IDC_STATIC, 6, 73, 82, 9 LTEXT "Startup type:", IDC_STATIC, 6, 108, 53, 11 - LTEXT "Service status:", IDC_STATIC, 4, 138, 53, 11 + LTEXT "Stav sluby:", IDC_STATIC, 4, 138, 53, 11 LTEXT "", IDC_SERV_STATUS, 70, 138, 176, 11, WS_CHILD | WS_VISIBLE LTEXT "You can specify the start parameters that apply when you start the service from here.",IDC_STATIC, 6,177,240,15 LTEXT "Start parameters:", IDC_STATIC, 6, 200, 58, 11 EDITTEXT IDC_START_PARAM, 68, 199, 178, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Edit", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED + PUSHBUTTON "Upravi", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED END IDD_DLG_DEPEND DIALOGEX 6,6,253,225 -CAPTION "Dependencies" +CAPTION "Závislosti" //Dependencies FONT 8, "MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN @@ -119,7 +119,7 @@ END IDD_DLG_CREATE DIALOGEX 6,6,225,209 -CAPTION "Create a service" +CAPTION "Vytvori slubu" FONT 8, "MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN @@ -128,10 +128,10 @@ EDITTEXT IDC_CREATE_PATH, 10, 62, 210, 13, WS_CHILD | WS_VISIBLE EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE - LTEXT "*Service Name :", IDC_STATIC, 12, 12, 54, 9 + LTEXT "*Názov sluby :", IDC_STATIC, 12, 12, 54, 9 LTEXT "*Display Name :", IDC_STATIC, 12, 33, 54, 9 LTEXT "*Path to executable :", IDC_STATIC, 10, 51, 68, 9 - LTEXT "Description :", IDC_STATIC, 12, 86, 44, 9 + LTEXT "Popis :", IDC_STATIC, 12, 86, 44, 9 PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 PUSHBUTTON "Zrui", IDCANCEL, 176, 192, 46, 13 LTEXT "Additional options (click help for details)", IDC_STATIC, 10, 151, 134, 9 @@ -139,13 +139,13 @@ END IDD_DLG_DELETE DIALOGEX 6,6,185,148 -CAPTION "Delete a service" +CAPTION "Odstráni slubu" FONT 8, "MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 LTEXT "Are you sure you want to delete the following service? This cannot be undone once removed!", IDC_STATIC, 50, 6, 125, 25 - LTEXT "Service Name:",IDC_STATIC, 6, 40, 80, 9 + LTEXT "Názov sluby:",IDC_STATIC, 6, 40, 80, 9 LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY PUSHBUTTON "Áno", IDOK, 26, 129, 54, 13 @@ -181,7 +181,7 @@ IDS_SECONDCOLUMN "Popis" IDS_THIRDCOLUMN "Stav" IDS_FOURTHCOLUMN "Typ spustenia" //Spôsob spustenia - IDS_FITHCOLUMN "Log On As" //Prihlásený ako + IDS_FITHCOLUMN "Prihlásený ako" //Log On As END STRINGTABLE DISCARDABLE @@ -190,12 +190,12 @@ IDS_SERVICES_STOPPED "Zastavená" IDS_SERVICES_AUTO "Automaticky" IDS_SERVICES_MAN "Ruène" - IDS_SERVICES_DIS "Disabled" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NUM_SERVICES "Num Services: %d" + IDS_SERVICES_DIS "Zablokovaná" //Disabled +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NUM_SERVICES "Poèet sluieb: %d" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END @@ -218,8 +218,8 @@ IDS_PROGRESS_INFO_STOP "ReactOS is attempting to stop the following service" IDS_PROGRESS_INFO_PAUSE "ReactOS is attempting to pause the following service" IDS_PROGRESS_INFO_RESUME "ReactOS is attempting to resume the following service" - IDS_CREATE_SUCCESS "Service Created Succesfully" - IDS_DELETE_SUCCESS "Service Deleted Succesfully" + IDS_CREATE_SUCCESS "Sluba bola úspene vytvorená" + IDS_DELETE_SUCCESS "Sluba bola úspene odstránená" IDS_CREATE_REQ "Fields marked with an\nasterix are mandatory" IDS_DELETE_STOP "You must manually stop the service before deleting!" END Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sk-SK.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -5,7 +5,9 @@ * Proofread 1998 by David Lee Lambert <lamber45(a)egr.msu.edu> * Copyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr> * Translation: - * Copyleft 2007 Kario <kario(a)szm.sk> + * TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: xx-xx-2007 + * LAST CHANGE: 04-11-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -189,5 +191,5 @@ STRING_CRLF, "Windows" STRING_LF, "Unix" STRING_CR, "Mac" -STRING_LINE_COLUMN, "Line %d, column %d" +STRING_LINE_COLUMN, "Riadok %d, ståpec %d" END Modified: trunk/reactos/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/uk-UA… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -1,150 +1,149 @@ /* - * PROJECT: ReactOS Console Configuration DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/lang/uk-UA.rc - * PURPOSE: Ukraianian resource file for console - * TRANSLATOR: Artem Reznikov + * PROJECT: ReactOS Console Configuration DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/console/lang/en-US.rc + * PURPOSE: Ukraianian resource file + * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) + * TRANSLATOR: Artem Reznikov */ #include <commctrl.h> LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Ïàðàìåòðè" FONT 8, "MS Shell Dlg" BEGIN -GROUPBOX "Ðîçì³ð êóðñîðó", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "&äð³áíèé", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10 -CONTROL "&ñåðåäí³é", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10 -CONTROL "&âåëèêèé", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10 -GROUPBOX "Ïàðàìåòðè â³äîáðàæåííÿ", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "Â&³êíî", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 -CONTROL "&Íà âåñü åêðàí", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 -GROUPBOX "Æóðíàë êîìàíä:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -LTEXT "&Ðîçì³ð áóôåðà", -1, 25, 100, 60, 15 -EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 -LTEXT "&Ê³ëüê³ñòü áóôåð³â:", -1, 25, 120, 80, 15 -EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 -CHECKBOX "Â&³äêèäàòè ïîâòîðåííÿ", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 - - -GROUPBOX "Ïàðàìåòðè ðåäàãóâàííÿ", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP -CHECKBOX "&Øâèäêå ðåäàãóâàííÿ", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP -CHECKBOX "&Ðåæèì âñòàâëåííÿ", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Ðîçì³ð êóðñîðó", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&äð³áíèé", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 + CONTROL "&ñåðåäí³é", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 + CONTROL "&âåëèêèé", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 + GROUPBOX "Ïàðàìåòðè â³äîáðàæåííÿ", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "Â&³êíî", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 + CONTROL "&Íà âåñü åêðàí", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 + GROUPBOX "Æóðíàë êîìàíä", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Ðîçì³ð áóôåðà:", -1, 14, 101, 70, 12 + EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 97, 12, 15 + LTEXT "&Ê³ëüê³ñòü áóôåð³â:", -1, 14, 124, 70, 12 + EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 120, 12, 15 + CHECKBOX "Â&³äêèäàòè ïîâòîðåííÿ", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + GROUPBOX "Ïàðàìåòðè ðåäàãóâàííÿ", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP + CHECKBOX "&Øâèäêå ðåäàãóâàííÿ", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "&Ðåæèì âñòàâëåííÿ", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Øðèôò" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Çðàçîê â³êíà", -1, 10, 7, 65, 10 -LTEXT "Ðîçì³ð", -1, 130, 10, 30, 10 -CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 -LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL -LTEXT "&Øðèôò", -1, 10, 105, 35, 10 -CHECKBOX "&Æèðí³", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 -LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL -GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 -CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 -LTEXT "Êîæåí ñèìâîë:", -1, 130, 165, 75, 10 -LTEXT "ï³êñåë³â çàâøèðøêè\nï³êñåë³â çàââèøêè", -1, 140, 180, 65, 20 -LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 -LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 + LTEXT "Çðàçîê â³êíà", -1, 10, 10, 94, 10 + LTEXT "Size:", -1, 180, 10, 36, 10 + CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 + LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL + LTEXT "&Øðèôò:", -1, 10, 105, 33, 10 + CHECKBOX "&Æèðí³", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 + LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL + GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 + CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 + LTEXT "Êîæåí ñèìâîë:", -1, 124, 166, 75, 10 + LTEXT "ï³êñåë³â çàâøèðøêè\nï³êñåë³â çàââèøêè", -1, 136, 180, 101, 20 + LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 + LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 END -IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Ðîçêëàäêà" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Çðàçîê â³êíà", -1, 10, 7, 65, 10 -CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 -GROUPBOX "Ðîçì³ð áóôåðà åêðàíà", -1, 130, 15, 115, 40 -LTEXT "&Øèðèíà:", -1, 135, 30, 25, 10 -LTEXT "&Âèñîòà:", -1, 135, 40, 25, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Ðîçì³ð â³êíà", -1, 130, 60, 115, 40 -LTEXT "Øè&ðèíà:", -1, 135, 70, 25, 10 -LTEXT "Â&èñîòà:", -1, 135, 80, 25, 10 -EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Ïîçèö³ÿ â³êíà", -1, 130, 105, 115, 55 -LTEXT "&Çë³âà:", -1, 135, 120, 25, 10 -LTEXT "Ç&ãîðè:", -1, 135, 130, 25, 10 -EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -CHECKBOX "&Àâòîìàòè÷íèé âèá³ð", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 + LTEXT "Çðàçîê â³êíà", -1, 8, 6, 95, 10 + CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 + GROUPBOX "Ðîçì³ð áóôåðà åêðàíà", -1, 130, 12, 115, 50 + LTEXT "&Øèðèíà:", -1, 140, 28, 40, 10 + LTEXT "&Âèñîòà:", -1, 140, 46, 39, 10 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 25, 13, 14 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 42, 13, 14 + GROUPBOX "Ðîçì³ð â³êíà", -1, 130, 65, 115, 47 + LTEXT "Øè&ðèíà:", -1, 140, 78, 39, 10 + LTEXT "Â&èñîòà:", -1, 140, 95, 37, 10 + EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 75, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 92, 13, 14 + GROUPBOX "Ïîçèö³ÿ â³êíà", -1, 130, 116, 115, 64 + LTEXT "&Çë³âà:", -1, 140, 132, 38, 10 + LTEXT "Ç&ãîðè:", -1, 140, 149, 40, 10 + EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 128, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 146, 13, 14 + CHECKBOX "&Àâòîìàòè÷íèé âèá³ð", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 END -IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Êîëüîðè" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "Ò&åêñò íà åêðàí³", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 -CONTROL "&Òëî åêðàíà", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 -CONTROL "Òå&êñò ñïëèâíîãî â³êíà", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 -CONTROL "Ò&ëî ñïëèâíîãî â³êíà", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 -GROUPBOX "Çíà÷åííÿ âèáðàíèõ êîëüîð³â", -1, 120, 15, 90, 45 -LTEXT "&×åðâîíèé:", -1, 125, 25, 30, 10 -EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10 -LTEXT "&Çåëåíèé:", -1, 125, 35, 30, 10 -EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10 -LTEXT "&Ñèí³é:", -1, 125, 45, 30, 10 -EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10 -CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 15, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 27, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 39, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 51, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 63, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 99, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 111, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 123, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 135, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 147, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 159, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 -GROUPBOX "Âèáðàí³ êîëüîðè åêðàíà", -1, 10, 110, 200, 40 -CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 -GROUPBOX "Âèáðàí³ ñïëèâí³ êîëüîðè", -1, 10, 155, 200, 40 -CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 + CONTROL "Ò&åêñò íà åêðàí³", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 + CONTROL "&Òëî åêðàíà", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 + CONTROL "Òå&êñò ñïëèâíîãî â³êíà", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 + CONTROL "Ò&ëî ñïëèâíîãî â³êíà", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 + GROUPBOX "Çíà÷åííÿ âèáðàíèõ êîëüîð³â", -1, 129, 7, 118, 73 + LTEXT "&×åðâîíèé:", -1, 140, 25, 48, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 22, 12, 14 + LTEXT "&Çåëåíèé:", -1, 140, 42, 48, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 39, 12, 14 + LTEXT "&Ñèí³é:", -1, 140, 60, 48, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 56, 12, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 17, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 31, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 45, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 59, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 73, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 115, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 129, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 143, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 157, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 185, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 + GROUPBOX "Âèáðàí³ êîëüîðè åêðàíà", -1, 7, 111, 240, 40 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 + GROUPBOX "Âèáðàí³ ñïëèâí³ êîëüîðè", -1, 7, 162, 240, 40 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END -IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Çì³íà âëàñòèâîñòåé" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "&Çì³íèòè ò³ëüêè äëÿ ïîòî÷íîãî â³êíà", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10 -CONTROL "&Çáåð³ãòè äëÿ ìàéáóòí³õ â³êîí ç òàêèì ñàìèì çàãîëîâêîì", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10 -PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE -PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE + CONTROL "&Çì³íèòè ò³ëüêè äëÿ ïîòî÷íîãî â³êíà", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 + CONTROL "&Çáåð³ãòè äëÿ ìàéáóòí³õ â³êîí ç òàêèì ñàìèì çàãîëîâêîì", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 + PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE END STRINGTABLE BEGIN - IDS_CPLNAME "Êîíñîëü" - IDS_CPLDESCRIPTION "Íàñòðîþâàííÿ âëàñòèâîñòåé êîíñîë³." - IDS_APPLY_SHORTCUT_ALL "Çì³íà &ÿðëèêà, ÿêèé çàïóñòèâ öå â³êíî" - IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" - IDS_RASTERFONTS "Ðàñòðîâ³ øðèôòè" + IDS_CPLNAME "Êîíñîëü" + IDS_CPLDESCRIPTION "Íàñòðîþâàííÿ âëàñòèâîñòåé êîíñîë³." + IDS_APPLY_SHORTCUT_ALL "Çì³íà &ÿðëèêà, ÿêèé çàïóñòèâ öå â³êíî" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + IDS_RASTERFONTS "Ðàñòðîâ³ øðèôòè" END Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -1,5 +1,6 @@ -/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR: 01-03-2008 +/* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR.: 01-03-2008 + * LAST CHANGE: 05-11-2008 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -64,9 +65,9 @@ LTEXT "Shift", -1, 74, 87, 27, 12 CTEXT "+", -1, 63, 87, 8, 9 AUTORADIOBUTTON "C&trl", IDC_CTRL_LAYOUT, 30, 81, 30, 11 - AUTORADIOBUTTON "Left A&LT", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 + AUTORADIOBUTTON "¼avý A&LT", IDC_LEFT_ALT_LAYOUT, 30, 95, 44, 12 DEFPUSHBUTTON "OK", IDOK, 172, 9, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 172, 27, 50, 14 + PUSHBUTTON "Zrui", IDCANCEL, 172, 27, 50, 14 END IDD_INPUT_LANG_PROP DIALOGEX 20, 20, 227, 75 @@ -87,77 +88,77 @@ IDS_CPLSYSTEMNAME "Textové sluby a vstupné jazyky" IDS_CPLSYSTEMDESCRIPTION "Customizes settings for text input of languages." IDS_KEYBOARD "Klávesnica" - IDS_NONE "(None)" - IDS_UNKNOWN "(Unknown)" + IDS_NONE "(Nie je)" + IDS_UNKNOWN "(Neznáme)" IDS_RESTART "Do you want to restart your computer now?" IDS_WHATS_THIS "Èo je toto?" IDS_LANGUAGE "Jazyk" IDS_LAYOUT "Rozloenie klávesnice" IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" - IDS_CONFIRMATION "Confirmation" + IDS_CONFIRMATION "Potvrdenie" //Confirmation IDS_LAYOUT_EXISTS "This layout already exists." IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." IDS_CTRL_SHIFT "Ctrl+Shift" - IDS_LEFT_ALT_SHIFT "Left Alt+Shift" + IDS_LEFT_ALT_SHIFT "¼avý Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" END STRINGTABLE BEGIN - IDS_US_LAYOUT, "US" + IDS_US_LAYOUT, "Americké" IDS_BELGIAN_LAYOUT, "Belgian (Period)" IDS_BELGIAN_FRENCH_LAYOUT, "Belgian French" - IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portuguese (Brazilian ABNT)" + IDS_PORTUGUESE_BRAZILIAN_ABNT_LAYOUT, "Portugalské (brazílske 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_GERMAN_LAYOUT, "Nemecké" + IDS_GERMAN_IBM_LAYOUT, "Nemecké (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_ITALIAN_LAYOUT, "Talianske" + IDS_ITALIAN_142_LAYOUT, "Talianske (142)" + IDS_LATIN_AMERICAN_LAYOUT, "Latinskoamerické" IDS_NORWEGIAN_LAYOUT, "Norwegian" - IDS_PORTUGUESE_LAYOUT, "Portuguese" + IDS_PORTUGUESE_LAYOUT, "Portugalské" 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_SWISS_GERMAN_LAYOUT, "Swiss Nemecké" 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_CZECH_LAYOUT, "Èeské" + IDS_CZECH_QWERTY_LAYOUT, "Èeské (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_POLISH_LAYOUT, "Po¾ské (programátorské)" + IDS_POLISH_214_LAYOUT, "Po¾ské (214)" IDS_ROMANIAN_LAYOUT, "Romanian" - IDS_SERBIAN_LATIN_LAYOUT, "Serbian (Latin)" - IDS_SLOVAK_LAYOUT, "Slovak" - IDS_SLOVAK_QWERTY_LAYOUT, "Slovak (QWERTY)" + IDS_SERBIAN_LATIN_LAYOUT, "Serbian (latinka)" + IDS_SLOVAK_LAYOUT, "Slovenské" + IDS_SLOVAK_QWERTY_LAYOUT, "Slovenské (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_GREEK_LAYOUT, "Grécke" + IDS_GREEK_LATIN_LAYOUT, "Grécke latinka" + IDS_GREEK_220_LAYOUT, "Grécke (220)" + IDS_GREEK_319_LAYOUT, "Grécke (319)" + IDS_GREEK_220_LATIN_LAYOUT, "Grécke (220 latinka)" + IDS_GREEK_319_LATIN_LAYOUT, "Grécke (319 latinka)" IDS_BELARUSIAN_LAYOUT, "Belarusian" IDS_BULGARIAN_LAYOUT, "Bulgarian" - IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (Latin)" + IDS_BULGARIAN_LATIN_LAYOUT, "Bulgarian (latinka)" IDS_RUSSIAN_LAYOUT, "Russian" IDS_RUSSIAN_TYPEWRITER_LAYOUT, "Russian (Typewriter)" IDS_SERBIAN_CYRILLIC_LAYOUT, "Serbian (Cyrillic)" @@ -168,33 +169,33 @@ 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_CHINESE_TRADITIONAL_USKEYBOARD_LAYOUT, "Èínske (Traditional) - US Keyboard" + IDS_CHINESE_TRADITIONAL_PHONETIC_LAYOUT, "Èínske (Traditional) - Phonetic" + IDS_CHINESE_TRADITIONAL_CHANGJIE_LAYOUT, "Èínske (Traditional) - ChangJie" + IDS_CHINESE_TRADITIONAL_BIG5CODE_LAYOUT, "Èínske (Traditional) - Big5 Code" + IDS_CHINESE_TRADITIONAL_DAYI_LAYOUT, "Èínske (Traditional) - DaYi" + IDS_CHINESE_TRADITIONAL_UNICODE_LAYOUT, "Èínske (Traditional) - Unicode" + IDS_CHINESE_TRADITIONAL_ALPHANUMERIC_LAYOUT, "Èínske (Traditional) - Alphanumeric" + IDS_CHINESE_SIMPLIFIED_USKEYBOARD_LAYOUT, "Èínske (Simplified) - US Keyboard" + IDS_CHINESE_SIMPLIFIED_QUANPIN_LAYOUT, "Èínske (Simplified) - QuanPin" + IDS_CHINESE_SIMPLIFIED_SHUANGPIN_LAYOUT, "Èínske (Simplified) - ShuangPin" + IDS_CHINESE_SIMPLIFIED_ZHENGMA_LAYOUT, "Èínske (Simplified) - ZhengMa" + IDS_CHINESE_SIMPLIFIED_NEIMA_LAYOUT, "Èínske (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_ARABIC_101_LAYOUT, "Arabské (101)" + IDS_ARABIC_102_LAYOUT, "Arabské (102)" + IDS_ARABIC_102_AZERTY_LAYOUT, "Arabské (102 AZERTY)" + IDS_CZECH_PROGRAMMERS_LAYOUT, "Èeské programátorské" 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_CHINESE_TRADITIONAL_NEWPHONETIC_LAYOUT, "Èínske (Traditional) - New Phonetic" + IDS_CHINESE_SIMPLIFIED_MSPINYINIME30_LAYOUT, "Èínske (Simplified) - Microsoft Pinyin IME 3.0" IDS_UNITED_STATES_DVIRAK_LAYOUT, "United States-Dvorak" - IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Chinese (Traditional) - New ChangJie" + IDS_CHINESE_TRADITIONAL_NEWCHANGJIE_LAYOUT, "Èínske (Traditional) - New ChangJie" IDS_ASSAMESE_LAYOUT, "Assamese" IDS_BENGALI_LAYOUT, "Bengali" IDS_DEVANAGARI_INSCRIPT_LAYOUT, "Devanagari - INSCRIPT" @@ -211,22 +212,22 @@ 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_CHINESE_TRADITIONAL_QUICK_LAYOUT, "Èínske (Traditional) - Quick" + IDS_CHINESE_TRADITIONAL_ARRAY_LAYOUT, "Èínske (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_AZERI_LATIN_LAYOUT, "Azeri Latin" //latinka ? 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_GREEK_POLYTONIC_LAYOUT, "Grécke Polytonic" + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" //Arabské IDS_FARSI_LAYOUT, "Farsi" IDS_GAELIC_LAYOUT, "Gaelic" - IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portuguese (Brazilian ABNT2)" + IDS_PORTUGUESE_BRAZIL_ABNT2_LAYOUT, "Portugalské (brazílske ABNT2)" IDS_MONGOLIAN_CYRILLIC_LAYOUT, "Mongolian Cyrillic" IDS_KYRGYZ_CYRILLIC_LAYOUT, "Kyrgyz Cyrillic" IDS_URDU_LAYOUT, "Urdu" @@ -236,10 +237,10 @@ IDS_DIVEHI_TYPEWRITER_LAYOUT, "Divehi Typewriter" IDS_BULGARIAN_PHONETIC_CLASSIC_LAYOUT, "Bulgarian Phonetic (Classic)" IDS_BULGARIAN_PHONETIC_BDS_LAYOUT, "Bulgarian Phonetic (BDS)" - IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" - IDS_GERMAN_RISTOME_LAYOUT, "German (RISTOME)" - IDS_GERMAN_NEO_11_LAYOUT, "German (NEO-1.1)" - IDS_GERMAN_DE_ERGO_LAYOUT, "German (de_ergo)" - IDS_BURMESE_LAYOUT, "Burmese" - IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" -END + IDS_BULGARIAN_BDS_LAYOUT, "Bulgarian BDS 5237-1978" + IDS_GERMAN_RISTOME_LAYOUT, "Nemecké (RISTOME)" + IDS_GERMAN_NEO_11_LAYOUT, "Nemecké (NEO-1.1)" + IDS_GERMAN_DE_ERGO_LAYOUT, "Nemecké (de_ergo)" + IDS_BURMESE_LAYOUT, "Burmese" + IDS_UKRAINIAN_STUDENT_LAYOUT, "Ukrainian (Student)" +END Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -197,7 +197,7 @@ CONST RECT *prc, UINT flags) { - /* FIXME add check for vaildate the flags */ + /* FIXME add check for validate the flags */ return NtGdiSetBoundsRect(hdc, (LPRECT)prc, flags); } Modified: trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -27,43 +27,43 @@ IDD_TCPIP_ALTCF_DLG DIALOGEX DISCARDABLE 0, 0, 246, 228 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Alternate Configuration" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "If this computer is used on more than one network, enter the alternate IP settings below", -1, 9, 9, 220, 20 - CONTROL "Au&tomatic private IP address", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 +CAPTION "Configurazione alternativa" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Se questo computer viene utilizzato in più di una rete indicare di seguito le configurazioni di rete alternative", -1, 9, 9, 220, 20 + CONTROL "Indirizzo IP privato &automatico", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX - CONTROL "U&ser configured", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 - LTEXT "&IP address:", -1, 14, 75, 135, 8 + CONTROL "Configurato dall'&utente", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + LTEXT "&Indirizzo IP:", -1, 14, 75, 135, 8 CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 150, 75, 80, 12 LTEXT "S&ubnet mask:", -1, 14, 95, 135, 8 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32",WS_TABSTOP, 150, 95, 80, 12 LTEXT "&Default gateway:", -1, 14, 115, 135, 8 CONTROL "",IDC_DEFGATEWAY,"SysIPAddress32",WS_TABSTOP, 150, 115, 80, 12 - LTEXT "&Preferred DNS server:", -1, 14, 150, 135, 8 + LTEXT "&DNS server preferenziale:", -1, 14, 150, 135, 8 CONTROL "",IDC_DNS1,"SysIPAddress32",WS_TABSTOP, 150, 150, 80, 12 - LTEXT "&Alternate DNS server:", -1, 14, 165, 180, 8 + LTEXT "DNS server alternativo:", -1, 14, 165, 180, 8 CONTROL "",IDC_DNS2,"SysIPAddress32",WS_TABSTOP, 150, 165, 80, 12 END IDD_TCPIP_ADVIP_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "IP Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 +CAPTION "Impostazioni IP" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Indirizzo IP", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 - PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Aggiungi...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Modifica...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Rimuovi", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP GROUPBOX "Default gateways:", -1, 5, 100, 240, 90 CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 - PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Aggiungi...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Modifica...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Rimuovi", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP GROUPBOX "", -1, 5, 200, 240, 30 - CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Interface metric:", -1, 15, 215, 90, 12 + CHECKBOX "Metriche automatiche", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Metriche sull'interfaccia:", -1, 15, 215, 90, 12 EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER END @@ -73,66 +73,66 @@ FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY - LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 - PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP - PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "&Add...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP - PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP - PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP - LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24 - CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 + LTEXT "Indirizzi D&NS server in ordine di utilizzo:", -1, 5, 5, 180, 12 + PUSHBUTTON "&Su", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "&Giù", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "&Aggiungi...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&Modifica...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&Rimuovi", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP + LTEXT "Le tre impostazioni seguenti sono applicate a tutte le connessioni dotate di TCP/IP abilitato. Per la risoluzione di nomi non qualificati:", -1, 5, 90, 220, 24 + CONTROL "Aggiungere suffissi DNS principali e specifici della connessione", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 + CONTROL "Aggiungere questi suffissi DNS(in ordine):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY - PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP - LTEXT "DNS &suffix for this connection:", -1, 5, 225, 110, 14 + PUSHBUTTON "Su", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Giù", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "&Aggiungi...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "&Modifica...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "Rimuovi", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP + LTEXT "Suffisso DNS per questa connessione:", -1, 5, 225, 110, 14 EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP - CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Registrare nel DNS gli indirizzi di questa connessione", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Usare i suffissi DNS di questa connessione nella registrazione DNS", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Options" +CAPTION "Opzioni" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OPTLIST, 5, 30, 230, 70 - LTEXT "&Optional settings", -1, 5, 15, 130, 12 - PUSHBUTTON "&Properties", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP - GROUPBOX "Description:", -1, 5, 120, 240, 70 + LTEXT "&Impostazioni opzionali", -1, 5, 15, 130, 12 + PUSHBUTTON "&Proprietà", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP + GROUPBOX "Descrizione:", -1, 5, 120, 240, 70 LTEXT "", IDC_OPTDESC, 15, 130, 220, 33 END IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE 0, 0, 200, 70 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Address" +CAPTION "Indirizzo TCP/IP" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "IP address:", -1, 5, 15, 70, 12 + LTEXT "Indirizzo IP:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Gateway Address" +CAPTION "Indirizzo TCP/IP Gateway" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 LTEXT "Gateway:", -1, 5, 15, 70, 12 - CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + CHECKBOX "Metriche automatiche", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&Metrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 @@ -143,7 +143,7 @@ CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 @@ -152,78 +152,78 @@ FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP - LTEXT "Domain suffix:", -1, 5, 10, 120, 12 + LTEXT "Suffisso del domain:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Filtering" -FONT 8, "MS Shell Dlg" -BEGIN - CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CAPTION "TCP/IP Filtri" +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "Abilita i filtri TCP/IP (Tutti gli adattatori)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "", -1, 5, 30, 90, 150 - CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 - CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 + CONTROL "Permetti tutto", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 + CONTROL "Permetti solo", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 - PUSHBUTTON "Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Aggiungi", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Rimuovi", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 105, 30, 90, 150 - CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 - CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 + CONTROL "Permetti tutto", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 + CONTROL "Permetti solo", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 - PUSHBUTTON "Add", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Aggiungi", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Rimuovi", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 205, 30, 90, 150 - CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 - CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 + CONTROL "Permetti tutto", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 + CONTROL "Permetti solo", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 - PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Aggiungi", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Rimuovi", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE 0, 0, 200, 60 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Add Filter" +CAPTION "Aggiungi filtro" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END STRINGTABLE BEGIN - IDS_NET_CONNECT "Network connection" - IDS_NO_IPADDR_SET "The adapter requires at least one IP address. Please enter one." - IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." - IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer." - IDS_TCPFILTER "TCP/IP Filtering" - IDS_IPADDR "IP address" + IDS_NET_CONNECT "Connessioni di rete" + IDS_NO_IPADDR_SET "L'adattatore richiede almeno un indirizzo IP. Indicarne uno." + IDS_NO_SUBMASK_SET "Avete indicato un indirizzo IP senza subnet mask. Indicare la subnet mask." + IDS_TCPFILTERDESC "I filtri TCP/IP permettono di controllare il tipo di traffico di rete che raggiunge il vostro computer." + IDS_TCPFILTER "Filtri TCP/IP" + IDS_IPADDR "Indirizzo IP" IDS_SUBMASK "Subnet mask" IDS_GATEWAY "Gateway" - IDS_METRIC "Metric" - IDS_DHCPACTIVE "DHCP Enabled" - IDS_AUTOMATIC "Automatic" - IDS_NOITEMSEL "You have not selected an item. Select one first." + IDS_METRIC "Metrica" + IDS_DHCPACTIVE "DHCP abilitato" + IDS_AUTOMATIC "Automatico" + IDS_NOITEMSEL "Nessun elemento selezionato. Sceglierne uno." IDS_TCPIP "ReactOS-TCP/IP" - IDS_ADD "Add" + IDS_ADD "Aggiungi" IDS_MOD "OK" - IDS_TCP_PORTS "TCP Ports" - IDS_UDP_PORTS "UDP Ports" - IDS_IP_PROTO "IP protocols" - IDS_PORT_RANGE "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range." - IDS_PROT_RANGE "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range." - IDS_DUP_NUMBER "The number you are trying to add is already in the list. Please enter a different number." - IDS_DISABLE_FILTER "Disabling this global TCP/IP setting will affect all adapters." - IDS_NO_SUFFIX "The current setting of search method requires at least one DNS suffix. Please enter one or change the setting." - IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." - IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." - IDS_DUP_SUFFIX "The DNS suffix is already on the list." - IDS_DUP_IPADDR "The IP address is already on the list." - IDS_DUP_GW "The default gateway is already on the list." -END + IDS_TCP_PORTS "TCP Porte" + IDS_UDP_PORTS "UDP Porte" + IDS_IP_PROTO "IP protocolli" + IDS_PORT_RANGE "I numeri di porta devono essere maggiori di zero e minori di 65536. Indicare un numero valido." + IDS_PROT_RANGE "I numeri di protocollo devono essere maggiori di zero e minori di 256. Indicare un numero valido." + IDS_DUP_NUMBER "State aggiungendo un numero già presente nella lista. Indicarne uno diverso." + IDS_DISABLE_FILTER "La disabilitazione di questa impostazione globale di TCP/IP influenzerà tutti gli adattatori." + IDS_NO_SUFFIX "L'impostazione attuale del metodo di ricerca necessita almeno un suffisso DNS. Indicarne uno o modificare l'impostazione." + IDS_DOMAIN_SUFFIX "Il suffisso di Dominio non è un suffisso valido." + IDS_DNS_SUFFIX "Il nome di dominio DNS ""%s"" non è nome di DNS valido." + IDS_DUP_SUFFIX "Il suffisso è già nella lista." + IDS_DUP_IPADDR "L'indirizzo IP è già nella lista." + IDS_DUP_GW "Il default gateway è già nella lista." +END Modified: trunk/reactos/dll/win32/netshell/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/it… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/it-IT.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -84,17 +84,17 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" + IDS_PHYSICAL_ADDRESS "Indirizzo fisico" + IDS_IP_ADDRESS "Indirizzo IP" IDS_SUBNET_MASK "Subnet Mask" IDS_DEF_GATEWAY "Default Gateway" IDS_DHCP_SERVER "DHCP Server" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" + IDS_LEASE_OBTAINED "Indirizzo ottenuto" + IDS_LEASE_EXPIRES "Indirizzo con scadenza" IDS_DNS_SERVERS "DNS Servers" IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" + IDS_PROPERTY "Proprietà" + IDS_VALUE "Valore" IDS_NETWORKCONNECTION "Connessione di rete" IDS_SHV_COLUMN_NAME "Nome" IDS_SHV_COLUMN_TYPE "Tipo" @@ -122,8 +122,8 @@ IDS_FORMAT_KBIT "%u KBit/s" IDS_FORMAT_MBIT "%u MBit/s" IDS_FORMAT_GBIT "%u GBit/s" - IDS_DURATION_DAY "%d Day %s" - IDS_DURATION_DAYS "%d Days %s" + IDS_DURATION_DAY "%d Giorno %s" + IDS_DURATION_DAYS "%d Giorni %s" IDS_ASSIGNED_DHCP "Assegnato da DHCP" IDS_ASSIGNED_MANUAL "Configurato manualmente" END Modified: trunk/reactos/dll/win32/netshell/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/uk-UA.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -1,32 +1,41 @@ +/* + * PROJECT: Network Connections Shell Folder + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/netshell/lang/uk-UA.rc + * PURPOSE: Ukraianian Language File for netshell + * TRANSLATOR: Artem Reznikov + */ + LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 228 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +IDD_NETPROPERTIES DIALOGEX DISCARDABLE 0, 0, 246, 246 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Çàãàëüí³" FONT 8, "MS Shell Dlg" BEGIN + CONTROL "", IDC_COMPONENTSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 9, 71, 230, 55 LTEXT "Ï³äêëþ÷åííÿ ÷åðåç:", -1, 9,9,217,8 - EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_DISABLED | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_NETCARDNAME, 9, 21, 230, 12, WS_BORDER | WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Íàëàøòóâàòè", IDC_CONFIGURE, 189, 38, 50, 14 LTEXT "Â³äì³÷åí³ êîìïîíåíòè âèêîðèñòîâóþòüñÿ öèì ï³äêëþ÷åííÿì:", -1, 9, 59, 217, 8 - LISTBOX IDC_COMPONENTSLIST, 9, 71, 230, 55, LBS_NOTIFY | WS_VSCROLL | WS_BORDER | LBS_NOINTEGRALHEIGHT PUSHBUTTON "Âñò&àíîâèòè", IDC_INSTALL, 9, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "Â&èäàëèòè", IDC_UNINSTALL, 90, 130, 65, 14, WS_DISABLED | WS_TABSTOP PUSHBUTTON "&Âëàñòèâîñò³", IDC_PROPERTIES, 174, 130, 65, 14 GROUPBOX "Îïèñ", -1, 9, 153, 230, 46, BS_GROUPBOX LTEXT "Îïèñ êîìïîíåíò³â...", IDC_DESCRIPTION, 15, 165, 217, 28, WS_GROUP - CHECKBOX "Âèâåñòè çíà÷îê ï³äêëþ÷åííÿ íà ïàíåëü çàâäàíü", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP + CHECKBOX "Âèâåñòè çíà÷îê ï³äêëþ÷åííÿ íà ïàíåëü çàâäàíü", IDC_SHOWTASKBAR, 9, 206, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "Ñïîâ³ùàòè, ÿêùî äîñÿæí³ñòü öüîãî ï³äêëþ÷åííÿ îáìåæåíà àáî íóëüîâà", IDC_NOTIFYNOCONNECTION, 9, 220, 230, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Properties" +CAPTION "Allgemein" FONT 8, "MS Shell Dlg" BEGIN END IDD_LAN_NETSTATUS DIALOGEX DISCARDABLE 0, 0, 200,180 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Çàãàëüí³" FONT 8, "MS Shell Dlg" BEGIN @@ -36,15 +45,12 @@ LTEXT "Øâèäê³ñòü:", -1, 19, 48, 60, 8 GROUPBOX "Àêòèâí³ñòü", -1, 9, 74, 182, 70, BS_GROUPBOX 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 + ICON IDI_NETSTAT, -1, 110, 85, 32, 32 LTEXT "Îòðèìàíî", -1, 149, 90, 37, 8 - LTEXT "Bytes:", -1, 17, 115, 32, 8 + LTEXT "Áàéò³â:", -1, 17, 115, 32, 8 RTEXT "000.000.000", IDC_SEND, 63, 115, 44, 8 - ICON IDI_NETSTAT, -1, 110, 85, 32, 32 RTEXT "000.000.000", IDC_RECEIVED, 139, 115, 44, 8 - PUSHBUTTON "Âëàñ&òèâîñò³", IDC_PROPERTIES, 10, 150, 50, 14 + PUSHBUTTON "Âëàñ&òèâîñò³", IDC_STATUS_PROPERTIES, 10, 150, 50, 14 PUSHBUTTON "Âè&ìêíóòè", IDC_ENDISABLE, 66, 150, 50, 14 RTEXT "",IDC_STATUS,83,20,98,8 RTEXT "",IDC_DURATION,83,34,98,8 @@ -72,56 +78,57 @@ IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Network Connection Details" +CAPTION "Â³äîìîñò³ ïðî ìåðåæíå ï³äêëþ÷åííÿ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + LTEXT "&Â³äîìîñò³ ïðî ìåðåæíå ï³äêëþ÷åííÿ:", -1, 15, 9, 170, 12 CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + PUSHBUTTON "&Çàêðèòè", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN - IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" - IDS_SUBNET_MASK "Subnet Mask" - IDS_DEF_GATEWAY "Default Gateway" - IDS_DHCP_SERVER "DHCP Server" - IDS_LEASE_OBTAINED "Lease Obtained" - IDS_LEASE_EXPIRES "Lease Expires" - IDS_DNS_SERVERS "DNS Servers" - IDS_WINS_SERVERS "WINS Servers" - IDS_PROPERTY "Property" - IDS_VALUE "Value" - IDS_NETWORKCONNECTION "Network Connection" - IDS_SHV_COLUMN_NAME "Name" - IDS_SHV_COLUMN_TYPE "Type" - IDS_SHV_COLUMN_STATE "Status" - IDS_SHV_COLUMN_DEVNAME "Device Name" - IDS_SHV_COLUMN_PHONE "Phone # or Host Address" - IDS_SHV_COLUMN_OWNER "Owner" - IDS_TYPE_ETHERNET "LAN or High-Speed Internet" - IDS_STATUS_NON_OPERATIONAL "Disabled" - IDS_STATUS_UNREACHABLE "Not Connected" - IDS_STATUS_DISCONNECTED "Network cable unplugged" - IDS_STATUS_CONNECTING "Acquiring network address" - IDS_STATUS_CONNECTED "Connected" - IDS_STATUS_OPERATIONAL "Connected" + IDS_PHYSICAL_ADDRESS "Ô³çè÷íà àäðåñà" + IDS_IP_ADDRESS "IP-àäðåñà" + IDS_SUBNET_MASK "Ìàñêà ï³äìåðåæ³" + IDS_DEF_GATEWAY "Îñíîâíèé øëþç" + IDS_DHCP_SERVER "DHCP-ñåðâåð" + IDS_LEASE_OBTAINED "Îðåíäó îòðèìàíî" + IDS_LEASE_EXPIRES "Îðåíäà çàê³í÷óºòüñÿ" + IDS_DNS_SERVERS "DNS-ñåðâåðè" + IDS_WINS_SERVERS "WINS-ñåðâåðè" + IDS_PROPERTY "Âëàñòèâ³ñòü" + IDS_VALUE "Çíà÷åííÿ" + IDS_NETWORKCONNECTION "Ìåðåæíå ï³äêëþ÷åííÿ" + IDS_SHV_COLUMN_NAME "²ì'ÿ" + IDS_SHV_COLUMN_TYPE "Òèï" + IDS_SHV_COLUMN_STATE "Ñòàí" + IDS_SHV_COLUMN_DEVNAME "²ì'ÿ ïðèñòðîþ" + IDS_SHV_COLUMN_PHONE "Íîìåð òåëåôîíó àáî àäðåñà âóçëà" + IDS_SHV_COLUMN_OWNER "Âëàñíèê" + IDS_TYPE_ETHERNET "ËÎÌ àáî âèñîêîøâèäê³ñíèé ²íòåðíåò" + IDS_STATUS_NON_OPERATIONAL "Âèìêíóòî" + IDS_STATUS_UNREACHABLE "Íå ï³äêëþ÷åíî" + IDS_STATUS_DISCONNECTED "Ìåðåæíèé êàáåëü íå ï³äêëþ÷åíî" + IDS_STATUS_CONNECTING "Îòðèìàííÿ ìåðåæíî¿ àäðåñè" + IDS_STATUS_CONNECTED "Ï³äêëþ÷åíî" + IDS_STATUS_OPERATIONAL "Ï³äêëþ÷åíî" - IDS_NET_ACTIVATE "Enable" - IDS_NET_DEACTIVATE "Disable" - IDS_NET_STATUS "Status" - IDS_NET_REPAIR "Repair" - IDS_NET_CREATELINK "Create Shortcut" - IDS_NET_DELETE "Delete" - IDS_NET_PROPERTIES "Properties" + IDS_NET_ACTIVATE "Óâ³ìêíóòè" + IDS_NET_DEACTIVATE "Âèìêíóòè" + IDS_NET_STATUS "Ñòàí" + IDS_NET_REPAIR "Âèïðàâèòè" + IDS_NET_CREATELINK "Ñòâîðèòè ÿðëèê" + IDS_NET_DELETE "Âèäàëèòè" + IDS_NET_PROPERTIES "Âëàñòèâîñò³" - IDS_FORMAT_BIT "%u Bit/s" - IDS_FORMAT_KBIT "%u KBit/s" - IDS_FORMAT_MBIT "%u MBit/s" - IDS_FORMAT_GBIT "%u GBit/s" - IDS_DURATION_DAY "%d Day %s" - IDS_DURATION_DAYS "%d Days %s" + IDS_FORMAT_BIT "%u á³ò/ñ" + IDS_FORMAT_KBIT "%u Êá³ò/ñ" + IDS_FORMAT_MBIT "%u Ìá³ò/ñ" + IDS_FORMAT_GBIT "%u Ãá³ò/ñ" + IDS_DURATION_DAY "%d Äåíü %s" + IDS_DURATION_DAYS "%d Äí³â %s" IDS_ASSIGNED_DHCP "Íàäàíî DHCP" IDS_ASSIGNED_MANUAL "Íàëàøòîâàíî âðó÷íó" END + Modified: trunk/reactos/dll/win32/setupapi/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/setupapi/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/lang/uk-UA.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -1,7 +1,7 @@ /* * PROJECT: Setup API * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/setupapi/Uk.rc + * FILE: dll/win32/setupapi/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for setupapi * TRANSLATOR: Artem Reznikov */ @@ -25,5 +25,5 @@ BEGIN IDS_QUERY_REBOOT_TEXT "Äëÿ çàê³í÷åííÿ óñòàíîâêè íåîáõ³äíî ïåðåçàïóñòèòè Âàø êîìï'þòåð. Ïðîäîâæèòè?" IDS_QUERY_REBOOT_CAPTION "Ïåðåçàïóñòèòè" - IDS_INF_FILE "Setup Information" + IDS_INF_FILE "Â³äîìîñò³ äëÿ óñòàíîâêè" END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -1,6 +1,6 @@ /* * Copyright 2004 Ilya Korniyko - * 2007 Artem Reznikov + * 2007-2008 Artem Reznikov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -606,17 +606,17 @@ IDS_SHV_COLUMN9 "Ïðèì³òêà" IDS_SHV_COLUMN10 "Âëàñíèê" IDS_SHV_COLUMN11 "Ãðóïà" - IDS_SHV_COLUMN12 "Filename" - IDS_SHV_COLUMN13 "Category" + IDS_SHV_COLUMN12 "²ì'ÿ ôàéëà" + IDS_SHV_COLUMN13 "Êàòåãîð³ÿ" IDS_SHV_COLUMN_DELFROM "Âèõ³äíå ðîçòàøóâàííÿ" IDS_SHV_COLUMN_DELDATE "Äàòà âèäàëåííÿ" - IDS_SHV_COLUMN_FONTTYPE "Fonttype" - IDS_SHV_COLUMN_WORKGROUP "Workgroup" - IDS_SHV_NETWORKLOCATION "Network Location" - IDS_SHV_COLUMN_DOCUMENTS "Documents" - IDS_SHV_COLUMN_STATUS "Status" - IDS_SHV_COLUMN_COMMENTS "Comments" - IDS_SHV_COLUMN_LOCATION "Location" + IDS_SHV_COLUMN_FONTTYPE "Òèï øðèôòó" + IDS_SHV_COLUMN_WORKGROUP "Ðîáî÷à ãðóïà" + IDS_SHV_NETWORKLOCATION "Ìåðåæíå ðîçòàøóâàííÿ" + IDS_SHV_COLUMN_DOCUMENTS "Äîêóìåíòè" + IDS_SHV_COLUMN_STATUS "Ñòàí" + IDS_SHV_COLUMN_COMMENTS "Ïðèì³òêè" + IDS_SHV_COLUMN_LOCATION "Ðîçòàøóâàííÿ" IDS_SHV_COLUMN_MODEL "Model" /* special folders */ @@ -624,7 +624,7 @@ IDS_MYCOMPUTER "Ì³é Êîìï'þòåð" IDS_RECYCLEBIN_FOLDER_NAME "Êîøèê" IDS_CONTROLPANEL "Ïàíåëü êåðóâàííÿ" - IDS_ADMINISTRATIVETOOLS "Administrative Tools" + IDS_ADMINISTRATIVETOOLS "Àäì³í³ñòðóâàííÿ" /* context menus */ IDS_VIEW_LARGE "&Âåëèê³ çíà÷êè" @@ -638,10 +638,10 @@ IDS_DELETE "Â&èäàëèòè" IDS_PROPERTIES "Â&ëàñòèâîñò³" IDS_CUT "&Âèð³çàòè" - IDS_RESTORE "Restore" - IDS_FORMATDRIVE "Format..." - IDS_RENAME "Rename" - IDS_INSERT "Insert" + IDS_RESTORE "Â³äíîâèòè" + IDS_FORMATDRIVE "Ôîðìàòóâàòè..." + IDS_RENAME "Ïåðåéìåíóâàòè" + IDS_INSERT "Âñòàâèòè" IDS_CREATEFOLDER_DENIED "Íå âäàëîñÿ ñòâîðèòè íîâó ïàïêó: Â³äìîâà ó äîñòóï³." IDS_CREATEFOLDER_CAPTION "Ïîìèëêà ïðè ñòâîðåíí³ íîâî¿ ïàïêè" @@ -735,18 +735,18 @@ IDS_LNK_FILE "ßðëèê" IDS_SYS_FILE "Ñèñòåìíèé ôàéë" - IDS_OPEN_VERB "Open" - IDS_RUNAS_VERB "Run as " - IDS_EDIT_VERB "Edit" - IDS_FIND_VERB "Find" - IDS_PRINT_VERB "Print" - IDS_PLAY_VERB "Play" - IDS_PREVIEW_VERB "Preview" - - IDS_FILE_FOLDER "%u Files, %u Folders" - IDS_PRINTERS "Printers" - IDS_FONTS "Fonts" - IDS_INSTALLNEWFONT "Install New Font..." - - IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_OPEN_VERB "Â³äêðèòè" + IDS_RUNAS_VERB "Çàïóñòèòè ÿê " + IDS_EDIT_VERB "Çì³íèòè" + IDS_FIND_VERB "Ïîøóê" + IDS_PRINT_VERB "Äðóê" + IDS_PLAY_VERB "Â³äòâîðèòè" + IDS_PREVIEW_VERB "Ïåðåãëÿä" + + IDS_FILE_FOLDER "%u ôàéë³â, %u ïàïîê" + IDS_PRINTERS "Ïðèíòåðè" + IDS_FONTS "Øðèôòè" + IDS_INSTALLNEWFONT "²íñòàëþâàòè íîâèé øðèôò..." + + IDS_DEFAULT_CLUSTER_SIZE "Ðîçì³ð êëàñòåðà çà ïðîìîâ÷àííÿì" +END Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc [iso-8859-1] Tue Nov 11 03:16:49 2008 @@ -24,8 +24,8 @@ STRINGTABLE DISCARDABLE { - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" - IDS_TIME_INTERVAL_MINUTES " min" - IDS_TIME_INTERVAL_SECONDS " sec" + IDS_BYTES_FORMAT "%ld áàéò" + IDS_TIME_INTERVAL_HOURS " ãîä" + IDS_TIME_INTERVAL_MINUTES " õâ" + IDS_TIME_INTERVAL_SECONDS " ñåê." }

1 0

[dreimer] 37284: Bug 3852: Ukrainian translation update by Artem Reznikov
by dreimer＠svn.reactos.org 11 Nov '08

11 Nov '08

Author: dreimer Date: Tue Nov 11 03:05:49 2008 New Revision: 37284 URL: http://svn.reactos.org/svn/reactos?rev=37284&view=rev Log: Bug 3852: Ukrainian translation update by Artem Reznikov Added: trunk/rosapps/applications/devutils/zoomin/lang/uk-UA.rc (with props) Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rc Added: trunk/rosapps/applications/devutils/zoomin/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/lang/uk-UA.rc (added) +++ trunk/rosapps/applications/devutils/zoomin/lang/uk-UA.rc [iso-8859-1] Tue Nov 11 03:05:49 2008 @@ -1,0 +1,91 @@ +/* + * PROJECT: ReactOS zoomin + * LICENSE: GPL - See COPYING in the top level directory + * FILE: devutils/zoomin/lang/uk-UA.rc + * PURPOSE: Ukraianian resource file + * TRANSLATOR: Artem Reznikov + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ZOOMIN ICON DISCARDABLE "zoomin.ico" + +///////////////////////////////////////////////////////////////////////////// +// +// Bitmap +// + + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_ZOOMIN_MENU MENU DISCARDABLE +BEGIN + POPUP "&Ôàéë" + BEGIN + MENUITEM "Â&èõ³ä\tAlt-F4", ID_EDIT_EXIT + END + POPUP "&Edit" + BEGIN + MENUITEM "&Êîï³þâàòè\tCtrl+C", ID_EDIT_COPY, GRAYED + MENUITEM "&Îíîâèòè\tF5", ID_EDIT_REFRESH + END + POPUP "&Options" + BEGIN + MENUITEM "&×àñòîòà îíîâëåííÿ...", ID_OPTIONS_REFRESH_RATE, GRAYED + END + POPUP "&Äîâ³äêà" + BEGIN + MENUITEM "&Ïðî ïðîãðàìó", ID_HELP_ABOUT + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 230, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ïðî ïðîãðàìó" +FONT 8, "System" +BEGIN + ICON IDI_ZOOMIN,IDI_ZOOMIN,14,9,16,16 + LTEXT "ReactOS zoomin âåðñ³ÿ 1.0",IDC_STATIC,49,10,119,8, + SS_NOPREFIX + LTEXT "Copyright (C) 2002 ReactOS Team",IDC_STATIC,49,20,119,8 + DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP +END + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "ReactOS Zoomin" +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Accelerator +// + +IDR_ZOOMIN ACCELERATORS DISCARDABLE +BEGIN + VK_F5, ID_REFRESH, VIRTKEY, NOINVERT +END Propchange: trunk/rosapps/applications/devutils/zoomin/lang/uk-UA.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom… ============================================================================== --- trunk/rosapps/applications/devutils/zoomin/zoomin.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/zoomin/zoomin.rc [iso-8859-1] Tue Nov 11 03:05:49 2008 @@ -12,3 +12,4 @@ #include "lang/es-ES.rc" #include "lang/no-NO.rc" #include "lang/sk-SK.rc" +#include "lang/uk-UA.rc"

1 0

[mkupfer] 37283: - get default language and keyboard layout selection from txtsetup.sif and preselect the entries - set selected language and keyboard layout when selecting next property sheet
by mkupfer＠svn.reactos.org 10 Nov '08

10 Nov '08

Author: mkupfer Date: Mon Nov 10 13:46:58 2008 New Revision: 37283 URL: http://svn.reactos.org/svn/reactos?rev=37283&view=rev Log: - get default language and keyboard layout selection from txtsetup.sif and preselect the entries - set selected language and keyboard layout when selecting next property sheet Modified: trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Mon Nov 10 13:46:58 2008 @@ -61,13 +61,13 @@ LONG FSType; // file system type on partition LONG MBRInstallType; // install bootloader LONG FormatPart; // type of format the partition - TCHAR SelectedLangId[9]; // selected language - TCHAR SelectedKBLayout[9]; // selected kayboard layout + LONG SelectedLangId; // selected language (table index) + LONG SelectedKBLayout; // selected keyboard layout (table index) WCHAR InstallationDirectory[MAX_PATH]; // installation directory on hdd BOOLEAN RepairUpdateFlag; // flag for update/repair an installed reactos // txtsetup.sif data - TCHAR DefaultLang[20]; // default language - TCHAR DefaultKBLayout[20]; // default keyboard layout + LONG DefaultLang; // default language (table index) + LONG DefaultKBLayout; // default keyboard layout (table index) PLANG pLanguages; LONG LangCount; PKBLAYOUT pKbLayouts; @@ -225,6 +225,8 @@ { PIMGINFO pImgInfo; LONG i; + LRESULT tindex; + HWND hList; pImgInfo = (PIMGINFO)GetWindowLongPtr(hwndDlg, DWLP_USER); switch (uMsg) { @@ -259,10 +261,23 @@ WM_SETFONT, (WPARAM)hTitleFont, (LPARAM)TRUE);*/ + hList = GetDlgItem(hwndDlg, IDC_LANGUAGES); for (i=0; i< SetupData.LangCount;i++) - (void)ComboBox_AddString(GetDlgItem(hwndDlg,IDC_LANGUAGES),SetupData.pLanguages[i].LangName); + { + tindex = SendMessage(hList,CB_ADDSTRING,(WPARAM)0,(LPARAM)SetupData.pLanguages[i].LangName); + SendMessage(hList,CB_SETITEMDATA,tindex,i); + if (SetupData.DefaultLang == i) + SendMessage(hList,CB_SETCURSEL,(WPARAM)tindex,(LPARAM)0); + + } + hList = GetDlgItem(hwndDlg, IDC_KEYLAYOUT); for (i=0; i< SetupData.KbLayoutCount;i++) - (void)ComboBox_AddString(GetDlgItem(hwndDlg,IDC_KEYLAYOUT),SetupData.pKbLayouts[i].LayoutName); + { + tindex = SendMessage(hList,CB_ADDSTRING,(WPARAM)0,(LPARAM)SetupData.pKbLayouts[i].LayoutName); + SendMessage(hList,CB_SETITEMDATA,tindex,i); + if (SetupData.DefaultKBLayout == i) + SendMessage(hList,CB_SETCURSEL,(WPARAM)tindex,(LPARAM)0); + } } break; case WM_DRAWITEM: @@ -307,6 +322,20 @@ case PSN_QUERYCANCEL: SetWindowLong(hwndDlg, DWL_MSGRESULT,MessageBox(GetParent(hwndDlg), abort_msg, abort_title, MB_YESNO | MB_ICONQUESTION) != IDYES); return TRUE; + case PSN_WIZNEXT: // set the selected data + hList =GetDlgItem(hwndDlg, IDC_LANGUAGES); + tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (tindex != CB_ERR) + { + SetupData.SelectedLangId = SendMessage(hList,CB_GETITEMDATA, (WPARAM)tindex, (LPARAM)0); + } + hList =GetDlgItem(hwndDlg, IDC_KEYLAYOUT); + tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0); + if (tindex != CB_ERR) + { + SetupData.SelectedKBLayout = SendMessage(hList,CB_GETITEMDATA, (WPARAM)tindex, (LPARAM)0); + } + return TRUE; default: break; } @@ -596,6 +625,7 @@ void LoadSetupData() { WCHAR szPath[MAX_PATH]; + TCHAR tmp[10]; WCHAR *ch; HINF hTxtsetupSif; INFCONTEXT InfContext; @@ -655,6 +685,29 @@ while (SetupFindNextLine(&InfContext, &InfContext) && Count < SetupData.LangCount); } } + // get default for keyboard and language + SetupData.DefaultKBLayout = -1; + SetupData.DefaultLang = -1; + if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"),_T("DefaultLayout"),&InfContext)) + { + SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); + for (Count=0;Count<SetupData.KbLayoutCount;Count++) + if (_tcscmp(tmp,SetupData.pKbLayouts[Count].LayoutId)==0) + { + SetupData.DefaultKBLayout = Count; + break; + } + } + if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"),_T("DefaultLanguage"),&InfContext)) + { + SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); + for (Count=0;Count<SetupData.LangCount;Count++) + if (_tcscmp(tmp,SetupData.pLanguages[Count].LangId)==0) + { + SetupData.DefaultLang = Count; + break; + } + } SetupCloseInfFile(hTxtsetupSif); } }

1 0

[gschneider] 37281: Implement ConvertSecurityDescriptorToStringSecurityDescriptorW based on Wine code.
by gschneider＠svn.reactos.org 10 Nov '08

10 Nov '08

Author: gschneider Date: Mon Nov 10 08:25:24 2008 New Revision: 37281 URL: http://svn.reactos.org/svn/reactos?rev=37281&view=rev Log: Implement ConvertSecurityDescriptorToStringSecurityDescriptorW based on Wine code. Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Mon Nov 10 08:25:24 2008 @@ -50,6 +50,12 @@ WELL_KNOWN_SID_TYPE Type; MAX_SID Sid; } WELLKNOWNSID; + +typedef struct _ACEFLAG +{ + LPCWSTR wstr; + DWORD value; +} ACEFLAG, *LPACEFLAG; static const WELLKNOWNSID WellKnownSids[] = { @@ -180,6 +186,76 @@ } return "(too-big)"; } + +static const ACEFLAG AceRights[] = +{ + { SDDL_GENERIC_ALL, GENERIC_ALL }, + { SDDL_GENERIC_READ, GENERIC_READ }, + { SDDL_GENERIC_WRITE, GENERIC_WRITE }, + { SDDL_GENERIC_EXECUTE, GENERIC_EXECUTE }, + + { SDDL_READ_CONTROL, READ_CONTROL }, + { SDDL_STANDARD_DELETE, DELETE }, + { SDDL_WRITE_DAC, WRITE_DAC }, + { SDDL_WRITE_OWNER, WRITE_OWNER }, + + { SDDL_READ_PROPERTY, ADS_RIGHT_DS_READ_PROP}, + { SDDL_WRITE_PROPERTY, ADS_RIGHT_DS_WRITE_PROP}, + { SDDL_CREATE_CHILD, ADS_RIGHT_DS_CREATE_CHILD}, + { SDDL_DELETE_CHILD, ADS_RIGHT_DS_DELETE_CHILD}, + { SDDL_LIST_CHILDREN, ADS_RIGHT_ACTRL_DS_LIST}, + { SDDL_SELF_WRITE, ADS_RIGHT_DS_SELF}, + { SDDL_LIST_OBJECT, ADS_RIGHT_DS_LIST_OBJECT}, + { SDDL_DELETE_TREE, ADS_RIGHT_DS_DELETE_TREE}, + { SDDL_CONTROL_ACCESS, ADS_RIGHT_DS_CONTROL_ACCESS}, + + { SDDL_FILE_ALL, FILE_ALL_ACCESS }, + { SDDL_FILE_READ, FILE_GENERIC_READ }, + { SDDL_FILE_WRITE, FILE_GENERIC_WRITE }, + { SDDL_FILE_EXECUTE, FILE_GENERIC_EXECUTE }, + + { SDDL_KEY_ALL, KEY_ALL_ACCESS }, + { SDDL_KEY_READ, KEY_READ }, + { SDDL_KEY_WRITE, KEY_WRITE }, + { SDDL_KEY_EXECUTE, KEY_EXECUTE }, + { NULL, 0 }, +}; + +static const LPCWSTR AceRightBitNames[32] = { + SDDL_CREATE_CHILD, /* 0 */ + SDDL_DELETE_CHILD, + SDDL_LIST_CHILDREN, + SDDL_SELF_WRITE, + SDDL_READ_PROPERTY, /* 4 */ + SDDL_WRITE_PROPERTY, + SDDL_DELETE_TREE, + SDDL_LIST_OBJECT, + SDDL_CONTROL_ACCESS, /* 8 */ + NULL, + NULL, + NULL, + NULL, /* 12 */ + NULL, + NULL, + NULL, + SDDL_STANDARD_DELETE, /* 16 */ + SDDL_READ_CONTROL, + SDDL_WRITE_DAC, + SDDL_WRITE_OWNER, + NULL, /* 20 */ + NULL, + NULL, + NULL, + NULL, /* 24 */ + NULL, + NULL, + NULL, + SDDL_GENERIC_ALL, /* 28 */ + SDDL_GENERIC_EXECUTE, + SDDL_GENERIC_WRITE, + SDDL_GENERIC_READ +}; + /* set last error code from NT status and get the proper boolean return value */ /* used for functions that are a simple wrapper around the corresponding ntdll API */ @@ -610,10 +686,289 @@ return TRUE; } +static void DumpString(LPCWSTR string, int cch, WCHAR **pwptr, ULONG *plen) +{ + if (cch == -1) + cch = strlenW(string); + + if (plen) + *plen += cch; + + if (pwptr) + { + memcpy(*pwptr, string, sizeof(WCHAR)*cch); + *pwptr += cch; + } +} + +static BOOL DumpSidNumeric(PSID psid, WCHAR **pwptr, ULONG *plen) +{ + DWORD i; + WCHAR fmt[] = { 'S','-','%','u','-','%','d',0 }; + WCHAR subauthfmt[] = { '-','%','u',0 }; + WCHAR buf[26]; + SID *pisid = psid; + + if( !IsValidSid( psid ) || pisid->Revision != SDDL_REVISION) + { + SetLastError(ERROR_INVALID_SID); + return FALSE; + } + + if (pisid->IdentifierAuthority.Value[0] || + pisid->IdentifierAuthority.Value[1]) + { + FIXME("not matching MS' bugs\n"); + SetLastError(ERROR_INVALID_SID); + return FALSE; + } + + sprintfW( buf, fmt, pisid->Revision, + MAKELONG( + MAKEWORD( pisid->IdentifierAuthority.Value[5], + pisid->IdentifierAuthority.Value[4] ), + MAKEWORD( pisid->IdentifierAuthority.Value[3], + pisid->IdentifierAuthority.Value[2] ) + ) ); + DumpString(buf, -1, pwptr, plen); + + for( i=0; i<pisid->SubAuthorityCount; i++ ) + { + sprintfW( buf, subauthfmt, pisid->SubAuthority[i] ); + DumpString(buf, -1, pwptr, plen); + } + return TRUE; +} + +static BOOL DumpSid(PSID psid, WCHAR **pwptr, ULONG *plen) +{ + size_t i; + for (i = 0; i < sizeof(WellKnownSids) / sizeof(WellKnownSids[0]); i++) + { + if (WellKnownSids[i].wstr[0] && EqualSid(psid, (PSID)&(WellKnownSids[i].Sid.Revision))) + { + DumpString(WellKnownSids[i].wstr, 2, pwptr, plen); + return TRUE; + } + } + + return DumpSidNumeric(psid, pwptr, plen); +} + +static void DumpRights(DWORD mask, WCHAR **pwptr, ULONG *plen) +{ + static const WCHAR fmtW[] = {'0','x','%','x',0}; + WCHAR buf[15]; + size_t i; + + if (mask == 0) + return; + + /* first check if the right have name */ + for (i = 0; i < sizeof(AceRights)/sizeof(AceRights[0]); i++) + { + if (AceRights[i].wstr == NULL) + break; + if (mask == AceRights[i].value) + { + DumpString(AceRights[i].wstr, -1, pwptr, plen); + return; + } + } + + /* then check if it can be built from bit names */ + for (i = 0; i < 32; i++) + { + if ((mask & (1 << i)) && (AceRightBitNames[i] == NULL)) + { + /* can't be built from bit names */ + sprintfW(buf, fmtW, mask); + DumpString(buf, -1, pwptr, plen); + return; + } + } + + /* build from bit names */ + for (i = 0; i < 32; i++) + if (mask & (1 << i)) + DumpString(AceRightBitNames[i], -1, pwptr, plen); +} + +static BOOL DumpAce(LPVOID pace, WCHAR **pwptr, ULONG *plen) +{ + ACCESS_ALLOWED_ACE *piace; /* all the supported ACEs have the same memory layout */ + static const WCHAR openbr = '('; + static const WCHAR closebr = ')'; + static const WCHAR semicolon = ';'; + + if (((PACE_HEADER)pace)->AceType > SYSTEM_ALARM_ACE_TYPE || ((PACE_HEADER)pace)->AceSize < sizeof(ACCESS_ALLOWED_ACE)) + { + SetLastError(ERROR_INVALID_ACL); + return FALSE; + } + + piace = (ACCESS_ALLOWED_ACE *)pace; + DumpString(&openbr, 1, pwptr, plen); + switch (piace->Header.AceType) + { + case ACCESS_ALLOWED_ACE_TYPE: + DumpString(SDDL_ACCESS_ALLOWED, -1, pwptr, plen); + break; + case ACCESS_DENIED_ACE_TYPE: + DumpString(SDDL_ACCESS_DENIED, -1, pwptr, plen); + break; + case SYSTEM_AUDIT_ACE_TYPE: + DumpString(SDDL_AUDIT, -1, pwptr, plen); + break; + case SYSTEM_ALARM_ACE_TYPE: + DumpString(SDDL_ALARM, -1, pwptr, plen); + break; + } + DumpString(&semicolon, 1, pwptr, plen); + + if (piace->Header.AceFlags & OBJECT_INHERIT_ACE) + DumpString(SDDL_OBJECT_INHERIT, -1, pwptr, plen); + if (piace->Header.AceFlags & CONTAINER_INHERIT_ACE) + DumpString(SDDL_CONTAINER_INHERIT, -1, pwptr, plen); + if (piace->Header.AceFlags & NO_PROPAGATE_INHERIT_ACE) + DumpString(SDDL_NO_PROPAGATE, -1, pwptr, plen); + if (piace->Header.AceFlags & INHERIT_ONLY_ACE) + DumpString(SDDL_INHERIT_ONLY, -1, pwptr, plen); + if (piace->Header.AceFlags & INHERITED_ACE) + DumpString(SDDL_INHERITED, -1, pwptr, plen); + if (piace->Header.AceFlags & SUCCESSFUL_ACCESS_ACE_FLAG) + DumpString(SDDL_AUDIT_SUCCESS, -1, pwptr, plen); + if (piace->Header.AceFlags & FAILED_ACCESS_ACE_FLAG) + DumpString(SDDL_AUDIT_FAILURE, -1, pwptr, plen); + DumpString(&semicolon, 1, pwptr, plen); + DumpRights(piace->Mask, pwptr, plen); + DumpString(&semicolon, 1, pwptr, plen); + /* objects not supported */ + DumpString(&semicolon, 1, pwptr, plen); + /* objects not supported */ + DumpString(&semicolon, 1, pwptr, plen); + if (!DumpSid((PSID)&piace->SidStart, pwptr, plen)) + return FALSE; + DumpString(&closebr, 1, pwptr, plen); + return TRUE; +} + +static BOOL DumpAcl(PACL pacl, WCHAR **pwptr, ULONG *plen, BOOL protected, BOOL autoInheritReq, BOOL autoInherited) +{ + WORD count; + int i; + + if (protected) + DumpString(SDDL_PROTECTED, -1, pwptr, plen); + if (autoInheritReq) + DumpString(SDDL_AUTO_INHERIT_REQ, -1, pwptr, plen); + if (autoInherited) + DumpString(SDDL_AUTO_INHERITED, -1, pwptr, plen); + + if (pacl == NULL) + return TRUE; + + if (!IsValidAcl(pacl)) + return FALSE; + + count = pacl->AceCount; + for (i = 0; i < count; i++) + { + LPVOID ace; + if (!GetAce(pacl, i, &ace)) + return FALSE; + if (!DumpAce(ace, pwptr, plen)) + return FALSE; + } + + return TRUE; +} + +static BOOL DumpOwner(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULONG *plen) +{ + static const WCHAR prefix[] = {'O',':',0}; + BOOL bDefaulted; + PSID psid; + + if (!GetSecurityDescriptorOwner(SecurityDescriptor, &psid, &bDefaulted)) + return FALSE; + + if (psid == NULL) + return TRUE; + + DumpString(prefix, -1, pwptr, plen); + if (!DumpSid(psid, pwptr, plen)) + return FALSE; + return TRUE; +} + +static BOOL DumpGroup(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULONG *plen) +{ + static const WCHAR prefix[] = {'G',':',0}; + BOOL bDefaulted; + PSID psid; + + if (!GetSecurityDescriptorGroup(SecurityDescriptor, &psid, &bDefaulted)) + return FALSE; + + if (psid == NULL) + return TRUE; + + DumpString(prefix, -1, pwptr, plen); + if (!DumpSid(psid, pwptr, plen)) + return FALSE; + return TRUE; +} + +static BOOL DumpDacl(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULONG *plen) +{ + static const WCHAR dacl[] = {'D',':',0}; + SECURITY_DESCRIPTOR_CONTROL control; + BOOL present, defaulted; + DWORD revision; + PACL pacl; + + if (!GetSecurityDescriptorDacl(SecurityDescriptor, &present, &pacl, &defaulted)) + return FALSE; + + if (!GetSecurityDescriptorControl(SecurityDescriptor, &control, &revision)) + return FALSE; + + if (!present) + return TRUE; + + DumpString(dacl, 2, pwptr, plen); + if (!DumpAcl(pacl, pwptr, plen, control & SE_DACL_PROTECTED, control & SE_DACL_AUTO_INHERIT_REQ, control & SE_DACL_AUTO_INHERITED)) + return FALSE; + return TRUE; +} + +static BOOL DumpSacl(PSECURITY_DESCRIPTOR SecurityDescriptor, WCHAR **pwptr, ULONG *plen) +{ + static const WCHAR sacl[] = {'S',':',0}; + SECURITY_DESCRIPTOR_CONTROL control; + BOOL present, defaulted; + DWORD revision; + PACL pacl; + + if (!GetSecurityDescriptorSacl(SecurityDescriptor, &present, &pacl, &defaulted)) + return FALSE; + + if (!GetSecurityDescriptorControl(SecurityDescriptor, &control, &revision)) + return FALSE; + + if (!present) + return TRUE; + + DumpString(sacl, 2, pwptr, plen); + if (!DumpAcl(pacl, pwptr, plen, control & SE_SACL_PROTECTED, control & SE_SACL_AUTO_INHERIT_REQ, control & SE_SACL_AUTO_INHERITED)) + return FALSE; + return TRUE; +} /****************************************************************************** * ConvertSecurityDescriptorToStringSecurityDescriptorW [ADVAPI32.@] - * @unimplemented + * @implemented */ BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW(PSECURITY_DESCRIPTOR SecurityDescriptor, @@ -622,6 +977,9 @@ LPWSTR *OutputString, PULONG OutputLen) { + ULONG len; + WCHAR *wptr, *wstr; + if (SDRevision != SDDL_REVISION_1) { ERR("Pogram requested unknown SDDL revision %d\n", SDRevision); @@ -629,9 +987,40 @@ return FALSE; } - FIXME("%s() not implemented!\n", __FUNCTION__); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + len = 0; + if (SecurityInformation & OWNER_SECURITY_INFORMATION) + if (!DumpOwner(SecurityDescriptor, NULL, &len)) + return FALSE; + if (SecurityInformation & GROUP_SECURITY_INFORMATION) + if (!DumpGroup(SecurityDescriptor, NULL, &len)) + return FALSE; + if (SecurityInformation & DACL_SECURITY_INFORMATION) + if (!DumpDacl(SecurityDescriptor, NULL, &len)) + return FALSE; + if (SecurityInformation & SACL_SECURITY_INFORMATION) + if (!DumpSacl(SecurityDescriptor, NULL, &len)) + return FALSE; + + wstr = wptr = LocalAlloc(0, (len + 1)*sizeof(WCHAR)); + if (SecurityInformation & OWNER_SECURITY_INFORMATION) + if (!DumpOwner(SecurityDescriptor, &wptr, NULL)) + return FALSE; + if (SecurityInformation & GROUP_SECURITY_INFORMATION) + if (!DumpGroup(SecurityDescriptor, &wptr, NULL)) + return FALSE; + if (SecurityInformation & DACL_SECURITY_INFORMATION) + if (!DumpDacl(SecurityDescriptor, &wptr, NULL)) + return FALSE; + if (SecurityInformation & SACL_SECURITY_INFORMATION) + if (!DumpSacl(SecurityDescriptor, &wptr, NULL)) + return FALSE; + *wptr = 0; + + TRACE("ret: %s, %d\n", wine_dbgstr_w(wstr), len); + *OutputString = wstr; + if (OutputLen) + *OutputLen = strlenW(*OutputString)+1; + return TRUE; }

2 1

← Newer
1
...
47
48
49
50
51
52
53
...
66
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2008