September 2012 - Wine-Commits

Jacek Caban : jscript: Always use jsval-based to_number implementation.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 0bab034faceead6fafacf643ca5e908744d46df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bab034faceead6fafacf643c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:18:20 2012 +0200 jscript: Always use jsval-based to_number implementation. --- dlls/jscript/array.c | 8 ++-- dlls/jscript/date.c | 84 +++++++++++++++++----------------- dlls/jscript/engine.c | 20 ++++---- dlls/jscript/error.c | 2 +- dlls/jscript/global.c | 4 +- dlls/jscript/jscript.h | 4 +- dlls/jscript/jsutils.c | 118 ++++++++++++++++------------------------------- dlls/jscript/math.c | 42 +++++++++--------- dlls/jscript/number.c | 4 +- dlls/jscript/regexp.c | 2 +- 10 files changed, 124 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bab034faceead6fafacf…

1 0

Henri Verbeet : wined3d: Recognize the SM4 dcl_inputPrimitive opcode.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 0fbb98424c1e2c6571ce92187457ab5a8f88df3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fbb98424c1e2c6571ce92187… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 12:22:24 2012 +0200 wined3d: Recognize the SM4 dcl_inputPrimitive opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 49 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 43 +++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 2 + 5 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 41b8242..e5b2968 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5099,6 +5099,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_hw_nop, + /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, /* WINED3DSIH_DEFB */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 58fc9ac..d83371e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5031,6 +5031,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_DCL */ shader_glsl_nop, + /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, /* WINED3DSIH_DEFB */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5e3abc6..6941434 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -50,6 +50,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_DCL */ "dcl", + /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", /* WINED3DSIH_DEFB */ "defb", @@ -1241,6 +1242,49 @@ static void shader_dump_ins_modifiers(const struct wined3d_shader_dst_param *dst if (mmask) FIXME("_unrecognized_modifier(%#x)", mmask); } +static void shader_dump_primitive_type(enum wined3d_primitive_type primitive_type) +{ + switch (primitive_type) + { + case WINED3D_PT_UNDEFINED: + TRACE("undefined"); + break; + case WINED3D_PT_POINTLIST: + TRACE("pointlist"); + break; + case WINED3D_PT_LINELIST: + TRACE("linelist"); + break; + case WINED3D_PT_LINESTRIP: + TRACE("linestrip"); + break; + case WINED3D_PT_TRIANGLELIST: + TRACE("trianglelist"); + break; + case WINED3D_PT_TRIANGLESTRIP: + TRACE("trianglestrip"); + break; + case WINED3D_PT_TRIANGLEFAN: + TRACE("trianglefan"); + break; + case WINED3D_PT_LINELIST_ADJ: + TRACE("linelist_adj"); + break; + case WINED3D_PT_LINESTRIP_ADJ: + TRACE("linestrip_adj"); + break; + case WINED3D_PT_TRIANGLELIST_ADJ: + TRACE("trianglelist_adj"); + break; + case WINED3D_PT_TRIANGLESTRIP_ADJ: + TRACE("trianglestrip_adj"); + break; + default: + TRACE("<unrecognized_primitive_type %#x>", primitive_type); + break; + } +} + static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, const DWORD *byte_code) { struct wined3d_shader_version shader_version; @@ -1322,6 +1366,11 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe TRACE(" "); shader_dump_dst_param(&ins.declaration.semantic.reg, &shader_version); } + else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE) + { + TRACE("%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_primitive_type(ins.declaration.primitive_type); + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { TRACE("%s %u", shader_opcode_names[ins.handler_idx], ins.declaration.count); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5087849..2f9094b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -28,6 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0xf << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) +#define WINED3D_SM4_PRIMITIVE_TYPE_SHIFT 11 +#define WINED3D_SM4_PRIMITIVE_TYPE_MASK (0x7 << WINED3D_SM4_PRIMITIVE_TYPE_SHIFT) + #define WINED3D_SM4_OPCODE_MASK 0xff #define WINED3D_SM4_REGISTER_MODIFIER (1 << 31) @@ -98,6 +101,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, WINED3D_SM4_OP_XOR = 0x57, + WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE = 0x5d, WINED3D_SM4_OP_DCL_VERTICES_OUT = 0x5e, }; @@ -112,6 +116,15 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_NULL = 0xd, }; +enum wined3d_sm4_input_primitive_type +{ + WINED3D_SM4_INPUT_PT_POINT = 0x1, + WINED3D_SM4_INPUT_PT_LINE = 0x2, + WINED3D_SM4_INPUT_PT_TRIANGLE = 0x3, + WINED3D_SM4_INPUT_PT_LINEADJ = 0x6, + WINED3D_SM4_INPUT_PT_TRIANGLEADJ = 0x7, +}; + enum wined3d_sm4_immconst_type { WINED3D_SM4_IMMCONST_SCALAR = 0x1, @@ -200,6 +213,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "U", "UU"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "F", "U"}, {WINED3D_SM4_OP_XOR, WINED3DSIH_XOR, "U", "UU"}, + {WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PRIMITIVE, "", ""}, {WINED3D_SM4_OP_DCL_VERTICES_OUT, WINED3DSIH_DCL_VERTICES_OUT, "", ""}, }; @@ -221,6 +235,18 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, }; +static const enum wined3d_primitive_type input_primitive_type_table[] = +{ + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* WINED3D_SM4_INPUT_PT_POINT */ WINED3D_PT_POINTLIST, + /* WINED3D_SM4_INPUT_PT_LINE */ WINED3D_PT_LINELIST, + /* WINED3D_SM4_INPUT_PT_TRIANGLE */ WINED3D_PT_TRIANGLELIST, + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* UNKNOWN */ WINED3D_PT_UNDEFINED, + /* WINED3D_SM4_INPUT_PT_LINEADJ */ WINED3D_PT_LINELIST_ADJ, + /* WINED3D_SM4_INPUT_PT_TRIANGLEADJ */ WINED3D_PT_TRIANGLELIST_ADJ, +}; + static const struct sysval_map sysval_map[] = { {WINED3D_SV_DEPTH, WINED3DSPR_DEPTHOUT, 0}, @@ -536,7 +562,22 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi FIXME("Skipping modifier 0x%08x.\n", modifier); } - if (opcode == WINED3D_SM4_OP_DCL_VERTICES_OUT) + if (opcode == WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE) + { + enum wined3d_sm4_input_primitive_type primitive_type; + + primitive_type = (opcode_token & WINED3D_SM4_PRIMITIVE_TYPE_MASK) >> WINED3D_SM4_PRIMITIVE_TYPE_SHIFT; + if (primitive_type >= sizeof(input_primitive_type_table) / sizeof(*input_primitive_type_table)) + { + FIXME("Unhandled input primitive type %#x.\n", primitive_type); + ins->declaration.primitive_type = WINED3D_PT_UNDEFINED; + } + else + { + ins->declaration.primitive_type = input_primitive_type_table[primitive_type]; + } + } + else if (opcode == WINED3D_SM4_OP_DCL_VERTICES_OUT) { ins->declaration.count = *p++; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31e16cd..1900d43 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -439,6 +439,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CRS, WINED3DSIH_CUT, WINED3DSIH_DCL, + WINED3DSIH_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, WINED3DSIH_DEFB, @@ -667,6 +668,7 @@ struct wined3d_shader_instruction union { struct wined3d_shader_semantic semantic; + enum wined3d_primitive_type primitive_type; UINT count; } declaration; };

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_CUT in the GLSL shader backend.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: c982e5f64b6951a5247314dab208337531ea1e14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c982e5f64b6951a5247314dab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 17 12:22:26 2012 +0200 wined3d: Implement WINED3DSIH_CUT in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fbd9f38..97a6109 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2202,6 +2202,11 @@ static void shader_glsl_cross(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "cross(%s, %s)%s);\n", src0_param.param_str, src1_param.param_str, dst_mask); } +static void shader_glsl_cut(const struct wined3d_shader_instruction *ins) +{ + shader_addline(ins->ctx->buffer, "EndPrimitive();\n"); +} + /* Process the WINED3DSIO_POW instruction in GLSL (dst = |src0|^src1) * Src0 and src1 are scalars. Note that D3D uses the absolute of src0, while * GLSL uses the value as-is. */ @@ -5029,7 +5034,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CMP */ shader_glsl_cmp, /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, - /* WINED3DSIH_CUT */ NULL, + /* WINED3DSIH_CUT */ shader_glsl_cut, /* WINED3DSIH_DCL */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop,

1 0

Alexandre Julliard : user32/tests: Add a test for calling UpdateLayeredWindow from a different thread.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: b57323a61e497923bd922d076a4cc47289e6b834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b57323a61e497923bd922d076… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 17 14:03:42 2012 +0200 user32/tests: Add a test for calling UpdateLayeredWindow from a different thread. --- dlls/user32/tests/msg.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0b63799..3208751 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13792,6 +13792,27 @@ static const struct message WmSetLayeredStyle2[] = { { 0 } }; +struct layered_window_info +{ + HWND hwnd; + HDC hdc; + SIZE size; + HANDLE event; + BOOL ret; +}; + +static DWORD CALLBACK update_layered_proc( void *param ) +{ + struct layered_window_info *info = param; + POINT src = { 0, 0 }; + + info->ret = pUpdateLayeredWindow( info->hwnd, 0, NULL, &info->size, + info->hdc, &src, 0, NULL, ULW_OPAQUE ); + ok( info->ret, "failed\n"); + SetEvent( info->event ); + return 0; +} + static void test_layered_window(void) { HWND hwnd; @@ -13801,6 +13822,9 @@ static void test_layered_window(void) SIZE size; POINT pos, src; RECT rect, client; + HANDLE thread; + DWORD tid; + struct layered_window_info info; if (!pUpdateLayeredWindow) { @@ -13894,6 +13918,26 @@ static void test_layered_window(void) broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + SetWindowLong( hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_LAYERED ); + info.hwnd = hwnd; + info.hdc = hdc; + info.size.cx = 250; + info.size.cy = 300; + info.event = CreateEventA( NULL, TRUE, FALSE, NULL ); + info.ret = FALSE; + thread = CreateThread( NULL, 0, update_layered_proc, &info, 0, &tid ); + ok( WaitForSingleObject( info.event, 1000 ) == 0, "wait failed\n" ); + ok( info.ret, "UpdateLayeredWindow failed in other thread\n" ); + WaitForSingleObject( thread, 1000 ); + CloseHandle( thread ); + GetWindowRect( hwnd, &rect ); + ok( rect.left == 200 && rect.top == 200 && rect.right == 450 && rect.bottom == 500, + "wrong window rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + GetClientRect( hwnd, &rect ); + ok( (rect.right == 250 && rect.bottom == 300) || + broken(rect.right == client.right - 100 && rect.bottom == client.bottom - 50), + "wrong client rect %d,%d,%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + DestroyWindow( hwnd ); DeleteDC( hdc ); DeleteObject( bmp );

1 0

Jacek Caban : jscript: Added new variable representation and use it for internal function return values .
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 932b3dd088388ed2d3ca1e5d992cc86473b3260a URL: http://source.winehq.org/git/wine.git/?a=commit;h=932b3dd088388ed2d3ca1e5d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:16:20 2012 +0200 jscript: Added new variable representation and use it for internal function return values. --- dlls/jscript/activex.c | 5 +- dlls/jscript/array.c | 136 +++++++--------- dlls/jscript/bool.c | 28 ++-- dlls/jscript/date.c | 416 +++++++++++++++++++++-------------------------- dlls/jscript/dispex.c | 73 +++++--- dlls/jscript/engine.c | 28 +++- dlls/jscript/error.c | 60 +++---- dlls/jscript/function.c | 94 +++++------ dlls/jscript/global.c | 276 ++++++++++++++----------------- dlls/jscript/jscript.h | 22 ++- dlls/jscript/jsutils.c | 152 +++++++++++++++++ dlls/jscript/jsval.h | 163 ++++++++++++++++++ dlls/jscript/math.c | 164 ++++++++++--------- dlls/jscript/number.c | 64 +++---- dlls/jscript/object.c | 76 ++++----- dlls/jscript/regexp.c | 84 ++++------ dlls/jscript/string.c | 256 ++++++++++++++---------------- dlls/jscript/vbarray.c | 40 ++--- 18 files changed, 1178 insertions(+), 959 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=932b3dd088388ed2d3ca1…

1 0

Jacek Caban : jscript: Always use jsval-based to_boolean.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 26576b83da35aabe7ba181b89fcad1cbd25feba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26576b83da35aabe7ba181b89… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:18:03 2012 +0200 jscript: Always use jsval-based to_boolean. --- dlls/jscript/bool.c | 2 +- dlls/jscript/engine.c | 8 ++-- dlls/jscript/jscript.h | 3 +- dlls/jscript/jsutils.c | 84 +++++++++++++++++------------------------------ 4 files changed, 37 insertions(+), 60 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index f8b4f84..9675965 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -128,7 +128,7 @@ static HRESULT BoolConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, HRESULT hres; if(argc) { - hres = to_boolean_jsval(argv[0], &value); + hres = to_boolean(argv[0], &value); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8595c52..1ffb3d4 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1212,7 +1212,7 @@ static HRESULT interp_cnd_nz(exec_ctx_t *ctx) TRACE("\n"); - hres = to_boolean_jsval(stack_top(ctx), &b); + hres = to_boolean(stack_top(ctx), &b); if(FAILED(hres)) return hres; @@ -1234,7 +1234,7 @@ static HRESULT interp_cnd_z(exec_ctx_t *ctx) TRACE("\n"); - hres = to_boolean_jsval(stack_top(ctx), &b); + hres = to_boolean(stack_top(ctx), &b); if(FAILED(hres)) return hres; @@ -2185,7 +2185,7 @@ static HRESULT interp_neg(exec_ctx_t *ctx) TRACE("\n"); v = stack_pop(ctx); - hres = to_boolean_jsval(v, &b); + hres = to_boolean(v, &b); jsval_release(v); if(FAILED(hres)) return hres; @@ -2325,7 +2325,7 @@ static HRESULT interp_jmp_z(exec_ctx_t *ctx) TRACE("\n"); v = stack_pop(ctx); - hres = to_boolean_jsval(v, &b); + hres = to_boolean(v, &b); jsval_release(v); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 651b49c..f9820bc 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -255,8 +255,7 @@ typedef enum { } hint_t; HRESULT to_primitive(script_ctx_t*,jsval_t,jsexcept_t*,jsval_t*, hint_t) DECLSPEC_HIDDEN; -HRESULT to_boolean(VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; -HRESULT to_boolean_jsval(jsval_t,BOOL*) DECLSPEC_HIDDEN; +HRESULT to_boolean(jsval_t,BOOL*) DECLSPEC_HIDDEN; HRESULT to_number(script_ctx_t*,VARIANT*,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_number_jsval(script_ctx_t*,jsval_t,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_integer(script_ctx_t*,jsval_t,jsexcept_t*,double*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 3a96a51..b5c3632 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -437,60 +437,32 @@ HRESULT to_primitive(script_ctx_t *ctx, jsval_t val, jsexcept_t *ei, jsval_t *re } /* ECMA-262 3rd Edition 9.2 */ -HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) +HRESULT to_boolean(jsval_t val, BOOL *ret) { - switch(V_VT(v)) { - case VT_EMPTY: - case VT_NULL: - *b = VARIANT_FALSE; - break; - case VT_I4: - *b = V_I4(v) ? VARIANT_TRUE : VARIANT_FALSE; - break; - case VT_R8: - if(isnan(V_R8(v))) *b = VARIANT_FALSE; - else *b = V_R8(v) ? VARIANT_TRUE : VARIANT_FALSE; - break; - case VT_BSTR: - *b = V_BSTR(v) && *V_BSTR(v) ? VARIANT_TRUE : VARIANT_FALSE; - break; - case VT_DISPATCH: - *b = V_DISPATCH(v) ? VARIANT_TRUE : VARIANT_FALSE; - break; - case VT_BOOL: - *b = V_BOOL(v); - break; - default: - FIXME("unimplemented for vt %d\n", V_VT(v)); - return E_NOTIMPL; - } - - return S_OK; -} - -/* ECMA-262 3rd Edition 9.2 */ -HRESULT to_boolean_jsval(jsval_t v, BOOL *ret) -{ - VARIANT_BOOL b; - VARIANT var; - HRESULT hres; - - if(v.type == JSV_BOOL) { - *ret = v.u.b; + switch(val.type) { + case JSV_UNDEFINED: + case JSV_NULL: + *ret = VARIANT_FALSE; + return S_OK; + case JSV_OBJECT: + *ret = get_object(val) != NULL; + return S_OK; + case JSV_STRING: + *ret = get_string(val) && *get_string(val); return S_OK; + case JSV_NUMBER: + *ret = !isnan(get_number(val)) && get_number(val); + return S_OK; + case JSV_BOOL: + *ret = get_bool(val); + return S_OK; + case JSV_VARIANT: + FIXME("unimplemented for variant %s\n", debugstr_variant(get_variant(val))); + return E_NOTIMPL; } - hres = jsval_to_variant(v, &var); - if(FAILED(hres)) - return hres; - - hres = to_boolean(&var, &b); - VariantClear(&var); - if(FAILED(hres)) - return hres; - - *ret = !!b; - return S_OK; + assert(0); + return E_FAIL; } static int hex_to_int(WCHAR c) @@ -986,11 +958,17 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY break; } case VT_BOOL: { - VARIANT_BOOL b; + jsval_t val; + BOOL b; + + hres = variant_to_jsval(src, &val); + if(FAILED(hres)) + return hres; - hres = to_boolean(src, &b); + hres = to_boolean(val, &b); + jsval_release(val); if(SUCCEEDED(hres)) - V_BOOL(dst) = b; + V_BOOL(dst) = b ? VARIANT_TRUE : VARIANT_FALSE; break; } case VT_BSTR: {

1 0

Jacek Caban : jscript: Always use jsval-based to_primitive.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: c1eb4326a05d13afa501435f00aae23cc871a34b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1eb4326a05d13afa501435f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:17:50 2012 +0200 jscript: Always use jsval-based to_primitive. --- dlls/jscript/date.c | 16 +++----- dlls/jscript/dispex.c | 29 ++------------ dlls/jscript/engine.c | 12 +++--- dlls/jscript/jscript.h | 5 +- dlls/jscript/jsutils.c | 103 ++++++++++++----------------------------------- 5 files changed, 45 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c1eb4326a05d13afa5014…

1 0

Jacek Caban : jscript: Store exception value as jsval_t instead of VARIANT.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: daf0b8dad2f68292524787bf52e413b972cd2d13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0b8dad2f68292524787bf5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:17:36 2012 +0200 jscript: Store exception value as jsval_t instead of VARIANT. --- dlls/jscript/engine.c | 38 +++++++------------------------------- dlls/jscript/error.c | 2 +- dlls/jscript/jscript.c | 2 +- dlls/jscript/jscript.h | 11 ++++++----- dlls/jscript/jsutils.c | 2 +- dlls/jscript/regexp.c | 2 +- 6 files changed, 17 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1cc8884..10e47f6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -674,19 +674,9 @@ static HRESULT interp_case(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 12.13 */ static HRESULT interp_throw(exec_ctx_t *ctx) { - VARIANT v; - jsval_t val; - HRESULT hres; - TRACE("\n"); - val = stack_pop(ctx); - hres = jsval_to_variant(val, &v); - jsval_release(val); - if(FAILED(hres)) - return hres; - - ctx->ei->var = v; + ctx->ei->val = stack_pop(ctx); return DISP_E_EXCEPTION; } @@ -778,9 +768,7 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) jsval_release(v); stack_popn(ctx, 1); - v = stack_pop(ctx); - hres = jsval_to_variant(v, &ctx->ei->var); - jsval_release(v); + ctx->ei->val = stack_pop(ctx); return SUCCEEDED(hres) ? DISP_E_EXCEPTION : hres; } @@ -2382,7 +2370,7 @@ OP_LIST static HRESULT unwind_exception(exec_ctx_t *ctx) { except_frame_t *except_frame; - VARIANT except_val; + jsval_t except_val; BSTR ident; HRESULT hres; @@ -2397,7 +2385,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) ctx->ip = except_frame->catch_off; - except_val = ctx->ei->var; + except_val = ctx->ei->val; memset(ctx->ei, 0, sizeof(*ctx->ei)); ident = except_frame->ident; @@ -2408,30 +2396,18 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) hres = create_dispex(ctx->script, NULL, NULL, &scope_obj); if(SUCCEEDED(hres)) { - jsval_t val; - - hres = variant_to_jsval(&except_val, &val); - if(SUCCEEDED(hres)) { - hres = jsdisp_propput_name(scope_obj, ident, val, ctx->ei); - jsval_release(val); - } + hres = jsdisp_propput_name(scope_obj, ident, except_val, ctx->ei); if(FAILED(hres)) jsdisp_release(scope_obj); } - VariantClear(&except_val); + jsval_release(except_val); if(FAILED(hres)) return hres; hres = scope_push(ctx->scope_chain, scope_obj, to_disp(scope_obj), &ctx->scope_chain); jsdisp_release(scope_obj); }else { - jsval_t exceptv; - - hres = variant_to_jsval(&except_val, &exceptv); - if(FAILED(hres)) - return hres; - - hres = stack_push(ctx, exceptv); + hres = stack_push(ctx, except_val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 407bd3b..77497a9 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -400,7 +400,7 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, HRESULT error, con return hres; if(ei) - var_set_jsdisp(&ei->var, err); + ei->val = jsval_obj(err); return error; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index bf6710b..f106be9 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -110,7 +110,7 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) memset(&jsexcept, 0, sizeof(jsexcept)); hres = exec_source(exec_ctx, code, &code->global_code, FALSE, &jsexcept, NULL); - VariantClear(&jsexcept.var); + jsval_release(jsexcept.val); exec_release(exec_ctx); IActiveScriptSite_OnLeaveScript(This->site); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index ef20c54..41c67c9 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -37,11 +37,7 @@ typedef struct _jsval_t jsval_t; typedef struct _script_ctx_t script_ctx_t; typedef struct _exec_ctx_t exec_ctx_t; typedef struct _dispex_prop_t dispex_prop_t; - -typedef struct { - EXCEPINFO ei; - VARIANT var; -} jsexcept_t; +typedef struct _jsexcept_t jsexcept_t; typedef struct { void **blocks; @@ -548,3 +544,8 @@ static inline LPWSTR heap_strdupW(LPCWSTR str) } #include "jsval.h" + +struct _jsexcept_t { + EXCEPINFO ei; + jsval_t val; +}; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a4f84c5..0439b10 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -1062,7 +1062,7 @@ HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTY } if(FAILED(hres)) { - VariantClear(&ei.var); + jsval_release(ei.val); return hres; } diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index e783c54..1c891a6 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3525,7 +3525,7 @@ static INT index_from_val(script_ctx_t *ctx, jsval_t v) memset(&ei, 0, sizeof(ei)); hres = to_number_jsval(ctx, v, &ei, &n); if(FAILED(hres)) { /* FIXME: Move ignoring exceptions to to_primitive */ - VariantClear(&ei.var); + jsval_release(ei.val); return 0; }

1 0

Jacek Caban : jscript: Store jsdisp_t values as jsval_t instead of VARIANT.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 80f7f3c2461399cca83ef603e80ed86d91c5c83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f7f3c2461399cca83ef603e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:17:24 2012 +0200 jscript: Store jsdisp_t values as jsval_t instead of VARIANT. --- dlls/jscript/dispex.c | 64 +++++++++++++++++++++++++---------------------- dlls/jscript/function.c | 15 ++--------- dlls/jscript/jscript.h | 4 +- dlls/jscript/jsutils.c | 3 +- dlls/jscript/math.c | 5 +--- 5 files changed, 42 insertions(+), 49 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e1b63c5..d6015e7 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -36,7 +36,7 @@ static const IID IID_IDispatchJS = #define GOLDEN_RATIO 0x9E3779B9U typedef enum { - PROP_VARIANT, + PROP_JSVAL, PROP_BUILTIN, PROP_PROTREF, PROP_DELETED @@ -49,7 +49,7 @@ struct _dispex_prop_t { DWORD flags; union { - VARIANT var; + jsval_t val; const builtin_prop_t *p; DWORD ref; } u; @@ -276,15 +276,15 @@ static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, BOOL search_p TRACE("creating prop %s\n", debugstr_w(name)); if(prop) { - prop->type = PROP_VARIANT; + prop->type = PROP_JSVAL; prop->flags = create_flags; }else { - prop = alloc_prop(This, name, PROP_VARIANT, create_flags); + prop = alloc_prop(This, name, PROP_JSVAL, create_flags); if(!prop) return E_OUTOFMEMORY; } - VariantInit(&prop->u.var); + prop->u.val = jsval_undefined(); } *ret = prop; @@ -372,15 +372,15 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t case PROP_PROTREF: return invoke_prop_func(This->prototype, jsthis, This->prototype->props+prop->u.ref, flags, argc, argv, r, ei, caller); - case PROP_VARIANT: { - if(V_VT(&prop->u.var) != VT_DISPATCH) { - FIXME("invoke vt %d\n", V_VT(&prop->u.var)); + case PROP_JSVAL: { + if(!is_object_instance(prop->u.val)) { + FIXME("invoke %s\n", debugstr_jsval(prop->u.val)); return E_FAIL; } - TRACE("call %s %p\n", debugstr_w(prop->name), V_DISPATCH(&prop->u.var)); + TRACE("call %s %p\n", debugstr_w(prop->name), get_object(prop->u.val)); - return disp_call_value(This->ctx, V_DISPATCH(&prop->u.var), jsthis, flags, argc, argv, r, ei); + return disp_call_value(This->ctx, get_object(prop->u.val), jsthis, flags, argc, argv, r, ei); } default: ERR("type %d\n", prop->type); @@ -403,9 +403,11 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, DISPPARAMS *dp, if(FAILED(hres)) break; - prop->type = PROP_VARIANT; - var_set_jsdisp(&prop->u.var, obj); - hres = variant_to_jsval(&prop->u.var, r); + prop->type = PROP_JSVAL; + prop->u.val = jsval_obj(obj); + + jsdisp_addref(obj); + *r = jsval_obj(obj); }else { vdisp_t vthis; @@ -417,8 +419,8 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, DISPPARAMS *dp, case PROP_PROTREF: hres = prop_get(This->prototype, This->prototype->props+prop->u.ref, dp, r, ei, caller); break; - case PROP_VARIANT: - hres = variant_to_jsval(&prop->u.var, r); + case PROP_JSVAL: + hres = jsval_copy(prop->u.val, r); break; default: ERR("type %d\n", prop->type); @@ -453,21 +455,23 @@ static HRESULT prop_put(jsdisp_t *This, dispex_prop_t *prop, jsval_t val, return hres; } case PROP_PROTREF: - prop->type = PROP_VARIANT; + prop->type = PROP_JSVAL; prop->flags = PROPF_ENUM; - V_VT(&prop->u.var) = VT_EMPTY; + prop->u.val = jsval_undefined(); break; - case PROP_VARIANT: - VariantClear(&prop->u.var); + case PROP_JSVAL: + jsval_release(prop->u.val); break; default: ERR("type %d\n", prop->type); return E_FAIL; } - hres = jsval_to_variant(val, &prop->u.var); - if(FAILED(hres)) + hres = jsval_copy(val, &prop->u.val); + if(FAILED(hres)) { + prop->u.val = jsval_undefined(); return hres; + } if(This->builtin_info->on_put) This->builtin_info->on_put(This, prop->name); @@ -562,8 +566,8 @@ static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) dispex_prop_t *prop; for(prop = This->props; prop < This->props+This->prop_cnt; prop++) { - if(prop->type == PROP_VARIANT) - VariantClear(&prop->u.var); + if(prop->type == PROP_JSVAL) + jsval_release(prop->u.val); heap_free(prop->name); } heap_free(This->props); @@ -733,8 +737,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT delete_prop(dispex_prop_t *prop) { - if(prop->type == PROP_VARIANT) { - VariantClear(&prop->u.var); + if(prop->type == PROP_JSVAL) { + jsval_release(prop->u.val); prop->type = PROP_DELETED; } return S_OK; @@ -1252,7 +1256,7 @@ HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, jsval_t val, jsexc return prop_put(obj, prop, val, ei, NULL); } -HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, VARIANT *val) +HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, jsval_t val) { dispex_prop_t *prop; HRESULT hres; @@ -1261,10 +1265,10 @@ HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, VARIANT *val) if(FAILED(hres)) return hres; - return VariantCopy(&prop->u.var, val); + return jsval_copy(val, &prop->u.val); } -HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, VARIANT *val) +HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, jsval_t val) { dispex_prop_t *prop; HRESULT hres; @@ -1273,7 +1277,7 @@ HRESULT jsdisp_propput_dontenum(jsdisp_t *obj, const WCHAR *name, VARIANT *val) if(FAILED(hres)) return hres; - return VariantCopy(&prop->u.var, val); + return jsval_copy(val, &prop->u.val); } HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, jsval_t val, jsexcept_t *ei) @@ -1441,6 +1445,6 @@ HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, VARIANT_BOOL *ret) if(FAILED(hres)) return hres; - *ret = prop && (prop->type == PROP_VARIANT || prop->type == PROP_BUILTIN) ? VARIANT_TRUE : VARIANT_FALSE; + *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN) ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; } diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 123c0b6..b3a616d 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -609,13 +609,8 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, if(FAILED(hres)) return hres; - if(builtin_info) { - VARIANT var; - - num_set_int(&var, function->length); - hres = jsdisp_propput_const(&function->dispex, lengthW, &var); - } - + if(builtin_info) + hres = jsdisp_propput_const(&function->dispex, lengthW, jsval_number(function->length)); if(SUCCEEDED(hres)) hres = set_prototype(ctx, &function->dispex, prototype); if(FAILED(hres)) { @@ -632,13 +627,9 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, static HRESULT set_constructor_prop(script_ctx_t *ctx, jsdisp_t *constr, jsdisp_t *prot) { - VARIANT v; - static const WCHAR constructorW[] = {'c','o','n','s','t','r','u','c','t','o','r',0}; - V_VT(&v) = VT_DISPATCH; - V_DISPATCH(&v) = to_disp(constr); - return jsdisp_propput_dontenum(prot, constructorW, &v); + return jsdisp_propput_dontenum(prot, constructorW, jsval_obj(constr)); } HRESULT create_builtin_constructor(script_ctx_t *ctx, builtin_invoke_t value_proc, const WCHAR *name, diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c323dea..ef20c54 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -217,8 +217,8 @@ HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,jsval_t*,jsexcept_t*) DECLS HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,jsval_t,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propget(jsdisp_t*,DISPID,jsval_t*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,jsval_t,jsexcept_t*) DECLSPEC_HIDDEN; -HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT jsdisp_propput_dontenum(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; +HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; +HRESULT jsdisp_propput_dontenum(jsdisp_t*,const WCHAR*,jsval_t) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,jsval_t,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*,jsexcept_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 83791d8..a4f84c5 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -260,7 +260,8 @@ HRESULT jsval_copy(jsval_t v, jsval_t *r) *r = v; return S_OK; case JSV_OBJECT: - IDispatch_AddRef(get_object(v)); + if(get_object(v)) + IDispatch_AddRef(get_object(v)); *r = v; return S_OK; case JSV_STRING: { diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 679e37e..4ed62b0 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -532,7 +532,6 @@ HRESULT create_math(script_ctx_t *ctx, jsdisp_t **ret) { jsdisp_t *math; unsigned i; - VARIANT v; HRESULT hres; struct { @@ -559,10 +558,8 @@ HRESULT create_math(script_ctx_t *ctx, jsdisp_t **ret) return hres; } - V_VT(&v) = VT_R8; for(i=0; i < sizeof(constants)/sizeof(*constants); i++) { - V_R8(&v) = constants[i].val; - hres = jsdisp_propput_const(math, constants[i].name, &v); + hres = jsdisp_propput_const(math, constants[i].name, jsval_number(constants[i].val)); if(FAILED(hres)) { jsdisp_release(math); return hres;

1 0

Jacek Caban : jscript: Use jsval_t instead of VARIANT for stack values.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 16b2b019b8b7bcdb55f5a15e2c97c9cac58355e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16b2b019b8b7bcdb55f5a15e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:17:02 2012 +0200 jscript: Use jsval_t instead of VARIANT for stack values. --- dlls/jscript/dispex.c | 81 ++--- dlls/jscript/engine.c | 981 +++++++++++++++++++---------------------------- dlls/jscript/engine.h | 8 +- dlls/jscript/function.c | 7 +- dlls/jscript/global.c | 10 +- dlls/jscript/jscript.h | 7 +- dlls/jscript/jsutils.c | 43 ++- 7 files changed, 483 insertions(+), 654 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16b2b019b8b7bcdb55f5a…

1 0