December 2011 - Wine-Commits

Andrew Eikum : wineoss.drv: Don't set volume in IAudioClient::Initialize.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: eed756c8dd352c35958c5ee5534eefc76cb82504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eed756c8dd352c35958c5ee55… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 5 06:37:29 2011 -0600 wineoss.drv: Don't set volume in IAudioClient::Initialize. --- dlls/wineoss.drv/mmdevdrv.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index bb3297b..571495d 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -931,10 +931,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_FAIL; } - mask = (100 << 8) | 100; - if(ioctl(This->fd, SNDCTL_DSP_SETPLAYVOL, &mask) < 0) - WARN("SETPLAYVOL failed: %d (%s)\n", errno, strerror(errno)); - This->fmt = clone_format(fmt); if(!This->fmt){ LeaveCriticalSection(&This->lock);

1 0

Alexandre Julliard : winex11: Always refresh the picture clipping when we have an additional clip region .
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: abd5d5a3a95c01c3b010ecad9cc960013e1e5924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd5d5a3a95c01c3b010ecad9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 17:21:17 2011 +0100 winex11: Always refresh the picture clipping when we have an additional clip region. --- dlls/winex11.drv/xrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 3853cd8..1c15d2a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -594,7 +594,7 @@ static Picture get_xrender_picture( struct xrender_physdev *dev, HRGN clip_rgn, dev->update_clip = TRUE; } - if (dev->update_clip) + if (dev->update_clip || clip_rect || clip_rgn) { RGNDATA *clip_data; HRGN rgn = 0;

1 0

Marcus Meissner : ole32: Output more information in OleCreateStaticFromData .
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: cfe49e3697b95c1cc198d2477ce67f02a103c5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfe49e3697b95c1cc198d2477… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 4 23:52:55 2011 +0100 ole32: Output more information in OleCreateStaticFromData. --- dlls/ole32/ole2stubs.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c index b029a86..16ac8d1 100644 --- a/dlls/ole32/ole2stubs.c +++ b/dlls/ole32/ole2stubs.c @@ -90,7 +90,8 @@ HRESULT WINAPI OleCreateStaticFromData(LPDATAOBJECT pSrcDataObj, REFIID iid, DWORD renderopt, LPFORMATETC pFormatEtc, LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, LPVOID* ppvObj) { - FIXME("(not shown), stub!\n"); + FIXME("(srcdata=%p, refiid=%s, renderopt=%x, formatetc=%p, client=%p, storage=%p, ppv=%p), stub!\n", + pSrcDataObj,debugstr_guid(iid),renderopt,pFormatEtc,pClientSite,pStg,ppvObj ); return E_NOTIMPL; }

1 0

Alexandre Julliard : gdi32/tests: Add more gradient tests.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 59f347b75c58ea22985f0b12f0ee619b65cb93d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59f347b75c58ea22985f0b12f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 13:33:05 2011 +0100 gdi32/tests: Add more gradient tests. --- dlls/gdi32/tests/dib.c | 132 +++++++++++++++++++++++++++++++---------------- 1 files changed, 87 insertions(+), 45 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index e271ccf..79a62db 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -133,7 +133,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "568f87f0194ca19b69a5b2bcdef795d89c5721ce", "257d114354a93e681225072bcde756f155b70496", "0cdf6fee6721d60d5d5ed26b1989eacddc16b14e", - "50f0d4252e700b0a29358ca6363e1c560d9c5f9b", + "e462052a03dbe4ec3814db7700e166d00d4d686f", + "a27917d4db49ce77989fae246015aeb2a28520ee", NULL }; @@ -193,7 +194,8 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "568f87f0194ca19b69a5b2bcdef795d89c5721ce", "257d114354a93e681225072bcde756f155b70496", "0cdf6fee6721d60d5d5ed26b1989eacddc16b14e", - "3692d0fe76bcd5622b567f524306d4df421aa450", + "0cda6b3297003b3ccd6d5baa17e1ca9bb7c56f08", + "b2c8e1ebb9435031fe068442f479d1304096e79f", NULL }; @@ -253,7 +255,8 @@ static const char *sha1_graphics_a8b8g8r8[] = "25675c30adfe24d6cae60793b156dfdaa36ac3ba", "2c4f116451b571106beba8b85da8e4b923937246", "9c8f3063504a81bbbfa8558e111c63d8bc36dbbf", - "d816ec7e95bd0d5ed336fa50efbadfcd63f20f9b", + "87f57a31253a38dbf3dc3070473328fa04b68a48", + "db64cc4d830fc35ed170b53943e722b2342954d4", NULL }; @@ -313,7 +316,8 @@ static const char *sha1_graphics_r10g10b10[] = "d3f08946300e1700865042aed121870e292d1095", "abb56db94becb64d663b51f0ea6b4bd535a88ba0", "3a81fe558c69ca0aea7e7191771ed86cf4321a5a", - "126c112d9c77826cbedddaee1ff96348c8f1e349", + "8ea5d7e4bebc40a1d91b04b12e1c11a42c188095", + "317521e576801acaea62c76fe16813cdfe20f4ad", NULL }; @@ -373,7 +377,8 @@ static const char *sha1_graphics_r6g6b6[] = "c3def160a1e847605ff0fc7edd30397fa90635a0", "50acb1597c4d53ad63225376d2aa36f64e8a229d", "796fd861474aa7861bd0384127df755458757ec3", - "d931b9b3e81b931826ea9dffdc7178ce87c422b5", + "aecb242c31f31a90f071b6455ea7d808d4ea22e3", + "77ea86e51a94b11a8081b29696cb4115687843e3", NULL }; @@ -433,7 +438,8 @@ static const char *sha1_graphics_24[] = "ee315634ed92da3a32c2675ecd1b369471c60936", "3491e2bd81e70dd203c8551cc2d39b19401caafe", "826de85271b67a11e7bd1a6596b58a045a96b69e", - "927d799714511eba2dd5876201a926d06a5677ce", + "354b92008a8409c62d0fa1dff1532c5943aa37a2", + "8dc9cb7deae5c24d1eae004d53893fa6caf4723c", NULL }; @@ -497,7 +503,8 @@ static const char *sha1_graphics_r5g5b5[] = "2daca4d26a086ed34894693be0b0374402232809", "bf0e0b74ce5686b73c527843e0d0df0cd10efefe", "517e32a8c0312b5676d498583ea092b0f198f2bc", - "be813b2206a9156c38b175e5ff009c44340ebfa9", + "295ec16530126046790fb734e99f86f5b3b74ed8", + "d98b0561010606b55a1b9b85fbc93640f681d256", NULL }; @@ -556,7 +563,8 @@ static const char *sha1_graphics_r4g4b4[] = "f7900e60347029876ba55e8f0c4c02e89deb36b6", "734d4a7836891d729f4a9ec6916ead78eecb2596", "d8ba2e556fd64c9c2f1746496e6e7dd7a487cd6d", - "5472bfe300268fb299987a04ff00db34b2007796", + "7587a9c87cab1eca827807f351bb67ca184d1ac5", + "b53ef0b5c674822e784903a9dbdd3b386d9f2350", NULL }; @@ -621,7 +629,8 @@ static const char *sha1_graphics_8_color[] = "2f7ba8803604c032cb1a1228bc021f0f1c03e245", "0204f06422a01787f7379d0edb51104bb023758a", "1f9a21eba2f2ce87768a5618d9cfefa7e48fb386", - "b61f2e6e2de63cb64b4ddcefd9f720dbf6ba8e93", + "e58d9c0acf0219d0839e1dbd162e08a765ed7f0f", + "34ca0f9660e1889f9f2c0deb80535d3c4f349fa4", NULL }; @@ -691,7 +700,8 @@ static const char *sha1_graphics_8_grayscale[] = "cb9ea8137eca1450e049879772f5c11a0e11ff0a", "a05e05b2e6e515baa59ea032d063ca11e70a72b5", "d908c86b7301666a8d7999b831841115a4938181", - "1f64da8432774f221fc3eb4bb66753bd92ede2da", + "0ca8775d9a61ccc251d1e6f2e3cfd26a24ae24a2", + "17ae603c199a5d6695d198a7f36e6d7263990951", NULL }; @@ -754,7 +764,8 @@ static const char *sha1_graphics_8[] = "600d6b2713d5e4c0d90c02660245ed26c7ae3033", "963d1fa8608c8b743e972eb9a4e9f3fc53c6c7e8", "ba49de83c4668fb08956221f465b93e7dd6a3383", - "d5fd38085d21bc27c388fb6702600ddcd935815a", + "bd28d77cd85b20a2384d6b25082cfd884bba683e", + "7e591ec8ae9bb61c3a443c93f071cab2b8978394", NULL }; @@ -813,7 +824,8 @@ static const char *sha1_graphics_4[] = "ec8e2aebfb4a1c28ebcd0e053b9e4d8638b50951", "da401c745421f6bdfaefd590ab99dee948dce412", "38a3b6edcba2a1fba6064f0b4d771aedae7f4673", - "0b504b6eb09907543174210272ee7763d67de2a9", + "28a6b9f7927e99e53cf46f0333d29168cb10e920", + "029552113292cc110fd6b7888e766628950aaeef", NULL }; @@ -872,7 +884,8 @@ static const char *sha1_graphics_4_grayscale[] = "d374d4d92c940ae42a9b42c14d744341b68a8c14", "25ec9fd2eeb1514ba4e0458a444149a5456cf63a", "2e4dc1e859350289575ffc2a47cd0033efca6c32", - "a0e8e78f3c082e2b674b5f5a592fb4be8324e843", + "ada3b7c34946e584dcdf4203e07cfa3dad02bc63", + "c2f61571b067a44b30f56b4658c9606f0edfc0f3", NULL }; @@ -946,7 +959,8 @@ static const char *sha1_graphics_1[] = "013cee26bac8f815eadad4bfc012d9b5d01c3b7f", "6b2cb2346b5820bdd0251cd6a4aeb5c22ee82e85", "6c4640b17e072efc682044c499e5a4f3481b7c87", - "7b739d8f9437c4893dddf3d2ff457db0803c924e", + "781d8c5cbc28591fd48fce06f984c502fdc6b363", + "df510792a7790cc699532b1420d43c6d4da2ae2f", NULL }; @@ -2090,37 +2104,65 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh if (pGdiGradientFill) { - TRIVERTEX vt[4]; - GRADIENT_RECT rect[1] = { { 0 , 1 } }; - vt[0].x = 1; - vt[0].y = 1; - vt[0].Red = 0; - vt[0].Green = 0x8000; - vt[0].Blue = 0; - vt[0].Alpha = 0x8000; - vt[1].x = 200; - vt[1].y = 200; - vt[1].Red = 0; - vt[1].Green = 0xff00; - vt[1].Blue = 0; - vt[1].Alpha = 0xff00; - pGdiGradientFill( hdc, vt, 2, rect, 1, GRADIENT_FILL_RECT_H ); - - vt[0].x = 180; - vt[0].y = 180; - vt[0].Red = 0; - vt[0].Green = 0; - vt[0].Blue = 0xff00; - vt[0].Alpha = 0xff00; - vt[1].x = 300; - vt[1].y = 300; - vt[1].Red = 0xff00; - vt[1].Green = 0xff00; - vt[1].Blue = 0xff00; - vt[1].Alpha = 0x00; - pGdiGradientFill( hdc, vt, 2, rect, 1, GRADIENT_FILL_RECT_V ); - if (bmi->bmiHeader.biBitCount == 8 || bmi->bmiHeader.biBitCount == 4) - /* Wine's 8-bit dithering isn't identical to Windows */ + TRIVERTEX vrect[] = + { + { 1, 1, 0xff00, 0x8000, 0x0000, 0x8000 }, + { 200, 200, 0x0000, 0x0000, 0xff00, 0xff00 }, + { 180, 180, 0x1234, 0x5678, 0x9abc, 0xdef0 }, + { 300, 300, 0xff00, 0xff00, 0xff00, 0x0000 } + }; + GRADIENT_RECT rect[] = { { 0, 1 }, { 2, 3 }, { 2, 1 } }; + + TRIVERTEX vtri[] = + { + { 250, 0, 0xff00, 0x0000, 0xff00, 0xff00 }, + { 500, 500, 0x0000, 0xff00, 0x0000, 0xff00 }, + { 0, 500, 0x0000, 0x0000, 0xff00, 0xff00 }, + + { 10, 0, 0x8000, 0x0000, 0x8000, 0x8000 }, + { 0, 20, 0xff00, 0xff00, 0xff00, 0x0000 }, + { 5, 30, 0x4000, 0xc000, 0x7000, 0x9000 }, + + { 30, 0, 0x9000, 0x8800, 0xcc00, 0xff00 }, + { 5, 12, 0x9900, 0xaa00, 0xbb00, 0xcc00 }, + { 0, 30, 0x5000, 0xd000, 0x9000, 0xbb00 }, + + { 35, 3, 0xaa00, 0x6500, 0x4300, 0x2100 }, + { 50, 6, 0x9800, 0x9800, 0x9800, 0x2000 }, + { 60, 10, 0x0100, 0x0200, 0x0300, 0x3000 }, + + { 60, 2, 0x0700, 0x0800, 0x0900, 0xff00 }, + { 73, 10, 0x9900, 0x8800, 0x7700, 0xff00 }, + { 66, 23, 0x1100, 0x2200, 0x3300, 0xff00 }, + + { 80, 1, 0xa000, 0x6000, 0x4000, 0x2000 }, + { 76, 9, 0x7000, 0x5000, 0x3000, 0x1000 }, + { 85, 23, 0x3300, 0x3300, 0x3300, 0x3300 }, + + { 90, 4, 0x4400, 0x5500, 0x6600, 0x9900 }, + { 95, 12, 0x4500, 0x5600, 0x6700, 0x9900 }, + { 85, 14, 0x4600, 0x5700, 0x6800, 0x9900 }, + }; + GRADIENT_TRIANGLE tri[] = + { + { 0, 1, 2 }, { 3, 4, 5 }, { 6, 7, 8 }, { 9, 10, 11 }, { 12, 13, 14 }, { 15, 16, 17 }, { 18, 19, 20 }, + { 2, 1, 0 }, { 3, 5, 4 }, { 7, 6, 8 }, { 10, 11, 9 }, { 14, 13, 12 }, { 17, 15, 16 }, { 19, 20, 18 } + }; + + pGdiGradientFill( hdc, vrect, 4, rect, 2, GRADIENT_FILL_RECT_H ); + for (i = 0; i < 4; i++) vrect[i].y += 250; + pGdiGradientFill( hdc, vrect, 4, rect, 2, GRADIENT_FILL_RECT_V ); + + if (bmi->bmiHeader.biBitCount <= 8) /* Wine's 8-bit dithering isn't identical to Windows */ + compare_hash_broken_todo( bmi, bits, sha1, "GdiGradientFill", 0, 1 ); + else + compare_hash(bmi, bits, sha1, "GdiGradientFill" ); + memset(bits, 0xcc, dib_size); + + pGdiGradientFill( hdc, vtri, 7*3, tri, 7, GRADIENT_FILL_TRIANGLE ); + for (i = 0; i < 7*3; i++) vtri[i].y += 100; + pGdiGradientFill( hdc, vtri, 7*3, tri + 7, 7, GRADIENT_FILL_TRIANGLE ); + if (bmi->bmiHeader.biBitCount <= 8) /* Wine's 8-bit dithering isn't identical to Windows */ compare_hash_broken_todo( bmi, bits, sha1, "GdiGradientFill", 0, 1 ); else compare_hash(bmi, bits, sha1, "GdiGradientFill" );

1 0

Jacek Caban : jscript: Use bytecode for assignment to identifier.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: d3d2f063b617d3c979bc62c0a6edbcd3b944d344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3d2f063b617d3c979bc62c0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 11:11:29 2011 +0100 jscript: Use bytecode for assignment to identifier. --- dlls/jscript/compile.c | 35 ++++++++++++++++++++- dlls/jscript/engine.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.h | 4 ++- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/api.js | 4 ++ dlls/jscript/tests/lang.js | 3 ++ 6 files changed, 116 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index ed42b4d..3679dfe 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -345,6 +345,35 @@ static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t return S_OK; } +static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_t *expr) +{ + HRESULT hres; + + switch(expr->expression1->type) { + case EXPR_IDENT: { + identifier_expression_t *ident_expr = (identifier_expression_t*)expr->expression1; + + hres = push_instr_bstr(ctx, OP_identid, ident_expr->identifier); + if(FAILED(hres)) + return hres; + break; + } + default: + expr->expr.eval = assign_expression_eval; + return compile_interp_fallback(ctx, &expr->expr); + } + + + hres = compile_expression(ctx, expr->expression2); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_assign) == -1) + return E_OUTOFMEMORY; + + return S_OK; +} + static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) { switch(literal->type) { @@ -384,10 +413,12 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) { switch(expr->type) { - case EXPR_AND: - return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_z); case EXPR_ADD: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); + case EXPR_AND: + return compile_logical_expression(ctx, (binary_expression_t*)expr, OP_jmp_z); + case EXPR_ASSIGN: + return compile_assign_expression(ctx, (binary_expression_t*)expr); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_BOR: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index d24392c..c445eab 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -102,6 +102,22 @@ static inline HRESULT stack_push_int(exec_ctx_t *ctx, INT n) return stack_push(ctx, &v); } +static HRESULT stack_push_objid(exec_ctx_t *ctx, IDispatch *disp, DISPID id) +{ + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = disp; + hres = stack_push(ctx, &v); + if(FAILED(hres)) + return hres; + + V_VT(&v) = VT_INT; + V_INT(&v) = id; + return stack_push(ctx, &v); +} + static inline VARIANT *stack_top(exec_ctx_t *ctx) { assert(ctx->top); @@ -142,6 +158,14 @@ static inline HRESULT stack_pop_int(exec_ctx_t *ctx, INT *r) return to_int32(ctx->parser->script, stack_pop(ctx), &ctx->ei, r); } +static inline IDispatch *stack_pop_objid(exec_ctx_t *ctx, DISPID *id) +{ + assert(V_VT(stack_top(ctx)) == VT_INT && V_VT(stack_topn(ctx, 1)) == VT_DISPATCH); + + *id = V_INT(stack_pop(ctx)); + return V_DISPATCH(stack_pop(ctx)); +} + static void exprval_release(exprval_t *val) { switch(val->type) { @@ -1757,6 +1781,28 @@ static HRESULT interp_ident(exec_ctx_t *ctx) return stack_push(ctx, &v); } +/* ECMA-262 3rd Edition 10.1.4 */ +static HRESULT interp_identid(exec_ctx_t *ctx) +{ + const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; + exprval_t exprval; + HRESULT hres; + + TRACE("%s\n", debugstr_w(arg)); + + hres = identifier_eval(ctx->parser->script, arg, EXPR_NEWREF, &ctx->ei, &exprval); + if(FAILED(hres)) + return hres; + + if(exprval.type != EXPRVAL_IDREF) { + WARN("invalid ref\n"); + exprval_release(&exprval); + return stack_push_objid(ctx, NULL, -1); + } + + return stack_push_objid(ctx, exprval.u.idref.disp, exprval.u.idref.id); +} + /* ECMA-262 3rd Edition 7.8.1 */ static HRESULT interp_null(exec_ctx_t *ctx) { @@ -3261,6 +3307,32 @@ HRESULT assign_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla return S_OK; } +/* ECMA-262 3rd Edition 11.13.1 */ +static HRESULT interp_assign(exec_ctx_t *ctx) +{ + IDispatch *disp; + DISPID id; + VARIANT *v; + HRESULT hres; + + TRACE("\n"); + + v = stack_pop(ctx); + disp = stack_pop_objid(ctx, &id); + + if(!disp) + return throw_reference_error(ctx->parser->script, &ctx->ei, JS_E_ILLEGAL_ASSIGN, NULL); + + hres = disp_propput(ctx->parser->script, disp, id, v, &ctx->ei, NULL/*FIXME*/); + IDispatch_Release(disp); + if(FAILED(hres)) { + VariantClear(v); + return hres; + } + + 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) { diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index e86db0f..12329e8 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -43,6 +43,7 @@ typedef struct _func_stack { #define OP_LIST \ X(add, 1, 0,0) \ + X(assign, 1, 0,0) \ X(bool, 1, ARG_INT, 0) \ X(bneg, 1, 0,0) \ X(delete, 1, 0,0) \ @@ -51,8 +52,9 @@ typedef struct _func_stack { X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ X(gt, 1, 0,0) \ - X(gteq, 1, 0,0) \ + X(gteq, 1, 0,0) \ X(ident, 1, ARG_BSTR, 0) \ + X(identid, 1, ARG_BSTR, 0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ X(jmp, 0, ARG_ADDR, 0) \ diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index c1c5df6..55f8aac 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1340,7 +1340,7 @@ static const expression_eval_t expression_eval_table[] = { left_shift_expression_eval, right_shift_expression_eval, right2_shift_expression_eval, - assign_expression_eval, + compiled_expression_eval, assign_lshift_expression_eval, assign_rshift_expression_eval, assign_rrshift_expression_eval, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index d99364f..b5ac66a 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2072,6 +2072,10 @@ testSyntaxError("/* @cc_on @*/ @_jscript_version", "E_DISABLED_CC"); // ReferenceError tests testException(function() {test = function() {}}, "E_ILLEGAL_ASSIGN"); +tmp = false; +testException(function() {test = (tmp = true);}, "E_ILLEGAL_ASSIGN"); +ok(tmp, "expr value on invalid assign not evaluated"); + // RegExpError tests testException(function() {RegExp(/a/, "g");}, "E_REGEXP_SYNTAX_ERROR"); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 4f3d509..1dd0c02 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -118,6 +118,9 @@ ok(testFunc1(true, "test") === true, "testFunc1 not returned true"); ok(testFunc1.arguments === null, "testFunc1.arguments = " + testFunc1.arguments); +(tmp) = 3; +ok(tmp === 3, "tmp = " + tmp); + function testRecFunc(x) { ok(testRecFunc.arguments === arguments, "testRecFunc.arguments = " + testRecFunc.arguments); if(x) {

1 0

Jacek Caban : jscript: Use bytecode for assignment to member expression.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 5b2c2c5cf924ca8d99ce132b1f58e7f260dd2a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b2c2c5cf924ca8d99ce132b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 11:11:59 2011 +0100 jscript: Use bytecode for assignment to member expression. --- dlls/jscript/compile.c | 16 ++++++++++++++++ dlls/jscript/engine.c | 5 ++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a237093..93d780f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -373,6 +373,22 @@ static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_ return E_OUTOFMEMORY; break; } + case EXPR_MEMBER: { + member_expression_t *member_expr = (member_expression_t*)expr->expression1; + + hres = compile_expression(ctx, member_expr->expression); + if(FAILED(hres)) + return hres; + + /* FIXME: Potential optimization */ + hres = push_instr_str(ctx, OP_str, member_expr->identifier); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_memberid) == -1) + return E_OUTOFMEMORY; + break; + } default: expr->expr.eval = assign_expression_eval; return compile_interp_fallback(ctx, &expr->expr); diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index e4d918f..2af2d75 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3328,9 +3328,8 @@ HRESULT assign_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } if(SUCCEEDED(hres)) { - hres = put_value(ctx, &exprval, &rval, ei); - if(FAILED(hres)) - VariantClear(&rval); + assert(exprval.type != EXPRVAL_IDREF); + return throw_reference_error(ctx, ei, JS_E_ILLEGAL_ASSIGN, NULL); } exprval_release(&exprval);

1 0

Jacek Caban : jscript: Use bytecode for '-=' expression implementation.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 7b022dbbb8e8323122ffbbfdcb2674421511b9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b022dbbb8e8323122ffbbfdc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 11:13:14 2011 +0100 jscript: Use bytecode for '-=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 28 ---------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 7c00cf9..2c6327e 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -479,6 +479,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_LAST); case EXPR_ASSIGNADD: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_add); + case EXPR_ASSIGNSUB: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_BITNEG: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_bneg); case EXPR_BOR: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 05dee4d..7627a5b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2402,24 +2402,6 @@ static HRESULT interp_add(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.6.2 */ -static HRESULT sub_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - VARIANT lnum, rnum; - HRESULT hres; - - hres = to_number(ctx, lval, ei, &lnum); - if(FAILED(hres)) - return hres; - - hres = to_number(ctx, rval, ei, &rnum); - if(FAILED(hres)) - return hres; - - num_set_val(retv, num_val(&lnum) - num_val(&rnum)); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.6.2 */ static HRESULT interp_sub(exec_ctx_t *ctx) { VARIANT l, r; @@ -3402,16 +3384,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_sub_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, sub_eval, ei, ret); -} - -/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_mul_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; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f78c0bd..0f76eba 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -575,7 +575,6 @@ HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_ HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rshift_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 assign_sub_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_mod_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 783aad9..17c3b60 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1345,7 +1345,7 @@ static const expression_eval_t expression_eval_table[] = { assign_rshift_expression_eval, assign_rrshift_expression_eval, compiled_expression_eval, - assign_sub_expression_eval, + compiled_expression_eval, assign_mul_expression_eval, assign_div_expression_eval, assign_mod_expression_eval,

1 0

Alexandre Julliard : gdi32: Implement triangular gradients in the DIB engine.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: 743b37df3d09bedc4521cf01549a190000b89368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743b37df3d09bedc4521cf015… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 4 17:10:30 2011 +0100 gdi32: Implement triangular gradients in the DIB engine. --- dlls/gdi32/dibdrv/bitblt.c | 189 +++++++++++++++++----- dlls/gdi32/dibdrv/dibdrv.h | 11 ++- dlls/gdi32/dibdrv/primitives.c | 343 +++++++++++++++++++++++++++++++-------- 3 files changed, 427 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=743b37df3d09bedc4521c…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: e97c454637d6c04f23bf5e5d19f1b0cf531ae51b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97c454637d6c04f23bf5e5d1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Dec 2 21:36:56 2011 +0900 po: Update Japanese translation. --- po/ja.po | 256 +++++++++++++++++++++++++++----------------------------------- 1 files changed, 111 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e97c454637d6c04f23bf5…

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Dec. 5, 2011

Dec. 5, 2011

Module: wine Branch: master Commit: ff2d66f5e6c1a9240d8a4946c94f3f2411efd139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff2d66f5e6c1a9240d8a4946c… Author: Luca Bennati <lucak3(a)gmail.com> Date: Fri Dec 2 12:12:53 2011 +0100 po: Update Italian translation. --- po/it.po | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/po/it.po b/po/it.po index 0878766..15a9230 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-29 22:07+0100\n" +"PO-Revision-Date: 2011-12-02 12:11+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -22,8 +22,8 @@ msgid "" "To install a new program from a floppy disk, CD-ROM drive, or your hard " "drive, click Install." msgstr "" -"Per installare un nuovo programma dal floppy disk, CD-ROM o dal tuo hard " -"disk, clicca Installa." +"Per installare un nuovo programma dal floppy disk, CD-ROM o dal tuo disco " +"rigido, clicca Installa." #: appwiz.rc:59 msgid "&Install..." @@ -113,7 +113,6 @@ msgid "Wine Gecko Installer" msgstr "Installer di Wine Gecko" #: appwiz.rc:100 -#, fuzzy msgid "" "Wine could not find a Gecko package which is needed for applications " "embedding HTML to work correctly. Wine can automatically download and " @@ -127,8 +126,9 @@ msgstr "" "incorporano HTML per funzionare correttamente. Wine lo può scaricare e " "installare automaticamente per te.\n" "\n" -"Nota: è raccomandato usare i pacchetti delle distribuzioni. Leggi http://" -"wiki.winehq.org/Gecko per i dettagli." +"Nota: è raccomandato usare i pacchetti delle distribuzioni. Leggi <a href=" +"\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> per i " +"dettagli." #: appwiz.rc:106 msgid "&Install" @@ -5851,11 +5851,11 @@ msgstr "&Attributi:" #: mshtml.rc:37 msgid "Hyperlink" -msgstr "Hyperlink" +msgstr "Iperlink" #: mshtml.rc:40 msgid "Hyperlink Information" -msgstr "Informazioni sull'hyperlink" +msgstr "Informazioni sull'iperlink" #: mshtml.rc:41 winecfg.rc:247 msgid "&Type:" @@ -6017,12 +6017,11 @@ msgstr "&Keyframe ogni" #: msvfw32.rc:50 msgid "&Data Rate" -msgstr "&Ritmo dati" +msgstr "&Rate di dati" #: msvfw32.rc:52 -#, fuzzy msgid "kB/sec" -msgstr "KBps" +msgstr "kB/sec" #: msvfw32.rc:25 msgid "Full Frames (Uncompressed)" @@ -6342,7 +6341,7 @@ msgstr "Visualizza come icona" #: oledlg.rc:68 setupapi.rc:58 msgid "Browse..." -msgstr "Scegli..." +msgstr "Sfoglia..." #: oledlg.rc:69 msgid "File:" @@ -6350,7 +6349,7 @@ msgstr "File:" #: oledlg.rc:75 msgid "Paste Special" -msgstr "Incolla Speciale" +msgstr "Incolla speciale" #: oledlg.rc:78 setupapi.rc:40 msgid "Source:" @@ -6505,13 +6504,12 @@ msgid "us" msgstr "µs" #: serialui.rc:25 -#, fuzzy msgid "Settings for %s" -msgstr "Proprietà di %s" +msgstr "Impostazioni di %s" #: serialui.rc:28 msgid "Baud Rate" -msgstr "Bit per secondo (baud)" +msgstr "Rate di bit (Baud)" #: serialui.rc:30 msgid "Parity" @@ -6539,7 +6537,7 @@ msgstr "Destinazione:" #: setupapi.rc:49 msgid "Files Needed" -msgstr "File Necessari" +msgstr "File necessari" #: setupapi.rc:52 msgid "" @@ -11006,7 +11004,7 @@ msgstr "Carico di lavore (K)" #: taskmgr.rc:380 msgid "Physical Memory (K)" -msgstr "Memoria Fisica (K)" +msgstr "Memoria fisica (K)" #: taskmgr.rc:381 msgid "Kernel Memory (K)"

1 0