wine-commits October 2014

wine-commits@winehq.org

2 participants
397 discussions

Jacek Caban : mshtml: Don' t assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlscript.c.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: b2c65c296f3664c78eba9665fd731c9f4c3d76ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2c65c296f3664c78eba9665f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 11:23:47 2014 +0200 mshtml: Don't assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlscript.c. --- dlls/mshtml/htmlscript.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index dcab32f..1a61398 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -136,7 +136,7 @@ static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR return S_OK; } - nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + nsres = nsIDOMHTMLElement_GetParentNode(This->element.nselem, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); This->parse_on_bind = TRUE; @@ -214,7 +214,7 @@ static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLScriptElement_GetParentNode(This->nsscript, &parent); + nsres = nsIDOMHTMLElement_GetParentNode(This->element.nselem, &parent); if(NS_FAILED(nsres) || !parent) { TRACE("No parent, not executing\n"); This->parse_on_bind = TRUE; @@ -433,10 +433,16 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { HRESULT script_elem_from_nsscript(HTMLDocumentNode *doc, nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) { + nsIDOMNode *nsnode; HTMLDOMNode *node; + nsresult nsres; HRESULT hres; - hres = get_node(doc, (nsIDOMNode*)nsscript, TRUE, &node); + nsres = nsIDOMHTMLScriptElement_QueryInterface(nsscript, &IID_nsIDOMNode, (void**)&nsnode); + assert(nsres == NS_OK); + + hres = get_node(doc, nsnode, TRUE, &node); + nsIDOMNode_Release(nsnode); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmloption.c.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 256204d876cc4588cb2d38896e3beb2e6b59ce1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=256204d876cc4588cb2d38896… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 11:23:37 2014 +0200 mshtml: Don't assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmloption.c. --- dlls/mshtml/htmloption.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmloption.c b/dlls/mshtml/htmloption.c index b5c8b7d..c960528 100644 --- a/dlls/mshtml/htmloption.c +++ b/dlls/mshtml/htmloption.c @@ -209,11 +209,11 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR while(1) { nsIDOMNode *child; - nsres = nsIDOMHTMLOptionElement_GetFirstChild(This->nsoption, &child); + nsres = nsIDOMHTMLElement_GetFirstChild(This->element.nselem, &child); if(NS_FAILED(nsres) || !child) break; - nsres = nsIDOMHTMLOptionElement_RemoveChild(This->nsoption, child, &tmp); + nsres = nsIDOMHTMLElement_RemoveChild(This->element.nselem, child, &tmp); nsIDOMNode_Release(child); if(NS_SUCCEEDED(nsres)) { nsIDOMNode_Release(tmp); @@ -231,7 +231,7 @@ static HRESULT WINAPI HTMLOptionElement_put_text(IHTMLOptionElement *iface, BSTR return E_FAIL; } - nsres = nsIDOMHTMLOptionElement_AppendChild(This->nsoption, (nsIDOMNode*)text_node, &tmp); + nsres = nsIDOMHTMLElement_AppendChild(This->element.nselem, (nsIDOMNode*)text_node, &tmp); if(NS_SUCCEEDED(nsres)) nsIDOMNode_Release(tmp); else

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlinput.c.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: f30f506d22357818e5e8813275d083f2d9f102c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f30f506d22357818e5e881327… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 11:23:25 2014 +0200 mshtml: Don't assume that nsIDOMHTML*Element interfaces inherit from nsIDOMHTMLElement in htmlinput.c. --- dlls/mshtml/htmlinput.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index e568f4b..4ce01b5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -256,6 +256,7 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF { HTMLInputElement *This = impl_from_IHTMLInputElement(iface); nsIDOMHTMLFormElement *nsform; + nsIDOMNode *form_node; HTMLDOMNode *node; HRESULT hres; nsresult nsres; @@ -269,8 +270,12 @@ static HRESULT WINAPI HTMLInputElement_get_form(IHTMLInputElement *iface, IHTMLF return E_FAIL; } - hres = get_node(This->element.node.doc, (nsIDOMNode*)nsform, TRUE, &node); + nsres = nsIDOMHTMLFormElement_QueryInterface(nsform, &IID_nsIDOMNode, (void**)&form_node); nsIDOMHTMLFormElement_Release(nsform); + assert(nsres == NS_OK); + + hres = get_node(This->element.node.doc, form_node, TRUE, &node); + nsIDOMNode_Release(form_node); if (FAILED(hres)) return hres; @@ -1233,7 +1238,7 @@ static HRESULT HTMLInputElementImpl_fire_event(HTMLDOMNode *iface, eventid_t eid *handled = TRUE; - nsres = nsIDOMHTMLInputElement_Click(This->nsinput); + nsres = nsIDOMHTMLElement_Click(This->element.nselem); if(NS_FAILED(nsres)) { ERR("Click failed: %08x\n", nsres); return E_FAIL;

1 0

Jacek Caban : jscript: Added support for '-' CC expression.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 9b41bb0345a98d23778c91da692a5a0e97cecfc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b41bb0345a98d23778c91da6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:44 2014 +0200 jscript: Added support for '-' CC expression. --- dlls/jscript/cc_parser.y | 3 +++ dlls/jscript/tests/cc.js | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/jscript/cc_parser.y b/dlls/jscript/cc_parser.y index 83d8b4e..d25022b 100644 --- a/dlls/jscript/cc_parser.y +++ b/dlls/jscript/cc_parser.y @@ -66,6 +66,7 @@ static int cc_parser_lex(void *lval, parser_ctx_t *ctx) case '(': case ')': case '+': + case '-': case '*': case '/': return *ctx->ptr++; @@ -105,6 +106,8 @@ CCAdditiveExpression : CCMultiplicativeExpression { $$ = $1; } | CCAdditiveExpression '+' CCMultiplicativeExpression { $$ = ccval_num(get_ccnum($1) + get_ccnum($3)); } + | CCAdditiveExpression '-' CCMultiplicativeExpression + { $$ = ccval_num(get_ccnum($1) - get_ccnum($3)); } CCMultiplicativeExpression : CCUnaryExpression { $$ = $1; } diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 32f827e..7ce3682 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -140,6 +140,12 @@ ok(@test === false, "@test = " + @test); @set @test = (0 != true) ok(@test === true, "@test = " + @test); +@set @test = (true-2) +ok(@test === -1, "@test = " + @test); + +@set @test = (true-@_jscript) +ok(@test === 0, "@test = " + @test); + @if (false) this wouldn not parse "@end

1 0

Jacek Caban : jscript: Implicitly turn CC on for @if instruction.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: fcd9817581533a29b540546e9a08e593087740bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcd9817581533a29b540546e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:37 2014 +0200 jscript: Implicitly turn CC on for @if instruction. --- dlls/jscript/lex.c | 3 +++ dlls/jscript/tests/run.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index e541182..b4a3700 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -1051,6 +1051,9 @@ static int cc_token(parser_ctx_t *ctx, void *lval) } if(!check_keyword(ctx, ifW, NULL)) { + if(!init_cc(ctx)) + return -1; + if(!skip_spaces(ctx) || *ctx->ptr != '(') return lex_error(ctx, JS_E_MISSING_LBRACKET); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 42336a4..aa1783e 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2185,6 +2185,12 @@ static BOOL run_tests(void) parse_script_a("@set @t=2\nok(@t === 2, '@t = ' + @t);"); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("@if(true)\nif(@_jscript) reportSuccess();\n@end"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Jacek Caban : jscript: Implicitly turn CC on for @set instruction.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 8b3638879795465395a27dc9ccfcfdf39acab3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3638879795465395a27dc9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:30 2014 +0200 jscript: Implicitly turn CC on for @set instruction. --- dlls/jscript/lex.c | 20 +++++++++++++------- dlls/jscript/tests/run.c | 2 ++ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 3daaf47..e541182 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -852,7 +852,7 @@ static cc_var_t *find_cc_var(cc_ctx_t *cc, const WCHAR *name, unsigned name_len) return NULL; } -static int init_cc(parser_ctx_t *ctx) +static BOOL init_cc(parser_ctx_t *ctx) { cc_ctx_t *cc; @@ -865,11 +865,13 @@ static int init_cc(parser_ctx_t *ctx) static const WCHAR _jscript_versionW[] = {'_','j','s','c','r','i','p','t','_','v','e','r','s','i','o','n',0}; if(ctx->script->cc) - return 0; + return TRUE; cc = heap_alloc(sizeof(cc_ctx_t)); - if(!cc) - return lex_error(ctx, E_OUTOFMEMORY); + if(!cc) { + lex_error(ctx, E_OUTOFMEMORY); + return FALSE; + } cc->vars = NULL; @@ -879,11 +881,12 @@ static int init_cc(parser_ctx_t *ctx) || !new_cc_var(cc, _jscript_versionW, -1, ccval_num(JSCRIPT_MAJOR_VERSION + (DOUBLE)JSCRIPT_MINOR_VERSION/10.0)) || !new_cc_var(cc, _jscript_buildW, -1, ccval_num(JSCRIPT_BUILD_VERSION))) { release_cc(cc); - return lex_error(ctx, E_OUTOFMEMORY); + lex_error(ctx, E_OUTOFMEMORY); + return FALSE; } ctx->script->cc = cc; - return 0; + return TRUE; } static BOOL parse_cc_identifier(parser_ctx_t *ctx, const WCHAR **ret, unsigned *ret_len) @@ -1011,13 +1014,16 @@ static int cc_token(parser_ctx_t *ctx, void *lval) ctx->ptr++; if(!check_keyword(ctx, cc_onW, NULL)) - return init_cc(ctx); + return init_cc(ctx) ? 0 : -1; if(!check_keyword(ctx, setW, NULL)) { const WCHAR *ident; unsigned ident_len; cc_var_t *var; + if(!init_cc(ctx)) + return -1; + if(!skip_spaces(ctx)) return lex_error(ctx, JS_E_EXPECTED_AT); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index b8edd7d..42336a4 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2183,6 +2183,8 @@ static BOOL run_tests(void) CHECK_CALLED(testobj_withprop_d); CHECK_CALLED(testobj_withprop_i); + parse_script_a("@set @t=2\nok(@t === 2, '@t = ' + @t);"); + run_from_res("lang.js"); run_from_res("api.js"); run_from_res("regexp.js");

1 0

Jacek Caban : jscript: Added tests for @if/@elif/@else/@end.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 68c61d17e0c5af5251d440efb0ee7c5292b598f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c61d17e0c5af5251d440efb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:21 2014 +0200 jscript: Added tests for @if/@elif/@else/@end. --- dlls/jscript/tests/cc.js | 104 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index b96f21e..32f827e 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -140,9 +140,107 @@ ok(@test === false, "@test = " + @test); @set @test = (0 != true) ok(@test === true, "@test = " + @test); +@if (false) + this wouldn not parse +"@end + +@if (false) "@end + +tmp = "@if (false) @end"; +ok(tmp.length === 16, "tmp.length = " + tmp.length); + +@if(true) +tmp = true +@end +ok(tmp === true, "tmp = " + tmp); + +@if(false) +@if this would not CC parse +this will not parse +@elif(true) +this will also not parse +@else +this also will not parse +@if let me complicate things a bit +@end enough +@end +@end + +@if(false) +this will not parse +@else +tmp = 2 +@else +this will not be parsed +@else +also this +@end +ok(tmp === 2, "tmp = " + tmp); + +@if(true) +tmp = 3; +@else +just skip this +@end +ok(tmp === 3, "tmp = " + tmp); + +@if(true) +tmp = 4; +@elif(true) +this will not parse +@elif nor this +@else +just skip this +@end +ok(tmp === 4, "tmp = " + tmp); + +@if(false) +this will not parse +@elif(false) +nor this would +@elif(true) +tmp = 5; +@elif nor this +@else +just skip this +@end +ok(tmp === 5, "tmp = " + tmp); + +@if (!@_jscript) +this would not parse +@if(true) +@else +@if(false) +@end +@end +@elif (@_jscript) +tmp = 6; +@elif (true) +@if xxx +@else +@if @elif @elif @else @end +@end +@else +this would not parse +@end +ok(tmp === 6, "tmp = " + tmp); + +@if(true) +@if(false) +@else +tmp = 7; +@end +@else +this would not parse +@end +ok(tmp === 7, "tmp = " + tmp); + var exception_map = { + JS_E_SYNTAX: {type: "SyntaxError", number: -2146827286}, + JS_E_MISSING_LBRACKET: {type: "SyntaxError", number: -2146827283}, JS_E_EXPECTED_IDENTIFIER: {type: "SyntaxError", number: -2146827278}, JS_E_EXPECTED_ASSIGN: {type: "SyntaxError", number: -2146827277}, + JS_E_EXPECTED_CCEND: {type: "SyntaxError", number: -2146827259}, JS_E_EXPECTED_AT: {type: "SyntaxError", number: -2146827256} }; @@ -164,5 +262,11 @@ function testException(src, id) { testException("@set test=true", "JS_E_EXPECTED_AT"); testException("@set @1=true", "JS_E_EXPECTED_IDENTIFIER"); testException("@set @test x=true", "JS_E_EXPECTED_ASSIGN"); +testException("@if false\n@end", "JS_E_MISSING_LBRACKET"); +testException("@if (false)\n", "JS_E_EXPECTED_CCEND"); +testException("@end\n", "JS_E_SYNTAX"); +testException("@elif\n", "JS_E_SYNTAX"); +testException("@else\n", "JS_E_SYNTAX"); +testException("@if false\n@elif true\n@end", "JS_E_MISSING_LBRACKET"); reportSuccess();

1 0

Jacek Caban : jscript: Added support for conditional compilation @if/@elif /@else/@end.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: afba44d3244f93effbd48ecc93358f897ec713ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=afba44d3244f93effbd48ecc9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 1 10:45:12 2014 +0200 jscript: Added support for conditional compilation @if/@elif/@else/@end. --- dlls/jscript/lex.c | 93 ++++++++++++++++++++++++++++++++++++++++++++------- dlls/jscript/parser.h | 1 + 2 files changed, 81 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 357b905..3daaf47 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -63,6 +63,9 @@ static const WCHAR voidW[] = {'v','o','i','d',0}; static const WCHAR whileW[] = {'w','h','i','l','e',0}; static const WCHAR withW[] = {'w','i','t','h',0}; +static const WCHAR elifW[] = {'e','l','i','f',0}; +static const WCHAR endW[] = {'e','n','d',0}; + static const struct { const WCHAR *word; int token; @@ -942,6 +945,61 @@ int try_parse_ccval(parser_ctx_t *ctx, ccval_t *r) return 0; } +static int skip_code(parser_ctx_t *ctx, BOOL exec_else) +{ + int if_depth = 1; + const WCHAR *ptr; + + while(1) { + ptr = strchrW(ctx->ptr, '@'); + if(!ptr) { + WARN("No @end\n"); + return lex_error(ctx, JS_E_EXPECTED_CCEND); + } + ctx->ptr = ptr+1; + + if(!check_keyword(ctx, endW, NULL)) { + if(--if_depth) + continue; + return 0; + } + + if(exec_else && !check_keyword(ctx, elifW, NULL)) { + if(if_depth > 1) + continue; + + if(!skip_spaces(ctx) || *ctx->ptr != '(') + return lex_error(ctx, JS_E_MISSING_LBRACKET); + + if(!parse_cc_expr(ctx)) + return -1; + + if(!get_ccbool(ctx->ccval)) + continue; /* skip block of code */ + + /* continue parsing */ + ctx->cc_if_depth++; + return 0; + } + + if(exec_else && !check_keyword(ctx, elseW, NULL)) { + if(if_depth > 1) + continue; + + /* parse else block */ + ctx->cc_if_depth++; + return 0; + } + + if(!check_keyword(ctx, ifW, NULL)) { + if_depth++; + continue; + } + + ctx->ptr++; + } +} + static int cc_token(parser_ctx_t *ctx, void *lval) { unsigned id_len = 0; @@ -949,8 +1007,6 @@ static int cc_token(parser_ctx_t *ctx, void *lval) static const WCHAR cc_onW[] = {'c','c','_','o','n',0}; static const WCHAR setW[] = {'s','e','t',0}; - static const WCHAR elifW[] = {'e','l','i','f',0}; - static const WCHAR endW[] = {'e','n','d',0}; ctx->ptr++; @@ -989,23 +1045,34 @@ static int cc_token(parser_ctx_t *ctx, void *lval) } if(!check_keyword(ctx, ifW, NULL)) { - FIXME("@if not implemented\n"); - return lex_error(ctx, E_NOTIMPL); - } + if(!skip_spaces(ctx) || *ctx->ptr != '(') + return lex_error(ctx, JS_E_MISSING_LBRACKET); - if(!check_keyword(ctx, elifW, NULL)) { - FIXME("@elif not implemented\n"); - return lex_error(ctx, E_NOTIMPL); + if(!parse_cc_expr(ctx)) + return -1; + + if(get_ccbool(ctx->ccval)) { + /* continue parsing block inside if */ + ctx->cc_if_depth++; + return 0; + } + + return skip_code(ctx, TRUE); } - if(!check_keyword(ctx, elseW, NULL)) { - FIXME("@else not implemented\n"); - return lex_error(ctx, E_NOTIMPL); + if(!check_keyword(ctx, elifW, NULL) || !check_keyword(ctx, elseW, NULL)) { + if(!ctx->cc_if_depth) + return lex_error(ctx, JS_E_SYNTAX); + + return skip_code(ctx, FALSE); } if(!check_keyword(ctx, endW, NULL)) { - FIXME("@end not implemented\n"); - return lex_error(ctx, E_NOTIMPL); + if(!ctx->cc_if_depth) + return lex_error(ctx, JS_E_SYNTAX); + + ctx->cc_if_depth--; + return 0; } if(!ctx->script->cc) diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index cb4e9c4..ab5744a 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -42,6 +42,7 @@ typedef struct _parser_ctx_t { HRESULT hres; ccval_t ccval; + unsigned cc_if_depth; heap_pool_t heap; } parser_ctx_t;

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 7579a96ac1bb91db154ae3b4cadfc6f232a35856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7579a96ac1bb91db154ae3b4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:59 2014 +0200 wined3d: Convert to WINED3DFMT_B8G8R8A8_UNORM for WINED3D_CT_CK_B8G8R8. --- dlls/wined3d/surface.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2ee3db1..73b872f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1606,7 +1606,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp { {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, - {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_B8G8R8A8, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, }; @@ -3247,17 +3247,16 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B8G8R8: - /* Converting R8G8B8 format to R8G8B8A8 with color-keying. */ - for (y = 0; y < height; y++) + for (y = 0; y < height; ++y) { source = src + pitch * y; dest = dst + outpitch * y; - for (x = 0; x < width; x++) { - DWORD color = ((DWORD)source[0] << 16) + ((DWORD)source[1] << 8) + (DWORD)source[2] ; - DWORD dstcolor = color << 8; + for (x = 0; x < width; ++x) + { + DWORD color = ((DWORD)source[2] << 16) | ((DWORD)source[1] << 8) | (DWORD)source[0]; if (!color_in_range(&surface->container->src_blt_color_key, color)) - dstcolor |= 0xff; - *(DWORD*)dest = dstcolor; + color |= 0xff000000; + *(DWORD *)dest = color; source += 3; dest += 4; }

1 0

Henri Verbeet : wined3d: Convert to WINED3DFMT_B5G5R5A1_UNORM for WINED3D_CT_CK_B5G6R5.
by Alexandre Julliard 01 Oct '14

01 Oct '14

Module: wine Branch: master Commit: 02b031e61acf2738a772f5a2a82277e36851518a URL: http://source.winehq.org/git/wine.git/?a=commit;h=02b031e61acf2738a772f5a2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 1 09:18:58 2014 +0200 wined3d: Convert to WINED3DFMT_B5G5R5A1_UNORM for WINED3D_CT_CK_B5G6R5. --- dlls/wined3d/surface.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b24504e..2ee3db1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1604,7 +1604,7 @@ static void d3dfmt_get_conv(const struct wined3d_texture *texture, BOOL need_alp } color_key_info[] = { - {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 2}, + {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_B5G6R5, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_B5G5R5X1, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_B8G8R8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_CK_B8G8R8X8, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, @@ -3207,35 +3207,22 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; case WINED3D_CT_CK_B5G6R5: - { - /* Converting the 565 format in 5551 packed to emulate color-keying. - - Note : in all these conversion, it would be best to average the averaging - pixels to get the color of the pixel that will be color-keyed to - prevent 'color bleeding'. This will be done later on if ever it is - too visible. - - Note2: Nvidia documents say that their driver does not support alpha + color keying - on the same surface and disables color keying in such a case - */ - const WORD *Source; - WORD *Dest; - - TRACE("Color keyed 565\n"); - - for (y = 0; y < height; y++) { - Source = (const WORD *)(src + y * pitch); - Dest = (WORD *) (dst + y * outpitch); - for (x = 0; x < width; x++ ) { - WORD color = *Source++; - *Dest = ((color & 0xffc0) | ((color & 0x1f) << 1)); + for (y = 0; y < height; ++y) + { + source = src + pitch * y; + dest = dst + outpitch * y; + for (x = 0; x < width; ++x) + { + WORD color = *(const WORD *)source; if (!color_in_range(&surface->container->src_blt_color_key, color)) - *Dest |= 0x0001; - Dest++; + *(WORD *)dest = 0x8000 | ((color & 0xffc0) >> 1) | (color & 0x1f); + else + *(WORD *)dest = ((color & 0xffc0) >> 1) | (color & 0x1f); + source += 2; + dest += 2; } } - } - break; + break; case WINED3D_CT_CK_B5G5R5X1: {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2014