September 2014 - Wine-Commits

André Hentschel : Add WWN 376
by Jeremy Newman Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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); + +(a)set @test = 1 +ok(@test === 1, "@test = " + @test); + +(a)set @test = 0 +ok(@test === 0, "@test = " + @test); + +tmp = false +(a)set @test = @test tmp=true +ok(@test === 0, "@test = " + @test); +ok(tmp, "expr after @set not evaluated"); + +(a)set @test = !@test +ok(@test === true, "@test = " + @test); + +(a)set @test = (@test+1+true) +ok(@test === 3, "@test = " + @test); + +(a)set + @test + = + 2 +ok(@test === 2, "@test = " + @test); + +(a)set + @test + = + ( + 2 + + + 2 + ) +ok(@test === 4, "@test = " + @test); + +(a)set @test = 2.5 +ok(@test === 2.5, "@test = " + @test); + +(a)set @test = 0x4 +ok(@test === 4, "@test = " + @test); + +(a)set @test = (2 + 2/2) +ok(@test === 3, "@test = " + @test); + +(a)set @test = (false+false) +ok(@test === 0, "@test = " + @test); + +(a)set @test = ((1+1)*((3)+1)) +ok(@test === 8, "@test = " + @test); + +(a)set @_test = true +ok(@_test === true, "@_test = " + @_test); + +(a)set @$test = true +ok(@$test === true, "@$test = " + @$test); + +(a)set @newtest = (@newtest != @newtest) +ok(@newtest === true, "@newtest = " + @newtest); + +(a)set @test = (false != 0) +ok(@test === false, "@test = " + @test); + +(a)set @test = (1 != true) +ok(@test === false, "@test = " + @test); + +(a)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 Sept. 30, 2014

Sept. 30, 2014

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 Sept. 30, 2014

Sept. 30, 2014

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 : mshtml: Don' t assume that nsIDOMHTMLElement inherits from nsIDOMNode in HTMLDocument_createStyleSheet.
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

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

Jacek Caban : mshtml: Use proper type for text node in exec_hyperlink.
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

Module: wine Branch: master Commit: 07751840acd8d9a7af2c0ebb47fff5810c11d858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07751840acd8d9a7af2c0ebb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 30 10:30:33 2014 +0200 mshtml: Use proper type for text node in exec_hyperlink. --- dlls/mshtml/editor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/editor.c b/dlls/mshtml/editor.c index 14aab53..b059a95 100644 --- a/dlls/mshtml/editor.c +++ b/dlls/mshtml/editor.c @@ -1170,13 +1170,14 @@ static HRESULT exec_hyperlink(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, /* create an element with text of URL */ if (insert_link_at_caret) { - nsIDOMNode *text_node, *unused_node; + nsIDOMNode *unused_node; + nsIDOMText *text_node; - nsIDOMHTMLDocument_CreateTextNode(This->doc_node->nsdoc, &ns_url, (nsIDOMText **)&text_node); + nsIDOMHTMLDocument_CreateTextNode(This->doc_node->nsdoc, &ns_url, &text_node); /* wrap the <a> tags around the text element */ - nsIDOMHTMLElement_AppendChild(anchor_elem, text_node, &unused_node); - nsIDOMNode_Release(text_node); + nsIDOMHTMLElement_AppendChild(anchor_elem, (nsIDOMNode*)text_node, &unused_node); + nsIDOMText_Release(text_node); nsIDOMNode_Release(unused_node); }

1 0

Henri Verbeet : wined3d: Use a lookup table in d3dfmt_get_conv().
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

Module: wine Branch: master Commit: 0932567faf10551f372d4caff0f66ba7cf18269b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0932567faf10551f372d4caff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 30 07:59:19 2014 +0200 wined3d: Use a lookup table in d3dfmt_get_conv(). --- dlls/wined3d/surface.c | 154 +++++++++++++++++-------------------------------- 1 file changed, 52 insertions(+), 102 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f8ea858..b7868dc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1591,115 +1591,65 @@ static HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_ BOOL colorkey_active = need_alpha_ck && (surface->container->color_key_flags & WINEDDSD_CKSRCBLT); const struct wined3d_device *device = surface->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - BOOL blit_supported = FALSE; + unsigned int i; + + static const struct + { + enum wined3d_format_id src_format; + enum wined3d_conversion_type conversion_type; + GLint gl_internal; + GLint gl_format; + GLint gl_type; + unsigned int conv_byte_count; + } + color_key_info[] = + { + {WINED3DFMT_B5G6R5_UNORM, WINED3D_CT_CK_565, GL_RGB5_A1, GL_RGBA, GL_UNSIGNED_SHORT_5_5_5_1, 2}, + {WINED3DFMT_B5G5R5X1_UNORM, WINED3D_CT_CK_5551, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV, 2}, + {WINED3DFMT_B8G8R8_UNORM, WINED3D_CT_CK_RGB24, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3D_CT_RGB32_888, GL_RGBA8, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, 4}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3D_CT_CK_ARGB32, GL_RGBA8, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4}, + }; - /* Copy the default values from the surface. Below we might perform fixups */ - /* TODO: get rid of color keying desc fixups by using e.g. a table. */ *format = *surface->resource.format; *conversion_type = WINED3D_CT_NONE; - /* Ok, now look if we have to do any conversion */ - switch (surface->resource.format->id) + if (colorkey_active) { - case WINED3DFMT_P8_UINT: - /* Below the call to blit_supported is disabled for Wine 1.2 - * because the function isn't operating correctly yet. At the - * moment 8-bit blits are handled in software and if certain GL - * extensions are around, surface conversion is performed at - * upload time. The blit_supported call recognizes it as a - * destination fixup. This type of upload 'fixup' and 8-bit to - * 8-bit blits need to be handled by the blit_shader. - * TODO: get rid of this #if 0. */ -#if 0 - blit_supported = device->blitter->blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - &rect, surface->resource.usage, surface->resource.pool, surface->resource.format, - &rect, surface->resource.usage, surface->resource.pool, surface->resource.format); -#endif - blit_supported = gl_info->supported[ARB_FRAGMENT_PROGRAM]; - - /* Use conversion when the blit_shader backend supports it. It only supports this in case of - * texturing. Further also use conversion in case of color keying. - * Paletted textures can be emulated using shaders but only do that for 2D purposes e.g. situations - * in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which - * conflicts with this. - */ - if (!((blit_supported && surface->container->swapchain - && surface->container == surface->container->swapchain->front_buffer)) - || colorkey_active || !use_texturing) - { - format->glFormat = GL_RGBA; - format->glInternal = GL_RGBA; - format->glType = GL_UNSIGNED_BYTE; - format->conv_byte_count = 4; - *conversion_type = WINED3D_CT_PALETTED; - } - break; - - case WINED3DFMT_B2G3R3_UNORM: - /* ********************** - GL_UNSIGNED_BYTE_3_3_2 - ********************** */ - if (colorkey_active) { - /* This texture format will never be used.. So do not care about color keying - up until the point in time it will be needed :-) */ - FIXME(" ColorKeying not supported in the RGB 332 format !\n"); - } - break; - - case WINED3DFMT_B5G6R5_UNORM: - if (colorkey_active) - { - *conversion_type = WINED3D_CT_CK_565; - format->glFormat = GL_RGBA; - format->glInternal = GL_RGB5_A1; - format->glType = GL_UNSIGNED_SHORT_5_5_5_1; - format->conv_byte_count = 2; - } - break; - - case WINED3DFMT_B5G5R5X1_UNORM: - if (colorkey_active) - { - *conversion_type = WINED3D_CT_CK_5551; - format->glFormat = GL_BGRA; - format->glInternal = GL_RGB5_A1; - format->glType = GL_UNSIGNED_SHORT_1_5_5_5_REV; - format->conv_byte_count = 2; - } - break; - - case WINED3DFMT_B8G8R8_UNORM: - if (colorkey_active) - { - *conversion_type = WINED3D_CT_CK_RGB24; - format->glFormat = GL_RGBA; - format->glInternal = GL_RGBA8; - format->glType = GL_UNSIGNED_INT_8_8_8_8; - format->conv_byte_count = 4; - } - break; - - case WINED3DFMT_B8G8R8X8_UNORM: - if (colorkey_active) - { - *conversion_type = WINED3D_CT_RGB32_888; - format->glFormat = GL_RGBA; - format->glInternal = GL_RGBA8; - format->glType = GL_UNSIGNED_INT_8_8_8_8; - format->conv_byte_count = 4; - } - break; - - case WINED3DFMT_B8G8R8A8_UNORM: - if (colorkey_active) - { - *conversion_type = WINED3D_CT_CK_ARGB32; - format->conv_byte_count = 4; - } + for (i = 0; i < sizeof(color_key_info) / sizeof(*color_key_info); ++i) + { + if (color_key_info[i].src_format != surface->resource.format->id) + continue; + + *conversion_type = color_key_info[i].conversion_type; + format->glInternal = color_key_info[i].gl_internal; + format->glFormat = color_key_info[i].gl_format; + format->glType = color_key_info[i].gl_type; + format->conv_byte_count = color_key_info[i].conv_byte_count; break; + } + } - default: - break; + if (surface->resource.format->id == WINED3DFMT_P8_UINT) + { + /* FIXME: This should check if the blitter backend can do P8 + * conversion, instead of checking for ARB_fragment_program. */ + if (!((gl_info->supported[ARB_FRAGMENT_PROGRAM] && surface->container->swapchain + && surface->container == surface->container->swapchain->front_buffer)) + || colorkey_active || !use_texturing) + { + *conversion_type = WINED3D_CT_PALETTED; + format->glInternal = GL_RGBA; + format->glFormat = GL_RGBA; + format->glType = GL_UNSIGNED_BYTE; + format->conv_byte_count = 4; + } + } + else if (surface->resource.format->id == WINED3DFMT_B2G3R3_UNORM && colorkey_active) + { + /* This texture format will never be used... So do not care about + * color-keying up until the point in time it will be needed. */ + FIXME("Color-keying not supported with WINED3DFMT_B2G3R3_UNORM.\n"); } if (*conversion_type != WINED3D_CT_NONE)

1 0

Jacek Caban : jscript: Added new ccval_t type for CC variable values.
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

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: Move parser related declarations to separated header.
by Alexandre Julliard Sept. 30, 2014

Sept. 30, 2014

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