September 2012 - Wine-Commits

Jacek Caban : jscript: Use BOOL instead of VARIANT_BOOL in a few more places.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 6920b289b0b02875d69b867fa2dfd6fde26bb8e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6920b289b0b02875d69b867fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:20:25 2012 +0200 jscript: Use BOOL instead of VARIANT_BOOL in a few more places. --- dlls/jscript/regexp.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index d09b203..3d0d96a 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3633,7 +3633,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res } static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsexcept_t *ei, BSTR *input, - match_result_t *match, match_result_t **parens, DWORD *parens_cnt, VARIANT_BOOL *ret) + match_result_t *match, match_result_t **parens, DWORD *parens_cnt, BOOL *ret) { RegExpInstance *regexp; DWORD parens_size = 0, last_index = 0, length; @@ -3657,7 +3657,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsexcep if(regexp->last_index < 0) { SysFreeString(string); set_last_index(regexp, 0); - *ret = VARIANT_FALSE; + *ret = FALSE; if(input) { *input = NULL; } @@ -3675,7 +3675,7 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, jsval_t arg, jsexcep return hres; } - *ret = hres == S_OK ? VARIANT_TRUE : VARIANT_FALSE; + *ret = hres == S_OK; if(input) { *input = string; }else { @@ -3689,7 +3689,7 @@ static HRESULT RegExp_exec(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig { match_result_t *parens = NULL, match; DWORD parens_cnt = 0; - VARIANT_BOOL b; + BOOL b; BSTR string; HRESULT hres; @@ -3721,7 +3721,7 @@ static HRESULT RegExp_test(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsig { match_result_t match; BSTR undef_str; - VARIANT_BOOL b; + BOOL b; HRESULT hres; TRACE("\n");

1 0

Jacek Caban : jscript: Don't assume that undefined variable is zeroed.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 9e7829828ee32421974507f83091fd26668534f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e7829828ee32421974507f83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:21:16 2012 +0200 jscript: Don't assume that undefined variable is zeroed. --- dlls/jscript/dispex.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index ae369c2..d10c675 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -272,12 +272,13 @@ static HRESULT ensure_prop_name(jsdisp_t *This, const WCHAR *name, BOOL search_p hres = find_prop_name_prot(This, string_hash(name), name, &prop); else hres = find_prop_name(This, string_hash(name), name, &prop); - if(SUCCEEDED(hres) && (!prop || prop->type==PROP_DELETED)) { + if(SUCCEEDED(hres) && (!prop || prop->type == PROP_DELETED)) { TRACE("creating prop %s\n", debugstr_w(name)); if(prop) { prop->type = PROP_JSVAL; prop->flags = create_flags; + prop->u.val = jsval_undefined(); }else { prop = alloc_prop(This, name, PROP_JSVAL, create_flags); if(!prop)

1 0

Matteo Bruni : d3dcompiler: Parse swizzles.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: 7cce71a0c3e35ee50cf0f05d6d30e8acb42cd34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cce71a0c3e35ee50cf0f05d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Sep 17 15:32:04 2012 +0200 d3dcompiler: Parse swizzles. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 14 ++++ dlls/d3dcompiler_43/hlsl.y | 122 +++++++++++++++++++++++++++++ dlls/d3dcompiler_43/utils.c | 33 ++++++++ 3 files changed, 169 insertions(+), 0 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 05454f1..01c31ef 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -706,6 +706,7 @@ enum hlsl_ir_node_type HLSL_IR_DEREF, HLSL_IR_EXPR, HLSL_IR_FUNCTION_DECL, + HLSL_IR_SWIZZLE, }; struct hlsl_ir_node @@ -834,6 +835,13 @@ struct hlsl_ir_expr struct list *subexpressions; }; +struct hlsl_ir_swizzle +{ + struct hlsl_ir_node node; + struct hlsl_ir_node *val; + DWORD swizzle; +}; + enum hlsl_ir_deref_type { HLSL_IR_DEREF_VAR, @@ -999,6 +1007,12 @@ static inline struct hlsl_ir_assignment *assignment_from_node(const struct hlsl_ return CONTAINING_RECORD(node, struct hlsl_ir_assignment, node); } +static inline struct hlsl_ir_swizzle *swizzle_from_node(const struct hlsl_ir_node *node) +{ + assert(node->type == HLSL_IR_SWIZZLE); + return CONTAINING_RECORD(node, struct hlsl_ir_swizzle, node); +} + static inline struct hlsl_ir_constructor *constructor_from_node(const struct hlsl_ir_node *node) { assert(node->type == HLSL_IR_CONSTRUCTOR); diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index c67ab54..c003754 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -187,6 +187,103 @@ static unsigned int components_count_expr_list(struct list *list) return count; } +static struct hlsl_ir_swizzle *new_swizzle(DWORD s, unsigned int components, + struct hlsl_ir_node *val, struct source_location *loc) +{ + struct hlsl_ir_swizzle *swizzle = d3dcompiler_alloc(sizeof(*swizzle)); + + if (!swizzle) + return NULL; + swizzle->node.type = HLSL_IR_SWIZZLE; + swizzle->node.loc = *loc; + swizzle->node.data_type = new_hlsl_type(NULL, HLSL_CLASS_VECTOR, val->data_type->base_type, components, 1); + swizzle->val = val; + swizzle->swizzle = s; + return swizzle; +} + +static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const char *swizzle, + struct source_location *loc) +{ + unsigned int len = strlen(swizzle), component = 0; + unsigned int i, set, swiz = 0; + BOOL valid; + + if (value->data_type->type == HLSL_CLASS_MATRIX) + { + /* Matrix swizzle */ + BOOL m_swizzle; + unsigned int inc, x, y; + + if (len < 3 || swizzle[0] != '_') + return NULL; + m_swizzle = swizzle[1] == 'm'; + inc = m_swizzle ? 4 : 3; + + if (len % inc || len > inc * 4) + return NULL; + + for (i = 0; i < len; i += inc) + { + if (swizzle[i] != '_') + return NULL; + if (m_swizzle) + { + if (swizzle[i + 1] != 'm') + return NULL; + x = swizzle[i + 2] - '0'; + y = swizzle[i + 3] - '0'; + } + else + { + x = swizzle[i + 1] - '1'; + y = swizzle[i + 2] - '1'; + } + + if (x >= value->data_type->dimx || y >= value->data_type->dimy) + return NULL; + swiz |= (y << 4 | x) << component * 8; + component++; + } + return new_swizzle(swiz, component, value, loc); + } + + /* Vector swizzle */ + if (len > 4) + return NULL; + + for (set = 0; set < 2; ++set) + { + valid = TRUE; + component = 0; + for (i = 0; i < len; ++i) + { + char c[2][4] = {{'x', 'y', 'z', 'w'}, {'r', 'g', 'b', 'a'}}; + unsigned int s = 0; + + for (s = 0; s < 4; ++s) + { + if (swizzle[i] == c[set][s]) + break; + } + if (s == 4) + { + valid = FALSE; + break; + } + + if (s >= value->data_type->dimx) + return NULL; + swiz |= s << component * 2; + component++; + } + if (valid) + return new_swizzle(swiz, component, value, loc); + } + + return NULL; +} + %} %locations @@ -944,6 +1041,31 @@ postfix_expr: primary_expr set_location(&loc, &@2); $$ = &new_expr(HLSL_IR_BINOP_POSTDEC, operands, &loc)->node; } + | postfix_expr '.' any_identifier + { + struct source_location loc; + + set_location(&loc, &@2); + if ($1->data_type->type <= HLSL_CLASS_LAST_NUMERIC) + { + struct hlsl_ir_swizzle *swizzle; + + swizzle = get_swizzle($1, $3, &loc); + if (!swizzle) + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "invalid swizzle %s", debugstr_a($3)); + return 1; + } + $$ = &swizzle->node; + } + else + { + hlsl_report_message(loc.file, loc.line, loc.col, HLSL_LEVEL_ERROR, + "invalid subscript %s", debugstr_a($3)); + return 1; + } + } /* "var_modifiers" doesn't make sense in this case, but it's needed in the grammar to avoid shift/reduce conflicts. */ | var_modifiers type '(' initializer_expr_list ')' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 242f5fb..c416060 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1457,6 +1457,7 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *left, enum parse_assig struct hlsl_ir_deref *lhs_deref = new_var_deref(var_from_node(lhs)); lhs = &lhs_deref->node; } + /* FIXME: check for invalid writemasks on the lhs. */ if (!compare_hlsl_types(type, rhs->data_type)) { @@ -1870,6 +1871,26 @@ static void debug_dump_ir_assignment(const struct hlsl_ir_assignment *assign) TRACE(")"); } +static void debug_dump_ir_swizzle(const struct hlsl_ir_swizzle *swizzle) +{ + unsigned int i; + + debug_dump_instr(swizzle->val); + TRACE("."); + if (swizzle->val->data_type->dimy > 1) + { + for (i = 0; i < swizzle->node.data_type->dimx; ++i) + TRACE("_m%u%u", (swizzle->swizzle >> i * 8) & 0xf, (swizzle->swizzle >> (i * 8 + 4)) & 0xf); + } + else + { + char c[] = {'x', 'y', 'z', 'w'}; + + for (i = 0; i < swizzle->node.data_type->dimx; ++i) + TRACE("%c", c[(swizzle->swizzle >> i * 2) & 0x3]); + } +} + static void debug_dump_instr(const struct hlsl_ir_node *instr) { switch (instr->type) @@ -1886,6 +1907,9 @@ static void debug_dump_instr(const struct hlsl_ir_node *instr) case HLSL_IR_ASSIGNMENT: debug_dump_ir_assignment(assignment_from_node(instr)); break; + case HLSL_IR_SWIZZLE: + debug_dump_ir_swizzle(swizzle_from_node(instr)); + break; case HLSL_IR_CONSTRUCTOR: debug_dump_ir_constructor(constructor_from_node(instr)); break; @@ -1993,6 +2017,12 @@ static void free_ir_deref(struct hlsl_ir_deref *deref) d3dcompiler_free(deref); } +static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) +{ + free_instr(swizzle->val); + d3dcompiler_free(swizzle); +} + static void free_ir_constructor(struct hlsl_ir_constructor *constructor) { free_instr_list(constructor->arguments); @@ -2033,6 +2063,9 @@ void free_instr(struct hlsl_ir_node *node) case HLSL_IR_DEREF: free_ir_deref(deref_from_node(node)); break; + case HLSL_IR_SWIZZLE: + free_ir_swizzle(swizzle_from_node(node)); + break; case HLSL_IR_CONSTRUCTOR: free_ir_constructor(constructor_from_node(node)); break;

1 0

Aric Stewart : user32: Free the uniscribe data before freeing the linedefs.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: e603ffd19eb33619c0f0ba7d41c21f3de0c0eefb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e603ffd19eb33619c0f0ba7d4… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Sep 17 08:54:09 2012 -0500 user32: Free the uniscribe data before freeing the linedefs. --- dlls/user32/edit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 278aa38..f5d4e65 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4593,6 +4593,7 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) if (es->hloc32A) { LocalFree(es->hloc32A); } + EDIT_InvalidateUniscribeData(es); pc = es->first_line_def; while (pc) { @@ -4601,7 +4602,6 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) pc = pp; } - EDIT_InvalidateUniscribeData(es); SetWindowLongPtrW( es->hwndSelf, 0, 0 ); HeapFree(GetProcessHeap(), 0, es->undo_text); HeapFree(GetProcessHeap(), 0, es);

1 0

Jacek Caban : jscript: Avoid direct access to jsval_t struct.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: c0cd0d17aab329125b83951480ea1801857016eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0cd0d17aab329125b8395148… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:21:26 2012 +0200 jscript: Avoid direct access to jsval_t struct. --- dlls/jscript/jsutils.c | 35 ++++++++++++++++++----------------- 1 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index a33cb7e..7df45ea 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -219,15 +219,15 @@ void jsval_release(jsval_t val) { switch(jsval_type(val)) { case JSV_OBJECT: - if(val.u.obj) - IDispatch_Release(val.u.obj); + if(get_object(val)) + IDispatch_Release(get_object(val)); break; case JSV_STRING: - SysFreeString(val.u.str); + SysFreeString(get_string(val)); break; case JSV_VARIANT: - VariantClear(val.u.v); - heap_free(val.u.v); + VariantClear(get_variant(val)); + heap_free(get_variant(val)); break; default: break; @@ -236,17 +236,18 @@ void jsval_release(jsval_t val) HRESULT jsval_variant(jsval_t *val, VARIANT *var) { + VARIANT *v; HRESULT hres; val->type = JSV_VARIANT; - val->u.v = heap_alloc(sizeof(VARIANT)); - if(!val->u.v) + val->u.v = v = heap_alloc(sizeof(VARIANT)); + if(!v) return E_OUTOFMEMORY; - V_VT(val->u.v) = VT_EMPTY; - hres = VariantCopy(val->u.v, var); + V_VT(v) = VT_EMPTY; + hres = VariantCopy(v, var); if(FAILED(hres)) - heap_free(val->u.v); + heap_free(v); return hres; } @@ -338,14 +339,14 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) return S_OK; case JSV_OBJECT: V_VT(retv) = VT_DISPATCH; - if(val.u.obj) - IDispatch_AddRef(val.u.obj); - V_DISPATCH(retv) = val.u.obj; + if(get_object(val)) + IDispatch_AddRef(get_object(val)); + V_DISPATCH(retv) = get_object(val); return S_OK; case JSV_STRING: V_VT(retv) = VT_BSTR; - if(val.u.str) { - V_BSTR(retv) = clone_bstr(val.u.str); + if(get_string(val)) { + V_BSTR(retv) = clone_bstr(get_string(val)); if(!V_BSTR(retv)) return E_OUTOFMEMORY; }else { @@ -367,11 +368,11 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) } case JSV_BOOL: V_VT(retv) = VT_BOOL; - V_BOOL(retv) = val.u.b ? VARIANT_TRUE : VARIANT_FALSE; + V_BOOL(retv) = get_bool(val) ? VARIANT_TRUE : VARIANT_FALSE; return S_OK; case JSV_VARIANT: V_VT(retv) = VT_EMPTY; - return VariantCopy(retv, val.u.v); + return VariantCopy(retv, get_variant(val)); } assert(0);

1 0

Jacek Caban : jscript: Use helper to access jsval_t type.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: c4df88b7fa61251cbeed185688d425303425841e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4df88b7fa61251cbeed18568… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:20:57 2012 +0200 jscript: Use helper to access jsval_t type. --- dlls/jscript/engine.c | 10 ++++++---- dlls/jscript/jsutils.c | 16 ++++++++-------- dlls/jscript/jsval.h | 5 +++++ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1a06b19..341c9bf 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -396,9 +396,11 @@ static HRESULT disp_cmp(IDispatch *disp1, IDispatch *disp2, BOOL *ret) /* ECMA-262 3rd Edition 11.9.6 */ static HRESULT equal2_values(jsval_t lval, jsval_t rval, BOOL *ret) { + jsval_type_t type = jsval_type(lval); + TRACE("\n"); - if(lval.type != rval.type) { + if(type != jsval_type(rval)) { if(is_null_instance(lval)) *ret = is_null_instance(rval); else @@ -406,7 +408,7 @@ static HRESULT equal2_values(jsval_t lval, jsval_t rval, BOOL *ret) return S_OK; } - switch(lval.type) { + switch(type) { case JSV_UNDEFINED: case JSV_NULL: *ret = TRUE; @@ -1657,7 +1659,7 @@ static HRESULT interp_void(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.3 */ static HRESULT typeof_string(jsval_t v, const WCHAR **ret) { - switch(v.type) { + switch(jsval_type(v)) { case JSV_UNDEFINED: *ret = undefinedW; break; @@ -1876,7 +1878,7 @@ static HRESULT interp_preinc(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.9.3 */ static HRESULT equal_values(script_ctx_t *ctx, jsval_t lval, jsval_t rval, jsexcept_t *ei, BOOL *ret) { - if(lval.type == rval.type || (is_number(lval) && is_number(rval))) + if(jsval_type(lval) == jsval_type(rval) || (is_number(lval) && is_number(rval))) return equal2_values(lval, rval, ret); /* FIXME: NULL disps should be handled in more general way */ diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 0b22a14..a33cb7e 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -61,7 +61,7 @@ const char *debugstr_variant(const VARIANT *v) const char *debugstr_jsval(const jsval_t v) { - switch(v.type) { + switch(jsval_type(v)) { case JSV_UNDEFINED: return "undefined"; case JSV_NULL: @@ -217,7 +217,7 @@ static BSTR clone_bstr(BSTR str) void jsval_release(jsval_t val) { - switch(val.type) { + switch(jsval_type(val)) { case JSV_OBJECT: if(val.u.obj) IDispatch_Release(val.u.obj); @@ -252,7 +252,7 @@ HRESULT jsval_variant(jsval_t *val, VARIANT *var) HRESULT jsval_copy(jsval_t v, jsval_t *r) { - switch(v.type) { + switch(jsval_type(v)) { case JSV_UNDEFINED: case JSV_NULL: case JSV_NUMBER: @@ -329,7 +329,7 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) { - switch(val.type) { + switch(jsval_type(val)) { case JSV_UNDEFINED: V_VT(retv) = VT_EMPTY; return S_OK; @@ -449,7 +449,7 @@ 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(jsval_t val, BOOL *ret) { - switch(val.type) { + switch(jsval_type(val)) { case JSV_UNDEFINED: case JSV_NULL: *ret = FALSE; @@ -587,7 +587,7 @@ static HRESULT str_to_number(BSTR str, double *ret) /* ECMA-262 3rd Edition 9.3 */ HRESULT to_number(script_ctx_t *ctx, jsval_t val, jsexcept_t *ei, double *ret) { - switch(val.type) { + switch(jsval_type(val)) { case JSV_UNDEFINED: *ret = NAN; return S_OK; @@ -734,7 +734,7 @@ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsexcept_t *ei, BSTR *str) const WCHAR trueW[] = {'t','r','u','e',0}; const WCHAR falseW[] = {'f','a','l','s','e',0}; - switch(val.type) { + switch(jsval_type(val)) { case JSV_UNDEFINED: *str = SysAllocString(undefinedW); break; @@ -775,7 +775,7 @@ HRESULT to_object(script_ctx_t *ctx, jsval_t val, IDispatch **disp) jsdisp_t *dispex; HRESULT hres; - switch(val.type) { + switch(jsval_type(val)) { case JSV_STRING: hres = create_string(ctx, get_string(val), SysStringLen(get_string(val)), &dispex); if(FAILED(hres)) diff --git a/dlls/jscript/jsval.h b/dlls/jscript/jsval.h index e55db92..a678e05 100644 --- a/dlls/jscript/jsval.h +++ b/dlls/jscript/jsval.h @@ -89,6 +89,11 @@ static inline jsval_t jsval_number(double n) return ret; } +static inline jsval_type_t jsval_type(jsval_t v) +{ + return v.type; +} + static inline BOOL is_object_instance(jsval_t v) { return v.type == JSV_OBJECT;

1 0

Jacek Caban : jscript: Use BOOL instead of VARIANT_BOOL in lexer.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: c5183bb505d60ccee36a4005c0a0b637bacf1d32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5183bb505d60ccee36a4005c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:20:37 2012 +0200 jscript: Use BOOL instead of VARIANT_BOOL in lexer. --- dlls/jscript/engine.h | 4 ++-- dlls/jscript/lex.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 361b786..c3f349b 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -262,7 +262,7 @@ typedef struct { union { double dval; const WCHAR *wstr; - VARIANT_BOOL bval; + BOOL bval; struct { const WCHAR *str; DWORD str_len; @@ -272,7 +272,7 @@ typedef struct { } literal_t; literal_t *parse_regexp(parser_ctx_t*) DECLSPEC_HIDDEN; -literal_t *new_boolean_literal(parser_ctx_t*,VARIANT_BOOL) DECLSPEC_HIDDEN; +literal_t *new_boolean_literal(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN; typedef struct _variable_declaration_t { const WCHAR *identifier; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 4c2cc6b..8823a30 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -380,7 +380,7 @@ static literal_t *new_double_literal(parser_ctx_t *ctx, DOUBLE d) return ret; } -literal_t *new_boolean_literal(parser_ctx_t *ctx, VARIANT_BOOL bval) +literal_t *new_boolean_literal(parser_ctx_t *ctx, BOOL bval) { literal_t *ret = parser_alloc(ctx, sizeof(literal_t)); @@ -749,7 +749,7 @@ static int next_token(parser_ctx_t *ctx, void *lval) struct _cc_var_t { BOOL is_num; union { - VARIANT_BOOL b; + BOOL b; DOUBLE n; } u; struct _cc_var_t *next; @@ -822,7 +822,7 @@ static int init_cc(parser_ctx_t *ctx) cc->vars = NULL; v.is_num = FALSE; - v.u.b = VARIANT_TRUE; + v.u.b = TRUE; if(!add_cc_var(cc, _jscriptW, &v) || !add_cc_var(cc, sizeof(void*) == 8 ? _win64W : _win32W, &v) || !add_cc_var(cc, sizeof(void*) == 8 ? _amd64W : _x86W, &v)) {

1 0

Jacek Caban : jscript: Store Boolean object' s value as BOOL instead of VARIANT_BOOL.
by Alexandre Julliard Sept. 17, 2012

Sept. 17, 2012

Module: wine Branch: master Commit: bc768b090664dc9a07f8e83948ef048cb3ce405a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc768b090664dc9a07f8e8394… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:20:01 2012 +0200 jscript: Store Boolean object's value as BOOL instead of VARIANT_BOOL. --- dlls/jscript/bool.c | 4 ++-- dlls/jscript/jscript.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 9675965..e3972a1 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; - VARIANT_BOOL val; + BOOL val; } BoolInstance; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; @@ -199,7 +199,7 @@ HRESULT create_bool_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp return hres; } -HRESULT create_bool(script_ctx_t *ctx, VARIANT_BOOL b, jsdisp_t **ret) +HRESULT create_bool(script_ctx_t *ctx, BOOL b, jsdisp_t **ret) { BoolInstance *bool; HRESULT hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index bc67426..3562db6 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -244,7 +244,7 @@ HRESULT create_array(script_ctx_t*,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_regexp(script_ctx_t*,const WCHAR *,int,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_regexp_var(script_ctx_t*,jsval_t,jsval_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_bool(script_ctx_t*,BOOL,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number(script_ctx_t*,double,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_vbarray(script_ctx_t*,SAFEARRAY*,jsdisp_t**) DECLSPEC_HIDDEN;

1 0

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

Sept. 17, 2012

Module: wine Branch: master Commit: 228aab23be7bd3b23cb362dd186eebce87171532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=228aab23be7bd3b23cb362dd1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:19:19 2012 +0200 jscript: Always use jsval-based to_object implementation. --- dlls/jscript/engine.c | 8 +++--- dlls/jscript/function.c | 4 +- dlls/jscript/jscript.h | 3 +- dlls/jscript/jsutils.c | 64 +++++++++++++++++++---------------------------- dlls/jscript/object.c | 2 +- 5 files changed, 34 insertions(+), 47 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9cdc2fb..1a06b19 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -148,7 +148,7 @@ static HRESULT stack_pop_object(exec_ctx_t *ctx, IDispatch **r) return S_OK; } - hres = to_object_jsval(ctx->script, v, r); + hres = to_object(ctx->script, v, r); jsval_release(v); return hres; } @@ -627,7 +627,7 @@ static HRESULT interp_push_scope(exec_ctx_t *ctx) TRACE("\n"); v = stack_pop(ctx); - hres = to_object_jsval(ctx->script, v, &disp); + hres = to_object(ctx->script, v, &disp); jsval_release(v); if(FAILED(hres)) return hres; @@ -878,7 +878,7 @@ static HRESULT interp_memberid(exec_ctx_t *ctx) namev = stack_pop(ctx); objv = stack_pop(ctx); - hres = to_object_jsval(ctx->script, objv, &obj); + hres = to_object(ctx->script, objv, &obj); jsval_release(objv); if(SUCCEEDED(hres)) { hres = to_string(ctx->script, namev, ctx->ei, &name); @@ -1578,7 +1578,7 @@ static HRESULT interp_delete(exec_ctx_t *ctx) namev = stack_pop(ctx); objv = stack_pop(ctx); - hres = to_object_jsval(ctx->script, objv, &obj); + hres = to_object(ctx->script, objv, &obj); jsval_release(objv); if(FAILED(hres)) { jsval_release(namev); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 401aae2..041f104 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -389,7 +389,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un if(argc) { if(!is_undefined(argv[0]) && !is_null(argv[0])) { - hres = to_object_jsval(ctx, argv[0], &this_obj); + hres = to_object(ctx, argv[0], &this_obj); if(FAILED(hres)) return hres; } @@ -442,7 +442,7 @@ static HRESULT Function_call(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns if(argc) { if(!is_undefined(argv[0]) && !is_null(argv[0])) { - hres = to_object_jsval(ctx, argv[0], &this_obj); + hres = to_object(ctx, argv[0], &this_obj); if(FAILED(hres)) return hres; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 4a40bc6..bbac902 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -261,8 +261,7 @@ HRESULT to_integer(script_ctx_t*,jsval_t,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,jsval_t,jsexcept_t*,INT*) DECLSPEC_HIDDEN; HRESULT to_uint32(script_ctx_t*,jsval_t,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,jsval_t,jsexcept_t*,BSTR*) DECLSPEC_HIDDEN; -HRESULT to_object(script_ctx_t*,VARIANT*,IDispatch**) DECLSPEC_HIDDEN; -HRESULT to_object_jsval(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; +HRESULT to_object(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; HRESULT variant_change_type(script_ctx_t*,VARIANT*,VARIANT*,VARTYPE) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index e89b8ae..1801f86 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -760,31 +760,30 @@ HRESULT to_string(script_ctx_t *ctx, jsval_t val, jsexcept_t *ei, BSTR *str) } /* ECMA-262 3rd Edition 9.9 */ -HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) +HRESULT to_object(script_ctx_t *ctx, jsval_t val, IDispatch **disp) { jsdisp_t *dispex; HRESULT hres; - switch(V_VT(v)) { - case VT_BSTR: - hres = create_string(ctx, V_BSTR(v), SysStringLen(V_BSTR(v)), &dispex); + switch(val.type) { + case JSV_STRING: + hres = create_string(ctx, get_string(val), SysStringLen(get_string(val)), &dispex); if(FAILED(hres)) return hres; *disp = to_disp(dispex); break; - case VT_I4: - case VT_R8: - hres = create_number(ctx, num_val(v), &dispex); + case JSV_NUMBER: + hres = create_number(ctx, get_number(val), &dispex); if(FAILED(hres)) return hres; *disp = to_disp(dispex); break; - case VT_DISPATCH: - if(V_DISPATCH(v)) { - IDispatch_AddRef(V_DISPATCH(v)); - *disp = V_DISPATCH(v); + case JSV_OBJECT: + if(get_object(val)) { + *disp = get_object(val); + IDispatch_AddRef(*disp); }else { jsdisp_t *obj; @@ -795,47 +794,36 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) *disp = to_disp(obj); } break; - case VT_BOOL: - hres = create_bool(ctx, V_BOOL(v), &dispex); + case JSV_BOOL: + hres = create_bool(ctx, get_bool(val), &dispex); if(FAILED(hres)) return hres; *disp = to_disp(dispex); break; - case VT_ARRAY|VT_VARIANT: - hres = create_vbarray(ctx, V_ARRAY(v), &dispex); - if(FAILED(hres)) - return hres; + case JSV_VARIANT: + switch(V_VT(get_variant(val))) { + case VT_ARRAY|VT_VARIANT: + hres = create_vbarray(ctx, V_ARRAY(get_variant(val)), &dispex); + if(FAILED(hres)) + return hres; - *disp = to_disp(dispex); + *disp = to_disp(dispex); + break; + + default: + FIXME("Unsupported %s\n", debugstr_variant(get_variant(val))); + return E_NOTIMPL; + } break; default: - FIXME("unsupported vt %d\n", V_VT(v)); + FIXME("unsupported %s\n", debugstr_jsval(val)); return E_NOTIMPL; } return S_OK; } -/* ECMA-262 3rd Edition 9.9 */ -HRESULT to_object_jsval(script_ctx_t *ctx, jsval_t v, IDispatch **disp) -{ - VARIANT var; - HRESULT hres; - - if(is_object_instance(v)) { - *disp = get_object(v); - IDispatch_AddRef(*disp); - return S_OK; - } - - hres = jsval_to_variant(v, &var); - if(FAILED(hres)) - return hres; - - return to_object(ctx, &var, disp); -} - HRESULT variant_change_type(script_ctx_t *ctx, VARIANT *dst, VARIANT *src, VARTYPE vt) { jsexcept_t ei; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index b88cf84..99daf46 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -228,7 +228,7 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(!is_undefined(argv[0]) && !is_null(argv[0]) && (!is_object_instance(argv[0]) || get_object(argv[0]))) { IDispatch *disp; - hres = to_object_jsval(ctx, argv[0], &disp); + hres = to_object(ctx, argv[0], &disp); if(FAILED(hres)) return hres;

1 0

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

Sept. 17, 2012

Module: wine Branch: master Commit: 2fc71ab6d52178ff173514415af427fc4548dbb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc71ab6d52178ff173514415… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:18:41 2012 +0200 jscript: Always use jsval-based to_uint32 implementation. --- dlls/jscript/array.c | 2 +- dlls/jscript/engine.c | 2 +- dlls/jscript/function.c | 2 +- dlls/jscript/jscript.h | 3 +-- dlls/jscript/jsutils.c | 28 +--------------------------- dlls/jscript/string.c | 2 +- 6 files changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 4eeca39..653bd9b 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -79,7 +79,7 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsexcept_t *ei, jsd if(FAILED(hres)) return hres; - hres = to_uint32_jsval(ctx, val, ei, ret); + hres = to_uint32(ctx, val, ei, ret); jsval_release(val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index da0aba6..61869cc 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -160,7 +160,7 @@ static inline HRESULT stack_pop_int(exec_ctx_t *ctx, INT *r) static inline HRESULT stack_pop_uint(exec_ctx_t *ctx, DWORD *r) { - return to_uint32_jsval(ctx->script, stack_pop(ctx), ctx->ei, r); + return to_uint32(ctx->script, stack_pop(ctx), ctx->ei, r); } static inline IDispatch *stack_pop_objid(exec_ctx_t *ctx, DISPID *id) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index b3a616d..e45ba7a 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -347,7 +347,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t if(FAILED(hres)) return hres; - hres = to_uint32_jsval(ctx, val, ei, &length); + hres = to_uint32(ctx, val, ei, &length); jsval_release(val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 8cfc14e..c8ccb0b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -259,8 +259,7 @@ HRESULT to_boolean(jsval_t,BOOL*) DECLSPEC_HIDDEN; HRESULT to_number(script_ctx_t*,jsval_t,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_integer(script_ctx_t*,jsval_t,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,jsval_t,jsexcept_t*,INT*) DECLSPEC_HIDDEN; -HRESULT to_uint32(script_ctx_t*,VARIANT*,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; -HRESULT to_uint32_jsval(script_ctx_t*,jsval_t,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; +HRESULT to_uint32(script_ctx_t*,jsval_t,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*) DECLSPEC_HIDDEN; HRESULT to_string_jsval(script_ctx_t*,jsval_t,jsexcept_t*,BSTR*) DECLSPEC_HIDDEN; HRESULT to_object(script_ctx_t*,VARIANT*,IDispatch**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index c0007fc..e14c352 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -645,23 +645,12 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, jsexcept_t *ei, INT *ret) } /* ECMA-262 3rd Edition 9.6 */ -HRESULT to_uint32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, DWORD *ret) +HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, jsexcept_t *ei, DWORD *ret) { - jsval_t val; double n; HRESULT hres; - if(V_VT(v) == VT_I4) { - *ret = V_I4(v); - return S_OK; - } - - hres = variant_to_jsval(v, &val); - if(FAILED(hres)) - return hres; - hres = to_number(ctx, val, ei, &n); - jsval_release(val); if(FAILED(hres)) return hres; @@ -669,21 +658,6 @@ HRESULT to_uint32(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, DWORD *ret) return S_OK; } -/* ECMA-262 3rd Edition 9.6 */ -HRESULT to_uint32_jsval(script_ctx_t *ctx, jsval_t v, jsexcept_t *ei, DWORD *ret) -{ - VARIANT var; - HRESULT hres; - - hres = jsval_to_variant(v, &var); - if(FAILED(hres)) - return hres; - - hres = to_uint32(ctx, &var, ei, ret); - VariantClear(&var); - return hres; -} - static BSTR int_to_bstr(int i) { WCHAR buf[12], *p; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 1549ca1..76f9c41 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1531,7 +1531,7 @@ static HRESULT StringConstr_fromCharCode(script_ctx_t *ctx, vdisp_t *jsthis, WOR return E_OUTOFMEMORY; for(i=0; i<argc; i++) { - hres = to_uint32_jsval(ctx, argv[i], ei, &code); + hres = to_uint32(ctx, argv[i], ei, &code); if(FAILED(hres)) { SysFreeString(ret); return hres;

1 0