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

Vincent Povirk : gdiplus: Implement GdipSetPathGradientBlend, with tests.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: b66fd44080b3a78d68f5dbe73005141b3f71bc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66fd44080b3a78d68f5dbe73… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 09:44:43 2012 -0500 gdiplus: Implement GdipSetPathGradientBlend, with tests. --- dlls/gdiplus/brush.c | 29 ++++++++++-- dlls/gdiplus/tests/brush.c | 105 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index b05d74a..5c82064 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1432,14 +1432,35 @@ GpStatus WINGDIPAPI GdipSetLineWrapMode(GpLineGradient *line, GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient *brush, GDIPCONST REAL *blend, GDIPCONST REAL *pos, INT count) { - static int calls; + REAL *new_blendfac, *new_blendpos; TRACE("(%p,%p,%p,%i)\n", brush, blend, pos, count); - if(!(calls++)) - FIXME("not implemented\n"); + if(!brush || !blend || !pos || count <= 0 || + (count >= 2 && (pos[0] != 0.0f || pos[count-1] != 1.0f))) + return InvalidParameter; - return NotImplemented; + new_blendfac = GdipAlloc(count * sizeof(REAL)); + new_blendpos = GdipAlloc(count * sizeof(REAL)); + + if (!new_blendfac || !new_blendpos) + { + GdipFree(new_blendfac); + GdipFree(new_blendpos); + return OutOfMemory; + } + + memcpy(new_blendfac, blend, count * sizeof(REAL)); + memcpy(new_blendpos, pos, count * sizeof(REAL)); + + GdipFree(brush->blendfac); + GdipFree(brush->blendpos); + + brush->blendcount = count; + brush->blendfac = new_blendfac; + brush->blendpos = new_blendpos; + + return Ok; } GpStatus WINGDIPAPI GdipSetPathGradientLinearBlend(GpPathGradient *brush, diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index bf74abd..354d60d 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1133,6 +1133,110 @@ static void test_pathgradientpresetblend(void) expect(Ok, status); } +static void test_pathgradientblend(void) +{ + static const GpPointF path_points[] = {{0,0}, {3,0}, {0,4}}; + GpPathGradient *brush; + GpStatus status; + INT count, i; + const REAL factors[5] = {0.0f, 0.1f, 0.5f, 0.9f, 1.0f}; + const REAL positions[5] = {0.0f, 0.2f, 0.5f, 0.8f, 1.0f}; + REAL res_factors[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + + status = GdipCreatePathGradient(path_points, 3, WrapModeClamp, &brush); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlendCount(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetPathGradientBlend(NULL, res_factors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, NULL, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, NULL, 1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, -1); + expect(InvalidParameter, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 2); + expect(Ok, status); + + status = GdipSetPathGradientBlend(NULL, factors, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, NULL, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, NULL, 5); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 0); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, -1); + expect(InvalidParameter, status); + + /* leave off the 0.0 position */ + status = GdipSetPathGradientBlend(brush, &factors[1], &positions[1], 4); + expect(InvalidParameter, status); + + /* leave off the 1.0 position */ + status = GdipSetPathGradientBlend(brush, factors, positions, 4); + expect(InvalidParameter, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 5); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(5, count); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 4); + expect(InsufficientBuffer, status); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 5); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expectf(factors[i], res_factors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 6); + expect(Ok, status); + + status = GdipSetPathGradientBlend(brush, factors, positions, 1); + expect(Ok, status); + + status = GdipGetPathGradientBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetPathGradientBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1160,6 +1264,7 @@ START_TEST(brush) test_pathgradientpath(); test_pathgradientcenterpoint(); test_pathgradientpresetblend(); + test_pathgradientblend(); GdiplusShutdown(gdiplusToken); }

1 0

Vincent Povirk : gdiplus: Implement GdipSetPathGradientLinearBlend.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: d0a85604d532bb8f4cc3cd1a07ce525facb0dc65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0a85604d532bb8f4cc3cd1a0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 09:50:33 2012 -0500 gdiplus: Implement GdipSetPathGradientLinearBlend. --- dlls/gdiplus/brush.c | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 5c82064..490a0b9 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1466,14 +1466,33 @@ GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient *brush, GDIPCONST RE GpStatus WINGDIPAPI GdipSetPathGradientLinearBlend(GpPathGradient *brush, REAL focus, REAL scale) { - static int calls; + REAL factors[3]; + REAL positions[3]; + int num_points = 0; TRACE("(%p,%0.2f,%0.2f)\n", brush, focus, scale); - if(!(calls++)) - FIXME("not implemented\n"); + if (!brush) return InvalidParameter; - return NotImplemented; + if (focus != 0.0) + { + factors[num_points] = 0.0; + positions[num_points] = 0.0; + num_points++; + } + + factors[num_points] = scale; + positions[num_points] = focus; + num_points++; + + if (focus != 1.0) + { + factors[num_points] = 0.0; + positions[num_points] = 1.0; + num_points++; + } + + return GdipSetPathGradientBlend(brush, factors, positions, num_points); } GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient *brush,

1 0

Vincent Povirk : gdiplus: Implement GdipSetPathGradientSigmaBlend.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 8273d58a9619fd7a0d3640ad07b402fcd3bc0d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8273d58a9619fd7a0d3640ad0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 09:55:29 2012 -0500 gdiplus: Implement GdipSetPathGradientSigmaBlend. --- dlls/gdiplus/brush.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 490a0b9..a2cf1f9 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1642,17 +1642,57 @@ GpStatus WINGDIPAPI GdipSetPathGradientGammaCorrection(GpPathGradient *grad, GpStatus WINGDIPAPI GdipSetPathGradientSigmaBlend(GpPathGradient *grad, REAL focus, REAL scale) { - static int calls; + REAL factors[33]; + REAL positions[33]; + int num_points = 0; + int i; + const int precision = 16; + REAL erf_range; /* we use values erf(-erf_range) through erf(+erf_range) */ + REAL min_erf; + REAL scale_erf; TRACE("(%p,%0.2f,%0.2f)\n", grad, focus, scale); if(!grad || focus < 0.0 || focus > 1.0 || scale < 0.0 || scale > 1.0) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + /* we want 2 standard deviations */ + erf_range = 2.0 / sqrt(2); - return NotImplemented; + /* calculate the constants we need to normalize the error function to be + between 0.0 and scale over the range we need */ + min_erf = erf(-erf_range); + scale_erf = scale / (-2.0 * min_erf); + + if (focus != 0.0) + { + positions[0] = 0.0; + factors[0] = 0.0; + for (i=1; i<precision; i++) + { + positions[i] = focus * i / precision; + factors[i] = scale_erf * (erf(2 * erf_range * i / precision - erf_range) - min_erf); + } + num_points += precision; + } + + positions[num_points] = focus; + factors[num_points] = scale; + num_points += 1; + + if (focus != 1.0) + { + for (i=1; i<precision; i++) + { + positions[i+num_points-1] = (focus + ((1.0-focus) * i / precision)); + factors[i+num_points-1] = scale_erf * (erf(erf_range - 2 * erf_range * i / precision) - min_erf); + } + num_points += precision; + positions[num_points-1] = 1.0; + factors[num_points-1] = 0.0; + } + + return GdipSetPathGradientBlend(grad, factors, positions, num_points); } GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient

1 0

Vincent Povirk : gdiplus: Store only one surround color if all colors are the same.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: e2b59a87b05968f5fd9cdbd2f6df4ce4de36b6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2b59a87b05968f5fd9cdbd2f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 24 10:14:35 2012 -0500 gdiplus: Store only one surround color if all colors are the same. --- dlls/gdiplus/brush.c | 20 +++++++++++++++++--- dlls/gdiplus/tests/brush.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index a2cf1f9..c11dea6 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1699,6 +1699,7 @@ GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient *grad, GDIPCONST ARGB *argb, INT *count) { ARGB *new_surroundcolors; + INT i, num_colors; TRACE("(%p,%p,%p)\n", grad, argb, count); @@ -1706,16 +1707,29 @@ GpStatus WINGDIPAPI GdipSetPathGradientSurroundColorsWithCount(GpPathGradient (*count > grad->path->pathdata.Count)) return InvalidParameter; - new_surroundcolors = GdipAlloc(*count * sizeof(ARGB)); + num_colors = *count; + + /* If all colors are the same, only store 1 color. */ + if (*count > 1) + { + for (i=1; i < num_colors; i++) + if (argb[i] != argb[i-1]) + break; + + if (i == num_colors) + num_colors = 1; + } + + new_surroundcolors = GdipAlloc(num_colors * sizeof(ARGB)); if (!new_surroundcolors) return OutOfMemory; - memcpy(new_surroundcolors, argb, *count * sizeof(ARGB)); + memcpy(new_surroundcolors, argb, num_colors * sizeof(ARGB)); GdipFree(grad->surroundcolors); grad->surroundcolors = new_surroundcolors; - grad->surroundcolorcount = *count; + grad->surroundcolorcount = num_colors; return Ok; } diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 354d60d..cde7b56 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -876,6 +876,37 @@ static void test_gradientsurroundcolorcount(void) expect(Ok, status); expect(2, count); + /* If all colors are the same, count is set to 1. */ + color[0] = color[1] = 0; + count = 2; + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(2, count); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 2; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(1, count); + expect(0x00000000, color[0]); + expect(0x00000000, color[1]); + expect(0xdeadbeef, color[2]); + + color[0] = color[1] = 0xff00ff00; + count = 2; + status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(2, count); + + color[0] = color[1] = color[2] = 0xdeadbeef; + count = 2; + status = GdipGetPathGradientSurroundColorsWithCount(grad, color, &count); + expect(Ok, status); + expect(1, count); + expect(0xff00ff00, color[0]); + expect(0xff00ff00, color[1]); + expect(0xdeadbeef, color[2]); + count = 0; status = GdipSetPathGradientSurroundColorsWithCount(grad, color, &count); expect(InvalidParameter, status);

1 0

Jacek Caban : jscript: Store variable names in function_code_t.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 64a3f5077f719adbad2b2a1668856f113db68fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64a3f5077f719adbad2b2a166… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 25 10:47:56 2012 +0200 jscript: Store variable names in function_code_t. --- dlls/jscript/compile.c | 16 +++++++++++++++- dlls/jscript/engine.c | 20 +++++++------------- dlls/jscript/engine.h | 4 +++- dlls/jscript/function.c | 2 +- 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index f8aaa41..5d162ea 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1775,6 +1775,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, BOOL from_eval, function_code_t *func) { function_declaration_t *iter; + var_list_t *var_iter; unsigned off, i; HRESULT hres; @@ -1809,7 +1810,6 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, func->source_len = func_expr->src_len; } - func->source_elements = source; func->expr = func_expr; func->funcs = heap_alloc_zero(func->func_cnt * sizeof(*func->funcs)); @@ -1823,6 +1823,20 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, } assert(i == func->func_cnt); + + for(var_iter = source->variables; var_iter; var_iter = var_iter->next) + func->var_cnt++; + + func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); + if(!func->variables) + return E_OUTOFMEMORY; + + for(var_iter = source->variables, i=0; var_iter; var_iter = var_iter->next, i++) { + func->variables[i] = compiler_alloc_bstr(ctx, var_iter->identifier); + if(!func->variables[i]) + return E_OUTOFMEMORY; + } + return S_OK; } diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index ec906a1..189e19b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2614,7 +2614,6 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO jsexcept_t *ei, VARIANT *retv) { exec_ctx_t *prev_ctx; - var_list_t *var; VARIANT val; unsigned i; HRESULT hres = S_OK; @@ -2640,19 +2639,14 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO return hres; } - for(var = func->source_elements->variables; var; var = var->next) { - DISPID id = 0; - BSTR name; + for(i=0; i < func->var_cnt; i++) { + if(!ctx->is_global || !lookup_global_members(ctx->script, func->variables[i], NULL)) { + DISPID id = 0; - name = SysAllocString(var->identifier); - if(!name) - return E_OUTOFMEMORY; - - if(!ctx->is_global || !lookup_global_members(ctx->script, name, NULL)) - hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); - SysFreeString(name); - if(FAILED(hres)) - return hres; + hres = jsdisp_get_id(ctx->var_disp, func->variables[i], fdexNameEnsure, &id); + if(FAILED(hres)) + return hres; + } } prev_ctx = ctx->script->exec_ctx; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index a2be6ee..cc58aa8 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -171,13 +171,15 @@ typedef struct _function_code_t { unsigned instr_off; function_expression_t *expr; /* FIXME */ - source_elements_t *source_elements; /* FIXME */ const WCHAR *source; unsigned source_len; unsigned func_cnt; struct _function_code_t *funcs; + + unsigned var_cnt; + BSTR *variables; } function_code_t; typedef struct _bytecode_t { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index dc4c5e8..0377138 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; - if(code->global_code.func_cnt != 1 || code->parser->source->variables) { + if(code->global_code.func_cnt != 1 || code->global_code.var_cnt) { ERR("Invalid parser result!\n"); release_bytecode(code); return E_UNEXPECTED;

1 0

Jacek Caban : jscript: Fixed func->funcs leak.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: d1a40539539883c56203743c16731734d2ad72fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a40539539883c56203743c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 25 11:25:44 2012 +0200 jscript: Fixed func->funcs leak. --- dlls/jscript/compile.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 5d162ea..8bb397d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1812,9 +1812,10 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, func->expr = func_expr; - func->funcs = heap_alloc_zero(func->func_cnt * sizeof(*func->funcs)); + func->funcs = compiler_alloc(ctx->code, func->func_cnt * sizeof(*func->funcs)); if(!func->funcs) return E_OUTOFMEMORY; + memset(func->funcs, 0, func->func_cnt * sizeof(*func->funcs)); for(iter = source->functions, i=0; iter; iter = iter->next, i++) { hres = compile_function(ctx, iter->expr->source_elements, iter->expr, FALSE, func->funcs+i);

1 0

Jacek Caban : jscript: Store function parameters in function_code_t.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 97b44da7466f089a25b03ed2785c8a12237f34e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97b44da7466f089a25b03ed27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 25 11:25:57 2012 +0200 jscript: Store function parameters in function_code_t. --- dlls/jscript/compile.c | 17 +++++++++++++++-- dlls/jscript/engine.c | 10 ++-------- dlls/jscript/engine.h | 16 ++++++---------- dlls/jscript/function.c | 25 ++++++------------------- dlls/jscript/jscript.c | 2 +- 5 files changed, 30 insertions(+), 40 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 8bb397d..6afef2c 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1806,11 +1806,24 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, } if(func_expr) { + parameter_t *param_iter; + func->source = func_expr->src_str; func->source_len = func_expr->src_len; - } - func->expr = func_expr; + for(param_iter = func_expr->parameter_list; param_iter; param_iter = param_iter->next) + func->param_cnt++; + + func->params = compiler_alloc(ctx->code, func->param_cnt * sizeof(*func->params)); + if(!func->params) + return E_OUTOFMEMORY; + + for(param_iter = func_expr->parameter_list, i=0; param_iter; param_iter = param_iter->next, i++) { + func->params[i] = compiler_alloc_bstr(ctx, param_iter->identifier); + if(!func->params[i]) + return E_OUTOFMEMORY; + } + } func->funcs = compiler_alloc(ctx->code, func->func_cnt * sizeof(*func->funcs)); if(!func->funcs) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 189e19b..35339c8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -804,16 +804,13 @@ static HRESULT interp_end_finally(exec_ctx_t *ctx) static HRESULT interp_func(exec_ctx_t *ctx) { unsigned func_idx = ctx->code->instrs[ctx->ip].arg1.uint; - function_expression_t *expr; jsdisp_t *dispex; VARIANT v; HRESULT hres; TRACE("%d\n", func_idx); - expr = ctx->func_code->funcs[func_idx].expr; - - hres = create_source_function(ctx->script, ctx->code, expr->parameter_list, ctx->func_code->funcs+func_idx, + hres = create_source_function(ctx->script, ctx->code, ctx->func_code->funcs+func_idx, ctx->scope_chain, &dispex); if(FAILED(hres)) return hres; @@ -2619,16 +2616,13 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BO HRESULT hres = S_OK; for(i = 0; i < func->func_cnt; i++) { - function_expression_t *expr; jsdisp_t *func_obj; VARIANT var; if(!func->funcs[i].name) continue; - expr = func->funcs[i].expr; - hres = create_source_function(ctx->script, code, expr->parameter_list, func->funcs+i, - ctx->scope_chain, &func_obj); + hres = create_source_function(ctx->script, code, func->funcs+i, ctx->scope_chain, &func_obj); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index cc58aa8..c57b89e 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -170,8 +170,6 @@ typedef struct _function_code_t { BSTR name; unsigned instr_off; - function_expression_t *expr; /* FIXME */ - const WCHAR *source; unsigned source_len; @@ -180,6 +178,9 @@ typedef struct _function_code_t { unsigned var_cnt; BSTR *variables; + + unsigned param_cnt; + BSTR *params; } function_code_t; typedef struct _bytecode_t { @@ -269,11 +270,7 @@ static inline void exec_addref(exec_ctx_t *ctx) void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_exec_ctx(script_ctx_t*,IDispatch*,jsdisp_t*,scope_chain_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,BOOL,jsexcept_t*,VARIANT*) DECLSPEC_HIDDEN; - -typedef struct _parameter_t parameter_t; - -HRESULT create_source_function(script_ctx_t*,bytecode_t*,parameter_t*,function_code_t*,scope_chain_t*, - jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; typedef enum { LT_INT, @@ -501,11 +498,10 @@ struct _expression_t { expression_type_t type; }; -struct _parameter_t { +typedef struct _parameter_t { const WCHAR *identifier; - struct _parameter_t *next; -}; +} parameter_t; struct _source_elements_t { statement_t *statement; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 0377138..31d3be3 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -28,7 +28,6 @@ typedef struct { builtin_invoke_t value_proc; const WCHAR *name; DWORD flags; - parameter_t *parameters; scope_chain_t *scope_chain; bytecode_t *code; function_code_t *func_code; @@ -75,7 +74,6 @@ static IDispatch *get_this(DISPPARAMS *dp) static HRESULT init_parameters(jsdisp_t *var_disp, FunctionInstance *function, DISPPARAMS *dp, jsexcept_t *ei) { - parameter_t *param; VARIANT var_empty; DWORD cargs, i=0; HRESULT hres; @@ -83,13 +81,11 @@ static HRESULT init_parameters(jsdisp_t *var_disp, FunctionInstance *function, D V_VT(&var_empty) = VT_EMPTY; cargs = arg_cnt(dp); - for(param = function->parameters; param; param = param->next) { - hres = jsdisp_propput_name(var_disp, param->identifier, + for(i=0; i < function->func_code->param_cnt; i++) { + hres = jsdisp_propput_name(var_disp, function->func_code->params[i], i < cargs ? get_arg(dp,i) : &var_empty, ei); if(FAILED(hres)) return hres; - - i++; } return S_OK; @@ -658,13 +654,11 @@ HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, return S_OK; } -HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, parameter_t *parameters, function_code_t *func_code, +HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, function_code_t *func_code, scope_chain_t *scope_chain, jsdisp_t **ret) { FunctionInstance *function; jsdisp_t *prototype; - parameter_t *iter; - DWORD length = 0; HRESULT hres; hres = create_object(ctx, NULL, &prototype); @@ -681,9 +675,6 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, parameter_t if(FAILED(hres)) return hres; - function->func_code = func_code; - function->parameters = parameters; - if(scope_chain) { scope_addref(scope_chain); function->scope_chain = scope_chain; @@ -691,10 +682,8 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, parameter_t bytecode_addref(code); function->code = code; - - for(iter = parameters; iter; iter = iter->next) - length++; - function->length = length; + function->func_code = func_code; + function->length = function->func_code->param_cnt; *ret = &function->dispex; return S_OK; @@ -702,7 +691,6 @@ HRESULT create_source_function(script_ctx_t *ctx, bytecode_t *code, parameter_t static HRESULT construct_function(script_ctx_t *ctx, DISPPARAMS *dp, jsexcept_t *ei, IDispatch **ret) { - function_expression_t *expr; WCHAR *str = NULL, *ptr; DWORD argc, len = 0, l; bytecode_t *code; @@ -779,9 +767,8 @@ static HRESULT construct_function(script_ctx_t *ctx, DISPPARAMS *dp, jsexcept_t release_bytecode(code); return E_UNEXPECTED; } - expr = code->global_code.funcs[0].expr; - hres = create_source_function(ctx, code, expr->parameter_list, code->global_code.funcs, NULL, &function); + hres = create_source_function(ctx, code, code->global_code.funcs, NULL, &function); release_bytecode(code); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index da34c11..bf6710b 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -836,7 +836,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars return hres; } - hres = create_source_function(This->ctx, code, NULL, &code->global_code, NULL, &dispex); + hres = create_source_function(This->ctx, code, &code->global_code, NULL, &dispex); release_bytecode(code); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Make parser a temporary compiler object.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: b866c7f5e90b9c1db182e1ab94459df3524e8a4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b866c7f5e90b9c1db182e1ab9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 25 11:26:12 2012 +0200 jscript: Make parser a temporary compiler object. --- dlls/jscript/compile.c | 6 +----- dlls/jscript/engine.h | 2 -- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 6afef2c..796fb7b 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1732,9 +1732,6 @@ void release_bytecode(bytecode_t *code) if(--code->ref) return; - if(code->parser) - parser_release(code->parser); - for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); @@ -1878,9 +1875,8 @@ HRESULT compile_script(script_ctx_t *ctx, const WCHAR *code, const WCHAR *delimi return hres; } - compiler.code->parser = compiler.parser; - hres = compile_function(&compiler, compiler.parser->source, NULL, from_eval, &compiler.code->global_code); + parser_release(compiler.parser); if(FAILED(hres)) { release_bytecode(compiler.code); return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c57b89e..20f3c45 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -197,8 +197,6 @@ typedef struct _bytecode_t { unsigned bstr_pool_size; unsigned bstr_cnt; - parser_ctx_t *parser; - struct _bytecode_t *next; } bytecode_t;

1 0

Jacek Caban : jscript: Moved collecting variable declarations from parser to compiler.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 474f1152b23cd8a0d311f31d67a01a4e573864cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=474f1152b23cd8a0d311f31d6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 25 11:26:21 2012 +0200 jscript: Moved collecting variable declarations from parser to compiler. --- dlls/jscript/compile.c | 44 ++++++++++++++++++++++++++++++-------------- dlls/jscript/engine.h | 10 +--------- dlls/jscript/parser.y | 13 +------------ 3 files changed, 32 insertions(+), 35 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 796fb7b..c903651 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -53,6 +53,9 @@ typedef struct { statement_ctx_t *stat_ctx; function_code_t *func; + + variable_declaration_t *var_head; + variable_declaration_t *var_tail; } compiler_ctx_t; static const struct { @@ -988,7 +991,19 @@ static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t variable_declaration_t *iter; HRESULT hres; + assert(list != NULL); + + if(ctx->var_tail) + ctx->var_tail->global_next = list; + else + ctx->var_head = list; + for(iter = list; iter; iter = iter->next) { + ctx->func->var_cnt++; + iter->global_next = iter->next; + if(!iter->next) + ctx->var_tail = iter; + if(!iter->expr) continue; @@ -1771,13 +1786,15 @@ static HRESULT init_code(compiler_ctx_t *compiler, const WCHAR *source) static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, function_expression_t *func_expr, BOOL from_eval, function_code_t *func) { + variable_declaration_t *var_iter; function_declaration_t *iter; - var_list_t *var_iter; unsigned off, i; HRESULT hres; TRACE("\n"); + ctx->var_head = ctx->var_tail = NULL; + off = ctx->code_off; ctx->func = func; hres = compile_block_statement(ctx, source->statement); @@ -1822,6 +1839,18 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, } } + func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); + if(!func->variables) + return E_OUTOFMEMORY; + + for(var_iter = ctx->var_head, i=0; var_iter; var_iter = var_iter->global_next, i++) { + func->variables[i] = compiler_alloc_bstr(ctx, var_iter->identifier); + if(!func->variables[i]) + return E_OUTOFMEMORY; + } + + assert(i == func->var_cnt); + func->funcs = compiler_alloc(ctx->code, func->func_cnt * sizeof(*func->funcs)); if(!func->funcs) return E_OUTOFMEMORY; @@ -1835,19 +1864,6 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, assert(i == func->func_cnt); - for(var_iter = source->variables; var_iter; var_iter = var_iter->next) - func->var_cnt++; - - func->variables = compiler_alloc(ctx->code, func->var_cnt * sizeof(*func->variables)); - if(!func->variables) - return E_OUTOFMEMORY; - - for(var_iter = source->variables, i=0; var_iter; var_iter = var_iter->next, i++) { - func->variables[i] = compiler_alloc_bstr(ctx, var_iter->identifier); - if(!func->variables[i]) - return E_OUTOFMEMORY; - } - return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 20f3c45..6a318c7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -27,17 +27,9 @@ typedef struct _function_declaration_t { struct _function_declaration_t *next; } function_declaration_t; -typedef struct _var_list_t { - const WCHAR *identifier; - - struct _var_list_t *next; -} var_list_t; - typedef struct _func_stack { function_declaration_t *func_head; function_declaration_t *func_tail; - var_list_t *var_head; - var_list_t *var_tail; struct _func_stack *next; } func_stack_t; @@ -302,6 +294,7 @@ typedef struct _variable_declaration_t { expression_t *expr; struct _variable_declaration_t *next; + struct _variable_declaration_t *global_next; /* for compiler */ } variable_declaration_t; typedef enum { @@ -505,7 +498,6 @@ struct _source_elements_t { statement_t *statement; statement_t *statement_tail; function_declaration_t *functions; - var_list_t *variables; }; struct _function_expression_t { diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 6f31e15..c5984b2 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1051,19 +1051,11 @@ static statement_t *new_block_statement(parser_ctx_t *ctx, statement_list_t *lis static variable_declaration_t *new_variable_declaration(parser_ctx_t *ctx, const WCHAR *identifier, expression_t *expr) { variable_declaration_t *ret = parser_alloc(ctx, sizeof(variable_declaration_t)); - var_list_t *var_list = parser_alloc(ctx, sizeof(var_list_t)); ret->identifier = identifier; ret->expr = expr; ret->next = NULL; - - var_list->identifier = identifier; - var_list->next = NULL; - - if(ctx->func_stack->var_tail) - ctx->func_stack->var_tail = ctx->func_stack->var_tail->next = var_list; - else - ctx->func_stack->var_head = ctx->func_stack->var_tail = var_list; + ret->global_next = NULL; return ret; } @@ -1503,7 +1495,6 @@ static void push_func(parser_ctx_t *ctx) func_stack_t *new_func = parser_alloc_tmp(ctx, sizeof(func_stack_t)); new_func->func_head = new_func->func_tail = NULL; - new_func->var_head = new_func->var_tail = NULL; new_func->next = ctx->func_stack; ctx->func_stack = new_func; @@ -1512,7 +1503,6 @@ static void push_func(parser_ctx_t *ctx) static source_elements_t *function_body_parsed(parser_ctx_t *ctx, source_elements_t *source) { source->functions = ctx->func_stack->func_head; - source->variables = ctx->func_stack->var_head; pop_func(ctx); return source; @@ -1521,7 +1511,6 @@ static source_elements_t *function_body_parsed(parser_ctx_t *ctx, source_element static void program_parsed(parser_ctx_t *ctx, source_elements_t *source) { source->functions = ctx->func_stack->func_head; - source->variables = ctx->func_stack->var_head; pop_func(ctx); ctx->source = source;

1 0

Aric Stewart : strmbase: get_VideoHeight should always have a positive height.
by Alexandre Julliard 25 Apr '12

25 Apr '12

Module: wine Branch: master Commit: 6b9cfd2629767ba9e99eb8547258bea73c539a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b9cfd2629767ba9e99eb8547… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 24 13:47:08 2012 -0500 strmbase: get_VideoHeight should always have a positive height. --- dlls/strmbase/video.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 83cd37f..1c4f360 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -156,7 +156,7 @@ HRESULT WINAPI BaseControlVideoImpl_get_VideoHeight(IBasicVideo *iface, LONG *pV TRACE("(%p/%p)->(%p)\n", This, iface, pVideoHeight); vih = This->pFuncsTable->pfnGetVideoFormat(This); - *pVideoHeight = vih->bmiHeader.biHeight; + *pVideoHeight = abs(vih->bmiHeader.biHeight); return S_OK; }

1 0