December 2020 - Wine-Devel - list.winehq.org

[PATCH] po: Update Japanese translation.

by Akihiro Sagawa

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

Dec. 21, 2020

Re: [PATCH v2 2/4] gdi32: Avoid best fit chars when mapping unicode character to a glyph index.

by Huw Davies

On Mon, Dec 21, 2020 at 03:21:10PM +0300, Dmitry Timoshkov wrote: > > I suspect this should wait until after 6.0. > > I'm OK with deferring 2/4 and 3/4, however I hope that 1/4 (tests) and 4/4 > (MS Sans Serif default glyph index) could be accepted, 4/4 doesn't depend > on previous patches in the series. Sounds good. I've sent in a v3 of 1/4 as v2 has conflicts with a recent change. I've also signed off 4/4. Huw.

Dec. 21, 2020

Re: [PATCH v2 4/4] fonts: Correct default glyph index for MS Sans Serif font to match Windows.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Dec. 21, 2020

[PATCH v3] gdi32/tests: Add some tests to show that GetGlyphIndices() should avoid best fit chars.

by Huw Davies

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 41 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ad7408f5620..da5fdf2238e 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1632,6 +1632,7 @@ static void test_GetGlyphIndices(void) LOGFONTA lf; DWORD flags = 0; WCHAR testtext[] = L"Test\xffff"; + WCHAR c[] = { 0x25bc /* Black Down-Pointing Triangle */, 0x212a /* Kelvin Sign */ }; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; @@ -1653,8 +1654,9 @@ static void test_GetGlyphIndices(void) lf.lfCharSet = ANSI_CHARSET; hfont = CreateFontIndirectA(&lf); - ok(hfont != 0, "CreateFontIndirectEx failed\n"); - ok(GetTextMetricsA(hdc, &textm), "GetTextMetric failed\n"); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); if (textm.tmCharSet == ANSI_CHARSET) { flags |= GGI_MARK_NONEXISTING_GLYPHS; @@ -1664,16 +1666,44 @@ static void test_GetGlyphIndices(void) flags = 0; charcount = pGetGlyphIndicesW(hdc, testtext, (sizeof(testtext)/2)-1, glyphs, flags); ok(charcount == 5, "GetGlyphIndicesW count of glyphs should = 5 not %d\n", charcount); - ok(glyphs[4] == textm.tmDefaultChar, "GetGlyphIndicesW should have returned a %04x not %04x\n", - textm.tmDefaultChar, glyphs[4]); + ok(glyphs[4] == textm.tmDefaultChar || glyphs[4] == 0x20 /* CJK Windows */, + "GetGlyphIndicesW should have returned a %04x not %04x\n", textm.tmDefaultChar, glyphs[4]); } else /* FIXME: Write tests for non-ANSI charsets. */ skip("GetGlyphIndices System font tests only for ANSI_CHARSET\n"); + DeleteObject(SelectObject(hdc, hOldFont)); + + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "MS Sans Serif"); + lf.lfHeight = -13; + lf.lfCharSet = DEFAULT_CHARSET; + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirect failed\n"); + hOldFont = SelectObject(hdc, hfont); + ok(GetTextMetricsA(hdc, &textm), "GetTextMetrics failed\n"); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, GGI_MARK_NONEXISTING_GLYPHS); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == 0x001f || glyphs[0] == 0xffff /* Vista */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == 0x001f || glyphs[1] == 0xffff /* Vista */, "got %#x\n", glyphs[1]); + + glyphs[0] = glyphs[1] = 0; + charcount = GetGlyphIndicesW(hdc, c, ARRAY_SIZE(c), glyphs, 0); + ok(charcount == ARRAY_SIZE(c), "got %u\n", charcount); + ok(glyphs[0] == textm.tmDefaultChar || glyphs[0] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[0]); +todo_wine + ok(glyphs[1] == textm.tmDefaultChar || glyphs[1] == 0x20 /* CJK Windows */, "got %#x\n", glyphs[1]); + + DeleteObject(SelectObject(hdc, hOldFont)); + if(!is_font_installed("Tahoma")) { skip("Tahoma is not installed so skipping this test\n"); + ReleaseDC(0, hdc); return; } memset(&lf, 0, sizeof(lf)); @@ -1718,12 +1748,13 @@ static void test_GetGlyphIndices(void) ok(glyphs[4] == 0, "GetGlyphIndicesW should have returned 0 not %04x\n", glyphs[4]); DeleteObject(SelectObject(hdc, hOldFont)); + ReleaseDC(0, hdc); + ret = pRemoveFontMemResourceEx(rsrc); ok(ret, "RemoveFontMemResourceEx error %d\n", GetLastError()); free_font(font); ret = DeleteFileA(ttf_name); ok(ret, "Failed to delete font file, %d.\n", GetLastError()); - } static void test_GetKerningPairs(void) -- 2.23.0

Dec. 21, 2020

Re: [PATCH v2 2/4] gdi32: Avoid best fit chars when mapping unicode character to a glyph index.

by Dmitry Timoshkov

Hi Huw, thanks for the review. Huw Davies <huw(a)codeweavers.com> wrote: > > --- a/dlls/gdi32/font.c > > +++ b/dlls/gdi32/font.c > > @@ -3223,7 +3223,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun > > if (str[i] >= 0xf020 && str[i] <= 0xf100) glyph = str[i] - 0xf000; > > else if (str[i] < 0x100) glyph = str[i]; > > } > > - else if (WideCharToMultiByte( physdev->font->codepage, 0, &str[i], 1, > > + else if (WideCharToMultiByte( physdev->font->codepage, WC_NO_BEST_FIT_CHARS, &str[i], 1, > > &ch, 1, NULL, &used ) && !used) > > glyph = (unsigned char)ch; > > } > > Hi Dmitry, > > I suspect this should wait until after 6.0. I'm OK with deferring 2/4 and 3/4, however I hope that 1/4 (tests) and 4/4 (MS Sans Serif default glyph index) could be accepted, 4/4 doesn't depend on previous patches in the series. > What app does this fix? The application that the patches fix is not publicly available. -- Dmitry.

Dec. 21, 2020

Re: [PATCH] include: Check whether the ms_abi attribute is supported on aarch64

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>

Dec. 21, 2020

Re: [PATCH] include: Check whether the ms_abi attribute is supported on aarch64

by Jacek Caban

On 21.12.2020 06:26, Chip Davis wrote: > December 20, 2020 4:39 PM, "Martin Storsjo" <martin(a)martin.st> wrote: > >> diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h >> index 4d11f68be0d..a66f43877ac 100644 >> --- a/include/msvcrt/corecrt.h >> +++ b/include/msvcrt/corecrt.h >> @@ -81,7 +81,7 @@ >> # endif >> # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) >> # define __stdcall __attribute__((pcs("aapcs-vfp"))) >> -# elif defined(__aarch64__) && defined (__GNUC__) >> +# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) > Are you sure that every version of GCC that supports __attribute__((ms_abi)) on AArch64 also supports __has_attribute()? No GCC version currently supports ms_abi on aarch64, while recent GCC supports __has_attribute, so it should be fine. Jacek

Dec. 21, 2020

Re: [PATCH] winspool/tests: Use wide-char string literals.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Dec. 21, 2020

Re: [PATCH v2 2/4] gdi32: Avoid best fit chars when mapping unicode character to a glyph index.

by Huw Davies

On Tue, Dec 15, 2020 at 03:04:46PM +0300, Dmitry Timoshkov wrote: > This part fixes GetGlyphIndices. > > Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> > --- > dlls/gdi32/font.c | 2 +- > dlls/gdi32/tests/font.c | 2 -- > 2 files changed, 1 insertion(+), 3 deletions(-) > > diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c > index 00bbeb0a11..9380d3efbe 100644 > --- a/dlls/gdi32/font.c > +++ b/dlls/gdi32/font.c > @@ -3223,7 +3223,7 @@ static DWORD CDECL font_GetGlyphIndices( PHYSDEV dev, const WCHAR *str, INT coun > if (str[i] >= 0xf020 && str[i] <= 0xf100) glyph = str[i] - 0xf000; > else if (str[i] < 0x100) glyph = str[i]; > } > - else if (WideCharToMultiByte( physdev->font->codepage, 0, &str[i], 1, > + else if (WideCharToMultiByte( physdev->font->codepage, WC_NO_BEST_FIT_CHARS, &str[i], 1, > &ch, 1, NULL, &used ) && !used) > glyph = (unsigned char)ch; > } Hi Dmitry, I suspect this should wait until after 6.0. What app does this fix? Huw.

Dec. 21, 2020

Re: [PATCH 2/2] gdi32/tests: Fix test failures on Win10 1909+.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Dec. 21, 2020

Re: [PATCH 1/2] gdi32/tests: Fix possible test failures in test_clip_box().

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Dec. 21, 2020

Re: [PATCH v4 2/2] wbemprox/tests: Add some tests for SystemRestore class.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Dec. 21, 2020

Re: [PATCH v4 1/2] wbemprox/tests: Run StdRegProv tests using ROOT\\DEFAULT connection point.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Dec. 21, 2020

[PATCH] include: Add ExecuteOptionEnum typedef

by Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/msado15_backcompat.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e5d0f5ecfe9..fedaf557066 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -513,6 +513,17 @@ typedef [uuid(00000531-0000-0010-8000-00aa006d2ea4)] enum EventReasonEnum adRsnMoveLast = 15 } EventReasonEnum; +typedef [uuid(0000051e-0000-0010-8000-00aa006d2ea4)] enum ExecuteOptionEnum +{ + adOptionUnspecified = -1, + adAsyncExecute = 16, + adAsyncFetch = 32, + adAsyncFetchNonBlocking = 64, + adExecuteNoRecords = 128, + adExecuteStream = 1024, + [hidden] adExecuteRecord = 2048 +} ExecuteOptionEnum; + typedef [uuid(00000541-0000-0010-8000-00aa006d2ea4)] enum ConnectOptionEnum { adConnectUnspecified = -1, -- 2.29.2

Dec. 21, 2020

[PATCH] include: Add DB_LRESERVE type

by Alistair Leslie-Hughes

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/oledb.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/oledb.idl b/include/oledb.idl index 5609e219320..4e333353a5e 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -40,6 +40,7 @@ typedef ULONG_PTR DBREFCOUNT; typedef ULONG_PTR DB_UPARAMS; typedef LONG_PTR DB_LPARAMS; typedef DWORD_PTR DBHASHVALUE; +typedef LONG_PTR DB_LRESERVE; #include "dbs.idl" -- 2.29.2

Dec. 21, 2020

Re: [PATCH vkd3d v3 4/4] vkd3d-shader: Implement #elif.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Dec. 21, 2020

Re: [PATCH vkd3d v3 3/4] vkd3d-shader: Implement #else.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Dec. 21, 2020

Re: [PATCH vkd3d v3 2/4] vkd3d-shader: Implement basic support for #if and #endif.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- Apparently I never got the email so I'm adding a couple of comments right here... preproc_was_writing() manages to trigger my review alarms every time. The function is definitely correct though, and clearly so after patch 4/4. So nothing to do but ignore the alarm. +static uint32_t preproc_parse_integer(const char *s) +{ + uint32_t base = 10, ret = 0; + int digit; + + if (s[0] == '0') + { + base = 8; I'd "++s;" here + if (s[1] == 'x' || s[1] == 'X') + { + base = 16; + s += 2; And then replace this one with another "++s;" (fixing up the if condition above to now check *s). + } + } + + while ((digit = char_to_int(*s++)) >= 0) + ret = ret * base + (uint32_t)digit; + return ret; +} AFAICS this should still work. It's all just a nitpick, it doesn't really matter.

Dec. 21, 2020

Re: [PATCH vkd3d v3 1/4] vkd3d-shader: Handle preprocessor parsing errors.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

Dec. 21, 2020

Re: [PATCH] comctl32: Avoid incorrect data read by user callback function during sorting.

by Nikolay Sivov

Hi, Thanks for the patch. Could you please explain what does it fix? Preferably with some sample code to trigger the issue.

Dec. 21, 2020

[PATCH] comctl32: Avoid incorrect data read by user callback function during sorting.

by Jiangyi Chen

Dec. 21, 2020

Re: [PATCH] include: Check whether the ms_abi attribute is supported on aarch64

by Chip Davis

December 20, 2020 4:39 PM, "Martin Storsjo" <martin(a)martin.st> wrote: > diff --git a/include/msvcrt/corecrt.h b/include/msvcrt/corecrt.h > index 4d11f68be0d..a66f43877ac 100644 > --- a/include/msvcrt/corecrt.h > +++ b/include/msvcrt/corecrt.h > @@ -81,7 +81,7 @@ > # endif > # elif defined(__arm__) && defined (__GNUC__) && !defined(__SOFTFP__) > # define __stdcall __attribute__((pcs("aapcs-vfp"))) > -# elif defined(__aarch64__) && defined (__GNUC__) > +# elif defined(__aarch64__) && defined (__GNUC__) && __has_attribute(ms_abi) Are you sure that every version of GCC that supports __attribute__((ms_abi)) on AArch64 also supports __has_attribute()? Chip

Dec. 21, 2020

Re: Looking for TestBot help

by Zhiyi Zhang

On 12/17/20 5:28 PM, Francois Gouget wrote: > In these freezing times I'm looking for volunteers to help with three > TestBot related tasks: > > * Modify WineTest to detect which tests can be run by running > 'xxx_test --list' and automatically detecting and dismissing the > "Missing dll" / "Missing entrypoint" dialogs. > > This would fix a lot of issues with tests not being run when they > should: > - Detect and report WineTest's "load errors" > https://bugs.winehq.org/show_bug.cgi?id=48062 > - Detect missing entry point errors > https://bugs.winehq.org/show_bug.cgi?id=48208 > > * Alternatively the same type of change is needed for the TestBot's > TestLauncher where it would replace AllImportedDllsPresent(): > https://source.winehq.org/git/tools.git/blob/HEAD:/testbot/src/TestLauncher… > > There too it will help with a lot of issues: > - TestLauncher says a required DLL is missing, but the test runs fine > without TestLauncher > https://bugs.winehq.org/show_bug.cgi?id=31609 > > But I expect that once this is done on one side it will be easy to > port to the other. So the choice of codebase is yours. > > > * Write or find a Windows tool to automatically take a screenshot every > few seconds and deduplicate identical screenshots. The requirements > are: I can help out with this one. I had been debugging some screenshot problems on Wine and already have a few code snippets to do screenshots and save them. For this tool, I'm thinking doing it generally the following way: 1. Capture the whole virtual screen and save it in a png in memory. 2. Compare the png in 1, if it's not equal to the previous screenshot, save it to disk in a folder. And this tool can run on Windows and Wine with your requirements met. I wonder if it would be better if we do video capture instead? If we don't plan on keeping the video forever, I think a 2 mins video shouldn't be too large. A few megabytes I think, depending on the video format. Zhiyi > - Open-source of course. > - No dependency (so if using an off-the-shelf tool it should not > require installing some language runtime, etc). > - Must support multi-screen configurations, even with slightly > different resolutions. > - Will eventually need to be used by the TestBot through TestAgentd, > either by running this external tool, or be integrated in TestAgentd > itself. > > The same functionality will be needed on Unix. If that's not possible > with a Windows tool this may turn into a separate project to do the > same on the Unix side. There I expect some scriptable open-source > tools to already exist but if one tool can do it all that would be > simpler. > > - Take live/regular screenshots > https://bugs.winehq.org/show_bug.cgi?id=44709 > > > In the meantime I'll continue refreshing the test VMs, and working on > the website and Engine perl side of things (but if there are volunteers > for that you're welcome too). > >

Dec. 21, 2020

[PATCH] winex11: Allow user to set WM_CLASS

by Nicholas Little

This commit allows the user to optionally set the WM_CLASS by setting an environment variable WINEWMCLASS with the aim of allowing him to ensure desktop environments can correctly identify wine windows, unfortunately the executable filename isn't always sufficient as some programs share a common executable name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50095 --- dlls/winex11.drv/window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 457173964eb..6b87166c830 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -837,6 +837,7 @@ static void set_initial_wm_hints( Display *display, Window window ) Atom protocols[3]; Atom dndVersion = WINE_XDND_VERSION; XClassHint *class_hints; + char *wine_wm_class; /* wm protocols */ i = 0; @@ -849,8 +850,9 @@ static void set_initial_wm_hints( Display *display, Window window ) /* class hints */ if ((class_hints = XAllocClassHint())) { + wine_wm_class = getenv( "WINEWMCLASS" ); class_hints->res_name = process_name; - class_hints->res_class = process_name; + class_hints->res_class = wine_wm_class ? wine_wm_class : process_name; XSetClassHint( display, window, class_hints ); XFree( class_hints ); } -- 2.26.2

Dec. 21, 2020

Re: Looking for TestBot help

by Zebediah Figura (she/her)

On 12/17/20 3:28 AM, Francois Gouget wrote: > > In these freezing times I'm looking for volunteers to help with three > TestBot related tasks: > > * Modify WineTest to detect which tests can be run by running > 'xxx_test --list' and automatically detecting and dismissing the > "Missing dll" / "Missing entrypoint" dialogs. Are we sure we want to do it this way? It seems potentially quite fragile... > > This would fix a lot of issues with tests not being run when they > should: > - Detect and report WineTest's "load errors" > https://bugs.winehq.org/show_bug.cgi?id=48062 > - Detect missing entry point errors > https://bugs.winehq.org/show_bug.cgi?id=48208 > > * Alternatively the same type of change is needed for the TestBot's > TestLauncher where it would replace AllImportedDllsPresent(): > https://source.winehq.org/git/tools.git/blob/HEAD:/testbot/src/TestLauncher… > > There too it will help with a lot of issues: > - TestLauncher says a required DLL is missing, but the test runs fine > without TestLauncher > https://bugs.winehq.org/show_bug.cgi?id=31609 > > But I expect that once this is done on one side it will be easy to > port to the other. So the choice of codebase is yours. > > > * Write or find a Windows tool to automatically take a screenshot every > few seconds and deduplicate identical screenshots. The requirements > are: > - Open-source of course. > - No dependency (so if using an off-the-shelf tool it should not > require installing some language runtime, etc). > - Must support multi-screen configurations, even with slightly > different resolutions. > - Will eventually need to be used by the TestBot through TestAgentd, > either by running this external tool, or be integrated in TestAgentd > itself. > > The same functionality will be needed on Unix. If that's not possible > with a Windows tool this may turn into a separate project to do the > same on the Unix side. There I expect some scriptable open-source > tools to already exist but if one tool can do it all that would be > simpler. > > - Take live/regular screenshots > https://bugs.winehq.org/show_bug.cgi?id=44709 > > > In the meantime I'll continue refreshing the test VMs, and working on > the website and Engine perl side of things (but if there are volunteers > for that you're welcome too). > >

Dec. 20, 2020