November 2017 - Wine-Commits

Nikolay Sivov : msvcp: Trace delimiter characters as single char strings.
by Alexandre Julliard Nov. 16, 2017

Nov. 16, 2017

Module: wine Branch: master Commit: 0c7d67c5fa7080e7b970a1b7054ba067658cd56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c7d67c5fa7080e7b970a1b70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 16 15:25:55 2017 +0300 msvcp: Trace delimiter characters as single char strings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 16 ++++++++-------- dlls/msvcp90/ios.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c index f5dabbf..fea2ade 100644 --- a/dlls/msvcp60/ios.c +++ b/dlls/msvcp60/ios.c @@ -7932,7 +7932,7 @@ basic_istream_char* __thiscall basic_istream_char_get_str_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -7978,7 +7978,7 @@ basic_istream_char* __thiscall basic_istream_char_get_streambuf_delim(basic_istr basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_an(&delim, 1)); this->count = 0; @@ -8022,7 +8022,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -8724,7 +8724,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_an(&delim, 1)); MSVCP_basic_string_char_clear(str); if(basic_istream_char_sentry_create(istream, TRUE)) { @@ -9400,7 +9400,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -9450,7 +9450,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1)); this->count = 0; @@ -9498,7 +9498,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -10397,7 +10397,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1)); MSVCP_basic_string_wchar_clear(str); if(basic_istream_wchar_sentry_create(istream, TRUE)) { diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 5d2f0ca..9ae9e65 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8414,7 +8414,7 @@ basic_istream_char* __thiscall basic_istream_char_get_str_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -8460,7 +8460,7 @@ basic_istream_char* __thiscall basic_istream_char_get_streambuf_delim(basic_istr basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_an(&delim, 1)); this->count = 0; @@ -8504,7 +8504,7 @@ basic_istream_char* __thiscall basic_istream_char_getline_delim(basic_istream_ch basic_ios_char *base = basic_istream_char_get_basic_ios(this); int ch = (unsigned char)delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_an(&delim, 1)); this->count = 0; @@ -9271,7 +9271,7 @@ basic_istream_char* __cdecl basic_istream_char_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = (unsigned char)delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_an(&delim, 1)); if(basic_istream_char_sentry_create(istream, TRUE)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); @@ -9957,7 +9957,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_str_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -10007,7 +10007,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_get_streambuf_delim(basic_is basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %c)\n", this, strbuf, delim); + TRACE("(%p %p %s)\n", this, strbuf, debugstr_wn(&delim, 1)); this->count = 0; @@ -10055,7 +10055,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_getline_delim(basic_istream_ basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); unsigned short ch = delim; - TRACE("(%p %p %s %c)\n", this, str, wine_dbgstr_longlong(count), delim); + TRACE("(%p %p %s %s)\n", this, str, wine_dbgstr_longlong(count), debugstr_wn(&delim, 1)); this->count = 0; @@ -11018,7 +11018,7 @@ basic_istream_wchar* __cdecl basic_istream_wchar_getline_bstr_delim( IOSB_iostate state = IOSTATE_goodbit; int c = delim; - TRACE("(%p %p %c)\n", istream, str, delim); + TRACE("(%p %p %s)\n", istream, str, debugstr_wn(&delim, 1)); if(basic_istream_wchar_sentry_create(istream, TRUE)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base);

1 0

André Hentschel : loader: Setup the TLS register on ARM64.
by Alexandre Julliard Nov. 16, 2017

Nov. 16, 2017

Module: wine Branch: master Commit: c08e5560c4179443f8b5f587a4fa0d3555958d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08e5560c4179443f8b5f587a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 15 23:32:02 2017 +0100 loader: Setup the TLS register on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/loader/preloader.c b/loader/preloader.c index e519457..725926e 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -457,6 +457,8 @@ SYSCALL_NOERR( wld_getegid, 108 /* SYS_getegid */ ); #elif defined(__aarch64__) +void *thread_data[256]; + /* * The _start function is the entry and exit point of this program * @@ -469,6 +471,8 @@ __ASM_GLOBAL_FUNC(_start, "mov x0, SP\n\t" "sub SP, SP, #144\n\t" /* allocate some space for extra aux values */ "str x0, [SP]\n\t" /* orig stack pointer */ + "ldr x0, =thread_data\n\t" + "msr tpidr_el0, x0\n\t" "mov x0, SP\n\t" /* ptr to orig stack pointer */ "bl wld_start\n\t" "ldr x1, [SP]\n\t" /* new stack pointer */

1 0

André Hentschel : loader: Remove dead code.
by Alexandre Julliard Nov. 16, 2017

Nov. 16, 2017

Module: wine Branch: master Commit: ebcac6d8f16111af3f8aa5e80c8b5ee6449f5a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebcac6d8f16111af3f8aa5e80… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 15 23:31:51 2017 +0100 loader: Remove dead code. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 5a4bb16..e519457 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -469,10 +469,8 @@ __ASM_GLOBAL_FUNC(_start, "mov x0, SP\n\t" "sub SP, SP, #144\n\t" /* allocate some space for extra aux values */ "str x0, [SP]\n\t" /* orig stack pointer */ - "str x30, [SP, #8]\n\t" "mov x0, SP\n\t" /* ptr to orig stack pointer */ "bl wld_start\n\t" - "ldr x30, [SP, #8]\n\t" "ldr x1, [SP]\n\t" /* new stack pointer */ "mov SP, x1\n\t" "mov x30, x0\n\t"

1 0

André Hentschel : configure: Set the main loader base address on ARM64.
by Alexandre Julliard Nov. 16, 2017

Nov. 16, 2017

Module: wine Branch: master Commit: 444550020af97935bbf220f5c5e9fd75cae29ee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=444550020af97935bbf220f5c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 15 23:30:55 2017 +0100 configure: Set the main loader base address on ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index dabb123..0da9bb5 100755 --- a/configure +++ b/configure @@ -8907,7 +8907,7 @@ if test "x$ac_cv_cflags__Wl___enable_new_dtags" = xyes; then : fi case $host_cpu in - *i[3456789]86* | x86_64) + *i[3456789]86* | x86_64 | *aarch64*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 $as_echo_n "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } if ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+:} false; then : diff --git a/configure.ac b/configure.ac index 637979a..0ec136d 100644 --- a/configure.ac +++ b/configure.ac @@ -920,7 +920,7 @@ case $host_os in [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"]) case $host_cpu in - *i[[3456789]]86* | x86_64) + *i[[3456789]]86* | x86_64 | *aarch64*) WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;;

1 0

Huw Davies : rsaenh: CALG_AES is not supported.
by Alexandre Julliard Nov. 16, 2017

Nov. 16, 2017

Module: wine Branch: master Commit: d192e9a1995a1720f0dd0500fc34847cc9e157d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d192e9a1995a1720f0dd0500f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 16 12:03:29 2017 +0000 rsaenh: CALG_AES is not supported. This is the correct fix for what commit f5c687e3652004e4efebe9352aadd02d179603cf was trying to fix. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 13 +------------ dlls/rsaenh/tests/rsaenh.c | 9 +++++++++ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index f2f5960..fdf410a 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -242,7 +242,6 @@ static const PROV_ENUMALGS_EX aProvEnumAlgsEx[5][RSAENH_MAX_ENUMALGS+1] = {CALG_DES, 56, 56, 56, 0, S("DES"), S("Data Encryption Standard (DES)")}, {CALG_3DES_112, 112, 112, 112, 0, S("3DES TWO KEY"), S("Two Key Triple DES")}, {CALG_3DES, 168, 168, 168, 0, S("3DES"), S("Three Key Triple DES")}, - {CALG_AES, 128, 128, 128, 0, S("AES"), S("Advanced Encryption Standard (AES)")}, {CALG_AES_128, 128, 128, 128, 0, S("AES-128"), S("Advanced Encryption Standard (AES-128)")}, {CALG_AES_192, 192, 192, 192, 0, S("AES-192"), S("Advanced Encryption Standard (AES-192)")}, {CALG_AES_256, 256, 256, 256, 0, S("AES-256"), S("Advanced Encryption Standard (AES-256)")}, @@ -791,7 +790,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK { HCRYPTKEY hCryptKey; CRYPTKEY *pCryptKey; - DWORD dwKeyLen = HIWORD(dwFlags), bKeyLen = dwKeyLen; + DWORD dwKeyLen = HIWORD(dwFlags); const PROV_ENUMALGS_EX *peaAlgidInfo; *ppCryptKey = NULL; @@ -850,14 +849,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK */ break; - case CALG_AES: - if (!bKeyLen) - { - TRACE("missing key len for CALG_AES\n"); - SetLastError(NTE_BAD_ALGID); - return (HCRYPTKEY)INVALID_HANDLE_VALUE; - } - /* fall through */ default: if (dwKeyLen % 8 || dwKeyLen > peaAlgidInfo->dwMaxLen || @@ -924,7 +915,6 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK pCryptKey->dwMode = CRYPT_MODE_CBC; break; - case CALG_AES: case CALG_AES_128: case CALG_AES_192: case CALG_AES_256: @@ -3197,7 +3187,6 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP case CALG_DES: case CALG_3DES_112: case CALG_3DES: - case CALG_AES: case CALG_AES_128: case CALG_AES_192: case CALG_AES_256: diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c9532b2..bc8e798 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -224,6 +224,15 @@ static BOOL init_aes_environment(void) result = CryptGenKey(hProv, AT_SIGNATURE, 0, &hKey); ok(result, "%08x\n", GetLastError()); if (result) CryptDestroyKey(hKey); + + /* CALG_AES is not supported, but CALG_AES_128 is */ + result = CryptGenKey(hProv, CALG_AES, 0, &hKey); + ok(!result && GetLastError() == NTE_BAD_ALGID, "%d %08x\n", result, GetLastError()); + result = CryptGenKey(hProv, CALG_AES, 128 << 16, &hKey); + ok(!result && GetLastError() == NTE_BAD_ALGID, "%d %08x\n", result, GetLastError()); + result = CryptGenKey(hProv, CALG_AES_128, 0, &hKey); + ok(result, "%08x\n", GetLastError()); + if (result) CryptDestroyKey(hKey); } return TRUE; }

1 0

Sebastian Lackner : ntdll: Avoid crash when trying to access page prot of address beyond address space limit.
by Alexandre Julliard Nov. 16, 2017

Nov. 16, 2017

Module: wine Branch: master Commit: 959d240cbe5f13612ee7fb6fc0aaaef87c436118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=959d240cbe5f13612ee7fb6fc… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 16 14:14:01 2017 +0100 ntdll: Avoid crash when trying to access page prot of address beyond address space limit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index d28b138..21ccdaa 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -185,6 +185,7 @@ static BYTE get_page_vprot( const void *addr ) size_t idx = (size_t)addr >> page_shift; #ifdef _WIN64 + if ((idx >> pages_vprot_shift) >= pages_vprot_size) return 0; if (!pages_vprot[idx >> pages_vprot_shift]) return 0; return pages_vprot[idx >> pages_vprot_shift][idx & pages_vprot_mask]; #else

1 0

Henri Verbeet : d3d11/tests: Introduce a format compatibility test.
by Alexandre Julliard Nov. 16, 2017

Nov. 16, 2017

Module: wine Branch: master Commit: 021ae0c3d3129d9862bba13d41615affbbd046dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=021ae0c3d3129d9862bba13d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 16 02:41:42 2017 +0330 d3d11/tests: Introduce a format compatibility test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5474be4..59f2e6e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -22315,6 +22315,138 @@ static void test_conservative_depth_output(void) release_test_context(&test_context); } +static void test_format_compatibility(void) +{ + ID3D11Texture2D *dst_texture, *src_texture; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + DWORD colour, expected; + ID3D11Device *device; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + static const struct + { + DXGI_FORMAT src_format; + DXGI_FORMAT dst_format; + size_t texel_size; + BOOL success; + } + test_data[] = + { + {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_SNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_SINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM, 4, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R16G16_UINT, 4, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R16G16_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16_UINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, + {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + }; + static const DWORD initial_data[16] = {0}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + ID3D11Device_GetImmediateContext(device, &context); + + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + unsigned int x, y, texel_dwords; + D3D11_BOX box; + + texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); + texture_desc.Format = test_data[i].src_format; + texture_desc.Usage = D3D11_USAGE_IMMUTABLE; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + + texture_desc.Format = test_data[i].dst_format; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, texture_desc.Width - 1, texture_desc.Height - 1, 1); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, 1, 1, 0, + (ID3D11Resource *)src_texture, 0, &box); + + texel_dwords = test_data[i].texel_size / sizeof(DWORD); + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success && x >= texel_dwords && y + ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)dst_texture, (ID3D11Resource *)src_texture); + + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D11Texture2D_Release(dst_texture); + ID3D11Texture2D_Release(src_texture); + } + + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -22420,4 +22552,5 @@ START_TEST(d3d11) test_fractional_viewports(); test_early_depth_stencil(); test_conservative_depth_output(); + test_format_compatibility(); }

1 0

Alexandre Julliard : patches: Detect test failures from Marvin' s reply email.
by Alexandre Julliard Nov. 16, 2017

Nov. 16, 2017

Module: tools Branch: master Commit: 64e4f2c1dedb9aa3f4972fa36cff02520c194f92 URL: http://source.winehq.org/git/tools.git/?a=commit;h=64e4f2c1dedb9aa3f4972fa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 15 17:33:19 2017 +0100 patches: Detect test failures from Marvin's reply email. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/patches/update b/patches/update index 963a5db..95e7841 100755 --- a/patches/update +++ b/patches/update @@ -149,6 +149,7 @@ foreach my $file (readdir DIR) { utf8::decode($_); if (/^Subject: (.*)$/) { $patch{"subject"} = $1; } + elsif (/^From: Marvin <testbot\(a)winehq.org>$/) { $patch{"from_marvin"} = 1; } elsif (/^From: (.*)$/) { $patch{"author"} = format_author($1); } elsif (/^Message-Id: (.*)$/) { $patch{"msgid"} = $1; } elsif (/^In-Reply-To: (.*)$/) { $patch{"reply"} = $1; } @@ -169,7 +170,9 @@ foreach my $file (readdir DIR) close PATCH; $patch{"id"} = $file; + $patch{"author"} = "Marvin (Testbot)" if $patch{"from_marvin"}; $patch{"status"} = "nil"; + if (open STATUS, "<$dir/$file.status") { my $status = <STATUS>; @@ -192,6 +195,7 @@ foreach my $file (readdir DIR) close REVIEW; } $patch{"testbot"} = ""; + $patch{"testclass"} = "testbot"; $patch{"testjob"} = ""; $patch{"testurl"} = ""; if (-f "$dir/$file.testbot") @@ -211,7 +215,8 @@ foreach my $file (readdir DIR) } if (-f "$dir/$file.testfail") { - $patch{"testbot"} = "Failed"; + $patch{"testbot"} = "<a href=\"data/$file.testfail\">Failed</a>"; + $patch{"testclass"} = "testbot botfail"; } if (defined $patch{"msgid"}) { @@ -243,6 +248,11 @@ sub assign_parent($) $patch->{"parent"} = $parent; push @{$parent->{"children"}}, $patch; push @{$parent->{"signoff"}}, @{$patch->{"signoff"}} if $patch->{"signoff"}; + if ($patch->{"from_marvin"}) + { + $parent->{"testbot"} = "<a href=\"data/$patch->{id}\">Failed</a>"; + $parent->{"testclass"} = "testbot botfail"; + } return $parent; } return undef; @@ -263,6 +273,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k if (!defined $patch->{"has_patch"}) # skip non-patches { next if $patch->{"status"} eq "reply"; + next if $patch->{"from_marvin"}; next unless $patch->{"subject"} =~ /\[.*PATCH.*\]/; } @@ -295,19 +306,11 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { printf INDEX "<td class=\"failmark\">X</td>"; } - if ($patch->{"testbot"} eq "Failed") - { - print INDEX "<td class=\"testbot botfail\"><a href=\"data/$file.testfail\">Failed</a></td>"; - } - else - { - printf INDEX "<td class=\"testbot\">%s</td>", $patch->{"testbot"}; - } + printf INDEX "<td class=\"%s\">%s</td>", $patch->{"testclass"}, $patch->{"testbot"}; if ($patch->{"testjob"} && $patch->{"testurl"}) { printf INDEX "<td class=\"%s\"><a href=\"%s\">%s</a></td>", - ($patch->{"testbot"} eq "Failed") ? " testbot botfail" : "testbot", - $patch->{"testurl"}, $patch->{"testjob"}; + $patch->{"testclass"}, $patch->{"testurl"}, $patch->{"testjob"}; } else {

1 0

Alexandre Julliard : testbot: Stop creating testfail files.
by Alexandre Julliard Nov. 16, 2017

Nov. 16, 2017

Module: tools Branch: master Commit: 5de4fe53e9e8fbcbf0a130e1efd73ac9477ca57a URL: http://source.winehq.org/git/tools.git/?a=commit;h=5de4fe53e9e8fbcbf0a130e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 16 14:57:24 2017 +0100 testbot: Stop creating testfail files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index e00c276..4d872a4 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -455,18 +455,6 @@ EOF if (defined $Patch->WebPatchId and -d "$DataDir/webpatches") { my $BaseName = "$DataDir/webpatches/" . $Patch->WebPatchId; - if ($Messages) - { - if (open(my $testfail, ">", "$BaseName.testfail")) - { - print $testfail $Messages; - close($testfail); - } - else - { - LogMsg "Job " . $Job->Id . ": Unable to open '$BaseName.testfail' for writing: $!"; - } - } if (open (my $result, ">", "$BaseName.testbot")) { print $result "Status: " . ($Messages ? "Failed" : "OK") . "\n";

1 0

Józef Kucia : wined3d: Allow copies between compatible formats in wined3d_device_copy_sub_resource_region ().
by Alexandre Julliard Nov. 15, 2017

Nov. 15, 2017

Module: wine Branch: master Commit: 7374c8325dcfc0e70b3032cdf5702f5d50833271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7374c8325dcfc0e70b3032cdf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Nov 16 01:01:04 2017 +0330 wined3d: Allow copies between compatible formats in wined3d_device_copy_sub_resource_region(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 13 +++++++++++++ dlls/wined3d/device.c | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 50bba6b..3b0b483 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1393,6 +1393,7 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface); struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface); + struct wined3d_sub_resource_desc src_desc, dst_desc; struct wined3d_box src_box; HRESULT hr; @@ -1403,6 +1404,18 @@ static HRESULT WINAPI d3d9_device_UpdateSurface(IDirect3DDevice9Ex *iface, wined3d_box_set(&src_box, src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1); wined3d_mutex_lock(); + + wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &src_desc); + wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &dst_desc); + if (src_desc.format != dst_desc.format) + { + wined3d_mutex_unlock(); + WARN("Surface formats (%#x/%#x) don't match.\n", + d3dformat_from_wined3dformat(src_desc.format), + d3dformat_from_wined3dformat(dst_desc.format)); + return D3DERR_INVALIDCALL; + } + hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0, dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture), diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1995a50..9fbf3b0 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4100,9 +4100,10 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - if (src_resource->format->id != dst_resource->format->id) + if (src_resource->format->typeless_id != dst_resource->format->typeless_id + || (!src_resource->format->typeless_id && src_resource->format->id != dst_resource->format->id)) { - WARN("Resource formats (%s / %s) don't match.\n", + WARN("Resource formats %s and %s are incompatible.\n", debug_d3dformat(dst_resource->format->id), debug_d3dformat(src_resource->format->id)); return WINED3DERR_INVALIDCALL;

1 0