September 2011 - Wine-commits

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

09 Sep '11

Module: wine Branch: master Commit: 82b7651841088c3a44b60a182490fd2a3976229f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b7651841088c3a44b60a182… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:48:13 2011 +0200 vbscript: Added parser support for equality expression. --- dlls/vbscript/parse.h | 7 +++++++ dlls/vbscript/parser.y | 26 ++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 0e1b4d1..607bdec 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,6 +18,7 @@ typedef enum { EXPR_BOOL, + EXPR_EQUAL, EXPR_MEMBER, EXPR_NOT, EXPR_STRING @@ -45,6 +46,12 @@ typedef struct { typedef struct { expression_t expr; + expression_t *left; + expression_t *right; +} binary_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 a743b97..7703402 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -38,6 +38,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 expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*); static member_expression_t *new_member_expression(parser_ctx_t*,expression_t*,const WCHAR*); @@ -74,7 +75,8 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %token <string> tIdentifier tString %type <statement> Statement StatementNl -%type <expression> Expression LiteralExpression PrimaryExpression +%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression +%type <expression> ConcatExpression %type <expression> NotExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -124,9 +126,16 @@ Expression : NotExpression { $$ = $1; } NotExpression + : EqualityExpression { $$ = $1; } + | tNOT NotExpression { $$ = new_unary_expression(ctx, EXPR_NOT, $2); CHECK_ERROR; } + +EqualityExpression + : ConcatExpression { $$ = $1; } + | EqualityExpression '=' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_EQUAL, $1, $3); CHECK_ERROR; } + +ConcatExpression : 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; } @@ -208,6 +217,19 @@ static expression_t *new_unary_expression(parser_ctx_t *ctx, expression_type_t t return &expr->expr; } +static expression_t *new_binary_expression(parser_ctx_t *ctx, expression_type_t type, expression_t *left, expression_t *right) +{ + binary_expression_t *expr; + + expr = new_expression(ctx, type, sizeof(*expr)); + if(!expr) + return NULL; + + expr->left = left; + expr->right = right; + 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 09 Sep '11

09 Sep '11

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 09 Sep '11

09 Sep '11

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 compiler/parser support for call expressions.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 114ffc8720a5ece8700802b33be97f9ae839fd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=114ffc8720a5ece8700802b33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:48:48 2011 +0200 vbscript: Added compiler/parser support for call expressions. --- dlls/vbscript/compile.c | 8 +++++--- dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parser.y | 8 ++++++-- dlls/vbscript/vbscript.h | 1 + 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 5ed19c4..e9b651d 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -146,7 +146,7 @@ static HRESULT compile_args(compile_ctx_t *ctx, expression_t *args, unsigned *re return S_OK; } -static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t *expr) +static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t *expr, BOOL ret_val) { unsigned arg_cnt = 0; HRESULT hres; @@ -159,7 +159,7 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t FIXME("obj_expr not implemented\n"); hres = E_NOTIMPL; }else { - hres = push_instr_bstr_uint(ctx, OP_icallv, expr->identifier, arg_cnt); + hres = push_instr_bstr_uint(ctx, ret_val ? OP_icall : OP_icallv, expr->identifier, arg_cnt); } return hres; @@ -198,6 +198,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) 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_MEMBER: + return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_STRING: @@ -217,7 +219,7 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_t *stat) while(stat) { switch(stat->type) { case STAT_CALL: - hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr); + hres = compile_member_expression(ctx, ((call_statement_t*)stat)->expr, FALSE); break; default: FIXME("Unimplemented statement type %d\n", stat->type); diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 42bef36..d88439a 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -168,6 +168,12 @@ static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) } } +static HRESULT interp_icall(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_icallv(exec_ctx_t *ctx) { BSTR identifier = ctx->instr->arg1.bstr; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 7703402..7bfdae9 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -75,7 +75,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 PrimaryExpression EqualityExpression +%type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression %type <expression> NotExpression %type <member> MemberExpression @@ -135,7 +135,11 @@ EqualityExpression ConcatExpression : LiteralExpression /* FIXME */ { $$ = $1; } - | PrimaryExpression /* FIXME */ { $$ = $1; } + | CallExpression /* FIXME */ { $$ = $1; } + +CallExpression + : PrimaryExpression { $$ = $1; } + | MemberExpression Arguments_opt { $1->args = $2; $$ = &$1->expr; } LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index e717872..0219334 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(equal, 1, 0, 0) \ + X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(not, 1, 0, 0) \ X(ret, 0, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_icall implementation.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 62a21545726ab580128b664a6f257838dbafe5d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a21545726ab580128b664a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:49:00 2011 +0200 vbscript: Added interp_icall implementation. --- dlls/vbscript/interp.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d88439a..ec56fa9 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -168,13 +168,7 @@ static void vbstack_to_dp(exec_ctx_t *ctx, unsigned arg_cnt, DISPPARAMS *dp) } } -static HRESULT interp_icall(exec_ctx_t *ctx) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT interp_icallv(exec_ctx_t *ctx) +static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res) { BSTR identifier = ctx->instr->arg1.bstr; const unsigned arg_cnt = ctx->instr->arg2.uint; @@ -182,8 +176,6 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) DISPPARAMS dp; HRESULT hres; - TRACE("\n"); - hres = lookup_identifier(ctx, identifier, &ref); if(FAILED(hres)) return hres; @@ -192,7 +184,7 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) switch(ref.type) { case REF_DISP: - hres = disp_call(ctx->script, ref.u.d.disp, ref.u.d.id, &dp, NULL); + hres = disp_call(ctx->script, ref.u.d.disp, ref.u.d.id, &dp, res); if(FAILED(hres)) return hres; break; @@ -205,6 +197,26 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_icall(exec_ctx_t *ctx) +{ + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = do_icall(ctx, &v); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); +} + +static HRESULT interp_icallv(exec_ctx_t *ctx) +{ + TRACE("\n"); + return do_icall(ctx, NULL); +} + static HRESULT interp_ret(exec_ctx_t *ctx) { TRACE("\n");

1 0

Jacek Caban : vbscript: Added more tests.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: ddc47d6974571d0681003523edd7bb72fd8bb187 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc47d6974571d0681003523e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 9 14:49:14 2011 +0200 vbscript: Added more tests. --- dlls/vbscript/tests/lang.vbs | 5 ++++ dlls/vbscript/tests/run.c | 53 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 6f8b815..1c9512a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -30,4 +30,9 @@ 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") +Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") +Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") +Call ok(getVT("") = "VT_BSTR", "getVT("""") is not VT_BSTR") +Call ok(getVT("test") = "VT_BSTR", "getVT(""test"") is not VT_BSTR") + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index b8cef40..329d75a 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -62,6 +62,7 @@ DEFINE_EXPECT(global_success_i); #define DISPID_GLOBAL_REPORTSUCCESS 1000 #define DISPID_GLOBAL_TRACE 1001 #define DISPID_GLOBAL_OK 1002 +#define DISPID_GLOBAL_GETVT 1003 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -87,6 +88,38 @@ static int strcmp_wa(LPCWSTR strw, const char *stra) return lstrcmpA(buf, stra); } +static const char *vt2a(VARIANT *v) +{ + if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { + static char buf[64]; + sprintf(buf, "%s*", vt2a(V_BYREF(v))); + return buf; + } + + switch(V_VT(v)) { + case VT_EMPTY: + return "VT_EMPTY"; + case VT_NULL: + return "VT_NULL"; + case VT_I2: + return "VT_I2"; + case VT_I4: + return "VT_I4"; + case VT_R8: + return "VT_R8"; + case VT_BSTR: + return "VT_BSTR"; + case VT_DISPATCH: + return "VT_DISPATCH"; + case VT_BOOL: + return "VT_BOOL"; + case VT_ARRAY|VT_VARIANT: + return "VT_ARRAY|VT_VARIANT"; + default: + ok(0, "unknown vt %d\n", V_VT(v)); + return NULL; + } +} #define test_grfdex(a,b) _test_grfdex(__LINE__,a,b) static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) @@ -202,6 +235,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_REPORTSUCCESS; return S_OK; } + if(!strcmp_wa(bstrName, "getVT")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_GETVT; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -254,6 +292,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, trace("%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); return S_OK; + case DISPID_GLOBAL_REPORTSUCCESS: CHECK_EXPECT(global_success_i); @@ -266,6 +305,20 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(pei != NULL, "pei == NULL\n"); return S_OK; + + case DISPID_GLOBAL_GETVT: + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_BSTR; + V_BSTR(pvarRes) = a2bstr(vt2a(pdp->rgvarg)); + return S_OK; } ok(0, "unexpected call %d\n", id);

1 0

Hans Leidekker : msi: Return the right error from ResolveSource when the user cancels.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: bd3885946c20be13cc2f96d2bdd8bd5490ddc1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd3885946c20be13cc2f96d2b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 11:01:12 2011 +0200 msi: Return the right error from ResolveSource when the user cancels. --- dlls/msi/action.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4c857f9..69384be 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5149,11 +5149,11 @@ static UINT ACTION_ResolveSource(MSIPACKAGE* package) msg = msi_build_error_string(package, 1302, 1, prompt); while(attrib == INVALID_FILE_ATTRIBUTES) { - rc = MessageBoxW(NULL,msg,NULL,MB_OKCANCEL); + rc = MessageBoxW(NULL, msg, NULL, MB_OKCANCEL); if (rc == IDCANCEL) { - rc = ERROR_INSTALL_USEREXIT; - break; + msi_free(prompt); + return ERROR_INSTALL_USEREXIT; } attrib = GetFileAttributesW(package->db->path); }

1 0

Hans Leidekker : msi: Remove some dead assignments (clang).
by Alexandre Julliard 09 Sep '11

09 Sep '11

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

Hans Leidekker : msi: Ignore unknown components in the FeatureComponents table.
by Alexandre Julliard 09 Sep '11

09 Sep '11

Module: wine Branch: master Commit: 258fc7137fa4456b80a87472f206cf16405e68af URL: http://source.winehq.org/git/wine.git/?a=commit;h=258fc7137fa4456b80a87472f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Sep 9 11:02:11 2011 +0200 msi: Ignore unknown components in the FeatureComponents table. --- dlls/msi/action.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 69384be..62d857a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1048,10 +1048,9 @@ static UINT iterate_load_featurecomponents(MSIRECORD *row, LPVOID param) comp = msi_get_loaded_component( ilfs->package, component ); if (!comp) { - ERR("unknown component %s\n", debugstr_w(component)); - return ERROR_FUNCTION_FAILED; + WARN("ignoring unknown component %s\n", debugstr_w(component)); + return ERROR_SUCCESS; } - add_feature_component( ilfs->feature, comp ); comp->Enabled = TRUE;

1 0

Francois Gouget : user32/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard 09 Sep '11

09 Sep '11

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