December 2011 - Wine-Commits

Alexandre Julliard : winex11: Use an X11 error handler to catch BadMatch errors from XGetImage.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 4c6a40977998c0aa7f9f5fa26021b5c5a4d3520c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6a40977998c0aa7f9f5fa26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 22:47:31 2011 +0100 winex11: Use an X11 error handler to catch BadMatch errors from XGetImage. --- dlls/winex11.drv/bitblt.c | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index c1df77a..9830327 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -582,6 +582,12 @@ int main() #endif /* BITBLT_TEST */ +/* handler for XGetImage BadMatch errors */ +static int XGetImage_handler( Display *dpy, XErrorEvent *event, void *arg ) +{ + return (event->request_code == X_GetImage && event->error_code == BadMatch); +} + /*********************************************************************** * BITBLT_GetDstArea * @@ -1423,16 +1429,23 @@ DWORD X11DRV_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, } else { - Pixmap pixmap; + X11DRV_expect_error( gdi_display, XGetImage_handler, NULL ); + image = XGetImage( gdi_display, physdev->drawable, + physdev->dc_rect.left + x, physdev->dc_rect.top + y, + width, height, AllPlanes, ZPixmap ); + if (X11DRV_check_error()) + { + /* use a temporary pixmap to avoid the BadMatch error */ + Pixmap pixmap; - wine_tsx11_lock(); - /* use a temporary pixmap to avoid BadMatch errors */ - pixmap = XCreatePixmap( gdi_display, root_window, width, height, depth ); - XCopyArea( gdi_display, physdev->drawable, pixmap, get_bitmap_gc(depth), - physdev->dc_rect.left + x, physdev->dc_rect.top + y, width, height, 0, 0 ); - image = XGetImage( gdi_display, pixmap, 0, 0, width, height, AllPlanes, ZPixmap ); - XFreePixmap( gdi_display, pixmap ); - wine_tsx11_unlock(); + wine_tsx11_lock(); + pixmap = XCreatePixmap( gdi_display, root_window, width, height, depth ); + XCopyArea( gdi_display, physdev->drawable, pixmap, get_bitmap_gc(depth), + physdev->dc_rect.left + x, physdev->dc_rect.top + y, width, height, 0, 0 ); + image = XGetImage( gdi_display, pixmap, 0, 0, width, height, AllPlanes, ZPixmap ); + XFreePixmap( gdi_display, pixmap ); + wine_tsx11_unlock(); + } } if (!image) return ERROR_OUTOFMEMORY;

1 0

Alexandre Julliard : wineps: Fall through to the null driver for Polyline and Polygon.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: d45eb00abc82c73c64191ad4b0c58201ca41e252 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45eb00abc82c73c64191ad4b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 5 22:29:46 2011 +0100 wineps: Fall through to the null driver for Polyline and Polygon. --- dlls/wineps.drv/graphics.c | 18 ------------------ dlls/wineps.drv/init.c | 4 ++-- dlls/wineps.drv/psdrv.h | 2 -- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 41f6e91..5459ce4 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -351,15 +351,6 @@ BOOL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWO /*********************************************************************** - * PSDRV_Polyline - */ -BOOL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) -{ - return PSDRV_PolyPolyline( dev, pt, (LPDWORD) &count, 1 ); -} - - -/*********************************************************************** * PSDRV_PolyPolygon */ BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) @@ -402,15 +393,6 @@ BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT p /*********************************************************************** - * PSDRV_Polygon - */ -BOOL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) -{ - return PSDRV_PolyPolygon( dev, pt, &count, 1 ); -} - - -/*********************************************************************** * PSDRV_PolyBezier */ BOOL PSDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e61df3e..9cba84a 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -897,8 +897,8 @@ static const struct gdi_dc_funcs psdrv_funcs = NULL, /* pPolyDraw */ PSDRV_PolyPolygon, /* pPolyPolygon */ PSDRV_PolyPolyline, /* pPolyPolyline */ - PSDRV_Polygon, /* pPolygon */ - PSDRV_Polyline, /* pPolyline */ + NULL, /* pPolygon */ + NULL, /* pPolyline */ NULL, /* pPolylineTo */ PSDRV_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index b86f527..a11048c 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -450,8 +450,6 @@ extern BOOL PSDRV_PolyBezier( PHYSDEV dev, const POINT *pts, DWORD count ) DECLS extern BOOL PSDRV_PolyBezierTo( PHYSDEV dev, const POINT *pts, DWORD count ) DECLSPEC_HIDDEN; extern BOOL PSDRV_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) DECLSPEC_HIDDEN; extern BOOL PSDRV_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* counts, DWORD polylines ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_Polygon( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; -extern BOOL PSDRV_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern DWORD PSDRV_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DLOCKED_RECT typedef.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: eafebc04911d257350517cf1be6b8fd4ed4943fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=eafebc04911d257350517cf1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 22:06:56 2011 +0100 wined3d: Get rid of the WINED3DLOCKED_RECT typedef. --- dlls/d3d8/surface.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/ddraw/surface.c | 12 +++--- dlls/wined3d/device.c | 12 +++--- dlls/wined3d/surface.c | 100 ++++++++++++++++++++++++------------------------ include/wine/wined3d.h | 10 ++-- 6 files changed, 69 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eafebc04911d257350517…

1 0

Nikolay Sivov : msxml3: Attribute name could be qualified.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: ca8e3c1cca444b9961b957762b5eec3874609bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca8e3c1cca444b9961b957762… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 5 23:27:20 2011 +0300 msxml3: Attribute name could be qualified. --- dlls/msxml3/xslpattern.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/xslpattern.y b/dlls/msxml3/xslpattern.y index 5187761..2fe3627 100644 --- a/dlls/msxml3/xslpattern.y +++ b/dlls/msxml3/xslpattern.y @@ -179,7 +179,7 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons $$=xmlStrcat($$,U("::")); } ; - Attribute : '@' TOK_NCName + Attribute : '@' QName { TRACE("Got Attribute: \"@%s\"\n", $2); $$=xmlStrdup(U("@"));

1 0

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

Dec. 6, 2011

Module: wine Branch: master Commit: e9bd2e47f88c8ec96ee66a1fab62e05812ca3746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9bd2e47f88c8ec96ee66a1fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:41:45 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 8688d5d..bcbbaf3 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -483,6 +483,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_ASSIGNMUL: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mul); + case EXPR_ASSIGNDIV: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_div); 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 c9ad519..ef43451 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2440,24 +2440,6 @@ static HRESULT interp_mul(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.5.2 */ -static HRESULT div_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.5.2 */ static HRESULT interp_div(exec_ctx_t *ctx) { VARIANT l, r; @@ -3366,16 +3348,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_div_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, div_eval, ei, ret); -} - -/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_mod_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 580b9f5..18f4401 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_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; HRESULT assign_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_or_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 66ef886..36c5ecf 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1347,7 +1347,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - assign_div_expression_eval, + compiled_expression_eval, assign_mod_expression_eval, assign_and_expression_eval, assign_or_expression_eval,

1 0

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

Dec. 6, 2011

Module: wine Branch: master Commit: 822fdde42dc5bbcadf0b114a87ad4dcd3b98f9de URL: http://source.winehq.org/git/wine.git/?a=commit;h=822fdde42dc5bbcadf0b114a8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:41:57 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 bcbbaf3..af227c0 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -485,6 +485,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mul); case EXPR_ASSIGNDIV: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_div); + case EXPR_ASSIGNMOD: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mod); 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 ef43451..0696e77 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2459,24 +2459,6 @@ static HRESULT interp_div(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.5.3 */ -static HRESULT mod_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, fmod(num_val(&lnum), num_val(&rnum))); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.5.3 */ static HRESULT interp_mod(exec_ctx_t *ctx) { VARIANT l, r; @@ -3348,16 +3330,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_mod_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, mod_eval, ei, ret); -} - -/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_and_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 18f4401..54e28a9 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_mod_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_xor_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 36c5ecf..8051c8a 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1348,7 +1348,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - assign_mod_expression_eval, + compiled_expression_eval, assign_and_expression_eval, assign_or_expression_eval, assign_xor_expression_eval,

1 0

Henri Verbeet : ddraw: Don't enumerate surfaces without references.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: 6523ef5f679950627a79dc2c802ea6655c73c3c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6523ef5f679950627a79dc2c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 5 22:06:55 2011 +0100 ddraw: Don't enumerate surfaces without references. --- dlls/ddraw/ddraw.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 03d8b1c..b344b81 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3422,6 +3422,13 @@ static HRESULT WINAPI ddraw7_EnumSurfaces(IDirectDraw7 *iface, DWORD Flags, LIST_FOR_EACH_SAFE(entry, entry2, &This->surface_list) { surf = LIST_ENTRY(entry, IDirectDrawSurfaceImpl, surface_list_entry); + + if (!surf->iface_count) + { + WARN("Not enumerating surface %p because it doesn't have any references.\n", surf); + continue; + } + if (all || (nomatch != ddraw_match_surface_desc(DDSD, &surf->surface_desc))) { TRACE("Enumerating surface %p.\n", surf);

1 0

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

Dec. 6, 2011

Module: wine Branch: master Commit: 0ff59f444b48a81cbb4b075fcc81abbe8055f7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff59f444b48a81cbb4b075fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:41:34 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 2c6327e..8688d5d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -481,6 +481,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) 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_ASSIGNMUL: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_mul); 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 7627a5b..c9ad519 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2421,24 +2421,6 @@ static HRESULT interp_sub(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.5.1 */ -static HRESULT mul_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.5.1 */ static HRESULT interp_mul(exec_ctx_t *ctx) { VARIANT l, r; @@ -3384,16 +3366,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* 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; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, mul_eval, ei, ret); -} - -/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_div_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 0f76eba..580b9f5 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_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; HRESULT assign_and_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 17c3b60..66ef886 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1346,7 +1346,7 @@ static const expression_eval_t expression_eval_table[] = { assign_rrshift_expression_eval, compiled_expression_eval, compiled_expression_eval, - assign_mul_expression_eval, + compiled_expression_eval, assign_div_expression_eval, assign_mod_expression_eval, assign_and_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '|=' expression.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: c74641acf23a991a9c570f7ff483e7959d3fd8bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74641acf23a991a9c570f7ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:42:21 2011 +0100 jscript: Use bytecode for '|=' expression. --- 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 9a0a471..22d5a5f 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -499,6 +499,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_div); case EXPR_ASSIGNMOD: 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_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 9e9c04d..9816b64 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2151,25 +2151,6 @@ static HRESULT interp_jmp_z(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.10 */ -static HRESULT bitor_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - INT li, ri; - HRESULT hres; - - hres = to_int32(ctx, lval, ei, &li); - if(FAILED(hres)) - return hres; - - hres = to_int32(ctx, rval, ei, &ri); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_I4; - V_I4(retv) = li|ri; - return S_OK; -} - -/* ECMA-262 3rd Edition 11.10 */ static HRESULT interp_or(exec_ctx_t *ctx) { INT l, r; @@ -3385,16 +3366,6 @@ HRESULT assign_and_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD } /* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_or_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, bitor_eval, ei, ret); -} - -/* ECMA-262 3rd Edition 11.13.2 */ HRESULT assign_xor_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 330dc34..49c7aa8 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -577,7 +577,6 @@ HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept 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_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_xor_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 8051c8a..0192eff 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1350,7 +1350,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, assign_and_expression_eval, - assign_or_expression_eval, + compiled_expression_eval, assign_xor_expression_eval, compiled_expression_eval, array_expression_eval,

1 0

Jacek Caban : jscript: Added bytecode version of member expression.
by Alexandre Julliard Dec. 6, 2011

Dec. 6, 2011

Module: wine Branch: master Commit: a289b8e0a40a29a0e2aa0fdc959766a189b0135d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a289b8e0a40a29a0e2aa0fdc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 6 10:42:09 2011 +0100 jscript: Added bytecode version of member expression. --- dlls/jscript/compile.c | 14 ++++++++++++++ dlls/jscript/engine.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/engine.h | 1 + 3 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index af227c0..9a0a471 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -210,6 +210,18 @@ static HRESULT compile_unary_expression(compiler_ctx_t *ctx, unary_expression_t return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK; } +/* ECMA-262 3rd Edition 11.2.1 */ +static HRESULT compile_member_expression(compiler_ctx_t *ctx, member_expression_t *expr) +{ + HRESULT hres; + + hres = compile_expression(ctx, expr->expression); + if(FAILED(hres)) + return hres; + + return push_instr_bstr(ctx, OP_member, expr->identifier); +} + /* ECMA-262 3rd Edition 11.14 */ static HRESULT compile_comma_expression(compiler_ctx_t *ctx, binary_expression_t *expr) { @@ -519,6 +531,8 @@ static HRESULT compile_expression(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_MEMBER: + return compile_member_expression(ctx, (member_expression_t*)expr); case EXPR_MINUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_minus); case EXPR_MOD: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 0696e77..9e9c04d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -153,6 +153,22 @@ static HRESULT stack_pop_number(exec_ctx_t *ctx, VARIANT *r) return hres; } +static HRESULT stack_pop_object(exec_ctx_t *ctx, IDispatch **r) +{ + VARIANT *v; + HRESULT hres; + + v = stack_pop(ctx); + if(V_VT(v) == VT_DISPATCH) { + *r = V_DISPATCH(v); + return S_OK; + } + + hres = to_object(ctx->parser->script, v, r); + VariantClear(v); + return hres; +} + static inline HRESULT stack_pop_int(exec_ctx_t *ctx, INT *r) { return to_int32(ctx->parser->script, stack_pop(ctx), &ctx->ei, r); @@ -1591,6 +1607,35 @@ HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } /* ECMA-262 3rd Edition 11.2.1 */ +static HRESULT interp_member(exec_ctx_t *ctx) +{ + const BSTR arg = ctx->parser->code->instrs[ctx->ip].arg1.bstr; + IDispatch *obj; + VARIANT v; + DISPID id; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_object(ctx, &obj); + if(FAILED(hres)) + return hres; + + hres = disp_get_id(ctx->parser->script, obj, arg, 0, &id); + if(SUCCEEDED(hres)) { + hres = disp_propget(ctx->parser->script, obj, id, &v, &ctx->ei, NULL/*FIXME*/); + }else if(hres == DISP_E_UNKNOWNNAME) { + V_VT(&v) = VT_EMPTY; + hres = S_OK; + } + IDispatch_Release(obj); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); +} + +/* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_memberid(exec_ctx_t *ctx) { VARIANT *objv, *namev; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 54e28a9..330dc34 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -62,6 +62,7 @@ typedef struct _func_stack { X(jmp_z, 0, ARG_ADDR, 0) \ X(lt, 1, 0,0) \ X(lteq, 1, 0,0) \ + X(member, 1, ARG_BSTR, 0) \ X(memberid, 1, 0,0) \ X(minus, 1, 0,0) \ X(mod, 1, 0,0) \

1 0