December 2011 - Wine-commits

Jacek Caban : jscript: Use labels in compiler for ending loops.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 80113b5c5cfec2fdd9b9b33a46c1df361546b055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80113b5c5cfec2fdd9b9b33a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:06:41 2011 +0100 jscript: Use labels in compiler for ending loops. --- dlls/jscript/compile.c | 216 +++++++++++++++++++++++++++++++++++++---------- dlls/jscript/engine.c | 7 +- dlls/jscript/engine.h | 8 +- 3 files changed, 180 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80113b5c5cfec2fdd9b9b…

1 0

Jacek Caban : jscript: Added bytecode versions of break and continue statements.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: c5c2276a9f427825e5ce896f8f37cd2c3fdd9fb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c2276a9f427825e5ce896f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:06:55 2011 +0100 jscript: Added bytecode versions of break and continue statements. --- dlls/jscript/compile.c | 113 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/jscript/parser.y | 4 +- 2 files changed, 109 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index fa793ce..bf2d3dd 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -32,6 +32,7 @@ typedef struct _statement_ctx_t { BOOL using_except; unsigned break_label; + unsigned continue_label; struct _statement_ctx_t *next; } statement_ctx_t; @@ -1029,12 +1030,17 @@ static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *s if(stat_ctx.break_label == -1) return E_OUTOFMEMORY; + stat_ctx.continue_label = alloc_label(ctx); + if(stat_ctx.continue_label == -1) + return E_OUTOFMEMORY; + if(!stat->do_while) { /* FIXME: avoid */ if(push_instr(ctx, OP_undefined) == -1) return E_OUTOFMEMORY; jmp_off = ctx->code_off; + label_set_addr(ctx, stat_ctx.continue_label); hres = compile_expression(ctx, stat->expr); if(FAILED(hres)) return hres; @@ -1062,6 +1068,7 @@ static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *s return hres; if(stat->do_while) { + label_set_addr(ctx, stat_ctx.continue_label); hres = compile_expression(ctx, stat->expr); if(FAILED(hres)) return hres; @@ -1110,6 +1117,10 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) if(stat_ctx.break_label == -1) return E_OUTOFMEMORY; + stat_ctx.continue_label = alloc_label(ctx); + if(stat_ctx.continue_label == -1) + return E_OUTOFMEMORY; + /* FIXME: avoid */ if(push_instr(ctx, OP_undefined) == -1) return E_OUTOFMEMORY; @@ -1141,6 +1152,8 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) if(FAILED(hres)) return hres; + label_set_addr(ctx, stat_ctx.continue_label); + if(stat->end_expr) { BOOL no_ret = FALSE; @@ -1164,7 +1177,7 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *stat) { statement_ctx_t stat_ctx = {4, FALSE, FALSE}; - unsigned loop_addr, off_backup = ctx->code_off; + unsigned off_backup = ctx->code_off; BOOL prev_no_fallback; HRESULT hres; @@ -1178,6 +1191,10 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s if(stat_ctx.break_label == -1) return E_OUTOFMEMORY; + stat_ctx.continue_label = alloc_label(ctx); + if(stat_ctx.continue_label == -1) + return E_OUTOFMEMORY; + hres = compile_expression(ctx, stat->in_expr); if(FAILED(hres)) return hres; @@ -1207,7 +1224,7 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s if(push_instr(ctx, OP_undefined) == -1) return E_OUTOFMEMORY; - loop_addr = ctx->code_off; + label_set_addr(ctx, stat_ctx.continue_label); hres = push_instr_uint(ctx, OP_forin, stat_ctx.break_label); if(FAILED(hres)) return E_OUTOFMEMORY; @@ -1224,7 +1241,7 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s if(FAILED(hres)) return hres; - hres = push_instr_uint(ctx, OP_jmp, loop_addr); + hres = push_instr_uint(ctx, OP_jmp, stat_ctx.continue_label); if(FAILED(hres)) return hres; @@ -1232,10 +1249,87 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s return S_OK; } +static HRESULT pop_to_stat(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx) +{ + statement_ctx_t *iter = ctx->stat_ctx; + unsigned stack_pop = 0; + + while(1) { + if(iter->using_scope && push_instr(ctx, OP_pop_scope) == -1) + return E_OUTOFMEMORY; + if(iter->using_except && push_instr(ctx, OP_pop_except) == -1) + return E_OUTOFMEMORY; + stack_pop += iter->stack_use; + if(iter == stat_ctx) + break; + iter = iter->next; + } + + /* FIXME: optimize */ + while(stack_pop--) { + if(push_instr(ctx, OP_pop) == -1) + return E_OUTOFMEMORY; + } + + return S_OK; +} + +/* ECMA-262 3rd Edition 12.7 */ +static HRESULT compile_continue_statement(compiler_ctx_t *ctx, branch_statement_t *stat) +{ + statement_ctx_t *pop_ctx; + HRESULT hres; + + for(pop_ctx = ctx->stat_ctx; pop_ctx; pop_ctx = pop_ctx->next) { + if(pop_ctx->continue_label != -1) + break; + } + + if(!pop_ctx || stat->identifier) { + stat->stat.eval = continue_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); + } + + hres = pop_to_stat(ctx, pop_ctx); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + + return push_instr_uint(ctx, OP_jmp, pop_ctx->continue_label); +} + +/* ECMA-262 3rd Edition 12.8 */ +static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t *stat) +{ + statement_ctx_t *pop_ctx; + HRESULT hres; + + for(pop_ctx = ctx->stat_ctx; pop_ctx; pop_ctx = pop_ctx->next) { + if(pop_ctx->break_label != -1) + break; + } + + if(!pop_ctx || stat->identifier) { + stat->stat.eval = break_statement_eval; + return compile_interp_fallback(ctx, &stat->stat); + } + + hres = pop_to_stat(ctx, pop_ctx); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_undefined) == -1) + return E_OUTOFMEMORY; + + return push_instr_uint(ctx, OP_jmp, pop_ctx->break_label); +} + /* ECMA-262 3rd Edition 12.10 */ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *stat) { - statement_ctx_t stat_ctx = {0, TRUE, FALSE, -1}; + statement_ctx_t stat_ctx = {0, TRUE, FALSE, -1, -1}; unsigned off_backup; BOOL prev_no_fallback; HRESULT hres; @@ -1270,8 +1364,8 @@ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *sta /* ECMA-262 3rd Edition 12.13 */ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t *stat) { + statement_ctx_t stat_ctx = {0, FALSE, FALSE, -1, -1}; unsigned case_cnt = 0, *case_jmps, i, default_jmp; - statement_ctx_t stat_ctx = {0, FALSE, FALSE}; BOOL have_default = FALSE; statement_t *stat_iter; case_clausule_t *iter; @@ -1390,7 +1484,8 @@ static HRESULT compile_throw_statement(compiler_ctx_t *ctx, expression_statement /* ECMA-262 3rd Edition 12.14 */ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) { - statement_ctx_t try_ctx = {0, FALSE, TRUE, -1}, catch_ctx = {0, TRUE, FALSE, -1}, finally_ctx = {2, FALSE, FALSE, -1}; + statement_ctx_t try_ctx = {0, FALSE, TRUE, -1, -1}, catch_ctx = {0, TRUE, FALSE, -1, -1}; + statement_ctx_t finally_ctx = {2, FALSE, FALSE, -1, -1}; unsigned off_backup, push_except; BOOL prev_no_fallback; BSTR ident; @@ -1494,6 +1589,12 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, case STAT_BLOCK: hres = compile_block_statement(ctx, ((block_statement_t*)stat)->stat_list); break; + case STAT_BREAK: + hres = compile_break_statement(ctx, (branch_statement_t*)stat); + break; + case STAT_CONTINUE: + hres = compile_continue_statement(ctx, (branch_statement_t*)stat); + break; case STAT_EMPTY: hres = push_instr(ctx, OP_undefined) == -1 ? E_OUTOFMEMORY : S_OK; /* FIXME */ break; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index f9b2ca3..5cf0412 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -837,8 +837,8 @@ static BOOL allow_auto_semicolon(parser_ctx_t *ctx) static const statement_eval_t stat_eval_table[] = { compiled_statement_eval, - break_statement_eval, - continue_statement_eval, + compiled_statement_eval, + compiled_statement_eval, compiled_statement_eval, compiled_statement_eval, compiled_statement_eval,

1 0

Jacek Caban : jscript: Get rid of no longer needed no_fallback hack.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 8f8c8528972c8c371335663f78657811aecacd49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8c8528972c8c371335663f7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:07:06 2011 +0100 jscript: Get rid of no longer needed no_fallback hack. --- dlls/jscript/compile.c | 33 --------------------------------- dlls/jscript/engine.c | 6 ++++-- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index bf2d3dd..9d1081e 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -49,8 +49,6 @@ struct _compiler_ctx_t { unsigned labels_cnt; statement_ctx_t *stat_ctx; - - BOOL no_fallback; }; static const struct { @@ -483,9 +481,6 @@ 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; @@ -1021,7 +1016,6 @@ static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *s { statement_ctx_t stat_ctx = {0, FALSE, FALSE}; unsigned off_backup, jmp_off; - BOOL prev_no_fallback; HRESULT hres; off_backup = ctx->code_off; @@ -1055,10 +1049,7 @@ static HRESULT compile_while_statement(compiler_ctx_t *ctx, while_statement_t *s jmp_off = ctx->code_off; } - prev_no_fallback = ctx->no_fallback; - ctx->no_fallback = TRUE; hres = compile_statement(ctx, &stat_ctx, stat->statement); - ctx->no_fallback = prev_no_fallback; if(hres == E_NOTIMPL) { ctx->code_off = off_backup; stat->stat.eval = while_statement_eval; @@ -1094,7 +1085,6 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) { statement_ctx_t stat_ctx = {0, FALSE, FALSE}; unsigned off_backup, expr_off; - BOOL prev_no_fallback; HRESULT hres; off_backup = ctx->code_off; @@ -1140,10 +1130,7 @@ static HRESULT compile_for_statement(compiler_ctx_t *ctx, for_statement_t *stat) 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_ctx, stat->statement); - ctx->no_fallback = prev_no_fallback; if(hres == E_NOTIMPL) { ctx->code_off = off_backup; stat->stat.eval = for_statement_eval; @@ -1178,7 +1165,6 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s { statement_ctx_t stat_ctx = {4, FALSE, FALSE}; unsigned off_backup = ctx->code_off; - BOOL prev_no_fallback; HRESULT hres; if(stat->variable) { @@ -1229,10 +1215,7 @@ static HRESULT compile_forin_statement(compiler_ctx_t *ctx, forin_statement_t *s if(FAILED(hres)) return E_OUTOFMEMORY; - prev_no_fallback = ctx->no_fallback; - ctx->no_fallback = TRUE; hres = compile_statement(ctx, &stat_ctx, stat->statement); - ctx->no_fallback = prev_no_fallback; if(hres == E_NOTIMPL) { ctx->code_off = off_backup; stat->stat.eval = forin_statement_eval; @@ -1331,7 +1314,6 @@ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *sta { statement_ctx_t stat_ctx = {0, TRUE, FALSE, -1, -1}; unsigned off_backup; - BOOL prev_no_fallback; HRESULT hres; off_backup = ctx->code_off; @@ -1343,10 +1325,7 @@ static HRESULT compile_with_statement(compiler_ctx_t *ctx, with_statement_t *sta if(push_instr(ctx, OP_push_scope) == -1) return E_OUTOFMEMORY; - prev_no_fallback = ctx->no_fallback; - ctx->no_fallback = TRUE; hres = compile_statement(ctx, &stat_ctx, stat->statement); - ctx->no_fallback = prev_no_fallback; if(hres == E_NOTIMPL) { ctx->code_off = off_backup; stat->stat.eval = with_statement_eval; @@ -1370,7 +1349,6 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t statement_t *stat_iter; case_clausule_t *iter; unsigned off_backup; - BOOL prev_no_fallback; HRESULT hres; off_backup = ctx->code_off; @@ -1436,10 +1414,7 @@ static HRESULT compile_switch_statement(compiler_ctx_t *ctx, switch_statement_t instr_ptr(ctx, iter->expr ? case_jmps[i++] : default_jmp)->arg1.uint = ctx->code_off; for(stat_iter = iter->stat; stat_iter && (!iter->next || iter->next->stat != stat_iter); stat_iter = stat_iter->next) { - prev_no_fallback = ctx->no_fallback; - ctx->no_fallback = TRUE; hres = compile_statement(ctx, &stat_ctx, stat_iter); - ctx->no_fallback = prev_no_fallback; if(hres == E_NOTIMPL) { ctx->code_off = off_backup; stat->stat.eval = switch_statement_eval; @@ -1487,12 +1462,10 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) statement_ctx_t try_ctx = {0, FALSE, TRUE, -1, -1}, catch_ctx = {0, TRUE, FALSE, -1, -1}; statement_ctx_t finally_ctx = {2, FALSE, FALSE, -1, -1}; unsigned off_backup, push_except; - BOOL prev_no_fallback; BSTR ident; HRESULT hres; off_backup = ctx->code_off; - prev_no_fallback = ctx->no_fallback; push_except = push_instr(ctx, OP_push_except); if(push_except == -1) @@ -1511,9 +1484,7 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) if(!stat->catch_block) try_ctx.stack_use = 2; - ctx->no_fallback = TRUE; hres = compile_statement(ctx, &try_ctx, stat->try_statement); - ctx->no_fallback = prev_no_fallback; if(hres == E_NOTIMPL) { ctx->code_off = off_backup; stat->stat.eval = try_statement_eval; @@ -1534,9 +1505,7 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) instr_ptr(ctx, push_except)->arg1.uint = ctx->code_off; - ctx->no_fallback = TRUE; hres = compile_statement(ctx, &catch_ctx, stat->catch_block->statement); - ctx->no_fallback = prev_no_fallback; if(hres == E_NOTIMPL) { ctx->code_off = off_backup; stat->stat.eval = try_statement_eval; @@ -1558,9 +1527,7 @@ static HRESULT compile_try_statement(compiler_ctx_t *ctx, try_statement_t *stat) if(push_instr(ctx, OP_pop) == -1) return E_OUTOFMEMORY; - ctx->no_fallback = TRUE; hres = compile_statement(ctx, stat->catch_block ? NULL : &finally_ctx, stat->finally_statement); - ctx->no_fallback = prev_no_fallback; if(hres == E_NOTIMPL) { ctx->code_off = off_backup; stat->stat.eval = try_statement_eval; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index bbf4fbd..0d97765 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3265,10 +3265,12 @@ HRESULT compiled_statement_eval(script_ctx_t *ctx, statement_t *stat, return_typ exec_ctx->ei = prev_ei; exec_ctx->except_frame = prev_except_frame; - if(FAILED(hres)) { - stack_popn(exec_ctx, exec_ctx->top-prev_top); + if(FAILED(hres) || rt->type != RT_NORMAL) { while(exec_ctx->scope_chain != prev_scope) scope_pop(&exec_ctx->scope_chain); + } + if(FAILED(hres)) { + stack_popn(exec_ctx, exec_ctx->top-prev_top); return hres; }

1 0

Jacek Caban : jscript: Added more control flow tests.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: d7fd00fdab1ab00b1d1fa2b58e4d431c6110e2be URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fd00fdab1ab00b1d1fa2b58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 12:07:15 2011 +0100 jscript: Added more control flow tests. --- dlls/jscript/tests/lang.js | 58 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 7eabdcf..d7182c6 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -839,6 +839,64 @@ for(tmp in obj1.nonexistent) ok(false, "for(tmp in obj1.nonexistent) called with tmp = " + tmp); ok(!("nonexistent" in obj1), "nonexistent added to obj1 by for..in loop"); +var i, j; + + +tmp = ""; +i = 0; +while(true) { + tmp += "1"; + for(i = 1; i < 3; i++) { + switch(i) { + case 1: + tmp += "2"; + continue; + case 2: + tmp += "3"; + try { + throw null; + }finally { + tmp += "4"; + break; + } + default: + ok(false, "unexpected state"); + } + tmp += "5"; + } + with({prop: "6"}) { + tmp += prop; + break; + } +} +ok(tmp === "123456", "tmp = " + tmp); + +tmp = ""; +i = 0; +for(j in [1,2,3]) { + tmp += "1"; + for(;;) { + with({prop: "2"}) { + tmp += prop; + try { + throw "3"; + }catch(e) { + tmp += e; + with([0]) + break; + } + } + ok(false, "unexpected state"); + } + while(true) { + tmp += "4"; + break; + } + break; +} +ok(tmp === "1234", "tmp = " + tmp); + + ok((void 1) === undefined, "(void 1) !== undefined"); var inobj = new Object();

1 0

Jacek Caban : mshtml: Use IURi for IHTMLLocation::get_hash implementation.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: dfeec5a2bf834ed2e6cc346973ba11d8923a978c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfeec5a2bf834ed2e6cc34697… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 28 13:09:51 2011 +0100 mshtml: Use IURi for IHTMLLocation::get_hash implementation. --- dlls/mshtml/htmllocation.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index b3354f0..cd24f12 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -504,9 +504,7 @@ static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v) static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) { HTMLLocation *This = impl_from_IHTMLLocation(iface); - URL_COMPONENTSW url = {sizeof(URL_COMPONENTSW)}; - const WCHAR hash[] = {'#',0}; - DWORD hash_pos = 0; + BSTR hash; HRESULT hres; TRACE("(%p)->(%p)\n", This, p); @@ -514,23 +512,21 @@ static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p) if(!p) return E_POINTER; - url.dwExtraInfoLength = 1; - hres = get_url_components(This, &url); - if(FAILED(hres)) - return hres; + if(!This->window || !This->window->uri) { + FIXME("No current URI\n"); + return E_NOTIMPL; + } - if(!url.dwExtraInfoLength){ + hres = IUri_GetFragment(This->window->uri, &hash); + if(hres == S_OK) { + *p = hash; + }else if(hres == S_FALSE) { + SysFreeString(hash); *p = NULL; - return S_OK; + }else { + return hres; } - hash_pos = strcspnW(url.lpszExtraInfo, hash); - url.dwExtraInfoLength -= hash_pos; - - *p = SysAllocStringLen(url.lpszExtraInfo + hash_pos, url.dwExtraInfoLength); - - if(!*p) - return E_OUTOFMEMORY; return S_OK; }

1 0

Piotr Caban : msvcrt: NULL terminate strings returned by _Getdays and _Getmonths.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 17f0ee46220ada879b101433f6cbdd507cc8728f URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f0ee46220ada879b101433f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 28 16:29:07 2011 +0100 msvcrt: NULL terminate strings returned by _Getdays and _Getmonths. --- dlls/msvcrt/locale.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 60ea424..699b028 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -444,6 +444,7 @@ char* CDECL _Getdays(void) memcpy(&out[size], cur->str[7+i], len); size += len; } + out[size] = '\0'; return out; } @@ -478,6 +479,7 @@ char* CDECL _Getmonths(void) memcpy(&out[size], cur->str[months_offset+12+i], len); size += len; } + out[size] = '\0'; return out; }

1 0

Nikolay Sivov : msxml3: Implement element stack and use it in related callbacks.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 9d662928f5ea228a8dbcd1fd1283309a06d8d3e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d662928f5ea228a8dbcd1fd1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Dec 24 16:10:33 2011 +0300 msxml3: Implement element stack and use it in related callbacks. --- dlls/msxml3/saxreader.c | 415 ++++++++++++++++++++--------------------- dlls/msxml3/tests/saxreader.c | 15 +- 2 files changed, 218 insertions(+), 212 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9d662928f5ea228a8dbcd…

1 0

Matteo Bruni : wined3d: Improve invalid TEXTURETRANSFORMFLAGS handling.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 472fed41dd6238f9aead069da1d46f609daf425c URL: http://source.winehq.org/git/wine.git/?a=commit;h=472fed41dd6238f9aead069da… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Dec 27 17:28:57 2011 +0100 wined3d: Improve invalid TEXTURETRANSFORMFLAGS handling. --- dlls/wined3d/shader.c | 37 ++++++++++++++++++++++++++++++++----- 1 files changed, 32 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 313ed9b..b3d2f7f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1911,20 +1911,46 @@ void find_ps_compile_args(const struct wined3d_state *state, for (i = 0; i < 4; ++i) { DWORD flags = state->texture_states[i][WINED3DTSS_TEXTURETRANSFORMFLAGS]; - DWORD count, tex_transform; + DWORD count, tex_transform = 0; /* Filter some invalid flags */ count = flags & ~WINED3DTTFF_PROJECTED; - if (count > WINED3DTTFF_COUNT4) + if (count > WINED3DTTFF_COUNT4 || (!(flags & WINED3DTTFF_PROJECTED) && count != 0)) { - WARN("The application set an invalid TEXTURETRANSFORMFLAGS value.\n"); - flags = count = 0; + WARN("The application set an invalid %#x TEXTURETRANSFORMFLAGS value.\n", flags); + count = 0; } - tex_transform = count; if (flags & WINED3DTTFF_PROJECTED) { enum wined3d_sampler_texture_type sampler_type = shader->reg_maps.sampler_type[i]; + DWORD max_valid = WINED3DTTFF_COUNT4; + + if (!count) + count = WINED3DTTFF_COUNT4; + + if (!state->vertex_shader) + { + unsigned int j; + unsigned int index = state->texture_states[i][WINED3DTSS_TEXCOORDINDEX]; + for (j = 0; j < state->vertex_declaration->element_count; ++j) + { + struct wined3d_vertex_declaration_element *element = + &state->vertex_declaration->elements[j]; + + if (element->usage == WINED3DDECLUSAGE_TEXCOORD + && element->usage_idx == index) + { + max_valid = element->format->component_count; + break; + } + } + } + + tex_transform = min(count, max_valid); + if (tex_transform != (flags & ~WINED3DTTFF_PROJECTED)) + WARN("Fixing up %#x projected texture transform flag to %#x.\n", + flags & ~WINED3DTTFF_PROJECTED, tex_transform); if ((sampler_type == WINED3DSTT_1D && tex_transform > WINED3DTTFF_COUNT1) || (sampler_type == WINED3DSTT_2D && tex_transform > WINED3DTTFF_COUNT2) @@ -1933,6 +1959,7 @@ void find_ps_compile_args(const struct wined3d_state *state, else WARN("Application requested projected texture with unsuitable texture coordinates.\n"); } + tex_transform &= WINED3D_PSARGS_TEXTRANSFORM_MASK; args->tex_transform |= tex_transform << i * WINED3D_PSARGS_TEXTRANSFORM_SHIFT; } }

1 0

Alexandre Julliard : gdi32: Pass the clip region to the brush_rect helper and add a similar helper for pens .
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: 9b8d920cb736eab30d65690f960b1833cbb00600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8d920cb736eab30d65690f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 11:28:21 2011 +0100 gdi32: Pass the clip region to the brush_rect helper and add a similar helper for pens. --- dlls/gdi32/dibdrv/dibdrv.h | 3 ++- dlls/gdi32/dibdrv/graphics.c | 8 +++----- dlls/gdi32/dibdrv/objects.c | 32 ++++++++++++++++++-------------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 85aa2cf..8649752 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -229,7 +229,8 @@ extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HID extern BOOL convert_dib(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN; extern COLORREF make_rgb_colorref( HDC hdc, dib_info *dib, COLORREF color, BOOL *got_pixel, DWORD *pixel ) DECLSPEC_HIDDEN; extern DWORD get_pixel_color(dibdrv_physdev *pdev, COLORREF color, BOOL mono_fixup) DECLSPEC_HIDDEN; -extern BOOL brush_rect( dibdrv_physdev *pdev, const RECT *rect, INT rop ) DECLSPEC_HIDDEN; +extern BOOL brush_rect( dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop ) DECLSPEC_HIDDEN; +extern BOOL pen_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) DECLSPEC_HIDDEN; extern int get_clipped_rects( const dib_info *dib, const RECT *rc, HRGN clip, struct clipped_rects *clip_rects ) DECLSPEC_HIDDEN; extern int clip_line(const POINT *start, const POINT *end, const RECT *clip, const bres_params *params, POINT *pt1, POINT *pt2) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index c84cce2..e5aad2a 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -479,7 +479,7 @@ BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) TRACE("(%p, %d, %d, %d, %d, %06x)\n", dev, dst->x, dst->y, dst->width, dst->height, rop); - return brush_rect( pdev, &dst->visrect, get_rop2_from_rop(rop) ); + return brush_rect( pdev, &dst->visrect, pdev->clip, get_rop2_from_rop(rop) ); } /*********************************************************************** @@ -501,7 +501,7 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) { rect = get_device_rect( dev->hdc, region->rects[i].left, region->rects[i].top, region->rects[i].right, region->rects[i].bottom, FALSE ); - brush_rect( pdev, &rect, GetROP2( dev->hdc ) ); + brush_rect( pdev, &rect, pdev->clip, GetROP2( dev->hdc ) ); } release_wine_region( rgn ); @@ -603,9 +603,7 @@ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) rect.right -= (pdev->pen_width + 2) / 2; rect.bottom -= (pdev->pen_width + 2) / 2; - brush_rect( pdev, &rect, GetROP2(dev->hdc) ); - - return TRUE; + return brush_rect( pdev, &rect, pdev->clip, GetROP2(dev->hdc) ); } /*********************************************************************** diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 79ae047..e203af7 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1227,22 +1227,11 @@ static HRGN get_wide_lines_region( dibdrv_physdev *pdev, int num, POINT *pts, BO static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close) { - struct clipped_rects clipped_rects; - rop_mask color; HRGN region; - DWORD pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); - - calc_rop_masks( GetROP2(pdev->dev.hdc), pen_color, &color ); region = get_wide_lines_region( pdev, num, pts, close ); if (pdev->clip) CombineRgn( region, region, pdev->clip, RGN_AND ); - - if (get_clipped_rects( &pdev->dib, NULL, region, &clipped_rects )) - { - pdev->dib.funcs->solid_rects( &pdev->dib, clipped_rects.count, clipped_rects.rects, - color.and, color.xor ); - free_clipped_rects( &clipped_rects ); - } + pen_rect( pdev, NULL, region, GetROP2( pdev->dev.hdc ) ); DeleteObject( region ); return TRUE; } @@ -1715,13 +1704,28 @@ COLORREF dibdrv_SetDCBrushColor( PHYSDEV dev, COLORREF color ) return next->funcs->pSetDCBrushColor( next, color ); } -BOOL brush_rect(dibdrv_physdev *pdev, const RECT *rect, INT rop) +BOOL brush_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) { struct clipped_rects clipped_rects; BOOL ret; - if (!get_clipped_rects( &pdev->dib, rect, pdev->clip, &clipped_rects )) return TRUE; + if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; ret = pdev->brush_rects( pdev, &pdev->dib, clipped_rects.count, clipped_rects.rects, rop ); free_clipped_rects( &clipped_rects ); return ret; } + +BOOL pen_rect(dibdrv_physdev *pdev, const RECT *rect, HRGN clip, INT rop) +{ + struct clipped_rects clipped_rects; + rop_mask color; + DWORD pen_color = get_pixel_color( pdev, pdev->pen_colorref, TRUE ); + + if (!get_clipped_rects( &pdev->dib, rect, clip, &clipped_rects )) return TRUE; + + calc_rop_masks( rop, pen_color, &color ); + pdev->dib.funcs->solid_rects( &pdev->dib, clipped_rects.count, clipped_rects.rects, + color.and, color.xor ); + free_clipped_rects( &clipped_rects ); + return TRUE; +}

1 0

Alexandre Julliard : gdi32: Fix the scaling of the width of cosmetic pens.
by Alexandre Julliard 28 Dec '11

28 Dec '11

Module: wine Branch: master Commit: ab63eb5c40d25bcbf2742f2dcb73df08a4301c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab63eb5c40d25bcbf2742f2dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 28 13:50:41 2011 +0100 gdi32: Fix the scaling of the width of cosmetic pens. --- dlls/gdi32/dibdrv/objects.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index e203af7..c9b7814 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1245,18 +1245,15 @@ static const dash_pattern dash_patterns[5] = {6, {9, 3, 3, 3, 3, 3}, 24} /* PS_DASHDOTDOT */ }; -static inline int get_pen_device_width( dibdrv_physdev *pdev, LOGPEN *pen ) +static inline int get_pen_device_width( dibdrv_physdev *pdev, int width ) { - int width = pen->lopnWidth.x; + POINT pts[2]; - if (pen->lopnStyle & PS_GEOMETRIC && width > 1) - { - POINT pts[2]; - pts[0].x = pts[0].y = pts[1].y = 0; - pts[1].x = width; - LPtoDP( pdev->dev.hdc, pts, 2 ); - width = abs( pts[1].x - pts[0].x ); - } + if (!width) return 1; + pts[0].x = pts[0].y = pts[1].y = 0; + pts[1].x = width; + LPtoDP( pdev->dev.hdc, pts, 2 ); + width = abs( pts[1].x - pts[0].x ); return max( width, 1 ); } @@ -1285,15 +1282,16 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) /* FIXME: add support for user style pens */ logpen.lopnStyle = elp->elpPenStyle; logpen.lopnWidth.x = elp->elpWidth; - logpen.lopnWidth.y = 0; logpen.lopnColor = elp->elpColor; + /* cosmetic ext pens are always 1-pixel wide */ + if (!(logpen.lopnStyle & PS_GEOMETRIC)) logpen.lopnWidth.x = 0; HeapFree( GetProcessHeap(), 0, elp ); } pdev->pen_join = logpen.lopnStyle & PS_JOIN_MASK; pdev->pen_endcap = logpen.lopnStyle & PS_ENDCAP_MASK; - pdev->pen_width = get_pen_device_width( pdev, &logpen ); + pdev->pen_width = get_pen_device_width( pdev, logpen.lopnWidth.x ); if (hpen == GetStockObject( DC_PEN )) logpen.lopnColor = GetDCPenColor( dev->hdc );

1 0