September 2008 - Wine-commits

Jacek Caban : jscript: Added prefix increment expression.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 5df7ac456f0a812fe8d20d249061ab0101afd746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df7ac456f0a812fe8d20d249… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:57:40 2008 +0200 jscript: Added prefix increment expression. --- dlls/jscript/engine.c | 34 +++++++++++++++++++++++++++++++--- dlls/jscript/tests/lang.js | 4 ++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 666f3ea..f6d5d86 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1548,10 +1548,38 @@ HRESULT post_decrement_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWOR return E_NOTIMPL; } -HRESULT pre_increment_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.4.4 */ +HRESULT pre_increment_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + unary_expression_t *expr = (unary_expression_t*)_expr; + VARIANT val, num; + exprval_t exprval; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression, EXPR_NEWREF, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_value(ctx->parser->script, &exprval, ei, &val); + if(SUCCEEDED(hres)) { + hres = to_number(ctx->parser->script, &val, ei, &num); + VariantClear(&val); + } + + if(SUCCEEDED(hres)) { + num_set_val(&val, num_val(&num)+1.0); + hres = put_value(ctx->parser->script, &exprval, &val, ei); + } + + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + ret->u.var = val; + return S_OK; } HRESULT pre_decrement_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 9211483..269c9da 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -223,4 +223,8 @@ ok("abce" >= "abcd", "abce >= abce failed"); ok("x" >= "", "\"x\" >= \"\" failed"); ok(0 >= 0, "0 >= 0"); +tmp = 1; +ok(++tmp === 2, "++tmp (1) is not 2"); +ok(tmp === 2, "incremented tmp is not 2"); + reportSuccess();

1 0

Jacek Caban : jscript: Added '<=' implementation.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 9332be04f0f07a3f8a6be71273ec0973ffd60da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9332be04f0f07a3f8a6be7127… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:56:29 2008 +0200 jscript: Added '<=' implementation. --- dlls/jscript/engine.c | 23 ++++++++++++++++++++--- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6d336fe..3d21b21 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1683,10 +1683,27 @@ HRESULT less_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, return return_bool(ret, b); } -HRESULT lesseq_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.8.3 */ +HRESULT lesseq_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT rval, lval; + BOOL b; + HRESULT hres; + + TRACE("\n"); + + hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); + if(FAILED(hres)) + return hres; + + hres = less_eval(ctx, &rval, &lval, ei, &b); + VariantClear(&lval); + VariantClear(&rval); + if(FAILED(hres)) + return hres; + + return return_bool(ret, !b); } HRESULT greater_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index f94284f..2799b15 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -202,4 +202,11 @@ ok("abcd" < "abce", "abce < abce failed"); ok("" < "x", "\"\" < \"x\" failed"); ok(!(0 < 0), "0 < 0"); +ok(1 <= 3.4, "1 <= 3.4 failed"); +ok(!(3.4 <= 1), "3.4 <= 1"); +ok("abc" <= "abcd", "abc <= abcd failed"); +ok("abcd" <= "abce", "abce <= abce failed"); +ok("" <= "x", "\"\" <= \"x\" failed"); +ok(0 <= 0, "0 <= 0 failed"); + reportSuccess();

1 0

Jacek Caban : jscript: Added '<' expression implementation.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 8e2a9ae06a92b7602f184160103bdeaff8104993 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e2a9ae06a92b7602f1841601… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:56:03 2008 +0200 jscript: Added '<' expression implementation. --- dlls/jscript/engine.c | 62 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 7 +++++ 2 files changed, 66 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d5cc1c1..6d336fe 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1621,10 +1621,66 @@ HRESULT not_equal2_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return return_bool(ret, !b); } -HRESULT less_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.8.5 */ +static HRESULT less_eval(exec_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, BOOL *ret) { - FIXME("\n"); - return E_NOTIMPL; + VARIANT l, r, ln, rn; + HRESULT hres; + + hres = to_primitive(ctx->parser->script, lval, ei, &l); + if(FAILED(hres)) + return hres; + + hres = to_primitive(ctx->parser->script, rval, ei, &r); + if(FAILED(hres)) { + VariantClear(&l); + return hres; + } + + if(V_VT(&l) == VT_BSTR && V_VT(&r) == VT_BSTR) { + *ret = strcmpW(V_BSTR(&l), V_BSTR(&r)) < 0; + SysFreeString(V_BSTR(&l)); + SysFreeString(V_BSTR(&r)); + return S_OK; + } + + hres = to_number(ctx->parser->script, &l, ei, &ln); + VariantClear(&l); + if(SUCCEEDED(hres)) + hres = to_number(ctx->parser->script, &r, ei, &rn); + VariantClear(&r); + if(FAILED(hres)) + return hres; + + if(V_VT(&ln) == VT_I4 && V_VT(&rn) == VT_I4) + *ret = V_I4(&ln) < V_I4(&rn); + else + *ret = num_val(&ln) < num_val(&rn); + + return S_OK; +} + +/* ECMA-262 3rd Edition 11.8.1 */ +HRESULT less_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +{ + binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT rval, lval; + BOOL b; + HRESULT hres; + + TRACE("\n"); + + hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); + if(FAILED(hres)) + return hres; + + hres = less_eval(ctx, &lval, &rval, ei, &b); + VariantClear(&lval); + VariantClear(&rval); + if(FAILED(hres)) + return hres; + + return return_bool(ret, b); } HRESULT lesseq_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 92fb6cd..f94284f 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -195,4 +195,11 @@ ok(tmp === "test", "true && \"test\" is not \"test\""); tmp = true && 0; ok(tmp === 0, "true && 0 is not 0"); +ok(1 < 3.4, "1 < 3.4 failed"); +ok(!(3.4 < 1), "3.4 < 1"); +ok("abc" < "abcd", "abc < abcd failed"); +ok("abcd" < "abce", "abce < abce failed"); +ok("" < "x", "\"\" < \"x\" failed"); +ok(!(0 < 0), "0 < 0"); + reportSuccess();

1 0

Jacek Caban : jscript: Added '&&' expression implementation.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: bc9e6aa1e5a0124b14a832d75f0c7ead998d4f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc9e6aa1e5a0124b14a832d75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:55:38 2008 +0200 jscript: Added '&&' expression implementation. --- dlls/jscript/engine.c | 45 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 9 ++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index cf1045b..d5cc1c1 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1270,10 +1270,49 @@ HRESULT logical_or_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f return S_OK; } -HRESULT logical_and_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.11 */ +HRESULT logical_and_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + exprval_t exprval; + VARIANT_BOOL b; + VARIANT val; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression1, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + hres = to_boolean(&val, &b); + if(SUCCEEDED(hres) && !b) { + ret->type = EXPRVAL_VARIANT; + ret->u.var = val; + return S_OK; + } + + VariantClear(&val); + if(FAILED(hres)) + return hres; + + hres = expr_eval(ctx, expr->expression2, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + ret->u.var = val; + return S_OK; } HRESULT binary_or_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index b334d96..92fb6cd 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -186,4 +186,13 @@ ok(tmp === 3, "3 || (...) is not 3"); tmp = false || 2; ok(tmp === 2, "false || 2 is not 2"); +tmp = 0 && ok(false, "second and expression called"); +ok(tmp === 0, "0 && (...) is not 0"); + +tmp = true && "test"; +ok(tmp === "test", "true && \"test\" is not \"test\""); + +tmp = true && 0; +ok(tmp === 0, "true && 0 is not 0"); + reportSuccess();

1 0

Jacek Caban : jscript: Added '+=' expression implementation.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 50c7c4b7193cf21a956d2bdba656dc09e6f5fb26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c7c4b7193cf21a956d2bdba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:54:45 2008 +0200 jscript: Added '+=' expression implementation. --- dlls/jscript/engine.c | 51 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 4 +++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a952ecb..a97d23a 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -785,6 +785,47 @@ static HRESULT binary_expr_eval(exec_ctx_t *ctx, binary_expression_t *expr, oper return S_OK; } +/* ECMA-262 3rd Edition 11.13.2 */ +static HRESULT assign_oper_eval(exec_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->parser->script, &exprval, ei, &lval); + if(SUCCEEDED(hres)) { + hres = expr_eval(ctx, rexpr, 0, ei, &exprvalr); + if(SUCCEEDED(hres)) { + hres = exprval_value(ctx->parser->script, &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->parser->script, &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(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { @@ -1624,10 +1665,14 @@ HRESULT assign_rrshift_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWOR return E_NOTIMPL; } -HRESULT assign_add_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.13.2 */ +HRESULT assign_add_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + + TRACE("\n"); + + return assign_oper_eval(ctx, expr->expression1, expr->expression2, add_eval, ei, ret); } HRESULT assign_sub_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 302de8d..adbb9d2 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -176,4 +176,8 @@ ok(getVT(tmp) === "VT_I4", "getVT(1.5+2.5) !== VT_I4"); tmp = "ab" + "cd"; ok(tmp === "abcd", "\"ab\" + \"cd\" !== \"abcd\""); +tmp = 1; +ok((tmp += 1) === 2, "tmp += 1 !== 2"); +ok(tmp === 2, "tmp !== 2"); + reportSuccess();

1 0

Jacek Caban : jscript: Added '||' expression implementation.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 6d541ecc5dff7cb6a07d8b1a0ab488a1b68a82d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d541ecc5dff7cb6a07d8b1a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 11 23:55:14 2008 +0200 jscript: Added '||' expression implementation. --- dlls/jscript/engine.c | 45 +++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/lang.js | 6 +++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a97d23a..cf1045b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1225,10 +1225,49 @@ HRESULT comma_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, return E_NOTIMPL; } -HRESULT logical_or_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.11 */ +HRESULT logical_or_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - FIXME("\n"); - return E_NOTIMPL; + binary_expression_t *expr = (binary_expression_t*)_expr; + exprval_t exprval; + VARIANT_BOOL b; + VARIANT val; + HRESULT hres; + + TRACE("\n"); + + hres = expr_eval(ctx, expr->expression1, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + hres = to_boolean(&val, &b); + if(SUCCEEDED(hres) && b) { + ret->type = EXPRVAL_VARIANT; + ret->u.var = val; + return S_OK; + } + + VariantClear(&val); + if(FAILED(hres)) + return hres; + + hres = expr_eval(ctx, expr->expression2, 0, ei, &exprval); + if(FAILED(hres)) + return hres; + + hres = exprval_to_value(ctx->parser->script, &exprval, ei, &val); + exprval_release(&exprval); + if(FAILED(hres)) + return hres; + + ret->type = EXPRVAL_VARIANT; + ret->u.var = val; + return S_OK; } HRESULT logical_and_expression_eval(exec_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index adbb9d2..b334d96 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -180,4 +180,10 @@ tmp = 1; ok((tmp += 1) === 2, "tmp += 1 !== 2"); ok(tmp === 2, "tmp !== 2"); +tmp = 3 || ok(false, "second or expression called"); +ok(tmp === 3, "3 || (...) is not 3"); + +tmp = false || 2; +ok(tmp === 2, "false || 2 is not 2"); + reportSuccess();

1 0

Juan Lang : winex11: Make button_state as large as the maximum number of cursors. Fixes Coverity id 728.
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 6e726e2a916ef4a48590d91a52e1116a38110602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e726e2a916ef4a48590d91a5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 11 13:14:22 2008 -0700 winex11: Make button_state as large as the maximum number of cursors. Fixes Coverity id 728. --- dlls/winex11.drv/wintab.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 5793e2c..c6545e7 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -267,7 +267,6 @@ static int proximity_out_type; static HWND hwndTabletDefault; static WTPACKET gMsgPacket; static DWORD gSerial; -static INT button_state[10]; /* Reference: http://www.wacomeng.com/devsupport/ibmpc/gddevpc.html * @@ -303,6 +302,7 @@ static INT button_state[10]; * So to support that we need CURSORMAX of 12 (0 to 11) * FIXME: we don't support more than 4 regular tablets or 2 multimode tablets */ #define CURSORMAX 12 +static INT button_state[CURSORMAX]; static LOGCONTEXTW gSysContext; static WTI_DEVICES_INFO gSysDevice;

1 0

Ismael Barros : dplayx: Fix static overrun of pDP array in test (Coverity).
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 7dddf097a8f0e3197f55f6eb9b6abffa803c3dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dddf097a8f0e3197f55f6eb9… Author: Ismael Barros <razielmine(a)gmail.com> Date: Thu Sep 11 20:50:58 2008 +0200 dplayx: Fix static overrun of pDP array in test (Coverity). --- dlls/dplayx/tests/dplayx.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index d084c9b..345647a 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -4280,9 +4280,8 @@ static void test_EnumGroupsInGroup(void) checkHR( DP_OK, hr ); /* - Open session */ - callbackData.pDP = pDP[1]; hr = IDirectPlayX_EnumSessions( pDP[1], &dpsd[0], 0, EnumSessions_cb_join, - (LPVOID) &callbackData, 0 ); + (LPVOID) pDP[1], 0 ); checkHR( DP_OK, hr );

1 0

Francois Gouget : ws2_32/tests: Fix a race in sock.c:test_write_events().
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 96e15460e1f9c73f057c7d5b7306811e8f57339e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e15460e1f9c73f057c7d5b7… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 11 16:53:43 2008 +0200 ws2_32/tests: Fix a race in sock.c:test_write_events(). Stop draining the socket to make sure we will be able to fill the send buffer and trigger a short write. --- dlls/ws2_32/tests/sock.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 715516d..ceb9281 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2020,6 +2020,7 @@ static void test_ioctlsocket(void) } } +static int drain_pause=0; static DWORD WINAPI drain_socket_thread(LPVOID arg) { char buffer[1024]; @@ -2036,6 +2037,8 @@ static DWORD WINAPI drain_socket_thread(LPVOID arg) FD_ZERO(&readset); FD_SET(sock, &readset); select(0, &readset, NULL, NULL, NULL); + while (drain_pause) + Sleep(100); } else break; @@ -2188,13 +2191,17 @@ static void test_write_events(void) goto end; } - /* Now if we send a tonne of data, the socket send buffer will only take some of it, - and we will get a short write, which will trigger another FD_WRITE event - as soon as data is sent and more space becomes available, but not any earlier. */ + /* Now if we send a ton of data and the 'server' does not drain it fast + * enough (set drain_pause to be sure), the socket send buffer will only + * take some of it, and we will get a short write. This will trigger + * another FD_WRITE event as soon as data is sent and more space becomes + * available, but not any earlier. */ + drain_pause=1; do { ret = send(src, buffer, bufferSize, 0); } while (ret == bufferSize); + drain_pause=0; if (ret >= 0 || WSAGetLastError() == WSAEWOULDBLOCK) { dwRet = WaitForSingleObject(hEvent, 5000);

1 0

Muneyuki Noguchi : winex11: Fix a buffer overflow bug in X11DRV_KeyEvent() and X11DRV_ToUnicodeEx().
by Alexandre Julliard 12 Sep '08

12 Sep '08

Module: wine Branch: master Commit: 18d2653c3b15a22ad0c00d5d5a701685ad5bcd85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d2653c3b15a22ad0c00d5d5… Author: Muneyuki Noguchi <nogu.dev(a)gmail.com> Date: Thu Sep 11 23:46:59 2008 +0900 winex11: Fix a buffer overflow bug in X11DRV_KeyEvent() and X11DRV_ToUnicodeEx(). --- dlls/winex11.drv/keyboard.c | 54 +++++++++++++++++++++++++++++++++--------- 1 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index fe0e840..99b16ed 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1352,7 +1352,8 @@ static void update_lock_state(BYTE vkey, WORD scan, DWORD time) void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) { XKeyEvent *event = &xev->xkey; - char Str[24]; + char buf[24]; + char *Str = buf; KeySym keysym = 0; WORD vkey = 0, bScan; DWORD dwFlags; @@ -1367,19 +1368,32 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) wine_tsx11_lock(); /* Clients should pass only KeyPress events to XmbLookupString */ if (xic && event->type == KeyPress) - ascii_chars = XmbLookupString(xic, event, Str, sizeof(Str), &keysym, &status); + { + ascii_chars = XmbLookupString(xic, event, buf, sizeof(buf), &keysym, &status); + TRACE("XmbLookupString needs %i byte(s)\n", ascii_chars); + if (status == XBufferOverflow) + { + Str = HeapAlloc(GetProcessHeap(), 0, ascii_chars); + if (Str == NULL) + { + ERR("Failed to allocate memory!\n"); + wine_tsx11_unlock(); + return; + } + ascii_chars = XmbLookupString(xic, event, Str, ascii_chars, &keysym, &status); + } + } else - ascii_chars = XLookupString(event, Str, sizeof(Str), &keysym, NULL); + ascii_chars = XLookupString(event, buf, sizeof(buf), &keysym, NULL); wine_tsx11_unlock(); TRACE_(key)("nbyte = %d, status 0x%x\n", ascii_chars, status); - if (status == XBufferOverflow) - ERR("Buffer Overflow need %i!\n",ascii_chars); - if (status == XLookupChars) { X11DRV_XIMLookupChars( Str, ascii_chars ); + if (buf != Str) + HeapFree(GetProcessHeap(), 0, Str); return; } @@ -1407,6 +1421,8 @@ void X11DRV_KeyEvent( HWND hwnd, XEvent *xev ) (event->type == KeyPress) ? "KeyPress" : "KeyRelease", keysym, ksname, ascii_chars, debugstr_an(Str, ascii_chars)); } + if (buf != Str) + HeapFree(GetProcessHeap(), 0, Str); wine_tsx11_lock(); vkey = EVENT_event_to_vkey(xic,event); @@ -2419,7 +2435,8 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, KeySym keysym = 0; INT ret; int keyc; - char lpChar[10]; + char buf[10]; + char *lpChar = buf; HWND focus; XIC xic; Status status = 0; @@ -2518,16 +2535,27 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, * e.type was set to KeyPress above. */ if (xic) - ret = XmbLookupString(xic, &e, lpChar, sizeof(lpChar), &keysym, &status); + { + ret = XmbLookupString(xic, &e, buf, sizeof(buf), &keysym, &status); + TRACE("XmbLookupString needs %d byte(s)\n", ret); + if (status == XBufferOverflow) + { + lpChar = HeapAlloc(GetProcessHeap(), 0, ret); + if (lpChar == NULL) + { + ERR("Failed to allocate memory!\n"); + wine_tsx11_unlock(); + return 0; + } + ret = XmbLookupString(xic, &e, lpChar, ret, &keysym, &status); + } + } else - ret = XLookupString(&e, lpChar, sizeof(lpChar), &keysym, NULL); + ret = XLookupString(&e, buf, sizeof(buf), &keysym, NULL); wine_tsx11_unlock(); TRACE_(key)("nbyte = %d, status 0x%x\n", ret, status); - if (status == XBufferOverflow) - ERR("Buffer Overflow need %d!\n", ret); - if (TRACE_ON(key)) { const char *ksname; @@ -2661,6 +2689,8 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, } found: + if (buf != lpChar) + HeapFree(GetProcessHeap(), 0, lpChar); TRACE_(key)("ToUnicode about to return %d with char %x %s\n", ret, (ret && bufW) ? bufW[0] : 0, bufW ? "" : "(no buffer)"); return ret;

1 0