October 2012 - Wine-commits

Henri Verbeet : wined3d: Implement WINED3DSIH_XOR in the GLSL shader backend.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 4c4b224330ecb45c4f32a6f53e40de66f01778f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4b224330ecb45c4f32a6f53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 10 22:22:16 2012 +0200 wined3d: Implement WINED3DSIH_XOR in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c5ceb6..52298fa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2205,6 +2205,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_IADD: op = '+'; break; case WINED3DSIH_MUL: op = '*'; break; case WINED3DSIH_SUB: op = '-'; break; + case WINED3DSIH_XOR: op = '^'; break; default: op = ' '; FIXME("Opcode %#x not yet handled in GLSL\n", ins->handler_idx); @@ -5299,7 +5300,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, - /* WINED3DSIH_XOR */ NULL, + /* WINED3DSIH_XOR */ shader_glsl_binop, }; static void shader_glsl_handle_instruction(const struct wined3d_shader_instruction *ins) {

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_EQ in the GLSL shader backend .
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 09f5f592292c7dbd4149eeab653eb9124ed3ba75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f5f592292c7dbd4149eeab6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 10 22:22:17 2012 +0200 wined3d: Implement WINED3DSIH_EQ in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 52298fa..47ace5d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2218,6 +2218,50 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s %c %s);\n", src0_param.param_str, op, src1_param.param_str); } +static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) +{ + struct wined3d_shader_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src0_param; + struct glsl_src_param src1_param; + unsigned int mask_size; + DWORD write_mask; + const char *op; + + write_mask = shader_glsl_append_dst(buffer, ins); + mask_size = shader_glsl_get_write_mask_size(write_mask); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); + shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); + + if (mask_size > 1) + { + switch (ins->handler_idx) + { + case WINED3DSIH_EQ: op = "equal"; break; + default: + op = "<unhandled operator>"; + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + break; + } + + shader_addline(buffer, "uvec%u(%s(%s, %s)) * 0xffffffffu);\n", + mask_size, op, src0_param.param_str, src1_param.param_str); + } + else + { + switch (ins->handler_idx) + { + case WINED3DSIH_EQ: op = "=="; break; + default: + op = "<unhandled operator>"; + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + break; + } + + shader_addline(buffer, "%s %s %s ? 0xffffffffu : 0u);\n", + src0_param.param_str, op, src1_param.param_str); + } +} + /* Process the WINED3DSIO_MOV opcode using GLSL (dst = src) */ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) { @@ -5223,7 +5267,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, - /* WINED3DSIH_EQ */ NULL, + /* WINED3DSIH_EQ */ shader_glsl_relop, /* WINED3DSIH_EXP */ shader_glsl_map2gl, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_GE in the GLSL shader backend .
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 819e5fa623f309b59ce32d9eff208c74cbccf6fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=819e5fa623f309b59ce32d9ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 10 22:22:18 2012 +0200 wined3d: Implement WINED3DSIH_GE in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 47ace5d..c95506a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2237,6 +2237,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) switch (ins->handler_idx) { case WINED3DSIH_EQ: op = "equal"; break; + case WINED3DSIH_GE: op = "greaterThanEqual"; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -2251,6 +2252,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) switch (ins->handler_idx) { case WINED3DSIH_EQ: op = "=="; break; + case WINED3DSIH_GE: op = ">="; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -5272,7 +5274,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ NULL, - /* WINED3DSIH_GE */ NULL, + /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ shader_glsl_if,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_IGE in the GLSL shader backend.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 842f75ee75e4cfd06d550a0b7270dbf9194a6c0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=842f75ee75e4cfd06d550a0b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 10 22:22:19 2012 +0200 wined3d: Implement WINED3DSIH_IGE in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c95506a..c492687 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2238,6 +2238,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) { case WINED3DSIH_EQ: op = "equal"; break; case WINED3DSIH_GE: op = "greaterThanEqual"; break; + case WINED3DSIH_IGE: op = "greaterThanEqual"; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -2253,6 +2254,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) { case WINED3DSIH_EQ: op = "=="; break; case WINED3DSIH_GE: op = ">="; break; + case WINED3DSIH_IGE: op = ">="; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -5279,7 +5281,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, - /* WINED3DSIH_IGE */ NULL, + /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_glsl_label,

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_LT in the GLSL shader backend .
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: f8e1550ebb5e45f7a4617975be821aaf8848b38b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e1550ebb5e45f7a4617975b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 10 22:22:20 2012 +0200 wined3d: Implement WINED3DSIH_LT in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c492687..e4f9477 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2239,6 +2239,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EQ: op = "equal"; break; case WINED3DSIH_GE: op = "greaterThanEqual"; break; case WINED3DSIH_IGE: op = "greaterThanEqual"; break; + case WINED3DSIH_LT: op = "lessThan"; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -2255,6 +2256,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_EQ: op = "=="; break; case WINED3DSIH_GE: op = ">="; break; case WINED3DSIH_IGE: op = ">="; break; + case WINED3DSIH_LT: op = "<"; break; default: op = "<unhandled operator>"; ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -5291,7 +5293,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LOGP */ shader_glsl_log, /* WINED3DSIH_LOOP */ shader_glsl_loop, /* WINED3DSIH_LRP */ shader_glsl_lrp, - /* WINED3DSIH_LT */ NULL, + /* WINED3DSIH_LT */ shader_glsl_relop, /* WINED3DSIH_M3x2 */ shader_glsl_mnxn, /* WINED3DSIH_M3x3 */ shader_glsl_mnxn, /* WINED3DSIH_M3x4 */ shader_glsl_mnxn,

1 0

Jacek Caban : jscript: Use custom string container instead of BSTR.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 7f1e3300fe05cf75462a44dd9ae54e31abbb78cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1e3300fe05cf75462a44dd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 12:16:01 2012 +0200 jscript: Use custom string container instead of BSTR. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/activex.c | 6 +- dlls/jscript/array.c | 80 +++--- dlls/jscript/bool.c | 6 +- dlls/jscript/compile.c | 14 +- dlls/jscript/date.c | 127 ++++------ dlls/jscript/dispex.c | 4 +- dlls/jscript/engine.c | 166 +++++++------ dlls/jscript/error.c | 73 +++--- dlls/jscript/function.c | 36 ++-- dlls/jscript/global.c | 172 +++++++------- dlls/jscript/jscript.c | 5 +- dlls/jscript/jscript.h | 83 ++++---- dlls/jscript/jscript_main.c | 4 + dlls/jscript/jsstr.c | 96 ++++++++ dlls/jscript/jsstr.h | 70 ++++++ dlls/jscript/jsutils.c | 97 ++++---- dlls/jscript/jsval.h | 10 +- dlls/jscript/number.c | 59 +++-- dlls/jscript/object.c | 24 ++- dlls/jscript/regexp.c | 108 ++++----- dlls/jscript/string.c | 561 +++++++++++++++++++------------------------ 22 files changed, 970 insertions(+), 832 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f1e3300fe05cf75462a4…

1 0

Jacek Caban : jscript: Store regexp source as jsstr_t.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 3182852293d68af85b67bb904e35815ff1f828c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3182852293d68af85b67bb904… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 12:16:50 2012 +0200 jscript: Store regexp source as jsstr_t. --- dlls/jscript/engine.c | 8 ++++++- dlls/jscript/jscript.h | 2 +- dlls/jscript/regexp.c | 55 +++++++++++++++++++---------------------------- dlls/jscript/string.c | 2 +- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a76c291..66e2b92 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1152,11 +1152,17 @@ static HRESULT interp_regexp(exec_ctx_t *ctx) const WCHAR *source = get_op_str(ctx, 0); const unsigned flags = get_op_uint(ctx, 1); jsdisp_t *regexp; + jsstr_t *src; HRESULT hres; TRACE("%s %x\n", debugstr_w(source), flags); - hres = create_regexp(ctx->script, source, strlenW(source), flags, &regexp); + src = jsstr_alloc(source); + if(!src) + return E_OUTOFMEMORY; + + hres = create_regexp(ctx->script, src, flags, &regexp); + jsstr_release(src); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 9972688..d779c7b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -276,7 +276,7 @@ HRESULT throw_uri_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT create_object(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_math(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; 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(script_ctx_t*,jsstr_t*,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*,jsstr_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool(script_ctx_t*,BOOL,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 4cb1a67..bdff445 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -74,7 +74,7 @@ typedef struct { size_t parenCount; /* number of parenthesized submatches */ size_t classCount; /* count [...] bitmaps */ RECharSet *classList; /* list of [...] bitmaps */ - BSTR source; /* locked source string, sans // */ + jsstr_t *source; /* locked source string, sans // */ jsbytecode program[1]; /* regular expression bytecode */ } JSRegExp; @@ -82,7 +82,7 @@ typedef struct { jsdisp_t dispex; JSRegExp *jsregexp; - BSTR str; + jsstr_t *str; INT last_index; jsval_t last_index_val; } RegExpInstance; @@ -2158,12 +2158,12 @@ ProcessCharSet(REGlobalData *gData, RECharSet *charSet) */ assert(1 <= charSet->u.src.startIndex); assert(charSet->u.src.startIndex - < SysStringLen(gData->regexp->source)); - assert(charSet->u.src.length <= SysStringLen(gData->regexp->source) + < jsstr_length(gData->regexp->source)); + assert(charSet->u.src.length <= jsstr_length(gData->regexp->source) - 1 - charSet->u.src.startIndex); charSet->converted = TRUE; - src = gData->regexp->source + charSet->u.src.startIndex; + src = gData->regexp->source->str + charSet->u.src.startIndex; end = src + charSet->u.src.length; @@ -2488,12 +2488,12 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, break; case REOP_FLAT: pc = ReadCompactIndex(pc, &offset); - assert(offset < SysStringLen(gData->regexp->source)); + assert(offset < jsstr_length(gData->regexp->source)); pc = ReadCompactIndex(pc, &length); assert(1 <= length); - assert(length <= SysStringLen(gData->regexp->source) - offset); + assert(length <= jsstr_length(gData->regexp->source) - offset); if (length <= (size_t)(gData->cpend - x->cp)) { - source = gData->regexp->source + offset; + source = gData->regexp->source->str + offset; TRACE("%s\n", debugstr_wn(source, length)); for (index = 0; index != length; index++) { if (source[index] != x->cp[index]) @@ -2513,11 +2513,11 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op, break; case REOP_FLATi: pc = ReadCompactIndex(pc, &offset); - assert(offset < SysStringLen(gData->regexp->source)); + assert(offset < jsstr_length(gData->regexp->source)); pc = ReadCompactIndex(pc, &length); assert(1 <= length); - assert(length <= SysStringLen(gData->regexp->source) - offset); - source = gData->regexp->source; + assert(length <= jsstr_length(gData->regexp->source) - offset); + source = gData->regexp->source->str; result = FlatNIMatcher(gData, x, source + offset, length); break; case REOP_FLAT1i: @@ -3218,7 +3218,7 @@ js_DestroyRegExp(JSRegExp *re) } static JSRegExp * -js_NewRegExp(script_ctx_t *cx, BSTR str, UINT flags, BOOL flat) +js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat) { JSRegExp *re; jsheap_t *mark; @@ -3230,10 +3230,10 @@ js_NewRegExp(script_ctx_t *cx, BSTR str, UINT flags, BOOL flat) re = NULL; mark = jsheap_mark(&cx->tmp_heap); - len = SysStringLen(str); + len = jsstr_length(str); state.context = cx; - state.cp = str; + state.cp = str->str; if (!state.cp) goto out; state.cpbegin = state.cp; @@ -3508,10 +3508,7 @@ static HRESULT RegExp_source(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns switch(flags) { case DISPATCH_PROPERTYGET: { RegExpInstance *This = regexp_from_vdisp(jsthis); - jsstr_t *ret = jsstr_alloc(This->str); - if(!ret) - return E_OUTOFMEMORY; - *r = jsval_string(ret); + *r = jsval_string(jsstr_addref(This->str)); break; } default: @@ -3789,7 +3786,7 @@ static void RegExp_destructor(jsdisp_t *dispex) if(This->jsregexp) js_DestroyRegExp(This->jsregexp); jsval_release(This->last_index_val); - SysFreeString(This->str); + jsstr_release(This->str); heap_free(This); } @@ -3853,25 +3850,19 @@ static HRESULT alloc_regexp(script_ctx_t *ctx, jsdisp_t *object_prototype, RegEx return S_OK; } -HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, jsdisp_t **ret) +HRESULT create_regexp(script_ctx_t *ctx, jsstr_t *src, DWORD flags, jsdisp_t **ret) { RegExpInstance *regexp; HRESULT hres; - TRACE("%s %x\n", debugstr_wn(exp, len), flags); + TRACE("%s %x\n", debugstr_jsstr(src), flags); hres = alloc_regexp(ctx, NULL, &regexp); if(FAILED(hres)) return hres; - if(len == -1) - regexp->str = SysAllocString(exp); - else - regexp->str = SysAllocStringLen(exp, len); - if(!regexp->str) { - jsdisp_release(&regexp->dispex); - return E_OUTOFMEMORY; - } + regexp->str = jsstr_addref(src); + regexp->last_index_val = jsval_number(0); regexp->jsregexp = js_NewRegExp(ctx, regexp->str, flags, FALSE); if(!regexp->jsregexp) { @@ -3880,8 +3871,6 @@ HRESULT create_regexp(script_ctx_t *ctx, const WCHAR *exp, int len, DWORD flags, return E_FAIL; } - regexp->last_index_val = jsval_number(0); - *ret = &regexp->dispex; return S_OK; } @@ -3900,7 +3889,7 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg if(is_class(obj, JSCLASS_REGEXP)) { RegExpInstance *regexp = (RegExpInstance*)obj; - hres = create_regexp(ctx, regexp->str, -1, regexp->jsregexp->flags, ret); + hres = create_regexp(ctx, regexp->str, regexp->jsregexp->flags, ret); jsdisp_release(obj); return hres; } @@ -3929,7 +3918,7 @@ HRESULT create_regexp_var(script_ctx_t *ctx, jsval_t src_arg, jsval_t *flags_arg if(FAILED(hres)) return hres; - return create_regexp(ctx, src->str, -1, flags, ret); + return create_regexp(ctx, src, flags, ret); } HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, jsstr_t *str, jsval_t *r) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 8fb6b07..5972061 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -577,7 +577,7 @@ static HRESULT String_match(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsi if(FAILED(hres)) return hres; - hres = create_regexp(ctx, match_str->str, jsstr_length(match_str), 0, &regexp); + hres = create_regexp(ctx, match_str, 0, &regexp); jsstr_release(match_str); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Use jsstr_t for compiler constant strings.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: be885e287bd0591e682984549faf0d26eed97974 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be885e287bd0591e682984549… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 12:17:17 2012 +0200 jscript: Use jsstr_t for compiler constant strings. --- dlls/jscript/compile.c | 60 ++++++++++++++++++++++++++++++++--------------- dlls/jscript/engine.c | 31 ++++++++---------------- dlls/jscript/engine.h | 6 ++++- 3 files changed, 56 insertions(+), 41 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 981ae96..2e18c50 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -75,7 +75,7 @@ static void dump_instr_arg(instr_arg_type_t type, instr_arg_t *arg) { switch(type) { case ARG_STR: - TRACE_(jscript_disas)("\t%s", debugstr_w(arg->str)); + TRACE_(jscript_disas)("\t%s", debugstr_jsstr(arg->str)); break; case ARG_BSTR: TRACE_(jscript_disas)("\t%s", debugstr_wn(arg->bstr, SysStringLen(arg->bstr))); @@ -119,16 +119,37 @@ static inline void *compiler_alloc(bytecode_t *code, size_t size) return jsheap_alloc(&code->heap, size); } -static WCHAR *compiler_alloc_string(bytecode_t *code, const WCHAR *str) +static jsstr_t *compiler_alloc_string_len(compiler_ctx_t *ctx, const WCHAR *str, unsigned len) { - size_t size; - WCHAR *ret; + jsstr_t *new_str; - size = (strlenW(str)+1)*sizeof(WCHAR); - ret = compiler_alloc(code, size); - if(ret) - memcpy(ret, str, size); - return ret; + if(!ctx->code->str_pool_size) { + ctx->code->str_pool = heap_alloc(8 * sizeof(jsstr_t*)); + if(!ctx->code->str_pool) + return NULL; + ctx->code->str_pool_size = 8; + }else if(ctx->code->str_pool_size == ctx->code->str_cnt) { + jsstr_t **new_pool; + + new_pool = heap_realloc(ctx->code->str_pool, ctx->code->str_pool_size*2*sizeof(jsstr_t*)); + if(!new_pool) + return NULL; + + ctx->code->str_pool = new_pool; + ctx->code->str_pool_size *= 2; + } + + new_str = jsstr_alloc_len(str, len); + if(!new_str) + return NULL; + + ctx->code->str_pool[ctx->code->str_cnt++] = new_str; + return new_str; +} + +static jsstr_t *compiler_alloc_string(compiler_ctx_t *ctx, const WCHAR *str) +{ + return compiler_alloc_string_len(ctx, str, strlenW(str)); } static BOOL ensure_bstr_slot(compiler_ctx_t *ctx) @@ -216,9 +237,9 @@ static HRESULT push_instr_int(compiler_ctx_t *ctx, jsop_t op, LONG arg) static HRESULT push_instr_str(compiler_ctx_t *ctx, jsop_t op, const WCHAR *arg) { unsigned instr; - WCHAR *str; + jsstr_t *str; - str = compiler_alloc_string(ctx->code, arg); + str = compiler_alloc_string(ctx, arg); if(!str) return E_OUTOFMEMORY; @@ -268,9 +289,9 @@ static HRESULT push_instr_bstr_uint(compiler_ctx_t *ctx, jsop_t op, const WCHAR static HRESULT push_instr_uint_str(compiler_ctx_t *ctx, jsop_t op, unsigned arg1, const WCHAR *arg2) { unsigned instr; - WCHAR *str; + jsstr_t *str; - str = compiler_alloc_string(ctx->code, arg2); + str = compiler_alloc_string(ctx, arg2); if(!str) return E_OUTOFMEMORY; @@ -711,7 +732,7 @@ static HRESULT compile_typeof_expression(compiler_ctx_t *ctx, unary_expression_t if(is_memberid_expr(expr->expression->type)) { if(expr->expression->type == EXPR_IDENT) - return push_instr_str(ctx, OP_typeofident, ((identifier_expression_t*)expr->expression)->identifier); + return push_instr_bstr(ctx, OP_typeofident, ((identifier_expression_t*)expr->expression)->identifier); op = OP_typeofid; hres = compile_memberid_expression(ctx, expr->expression, 0); @@ -738,13 +759,11 @@ static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) return push_instr_str(ctx, OP_str, literal->u.wstr); case LT_REGEXP: { unsigned instr; - WCHAR *str; + jsstr_t *str; - str = compiler_alloc(ctx->code, (literal->u.regexp.str_len+1)*sizeof(WCHAR)); + str = compiler_alloc_string_len(ctx, literal->u.regexp.str, literal->u.regexp.str_len); if(!str) return E_OUTOFMEMORY; - memcpy(str, literal->u.regexp.str, literal->u.regexp.str_len*sizeof(WCHAR)); - str[literal->u.regexp.str_len] = 0; instr = push_instr(ctx, OP_regexp); if(!instr) @@ -1796,10 +1815,13 @@ void release_bytecode(bytecode_t *code) for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); + for(i=0; i < code->str_cnt; i++) + jsstr_release(code->str_pool[i]); heap_free(code->source); jsheap_free(&code->heap); heap_free(code->bstr_pool); + heap_free(code->str_pool); heap_free(code->instrs); heap_free(code); } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 66e2b92..44c8333 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -549,7 +549,7 @@ static inline unsigned get_op_int(exec_ctx_t *ctx, int i){ return ctx->code->instrs[ctx->ip].u.arg[i].lng; } -static inline const WCHAR *get_op_str(exec_ctx_t *ctx, int i){ +static inline jsstr_t *get_op_str(exec_ctx_t *ctx, int i){ return ctx->code->instrs[ctx->ip].u.arg[i].str; } @@ -718,11 +718,11 @@ static HRESULT interp_throw_ref(exec_ctx_t *ctx) static HRESULT interp_throw_type(exec_ctx_t *ctx) { const HRESULT hres = get_op_uint(ctx, 0); - const WCHAR *str = get_op_str(ctx, 1); + jsstr_t *str = get_op_str(ctx, 1); - TRACE("%08x %s\n", hres, debugstr_w(str)); + TRACE("%08x %s\n", hres, debugstr_jsstr(str)); - return throw_type_error(ctx->script, hres, str); + return throw_type_error(ctx->script, hres, str->str); } /* ECMA-262 3rd Edition 12.14 */ @@ -1134,35 +1134,24 @@ static HRESULT interp_double(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 7.8.4 */ static HRESULT interp_str(exec_ctx_t *ctx) { - const WCHAR *arg = get_op_str(ctx, 0); - jsstr_t *str; - - TRACE("%s\n", debugstr_w(arg)); + jsstr_t *str = get_op_str(ctx, 0); - str = jsstr_alloc(arg); - if(!str) - return E_OUTOFMEMORY; + TRACE("%s\n", debugstr_jsstr(str)); - return stack_push(ctx, jsval_string(str)); + return stack_push(ctx, jsval_string(jsstr_addref(str))); } /* ECMA-262 3rd Edition 7.8 */ static HRESULT interp_regexp(exec_ctx_t *ctx) { - const WCHAR *source = get_op_str(ctx, 0); + jsstr_t *source = get_op_str(ctx, 0); const unsigned flags = get_op_uint(ctx, 1); jsdisp_t *regexp; - jsstr_t *src; HRESULT hres; - TRACE("%s %x\n", debugstr_w(source), flags); - - src = jsstr_alloc(source); - if(!src) - return E_OUTOFMEMORY; + TRACE("%s %x\n", debugstr_jsstr(source), flags); - hres = create_regexp(ctx->script, src, flags, &regexp); - jsstr_release(src); + hres = create_regexp(ctx->script, source, flags, &regexp); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 49232ee..9123a2b 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -121,7 +121,7 @@ OP_LIST typedef union { BSTR bstr; LONG lng; - WCHAR *str; + jsstr_t *str; unsigned uint; } instr_arg_t; @@ -175,6 +175,10 @@ typedef struct _bytecode_t { unsigned bstr_pool_size; unsigned bstr_cnt; + jsstr_t **str_pool; + unsigned str_pool_size; + unsigned str_cnt; + struct _bytecode_t *next; } bytecode_t;

1 0

Jacek Caban : jscript: Get rid of BSTR in date.c.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: c2df65eeef729323a3fd50b789a039c21e49a6a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2df65eeef729323a3fd50b78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 12:17:37 2012 +0200 jscript: Get rid of BSTR in date.c. --- dlls/jscript/date.c | 101 +++++++++++++++------------------------------------ 1 files changed, 29 insertions(+), 72 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 6ce1f46..ebf1454 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -22,6 +22,7 @@ #include <limits.h> #include <math.h> +#include <assert.h> #include "jscript.h" @@ -490,10 +491,10 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; BOOL formatAD = TRUE; - BSTR week, month; + WCHAR week[64], month[64]; jsstr_t *date_str; int len, size, year, day; - DWORD lcid_en, week_id, month_id; + DWORD lcid_en; WCHAR sign = '-'; if(isnan(time)) { @@ -507,22 +508,11 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - week_id = week_ids[(int)week_day(time)]; - size = GetLocaleInfoW(lcid_en, week_id, NULL, 0); - week = SysAllocStringLen(NULL, size); - if(!week) - return E_OUTOFMEMORY; - GetLocaleInfoW(lcid_en, week_id, week, size); + size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); + assert(size); len += size-1; - month_id = month_ids[(int)month_from_time(time)]; - size = GetLocaleInfoW(lcid_en, month_id, NULL, 0); - month = SysAllocStringLen(NULL, size); - if(!month) { - SysFreeString(week); - return E_OUTOFMEMORY; - } - GetLocaleInfoW(lcid_en, month_id, month, size); + size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); len += size-1; year = year_from_time(time); @@ -555,11 +545,8 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, } date_str = jsstr_alloc_buf(len); - if(!date_str) { - SysFreeString(week); - SysFreeString(month); + if(!date_str) return E_OUTOFMEMORY; - } if(!show_offset) sprintfW(date_str->str, formatNoOffsetW, week, month, day, @@ -575,9 +562,6 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), year, formatAD?ADW:BCW); - SysFreeString(week); - SysFreeString(month); - *r = jsval_string(date_str); } return S_OK; @@ -681,11 +665,11 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; BOOL formatAD = TRUE; - BSTR week, month; + WCHAR week[64], month[64]; DateInstance *date; jsstr_t *date_str; int len, size, year, day; - DWORD lcid_en, week_id, month_id; + DWORD lcid_en; if(!(date = date_this(jsthis))) return throw_type_error(ctx, JS_E_DATE_EXPECTED, NULL); @@ -701,22 +685,10 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - week_id = week_ids[(int)week_day(date->time)]; - size = GetLocaleInfoW(lcid_en, week_id, NULL, 0); - week = SysAllocStringLen(NULL, size); - if(!week) - return E_OUTOFMEMORY; - GetLocaleInfoW(lcid_en, week_id, week, size); + size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(date->time)], week, sizeof(week)/sizeof(*week)); len += size-1; - month_id = month_ids[(int)month_from_time(date->time)]; - size = GetLocaleInfoW(lcid_en, month_id, NULL, 0); - month = SysAllocStringLen(NULL, size); - if(!month) { - SysFreeString(week); - return E_OUTOFMEMORY; - } - GetLocaleInfoW(lcid_en, month_id, month, size); + size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(date->time)], month, sizeof(month)/sizeof(*month)); len += size-1; year = year_from_time(date->time); @@ -791,11 +763,11 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) LOCALE_SABBREVMONTHNAME11, LOCALE_SABBREVMONTHNAME12 }; BOOL formatAD = TRUE; - BSTR week, month; + WCHAR week[64], month[64]; jsstr_t *date_str; DOUBLE time; int len, size, year, day; - DWORD lcid_en, week_id, month_id; + DWORD lcid_en; if(isnan(date->time)) { if(r) @@ -810,22 +782,12 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - week_id = week_ids[(int)week_day(time)]; - size = GetLocaleInfoW(lcid_en, week_id, NULL, 0); - week = SysAllocStringLen(NULL, size); - if(!week) - return E_OUTOFMEMORY; - GetLocaleInfoW(lcid_en, week_id, week, size); + size = GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); + assert(size); len += size-1; - month_id = month_ids[(int)month_from_time(time)]; - size = GetLocaleInfoW(lcid_en, month_id, NULL, 0); - month = SysAllocStringLen(NULL, size); - if(!month) { - SysFreeString(week); - return E_OUTOFMEMORY; - } - GetLocaleInfoW(lcid_en, month_id, month, size); + size = GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); + assert(size); len += size-1; year = year_from_time(time); @@ -851,16 +813,10 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) day = date_from_time(time); date_str = jsstr_alloc_buf(len); - if(!date_str) { - SysFreeString(week); - SysFreeString(month); + if(!date_str) return E_OUTOFMEMORY; - } sprintfW(date_str->str, formatAD?formatADW:formatBCW, week, month, day, year); - SysFreeString(week); - SysFreeString(month); - *r = jsval_string(date_str); } return S_OK; @@ -2073,9 +2029,8 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { LOCALE_SMONTHNAME1, LOCALE_SDAYNAME7, LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6 }; - BSTR strings[sizeof(string_ids)/sizeof(DWORD)]; - - BSTR parse; + WCHAR *strings[sizeof(string_ids)/sizeof(DWORD)]; + WCHAR *parse; int input_len, parse_len = 0, nest_level = 0, i, size; int year = 0, month = 0, day = 0, hour = 0, min = 0, sec = 0; int ms = 0, offset = 0, hour_adjust = 0; @@ -2102,7 +2057,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { else if(!nest_level) parse_len++; } - parse = SysAllocStringLen(NULL, parse_len); + parse = heap_alloc((parse_len+1)*sizeof(WCHAR)); if(!parse) return E_OUTOFMEMORY; nest_level = 0; @@ -2112,6 +2067,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { else if(input[i] == ')') nest_level--; else if(!nest_level) parse[parse_len++] = toupperW(input[i]); } + parse[parse_len] = 0; GetTimeZoneInformation(&tzi); di.bias = tzi.Bias; @@ -2120,15 +2076,16 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { di.daylightDate = tzi.DaylightDate; di.daylightBias = tzi.DaylightBias; + /* FIXME: Cache strings */ lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); for(i=0; i<sizeof(string_ids)/sizeof(DWORD); i++) { size = GetLocaleInfoW(lcid_en, string_ids[i], NULL, 0); - strings[i] = SysAllocStringLen(NULL, size); + strings[i] = heap_alloc((size+1)*sizeof(WCHAR)); if(!strings[i]) { i--; while(i-- >= 0) - SysFreeString(strings[i]); - SysFreeString(parse); + heap_free(strings[i]); + heap_free(parse); return E_OUTOFMEMORY; } GetLocaleInfoW(lcid_en, string_ids[i], strings[i], size); @@ -2290,7 +2247,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { size -= i; for(j=0; j<sizeof(string_ids)/sizeof(DWORD); j++) - if(!memicmpW(&parse[i], strings[j], size)) break; + if(!strncmpiW(&parse[i], strings[j], size)) break; if(j < 12) { if(set_month) break; @@ -2323,8 +2280,8 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { } for(i=0; i<sizeof(string_ids)/sizeof(DWORD); i++) - SysFreeString(strings[i]); - SysFreeString(parse); + heap_free(strings[i]); + heap_free(parse); return S_OK; }

1 0

Jacek Caban : mshtml: Don' t run noscript tests in enhanced security configuration.
by Alexandre Julliard 11 Oct '12

11 Oct '12

Module: wine Branch: master Commit: 45b29f95550a3a8852e110b4e3b1af3c0d08a539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b29f95550a3a8852e110b4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 11 14:07:08 2012 +0200 mshtml: Don't run noscript tests in enhanced security configuration. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f7bba1d..7f1682e 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6564,6 +6564,7 @@ START_TEST(dom) if (winetest_interactive || ! is_ie_hardened()) { run_domtest(elem_test_str, test_elems); run_domtest(elem_test2_str, test_elems2); + run_domtest(noscript_str, test_noscript); }else { skip("IE running in Enhanced Security Configuration\n"); } @@ -6575,7 +6576,6 @@ START_TEST(dom) run_domtest(frameset_str, test_frameset); run_domtest(emptydiv_str, test_docfrag); run_domtest(doc_blank, test_replacechild_elems); - run_domtest(noscript_str, test_noscript); CoUninitialize(); }

1 0