March 2012 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32: Update thumb position on autopage instead of deferring it.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: f296c84feb94b8bb7f2194c77356c0b86decd9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f296c84feb94b8bb7f2194c77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 13 10:47:41 2012 +0300 comctl32: Update thumb position on autopage instead of deferring it. --- dlls/comctl32/trackbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 22d5945..99fde1b 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -457,7 +457,7 @@ TRACKBAR_AutoPage (TRACKBAR_INFO *infoPtr, POINT clickPoint) TRACKBAR_PageUp(infoPtr); else return FALSE; - infoPtr->flags |= TB_THUMBPOSCHANGED; + TRACKBAR_UpdateThumb (infoPtr); TRACKBAR_InvalidateThumbMove (infoPtr, prevPos, infoPtr->lPos); return TRUE;

1 0

Jacek Caban : jscript: Store bytecode_t in exec_ctx_t.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 9f83c6061fd55e41a725fc8ad3f3c845bed82f3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f83c6061fd55e41a725fc8ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:21:27 2012 +0100 jscript: Store bytecode_t in exec_ctx_t. --- dlls/jscript/engine.c | 80 +++++++++++++++++++++++++----------------------- dlls/jscript/engine.h | 1 + 2 files changed, 43 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9f83c6061fd55e41a725f…

1 0

Jacek Caban : jscript: Simplify compile_subscript_stat.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 4fb1cad149eb3c225a2fd27c261db0f2ba445494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fb1cad149eb3c225a2fd27c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:21:42 2012 +0100 jscript: Simplify compile_subscript_stat. --- dlls/jscript/compile.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8569c53..0a84aef 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1756,10 +1756,7 @@ HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL fro return hres; off = parser->compiler->code_off; - if(stat->next) - hres = compile_block_statement(parser->compiler, stat); - else - hres = compile_statement(parser->compiler, NULL, stat); + hres = compile_block_statement(parser->compiler, stat); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Compile all function from given source in one run.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 825eb76321d3a7aaaa9c0d7ddc6081ba6e0ce277 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825eb76321d3a7aaaa9c0d7dd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:22:36 2012 +0100 jscript: Compile all function from given source in one run. --- dlls/jscript/compile.c | 39 +++++++++++++++++++++++++++------------ dlls/jscript/engine.c | 12 +++++------- dlls/jscript/engine.h | 4 ++-- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 6 +++--- dlls/jscript/parser.y | 25 +++++++++++++------------ 7 files changed, 52 insertions(+), 38 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 0a84aef..8d1487b 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1744,32 +1744,47 @@ static HRESULT init_compiler(parser_ctx_t *parser) return S_OK; } -HRESULT compile_subscript_stat(parser_ctx_t *parser, statement_t *stat, BOOL from_eval, unsigned *ret_off) +static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, BOOL from_eval) { + function_declaration_t *iter; unsigned off; HRESULT hres; TRACE("\n"); - hres = init_compiler(parser); + off = ctx->code_off; + hres = compile_block_statement(ctx, source->statement); if(FAILED(hres)) return hres; - off = parser->compiler->code_off; - hres = compile_block_statement(parser->compiler, stat); - if(FAILED(hres)) - return hres; + resolve_labels(ctx, off); - resolve_labels(parser->compiler, off); - - if(!from_eval && !push_instr(parser->compiler, OP_pop)) + if(!from_eval && !push_instr(ctx, OP_pop)) return E_OUTOFMEMORY; - if(!push_instr(parser->compiler, OP_ret)) + if(!push_instr(ctx, OP_ret)) return E_OUTOFMEMORY; if(TRACE_ON(jscript_disas)) - dump_code(parser->compiler, off); + dump_code(ctx, off); + + source->instr_off = off; + + for(iter = source->functions; iter; iter = iter->next) { + hres = compile_function(ctx, iter->expr->source_elements, FALSE); + if(FAILED(hres)) + return hres; + } - *ret_off = off; return S_OK; } + +HRESULT compile_script(parser_ctx_t *parser, BOOL from_eval) +{ + HRESULT hres; + + hres = init_compiler(parser); + if(FAILED(hres)) + return hres; + + return compile_function(parser->compiler, parser->source, from_eval); +} diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a949f5c..37e0f66 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2581,6 +2581,9 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so jsdisp_t *func_obj; VARIANT var; + if(!func->expr->identifier) + continue; + hres = create_source_function(parser, func->expr->parameter_list, func->expr->source_elements, ctx->scope_chain, func->expr->src_str, func->expr->src_len, &func_obj); if(FAILED(hres)) @@ -2615,13 +2618,8 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so ctx->parser = parser; if(source->statement) { - if(!source->instr_off) { - hres = compile_subscript_stat(ctx->parser, source->statement, from_eval, &source->instr_off); - if(FAILED(hres) && is_jscript_error(hres)) - hres = throw_syntax_error(script, ei, hres, NULL); - } - if(SUCCEEDED(hres)) - hres = enter_bytecode(script, parser->code, source->instr_off, ei, &val); + assert(source->instr_off); + hres = enter_bytecode(script, parser->code, source->instr_off, ei, &val); }else { V_VT(&val) = VT_EMPTY; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f608374..7135578 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -188,7 +188,7 @@ typedef struct _parser_ctx_t { struct _parser_ctx_t *next; } parser_ctx_t; -HRESULT script_parse(script_ctx_t*,const WCHAR*,const WCHAR*,parser_ctx_t**) DECLSPEC_HIDDEN; +HRESULT script_parse(script_ctx_t*,const WCHAR*,const WCHAR*,BOOL,parser_ctx_t**) DECLSPEC_HIDDEN; void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; @@ -577,4 +577,4 @@ typedef struct { prop_val_t *property_list; } property_value_expression_t; -HRESULT compile_subscript_stat(parser_ctx_t*,statement_t*,BOOL,unsigned*) DECLSPEC_HIDDEN; +HRESULT compile_script(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 8b57721..abccae5 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -774,7 +774,7 @@ static HRESULT construct_function(script_ctx_t *ctx, DISPPARAMS *dp, jsexcept_t if(FAILED(hres)) return hres; - hres = script_parse(ctx, str, NULL, &parser); + hres = script_parse(ctx, str, NULL, FALSE, &parser); heap_free(str); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 35f6b2f..620b554 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -371,7 +371,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS } TRACE("parsing %s\n", debugstr_w(V_BSTR(arg))); - hres = script_parse(ctx, V_BSTR(arg), NULL, &parser_ctx); + hres = script_parse(ctx, V_BSTR(arg), NULL, TRUE, &parser_ctx); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_w(V_BSTR(arg)), hres); return throw_syntax_error(ctx, ei, hres, NULL); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 45edeb1..8b0c28b 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -762,7 +762,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = script_parse(This->ctx, pstrCode, pstrDelimiter, &parser_ctx); + hres = script_parse(This->ctx, pstrCode, pstrDelimiter, FALSE, &parser_ctx); if(FAILED(hres)) return hres; @@ -775,8 +775,8 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, } hres = exec_global_code(This, parser_ctx); - parser_release(parser_ctx); + parser_release(parser_ctx); return hres; } @@ -829,7 +829,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = script_parse(This->ctx, pstrCode, pstrDelimiter, &parser_ctx); + hres = script_parse(This->ctx, pstrCode, pstrDelimiter, FALSE, &parser_ctx); if(FAILED(hres)) { WARN("Parse failed %08x\n", hres); return hres; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 7938968..2a42034 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1315,6 +1315,7 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide parameter_list_t *parameter_list, source_elements_t *source_elements, const WCHAR *src_str, DWORD src_len) { function_expression_t *ret = new_expression(ctx, EXPR_FUNC, sizeof(*ret)); + function_declaration_t *decl; ret->identifier = identifier; ret->parameter_list = parameter_list ? parameter_list->head : NULL; @@ -1322,17 +1323,15 @@ static expression_t *new_function_expression(parser_ctx_t *ctx, const WCHAR *ide ret->src_str = src_str; ret->src_len = src_len; - if(ret->identifier) { - function_declaration_t *decl = parser_alloc(ctx, sizeof(function_declaration_t)); + decl = parser_alloc(ctx, sizeof(function_declaration_t)); - decl->expr = ret; - decl->next = NULL; + decl->expr = ret; + decl->next = NULL; - if(ctx->func_stack->func_tail) - ctx->func_stack->func_tail = ctx->func_stack->func_tail->next = decl; - else - ctx->func_stack->func_head = ctx->func_stack->func_tail = decl; - } + if(ctx->func_stack->func_tail) + ctx->func_stack->func_tail = ctx->func_stack->func_tail->next = decl; + else + ctx->func_stack->func_head = ctx->func_stack->func_tail = decl; return &ret->expr; } @@ -1546,7 +1545,7 @@ void parser_release(parser_ctx_t *ctx) heap_free(ctx); } -HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter, +HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter, BOOL from_eval, parser_ctx_t **ret) { parser_ctx_t *parser_ctx; @@ -1582,8 +1581,10 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite parser_parse(parser_ctx); jsheap_clear(mark); - if(FAILED(parser_ctx->hres)) { - hres = parser_ctx->hres; + hres = parser_ctx->hres; + if(SUCCEEDED(hres)) + hres = compile_script(parser_ctx, from_eval); + if(FAILED(hres)) { parser_release(parser_ctx); return hres; }

1 0

Jacek Caban : jscript: Call script_parse from compile_script, not the other way around.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: be29a73845461aff1ae5c6572699127be87d4005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be29a73845461aff1ae5c6572… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:22:59 2012 +0100 jscript: Call script_parse from compile_script, not the other way around. --- dlls/jscript/compile.c | 17 ++++++++++++++--- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- dlls/jscript/parser.y | 2 -- 6 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8d1487b..dc6f099 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1778,13 +1778,24 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, return S_OK; } -HRESULT compile_script(parser_ctx_t *parser, BOOL from_eval) +HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter, BOOL from_eval, + parser_ctx_t **ret) { + parser_ctx_t *parser; HRESULT hres; - hres = init_compiler(parser); + hres = script_parse(ctx, code, delimiter, from_eval, &parser); if(FAILED(hres)) return hres; - return compile_function(parser->compiler, parser->source, from_eval); + hres = init_compiler(parser); + if(SUCCEEDED(hres)) + hres = compile_function(parser->compiler, parser->source, from_eval); + if(FAILED(hres)) { + parser_release(parser); + return hres; + } + + *ret = parser; + return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7135578..73553b6 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -577,4 +577,4 @@ typedef struct { prop_val_t *property_list; } property_value_expression_t; -HRESULT compile_script(parser_ctx_t*,BOOL) DECLSPEC_HIDDEN; +HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,BOOL,parser_ctx_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index abccae5..23f7e47 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -774,7 +774,7 @@ static HRESULT construct_function(script_ctx_t *ctx, DISPPARAMS *dp, jsexcept_t if(FAILED(hres)) return hres; - hres = script_parse(ctx, str, NULL, FALSE, &parser); + hres = compile_script(ctx, str, NULL, FALSE, &parser); heap_free(str); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 620b554..8a6fe38 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -371,7 +371,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS } TRACE("parsing %s\n", debugstr_w(V_BSTR(arg))); - hres = script_parse(ctx, V_BSTR(arg), NULL, TRUE, &parser_ctx); + hres = compile_script(ctx, V_BSTR(arg), NULL, TRUE, &parser_ctx); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_w(V_BSTR(arg)), hres); return throw_syntax_error(ctx, ei, hres, NULL); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8b0c28b..81c8f21 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -762,7 +762,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = script_parse(This->ctx, pstrCode, pstrDelimiter, FALSE, &parser_ctx); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, FALSE, &parser_ctx); if(FAILED(hres)) return hres; @@ -829,7 +829,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = script_parse(This->ctx, pstrCode, pstrDelimiter, FALSE, &parser_ctx); + hres = compile_script(This->ctx, pstrCode, pstrDelimiter, FALSE, &parser_ctx); if(FAILED(hres)) { WARN("Parse failed %08x\n", hres); return hres; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 2a42034..66b5476 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1582,8 +1582,6 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite parser_parse(parser_ctx); jsheap_clear(mark); hres = parser_ctx->hres; - if(SUCCEEDED(hres)) - hres = compile_script(parser_ctx, from_eval); if(FAILED(hres)) { parser_release(parser_ctx); return hres;

1 0

Jacek Caban : jscript: Don't store compiler_ctx_t in parser_ctx_t.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 9d4b0bd502d396957fc1983c7b3aaf556ba3ba5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d4b0bd502d396957fc1983c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:23:19 2012 +0100 jscript: Don't store compiler_ctx_t in parser_ctx_t. --- dlls/jscript/compile.c | 49 +++++++++++++++-------------------------------- dlls/jscript/engine.h | 5 ---- dlls/jscript/parser.y | 2 - 3 files changed, 16 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index dc6f099..40ad782 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -40,7 +40,7 @@ typedef struct _statement_ctx_t { struct _statement_ctx_t *next; } statement_ctx_t; -struct _compiler_ctx_t { +typedef struct { parser_ctx_t *parser; bytecode_t *code; @@ -52,7 +52,7 @@ struct _compiler_ctx_t { unsigned labels_cnt; statement_ctx_t *stat_ctx; -}; +} compiler_ctx_t; static const struct { const char *op_str; @@ -1703,44 +1703,22 @@ void release_bytecode(bytecode_t *code) heap_free(code); } -void release_compiler(compiler_ctx_t *ctx) +static HRESULT init_code(compiler_ctx_t *compiler) { - heap_free(ctx); -} - -static HRESULT init_compiler(parser_ctx_t *parser) -{ - compiler_ctx_t *compiler; - - if(parser->compiler) - return S_OK; - - compiler = heap_alloc_zero(sizeof(*compiler)); - if(!compiler) - return E_OUTOFMEMORY; - compiler->code = heap_alloc_zero(sizeof(bytecode_t)); - if(!compiler->code) { - release_compiler(compiler); + if(!compiler->code) return E_OUTOFMEMORY; - } jsheap_init(&compiler->code->heap); compiler->code->instrs = heap_alloc(64 * sizeof(instr_t)); if(!compiler->code->instrs) { release_bytecode(compiler->code); - release_compiler(compiler); return E_OUTOFMEMORY; } compiler->code_size = 64; compiler->code_off = 1; - - compiler->parser = parser; - - parser->code = compiler->code; - parser->compiler = compiler; return S_OK; } @@ -1781,21 +1759,26 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimiter, BOOL from_eval, parser_ctx_t **ret) { - parser_ctx_t *parser; + compiler_ctx_t compiler = {0}; HRESULT hres; - hres = script_parse(ctx, code, delimiter, from_eval, &parser); + hres = script_parse(ctx, code, delimiter, from_eval, &compiler.parser); if(FAILED(hres)) return hres; - hres = init_compiler(parser); - if(SUCCEEDED(hres)) - hres = compile_function(parser->compiler, parser->source, from_eval); + hres = init_code(&compiler); + if(SUCCEEDED(hres)) { + hres = compile_function(&compiler, compiler.parser->source, from_eval); + if(FAILED(hres)) + release_bytecode(compiler.code); + } + if(FAILED(hres)) { - parser_release(parser); + parser_release(compiler.parser); return hres; } - *ret = parser; + compiler.parser->code = compiler.code; + *ret = compiler.parser; return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 73553b6..1c4f49a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -160,10 +160,6 @@ typedef struct { void release_bytecode(bytecode_t*); -typedef struct _compiler_ctx_t compiler_ctx_t; - -void release_compiler(compiler_ctx_t*); - typedef struct _parser_ctx_t { LONG ref; @@ -183,7 +179,6 @@ typedef struct _parser_ctx_t { func_stack_t *func_stack; bytecode_t *code; - compiler_ctx_t *compiler; struct _parser_ctx_t *next; } parser_ctx_t; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 66b5476..41a99c4 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1537,8 +1537,6 @@ void parser_release(parser_ctx_t *ctx) if(ctx->code) release_bytecode(ctx->code); - if(ctx->compiler) - release_compiler(ctx->compiler); script_release(ctx->script); heap_free(ctx->begin); jsheap_free(&ctx->heap);

1 0

Jacek Caban : jscript: Store script context in exec_ctx_t.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: 8c347fd71d850fadea511cfa1b52f6c537c469eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c347fd71d850fadea511cfa1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:23:56 2012 +0100 jscript: Store script context in exec_ctx_t. --- dlls/jscript/engine.c | 141 +++++++++++++++++++++++++----------------------- dlls/jscript/engine.h | 1 + 2 files changed, 74 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c347fd71d850fadea511…

1 0

Jacek Caban : jscript: Store parser_ctx_t in bytecode_t instead of other way around.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: a1c4c840055159c2ffa02b55d618857e1a635f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c4c840055159c2ffa02b55d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:24:22 2012 +0100 jscript: Store parser_ctx_t in bytecode_t instead of other way around. --- dlls/jscript/compile.c | 24 ++++++++++++------ dlls/jscript/engine.c | 23 +++++++----------- dlls/jscript/engine.h | 60 +++++++++++++++++++++++++--------------------- dlls/jscript/function.c | 30 ++++++++++++----------- dlls/jscript/global.c | 8 +++--- dlls/jscript/jscript.c | 34 +++++++++++++------------- dlls/jscript/parser.y | 2 - 7 files changed, 95 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a1c4c840055159c2ffa02…

1 0

Jacek Caban : jscript: Removed no longer needed ref counting in parser_ctx_t.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: a6ee63eef35c54b0c651d36f8ddb8883e727d3fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ee63eef35c54b0c651d36f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 12 19:24:34 2012 +0100 jscript: Removed no longer needed ref counting in parser_ctx_t. --- dlls/jscript/engine.h | 7 ------- dlls/jscript/parser.y | 4 ---- 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 65b3a60..040b3c4 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -43,8 +43,6 @@ typedef struct _func_stack { } func_stack_t; typedef struct { - LONG ref; - WCHAR *begin; const WCHAR *end; const WCHAR *ptr; @@ -196,11 +194,6 @@ void parser_release(parser_ctx_t*) DECLSPEC_HIDDEN; int parser_lex(void*,parser_ctx_t*) DECLSPEC_HIDDEN; -static inline void parser_addref(parser_ctx_t *ctx) -{ - ctx->ref++; -} - static inline void *parser_alloc(parser_ctx_t *ctx, DWORD size) { return jsheap_alloc(&ctx->heap, size); diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index af6933f..717a95c 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1532,9 +1532,6 @@ static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) void parser_release(parser_ctx_t *ctx) { - if(--ctx->ref) - return; - script_release(ctx->script); heap_free(ctx->begin); jsheap_free(&ctx->heap); @@ -1554,7 +1551,6 @@ HRESULT script_parse(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimite if(!parser_ctx) return E_OUTOFMEMORY; - parser_ctx->ref = 1; parser_ctx->hres = JS_E_SYNTAX; parser_ctx->is_html = delimiter && !strcmpiW(delimiter, html_tagW);

1 0

Kusanagi Kouichi : gdi32: Add a helper function to find font link.
by Alexandre Julliard 13 Mar '12

13 Mar '12

Module: wine Branch: master Commit: e86519c9b36ea78c3904aac3ceb698d06b864516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86519c9b36ea78c3904aac3c… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Thu Mar 8 22:32:49 2012 +0900 gdi32: Add a helper function to find font link. --- dlls/gdi32/freetype.c | 102 +++++++++++++++++++++++------------------------- 1 files changed, 49 insertions(+), 53 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 8a0c096..3056462 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1978,6 +1978,19 @@ static const struct font_links_defaults_list }; +static SYSTEM_LINKS *find_font_link(const WCHAR *name) +{ + SYSTEM_LINKS *font_link; + + LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + { + if(!strcmpiW(font_link->font_name, name)) + return font_link; + } + + return NULL; +} + static void populate_system_links(const WCHAR *name, const WCHAR *const *values) { const WCHAR *value; @@ -1992,7 +2005,6 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) if (values) { SYSTEM_LINKS *font_link; - BOOL existing = FALSE; memset(&fs, 0, sizeof(fs)); psub = get_font_subst(&font_subst_list, name, -1); @@ -2003,20 +2015,13 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) return; } - LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) - { - if(!strcmpiW(font_link->font_name, name)) - { - existing = TRUE; - break; - } - } - - if (!existing) + font_link = find_font_link(name); + if (font_link == NULL) { font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link)); font_link->font_name = strdupW(name); list_init(&font_link->links); + list_add_tail(&system_links, &font_link->entry); } for (i = 0; values[i] != NULL; i++) @@ -2076,8 +2081,6 @@ static void populate_system_links(const WCHAR *name, const WCHAR *const *values) face->fs_links = fs; } } - if (!existing) - list_add_tail(&system_links, &font_link->entry); } } @@ -2225,22 +2228,19 @@ skip_internal: TRACE("Found Tahoma in %s index %ld\n", child_font->face->file, child_font->face->face_index); list_add_tail(&system_font_link->links, &child_font->entry); } - LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + font_link = find_font_link(Tahoma); + if (font_link != NULL) { - if(!strcmpiW(font_link->font_name, Tahoma)) + CHILD_FONT *font_link_entry; + LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) { - CHILD_FONT *font_link_entry; - LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) - { - CHILD_FONT *new_child; - new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); - new_child->face = font_link_entry->face; - new_child->font = NULL; - fs.fsCsb[0] |= font_link_entry->face->fs.fsCsb[0]; - fs.fsCsb[1] |= font_link_entry->face->fs.fsCsb[1]; - list_add_tail(&system_font_link->links, &new_child->entry); - } - break; + CHILD_FONT *new_child; + new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); + new_child->face = font_link_entry->face; + new_child->font = NULL; + fs.fsCsb[0] |= font_link_entry->face->fs.fsCsb[0]; + fs.fsCsb[1] |= font_link_entry->face->fs.fsCsb[1]; + list_add_tail(&system_font_link->links, &new_child->entry); } } family = find_family_from_name(system_font_link->font_name); @@ -3793,22 +3793,19 @@ static BOOL create_child_font_list(GdiFont *font) psub = get_font_subst(&font_subst_list, font->name, -1); font_name = psub ? psub->to.name : font->name; - LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + font_link = find_font_link(font_name); + if (font_link != NULL) { - if(!strcmpiW(font_link->font_name, font_name)) + TRACE("found entry in system list\n"); + LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) { - TRACE("found entry in system list\n"); - LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) - { - new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); - new_child->face = font_link_entry->face; - new_child->font = NULL; - list_add_tail(&font->child_fonts, &new_child->entry); - TRACE("font %s %ld\n", debugstr_a(new_child->face->file), new_child->face->face_index); - } - ret = TRUE; - break; + new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); + new_child->face = font_link_entry->face; + new_child->font = NULL; + list_add_tail(&font->child_fonts, &new_child->entry); + TRACE("font %s %ld\n", debugstr_a(new_child->face->file), new_child->face->face_index); } + ret = TRUE; } /* * if not SYMBOL or OEM then we also get all the fonts for Microsoft @@ -3817,23 +3814,22 @@ static BOOL create_child_font_list(GdiFont *font) if (use_default_fallback && font->charset != SYMBOL_CHARSET && font->charset != OEM_CHARSET && strcmpiW(font_name,szDefaultFallbackLink) != 0) - LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + { + font_link = find_font_link(szDefaultFallbackLink); + if (font_link != NULL) { - if(!strcmpiW(font_link->font_name,szDefaultFallbackLink)) + TRACE("found entry in default fallback list\n"); + LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) { - TRACE("found entry in default fallback list\n"); - LIST_FOR_EACH_ENTRY(font_link_entry, &font_link->links, CHILD_FONT, entry) - { - new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); - new_child->face = font_link_entry->face; - new_child->font = NULL; - list_add_tail(&font->child_fonts, &new_child->entry); - TRACE("font %s %ld\n", debugstr_a(new_child->face->file), new_child->face->face_index); - } - ret = TRUE; - break; + new_child = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_child)); + new_child->face = font_link_entry->face; + new_child->font = NULL; + list_add_tail(&font->child_fonts, &new_child->entry); + TRACE("font %s %ld\n", debugstr_a(new_child->face->file), new_child->face->face_index); } + ret = TRUE; } + } return ret; }

1 0