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

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

by Martin Storsjo

While wine's configure checks and requires that the ms_abi attribute is supported on aarch64 (without it, variadic functions don't have the correct ABI), these headers are also included when building widl as a generic cross compilation tool as part of mingw-w64-tools. In the case of widl, the functions that use these attributes (and in particular, their ABI) doesn't matter as they aren't used/called, they're just included as a side effect of including the headers that widl actually needs. This fixes building the widl tool for aarch64 linux with GCC, even if wine itself can't be built in that configuration. Only windef.h is used/needed by widl, but update msvcrt/corecrt.h as well to keep these definitions in sync. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- include/msvcrt/corecrt.h | 4 ++-- include/windef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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) # define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall @@ -102,7 +102,7 @@ #endif #ifndef __ms_va_list -# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) +# if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) diff --git a/include/windef.h b/include/windef.h index b8e5ed692b1..5351afe66db 100644 --- a/include/windef.h +++ b/include/windef.h @@ -74,7 +74,7 @@ extern "C" { # 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) # define __stdcall __attribute__((ms_abi)) # else /* __i386__ */ # define __stdcall @@ -103,7 +103,7 @@ extern "C" { #endif #ifndef __ms_va_list -# if (defined(__x86_64__) || defined(__aarch64__)) && defined (__GNUC__) +# if (defined(__x86_64__) || (defined(__aarch64__) && __has_attribute(ms_abi))) && defined (__GNUC__) # define __ms_va_list __builtin_ms_va_list # define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg) # define __ms_va_end(list) __builtin_ms_va_end(list) -- 2.17.1

Dec. 20, 2020

Re: [PATCH] winebuild: Pass -m options to dlltool for arm and arm64

by Jacek Caban

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

Dec. 20, 2020

Re: [PATCH] include: Fix the signature of _InterlockedCompareExchange128

by Jacek Caban

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

Dec. 20, 2020

Re: [PATCH] asm: Use SEH assembly when building with clang in MSVC mode

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> On 18.12.2020 23:37, Martin Storsjo wrote: > In MSVC mode, the __SEH__ macro isn't defined, but the .seh directives > are supported in assembly. In these cases, we have to hardcode which > architectures we know clang supports SEH directives in as it's not > exposed otherwise. > > Signed-off-by: Martin Storsjo<martin(a)martin.st> Nice. I recall having build problems with something like that, but your patch works fine now. Maybe it was only about x86. Thanks, Jacek

Dec. 20, 2020

Re: [PATCH] asm: Separate .def/.scl/.type/.endef with newlines instead of semicolons

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Note that there are more candidates for a similar fix. For example 'git grep nop\;' shows some candidates in ntdll. Thanks, Jacek

Dec. 20, 2020

[PATCH v2] kernelbase: Ignore SORT_DIGITSASNUMBERS in CompareStringEx()

by John Zourlios

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50362 Signed-off-by: John Zourlios <john.kinigos(a)gmail.com> --- dlls/kernelbase/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index c60b796aa48..51085f4377a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -3021,7 +3021,7 @@ INT WINAPI CompareStringEx( const WCHAR *locale, DWORD flags, const WCHAR *str1, { DWORD supported_flags = NORM_IGNORECASE | NORM_IGNORENONSPACE | NORM_IGNORESYMBOLS | SORT_STRINGSORT | NORM_IGNOREKANATYPE | NORM_IGNOREWIDTH | LOCALE_USE_CP_ACP; - DWORD semistub_flags = NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE | 0x10000000; + DWORD semistub_flags = NORM_LINGUISTIC_CASING | LINGUISTIC_IGNORECASE | 0x10000000 | SORT_DIGITSASNUMBERS; /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; static int once; -- 2.29.2

Dec. 19, 2020

[PATCH] include: Fix the signature of _InterlockedCompareExchange128

by Martin Storsjo

Clang 12 doesn't consider a function with an inconsistent signature as matching the intrinsic. This fixes InterlockedCompareExchange128 with clang 12 in MSVC mode. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 01402d211fe..6d76e5e49e5 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6923,7 +6923,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #if defined(_MSC_VER) #define InterlockedCompareExchange128 _InterlockedCompareExchange128 -static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); +unsigned char _InterlockedCompareExchange128(volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); #pragma intrinsic(_InterlockedCompareExchange128) #elif defined(__x86_64__) -- 2.17.1

Dec. 19, 2020

Re: [PATCH] include: Don't use the MSVC intrinsic _InterlockedCompareExchange128 on clang in MSVC mode

by Martin Storsjö

Hi Jacek, On Sat, 19 Dec 2020, Jacek Caban wrote: > Hi Martin, > > On 18.12.2020 23:35, Martin Storsjo wrote: >> This fixes building in PE mode with Clang in MSVC mode for both x86_64 >> and aarch64. > > > I'd expect x86_64 to be fixed by [1], we could do the same for aarch64. Ah, I see - that explains it. Yeah I was a bit surprised to see that it didn't work as expected, as I presumed that you had tested building in MSVC mode. The actual issue here seems to be that the signature of the intrinsic _InterlockedCompareExchange128 is slightly wrong. Clang 11 and older (and MSVC itself) doesn't mind, but I was testing with a fresh trunk version of clang, where it needs to match better. See https://godbolt.org/z/TWbMs8 for an example of the difference. FWIW, I bisected the change in behaviour down to https://reviews.llvm.org/D77491. In that case, the fix is simply to correct the signature of the declaration - sending a new patch for that instead. // Martin

Dec. 19, 2020

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

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winspool.drv/tests/info.c | 46 ++++++++++++++-------------------- 1 file changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 53aa67ba036..56d73798538 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -56,16 +56,6 @@ static CHAR version_dll[] = "version.dll"; static CHAR winetest[] = "winetest"; static CHAR xcv_localport[] = ",XcvMonitor Local Port"; -static const WCHAR cmd_MonitorUIW[] = {'M','o','n','i','t','o','r','U','I',0}; -static const WCHAR cmd_PortIsValidW[] = {'P','o','r','t','I','s','V','a','l','i','d',0}; -static WCHAR emptyW[] = {0}; - -static WCHAR portname_com1W[] = {'C','O','M','1',':',0}; -static WCHAR portname_com2W[] = {'C','O','M','2',':',0}; -static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; -static WCHAR portname_lpt1W[] = {'L','P','T','1',':',0}; -static WCHAR portname_lpt2W[] = {'L','P','T','2',':',0}; - static HANDLE hwinspool; static BOOL (WINAPI * pAddPortExA)(LPSTR, DWORD, LPBYTE, LPSTR); static BOOL (WINAPI * pEnumPrinterDriversW)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD); @@ -2088,7 +2078,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, NULL, 0, &needed, &status); ok( res && (status == ERROR_INSUFFICIENT_BUFFER) && (needed <= MAX_PATH), "returned %d with %u and %u for status %u (expected '!= 0' and " "'<= MAX_PATH' for status ERROR_INSUFFICIENT_BUFFER)\n", @@ -2105,7 +2095,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, emptyW, NULL, 0, NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"", NULL, 0, NULL, 0, &needed, &status); ok( res && (status == ERROR_INVALID_PARAMETER), "returned %d with %u and %u for status %u (expected '!= 0' with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); @@ -2122,7 +2112,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, NULL, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len, NULL, &status); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "returned %d with %u and %u for status %u (expected '0' with " "ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); @@ -2130,7 +2120,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, NULL, len, &needed, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, NULL, len, &needed, &status); ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER), "returned %d with %u and %u for status %u (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", res, GetLastError(), needed, status); @@ -2138,7 +2128,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, &needed, NULL); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len, &needed, NULL); ok( !res && (GetLastError() == RPC_X_NULL_REF_POINTER), "returned %d with %u and %u for status %u (expected '0' with " "RPC_X_NULL_REF_POINTER)\n", res, GetLastError(), needed, status); @@ -2147,7 +2137,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len+1, &needed, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len+1, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for status " "ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2157,7 +2147,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len-1, &needed, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len-1, &needed, &status); ok( res && (status == ERROR_INSUFFICIENT_BUFFER), "returned %d with %u and %u for status %u (expected '!= 0' for status " "ERROR_INSUFFICIENT_BUFFER)\n", res, GetLastError(), needed, status); @@ -2168,7 +2158,7 @@ static void test_XcvDataW_MonitorUI(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_MonitorUIW, NULL, 0, buffer, len, &needed, &status); + res = pXcvDataW(hXcv, L"MonitorUI", NULL, 0, buffer, len, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for status " "ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2207,7 +2197,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, NULL, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"LPT1:", sizeof(L"LPT1:"), NULL, 0, NULL, &status); ok( !res && (GetLastError() == ERROR_INVALID_PARAMETER), "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_INVALID_PARAMETER)\n", res, GetLastError(), needed, status); @@ -2216,7 +2206,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) emptyW, sizeof(emptyW), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"", sizeof(L""), NULL, 0, &needed, &status); ok( res && ((status == ERROR_FILE_NOT_FOUND) || (status == ERROR_PATH_NOT_FOUND)), "returned %d with %u and %u for status %u (expected '!= 0' for status: " "ERROR_FILE_NOT_FOUND or ERROR_PATH_NOT_FOUND)\n", @@ -2226,7 +2216,8 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) tempdirW, (lstrlenW(tempdirW) + 1) * sizeof(WCHAR), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) tempdirW, (lstrlenW(tempdirW) + 1) * sizeof(WCHAR), + NULL, 0, &needed, &status); /* XP: ERROR_PATH_NOT_FOUND, w2k ERROR_ACCESS_DENIED */ ok( res && ((status == ERROR_PATH_NOT_FOUND) || (status == ERROR_ACCESS_DENIED)), "returned %d with %u and %u for status %u (expected '!= 0' for status: " @@ -2237,7 +2228,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt1W, sizeof(portname_lpt1W), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"LPT1:", sizeof(L"LPT1:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2245,7 +2236,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_lpt2W, sizeof(portname_lpt2W), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"LPT2:", sizeof(L"LPT2:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2253,7 +2244,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_com1W, sizeof(portname_com1W), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"COM1:", sizeof(L"COM1:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2261,7 +2252,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_com2W, sizeof(portname_com2W), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"COM2:", sizeof(L"COM2:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' for ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2269,7 +2260,7 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) portname_fileW, sizeof(portname_fileW), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) L"FILE:", sizeof(L"FILE:"), NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError(), needed, status); @@ -2279,7 +2270,8 @@ static void test_XcvDataW_PortIsValid(void) needed = (DWORD) 0xdeadbeef; status = (DWORD) 0xdeadbeef; SetLastError(0xdeadbeef); - res = pXcvDataW(hXcv, cmd_PortIsValidW, (PBYTE) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), NULL, 0, &needed, &status); + res = pXcvDataW(hXcv, L"PortIsValid", (BYTE *) tempfileW, (lstrlenW(tempfileW) + 1) * sizeof(WCHAR), + NULL, 0, &needed, &status); ok( res && (status == ERROR_SUCCESS), "returned %d with %u and %u for status %u (expected '!= 0' with ERROR_SUCCESS)\n", res, GetLastError(), needed, status); -- 2.26.2

Dec. 19, 2020

Re: [PATCH] include: Don't use the MSVC intrinsic _InterlockedCompareExchange128 on clang in MSVC mode

by Jacek Caban

Hi Martin, On 18.12.2020 23:35, Martin Storsjo wrote: > This fixes building in PE mode with Clang in MSVC mode for both x86_64 > and aarch64. I'd expect x86_64 to be fixed by [1], we could do the same for aarch64. If changing header is preferable for some reason, we should reflect that in configure and maybe reorder #ifdefs to simplify it a bit. Thanks, Jacek [1] https://source.winehq.org/git/wine.git/commitdiff/dc199ae8b8b38ac088eb0bcd0…

Dec. 19, 2020

Re: [PATCH] kernel32/tests: Don't test functions directly when reporting GetLastError()

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83604 Your paranoid android. === w1064 (32 bit report) === kernel32: debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wtF1A8.tmp' debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wtF1A8.tmp debugger.c:657: Test failed: the child and debugged pids don't match: 8116 != 7972 === w1064 (testbot log) === The task timed out === w10pro64 (32 bit report) === kernel32: debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wtF765.tmp' debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wtF765.tmp debugger.c:657: Test failed: the child and debugged pids don't match: 7384 != 8012 === w10pro64 (testbot log) === The task timed out === w1064v1809 (64 bit report) === kernel32: debugger.c:1661: Test failed: unexpected instruction pointer 00007FFFB75AF844 === w1064 (64 bit report) === kernel32: debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wtEE6C.tmp' debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wtEE6C.tmp debugger.c:657: Test failed: the child and debugged pids don't match: 8156 != 7932 === w1064_2qxl (64 bit report) === kernel32: debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wt15AB.tmp' debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wt15AB.tmp debugger.c:657: Test failed: the child and debugged pids don't match: 7196 != 7160 === w10pro64 (64 bit report) === kernel32: debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wtF5A0.tmp' debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wtF5A0.tmp debugger.c:657: Test failed: the child and debugged pids don't match: 7328 != 4756 === w10pro64 (testbot log) === The task timed out === w10pro64_ar (64 bit report) === kernel32: debugger.c:1661: Test failed: unexpected instruction pointer 00007FFD44C2BEA4 === w10pro64_zh_CN (64 bit report) === kernel32: debugger.c:145: Test failed: unable to open 'C:\Users\winetest\AppData\Local\Temp\wtF263.tmp' debugger.c:145: Test failed: failed to open: C:\Users\winetest\AppData\Local\Temp\wtF263.tmp debugger.c:657: Test failed: the child and debugged pids don't match: 8172 != 8132

Dec. 19, 2020

Re: [PATCH 4/4] dxgi/tests: Don't test functions directly when reporting GetLastError()

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83603 Your paranoid android. === w1064v1507 (32 bit report) === dxgi: dxgi.c:5689: Test failed: Got unexpected message 0x31f, hwnd 000A0160, wparam 0x1, lparam 0. === w1064v1507 (64 bit report) === dxgi: dxgi.c:5990: Test failed: Test 4: Got exstyle 0x108, expected 0x100. dxgi.c:6006: Test failed: Test 4: Got exstyle 0x108, expected 0x100. dxgi.c:6035: Test failed: Test 4: Got exstyle 0x108, expected 0x100. dxgi.c:6064: Test failed: Test 4: Got exstyle 0x108, expected 0x100. dxgi.c:6081: Test failed: Test 4: Got exstyle 0x108, expected 0x100.

Dec. 19, 2020

Re: [PATCH 3/4] d3d8/tests: Don't test functions directly when reporting GetLastError()

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83602 Your paranoid android. === w8 (32 bit report) === d3d8: device.c:1727: Test failed: D3DVIEWPORT->Width = 400. device.c:1728: Test failed: D3DVIEWPORT->Height = 300.

Dec. 19, 2020

Re: [PATCH 2/4] d3d9/tests: Don't test functions directly when reporting GetLastError()

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83601 Your paranoid android. === w2008s64 (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0. === w7u_2qxl (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0. device.c:14163: Test failed: Adapter 1: Failed to get monitor info, error 0. === w7u_adm (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0. === w7u_el (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0. === w8 (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0. === w8adm (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0. === w864 (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0. === w1064v1507 (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0. === w1064v1809 (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a. === w1064 (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a. === w10pro64 (32 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a. === wvistau64 (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x583. === w2008s64 (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x583. === w864 (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0. === w1064v1507 (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0. === w1064v1809 (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a. === w1064 (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a. === w1064_2qxl (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a. device.c:14163: Test failed: Adapter 1: Failed to get monitor info, error 0x12a. === w10pro64 (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a. === w10pro64_ar (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a. === w10pro64_he (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a. === w10pro64_ja (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a. === w10pro64_zh_CN (64 bit report) === d3d9: device.c:14163: Test failed: Adapter 0: Failed to get monitor info, error 0x12a.

Dec. 19, 2020

Re: [PATCH 1/4] ddraw/tests: Don't test functions directly when reporting GetLastError()

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=83600 Your paranoid android. === w8 (32 bit report) === ddraw: ddraw7.c:3091: Test failed: Failed to create surface, hr 0x887601c2. 0cc0:ddraw7: unhandled exception c0000005 at 0053096D === debiant (build log) === The task timed out

Dec. 19, 2020

[PATCH] opengl32/tests: Don't test function directly when reporting GetLastError()

by André Hentschel

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/opengl32/tests/opengl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index db5ad0ad765..90f06492e81 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -235,9 +235,10 @@ static int test_pfd(const PIXELFORMATDESCRIPTOR *pfd, PIXELFORMATDESCRIPTOR *fmt pf = ChoosePixelFormat( hdc, pfd ); if (pf && fmt) { + INT ret; memset(fmt, 0, sizeof(*fmt)); - ok(DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ), - "DescribePixelFormat failed with error: %u\n", GetLastError()); + ret = DescribePixelFormat( hdc, pf, sizeof(*fmt), fmt ); + ok(ret, "DescribePixelFormat failed with error: %u\n", GetLastError()); } ReleaseDC( hwnd, hdc ); DestroyWindow( hwnd ); -- 2.25.1

Dec. 19, 2020

[PATCH] kernel32/tests: Don't test functions directly when reporting GetLastError()

by André Hentschel

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/kernel32/tests/debugger.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 0a43fe91e64..962b308b6dc 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1332,8 +1332,8 @@ static void test_debugger(const char *argv0) status = NtSuspendThread(thread, NULL); ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = NtResumeThread(thread, NULL); @@ -1350,8 +1350,8 @@ static void test_debugger(const char *argv0) ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); de = ctx.ev; - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); @@ -1462,8 +1462,8 @@ static void test_debugger(const char *argv0) status = NtSuspendThread(thread_b, NULL); ok(!status, "NtSuspendThread failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ctx.ev.dwDebugEventCode = -1; next_event(&ctx, WAIT_EVENT_TIMEOUT); @@ -1485,8 +1485,8 @@ static void test_debugger(const char *argv0) { status = pNtSuspendProcess(pi.hProcess); ok(!status, "NtSuspendProcess failed, last error:%u\n", GetLastError()); - ok(ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER), - "ContinueDebugEvent failed, last error:%u\n", GetLastError()); + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_REPLY_LATER); + ok(ret, "ContinueDebugEvent failed, last error:%u\n", GetLastError()); ok(!WaitForDebugEvent(&ctx.ev, POLL_EVENT_TIMEOUT), "WaitForDebugEvent succeeded.\n"); status = NtResumeThread(thread_b, NULL); -- 2.25.1

Dec. 19, 2020

[PATCH 4/4] dxgi/tests: Don't test functions directly when reporting GetLastError()

by André Hentschel

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/dxgi/tests/dxgi.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 3c3a57806a4..53d768d1a36 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5475,8 +5475,8 @@ static void test_multi_adapter(void) /* Should have the same monitor rectangle. */ monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, &monitor_info), - "Adapter %u output %u: Failed to get monitor info, error %#x.\n", adapter_index, + ret = GetMonitorInfoA(monitor, &monitor_info); + ok(ret, "Adapter %u output %u: Failed to get monitor info, error %#x.\n", adapter_index, output_index, GetLastError()); ok(EqualRect(&monitor_info.rcMonitor, &output_desc.DesktopCoordinates), "Adapter %u output %u: Got unexpected output rect %s, expected %s.\n", @@ -6572,6 +6572,7 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) IDXGIOutput *output; ULONG refcount; HRESULT hr; + BOOL ret; get_factory(device, is_d3d12, &factory); @@ -6622,11 +6623,12 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) "Adapter %u output %u: Failed to find a different mode than %ux%u.\n", adapter_idx, output_idx, width, height); - ok(ClipCursor(NULL), "Adapter %u output %u: ClipCursor failed, error %#x.\n", + ret = ClipCursor(NULL); + ok(ret, "Adapter %u output %u: ClipCursor failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), - "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, @@ -6647,8 +6649,8 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), - "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, @@ -6671,8 +6673,8 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), - "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, @@ -6691,8 +6693,8 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), - "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u output %u: GetClipCursor failed, error %#x.\n", adapter_idx, output_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u output %u: Expect clip rect %s, got %s.\n", adapter_idx, output_idx, -- 2.25.1

Dec. 19, 2020

[PATCH 3/4] d3d8/tests: Don't test functions directly when reporting GetLastError()

by André Hentschel

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/d3d8/tests/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 45cf0f20eda..ffd940067e8 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -10465,8 +10465,8 @@ static void test_multi_adapter(void) ok(!!monitor, "Adapter %u: Failed to get monitor.\n", i); monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info), - "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info); + ok(ret, "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); if (!i) ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, @@ -10597,6 +10597,7 @@ static void test_cursor_clipping(void) IDirect3D8 *d3d; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -10625,10 +10626,12 @@ static void test_cursor_clipping(void) "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, current_mode.Width, current_mode.Height); - ok(ClipCursor(NULL), "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, + ret = ClipCursor(NULL); + ok(ret, "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -10643,7 +10646,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -10651,7 +10655,8 @@ static void test_cursor_clipping(void) IDirect3DDevice8_Release(device); flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); -- 2.25.1

Dec. 19, 2020

[PATCH 2/4] d3d9/tests: Don't test functions directly when reporting GetLastError()

by André Hentschel

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/d3d9/tests/device.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0343fade792..1bb69935df6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -14159,8 +14159,8 @@ static void test_multi_adapter(void) ok(!!monitor, "Adapter %u: Failed to get monitor.\n", i); monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info), - "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); + ret = GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info); + ok(!ret, "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); if (!i) ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, @@ -14351,6 +14351,7 @@ static void test_cursor_clipping(void) IDirect3D9 *d3d; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -14377,10 +14378,12 @@ static void test_cursor_clipping(void) "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, current_mode.Width, current_mode.Height); - ok(ClipCursor(NULL), "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, + ret = ClipCursor(NULL); + ok(ret, "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -14395,7 +14398,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); @@ -14403,7 +14407,8 @@ static void test_cursor_clipping(void) IDirect3DDevice9_Release(device); flush_events(); get_virtual_rect(&virtual_rect); - ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + ret = GetClipCursor(&clip_rect); + ok(ret, "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, GetLastError()); ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); -- 2.25.1

Dec. 19, 2020

[PATCH 1/4] ddraw/tests: Don't test functions directly when reporting GetLastError()

by André Hentschel

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw2.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw4.c | 28 +++++++++++++++++++--------- dlls/ddraw/tests/ddraw7.c | 28 +++++++++++++++++++--------- 4 files changed, 76 insertions(+), 36 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e1a315f291f..df5c8ac8400 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -13964,6 +13964,7 @@ static void test_cursor_clipping(void) IDirectDraw *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -13986,9 +13987,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -13997,7 +14000,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14010,7 +14014,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14018,7 +14023,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14027,7 +14033,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14040,7 +14047,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14049,7 +14057,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14058,7 +14067,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 849d510a349..bc915c97864 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -14925,6 +14925,7 @@ static void test_cursor_clipping(void) IDirectDraw2 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -14947,9 +14948,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14958,7 +14961,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14971,7 +14975,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14979,7 +14984,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -14988,7 +14994,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15001,7 +15008,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15010,7 +15018,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -15019,7 +15028,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 56a4777add5..f009b4583f4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -17985,6 +17985,7 @@ static void test_cursor_clipping(void) IDirectDraw4 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -18007,9 +18008,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18018,7 +18021,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18031,7 +18035,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18039,7 +18044,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18048,7 +18054,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18061,7 +18068,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18070,7 +18078,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18079,7 +18088,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c9ba50287be..613f8dae98b 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18247,6 +18247,7 @@ static void test_cursor_clipping(void) IDirectDraw7 *ddraw; HWND window; HRESULT hr; + BOOL ret; window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -18269,9 +18270,11 @@ static void test_cursor_clipping(void) goto done; } - ok(ClipCursor(NULL), "ClipCursor failed, error %#x.\n", GetLastError()); + ret = ClipCursor(NULL); + ok(ret, "ClipCursor failed, error %#x.\n", GetLastError()); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18280,7 +18283,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18293,7 +18297,8 @@ static void test_cursor_clipping(void) } flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18301,7 +18306,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18310,7 +18316,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18323,7 +18330,8 @@ static void test_cursor_clipping(void) } flush_events(); SetRect(&rect, 0, 0, param.new_width, param.new_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18332,7 +18340,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#x.\n", hr); flush_events(); SetRect(&rect, 0, 0, param.old_width, param.old_height); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); @@ -18341,7 +18350,8 @@ static void test_cursor_clipping(void) ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#x.\n", hr); flush_events(); get_virtual_rect(&rect); - ok(GetClipCursor(&clip_rect), "GetClipCursor failed, error %#x.\n", GetLastError()); + ret = GetClipCursor(&clip_rect); + ok(ret, "GetClipCursor failed, error %#x.\n", GetLastError()); ok(EqualRect(&clip_rect, &rect), "Expect clip rect %s, got %s.\n", wine_dbgstr_rect(&rect), wine_dbgstr_rect(&clip_rect)); -- 2.25.1

Dec. 19, 2020

Wine staging 6.0-rc3 release

by Alistair Leslie-Hughes

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.0-rc3 (773 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * winmm: Pass a fullpath to CreateFileA Added: * [39346] - Support IDirect3D3 when creating device. * [50150] - odbccp32: Implement SQLWriteDSNToIni/W * [50293] - native dxdiag complains about missing dlls. * [50026] - ntdll: Add stub for RtlQueryProcessPlaceholderCompatibilityMode Updated: * Staging * ntdll-NtQueryVirtualMemory * bcrypt-ECDHSecretAgreement * ntdll-Syscall_Emulation * mfplat-streaming-support * widl-winrt-support Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

Dec. 19, 2020

[PATCH] asm: Use SEH assembly when building with clang in MSVC mode

by Martin Storsjo

In MSVC mode, the __SEH__ macro isn't defined, but the .seh directives are supported in assembly. In these cases, we have to hardcode which architectures we know clang supports SEH directives in as it's not exposed otherwise. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- This is admittedly rather ugly, but fixes a few unwinding cases with a wine in PE mode, built with clang in MSVC mode. --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index ed44a7dd6dd..236b35cf8fe 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -41,7 +41,7 @@ # define __ASM_CFI(str) #endif -#ifdef __SEH__ +#if defined(__SEH__) || (defined(_MSC_VER) && defined(__clang__) && (defined(__x86_64__) || defined(__aarch64__))) # if defined(__aarch64__) && defined(__clang_major__) && (__clang_major__ < 12 || defined(__apple_build_version__)) /* Clang got support for aarch64 SEH assembly directives in Clang 12, * before that, only .seh_startproc/.seh_endproc but nothing else was -- 2.17.1

Dec. 18, 2020

[PATCH] include: Don't use the MSVC intrinsic _InterlockedCompareExchange128 on clang in MSVC mode

by Martin Storsjo

Clang doesn't consider the currently declared function as the proper intrinsic function (a few parameters differ vaguely), and even if declared properly, clang requires building for a target with the cx16 flag enabled to be able to use that intrinsic. Instead just use the inline assembly or GCC builtin version instead. This fixes building in PE mode with Clang in MSVC mode for both x86_64 and aarch64. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- include/winnt.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 04353d9405d..9d797a85099 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6894,7 +6894,7 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #ifdef _WIN64 -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) #define InterlockedCompareExchange128 _InterlockedCompareExchange128 static inline unsigned char _InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); @@ -6913,7 +6913,7 @@ static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 return ret; } -#elif defined(__GNUC__) +#elif defined(__GNUC__) || defined(__clang__) static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) { -- 2.17.1

Dec. 18, 2020

[PATCH] winebuild: Pass -m options to dlltool for arm and arm64

by Martin Storsjo

This allows using the arch independent llvm-dlltool without the llvm-mingw specific <triple>-dlltool wrappers. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- tools/winebuild/import.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index fb5c26da07f..bd25ec5ee70 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1856,6 +1856,14 @@ static void build_windows_import_lib( DLLSPEC *spec ) m_flag = "i386:x86-64"; as_flags = "--as-flags=--64"; break; + case CPU_ARM: + m_flag = "arm"; + as_flags = NULL; + break; + case CPU_ARM64: + m_flag = "arm64"; + as_flags = NULL; + break; default: m_flag = NULL; break; -- 2.17.1

Dec. 18, 2020