wine-commits September 2014

wine-commits@winehq.org

2 participants
301 discussions

André Hentschel : Add WWN 376
by Jeremy Newman 30 Sep '14

30 Sep '14

Module: website Branch: master Commit: bcecd9e369defb582e129d5391cf53b122245c1a URL: http://source.winehq.org/git/website.git/?a=commit;h=bcecd9e369defb582e129d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 30 23:12:12 2014 +0200 Add WWN 376 --- news/de/2014093001.xml | 13 + news/en/2014093001.xml | 13 + wwn/en/wn20140930_376.xml | 613 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 639 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=bcecd9e369defb582e…

1 0

Jactry Zeng : riched20: Set editor-> reOle to NULL when IRichEditOle is released.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: a3b8065600ec43349a65a707e45bf4c8ed111360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b8065600ec43349a65a707e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Sep 30 20:11:55 2014 +0800 riched20: Set editor->reOle to NULL when IRichEditOle is released. --- dlls/riched20/richole.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index f7e7870..9e7c123 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -142,6 +142,7 @@ IRichEditOle_fnRelease(IRichEditOle *me) ITextRangeImpl *txtRge; TRACE ("Destroying %p\n", This); This->txtSel->reOle = NULL; + This->editor->reOle = NULL; ITextSelection_Release(&This->txtSel->ITextSelection_iface); IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry)

1 0

Jacek Caban : jscript/tests: Added @set tests.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: ad842c42f07562ebd8b3d4e8da0a02d1dbdd5177 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad842c42f07562ebd8b3d4e8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:52:03 2014 +0200 jscript/tests: Added @set tests. --- dlls/jscript/tests/cc.js | 93 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/dlls/jscript/tests/cc.js b/dlls/jscript/tests/cc.js index 1fee93f..b96f21e 100644 --- a/dlls/jscript/tests/cc.js +++ b/dlls/jscript/tests/cc.js @@ -72,4 +72,97 @@ try { } ok(tmp, "expected syntax exception"); +ok(isNaN(@test), "@test = " + @test); + +@set @test = 1 +ok(@test === 1, "@test = " + @test); + +@set @test = 0 +ok(@test === 0, "@test = " + @test); + +tmp = false +@set @test = @test tmp=true +ok(@test === 0, "@test = " + @test); +ok(tmp, "expr after @set not evaluated"); + +@set @test = !@test +ok(@test === true, "@test = " + @test); + +@set @test = (@test+1+true) +ok(@test === 3, "@test = " + @test); + +@set + @test + = + 2 +ok(@test === 2, "@test = " + @test); + +@set + @test + = + ( + 2 + + + 2 + ) +ok(@test === 4, "@test = " + @test); + +@set @test = 2.5 +ok(@test === 2.5, "@test = " + @test); + +@set @test = 0x4 +ok(@test === 4, "@test = " + @test); + +@set @test = (2 + 2/2) +ok(@test === 3, "@test = " + @test); + +@set @test = (false+false) +ok(@test === 0, "@test = " + @test); + +@set @test = ((1+1)*((3)+1)) +ok(@test === 8, "@test = " + @test); + +@set @_test = true +ok(@_test === true, "@_test = " + @_test); + +@set @$test = true +ok(@$test === true, "@$test = " + @$test); + +@set @newtest = (@newtest != @newtest) +ok(@newtest === true, "@newtest = " + @newtest); + +@set @test = (false != 0) +ok(@test === false, "@test = " + @test); + +@set @test = (1 != true) +ok(@test === false, "@test = " + @test); + +@set @test = (0 != true) +ok(@test === true, "@test = " + @test); + +var exception_map = { + JS_E_EXPECTED_IDENTIFIER: {type: "SyntaxError", number: -2146827278}, + JS_E_EXPECTED_ASSIGN: {type: "SyntaxError", number: -2146827277}, + JS_E_EXPECTED_AT: {type: "SyntaxError", number: -2146827256} +}; + +function testException(src, id) { + var ex = exception_map[id]; + var ret = "", num = ""; + + try { + eval(src); + } catch(e) { + ret = e.name; + num = e.number; + } + + ok(ret === ex.type, "Exception test, ret = " + ret + ", expected " + ex.type +". Executed code: " + src); + ok(num === ex.number, "Exception test, num = " + num + ", expected " + ex.number + ". Executed function: " + src); +} + +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"); + reportSuccess();

1 0

Jacek Caban : jscript: Added conditional compilation @set support.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 5ec69474cf52c4f2f28a230d093455e46a728d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec69474cf52c4f2f28a230d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:57 2014 +0200 jscript: Added conditional compilation @set support. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/cc_parser.y | 123 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 4 ++ dlls/jscript/jscript.rc | 4 ++ dlls/jscript/lex.c | 94 +++++++++++++++++++++++++++++++++++- dlls/jscript/parser.h | 15 ++++++ dlls/jscript/resource.h | 4 ++ po/ar.po | 72 ++++++++++++++++++--------- po/bg.po | 64 +++++++++++++++--------- po/ca.po | 72 ++++++++++++++++++--------- po/cs.po | 72 ++++++++++++++++++--------- po/da.po | 72 ++++++++++++++++++--------- po/de.po | 72 ++++++++++++++++++--------- po/el.po | 64 +++++++++++++++--------- po/en.po | 64 +++++++++++++++--------- po/en_US.po | 64 +++++++++++++++--------- po/eo.po | 64 +++++++++++++++--------- po/es.po | 72 ++++++++++++++++++--------- po/fa.po | 64 +++++++++++++++--------- po/fi.po | 72 ++++++++++++++++++--------- po/fr.po | 72 ++++++++++++++++++--------- po/he.po | 68 +++++++++++++++++--------- po/hi.po | 64 +++++++++++++++--------- po/hr.po | 72 ++++++++++++++++++--------- po/hu.po | 72 ++++++++++++++++++--------- po/it.po | 72 ++++++++++++++++++--------- po/ja.po | 72 ++++++++++++++++++--------- po/ko.po | 72 ++++++++++++++++++--------- po/lt.po | 72 ++++++++++++++++++--------- po/ml.po | 64 +++++++++++++++--------- po/nb_NO.po | 72 ++++++++++++++++++--------- po/nl.po | 72 ++++++++++++++++++--------- po/or.po | 64 +++++++++++++++--------- po/pa.po | 64 +++++++++++++++--------- po/pl.po | 72 ++++++++++++++++++--------- po/pt_BR.po | 72 ++++++++++++++++++--------- po/pt_PT.po | 72 ++++++++++++++++++--------- po/rm.po | 64 +++++++++++++++--------- po/ro.po | 72 ++++++++++++++++++--------- po/ru.po | 72 ++++++++++++++++++--------- po/sk.po | 64 +++++++++++++++--------- po/sl.po | 72 ++++++++++++++++++--------- po/sr_RS(a)cyrillic.po | 70 ++++++++++++++++++--------- po/sr_RS(a)latin.po | 70 ++++++++++++++++++--------- po/sv.po | 70 ++++++++++++++++++--------- po/te.po | 64 +++++++++++++++--------- po/th.po | 64 +++++++++++++++--------- po/tr.po | 72 ++++++++++++++++++--------- po/uk.po | 72 ++++++++++++++++++--------- po/wa.po | 64 +++++++++++++++--------- po/wine.pot | 64 +++++++++++++++--------- po/zh_CN.po | 64 +++++++++++++++--------- po/zh_TW.po | 72 ++++++++++++++++++--------- 53 files changed, 2305 insertions(+), 1106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ec69474cf52c4f2f28a2…

1 0

Jacek Caban : jscript: Moved skipping spaces to separated function.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 77d0c2a44c72cef6fe23351cbe7b473cd3e9b9c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77d0c2a44c72cef6fe23351cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:44 2014 +0200 jscript: Moved skipping spaces to separated function. --- dlls/jscript/lex.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 8d8e2d9..5e0226a 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -231,6 +231,16 @@ static BOOL skip_comment(parser_ctx_t *ctx) return TRUE; } +static BOOL skip_spaces(parser_ctx_t *ctx) +{ + while(ctx->ptr < ctx->end && isspaceW(*ctx->ptr)) { + if(is_endline(*ctx->ptr++)) + ctx->nl = TRUE; + } + + return ctx->ptr != ctx->end; +} + static BOOL unescape(WCHAR *str) { WCHAR *pd, *p, c; @@ -534,11 +544,7 @@ static BOOL parse_numeric_literal(parser_ctx_t *ctx, double *ret) static int next_token(parser_ctx_t *ctx, void *lval) { do { - while(ctx->ptr < ctx->end && isspaceW(*ctx->ptr)) { - if(is_endline(*ctx->ptr++)) - ctx->nl = TRUE; - } - if(ctx->ptr == ctx->end) + if(!skip_spaces(ctx)) return tEOF; }while(skip_comment(ctx) || skip_html_comment(ctx));

1 0

Jacek Caban : jscript: Added new ccval_t type for CC variable values.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 79dc3bc72e362ce85d08e05be83c75b99a6cb38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=79dc3bc72e362ce85d08e05be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:36 2014 +0200 jscript: Added new ccval_t type for CC variable values. --- dlls/jscript/lex.c | 43 +++++++++++++------------------------------ dlls/jscript/parser.h | 24 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 1796aed..8d8e2d9 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -789,11 +789,7 @@ static int next_token(parser_ctx_t *ctx, void *lval) } struct _cc_var_t { - BOOL is_num; - union { - BOOL b; - DOUBLE n; - } u; + ccval_t val; struct _cc_var_t *next; unsigned name_len; WCHAR name[0]; @@ -811,18 +807,18 @@ void release_cc(cc_ctx_t *cc) heap_free(cc); } -static BOOL add_cc_var(cc_ctx_t *cc, const WCHAR *name, cc_var_t *v) +static BOOL new_cc_var(cc_ctx_t *cc, const WCHAR *name, int len, ccval_t v) { cc_var_t *new_v; - unsigned len; - len = strlenW(name); + if(len == -1) + len = strlenW(name); new_v = heap_alloc(sizeof(cc_var_t) + (len+1)*sizeof(WCHAR)); if(!new_v) return FALSE; - memcpy(new_v, v, sizeof(*v)); + new_v->val = v; memcpy(new_v->name, name, (len+1)*sizeof(WCHAR)); new_v->name_len = len; new_v->next = cc->vars; @@ -845,7 +841,6 @@ static cc_var_t *find_cc_var(cc_ctx_t *cc, const WCHAR *name, unsigned name_len) static int init_cc(parser_ctx_t *ctx) { cc_ctx_t *cc; - cc_var_t v; static const WCHAR _win32W[] = {'_','w','i','n','3','2',0}; static const WCHAR _win64W[] = {'_','w','i','n','6','4',0}; @@ -863,24 +858,12 @@ static int init_cc(parser_ctx_t *ctx) return lex_error(ctx, E_OUTOFMEMORY); cc->vars = NULL; - v.is_num = FALSE; - v.u.b = TRUE; - if(!add_cc_var(cc, _jscriptW, &v) - || !add_cc_var(cc, sizeof(void*) == 8 ? _win64W : _win32W, &v) - || !add_cc_var(cc, sizeof(void*) == 8 ? _amd64W : _x86W, &v)) { - release_cc(cc); - return lex_error(ctx, E_OUTOFMEMORY); - } - - v.is_num = TRUE; - v.u.n = JSCRIPT_BUILD_VERSION; - if(!add_cc_var(cc, _jscript_buildW, &v)) { - release_cc(cc); - return lex_error(ctx, E_OUTOFMEMORY); - } - v.u.n = JSCRIPT_MAJOR_VERSION + (DOUBLE)JSCRIPT_MINOR_VERSION/10.0; - if(!add_cc_var(cc, _jscript_versionW, &v)) { + if(!new_cc_var(cc, _jscriptW, -1, ccval_bool(TRUE)) + || !new_cc_var(cc, sizeof(void*) == 8 ? _win64W : _win32W, -1, ccval_bool(TRUE)) + || !new_cc_var(cc, sizeof(void*) == 8 ? _amd64W : _x86W, -1, ccval_bool(TRUE)) + || !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); } @@ -941,12 +924,12 @@ static int cc_token(parser_ctx_t *ctx, void *lval) var = find_cc_var(ctx->script->cc, ctx->ptr, id_len); ctx->ptr += id_len; - if(!var || var->is_num) { - *(literal_t**)lval = new_double_literal(ctx, var ? var->u.n : NAN); + if(!var || var->val.is_num) { + *(literal_t**)lval = new_double_literal(ctx, var ? var->val.u.n : NAN); return tNumericLiteral; } - *(literal_t**)lval = new_boolean_literal(ctx, var->u.b); + *(literal_t**)lval = new_boolean_literal(ctx, var->val.u.b); return tBooleanLiteral; } diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index ff50cb1..5d15bc3 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -20,6 +20,14 @@ typedef struct _source_elements_t source_elements_t; typedef struct _expression_t expression_t; typedef struct _statement_t statement_t; +typedef struct { + BOOL is_num; + union { + BOOL b; + double n; + } u; +} ccval_t; + typedef struct _parser_ctx_t { const WCHAR *begin; const WCHAR *end; @@ -352,3 +360,19 @@ typedef struct { expression_t expr; prop_val_t *property_list; } property_value_expression_t; + +static inline ccval_t ccval_num(double n) +{ + ccval_t r; + r.is_num = TRUE; + r.u.n = n; + return r; +} + +static inline ccval_t ccval_bool(BOOL b) +{ + ccval_t r; + r.is_num = FALSE; + r.u.b = b; + return r; +}

1 0

Jacek Caban : jscript: Return double from parse_numeric_literal and parse_double_literal.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 166c97d549acca63494c9e8ebf6c6c7d2eb296d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=166c97d549acca63494c9e8eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:24 2014 +0200 jscript: Return double from parse_numeric_literal and parse_double_literal. --- dlls/jscript/lex.c | 58 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 7318838..1796aed 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -388,7 +388,7 @@ literal_t *new_boolean_literal(parser_ctx_t *ctx, BOOL bval) return ret; } -static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **literal) +static BOOL parse_double_literal(parser_ctx_t *ctx, LONG int_part, double *ret) { LONGLONG d, hlp; int exp = 0; @@ -435,13 +435,15 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li ctx->ptr++; }else if(!isdigitW(*ctx->ptr)) { WARN("Expected exponent part\n"); - return lex_error(ctx, E_FAIL); + lex_error(ctx, E_FAIL); + return FALSE; } } if(ctx->ptr == ctx->end) { WARN("unexpected end of file\n"); - return lex_error(ctx, E_FAIL); + lex_error(ctx, E_FAIL); + return FALSE; } while(ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { @@ -457,14 +459,15 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } - *literal = new_double_literal(ctx, exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); - return tNumericLiteral; + *ret = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); + return TRUE; } -static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) +static BOOL parse_numeric_literal(parser_ctx_t *ctx, double *ret) { LONG l, d; @@ -473,7 +476,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(*ctx->ptr == 'x' || *ctx->ptr == 'X') { if(++ctx->ptr == ctx->end) { ERR("unexpected end of file\n"); - return 0; + return FALSE; } while(ctx->ptr < ctx->end && (d = hex_to_int(*ctx->ptr)) != -1) { @@ -483,11 +486,12 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(ctx->ptr < ctx->end && is_identifier_char(*ctx->ptr)) { WARN("unexpected identifier char\n"); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } - *literal = new_double_literal(ctx, l); - return tNumericLiteral; + *ret = l; + return TRUE; } if(isdigitW(*ctx->ptr)) { @@ -509,20 +513,22 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) /* FIXME: Do we need it here? */ if(ctx->ptr < ctx->end && (is_identifier_char(*ctx->ptr) || *ctx->ptr == '.')) { WARN("wrong char after octal literal: '%c'\n", *ctx->ptr); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } - *literal = new_double_literal(ctx, val); - return tNumericLiteral; + *ret = val; + return TRUE; } if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); - return lex_error(ctx, JS_E_MISSING_SEMICOLON); + lex_error(ctx, JS_E_MISSING_SEMICOLON); + return FALSE; } } - return parse_double_literal(ctx, l, literal); + return parse_double_literal(ctx, l, ret); } static int next_token(parser_ctx_t *ctx, void *lval) @@ -550,8 +556,15 @@ static int next_token(parser_ctx_t *ctx, void *lval) return parse_identifier(ctx, lval); } - if(isdigitW(*ctx->ptr)) - return parse_numeric_literal(ctx, lval); + if(isdigitW(*ctx->ptr)) { + double n; + + if(!parse_numeric_literal(ctx, &n)) + return -1; + + *(literal_t**)lval = new_double_literal(ctx, n); + return tNumericLiteral; + } switch(*ctx->ptr) { case '{': @@ -571,8 +584,13 @@ static int next_token(parser_ctx_t *ctx, void *lval) return '}'; case '.': - if(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) - return parse_double_literal(ctx, 0, lval); + if(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)) { + double n; + if(!parse_double_literal(ctx, 0, &n)) + return -1; + *(literal_t**)lval = new_double_literal(ctx, n); + return tNumericLiteral; + } return '.'; case '<':

1 0

Jacek Caban : jscript: Move parser related declarations to separated header.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 615f6a6e8b13f33226263131e358ee7b1aad1ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=615f6a6e8b13f33226263131e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 16:51:14 2014 +0200 jscript: Move parser related declarations to separated header. --- dlls/jscript/compile.c | 1 + dlls/jscript/engine.c | 15 +++ dlls/jscript/engine.h | 355 +------------------------------------------------ dlls/jscript/lex.c | 1 + dlls/jscript/parser.h | 354 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/parser.y | 1 + 6 files changed, 374 insertions(+), 353 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=615f6a6e8b13f33226263…

1 0

Jacek Caban : mshtml: Removed no longer needed assert.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: 9550189b4f6ee6835cd666ad502e3c403408bd99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9550189b4f6ee6835cd666ad5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 10:14:14 2014 +0200 mshtml: Removed no longer needed assert. --- dlls/mshtml/htmlframebase.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 92421b5..9808379 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -709,7 +709,6 @@ void HTMLFrameBase_Init(HTMLFrameBase *This, HTMLDocumentNode *doc, nsIDOMHTMLEl nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLIFrameElement, (void**)&This->nsiframe); assert(nsres == NS_OK); }else { - assert((nsIDOMNode*)This->nsframe == This->element.node.nsnode); This->nsiframe = NULL; } }

1 0

Jacek Caban : mshtml: Don' t assume that nsIDOMHTMLElement inherits from nsIDOMNode in HTMLDocument_createStyleSheet.
by Alexandre Julliard 30 Sep '14

30 Sep '14

Module: wine Branch: master Commit: fc38aea9ba41652d134391c45e332da76e9f587f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc38aea9ba41652d134391c45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 10:14:06 2014 +0200 mshtml: Don't assume that nsIDOMHTMLElement inherits from nsIDOMNode in HTMLDocument_createStyleSheet. This will change after the next Gecko update. --- dlls/mshtml/htmldoc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4837a89..a8d6d76 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1625,10 +1625,14 @@ static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR nsres = nsIDOMHTMLDocument_GetHead(This->doc_node->nsdoc, &head_elem); if(NS_SUCCEEDED(nsres)) { - nsIDOMNode *tmp_node; + nsIDOMNode *head_node, *tmp_node; - nsres = nsIDOMHTMLHeadElement_AppendChild(head_elem, (nsIDOMNode*)elem->nselem, &tmp_node); + nsres = nsIDOMHTMLHeadElement_QueryInterface(head_elem, &IID_nsIDOMNode, (void**)&head_node); nsIDOMHTMLHeadElement_Release(head_elem); + assert(nsres == NS_OK); + + nsres = nsIDOMNode_AppendChild(head_node, elem->node.nsnode, &tmp_node); + nsIDOMNode_Release(head_node); if(NS_SUCCEEDED(nsres) && tmp_node) nsIDOMNode_Release(tmp_node); }

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 September 2014