July 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Manage event queries in the context.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: fb77678e9f1bc5e1baa20f241d2fc00a718496e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb77678e9f1bc5e1baa20f241… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 24 10:44:14 2009 +0200 wined3d: Manage event queries in the context. --- dlls/wined3d/context.c | 92 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 15 +------ dlls/wined3d/query.c | 92 ++++++++++++++++----------------------- dlls/wined3d/wined3d_private.h | 20 ++++++--- 4 files changed, 146 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fb77678e9f1bc5e1baa20…

1 0

Henri Verbeet : wined3d: Manage occlusion queries in the context.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 4ab7af65750bbf0fc9ce16b15ef57eb84a8ce977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab7af65750bbf0fc9ce16b15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 24 10:44:13 2009 +0200 wined3d: Manage occlusion queries in the context. --- dlls/wined3d/context.c | 84 +++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 14 +---- dlls/wined3d/query.c | 101 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 20 ++++++-- 4 files changed, 160 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ab7af65750bbf0fc9ce1…

1 0

Roderick Colenbrander : winex11: XRenderComposite can be inaccurate when scaled x / y source coordinates are passed to it.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 6a1aa9b166a571b219c317a59a000031cd2448ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a1aa9b166a571b219c317a59… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Jul 22 17:42:14 2009 +0200 winex11: XRenderComposite can be inaccurate when scaled x / y source coordinates are passed to it. Moving this translation to the transformation matrix fixes the problem. --- dlls/winex11.drv/bitblt.c | 3 +- dlls/winex11.drv/x11drv.h | 2 - dlls/winex11.drv/xrender.c | 70 ++++++++++++++++++++++++++----------------- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 79078ae..119ac5b 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1438,8 +1438,7 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT wine_tsx11_unlock(); if(!X11DRV_XRender_GetSrcAreaStretch( physDevSrc, physDevDst, pixmaps[SRC], tmpGC, - xSrc, ySrc, widthSrc, heightSrc, - xDst, yDst, widthDst, heightDst, + widthSrc, heightSrc, widthDst, heightDst, &visRectSrc, &visRectDst)) { if (fStretch) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 10af183..1a7a634 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -269,9 +269,7 @@ extern BOOL X11DRV_XRender_ExtTextOut(X11DRV_PDEVICE *physDev, INT x, INT y, UIN UINT count, const INT *lpDx); BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, - INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, - INT xDst, INT yDst, INT widthDst, INT heightDst, RECT *visRectSrc, RECT *visRectDst); extern void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev); diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 6d290ba..072cd25 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1733,6 +1733,41 @@ static void set_xrender_transformation(Picture src_pict, float xscale, float ysc #endif } +/* Helper function for (stretched) blitting using xrender */ +static void xrender_blit(Picture src_pict, Picture mask_pict, Picture dst_pict, int x_src, int y_src, float xscale, float yscale, int width, int height) +{ + /* Further down a transformation matrix is used for stretching and mirroring the source data. + * xscale/yscale contain the scaling factors for the width and height. In case of mirroring + * we also need a x- and y-offset because without the pixels will be in the wrong quadrant of the x-y plane. + */ + int x_offset = (xscale<0) ? width : 0; + int y_offset = (yscale<0) ? height : 0; + + /* When we need to scale we perform scaling and source_x / source_y translation using a transformation matrix. + * This is needed because XRender is inaccurate in combination with scaled source coordinates passed to XRenderComposite. + * In all other cases we do use XRenderComposite for translation as it is faster than using a transformation matrix. */ + if(xscale != 1.0 || yscale != 1.0) + { + /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict */ + if(mask_pict) + set_xrender_transformation(mask_pict, xscale, yscale, x_offset, y_offset); + else + set_xrender_transformation(src_pict, xscale, yscale, x_src + x_offset, y_src + y_offset); + + pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, 0, 0, 0, 0, 0, 0, width, height); + } + else + { + /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict */ + if(mask_pict) + set_xrender_transformation(mask_pict, 1, 1, 0, 0); + else + set_xrender_transformation(src_pict, 1, 1, 0, 0); + + pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, x_src, y_src, 0, 0, 0, 0, width, height); + } +} + /****************************************************************************** * AlphaBlend (x11drv.@) */ @@ -1933,34 +1968,28 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physDevDst, Pixmap pixmap, GC gc, - INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, - INT xDst, INT yDst, INT widthDst, INT heightDst, RECT *visRectSrc, RECT *visRectDst ) { BOOL stretch = (widthSrc != widthDst) || (heightSrc != heightDst); int width = visRectDst->right - visRectDst->left; int height = visRectDst->bottom - visRectDst->top; + int x_src = physDevSrc->dc_rect.left + visRectSrc->left; + int y_src = physDevSrc->dc_rect.top + visRectSrc->top; WineXRenderFormat *src_format = get_xrender_format_from_pdevice(physDevSrc); WineXRenderFormat *dst_format = get_xrender_format_from_pdevice(physDevDst); Picture src_pict=0, dst_pict=0, mask_pict=0; - /* Further down a transformation matrix is used for stretching and mirroring the source data. - * xscale/yscale contain the scaling factors for the width and height. In case of mirroring - * we also need a x- and y-offset because without the pixels will be in the wrong quadrant of the x-y plane. - */ double xscale = widthSrc/(double)widthDst; double yscale = heightSrc/(double)heightDst; - int xoffset = (xscale<0) ? width : 0; - int yoffset = (yscale<0) ? height : 0; XRenderPictureAttributes pa; pa.subwindow_mode = IncludeInferiors; pa.repeat = RepeatNone; - TRACE("src depth=%d widthSrc=%d heightSrc=%d xSrc=%d ySrc=%d\n", physDevSrc->depth, widthSrc, heightSrc, xSrc, ySrc); - TRACE("dst depth=%d widthDst=%d heightDst=%d xDst=%d yDst=%d\n", physDevDst->depth, widthDst, heightDst, xDst, yDst); + TRACE("src depth=%d widthSrc=%d heightSrc=%d xSrc=%d ySrc=%d\n", physDevSrc->depth, widthSrc, heightSrc, x_src, y_src); + TRACE("dst depth=%d widthDst=%d heightDst=%d\n", physDevDst->depth, widthDst, heightDst); if(!X11DRV_XRender_Installed) { @@ -1981,10 +2010,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE { TRACE("Source and destination depth match and no stretching needed falling back to XCopyArea\n"); wine_tsx11_lock(); - XCopyArea( gdi_display, physDevSrc->drawable, pixmap, gc, - physDevSrc->dc_rect.left + visRectSrc->left, - physDevSrc->dc_rect.top + visRectSrc->top, - width, height, 0, 0); + XCopyArea( gdi_display, physDevSrc->drawable, pixmap, gc, x_src, y_src, width, height, 0, 0); wine_tsx11_unlock(); return TRUE; } @@ -1998,7 +2024,6 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE /* We use the source drawable as a mask */ wine_tsx11_lock(); mask_pict = pXRenderCreatePicture(gdi_display, physDevSrc->drawable, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); - set_xrender_transformation(mask_pict, xscale, yscale, xoffset, yoffset); /* Use backgroundPixel as the foreground color */ src_pict = get_tile_pict(dst_format, physDevDst->backgroundPixel); @@ -2007,12 +2032,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); pXRenderFillRectangle(gdi_display, PictOpSrc, dst_pict, &col, 0, 0, width, height); - /* Notice that the source coordinates have to be relative to the transformated source picture */ - pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, - (physDevSrc->dc_rect.left + visRectSrc->left)/xscale, - (physDevSrc->dc_rect.top + visRectSrc->top)/yscale, - 0, 0, 0, 0, - width, height); + xrender_blit(src_pict, mask_pict, dst_pict, x_src, y_src, xscale, yscale, width, height); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict); if(mask_pict) pXRenderFreePicture(gdi_display, mask_pict); @@ -2024,18 +2044,12 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE src_pict = pXRenderCreatePicture(gdi_display, physDevSrc->drawable, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); - set_xrender_transformation(src_pict, xscale, yscale, xoffset, yoffset); dst_pict = pXRenderCreatePicture(gdi_display, pixmap, dst_format->pict_format, CPSubwindowMode|CPRepeat, &pa); - /* Notice that the source coordinates have to be relative to the transformated source picture */ - pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, - (physDevSrc->dc_rect.left + visRectSrc->left)/xscale, - (physDevSrc->dc_rect.top + visRectSrc->top)/yscale, - 0, 0, 0, 0, - width, height); + xrender_blit(src_pict, 0, dst_pict, x_src, y_src, xscale, yscale, width, height); if(src_pict) pXRenderFreePicture(gdi_display, src_pict); if(dst_pict) pXRenderFreePicture(gdi_display, dst_pict);

1 0

Paul Vriens : jscript: Add Dutch translations.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 75fc48d4c5b9800333bcf68b19c7a4305cef59aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fc48d4c5b9800333bcf68b1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 24 10:32:38 2009 +0200 jscript: Add Dutch translations. --- dlls/jscript/jscript_Nl.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Nl.rc b/dlls/jscript/jscript_Nl.rc index 50cf92d..71ba6b5 100644 --- a/dlls/jscript/jscript_Nl.rc +++ b/dlls/jscript/jscript_Nl.rc @@ -26,9 +26,14 @@ STRINGTABLE DISCARDABLE IDS_INVALID_CALL_ARG "Ongeldige procedure-aanroep of argument" IDS_NO_PROPERTY "Dit object ondersteunt deze eigenschap of methode niet" IDS_ARG_NOT_OPT "Argument is niet optioneel" + IDS_SYNTAX_ERROR "Syntax fout" + IDS_SEMICOLON "';' verwacht" + IDS_LBRACKET "'(' verwacht" + IDS_RBRACKET "')' verwacht" IDS_NOT_FUNC "Functie verwacht" IDS_NOT_DATE "'[object]' is geen datum object" IDS_NOT_NUM "Getal verwacht" + IDS_ILLEGAL_ASSIGN "Ongeldige toekenning" IDS_UNDEFINED "'|' is ongedefinieerd" IDS_NOT_BOOL "Boolean object verwacht" IDS_INVALID_LENGTH "Array lengte moet een eindig, positief geheel getal zijn"

1 0

Rein Klazes : ws2_32: Do not make the unix file descriptor blocking. Too many places in the socket code assume it is not.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: d8f962e69cb92e4a6cc438394cff42779621af16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8f962e69cb92e4a6cc438394… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Jul 24 10:29:17 2009 +0200 ws2_32: Do not make the unix file descriptor blocking. Too many places in the socket code assume it is not. --- dlls/ws2_32/socket.c | 24 +++++------------------- 1 files changed, 5 insertions(+), 19 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1492640..2eb5837 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2406,25 +2406,11 @@ int WINAPI WS_ioctlsocket(SOCKET s, LONG cmd, WS_u_long *argp) SetLastError(WSAEINVAL); return SOCKET_ERROR; } - fd = get_sock_fd( s, 0, NULL ); - if (fd != -1) - { - int ret; - if (*argp) - { - _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); - ret = fcntl( fd, F_SETFL, O_NONBLOCK ); - } - else - { - _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); - ret = fcntl( fd, F_SETFL, 0 ); - } - release_sock_fd( s, fd ); - if (!ret) return 0; - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); - } - return SOCKET_ERROR; + if (*argp) + _enable_event(SOCKET2HANDLE(s), 0, FD_WINE_NONBLOCKING, 0); + else + _enable_event(SOCKET2HANDLE(s), 0, 0, FD_WINE_NONBLOCKING); + return 0; case WS_SIOCATMARK: newcmd=SIOCATMARK;

1 0

Piotr Caban : jscript: Throw more SyntaxErrors in parser.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: f3d24fdda90c0e7255df49c80b451143bd6afa5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d24fdda90c0e7255df49c80… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:36:23 2009 +0200 jscript: Throw more SyntaxErrors in parser. --- dlls/jscript/parser.y | 18 +++++++++++------- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 50092e5..a0ae471 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -202,7 +202,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <statement> Finally %type <statement_list> StatementList StatementList_opt %type <parameter_list> FormalParameterList FormalParameterList_opt -%type <expr> Expression Expression_opt +%type <expr> Expression Expression_opt Expression_err %type <expr> ExpressionNoIn ExpressionNoIn_opt %type <expr> FunctionExpression %type <expr> AssignmentExpression AssignmentExpressionNoIn @@ -381,16 +381,16 @@ ExpressionStatement /* ECMA-262 3rd Edition 12.5 */ IfStatement - : kIF left_bracket Expression right_bracket Statement kELSE Statement + : kIF left_bracket Expression_err right_bracket Statement kELSE Statement { $$ = new_if_statement(ctx, $3, $5, $7); } - | kIF left_bracket Expression right_bracket Statement %prec LOWER_THAN_ELSE + | kIF left_bracket Expression_err right_bracket Statement %prec LOWER_THAN_ELSE { $$ = new_if_statement(ctx, $3, $5, NULL); } /* ECMA-262 3rd Edition 12.6 */ IterationStatement - : kDO Statement kWHILE left_bracket Expression right_bracket semicolon_opt + : kDO Statement kWHILE left_bracket Expression_err right_bracket semicolon_opt { $$ = new_while_statement(ctx, TRUE, $5, $2); } - | kWHILE left_bracket Expression right_bracket Statement + | kWHILE left_bracket Expression_err right_bracket Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } | kFOR left_bracket ExpressionNoIn_opt { if(!explicit_error(ctx, $3, ';')) YYABORT; } @@ -404,9 +404,9 @@ IterationStatement { if(!explicit_error(ctx, $7, ';')) YYABORT; } semicolon Expression_opt right_bracket Statement { $$ = new_for_statement(ctx, $4, NULL, $7, $10, $12); } - | kFOR left_bracket LeftHandSideExpression kIN Expression right_bracket Statement + | kFOR left_bracket LeftHandSideExpression kIN Expression_err right_bracket Statement { $$ = new_forin_statement(ctx, NULL, $3, $5, $7); } - | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression right_bracket Statement + | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression_err right_bracket Statement { $$ = new_forin_statement(ctx, $4, NULL, $6, $8); } /* ECMA-262 3rd Edition 12.7 */ @@ -493,6 +493,10 @@ Expression_opt : /* empty */ { $$ = NULL; } | Expression { $$ = $1; } +Expression_err + : Expression { $$ = $1; } + | error { set_error(ctx, IDS_SYNTAX_ERROR); YYABORT; } + /* ECMA-262 3rd Edition 11.14 */ Expression : AssignmentExpression { $$ = $1; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 720e7c0..53b7f92 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1331,5 +1331,7 @@ exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282); exception_test(function() {test = function() {}}, "ReferenceError", -2146823280); exception_test(function() {eval("for(i=0")}, "SyntaxError", -2146827284); exception_test(function() {eval("for(i=0;i<10")}, "SyntaxError", -2146827284); +exception_test(function() {eval("while(")}, "SyntaxError", -2146827286); +exception_test(function() {eval("if(")}, "SyntaxError", -2146827286); reportSuccess();

1 0

Piotr Caban : jscript: Added "Expected ';'" error.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 67c8a3e9194d6609e9a2cb626d4dbe01841f530d URL: http://source.winehq.org/git/wine.git/?a=commit;h=67c8a3e9194d6609e9a2cb626… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:36:20 2009 +0200 jscript: Added "Expected ';'" error. --- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/parser.y | 30 +++++++++++++++++++++++++----- dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 2 ++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 96db21f..b47e951 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -27,6 +27,7 @@ STRINGTABLE DISCARDABLE IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" IDS_SYNTAX_ERROR "Syntax error" + IDS_SEMICOLON "Expected ';'" IDS_LBRACKET "Expected '('" IDS_RBRACKET "Expected ')'" IDS_NOT_FUNC "Function expected" diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index bcb2c24..50092e5 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -26,6 +26,7 @@ static int parser_error(const char*); static void set_error(parser_ctx_t*,UINT); +static BOOL explicit_error(parser_ctx_t*,void*,WCHAR); static BOOL allow_auto_semicolon(parser_ctx_t*); static void program_parsed(parser_ctx_t*,source_elements_t*); static source_elements_t *function_body_parsed(parser_ctx_t*,source_elements_t*); @@ -391,10 +392,18 @@ IterationStatement { $$ = new_while_statement(ctx, TRUE, $5, $2); } | kWHILE left_bracket Expression right_bracket Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } - | kFOR left_bracket ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt right_bracket Statement - { $$ = new_for_statement(ctx, NULL, $3, $5, $7, $9); } - | kFOR left_bracket kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt right_bracket Statement - { $$ = new_for_statement(ctx, $4, NULL, $6, $8, $10); } + | kFOR left_bracket ExpressionNoIn_opt + { if(!explicit_error(ctx, $3, ';')) YYABORT; } + semicolon Expression_opt + { if(!explicit_error(ctx, $6, ';')) YYABORT; } + semicolon Expression_opt right_bracket Statement + { $$ = new_for_statement(ctx, NULL, $3, $6, $9, $11); } + | kFOR left_bracket kVAR VariableDeclarationListNoIn + { if(!explicit_error(ctx, $4, ';')) YYABORT; } + semicolon Expression_opt + { if(!explicit_error(ctx, $7, ';')) YYABORT; } + semicolon Expression_opt right_bracket Statement + { $$ = new_for_statement(ctx, $4, NULL, $7, $10, $12); } | kFOR left_bracket LeftHandSideExpression kIN Expression right_bracket Statement { $$ = new_forin_statement(ctx, NULL, $3, $5, $7); } | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression right_bracket Statement @@ -494,7 +503,6 @@ Expression ExpressionNoIn_opt : /* empty */ { $$ = NULL; } | ExpressionNoIn { $$ = $1; } - | error { set_error(ctx, IDS_SYNTAX_ERROR); YYABORT; } /* ECMA-262 3rd Edition 11.14 */ ExpressionNoIn @@ -806,6 +814,10 @@ right_bracket : ')' | error { set_error(ctx, IDS_RBRACKET); YYABORT; } +semicolon + : ';' + | error { set_error(ctx, IDS_SEMICOLON); YYABORT; } + %% static BOOL allow_auto_semicolon(parser_ctx_t *ctx) @@ -1449,6 +1461,14 @@ static void set_error(parser_ctx_t *ctx, UINT error) ctx->hres = JSCRIPT_ERROR|error; } +static BOOL explicit_error(parser_ctx_t *ctx, void *obj, WCHAR next) +{ + if(obj || *(ctx->ptr-1)==next) return TRUE; + + set_error(ctx, IDS_SYNTAX_ERROR); + return FALSE; +} + static expression_t *new_identifier_expression(parser_ctx_t *ctx, const WCHAR *identifier) { diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 969ea13..0503961 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -23,6 +23,7 @@ #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_SYNTAX_ERROR 0x03EA +#define IDS_SEMICOLON 0x03EC #define IDS_LBRACKET 0x03ED #define IDS_RBRACKET 0x03EE #define IDS_NOT_FUNC 0x138A diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7e43ffb..720e7c0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1329,5 +1329,7 @@ exception_test(function() {eval("if(false");}, "SyntaxError", -2146827282); exception_test(function() {eval("for(i=0; i<10; i++");}, "SyntaxError", -2146827282); exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282); exception_test(function() {test = function() {}}, "ReferenceError", -2146823280); +exception_test(function() {eval("for(i=0")}, "SyntaxError", -2146827284); +exception_test(function() {eval("for(i=0;i<10")}, "SyntaxError", -2146827284); reportSuccess();

1 0

Piotr Caban : jscript: Add "illegal assignment" error.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: c6412d98d9b3693bd7c15e6aa59d8b53ca737360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6412d98d9b3693bd7c15e6aa… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:36:16 2009 +0200 jscript: Add "illegal assignment" error. --- dlls/jscript/engine.c | 6 ++---- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c79c48f..ff5e6a8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -232,10 +232,8 @@ static HRESULT disp_get_id(IDispatch *disp, BSTR name, DWORD flags, DISPID *id) /* ECMA-262 3rd Edition 8.7.2 */ static HRESULT put_value(script_ctx_t *ctx, exprval_t *ref, VARIANT *v, jsexcept_t *ei) { - if(ref->type != EXPRVAL_IDREF) { - FIXME("throw ReferemceError\n"); - return E_FAIL; - } + if(ref->type != EXPRVAL_IDREF) + return throw_reference_error(ctx, ei, IDS_ILLEGAL_ASSIGN, NULL); return disp_propput(ref->u.idref.disp, ref->u.idref.id, ctx->lcid, v, ei, NULL/*FIXME*/); } diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index d2470c7..96db21f 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -32,6 +32,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" + IDS_ILLEGAL_ASSIGN "Illegal assignment" IDS_UNDEFINED "'|' is undefined" IDS_NOT_BOOL "Boolean object expected" IDS_INVALID_LENGTH "Array length must be a finite positive integer" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 5fcbbae..969ea13 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -28,6 +28,7 @@ #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 +#define IDS_ILLEGAL_ASSIGN 0x1390 #define IDS_UNDEFINED 0x1391 #define IDS_NOT_BOOL 0x1392 #define IDS_INVALID_LENGTH 0x13A5 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 3ccb362..7e43ffb 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1328,5 +1328,6 @@ exception_test(function() {eval("switch");}, "SyntaxError", -2146827283); exception_test(function() {eval("if(false");}, "SyntaxError", -2146827282); exception_test(function() {eval("for(i=0; i<10; i++");}, "SyntaxError", -2146827282); exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282); +exception_test(function() {test = function() {}}, "ReferenceError", -2146823280); reportSuccess();

1 0

Piotr Caban : jscript: Added "Expected ')'" error.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 2fba39df272ba4c5f504b0121bd1a9b1942e0ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fba39df272ba4c5f504b0121… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:36:13 2009 +0200 jscript: Added "Expected ')'" error. --- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/parser.y | 28 ++++++++++++++++------------ dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 3 +++ 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 325df41..d2470c7 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -28,6 +28,7 @@ STRINGTABLE DISCARDABLE IDS_ARG_NOT_OPT "Argument not optional" IDS_SYNTAX_ERROR "Syntax error" IDS_LBRACKET "Expected '('" + IDS_RBRACKET "Expected ')'" IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3777478..bcb2c24 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -267,7 +267,7 @@ SourceElements /* ECMA-262 3rd Edition 13 */ FunctionExpression - : KFunction Identifier_opt left_bracket FormalParameterList_opt ')' '{' FunctionBody '}' + : KFunction Identifier_opt left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' { $$ = new_function_expression(ctx, $2, $4, $7, $1, $8-$1+1); } KFunction @@ -380,24 +380,24 @@ ExpressionStatement /* ECMA-262 3rd Edition 12.5 */ IfStatement - : kIF left_bracket Expression ')' Statement kELSE Statement + : kIF left_bracket Expression right_bracket Statement kELSE Statement { $$ = new_if_statement(ctx, $3, $5, $7); } - | kIF left_bracket Expression ')' Statement %prec LOWER_THAN_ELSE + | kIF left_bracket Expression right_bracket Statement %prec LOWER_THAN_ELSE { $$ = new_if_statement(ctx, $3, $5, NULL); } /* ECMA-262 3rd Edition 12.6 */ IterationStatement - : kDO Statement kWHILE left_bracket Expression ')' semicolon_opt + : kDO Statement kWHILE left_bracket Expression right_bracket semicolon_opt { $$ = new_while_statement(ctx, TRUE, $5, $2); } - | kWHILE left_bracket Expression ')' Statement + | kWHILE left_bracket Expression right_bracket Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } - | kFOR left_bracket ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt ')' Statement + | kFOR left_bracket ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt right_bracket Statement { $$ = new_for_statement(ctx, NULL, $3, $5, $7, $9); } - | kFOR left_bracket kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt ')' Statement + | kFOR left_bracket kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt right_bracket Statement { $$ = new_for_statement(ctx, $4, NULL, $6, $8, $10); } - | kFOR left_bracket LeftHandSideExpression kIN Expression ')' Statement + | kFOR left_bracket LeftHandSideExpression kIN Expression right_bracket Statement { $$ = new_forin_statement(ctx, NULL, $3, $5, $7); } - | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression ')' Statement + | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression right_bracket Statement { $$ = new_forin_statement(ctx, $4, NULL, $6, $8); } /* ECMA-262 3rd Edition 12.7 */ @@ -417,7 +417,7 @@ ReturnStatement /* ECMA-262 3rd Edition 12.10 */ WithStatement - : kWITH left_bracket Expression ')' Statement + : kWITH left_bracket Expression right_bracket Statement { $$ = new_with_statement(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.12 */ @@ -427,7 +427,7 @@ LabelledStatement /* ECMA-262 3rd Edition 12.11 */ SwitchStatement - : kSWITCH left_bracket Expression ')' CaseBlock + : kSWITCH left_bracket Expression right_bracket CaseBlock { $$ = new_switch_statement(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.11 */ @@ -472,7 +472,7 @@ TryStatement /* ECMA-262 3rd Edition 12.14 */ Catch - : kCATCH left_bracket tIdentifier ')' Block + : kCATCH left_bracket tIdentifier right_bracket Block { $$ = new_catch_block(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.14 */ @@ -802,6 +802,10 @@ left_bracket : '(' | error { set_error(ctx, IDS_LBRACKET); YYABORT; } +right_bracket + : ')' + | error { set_error(ctx, IDS_RBRACKET); YYABORT; } + %% static BOOL allow_auto_semicolon(parser_ctx_t *ctx) diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index c0e73f9..5fcbbae 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -24,6 +24,7 @@ #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_SYNTAX_ERROR 0x03EA #define IDS_LBRACKET 0x03ED +#define IDS_RBRACKET 0x03EE #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index efc8578..3ccb362 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1325,5 +1325,8 @@ exception_test(function() {eval("while");}, "SyntaxError", -2146827283); exception_test(function() {eval("for");}, "SyntaxError", -2146827283); exception_test(function() {eval("with");}, "SyntaxError", -2146827283); exception_test(function() {eval("switch");}, "SyntaxError", -2146827283); +exception_test(function() {eval("if(false");}, "SyntaxError", -2146827282); +exception_test(function() {eval("for(i=0; i<10; i++");}, "SyntaxError", -2146827282); +exception_test(function() {eval("while(true");}, "SyntaxError", -2146827282); reportSuccess();

1 0

Piotr Caban : jscript: Added "Expected '('" error.
by Alexandre Julliard July 24, 2009

July 24, 2009

Module: wine Branch: master Commit: 29d9f09992a3fa8821cb77588e1afe1b1c552f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d9f09992a3fa8821cb77588… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Jul 24 09:36:04 2009 +0200 jscript: Added "Expected '('" error. --- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/parser.y | 40 ++++++++++++++++++++++++++-------------- dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 7 +++++++ 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 154479a..325df41 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -27,6 +27,7 @@ STRINGTABLE DISCARDABLE IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" IDS_SYNTAX_ERROR "Syntax error" + IDS_LBRACKET "Expected '('" IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index adec6bc..3777478 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -25,6 +25,7 @@ #define YYPARSE_PARAM ctx static int parser_error(const char*); +static void set_error(parser_ctx_t*,UINT); static BOOL allow_auto_semicolon(parser_ctx_t*); static void program_parsed(parser_ctx_t*,source_elements_t*); static source_elements_t *function_body_parsed(parser_ctx_t*,source_elements_t*); @@ -266,7 +267,7 @@ SourceElements /* ECMA-262 3rd Edition 13 */ FunctionExpression - : KFunction Identifier_opt '(' FormalParameterList_opt ')' '{' FunctionBody '}' + : KFunction Identifier_opt left_bracket FormalParameterList_opt ')' '{' FunctionBody '}' { $$ = new_function_expression(ctx, $2, $4, $7, $1, $8-$1+1); } KFunction @@ -379,24 +380,24 @@ ExpressionStatement /* ECMA-262 3rd Edition 12.5 */ IfStatement - : kIF '(' Expression ')' Statement kELSE Statement + : kIF left_bracket Expression ')' Statement kELSE Statement { $$ = new_if_statement(ctx, $3, $5, $7); } - | kIF '(' Expression ')' Statement %prec LOWER_THAN_ELSE + | kIF left_bracket Expression ')' Statement %prec LOWER_THAN_ELSE { $$ = new_if_statement(ctx, $3, $5, NULL); } /* ECMA-262 3rd Edition 12.6 */ IterationStatement - : kDO Statement kWHILE '(' Expression ')' semicolon_opt + : kDO Statement kWHILE left_bracket Expression ')' semicolon_opt { $$ = new_while_statement(ctx, TRUE, $5, $2); } - | kWHILE '(' Expression ')' Statement + | kWHILE left_bracket Expression ')' Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } - | kFOR '(' ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt ')' Statement + | kFOR left_bracket ExpressionNoIn_opt ';' Expression_opt ';' Expression_opt ')' Statement { $$ = new_for_statement(ctx, NULL, $3, $5, $7, $9); } - | kFOR '(' kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt ')' Statement + | kFOR left_bracket kVAR VariableDeclarationListNoIn ';' Expression_opt ';' Expression_opt ')' Statement { $$ = new_for_statement(ctx, $4, NULL, $6, $8, $10); } - | kFOR '(' LeftHandSideExpression kIN Expression ')' Statement + | kFOR left_bracket LeftHandSideExpression kIN Expression ')' Statement { $$ = new_forin_statement(ctx, NULL, $3, $5, $7); } - | kFOR '(' kVAR VariableDeclarationNoIn kIN Expression ')' Statement + | kFOR left_bracket kVAR VariableDeclarationNoIn kIN Expression ')' Statement { $$ = new_forin_statement(ctx, $4, NULL, $6, $8); } /* ECMA-262 3rd Edition 12.7 */ @@ -416,7 +417,7 @@ ReturnStatement /* ECMA-262 3rd Edition 12.10 */ WithStatement - : kWITH '(' Expression ')' Statement + : kWITH left_bracket Expression ')' Statement { $$ = new_with_statement(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.12 */ @@ -426,8 +427,8 @@ LabelledStatement /* ECMA-262 3rd Edition 12.11 */ SwitchStatement - : kSWITCH '(' Expression ')' CaseBlock - { $$ = new_switch_statement(ctx, $3, $5); } + : kSWITCH left_bracket Expression ')' CaseBlock + { $$ = new_switch_statement(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.11 */ CaseBlock @@ -471,8 +472,8 @@ TryStatement /* ECMA-262 3rd Edition 12.14 */ Catch - : kCATCH '(' tIdentifier ')' Block - { $$ = new_catch_block(ctx, $3, $5); } + : kCATCH left_bracket tIdentifier ')' Block + { $$ = new_catch_block(ctx, $3, $5); } /* ECMA-262 3rd Edition 12.14 */ Finally @@ -493,6 +494,7 @@ Expression ExpressionNoIn_opt : /* empty */ { $$ = NULL; } | ExpressionNoIn { $$ = $1; } + | error { set_error(ctx, IDS_SYNTAX_ERROR); YYABORT; } /* ECMA-262 3rd Edition 11.14 */ ExpressionNoIn @@ -796,6 +798,10 @@ semicolon_opt : ';' | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} } +left_bracket + : '(' + | error { set_error(ctx, IDS_LBRACKET); YYABORT; } + %% static BOOL allow_auto_semicolon(parser_ctx_t *ctx) @@ -1434,6 +1440,12 @@ static int parser_error(const char *str) return 0; } +static void set_error(parser_ctx_t *ctx, UINT error) +{ + ctx->hres = JSCRIPT_ERROR|error; +} + + static expression_t *new_identifier_expression(parser_ctx_t *ctx, const WCHAR *identifier) { identifier_expression_t *ret = parser_alloc(ctx, sizeof(identifier_expression_t)); diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index fd2cb82..c0e73f9 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -23,6 +23,7 @@ #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_SYNTAX_ERROR 0x03EA +#define IDS_LBRACKET 0x03ED #define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index a71c0aa..efc8578 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1318,5 +1318,12 @@ exception_test(function() {arr.toString = Function.prototype.toString; arr.toStr exception_test(function() {date();}, "TypeError", -2146823286); exception_test(function() {arr();}, "TypeError", -2146823286); exception_test(function() {eval("for(i=0;) {}");}, "SyntaxError", -2146827286); +exception_test(function() {eval("function {};");}, "SyntaxError", -2146827283); +exception_test(function() {eval("if");}, "SyntaxError", -2146827283); +exception_test(function() {eval("do i=0; while");}, "SyntaxError", -2146827283); +exception_test(function() {eval("while");}, "SyntaxError", -2146827283); +exception_test(function() {eval("for");}, "SyntaxError", -2146827283); +exception_test(function() {eval("with");}, "SyntaxError", -2146827283); +exception_test(function() {eval("switch");}, "SyntaxError", -2146827283); reportSuccess();

1 0