December 2011 - Wine-commits

Alexandre Julliard : user32: Don' t try to alpha blend icons on low color bitmaps.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 430c8aa9101317777e99a15c4d2c2b97329136e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=430c8aa9101317777e99a15c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 14:20:56 2011 +0100 user32: Don't try to alpha blend icons on low color bitmaps. --- dlls/user32/cursoricon.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 4ae7098..d8068d8 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2288,15 +2288,15 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, if (frame->alpha && (flags & DI_IMAGE)) { - BOOL is_mono = FALSE; + BOOL alpha_blend = TRUE; if (GetObjectType( hdc_dest ) == OBJ_MEMDC) { BITMAP bm; HBITMAP bmp = GetCurrentObject( hdc_dest, OBJ_BITMAP ); - is_mono = GetObjectW( bmp, sizeof(bm), &bm ) && bm.bmBitsPixel == 1; + alpha_blend = GetObjectW( bmp, sizeof(bm), &bm ) && bm.bmBitsPixel > 8; } - if (!is_mono) + if (alpha_blend) { BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; SelectObject( hMemDC, frame->alpha );

1 0

Alexandre Julliard : oleaut32: Fix IPicture:: SelectPicture to not try to select a bitmap into two DCs at the same time.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 1e0ab160697ddf8162c82854904adf293d581431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0ab160697ddf8162c828549… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 16 16:29:12 2011 +0100 oleaut32: Fix IPicture::SelectPicture to not try to select a bitmap into two DCs at the same time. --- dlls/oleaut32/olepicture.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 8081785..2195ba5 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -141,6 +141,7 @@ typedef struct OLEPictureImpl { BOOL keepOrigFormat; HDC hDCCur; + HBITMAP stock_bitmap; /* Bitmap transparency mask */ HBITMAP hbmMask; @@ -219,6 +220,7 @@ static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This) This->himetricWidth = xpixels_to_himetric(bm.bmWidth, hdcRef); This->himetricHeight = ypixels_to_himetric(bm.bmHeight, hdcRef); + This->stock_bitmap = GetCurrentObject( hdcRef, OBJ_BITMAP ); DeleteDC(hdcRef); } @@ -769,10 +771,10 @@ static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface, OLEPictureImpl *This = impl_from_IPicture(iface); TRACE("(%p)->(%p, %p, %p)\n", This, hdcIn, phdcOut, phbmpOut); if (This->desc.picType == PICTYPE_BITMAP) { - SelectObject(hdcIn,This->desc.u.bmp.hbitmap); - if (phdcOut) *phdcOut = This->hDCCur; + if (This->hDCCur) SelectObject(This->hDCCur,This->stock_bitmap); + if (hdcIn) SelectObject(hdcIn,This->desc.u.bmp.hbitmap); This->hDCCur = hdcIn; if (phbmpOut) *phbmpOut = HandleToUlong(This->desc.u.bmp.hbitmap);

1 0

Francois Gouget : taskmgr: Remove unneeded and untranslatable widget labels .
by Alexandre Julliard 16 Dec '11

16 Dec '11

1 0

Francois Gouget : windowscodecs: Avoid hardcoding the Unicode string literal lengths.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 268d364e1f0b1b0c4ecd3d5df7f46b7096875c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=268d364e1f0b1b0c4ecd3d5df… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 16 13:06:31 2011 +0100 windowscodecs: Avoid hardcoding the Unicode string literal lengths. --- dlls/windowscodecs/regsvr.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index bc12e40..9b7baea 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -99,19 +99,19 @@ static HRESULT unregister_converters(struct regsvr_converter const *list); /*********************************************************************** * static string constants */ -static WCHAR const clsid_keyname[6] = { +static WCHAR const clsid_keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; -static WCHAR const curver_keyname[7] = { +static WCHAR const curver_keyname[] = { 'C', 'u', 'r', 'V', 'e', 'r', 0 }; -static WCHAR const ips_keyname[13] = { +static WCHAR const ips_keyname[] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', 0 }; -static WCHAR const ips32_keyname[15] = { +static WCHAR const ips32_keyname[] = { 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', '3', '2', 0 }; -static WCHAR const progid_keyname[7] = { +static WCHAR const progid_keyname[] = { 'P', 'r', 'o', 'g', 'I', 'D', 0 }; -static WCHAR const viprogid_keyname[25] = { +static WCHAR const viprogid_keyname[] = { 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', 0 };

1 0

Nikolay Sivov : msxml3: Remove redundant type specifiers.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: f999f4ae69dc4788723ca803e558b8e2865aaa2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f999f4ae69dc4788723ca803e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 16 14:33:32 2011 +0300 msxml3: Remove redundant type specifiers. --- dlls/msxml3/saxreader.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 6765aef..924a979 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); #ifdef HAVE_LIBXML2 -enum ReaderFeatures +typedef enum { ExhaustiveErrors = 1 << 1, ExternalGeneralEntities = 1 << 2, @@ -66,7 +66,7 @@ enum ReaderFeatures UseInlineSchema = 1 << 13, UseSchemaLocation = 1 << 14, LexicalHandlerParEntities = 1 << 15 -}; +} saxreader_features; struct bstrpool { @@ -75,28 +75,28 @@ struct bstrpool unsigned int len; }; -typedef struct _saxreader +typedef struct { DispatchEx dispex; IVBSAXXMLReader IVBSAXXMLReader_iface; ISAXXMLReader ISAXXMLReader_iface; LONG ref; - struct ISAXContentHandler *contentHandler; - struct IVBSAXContentHandler *vbcontentHandler; - struct ISAXErrorHandler *errorHandler; - struct IVBSAXErrorHandler *vberrorHandler; - struct ISAXLexicalHandler *lexicalHandler; - struct IVBSAXLexicalHandler *vblexicalHandler; - struct ISAXDeclHandler *declHandler; - struct IVBSAXDeclHandler *vbdeclHandler; + ISAXContentHandler *contentHandler; + IVBSAXContentHandler *vbcontentHandler; + ISAXErrorHandler *errorHandler; + IVBSAXErrorHandler *vberrorHandler; + ISAXLexicalHandler *lexicalHandler; + IVBSAXLexicalHandler *vblexicalHandler; + ISAXDeclHandler *declHandler; + IVBSAXDeclHandler *vbdeclHandler; xmlSAXHandler sax; BOOL isParsing; struct bstrpool pool; - enum ReaderFeatures features; + saxreader_features features; MSXML_VERSION version; } saxreader; -typedef struct _saxlocator +typedef struct { IVBSAXLocator IVBSAXLocator_iface; ISAXLocator ISAXLocator_iface; @@ -231,7 +231,7 @@ static const WCHAR FeatureNamespacesW[] = { '/','n','a','m','e','s','p','a','c','e','s',0 }; -static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL value) +static inline HRESULT set_feature_value(saxreader *reader, saxreader_features feature, VARIANT_BOOL value) { if (value == VARIANT_TRUE) reader->features |= feature; @@ -241,7 +241,7 @@ static inline HRESULT set_feature_value(saxreader *reader, enum ReaderFeatures f return S_OK; } -static inline HRESULT get_feature_value(const saxreader *reader, enum ReaderFeatures feature, VARIANT_BOOL *value) +static inline HRESULT get_feature_value(const saxreader *reader, saxreader_features feature, VARIANT_BOOL *value) { *value = reader->features & feature ? VARIANT_TRUE : VARIANT_FALSE; return S_OK;

1 0

Jacek Caban : jscript: Use bytecode for function expression implementation.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: b268e41da6367ea6cb9b24b4450ee94ddb6222a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b268e41da6367ea6cb9b24b44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:42:57 2011 +0100 jscript: Use bytecode for function expression implementation. --- dlls/jscript/compile.c | 17 +++++++++++++++++ dlls/jscript/engine.c | 30 ++++++++++-------------------- dlls/jscript/engine.h | 4 +++- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 6 ++++++ dlls/jscript/tests/run.c | 2 ++ 6 files changed, 39 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 9718c69..9331910 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -646,6 +646,21 @@ static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expressi return push_instr_uint(ctx, OP_carray, elem_cnt); } +static HRESULT compile_function_expression(compiler_ctx_t *ctx, function_expression_t *expr) +{ + unsigned instr; + + /* FIXME: not exactly right */ + if(expr->identifier) + return push_instr_bstr(ctx, OP_ident, expr->identifier); + + instr = push_instr(ctx, OP_func); + if(instr == -1) + return E_OUTOFMEMORY; + + instr_ptr(ctx, instr)->arg1.func = expr; + return S_OK; +} static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, BOOL *no_ret) { @@ -702,6 +717,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq); case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); + case EXPR_FUNC: + return compile_function_expression(ctx, (function_expression_t*)expr); case EXPR_GREATER: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt); case EXPR_GREATEREQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 98e4158..23f457d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1420,32 +1420,22 @@ HRESULT try_statement_eval(script_ctx_t *ctx, statement_t *_stat, return_type_t } /* ECMA-262 3rd Edition 13 */ -HRESULT function_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_func(exec_ctx_t *ctx) { - function_expression_t *expr = (function_expression_t*)_expr; - VARIANT var; + function_expression_t *expr = ctx->parser->code->instrs[ctx->ip].arg1.func; + jsdisp_t *dispex; + VARIANT v; HRESULT hres; TRACE("\n"); - if(expr->identifier) { - hres = jsdisp_propget_name(ctx->exec_ctx->var_disp, expr->identifier, &var, ei, NULL/*FIXME*/); - if(FAILED(hres)) - return hres; - }else { - jsdisp_t *dispex; - - hres = create_source_function(ctx->exec_ctx->parser, expr->parameter_list, expr->source_elements, ctx->exec_ctx->scope_chain, - expr->src_str, expr->src_len, &dispex); - if(FAILED(hres)) - return hres; - - var_set_jsdisp(&var, dispex); - } + hres = create_source_function(ctx->parser, expr->parameter_list, expr->source_elements, ctx->scope_chain, + expr->src_str, expr->src_len, &dispex); + if(FAILED(hres)) + return hres; - ret->type = EXPRVAL_VARIANT; - ret->u.var = var; - return S_OK; + var_set_jsdisp(&v, dispex); + return stack_push(ctx, &v); } /* ECMA-262 3rd Edition 11.2.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 2cea63d..fcdc093 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -57,6 +57,7 @@ typedef struct _func_stack { X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ + X(func, 1, ARG_FUNC, 0) \ X(gt, 1, 0,0) \ X(gteq, 1, 0,0) \ X(ident, 1, ARG_BSTR, 0) \ @@ -117,6 +118,7 @@ typedef union { LONG lng; WCHAR *str; unsigned uint; + function_expression_t *func; /* FIXME */ } instr_arg_t; typedef enum { @@ -124,6 +126,7 @@ typedef enum { ARG_ADDR, ARG_BSTR, ARG_EXPR, + ARG_FUNC, ARG_INT, ARG_STR } instr_arg_type_t; @@ -565,7 +568,6 @@ typedef struct { prop_val_t *property_list; } property_value_expression_t; -HRESULT function_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT property_value_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 c791e9c..41481ab 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1357,7 +1357,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - function_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, property_value_expression_eval, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 165e70e..13c90fa 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1110,6 +1110,12 @@ ok(newValue === 1, "newValue = " + newValue); obj = {undefined: 3}; +ok(typeof(name_override_func) === "function", "typeof(name_override_func) = " + typeof(name_override_func)); +name_override_func = 3; +ok(name_override_func === 3, "name_override_func = " + name_override_func); +function name_override_func() {}; +ok(name_override_func === 3, "name_override_func = " + name_override_func); + /* Keep this test in the end of file */ undefined = 6; ok(undefined === 6, "undefined = " + undefined); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 890809c..5626bd8 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1487,6 +1487,8 @@ static void run_tests(void) CHECK_CALLED(global_propdelete_d); CHECK_CALLED(DeleteMemberByDispID); + parse_script_a("(function reportSuccess() {})()"); + parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");"); parse_script_a("function reportSuccess() {}; reportSuccess();");

1 0

Jacek Caban : jscript: Use bytecode for object literal implementation.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 5e6faaea12130b61641f0d2efd3c81fd68f7faa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6faaea12130b61641f0d2ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:43:31 2011 +0100 jscript: Use bytecode for object literal implementation. --- dlls/jscript/compile.c | 49 ++++++++++++++++++++++++ dlls/jscript/dispex.c | 8 ++++ dlls/jscript/engine.c | 98 ++++++++++-------------------------------------- dlls/jscript/engine.h | 4 +- dlls/jscript/jscript.h | 5 ++ dlls/jscript/jsutils.c | 47 ++++++++++++++--------- dlls/jscript/parser.y | 2 +- 7 files changed, 113 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e6faaea12130b61641f0…

1 0

Jacek Caban : jscript: Get rid of no longer needed expression eval entry.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: fecc2fcb5ef22e5b1f75010a3990a47f0169d53c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fecc2fcb5ef22e5b1f75010a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:44:03 2011 +0100 jscript: Get rid of no longer needed expression eval entry. --- dlls/jscript/compile.c | 1 - dlls/jscript/engine.c | 15 +++++------ dlls/jscript/engine.h | 3 -- dlls/jscript/parser.y | 63 +----------------------------------------------- 4 files changed, 8 insertions(+), 74 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index daa1846..f2e2ead 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -829,7 +829,6 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, case EXPR_BXOR: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); default: - assert(expr->eval != compiled_expression_eval); return compile_interp_fallback(ctx, expr); } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 210cdf7..424659f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -56,7 +56,7 @@ static inline HRESULT stat_eval(script_ctx_t *ctx, statement_t *stat, return_typ static inline HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { - return expr->eval(ctx, expr, flags, ei, ret); + return compiled_expression_eval(ctx, expr, flags, ei, ret); } static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) @@ -3168,12 +3168,11 @@ HRESULT compiled_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD fl TRACE("\n"); - hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); - if(FAILED(hres)) - return hres; - - if(expr->eval == compiled_expression_eval) - expr->eval = interp_expression_eval; + if(expr->instr_off == -1) { + hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); + if(FAILED(hres)) + return hres; + } - return expr->eval(ctx, expr, flags, ei, ret); + return interp_expression_eval(ctx, expr, flags, ei, ret); } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 6c1acad..323e9e3 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -469,11 +469,8 @@ typedef enum { EXPR_LITERAL } expression_type_t; -typedef HRESULT (*expression_eval_t)(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); - struct _expression_t { expression_type_t type; - expression_eval_t eval; unsigned instr_off; }; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index ab5ebff..1524713 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1303,73 +1303,12 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide return &ret->expr; } -static const expression_eval_t expression_eval_table[] = { - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval, - compiled_expression_eval -}; - static void *new_expression(parser_ctx_t *ctx, expression_type_t type, size_t size) { expression_t *ret = parser_alloc(ctx, size ? size : sizeof(*ret)); ret->type = type; - ret->eval = expression_eval_table[type]; + ret->instr_off = -1; return ret; }

1 0

Jacek Caban : jscript: Invoke bytecode directly from expr_eval.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 6b1077e2cbf4462f7b3e721993db9411f77a22b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b1077e2cbf4462f7b3e72199… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:44:27 2011 +0100 jscript: Invoke bytecode directly from expr_eval. --- dlls/jscript/engine.c | 28 ++++++++-------------------- dlls/jscript/engine.h | 2 -- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 424659f..00035f9 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -54,10 +54,7 @@ static inline HRESULT stat_eval(script_ctx_t *ctx, statement_t *stat, return_typ return stat->eval(ctx, stat, rt, ret); } -static inline HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - return compiled_expression_eval(ctx, expr, flags, ei, ret); -} +static HRESULT expr_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*); static HRESULT stack_push(exec_ctx_t *ctx, VARIANT *v) { @@ -3122,7 +3119,7 @@ OP_LIST #undef X }; -static HRESULT interp_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT expr_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) { exec_ctx_t *exec_ctx = ctx->exec_ctx; unsigned prev_ip, prev_top; @@ -3131,6 +3128,12 @@ static HRESULT interp_expression_eval(script_ctx_t *ctx, expression_t *expr, DWO TRACE("\n"); + if(expr->instr_off == -1) { + hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); + if(FAILED(hres)) + return hres; + } + prev_top = exec_ctx->top; prev_ip = exec_ctx->ip; exec_ctx->ip = expr->instr_off; @@ -3161,18 +3164,3 @@ static HRESULT interp_expression_eval(script_ctx_t *ctx, expression_t *expr, DWO ret->u.var = *stack_pop(exec_ctx); return S_OK; } - -HRESULT compiled_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - HRESULT hres; - - TRACE("\n"); - - if(expr->instr_off == -1) { - hres = compile_subscript(ctx->exec_ctx->parser, expr, !(flags & EXPR_NOVAL), &expr->instr_off); - if(FAILED(hres)) - return hres; - } - - return interp_expression_eval(ctx, expr, flags, ei, ret); -} diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 323e9e3..5ff5933 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -567,6 +567,4 @@ typedef struct { prop_val_t *property_list; } property_value_expression_t; -HRESULT compiled_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; - HRESULT compile_subscript(parser_ctx_t*,expression_t*,BOOL,unsigned*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : jscript: Return VARIANT directly from expr_eval.
by Alexandre Julliard 16 Dec '11

16 Dec '11

Module: wine Branch: master Commit: 47fa932ac05ac32c7028e292d732593faa821835 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47fa932ac05ac32c7028e292d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 16 11:45:37 2011 +0100 jscript: Return VARIANT directly from expr_eval. --- dlls/jscript/engine.c | 165 ++++++++++-------------------------------------- 1 files changed, 35 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47fa932ac05ac32c7028e…

1 0