June 2015 - Wine-commits - list.winehq.org

Hans Leidekker : qmgr/tests: Add tests.
by Alexandre Julliard 15 Jun '15

15 Jun '15

Module: wine Branch: master Commit: c5a969904f9f06cbe9d29bf14f7d4efc7d78f590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a969904f9f06cbe9d29bf14… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 12 15:07:46 2015 +0200 qmgr/tests: Add tests. --- dlls/qmgr/tests/enum_files.c | 1 + dlls/qmgr/tests/job.c | 250 ++++++++++++++++++++++++++++++++++++++----- dlls/qmgr/tests/qmgr.c | 1 - 3 files changed, 223 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5a969904f9f06cbe9d29…

1 0

Alexandre Julliard : Wine release 1.7.45
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: website Branch: master Commit: 0bf3e26310f58fdbd6f8351c0f64f4680eccf6e0 URL: http://source.winehq.org/git/website.git/?a=commit;h=0bf3e26310f58fdbd6f835… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 21:36:22 2015 +0900 Wine release 1.7.45 --- news/en/2015061201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015061201.xml b/news/en/2015061201.xml new file mode 100644 index 0000000..4b8849c --- /dev/null +++ b/news/en/2015061201.xml @@ -0,0 +1,16 @@ +<news> +<date>June 12, 2015</date> +<title>Wine 1.7.45 Released</title> +<body> + The Wine development release 1.7.45 is now available. + <a href="{$root}/announce/1.7.45">What's new</a> in this release: +<ul> + <li>Better debugging support on 64-bit Mac OS X.</li> + <li>Some more progress on DirectWrite implementation.</li> + <li>A number of RichEdit control fixes.</li> + <li>Beginning implementation of the old MSVCIRT C++ runtime.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.45.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Vincent Povirk : ole32: Fix storage locking for read-only exclusive mode.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 3f83b788d4663d321af6de4ee5885b645e5ad485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f83b788d4663d321af6de4ee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 11 16:37:25 2015 -0500 ole32: Fix storage locking for read-only exclusive mode. --- dlls/ole32/storage32.c | 8 ++++++++ dlls/ole32/tests/storage32.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index bde8481..b1bad38 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5031,6 +5031,14 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_WRITE || share_mode == STGM_SHARE_EXCLUSIVE)) hr = StorageImpl_CheckLockRange(This, RANGELOCK_WRITE_FIRST, RANGELOCK_WRITE_LAST, STG_E_LOCKVIOLATION); + if (SUCCEEDED(hr) && STGM_ACCESS_MODE(openFlags) == STGM_READ && share_mode == STGM_SHARE_EXCLUSIVE) + { + hr = StorageImpl_CheckLockRange(This, 0, RANGELOCK_CHECKLOCKS-1, STG_E_LOCKVIOLATION); + + if (SUCCEEDED(hr)) + hr = StorageImpl_CheckLockRange(This, RANGELOCK_CHECKLOCKS+1, RANGELOCK_LAST, STG_E_LOCKVIOLATION); + } + /* Then grab our locks. */ if (SUCCEEDED(hr) && (openFlags & STGM_PRIORITY) == STGM_PRIORITY) { diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e83ae2a..0113d1b 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3185,8 +3185,8 @@ static const struct lock_test lock_tests[] = { { STGM_READWRITE|STGM_TRANSACTED|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, rwdw_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, - { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, - { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, TRUE }, + { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE }, + { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE }, }; static BOOL can_open(LPCWSTR filename, DWORD access, DWORD sharing)

1 0

Thomas Faller : cmd: Fix access of uninitialized memory.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 43dfe7637670d51ddab43c487e772109b7708fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dfe7637670d51ddab43c487… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Thu Jun 11 22:14:11 2015 +0200 cmd: Fix access of uninitialized memory. --- programs/cmd/builtins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 724da20..30b8684 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3313,7 +3313,8 @@ void WCMD_setshow_default (const WCHAR *args) { WINE_TRACE("Request change to directory '%s'\n", wine_dbgstr_w(args)); /* Skip /D and trailing whitespace if on the front of the command line */ - if (CompareStringW(LOCALE_USER_DEFAULT, + if (strlenW(args) >= 2 && + CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, args, 2, parmD, -1) == CSTR_EQUAL) { args += 2;

1 0

Iván Matellanes : msvcirt/tests: Add more streambuf tests.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: b36a526f5a568bd0075e264c73e1650aa2436980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b36a526f5a568bd0075e264c7… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jun 12 11:51:48 2015 +0200 msvcirt/tests: Add more streambuf tests. --- dlls/msvcirt/tests/msvcirt.c | 51 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 057c6c8..3ee987b 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -196,7 +196,7 @@ static DWORD WINAPI lock_streambuf(void *arg) static void test_streambuf(void) { - streambuf sb, sb2, *psb; + streambuf sb, sb2, sb3, *psb; struct streambuf_lock_arg lock_arg; HANDLE thread; char reserve[16]; @@ -205,6 +205,7 @@ static void test_streambuf(void) memset(&sb, 0xab, sizeof(streambuf)); memset(&sb2, 0xab, sizeof(streambuf)); + memset(&sb3, 0xab, sizeof(streambuf)); /* constructors */ call_func1(p_streambuf_ctor, &sb); @@ -219,6 +220,11 @@ static void test_streambuf(void) ok(sb2.base == reserve, "wrong base pointer, expected %p got %p\n", reserve, sb2.base); ok(sb2.ebuf == reserve+16, "wrong ebuf pointer, expected %p got %p\n", reserve+16, sb2.ebuf); ok(sb.lock.LockCount == -1, "wrong critical section state, expected -1 got %d\n", sb.lock.LockCount); + call_func1(p_streambuf_ctor, &sb3); + ok(sb3.allocated == 0, "wrong allocate value, expected 0 got %d\n", sb3.allocated); + ok(sb3.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", sb3.unbuffered); + ok(sb3.base == NULL, "wrong base pointer, expected %p got %p\n", NULL, sb3.base); + ok(sb3.ebuf == NULL, "wrong ebuf pointer, expected %p got %p\n", NULL, sb3.ebuf); /* setlock */ ok(sb.do_lock == -1, "expected do_lock value -1, got %d\n", sb.do_lock); @@ -326,34 +332,58 @@ static void test_streambuf(void) ok(ret == 1, "doallocate failed, got %d\n", ret); ok(sb2.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb2.allocated); ok(sb2.ebuf - sb2.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb2.ebuf, sb2.base); + ret = (int) call_func1(p_streambuf_doallocate, &sb3); + ok(ret == 1, "doallocate failed, got %d\n", ret); + ok(sb3.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb3.allocated); + ok(sb3.ebuf - sb3.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb3.ebuf, sb3.base); + + /* sb: buffered, space available */ + sb.eback = sb.gptr = sb.base; + sb.egptr = sb.base + 256; + sb.pbase = sb.pptr = sb.base + 256; + sb.epptr = sb.base + 512; + /* sb2: buffered, no space available */ + sb2.eback = sb2.base; + sb2.gptr = sb2.egptr = sb2.base + 256; + sb2.pbase = sb2.base + 256; + sb2.pptr = sb2.epptr = sb2.base + 512; + /* sb3: unbuffered */ + sb3.unbuffered = 1; /* gbump */ - sb.eback = sb.base + 100; - sb.gptr = sb.base + 104; - sb.egptr = sb.base + 110; call_func2(p_streambuf_gbump, &sb, 10); - ok(sb.gptr == sb.eback + 14, "advance get pointer failed, expected %p got %p\n", sb.eback + 14, sb.gptr); + ok(sb.gptr == sb.eback + 10, "advance get pointer failed, expected %p got %p\n", sb.eback + 10, sb.gptr); call_func2(p_streambuf_gbump, &sb, -15); - ok(sb.gptr == sb.eback - 1, "advance get pointer failed, expected %p got %p\n", sb.eback - 1, sb.gptr); + ok(sb.gptr == sb.eback - 5, "advance get pointer failed, expected %p got %p\n", sb.eback - 5, sb.gptr); + sb.gptr = sb.eback; /* pbump */ - sb.pbase = sb.pptr = sb.base + 200; - sb.epptr = sb.base + 210; call_func2(p_streambuf_pbump, &sb, -2); ok(sb.pptr == sb.pbase - 2, "advance put pointer failed, expected %p got %p\n", sb.pbase - 2, sb.pptr); call_func2(p_streambuf_pbump, &sb, 20); ok(sb.pptr == sb.pbase + 18, "advance put pointer failed, expected %p got %p\n", sb.pbase + 18, sb.pptr); + sb.pptr = sb.pbase; /* sync */ ret = (int) call_func1(p_streambuf_sync, &sb); ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); sb.gptr = sb.egptr; ret = (int) call_func1(p_streambuf_sync, &sb); - ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); - sb.pptr = sb.pbase; + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb.gptr = sb.egptr + 1; ret = (int) call_func1(p_streambuf_sync, &sb); + todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb.gptr = sb.eback; + ret = (int) call_func1(p_streambuf_sync, &sb2); + ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); + sb2.pptr = sb2.pbase; + ret = (int) call_func1(p_streambuf_sync, &sb2); ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb2.pptr = sb2.pbase - 1; ret = (int) call_func1(p_streambuf_sync, &sb2); + todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + sb2.pptr = sb2.epptr; + ret = (int) call_func1(p_streambuf_sync, &sb3); ok(ret == 0, "sync failed, expected 0 got %d\n", ret); SetEvent(lock_arg.test[3]); @@ -361,6 +391,7 @@ static void test_streambuf(void) call_func1(p_streambuf_dtor, &sb); call_func1(p_streambuf_dtor, &sb2); + call_func1(p_streambuf_dtor, &sb3); for (i = 0; i < 4; i++) { CloseHandle(lock_arg.lock[i]); CloseHandle(lock_arg.test[i]);

1 0

Iván Matellanes : msvcirt: Fix implementation of streambuf::sync.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: c69ac67206c833d7b44d18d4e928fd41005ef636 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69ac67206c833d7b44d18d4e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jun 12 11:51:54 2015 +0200 msvcirt: Fix implementation of streambuf::sync. --- dlls/msvcirt/msvcirt.c | 2 +- dlls/msvcirt/tests/msvcirt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index ae644b3..8c05fe3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -457,7 +457,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_sync, 4) int __thiscall streambuf_sync(streambuf *this) { TRACE("(%p)\n", this); - return (this->gptr == this->egptr && this->pbase == this->pptr) ? 0 : EOF; + return (this->gptr >= this->egptr && this->pbase >= this->pptr) ? 0 : EOF; } /* ?unbuffered(a)streambuf@@IAEXH(a)Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3ee987b..1a6ce5d 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -372,7 +372,7 @@ static void test_streambuf(void) ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb.gptr = sb.egptr + 1; ret = (int) call_func1(p_streambuf_sync, &sb); - todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb.gptr = sb.eback; ret = (int) call_func1(p_streambuf_sync, &sb2); ok(ret == EOF, "sync failed, expected EOF got %d\n", ret); @@ -381,7 +381,7 @@ static void test_streambuf(void) ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb2.pptr = sb2.pbase - 1; ret = (int) call_func1(p_streambuf_sync, &sb2); - todo_wine ok(ret == 0, "sync failed, expected 0 got %d\n", ret); + ok(ret == 0, "sync failed, expected 0 got %d\n", ret); sb2.pptr = sb2.epptr; ret = (int) call_func1(p_streambuf_sync, &sb3); ok(ret == 0, "sync failed, expected 0 got %d\n", ret);

1 0

Huw Davies : wininet/tests: Fix tests on Win 2k.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 53dbffd31430e168234925f8406e49e24b09c7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53dbffd31430e168234925f84… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 12 10:34:13 2015 +0100 wininet/tests: Fix tests on Win 2k. --- dlls/wininet/tests/http.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bd4ca54..df7dd07 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4838,7 +4838,13 @@ static void test_secure_connection(void) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret, "HttpSendRequest failed: %d\n", GetLastError()); + ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), + "HttpSendRequest failed: %d\n", GetLastError()); + if (!ret) + { + win_skip("Cannot connect to https.\n"); + goto done; + } size = sizeof(flags); ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); @@ -4963,6 +4969,7 @@ static void test_secure_connection(void) } HeapFree(GetProcessHeap(), 0, certificate_structW); +done: InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses);

1 0

Huw Davies : user32/tests: Use the correct codepage for WM_CHAR tests.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 30c529c9f7baf683faf66a100a1e754949720aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c529c9f7baf683faf66a100… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 12 10:34:32 2015 +0100 user32/tests: Use the correct codepage for WM_CHAR tests. --- dlls/user32/tests/msg.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5ef3840..5cbfec8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11964,6 +11964,18 @@ static void test_SetForegroundWindow(void) DestroyWindow(hwnd); } +static DWORD get_input_codepage( void ) +{ + DWORD cp; + int ret; + HKL hkl = GetKeyboardLayout( 0 ); + + ret = GetLocaleInfoW( LOWORD(hkl), LOCALE_IDEFAULTANSICODEPAGE | LOCALE_RETURN_NUMBER, + (WCHAR *)&cp, sizeof(cp) / sizeof(WCHAR) ); + if (!ret) cp = CP_ACP; + return cp; +} + static void test_dbcs_wm_char(void) { BYTE dbch[2]; @@ -11977,6 +11989,7 @@ static void test_dbcs_wm_char(void) UINT i, j, k; struct message wmCharSeq[2]; BOOL ret; + DWORD cp = get_input_codepage(); if (!pGetCPInfoExA) { @@ -11984,7 +11997,7 @@ static void test_dbcs_wm_char(void) return; } - pGetCPInfoExA( CP_ACP, 0, &cpinfo ); + pGetCPInfoExA( cp, 0, &cpinfo ); if (cpinfo.MaxCharSize != 2) { skip( "Skipping DBCS WM_CHAR test in SBCS codepage '%s'\n", cpinfo.CodePageName ); @@ -12002,8 +12015,8 @@ static void test_dbcs_wm_char(void) WCHAR wstr[2]; str[0] = j; str[1] = k; - if (MultiByteToWideChar( CP_ACP, 0, str, 2, wstr, 2 ) == 1 && - WideCharToMultiByte( CP_ACP, 0, wstr, 1, str, 2, NULL, NULL ) == 2 && + if (MultiByteToWideChar( cp, 0, str, 2, wstr, 2 ) == 1 && + WideCharToMultiByte( cp, 0, wstr, 1, str, 2, NULL, NULL ) == 2 && (BYTE)str[0] == j && (BYTE)str[1] == k && HIBYTE(wstr[0]) && HIBYTE(wstr[0]) != 0xff) {

1 0

Michael Müller : ddraw: Make some functions hotpachable.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 2f17d5b1365e467056ba99244f9053a4afbca6ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f17d5b1365e467056ba99244… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 11 17:38:47 2015 +0200 ddraw: Make some functions hotpachable. --- dlls/ddraw/surface.c | 55 ++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f17d5b1365e467056ba9…

1 0

Matteo Bruni : d3d9/tests: Test the default diffuse color for vertex shaders.
by Alexandre Julliard 12 Jun '15

12 Jun '15

Module: wine Branch: master Commit: 3c7e48a13246866ece788a52c95e8b81e5100d40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c7e48a13246866ece788a52c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 23:13:38 2015 +0200 d3d9/tests: Test the default diffuse color for vertex shaders. --- dlls/d3d9/tests/visual.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ae67d5c..c0ed616 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7388,6 +7388,7 @@ static void test_vshader_input(void) { IDirect3DVertexDeclaration9 *decl_twotexcrd, *decl_onetexcrd, *decl_twotex_wrongidx, *decl_twotexcrd_rightorder; IDirect3DVertexDeclaration9 *decl_texcoord_color, *decl_color_color, *decl_color_ubyte, *decl_color_float; + IDirect3DVertexDeclaration9 *decl_nocolor; IDirect3DVertexShader9 *swapped_shader, *texcoord_color_shader, *color_color_shader; D3DADAPTER_IDENTIFIER9 identifier; IDirect3DPixelShader9 *ps; @@ -7576,6 +7577,13 @@ static void test_vshader_input(void) 1.0f, 0.0f, 0.1f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 0.0f, 1.0f, }; + static const struct vec3 quad_nocolor[] = + { + {-1.0f, -1.0f, 0.1f}, + {-1.0f, 1.0f, 0.1f}, + { 1.0f, -1.0f, 0.1f}, + { 1.0f, 1.0f, 0.1f}, + }; static const D3DVERTEXELEMENT9 decl_elements_twotexcrd[] = { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, @@ -7627,6 +7635,11 @@ static void test_vshader_input(void) {0, 12, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, D3DDECL_END() }; + static const D3DVERTEXELEMENT9 decl_elements_nocolor[] = + { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + D3DDECL_END() + }; static const float normalize[4] = {1.0f / 256.0f, 1.0f / 256.0f, 1.0f / 256.0f, 1.0f / 256.0f}; static const float no_normalize[4] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -7670,6 +7683,8 @@ static void test_vshader_input(void) ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_color_float, &decl_color_float); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_nocolor, &decl_nocolor); + ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, ps3_code, &ps); ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader returned %08x\n", hr); @@ -7876,10 +7891,6 @@ static void test_vshader_input(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - IDirect3DDevice9_SetVertexShader(device, NULL); - IDirect3DDevice9_SetVertexDeclaration(device, NULL); - IDirect3DDevice9_SetPixelShader(device, NULL); - color = getPixelColor(device, 160, 360); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x80, 0x40), 1), "Input test: Quad 1(color-texcoord) returned color 0x%08x, expected 0x00ff8040\n", color); @@ -7896,6 +7907,30 @@ static void test_vshader_input(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); + hr = IDirect3DDevice9_SetVertexDeclaration(device, decl_nocolor); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad_nocolor, sizeof(quad_nocolor[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + /* WARP ends up using the color attribute from the previous draw. Let's mark + * that behavior as broken. */ + color = getPixelColor(device, 160, 360); + ok(color_match(color, 0x00000000, 1) + || broken(color_match(color, 0x00ffff00, 1)), + "Got unexpected color 0x%08x for no color attribute test.\n", color); + + IDirect3DDevice9_SetVertexShader(device, NULL); + IDirect3DDevice9_SetVertexDeclaration(device, NULL); + IDirect3DDevice9_SetPixelShader(device, NULL); + IDirect3DVertexShader9_Release(texcoord_color_shader); IDirect3DVertexShader9_Release(color_color_shader); } @@ -7909,6 +7944,7 @@ static void test_vshader_input(void) IDirect3DVertexDeclaration9_Release(decl_color_color); IDirect3DVertexDeclaration9_Release(decl_color_ubyte); IDirect3DVertexDeclaration9_Release(decl_color_float); + IDirect3DVertexDeclaration9_Release(decl_nocolor); IDirect3DPixelShader9_Release(ps); refcount = IDirect3DDevice9_Release(device);

1 0