December 2011 - Wine-Commits

Jacek Caban : jscript: Added bytecode version of while statement.
by Alexandre Julliard Dec. 27, 2011

Dec. 27, 2011

Module: wine Branch: master Commit: f5425aeecafa9a811b5262bd359220c4786fd306 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5425aeecafa9a811b5262bd3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 27 11:16:02 2011 +0100 jscript: Added bytecode version of while statement. --- dlls/jscript/compile.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/parser.y | 2 +- 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index ceed228..bcec761 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -32,6 +32,8 @@ struct _compiler_ctx_t { unsigned code_off; unsigned code_size; + + BOOL no_fallback; }; static HRESULT compile_expression(compiler_ctx_t*,expression_t*); @@ -425,6 +427,9 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, statement_t *stat) { unsigned instr; + if(ctx->no_fallback) + return E_NOTIMPL; + instr = push_instr(ctx, OP_tree); if(instr == -1) return E_OUTOFMEMORY; @@ -943,6 +948,67 @@ static HRESULT compile_if_statement(compiler_ctx_t *ctx, if_statement_t *stat) return S_OK; } +/* ECMA-262 3rd Edition 12.6.2 */ +static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *stat) +{ + unsigned off_backup, jmp_off, jmp = -1; + BOOL prev_no_fallback; + HRESULT hres; + + off_backup = ctx->code_off; + + if(!stat->do_while) { + /* FIXME: avoid */ + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + + jmp_off = ctx->code_off; + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + jmp = push_instr(ctx, OP_jmp_z); + if(jmp == -1) + return E_OUTOFMEMORY; + + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + }else { + jmp_off = ctx->code_off; + } + + prev_no_fallback = ctx->no_fallback; + ctx->no_fallback = TRUE; + hres = compile_statement(ctx, stat->statement); + ctx->no_fallback = prev_no_fallback; + if(hres == E_NOTIMPL) { + ctx->code_off = off_backup; + stat->stat.eval = while_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); + } + if(FAILED(hres)) + return hres; + + if(stat->do_while) { + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + jmp = push_instr(ctx, OP_jmp_z); + if(jmp == -1) + return E_OUTOFMEMORY; + + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + } + hres = push_instr_uint(ctx, OP_jmp, jmp_off); + if(FAILED(hres)) + return hres; + + instr_ptr(ctx, jmp)->arg1.uint = ctx->code_off; + return S_OK; +} + static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) { switch(stat->type) { @@ -956,6 +1022,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return compile_if_statement(ctx, (if_statement_t*)stat); case STAT_VAR: return compile_var_statement(ctx, (var_statement_t*)stat); + case STAT_WHILE: + return compile_while_statement(ctx, (while_statement_t*)stat); default: return compile_interp_fallback(ctx, stat); } diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3445476..08a9b83 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -850,7 +850,7 @@ static const statement_eval_t stat_eval_table[] = { throw_statement_eval, try_statement_eval, compiled_statement_eval, - while_statement_eval, + compiled_statement_eval, with_statement_eval };

1 0

Alexandre Julliard : gdi32: Re-create the brush bits only when the ROP has really changed.
by Alexandre Julliard Dec. 27, 2011

Dec. 27, 2011

Module: wine Branch: master Commit: a80eafe8d761af0f91138777f11998c74f21532e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80eafe8d761af0f91138777f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 16:40:48 2011 +0100 gdi32: Re-create the brush bits only when the ROP has really changed. --- dlls/gdi32/dibdrv/bitblt.c | 9 +++------ dlls/gdi32/dibdrv/dc.c | 17 ++--------------- dlls/gdi32/dibdrv/dibdrv.h | 7 +++---- dlls/gdi32/dibdrv/graphics.c | 11 +++-------- dlls/gdi32/dibdrv/objects.c | 35 +++++++++++++++++++---------------- 5 files changed, 30 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a80eafe8d761af0f91138…

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetMatrix() test.
by Alexandre Julliard Dec. 27, 2011

Dec. 27, 2011

Module: wine Branch: master Commit: f856afe336b0224e59e8916254590920df7788fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f856afe336b0224e59e891625… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 26 11:51:30 2011 +0100 d3dx9/tests: Add effect parameter value GetMatrix() test. --- dlls/d3dx9_36/tests/effect.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 8cf01de..fcc336f 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -920,6 +920,54 @@ static void test_effect_parameter_value_GetVectorArray(const struct test_effect_ } } +static void test_effect_parameter_value_GetMatrix(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[16]; + UINT l, k; + + memset(fvalue, 0xab, sizeof(fvalue)); + hr = effect->lpVtbl->GetMatrix(effect, parameter, (D3DXMATRIX *)&fvalue); + if (!res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetMatrix failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (k = 0; k < 4; ++k) + { + for (l = 0; l < 4; ++l) + { + if (k < res_desc->Columns && l < res_desc->Rows) + { + ok(compare_float(fvalue[l * 4 + k], get_float(res_desc->Type, &res_value[l * res_desc->Columns + k]), 512), + "%u - %s: GetMatrix fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l * 4 + k, fvalue[l * 4 + k], + get_float(res_desc->Type, &res_value[l * res_desc->Columns + k])); + } + else + { + ok(fvalue[l * 4 + k] == 0.0f, "%u - %s: GetMatrix fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l * 4 + k, fvalue[l * 4 + k], 0.0f); + } + } + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrix failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < sizeof(fvalue) / sizeof(*fvalue); ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrix fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -998,6 +1046,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetFloatArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetVector(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetVectorArray(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetMatrix(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value GetMatrixArray() test.
by Alexandre Julliard Dec. 27, 2011

Dec. 27, 2011

Module: wine Branch: master Commit: 9be82e317552907eda0ac2dc59d8c1c5aa975270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be82e317552907eda0ac2dc5… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Dec 26 11:51:34 2011 +0100 d3dx9/tests: Add effect parameter value GetMatrixArray() test. --- dlls/d3dx9_36/tests/effect.c | 70 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index fcc336f..0aa4d05 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -968,6 +968,75 @@ static void test_effect_parameter_value_GetMatrix(const struct test_effect_param } } +static void test_effect_parameter_value_GetMatrixArray(const struct test_effect_parameter_value_result *res, + ID3DXEffect *effect, const DWORD *res_value, D3DXHANDLE parameter, UINT i) +{ + const D3DXPARAMETER_DESC *res_desc = &res->desc; + LPCSTR res_full_name = res->full_name; + HRESULT hr; + DWORD cmp = 0xabababab; + FLOAT fvalue[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; + UINT l, k, m; + + memset(fvalue, 0xab, sizeof(fvalue)); + hr = effect->lpVtbl->GetMatrixArray(effect, parameter, (D3DXMATRIX *)&fvalue, res_desc->Elements); + if (!res_desc->Elements) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else if (res_desc->Elements && res_desc->Class == D3DXPC_MATRIX_ROWS) + { + ok(hr == D3D_OK, "%u - %s: GetMatrixArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); + + for (m = 0; m < res_desc->Elements; ++m) + { + for (k = 0; k < 4; ++k) + { + for (l = 0; l < 4; ++l) + { + if (k < res_desc->Columns && l < res_desc->Rows) + { + ok(compare_float(fvalue[m * 16 + l * 4 + k], get_float(res_desc->Type, + &res_value[m * res_desc->Columns * res_desc->Rows + l * res_desc->Columns + k]), 512), + "%u - %s: GetMatrixArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l * 4 + k, fvalue[m * 16 + l * 4 + k], + get_float(res_desc->Type, &res_value[m * res_desc->Columns * res_desc->Rows + + l * res_desc->Columns + k])); + } + else + { + ok(fvalue[m * 16 + l * 4 + k] == 0.0f, "%u - %s: GetMatrixArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, m * 16 + l * 4 + k, fvalue[m * 16 + l * 4 + k], 0.0f); + } + } + } + } + + for (l = res_desc->Elements * 16; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + ok(fvalue[l] == *(FLOAT *)&cmp, "%u - %s: GetMatrixArray fvalue[%u] failed, got %f, expected %f\n", + i, res_full_name, l, fvalue[l], *(FLOAT *)&cmp); + } + } +} + static void test_effect_parameter_value(IDirect3DDevice9 *device) { UINT i; @@ -1047,6 +1116,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetVector(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetVectorArray(&res[k], effect, &blob[res_value_offset], parameter, i); test_effect_parameter_value_GetMatrix(&res[k], effect, &blob[res_value_offset], parameter, i); + test_effect_parameter_value_GetMatrixArray(&res[k], effect, &blob[res_value_offset], parameter, i); } count = effect->lpVtbl->Release(effect);

1 0

Nikolay Sivov : comctl32: Block selection change depending on TCN_SELCHANGING result.
by Alexandre Julliard Dec. 27, 2011

Dec. 27, 2011

Module: wine Branch: master Commit: fade32b515a6b60d224e61e2ffaf0155888a0455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fade32b515a6b60d224e61e2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 26 01:20:54 2011 +0300 comctl32: Block selection change depending on TCN_SELCHANGING result. --- dlls/comctl32/tab.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 374d4ee..ad27b8a 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -684,7 +684,8 @@ TAB_LButtonDown (TAB_INFO *infoPtr, WPARAM wParam, LPARAM lParam) break; } - TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING); + if (TAB_SendSimpleNotify(infoPtr, TCN_SELCHANGING)) + return 0; if (pressed) TAB_DeselectAll (infoPtr, FALSE);

1 0

André Hentschel : msvcrt/tests: Fix two test messages.
by Alexandre Julliard Dec. 27, 2011

Dec. 27, 2011

Module: wine Branch: master Commit: 825a25ef96a9952487890dea668673af78a0774e URL: http://source.winehq.org/git/wine.git/?a=commit;h=825a25ef96a9952487890dea6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 23 20:02:54 2011 +0100 msvcrt/tests: Fix two test messages. --- dlls/msvcrt/tests/string.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index c923684..8aa7a81 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1583,7 +1583,7 @@ static void test__strlwr_s(void) ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); ok(!memcmp(buffer, "\0oRrIsTeR", sizeof("\0oRrIsTeR")), - "Expected the output buffer to be \"gorrIsTeR\"\n"); + "Expected the output buffer to be \"\\0oRrIsTeR\"\n"); strcpy(buffer, "GoRrIsTeR"); errno = EBADF; @@ -1591,7 +1591,7 @@ static void test__strlwr_s(void) ok(ret == EINVAL, "Expected _strlwr_s to return EINVAL, got %d\n", ret); ok(errno == EINVAL, "Expected errno to be EINVAL, got %d\n", errno); ok(!memcmp(buffer, "\0oRrIsTeR", sizeof("\0oRrIsTeR")), - "Expected the output buffer to be \"gorrIsTeR\"\n"); + "Expected the output buffer to be \"\\0oRrIsTeR\"\n"); strcpy(buffer, "GoRrIsTeR"); ret = p_strlwr_s(buffer, sizeof("GoRrIsTeR"));

1 0

André Hentschel : dsound: Use if(0) instead of #if 0 to make sure code still compiles.
by Alexandre Julliard Dec. 27, 2011

Dec. 27, 2011

Module: wine Branch: master Commit: 2b981177d323122d5ad47de1fa8a767832834ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b981177d323122d5ad47de1f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 25 19:23:39 2011 +0100 dsound: Use if(0) instead of #if 0 to make sure code still compiles. --- dlls/dsound/sound3d.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index f4c182f..512a254 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -162,9 +162,6 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) D3DVALUE flAngle; D3DVECTOR vLeft; /* doppler shift related stuff */ -#if 0 - D3DVALUE flFreq, flBufferVel, flListenerVel; -#endif TRACE("(%p)\n",dsb); @@ -263,13 +260,17 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) TRACE("panning: Angle = %f rad, lPan = %d\n", flAngle, dsb->volpan.lPan); /* FIXME: Doppler Effect disabled since i have no idea which frequency to change and how to do it */ -#if 0 +if(0) +{ + D3DVALUE flFreq, flBufferVel, flListenerVel; /* doppler shift*/ - if ((VectorMagnitude(&ds3db_ds3db.vVelocity) == 0) && (VectorMagnitude(&dsb->device->ds3dl.vVelocity) == 0)) + if (!VectorMagnitude(&dsb->ds3db_ds3db.vVelocity) && !VectorMagnitude(&dsb->device->ds3dl.vVelocity)) { TRACE("doppler: Buffer and Listener don't have velocities\n"); } - else if (ds3db_ds3db.vVelocity != dsb->device->ds3dl.vVelocity) + else if (!(dsb->ds3db_ds3db.vVelocity.x == dsb->device->ds3dl.vVelocity.x && + dsb->ds3db_ds3db.vVelocity.y == dsb->device->ds3dl.vVelocity.y && + dsb->ds3db_ds3db.vVelocity.z == dsb->device->ds3dl.vVelocity.z)) { /* calculate length of ds3db_ds3db.vVelocity component which causes Doppler Effect NOTE: if buffer moves TOWARDS the listener, it's velocity component is NEGATIVE @@ -282,14 +283,14 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) /* formula taken from Gianicoli D.: Physics, 4th edition: */ /* FIXME: replace dsb->freq with appropriate frequency ! */ flFreq = dsb->freq * ((DEFAULT_VELOCITY + flListenerVel)/(DEFAULT_VELOCITY + flBufferVel)); - TRACE("doppler: Buffer velocity (component) = %lf, Listener velocity (component) = %lf => Doppler shift: %ld Hz -> %lf Hz\n", flBufferVel, flListenerVel, - dsb->freq, flFreq); + TRACE("doppler: Buffer velocity (component) = %f, Listener velocity (component) = %f => Doppler shift: %d Hz -> %f Hz\n", + flBufferVel, flListenerVel, dsb->freq, flFreq); /* FIXME: replace following line with correct frequency setting ! */ dsb->freq = flFreq; DSOUND_RecalcFormat(dsb); - DSOUND_MixToTemporary(dsb, 0, dsb->buflen); + DSOUND_MixToTemporary(dsb, 0, dsb->buflen, FALSE); } -#endif +} /* time for remix */ DSOUND_RecalcVolPan(&dsb->volpan);

1 0

Jacek Caban : jscript: Added bytecode version of for loop statement.
by Alexandre Julliard Dec. 27, 2011

Dec. 27, 2011

Module: wine Branch: master Commit: 17fedc448b00512f113e71cf6e616255a9f280f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fedc448b00512f113e71cf6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 27 11:16:13 2011 +0100 jscript: Added bytecode version of for loop statement. --- dlls/jscript/compile.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/parser.y | 2 +- 2 files changed, 93 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index bcec761..663edf0 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -872,12 +872,12 @@ static HRESULT compile_block_statement(compiler_ctx_t *ctx, statement_t *iter) } /* ECMA-262 3rd Edition 12.2 */ -static HRESULT compile_var_statement(compiler_ctx_t *ctx, var_statement_t *stat) +static HRESULT compile_variable_list(compiler_ctx_t *ctx, variable_declaration_t *list) { variable_declaration_t *iter; HRESULT hres; - for(iter = stat->variable_list; iter; iter = iter->next) { + for(iter = list; iter; iter = iter->next) { if(!iter->expr) continue; @@ -890,6 +890,18 @@ static HRESULT compile_var_statement(compiler_ctx_t *ctx, var_statement_t *stat) return hres; } + return S_OK; +} + +/* ECMA-262 3rd Edition 12.2 */ +static HRESULT compile_var_statement(compiler_ctx_t *ctx, var_statement_t *stat) +{ + HRESULT hres; + + hres = compile_variable_list(ctx, stat->variable_list); + if(FAILED(hres)) + return hres; + return push_instr(ctx, OP_undefined) == -1 ? E_OUTOFMEMORY : S_OK; } @@ -1009,6 +1021,82 @@ static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *s return S_OK; } +/* ECMA-262 3rd Edition 12.6.3 */ +static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) +{ + unsigned off_backup, jmp, expr_off; + BOOL prev_no_fallback; + HRESULT hres; + + off_backup = ctx->code_off; + + if(stat->variable_list) { + hres = compile_variable_list(ctx, stat->variable_list); + if(FAILED(hres)) + return hres; + }else if(stat->begin_expr) { + BOOL no_ret = FALSE; + + hres = compile_expression_noret(ctx, stat->begin_expr, &no_ret); + if(FAILED(hres)) + return hres; + if(!no_ret && push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + } + + /* FIXME: avoid */ + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + + expr_off = ctx->code_off; + + if(stat->expr) { + hres = compile_expression(ctx, stat->expr); + if(FAILED(hres)) + return hres; + + jmp = push_instr(ctx, OP_jmp_z); + if(jmp == -1) + return E_OUTOFMEMORY; + }else { + jmp = -1; + } + + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + + prev_no_fallback = ctx->no_fallback; + ctx->no_fallback = TRUE; + hres = compile_statement(ctx, stat->statement); + ctx->no_fallback = prev_no_fallback; + if(hres == E_NOTIMPL) { + ctx->code_off = off_backup; + stat->stat.eval = for_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); + } + if(FAILED(hres)) + return hres; + + if(stat->end_expr) { + BOOL no_ret = FALSE; + + hres = compile_expression_noret(ctx, stat->end_expr, &no_ret); + if(FAILED(hres)) + return hres; + + if(!no_ret && push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + } + + hres = push_instr_uint(ctx, OP_jmp, expr_off); + if(FAILED(hres)) + return hres; + + if(jmp != -1) + instr_ptr(ctx, jmp)->arg1.uint = ctx->code_off; + return S_OK; +} + static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) { switch(stat->type) { @@ -1018,6 +1106,8 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_t *stat) return push_instr(ctx, OP_undefined) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ case STAT_EXPR: return compile_expression_statement(ctx, (expression_statement_t*)stat); + case STAT_FOR: + return compile_for_statement(ctx, (for_statement_t*)stat); case STAT_IF: return compile_if_statement(ctx, (if_statement_t*)stat); case STAT_VAR: diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 08a9b83..008ada2 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -841,7 +841,7 @@ static const statement_eval_t stat_eval_table[] = { continue_statement_eval, compiled_statement_eval, compiled_statement_eval, - for_statement_eval, + compiled_statement_eval, forin_statement_eval, compiled_statement_eval, labelled_statement_eval,

1 0

Alexandre Julliard : gdi32: Use the get_clipped_rects helper in the pen functions.
by Alexandre Julliard Dec. 27, 2011

Dec. 27, 2011

Module: wine Branch: master Commit: d0f110e2a90068d952671fb1f38966d2524fc214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f110e2a90068d952671fb1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 14:32:41 2011 +0100 gdi32: Use the get_clipped_rects helper in the pen functions. --- dlls/gdi32/dibdrv/objects.c | 117 ++++++++++++++++--------------------------- 1 files changed, 44 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0f110e2a90068d952671…

1 0

Alexandre Julliard : gdi32: Use the get_clipped_rects helper in the text functions.
by Alexandre Julliard Dec. 27, 2011

Dec. 27, 2011

Module: wine Branch: master Commit: 63ebfc591e6cc681b2f4385ea78fceaf305115ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ebfc591e6cc681b2f4385ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 27 14:32:12 2011 +0100 gdi32: Use the get_clipped_rects helper in the text functions. --- dlls/gdi32/dibdrv/graphics.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index d9b305d..2e95d66 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -126,9 +126,8 @@ static inline void get_text_bkgnd_masks( dibdrv_physdev *pdev, rop_mask *mask ) static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHMETRICS *metrics, const struct gdi_image_bits *image, DWORD text_color, - const struct intensity_range *ranges ) + const struct intensity_range *ranges, const struct clipped_rects *clipped_rects ) { - const WINEREGION *clip = get_wine_region( pdev->clip ); int i; RECT rect, clipped_rect; POINT src_origin; @@ -145,9 +144,9 @@ static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHME rect.right = rect.left + metrics->gmBlackBoxX; rect.bottom = rect.top + metrics->gmBlackBoxY; - for (i = 0; i < clip->numRects; i++) + for (i = 0; i < clipped_rects->count; i++) { - if (intersect_rect( &clipped_rect, &rect, clip->rects + i )) + if (intersect_rect( &clipped_rect, &rect, clipped_rects->rects + i )) { src_origin.x = clipped_rect.left - rect.left; src_origin.y = clipped_rect.top - rect.top; @@ -156,8 +155,6 @@ static void draw_glyph( dibdrv_physdev *pdev, const POINT *origin, const GLYPHME text_color, ranges ); } } - - release_wine_region( pdev->clip ); } static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; @@ -267,7 +264,7 @@ BOOL render_aa_text_bitmapinfo( HDC hdc, BITMAPINFO *info, struct gdi_image_bits bkgnd_color.and = 0; bkgnd_color.xor = bg_pixel; - solid_rects( &dib, 1, &src->visrect, &bkgnd_color, 0 ); + dib.funcs->solid_rects( &dib, 1, &src->visrect, bkgnd_color.and, bkgnd_color.xor ); } for (i = 0; i < count; i++) @@ -332,27 +329,36 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *rect, LPCWSTR str, UINT count, const INT *dx ) { dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + struct clipped_rects clipped_rects; UINT aa_flags, i; POINT origin; DWORD text_color, err; - HRGN saved_clip = NULL; struct intensity_range ranges[17]; + init_clipped_rects( &clipped_rects ); + if (flags & ETO_OPAQUE) { rop_mask bkgnd_color; get_text_bkgnd_masks( pdev, &bkgnd_color ); - solid_rects( &pdev->dib, 1, rect, &bkgnd_color, pdev->clip ); + get_clipped_rects( &pdev->dib, rect, pdev->clip, &clipped_rects ); + pdev->dib.funcs->solid_rects( &pdev->dib, clipped_rects.count, clipped_rects.rects, + bkgnd_color.and, bkgnd_color.xor ); } - if (count == 0) return TRUE; + if (count == 0) goto done; if (flags & ETO_CLIPPED) { - HRGN clip = CreateRectRgnIndirect( rect ); - saved_clip = add_extra_clipping_region( pdev, clip ); - DeleteObject( clip ); + if (!(flags & ETO_OPAQUE)) /* otherwise we have done it already */ + get_clipped_rects( &pdev->dib, rect, pdev->clip, &clipped_rects ); } + else + { + free_clipped_rects( &clipped_rects ); + get_clipped_rects( &pdev->dib, NULL, pdev->clip, &clipped_rects ); + } + if (!clipped_rects.count) return TRUE; text_color = get_pixel_color( pdev, GetTextColor( pdev->dev.hdc ), TRUE ); get_aa_ranges( pdev->dib.funcs->pixel_to_colorref( &pdev->dib, text_color ), ranges ); @@ -368,7 +374,7 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, err = get_glyph_bitmap( dev->hdc, (UINT)str[i], aa_flags, &metrics, &image ); if (err) continue; - if (image.ptr) draw_glyph( pdev, &origin, &metrics, &image, text_color, ranges ); + if (image.ptr) draw_glyph( pdev, &origin, &metrics, &image, text_color, ranges, &clipped_rects ); if (image.free) image.free( &image ); if (dx) @@ -388,7 +394,8 @@ BOOL dibdrv_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, } } - restore_clipping_region( pdev, saved_clip ); +done: + free_clipped_rects( &clipped_rects ); return TRUE; }

1 0