wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Jacek Caban : vbscript: Added compiler support for |not| expression.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 7f9464ce2759eb96ccc0bb7b782ce029689f692d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9464ce2759eb96ccc0bb7b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:45 2011 +0200 vbscript: Added compiler support for |not| expression. --- dlls/vbscript/compile.c | 13 +++++++++++++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index ea55177..c64c30c 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -165,11 +165,24 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t return hres; } +static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t *expr, vbsop_t op) +{ + HRESULT hres; + + hres = compile_expression(ctx, expr->subexpr); + if(FAILED(hres)) + return hres; + + return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; +} + static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) { switch(expr->type) { case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); + case EXPR_NOT: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); default: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a33ff90..f582e80 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -198,6 +198,12 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_not(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static const instr_func_t op_funcs[] = { #define X(x,n,a,b) interp_ ## x, OP_LIST diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 54d7da5..3f55b40 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -77,6 +77,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ + X(not, 1, 0, 0) \ X(ret, 0, 0, 0) \ X(string, 1, ARG_STR, 0)

1 0

Jacek Caban : vbscript: Added parser support for |not| expression.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 39dd08ad7debaf4cb0cbb1e0fd91732f9f81b263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39dd08ad7debaf4cb0cbb1e0f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:32 2011 +0200 vbscript: Added parser support for |not| expression. --- dlls/vbscript/parse.h | 6 ++++++ dlls/vbscript/parser.y | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 5f7fba2..0e1b4d1 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -19,6 +19,7 @@ typedef enum { EXPR_BOOL, EXPR_MEMBER, + EXPR_NOT, EXPR_STRING } expression_type_t; @@ -39,6 +40,11 @@ typedef struct { typedef struct { expression_t expr; + expression_t *subexpr; +} unary_expression_t; + +typedef struct { + expression_t expr; expression_t *obj_expr; const WCHAR *identifier; expression_t *args; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 728d69b..a743b97 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -37,6 +37,7 @@ static void source_add_statement(parser_ctx_t*,statement_t*); static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); static expression_t *new_string_expression(parser_ctx_t*,const WCHAR*); +static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); @@ -74,6 +75,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression PrimaryExpression +%type <expression> NotExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -119,8 +121,12 @@ EmptyBrackets_opt | tEMPTYBRACKETS Expression + : NotExpression { $$ = $1; } + +NotExpression : LiteralExpression /* FIXME */ { $$ = $1; } | PrimaryExpression /* FIXME */ { $$ = $1; } + | tNOT NotExpression { $$ = new_unary_expression(ctx, EXPR_NOT, $2); CHECK_ERROR; } LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } @@ -190,6 +196,18 @@ static expression_t *new_string_expression(parser_ctx_t *ctx, const WCHAR *value return &expr->expr; } +static expression_t *new_unary_expression(parser_ctx_t *ctx, expression_type_t type, expression_t *subexpr) +{ + unary_expression_t *expr; + + expr = new_expression(ctx, type, sizeof(*expr)); + if(!expr) + return NULL; + + expr->subexpr = subexpr; + return &expr->expr; +} + static member_expression_t *new_member_expression(parser_ctx_t *ctx, expression_t *obj_expr, const WCHAR *identifier) { member_expression_t *expr;

1 0

Jacek Caban : vbscript: Added support for parentheses in expressions.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: a17f9aa07ad94888a21cc14c83d47fa923d30974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17f9aa07ad94888a21cc14c8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:21 2011 +0200 vbscript: Added support for parentheses in expressions. --- dlls/vbscript/parser.y | 6 +++++- dlls/vbscript/tests/lang.vbs | 1 + 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 258420d..728d69b 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -73,7 +73,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %token <string> tIdentifier tString %type <statement> Statement StatementNl -%type <expression> Expression LiteralExpression +%type <expression> Expression LiteralExpression PrimaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -120,12 +120,16 @@ EmptyBrackets_opt Expression : LiteralExpression /* FIXME */ { $$ = $1; } + | PrimaryExpression /* FIXME */ { $$ = $1; } LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } +PrimaryExpression + : '(' Expression ')' { $$ = $2; } + %% static int parser_error(const char *str) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 07585fa..32fc903 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -20,5 +20,6 @@ Option Explicit call ok(true, "true is not true?") ok true, "true is not true?" +call ok((true), "true is not true?") reportSuccess()

1 0

Jacek Caban : vbscript: Added parser/compiler support for |option explicit| .
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 8108b4040ca140dd7567adf698943de56edaa616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8108b4040ca140dd7567adf69… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:00 2011 +0200 vbscript: Added parser/compiler support for |option explicit|. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 5 ++++- dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 14 +++++++++++--- dlls/vbscript/tests/lang.vbs | 2 ++ dlls/vbscript/vbscript.h | 2 ++ 6 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 7e8fe3b..ea55177 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -256,6 +256,8 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ctx->instr_cnt = 0; ctx->instr_size = 32; + ret->option_explicit = ctx->parser.option_explicit; + ret->bstr_pool = NULL; ret->bstr_pool_size = 0; ret->bstr_cnt = 0; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f5254c4..a33ff90 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -29,6 +29,7 @@ typedef struct { vbscode_t *code; instr_t *instr; script_ctx_t *script; + function_t *func; unsigned stack_size; unsigned top; @@ -70,7 +71,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) } } - FIXME("create if no option explicit\n"); + if(!ctx->func->code_ctx->option_explicit) + FIXME("create an attempt to set\n"); ref->type = REF_NONE; return S_OK; @@ -223,6 +225,7 @@ HRESULT exec_script(script_ctx_t *ctx, function_t *func) exec.code = func->code_ctx; exec.instr = exec.code->instrs + func->code_off; exec.script = ctx; + exec.func = func; while(exec.instr) { op = exec.instr->op; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index a0c7f2c..5f7fba2 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -63,6 +63,7 @@ typedef struct { const WCHAR *ptr; const WCHAR *end; + BOOL option_explicit; BOOL parse_complete; HRESULT hres; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 72790fa..258420d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); static int parser_error(const char*); -static void parse_complete(parser_ctx_t*); + static void parse_complete(parser_ctx_t*,BOOL); static void source_add_statement(parser_ctx_t*,statement_t*); @@ -54,6 +54,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); statement_t *statement; expression_t *expression; member_expression_t *member; + BOOL bool; } %token tEOF tNL tREM tEMPTYBRACKETS @@ -75,11 +76,16 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <expression> Expression LiteralExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList +%type <bool> OptionExplicit_opt %% Program - : SourceElements tEOF { parse_complete(ctx); } + : OptionExplicit_opt SourceElements tEOF { parse_complete(ctx, $1); } + +OptionExplicit_opt + : /* empty */ { $$ = FALSE; } + | tOPTION tEXPLICIT tNL { $$ = TRUE; } SourceElements : /* empty */ @@ -137,9 +143,10 @@ static void source_add_statement(parser_ctx_t *ctx, statement_t *stat) } } -static void parse_complete(parser_ctx_t *ctx) +static void parse_complete(parser_ctx_t *ctx, BOOL option_explicit) { ctx->parse_complete = TRUE; + ctx->option_explicit = option_explicit; } static void *new_expression(parser_ctx_t *ctx, expression_type_t type, unsigned size) @@ -240,6 +247,7 @@ HRESULT parse_script(parser_ctx_t *ctx, const WCHAR *code) ctx->last_token = tNL; ctx->last_nl = 0; ctx->stats = ctx->stats_tail = NULL; + ctx->option_explicit = FALSE; parser_parse(ctx); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 55a8cad..07585fa 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -16,6 +16,8 @@ ' Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA ' +Option Explicit + call ok(true, "true is not true?") ok true, "true is not true?" diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a1428bb..54d7da5 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -109,6 +109,8 @@ struct _vbscode_t { instr_t *instrs; WCHAR *source; + BOOL option_explicit; + BOOL global_executed; function_t global_code;

1 0

Jacek Caban : vbscript: Added support for |f a, b, c| call statement.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: a921bd2ea4f988d615ece2f9d1a24ff6e3ab593d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a921bd2ea4f988d615ece2f9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:46:46 2011 +0200 vbscript: Added support for |f a, b, c| call statement. --- dlls/vbscript/lex.c | 22 +++++++++++++++++++--- dlls/vbscript/parser.y | 14 +++++++++----- dlls/vbscript/tests/lang.vbs | 1 + 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 2fd51bc..41f76e9 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -240,12 +240,17 @@ static int parse_string_literal(parser_ctx_t *ctx, const WCHAR **ret) return tString; } +static void skip_spaces(parser_ctx_t *ctx) +{ + while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') + ctx->ptr++; +} + static int parse_next_token(void *lval, parser_ctx_t *ctx) { WCHAR c; - while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') - ctx->ptr++; + skip_spaces(ctx); if(ctx->ptr == ctx->end) return ctx->last_token == tNL ? tEOF : tNL; @@ -269,7 +274,6 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) else ctx->ptr = ctx->end; return tNL; - case '(': case ')': case ',': case '=': @@ -281,6 +285,18 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) case '\\': case '.': return *ctx->ptr++; + case '(': + /* NOTE: + * We resolve empty brackets in lexer instead of parser to avoid complex conflicts + * in call statement special case |f()| without 'call' keyword + */ + ctx->ptr++; + skip_spaces(ctx); + if(*ctx->ptr == ')') { + ctx->ptr++; + return tEMPTYBRACKETS; + } + return '('; case '"': return parse_string_literal(ctx, lval); default: diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 2d50565..72790fa 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -56,7 +56,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); member_expression_t *member; } -%token tEOF tNL tREM +%token tEOF tNL tREM tEMPTYBRACKETS %token tTRUE tFALSE %token tNOT tAND tOR tXOR tEQV tIMP tNEQ %token tIS tLTEQ tGTEQ tMOD @@ -89,7 +89,7 @@ StatementNl : Statement tNL { $$ = $1; } Statement - : MemberExpression Arguments_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } + : MemberExpression ArgumentList_opt { $1->args = $2; $$ = new_call_statement(ctx, $1); CHECK_ERROR; } | tCALL MemberExpression Arguments_opt { $2->args = $3; $$ = new_call_statement(ctx, $2); CHECK_ERROR; } MemberExpression @@ -97,17 +97,21 @@ MemberExpression /* FIXME: MemberExpressionArgs '.' tIdentifier */ Arguments_opt - : /* empty */ { $$ = NULL; } - | '(' ArgumentList_opt ')' { $$ = $2; } + : EmptyBrackets_opt { $$ = NULL; } + | '(' ArgumentList ')' { $$ = $2; } ArgumentList_opt - : /* empty */ { $$ = NULL; } + : EmptyBrackets_opt { $$ = NULL; } | ArgumentList { $$ = $1; } ArgumentList : Expression { $$ = $1; } | Expression ',' ArgumentList { $1->next = $3; $$ = $1; } +EmptyBrackets_opt + : /* empty */ + | tEMPTYBRACKETS + Expression : LiteralExpression /* FIXME */ { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 642c2ff..55a8cad 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -17,5 +17,6 @@ ' call ok(true, "true is not true?") +ok true, "true is not true?" reportSuccess()

1 0

Christian Costa : cmd: Add help info for xcopy.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 908834feefa0f8a9458e37b1718f85724ac10b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908834feefa0f8a9458e37b17… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Sep 9 09:16:51 2011 +0200 cmd: Add help info for xcopy. --- po/ar.po | 73 +++++++++++++++++++++++----------------------- po/bg.po | 73 +++++++++++++++++++++++----------------------- po/ca.po | 73 +++++++++++++++++++++++----------------------- po/cs.po | 73 +++++++++++++++++++++++----------------------- po/da.po | 73 +++++++++++++++++++++++----------------------- po/de.po | 73 +++++++++++++++++++++++----------------------- po/el.po | 73 +++++++++++++++++++++++----------------------- po/en.po | 74 ++++++++++++++++++++++++----------------------- po/en_US.po | 74 ++++++++++++++++++++++++----------------------- po/eo.po | 73 +++++++++++++++++++++++----------------------- po/es.po | 73 +++++++++++++++++++++++----------------------- po/fa.po | 73 +++++++++++++++++++++++----------------------- po/fi.po | 73 +++++++++++++++++++++++----------------------- po/fr.po | 73 +++++++++++++++++++++++----------------------- po/he.po | 73 +++++++++++++++++++++++----------------------- po/hi.po | 73 +++++++++++++++++++++++----------------------- po/hu.po | 73 +++++++++++++++++++++++----------------------- po/it.po | 73 +++++++++++++++++++++++----------------------- po/ja.po | 73 +++++++++++++++++++++++----------------------- po/ko.po | 74 ++++++++++++++++++++++++----------------------- po/lt.po | 74 ++++++++++++++++++++++++----------------------- po/ml.po | 73 +++++++++++++++++++++++----------------------- po/nb_NO.po | 73 +++++++++++++++++++++++----------------------- po/nl.po | 73 +++++++++++++++++++++++----------------------- po/or.po | 73 +++++++++++++++++++++++----------------------- po/pa.po | 73 +++++++++++++++++++++++----------------------- po/pl.po | 73 +++++++++++++++++++++++----------------------- po/pt_BR.po | 73 +++++++++++++++++++++++----------------------- po/pt_PT.po | 73 +++++++++++++++++++++++----------------------- po/rm.po | 73 +++++++++++++++++++++++----------------------- po/ro.po | 73 +++++++++++++++++++++++----------------------- po/ru.po | 73 +++++++++++++++++++++++----------------------- po/sk.po | 73 +++++++++++++++++++++++----------------------- po/sl.po | 73 +++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 73 +++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 73 +++++++++++++++++++++++----------------------- po/sv.po | 73 +++++++++++++++++++++++----------------------- po/te.po | 73 +++++++++++++++++++++++----------------------- po/th.po | 73 +++++++++++++++++++++++----------------------- po/tr.po | 73 +++++++++++++++++++++++----------------------- po/uk.po | 73 +++++++++++++++++++++++----------------------- po/wa.po | 73 +++++++++++++++++++++++----------------------- po/wine.pot | 73 +++++++++++++++++++++++----------------------- po/zh_CN.po | 73 +++++++++++++++++++++++----------------------- po/zh_TW.po | 73 +++++++++++++++++++++++----------------------- programs/cmd/builtins.c | 3 +- programs/cmd/cmd.rc | 1 + 47 files changed, 1672 insertions(+), 1621 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=908834feefa0f8a9458e3…

1 0

Alistair Leslie-Hughes : advapi32: Correct test for NT4 prior to sp4.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 1833124218a0826cf96cdc12e9c8db77c18bffe2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1833124218a0826cf96cdc12e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 9 19:31:02 2011 +1000 advapi32: Correct test for NT4 prior to sp4. --- dlls/advapi32/tests/security.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 336cc9c..4cc1402 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2913,8 +2913,8 @@ static void test_SetEntriesInAclA(void) ExplicitAccess.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP; ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_SID; ExplicitAccess.Trustee.ptstrName = EveryoneSid; - ExplicitAccess.Trustee.MultipleTrusteeOperation = 0xDEADBEEF; - ExplicitAccess.Trustee.pMultipleTrustee = (PVOID)0xDEADBEEF; + ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; + ExplicitAccess.Trustee.pMultipleTrustee = NULL; res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl); ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res); ok(NewAcl != NULL, "returned acl was NULL\n");

1 0

Hwang YunSong : dinput: New Korean resource.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: d045719761e12790bcc989d1ea83d9c416e24a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d045719761e12790bcc989d1e… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Sep 9 11:00:30 2011 +0900 dinput: New Korean resource. --- dlls/dinput/Makefile.in | 3 ++- dlls/dinput/dinput_Ko.rc | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/Makefile.in b/dlls/dinput/Makefile.in index d614def..0054363 100644 --- a/dlls/dinput/Makefile.in +++ b/dlls/dinput/Makefile.in @@ -24,6 +24,7 @@ PO_SRCS = dinput.rc RC_SRCS = \ dinput.rc \ - dinput_En.rc + dinput_En.rc \ + dinput_Ko.rc @MAKE_DLL_RULES@ diff --git a/dlls/dinput/dinput_Ko.rc b/dlls/dinput/dinput_Ko.rc new file mode 100644 index 0000000..043ce5d --- /dev/null +++ b/dlls/dinput/dinput_Ko.rc @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2011 Lucas Fialho Zawacki + * Copyright (c) 2011 YunSong Hwang + * + * 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. + * + * 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 + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +IDD_CONFIGUREDEVICES DIALOG 0, 0, 270, 260 +STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE +CAPTION "장치 설정" +FONT 8, "Ms Shell Dlg" +{ + DEFPUSHBUTTON "확인", IDOK, 10, 236, 50, 14 + DEFPUSHBUTTON "취소", IDCANCEL, 65, 236, 50, 14 + DEFPUSHBUTTON "재설정", IDC_RESET, 210, 236, 50, 14 + COMBOBOX IDC_PLAYERCOMBO, 10, 50, 90, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + COMBOBOX IDC_CONTROLLERCOMBO, 10, 20, 90, 30, CBS_DROPDOWNLIST | CBS_HASSTRINGS + LTEXT "플레이어", IDC_PLAYERTEXT, 10, 40, 21, 8, SS_LEFT + LTEXT "장치", IDC_DEVICETEXT, 10, 10, 22, 8, SS_LEFT + LTEXT "행동", IDC_ACTIONTEXT, 10, 70, 24, 8, SS_LEFT + LTEXT "매핑", IDC_MAPPINGTEXT, 120, 8, 28, 8, SS_LEFT + LISTBOX IDC_ACTIONLIST, 10, 80, 90, 130, WS_TABSTOP | WS_VSCROLL | LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + AUTOCHECKBOX "할당 정렬", IDC_CHECKBOXSORT, 120, 215, 60, 8 + CONTROL "Listview", IDC_DEVICEOBJECTSLIST, "SysListView32", LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 120, 20, 140, 190 +}

1 0

Hwang YunSong : po: Updated Korean translation.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 90152743c996453d1f630c527766c7f67fb3c17d URL: http://source.winehq.org/git/wine.git/?a=commit;h=90152743c996453d1f630c527… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Fri Sep 9 10:59:49 2011 +0900 po: Updated Korean translation. --- po/ko.po | 69 +++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 39 insertions(+), 30 deletions(-) diff --git a/po/ko.po b/po/ko.po index b8cb315..03457cb 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2013,14 +2013,12 @@ msgid "Default MidiOut Device" msgstr "기본 미디출력 장치" #: dinput.rc:34 -#, fuzzy msgid "Action" -msgstr "Activation" +msgstr "행동" #: dinput.rc:35 -#, fuzzy msgid "Object" -msgstr "객체(&O)" +msgstr "객체" #: dxdiagn.rc:25 msgid "Regional Setting" @@ -2093,7 +2091,7 @@ msgstr "숨기기" #: hhctrl.rc:41 ieframe.rc:65 shdoclc.rc:164 shdoclc.rc:188 msgid "Stop" -msgstr "정지" +msgstr "멈추기" #: hhctrl.rc:42 ieframe.rc:66 shell32.rc:59 msgid "Refresh" @@ -7668,6 +7666,25 @@ msgid "" "and all subfolders.\n" "/D Processes folders as well.\n" msgstr "" +"ATTRIB - 파일 속성을 보여주거나 바꿉니다.\n" +"\n" +"문법:\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [드라이브:][경로][파일이름]\n" +"\t [/S [/D]]\n" +"\n" +"어디에:\n" +"\n" +"+ 속성을 설정합니다.\n" +"- 속성을 지웁니다.\n" +"R 읽기-전용 파일 속성을 설정합니다\n" +"A 압축 파일 속성을 설정합니다.\n" +"S 시스템 파일 속성을 설정합니다.\n" +"H 숨은 파일 속성을 설정합니다.\n" +"[드라이브:][경로][파일이름]\n" +"속성 작업을 할 파일이나 파일들을 지정합니다.\n" +"/S 현재 폴더와 모든 하위 폴더에서 일치하는 파일들을 \n" +"처리합니.\n" +"/D 폴더를 함께 처리합니다.\n" #: clock.rc:29 msgid "Ana&log" @@ -7830,7 +7847,6 @@ msgstr "" "아무 매개변수가 없는 HELP눈 CMD의 모든 내장 명령을 보여줍니다.\n" #: cmd.rc:94 -#, fuzzy msgid "" "IF is used to conditionally execute a command.\n" "\n" @@ -7843,12 +7859,12 @@ msgid "" msgstr "" "IF는 명령을 선택적으로 실행 할 때 사용한다.\n" "\n" -"Syntax:\tIF [NOT] EXIST 파일이름 명령\n" -"IF [NOT] string1==string2 명령\n" -"IF [NOT] ERRORLEVEL 숫자 명령\n" +"문법: IF [NOT] EXIST 파일이름 명령\n" +" IF [NOT] string1==string2 명령\n" +" IF [NOT] ERRORLEVEL 숫자 명령\n" "\n" -"명령의 첫번째 형식에서, string1 과 string2는 반드시 2개의 따옴표로\n" -"둘려놓아야 합니다. 대소문자는 구분하지 않습니다.\n" +"명령의 두번째 형식에서, string1 과 string2는 반드시 2개의 따옴표로\n" +"둘려놓아야 합니다.이 비교는 대소문자를 구분하지 않습니다.\n" #: cmd.rc:100 msgid "" @@ -7924,7 +7940,6 @@ msgstr "" "넘치게 하는 이전 명령의 결과를 읽도록 한다\n" #: cmd.rc:149 -#, fuzzy msgid "" "PROMPT sets the command-line prompt.\n" "\n" @@ -7946,17 +7961,18 @@ msgid "" "The prompt can also be changed by altering the PROMPT environment variable,\n" "so the command 'SET PROMPT=text' has the same effect as 'PROMPT text'.\n" msgstr "" -"PROMPT 명령라인 프롬프트 설정.\n" +"PROMPT 명령-라인 프롬프트 설정.\n" "\n" "이 문자는 cmd가 입력을 기다리고 있을 때 시작 줄에 나타나는 PROMPT\n" "명령(그리고 스페이스 다음에)에 뒤따른다.\n" "\n" "뒤의 문자의 문자열의 특별한 의미 설명:\n" "\n" -"$$ 달러 기호 $_ 라인피드 $b 파이프 기호 (|)\n" -"$d C현재 날짜 $e 이스케이프 $g > 기호\n" +"$$ 달러 기호 $_ 라인피드 $b 파이프 기호 " +"(|)\n" +"$d 현재 날짜 $e 이스케이프 $g > 기호\n" "$l < 기호 $n 현재 드라이브 $p 현재 경로\n" -"$q 등호 기호 $t 현재 시간 $v cmd 버젼\n" +"$q 등호 기호 $t 현재 시간 $v cmd 버젼\n" "\n" "프롬프트가 기본상태인 채로 프롬프트문자를 재설정하지 않고 PROMPT 명령을\n" "사용했을 때 ,이것은 현재 디렉토리 (포함해서현재 드라이브 문자) 에 \"보다 큰" @@ -8185,7 +8201,6 @@ msgstr "" "호출한 셀로 돌아갑니다.\n" #: cmd.rc:287 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8492,7 +8507,6 @@ msgid "Default gateway" msgstr "기본 게이트웨이" #: net.rc:27 -#, fuzzy msgid "" "The syntax of this command is:\n" "\n" @@ -8502,10 +8516,10 @@ msgid "" "\n" "Where 'command' is one of HELP, START, STOP or USE.\n" msgstr "" -"명령어 문법:\n" +"이 명령어의 문법은:\n" "\n" "NET 명령어[매개변수]\n" -" -or-\n" +" -나-\n" "NET 명령어 /HELP\n" "\n" "명령어에 들어갈 수 있는 것은 HELP, START, STOP이나 USE중의 하나임\n" @@ -9047,15 +9061,15 @@ msgstr "인터페이스" #: oleview.rc:138 msgid "Registry" -msgstr "Registry" +msgstr "레지스트리" #: oleview.rc:139 msgid "Implementation" -msgstr "Implementation" +msgstr "구현" #: oleview.rc:140 msgid "Activation" -msgstr "Activation" +msgstr "활성화" #: oleview.rc:142 msgid "CoGetClassObject failed." @@ -10426,7 +10440,6 @@ msgstr "" "다. 만약 당신이 계속 진행하기를 원한다면 반드시 다시 만드십시오!" #: winecfg.rc:80 -#, fuzzy msgctxt "Drive letter" msgid "Letter" msgstr "문자" @@ -10668,7 +10681,6 @@ msgstr "" "옵션:\n" #: wineconsole.rc:49 -#, fuzzy msgid "" " --backend={user|curses} Choosing user will spawn a new window, curses " "will\n" @@ -10676,16 +10688,14 @@ msgid "" "console.\n" msgstr "" " --backend={user|curses} 사용자가 새 창을 열 것인지,\n" -" curses가 Wine 콘솔처럼 현재 터미널에 나타낼 것인" -"지 선택\n" +" curses으로 Wine 콘솔처럼 현재 터미널에 나타낼 것" +"인지 선택\n" #: wineconsole.rc:51 -#, fuzzy msgid " <command> The Wine program to launch in the console.\n" msgstr " <명령> The Wine 프로그램은 콘솔을 통해서 시작됨\n" #: wineconsole.rc:52 -#, fuzzy msgid "" "\n" "Example:\n" @@ -11319,7 +11329,6 @@ msgid "D" msgstr "D" #: xcopy.rc:77 -#, fuzzy msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n"

1 0

Francois Gouget : po: Add a linefeed to fix the Lithuanian translation.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 3598c0dabc4df429a1c2f627af0de37254d0276e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3598c0dabc4df429a1c2f627a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Sep 9 12:51:37 2011 +0200 po: Add a linefeed to fix the Lithuanian translation. --- po/lt.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/lt.po b/po/lt.po index 21a1880..649d7e9 100644 --- a/po/lt.po +++ b/po/lt.po @@ -7731,7 +7731,7 @@ msgstr "" "Nurodo failą ar failus attrib apdorojimui.\n" "/S Apdoroja atitinkančius failus dabartiniame\n" "aplanke ir poaplankiuose.\n" -"/D Taip pat apdoroja aplankus." +"/D Taip pat apdoroja aplankus.\n" #: clock.rc:29 msgid "Ana&log"

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011