- Wine-Devel - list.winehq.org

[PATCH 2/9] msvcrt: Don't use strcmpW in wcscmp.
by Piotr Caban July 14, 2020

July 14, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 15 +++++++++++++++ dlls/msvcrt/wcs.c | 28 +++++++++++++++++++--------- 2 files changed, 34 insertions(+), 9 deletions(-)

1 0

[PATCH 1/9] ucrtbase: Add parameters validation to _timespec32_get function.
by Piotr Caban July 14, 2020

July 14, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[PATCH v2 1/6] wined3d: Fix / update reported driver model version.
by Matteo Bruni July 14, 2020

July 14, 2020

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/directx.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 454125c1462d..45f3f61f2fe7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -198,20 +198,26 @@ ULONG CDECL wined3d_decref(struct wined3d *wined3d) return refcount; } -/* Certain applications (Steam) complain if we report an outdated driver version. In general, - * reporting a driver version is moot because we are not the Windows driver, and we have different - * bugs, features, etc. +/* Certain applications (e.g. Steam) complain if we report an outdated driver + * version. * * The driver version has the form "x.y.z.w". * - * "x" is the Windows version the driver is meant for: + * "x" is the Windows version / driver model the driver is meant for: * 4 -> 95/98/NT4 * 5 -> 2000 - * 6 -> 2000/XP - * 7 -> Vista - * 8 -> Windows 7 - * 9 -> Windows 8 - * 10 -> Windows 10 + * 6 -> XP + * 7 -> Vista - WDDM 1.0 + * 8 -> Windows 7 - WDDM 1.1 + * 9 -> Windows 8 - WDDM 1.2 + * 10 -> Windows 8.1 - WDDM 1.3 + * 20 -> Windows 10 - WDDM 2.0 + * 21 -> Windows 10 Anniversary Update - WDDM 2.1 + * 22 -> Windows 10 Creators Update - WDDM 2.2 + * 23 -> Windows 10 Fall Creators Update - WDDM 2.3 + * 24 -> Windows 10 April 2018 Update - WDDM 2.4 + * 25 -> Windows 10 October 2018 Update - WDDM 2.5 + * 26 -> Windows 10 May 2019 Update - WDDM 2.6 * * "y" is the maximum Direct3D version the driver supports. * y -> d3d version mapping: @@ -705,20 +711,25 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, driver_os_version = 8; driver_model = DRIVER_MODEL_NT6X; } + else if (os_version.dwMinorVersion == 2) + { + driver_os_version = 9; + driver_model = DRIVER_MODEL_NT6X; + } else { if (os_version.dwMinorVersion > 3) { - FIXME("Unhandled OS version %u.%u, reporting Win 8.\n", + FIXME("Unhandled OS version %u.%u, reporting Windows 8.1.\n", os_version.dwMajorVersion, os_version.dwMinorVersion); } - driver_os_version = 9; + driver_os_version = 10; driver_model = DRIVER_MODEL_NT6X; } break; case 10: - driver_os_version = 10; + driver_os_version = 26; driver_model = DRIVER_MODEL_NT6X; break; -- 2.26.2

3 11

[PATCH] winecrt0: Do not expect jmp_buf to be aligned in __wine_longjmp on x86_64.
by Paul Gofman July 14, 2020

July 14, 2020

There is no guarantee that jmp_buf is 16 bytes aligned. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winecrt0/exception.c | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 137ee2d6ee3..d3ce8d1aebb 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -80,16 +80,16 @@ __ASM_GLOBAL_FUNC( __wine_setjmpex, "movq %r15,0x48(%rcx)\n\t" /* jmp_buf->R15 */ "movq (%rsp),%rax\n\t" "movq %rax,0x50(%rcx)\n\t" /* jmp_buf->Rip */ - "movdqa %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ - "movdqa %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ - "movdqa %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ - "movdqa %xmm9,0x90(%rcx)\n\t" /* jmp_buf->Xmm9 */ - "movdqa %xmm10,0xa0(%rcx)\n\t" /* jmp_buf->Xmm10 */ - "movdqa %xmm11,0xb0(%rcx)\n\t" /* jmp_buf->Xmm11 */ - "movdqa %xmm12,0xc0(%rcx)\n\t" /* jmp_buf->Xmm12 */ - "movdqa %xmm13,0xd0(%rcx)\n\t" /* jmp_buf->Xmm13 */ - "movdqa %xmm14,0xe0(%rcx)\n\t" /* jmp_buf->Xmm14 */ - "movdqa %xmm15,0xf0(%rcx)\n\t" /* jmp_buf->Xmm15 */ + "movq %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ + "movq %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ + "movq %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ + "movq %xmm9,0x90(%rcx)\n\t" /* jmp_buf->Xmm9 */ + "movq %xmm10,0xa0(%rcx)\n\t" /* jmp_buf->Xmm10 */ + "movq %xmm11,0xb0(%rcx)\n\t" /* jmp_buf->Xmm11 */ + "movq %xmm12,0xc0(%rcx)\n\t" /* jmp_buf->Xmm12 */ + "movq %xmm13,0xd0(%rcx)\n\t" /* jmp_buf->Xmm13 */ + "movq %xmm14,0xe0(%rcx)\n\t" /* jmp_buf->Xmm14 */ + "movq %xmm15,0xf0(%rcx)\n\t" /* jmp_buf->Xmm15 */ "xorq %rax,%rax\n\t" "retq" ) @@ -103,16 +103,16 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, "movq 0x38(%rcx),%r13\n\t" /* jmp_buf->R13 */ "movq 0x40(%rcx),%r14\n\t" /* jmp_buf->R14 */ "movq 0x48(%rcx),%r15\n\t" /* jmp_buf->R15 */ - "movdqa 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ - "movdqa 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ - "movdqa 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ - "movdqa 0x90(%rcx),%xmm9\n\t" /* jmp_buf->Xmm9 */ - "movdqa 0xa0(%rcx),%xmm10\n\t" /* jmp_buf->Xmm10 */ - "movdqa 0xb0(%rcx),%xmm11\n\t" /* jmp_buf->Xmm11 */ - "movdqa 0xc0(%rcx),%xmm12\n\t" /* jmp_buf->Xmm12 */ - "movdqa 0xd0(%rcx),%xmm13\n\t" /* jmp_buf->Xmm13 */ - "movdqa 0xe0(%rcx),%xmm14\n\t" /* jmp_buf->Xmm14 */ - "movdqa 0xf0(%rcx),%xmm15\n\t" /* jmp_buf->Xmm15 */ + "movq 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ + "movq 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ + "movq 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ + "movq 0x90(%rcx),%xmm9\n\t" /* jmp_buf->Xmm9 */ + "movq 0xa0(%rcx),%xmm10\n\t" /* jmp_buf->Xmm10 */ + "movq 0xb0(%rcx),%xmm11\n\t" /* jmp_buf->Xmm11 */ + "movq 0xc0(%rcx),%xmm12\n\t" /* jmp_buf->Xmm12 */ + "movq 0xd0(%rcx),%xmm13\n\t" /* jmp_buf->Xmm13 */ + "movq 0xe0(%rcx),%xmm14\n\t" /* jmp_buf->Xmm14 */ + "movq 0xf0(%rcx),%xmm15\n\t" /* jmp_buf->Xmm15 */ "movq 0x50(%rcx),%rdx\n\t" /* jmp_buf->Rip */ "movq 0x10(%rcx),%rsp\n\t" /* jmp_buf->Rsp */ "jmp *%rdx" ) -- 2.26.2

4 7

[PATCH v2] ntdll: Always align stack pointer in __wine_syscall_dispatcher on x64.
by Paul Gofman July 14, 2020

July 14, 2020

Syscall thunks break stack alignment for dispatcher. Regardless of that, it is probably better not to assume aligned stack in syscall thunk entry. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - fix jump destination in error branch (last jump). tools/winebuild/import.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 97191ca89ec..278de20522e 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1497,23 +1497,25 @@ void output_syscalls( DLLSPEC *spec ) * depends on us returning to it. Adjust the return address accordingly. */ output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tcmpq $%u,%%rax\n", count ); - output( "\tjae 3f\n" ); + output( "\tjae 4f\n" ); output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); - output( "\tjbe 1f\n" ); - output( "\tsubq %%rcx,%%rsp\n" ); + output( "\tja 1f\n" ); + output( "\tandq $~15,%%rsp\n\t" ); + output( "\tjmp 2f\n" ); + output( "1:\tsubq %%rcx,%%rsp\n" ); output( "\tshrq $3,%%rcx\n" ); output( "\tleaq 0x38(%%rbp),%%rsi\n" ); output( "\tandq $~15,%%rsp\n\t" ); output( "\tmovq %%rsp,%%rdi\n" ); output( "\tcld\n" ); output( "\trep; movsq\n" ); - output( "1:\tmovq %%r10,%%rcx\n" ); + output( "2:\tmovq %%r10,%%rcx\n" ); output( "\tsubq $0x20,%%rsp\n" ); output( "\tleaq .Lsyscall_table(%%rip),%%r10\n" ); output( "\tcallq *(%%r10,%%rax,8)\n" ); - output( "2:\tleaq -0x10(%%rbp),%%rsp\n" ); + output( "3:\tleaq -0x10(%%rbp),%%rsp\n" ); output( "\tpopq %%rdi\n" ); output_cfi( ".cfi_same_value %%rdi" ); output( "\tpopq %%rsi\n" ); @@ -1523,8 +1525,8 @@ void output_syscalls( DLLSPEC *spec ) output_cfi( ".cfi_adjust_cfa_offset -8" ); output_cfi( ".cfi_same_value %%rbp" ); output( "\tret\n" ); - output( "3:\tmovl $0x%x,%%eax\n", invalid_param ); - output( "\tjmp 2b\n" ); + output( "4:\tmovl $0x%x,%%eax\n", invalid_param ); + output( "\tjmp 3b\n" ); break; case CPU_ARM: output( "\tldr r1, 4f\n" ); -- 2.26.2

1 0

[PATCH v2 1/2] amstream: Add AMMediaStream::JoinFilterGraph() tests.
by Gijs Vermeulen July 14, 2020

July 14, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/tests/amstream.c | 84 ++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 2d9f3e35f2..a0876d6242 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4328,6 +4328,89 @@ static void test_ammediastream_join_filter(void) check_ammediastream_join_filter(&CLSID_AMDirectDrawStream); } +static void check_ammediastream_join_filter_graph(const MSPID *id) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IGraphBuilder *builder, *builder2; + IMediaStreamFilter *filter; + IAMMediaStream *stream; + IFilterGraph *graph; + FILTER_INFO info; + HRESULT hr; + ULONG ref; + + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!filter, "Expected non-null filter.\n"); + + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, id, 0, (IMediaStream **)&stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!builder, "Expected non-null graph.\n"); + EXPECT_REF(builder, 4); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph, (void **)&graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + /* Crashes on native. */ + if (0) + { + hr = IAMMediaStream_JoinFilterGraph(stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + } + + hr = IAMMediaStream_JoinFilterGraph(stream, graph); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &builder2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(builder2 == builder, "Expected graph %p, got %p.\n", builder, builder2); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IGraphBuilder_Release(builder2); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + hr = IMediaStreamFilter_QueryFilterInfo(filter, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pGraph == (IFilterGraph *)builder, "Expected graph %p, got %p.\n", (IFilterGraph *)builder, info.pGraph); + EXPECT_REF(builder, 5); + EXPECT_REF(graph, 1); + IFilterGraph_Release(info.pGraph); + EXPECT_REF(builder, 4); + EXPECT_REF(graph, 1); + + ref = IFilterGraph_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(builder); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +static void test_ammediastream_join_filter_graph(void) +{ + check_ammediastream_join_filter_graph(&MSPID_PrimaryAudio); + check_ammediastream_join_filter_graph(&MSPID_PrimaryVideo); +} + void test_mediastreamfilter_get_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5023,6 +5106,7 @@ START_TEST(amstream) test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); + test_ammediastream_join_filter_graph(); test_mediastreamfilter_get_state(); test_mediastreamfilter_stop_pause_run(); -- 2.27.0

2 3

[PATCH 6/6] server: Remove no longer needed fill_console_output request.
by Jacek Caban July 14, 2020

July 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 7 +++++++ server/console.c | 20 -------------------- server/protocol.def | 21 --------------------- server/trace.c | 26 -------------------------- tools/make_requests | 1 - 5 files changed, 7 insertions(+), 68 deletions(-)

2 1

Compiler requirement with wine-mono
by Michael Cronenworth July 14, 2020

July 14, 2020

Hi, I noticed that wine-mono 5.1.0 ships a binary compiler package inside of the source code tarball. Why was wine-mono switched from MinGW GCC to MinGW Clang? Is it now impossible to use MinGW GCC to build wine-mono? I'm attempting to ship an update to wine-mono in Fedora, but I cannot use the bundled binary compiler to do so, and I cannot get the source to compile with MinGW GCC. Thanks, Michael

2 2

[PATCH 5/6] kernel32: Use IOCTL_CONDRV_FILL_OUTPUT in CONSOLE_FillLineUniform.
by Jacek Caban July 14, 2020

July 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)

2 1

[PATCH 4/6] kernelbase: Use IOCTL_CONDRV_FILL_OUTPUT in fill_console_output.
by Jacek Caban July 14, 2020

July 14, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)

1 0