December 2011 - Wine-commits

Nikolay Sivov : comctl32/listview: Create header when LVS_EX_FULLROWSELECT is requested.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 485fde811db67ba2aaf51ac6f0850f32a6b5afe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485fde811db67ba2aaf51ac6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 10:42:54 2011 +0300 comctl32/listview: Create header when LVS_EX_FULLROWSELECT is requested. --- dlls/comctl32/listview.c | 5 +++++ dlls/comctl32/tests/listview.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c951633..3cd316a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8450,6 +8450,11 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD mas LISTVIEW_UpdateSize(infoPtr); } + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_FULLROWSELECT) + { + LISTVIEW_CreateHeader(infoPtr); + } + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_TRANSPARENTBKGND) { if (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTBKGND) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 64d6090..b3df59e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1557,6 +1557,20 @@ static void test_create(void) ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); + /* setting LVS_EX_FULLROWSELECT creates header */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader) || + broken(!IsWindow(hHeader)), /* 4.7x common controls */ + "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + DestroyWindow(hList); + /* not report style accepts LVS_EX_HEADERDRAGDROP too */ hList = create_listview_control(LVS_ICON); SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP);

1 0

Hans Leidekker : winhttp: Avoid a null pointer dereference (clang).
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: e950e89867cca8ed3fad6c9cbbdb12a746c320bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e950e89867cca8ed3fad6c9cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 09:01:23 2011 +0100 winhttp: Avoid a null pointer dereference (clang). --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 0f9e782..b4ed568 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -565,7 +565,7 @@ static void str_to_buffer( WCHAR *buffer, const WCHAR *str, LPDWORD buflen ) if (str) len = strlenW( str ); if (buffer && *buflen > len) { - memcpy( buffer, str, len * sizeof(WCHAR) ); + if (str) memcpy( buffer, str, len * sizeof(WCHAR) ); buffer[len] = 0; } *buflen = len * sizeof(WCHAR);

1 0

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

09 Dec '11

Module: wine Branch: master Commit: 053d1731fe815c11d355cf9bf64602dd183fdd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053d1731fe815c11d355cf9bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 09:01:42 2011 +0100 winhttp: Remove some dead assignments (clang). --- dlls/winhttp/request.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f610dde..fac6fac 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1872,7 +1872,7 @@ static BOOL receive_response( request_t *request, BOOL async ) if (!(ret = handle_redirect( request, status ))) break; clear_response_headers( request ); - ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ + send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ continue; } else if (status == 401 || status == 407) @@ -1886,7 +1886,7 @@ static BOOL receive_response( request_t *request, BOOL async ) break; } clear_response_headers( request ); - ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); + send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); continue; } break;

1 0

Jacek Caban : jscript: Fixed memory leaks.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: fcdd85267db6a3f12a94712f86d93b488ee62c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcdd85267db6a3f12a94712f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:04:14 2011 +0100 jscript: Fixed memory leaks. --- dlls/jscript/engine.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 63ae9d7..6a76f8e 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1585,6 +1585,7 @@ static HRESULT interp_array(exec_ctx_t *ctx) } hres = to_string(ctx->parser->script, namev, &ctx->ei, &name); + VariantClear(namev); if(FAILED(hres)) { IDispatch_Release(obj); return hres; @@ -2701,6 +2702,8 @@ static HRESULT interp_postinc(exec_ctx_t *ctx) num_set_val(&inc, num_val(&n)+(double)arg); hres = disp_propput(ctx->parser->script, obj, id, &inc, &ctx->ei, NULL/*FIXME*/); } + if(FAILED(hres)) + VariantClear(&v); } IDispatch_Release(obj); if(FAILED(hres))

1 0

Jacek Caban : jscript: Use bytecode for '>>>' expression implementation.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 96e822a33edd16ed0486443a0f3f48d6eb5d8df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e822a33edd16ed0486443a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:04:24 2011 +0100 jscript: Use bytecode for '>>>' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 15 +++++++++++---- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index d733c33..ececd10 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -693,6 +693,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_preinc, 1); case EXPR_RSHIFT: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_rshift); + case EXPR_RRSHIFT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_rshift2); case EXPR_SUB: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_THIS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6a76f8e..1699d84 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3160,13 +3160,20 @@ static HRESULT rshift2_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jse } /* ECMA-262 3rd Edition 11.7.3 */ -HRESULT right2_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_rshift2(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + DWORD r, l; + HRESULT hres; - TRACE("\n"); + hres = stack_pop_uint(ctx, &r); + if(FAILED(hres)) + return hres; - return binary_expr_eval(ctx, expr, rshift2_eval, ei, ret); + hres = stack_pop_uint(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_int(ctx, l >> (r&0x1f)); } /* ECMA-262 3rd Edition 11.13.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index dc7f6ac..5b0a869 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -83,6 +83,7 @@ typedef struct _func_stack { X(preinc, 1, ARG_INT, 0) \ X(regexp, 1, ARG_STR, ARG_INT) \ X(rshift, 1, 0,0) \ + X(rshift2, 1, 0,0) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ X(throw, 0, ARG_UINT, 0) \ @@ -567,7 +568,6 @@ HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3322206..f07280b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1338,7 +1338,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, left_shift_expression_eval, compiled_expression_eval, - right2_shift_expression_eval, + compiled_expression_eval, compiled_expression_eval, assign_lshift_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '>>>=' expression implementation.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 7904932a9ed5320391acfd2b43fd0d6c8695a376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7904932a9ed5320391acfd2b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:04:45 2011 +0100 jscript: Use bytecode for '>>>=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 29 ----------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index ececd10..541e945 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -627,6 +627,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or); case EXPR_ASSIGNRSHIFT: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_rshift); + case EXPR_ASSIGNRRSHIFT: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_rshift2); case EXPR_ASSIGNXOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor); case EXPR_BAND: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1699d84..3ebdb83 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3141,25 +3141,6 @@ static HRESULT interp_rshift(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.7.3 */ -static HRESULT rshift2_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - DWORD li, ri; - HRESULT hres; - - hres = to_uint32(ctx, lval, ei, &li); - if(FAILED(hres)) - return hres; - - hres = to_uint32(ctx, rval, ei, &ri); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_I4; - V_I4(retv) = li >> (ri&0x1f); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.7.3 */ static HRESULT interp_rshift2(exec_ctx_t *ctx) { DWORD r, l; @@ -3212,16 +3193,6 @@ HRESULT assign_lshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DW return assign_oper_eval(ctx, expr->expression1, expr->expression2, lshift_eval, ei, ret); } -/* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift2_eval, ei, ret); -} - static HRESULT interp_undefined(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 5b0a869..ba2c3a8 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -569,7 +569,6 @@ HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f07280b..00fea0b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1342,7 +1342,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, assign_lshift_expression_eval, compiled_expression_eval, - assign_rrshift_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '<<' expression implementation.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: a80392e5eaa746590aaf46a8e046a0837fcfc54c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80392e5eaa746590aaf46a8e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:04:57 2011 +0100 jscript: Use bytecode for '<<' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 16 ++++++++++++---- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 541e945..0f85471 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -667,6 +667,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_literal(ctx, ((literal_expression_t*)expr)->literal); case EXPR_LOGNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); + case EXPR_LSHIFT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lshift); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr); case EXPR_MINUS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 3ebdb83..0f74940 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3113,13 +3113,21 @@ static HRESULT lshift_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsex } /* ECMA-262 3rd Edition 11.7.1 */ -HRESULT left_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_lshift(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + DWORD r; + INT l; + HRESULT hres; - TRACE("\n"); + hres = stack_pop_uint(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_int(ctx, &l); + if(FAILED(hres)) + return hres; - return binary_expr_eval(ctx, expr, lshift_eval, ei, ret); + return stack_push_int(ctx, l << (r&0x1f)); } /* ECMA-262 3rd Edition 11.7.2 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index ba2c3a8..d7714fe 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -65,6 +65,7 @@ typedef struct _func_stack { X(jmp, 0, ARG_ADDR, 0) \ X(jmp_nz, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ + X(lshift, 1, 0,0) \ X(lt, 1, 0,0) \ X(lteq, 1, 0,0) \ X(member, 1, ARG_BSTR, 0) \ @@ -567,7 +568,6 @@ HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 00fea0b..3019c60 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1336,7 +1336,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - left_shift_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '<<=' expression implementation.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 7c3728d728da6a0732eb265e0a195f75e71b4490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c3728d728da6a0732eb265e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:05:08 2011 +0100 jscript: Use bytecode for '<<=' expression implementation. --- dlls/jscript/compile.c | 2 + dlls/jscript/engine.c | 71 ------------------------------------------------ dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 73 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0f85471..1121838 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -625,6 +625,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod); case EXPR_ASSIGNOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or); + case EXPR_ASSIGNLSHIFT: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_lshift); case EXPR_ASSIGNRSHIFT: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_rshift); case EXPR_ASSIGNRRSHIFT: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0f74940..7886c0c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1440,47 +1440,6 @@ static HRESULT binary_expr_eval(script_ctx_t *ctx, binary_expression_t *expr, op return S_OK; } -/* ECMA-262 3rd Edition 11.13.2 */ -static HRESULT assign_oper_eval(script_ctx_t *ctx, expression_t *lexpr, expression_t *rexpr, oper_t oper, - jsexcept_t *ei, exprval_t *ret) -{ - VARIANT retv, lval, rval; - exprval_t exprval, exprvalr; - HRESULT hres; - - hres = expr_eval(ctx, lexpr, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = exprval_value(ctx, &exprval, ei, &lval); - if(SUCCEEDED(hres)) { - hres = expr_eval(ctx, rexpr, 0, ei, &exprvalr); - if(SUCCEEDED(hres)) { - hres = exprval_value(ctx, &exprvalr, ei, &rval); - exprval_release(&exprvalr); - } - if(SUCCEEDED(hres)) { - hres = oper(ctx, &lval, &rval, ei, &retv); - VariantClear(&rval); - } - VariantClear(&lval); - } - - if(SUCCEEDED(hres)) { - hres = put_value(ctx, &exprval, &retv, ei); - if(FAILED(hres)) - VariantClear(&retv); - } - exprval_release(&exprval); - - if(FAILED(hres)) - return hres; - - ret->type = EXPRVAL_VARIANT; - ret->u.var = retv; - return S_OK; -} - /* ECMA-262 3rd Edition 13 */ HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -3093,26 +3052,6 @@ static HRESULT interp_neg(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.7.1 */ -static HRESULT lshift_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - DWORD ri; - INT li; - HRESULT hres; - - hres = to_int32(ctx, lval, ei, &li); - if(FAILED(hres)) - return hres; - - hres = to_uint32(ctx, rval, ei, &ri); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_I4; - V_I4(retv) = li << (ri&0x1f); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.7.1 */ static HRESULT interp_lshift(exec_ctx_t *ctx) { DWORD r; @@ -3191,16 +3130,6 @@ static HRESULT interp_assign(exec_ctx_t *ctx) return stack_push(ctx, v); } -/* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_lshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, lshift_eval, ei, ret); -} - static HRESULT interp_undefined(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index d7714fe..e6ad0c9 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -568,7 +568,6 @@ HRESULT property_value_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3019c60..76d1c1d 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1340,7 +1340,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - assign_lshift_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Piotr Caban : services: Accept SERVICE_START_PENDING as valid service start status.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 8e915c51e1e34aae76dacc97065998c13a090090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e915c51e1e34aae76dacc970… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 9 13:33:32 2011 +0100 services: Accept SERVICE_START_PENDING as valid service start status. --- programs/services/services.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 4369d28..4a4aeb8 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -711,7 +711,12 @@ static DWORD service_wait_for_startup(struct service_entry *service_entry, HANDL service_lock_shared(service_entry); dwCurrentStatus = service_entry->status.dwCurrentState; service_unlock(service_entry); - if (dwCurrentStatus == SERVICE_RUNNING) + if (dwCurrentStatus == SERVICE_START_PENDING) + { + WINE_TRACE("Service changed its status to SERVICE_START_PENDING\n"); + return ERROR_SUCCESS; + } + else if (dwCurrentStatus == SERVICE_RUNNING) { WINE_TRACE("Service started successfully\n"); return ERROR_SUCCESS;

1 0

Piotr Caban : services: Set result inside service_send_command.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: c368e551964ca8e0bb67a7964fecd943e0716644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c368e551964ca8e0bb67a7964… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 9 13:33:45 2011 +0100 services: Set result inside service_send_command. --- programs/services/rpc.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 66bd17b..806e65d 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -914,34 +914,50 @@ BOOL service_send_command( struct service_entry *service, HANDLE pipe, const void *data, DWORD size, DWORD *result ) { OVERLAPPED overlapped; - DWORD count; + DWORD count, ret; BOOL r; overlapped.hEvent = service->overlapped_event; r = WriteFile(pipe, data, size, &count, &overlapped); if (!r && GetLastError() == ERROR_IO_PENDING) { - WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); + ret = WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); + if (ret == WAIT_TIMEOUT) + { + WINE_ERR("sending command timed out\n"); + *result = ERROR_SERVICE_REQUEST_TIMEOUT; + return FALSE; + } r = GetOverlappedResult( pipe, &overlapped, &count, FALSE ); } if (!r || count != size) { WINE_ERR("service protocol error - failed to write pipe!\n"); + *result = (!r ? GetLastError() : ERROR_WRITE_FAULT); return FALSE; } r = ReadFile(pipe, result, sizeof *result, &count, &overlapped); if (!r && GetLastError() == ERROR_IO_PENDING) { - WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); + ret = WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); + if (ret == WAIT_TIMEOUT) + { + WINE_ERR("receiving command result timed out\n"); + *result = ERROR_SERVICE_REQUEST_TIMEOUT; + return FALSE; + } r = GetOverlappedResult( pipe, &overlapped, &count, FALSE ); } if (!r || count != sizeof *result) { WINE_ERR("service protocol error - failed to read pipe " "r = %d count = %d!\n", r, count); + *result = (!r ? GetLastError() : ERROR_READ_FAULT); return FALSE; } - return r; + + *result = ERROR_SUCCESS; + return TRUE; } /****************************************************************************** @@ -996,7 +1012,7 @@ DWORD __cdecl svcctl_ControlService( { DWORD access_required; struct sc_service_handle *service; - DWORD err; + DWORD result; BOOL ret; HANDLE control_mutex; HANDLE control_pipe; @@ -1027,8 +1043,8 @@ DWORD __cdecl svcctl_ControlService( return ERROR_INVALID_PARAMETER; } - if ((err = validate_service_handle(hService, access_required, &service)) != 0) - return err; + if ((result = validate_service_handle(hService, access_required, &service)) != 0) + return result; service_lock_exclusive(service->service_entry); @@ -1078,9 +1094,7 @@ DWORD __cdecl svcctl_ControlService( ret = WaitForSingleObject(control_mutex, 30000); if (ret == WAIT_OBJECT_0) { - DWORD result = ERROR_SUCCESS; - - ret = service_send_control(service->service_entry, control_pipe, dwControl, &result); + service_send_control(service->service_entry, control_pipe, dwControl, &result); if (dwControl == SERVICE_CONTROL_STOP) {

1 0