November 2011 - Wine-Commits

Alexandre Julliard : gdi32: Implement 8-bpp and 4-bpp gradient dithering.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: a869fc47bd1147f3f33d8431d32b644b60361462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a869fc47bd1147f3f33d8431d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 29 14:22:59 2011 +0100 gdi32: Implement 8-bpp and 4-bpp gradient dithering. --- dlls/gdi32/dibdrv/primitives.c | 99 ++++++++++++++++++++++++--------------- 1 files changed, 61 insertions(+), 38 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 00213de..5938a1b 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -4015,6 +4015,34 @@ static inline WORD gradient_rgb_555( const TRIVERTEX *v, unsigned int pos, unsig return (r << 10) | (g << 5) | b; } +static inline BYTE gradient_rgb_8( const dib_info *dib, const TRIVERTEX *v, + unsigned int pos, unsigned int len, unsigned int x, unsigned int y ) +{ + static const BYTE matrix[16][16] = + { + { 0, 128, 32, 160, 8, 136, 40, 168, 2, 130, 34, 162, 10, 138, 42, 170 }, + { 192, 64, 224, 96, 200, 72, 232, 104, 194, 66, 226, 98, 202, 74, 234, 106 }, + { 48, 176, 16, 144, 56, 184, 24, 152, 50, 178, 18, 146, 58, 186, 26, 154 }, + { 240, 112, 208, 80, 248, 120, 216, 88, 242, 114, 210, 82, 250, 122, 218, 90 }, + { 12, 140, 44, 172, 4, 132, 36, 164, 14, 142, 46, 174, 6, 134, 38, 166 }, + { 204, 76, 236, 108, 196, 68, 228, 100, 206, 78, 238, 110, 198, 70, 230, 102 }, + { 60, 188, 28, 156, 52, 180, 20, 148, 62, 190, 30, 158, 54, 182, 22, 150 }, + { 252, 124, 220, 92, 244, 116, 212, 84, 254, 126, 222, 94, 246, 118, 214, 86 }, + { 3, 131, 35, 163, 11, 139, 43, 171, 1, 129, 33, 161, 9, 137, 41, 169 }, + { 195, 67, 227, 99, 203, 75, 235, 107, 193, 65, 225, 97, 201, 73, 233, 105 }, + { 51, 179, 19, 147, 59, 187, 27, 155, 49, 177, 17, 145, 57, 185, 25, 153 }, + { 243, 115, 211, 83, 251, 123, 219, 91, 241, 113, 209, 81, 249, 121, 217, 89 }, + { 15, 143, 47, 175, 7, 135, 39, 167, 13, 141, 45, 173, 5, 133, 37, 165 }, + { 207, 79, 239, 111, 199, 71, 231, 103, 205, 77, 237, 109, 197, 69, 229, 101 }, + { 63, 191, 31, 159, 55, 183, 23, 151, 61, 189, 29, 157, 53, 181, 21, 149 }, + { 255, 127, 223, 95, 247, 119, 215, 87, 253, 125, 221, 93, 245, 117, 213, 85 }, + }; + BYTE r = ((v[0].Red * (len - pos) + v[1].Red * pos) / len / 128 + matrix[y % 16][x % 16]) / 256; + BYTE g = ((v[0].Green * (len - pos) + v[1].Green * pos) / len / 128 + matrix[y % 16][x % 16]) / 256; + BYTE b = ((v[0].Blue * (len - pos) + v[1].Blue * pos) / len / 128 + matrix[y % 16][x % 16]) / 256; + return rgb_to_pixel_colortable( dib, r * 127, g * 127, b * 127 ); +} + static void gradient_rect_8888( const dib_info *dib, const RECT *rc, const TRIVERTEX *v, int mode ) { DWORD *ptr = get_pixel_ptr_32( dib, rc->left, rc->top ); @@ -4196,29 +4224,26 @@ static void gradient_rect_16( const dib_info *dib, const RECT *rc, const TRIVERT static void gradient_rect_8( const dib_info *dib, const RECT *rc, const TRIVERTEX *v, int mode ) { - BYTE *ptr = get_pixel_ptr_8( dib, rc->left, rc->top ); + BYTE *ptr = get_pixel_ptr_8( dib, 0, rc->top ); int x, y; switch (mode) { case GRADIENT_FILL_RECT_H: - for (x = 0; x < rc->right - rc->left; x++) - { - DWORD val = gradient_rgb_24( v, x + rc->left - v[0].x, v[1].x - v[0].x ); - ptr[x] = rgb_lookup_colortable( dib, val >> 16, val >> 8, val ); - } - - for (y = rc->top + 1; y < rc->bottom; y++, ptr += dib->stride) - memcpy( ptr + dib->stride, ptr, rc->right - rc->left ); + for (y = rc->top; y < min( rc->top + 16, rc->bottom ); y++, ptr += dib->stride) + for (x = rc->left; x < rc->right; x++) + ptr[x] = gradient_rgb_8( dib, v, x - v[0].x, v[1].x - v[0].x, x, y ); + for (ptr += rc->left; y < rc->bottom; y++, ptr += dib->stride) + memcpy( ptr, ptr - dib->stride * 16, rc->right - rc->left ); break; case GRADIENT_FILL_RECT_V: - for (y = rc->top; y < rc->bottom; y++) + for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride) { - DWORD val = gradient_rgb_24( v, y - v[0].y, v[1].y - v[0].y ); - val = rgb_lookup_colortable( dib, val >> 16, val >> 8, val ); - for (x = 0; x < rc->right - rc->left; x++) ptr[x] = val; - ptr += dib->stride; + BYTE values[16]; + for (x = 0; x < 16; x++) + values[x] = gradient_rgb_8( dib, v, y - v[0].y, v[1].y - v[0].y, x, y ); + for (x = rc->left; x < rc->right; x++) ptr[x] = values[x % 16]; } break; } @@ -4232,44 +4257,42 @@ static void gradient_rect_4( const dib_info *dib, const RECT *rc, const TRIVERTE switch (mode) { case GRADIENT_FILL_RECT_H: - for (x = rc->left; x < rc->right; x++) + for (y = rc->top; y < min( rc->top + 16, rc->bottom ); y++, ptr += dib->stride) { - DWORD val = gradient_rgb_24( v, x - v[0].x, v[1].x - v[0].x ); - val = rgb_lookup_colortable( dib, val >> 16, val >> 8, val ); - if (x & 1) - ptr[x / 2] = val | (ptr[x / 2] & 0xf0); - else - ptr[x / 2] = (val << 4) | (ptr[x / 2] & 0x0f); + for (x = rc->left; x < rc->right; x++) + { + BYTE val = gradient_rgb_8( dib, v, x - v[0].x, v[1].x - v[0].x, x, y ); + if (x & 1) + ptr[x / 2] = val | (ptr[x / 2] & 0xf0); + else + ptr[x / 2] = (val << 4) | (ptr[x / 2] & 0x0f); + } } - - for (y = rc->top + 1; y < rc->bottom; y++, ptr += dib->stride) + for ( ; y < rc->bottom; y++, ptr += dib->stride) { x = rc->left; if (x & 1) { - ptr[dib->stride + x / 2] = (ptr[x / 2] & 0x0f) | (ptr[dib->stride + x / 2] & 0xf0); + ptr[x / 2] = (ptr[x / 2 - 16 * dib->stride] & 0x0f) | (ptr[x / 2] & 0xf0); x++; } - for (; x < rc->right - 1; x += 2) ptr[dib->stride + x / 2] = ptr[x / 2]; + for (; x < rc->right - 1; x += 2) ptr[x / 2] = ptr[x / 2 - 16 * dib->stride]; if (x < rc->right) - ptr[dib->stride + x / 2] = (ptr[dib->stride + x / 2] & 0x0f) | (ptr[x / 2] & 0xf0); + ptr[x / 2] = (ptr[x / 2] & 0x0f) | (ptr[x / 2 - 16 * dib->stride] & 0xf0); } break; case GRADIENT_FILL_RECT_V: - for (y = rc->top; y < rc->bottom; y++) + for (y = rc->top; y < rc->bottom; y++, ptr += dib->stride) { - DWORD val = gradient_rgb_24( v, y - v[0].y, v[1].y - v[0].y ); - val = rgb_lookup_colortable( dib, val >> 16, val >> 8, val ); - x = rc->left; - if (x & 1) - { - ptr[x / 2] = val | (ptr[x / 2] & 0xf0); - x++; - } - for (; x < rc->right - 1; x += 2) ptr[x / 2] = (val << 4) | val; - if (x < rc->right) ptr[x / 2] = (ptr[x / 2] & 0x0f) | (val << 4); - ptr += dib->stride; + BYTE values[16]; + for (x = 0; x < 16; x++) + values[x] = gradient_rgb_8( dib, v, y - v[0].y, v[1].y - v[0].y, x, y ); + for (x = rc->left; x < rc->right; x++) + if (x & 1) + ptr[x / 2] = values[x % 16] | (ptr[x / 2] & 0xf0); + else + ptr[x / 2] = (values[x % 16] << 4) | (ptr[x / 2] & 0x0f); } break; }

1 0

Alexandre Julliard : gdi32: Implement rectangular gradients in the DIB engine.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: e19a362407a4f57f6389e8f5a40dd3b7f5a03c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e19a362407a4f57f6389e8f5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 28 13:21:52 2011 +0100 gdi32: Implement rectangular gradients in the DIB engine. --- dlls/gdi32/dibdrv/bitblt.c | 77 ++++++++++ dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 3 + dlls/gdi32/dibdrv/primitives.c | 326 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 407 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e19a362407a4f57f6389e…

1 0

Francois Gouget : cmd/tests: Standardize the batch file section headers.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 128d0656de78c6c850e4774ad3fad64a06f54cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=128d0656de78c6c850e4774ad… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 29 11:45:51 2011 +0100 cmd/tests: Standardize the batch file section headers. --- programs/cmd/tests/test_builtins.cmd | 52 +++++++++++++++--------------- programs/cmd/tests/test_builtins.cmd.exp | 52 +++++++++++++++--------------- 2 files changed, 52 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=128d0656de78c6c850e47…

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetBool().
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 4b42b1130357f8f4674fce36db50a71a7c3c6564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b42b1130357f8f4674fce36d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 29 10:04:10 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetBool(). --- dlls/d3dx9_36/effect.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 619d184..c2be558 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1656,10 +1656,19 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL b) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, b %u stub\n", This, parameter, b); + TRACE("iface %p, parameter %p, b %s\n", This, parameter, b ? "TRUE" : "FALSE"); - return E_NOTIMPL; + if (param && !param->element_count && param->rows == 1 && param->columns == 1) + { + set_number(param->data, param->type, &b, D3DXPT_BOOL); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetBool(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL *b)

1 0

Eric Pouech : cmd: Correctly parse program name when launching external processes.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 6faea5a606c6cea586c3f4878f6b7fc9347341cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6faea5a606c6cea586c3f4878… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 28 22:09:07 2011 +0100 cmd: Correctly parse program name when launching external processes. --- programs/cmd/wcmdmain.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5bcdbca..0811cd1 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -978,7 +978,12 @@ void WCMD_run_program (WCHAR *command, int called) { static const WCHAR envPathExt[] = {'P','A','T','H','E','X','T','\0'}; static const WCHAR delims[] = {'/','\\',':','\0'}; - WCMD_parse (command, quals, param1, param2); /* Quick way to get the filename */ + /* Quick way to get the filename + * (but handle leading / as part of program name, not qualifier) + */ + for (len = 0; command[len] == '/'; len++) param1[len] = '/'; + WCMD_parse (command + len, quals, param1 + len, param2); + if (!(*param1) && !(*param2)) return;

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_CACHEUTILIZATION.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: a84454aabb6c1eaabf15e6b0548711c0b74418cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84454aabb6c1eaabf15e6b05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 28 21:31:01 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_CACHEUTILIZATION. --- include/wine/wined3d.h | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 88fd0de..1ee94b7 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1692,12 +1692,6 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DDEVINFO_CACHEUTILIZATION -{ - float TextureCacheHitRate; - float PostTransformVertexCacheHitRate; -} WINED3DDEVINFO_CACHEUTILIZATION; - typedef struct _WINED3DDEVINFO_INTERFACETIMINGS { float WaitingForGPUToUseApplicationResourceTimePercent;

1 0

Jacek Caban : jscript: Use bytecode for binary xor expressions.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 0505e03b570fbdc27f97f605375adfa4338581b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0505e03b570fbdc27f97f6053… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 29 11:09:49 2011 +0100 jscript: Use bytecode for binary xor expressions. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 15 ++++++++++++--- dlls/jscript/engine.h | 4 ++-- dlls/jscript/parser.y | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 7520756..b7abdda 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -388,6 +388,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_this) == -1 ? E_OUTOFMEMORY : S_OK; case EXPR_VOID: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_void); + 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 16a3a06..2d766e4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2061,13 +2061,22 @@ static HRESULT xor_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.10 */ -HRESULT binary_xor_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_xor(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + INT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, xor_eval, ei, ret); + hres = stack_pop_int(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_int(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_int(ctx, l^r); } /* ECMA-262 3rd Edition 11.10 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 6ac6d23..58f12c7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -72,7 +72,8 @@ typedef struct _func_stack { X(tree, 1, ARG_EXPR, 0) \ X(ret, 0, 0,0) \ X(sub, 1, 0,0) \ - X(void, 1, 0,0) + X(void, 1, 0,0) \ + X(xor, 1, 0,0) typedef enum { #define X(x,a,b,c) OP_##x, @@ -555,7 +556,6 @@ HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT array_literal_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 binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_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 fecde80..0912107 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1309,7 +1309,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - binary_xor_expression_eval, + compiled_expression_eval, binary_and_expression_eval, instanceof_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '/' expression implementation.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 09306e434e97e9290ff916f27d114190357eb280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09306e434e97e9290ff916f27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 29 11:09:04 2011 +0100 jscript: Use bytecode for '/' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 15 ++++++++++++--- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index a529fe7..8608bbe 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -350,6 +350,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_comma_expression(ctx, (binary_expression_t*)expr); case EXPR_COND: return compile_conditional_expression(ctx, (conditional_expression_t*)expr); + case EXPR_DIV: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_div); case EXPR_EQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq); case EXPR_EQEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5e60381..97f19b5 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2360,13 +2360,22 @@ static HRESULT div_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.5.2 */ -HRESULT div_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_div(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, div_eval, ei, ret); + hres = stack_pop_number(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_number(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_number(ctx, num_val(&l)/num_val(&r)); } /* ECMA-262 3rd Edition 11.5.3 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 120bf42..f481a69 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -45,6 +45,7 @@ typedef struct _func_stack { X(add, 1, 0,0) \ X(bool, 1, ARG_INT, 0) \ X(bneg, 1, 0,0) \ + X(div, 1, 0,0) \ X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ @@ -556,7 +557,6 @@ HRESULT binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*, HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mod_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_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 9b72d7f..79ecb12 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1316,7 +1316,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - div_expression_eval, + compiled_expression_eval, mod_expression_eval, delete_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for binary or implementation.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 96b13314eb450a98dd1360e2d98f1a46e49b3485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b13314eb450a98dd1360e2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 29 11:09:35 2011 +0100 jscript: Use bytecode for binary or implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 29 ++++++++++++++++++++++++++--- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 4793fa3..7520756 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -346,6 +346,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_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: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_or); case EXPR_COMMA: return compile_comma_expression(ctx, (binary_expression_t*)expr); case EXPR_COND: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1cdc4d0..16a3a06 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -94,6 +94,15 @@ static inline HRESULT stack_push_number(exec_ctx_t *ctx, double number) return stack_push(ctx, &v); } +static inline HRESULT stack_push_int(exec_ctx_t *ctx, INT n) +{ + VARIANT v; + + V_VT(&v) = VT_I4; + V_I4(&v) = n; + return stack_push(ctx, &v); +} + static inline VARIANT *stack_top(exec_ctx_t *ctx) { assert(ctx->top); @@ -129,6 +138,11 @@ static HRESULT stack_pop_number(exec_ctx_t *ctx, VARIANT *r) return hres; } +static inline HRESULT stack_pop_int(exec_ctx_t *ctx, INT *r) +{ + return to_int32(ctx->parser->script, stack_pop(ctx), &ctx->ei, r); +} + static void exprval_release(exprval_t *val) { switch(val->type) { @@ -2009,13 +2023,22 @@ static HRESULT bitor_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexc } /* ECMA-262 3rd Edition 11.10 */ -HRESULT binary_or_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_or(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + INT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, bitor_eval, ei, ret); + hres = stack_pop_int(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_int(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_int(ctx, l|r); } /* ECMA-262 3rd Edition 11.10 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 5ef2002..6ac6d23 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -63,6 +63,7 @@ typedef struct _func_stack { X(neq2, 1, 0,0) \ X(new, 1, ARG_INT, 0) \ X(null, 1, 0,0) \ + X(or, 1, 0,0) \ X(pop, 1, 0,0) \ X(regexp, 1, ARG_STR, ARG_INT) \ X(str, 1, ARG_STR, 0) \ @@ -554,7 +555,6 @@ HRESULT identifier_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT array_literal_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 binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_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 36f8f19..fecde80 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1308,7 +1308,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - binary_or_expression_eval, + compiled_expression_eval, binary_xor_expression_eval, binary_and_expression_eval, instanceof_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for modulo expression implementation.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 7a20965bd28dd915b971a0357d103de35b0f25d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a20965bd28dd915b971a0357… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 29 11:09:20 2011 +0100 jscript: Use bytecode for modulo expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 15 ++++++++++++--- dlls/jscript/engine.h | 3 +-- dlls/jscript/parser.y | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8608bbe..4793fa3 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -366,6 +366,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_MINUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_minus); + case EXPR_MOD: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mod); case EXPR_MUL: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mul); case EXPR_NEW: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 97f19b5..1cdc4d0 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2397,13 +2397,22 @@ static HRESULT mod_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.5.3 */ -HRESULT mod_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_mod(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, mod_eval, ei, ret); + hres = stack_pop_number(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_number(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_number(ctx, fmod(num_val(&l), num_val(&r))); } /* ECMA-262 3rd Edition 11.4.2 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f481a69..5ef2002 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -56,6 +56,7 @@ typedef struct _func_stack { X(jmp_nz, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ X(minus, 1, 0,0) \ + X(mod, 1, 0,0) \ X(mul, 1, 0,0) \ X(neg, 1, 0,0) \ X(neq, 1, 0,0) \ @@ -557,10 +558,8 @@ HRESULT binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*, HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT mod_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT minus_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_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 79ecb12..36f8f19 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1317,7 +1317,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - mod_expression_eval, + compiled_expression_eval, delete_expression_eval, compiled_expression_eval, typeof_expression_eval,

1 0