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

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

by Martin Storsjo

When targeting arm64 in MSVC mode, LLVM treats semicolons in assembly as comment char, instead of as statement separator (contrary to in mingw mode, where semicolons still work as separator). In generated code, there's no need to keep these directives on one single line though, so just separate them with newlines. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- (There's no reference for how msvc should interpret gas-style assembly, so one could also think LLVM should change and treat semicolons as statement separator there, like for other architectures. But when I suggested fixing that a couple years ago, it was suggested to only change it for GNU style targets, see [1]. I guess the matter could be brought up again though.) [1] https://reviews.llvm.org/D36366#833185 --- include/wine/asm.h | 2 +- tools/winebuild/utils.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index b5e6c6efd3d..ed44a7dd6dd 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -56,7 +56,7 @@ #endif #ifdef _WIN32 -# define __ASM_FUNC_TYPE(name) ".def " name "; .scl 2; .type 32; .endef" +# define __ASM_FUNC_TYPE(name) ".def " name "\n\t.scl 2\n\t.type 32\n\t.endef" #elif defined(__APPLE__) # define __ASM_FUNC_TYPE(name) "" #elif defined(__arm__) || defined(__arm64__) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 1af42f10005..5cffc74accd 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -686,7 +686,7 @@ void output_standard_file_header(void) output( "/* This file can be copied, modified and distributed without restriction. */\n\n" ); if (safe_seh) { - output( "\t.def @feat.00; .scl 3; .type 0; .endef\n" ); + output( "\t.def @feat.00\n\t.scl 3\n\t.type 0\n\t.endef\n" ); output( "\t.globl @feat.00\n" ); output( ".set @feat.00, 1\n" ); } @@ -1119,7 +1119,7 @@ const char *func_declaration( const char *func ) return ""; case PLATFORM_WINDOWS: free( buffer ); - buffer = strmake( ".def %s; .scl 2; .type 32; .endef", asm_name(func) ); + buffer = strmake( ".def %s\n\t.scl 2\n\t.type 32\n\t.endef", asm_name(func) ); break; default: free( buffer ); -- 2.17.1

Dec. 18, 2020

[PATCH] ntdll, ntoskrnl: Implement a no-op __chkstk for arm64

by Martin Storsjo

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm64.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 949b262a592..ee2e3f8ad31 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1647,7 +1647,7 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall -import ZombifyActCtx(ptr) @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() ntdll.__chkstk @ stub _DebugOut @ stub _DebugPrintf @ stdcall _hread(long ptr long) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 36d0492857f..b02737f045b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1742,7 +1742,7 @@ # @ stub _GetMUIStringFromCache # @ stub _OpenMuiStringCache @ stdcall -arch=x86_64 -private __C_specific_handler(ptr long ptr ptr) ntdll.__C_specific_handler -@ cdecl -arch=arm,x86_64 -norelay __chkstk() ntdll.__chkstk +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() ntdll.__chkstk # @ stub __dllonexit3 @ stub __misaligned_access # @ stub __wgetmainargs diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b9acb120844..f3ec8fd9e39 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1445,7 +1445,7 @@ @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() @ stdcall -arch=x86_64,arm64 __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c31eb510382..6ca49481c77 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -100,6 +100,13 @@ static inline BOOL is_valid_frame( ULONG_PTR frame ) } +/************************************************************************** + * __chkstk (NTDLL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret") + /*********************************************************************** * RtlCaptureContext (NTDLL.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 4092e33db43..23ca0c1c51d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3858,6 +3858,13 @@ __ASM_GLOBAL_FUNC( _chkstk, */ __ASM_GLOBAL_FUNC( __chkstk, "lsl r4, r4, #2\n\t" "bx lr" ) +#elif defined(__aarch64__) +/************************************************************************** + * __chkstk (NTOSKRNL.@) + * + * Supposed to touch all the stack pages, but we shouldn't need that. + */ +__ASM_GLOBAL_FUNC( __chkstk, "ret" ); #endif /********************************************************************* diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6ac70c718f1..d57a2f81df6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1522,7 +1522,7 @@ @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) NtWriteFile @ stdcall -private ZwYieldExecution() NtYieldExecution @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) -@ cdecl -arch=arm,x86_64 -norelay __chkstk() +@ cdecl -arch=arm,arm64,x86_64 -norelay __chkstk() @ cdecl -private -arch=i386 _CIcos() @ cdecl -private -arch=i386 _CIsin() @ cdecl -private -arch=i386 _CIsqrt() -- 2.17.1

Dec. 18, 2020

Re: [PATCH] ntdll: Always copy context in call_user_apc_dispatcher() on x86.

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=83587 Your paranoid android. === w2008s64 (32 bit report) === ntdll: exception.c:2046: Test failed: Should not get here, status 0x770f9b00. exception.c:2048: Test failed: Got unexpected pass 2.

Dec. 18, 2020

[PATCH] ntdll: Always copy context in call_user_apc_dispatcher() on x86.

by Paul Gofman

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/tests/exception.c | 48 ++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 84 ++++++++++++++++++++++------------- 2 files changed, 101 insertions(+), 31 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 48785f229e9..3aa8b7a4eb9 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2003,6 +2003,53 @@ static void test_kiuserexceptiondispatcher(void) ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); } +static BOOL test_apc_called; + +static void CALLBACK test_apc(ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3) +{ + test_apc_called = TRUE; +} + +static void test_user_apc(void) +{ + NTSTATUS status; + CONTEXT context; + int pass; + + if (!pNtQueueApcThread) + { + win_skip("NtQueueApcThread is not available.\n"); + return; + } + + pass = 0; + InterlockedIncrement(&pass); + RtlCaptureContext(&context); + InterlockedIncrement(&pass); + + if (pass == 2) + { + /* Try to make sure context data is far enough below context.Esp. */ + CONTEXT c[4]; + + c[0] = context; + + test_apc_called = FALSE; + status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0); + ok(!status, "Got unexpected status %#x.\n", status); + SleepEx(0, TRUE); + ok(test_apc_called, "Test user APC was not called.\n"); + test_apc_called = FALSE; + status = pNtQueueApcThread(GetCurrentThread(), test_apc, 0, 0, 0); + ok(!status, "Got unexpected status %#x.\n", status); + status = NtContinue(&c[0], TRUE ); + + /* Broken before Win7, in that case NtContinue returns here instead of restoring context after calling APC. */ + ok(0, "Should not get here, status %#x.\n", status); + } + ok(pass == 3, "Got unexpected pass %d.\n", pass); + ok(test_apc_called, "Test user APC was not called.\n"); +} #elif defined(__x86_64__) #define UNW_FLAG_NHANDLER 0 @@ -8291,6 +8338,7 @@ START_TEST(exception) test_kiuserexceptiondispatcher(); test_extended_context(); test_copy_context(); + test_user_apc(); #elif defined(__x86_64__) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index f1fd2cd2e41..ff9d8a12c14 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1675,6 +1675,42 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) setup_raise_exception( sigcontext, stack, rec, &xcontext ); } +/* stack layout when calling an user apc function. + * FIXME: match Windows ABI. */ +struct apc_stack_layout +{ + void *context_ptr; + void *ctx; + void *arg1; + void *arg2; + void *func; + CONTEXT context; +}; + +struct apc_stack_layout * WINAPI setup_user_apc_dispatcher_stack( CONTEXT *context, struct apc_stack_layout *stack, + void *ctx, void *arg1, void *arg2, void *func ) +{ + CONTEXT c; + + if (!context) + { + c.ContextFlags = CONTEXT_FULL; + NtGetContextThread( GetCurrentThread(), &c ); + context = &c; + } + memmove( &stack->context, context, sizeof(stack->context) ); + stack->context_ptr = &stack->context; + stack->ctx = ctx; + stack->arg1 = arg1; + stack->arg2 = arg2; + stack->func = func; + stack->context.Eax = STATUS_USER_APC; + return stack; +} + +C_ASSERT( sizeof(struct apc_stack_layout) == 0x2e0 ); +C_ASSERT( offsetof(struct syscall_frame, ret_addr) == 0x14 ); +C_ASSERT( offsetof(struct apc_stack_layout, context) == 20 ); /*********************************************************************** * call_user_apc_dispatcher @@ -1682,41 +1718,27 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movl 4(%esp),%esi\n\t" /* context_ptr */ "movl 24(%esp),%edi\n\t" /* dispatcher */ + "leal 4(%esp),%ebp\n\t" "test %esi,%esi\n\t" "jz 1f\n\t" - "movl 0xc4(%esi),%eax\n\t" /* context_ptr->Rsp */ - "leal -0x2f8(%eax),%eax\n\t" /* sizeof(CONTEXT) + offsetof(frame,ret_addr) + params */ - "movl 20(%esp),%ecx\n\t" /* func */ - "movl %ecx,20(%eax)\n\t" - "movl 8(%esp),%ebx\n\t" /* ctx */ - "movl 12(%esp),%edx\n\t" /* arg1 */ - "movl 16(%esp),%ecx\n\t" /* arg2 */ - "leal 4(%eax),%esp\n\t" - "jmp 2f\n" + "movl 0xc4(%esi),%eax\n\t" /* context_ptr->Esp */ + "jmp 2f\n\t" "1:\tmovl %fs:0x1f8,%eax\n\t" /* x86_thread_data()->syscall_frame */ - "leal -0x2cc(%eax),%esi\n\t" - "movl %esp,%ebx\n\t" - "cmpl %esp,%esi\n\t" - "cmovbl %esi,%esp\n\t" - "pushl 20(%ebx)\n\t" /* func */ - "pushl 16(%ebx)\n\t" /* arg2 */ - "pushl 12(%ebx)\n\t" /* arg1 */ - "movl 8(%ebx),%ebx\n\t" /* ctx */ - "movl $0x00010007,(%esi)\n\t" /* context.ContextFlags = CONTEXT_FULL */ - "pushl %esi\n\t" /* context */ - "pushl $0xfffffffe\n\t" - "call " __ASM_STDCALL("NtGetContextThread",8) "\n\t" - "movl $0xc0,0xb0(%esi)\n" /* context.Eax = STATUS_USER_APC */ - "popl %edx\n\t" - "popl %ecx\n\t" - "popl %eax\n\t" - "leal -20(%esi),%esp\n\t" - "movl %eax,16(%esp)\n" /* func */ - "2:\tmovl %ecx,12(%esp)\n\t" /* arg2 */ - "movl %edx,8(%esp)\n\t" /* arg1 */ - "movl %ebx,4(%esp)\n\t" /* ctx */ - "movl %esi,(%esp)\n\t" /* context */ + "leal 0x14(%eax),%eax\n\t" /* &x86_thread_data()->syscall_frame->ret_addr */ + "2:\tsubl $0x2e0,%eax\n\t" /* sizeof(struct apc_stack_layout) */ + "movl %ebp,%esp\n\t" /* pop return address */ + "cmpl %esp,%eax\n\t" + "cmovbl %eax,%esp\n\t" + "pushl 16(%ebp)\n\t" /* func */ + "pushl 12(%ebp)\n\t" /* arg2 */ + "pushl 8(%ebp)\n\t" /* arg1 */ + "pushl 4(%ebp)\n\t" /* ctx */ + "pushl %eax\n\t" + "pushl %esi\n\t" + "call " __ASM_STDCALL("setup_user_apc_dispatcher_stack",24) "\n\t" "movl $0,%fs:0x1f8\n\t" /* x86_thread_data()->syscall_frame = NULL */ + "movl %eax,%esp\n\t" + "leal 20(%eax),%esi\n\t" "movl 0xb4(%esi),%ebp\n\t" /* context.Ebp */ "pushl 0xb8(%esi)\n\t" /* context.Eip */ "jmp *%edi\n" ) -- 2.29.2

Dec. 18, 2020

Re: [PATCH] ieframe: Fix memory leak in PersistFile_Save.

by Jacek Caban

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

Dec. 18, 2020

Re: [PATCH v2 1/2] widl: don't use local methods when writing async interfaces

by Jacek Caban

On 16.12.2020 15:38, Steve Lhomme wrote: > The same entries can have a different call_as between the synchronous and > asynchronous interfaces and shouldn't be mixed up. Looking closer at it, I think that we shouldn't apply call_as methods to async interfaces in the first place. Sorry for not catching it earlier, I sent a patch: https://source.winehq.org/patches/data/197632 Thanks, Jacek

Dec. 18, 2020

[PATCH] widl: Don't apply call_as methods to async interface.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/widl/parser.y | 2 ++ 1 file changed, 2 insertions(+)

Dec. 18, 2020

Re: [PATCH v3 4/4] winmm: Search the default path when opening an existing file in create_file_OF().

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Dec 17, 2020 at 04:40:51PM -0600, Zebediah Figura wrote: > Based on a patch by Alistair Leslie-Hughes. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winmm/mmio.c | 24 ++++++++++++++++++++++-- > dlls/winmm/tests/mmio.c | 2 +- > 2 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c > index cb3175c5cd7..da536357416 100644 > --- a/dlls/winmm/mmio.c > +++ b/dlls/winmm/mmio.c > @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList; > /* From kernel32 */ > static HANDLE create_file_OF( LPCSTR path, INT mode ) > { > - DWORD access, sharing, creation; > + DWORD access, sharing, creation, len; > + char *full_path; > + HANDLE ret; > > if (mode & OF_CREATE) > { > @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) > case OF_SHARE_COMPAT: > default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; > } > - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + > + if (mode & OF_CREATE) > + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + > + if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL ))) > + return INVALID_HANDLE_VALUE; > + if (!(full_path = malloc(len + 1))) > + { > + SetLastError( ERROR_OUTOFMEMORY ); > + return INVALID_HANDLE_VALUE; > + } > + if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL )) > + { > + free(full_path); > + return INVALID_HANDLE_VALUE; > + } > + ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + free(full_path); > + return ret; > } > > /************************************************************************** > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index c9ceda24f3f..a232070064c 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -551,7 +551,7 @@ static void test_mmioOpen_create(void) > > wcscpy(buffer, L"test_mmio_path"); > hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); > - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > mmioClose(hmmio, 0); > > wcscpy(buffer, L"test_mmio_path"); > -- > 2.29.2 > >

Dec. 18, 2020

Re: [PATCH v3 3/4] winmm/tests: Add some tests for MMIO_PARSE with long file names.

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Dec 17, 2020 at 04:40:50PM -0600, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winmm/tests/mmio.c | 20 +++++++++++++++++++- > 1 file changed, 19 insertions(+), 1 deletion(-) > > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index 0236855f246..c9ceda24f3f 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -483,7 +483,7 @@ static void test_mmioOpen_create(void) > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; > WCHAR buffer[MAX_PATH], expect[MAX_PATH]; > - char exedir_filename[MAX_PATH]; > + char exedir_filename[MAX_PATH], bufferA[MAX_PATH], expectA[MAX_PATH]; > MMIOINFO info = {0}; > BOOL ret; > FILE *f; > @@ -531,6 +531,24 @@ static void test_mmioOpen_create(void) > > DeleteFileW(long_filename); > > + wcscpy(buffer, long_filename); > + info.wErrorRet = 0xdead; > + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); > + todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet); > + todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet); > + wcscpy(expect, temp_dir); > + wcscat(expect, long_filename); > + expect[127] = 0; > + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); > + > + WideCharToMultiByte(CP_ACP, 0, long_filename, -1, bufferA, sizeof(bufferA), NULL, NULL); > + info.wErrorRet = 0xdead; > + hmmio = mmioOpenA(bufferA, &info, MMIO_PARSE); > + todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet); > + todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet); > + WideCharToMultiByte(CP_ACP, 0, long_filename, -1, expectA, sizeof(expectA), NULL, NULL); > + todo_wine ok(!strcmp(bufferA, expectA), "expected %s, got %s\n", debugstr_a(expectA), debugstr_a(bufferA)); > + > wcscpy(buffer, L"test_mmio_path"); > hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); > todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > -- > 2.29.2 > >

Dec. 18, 2020

Re: [PATCH v3 2/4] winmm/tests: Test the mmioOpen() search path with various flags.

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Dec 17, 2020 at 04:40:49PM -0600, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ > 1 file changed, 52 insertions(+), 8 deletions(-) > > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index e3984fbaf3a..0236855f246 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) > WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; > /* According to docs, filename must be no more than 128 bytes, but it will > * actually allow longer than that. */ > - WCHAR filename[] = L"very_long_filename_" > + WCHAR long_filename[] = L"very_long_filename_" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; > + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; > + char exedir_filename[MAX_PATH]; > + MMIOINFO info = {0}; > + BOOL ret; > + FILE *f; > + > + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); > + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); > + f = fopen(exedir_filename, "w"); > + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); > + fclose(f); > > GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); > GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); > SetCurrentDirectoryW(temp_dir); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > > /* open with MMIO_DENYNONE */ > - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); > + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); > ok(hmmio != NULL, "mmioOpen failed\n"); > > /* MMIO_DENYNONE lets us open it here, too */ > - handle = CreateFileW(filename, GENERIC_READ, > + handle = CreateFileW(long_filename, GENERIC_READ, > FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, > OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); > ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); > @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) > > mmioClose(hmmio, 0); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > > /* open with MMIO_EXCLUSIVE */ > - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); > + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); > ok(hmmio != NULL, "mmioOpen failed\n"); > > /* should fail due to MMIO_EXCLUSIVE */ > - handle = CreateFileW(filename, GENERIC_READ, > + handle = CreateFileW(long_filename, GENERIC_READ, > FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, > OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); > ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); > @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) > > mmioClose(hmmio, 0); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); > + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + mmioClose(hmmio, 0); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); > + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); > + wcscpy(expect, temp_dir); > + wcscat(expect, L"test_mmio_path"); > + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); > + > + wcscpy(buffer, L"test_mmio_path"); > + info.wErrorRet = 0xdead; > + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); > + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); > + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); > + > + ret = DeleteFileA("test_mmio_path"); > + ok(!ret, "expected failure\n"); > + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); > + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + mmioClose(hmmio, 0); > + > + ret = DeleteFileA("test_mmio_path"); > + ok(ret, "got error %u\n", GetLastError()); > > SetCurrentDirectoryW(cwd); > + > + ret = DeleteFileA(exedir_filename); > + ok(ret, "got error %u\n", GetLastError()); > } > > static void test_mmioSetBuffer(char *fname) > -- > 2.29.2 > >

Dec. 18, 2020

Re: [PATCH v3 1/4] winmm: Always allocate at least MAX_PATH bytes in mmioOpenW().

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Thu, Dec 17, 2020 at 04:40:48PM -0600, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winmm/mmio.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c > index 48bbd3ed48d..cb3175c5cd7 100644 > --- a/dlls/winmm/mmio.c > +++ b/dlls/winmm/mmio.c > @@ -734,6 +734,7 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo, > if (szFileName) > { > INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); > + if (len < MAX_PATH) len = MAX_PATH; > szFn = HeapAlloc( GetProcessHeap(), 0, len ); > if (!szFn) return NULL; > WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); > -- > 2.29.2 > >

Dec. 18, 2020

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

by Dmitry Timoshkov

v2: Fix test failures under 2 testbot VMs (w7u_adm and w8adm). v3: Avoid using NULL interface on clean up due to a failed method call. v4: Accept WBEM_E_ACCESS_DENIED and print a message about it. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 63 +++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..37b6fb4e8d 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,67 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK || hr == WBEM_E_ACCESS_DENIED, "failed to execute method %08x\n", hr ); + if (hr == S_OK) + { + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + + IWbemClassObject_Release( out ); + } + else if (hr == WBEM_E_ACCESS_DENIED) + win_skip( "insufficient privs to test SystemRestore\n" ); + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1884,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1898,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

Dec. 18, 2020

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

by Dmitry Timoshkov

StdRegProv is not available on ROOT\\CIMV2 for unknown reason on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

Dec. 18, 2020

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

by Dmitry Timoshkov

Hans Leidekker <hans(a)codeweavers.com> wrote: > On Fri, 2020-12-18 at 14:41 +0300, Dmitry Timoshkov wrote: > > > > > On Fri, 2020-12-18 at 13:21 +0300, Dmitry Timoshkov wrote: > > > > > > > + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); > > > > + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); > > > > > > I would prefer to accept both results and print a message when access is > > > denied, like in test_SystemSecurity(). > > > > Sure. > > > > > Should we disable monitoring when this method succeeds? > > > > What do you mean by disabling monitoring? > > You're calling the Enable() method which starts the System Restore service > and filter driver according to MSDN. It seems that we should call Disable() > to give the system a chance to clean up. The service is already running by default, it takes considerable measures to disable it and turn off the system restore functionality, so I'd assume that calling Enable() should be a no-op, and disabling the service would be harmful to the system. -- Dmitry.

Dec. 18, 2020

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

by Hans Leidekker

On Fri, 2020-12-18 at 14:41 +0300, Dmitry Timoshkov wrote: > > > On Fri, 2020-12-18 at 13:21 +0300, Dmitry Timoshkov wrote: > > > > > + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); > > > + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); > > > > I would prefer to accept both results and print a message when access is > > denied, like in test_SystemSecurity(). > > Sure. > > > Should we disable monitoring when this method succeeds? > > What do you mean by disabling monitoring? You're calling the Enable() method which starts the System Restore service and filter driver according to MSDN. It seems that we should call Disable() to give the system a chance to clean up.

Dec. 18, 2020

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

by Dmitry Timoshkov

Hans Leidekker <hans(a)codeweavers.com> wrote: > On Fri, 2020-12-18 at 13:21 +0300, Dmitry Timoshkov wrote: > > > + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); > > + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); > > I would prefer to accept both results and print a message when access is > denied, like in test_SystemSecurity(). Sure. > Should we disable monitoring when this method succeeds? What do you mean by disabling monitoring? -- Dmitry.

Dec. 18, 2020

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

by Hans Leidekker

On Fri, 2020-12-18 at 13:21 +0300, Dmitry Timoshkov wrote: > + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); > + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); I would prefer to accept both results and print a message when access is denied, like in test_SystemSecurity(). Should we disable monitoring when this method succeeds?

Dec. 18, 2020

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

by Dmitry Timoshkov

v2: Fix test failures under 2 testbot VMs (w7u_adm and w8adm). v3: Avoid using NULL interface on clean up due to a failed method call. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 61 +++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..0a0bd2c4f8 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,65 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); + if (hr == S_OK) + { + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + + IWbemClassObject_Release( out ); + } + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1882,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1896,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

Dec. 18, 2020

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

by Dmitry Timoshkov

StdRegProv is not available on ROOT\\CIMV2 for unknown reason on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

Dec. 18, 2020

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

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=83578 Your paranoid android. === w7u_adm (32 bit report) === wbemprox: 09c4:query: unhandled exception c0000005 at 00404ACA === w8adm (32 bit report) === wbemprox: 0c9c:query: unhandled exception c0000005 at 00404ACA

Dec. 18, 2020

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

by Dmitry Timoshkov

v2: Fix test failures under 2 testbot VMs (w7u_adm and w8adm). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..d102c660e3 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,64 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK || broken(hr == WBEM_E_ACCESS_DENIED), "failed to execute method %08x\n", hr ); + if (hr == S_OK) + { + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + } + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( out ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1881,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1895,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

Dec. 18, 2020

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

by Dmitry Timoshkov

StdRegProv is not available on ROOT\\CIMV2 for unknown reason on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

Dec. 18, 2020

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

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=83576 Your paranoid android. === w7u_adm (32 bit report) === wbemprox: query.c:1804: Test failed: failed to execute method 80041003 09d4:query: unhandled exception c0000005 at 00404A20 === w8adm (32 bit report) === wbemprox: query.c:1804: Test failed: failed to execute method 80041003 0cd4:query: unhandled exception c0000005 at 00404A20

Dec. 18, 2020

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

by Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 58 +++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 73f055e8bd..ae7cddc684 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1760,6 +1760,62 @@ static void test_Win32_SoundDevice( IWbemServices *services ) SysFreeString( wql ); } +static void test_SystemRestore( IWbemServices *services ) +{ + WCHAR path[MAX_PATH]; + BSTR class, method; + IWbemClassObject *service, *sig_in, *in, *out; + VARIANT var; + HRESULT hr; + + class = SysAllocString( L"SystemRestore" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + if (hr != S_OK) + { + skip( "SystemRestore not available\n" ); + SysFreeString( class ); + return; + } + + check_property( service, L"CreationTime", VT_NULL, CIM_STRING ); + check_property( service, L"Description", VT_NULL, CIM_STRING ); + check_property( service, L"EventType", VT_NULL, CIM_UINT32 ); + check_property( service, L"RestorePointType", VT_NULL, CIM_UINT32 ); + check_property( service, L"SequenceNumber", VT_NULL, CIM_UINT32 ); + + method = SysAllocString( L"Enable" ); + sig_in = NULL; + hr = IWbemClassObject_GetMethod( service, method, 0, &sig_in, NULL ); + ok( hr == S_OK, "failed to get Enable method %08x\n", hr ); + + hr = IWbemClassObject_SpawnInstance( sig_in, 0, &in ); + ok( hr == S_OK, "failed to spawn instance %08x\n", hr ); + + GetWindowsDirectoryW(path, ARRAY_SIZE(path)); + path[3] = 0; /* otherwise XP fails */ + V_VT( &var ) = VT_BSTR; + V_BSTR( &var ) = SysAllocString( path ); + hr = IWbemClassObject_Put( in, L"Drive", 0, &var, 0 ); + ok( hr == S_OK, "failed to set Drive %08x\n", hr ); + SysFreeString( V_BSTR( &var ) ); + + out = NULL; + hr = IWbemServices_ExecMethod( services, class, method, 0, NULL, in, &out, NULL ); + ok( hr == S_OK, "failed to execute method %08x\n", hr ); + + VariantInit( &var ); + hr = IWbemClassObject_Get( out, L"ReturnValue", 0, &var, NULL, NULL ); + ok( hr == S_OK, "failed to get return value %08x\n", hr ); + ok( V_I4( &var ) == ERROR_SUCCESS, "unexpected error %u\n", V_UI4( &var ) ); + + IWbemClassObject_Release( in ); + IWbemClassObject_Release( out ); + IWbemClassObject_Release( sig_in ); + IWbemClassObject_Release( service ); + SysFreeString( method ); + SysFreeString( class ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1823,6 +1879,7 @@ START_TEST(query) test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); @@ -1836,6 +1893,7 @@ START_TEST(query) ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); test_StdRegProv( services ); + test_SystemRestore( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.29.2

Dec. 18, 2020

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

by Dmitry Timoshkov

StdRegProv is not available on ROOT\\CIMV2 on some Windows configs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wbemprox/tests/query.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 191b9f6c85..73f055e8bd 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1824,6 +1824,19 @@ START_TEST(query) test_Win32_VideoController( services ); test_Win32_WinSAT( services ); + SysFreeString( path ); + IWbemServices_Release( services ); + + /* Some tests need other connection point */ + path = SysAllocString( L"ROOT\\DEFAULT" ); + hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); + ok( hr == S_OK, "failed to get IWbemServices interface %08x\n", hr ); + hr = CoSetProxyBlanket( (IUnknown *)services, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, + RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); + ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr ); + + test_StdRegProv( services ); + SysFreeString( path ); IWbemServices_Release( services ); IWbemLocator_Release( locator ); -- 2.29.2

Dec. 18, 2020

[PATCH 3/3] include: Add DEFINE_ENUM_FLAG_OPERATORS macro in directmanipulation.idl.

by Biswapriyo Nath

Dec. 18, 2020

[PATCH 2/3] include: Add DEFINE_ENUM_FLAG_OPERATORS macro in mfreadwrite.idl.

by Biswapriyo Nath

Dec. 18, 2020

[PATCH 1/3] include: Add more GUIDs in mfreadwrite.idl.

by Biswapriyo Nath

Dec. 18, 2020

[PATCH] ieframe: Fix memory leak in PersistFile_Save.

by Haidong Yu

Dec. 18, 2020

Re: [PATCH v2 1/2] winmm/tests: Test the mmioOpen() search path with various flags.

by Zebediah Figura (she/her)

On 12/17/20 3:27 PM, Andrew Eikum wrote: > Well, you found a new bug. Your tests crash: > > https://testbot.winehq.org/JobDetails.pl?Key=83551#k401 > > This is because in mmioOpenW, we allocate only the space required to > fit the input filename, but MMIO_PARSE needs room for at least 128 > characters. (128 per the docs. Might as well do MAX_PATH.) > > I think you need the below diff before applying your patches. It ought > to also copy the resulting filename back to the input buffer, but, > code freeze. > > diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c > index 48bbd3ed48d..4f13a34303c 100644 > --- a/dlls/winmm/mmio.c > +++ b/dlls/winmm/mmio.c > @@ -733,10 +733,9 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo, > > if (szFileName) > { > - INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); > - szFn = HeapAlloc( GetProcessHeap(), 0, len ); > + szFn = HeapAlloc( GetProcessHeap(), 0, MAX_PATH ); > if (!szFn) return NULL; > - WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); > + WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, MAX_PATH, NULL, NULL ); > } > > ret = MMIO_Open(szFn, lpmmioinfo, dwOpenFlags, TRUE); I'd be more comfortable with allocating at least MAX_PATH (or 128) bytes rather than always allocating MAX_PATH, especially during code freeze; I've sent a v3 that does this. I've also written some tests that show the interesting effects of buffer size on MMIO_PARSE... > > Andrew > > On Thu, Dec 17, 2020 at 02:34:26PM -0600, Zebediah Figura wrote: >> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> >> --- >> v2: don't assume cwd == executable directory >> >> dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ >> 1 file changed, 52 insertions(+), 8 deletions(-) >> >> diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c >> index e3984fbaf3a..0236855f246 100644 >> --- a/dlls/winmm/tests/mmio.c >> +++ b/dlls/winmm/tests/mmio.c >> @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) >> WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; >> /* According to docs, filename must be no more than 128 bytes, but it will >> * actually allow longer than that. */ >> - WCHAR filename[] = L"very_long_filename_" >> + WCHAR long_filename[] = L"very_long_filename_" >> L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" >> L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" >> L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; >> + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; >> + char exedir_filename[MAX_PATH]; >> + MMIOINFO info = {0}; >> + BOOL ret; >> + FILE *f; >> + >> + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); >> + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); >> + f = fopen(exedir_filename, "w"); >> + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); >> + fclose(f); >> >> GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); >> GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); >> SetCurrentDirectoryW(temp_dir); >> >> - DeleteFileW(filename); >> + DeleteFileW(long_filename); >> >> /* open with MMIO_DENYNONE */ >> - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); >> + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); >> ok(hmmio != NULL, "mmioOpen failed\n"); >> >> /* MMIO_DENYNONE lets us open it here, too */ >> - handle = CreateFileW(filename, GENERIC_READ, >> + handle = CreateFileW(long_filename, GENERIC_READ, >> FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, >> OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); >> ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); >> @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) >> >> mmioClose(hmmio, 0); >> >> - DeleteFileW(filename); >> + DeleteFileW(long_filename); >> >> /* open with MMIO_EXCLUSIVE */ >> - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); >> + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); >> ok(hmmio != NULL, "mmioOpen failed\n"); >> >> /* should fail due to MMIO_EXCLUSIVE */ >> - handle = CreateFileW(filename, GENERIC_READ, >> + handle = CreateFileW(long_filename, GENERIC_READ, >> FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, >> OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); >> ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); >> @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) >> >> mmioClose(hmmio, 0); >> >> - DeleteFileW(filename); >> + DeleteFileW(long_filename); >> + >> + wcscpy(buffer, L"test_mmio_path"); >> + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); >> + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); >> + mmioClose(hmmio, 0); >> + >> + wcscpy(buffer, L"test_mmio_path"); >> + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); >> + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); >> + wcscpy(expect, temp_dir); >> + wcscat(expect, L"test_mmio_path"); >> + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); >> + >> + wcscpy(buffer, L"test_mmio_path"); >> + info.wErrorRet = 0xdead; >> + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); >> + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); >> + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); >> + >> + ret = DeleteFileA("test_mmio_path"); >> + ok(!ret, "expected failure\n"); >> + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); >> + >> + wcscpy(buffer, L"test_mmio_path"); >> + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); >> + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); >> + mmioClose(hmmio, 0); >> + >> + ret = DeleteFileA("test_mmio_path"); >> + ok(ret, "got error %u\n", GetLastError()); >> >> SetCurrentDirectoryW(cwd); >> + >> + ret = DeleteFileA(exedir_filename); >> + ok(ret, "got error %u\n", GetLastError()); >> } >> >> static void test_mmioSetBuffer(char *fname) >> -- >> 2.29.2 >> >> >

Dec. 17, 2020

[PATCH v3 4/4] winmm: Search the default path when opening an existing file in create_file_OF().

by Zebediah Figura

Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/mmio.c | 24 ++++++++++++++++++++++-- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index cb3175c5cd7..da536357416 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList; /* From kernel32 */ static HANDLE create_file_OF( LPCSTR path, INT mode ) { - DWORD access, sharing, creation; + DWORD access, sharing, creation, len; + char *full_path; + HANDLE ret; if (mode & OF_CREATE) { @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) case OF_SHARE_COMPAT: default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; } - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (mode & OF_CREATE) + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL ))) + return INVALID_HANDLE_VALUE; + if (!(full_path = malloc(len + 1))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return INVALID_HANDLE_VALUE; + } + if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL )) + { + free(full_path); + return INVALID_HANDLE_VALUE; + } + ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + free(full_path); + return ret; } /************************************************************************** diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index c9ceda24f3f..a232070064c 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -551,7 +551,7 @@ static void test_mmioOpen_create(void) wcscpy(buffer, L"test_mmio_path"); hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); mmioClose(hmmio, 0); wcscpy(buffer, L"test_mmio_path"); -- 2.29.2

Dec. 17, 2020

[PATCH v3 3/4] winmm/tests: Add some tests for MMIO_PARSE with long file names.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/tests/mmio.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 0236855f246..c9ceda24f3f 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -483,7 +483,7 @@ static void test_mmioOpen_create(void) L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; WCHAR buffer[MAX_PATH], expect[MAX_PATH]; - char exedir_filename[MAX_PATH]; + char exedir_filename[MAX_PATH], bufferA[MAX_PATH], expectA[MAX_PATH]; MMIOINFO info = {0}; BOOL ret; FILE *f; @@ -531,6 +531,24 @@ static void test_mmioOpen_create(void) DeleteFileW(long_filename); + wcscpy(buffer, long_filename); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet); + todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, long_filename); + expect[127] = 0; + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + WideCharToMultiByte(CP_ACP, 0, long_filename, -1, bufferA, sizeof(bufferA), NULL, NULL); + info.wErrorRet = 0xdead; + hmmio = mmioOpenA(bufferA, &info, MMIO_PARSE); + todo_wine ok(hmmio == (HMMIO)FALSE, "failed to parse file name, error %#x\n", info.wErrorRet); + todo_wine ok(info.wErrorRet == MMIOERR_OUTOFMEMORY, "got error %#x\n", info.wErrorRet); + WideCharToMultiByte(CP_ACP, 0, long_filename, -1, expectA, sizeof(expectA), NULL, NULL); + todo_wine ok(!strcmp(bufferA, expectA), "expected %s, got %s\n", debugstr_a(expectA), debugstr_a(bufferA)); + wcscpy(buffer, L"test_mmio_path"); hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); -- 2.29.2

Dec. 17, 2020

[PATCH v3 2/4] winmm/tests: Test the mmioOpen() search path with various flags.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e3984fbaf3a..0236855f246 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; /* According to docs, filename must be no more than 128 bytes, but it will * actually allow longer than that. */ - WCHAR filename[] = L"very_long_filename_" + WCHAR long_filename[] = L"very_long_filename_" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; + char exedir_filename[MAX_PATH]; + MMIOINFO info = {0}; + BOOL ret; + FILE *f; + + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); + f = fopen(exedir_filename, "w"); + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); + fclose(f); GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); SetCurrentDirectoryW(temp_dir); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_DENYNONE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); ok(hmmio != NULL, "mmioOpen failed\n"); /* MMIO_DENYNONE lets us open it here, too */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_EXCLUSIVE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); ok(hmmio != NULL, "mmioOpen failed\n"); /* should fail due to MMIO_EXCLUSIVE */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, L"test_mmio_path"); + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + wcscpy(buffer, L"test_mmio_path"); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); + + ret = DeleteFileA("test_mmio_path"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); SetCurrentDirectoryW(cwd); + + ret = DeleteFileA(exedir_filename); + ok(ret, "got error %u\n", GetLastError()); } static void test_mmioSetBuffer(char *fname) -- 2.29.2

Dec. 17, 2020

[PATCH v3 1/4] winmm: Always allocate at least MAX_PATH bytes in mmioOpenW().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/mmio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48d..cb3175c5cd7 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -734,6 +734,7 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo, if (szFileName) { INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); + if (len < MAX_PATH) len = MAX_PATH; szFn = HeapAlloc( GetProcessHeap(), 0, len ); if (!szFn) return NULL; WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); -- 2.29.2

Dec. 17, 2020

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

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/driver.c | 2 +- dlls/gdi32/tests/font.c | 24 +++++++++++------------- dlls/gdi32/tests/icm.c | 4 +--- dlls/gdi32/tests/metafile.c | 3 +-- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 2110765835f..eb0da18b32e 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -32,7 +32,7 @@ #include "wine/test.h" -static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static const WCHAR display1W[] = L"\\\\.\\DISPLAY1"; static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 86ccddd05ea..ad7408f5620 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1136,7 +1136,6 @@ static void ABCWidths_helper(const char* description, HDC hdc, WORD *glyphs, con static void test_GetCharABCWidths(void) { - static const WCHAR str[] = {'i',0}; BOOL ret; HDC hdc; LOGFONTA lf; @@ -1201,7 +1200,7 @@ static void test_GetCharABCWidths(void) hdc = GetDC(0); hfont = SelectObject(hdc, hfont); - nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + nb = pGetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = GetCharABCWidthsI(NULL, 0, 1, glyphs, abc); @@ -1382,7 +1381,7 @@ static void test_GetCharABCWidths(void) SetMapMode(hdc, MM_ANISOTROPIC); SelectObject(hdc, hfont); - nb = pGetGlyphIndicesW(hdc, str, 1, glyphs, 0); + nb = pGetGlyphIndicesW(hdc, L"i", 1, glyphs, 0); ok(nb == 1, "GetGlyphIndicesW should have returned 1\n"); ret = GetCharABCWidthsI(hdc, 0, 1, glyphs, abc); @@ -1433,8 +1432,7 @@ static void test_GetCharABCWidths(void) static void test_text_extents(void) { - static const WCHAR wt[] = {'O','n','e','\n','t','w','o',' ','3',0}; - static const WCHAR emptyW[] = {0}; + static const WCHAR wt[] = L"One\ntwo 3"; LPINT extents; INT i, len, fit1, fit2, extents2[3]; LOGFONTA lf; @@ -1484,7 +1482,7 @@ static void test_text_extents(void) ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); memset(&sz, 0xcc, sizeof(sz)); - ret = GetTextExtentPointW(hdc, emptyW, 0, &sz); + ret = GetTextExtentPointW(hdc, L"", 0, &sz); ok(ret, "got %d\n", ret); ok(sz.cx == 0 && sz.cy == 0, "cx %d, cy %d\n", sz.cx, sz.cy); @@ -1633,7 +1631,7 @@ static void test_GetGlyphIndices(void) DWORD charcount; LOGFONTA lf; DWORD flags = 0; - WCHAR testtext[] = {'T','e','s','t',0xffff,0}; + WCHAR testtext[] = L"Test\xffff"; WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRICA textm; HFONT hOldFont; @@ -4445,7 +4443,7 @@ static void test_RealizationInfo(void) static void test_GetTextFace(void) { static const char faceA[] = "Tahoma"; - static const WCHAR faceW[] = {'T','a','h','o','m','a', 0}; + static const WCHAR faceW[] = L"Tahoma"; LOGFONTA fA = {0}; LOGFONTW fW = {0}; char bufA[LF_FACESIZE]; @@ -6822,7 +6820,7 @@ static void test_fake_bold_font(void) static void test_bitmap_font_glyph_index(void) { - const WCHAR text[] = {'#','!','/','b','i','n','/','s','h',0}; + const WCHAR text[] = L"#!/bin/sh"; const struct { LPCSTR face; BYTE charset; @@ -7117,10 +7115,10 @@ static void test_ttf_names(void) static void test_lang_names(void) { - static const WCHAR name_cond_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',0}; - static const WCHAR name_cond_ja_reg_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',' ','R','e','g',0}; - static const WCHAR name_cond_ja_reg_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','C','o','n','d',' ','(','j','a',')',' ','R','e','g',' ','(','j','a',')',0}; - static const WCHAR name_wws_ja_w[] = {0x30d5,0x30a9,0x30f3,0x30c8,0x540d,' ','W','W','S',' ','(','j','a',')',0}; + static const WCHAR name_cond_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja)"; + static const WCHAR name_cond_ja_reg_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja) Reg"; + static const WCHAR name_cond_ja_reg_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d Cond (ja) Reg (ja)"; + static const WCHAR name_wws_ja_w[] = L"\x30d5\x30a9\x30f3\x30c8\x540d WWS (ja)"; struct enum_fullname_data efnd; struct enum_fullname_data_w efnd_w; diff --git a/dlls/gdi32/tests/icm.c b/dlls/gdi32/tests/icm.c index 340ebeef55a..509d5c0c579 100644 --- a/dlls/gdi32/tests/icm.c +++ b/dlls/gdi32/tests/icm.c @@ -27,8 +27,6 @@ #include "wine/test.h" -static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; - static void test_GetICMProfileA( HDC dc ) { BOOL ret; @@ -167,7 +165,7 @@ static void test_SetICMMode( HDC dc ) ok( ret, "SetICMMode failed (%d)\n", GetLastError() ); SetLastError( 0xdeadbeef ); - dc = CreateDCW( displayW, NULL, NULL, NULL ); + dc = CreateDCW( L"DISPLAY", NULL, NULL, NULL ); if ( !dc && ( GetLastError() == ERROR_CALL_NOT_IMPLEMENTED ) ) { win_skip( "CreateDCW is not implemented\n" ); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 5a64fe6d60a..8dae908126d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -312,7 +312,6 @@ static int CALLBACK eto_scale_enum_proc(HDC hdc, HANDLETABLE *handle_table, static void test_ExtTextOutScale(void) { const RECT rc = { 0, 0, 100, 100 }; - const WCHAR str[] = {'a',0 }; struct eto_scale_test_record test; HDC hdcDisplay, hdcMetafile; HENHMETAFILE hMetafile; @@ -392,7 +391,7 @@ static void test_ExtTextOutScale(void) ok(ret, "SetViewportExtEx failed\n"); } - ret = ExtTextOutW(hdcMetafile, 0, 0, 0, 0, str, 1, NULL); + ret = ExtTextOutW(hdcMetafile, 0, 0, 0, 0, L"a", 1, NULL); ok(ret, "ExtTextOutW failed\n"); hMetafile = CloseEnhMetaFile(hdcMetafile); -- 2.26.2

Dec. 17, 2020

Re: [PATCH v2 1/2] winmm/tests: Test the mmioOpen() search path with various flags.

by Andrew Eikum

Well, you found a new bug. Your tests crash: https://testbot.winehq.org/JobDetails.pl?Key=83551#k401 This is because in mmioOpenW, we allocate only the space required to fit the input filename, but MMIO_PARSE needs room for at least 128 characters. (128 per the docs. Might as well do MAX_PATH.) I think you need the below diff before applying your patches. It ought to also copy the resulting filename back to the input buffer, but, code freeze. diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48d..4f13a34303c 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -733,10 +733,9 @@ HMMIO WINAPI mmioOpenW(LPWSTR szFileName, MMIOINFO* lpmmioinfo, if (szFileName) { - INT len = WideCharToMultiByte( CP_ACP, 0, szFileName, -1, NULL, 0, NULL, NULL ); - szFn = HeapAlloc( GetProcessHeap(), 0, len ); + szFn = HeapAlloc( GetProcessHeap(), 0, MAX_PATH ); if (!szFn) return NULL; - WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, len, NULL, NULL ); + WideCharToMultiByte( CP_ACP, 0, szFileName, -1, szFn, MAX_PATH, NULL, NULL ); } ret = MMIO_Open(szFn, lpmmioinfo, dwOpenFlags, TRUE); Andrew On Thu, Dec 17, 2020 at 02:34:26PM -0600, Zebediah Figura wrote: > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > v2: don't assume cwd == executable directory > > dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ > 1 file changed, 52 insertions(+), 8 deletions(-) > > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index e3984fbaf3a..0236855f246 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) > WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; > /* According to docs, filename must be no more than 128 bytes, but it will > * actually allow longer than that. */ > - WCHAR filename[] = L"very_long_filename_" > + WCHAR long_filename[] = L"very_long_filename_" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" > L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; > + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; > + char exedir_filename[MAX_PATH]; > + MMIOINFO info = {0}; > + BOOL ret; > + FILE *f; > + > + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); > + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); > + f = fopen(exedir_filename, "w"); > + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); > + fclose(f); > > GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); > GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); > SetCurrentDirectoryW(temp_dir); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > > /* open with MMIO_DENYNONE */ > - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); > + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); > ok(hmmio != NULL, "mmioOpen failed\n"); > > /* MMIO_DENYNONE lets us open it here, too */ > - handle = CreateFileW(filename, GENERIC_READ, > + handle = CreateFileW(long_filename, GENERIC_READ, > FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, > OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); > ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); > @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) > > mmioClose(hmmio, 0); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > > /* open with MMIO_EXCLUSIVE */ > - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); > + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); > ok(hmmio != NULL, "mmioOpen failed\n"); > > /* should fail due to MMIO_EXCLUSIVE */ > - handle = CreateFileW(filename, GENERIC_READ, > + handle = CreateFileW(long_filename, GENERIC_READ, > FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, > OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); > ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); > @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) > > mmioClose(hmmio, 0); > > - DeleteFileW(filename); > + DeleteFileW(long_filename); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); > + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + mmioClose(hmmio, 0); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); > + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); > + wcscpy(expect, temp_dir); > + wcscat(expect, L"test_mmio_path"); > + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); > + > + wcscpy(buffer, L"test_mmio_path"); > + info.wErrorRet = 0xdead; > + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); > + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); > + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); > + > + ret = DeleteFileA("test_mmio_path"); > + ok(!ret, "expected failure\n"); > + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); > + > + wcscpy(buffer, L"test_mmio_path"); > + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); > + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + mmioClose(hmmio, 0); > + > + ret = DeleteFileA("test_mmio_path"); > + ok(ret, "got error %u\n", GetLastError()); > > SetCurrentDirectoryW(cwd); > + > + ret = DeleteFileA(exedir_filename); > + ok(ret, "got error %u\n", GetLastError()); > } > > static void test_mmioSetBuffer(char *fname) > -- > 2.29.2 > >

Dec. 17, 2020

[PATCH v2 2/2] winmm: Search the default path when opening an existing file in create_file_OF().

by Zebediah Figura

Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/mmio.c | 24 ++++++++++++++++++++++-- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48d..c4838f388b6 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList; /* From kernel32 */ static HANDLE create_file_OF( LPCSTR path, INT mode ) { - DWORD access, sharing, creation; + DWORD access, sharing, creation, len; + char *full_path; + HANDLE ret; if (mode & OF_CREATE) { @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) case OF_SHARE_COMPAT: default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; } - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (mode & OF_CREATE) + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL ))) + return INVALID_HANDLE_VALUE; + if (!(full_path = malloc(len + 1))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return INVALID_HANDLE_VALUE; + } + if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL )) + { + free(full_path); + return INVALID_HANDLE_VALUE; + } + ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + free(full_path); + return ret; } /************************************************************************** diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 0236855f246..a2abb6c5f5c 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -533,7 +533,7 @@ static void test_mmioOpen_create(void) wcscpy(buffer, L"test_mmio_path"); hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); mmioClose(hmmio, 0); wcscpy(buffer, L"test_mmio_path"); -- 2.29.2

Dec. 17, 2020

[PATCH v2 1/2] winmm/tests: Test the mmioOpen() search path with various flags.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: don't assume cwd == executable directory dlls/winmm/tests/mmio.c | 60 +++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e3984fbaf3a..0236855f246 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -478,23 +478,34 @@ static void test_mmioOpen_create(void) WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; /* According to docs, filename must be no more than 128 bytes, but it will * actually allow longer than that. */ - WCHAR filename[] = L"very_long_filename_" + WCHAR long_filename[] = L"very_long_filename_" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; + char exedir_filename[MAX_PATH]; + MMIOINFO info = {0}; + BOOL ret; + FILE *f; + + GetModuleFileNameA(NULL, exedir_filename, ARRAY_SIZE(exedir_filename)); + strcpy(strrchr(exedir_filename, '\\') + 1, "test_mmio_path"); + f = fopen(exedir_filename, "w"); + ok(!!f, "failed to create %s: %s\n", debugstr_a(exedir_filename), strerror(errno)); + fclose(f); GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); SetCurrentDirectoryW(temp_dir); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_DENYNONE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); ok(hmmio != NULL, "mmioOpen failed\n"); /* MMIO_DENYNONE lets us open it here, too */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); @@ -502,14 +513,14 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_EXCLUSIVE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); ok(hmmio != NULL, "mmioOpen failed\n"); /* should fail due to MMIO_EXCLUSIVE */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); @@ -518,9 +529,42 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, L"test_mmio_path"); + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + wcscpy(buffer, L"test_mmio_path"); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); + + ret = DeleteFileA("test_mmio_path"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); SetCurrentDirectoryW(cwd); + + ret = DeleteFileA(exedir_filename); + ok(ret, "got error %u\n", GetLastError()); } static void test_mmioSetBuffer(char *fname) -- 2.29.2

Dec. 17, 2020

Re: [PATCH] inetcpl.cpl: If memory allocation fails,the program will carsh.

by Alexandre Julliard

"Haidong Yu" <yhd986(a)163.com> writes: > @@ -301,10 +301,10 @@ static INT_PTR security_on_initdialog(HWND hsec) > DWORD i; > > sd = heap_alloc_zero(sizeof(secdlg_data)); > - SetWindowLongPtrW(hsec, DWLP_USER, (LONG_PTR) sd); > if (!sd) { > return FALSE; > } > + SetWindowLongPtrW(hsec, DWLP_USER, (LONG_PTR) sd); This won't make any difference. -- Alexandre Julliard julliard(a)winehq.org

Dec. 17, 2020

Re: [PATCH 2/2] winmm: Search the default path when opening an existing file in create_file_OF().

by Andrew Eikum

This fails for me: wine.win64$ WINEPREFIX=$HOME/tmp/tmppfx/ make dlls/winmm/tests/mmio.ok ../wine/tools/runtest -q -P wine -T . -M winmm.dll -p dlls/winmm/tests/winmm_test.exe mmio && touch dlls/winmm/tests/mmio.ok mmio.c:533: Test failed: failed to open file, error 0x101 make: *** [Makefile:171981: dlls/winmm/tests/mmio.ok] Error 1 Excerpts from a +file log: 00d8:trace:file:CreateFileW L"test_mmio_path" GENERIC_WRITE FILE_SHARE_READ FILE_SHARE_WRITE creation 2 attributes 0x80 00d8:trace:file:nt_to_unix_file_name L"\\??\\Z:\\home\\andrew\\src\\wine.win64\\test_mmio_path" -> "/home/andrew/tmp/tmppfx/dosdevices/z:/home/andrew/src/wine.win64/test_mmio_path" 0034:trace:file:CreateFileW returning 0000000000000094 ... 00d8:trace:mmio:MMIO_Open ("test_mmio_path", 000000000031F180, 00000001, unicode); ... 00d8:warn:file:NtQueryAttributesFile L"\\??\\Z:\\home\\andrew\\src\\wine.win64\\dlls\\winmm\\tests\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\users\\andrew\\Temp\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\system32\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\system\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\system32\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\system32\\wbem\\test_mmio_path" not found (c0000034) 00d8:warn:file:NtQueryAttributesFile L"\\??\\C:\\windows\\system32\\WindowsPowershell\\v1.0\\test_mmio_path" not found (c0000034) mmio.c:533: Test failed: failed to open file, error 0x101 The same happens if I run it while in the <dlls/winmm/tests/> dir. Andrew On Thu, Dec 17, 2020 at 11:55:06AM -0600, Zebediah Figura wrote: > Based on a patch by Alistair Leslie-Hughes. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 > Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> > --- > dlls/winmm/mmio.c | 24 ++++++++++++++++++++++-- > dlls/winmm/tests/mmio.c | 2 +- > 2 files changed, 23 insertions(+), 3 deletions(-) > > diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c > index 48bbd3ed48d..c4838f388b6 100644 > --- a/dlls/winmm/mmio.c > +++ b/dlls/winmm/mmio.c > @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList; > /* From kernel32 */ > static HANDLE create_file_OF( LPCSTR path, INT mode ) > { > - DWORD access, sharing, creation; > + DWORD access, sharing, creation, len; > + char *full_path; > + HANDLE ret; > > if (mode & OF_CREATE) > { > @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) > case OF_SHARE_COMPAT: > default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; > } > - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + > + if (mode & OF_CREATE) > + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + > + if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL ))) > + return INVALID_HANDLE_VALUE; > + if (!(full_path = malloc(len + 1))) > + { > + SetLastError( ERROR_OUTOFMEMORY ); > + return INVALID_HANDLE_VALUE; > + } > + if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL )) > + { > + free(full_path); > + return INVALID_HANDLE_VALUE; > + } > + ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); > + free(full_path); > + return ret; > } > > /************************************************************************** > diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c > index 5ad20eec521..fc9ec802657 100644 > --- a/dlls/winmm/tests/mmio.c > +++ b/dlls/winmm/tests/mmio.c > @@ -530,7 +530,7 @@ static void test_mmioOpen_create(void) > > wcscpy(buffer, L"test_mmio_path"); > hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); > - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); > mmioClose(hmmio, 0); > > wcscpy(buffer, L"test_mmio_path"); > -- > 2.29.2 > >

Dec. 17, 2020

[PATCH 2/2] winmm: Search the default path when opening an existing file in create_file_OF().

by Zebediah Figura

Based on a patch by Alistair Leslie-Hughes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49650 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/mmio.c | 24 ++++++++++++++++++++++-- dlls/winmm/tests/mmio.c | 2 +- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mmio.c b/dlls/winmm/mmio.c index 48bbd3ed48d..c4838f388b6 100644 --- a/dlls/winmm/mmio.c +++ b/dlls/winmm/mmio.c @@ -51,7 +51,9 @@ static WINE_MMIO *MMIOList; /* From kernel32 */ static HANDLE create_file_OF( LPCSTR path, INT mode ) { - DWORD access, sharing, creation; + DWORD access, sharing, creation, len; + char *full_path; + HANDLE ret; if (mode & OF_CREATE) { @@ -79,7 +81,25 @@ static HANDLE create_file_OF( LPCSTR path, INT mode ) case OF_SHARE_COMPAT: default: sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; } - return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (mode & OF_CREATE) + return CreateFileA( path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + + if (!(len = SearchPathA( NULL, path, NULL, 0, NULL, NULL ))) + return INVALID_HANDLE_VALUE; + if (!(full_path = malloc(len + 1))) + { + SetLastError( ERROR_OUTOFMEMORY ); + return INVALID_HANDLE_VALUE; + } + if (!SearchPathA( NULL, path, NULL, len + 1, full_path, NULL )) + { + free(full_path); + return INVALID_HANDLE_VALUE; + } + ret = CreateFileA( full_path, access, sharing, NULL, creation, FILE_ATTRIBUTE_NORMAL, 0 ); + free(full_path); + return ret; } /************************************************************************** diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index 5ad20eec521..fc9ec802657 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -530,7 +530,7 @@ static void test_mmioOpen_create(void) wcscpy(buffer, L"test_mmio_path"); hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); - todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); mmioClose(hmmio, 0); wcscpy(buffer, L"test_mmio_path"); -- 2.29.2

Dec. 17, 2020

[PATCH 1/2] winmm/tests: Test the mmioOpen() search path with various flags.

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winmm/tests/mmio.c | 57 +++++++++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c index e3984fbaf3a..5ad20eec521 100644 --- a/dlls/winmm/tests/mmio.c +++ b/dlls/winmm/tests/mmio.c @@ -478,23 +478,31 @@ static void test_mmioOpen_create(void) WCHAR cwd[MAX_PATH], temp_dir[MAX_PATH]; /* According to docs, filename must be no more than 128 bytes, but it will * actually allow longer than that. */ - WCHAR filename[] = L"very_long_filename_" + WCHAR long_filename[] = L"very_long_filename_" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" L"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; + WCHAR buffer[MAX_PATH], expect[MAX_PATH]; + MMIOINFO info = {0}; + BOOL ret; + FILE *f; + + f = fopen("test_mmio_path", "w"); + ok(!!f, "failed to create file: %s\n", strerror(errno)); + fclose(f); GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd); GetTempPathW(ARRAY_SIZE(temp_dir), temp_dir); SetCurrentDirectoryW(temp_dir); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_DENYNONE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_DENYNONE); ok(hmmio != NULL, "mmioOpen failed\n"); /* MMIO_DENYNONE lets us open it here, too */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle != INVALID_HANDLE_VALUE, "Couldn't open non-exclusive file\n"); @@ -502,14 +510,14 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); /* open with MMIO_EXCLUSIVE */ - hmmio = mmioOpenW(filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); + hmmio = mmioOpenW(long_filename, NULL, MMIO_CREATE | MMIO_WRITE | MMIO_EXCLUSIVE); ok(hmmio != NULL, "mmioOpen failed\n"); /* should fail due to MMIO_EXCLUSIVE */ - handle = CreateFileW(filename, GENERIC_READ, + handle = CreateFileW(long_filename, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(handle == INVALID_HANDLE_VALUE, "Opening exclusive file should have failed\n"); @@ -518,9 +526,42 @@ static void test_mmioOpen_create(void) mmioClose(hmmio, 0); - DeleteFileW(filename); + DeleteFileW(long_filename); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE); + todo_wine ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_PARSE); + ok(hmmio == (HMMIO)TRUE, "failed to parse file name, error %#x\n", info.wErrorRet); + wcscpy(expect, temp_dir); + wcscat(expect, L"test_mmio_path"); + todo_wine ok(!wcscmp(buffer, expect), "expected %s, got %s\n", debugstr_w(expect), debugstr_w(buffer)); + + wcscpy(buffer, L"test_mmio_path"); + info.wErrorRet = 0xdead; + hmmio = mmioOpenW(buffer, &info, MMIO_EXIST); + ok(hmmio == (HMMIO)FALSE, "file should exist\n"); + todo_wine ok(info.wErrorRet == MMIOERR_FILENOTFOUND, "got error %#x\n", info.wErrorRet); + + ret = DeleteFileA("test_mmio_path"); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "got error %u\n", GetLastError()); + + wcscpy(buffer, L"test_mmio_path"); + hmmio = mmioOpenW(buffer, &info, MMIO_WRITE | MMIO_CREATE); + ok(!!hmmio, "failed to open file, error %#x\n", info.wErrorRet); + mmioClose(hmmio, 0); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); SetCurrentDirectoryW(cwd); + + ret = DeleteFileA("test_mmio_path"); + ok(ret, "got error %u\n", GetLastError()); } static void test_mmioSetBuffer(char *fname) -- 2.29.2

Dec. 17, 2020

Re: [RFC] Announcing Wayland driver development

by Alexandros Frantzis

On Wed, Dec 16, 2020 at 10:07:09AM -0600, Zebediah Figura (she/her) wrote: > On 12/16/20 2:44 AM, Julian Rüger wrote: <snip> > > > > You should talk to our tireless and competent staging developers, > > Zebediah Figura and Alistair Leslie-Hughes about that. > > That's probably about right. I would like to be sure that a Wayland > driver will be accepted upstream in some form or another before we take > it—I don't want to maintain any patch set in wine-staging forever, but > an entire graphics driver least of all. > > In particular I've seen a lot of concerns about the long list of things > Wayland can't support. Window positioning is one, but not the only by > far. See also [1] (not that I can personally verify the veracity of any > of these; I don't work with window managers). > > [1] https://bugs.winehq.org/show_bug.cgi?id=42284#c17 Hi Zebediah, Thank you for your comments and the link to the bug! I would like to use this opportunity to address some of the points mentioned in the bug report, since quite a few people may also have similar concerns. There is no question that the direct Wine->X11 path is likely to remain the most capable for the foreseeable future. However, since Wayland adoption is growing, and, by some accounts at least, X11 is becoming legacy, I think it's worth it for Wine to begin exploring the Wayland path. It won't be perfect in the beginning, although it may be "good enough" for most people, and given the special weight that Wine has, it may also help incentivize the implementation of missing Wayland functionality in the form of new extensions. Direct support for Wayland also provides access to modern features that may not be available to X11 clients. An example is HDR support, which is currently being worked on for Wayland [1], but unlikely to be supported on X11. --- Regarding some specific concerns: > global keybindings, clipboard, layout switching, screen capturing, > tray icons, With the exception of clipboard operations, for which Wayland has an official protocol, Wayland doesn't directly support the rest. However, a feature not being supported by Wayland doesn't mean much about its availability on a Wayland based system. Some features which were previously X11 requests, are now implemented using a completely different mechanism, mostly due to security considerations. For example, screen capturing is already supported through the xdg-portal mechanism on KDE, GNOME and wlroots based desktops. There are also discussions about implementing global key bindings in a similar way, or potentially as a Wayland protocol. --- I think some notes on XWayland are also warranted, since some may consider it to be a the way forward for Wine under Wayland. XWayland is privileged in many ways, being closely integrated with Wayland compositors. A Wayland compositor acts as the X11 window manager, which is how absolute window positioning from X11 can work on Wayland. Despite its special status, XWayland is still not given free rein over the compositor. There are many features which do not work through the X11 protocol on XWayland, and are likely to remain that way. Here is a list of such features that may be of interest to Wine: * screenshots, screencasting (except of other X11 windows) * global hotkeys * input grabs and eavesdropping * changing global state like "video card LUT" or video mode * controlling or inspecting other applications' windows (except possibly for other X11 apps) Some of these features will need to be accessed through the same alternative methods that one would need to use on direct Wayland too, some are waiting to be implemented with a Wayland protocol or other method, others are unlikely to ever be permitted on normal desktop systems. Due to the above, my opinion is that a direct Wayland driver is a much better long-term option for running Wine on Wayland. Thanks, Alexandros [1] https://www.collabora.com/news-and-blog/blog/2020/11/19/developing-wayland-…

Dec. 17, 2020

Re: [PATCH 2/2] widl: open files to write in binary mode

by Jacek Caban

On 17.12.2020 08:06, Steve Lhomme wrote: > > I meant that for generated files it's fine, so I agree with you. I > fear that forcing binary mode for input files as well may break > reading some files with windows line ending on Windows. I don't think > that's the case in mingw-w64 but it may have some side effects elsewhere. Note that binary mode results in more or less what we use on Unix, so if reading in text or binary mode changes output, it would most likely mean that we don't do it right on one of hosts. In practice, new lines are consumed by lexer and both modes should be fine. Jacek

Dec. 17, 2020

Re: TestBot job 83503 results: [PATCH] ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.

by Paul Gofman

Thanks. Yes, there are two problems with SIO_GET_INTERFACE_LIST: - It doesn't report loopback interface while it should (as GetAdaptersInfo() does not report it by design; I guess GetIpAddrTable() should be used instead); - There is a check to skip unconfigured interfaces with zero address, and the check is wrong (checks for '\0' char instead of '0'), so intrefaces with zero IP addresses are still returned. But fixes for these should probably wait until the code freeze end. On 12/17/20 13:40, Francois Gouget wrote: > On Thu, 17 Dec 2020, Paul Gofman wrote: > [...] >> Is it possible to see the output of 'ifconfig' from debiant? > You can't because it's not installed. But this should do: > > > diff --git a/Makefile.in b/Makefile.in > index b52495f741f..e07b8c39fab 100644 > --- a/Makefile.in > +++ b/Makefile.in > @@ -91,6 +91,7 @@ TOP_INSTALL_DEV = @TOP_INSTALL_DEV@ > > all: wine > @echo "Wine build complete." > + ip address > > # Rules for re-running configure > > diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c > index 98cc3881853..5d28df13498 100644 > --- a/dlls/ws2_32/tests/sock.c > +++ b/dlls/ws2_32/tests/sock.c > @@ -1,4 +1,4 @@ > -/* > +/* Dummy > * Unit test suite for winsock functions > * > * Copyright 2002 Martin Wilck > >

Dec. 17, 2020

[tools] testbot/RestoreVM: Explicitly deleting the old disks may not be necessary.

by Francois Gouget

Normally virsh undefine --remove-all-storage handles it but it does not follow the symbolic links. So tell rm not to complain if it finds no file to delete. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/RestoreVM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM index a31f3ea71d..bf99e4978a 100755 --- a/testbot/scripts/RestoreVM +++ b/testbot/scripts/RestoreVM @@ -641,7 +641,7 @@ then then fatal_no_cleanup "could not remove the existing '$opt_vm' VM" fi - [ -z "$olddisks" ] || dry_run rm $olddisks + [ -z "$olddisks" ] || dry_run rm -f $olddisks fi -- 2.20.1

Dec. 17, 2020

[tools] testbot/TestAgent: Also dereference symbolic links to better find $::RootDir.

by Francois Gouget

This allows putting a symbolic link to TestAgent in $PATH. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/TestAgent | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 40f443e462..10bdc63d1b 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -23,12 +23,10 @@ use strict; sub BEGIN { - if ($0 !~ m=^/=) - { - # Turn $0 into an absolute path so it can safely be used in @INC - require Cwd; - $0 = Cwd::cwd() . "/$0"; - } + # Turn $0 into an absolute path so it can safely be used in @INC. + # Also dereference symbolic links to better find $::RootDir. + use Cwd 'abs_path'; + $0 = abs_path($0); if ($0 =~ m=^(/.*)/[^/]+/[^/]+$=) { $::RootDir = $1; -- 2.20.1

Dec. 17, 2020

[tools] testbot/RestoreVM: Avoid errors when restoring a VM with no snapshot.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/scripts/RestoreVM | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/scripts/RestoreVM b/testbot/scripts/RestoreVM index bf99e4978a..a1b9d15846 100755 --- a/testbot/scripts/RestoreVM +++ b/testbot/scripts/RestoreVM @@ -677,6 +677,7 @@ then _dir="$1" for snapxml in "$_dir"/*.xml do + [ -f "$snapxml" ] || continue name=`basename "$snapxml" .xml` ctime=`sed -e 's~^.*<creationTime>$[0-9][0-9]*$</creationTime>.*$~\1~' -e t -e d "$snapxml"` echo "$ctime $name" -- 2.20.1

Dec. 17, 2020

Re: TestBot job 83503 results: [PATCH] ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.

by Francois Gouget

On Thu, 17 Dec 2020, Paul Gofman wrote: [...] > Is it possible to see the output of 'ifconfig' from debiant? You can't because it's not installed. But this should do: diff --git a/Makefile.in b/Makefile.in index b52495f741f..e07b8c39fab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -91,6 +91,7 @@ TOP_INSTALL_DEV = @TOP_INSTALL_DEV@ all: wine @echo "Wine build complete." + ip address # Rules for re-running configure diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 98cc3881853..5d28df13498 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1,4 +1,4 @@ -/* +/* Dummy * Unit test suite for winsock functions * * Copyright 2002 Martin Wilck -- Francois Gouget <fgouget(a)codeweavers.com>

Dec. 17, 2020

Re: TestBot job 83503 results: [PATCH] ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.

by Paul Gofman

On 12/17/20 12:25, Francois Gouget wrote: > On Wed, 16 Dec 2020, Paul Gofman wrote: > >> On 12/16/20 12:10, Marvin wrote: >>> ws2_32: >>> sock.c:10534: Test failed: Got unexpected ret 0. >>> sock.c:10535: Test failed: Got unexpected error 6. >>> sock.c:10536: Test failed: Got unexpected size 76. >> Can it be that Wine is not getting updated on Testbot? The tests results >> are like the changes to test are applied but ws2_32.dll is unchanged. > The "Show full task log" links show that ws2_32.dll.so was rebuilt. > > https://testbot.winehq.org/JobDetails.pl?Key=83503&f401=task.log#k401 > https://testbot.winehq.org/JobDetails.pl?Key=83503&f402=task.log#k402 > > Also, as far as I can tell, the WinePrefix only contains a fake dll so > it does not look like there any way the WinePrefix could use an old > version. > Yeah, indeed, and I figured that the failure is still there with the dummy patch after that patch was committed. That happens because WSAIoctl(...,SIO_GET_INTERFACE_LIST,...) finds just one appropriate interface which I honestly didn't expect. I've sent the patch which will avoid such test failure, but I am still curious how that can happen, I was under impression that at least loopback should be available besides the "normal" interface on Testbot. Maybe that indicates some issue in ws2_32 SIO_GET_INTERFACE_LIST or iphlpapi. Is it possible to see the output of 'ifconfig' from debiant?

Dec. 17, 2020