Ros-diffs January 2009

ros-diffs@reactos.org

30 participants
755 discussions

[cwittich] 38972: sync winebuild with wine 1.1.13

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 20 05:44:30 2009 New Revision: 38972 URL: http://svn.reactos.org/svn/reactos?rev=38972&view=rev Log: sync winebuild with wine 1.1.13 Modified: trunk/reactos/tools/winebuild/build.h trunk/reactos/tools/winebuild/import.c trunk/reactos/tools/winebuild/main.c trunk/reactos/tools/winebuild/parser.c trunk/reactos/tools/winebuild/relay.c trunk/reactos/tools/winebuild/spec32.c trunk/reactos/tools/winebuild/utils.c Modified: trunk/reactos/tools/winebuild/build.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/build.h?re… ============================================================================== --- trunk/reactos/tools/winebuild/build.h [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/build.h [iso-8859-1] Tue Jan 20 05:44:30 2009 @@ -128,13 +128,15 @@ #define FLAG_NONAME 0x02 /* don't export function by name */ #define FLAG_RET16 0x04 /* function returns a 16-bit value */ #define FLAG_RET64 0x08 /* function returns a 64-bit value */ -#define FLAG_I386 0x10 /* function is i386 only */ -#define FLAG_REGISTER 0x20 /* use register calling convention */ -#define FLAG_PRIVATE 0x40 /* function is private (cannot be imported) */ -#define FLAG_ORDINAL 0x80 /* function should be imported by ordinal */ +#define FLAG_REGISTER 0x10 /* use register calling convention */ +#define FLAG_PRIVATE 0x20 /* function is private (cannot be imported) */ +#define FLAG_ORDINAL 0x40 /* function should be imported by ordinal */ #define FLAG_FORWARD 0x100 /* function is a forwarded name */ #define FLAG_EXT_LINK 0x200 /* function links to an external symbol */ + +#define FLAG_CPU(cpu) (0x01000 << (cpu)) +#define FLAG_CPU_MASK 0x1f000 #define MAX_ORDINALS 65535 @@ -178,6 +180,7 @@ extern void free_dll_spec( DLLSPEC *spec ); extern const char *make_c_identifier( const char *str ); extern const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ); +extern enum target_cpu get_cpu_from_name( const char *name ); extern unsigned int get_alignment(unsigned int align); extern unsigned int get_page_size(void); extern unsigned int get_ptr_size(void); @@ -230,6 +233,7 @@ extern int verbose; extern int save_temps; extern int link_ext_symbols; +extern int force_pointer_size; extern char *input_file_name; extern char *spec_file_name; Modified: trunk/reactos/tools/winebuild/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/import.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/import.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/import.c [iso-8859-1] Tue Jan 20 05:44:30 2009 @@ -970,22 +970,22 @@ output( "\tjmp *%%eax\n" ); break; case CPU_x86_64: - output( "\tpushq %%rdi\n" ); - output( "\tpushq %%rsi\n" ); output( "\tpushq %%rdx\n" ); output( "\tpushq %%rcx\n" ); output( "\tpushq %%r8\n" ); output( "\tpushq %%r9\n" ); - output( "\tsubq $8,%%rsp\n" ); - output( "\tmovq %%r11,%%rdi\n" ); + output( "\tpushq %%r10\n" ); + output( "\tpushq %%r11\n" ); + output( "\tsubq $40,%%rsp\n" ); + output( "\tmovq %%rax,%%rcx\n" ); output( "\tcall %s\n", asm_name("__wine_spec_delay_load") ); - output( "\taddq $8,%%rsp\n" ); + output( "\taddq $40,%%rsp\n" ); + output( "\tpopq %%r11\n" ); + output( "\tpopq %%r10\n" ); output( "\tpopq %%r9\n" ); output( "\tpopq %%r8\n" ); output( "\tpopq %%rcx\n" ); output( "\tpopq %%rdx\n" ); - output( "\tpopq %%rsi\n" ); - output( "\tpopq %%rdi\n" ); output( "\tjmp *%%rax\n" ); break; case CPU_SPARC: @@ -1068,7 +1068,7 @@ output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_x86_64: - output( "\tmovq $%d,%%r11\n", (idx << 16) | j ); + output( "\tmovq $%d,%%rax\n", (idx << 16) | j ); output( "\tjmp %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_SPARC: @@ -1191,45 +1191,64 @@ output( "\t%s\n", func_declaration(name) ); output( "%s:\n", asm_name(name) ); - /* flesh out the stub a bit to make safedisc happy */ - output(" \tnop\n" ); - output(" \tnop\n" ); - output(" \tnop\n" ); - output(" \tnop\n" ); - output(" \tnop\n" ); - output(" \tnop\n" ); - output(" \tnop\n" ); - output(" \tnop\n" ); - output(" \tnop\n" ); - - output( "\tsubl $4,%%esp\n" ); - if (UsePIC) - { - output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:" ); + switch (target_cpu) + { + case CPU_x86: + /* flesh out the stub a bit to make safedisc happy */ + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + output(" \tnop\n" ); + + output( "\tsubl $4,%%esp\n" ); + if (UsePIC) + { + output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); + output( "1:" ); + if (exp_name) + { + output( "\tleal .L%s_string-1b(%%eax),%%ecx\n", name ); + output( "\tpushl %%ecx\n" ); + count++; + } + else + output( "\tpushl $%d\n", odp->ordinal ); + output( "\tleal .L__wine_spec_file_name-1b(%%eax),%%ecx\n" ); + output( "\tpushl %%ecx\n" ); + } + else + { + if (exp_name) + { + output( "\tpushl $.L%s_string\n", name ); + count++; + } + else + output( "\tpushl $%d\n", odp->ordinal ); + output( "\tpushl $.L__wine_spec_file_name\n" ); + } + output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); + break; + case CPU_x86_64: + output( "\tleaq .L__wine_spec_file_name(%%rip),%%rdi\n" ); if (exp_name) { - output( "\tleal .L%s_string-1b(%%eax),%%ecx\n", name ); - output( "\tpushl %%ecx\n" ); + output( "leaq .L%s_string(%%rip),%%rsi\n", name ); count++; } else - output( "\tpushl $%d\n", odp->ordinal ); - output( "\tleal .L__wine_spec_file_name-1b(%%eax),%%ecx\n" ); - output( "\tpushl %%ecx\n" ); - } - else - { - if (exp_name) - { - output( "\tpushl $.L%s_string\n", name ); - count++; - } - else - output( "\tpushl $%d\n", odp->ordinal ); - output( "\tpushl $.L__wine_spec_file_name\n" ); - } - output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "\tmovq $%d,%%rsi\n", odp->ordinal ); + output( "\tsubq $8,%%rsp\n" ); + output( "\tcall %s\n", asm_name("__wine_spec_unimplemented_stub") ); + break; + default: + assert(0); + } output_function_size( name ); } Modified: trunk/reactos/tools/winebuild/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/main.c?rev… ============================================================================== --- trunk/reactos/tools/winebuild/main.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/main.c [iso-8859-1] Tue Jan 20 05:44:30 2009 @@ -47,6 +47,7 @@ int verbose = 0; int save_temps = 0; int link_ext_symbols = 0; +int force_pointer_size = 0; #if defined(TARGET_i386) enum target_cpu target_cpu = CPU_x86; @@ -98,23 +99,6 @@ static const struct { const char *name; - enum target_cpu cpu; -} cpu_names[] = -{ - { "i386", CPU_x86 }, - { "i486", CPU_x86 }, - { "i586", CPU_x86 }, - { "i686", CPU_x86 }, - { "i786", CPU_x86 }, - { "x86_64", CPU_x86_64 }, - { "sparc", CPU_SPARC }, - { "alpha", CPU_ALPHA }, - { "powerpc", CPU_POWERPC } -}; - -static const struct -{ - const char *name; enum target_platform platform; } platform_names[] = { @@ -176,13 +160,8 @@ if (!(p = strchr( spec, '-' ))) fatal_error( "Invalid target specification '%s'\n", target ); *p++ = 0; - for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) - { - if (!strcmp( cpu_names[i].name, spec )) break; - } - if (i < sizeof(cpu_names)/sizeof(cpu_names[0])) target_cpu = cpu_names[i].cpu; - else fatal_error( "Unrecognized CPU '%s'\n", spec ); - + if ((target_cpu = get_cpu_from_name( spec )) == -1) + fatal_error( "Unrecognized CPU '%s'\n", spec ); platform = p; if ((p = strrchr( p, '-' ))) platform = p + 1; @@ -239,6 +218,7 @@ "Usage: winebuild [OPTIONS] [FILES]\n\n" "Options:\n" " --as-cmd=AS Command to use for assembling (default: as)\n" +" -b, --target=TARGET Specify target CPU and platform for cross-compiling\n" " -d, --delay-lib=LIB Import the specified library in delayed mode\n" " -D SYM Ignored for C flags compatibility\n" " -e, --entry=FUNC Set the DLL entry point function (default: DllMain)\n" @@ -255,6 +235,7 @@ " --ld-cmd=LD Command to use for linking (default: ld)\n" " -l, --library=LIB Import the specified library\n" " -L, --library-path=DIR Look for imports libraries in DIR\n" +" -m32, -m64 Force building 32-bit resp. 64-bit code\n" " -M, --main-module=MODULE Set the name of the main module for a Win16 dll\n" " --nm-cmd=NM Command to use to get undefined symbols (default: nm)\n" " --nxcompat=y|n Set the NX compatibility flag (default: yes)\n" @@ -263,7 +244,6 @@ " -r, --res=RSRC.RES Load resources from RSRC.RES\n" " --save-temps Do not delete the generated intermediate files\n" " --subsystem=SUBSYS Set the subsystem (one of native, windows, console)\n" -" --target=TARGET Specify target CPU and platform for cross-compiling\n" " -u, --undefined=SYMBOL Add an undefined reference to SYMBOL when linking\n" " -v, --verbose Display the programs invoked\n" " --version Print the version and exit\n" @@ -291,12 +271,11 @@ LONG_OPT_RELAY32, LONG_OPT_SAVE_TEMPS, LONG_OPT_SUBSYSTEM, - LONG_OPT_TARGET, LONG_OPT_VERSION, LONG_OPT_PEDLL }; -static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:d:e:f:hi:kl:m:o:r:u:vw"; +static const char short_options[] = "C:D:E:F:H:I:K:L:M:N:b:d:e:f:hi:kl:m:o:r:u:vw"; static const struct option long_options[] = { @@ -312,10 +291,10 @@ { "relay32", 0, 0, LONG_OPT_RELAY32 }, { "save-temps", 0, 0, LONG_OPT_SAVE_TEMPS }, { "subsystem", 1, 0, LONG_OPT_SUBSYSTEM }, - { "target", 1, 0, LONG_OPT_TARGET }, { "version", 0, 0, LONG_OPT_VERSION }, { "pedll", 1, 0, LONG_OPT_PEDLL }, /* aliases for short options */ + { "target", 1, 0, 'b' }, { "delay-lib", 1, 0, 'd' }, { "export", 1, 0, 'E' }, { "entry", 1, 0, 'e' }, @@ -385,11 +364,20 @@ lib_path = xrealloc( lib_path, (nb_lib_paths+1) * sizeof(*lib_path) ); lib_path[nb_lib_paths++] = xstrdup( optarg ); break; + case 'm': + if (strcmp( optarg, "32" ) && strcmp( optarg, "64" )) + fatal_error( "Invalid -m option '%s', expected -m32 or -m64\n", optarg ); + if (!strcmp( optarg, "32" )) force_pointer_size = 4; + else force_pointer_size = 8; + break; case 'M': spec->type = SPEC_WIN16; break; case 'N': spec->dll_name = xstrdup( optarg ); + break; + case 'b': + set_target( optarg ); break; case 'd': add_delayed_import( optarg ); @@ -495,9 +483,6 @@ case LONG_OPT_SUBSYSTEM: set_subsystem( optarg, spec ); break; - case LONG_OPT_TARGET: - set_target( optarg ); - break; case LONG_OPT_VERSION: printf( "winebuild version " PACKAGE_VERSION "\n" ); exit(0); @@ -514,6 +499,20 @@ if (spec->file_name && !strchr( spec->file_name, '.' )) strcat( spec->file_name, exec_mode == MODE_EXE ? ".exe" : ".dll" ); + + switch (target_cpu) + { + case CPU_x86: + if (force_pointer_size == 8) target_cpu = CPU_x86_64; + break; + case CPU_x86_64: + if (force_pointer_size == 4) target_cpu = CPU_x86; + break; + default: + if (force_pointer_size == 8) + fatal_error( "Cannot build 64-bit code for this CPU\n" ); + break; + } return &argv[optind]; } Modified: trunk/reactos/tools/winebuild/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/parser.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/parser.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/parser.c [iso-8859-1] Tue Jan 20 05:44:30 2009 @@ -67,7 +67,6 @@ "noname", /* FLAG_NONAME */ "ret16", /* FLAG_RET16 */ "ret64", /* FLAG_RET64 */ - "i386", /* FLAG_I386 */ "register", /* FLAG_REGISTER */ "private", /* FLAG_PRIVATE */ "ordinal", /* FLAG_ORDINAL */ @@ -378,7 +377,7 @@ { odp->u.func.arg_types[0] = '\0'; odp->link_name = xstrdup(""); - odp->flags |= FLAG_I386; /* don't bother generating stubs for Winelib */ + odp->flags |= FLAG_CPU(CPU_x86) | FLAG_CPU(CPU_x86_64); /* don't bother generating stubs for Winelib */ return 1; } @@ -428,14 +427,38 @@ do { if (!(token = GetToken(0))) break; - for (i = 0; FlagNames[i]; i++) - if (!strcmp( FlagNames[i], token )) break; - if (!FlagNames[i]) - { - error( "Unknown flag '%s'\n", token ); - return NULL; - } - odp->flags |= 1 << i; + if (!strncmp( token, "arch=", 5)) + { + char *args = xstrdup( token + 5 ); + char *cpu_name = strtok( args, "," ); + while (cpu_name) + { + enum target_cpu cpu = get_cpu_from_name( cpu_name ); + if (cpu == -1) + { + error( "Unknown architecture '%s'\n", cpu_name ); + return NULL; + } + odp->flags |= FLAG_CPU( cpu ); + cpu_name = strtok( NULL, "," ); + } + free( args ); + } + else if (!strcmp( token, "i386" )) /* backwards compatibility */ + { + odp->flags |= FLAG_CPU(CPU_x86); + } + else + { + for (i = 0; FlagNames[i]; i++) + if (!strcmp( FlagNames[i], token )) break; + if (!FlagNames[i]) + { + error( "Unknown flag '%s'\n", token ); + return NULL; + } + odp->flags |= 1 << i; + } token = GetToken(0); } while (token && *token == '-'); @@ -507,9 +530,9 @@ assert( 0 ); } - if ((target_cpu != CPU_x86) && (odp->flags & FLAG_I386)) - { - /* ignore this entry point on non-Intel archs */ + if ((odp->flags & FLAG_CPU_MASK) && !(odp->flags & FLAG_CPU(target_cpu))) + { + /* ignore this entry point */ spec->nb_entry_points--; return 1; } Modified: trunk/reactos/tools/winebuild/relay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/relay.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/relay.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/relay.c [iso-8859-1] Tue Jan 20 05:44:30 2009 @@ -741,9 +741,10 @@ * * Stack layout: * ... - * (ebp+16) first arg - * (ebp+12) ret addr to user code - * (ebp+8) eax saved by relay code + * (ebp+20) first arg + * (ebp+16) ret addr to user code + * (ebp+12) func to call (relative to relay code ret addr) + * (ebp+8) number of args * (ebp+4) ret addr to relay code * (ebp+0) saved ebp * (ebp-128) buffer area to allow stack frame manipulation @@ -770,17 +771,16 @@ output( "\tpushl %%ebp\n" ); output( "\tmovl %%esp,%%ebp\n "); - output( "\tleal -%d(%%esp), %%esp\n", STACK_SPACE + 4 /* for context arg */); + output( "\tleal -%d(%%esp),%%esp\n", STACK_SPACE ); /* Build the context structure */ + output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Eax) - STACK_SPACE ); output( "\tpushfl\n" ); output( "\tpopl %%eax\n" ); output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(EFlags) - STACK_SPACE ); output( "\tmovl 0(%%ebp),%%eax\n" ); output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Ebp) - STACK_SPACE ); - output( "\tmovl 8(%%ebp),%%eax\n" ); - output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Eax) - STACK_SPACE ); output( "\tmovl %%ebx,%d(%%ebp)\n", CONTEXTOFFSET(Ebx) - STACK_SPACE ); output( "\tmovl %%ecx,%d(%%ebp)\n", CONTEXTOFFSET(Ecx) - STACK_SPACE ); output( "\tmovl %%edx,%d(%%ebp)\n", CONTEXTOFFSET(Edx) - STACK_SPACE ); @@ -805,31 +805,30 @@ output( "\tmovl $0x%x,%%eax\n", CONTEXT86_FULL ); output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(ContextFlags) - STACK_SPACE ); - output( "\tmovl 12(%%ebp),%%eax\n" ); /* Get %eip at time of call */ + output( "\tmovl 16(%%ebp),%%eax\n" ); /* Get %eip at time of call */ output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Eip) - STACK_SPACE ); /* Transfer the arguments */ - output( "\tmovl 4(%%ebp),%%ebx\n" ); /* get relay code addr */ - output( "\tmovzbl 4(%%ebx),%%ecx\n" ); /* fetch number of args to copy */ - output( "\tsubl %%ecx,%%esp\n" ); + output( "\tmovl 8(%%ebp),%%ecx\n" ); /* fetch number of args to copy */ + output( "\tleal 4(,%%ecx,4),%%edx\n" ); /* add 4 for context arg */ + output( "\tsubl %%edx,%%esp\n" ); output( "\tandl $~15,%%esp\n" ); - output( "\tleal 16(%%ebp),%%esi\n" ); /* get %esp at time of call */ + output( "\tleal 20(%%ebp),%%esi\n" ); /* get %esp at time of call */ output( "\tmovl %%esp,%%edi\n" ); - output( "\tshrl $2,%%ecx\n" ); + output( "\ttest %%ecx,%%ecx\n" ); output( "\tjz 1f\n" ); output( "\tcld\n" ); output( "\trep\n\tmovsl\n" ); /* copy args */ output( "1:\tleal %d(%%ebp),%%eax\n", -STACK_SPACE ); /* get addr of context struct */ output( "\tmovl %%eax,(%%edi)\n" ); /* and pass it as extra arg */ - output( "\tmovzbl 5(%%ebx),%%eax\n" ); /* fetch number of args to remove */ - output( "\tleal 16(%%ebp,%%eax),%%eax\n" ); - output( "\tmovl %%eax,%d(%%ebp)\n", CONTEXTOFFSET(Esp) - STACK_SPACE ); + output( "\tmovl %%esi,%d(%%ebp)\n", CONTEXTOFFSET(Esp) - STACK_SPACE ); /* Call the entry point */ - output( "\taddl (%%ebx),%%ebx\n" ); - output( "\tcall *%%ebx\n" ); + output( "\tmovl 4(%%ebp),%%eax\n" ); /* get relay code addr */ + output( "\taddl 12(%%ebp),%%eax\n" ); + output( "\tcall *%%eax\n" ); output( "\tleal -%d(%%ebp),%%ecx\n", STACK_SPACE ); /* Restore the context structure */ @@ -975,8 +974,181 @@ output( "%s\n\t.long 0\n", asm_globl("CallTo16_DataSelector") ); output( "%s\n\t.long 0\n", asm_globl("CallTo16_TebSelector") ); if (UsePIC) output( "wine_ldt_copy_ptr:\t.long %s\n", asm_name("wine_ldt_copy") ); + + output( "\t.text\n" ); + output( "%s:\n\n", asm_name("__wine_spec_thunk_text_32") ); + BuildCallFrom32Regs(); + output_function_size( "__wine_spec_thunk_text_32" ); + output_gnu_stack_note(); } + + +/******************************************************************* + * build_call_from_regs_x86_64 + * + * Build the register saving code for a 'register' entry point. + * + * Stack layout: + * ... + * (rsp+16) first arg + * (rsp+8) ret addr to user code + * (rsp) ret addr to relay code + * (rsp-128) buffer area to allow stack frame manipulation + * + * Parameters: + * %rcx number of args + * %rdx entry point + */ +static void build_call_from_regs_x86_64(void) +{ + static const int STACK_SPACE = 128 + 0x4d0; /* size of x86_64 context */ + + /* Function header */ + + function_header( "__wine_call_from_regs" ); + + output( "\tsubq $%u,%%rsp\n", STACK_SPACE ); + + /* save registers into the context */ + + output( "\tmovq %%rax,0x78(%%rsp)\n" ); + output( "\tmovq %u(%%rsp),%%rax\n", STACK_SPACE + 16 ); /* saved %rcx on stack */ + output( "\tmovq %%rax,0x80(%%rsp)\n" ); + output( "\tmovq %u(%%rsp),%%rax\n", STACK_SPACE + 24 ); /* saved %rdx on stack */ + output( "\tmovq %%rax,0x88(%%rsp)\n" ); + output( "\tmovq %%rbx,0x90(%%rsp)\n" ); + output( "\tleaq %u(%%rsp),%%rax\n", STACK_SPACE + 16 ); + output( "\tmovq %%rax,0x98(%%rsp)\n" ); + output( "\tmovq %%rbp,0xa0(%%rsp)\n" ); + output( "\tmovq %%rsi,0xa8(%%rsp)\n" ); + output( "\tmovq %%rdi,0xb0(%%rsp)\n" ); + output( "\tmovq %%r8,0xb8(%%rsp)\n" ); + output( "\tmovq %%r9,0xc0(%%rsp)\n" ); + output( "\tmovq %%r10,0xc8(%%rsp)\n" ); + output( "\tmovq %%r11,0xd0(%%rsp)\n" ); + output( "\tmovq %%r12,0xd8(%%rsp)\n" ); + output( "\tmovq %%r13,0xe0(%%rsp)\n" ); + output( "\tmovq %%r14,0xe8(%%rsp)\n" ); + output( "\tmovq %%r15,0xf0(%%rsp)\n" ); + output( "\tmovq %u(%%rsp),%%rax\n", STACK_SPACE + 8 ); + output( "\tmovq %%rax,0xf8(%%rsp)\n" ); + + output( "\tstmxcsr 0x34(%%rsp)\n" ); + output( "\tfxsave 0x100(%%rsp)\n" ); + output( "\tmovdqa %%xmm0,0x1a0(%%rsp)\n" ); + output( "\tmovdqa %%xmm1,0x1b0(%%rsp)\n" ); + output( "\tmovdqa %%xmm2,0x1c0(%%rsp)\n" ); + output( "\tmovdqa %%xmm3,0x1d0(%%rsp)\n" ); + output( "\tmovdqa %%xmm4,0x1e0(%%rsp)\n" ); + output( "\tmovdqa %%xmm5,0x1f0(%%rsp)\n" ); + output( "\tmovdqa %%xmm6,0x200(%%rsp)\n" ); + output( "\tmovdqa %%xmm7,0x210(%%rsp)\n" ); + output( "\tmovdqa %%xmm8,0x220(%%rsp)\n" ); + output( "\tmovdqa %%xmm9,0x230(%%rsp)\n" ); + output( "\tmovdqa %%xmm10,0x240(%%rsp)\n" ); + output( "\tmovdqa %%xmm11,0x250(%%rsp)\n" ); + output( "\tmovdqa %%xmm12,0x260(%%rsp)\n" ); + output( "\tmovdqa %%xmm13,0x270(%%rsp)\n" ); + output( "\tmovdqa %%xmm14,0x280(%%rsp)\n" ); + output( "\tmovdqa %%xmm15,0x290(%%rsp)\n" ); + + output( "\tmovw %%cs,0x38(%%rsp)\n" ); + output( "\tmovw %%ds,0x3a(%%rsp)\n" ); + output( "\tmovw %%es,0x3c(%%rsp)\n" ); + output( "\tmovw %%fs,0x3e(%%rsp)\n" ); + output( "\tmovw %%gs,0x40(%%rsp)\n" ); + output( "\tmovw %%ss,0x42(%%rsp)\n" ); + output( "\tpushfq\n" ); + output( "\tpopq %%rax\n" ); + output( "\tmovl %%eax,0x44(%%rsp)\n" ); + + output( "\tmovl $0x%x,0x30(%%rsp)\n", 0x0010000f ); + + /* transfer the arguments */ + + output( "\tmovq %%r8,%u(%%rsp)\n", STACK_SPACE + 32 ); + output( "\tmovq %%r9,%u(%%rsp)\n", STACK_SPACE + 40 ); + output( "\tmovq $4,%%rax\n" ); + output( "\tleaq %u(%%rsp),%%rsi\n", STACK_SPACE + 16 ); + output( "\tcmpq %%rax,%%rcx\n" ); + output( "\tcmovgq %%rcx,%%rax\n" ); + output( "\tmovq %%rsp,%%rbx\n" ); + output( "\tleaq 16(,%%rax,8),%%rax\n" ); /* add 8 for context arg and 8 for rounding */ + output( "\tandq $~15,%%rax\n" ); + output( "\tsubq %%rax,%%rsp\n" ); + output( "\tmovq %%rsp,%%rdi\n" ); + output( "\tjrcxz 1f\n" ); + output( "\tcld\n" ); + output( "\trep\n\tmovsq\n" ); + output( "1:\tmovq %%rbx,0(%%rdi)\n" ); /* context arg */ + + /* call the entry point */ + + output( "\tmovq %%rdx,%%rax\n" ); + output( "\tmovq 0(%%rsp),%%rcx\n" ); + output( "\tmovq 8(%%rsp),%%rdx\n" ); + output( "\tmovq 16(%%rsp),%%r8\n" ); + output( "\tmovq 24(%%rsp),%%r9\n" ); + output( "\tcallq *%%rax\n" ); + + /* restore the context structure */ + + output( "1:\tmovq 0x80(%%rbx),%%rcx\n" ); + output( "\tmovq 0x88(%%rbx),%%rdx\n" ); + output( "\tmovq 0xa0(%%rbx),%%rbp\n" ); + output( "\tmovq 0xa8(%%rbx),%%rsi\n" ); + output( "\tmovq 0xb0(%%rbx),%%rdi\n" ); + output( "\tmovq 0xb8(%%rbx),%%r8\n" ); + output( "\tmovq 0xc0(%%rbx),%%r9\n" ); + output( "\tmovq 0xc8(%%rbx),%%r10\n" ); + output( "\tmovq 0xd0(%%rbx),%%r11\n" ); + output( "\tmovq 0xd8(%%rbx),%%r12\n" ); + output( "\tmovq 0xe0(%%rbx),%%r13\n" ); + output( "\tmovq 0xe8(%%rbx),%%r14\n" ); + output( "\tmovq 0xf0(%%rbx),%%r15\n" ); + + output( "\tmovdqa 0x1a0(%%rbx),%%xmm0\n" ); + output( "\tmovdqa 0x1b0(%%rbx),%%xmm1\n" ); + output( "\tmovdqa 0x1c0(%%rbx),%%xmm2\n" ); + output( "\tmovdqa 0x1d0(%%rbx),%%xmm3\n" ); + output( "\tmovdqa 0x1e0(%%rbx),%%xmm4\n" ); + output( "\tmovdqa 0x1f0(%%rbx),%%xmm5\n" ); + output( "\tmovdqa 0x200(%%rbx),%%xmm6\n" ); + output( "\tmovdqa 0x210(%%rbx),%%xmm7\n" ); + output( "\tmovdqa 0x220(%%rbx),%%xmm8\n" ); + output( "\tmovdqa 0x230(%%rbx),%%xmm9\n" ); + output( "\tmovdqa 0x240(%%rbx),%%xmm10\n" ); + output( "\tmovdqa 0x250(%%rbx),%%xmm11\n" ); + output( "\tmovdqa 0x260(%%rbx),%%xmm12\n" ); + output( "\tmovdqa 0x270(%%rbx),%%xmm13\n" ); + output( "\tmovdqa 0x280(%%rbx),%%xmm14\n" ); + output( "\tmovdqa 0x290(%%rbx),%%xmm15\n" ); + output( "\tfxrstor 0x100(%%rbx)\n" ); + output( "\tldmxcsr 0x34(%%rbx)\n" ); + + output( "\tmovl 0x44(%%rbx),%%eax\n" ); + output( "\tpushq %%rax\n" ); + output( "\tpopfq\n" ); + + output( "\tmovq 0x98(%%rbx),%%rax\n" ); /* stack pointer */ + output( "\tpushq 0xf8(%%rbx)\n" ); /* return address */ + output( "\tpopq -8(%%rax)\n" ); + output( "\tpushq 0x78(%%rbx)\n" ); /* rax */ + output( "\tpopq -16(%%rax)\n" ); + output( "\tmovq 0x90(%%rbx),%%rbx\n" ); + output( "\tleaq -16(%%rax),%%rsp\n" ); + output( "\tpopq %%rax\n" ); + output( "\tret\n" ); + + output_function_size( "__wine_call_from_regs" ); + + function_header( "__wine_restore_regs" ); + output( "\tmovq %%rcx,%%rbx\n" ); + output( "\tjmp 1b\n" ); + output_function_size( "__wine_restore_regs" ); +} + /******************************************************************* * BuildRelays32 @@ -985,21 +1157,29 @@ */ void BuildRelays32(void) { - if (target_cpu != CPU_x86) - { + switch (target_cpu) + { + case CPU_x86: + output( "/* File generated automatically. Do not edit! */\n\n" ); + output( "\t.text\n" ); + output( "%s:\n\n", asm_name("__wine_spec_thunk_text_32") ); + + /* 32-bit register entry point */ + BuildCallFrom32Regs(); + + output_function_size( "__wine_spec_thunk_text_32" ); + output_gnu_stack_note(); + break; + + case CPU_x86_64: + output( "/* File generated automatically. Do not edit! */\n\n" ); + output( "\t.text\n" ); + build_call_from_regs_x86_64(); + output_gnu_stack_note(); + break; + + default: output( "/* File not used with this architecture. Do not edit! */\n\n" ); return; } - - /* File header */ - - output( "/* File generated automatically. Do not edit! */\n\n" ); - output( "\t.text\n" ); - output( "%s:\n\n", asm_name("__wine_spec_thunk_text_32") ); - - /* 32-bit register entry point */ - BuildCallFrom32Regs(); - - output_function_size( "__wine_spec_thunk_text_32" ); - output_gnu_stack_note(); } Modified: trunk/reactos/tools/winebuild/spec32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/spec32.c?r… ============================================================================== --- trunk/reactos/tools/winebuild/spec32.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/spec32.c [iso-8859-1] Tue Jan 20 05:44:30 2009 @@ -52,7 +52,7 @@ { int i; - if (target_cpu != CPU_x86) return 0; + if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64) return 0; for (i = spec->base; i <= spec->limit; i++) { @@ -146,36 +146,58 @@ output( "\t.align %d\n", get_alignment(4) ); output( ".L__wine_spec_relay_entry_point_%d:\n", i ); - if (odp->flags & FLAG_REGISTER) - output( "\tpushl %%eax\n" ); - else - output( "\tpushl %%esp\n" ); - args = strlen(odp->u.func.arg_types); flags = 0; - if (odp->flags & FLAG_RET64) flags |= 1; - if (odp->type == TYPE_STDCALL) flags |= 2; - output( "\tpushl $%u\n", (flags << 24) | (args << 16) | (i - spec->base) ); - - if (UsePIC) - { - output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); - output( "1:\tleal .L__wine_spec_relay_descr-1b(%%eax),%%eax\n" ); - } - else output( "\tmovl $.L__wine_spec_relay_descr,%%eax\n" ); - output( "\tpushl %%eax\n" ); - - if (odp->flags & FLAG_REGISTER) - { - output( "\tcall *8(%%eax)\n" ); - } - else - { - output( "\tcall *4(%%eax)\n" ); - if (odp->type == TYPE_STDCALL) - output( "\tret $%u\n", args * get_ptr_size() ); + + switch (target_cpu) + { + case CPU_x86: + if (odp->flags & FLAG_REGISTER) + output( "\tpushl %%eax\n" ); else - output( "\tret\n" ); + output( "\tpushl %%esp\n" ); + + if (odp->flags & FLAG_RET64) flags |= 1; + output( "\tpushl $%u\n", (flags << 24) | (args << 16) | (i - spec->base) ); + + if (UsePIC) + { + output( "\tcall %s\n", asm_name("__wine_spec_get_pc_thunk_eax") ); + output( "1:\tleal .L__wine_spec_relay_descr-1b(%%eax),%%eax\n" ); + } + else output( "\tmovl $.L__wine_spec_relay_descr,%%eax\n" ); + output( "\tpushl %%eax\n" ); + + if (odp->flags & FLAG_REGISTER) + { + output( "\tcall *8(%%eax)\n" ); + } + else + { + output( "\tcall *4(%%eax)\n" ); + if (odp->type == TYPE_STDCALL) + output( "\tret $%u\n", args * get_ptr_size() ); + else + output( "\tret\n" ); + } + break; + + case CPU_x86_64: + output( "\tmovq %%rcx,8(%%rsp)\n" ); + output( "\tmovq %%rdx,16(%%rsp)\n" ); + output( "\tmovq %%r8,24(%%rsp)\n" ); + output( "\tmovq %%r9,32(%%rsp)\n" ); + output( "\tmovq %%rsp,%%r8\n" ); + output( "\tmovq $%u,%%rdx\n", (flags << 24) | (args << 16) | (i - spec->base) ); + output( "\tleaq .L__wine_spec_relay_descr(%%rip),%%rcx\n" ); + output( "\tsubq $40,%%rsp\n" ); + output( "\tcallq *%u(%%rcx)\n", (odp->flags & FLAG_REGISTER) ? 16 : 8 ); + output( "\taddq $40,%%rsp\n" ); + output( "\tret\n" ); + break; + + default: + assert(0); } } } @@ -307,8 +329,8 @@ /* output relays */ - /* we only support relay debugging on i386 */ - if (target_cpu != CPU_x86) + /* we only support relay debugging on i386 and x86_64 */ + if (target_cpu != CPU_x86 && target_cpu != CPU_x86_64) { output( "\t%s 0\n", get_asm_ptr_keyword() ); return; @@ -605,11 +627,8 @@ switch(odp->type) { case TYPE_EXTERN: - output( " %s", name ); is_data = 1; - if(strcmp(name, odp->link_name) || (odp->flags & FLAG_FORWARD)) - output( "=%s", odp->link_name ); - break; + /* fall through */ case TYPE_VARARGS: case TYPE_CDECL: /* try to reduce output */ @@ -621,7 +640,7 @@ { int at_param = strlen(odp->u.func.arg_types) * get_ptr_size(); output( " %s", name ); - if (!kill_at) output( "@%d", at_param ); + if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); if (odp->flags & FLAG_FORWARD) { output( "=%s", odp->link_name ); @@ -629,7 +648,7 @@ else if (strcmp(name, odp->link_name)) /* try to reduce output */ { output( "=%s", odp->link_name ); - if (!kill_at) output( "@%d", at_param ); + if (!kill_at && target_cpu == CPU_x86) output( "@%d", at_param ); } break; } Modified: trunk/reactos/tools/winebuild/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/utils.c?re… ============================================================================== --- trunk/reactos/tools/winebuild/utils.c [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/utils.c [iso-8859-1] Tue Jan 20 05:44:30 2009 @@ -37,6 +37,23 @@ #define MAX_TMP_FILES 8 static const char *tmp_files[MAX_TMP_FILES]; static unsigned int nb_tmp_files; + +static const struct +{ + const char *name; + enum target_cpu cpu; +} cpu_names[] = +{ + { "i386", CPU_x86 }, + { "i486", CPU_x86 }, + { "i586", CPU_x86 }, + { "i686", CPU_x86 }, + { "i786", CPU_x86 }, + { "x86_64", CPU_x86_64 }, + { "sparc", CPU_SPARC }, + { "alpha", CPU_ALPHA }, + { "powerpc", CPU_POWERPC } +}; /* atexit handler to clean tmp files */ static void cleanup_tmp_files(void) @@ -416,6 +433,15 @@ return buffer; } +/* parse a cpu name and return the corresponding value */ +enum target_cpu get_cpu_from_name( const char *name ) +{ + unsigned int i; + + for (i = 0; i < sizeof(cpu_names)/sizeof(cpu_names[0]); i++) + if (!strcmp( cpu_names[i].name, name )) return cpu_names[i].cpu; + return -1; +} /***************************************************************** * Function: get_alignment

15 years, 8 months

[tkreuzer] 38971: kdcom: implement KdpSendControlPacket and use it to respond with a reset packet to a reset packet. WindDbg expects this and will now finally except the resent packet and respond with a DBGKD_MANIPULATE_STATE64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jan 20 04:05:21 2009 New Revision: 38971 URL: http://svn.reactos.org/svn/reactos?rev=38971&view=rev Log: kdcom: implement KdpSendControlPacket and use it to respond with a reset packet to a reset packet. WindDbg expects this and will now finally except the resent packet and respond with a DBGKD_MANIPULATE_STATE64 Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Tue Jan 20 04:05:21 2009 @@ -575,6 +575,24 @@ return KdPacketReceived; } +VOID +NTAPI +KdpSendControlPacket( + IN USHORT PacketType, + IN ULONG PacketId OPTIONAL) +{ + KD_PACKET Packet; + + Packet.PacketLeader = CONTROL_PACKET_LEADER; + Packet.PacketId = PacketId; + Packet.ByteCount = 0; + Packet.Checksum = 0; + Packet.PacketType = PacketType; + + KdpSendBuffer(&Packet, sizeof(KD_PACKET)); +} + + /* NEW PUBLIC FUNCTIONS ******************************************************/ /****************************************************************************** @@ -928,7 +946,7 @@ case PACKET_TYPE_KD_RESET: FrLdrDbgPrint("KdReceivePacket - got a reset packet\n"); - // FIXME + KdpSendControlPacket(PACKET_TYPE_KD_RESET, INITIAL_PACKET_ID); return KdPacketNeedsResend; default:

15 years, 8 months

[cwittich] 38970: update mapi headers to wine 1.1.13

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 20 02:19:52 2009 New Revision: 38970 URL: http://svn.reactos.org/svn/reactos?rev=38970&view=rev Log: update mapi headers to wine 1.1.13 Modified: trunk/reactos/include/psdk/mapi.h trunk/reactos/include/psdk/mapicode.h trunk/reactos/include/psdk/mapidefs.h trunk/reactos/include/psdk/mapiguid.h trunk/reactos/include/psdk/mapitags.h trunk/reactos/include/psdk/mapiutil.h trunk/reactos/include/psdk/mapival.h trunk/reactos/include/psdk/mapix.h Modified: trunk/reactos/include/psdk/mapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mapi.h?rev=38… ============================================================================== --- trunk/reactos/include/psdk/mapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mapi.h [iso-8859-1] Tue Jan 20 02:19:52 2009 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 François Gouget + * Copyright (C) 2000 Francois Gouget * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPI_H @@ -27,15 +27,15 @@ #ifndef __LHANDLE #define __LHANDLE -typedef unsigned long LHANDLE, *LPLHANDLE; +typedef ULONG LHANDLE, *LPLHANDLE; #endif #define lhSessionNull ((LHANDLE)0) #ifndef WINE_FLAGS_DEFINED #define WINE_FLAGS_DEFINED -typedef unsigned long FLAGS; -#endif -typedef unsigned long* LPULONG; +typedef ULONG FLAGS; +#endif +typedef ULONG *LPULONG; typedef struct { @@ -191,7 +191,7 @@ MAPISENDDOCUMENTS MAPISendDocuments; typedef ULONG (WINAPI MAPISENDMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG); -typedef MAPISENDMAIL *LPMAPI; +typedef MAPISENDMAIL *LPMAPISENDMAIL; MAPISENDMAIL MAPISendMail; #ifdef __cplusplus Modified: trunk/reactos/include/psdk/mapicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mapicode.h?re… ============================================================================== --- trunk/reactos/include/psdk/mapicode.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mapicode.h [iso-8859-1] Tue Jan 20 02:19:52 2009 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPICODE_H Modified: trunk/reactos/include/psdk/mapidefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mapidefs.h?re… ============================================================================== --- trunk/reactos/include/psdk/mapidefs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mapidefs.h [iso-8859-1] Tue Jan 20 02:19:52 2009 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPIDEFS_H @@ -24,9 +24,8 @@ #endif #include <winerror.h> -#ifndef _OBJBASE_H_ #include <objbase.h> -#endif +#include <stddef.h> /* Some types from other headers */ #ifndef __LHANDLE @@ -219,7 +218,7 @@ #define MVI_FLAG (MV_FLAG|MV_INSTANCE) #define MVI_PROP(t) ((t)|MVI_FLAG) -#ifndef __WINESRC__ +#ifndef WINE_NO_UNICODE_MACROS # ifdef UNICODE # define PT_TSTRING PT_UNICODE # define PT_MV_TSTRING (MV_FLAG|PT_UNICODE) @@ -435,7 +434,7 @@ typedef struct _SPropProblem { ULONG ulIndex; /* Index of the property */ - ULONG ulPropTag; /* Proprty tag of the property */ + ULONG ulPropTag; /* Property tag of the property */ SCODE scode; /* Error code of the problem */ } SPropProblem, *LPSPropProblem; @@ -896,17 +895,17 @@ #define IMAPIProp_AddRef(p) (p)->lpVtbl->AddRef(p) #define IMAPIProp_Release(p) (p)->lpVtbl->Release(p) /*** IMAPIProp methods ***/ -#define IMAPIProp_GetLastError(p,a,b,c) (p)->lpVtbl->GetLastError(p,a,b,c) -#define IMAPIProp_SaveChanges(p,a) (p)->lpVtbl->SaveChanges(p,a) -#define IMAPIProp_GetProps(p,a,b,c,d) (p)->lpVtbl->GetProps(p,a,b,c,d) -#define IMAPIProp_GetPropList(p,a,b) (p)->lpVtbl->GetPropList(p,a,b) -#define IMAPIProp_OpenProperty(p,a,b,c,d,e) (p)->lpVtbl->OpenProperty(p,a,b,c,d,e) -#define IMAPIProp_SetProps(p,a,b,c) (p)->lpVtbl->SetProps(p,a,b,c) -#define IMAPIProp_DeleteProps(p,a,b) (p)->lpVtbl->DeleteProps(p,a,b) -#define IMAPIProp_CopyTo(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CopyTo(p,a,b,c,d,e,f,g,h,i) -#define IMAPIProp_CopyProps(p,a,b,c,d,e,f,g) (p)->lpVtbl->CopyProps(p,a,b,c,d,e,f,g) -#define IMAPIProp_GetNamesFromIDs(p,a,b,c,d,e) (p)->lpVtbl->GetNamesFromIDs(p,a,b,c,d,e) -#define IMAPIProp_GetIDsFromNames(p,a,b,c,d) (p)->lpVtbl->GetIDsFromNames(p,a,b,c,d) +#define IMAPIProp_GetLastError(p,a,b,c) (p)->lpVtbl->GetLastError(p,a,b,c) +#define IMAPIProp_SaveChanges(p,a) (p)->lpVtbl->SaveChanges(p,a) +#define IMAPIProp_GetProps(p,a,b,c,d) (p)->lpVtbl->GetProps(p,a,b,c,d) +#define IMAPIProp_GetPropList(p,a,b) (p)->lpVtbl->GetPropList(p,a,b) +#define IMAPIProp_OpenProperty(p,a,b,c,d,e) (p)->lpVtbl->OpenProperty(p,a,b,c,d,e) +#define IMAPIProp_SetProps(p,a,b,c) (p)->lpVtbl->SetProps(p,a,b,c) +#define IMAPIProp_DeleteProps(p,a,b) (p)->lpVtbl->DeleteProps(p,a,b) +#define IMAPIProp_CopyTo(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CopyTo(p,a,b,c,d,e,f,g,h,i) +#define IMAPIProp_CopyProps(p,a,b,c,d,e,f,g) (p)->lpVtbl->CopyProps(p,a,b,c,d,e,f,g) +#define IMAPIProp_GetNamesFromIDs(p,a,b,c,d,e) (p)->lpVtbl->GetNamesFromIDs(p,a,b,c,d,e) +#define IMAPIProp_GetIDsFromNames(p,a,b,c,d) (p)->lpVtbl->GetIDsFromNames(p,a,b,c,d) #endif typedef IMAPIProp *LPMAPIPROP; Modified: trunk/reactos/include/psdk/mapiguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mapiguid.h?re… ============================================================================== --- trunk/reactos/include/psdk/mapiguid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mapiguid.h [iso-8859-1] Tue Jan 20 02:19:52 2009 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPIGUID_H Modified: trunk/reactos/include/psdk/mapitags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mapitags.h?re… ============================================================================== --- trunk/reactos/include/psdk/mapitags.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mapitags.h [iso-8859-1] Tue Jan 20 02:19:52 2009 @@ -6,16 +6,16 @@ * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either - * version 2.1 of the License,or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * * This library 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not,write to the Free Software - * Foundation,Inc.,59 Temple Place,Suite 330,Boston,MA 02111-1307 USA + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPITAGS_H #define MAPITAGS_H @@ -415,7 +415,7 @@ #define PR_IPM_OUTBOX_SEARCH_KEY PROP_TAG(PT_BINARY,0x3411) #define PR_IPM_WASTEBASKET_SEARCH_KEY PROP_TAG(PT_BINARY,0x3412) #define PR_IPM_SENTMAIL_SEARCH_KEY PROP_TAG(PT_BINARY,0x3413) -/* Provder-defined message store type */ +/* Provider-defined message store type */ #define PR_MDB_PROVIDER PROP_TAG(PT_BINARY,0x3414) #define PR_RECEIVE_FOLDER_SETTINGS PROP_TAG(PT_OBJECT,0x3415) #define PR_VALID_FOLDER_MASK PROP_TAG(PT_I4,0x35DF) Modified: trunk/reactos/include/psdk/mapiutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mapiutil.h?re… ============================================================================== --- trunk/reactos/include/psdk/mapiutil.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mapiutil.h [iso-8859-1] Tue Jan 20 02:19:52 2009 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPIUTIL_H_ @@ -175,7 +175,7 @@ static inline FILETIME FtAddFt(FILETIME ftLeft, FILETIME ftRight) { LONG64 *pl = (LONG64*)&ftLeft, *pr = (LONG64*)&ftRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = *pl + *pr; return ftmap.ft; } @@ -183,7 +183,7 @@ static inline FILETIME FtSubFt(FILETIME ftLeft, FILETIME ftRight) { LONG64 *pl = (LONG64*)&ftLeft, *pr = (LONG64*)&ftRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = *pl - *pr; return ftmap.ft; } @@ -191,7 +191,7 @@ static inline FILETIME FtNegFt(FILETIME ftLeft) { LONG64 *p = (LONG64*)&ftLeft; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = -*p; return ftmap.ft; } @@ -199,7 +199,7 @@ static inline FILETIME FtMulDw(DWORD dwLeft, FILETIME ftRight) { LONG64 l = (LONG64)dwLeft, *pr = (LONG64*)&ftRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = l * (*pr); return ftmap.ft; } @@ -207,7 +207,7 @@ static inline FILETIME FtMulDwDw(DWORD dwLeft, DWORD dwRight) { LONG64 l = (LONG64)dwLeft, r = (LONG64)dwRight; - union { FILETIME ft; LONG64 ll; } ftmap; + union { FILETIME ft; LONG64 ll; } ftmap; ftmap.ll = l * r; return ftmap.ft; } @@ -253,17 +253,17 @@ #define IPropData_AddRef(p) (p)->lpVtbl->AddRef(p) #define IPropData_Release(p) (p)->lpVtbl->Release(p) /*** IMAPIProp methods ***/ -#define IPropData_GetLastError(p,a,b,c) (p)->lpVtbl->GetLastError(p,a,b,c) -#define IPropData_SaveChanges(p,a) (p)->lpVtbl->SaveChanges(p,a) -#define IPropData_GetProps(p,a,b,c,d) (p)->lpVtbl->GetProps(p,a,b,c,d) -#define IPropData_GetPropList(p,a,b) (p)->lpVtbl->GetPropList(p,a,b) -#define IPropData_OpenProperty(p,a,b,c,d,e) (p)->lpVtbl->OpenProperty(p,a,b,c,d,e) -#define IPropData_SetProps(p,a,b,c) (p)->lpVtbl->SetProps(p,a,b,c) -#define IPropData_DeleteProps(p,a,b) (p)->lpVtbl->DeleteProps(p,a,b) -#define IPropData_CopyTo(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CopyTo(p,a,b,c,d,e,f,g,h,i) -#define IPropData_CopyProps(p,a,b,c,d,e,f,g) (p)->lpVtbl->CopyProps(p,a,b,c,d,e,f,g) -#define IPropData_GetNamesFromIDs(p,a,b,c,d,e) (p)->lpVtbl->GetNamesFromIDs(p,a,b,c,d,e) -#define IPropData_GetIDsFromNames(p,a,b,c,d) (p)->lpVtbl->GetIDsFromNames(p,a,b,c,d) +#define IPropData_GetLastError(p,a,b,c) (p)->lpVtbl->GetLastError(p,a,b,c) +#define IPropData_SaveChanges(p,a) (p)->lpVtbl->SaveChanges(p,a) +#define IPropData_GetProps(p,a,b,c,d) (p)->lpVtbl->GetProps(p,a,b,c,d) +#define IPropData_GetPropList(p,a,b) (p)->lpVtbl->GetPropList(p,a,b) +#define IPropData_OpenProperty(p,a,b,c,d,e) (p)->lpVtbl->OpenProperty(p,a,b,c,d,e) +#define IPropData_SetProps(p,a,b,c) (p)->lpVtbl->SetProps(p,a,b,c) +#define IPropData_DeleteProps(p,a,b) (p)->lpVtbl->DeleteProps(p,a,b) +#define IPropData_CopyTo(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CopyTo(p,a,b,c,d,e,f,g,h,i) +#define IPropData_CopyProps(p,a,b,c,d,e,f,g) (p)->lpVtbl->CopyProps(p,a,b,c,d,e,f,g) +#define IPropData_GetNamesFromIDs(p,a,b,c,d,e) (p)->lpVtbl->GetNamesFromIDs(p,a,b,c,d,e) +#define IPropData_GetIDsFromNames(p,a,b,c,d) (p)->lpVtbl->GetIDsFromNames(p,a,b,c,d) #define IPropData_HrSetObjAccess(p,a) (p)->lpVtbl->HrSetObjAccess(p,a) #define IPropData_HrSetPropAccess(p,a,b) (p)->lpVtbl->HrSetPropAccess(p,a,b) #define IPropData_HrGetPropAccess(p,a,b) (p)->lpVtbl->HrGetPropAccess(p,a,b) Modified: trunk/reactos/include/psdk/mapival.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mapival.h?rev… ============================================================================== --- trunk/reactos/include/psdk/mapival.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mapival.h [iso-8859-1] Tue Jan 20 02:19:52 2009 @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPIVAL_H @@ -24,6 +24,8 @@ #endif #include <mapiutil.h> +#include <stddef.h> +#include <stdarg.h> BOOL WINAPI FBadRglpszW(LPWSTR*,ULONG); BOOL WINAPI FBadRowSet(LPSRowSet); Modified: trunk/reactos/include/psdk/mapix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mapix.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/mapix.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mapix.h [iso-8859-1] Tue Jan 20 02:19:52 2009 @@ -13,24 +13,16 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef MAPIX_H #define MAPIX_H -#ifndef MAPIDEFS_H #include <mapidefs.h> -#endif -#ifndef MAPICODE_H #include <mapicode.h> -#endif -#ifndef MAPIGUID_H #include <mapiguid.h> -#endif -#ifndef MAPITAGS_H #include <mapitags.h> -#endif #ifdef __cplusplus extern "C" { @@ -44,7 +36,7 @@ #ifndef WINE_FLAGS_DEFINED #define WINE_FLAGS_DEFINED -typedef unsigned long FLAGS; +typedef ULONG FLAGS; #endif /* Flags for MAPILogon and MAPILogonEx */ @@ -113,6 +105,10 @@ typedef MAPIFREEBUFFER *LPMAPIFREEBUFFER; MAPIFREEBUFFER MAPIFreeBuffer; #endif + +typedef HRESULT (WINAPI MAPIADMINPROFILES)(ULONG,LPPROFADMIN*); +typedef MAPIADMINPROFILES *LPMAPIADMINPROFILES; +MAPIADMINPROFILES MAPIAdminProfiles; /***************************************************************************** * IMAPISession interface

15 years, 8 months

[cwittich] 38969: stublement some more Activation Context stuff fix RTL_ACTIVATION_CONTEXT_STACK_FRAME in NDK

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jan 20 01:40:15 2009 New Revision: 38969 URL: http://svn.reactos.org/svn/reactos?rev=38969&view=rev Log: stublement some more Activation Context stuff fix RTL_ACTIVATION_CONTEXT_STACK_FRAME in NDK Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c trunk/reactos/include/ndk/rtltypes.h trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/dll/win32/kernel32/misc/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ac… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/actctx.c [iso-8859-1] Tue Jan 20 01:40:15 2009 @@ -138,7 +138,8 @@ DPRINT("ActivateActCtx(%p %p)\n", hActCtx, ulCookie ); - if ((Status = RtlActivateActivationContext(0, hActCtx, ulCookie))) + Status = RtlActivateActivationContext(0, hActCtx, ulCookie); + if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); return FALSE; @@ -173,7 +174,8 @@ DPRINT("CreateActCtxW(%p %08lx)\n", pActCtx, pActCtx ? pActCtx->dwFlags : 0); - if ((Status = RtlCreateActivationContext(&hActCtx, &pActCtx))) + Status = RtlCreateActivationContext(&hActCtx, &pActCtx); + if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); return INVALID_HANDLE_VALUE; @@ -235,7 +237,8 @@ NTSTATUS Status; RtlInitUnicodeString(&us, lpStringToFind); - if ((Status = RtlFindActivationContextSectionString(dwFlags, lpExtensionGuid, ulSectionId, &us, ReturnedData))) + Status = RtlFindActivationContextSectionString(dwFlags, lpExtensionGuid, ulSectionId, &us, ReturnedData); + if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); return FALSE; @@ -254,7 +257,8 @@ NTSTATUS Status; DPRINT("GetCurrentActCtx(%p)\n", phActCtx); - if ((Status = RtlGetActiveActivationContext(phActCtx))) + Status = RtlGetActiveActivationContext(phActCtx); + if (!NT_SUCCESS(Status)) { SetLastError(RtlNtStatusToDosError(Status)); return FALSE; @@ -305,8 +309,15 @@ HANDLE hActCtx ) { + NTSTATUS Status; DPRINT("ZombifyActCtx(%p)\n", hActCtx); - if (hActCtx != ACTCTX_FAKE_HANDLE) + + Status = RtlZombifyActivationContext(hActCtx); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); return FALSE; - return TRUE; -} + } + + return TRUE; +} Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Tue Jan 20 01:40:15 2009 @@ -742,7 +742,7 @@ // typedef struct _RTL_ACTIVATION_CONTEXT_STACK_FRAME { - struct __RTL_ACTIVATION_CONTEXT_STACK_FRAME *Previous; + struct _RTL_ACTIVATION_CONTEXT_STACK_FRAME *Previous; PACTIVATION_CONTEXT ActivationContext; ULONG Flags; } RTL_ACTIVATION_CONTEXT_STACK_FRAME, Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=38969… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Tue Jan 20 01:40:15 2009 @@ -28,6 +28,24 @@ #define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa) #define ACTCTX_FAKE_COOKIE ((ULONG_PTR) 0xf00bad) + +/* INTERNAL FUNCTIONS *******************************************************/ + +static NTSTATUS open_nt_file( HANDLE *handle, UNICODE_STRING *name ) +{ + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + return NtOpenFile( handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_ALERT ); +} + + /* FUNCTIONS ***************************************************************/ VOID @@ -58,10 +76,16 @@ NTAPI RtlGetActiveActivationContext(IN PVOID *Context) { - UNIMPLEMENTED; - + /* + if (NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame) + { + *Context = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame->ActivationContext; + RtlAddRefActivationContext(*Context); + } + else + *Context = 0; + */ *Context = ACTCTX_FAKE_HANDLE; - return STATUS_SUCCESS; } @@ -80,7 +104,16 @@ IN PUNICODE_STRING SectionName, IN OUT PVOID ReturnedData) { - UNIMPLEMENTED; + PACTCTX_SECTION_KEYED_DATA Data = ReturnedData; + + UNIMPLEMENTED; + + if (!Data || Data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) || + !SectionName || !SectionName->Buffer) + { + return STATUS_INVALID_PARAMETER; + } + return STATUS_NOT_IMPLEMENTED; } @@ -119,6 +152,10 @@ RtlZombifyActivationContext(PVOID Context) { UNIMPLEMENTED; + + if (Context == ACTCTX_FAKE_HANDLE) + return STATUS_SUCCESS; + return STATUS_NOT_IMPLEMENTED; } @@ -147,11 +184,27 @@ NTAPI RtlActivateActivationContext(IN ULONG Unknown, IN HANDLE Handle, OUT PULONG_PTR Cookie) { + /* + PRTL_ACTIVATION_CONTEXT_STACK_FRAME Frame; + + Frame = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*Frame) ); + if (!Frame) + return STATUS_NO_MEMORY; + + Frame->Previous = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; + Frame->ActivationContext = Handle; + Frame->Flags = 0; + NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = Frame; + RtlAddRefActivationContext(Handle); + + *Cookie = (ULONG_PTR)Frame; + DPRINT( "%p Cookie=%lx\n", Handle, *Cookie ); + */ + UNIMPLEMENTED; if (Cookie) *Cookie = ACTCTX_FAKE_COOKIE; - return STATUS_SUCCESS; } @@ -160,16 +213,61 @@ RtlCreateActivationContext(OUT PHANDLE Handle, IN OUT PVOID ReturnedData) { PCACTCTXW pActCtx = (PCACTCTXW) ReturnedData; - - UNIMPLEMENTED; - - if (!pActCtx) - *Handle = INVALID_HANDLE_VALUE; - if (pActCtx->cbSize != sizeof *pActCtx) - *Handle = INVALID_HANDLE_VALUE; - if (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL) - *Handle = INVALID_HANDLE_VALUE; + UNICODE_STRING NameW; + NTSTATUS Status = STATUS_SUCCESS; + HANDLE hFile = INVALID_HANDLE_VALUE; + + UNIMPLEMENTED; + + if (!pActCtx || (pActCtx->cbSize < sizeof(*pActCtx)) || + (pActCtx->dwFlags & ~ACTCTX_FLAGS_ALL)) + return STATUS_INVALID_PARAMETER; + + NameW.Buffer = NULL; + if (pActCtx->lpSource) + { + if (!RtlDosPathNameToNtPathName_U(pActCtx->lpSource, &NameW, NULL, NULL)) + { + Status = STATUS_NO_SUCH_FILE; + goto Error; + } + Status = open_nt_file( &hFile, &NameW ); + if (!NT_SUCCESS(Status)) + { + RtlFreeUnicodeString( &NameW ); + goto Error; + } + } + + if (pActCtx->dwFlags & ACTCTX_FLAG_RESOURCE_NAME_VALID) + { + /* if we have a resource it's a PE file */ + if (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID) + { + } + else if (pActCtx->lpSource) + { + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + } + else + { + /* manifest file */ + } + + if (hFile) + NtClose( hFile ); + if (NameW.Buffer) + RtlFreeUnicodeString( &NameW ); + *Handle = ACTCTX_FAKE_HANDLE; - - return STATUS_SUCCESS; -} + return Status; + +Error: + if (hFile) NtClose( hFile ); + return Status; + +}

15 years, 8 months

[dreimer] 38968: Bug 4030: Greek Update by Apostolos Alexiadis Bug 4044: Czech translation update - desk.cpl by Radek Liska Bug 4035: a few updates for ros by Mario Kacmar Bug 4037: Translate norwegian file by Lars Martin Hambro

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue Jan 20 01:28:51 2009 New Revision: 38968 URL: http://svn.reactos.org/svn/reactos?rev=38968&view=rev Log: Bug 4030: Greek Update by Apostolos Alexiadis Bug 4044: Czech translation update - desk.cpl by Radek Liska Bug 4035: a few updates for ros by Mario Kacmar Bug 4037: Translate norwegian file by Lars Martin Hambro Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/el-GR.rc trunk/reactos/dll/cpl/access/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc trunk/reactos/dll/cpl/usrmgr/usrmgr.c trunk/reactos/dll/win32/newdev/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -9,14 +9,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dez",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Okt",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dez",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Okt",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -13,14 +13,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -18,14 +18,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN GROUPBOX "",IDC_STATIC,4,16,132,21 - CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, - 10 - CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, - 10 - CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, - 10 - CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, - 26,10 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 GROUPBOX "",IDC_STATIC,4,36,76,21 CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,44,26,10 Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/el… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/el-GR.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -33,7 +33,7 @@ CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "ÐáôÞóôå Åðüìåíï ãéá íá ñõèìßóåôå ôéò óõóêåõÝò.", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 Modified: trunk/reactos/dll/cpl/access/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/el-GR.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -53,7 +53,7 @@ PUSHBUTTON "&Ñõèìßóåéò",IDC_CONTRAST_BUTTON,PROPSHEETWIDTH-PROPSHEETPADDING(17),LABELLINE(5)+2,PROPSHEETPADDING(15),14 GROUPBOX "ÅðéëïãÝò äñïìÝá",-1,PROPSHEETPADDING(1),LABELLINE(8)+5,PROPSHEETWIDTH-PROPSHEETPADDING(2),LABELLINE(13) - LTEXT "ÍåôáêéíÞóôå ôá ñõèìéóôéêÜ, þóôå íá áëëÜîåôå ôçí ôá÷ýôçôá ìå ôçí ïðïßá áíáâïóâÞíåé ï äñïìÝíáò (ñõèìüò åíáëëáãÞò öùôåéíüôçôáò) êáé ôï ðëÜôïò ôïõ äñïìÝá.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(2) + LTEXT "ÌåôáêéíÞóôå ôá ñõèìéóôéêÜ, þóôå íá áëëÜîåôå ôçí ôá÷ýôçôá ìå ôçí ïðïßá áíáâïóâÞíåé ï äñïìÝíáò (ñõèìüò åíáëëáãÞò öùôåéíüôçôáò) êáé ôï ðëÜôïò ôïõ äñïìÝá.",-1,PROPSHEETPADDING(2),LABELLINE(9)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(3) CTEXT "Ñõèìüò åíáëëáãÞò öùôåéíüôçôáò:",-1,PROPSHEETPADDING(2),LABELLINE(12)+5,PROPSHEETWIDTH-PROPSHEETPADDING(4),LABELLINE(1) LTEXT "ÊáíÝíáò",-1,PROPSHEETPADDING(3),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) LTEXT "Õøçëüò",-1,PROPSHEETWIDTH-PROPSHEETPADDING(9),LABELLINE(14)+2,PROPSHEETPADDING(6),LABELLINE(1) Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -229,7 +229,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DISPLAY_SETTINGS "Display settings" - IDS_APPLY_FAILED "Failed to apply new settings..." - IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_DISPLAY_SETTINGS "Nastavení zobrazení" + IDS_APPLY_FAILED "Nepodaøilo se aplikovat nová nastavení..." + IDS_APPLY_NEEDS_RESTART "Aby se zmìny projevily, je tøeba restartovat poèítaè." +END Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -224,7 +224,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DISPLAY_SETTINGS "Display settings" - IDS_APPLY_FAILED "Failed to apply new settings..." - IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_DISPLAY_SETTINGS "Skjerm innstillinger" + IDS_APPLY_FAILED "Mislykket å endre innstillingene..." + IDS_APPLY_NEEDS_RESTART "Du trenger å starte datamaskinen på nytt for at innstillingene skal endres." +END Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -3,7 +3,7 @@ * PURPOSE: Slovak Language File for desk * TRANSLATOR: Mário Kaèmár aka Kario <kario(a)szm.sk> * DATE OF TR.: 15-09-2007 - * LAST CHANGE: 05-10-2008 + * LAST CHANGE: 19-01-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -232,7 +232,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_DISPLAY_SETTINGS "Display settings" - IDS_APPLY_FAILED "Failed to apply new settings..." - IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." -END + IDS_DISPLAY_SETTINGS "Nastavenia zobrazenia" // obrazovky ? + IDS_APPLY_FAILED "Nepodarilo sa aplikova nové nastavenia..." + IDS_APPLY_NEEDS_RESTART "Je potrebné retartova poèítaè, aby sa prejavili zmeny." +END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/el-GR.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -2,21 +2,21 @@ IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welcome to the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "This wizard helps you:", -1, 114, 40, 182, 8 + LTEXT "Êáëþò Þëèáôå óôïí Ïäçãü ÐñïóèÞêçò Õëéêïý", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Áõôüò ï ïäçãüò óáò âïçèÜ íá:", -1, 114, 40, 182, 8 LTEXT "1) Install software to support the hardware you add to your computer.", -1, 121, 56, 184, 16 LTEXT "2) Troubleshoot problems you may be having with your hardware.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 LTEXT "If your hardware came with an installation CD, it is recommended that you click Cancel to close this wizard and use the manufacturer's CD to install this hardware.", 503, 150, 106, 155, 50 - LTEXT "To continue, click Next.", -1, 114, 166, 193, 8 + LTEXT "Ãéá íá óõíå÷ßóåôå, ðáôÞóôå 'Åðüìåíï'.", -1, 114, 166, 193, 8 END IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 8, 275, 32 @@ -25,17 +25,17 @@ IDD_ISCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Have you already connected this hardware to your computer?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Yes, I have already connected the hardware", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "&No, I have not added the hardware yet", IDC_NOTCONNECTED, 29, 35, 266, 8 + LTEXT "¸÷åôå Þäç óõíäÝóåé áõôÞ ôç óõóêåõÞ óôïí õðïëïãéóôÞ óáò;", -1, 20, 11, 275, 8 + AUTORADIOBUTTON "&Íáé, Ý÷ù Þäç óõíäÝóåé ôç óõóêåõÞ", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "&¼÷é, äåí ôçí Ý÷ù óõíäÝóåé áêüìá", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 @@ -46,22 +46,22 @@ IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24 - LTEXT "What do you want the wizard to do?", -1, 23, 40, 275, 8 + LTEXT "Ôé èÝëåôå ï ïäçãüò íá êÜíåé;", -1, 23, 40, 275, 8 AUTORADIOBUTTON "&Search for and install the hardware automatically (Recommended)", IDC_AUTOINSTALL, 30, 55, 266, 8, WS_GROUP | NOT WS_TABSTOP AUTORADIOBUTTON "Install the hardware that I &manually select from a list (Advanced)", IDC_MANUALLYINST, 30, 70, 266, 8, NOT WS_TABSTOP END IDD_DETECTEDHWPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "Õëéêü ðïõ áíé÷íåýèçêå:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END @@ -77,11 +77,11 @@ IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15 - LTEXT "Total progress:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 + LTEXT "Ç áíáæÞôçóç ãéá óõóêåõÝò ìðïñåß íá äéáñêÝóåé áñêåôÜ ëåðôÜ.", -1, 21, 8, 275, 15 + LTEXT "ÓõíïëéêÞ ðñüïäïò:", IDC_TPROGRESSTEXT, 21, 25, 275, 8 CONTROL "", IDC_TPROGRESSBAR, "msctls_progress32", 0, 21, 37, 275, 14 LTEXT "", IDC_PROGRESSTEXT, 58, 58, 200, 8, SS_NOPREFIX CONTROL "", IDC_PROGRESSBAR, "msctls_progress32", 0, 58, 70, 200, 8 @@ -89,48 +89,48 @@ IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "You have successfully completed the Add Hardware wizard.", -1, 114, 32, 193, 19 + LTEXT "ÏëïêëÞñùóç ôïõ Ïäçãïý ÐñïóèÞêçò Õëéêïý", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Ïëïêëçñþóáôå åðéôõ÷þò ôïí Ïäçãü ÐñïóèÞêçò Õëéêïý.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Ãéá íá êëåßóåôå áõôüí ôïí ïäçãü, ðáôÞóôå 'ÏëïêëÞñùóç'.", -1, 114, 166, 132, 8 END IDD_ISFOUNDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 - LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Ï ïäçãüò âñÞêå ôéò ðáñáêÜôù óõóêåõÝò óõíäåäåìÝíåò óôïí õðïëïãéóôÞ óáò:", -1, 114, 32, 193, 19 + LTEXT "Ãéá íá êëåßóåôå áõôüí ôïí ïäçãü, ðáôÞóôå 'ÏëïêëÞñùóç'.", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END IDD_HWSTATUSPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28 LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16 - LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "Ãéá íá âãåßôå áðü ôïí ïäçãü, ðáôÞóôå '¢êõñï'.", IDC_STATUSTEXT, 114, 166, 132, 8 END IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Ïäçãüò ÐñïóèÞêçò Õëéêïý" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 - LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "Ãéá íá êëåßóåôå áõôüí ôïí ïäçãü, ðáôÞóôå 'ÏëïêëÞñùóç'.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE @@ -139,9 +139,9 @@ IDS_CPLDESCRIPTION "Ðñüóèåóç óõóêåõþí óôïí õðïëïãéóôÞ óáò." IDS_SEARCHTITLE "Please wait while the wizard searches..." IDS_SEARCHTEXT "This wizard is searching for hardware that has been connected to your computer recently but has not yet been installed." - IDS_ISCONNECTED "Is the hardware connected?" + IDS_ISCONNECTED "Åßíáé áõôÞ ç óõóêåõÞ óõíäåäåìÝíç;" IDS_PROBELISTTITLE "The following hardware is already installed on your computer" IDS_ADDNEWDEVICE "Add a new hardware device" - IDS_SELECTWAYTITLE "The wizard can help you install other hardware" + IDS_SELECTWAYTITLE "Ï ïäçãüò ìðïñåß íá óáò âïçèÞóåé íá åãêáôáóôÞóåôå Üëëåò óõóêåõÝò" IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/no-NO.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -38,7 +38,7 @@ CAPTION "Veiviser for å legge til maskinvare" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Fra listen under, velg en installert maskinvare type, også trykk på Neste for å sjekke egenskaper eller feilsøke et problem som du har.", -1, 21, 8, 275, 22 + LTEXT "Fra listen under, velg en installert maskinvare komponent, også trykk på Neste for å sjekke egenskaper eller feilsøke et problem som du har.", -1, 21, 8, 275, 22 LTEXT "For å legge til maskinvare som ikke er vist på listen, trykk ""Legg til ny maskinvare enhet.""", -1, 21, 32, 275, 24 LTEXT "I&nstallert maskinvare:", -1, 21, 62, 140, 8 CONTROL "", IDC_PROBELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 72, 275, 66 @@ -143,5 +143,5 @@ IDS_PROBELISTTITLE "Følgende maskinvare har blitt installert på din datamaskin" IDS_ADDNEWDEVICE "Legg til en ny maskinvare enhet" IDS_SELECTWAYTITLE "Veiviseren kan hjelpe deg å installere andre maskinvare" - IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" + IDS_HDTYPESTITLE "Fra listen under, velg maskinvare komponenten som du vil installere" END Modified: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -1,13 +1,13 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 02-02-2008 - * LAST CHANGE: 06-01-2009 + * LAST CHANGE: 10-01-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Sprievodca pridaním hardvéru" +CAPTION "Sprievodca pridaním hardvéru" // Add Hardware Wizard FONT 8, "MS Shell Dlg" BEGIN LTEXT "Víta Vás sprievodca pridaním hardvéru", IDC_FINISHTITLE, 114, 8, 203, 24 @@ -40,7 +40,7 @@ IDD_PROBELISTPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN LTEXT "From the list below, select an installed hardware device, then click Next to check properties or troubleshoot a problem you might be having.", -1, 21, 8, 275, 22 @@ -51,7 +51,7 @@ IDD_SELECTWAYPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN LTEXT "The wizard can search for other hardware and automatically install it for you. Or, if you know exactly which hardware model you want to install, you can select it from a list.", -1, 21, 8, 280, 24 @@ -62,17 +62,17 @@ IDD_DETECTEDHWPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN LTEXT "", IDC_STATUSTEXT, 21, 9, 275, 40 - LTEXT "Detected hardware:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 + LTEXT "Zistený hardvér:", IDC_DETECTEDHWTEXT, 21, 53, 176, 8 CONTROL "", IDC_DETECTEDHWLIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER, 21, 65, 275, 70 END IDD_HWTYPESPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN LTEXT "If you do not see the hardware category you want, click Show All Devices.", IDC_STATUSTEXT, 21, 9, 275, 18 @@ -82,7 +82,7 @@ IDD_PROGRESSPAGE DIALOG DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN LTEXT "It may take several minutes to search for hardware.", -1, 21, 8, 275, 15 @@ -97,7 +97,7 @@ CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Dokonèenie sprievodcu pridaním hardvéru", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Dokonèenie sprievodcu pridaním hardvéru", IDC_FINISHTITLE, 114, 8, 203, 24 // Completing the Add Hardware Wizard LTEXT "Úspene ste dokonèili sprievodcu pridaním hardvéru.", -1, 114, 32, 193, 19 LTEXT "", IDC_STATUSTEXT, 114, 70, 193, 92 LTEXT "Pre zatvorenie tohto sprievodcu kliknite na tlaèidlo Dokonèi.", -1, 114, 166, 132, 8 @@ -105,37 +105,37 @@ IDD_ISFOUNDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 24 + LTEXT "Dokonèenie sprievodcu pridaním hardvéru", IDC_FINISHTITLE, 114, 8, 203, 24 LTEXT "The wizard found the following hardware connected to your computer:", -1, 114, 32, 193, 19 - LTEXT "To close this wizard, click Finish.", -1, 114, 166, 132, 8 + LTEXT "Pre zatvorenie tohto sprievodcu kliknite na tlaèidlo Dokonèi.", -1, 114, 166, 132, 8 CONTROL "", IDC_FOUNDHARDWARELIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHAREIMAGELISTS, 114, 56, 193, 78 END IDD_HWSTATUSPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Completing the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 195, 28 + LTEXT "Dokonèenie sprievodcu pridaním hardvéru", IDC_FINISHTITLE, 114, 8, 195, 28 LTEXT "Here is the current status of the hardware you selected:", -1, 114, 40, 193, 19 EDITTEXT IDC_HWSTATUSEDIT, 114, 60, 193, 70, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP LTEXT "To start a troubleshooter that can help you resolve any problems you might be having, click Finish.", -1, 114, 136, 193, 16 - LTEXT "To exit this wizard, click Cancel.", IDC_STATUSTEXT, 114, 166, 132, 8 + LTEXT "Sprievodcu ukonèíte kliknutím na tlaèidlo Zrui.", IDC_STATUSTEXT, 114, 166, 132, 8 END IDD_NOTCONNECTEDPAGE DIALOG DISCARDABLE 0, 0, 317, 186 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Add Hardware Wizard" +CAPTION "Sprievodca pridaním hardvéru" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Cannot Continue the Add Hardware Wizard", IDC_FINISHTITLE, 114, 8, 203, 28 LTEXT "To continue, connect this hardware to your computer.", -1, 114, 40, 193, 16 AUTOCHECKBOX "&Turn off the computer when I click Finish so that I can open the computer and connect the hardware.", IDC_TURNOFFCHECKBOX, 114, 64, 203, 20, BS_TOP | BS_MULTILINE LTEXT "In most cases ReactOS will automatically install your hardware after you connect it. If ReactOS does not find it, you can reopen this wizard to install the supporting software.", -1, 114, 98, 193, 32 - LTEXT "To close this wizard, click Finish.", IDC_STATUSTEXT, 114, 166, 193, 8 + LTEXT "Pre zatvorenie tohto sprievodcu kliknite na tlaèidlo Dokonèi.", IDC_STATUSTEXT, 114, 166, 193, 8 END STRINGTABLE @@ -144,9 +144,9 @@ IDS_CPLDESCRIPTION "Naintaluje nové hardvérové komponenty Váho poèítaèa." IDS_SEARCHTITLE "Poèkajte, prosím, kým sprievodca h¾adá ..." IDS_SEARCHTEXT "Tento sprievodca práve h¾adá hardvér, ktorý bol nedávno pripojený k Vámu poèítaèu, ale zatia¾ ete nebol naintalovaný." - IDS_ISCONNECTED "Je hardvére pripojený?" - IDS_PROBELISTTITLE "The following hardware is already installed on your computer" - IDS_ADDNEWDEVICE "Add a new hardware device" + IDS_ISCONNECTED "Je hardvér pripojený?" + IDS_PROBELISTTITLE "Nasledovný hardvér u je naintalovaný na Vaom poèítaèi" + IDS_ADDNEWDEVICE "Prida nové hardvérové zariadenie" IDS_SELECTWAYTITLE "The wizard can help you install other hardware" IDS_HDTYPESTITLE "From the list below, select the type of hardware you are installing" END Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.c [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS User Manager Control Panel - * FILE: dll/cpl/usrmgr/extra.c + * FILE: dll/cpl/usrmgr/usrmgr.c * PURPOSE: Main functions * * PROGRAMMERS: Eric Kohl Modified: trunk/reactos/dll/win32/newdev/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/el-G… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/el-GR.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -9,9 +9,9 @@ LTEXT "Êáëþò Þëèáôå",IDC_WELCOMETITLE,120,8,195,24 LTEXT "Áõôüò ï âïçèüò åãêáèéóôÜ Ýíáí ïäçãü óõóêåõÞò ãéá ôï:", IDC_STATIC,120,21,195,16 - LTEXT "ÐáôÞóôå Åðüìåíï ãéá íá óõíå÷ßóåôå.",IDC_STATIC,120,169,195,17 + LTEXT "ÐáôÞóôå 'Åðüìåíï' ãéá íá óõíå÷ßóåôå.",IDC_STATIC,120,169,195,17 LTEXT "ÁÃÍÙÓÔÇ ÓÕÓÊÅÕÇ",IDC_DEVICE,134,36,164,11 - LTEXT "ÑÏÅÉÄÏÐÏÉÇÓÇ! Ç ÅÃÊÁÔ¢ÓÔÁÓÇ ÌÉÁÓ ÄÉÊÇÓ ÓÁÓ ÓÕÓÊÅÕÇÓ ÌÐÏÑÅÉ ÍÁ ÐÁÃÙÓÅÉ ÔÇ ËÅÉÔÏÕÑÃÉÁ ÔÏÕ ÕÐÏËÏÃÉÓÔÇ 'Ç ÍÁ ÔÏÍ ÊÁÍÅÉ ÌÇ ÅÐÁÍÅÊÊÉÍÇÓÉÌÏ!",IDC_STATIC,120,59,195,16 + LTEXT "ÐÑÏÅÉÄÏÐÏÉÇÓÇ! Ç ÅÃÊÁÔ¢ÓÔÁÓÇ ÌÉÁÓ ÄÉÊÇÓ ÓÁÓ ÓÕÓÊÅÕÇÓ ÌÐÏÑÅÉ ÍÁ ÐÁÃÙÓÅÉ ÔÇ ËÅÉÔÏÕÑÃÉÁ ÔÏÕ ÕÐÏËÏÃÉÓÔÇ 'Ç ÍÁ ÔÏÍ ÊÁÍÅÉ ÌÇ ÅÐÁÍÅÊÊÉÍÇÓÉÌÏ!",IDC_STATIC,120,59,195,25 CONTROL "Áõôüìáôç åãêáôÜóôáóç ïäçãïý",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "ÅãêáôÜóôáóç ïäçãïý áðü óõãêåêñéìÝíç ôïðïèåóßá",IDC_RADIO_MANUAL, @@ -27,7 +27,7 @@ LTEXT "Ç åãêáôÜóôáóç áðÝôõ÷å",IDC_FINISHTITLE,120,8,195,24 LTEXT "Ç óõóêåõÞ äåí Þôáí äõíáôüí íá åãêáôáóôáèåß åðåéäÞ ï ïäçãüò äå âñÝèçêå.", IDC_STATIC,120,40,195,19 - LTEXT "ÐáôÞóôå óôï Ðñïçãïýìåíï áí Ý÷åôå äéóêÝôá ïäçãïý Þ îÝñåôå ôïí êáôÜëïãü ôïõ.", + LTEXT "ÐáôÞóôå 'Ðñïçãïýìåíï' áí Ý÷åôå äéóêÝôá ïäçãïý Þ îÝñåôå ôïí êáôÜëïãü ôïõ.", IDC_STATIC,120,98,181,24 CONTROL "Íá ìçí åìöáíéóôåß áõôü ôï ðáñÜèõñï îáíÜ",IDC_DONOTSHOWDLG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 @@ -88,7 +88,7 @@ LTEXT "Ç åãêáôÜóôáóç ïëïêëçñþèçêå",IDC_FINISHTITLE,120,8,195,11 LTEXT "ÐñÝðåé íá åðáíåêêéíÞóåôå ôïí õðïëïãéóôÞ óáò ãéá íá ïëïêëçñþóåôå ôçí åãêáôÜóôáóç ôïõ:", IDC_STATIC,120,32,195,19 - LTEXT "ÐáôÞóôå ÏëïêëÞñùóç ãéá íá êëåßóåôå ôïí âïçèü.",IDC_STATIC,120,174, + LTEXT "ÐáôÞóôå 'ÏëïêëÞñùóç' ãéá íá êëåßóåôå ôï âïçèü.",IDC_STATIC,120,174, 179,11 LTEXT "ÁÃÍÙÓÔÇ ÓÕÓÊÅÕÇ",IDC_DEVICE,148,53,147,12 END @@ -102,7 +102,7 @@ LTEXT "Ç åãêáôÜóôáóç ïëïêëçñþèçêå",IDC_FINISHTITLE,120,8,195,11 LTEXT "Ï âïçèüò ïëïêëÞñùóå ôçí åãêáôÜóôáóç ïäçãïý ãéá ôï:", IDC_STATIC,120,32,195,19 - LTEXT "ÐáôÞóôå ÏëïêëÞñùóç ãéá íá êëåßóåôå ôïí âïçèü.",IDC_STATIC,120,174, + LTEXT "ÐáôÞóôå 'ÏëïêëÞñùóç' ãéá íá êëåßóåôå ôï âïçèü.",IDC_STATIC,120,174, 179,11 LTEXT "ÁÃÍÙÓÔÇ ÓÕÓÊÅÕÇ",IDC_DEVICE,148,53,147,12 END Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Tue Jan 20 01:28:51 2009 @@ -29,7 +29,7 @@ LTEXT "Áõôüò ï ïäçãüò åãêáèéóôÜ ôï ReactOS óôïí õðïëïãéóôÞ óáò. Ï ïäçãüò "\ "÷ñåéÜæåôáé ðñþôá êÜðïéåò ðëçñïöïñßåò ãéá åóÜò êáé ãéá ôïí õðïëïãéóôÞ óáò "\ "ãéá íá ñõèìßóåé óùóôÜ ôï ReactOS.", IDC_STATIC, 115, 40, 195, 100 - LTEXT "ÐáôÞóôå ôï êïõìðß Åðüìåíï ãéá íá óõíå÷ßóåé ç åãêáôÜóôáóç.", IDC_STATIC, 115, 169, 195, 17 + LTEXT "ÐáôÞóôå ôï êïõìðß 'Åðüìåíï' ãéá íá óõíå÷ßóåé ç åãêáôÜóôáóç.", IDC_STATIC, 115, 169, 195, 17 END @@ -47,7 +47,7 @@ "Þ íá åðáíáäéáíåßìåôå ìÝñç ôïõ Þ ïëüêëçñï ôï Reactos, ðñÝðåé íá ôçñåßôå ôçí GPL.", IDC_STATIC,15,110,227,24 PUSHBUTTON "&¢äåéá...",IDC_VIEWGPL,251,110,50,19 - LTEXT "ÐáôÞóôå ôï êïõìðß Åðüìåíï ãéá íá óõíå÷Þóåôå.",IDC_STATIC,15,136, + LTEXT "ÐáôÞóôå ôï êïõìðß 'Åðüìåíï' ãéá íá óõíå÷ßóåôå.",IDC_STATIC,15,136, 195,17 END @@ -83,7 +83,7 @@ IDC_STATIC, 54, 83, 250, 16 LTEXT "&Êùäéêüò ðñüóâáóçò:", IDC_STATIC, 54, 104, 75, 8 EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "&ÅðéâáéâÝùóç êùäéêïý:", IDC_STATIC, 54, 123, 75, 8 + LTEXT "&Åðéâåâáßùóç êùäéêïý:", IDC_STATIC, 54, 123, 75, 8 EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -95,16 +95,16 @@ BEGIN LTEXT "Ïé ôïðéêÝò ñõèìéóåéò ðñÝðåé íá ôáéñéÜæïõí ìå ôç ãëþóóá ôùí åöáñìïãþí "\ "ðïõ èÝëåôå íá ÷ñçóéìïðïéÞóåôå. Åðßóçò åëÝã÷ïõí ôïí ôñüðï "\ - "ìå ôïí ïðïßï èá åìöáíßæïíôáé ïé áñéèìïß, ôá íïìßóìáôá êáé ïé çìåñïìçíßåò.", IDC_STATIC, 53, 7, 253, 20 - LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 - LTEXT "Ãéá íá áëëÜîåôå ôéò ôïðéêÝò ñõèìßóåéò, ðáôÞóôå ôï êïõìðß ÐñïóáñìïãÞ.", - IDC_STATIC, 53, 57, 184, 14 + "ìå ôïí ïðïßï èá åìöáíßæïíôáé ïé áñéèìïß, ôá íïìßóìáôá êáé ïé çìåñïìçíßåò.", IDC_STATIC, 53, 7, 253, 31 + LTEXT "", IDC_LOCALETEXT, 53, 31, 250, 16 + LTEXT "Ãéá íá áëëÜîåôå ôéò ôïðéêÝò ñõèìßóåéò, ðáôÞóôå ôï êïõìðß 'ÐñïóáñìïãÞ'.", + IDC_STATIC, 53, 57, 184, 16 PUSHBUTTON "&ÐñïóáñìïãÞ...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 LTEXT "Ç äéÜôáîç ðëçêôñïëïãßïõ ÝëÝã÷åé ôïõò ÷áñáêôÞñåò ðïõ èá åìöáíßæïíôáé êáèþò ðëçêôñïëïãåßôå.", - IDC_STATIC, 53, 86, 253, 16 - LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 + IDC_STATIC, 53, 86, 253, 20 + LTEXT "", IDC_LAYOUTTEXT, 53, 102, 253, 16 LTEXT "Ãéá íá áëëÜîåôå ôç äéÜôáîç ôïõ ðëçêôñïëïãßïõ, ðáôÞóôå ôï êïõìðß 'ÐñïóáñìïãÞ'.", - IDC_STATIC, 53, 122, 184, 14 + IDC_STATIC, 53, 122, 184, 16 PUSHBUTTON "Ð&ñïóáñìïãÞ...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 END @@ -197,9 +197,9 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "ÂïçèÞìáôá" - IDS_CMT_CALC "Launch Calculator" + IDS_CMT_CALC "Öüñôùóç ôïõ Calculator" IDS_CMT_CMD "Open command prompt" - IDS_CMT_EXPLORER "Launch Explorer" + IDS_CMT_EXPLORER "Öüñôùóç ôïõ ÅîåñåõíçôÞ" IDS_CMT_NOTEPAD "Launch Text Editor" IDS_CMT_REGEDIT "Launch Registry Editor" IDS_CMT_WORDPAD "Launch Document Editor"

15 years, 8 months

[tkreuzer] 38967: kdcom: partly handle control packets, now we resend our data on reset packets, but WinDbg still doesn't like them.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 19 21:17:31 2009 New Revision: 38967 URL: http://svn.reactos.org/svn/reactos?rev=38967&view=rev Log: kdcom: partly handle control packets, now we resend our data on reset packets, but WinDbg still doesn't like them. Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Mon Jan 19 21:17:31 2009 @@ -878,9 +878,9 @@ /* Step 3 - Read ByteCount */ RcvCode = KdpReceiveBuffer(&Packet.ByteCount, sizeof(USHORT)); - if (RcvCode != KdPacketReceived) - { - /* Didn't receive ByteCount. Start over. */ + if (RcvCode != KdPacketReceived || Packet.ByteCount > PACKET_MAX_SIZE) + { + /* Didn't receive ByteCount or it's too big. Start over. */ continue; } @@ -913,6 +913,30 @@ FrLdrDbgPrint("KdReceivePacket 5, Checksum == 0x%x\n", Packet.Checksum); + /* Step 6 - Handle control packets */ + if (Packet.PacketLeader == CONTROL_PACKET_LEADER) + { + switch (Packet.PacketType) + { + case PACKET_TYPE_KD_ACKNOWLEDGE: + /* Remote acknowledges the last packet */ + return KdPacketReceived; + + case PACKET_TYPE_KD_RESEND: + /* Remote wants us to resend the last packet */ + return KdPacketNeedsResend; + + case PACKET_TYPE_KD_RESET: + FrLdrDbgPrint("KdReceivePacket - got a reset packet\n"); + // FIXME + return KdPacketNeedsResend; + + default: + FrLdrDbgPrint("KdReceivePacket - got unknown control packet\n"); + return KdPacketNeedsResend; + } + } + }

15 years, 8 months

[tkreuzer] 38966: kdcom: initial implementation of KdSendPacket() and KdReceivePacket(). Based on info in ms windbgkd.h and http://www.nynaeve.net/?p=169 Now we start exchanging packets, but still not good enough to get things going.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 19 20:57:14 2009 New Revision: 38966 URL: http://svn.reactos.org/svn/reactos?rev=38966&view=rev Log: kdcom: initial implementation of KdSendPacket() and KdReceivePacket(). Based on info in ms windbgkd.h and http://www.nynaeve.net/?p=169 Now we start exchanging packets, but still not good enough to get things going. Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Mon Jan 19 20:57:14 2009 @@ -124,6 +124,8 @@ /* GLOBAL VARIABLES *********************************************************/ +ULONG CurrentPacketId = INITIAL_PACKET_ID; + /* STATIC VARIABLES *********************************************************/ static KD_PORT_INFORMATION DefaultPort = { 0, 0, 0 }; @@ -743,29 +745,65 @@ IN PSTRING MessageData, IN OUT PKD_CONTEXT Context) { - ULONG i; - - switch (PacketType) - { - case PACKET_TYPE_KD_DEBUG_IO: - /* Copy Message to COM port */ - for (i = 0; i < MessageData->Length; i++) - { - char c = MessageData->Buffer[i]; - if ( c == 10 ) - { - KdPortPutByteEx(&DefaultPort, 13); - KdPortPutByteEx(&DefaultPort, 10); - } - else - { - KdPortPutByteEx(&DefaultPort, c); - } - } + KD_PACKET Packet; + KDSTATUS RcvCode; + + for (;;) + { + /* Initialize a KD_PACKET */ + Packet.PacketLeader = PACKET_LEADER; + Packet.PacketType = PacketType; + Packet.ByteCount = MessageHeader->Length; + Packet.Checksum = KdpCalculateChecksum(MessageHeader->Buffer, + MessageHeader->Length); + + /* If we have message data, add it to the packet */ + if (MessageData) + { + Packet.ByteCount += MessageData->Length; + Packet.Checksum += KdpCalculateChecksum(MessageData->Buffer, + MessageData->Length); + } + + /* Set the packet id */ + Packet.PacketId = CurrentPacketId; + + /* Send the packet header to the KD port */ + KdpSendBuffer(&Packet, sizeof(KD_PACKET)); + + /* Send the message header */ + KdpSendBuffer(MessageHeader->Buffer, MessageHeader->Length); + + /* If we have meesage data, also send it */ + if (MessageData) + { + KdpSendBuffer(MessageData->Buffer, MessageData->Length); + } + + /* Finalize with a trailing byte */ + KdPortPutByte(PACKET_TRAILING_BYTE); + + /* Wait for acknowledge */ + RcvCode = KdReceivePacket(PACKET_TYPE_KD_ACKNOWLEDGE, + NULL, + NULL, + 0, + NULL); + + /* Did we succeed? */ + if (RcvCode == KdPacketReceived) + { break; - - default: - break; + } + + /* PACKET_TYPE_KD_DEBUG_IO is allowed to instantly timeout */ + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + /* No response, silently fail. */ + return; + } + + /* Packet timed out, send it again */ } return; @@ -797,6 +835,8 @@ IN OUT PKD_CONTEXT Context) { UCHAR BreakIn = 0; + KDSTATUS RcvCode; + KD_PACKET Packet; /* Special handling for breakin packet */ if(PacketType == PACKET_TYPE_KD_POLL_BREAKIN) @@ -811,7 +851,71 @@ return KdPacketTimedOut; } - // FIXME: handle other cases + for (;;) + { + /* Step 1 - Read PacketLeader */ + RcvCode = KdpReceiveBuffer(&Packet.PacketLeader, sizeof(ULONG)); + if ( (RcvCode != KdPacketReceived) || + ((Packet.PacketLeader != BREAKIN_PACKET) && + (Packet.PacketLeader != PACKET_LEADER) && + (Packet.PacketLeader != CONTROL_PACKET_LEADER)) ) + { + /* Couldn't read a correct packet leader. Start over. */ + continue; + } + + FrLdrDbgPrint("KdReceivePacket 1, PacketLeader == 0x%x\n", Packet.PacketLeader); + + /* Step 2 - Read PacketType */ + RcvCode = KdpReceiveBuffer(&Packet.PacketType, sizeof(USHORT)); + if (RcvCode != KdPacketReceived) // FIXME: check PacketType + { + /* Didn't receive a PacketType or PacketType is bad. Start over. */ + continue; + } + + FrLdrDbgPrint("KdReceivePacket 2, PacketType == 0x%x\n", Packet.PacketType); + + /* Step 3 - Read ByteCount */ + RcvCode = KdpReceiveBuffer(&Packet.ByteCount, sizeof(USHORT)); + if (RcvCode != KdPacketReceived) + { + /* Didn't receive ByteCount. Start over. */ + continue; + } + + FrLdrDbgPrint("KdReceivePacket 3, ByteCount == 0x%x\n", Packet.ByteCount); + + /* Step 4 - Read PacketId */ + RcvCode = KdpReceiveBuffer(&Packet.PacketId, sizeof(ULONG)); + if (RcvCode != KdPacketReceived) + { + /* Didn't receive PacketId. Start over. */ + continue; + } + + FrLdrDbgPrint("KdReceivePacket 4, PacketId == 0x%x\n", Packet.PacketId); +/* + if (Packet.PacketId != ExpectedPacketId) + { + // Ask for a resend! + continue; + } +*/ + + /* Step 5 - Read Checksum */ + RcvCode = KdpReceiveBuffer(&Packet.Checksum, sizeof(ULONG)); + if (RcvCode != KdPacketReceived) + { + /* Didn't receive Checksum. Start over. */ + continue; + } + + FrLdrDbgPrint("KdReceivePacket 5, Checksum == 0x%x\n", Packet.Checksum); + + + + } return KdPacketReceived; }

15 years, 8 months

[tkreuzer] 38965: kdcom: add a debug hack to use com2 for WinDbg, while com1 stays for FrLdrDbgPrint. Also mark the Port as initialized in KdDebuggerInitialize0. Remove the KD_RECV_CODE enum, use the KDSTATUS enum that already exist. Implement PACKET_TYPE_KD_POLL_BREAKIN case for KdReceivePacket as described in http://www.nynaeve.net/?p=169 Now we return from KdPollBreakIn().

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 19 19:50:13 2009 New Revision: 38965 URL: http://svn.reactos.org/svn/reactos?rev=38965&view=rev Log: kdcom: add a debug hack to use com2 for WinDbg, while com1 stays for FrLdrDbgPrint. Also mark the Port as initialized in KdDebuggerInitialize0. Remove the KD_RECV_CODE enum, use the KDSTATUS enum that already exist. Implement PACKET_TYPE_KD_POLL_BREAKIN case for KdReceivePacket as described in http://www.nynaeve.net/?p=169 Now we return from KdPollBreakIn(). Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Mon Jan 19 19:50:13 2009 @@ -21,13 +21,6 @@ #include "windbgkd.h" #include <kddll.h> #include <ioaccess.h> /* port intrinsics */ - -typedef enum _KD_RECV_CODE -{ - KD_RECV_CODE_OK = 0, - KD_RECV_CODE_TIMEOUT = 1, - KD_RECV_CODE_FAILED = 2 -} KD_RECV_CODE, * PKD_RECV_CODE; typedef struct _KD_PORT_INFORMATION { @@ -541,13 +534,14 @@ } } + /****************************************************************************** * \name KdpReceiveBuffer * \brief Recieves data from the KD port and fills a buffer. * \param Buffer Pointer to a buffer that receives the data. * \param Size Size of data to receive in bytes. - * \return KD_RECV_CODE_OK if successful. - * KD_RECV_CODE_TIMEOUT if the receice timed out (10 seconds). + * \return KdPacketReceived if successful. + * KdPacketTimedOut if the receice timed out (10 seconds). * \todo Handle timeout. */ KDSTATUS @@ -571,12 +565,12 @@ if (TimeOut) { - return KD_RECV_CODE_TIMEOUT; + return KdPacketTimedOut; } FrLdrDbgPrint("Received byte: %x\n", ByteBuffer[i]); } - return KD_RECV_CODE_OK; + return KdPacketReceived; } /* NEW PUBLIC FUNCTIONS ******************************************************/ @@ -679,6 +673,9 @@ } } + // HACK use com1 for FrLdrDbg, com2 for WinDbg + DefaultPort.ComPort = 2; + /* Get base address */ DefaultPort.BaseAddress = BaseArray[DefaultPort.ComPort]; @@ -690,6 +687,7 @@ /* Initialize the port */ KdPortInitializeEx(&DefaultPort, 0, 0); + PortInitialized = TRUE; return STATUS_SUCCESS; } @@ -707,7 +705,6 @@ { // HACK: misuse this function to get a pointer to FrLdrDbgPrint FrLdrDbgPrint = (PVOID)LoaderBlock; - UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -774,8 +771,21 @@ return; } -/* - * @unimplemented + +/****************************************************************************** + * \name KdReceivePacket + * \brief Receive a packet from the KD port. + * \param [in] PacketType Describes the type of the packet to receive. + * This can be one of the PACKET_TYPE_ constants. + * \param [out] MessageHeader Pointer to a STRING structure for the header. + * \param [out] MessageData Pointer to a STRING structure for the data. + * \return KdPacketReceived if successful, KdPacketTimedOut if the receive + * timed out, KdPacketNeedsResend to signal that the last packet needs + * to be sent again. + * \note If PacketType is PACKET_TYPE_KD_POLL_BREAKIN, the function doesn't + * wait for any data, but returns KdPacketTimedOut instantly if no breakin + * packet byte is received. + * \sa http://www.nynaeve.net/?p=169 */ KDSTATUS NTAPI @@ -786,8 +796,24 @@ OUT PULONG DataLength, IN OUT PKD_CONTEXT Context) { -// UNIMPLEMENTED; - return 0; + UCHAR BreakIn = 0; + + /* Special handling for breakin packet */ + if(PacketType == PACKET_TYPE_KD_POLL_BREAKIN) + { + if (KdPortGetByteEx(&DefaultPort, &BreakIn)) + { + if (BreakIn == BREAKIN_PACKET_BYTE) + { + return KdPacketReceived; + } + } + return KdPacketTimedOut; + } + + // FIXME: handle other cases + + return KdPacketReceived; } /* EOF */

15 years, 8 months

[tkreuzer] 38964: kdcom: Add KD_RECEIVE_CODE enum, implement KdpReceiveBuffer, HACK: misuse KdDebuggerInitialize1 to set a pointer to FrLdrDbgPrint

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 19 19:05:07 2009 New Revision: 38964 URL: http://svn.reactos.org/svn/reactos?rev=38964&view=rev Log: kdcom: Add KD_RECEIVE_CODE enum, implement KdpReceiveBuffer, HACK: misuse KdDebuggerInitialize1 to set a pointer to FrLdrDbgPrint Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Mon Jan 19 19:05:07 2009 @@ -21,6 +21,13 @@ #include "windbgkd.h" #include <kddll.h> #include <ioaccess.h> /* port intrinsics */ + +typedef enum _KD_RECV_CODE +{ + KD_RECV_CODE_OK = 0, + KD_RECV_CODE_TIMEOUT = 1, + KD_RECV_CODE_FAILED = 2 +} KD_RECV_CODE, * PKD_RECV_CODE; typedef struct _KD_PORT_INFORMATION { @@ -134,6 +141,10 @@ ULONG KdpPort; ULONG KdpPortIrq; +// HACK!!! +typedef ULONG (*DBGRNT)(const char *Format, ...); +DBGRNT FrLdrDbgPrint = 0; + /* STATIC FUNCTIONS *********************************************************/ static BOOLEAN @@ -531,6 +542,46 @@ } /****************************************************************************** + * \name KdpReceiveBuffer + * \brief Recieves data from the KD port and fills a buffer. + * \param Buffer Pointer to a buffer that receives the data. + * \param Size Size of data to receive in bytes. + * \return KD_RECV_CODE_OK if successful. + * KD_RECV_CODE_TIMEOUT if the receice timed out (10 seconds). + * \todo Handle timeout. + */ +KDSTATUS +NTAPI +KdpReceiveBuffer( + OUT PVOID Buffer, + IN ULONG Size) +{ + ULONG i; + PUCHAR ByteBuffer = Buffer; + BOOLEAN Ret, TimeOut; + + for (i = 0; i < Size; i++) + { + do + { + Ret = KdPortGetByteEx(&DefaultPort, &ByteBuffer[i]); + TimeOut = FALSE; // FIXME timeout after 10 Sec + } + while (!Ret | TimeOut); + + if (TimeOut) + { + return KD_RECV_CODE_TIMEOUT; + } + FrLdrDbgPrint("Received byte: %x\n", ByteBuffer[i]); + } + + return KD_RECV_CODE_OK; +} + +/* NEW PUBLIC FUNCTIONS ******************************************************/ + +/****************************************************************************** * \name KdDebuggerInitialize0 * \brief Phase 0 initialization. * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. @@ -654,6 +705,8 @@ KdDebuggerInitialize1( IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) { + // HACK: misuse this function to get a pointer to FrLdrDbgPrint + FrLdrDbgPrint = (PVOID)LoaderBlock; UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; }

15 years, 8 months

[tkreuzer] 38963: Implement KdpSendBuffer, KdpCalculateChecksum, reference: http://www.vista-xp.co.uk/forums/technical-reference-library/2540-basics-debugging.html

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jan 19 18:42:10 2009 New Revision: 38963 URL: http://svn.reactos.org/svn/reactos?rev=38963&view=rev Log: Implement KdpSendBuffer, KdpCalculateChecksum, reference: http://www.vista-xp.co.uk/forums/technical-reference-library/2540-basics-de… Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Mon Jan 19 18:42:10 2009 @@ -5,6 +5,7 @@ * PURPOSE: Serial i/o functions for the kernel debugger. * PROGRAMMER: Alex Ionescu * Hervé Poussineau + * Timo Kreuzer */ /* INCLUDES *****************************************************************/ @@ -485,8 +486,55 @@ return TRUE; } -/* - * @implemented +/* NEW INTERNAL FUNCTIONS ****************************************************/ + +/****************************************************************************** + * \name KdpCalculateChecksum + * \brief Calculates the checksum for the packet data. + * \param Buffer Pointer to the packet data. + * \param Length Length of data in bytes. + * \return The calculated checksum. + * \sa http://www.vista-xp.co.uk/forums/technical-reference-library/2540-basics-de… + */ +ULONG +NTAPI +KdpCalculateChecksum( + IN PVOID Buffer, + IN ULONG Length) +{ + ULONG i, Checksum = 0; + + for (i = 0; i < Length; i++) + { + Checksum += ((PUCHAR)Buffer)[i]; + } + return Checksum; +} + +/****************************************************************************** + * \name KdpSendBuffer + * \brief Sends a buffer of data to the KD port. + * \param Buffer Pointer to the data. + * \param Size Size of data in bytes. + */ +VOID +NTAPI +KdpSendBuffer( + IN PVOID Buffer, + IN ULONG Size) +{ + INT i; + for (i = 0; i < Size; i++) + { + KdPortPutByteEx(&DefaultPort, ((PUCHAR)Buffer)[i]); + } +} + +/****************************************************************************** + * \name KdDebuggerInitialize0 + * \brief Phase 0 initialization. + * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. + * \return Status */ NTSTATUS NTAPI @@ -595,8 +643,11 @@ return STATUS_SUCCESS; } -/* - * @unimplemented +/****************************************************************************** + * \name KdDebuggerInitialize0 + * \brief Phase 0 initialization. + * \param [opt] LoaderBlock Pointer to the Loader parameter block. Can be NULL. + * \return Status */ NTSTATUS NTAPI

15 years, 8 months

← Newer
1
...
26
27
28
29
30
31
32
...
76
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2009