December 2011 - Wine-commits

Stefan Dösinger : ddraw/tests: Update a copyright line .
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: ea151da3cdc23bbbba562d05522b6e5983448443 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea151da3cdc23bbbba562d055… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Dec 5 00:07:22 2011 +0100 ddraw/tests: Update a copyright line. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ae057bc..5efe718 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2,7 +2,7 @@ * Some unit tests for d3d functions * * Copyright (C) 2005 Antoine Chavasse - * Copyright (C) 2006 Stefan Dösinger for CodeWeavers + * Copyright (C) 2006,2011 Stefan Dösinger for CodeWeavers * Copyright (C) 2008 Alexander Dorofeyev * * This library is free software; you can redistribute it and/or

1 0

Marcus Meissner : ole32: Handle VT_BLOB in PropertyStorage_ReadProperty.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 48ae8e9ced8475127bb83625d62dd641b88b9c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48ae8e9ced8475127bb83625d… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Dec 4 23:52:44 2011 +0100 ole32: Handle VT_BLOB in PropertyStorage_ReadProperty. --- dlls/ole32/stg_prop.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 53c2a99..53f57c1 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1111,6 +1111,22 @@ static HRESULT PropertyStorage_ReadProperty(PropertyStorage_impl *This, } break; } + case VT_BLOB: + { + DWORD count; + + StorageUtl_ReadDWord(data, 0, &count); + prop->u.blob.cbSize = count; + prop->u.blob.pBlobData = CoTaskMemAlloc(count); + if (prop->u.blob.pBlobData) + { + memcpy(prop->u.blob.pBlobData, data + sizeof(DWORD), count); + TRACE("Read blob value of size %d\n", count); + } + else + hr = STG_E_INSUFFICIENTMEMORY; + break; + } case VT_LPWSTR: { DWORD count;

1 0

Marcus Meissner : ole32: Output more information in OleCreateStaticFromData .
by Alexandre Julliard 05 Dec '11

05 Dec '11

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

Jacek Caban : jscript: Use bytecode for assignment to identifier.
by Alexandre Julliard 05 Dec '11

05 Dec '11

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 assigning to array expression.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 9aafd0311086a22fde37119fe1a28e6c2b9b9bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aafd0311086a22fde37119fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 11:11:45 2011 +0100 jscript: Use bytecode for assigning to array expression. --- dlls/jscript/compile.c | 15 +++++++++++++++ dlls/jscript/engine.c | 35 +++++++++++++++++++++++++++++++++++ dlls/jscript/engine.h | 1 + 3 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 3679dfe..a237093 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -358,6 +358,21 @@ static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_ return hres; break; } + case EXPR_ARRAY: { + array_expression_t *array_expr = (array_expression_t*)expr->expression1; + + hres = compile_expression(ctx, array_expr->member_expr); + if(FAILED(hres)) + return hres; + + hres = compile_expression(ctx, array_expr->expression); + 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 c445eab..e4d918f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1573,6 +1573,41 @@ HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla return hres; } +/* ECMA-262 3rd Edition 11.2.1 */ +static HRESULT interp_memberid(exec_ctx_t *ctx) +{ + VARIANT *objv, *namev; + IDispatch *obj; + BSTR name; + DISPID id; + HRESULT hres; + + TRACE("\n"); + + namev = stack_pop(ctx); + objv = stack_pop(ctx); + + hres = to_object(ctx->parser->script, objv, &obj); + VariantClear(objv); + if(SUCCEEDED(hres)) { + hres = to_string(ctx->parser->script, namev, &ctx->ei, &name); + if(FAILED(hres)) + IDispatch_Release(obj); + } + VariantClear(namev); + if(FAILED(hres)) + return hres; + + hres = disp_get_id(ctx->parser->script, obj, name, fdexNameEnsure, &id); + SysFreeString(name); + if(FAILED(hres)) { + IDispatch_Release(obj); + return hres; + } + + return stack_push_objid(ctx, obj, id); +} + static void free_dp(DISPPARAMS *dp) { DWORD i; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 12329e8..a032f7b 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(memberid, 1, 0,0) \ X(minus, 1, 0,0) \ X(mod, 1, 0,0) \ X(mul, 1, 0,0) \

1 0

Jacek Caban : jscript: Use bytecode for assignment to member expression.
by Alexandre Julliard 05 Dec '11

05 Dec '11

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 invalid assignments.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: 8511797c07578cd13587ad6cd652712bcb038531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8511797c07578cd13587ad6cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 11:12:32 2011 +0100 jscript: Use bytecode for invalid assignments. --- dlls/jscript/compile.c | 23 +++++++++++++++++++++-- dlls/jscript/engine.c | 43 +++++++++---------------------------------- dlls/jscript/engine.h | 2 +- dlls/jscript/tests/api.js | 12 ++++++++++++ 4 files changed, 43 insertions(+), 37 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 93d780f..73f57ee 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -172,6 +172,18 @@ static HRESULT push_instr_double(compiler_ctx_t *ctx, jsop_t op, double arg) return S_OK; } +static HRESULT push_instr_uint(compiler_ctx_t *ctx, jsop_t op, unsigned arg) +{ + unsigned instr; + + instr = push_instr(ctx, op); + if(instr == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->arg1.uint = arg; + return S_OK; +} + static HRESULT compile_binary_expression(compiler_ctx_t *ctx, binary_expression_t *expr, jsop_t op) { HRESULT hres; @@ -390,8 +402,15 @@ static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_ break; } default: - expr->expr.eval = assign_expression_eval; - return compile_interp_fallback(ctx, &expr->expr); + hres = compile_expression(ctx, expr->expression1); + if(FAILED(hres)) + return hres; + + hres = compile_expression(ctx, expr->expression2); + if(FAILED(hres)) + return hres; + + return push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 2af2d75..124b7b0 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1279,6 +1279,15 @@ HRESULT throw_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_ return DISP_E_EXCEPTION; } +static HRESULT interp_throw(exec_ctx_t *ctx) +{ + const HRESULT arg = ctx->parser->code->instrs[ctx->ip].arg1.uint; + + TRACE("%08x\n", arg); + + return throw_reference_error(ctx->parser->script, &ctx->ei, arg, NULL); +} + /* ECMA-262 3rd Edition 12.14 */ static HRESULT catch_eval(script_ctx_t *ctx, catch_block_t *block, return_type_t *rt, VARIANT *ret) { @@ -3308,40 +3317,6 @@ HRESULT right2_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWO } /* ECMA-262 3rd Edition 11.13.1 */ -HRESULT assign_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; - exprval_t exprval, exprvalr; - VARIANT rval; - HRESULT hres; - - TRACE("\n"); - - hres = expr_eval(ctx, expr->expression1, EXPR_NEWREF, ei, &exprval); - if(FAILED(hres)) - return hres; - - hres = expr_eval(ctx, expr->expression2, 0, ei, &exprvalr); - if(SUCCEEDED(hres)) { - hres = exprval_to_value(ctx, &exprvalr, ei, &rval); - exprval_release(&exprvalr); - } - - if(SUCCEEDED(hres)) { - assert(exprval.type != EXPRVAL_IDREF); - return throw_reference_error(ctx, ei, JS_E_ILLEGAL_ASSIGN, NULL); - } - - exprval_release(&exprval); - if(FAILED(hres)) - return hres; - - ret->type = EXPRVAL_VARIANT; - ret->u.var = rval; - return S_OK; -} - -/* ECMA-262 3rd Edition 11.13.1 */ static HRESULT interp_assign(exec_ctx_t *ctx) { IDispatch *disp; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index a032f7b..0825649 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -76,6 +76,7 @@ typedef struct _func_stack { X(regexp, 1, ARG_STR, ARG_INT) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ + X(throw, 0, ARG_UINT, 0) \ X(tonum, 1, 0,0) \ X(tree, 1, ARG_EXPR, 0) \ X(ret, 0, 0,0) \ @@ -570,7 +571,6 @@ HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT assign_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_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; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b5ac66a..0118743 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2076,6 +2076,18 @@ tmp = false; testException(function() {test = (tmp = true);}, "E_ILLEGAL_ASSIGN"); ok(tmp, "expr value on invalid assign not evaluated"); +tmp = false; +testException(function() {(tmp = true) = false;}, "E_ILLEGAL_ASSIGN"); +ok(tmp, "expr assign not evaluated"); + +tmp = false; +testException(function() {true = (tmp = true);}, "E_ILLEGAL_ASSIGN"); +ok(tmp, "expr value assign not evaluated"); + +tmp = ""; +testException(function() {(tmp = tmp+"1") = (tmp = tmp+"2");}, "E_ILLEGAL_ASSIGN"); +ok(tmp === "12", "assign evaluated in unexpected order"); + // RegExpError tests testException(function() {RegExp(/a/, "g");}, "E_REGEXP_SYNTAX_ERROR");

1 0

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

05 Dec '11

Module: wine Branch: master Commit: 087afe8b79a286ad074d89922653f9a40f861cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=087afe8b79a286ad074d89922… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 5 11:13:02 2011 +0100 jscript: Use bytecode for '+=' expression implementation. --- dlls/jscript/compile.c | 14 ++++++++++++-- dlls/jscript/engine.c | 39 +++++++++++++++++++++++++++++---------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 43 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 73f57ee..7c00cf9 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -357,7 +357,7 @@ 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) +static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_t *expr, jsop_t op) { HRESULT hres; @@ -410,14 +410,22 @@ static HRESULT compile_assign_expression(compiler_ctx_t *ctx, binary_expression_ if(FAILED(hres)) return hres; + if(op != OP_LAST && push_instr(ctx, op) == -1) + return E_OUTOFMEMORY; + return push_instr_uint(ctx, OP_throw, JS_E_ILLEGAL_ASSIGN); } + if(op != OP_LAST && push_instr(ctx, OP_refval) == -1) + return E_OUTOFMEMORY; hres = compile_expression(ctx, expr->expression2); if(FAILED(hres)) return hres; + if(op != OP_LAST && push_instr(ctx, op) == -1) + return E_OUTOFMEMORY; + if(push_instr(ctx, OP_assign) == -1) return E_OUTOFMEMORY; @@ -468,7 +476,9 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) 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); + 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_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 124b7b0..05dee4d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -166,6 +166,14 @@ static inline IDispatch *stack_pop_objid(exec_ctx_t *ctx, DISPID *id) return V_DISPATCH(stack_pop(ctx)); } +static inline IDispatch *stack_top_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_top(ctx)); + return V_DISPATCH(stack_topn(ctx, 1)); +} + static void exprval_release(exprval_t *val) { switch(val->type) { @@ -1617,6 +1625,27 @@ static HRESULT interp_memberid(exec_ctx_t *ctx) return stack_push_objid(ctx, obj, id); } +/* ECMA-262 3rd Edition 11.2.1 */ +static HRESULT interp_refval(exec_ctx_t *ctx) +{ + IDispatch *disp; + VARIANT v; + DISPID id; + HRESULT hres; + + TRACE("\n"); + + disp = stack_top_objid(ctx, &id); + if(!disp) + return throw_reference_error(ctx->parser->script, &ctx->ei, JS_E_ILLEGAL_ASSIGN, NULL); + + hres = disp_propget(ctx->parser->script, disp, id, &v, &ctx->ei, NULL/*FIXME*/); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); +} + static void free_dp(DISPPARAMS *dp) { DWORD i; @@ -3373,16 +3402,6 @@ HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, D } /* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_add_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, add_eval, ei, ret); -} - -/* 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; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 0825649..f78c0bd 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -79,6 +79,7 @@ typedef struct _func_stack { X(throw, 0, ARG_UINT, 0) \ X(tonum, 1, 0,0) \ X(tree, 1, ARG_EXPR, 0) \ + X(refval, 1, 0,0) \ X(ret, 0, 0,0) \ X(sub, 1, 0,0) \ X(void, 1, 0,0) \ @@ -574,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_add_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; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 55f8aac..783aad9 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1344,7 +1344,7 @@ static const expression_eval_t expression_eval_table[] = { assign_lshift_expression_eval, assign_rshift_expression_eval, assign_rrshift_expression_eval, - assign_add_expression_eval, + compiled_expression_eval, assign_sub_expression_eval, assign_mul_expression_eval, assign_div_expression_eval,

1 0

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

05 Dec '11

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

Nikolay Sivov : msxml3: Added IDispatchEx support for IMXWriter.
by Alexandre Julliard 05 Dec '11

05 Dec '11

Module: wine Branch: master Commit: f9127ddc85f91b812368f695aed7326a80e1efba URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9127ddc85f91b812368f695a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 5 11:07:26 2011 +0300 msxml3: Added IDispatchEx support for IMXWriter. --- dlls/msxml3/mxwriter.c | 83 +++++++++++++++++----------------------- dlls/msxml3/tests/saxreader.c | 22 +++++++++++ 2 files changed, 57 insertions(+), 48 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index cc75d1d..b402259 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -59,6 +59,7 @@ typedef enum typedef struct _mxwriter { + DispatchEx dispex; IMXWriter IMXWriter_iface; ISAXContentHandler ISAXContentHandler_iface; @@ -209,6 +210,8 @@ static HRESULT WINAPI mxwriter_QueryInterface(IMXWriter *iface, REFIID riid, voi TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + *obj = NULL; + if ( IsEqualGUID( riid, &IID_IMXWriter ) || IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown ) ) @@ -219,6 +222,10 @@ static HRESULT WINAPI mxwriter_QueryInterface(IMXWriter *iface, REFIID riid, voi { *obj = &This->ISAXContentHandler_iface; } + else if (dispex_query_interface(&This->dispex, riid, obj)) + { + return *obj ? S_OK : E_NOINTERFACE; + } else { ERR("interface %s not implemented\n", debugstr_guid(riid)); @@ -257,6 +264,7 @@ static ULONG WINAPI mxwriter_Release(IMXWriter *iface) xmlOutputBufferClose(This->buffer); SysFreeString(This->element); + release_dispex(&This->dispex); heap_free(This); } @@ -266,12 +274,7 @@ static ULONG WINAPI mxwriter_Release(IMXWriter *iface) static HRESULT WINAPI mxwriter_GetTypeInfoCount(IMXWriter *iface, UINT* pctinfo) { mxwriter *This = impl_from_IMXWriter( iface ); - - TRACE("(%p)->(%p)\n", This, pctinfo); - - *pctinfo = 1; - - return S_OK; + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); } static HRESULT WINAPI mxwriter_GetTypeInfo( @@ -280,10 +283,8 @@ static HRESULT WINAPI mxwriter_GetTypeInfo( ITypeInfo** ppTInfo ) { mxwriter *This = impl_from_IMXWriter( iface ); - - TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - - return get_typeinfo(IMXWriter_tid, ppTInfo); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, + iTInfo, lcid, ppTInfo); } static HRESULT WINAPI mxwriter_GetIDsOfNames( @@ -292,23 +293,8 @@ static HRESULT WINAPI mxwriter_GetIDsOfNames( UINT cNames, LCID lcid, DISPID* rgDispId ) { mxwriter *This = impl_from_IMXWriter( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - - if(!rgszNames || cNames == 0 || !rgDispId) - return E_INVALIDARG; - - hr = get_typeinfo(IMXWriter_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, + riid, rgszNames, cNames, lcid, rgDispId); } static HRESULT WINAPI mxwriter_Invoke( @@ -318,21 +304,8 @@ static HRESULT WINAPI mxwriter_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr ) { mxwriter *This = impl_from_IMXWriter( iface ); - ITypeInfo *typeinfo; - HRESULT hr; - - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - - hr = get_typeinfo(IMXWriter_tid, &typeinfo); - if(SUCCEEDED(hr)) - { - hr = ITypeInfo_Invoke(typeinfo, &This->IMXWriter_iface, dispIdMember, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - ITypeInfo_Release(typeinfo); - } - - return hr; + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, + dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI mxwriter_put_output(IMXWriter *iface, VARIANT dest) @@ -575,7 +548,7 @@ static HRESULT WINAPI mxwriter_flush(IMXWriter *iface) return flush_output_buffer(This); } -static const struct IMXWriterVtbl mxwriter_vtbl = +static const struct IMXWriterVtbl MXWriterVtbl = { mxwriter_QueryInterface, mxwriter_AddRef, @@ -897,20 +870,32 @@ static const struct ISAXContentHandlerVtbl mxwriter_saxcontent_vtbl = mxwriter_saxcontent_skippedEntity }; -HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *pUnkOuter, void **ppObj) +static const tid_t mxwriter_iface_tids[] = { + IMXWriter_tid, + 0 +}; + +static dispex_static_data_t mxwriter_dispex = { + NULL, + IMXWriter_tid, + NULL, + mxwriter_iface_tids +}; + +HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *outer, void **ppObj) { static const WCHAR version10W[] = {'1','.','0',0}; mxwriter *This; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); + TRACE("(%p, %p)\n", outer, ppObj); - if (pUnkOuter) FIXME("support aggregation, outer\n"); + if (outer) FIXME("support aggregation, outer\n"); This = heap_alloc( sizeof (*This) ); if(!This) return E_OUTOFMEMORY; - This->IMXWriter_iface.lpVtbl = &mxwriter_vtbl; + This->IMXWriter_iface.lpVtbl = &MXWriterVtbl; This->ISAXContentHandler_iface.lpVtbl = &mxwriter_saxcontent_vtbl; This->ref = 1; This->class_version = version; @@ -931,6 +916,8 @@ HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *pUnkOuter, void **ppObj This->buffer = xmlAllocOutputBuffer(xmlGetCharEncodingHandler(This->encoding)); + init_dispex(&This->dispex, (IUnknown*)&This->IMXWriter_iface, &mxwriter_dispex); + *ppObj = &This->IMXWriter_iface; TRACE("returning iface %p\n", *ppObj); @@ -940,7 +927,7 @@ HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *pUnkOuter, void **ppObj #else -HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *pUnkOuter, void **obj) +HRESULT MXWriter_create(MSXML_VERSION version, IUnknown *outer, void **obj) { MESSAGE("This program tried to use a MXXMLWriter object, but\n" "libxml2 support was not present at compile time.\n"); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index fbb1bd2..e59c13b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2672,6 +2672,27 @@ static void test_dispex(void) ISAXXMLReader_Release(reader); } +static void test_mxwriter_dispex(void) +{ + IDispatchEx *dispex; + IMXWriter *writer; + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_IDispatchEx, (void**)&dispex); + EXPECT_HR(hr, S_OK); + hr = IDispatchEx_QueryInterface(dispex, &IID_IUnknown, (void**)&unk); + test_obj_dispex(unk); + IUnknown_Release(unk); + IDispatchEx_Release(dispex); + + IMXWriter_Release(writer); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -2711,6 +2732,7 @@ START_TEST(saxreader) test_mxwriter_flush(); test_mxwriter_stream(); test_mxwriter_encoding(); + test_mxwriter_dispex(); } else win_skip("MXXMLWriter not supported\n");

1 0