December 2018 - Wine-commits

Alexandre Julliard : wineandroid: Add a helper function to update a window surface.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: cc06703e3abc8617ae4a3dff4024d06e235a2293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc06703e3abc8617ae4a3dff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 3 18:26:50 2018 +0100 wineandroid: Add a helper function to update a window surface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 6e6bbff..9229955 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -530,6 +530,20 @@ public class WineActivity extends Activity return hwnd; } + private void update_surface( boolean is_client ) + { + if (is_client) + { + Log.i( LOGTAG, String.format( "set client surface hwnd %08x %s", hwnd, client_surface )); + if (client_surface != null) wine_surface_changed( hwnd, client_surface, true ); + } + else + { + Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); + if (window_surface != null) wine_surface_changed( hwnd, window_surface, false ); + } + } + public void set_surface( SurfaceTexture surftex, boolean is_client ) { if (is_client) @@ -540,8 +554,6 @@ public class WineActivity extends Activity client_surftex = surftex; client_surface = new Surface( surftex ); } - Log.i( LOGTAG, String.format( "set client surface hwnd %08x %s", hwnd, client_surface )); - wine_surface_changed( hwnd, client_surface, true ); } else { @@ -551,9 +563,8 @@ public class WineActivity extends Activity window_surftex = surftex; window_surface = new Surface( surftex ); } - Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); - wine_surface_changed( hwnd, window_surface, false ); } + update_surface( is_client ); } public void get_event_pos( MotionEvent event, int[] pos )

1 0

Andrew Eikum : winegcc: Pass -static-libstdc++ to the linker.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 590ccd0f5ce03dd2417d6ea057459f073a556ab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=590ccd0f5ce03dd2417d6ea0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 09:05:14 2018 -0600 winegcc: Pass -static-libstdc++ to the linker. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5136cf3..b5fa881 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -71,8 +71,9 @@ * * Linker Options * object-file-name -llibrary -nostartfiles -nodefaultlibs - * -nostdlib -s -static -static-libgcc -shared -shared-libgcc - * -symbolic -Wl,option -Xlinker option -u symbol --image-base + * -nostdlib -s -static -static-libgcc -static-libstdc++ + * -shared -shared-libgcc -symbolic -Wl,option + * -Xlinker option -u symbol --image-base * * Directory Options * -Bprefix -Idir -I- -Ldir -specs=file @@ -1288,8 +1289,9 @@ static int is_linker_arg(const char* arg) { static const char* link_switches[] = { - "-nostdlib", "-s", "-static", "-static-libgcc", "-shared", "-shared-libgcc", "-symbolic", - "-framework", "--coverage", "-fprofile-generate", "-fprofile-use" + "-nostdlib", "-s", "-static", "-static-libgcc", "-static-libstdc++", + "-shared", "-shared-libgcc", "-symbolic", "-framework", "--coverage", + "-fprofile-generate", "-fprofile-use" }; unsigned int j;

1 0

Alex Henrie : dmusic: Make constant 'emulated' static.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 6a6660efe2ff46b6f0200a7c622bd95afb6742fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a6660efe2ff46b6f0200a7c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:02 2018 -0700 dmusic: Make constant 'emulated' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/dmusic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 033983f..fd450b8 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -373,8 +373,8 @@ static const IDirectMusic8Vtbl DirectMusic8_Vtbl = { static void create_system_ports_list(IDirectMusic8Impl* object) { + static const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; port_info * port; - const WCHAR emulated[] = {' ','[','E','m','u','l','a','t','e','d',']',0}; ULONG nb_ports; ULONG nb_midi_out; ULONG nb_midi_in;

1 0

Alex Henrie : dwrite: Make constant 'globaldefaultW' static.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 195154b747382613dd778778558ea61b53b3c8f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=195154b747382613dd778778… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:03 2018 -0700 dwrite: Make constant 'globaldefaultW' static. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 6666249..97b99f9 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4263,7 +4263,7 @@ HRESULT get_eudc_fontcollection(IDWriteFactory5 *factory, IDWriteFontCollection1 hr = IDWriteFontCollection1_FindFamilyName(&collection->IDWriteFontCollection1_iface, emptyW, &index, &exists); if (FAILED(hr) || !exists) { - const WCHAR globaldefaultW[] = {'E','U','D','C','.','T','T','E',0}; + static const WCHAR globaldefaultW[] = {'E','U','D','C','.','T','T','E',0}; hr = eudc_collection_add_family(factory, collection, emptyW, globaldefaultW); if (hr != S_OK) WARN("failed to add global default EUDC font, 0x%08x\n", hr);

1 0

Alex Henrie : gdi32: Turn variable 'fake_nameW' into a static constant.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 235063d862a1c5489dbabe022e8d55554425a8b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=235063d862a1c5489dbabe02… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:04 2018 -0700 gdi32: Turn variable 'fake_nameW' into a static constant. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f50c163..87c55e0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7837,7 +7837,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) full_nameW = get_face_name( ft_face, TT_NAME_ID_UNIQUE_ID, GetSystemDefaultLangID() ); if (!full_nameW) { - WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; + static const WCHAR fake_nameW[] = {'f','a','k','e',' ','n','a','m','e', 0}; FIXME("failed to read full_nameW for font %s!\n", wine_dbgstr_w(font->name)); full_nameW = strdupW(fake_nameW); }

1 0

Alex Henrie : riched20: Turn several constants and variables into static constants.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 55a3dfe35e2c550edd334ec4be5b27de0bd3b191 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55a3dfe35e2c550edd334ec4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Nov 30 00:14:17 2018 -0700 riched20: Turn several constants and variables into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 4 ++-- dlls/riched20/paint.c | 4 ++-- dlls/riched20/para.c | 2 +- dlls/riched20/run.c | 2 +- dlls/riched20/table.c | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 052400c..99c87bf 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2520,11 +2520,11 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) if (editor->styleFlags & ES_MULTILINE) { + static const WCHAR endl = '\r'; + static const WCHAR endlv10[] = {'\r','\n'}; ME_Cursor cursor = editor->pCursors[0]; ME_DisplayItem *para = cursor.pPara; int from, to; - const WCHAR endl = '\r'; - const WCHAR endlv10[] = {'\r','\n'}; ME_Style *style, *eop_style; if (editor->styleFlags & ES_READONLY) { diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 44cf3cb..e2ccef4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -989,7 +989,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) } if (me_debug) { - const WCHAR wszRowDebug[] = {'r','o','w','[','%','d',']',0}; + static const WCHAR wszRowDebug[] = {'r','o','w','[','%','d',']',0}; WCHAR buf[128]; POINT pt = c->pt; wsprintfW(buf, wszRowDebug, no); @@ -1017,7 +1017,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) c->pt.y + para->pt.y + run->pt.y + baseline, p, para); if (me_debug) { - const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0}; + static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0}; WCHAR buf[2560]; POINT pt; pt.x = c->pt.x + run->pt.x; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index c4ddb65..7781ff2 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -152,6 +152,7 @@ void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) void ME_MakeFirstParagraph(ME_TextEditor *editor) { + static const WCHAR cr_lf[] = {'\r','\n',0}; ME_Context c; CHARFORMAT2W cf; const CHARFORMATW *host_cf; @@ -162,7 +163,6 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_DisplayItem *run; ME_Style *style; int eol_len; - WCHAR cr_lf[] = {'\r','\n',0}; ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 2cdd3d8..66c24f8 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -612,8 +612,8 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visu SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) { + static const WCHAR spaceW[] = {' ',0}; SIZE size; - WCHAR spaceW[] = {' ',0}; nLen = min( nLen, run->len ); diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 4cd77eb..7e8d7ff 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -56,6 +56,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); +static const WCHAR cr_lf[] = {'\r', '\n', 0}; + static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, int nCursor, const WCHAR *eol_str, int eol_len, @@ -77,7 +79,6 @@ static ME_DisplayItem* ME_InsertEndParaFromCursor(ME_TextEditor *editor, ME_DisplayItem* ME_InsertTableRowStartFromCursor(ME_TextEditor *editor) { ME_DisplayItem *para; - WCHAR cr_lf[] = {'\r', '\n', 0}; para = ME_InsertEndParaFromCursor(editor, 0, cr_lf, 2, MEPF_ROWSTART); return para->member.para.prev_para; } @@ -128,7 +129,6 @@ ME_DisplayItem* ME_InsertTableCellFromCursor(ME_TextEditor *editor) ME_DisplayItem* ME_InsertTableRowEndFromCursor(ME_TextEditor *editor) { ME_DisplayItem *para; - WCHAR cr_lf[] = {'\r', '\n', 0}; para = ME_InsertEndParaFromCursor(editor, 0, cr_lf, 2, MEPF_ROWEND); return para->member.para.prev_para; }

1 0

Serge Gautherie : rpcrt4: Fix 'Routeines' typos.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: c73352047d20a503c67bdd583f6ef8d98711a678 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c73352047d20a503c67bdd58… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Sat Dec 1 03:17:59 2018 +0100 rpcrt4: Fix 'Routeines' typos. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 0dc6789..79c9645 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -519,9 +519,9 @@ @ stub long_from_ndr @ stub long_from_ndr_temp @ stub pfnFreeRoutines # wxp -@ stub pfnMarshallRouteines # wxp +@ stub pfnMarshallRoutines # wxp @ stub pfnSizeRoutines # wxp -@ stub pfnUnmarshallRouteines # wxp +@ stub pfnUnmarshallRoutines # wxp @ stub short_array_from_ndr @ stub short_from_ndr @ stub short_from_ndr_temp

1 0

Jacek Caban : jscript: Rename prop_val_t to property_definition_t.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 9193b9f52c5c77951ac6dff581a22f2152570260 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9193b9f52c5c77951ac6dff5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 22:44:07 2018 +0100 jscript: Rename prop_val_t to property_definition_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 4 ++-- dlls/jscript/parser.h | 8 ++++---- dlls/jscript/parser.y | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 3f9db7a..a498abd 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -888,7 +888,7 @@ static HRESULT compile_array_literal(compiler_ctx_t *ctx, array_literal_expressi static HRESULT compile_object_literal(compiler_ctx_t *ctx, property_value_expression_t *expr) { - prop_val_t *iter; + property_definition_t *iter; unsigned instr; BSTR name; HRESULT hres; @@ -1999,7 +1999,7 @@ static HRESULT visit_expression(compiler_ctx_t *ctx, expression_t *expr) hres = visit_expression(ctx, ((member_expression_t*)expr)->expression); break; case EXPR_PROPVAL: { - prop_val_t *iter; + property_definition_t *iter; for(iter = ((property_value_expression_t*)expr)->property_list; iter; iter = iter->next) { hres = visit_expression(ctx, iter->value); if(FAILED(hres)) diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index 65297b9..908d6b6 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -358,16 +358,16 @@ typedef struct { int length; } array_literal_expression_t; -typedef struct _prop_val_t { +typedef struct _property_definition_t { literal_t *name; expression_t *value; - struct _prop_val_t *next; -} prop_val_t; + struct _property_definition_t *next; +} property_definition_t; typedef struct { expression_t expr; - prop_val_t *property_list; + property_definition_t *property_list; } property_value_expression_t; BOOL try_parse_ccval(parser_ctx_t*,ccval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 0bb8856..5979ef0 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -41,8 +41,8 @@ static literal_t *new_string_literal(parser_ctx_t*,const WCHAR*); static literal_t *new_null_literal(parser_ctx_t*); typedef struct _property_list_t { - prop_val_t *head; - prop_val_t *tail; + property_definition_t *head; + property_definition_t *tail; } property_list_t; static property_list_t *new_property_list(parser_ctx_t*,literal_t*,expression_t*); @@ -921,9 +921,9 @@ static literal_t *new_null_literal(parser_ctx_t *ctx) return ret; } -static prop_val_t *new_prop_val(parser_ctx_t *ctx, literal_t *name, expression_t *value) +static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal_t *name, expression_t *value) { - prop_val_t *ret = parser_alloc(ctx, sizeof(prop_val_t)); + property_definition_t *ret = parser_alloc(ctx, sizeof(property_definition_t)); ret->name = name; ret->value = value; @@ -936,14 +936,14 @@ static property_list_t *new_property_list(parser_ctx_t *ctx, literal_t *name, ex { property_list_t *ret = parser_alloc_tmp(ctx, sizeof(property_list_t)); - ret->head = ret->tail = new_prop_val(ctx, name, value); + ret->head = ret->tail = new_property_definition(ctx, name, value); return ret; } static property_list_t *property_list_add(parser_ctx_t *ctx, property_list_t *list, literal_t *name, expression_t *value) { - list->tail = list->tail->next = new_prop_val(ctx, name, value); + list->tail = list->tail->next = new_property_definition(ctx, name, value); return list; }

1 0

Jacek Caban : jscript: Use separated parser rule for property definition.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: fd4c34759f9cb045fd85768e22815017151e4eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd4c34759f9cb045fd85768e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 22:44:14 2018 +0100 jscript: Use separated parser rule for property definition. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/parser.y | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 5979ef0..47ac1bc 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -45,8 +45,10 @@ typedef struct _property_list_t { property_definition_t *tail; } property_list_t; -static property_list_t *new_property_list(parser_ctx_t*,literal_t*,expression_t*); -static property_list_t *property_list_add(parser_ctx_t*,property_list_t*,literal_t*,expression_t*); +static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal_t *name, + expression_t *value); +static property_list_t *new_property_list(parser_ctx_t*,property_definition_t*); +static property_list_t *property_list_add(parser_ctx_t*,property_list_t*,property_definition_t*); typedef struct _element_list_t { array_element_t *head; @@ -156,6 +158,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state const WCHAR *identifier; struct _parameter_list_t *parameter_list; struct _property_list_t *property_list; + property_definition_t *property_definition; source_elements_t *source_elements; statement_t *statement; struct _statement_list_t *statement_list; @@ -237,6 +240,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <ival> Elision Elision_opt %type <element_list> ElementList %type <property_list> PropertyNameAndValueList +%type <property_definition> PropertyDefinition %type <literal> PropertyName %type <literal> BooleanLiteral %type <srcptr> KFunction @@ -789,10 +793,14 @@ ObjectLiteral /* ECMA-262 3rd Edition 11.1.5 */ PropertyNameAndValueList + : PropertyDefinition { $$ = new_property_list(ctx, $1); } + | PropertyNameAndValueList ',' PropertyDefinition + { $$ = property_list_add(ctx, $1, $3); } + +/* ECMA-262 5.1 Edition 12.2.6 */ +PropertyDefinition : PropertyName ':' AssignmentExpression - { $$ = new_property_list(ctx, $1, $3); } - | PropertyNameAndValueList ',' PropertyName ':' AssignmentExpression - { $$ = property_list_add(ctx, $1, $3, $5); } + { $$ = new_property_definition(ctx, $1, $3); } /* ECMA-262 3rd Edition 11.1.5 */ PropertyName @@ -932,19 +940,16 @@ static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal return ret; } -static property_list_t *new_property_list(parser_ctx_t *ctx, literal_t *name, expression_t *value) +static property_list_t *new_property_list(parser_ctx_t *ctx, property_definition_t *prop) { property_list_t *ret = parser_alloc_tmp(ctx, sizeof(property_list_t)); - - ret->head = ret->tail = new_property_definition(ctx, name, value); - + ret->head = ret->tail = prop; return ret; } -static property_list_t *property_list_add(parser_ctx_t *ctx, property_list_t *list, literal_t *name, expression_t *value) +static property_list_t *property_list_add(parser_ctx_t *ctx, property_list_t *list, property_definition_t *prop) { - list->tail = list->tail->next = new_property_definition(ctx, name, value); - + list->tail = list->tail->next = prop; return list; }

1 0

Jacek Caban : jscript: Add parser support for getters and setters in object initializer.
by Alexandre Julliard 03 Dec '18

03 Dec '18

Module: wine Branch: master Commit: 56be97fd5d5fc0a9a5b78005383f6e8770c7fec8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56be97fd5d5fc0a9a5b78005… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 30 22:44:32 2018 +0100 jscript: Add parser support for getters and setters in object initializer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.h | 6 ++++++ dlls/jscript/lex.c | 17 ++++++++++++++--- dlls/jscript/parser.h | 1 + dlls/jscript/parser.y | 29 +++++++++++++++++++++-------- dlls/jscript/tests/lang.js | 2 ++ 5 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index d3fd3d77..d0c419a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -129,6 +129,12 @@ typedef struct { } u; } instr_t; +typedef enum { + PROPERTY_DEFINITION_VALUE, + PROPERTY_DEFINITION_GETTER, + PROPERTY_DEFINITION_SETTER +} property_definition_type_t; + typedef struct { BSTR name; int ref; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 7ef2112..be20e99 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -46,12 +46,14 @@ static const WCHAR falseW[] = {'f','a','l','s','e',0}; static const WCHAR finallyW[] = {'f','i','n','a','l','l','y',0}; static const WCHAR forW[] = {'f','o','r',0}; static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0}; +static const WCHAR getW[] = {'g','e','t',0}; static const WCHAR ifW[] = {'i','f',0}; static const WCHAR inW[] = {'i','n',0}; static const WCHAR instanceofW[] = {'i','n','s','t','a','n','c','e','o','f',0}; static const WCHAR newW[] = {'n','e','w',0}; static const WCHAR nullW[] = {'n','u','l','l',0}; static const WCHAR returnW[] = {'r','e','t','u','r','n',0}; +static const WCHAR setW[] = {'s','e','t',0}; static const WCHAR switchW[] = {'s','w','i','t','c','h',0}; static const WCHAR thisW[] = {'t','h','i','s',0}; static const WCHAR throwW[] = {'t','h','r','o','w',0}; @@ -70,11 +72,12 @@ static const struct { const WCHAR *word; int token; BOOL no_nl; + unsigned min_version; } keywords[] = { - {breakW, kBREAK, TRUE}, + {breakW, kBREAK, TRUE}, {caseW, kCASE}, {catchW, kCATCH}, - {continueW, kCONTINUE, TRUE}, + {continueW, kCONTINUE, TRUE}, {defaultW, kDEFAULT}, {deleteW, kDELETE}, {doW, kDO}, @@ -83,12 +86,14 @@ static const struct { {finallyW, kFINALLY}, {forW, kFOR}, {functionW, kFUNCTION}, + {getW, kGET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, {ifW, kIF}, {inW, kIN}, {instanceofW, kINSTANCEOF}, {newW, kNEW}, {nullW, kNULL}, - {returnW, kRETURN, TRUE}, + {returnW, kRETURN, TRUE}, + {setW, kSET, FALSE, SCRIPTLANGUAGEVERSION_ES5}, {switchW, kSWITCH}, {thisW, kTHIS}, {throwW, kTHROW}, @@ -169,6 +174,12 @@ static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval) r = check_keyword(ctx, keywords[i].word, lval); if(!r) { + if(ctx->script->version < keywords[i].min_version) { + TRACE("ignoring keyword %s in incompatible mode\n", + debugstr_w(keywords[i].word)); + ctx->ptr -= strlenW(keywords[i].word); + return 0; + } ctx->implicit_nl_semicolon = keywords[i].no_nl; return keywords[i].token; } diff --git a/dlls/jscript/parser.h b/dlls/jscript/parser.h index 908d6b6..03f504f 100644 --- a/dlls/jscript/parser.h +++ b/dlls/jscript/parser.h @@ -359,6 +359,7 @@ typedef struct { } array_literal_expression_t; typedef struct _property_definition_t { + unsigned type; literal_t *name; expression_t *value; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 47ac1bc..157bc18 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -45,8 +45,8 @@ typedef struct _property_list_t { property_definition_t *tail; } property_list_t; -static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal_t *name, - expression_t *value); +static property_definition_t *new_property_definition(parser_ctx_t *ctx, property_definition_type_t, + literal_t *name, expression_t *value); static property_list_t *new_property_list(parser_ctx_t*,property_definition_t*); static property_list_t *property_list_add(parser_ctx_t*,property_list_t*,property_definition_t*); @@ -167,7 +167,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state } /* keywords */ -%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kIN +%token <identifier> kBREAK kCASE kCATCH kCONTINUE kDEFAULT kDELETE kDO kELSE kFUNCTION kIF kFINALLY kFOR kGET kIN kSET %token <identifier> kINSTANCEOF kNEW kNULL kRETURN kSWITCH kTHIS kTHROW kTRUE kFALSE kTRY kTYPEOF kVAR kVOID kWHILE kWITH %token tANDAND tOROR tINC tDEC tHTMLCOMMENT kDIVEQ kDCOL @@ -224,6 +224,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <expr> CallExpression %type <expr> MemberExpression %type <expr> PrimaryExpression +%type <expr> GetterSetterMethod %type <identifier> Identifier_opt %type <variable_list> VariableDeclarationList %type <variable_list> VariableDeclarationListNoIn @@ -243,7 +244,7 @@ static source_elements_t *source_elements_add_statement(source_elements_t*,state %type <property_definition> PropertyDefinition %type <literal> PropertyName %type <literal> BooleanLiteral -%type <srcptr> KFunction +%type <srcptr> KFunction left_bracket %type <ival> AssignOper %type <identifier> IdentifierName ReservedAsIdentifier @@ -800,9 +801,17 @@ PropertyNameAndValueList /* ECMA-262 5.1 Edition 12.2.6 */ PropertyDefinition : PropertyName ':' AssignmentExpression - { $$ = new_property_definition(ctx, $1, $3); } + { $$ = new_property_definition(ctx, PROPERTY_DEFINITION_VALUE, $1, $3); } + | kGET PropertyName GetterSetterMethod + { $$ = new_property_definition(ctx, PROPERTY_DEFINITION_GETTER, $2, $3); } + | kSET PropertyName GetterSetterMethod + { $$ = new_property_definition(ctx, PROPERTY_DEFINITION_SETTER, $2, $3); } -/* ECMA-262 3rd Edition 11.1.5 */ +GetterSetterMethod + : left_bracket FormalParameterList_opt right_bracket '{' FunctionBody '}' + { $$ = new_function_expression(ctx, NULL, $2, $5, NULL, $1, $6-$1); } + +/* Ecma-262 3rd Edition 11.1.5 */ PropertyName : IdentifierName { $$ = new_string_literal(ctx, $1); } | tStringLiteral { $$ = new_string_literal(ctx, $1); } @@ -839,12 +848,14 @@ ReservedAsIdentifier | kFINALLY { $$ = $1; } | kFOR { $$ = $1; } | kFUNCTION { $$ = $1; } + | kGET { $$ = $1; } | kIF { $$ = $1; } | kIN { $$ = $1; } | kINSTANCEOF { $$ = $1; } | kNEW { $$ = $1; } | kNULL { $$ = $1; } | kRETURN { $$ = $1; } + | kSET { $$ = $1; } | kSWITCH { $$ = $1; } | kTHIS { $$ = $1; } | kTHROW { $$ = $1; } @@ -878,7 +889,7 @@ semicolon_opt | error { if(!allow_auto_semicolon(ctx)) {YYABORT;} } left_bracket - : '(' + : '(' { $$ = ctx->ptr; } | error { set_error(ctx, JS_E_MISSING_LBRACKET); YYABORT; } right_bracket @@ -929,10 +940,12 @@ static literal_t *new_null_literal(parser_ctx_t *ctx) return ret; } -static property_definition_t *new_property_definition(parser_ctx_t *ctx, literal_t *name, expression_t *value) +static property_definition_t *new_property_definition(parser_ctx_t *ctx, property_definition_type_t type, + literal_t *name, expression_t *value) { property_definition_t *ret = parser_alloc(ctx, sizeof(property_definition_t)); + ret->type = type; ret->name = name; ret->value = value; ret->next = NULL; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 1cd5668..2a30ea3 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1832,6 +1832,8 @@ ok(tmp, "tmp = " + tmp); ok(x === undefined, "x = " + x); })(); +var get, set; + /* NoNewline rule parser tests */ while(true) { if(true) break

1 0