March 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : widl: Enable [hidden] attribute for enums.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 7ec8670985eb49e128b8c0d8be27b143b1c702fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ec8670985eb49e128b8c0d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 23 18:10:17 2020 +0300 widl: Enable [hidden] attribute for enums. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8eb756c6993e8931059ac51bff668fb6a546123e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 92b4f8ebd5a..f49172bbd8f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2115,7 +2115,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_HELPSTRING */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstring" }, /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 1, "helpstringcontext" }, /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, - /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0, 1, "hidden" }, + /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, "hidden" }, /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, "id" }, /* ATTR_IDEMPOTENT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, /* ATTR_IGNORE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "ignore" },

1 0

Robert Wilhelm : vbscript: Parse decimal literals between -1 and 1 without 0 in front.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: e1460b2794d8e34a42c06e5077eaeb59b4aa838a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1460b2794d8e34a42c06e50… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Sep 15 13:33:38 2020 +0200 vbscript: Parse decimal literals between -1 and 1 without 0 in front. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49820 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a31023a67812714f503250dc25abbc086439790a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/lex.c | 11 +++++++++-- dlls/vbscript/tests/lang.vbs | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 444774b4341..2fee702ac8f 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -390,11 +390,18 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) /* * We need to distinguish between '.' used as part of a member expression and * a beginning of a dot expression (a member expression accessing with statement - * expression). + * expression) and a floating point number like ".2" . */ c = ctx->ptr > ctx->code ? ctx->ptr[-1] : '\n'; + if (is_identifier_char(c) || c == ')') { + ctx->ptr++; + return '.'; + } + c = ctx->ptr[1]; + if('0' <= c && c <= '9') + return parse_numeric_literal(ctx, lval); ctx->ptr++; - return is_identifier_char(c) || c == ')' ? '.' : tDOT; + return tDOT; case '-': if(ctx->is_html && ctx->ptr[1] == '-' && ctx->ptr[2] == '>') return comment_line(ctx); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 570b5befeaa..95988a4e1d9 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -47,6 +47,8 @@ Call ok(56.789e-2 = 0.56789, "56.789e-2 <> 0.56789") Call ok(1e-94938484 = 0, "1e-... <> 0") Call ok(34e0 = 34, "34e0 <> 34") Call ok(34E1 = 340, "34E0 <> 340") +Call ok(.5 = 0.5, ".5 <> 0.5") +Call ok(.5e1 = 5, ".5e1 <> 5") Call ok(--1 = 1, "--1 = " & --1) Call ok(-empty = 0, "-empty = " & (-empty)) Call ok(true = -1, "! true = -1") @@ -81,6 +83,7 @@ Call ok(getVT(null) = "VT_NULL", "getVT(null) is not VT_NULL") Call ok(getVT(0) = "VT_I2", "getVT(0) is not VT_I2") Call ok(getVT(1) = "VT_I2", "getVT(1) is not VT_I2") Call ok(getVT(0.5) = "VT_R8", "getVT(0.5) is not VT_R8") +Call ok(getVT(.5) = "VT_R8", "getVT(.5) is not VT_R8") Call ok(getVT(0.0) = "VT_R8", "getVT(0.0) is not VT_R8") Call ok(getVT(2147483647) = "VT_I4", "getVT(2147483647) is not VT_I4") Call ok(getVT(2147483648) = "VT_R8", "getVT(2147483648) is not VT_R8")

1 0

Myah Caron : dmstyle: Return S_FALSE for IDirectMusicStyle8::GetMotif.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 63d6994040dba6c14504e51c1dc42ce50153b9a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63d6994040dba6c14504e51c… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Thu Sep 17 09:04:02 2020 +0000 dmstyle: Return S_FALSE for IDirectMusicStyle8::GetMotif. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49850 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d28c7938c704fe4dcfc8920db494a7175a46fe6b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmstyle/style.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 5a97dac079a..6eaedb1fbdc 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -201,8 +201,8 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_GetMotif(IDirectMusicStyle8 *iface, IDirectMusicSegment **ppSegment) { IDirectMusicStyle8Impl *This = impl_from_IDirectMusicStyle8(iface); - FIXME("(%p, %p, %p): stub\n", This, pwszName, ppSegment); - return S_OK; + FIXME("(%p, %s, %p): stub\n", This, debugstr_w(pwszName), ppSegment); + return S_FALSE; } static HRESULT WINAPI IDirectMusicStyle8Impl_GetDefaultChordMap(IDirectMusicStyle8 *iface,

1 0

Arkadiusz Hiler : gdi32: Limit GetGlyphOutlineW(uChar) to a WORD.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 593561edfddda914a8997b8a42ee6ee278a4b481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=593561edfddda914a8997b8a… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Sep 28 12:16:49 2020 +0300 gdi32: Limit GetGlyphOutlineW(uChar) to a WORD. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45400 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 45aee6375d0f2dcfe7bd47b5d0e4866916a345db) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/font.c | 2 ++ dlls/gdi32/tests/font.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d451f30c3ee..72d08ff0c35 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2905,6 +2905,8 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat, dc = get_dc_ptr(hdc); if(!dc) return GDI_ERROR; + uChar &= 0xffff; + dev = GET_DC_PHYSDEV( dc, pGetGlyphOutline ); ret = dev->funcs->pGetGlyphOutline( dev, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ea1bb960df6..47eed850a5b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5842,6 +5842,57 @@ todo_wine ReleaseDC(NULL, hdc); } +static void test_GetGlyphOutline_character(void) +{ + HFONT hfont, hfont_old; + LOGFONTA lf; + HDC hdc; + DWORD ret; + GLYPHMETRICS gm1, gm2, gmn; + char test_chars[] = { 'A', 'D', '!', '\0' }; + char *current_char; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "wine_test"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_old = SelectObject(hdc, hfont); + ok(hfont_old != NULL, "SelectObject failed\n"); + + ret = GetGlyphOutlineW(hdc, 'Z', GGO_METRICS, &gmn, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed to default to .notdef for character 'Z'\n"); + + for (current_char = test_chars; *current_char != '\0'; current_char++) + { + ret = GetGlyphOutlineW(hdc, *current_char, GGO_METRICS, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for '%c'\n", *current_char); + ok(memcmp(&gm1, &gmn, sizeof(gmn)) != 0, "the test character '%c' matches .notdef\n", *current_char); + + ret = GetGlyphOutlineW(hdc, 0x10000 + *current_char, GGO_METRICS, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for 0x10000 + '%c'\n", *current_char); + ok(memcmp(&gm1, &gm2, sizeof(gmn)) == 0, "GetGlyphOutlineW returned wrong metrics for character 0x10000 + '%c'\n", *current_char); + } + + ret = GetGlyphOutlineW(hdc, 0x3, GGO_METRICS|GGO_GLYPH_INDEX, &gm1, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW failed for glyph index 0x3\n"); + + ret = GetGlyphOutlineW(hdc, 0xFFFF, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); + ok(ret == GDI_ERROR, "GetGlyphOutlineW for nonexistent glyph index 0xFFFF has succeded\n"); + + ret = GetGlyphOutlineW(hdc, 0x10003, GGO_METRICS|GGO_GLYPH_INDEX, &gm2, 0, NULL, &mat); + ok(ret != GDI_ERROR, "GetGlyphOutlineW for index 0x10003 has failed\n"); + ok(memcmp(&gm1, &gm2, sizeof(gmn)) == 0, "GetGlyphOutlineW returned wrong metrics for glyph 0x10003\n"); + + SelectObject(hdc, hfont_old); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_fstype_fixup(void) { HDC hdc; @@ -5964,6 +6015,7 @@ static void test_CreateScalableFontResource(void) test_GetGlyphOutline_empty_contour(); test_GetGlyphOutline_metric_clipping(); + test_GetGlyphOutline_character(); test_fstype_fixup(); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0);

1 0

Robert Wilhelm : vbscript: Fix handling zero and negative number arguments in err.raise.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 11512f094016f6ed6361e4eb87cfb3c57a8a27c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11512f094016f6ed6361e4eb… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Sep 25 16:46:21 2020 +0200 vbscript: Fix handling zero and negative number arguments in err.raise. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49172 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7d48c52816e170eb44dcb64a236345aaf9cad7fd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/global.c | 2 +- dlls/vbscript/tests/api.vbs | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 17d3639a105..2452b6e6351 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -3090,7 +3090,7 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA hres = to_int(args, &code); if(FAILED(hres)) return hres; - if(code > 0 && code > 0xffff) + if(code == 0 || code > 0xffff) return E_INVALIDARG; if(args_cnt >= 2) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 413c9a8b9b6..a0948aefe9f 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1693,13 +1693,29 @@ end sub sub testErrRaise() on error resume next call ok(err.number = 0, "err.number = " & err.number) + err.raise 0 + call ok(err.number = 5, "err.number = " & err.number) err.raise 1 call ok(err.number = 1, "err.number = " & err.number) err.raise call ok(err.number = 450, "err.number = " & err.number) call testErrNumber(450) + err.raise &h8000 + call ok(err.number = -32768, "err.number = " & err.number) + err.raise &hffff + call ok(err.number = -1, "err.number = " & err.number) err.raise &h10000& call ok(err.number = 5, "err.number = " & err.number) + err.raise -3000000000 + call ok(err.number = 6, "err.number = " & err.number) + err.raise -1 + call ok(err.number = -1, "err.number = " & err.number) + err.raise -20 + call ok(err.number = -20, "err.number = " & err.number) + err.raise -&hfff0 + call ok(err.number = 16, "err.number = " & err.number) + err.raise -&h8000 + call ok(err.number = 32768, "err.number = " & err.number) err.clear call ok(getVT(err.source) = "VT_BSTR", "err.source = " & err.source)

1 0

Robert Wilhelm : vbscript: Fix vanishing statements.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 25491ebd2ac2fc5f0f1eff5f7211c8c493e23c7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=25491ebd2ac2fc5f0f1eff5f… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Tue Sep 22 22:14:29 2020 +0200 vbscript: Fix vanishing statements. When adding multiple statements (e.g. colon separated SimpleStatements) in function source_add_statement(), tail of linked list was not adjusted. Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe59d1a5d35f4d0d9e2a262c25cbfefb91cdad3c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/parser.y | 5 +++++ dlls/vbscript/tests/lang.vbs | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 9a395f94961..9507e97e8ca 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -511,12 +511,17 @@ static void source_add_statement(parser_ctx_t *ctx, statement_t *stat) if(!stat) return; + /* concatenate both linked lists */ if(ctx->stats) { ctx->stats_tail->next = stat; ctx->stats_tail = stat; }else { ctx->stats = ctx->stats_tail = stat; } + /* find new tail */ + while(ctx->stats_tail->next) { + ctx->stats_tail=ctx->stats_tail->next; + } } static void source_add_class(parser_ctx_t *ctx, class_decl_t *class_decl) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 95988a4e1d9..14761cf5a52 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -62,6 +62,9 @@ Call ok(W = 5, "W = " & W & " expected " & 5) x = "xx" Call ok(x = "xx", "x = " & x & " expected ""xx""") +Dim public1 : public1 = 42 +Call ok(public1 = 42, "public1=" & public1 & " expected & " & 42) + Call ok(true <> false, "true <> false is false") Call ok(not (true <> true), "true <> true is true") Call ok(not ("x" <> "x"), """x"" <> ""x"" is true")

1 0

Christian Costa : d3dx9: Ignore vertices reordering for D3DXMESHOPT_ATTRSORT in OptimizeInPlace().
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: fc03e947f7958b4b7c7493adf2fc0980dea329b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc03e947f7958b4b7c7493ad… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Sep 29 10:29:39 2020 +0200 d3dx9: Ignore vertices reordering for D3DXMESHOPT_ATTRSORT in OptimizeInPlace(). Not reordering vertices shouldn't have effects aside from performance. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48529 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 1dcc3ab292151cd91ea4202b92107c3a91527c7a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 5e0bb98efc7..55493ad0a1c 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1689,11 +1689,7 @@ static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, if (FAILED(hr)) goto cleanup; } else if (flags & D3DXMESHOPT_ATTRSORT) { if (!(flags & D3DXMESHOPT_IGNOREVERTS)) - { FIXME("D3DXMESHOPT_ATTRSORT vertex reordering not implemented.\n"); - hr = E_NOTIMPL; - goto cleanup; - } hr = iface->lpVtbl->LockAttributeBuffer(iface, 0, &attrib_buffer); if (FAILED(hr)) goto cleanup;

1 0

Michael Müller : fsutil: Print out usage message.
by Alexandre Julliard 23 Mar '21

23 Mar '21

1 0

Michael Müller : fsutil: Add support for creating hardlinks.
by Alexandre Julliard 23 Mar '21

23 Mar '21

1 0

Arkadiusz Hiler : msvcirt: Implement most of ifstream.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: oldstable Commit: 2fcb70a75f70bb68a13dc843fe487052b7dafc26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fcb70a75f70bb68a13dc843… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Sep 2 19:56:33 2020 +0300 msvcirt: Implement most of ifstream. Based on semi-stubs by Gijs Vermeulen. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22616 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30014 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a0faee89e01fe4daf7a25ebc4240cda4fe34da59) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 185 +++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 68 ++++++------ dlls/msvcirt/tests/msvcirt.c | 251 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 68 ++++++------ dlls/msvcrt40/msvcrt40.spec | 68 ++++++------ 5 files changed, 538 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2fcb70a75f70bb68a13d…

1 0