wine-commits September 2012

wine-commits@winehq.org

2 participants
828 discussions

Jacek Caban : jscript: Use helper to access jsval_t type.
by Alexandre Julliard 17 Sep '12

17 Sep '12

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 17 Sep '12

17 Sep '12

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: Use BOOL instead of VARIANT_BOOL in a few more places.
by Alexandre Julliard 17 Sep '12

17 Sep '12

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: Return BOOL instead of VARIANT_BOOL from jsdisp_is_own_prop.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 29f4194d741b7df724e8efed8f3f7988f6481fd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f4194d741b7df724e8efed8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:20:14 2012 +0200 jscript: Return BOOL instead of VARIANT_BOOL from jsdisp_is_own_prop. --- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsutils.c | 2 +- dlls/jscript/object.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2da9661..ae369c2 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1415,7 +1415,7 @@ HRESULT jsdisp_delete_idx(jsdisp_t *obj, DWORD idx) return delete_prop(prop); } -HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, VARIANT_BOOL *ret) +HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, BOOL *ret) { dispex_prop_t *prop; HRESULT hres; @@ -1424,6 +1424,6 @@ HRESULT jsdisp_is_own_prop(jsdisp_t *obj, BSTR name, VARIANT_BOOL *ret) if(FAILED(hres)) return hres; - *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN) ? VARIANT_TRUE : VARIANT_FALSE; + *ret = prop && (prop->type == PROP_JSVAL || prop->type == PROP_BUILTIN); return S_OK; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 3562db6..8a80192 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -220,7 +220,7 @@ HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,jsval_t*,jsexcept_t*) DECLSPEC_HID HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,jsval_t*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; -HRESULT jsdisp_is_own_prop(jsdisp_t*,BSTR,VARIANT_BOOL*) DECLSPEC_HIDDEN; +HRESULT jsdisp_is_own_prop(jsdisp_t*,BSTR,BOOL*) DECLSPEC_HIDDEN; HRESULT create_builtin_function(script_ctx_t*,builtin_invoke_t,const WCHAR*,const builtin_info_t*,DWORD, jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 540d814..0b22a14 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -452,7 +452,7 @@ HRESULT to_boolean(jsval_t val, BOOL *ret) switch(val.type) { case JSV_UNDEFINED: case JSV_NULL: - *ret = VARIANT_FALSE; + *ret = FALSE; return S_OK; case JSV_OBJECT: *ret = get_object(val) != NULL; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 99daf46..ae5c03a 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -123,7 +123,7 @@ static HRESULT Object_hasOwnProperty(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl return hres; if(is_jsdisp(jsthis)) { - VARIANT_BOOL result; + BOOL result; hres = jsdisp_is_own_prop(jsthis->u.jsdisp, name, &result); if(FAILED(hres))

1 0

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

17 Sep '12

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: Get rid of no longer needed VARIANT helpers.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: 5fecc71d34e583aa216f3e8eeb1b05fe123bed35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fecc71d34e583aa216f3e8ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:19:44 2012 +0200 jscript: Get rid of no longer needed VARIANT helpers. --- dlls/jscript/jscript.h | 33 --------------------------------- dlls/jscript/jsutils.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 35 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index bbac902..bc67426 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -387,16 +387,6 @@ static inline BOOL is_vclass(vdisp_t *vdisp, jsclass_t class) return is_jsdisp(vdisp) && is_class(vdisp->u.jsdisp, class); } -static inline BOOL is_num_vt(enum VARENUM vt) -{ - return vt == VT_I4 || vt == VT_R8; -} - -static inline DOUBLE num_val(const VARIANT *v) -{ - return V_VT(v) == VT_I4 ? V_I4(v) : V_R8(v); -} - #ifndef INT32_MIN #define INT32_MIN (-2147483647-1) #endif @@ -410,29 +400,6 @@ static inline BOOL is_int32(double d) return INT32_MIN <= d && d <= INT32_MAX && (double)(int)d == d; } -static inline void num_set_int(VARIANT *v, INT i) -{ - V_VT(v) = VT_I4; - V_I4(v) = i; -} - -static inline void num_set_val(VARIANT *v, DOUBLE d) -{ - if(is_int32(d)) { - V_VT(v) = VT_I4; - V_I4(v) = d; - }else { - V_VT(v) = VT_R8; - V_R8(v) = d; - } -} - -static inline void var_set_jsdisp(VARIANT *v, jsdisp_t *jsdisp) -{ - V_VT(v) = VT_DISPATCH; - V_DISPATCH(v) = to_disp(jsdisp); -} - static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) { return (ctx->version << 28) | flags; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 1801f86..540d814 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -352,9 +352,19 @@ HRESULT jsval_to_variant(jsval_t val, VARIANT *retv) V_BSTR(retv) = NULL; } return S_OK; - case JSV_NUMBER: - num_set_val(retv, val.u.n); + case JSV_NUMBER: { + double n = get_number(val); + + if(is_int32(n)) { + V_VT(retv) = VT_I4; + V_I4(retv) = n; + }else { + V_VT(retv) = VT_R8; + V_R8(retv) = n; + } + return S_OK; + } case JSV_BOOL: V_VT(retv) = VT_BOOL; V_BOOL(retv) = val.u.b ? VARIANT_TRUE : VARIANT_FALSE;

1 0

Jacek Caban : jscript: Store regexp last_index value as jsval.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: a3f7f0f7defd8e5dffa5773a509905702980dd9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f7f0f7defd8e5dffa5773a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:19:30 2012 +0200 jscript: Store regexp last_index value as jsval. --- dlls/jscript/regexp.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 3e0f986..d09b203 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -84,7 +84,7 @@ typedef struct { JSRegExp *jsregexp; BSTR str; INT last_index; - VARIANT last_index_var; + jsval_t last_index_val; } RegExpInstance; static const WCHAR sourceW[] = {'s','o','u','r','c','e',0}; @@ -3308,8 +3308,8 @@ static inline RegExpInstance *regexp_from_vdisp(vdisp_t *vdisp) static void set_last_index(RegExpInstance *This, DWORD last_index) { This->last_index = last_index; - VariantClear(&This->last_index_var); - num_set_val(&This->last_index_var, last_index); + jsval_release(This->last_index_val); + This->last_index_val = jsval_number(last_index); } static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, DWORD rem_flags, @@ -3542,13 +3542,13 @@ static HRESULT RegExp_lastIndex(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, case DISPATCH_PROPERTYGET: { RegExpInstance *regexp = regexp_from_vdisp(jsthis); - return variant_to_jsval(&regexp->last_index_var, r); + return jsval_copy(regexp->last_index_val, r); } case DISPATCH_PROPERTYPUT: { RegExpInstance *regexp = regexp_from_vdisp(jsthis); HRESULT hres; - hres = jsval_to_variant(argv[0], &regexp->last_index_var); + hres = jsval_copy(argv[0], &regexp->last_index_val); if(FAILED(hres)) return hres; @@ -3765,7 +3765,7 @@ static void RegExp_destructor(jsdisp_t *dispex) if(This->jsregexp) js_DestroyRegExp(This->jsregexp); - VariantClear(&This->last_index_var); + jsval_release(This->last_index_val); SysFreeString(This->str); heap_free(This); } @@ -3857,7 +3857,7 @@ HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, return E_FAIL; } - num_set_int(&regexp->last_index_var, 0); + regexp->last_index_val = jsval_number(0); *ret = &regexp->dispex; return S_OK;

1 0

Jacek Caban : jscript: Always use jsval-based to_object implementation.
by Alexandre Julliard 17 Sep '12

17 Sep '12

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_string implementation.
by Alexandre Julliard 17 Sep '12

17 Sep '12

Module: wine Branch: master Commit: acfd2b98c38894f04f902cd4cc73a2501e31072f URL: http://source.winehq.org/git/wine.git/?a=commit;h=acfd2b98c38894f04f902cd4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 17 15:18:59 2012 +0200 jscript: Always use jsval-based to_string implementation. --- dlls/jscript/activex.c | 2 +- dlls/jscript/array.c | 8 +++--- dlls/jscript/date.c | 2 +- dlls/jscript/engine.c | 12 +++++----- dlls/jscript/error.c | 8 +++--- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 16 ++++++------ dlls/jscript/jscript.h | 3 +- dlls/jscript/jsutils.c | 55 ++++++++++++++-------------------------------- dlls/jscript/number.c | 20 +++------------- dlls/jscript/object.c | 2 +- dlls/jscript/regexp.c | 2 +- dlls/jscript/string.c | 40 ++++++++++++---------------------- 13 files changed, 63 insertions(+), 109 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=acfd2b98c38894f04f902…

1 0

Jacek Caban : jscript: Always use jsval-based to_uint32 implementation.
by Alexandre Julliard 17 Sep '12

17 Sep '12

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

← Newer
1
...
40
41
42
43
44
45
46
...
83
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2012