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

Piotr Caban : msvcrt: Open console input handle with write permission so SetConsoleMode can work on it.
by Alexandre Julliard June 15, 2015

June 15, 2015

Module: wine Branch: master Commit: 3b5991cd80163edd0f8ca1a9a9ef18b60f10c1dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5991cd80163edd0f8ca1a9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 12 14:33:41 2015 +0200 msvcrt: Open console input handle with write permission so SetConsoleMode can work on it. --- dlls/msvcrt/console.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 0acaa03..3da7fb8 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -44,7 +44,8 @@ void msvcrt_init_console(void) { TRACE(":Opening console handles\n"); - MSVCRT_console_in = CreateFileA("CONIN$", GENERIC_READ, FILE_SHARE_READ, + MSVCRT_console_in = CreateFileA("CONIN$", GENERIC_WRITE|GENERIC_READ, + FILE_SHARE_WRITE|FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); MSVCRT_console_out= CreateFileA("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);

1 0

Alexandre Julliard : Wine release 1.7.45
by Alexandre Julliard June 12, 2015

June 12, 2015

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

Matteo Bruni : wined3d: Avoid the builtin GLSL vertex attributes.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 4189d297760166951641baf6172a1ef708863855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4189d297760166951641baf61… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 23:13:42 2015 +0200 wined3d: Avoid the builtin GLSL vertex attributes. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 6 ++- dlls/wined3d/glsl_shader.c | 110 +++++++++++++++++++++++++++++------------ dlls/wined3d/state.c | 11 +++-- dlls/wined3d/utils.c | 6 +-- dlls/wined3d/wined3d_private.h | 5 +- 6 files changed, 98 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4189d297760166951641b…

1 0

Michael Müller : ddraw: Make some functions hotpachable.
by Alexandre Julliard June 12, 2015

June 12, 2015

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

Vincent Povirk : ole32: Fix storage locking for read-only exclusive mode.
by Alexandre Julliard June 12, 2015

June 12, 2015

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

Tag wine-1.7.45 : Alexandre Julliard : Release 1.7.45
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: refs/tags/wine-1.7.45 Tag: 6478d66ad69492a731dc49cd164d95600c912443 URL: http://source.winehq.org/git/wine.git/?a=tag;h=6478d66ad69492a731dc49cd164d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 21:34:31 2015 +0900 Release 1.7.45

1 0

Alexandre Julliard : Release 1.7.45.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: cde46665fa8503e90c9a2fab1898cdb4d22f667b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde46665fa8503e90c9a2fab1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 12 21:34:31 2015 +0900 Release 1.7.45. --- ANNOUNCE | 716 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 387 insertions(+), 350 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cde46665fa8503e90c9a2…

1 0

Matteo Bruni : d3d8/tests: Port part of the fixed function attributes test to D3D8.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 92a2cef7a8d21d113b249a78e9d838b5f3448a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a2cef7a8d21d113b249a78e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 23:13:41 2015 +0200 d3d8/tests: Port part of the fixed function attributes test to D3D8. --- dlls/d3d8/tests/visual.c | 193 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 3b5f91d..db9fb79 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7363,6 +7363,198 @@ done: DestroyWindow(window); } +static void test_fixed_function_fvf(void) +{ + IDirect3DDevice8 *device; + DWORD color; + IDirect3D8 *d3d; + ULONG refcount; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + DWORD diffuse; + } + quad1[] = + { + {{-1.0f, -1.0f, 0.1f}, 0x00ffff00}, + {{-1.0f, 0.0f, 0.1f}, 0x00ffff00}, + {{ 0.0f, -1.0f, 0.1f}, 0x00ffff00}, + {{ 0.0f, 0.0f, 0.1f}, 0x00ffff00}, + }; + static const struct vec3 quad2[] = + { + {-1.0f, -1.0f, 0.1f}, + {-1.0f, 0.0f, 0.1f}, + { 0.0f, -1.0f, 0.1f}, + { 0.0f, 0.0f, 0.1f}, + }; + static const struct + { + struct vec4 position; + DWORD diffuse; + } + quad_transformed[] = + { + {{ 90.0f, 110.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{570.0f, 110.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{ 90.0f, 300.0f, 0.1f, 2.0f}, 0x00ffff00}, + {{570.0f, 300.0f, 0.1f, 2.0f}, 0x00ffff00}, + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(quad1[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 360); + ok(color == 0x00ffff00, + "D3DDECLTYPE_D3DCOLOR returned color %08x, expected 0x00ffff00\n", color); + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + /* Test with no diffuse color attribute. */ + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(SUCCEEDED(hr), "IDirect3DDevice8_Clear failed with %08x\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad2, sizeof(quad2[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 360); + ok(color == 0x00ffffff, "Got unexpected color 0x%08x in the no diffuse attribute test.\n", color); + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + /* Test what happens with specular lighting enabled and no specular color attribute. */ + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad1, sizeof(quad1[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SPECULARENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable specular lighting, hr %#x.\n", hr); + + color = getPixelColor(device, 160, 360); + ok(color == 0x00ffff00, "Got unexpected color 0x%08x in the no specular attribute test.\n", color); + + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quad_transformed, sizeof(quad_transformed[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = getPixelColor(device, 88, 108); + ok(color == 0x000000ff, + "pixel 88/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 108); + ok(color == 0x000000ff, + "pixel 92/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 88, 112); + ok(color == 0x000000ff, + "pixel 88/112 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 112); + ok(color == 0x00ffff00, + "pixel 92/112 has color %08x, expected 0x00ffff00\n", color); + + color = getPixelColor(device, 568, 108); + ok(color == 0x000000ff, + "pixel 568/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 572, 108); + ok(color == 0x000000ff, + "pixel 572/108 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 568, 112); + ok(color == 0x00ffff00, + "pixel 568/112 has color %08x, expected 0x00ffff00\n", color); + color = getPixelColor(device, 572, 112); + ok(color == 0x000000ff, + "pixel 572/112 has color %08x, expected 0x000000ff\n", color); + + color = getPixelColor(device, 88, 298); + ok(color == 0x000000ff, + "pixel 88/298 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 298); + ok(color == 0x00ffff00, + "pixel 92/298 has color %08x, expected 0x00ffff00\n", color); + color = getPixelColor(device, 88, 302); + ok(color == 0x000000ff, + "pixel 88/302 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 92, 302); + ok(color == 0x000000ff, + "pixel 92/302 has color %08x, expected 0x000000ff\n", color); + + color = getPixelColor(device, 568, 298); + ok(color == 0x00ffff00, + "pixel 568/298 has color %08x, expected 0x00ffff00\n", color); + color = getPixelColor(device, 572, 298); + ok(color == 0x000000ff, + "pixel 572/298 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 568, 302); + ok(color == 0x000000ff, + "pixel 568/302 has color %08x, expected 0x000000ff\n", color); + color = getPixelColor(device, 572, 302); + ok(color == 0x000000ff, + "pixel 572/302 has color %08x, expected 0x000000ff\n", color); + + IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -7422,4 +7614,5 @@ START_TEST(visual) test_multisample_mismatch(); test_texcoordindex(); test_vshader_input(); + test_fixed_function_fvf(); }

1 0

Matteo Bruni : d3d8/tests: Port the vertex shader input test to D3D8.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: ddefb49a301446db09da16ce53edfeb28bc591d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddefb49a301446db09da16ce5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 23:13:40 2015 +0200 d3d8/tests: Port the vertex shader input test to D3D8. --- dlls/d3d8/tests/visual.c | 288 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 288 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddefb49a301446db09da1…

1 0

Matteo Bruni : d3d9/tests: Test the default colors for fixed function vertex processing.
by Alexandre Julliard June 12, 2015

June 12, 2015

Module: wine Branch: master Commit: 4611ad8befb13de377eba71cb40fe2ae2389826d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4611ad8befb13de377eba71cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jun 11 23:13:39 2015 +0200 d3d9/tests: Test the default colors for fixed function vertex processing. --- dlls/d3d9/tests/visual.c | 110 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 102 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c0ed616..f9cb71c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8365,7 +8365,7 @@ done: static void fixed_function_decl_test(void) { IDirect3DVertexDeclaration9 *dcl_float = NULL, *dcl_short = NULL, *dcl_ubyte = NULL, *dcl_color = NULL; - IDirect3DVertexDeclaration9 *dcl_color_2 = NULL, *dcl_ubyte_2 = NULL, *dcl_positiont; + IDirect3DVertexDeclaration9 *dcl_color_2 = NULL, *dcl_ubyte_2 = NULL, *dcl_nocolor, *dcl_positiont; IDirect3DVertexBuffer9 *vb, *vb2; IDirect3DDevice9 *device; BOOL s_ok, ub_ok, f_ok; @@ -8407,6 +8407,10 @@ static void fixed_function_decl_test(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 D3DVERTEXELEMENT9 decl_elements_positiont[] = { {0, 0, D3DDECLTYPE_FLOAT4, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITIONT, 0}, {0, 16, D3DDECLTYPE_D3DCOLOR, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_COLOR, 0}, @@ -8544,6 +8548,8 @@ static void fixed_function_decl_test(void) } hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_d3dcolor_2streams, &dcl_color_2); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_nocolor, &dcl_nocolor); + ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_positiont, &dcl_positiont); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (%08x)\n", hr); @@ -8629,6 +8635,8 @@ static void fixed_function_decl_test(void) * It makes sure that the vertex buffer one works, while the above tests * whether the immediate mode code works. */ f_ok = FALSE; s_ok = FALSE; ub_ok = FALSE; + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 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); @@ -8698,11 +8706,6 @@ static void fixed_function_decl_test(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSource failed with %08x\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed (%08x)\n", hr); - if(dcl_short) { color = getPixelColor(device, 480, 360); ok(color == 0x000000ff || !s_ok, @@ -8725,8 +8728,95 @@ static void fixed_function_decl_test(void) } IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + /* Test with no diffuse color attribute. */ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_nocolor); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, 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, quads, sizeof(float) * 3); + 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); + + color = getPixelColor(device, 160, 360); + ok(color == 0x00ffffff, "Got unexpected color 0x%08x in the no color attribute test.\n", color); + + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + + /* Test what happens with specular lighting enabled and no specular color attribute. */ + f_ok = FALSE; s_ok = FALSE; ub_ok = FALSE; + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable specular lighting, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + + if (dcl_color) + { + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_color); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad1, sizeof(quad1[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + } + if (dcl_ubyte) + { + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_ubyte); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad2, sizeof(quad2[0])); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + ub_ok = SUCCEEDED(hr); + } + if (dcl_short) + { + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_short); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad3, sizeof(quad3[0])); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + s_ok = SUCCEEDED(hr); + } + if (dcl_float) + { + hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_float); + ok(SUCCEEDED(hr), "Failed to set vertex declaration, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad4, sizeof(quad4[0])); + ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + f_ok = SUCCEEDED(hr); + } + + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SPECULARENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable specular lighting, hr %#x.\n", hr); + + if (dcl_short) + { + color = getPixelColor(device, 480, 360); + ok(color == 0x000000ff || !s_ok, + "D3DDECLTYPE_USHORT4N returned color %08x, expected 0x000000ff.\n", color); + } + if (dcl_ubyte) + { + color = getPixelColor(device, 160, 120); + ok(color == 0x0000ffff || !ub_ok, + "D3DDECLTYPE_UBYTE4N returned color %08x, expected 0x0000ffff.\n", color); + } + if (dcl_color) + { + color = getPixelColor(device, 160, 360); + ok(color == 0x00ffff00, + "D3DDECLTYPE_D3DCOLOR returned color %08x, expected 0x00ffff00.\n", color); + } + if (dcl_float) + { + color = getPixelColor(device, 480, 120); + ok(color == 0x00ff0000 || !f_ok, + "D3DDECLTYPE_FLOAT4 returned color %08x, expected 0x00ff0000.\n", color); + } + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); hr = IDirect3DVertexBuffer9_Lock(vb, 0, sizeof(quad_transformed), &data, 0); ok(hr == D3D_OK, "IDirect3DVertexBuffer9_Lock failed with %08x\n", hr); @@ -8737,6 +8827,9 @@ static void fixed_function_decl_test(void) hr = IDirect3DDevice9_SetVertexDeclaration(device, dcl_positiont); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration failed with %08x\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with %08x\n", hr); + hr = IDirect3DDevice9_BeginScene(device); ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(quad_transformed[0])); @@ -8895,7 +8988,8 @@ out: if(dcl_color) IDirect3DVertexDeclaration9_Release(dcl_color); if(dcl_color_2) IDirect3DVertexDeclaration9_Release(dcl_color_2); if(dcl_ubyte_2) IDirect3DVertexDeclaration9_Release(dcl_ubyte_2); - if(dcl_positiont) IDirect3DVertexDeclaration9_Release(dcl_positiont); + IDirect3DVertexDeclaration9_Release(dcl_nocolor); + IDirect3DVertexDeclaration9_Release(dcl_positiont); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done:

1 0