September 2011 - Wine-Commits

Christian Costa : cmd: Add help info for xcopy.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

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

Jacek Caban : vbscript: Added parser/compiler support for |option explicit| .
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

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 parser support for |not| expression.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

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 compiler support for equality expression.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: eb88228b62d7f1e8f8596a21c0cf89ed8409c58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb88228b62d7f1e8f8596a21c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:48:25 2011 +0200 vbscript: Added compiler support for equality expression. --- dlls/vbscript/compile.c | 17 +++++++++++++++++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index c64c30c..5ed19c4 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -176,11 +176,28 @@ static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t * return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; } +static HRESULT compile_binary_expression(compile_ctx_t *ctx, binary_expression_t *expr, vbsop_t op) +{ + HRESULT hres; + + hres = compile_expression(ctx, expr->left); + if(FAILED(hres)) + return hres; + + hres = compile_expression(ctx, expr->right); + 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_EQUAL: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_STRING: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 0c3470b..29fed74 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -253,6 +253,12 @@ static HRESULT interp_not(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_equal(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 3f55b40..e717872 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -76,6 +76,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ + X(equal, 1, 0, 0) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(not, 1, 0, 0) \ X(ret, 0, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_equal implementation.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 6d7ec9cf71ce2b3e9bb0745bb39f3592f15af43b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d7ec9cf71ce2b3e9bb0745bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:48:35 2011 +0200 vbscript: Added interp_equal implementation. --- dlls/vbscript/interp.c | 32 ++++++++++++++++++++++++++++++-- dlls/vbscript/tests/lang.vbs | 5 +++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 29fed74..42bef36 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -253,10 +253,38 @@ static HRESULT interp_not(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT cmp_oper(exec_ctx_t *ctx) +{ + variant_val_t l, r; + HRESULT hres; + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) + hres = VarCmp(l.v, r.v, ctx->script->lcid, 0); + + release_val(&r); + release_val(&l); + return hres; +} + static HRESULT interp_equal(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = cmp_oper(ctx); + if(FAILED(hres)) + return hres; + + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = hres == VARCMP_EQ ? VARIANT_TRUE : VARIANT_FALSE; + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8f13c9c..6f8b815 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -25,4 +25,9 @@ call ok((true), "true is not true?") ok not false, "not false but not true?" ok not not true, "not not true but not true?" +Call ok(true = true, "true = true is false") +Call ok(false = false, "false = false is false") +Call ok(not (true = false), "true = false is true") +Call ok("x" = "x", """x"" = ""x"" is false") + reportSuccess()

1 0

Jacek Caban : vbscript: Added interp_not implementation.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 6ca3cb623e1022b52af15a5747c80162426b19b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ca3cb623e1022b52af15a574… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:47:55 2011 +0200 vbscript: Added interp_not implementation. --- dlls/vbscript/interp.c | 53 ++++++++++++++++++++++++++++++++++++++++- dlls/vbscript/tests/lang.vbs | 3 ++ 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f582e80..0c3470b 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -53,6 +53,12 @@ typedef struct { } u; } ref_t; +typedef struct { + VARIANT *v; + VARIANT store; + BOOL owned; +} variant_val_t; + static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, ref_t *ref) { named_item_t *item; @@ -109,6 +115,35 @@ static void stack_popn(exec_ctx_t *ctx, unsigned n) VariantClear(stack_pop(ctx)); } +static HRESULT stack_pop_val(exec_ctx_t *ctx, variant_val_t *v) +{ + VARIANT *var; + + var = stack_pop(ctx); + + if(V_VT(var) == (VT_BYREF|VT_VARIANT)) { + v->owned = FALSE; + var = V_VARIANTREF(var); + }else { + v->owned = TRUE; + } + + if(V_VT(var) == VT_DISPATCH) { + FIXME("got dispatch - get its default value\n"); + return E_NOTIMPL; + }else { + v->v = var; + } + + return S_OK; +} + +static inline void release_val(variant_val_t *v) +{ + if(v->owned) + VariantClear(v->v); +} + static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) { dp->cArgs = arg_cnt; @@ -200,8 +235,22 @@ static HRESULT interp_string(exec_ctx_t *ctx) static HRESULT interp_not(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t val; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + hres = VarNot(val.v, &v); + release_val(&val); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 32fc903..8f13c9c 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -22,4 +22,7 @@ call ok(true, "true is not true?") ok true, "true is not true?" call ok((true), "true is not true?") +ok not false, "not false but not true?" +ok not not true, "not not true but not true?" + reportSuccess()

1 0

Hans Leidekker : msi: Remove some dead assignments (clang).
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 6351cd827be2c0a3378815c09f907a08a2576e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6351cd827be2c0a3378815c09… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 11:01:39 2011 +0200 msi: Remove some dead assignments (clang). --- dlls/msi/appsearch.c | 5 ++--- dlls/msi/dialog.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 3e0607f..f93e05d 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -460,7 +460,7 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT switch (type & 0x0f) { case msidbLocatorTypeDirectory: - rc = ACTION_SearchDirectory(package, sig, ptr, 0, appValue); + ACTION_SearchDirectory(package, sig, ptr, 0, appValue); break; case msidbLocatorTypeFileName: *appValue = app_search_file(ptr, sig); @@ -481,7 +481,6 @@ end: msi_free( deformatted ); msiobj_release(&row->hdr); - return ERROR_SUCCESS; } @@ -961,7 +960,7 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU { MSISIGNATURE parentSig; - rc = ACTION_AppSearchSigName(package, parentName, &parentSig, &parent); + ACTION_AppSearchSigName(package, parentName, &parentSig, &parent); ACTION_FreeSignature(&parentSig); if (!parent) { diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 51ca2e7..7074a7b 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -2467,12 +2467,11 @@ MSISelectionTree_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) tvhti.pt.y = (short)HIWORD( lParam ); tvhti.flags = 0; tvhti.hItem = 0; - r = CallWindowProcW(info->oldproc, hWnd, TVM_HITTEST, 0, (LPARAM) &tvhti ); + CallWindowProcW(info->oldproc, hWnd, TVM_HITTEST, 0, (LPARAM) &tvhti ); if (tvhti.flags & TVHT_ONITEMSTATEICON) return msi_seltree_menu( hWnd, tvhti.hItem ); break; } - r = CallWindowProcW(info->oldproc, hWnd, msg, wParam, lParam); switch( msg )

1 0

Francois Gouget : user32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 03d4ef95ece26873e1ee07d83c243b48d214e2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=03d4ef95ece26873e1ee07d83… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 9 12:49:44 2011 +0200 user32/tests: Add a trailing '\n' to an ok() call. --- dlls/user32/tests/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 934fc52..c1ca3a3 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -773,7 +773,7 @@ static void test_edit_control_2(void) r = SetCaretPos(0, 0); todo_wine ok(0 == r, "SetCaretPos succeeded unexpectedly, expected: 0, got: %d\n", r); phwnd = SetFocus(hwndET2); - ok(phwnd != NULL, "SetFocus failed unexpectedly, expected non-zero, got NULL"); + ok(phwnd != NULL, "SetFocus failed unexpectedly, expected non-zero, got NULL\n"); r = SetCaretPos(0, 0); ok(1 == r, "SetCaretPos failed unexpectedly, expected: 1, got: %d\n", r); r = GetCaretPos(&cpos);

1 0

Francois Gouget : po: Remove English strings from the Chinese (Taiwan) translation.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: c5f9129ddd9ebb8e1d768d10d66e83a8d7228737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f9129ddd9ebb8e1d768d10d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 9 02:02:41 2011 +0200 po: Remove English strings from the Chinese (Taiwan) translation. --- po/zh_TW.po | 141 +++++++++++++++++------------------------------------------ 1 files changed, 40 insertions(+), 101 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index aa319bd..45b3a8e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -56,11 +56,11 @@ msgstr "版本" #: appwiz.rc:38 msgid "Installation programs" -msgstr "Installation Programs" +msgstr "" #: appwiz.rc:39 msgid "Programs (*.exe)" -msgstr "Programs (*.exe)" +msgstr "" #: appwiz.rc:40 avifil32.rc:30 cryptui.rc:80 shell32.rc:195 notepad.rc:75 #: oleview.rc:101 progman.rc:79 regedit.rc:195 winhlp32.rc:87 @@ -68,14 +68,12 @@ msgid "All files (*.*)" msgstr "所有檔案 (*.*)" #: appwiz.rc:42 -#, fuzzy msgid "&Remove" -msgstr "&Remove..." +msgstr "" #: appwiz.rc:43 -#, fuzzy msgid "&Modify/Remove" -msgstr "&Modify/Remove..." +msgstr "" #: appwiz.rc:48 msgid "Downloading..." @@ -2220,9 +2218,8 @@ msgid "&Help" msgstr "幫助(&H)" #: ieframe.rc:57 -#, fuzzy msgid "&About Internet Explorer" -msgstr "Wine Internet Explorer" +msgstr "" #: ieframe.rc:67 #, fuzzy @@ -3462,9 +3459,8 @@ msgid "No recovery program for service\n" msgstr "" #: winerror.mc:1291 -#, fuzzy msgid "Service not implemented by exe\n" -msgstr "Printing not implemented" +msgstr "" #: winerror.mc:1296 msgid "End of media\n" @@ -4665,19 +4661,16 @@ msgid "Installer service failed.\n" msgstr "剩餘空間" #: winerror.mc:2731 -#, fuzzy msgid "Installation aborted by user\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2736 -#, fuzzy msgid "Installation failure\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2741 -#, fuzzy msgid "Installation suspended\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2746 #, fuzzy @@ -4741,18 +4734,16 @@ msgid "Device removed\n" msgstr "" #: winerror.mc:2811 -#, fuzzy msgid "Installation already running\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2816 msgid "Installation package failed to open\n" msgstr "" #: winerror.mc:2821 -#, fuzzy msgid "Installation package is invalid\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2826 msgid "Installer user interface failed\n" @@ -4772,9 +4763,8 @@ msgid "Installation transform failed to apply\n" msgstr "" #: winerror.mc:2846 -#, fuzzy msgid "Installation package rejected\n" -msgstr "Installation Programs" +msgstr "" #: winerror.mc:2851 msgid "Function could not be called\n" @@ -5335,9 +5325,8 @@ msgid "RPC call cancelled\n" msgstr "" #: winerror.mc:3506 -#, fuzzy msgid "Binding incomplete\n" -msgstr "Printing not implemented" +msgstr "" #: winerror.mc:3511 msgid "RPC comm failure\n" @@ -5606,7 +5595,6 @@ msgid "insert disk %s" msgstr "插入軟碟 %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5638,35 +5626,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -5771,9 +5730,8 @@ msgid "application" msgstr "運用程式" #: oleacc.rc:42 -#, fuzzy msgid "document" -msgstr "Document" +msgstr "" #: oleacc.rc:43 msgid "pane" @@ -6740,9 +6698,8 @@ msgid "Program Files\\Common Files" msgstr "" #: shell32.rc:221 shell32.rc:147 shell32.rc:243 -#, fuzzy msgid "Documents" -msgstr "Document" +msgstr "" #: shell32.rc:222 msgid "Start Menu\\Programs\\Administrative Tools" @@ -6767,9 +6724,8 @@ msgid "Local Settings\\Application Data\\Microsoft\\CD Burning" msgstr "" #: shell32.rc:217 -#, fuzzy msgid "Program Files (x86)" -msgstr "Programs (*.exe)" +msgstr "" #: shell32.rc:220 msgid "Program Files (x86)\\Common Files" @@ -6863,31 +6819,31 @@ msgstr "" #: shell32.rc:166 msgid "Unable to create new Folder: Permission denied." -msgstr "Unable to create new Folder: Permission denied." +msgstr "" #: shell32.rc:167 msgid "Error during creation of a new folder" -msgstr "Error during creation of a new folder" +msgstr "" #: shell32.rc:168 msgid "Confirm file deletion" -msgstr "Confirm file deletion" +msgstr "" #: shell32.rc:169 msgid "Confirm folder deletion" -msgstr "Confirm folder deletion" +msgstr "" #: shell32.rc:170 msgid "Are you sure you want to delete '%1'?" -msgstr "Are you sure you want to delete '%1'?" +msgstr "" #: shell32.rc:171 msgid "Are you sure you want to delete these %1 items?" -msgstr "Are you sure you want to delete these %1 items?" +msgstr "" #: shell32.rc:178 msgid "Confirm file overwrite" -msgstr "Confirm file overwrite" +msgstr "" #: shell32.rc:177 msgid "" @@ -6895,32 +6851,27 @@ msgid "" "\n" "Do you want to replace it?" msgstr "" -"This folder already contains a file called '%1'.\n" -"\n" -"Do you want to replace it?" #: shell32.rc:172 msgid "Are you sure you want to delete the selected item(s)?" -msgstr "Are you sure you want to delete the selected item(s)?" +msgstr "" #: shell32.rc:174 msgid "" "Are you sure that you want to send '%1' and all its content to the Trash?" msgstr "" -"Are you sure that you want to send '%1' and all its content to the Trash?" #: shell32.rc:173 msgid "Are you sure that you want to send '%1' to the Trash?" -msgstr "Are you sure that you want to send '%1' to the Trash?" +msgstr "" #: shell32.rc:175 msgid "Are you sure that you want to send these %1 items to the Trash?" -msgstr "Are you sure that you want to send these %1 items to the Trash?" +msgstr "" #: shell32.rc:176 msgid "The item '%1' can't be sent to Trash. Do you want to delete it instead?" msgstr "" -"The item '%1' can't be sent to Trash. Do you want to delete it instead?" #: shell32.rc:179 msgid "" @@ -6930,15 +6881,10 @@ msgid "" "selected folder they will be replaced. Do you still want to move or copy\n" "the folder?" msgstr "" -"This folder already contains a folder named '%1'.\n" -"\n" -"If the files in the destination folder have the same names as files in the\n" -"selected folder they will be replaced. Do you still want to move or copy\n" -"the folder?" #: shell32.rc:247 msgid "New Folder" -msgstr "New Folder" +msgstr "" #: shell32.rc:249 msgid "Wine Control Panel" @@ -6962,19 +6908,16 @@ msgid "There is no Windows program configured to open this type of file." msgstr "" #: shell32.rc:255 -#, fuzzy msgid "Are you sure you wish to permanently delete '%1'?" -msgstr "Are you sure you want to delete '%1'?" +msgstr "" #: shell32.rc:256 -#, fuzzy msgid "Are you sure you wish to permanently delete these %1 items?" -msgstr "Are you sure you want to delete these %1 items?" +msgstr "" #: shell32.rc:257 -#, fuzzy msgid "Confirm deletion" -msgstr "Confirm file deletion" +msgstr "" #: shell32.rc:258 #, fuzzy @@ -6997,9 +6940,8 @@ msgstr "" "要替換嗎?" #: shell32.rc:260 -#, fuzzy msgid "Confirm overwrite" -msgstr "Confirm file overwrite" +msgstr "" #: shell32.rc:277 msgid "" @@ -7824,9 +7766,8 @@ msgid "Timeout" msgstr "" #: wldap32.rc:113 -#, fuzzy msgid "Auth Unknown" -msgstr "Context Unknown" +msgstr "" #: wldap32.rc:114 msgid "Filter Error" @@ -8900,9 +8841,8 @@ msgid "&Local server" msgstr "本地端口" #: oleview.rc:44 -#, fuzzy msgid "&Remote server" -msgstr "&Remove..." +msgstr "" #: oleview.rc:47 msgid "View &Type information" @@ -9623,7 +9563,7 @@ msgstr "添加一個新的多字符串值" #: regedit.rc:171 msgid "Exports selected branch of the registry to a text file" -msgstr "Exports selected branch of the registry to a text file" +msgstr "" #: start.rc:46 msgid "" @@ -10051,7 +9991,7 @@ msgstr "將進程設為低優先級" #: taskmgr.rc:247 msgid "Controls Debug Channels" -msgstr "Controls Debug Channels" +msgstr "" #: taskmgr.rc:263 #, fuzzy @@ -10247,9 +10187,8 @@ msgid "Task" msgstr "結束任務(&E)" #: taskmgr.rc:327 -#, fuzzy msgid "Debug Channels" -msgstr "Controls Debug Channels" +msgstr "" #: taskmgr.rc:328 msgid "Fixme" @@ -11248,11 +11187,11 @@ msgstr "單頁" #: wordpad.rc:167 msgid "Zoom in" -msgstr "Zoom in" +msgstr "" #: wordpad.rc:168 msgid "Zoom out" -msgstr "Zoom out" +msgstr "" #: wordpad.rc:170 #, fuzzy @@ -11286,7 +11225,7 @@ msgstr "" #: wordpad.rc:180 msgid "Document" -msgstr "Document" +msgstr "" #: wordpad.rc:181 msgid "Save changes to '%s'?" @@ -11332,7 +11271,7 @@ msgstr "你沒有開啟檔案的權力." #: wordpad.rc:193 msgid "Printing not implemented" -msgstr "Printing not implemented" +msgstr "" #: wordpad.rc:194 msgid "Cannot add more than 32 tab stops."

1 0

Francois Gouget : po: Remove English strings from the Turkish translation.
by Alexandre Julliard Sept. 9, 2011

Sept. 9, 2011

Module: wine Branch: master Commit: 9a14be9f6cb733434ea5f1ed12a4a58d4650def8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a14be9f6cb733434ea5f1ed1… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Sep 9 02:05:31 2011 +0200 po: Remove English strings from the Turkish translation. --- po/tr.po | 414 ++++++++++++++++++++------------------------------------------ 1 files changed, 133 insertions(+), 281 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a14be9f6cb733434ea5f…

1 0