November 2013 - Wine-commits

Jacek Caban : mshtml: Added IHTMLStyle6::boxSizing property implementation.
by Alexandre Julliard 07 Nov '13

07 Nov '13

Module: wine Branch: master Commit: 321c96574ea4b88c971e92372c82d272db95bd60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=321c96574ea4b88c971e92372… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 7 17:01:31 2013 +0100 mshtml: Added IHTMLStyle6::boxSizing property implementation. --- dlls/mshtml/htmlstyle.c | 4 ++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 12 ++++++++---- dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 5ed2f93..5f4fc67 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -91,6 +91,9 @@ static const WCHAR attrBorderWidth[] = {'b','o','r','d','e','r','-','w','i','d','t','h',0}; static const WCHAR attrBottom[] = {'b','o','t','t','o','m',0}; +/* FIXME: Use unprefixed version (requires Gecko changes). */ +static const WCHAR attrBoxSizing[] = + {'-','m','o','z','-','b','o','x','-','s','i','z','i','n','g',0}; static const WCHAR attrClear[] = {'c','l','e','a','r',0}; static const WCHAR attrClip[] = @@ -221,6 +224,7 @@ static const style_tbl_entry_t style_tbl[] = { {attrBorderTopWidth, DISPID_IHTMLSTYLE_BORDERTOPWIDTH}, {attrBorderWidth, DISPID_IHTMLSTYLE_BORDERWIDTH}, {attrBottom, DISPID_IHTMLSTYLE2_BOTTOM}, + {attrBoxSizing, DISPID_IHTMLSTYLE6_BOXSIZING}, {attrClear, DISPID_IHTMLSTYLE_CLEAR}, {attrClip, DISPID_IHTMLSTYLE_CLIP}, {attrColor, DISPID_IHTMLSTYLE_COLOR}, diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 646375f..382a226 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -61,6 +61,7 @@ typedef enum { STYLEID_BORDER_TOP_WIDTH, STYLEID_BORDER_WIDTH, STYLEID_BOTTOM, + STYLEID_BOX_SIZING, STYLEID_CLEAR, STYLEID_CLIP, STYLEID_COLOR, diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index 116181c..1cff71b 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -762,15 +762,19 @@ static HRESULT WINAPI HTMLStyle6_get_outlineColor(IHTMLStyle6 *iface, VARIANT *p static HRESULT WINAPI HTMLStyle6_put_boxSizing(IHTMLStyle6 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_nsstyle_attr(This->nsstyle, STYLEID_BOX_SIZING, v, 0); } static HRESULT WINAPI HTMLStyle6_get_boxSizing(IHTMLStyle6 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_nsstyle_attr(This->nsstyle, STYLEID_BOX_SIZING, p, 0); } static HRESULT WINAPI HTMLStyle6_put_boxSpacing(IHTMLStyle6 *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index c434c1c..2df585a 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -492,6 +492,23 @@ static void test_style6(IHTMLStyle6 *style) ok(hres == S_OK, "get_outline failed: %08x\n", hres); ok(wstr_contains(str, "1px"), "outline = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLStyle6_get_boxSizing(style, &str); + ok(hres == S_OK, "get_boxSizing failed: %08x\n", hres); + ok(!str, "boxSizing = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("border-box"); + hres = IHTMLStyle6_put_boxSizing(style, str); + ok(hres == S_OK, "put_boxSizing failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLStyle6_get_boxSizing(style, &str); + ok(hres == S_OK, "get_boxSizing failed: %08x\n", hres); + ok(!strcmp_wa(str, "border-box"), "boxSizing = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_body_style(IHTMLStyle *style)

1 0

Dmitry Timoshkov : gdiplus: Implement GdipPrivateAddFontFile.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: e7f6d77919f75e7a2cabf6f901087eba009a2ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f6d77919f75e7a2cabf6f90… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 6 12:44:21 2013 +0900 gdiplus: Implement GdipPrivateAddFontFile. --- dlls/gdiplus/font.c | 34 +++++++++++++++++++++++++++++----- 1 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index a6c7924..a811a60 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1127,15 +1127,39 @@ GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection **fontColle /***************************************************************************** * GdipPrivateAddFontFile [GDIPLUS.@] */ -GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection* fontCollection, - GDIPCONST WCHAR* filename) +GpStatus WINGDIPAPI GdipPrivateAddFontFile(GpFontCollection *collection, GDIPCONST WCHAR *name) { - FIXME("stub: %p, %s\n", fontCollection, debugstr_w(filename)); + HANDLE file, mapping; + LARGE_INTEGER size; + void *mem; + GpStatus status; + + TRACE("%p, %s\n", collection, debugstr_w(name)); + + if (!collection || !name) return InvalidParameter; - if (!(fontCollection && filename)) + file = CreateFileW(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (file == INVALID_HANDLE_VALUE) return InvalidParameter; + + if (!GetFileSizeEx(file, &size) || size.u.HighPart) + { + CloseHandle(file); return InvalidParameter; + } + + mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, NULL); + CloseHandle(file); + if (!mapping) return InvalidParameter; + + mem = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + CloseHandle(mapping); + if (!mem) return InvalidParameter; + + /* GdipPrivateAddMemoryFont creates a copy of the memory block */ + status = GdipPrivateAddMemoryFont(collection, mem, size.u.LowPart); + UnmapViewOfFile(mem); - return NotImplemented; + return status; } #define TT_PLATFORM_APPLE_UNICODE 0

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 968e3c5a6b858d3ee400f6a6bb7d150f4c4c26d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=968e3c5a6b858d3ee400f6a6b… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Nov 6 08:21:14 2013 +0200 po: Update Lithuanian translation. --- po/lt.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/lt.po b/po/lt.po index 7d332ba..d73379f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-10-02 08:42+0300\n" +"PO-Revision-Date: 2013-11-06 08:20+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -4701,8 +4701,6 @@ msgid "No Unicode translation.\n" msgstr "Nėra unikodo perskaičiavimo.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "Nepavyko DLL inicijavimas.\n"

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 9d7b466cfc85d2e075948f5633423f1bc36be7b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d7b466cfc85d2e075948f563… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 6 10:05:56 2013 +0100 po: Update French translation. --- po/fr.po | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9b0bf92..2e243dc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-10-01 21:13+0100\n" +"PO-Revision-Date: 2013-11-05 21:13+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -4724,8 +4724,6 @@ msgid "No Unicode translation.\n" msgstr "Pas de traduction Unicode.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "Échec d'initialisation de la DLL.\n"

1 0

Ken Thomases : winemac: Fix search for clipboard format matching a pasteboard type so it can fail when it should .
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 7c0c30b4d650d663770e0bbf683946005506bb8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c0c30b4d650d663770e0bbf6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 6 06:58:42 2013 -0600 winemac: Fix search for clipboard format matching a pasteboard type so it can fail when it should. It had been acting as though the last registered clipboard format always matched any pasteboard type. --- dlls/winemac.drv/clipboard.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index ee63c10..5d765f4 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -367,6 +367,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty } } + format = NULL; if (!current) { LPWSTR name;

1 0

Ken Thomases : winemac: Reduce duplicated code by consolidating exit paths from format_for_type().
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: aa53603135fa8699b1465dca40556c14ed332551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa53603135fa8699b1465dca4… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Nov 6 06:59:00 2013 -0600 winemac: Reduce duplicated code by consolidating exit paths from format_for_type(). --- dlls/winemac.drv/clipboard.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 5d765f4..f97faea 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -361,10 +361,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty { format = LIST_ENTRY(ptr, WINE_CLIPFORMAT, entry); if (CFEqual(format->type, type)) - { - TRACE(" -> %p/%s\n", format, debugstr_format(format->format_id)); - return format; - } + goto done; } format = NULL; @@ -376,7 +373,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty { ERR("Shouldn't happen. Built-in type %s should have matched something in format list.\n", debugstr_cf(type)); - return NULL; + goto done; } else if (CFStringHasPrefix(type, registered_name_type_prefix)) { @@ -403,6 +400,7 @@ static WINE_CLIPFORMAT* format_for_type(WINE_CLIPFORMAT *current, CFStringRef ty HeapFree(GetProcessHeap(), 0, name); } +done: TRACE(" -> %p/%s\n", format, debugstr_format(format ? format->format_id : 0)); return format; }

1 0

Rico Schüller : wined3d: Use GL_ARB_texture_mirror_clamp_to_edge when available.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: de9e1cdcae3ededfa20fb6d85f1785fe01b454de URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9e1cdcae3ededfa20fb6d85… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 5 23:08:30 2013 +0100 wined3d: Use GL_ARB_texture_mirror_clamp_to_edge when available. --- dlls/wined3d/directx.c | 12 +++++++++--- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 31ff52a..69d3401 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -134,6 +134,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, + {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, @@ -2932,6 +2933,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) if (!counter_bits) gl_info->supported[ARB_OCCLUSION_QUERY] = FALSE; } + if (!gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] && gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + { + TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); + gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] = TRUE; + } wined3d_adapter_init_limits(gl_info); @@ -3049,7 +3055,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) gl_info->wrap_lookup[WINED3D_TADDRESS_BORDER - WINED3D_TADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; gl_info->wrap_lookup[WINED3D_TADDRESS_MIRROR_ONCE - WINED3D_TADDRESS_WRAP] = - gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; + gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] ? GL_MIRROR_CLAMP_TO_EDGE : GL_REPEAT; adapter->d3d_info.valid_rt_mask = 0; for (i = 0; i < gl_info->limits.buffers; ++i) @@ -4349,7 +4355,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte { caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } - if (gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) { caps->TextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; } @@ -4367,7 +4373,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte { caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRROR; } - if (gl_info->supported[ATI_TEXTURE_MIRROR_ONCE]) + if (gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE]) { caps->VolumeTextureAddressCaps |= WINED3DPTADDRESSCAPS_MIRRORONCE; } diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8ad865e..76b8767 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -84,6 +84,7 @@ enum wined3d_gl_extension ARB_TEXTURE_ENV_DOT3, ARB_TEXTURE_FLOAT, ARB_TEXTURE_MIRRORED_REPEAT, + ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, ARB_TEXTURE_NON_POWER_OF_TWO, ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG,

1 0

Jacek Caban : jscript: Added support for octal literals.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 4d9ea4b5635654cfcd65478a1cc47363ee1798ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9ea4b5635654cfcd65478a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 17:18:28 2013 +0100 jscript: Added support for octal literals. --- dlls/jscript/lex.c | 30 ++++++++++++++++++++++++++---- dlls/jscript/tests/lang.js | 11 +++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 8b881f3..dfadccd 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -484,15 +484,37 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) return tNumericLiteral; } + if(isdigitW(*ctx->ptr)) { + unsigned base = 8; + const WCHAR *ptr; + double val = 0; + + for(ptr = ctx->ptr; ptr < ctx->end && isdigitW(*ptr); ptr++) { + if(*ptr > '7') { + base = 10; + break; + } + } + + do { + val = val*base + *ctx->ptr-'0'; + }while(++ctx->ptr < ctx->end && isdigitW(*ctx->ptr)); + + /* 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); + } + + *literal = new_double_literal(ctx, val); + return tNumericLiteral; + } + if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); return lex_error(ctx, E_FAIL); } - if(isdigitW(*ctx->ptr)) { - FIXME("octal literals not implemented\n"); - return lex_error(ctx, E_NOTIMPL); - } } return parse_double_literal(ctx, l, literal); diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index bac2deb..ccbdb51 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -38,6 +38,17 @@ ok(1000000*1000000 === 1000000000000, "1000000*1000000 === 1000000000000 is fals ok(8.64e15 === 8640000000000000, "8.64e15 !== 8640000000000000"); ok(1e2147483648 === Infinity, "1e2147483648 !== Infinity"); +ok(00 === 0, "00 != 0"); +ok(010 === 8, "010 != 8"); +ok(077 === 63, "077 != 63"); +ok(080 === 80, "080 != 80"); +ok(090 === 90, "090 != 90"); +ok(018 === 18, "018 != 18"); +tmp = 07777777777777777777777; +ok(typeof(tmp) === "number" && tmp > 0xffffffff, "tmp = " + tmp); +tmp = 07777777779777777777777; +ok(typeof(tmp) === "number" && tmp > 0xffffffff, "tmp = " + tmp); + ok(1 !== 2, "1 !== 2 is false"); ok(null !== undefined, "null !== undefined is false");

1 0

Jacek Caban : jscript: Improved error handling in numeric literal parser.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 1a89ea7043e2ea10ff4a29c1c15f45ec80f3dbd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a89ea7043e2ea10ff4a29c1c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 17:18:38 2013 +0100 jscript: Improved error handling in numeric literal parser. --- dlls/jscript/lex.c | 10 +++++++--- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index dfadccd..363e18d 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -454,6 +454,11 @@ static int parse_double_literal(parser_ctx_t *ctx, LONG int_part, literal_t **li else exp += e; } + if(is_identifier_char(*ctx->ptr)) { + WARN("wrong char after zero\n"); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); + } + *literal = new_double_literal(ctx, exp>=0 ? d*pow(10, exp) : d/pow(10, -exp)); return tNumericLiteral; } @@ -477,7 +482,7 @@ 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, E_FAIL); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); } *literal = new_double_literal(ctx, l); @@ -512,9 +517,8 @@ static int parse_numeric_literal(parser_ctx_t *ctx, literal_t **literal) if(is_identifier_char(*ctx->ptr)) { WARN("wrong char after zero\n"); - return lex_error(ctx, E_FAIL); + return lex_error(ctx, JS_E_MISSING_SEMICOLON); } - } return parse_double_literal(ctx, l, literal); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index eb16176..e1f91c0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2357,6 +2357,13 @@ testSyntaxError("ok(false, 'unexpected execution'); while(true) continue some_la testSyntaxError("ok(false, 'unexpected execution'); some_label: { while(true) continue some_label; }", "E_INVALID_CONTINUE"); testSyntaxError("ok(false, 'unexpected execution'); some_label: { some_label: while(true); }", "E_LABEL_REDEFINED"); testSyntaxError("return;", "E_MISPLACED_RETURN"); +testSyntaxError("001.5;", "E_SEMICOLON"); +testSyntaxError("001.5", "E_SEMICOLON"); +testSyntaxError("0a", "E_SEMICOLON"); +testSyntaxError("01a", "E_SEMICOLON"); +testSyntaxError("0x1r", "E_SEMICOLON"); +testSyntaxError("1a", "E_SEMICOLON"); +testSyntaxError("1_", "E_SEMICOLON"); // ReferenceError tests testException(function() {test = function() {}}, "E_ILLEGAL_ASSIGN");

1 0

André Hentschel : tools/winapi: Remove PCTSTR, PTSTR and TCHAR from the list of tested types.
by Alexandre Julliard 06 Nov '13

06 Nov '13

Module: wine Branch: master Commit: 94d8e3ab689d390ed04c0a012136add269aff7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94d8e3ab689d390ed04c0a012… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 5 22:40:15 2013 +0100 tools/winapi: Remove PCTSTR, PTSTR and TCHAR from the list of tested types. --- dlls/ntdll/tests/generated.c | 45 ------------------------------------------ tools/winapi/tests.dat | 3 -- 2 files changed, 0 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/tests/generated.c b/dlls/ntdll/tests/generated.c index fdba6e8..2212dc8 100644 --- a/dlls/ntdll/tests/generated.c +++ b/dlls/ntdll/tests/generated.c @@ -1899,13 +1899,6 @@ static void test_pack_PCSTR(void) TEST_TARGET_ALIGN(PCSTR, 1) } -static void test_pack_PCTSTR(void) -{ - /* PCTSTR */ - TEST_TYPE_SIZE (PCTSTR, 8) - TEST_TYPE_ALIGN (PCTSTR, 8) -} - static void test_pack_PCWCH(void) { /* PCWCH */ @@ -2568,13 +2561,6 @@ static void test_pack_PTOKEN_USER(void) TEST_TARGET_ALIGN(PTOKEN_USER, 8) } -static void test_pack_PTSTR(void) -{ - /* PTSTR */ - TEST_TYPE_SIZE (PTSTR, 8) - TEST_TYPE_ALIGN (PTSTR, 8) -} - static void test_pack_PULARGE_INTEGER(void) { /* PULARGE_INTEGER */ @@ -2929,13 +2915,6 @@ static void test_pack_SYSTEM_AUDIT_ACE(void) TEST_FIELD_OFFSET(SYSTEM_AUDIT_ACE, SidStart, 8) } -static void test_pack_TCHAR(void) -{ - /* TCHAR */ - TEST_TYPE_SIZE (TCHAR, 1) - TEST_TYPE_ALIGN (TCHAR, 1) -} - static void test_pack_TOKEN_DEFAULT_DACL(void) { /* TOKEN_DEFAULT_DACL */ @@ -5265,13 +5244,6 @@ static void test_pack_PCSTR(void) TEST_TARGET_ALIGN(PCSTR, 1) } -static void test_pack_PCTSTR(void) -{ - /* PCTSTR */ - TEST_TYPE_SIZE (PCTSTR, 4) - TEST_TYPE_ALIGN (PCTSTR, 4) -} - static void test_pack_PCWCH(void) { /* PCWCH */ @@ -5934,13 +5906,6 @@ static void test_pack_PTOKEN_USER(void) TEST_TARGET_ALIGN(PTOKEN_USER, 4) } -static void test_pack_PTSTR(void) -{ - /* PTSTR */ - TEST_TYPE_SIZE (PTSTR, 4) - TEST_TYPE_ALIGN (PTSTR, 4) -} - static void test_pack_PULARGE_INTEGER(void) { /* PULARGE_INTEGER */ @@ -6295,13 +6260,6 @@ static void test_pack_SYSTEM_AUDIT_ACE(void) TEST_FIELD_OFFSET(SYSTEM_AUDIT_ACE, SidStart, 8) } -static void test_pack_TCHAR(void) -{ - /* TCHAR */ - TEST_TYPE_SIZE (TCHAR, 1) - TEST_TYPE_ALIGN (TCHAR, 1) -} - static void test_pack_TOKEN_DEFAULT_DACL(void) { /* TOKEN_DEFAULT_DACL */ @@ -6929,7 +6887,6 @@ static void test_pack(void) test_pack_PCCH(); test_pack_PCH(); test_pack_PCSTR(); - test_pack_PCTSTR(); test_pack_PCWCH(); test_pack_PCWSTR(); test_pack_PEXCEPTION_POINTERS(); @@ -7016,7 +6973,6 @@ static void test_pack(void) test_pack_PTOKEN_GROUPS(); test_pack_PTOKEN_PRIVILEGES(); test_pack_PTOKEN_USER(); - test_pack_PTSTR(); test_pack_PULARGE_INTEGER(); test_pack_PVECTORED_EXCEPTION_HANDLER(); test_pack_PVOID(); @@ -7046,7 +7002,6 @@ static void test_pack(void) test_pack_SSIZE_T(); test_pack_SYSTEM_ALARM_ACE(); test_pack_SYSTEM_AUDIT_ACE(); - test_pack_TCHAR(); test_pack_TOKEN_DEFAULT_DACL(); test_pack_TOKEN_GROUPS(); test_pack_TOKEN_OWNER(); diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat index 08474ee..a0ed45d 100644 --- a/tools/winapi/tests.dat +++ b/tools/winapi/tests.dat @@ -759,7 +759,6 @@ PCCH PCH !PCONTEXT # Architecture dependent PCSTR -PCTSTR PCWCH PCWSTR !PEXCEPTION_HANDLER # Wine-only type @@ -852,7 +851,6 @@ PTOKEN_GROUPS PTOKEN_PRIVILEGES PTOKEN_USER PTOP_LEVEL_EXCEPTION_FILTER -PTSTR PULARGE_INTEGER PVECTORED_EXCEPTION_HANDLER PVOID @@ -883,7 +881,6 @@ SSIZE_T !STACK_FRAME_HEADER # Architecture dependent SYSTEM_ALARM_ACE SYSTEM_AUDIT_ACE -TCHAR TOKEN_DEFAULT_DACL TOKEN_GROUPS TOKEN_OWNER

1 0