July 2020 - Wine-devel - list.winehq.org

[PATCH 8/9] msvcrt: Don't use strncmpiW in _wcsnicmp_l.
by Piotr Caban 14 Jul '20

14 Jul '20

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

1 0

[PATCH 7/9] msvcrt: Don't use strncmpiW in _wcsnicoll_l.
by Piotr Caban 14 Jul '20

14 Jul '20

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

1 0

[PATCH 6/9] msvcrt: Don't use strncmpW in msvcrt_get_flags.
by Piotr Caban 14 Jul '20

14 Jul '20

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

1 0

[PATCH 5/9] msvcrt: Don't use strncmpW in wcsncmp.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)

1 0

[PATCH 4/9] msvcrt: Don't use strcmpiW in _wcsicmp_l.
by Piotr Caban 14 Jul '20

14 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 69 ++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 31 deletions(-)

1 0

[PATCH 3/9] msvcrt: Don't use strcmpiW in _wcsicoll_l.
by Piotr Caban 14 Jul '20

14 Jul '20

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

1 0

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

14 Jul '20

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 14 Jul '20

14 Jul '20

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 14 Jul '20

14 Jul '20

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 14 Jul '20

14 Jul '20

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