April 2014 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9/tests: Handle the Windows 8 testbot results in zenable_test().
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: f174ca74c88ddc4fc48e1047cd334a8ed9b69a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f174ca74c88ddc4fc48e1047c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 1 09:50:44 2014 +0200 d3d9/tests: Handle the Windows 8 testbot results in zenable_test(). --- dlls/d3d9/tests/visual.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 6f3fef3..7e852b4 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -15053,6 +15053,15 @@ static void zenable_test(void) 0x00ff0000, 0x00606060, 0x009f609f, 0x00ff0000, 0x00ff0000, 0x00602060, 0x009f209f, 0x00ff0000, }; + /* The Windows 8 testbot (WARP) appears to not clip z for regular + * vertices either. */ + static const D3DCOLOR expected_broken[] = + { + 0x0020df20, 0x0060df60, 0x009fdf9f, 0x00dfdfdf, + 0x00209f20, 0x00609f60, 0x009f9f9f, 0x00df9fdf, + 0x00206020, 0x00606060, 0x009f609f, 0x00df60df, + 0x00202020, 0x00602060, 0x009f209f, 0x00df20df, + }; IDirect3DVertexShader9 *vs; IDirect3DPixelShader9 *ps; @@ -15084,7 +15093,8 @@ static void zenable_test(void) x = 80 * ((2 * j) + 1); y = 60 * ((2 * i) + 1); color = getPixelColor(device, x, y); - ok(color_match(color, expected[i * 4 + j], 1), + ok(color_match(color, expected[i * 4 + j], 1) + || broken(color_match(color, expected_broken[i * 4 + j], 1)), "Expected color 0x%08x at %u, %u, got 0x%08x.\n", expected[i * 4 + j], x, y, color); } } @@ -15092,10 +15102,6 @@ static void zenable_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetPixelShader(device, NULL); - ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); IDirect3DPixelShader9_Release(ps); IDirect3DVertexShader9_Release(vs); }

1 0

Henri Verbeet : d3d9/tests: Handle the Windows 8 testbot results in fp_special_test().
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: f11f913ab09f681c6f0ad83b2da61b02642abc7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11f913ab09f681c6f0ad83b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 1 09:50:45 2014 +0200 d3d9/tests: Handle the Windows 8 testbot results in fp_special_test(). --- dlls/d3d9/tests/visual.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 7e852b4..74cbd9f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13337,6 +13337,7 @@ static void fp_special_test(void) D3DCOLOR r600; D3DCOLOR nv40; D3DCOLOR nv50; + D3DCOLOR warp; } vs_body[] = { @@ -13351,18 +13352,19 @@ static void fp_special_test(void) * written to the blue component. * * There are considerable differences between graphics cards in how - * these are handled, but pow and nrm never generate INF or NAN. */ - {"log", vs_log, sizeof(vs_log), 0x00000000, 0x00000000, 0x00ff0000, 0x00ff7f00}, - {"pow", vs_pow, sizeof(vs_pow), 0x000000ff, 0x000000ff, 0x0000ff00, 0x000000ff}, - {"nrm", vs_nrm, sizeof(vs_nrm), 0x00ff0000, 0x00ff0000, 0x0000ff00, 0x00ff0000}, - {"rcp1", vs_rcp1, sizeof(vs_rcp1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00}, - {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x000000ff, 0x00000000, 0x00ff0000, 0x00ff7f00}, - {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00}, - {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00}, - {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, - {"def1", vs_def1, sizeof(vs_def1), 0x000000ff, 0x00007f00, 0x0000ff00, 0x00007f00}, - {"def2", vs_def2, sizeof(vs_def2), 0x00ff0000, 0x00ff7f00, 0x00ff0000, 0x00ff7f00}, - {"def3", vs_def3, sizeof(vs_def3), 0x00ff00ff, 0x00ff7f00, 0x00ff00ff, 0x00ff7f00}, + * these are handled, but pow and nrm never generate INF or NAN on + * real hardware. */ + {"log", vs_log, sizeof(vs_log), 0x00000000, 0x00000000, 0x00ff0000, 0x00ff7f00, 0x00ff8000}, + {"pow", vs_pow, sizeof(vs_pow), 0x000000ff, 0x000000ff, 0x0000ff00, 0x000000ff, 0x00008000}, + {"nrm", vs_nrm, sizeof(vs_nrm), 0x00ff0000, 0x00ff0000, 0x0000ff00, 0x00ff0000, 0x00008000}, + {"rcp1", vs_rcp1, sizeof(vs_rcp1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00, 0x00ff8000}, + {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x000000ff, 0x00000000, 0x00ff0000, 0x00ff7f00, 0x00ff8000}, + {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00, 0x00ff8000}, + {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00, 0x00ff8000}, + {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000}, + {"def1", vs_def1, sizeof(vs_def1), 0x000000ff, 0x00007f00, 0x0000ff00, 0x00007f00, 0x00008000}, + {"def2", vs_def2, sizeof(vs_def2), 0x00ff0000, 0x00ff7f00, 0x00ff0000, 0x00ff7f00, 0x00ff8000}, + {"def3", vs_def3, sizeof(vs_def3), 0x00ff00ff, 0x00ff7f00, 0x00ff00ff, 0x00ff7f00, 0x00ff8000}, }; static const DWORD ps_code[] = @@ -13484,7 +13486,8 @@ static void fp_special_test(void) ok(color_match(color, vs_body[i].r500, 1) || color_match(color, vs_body[i].r600, 1) || color_match(color, vs_body[i].nv40, 1) - || color_match(color, vs_body[i].nv50, 1), + || color_match(color, vs_body[i].nv50, 1) + || broken(color_match(color, vs_body[i].warp, 1)), "Expected color 0x%08x, 0x%08x, 0x%08x or 0x%08x for instruction \"%s\", got 0x%08x.\n", vs_body[i].r500, vs_body[i].r600, vs_body[i].nv40, vs_body[i].nv50, vs_body[i].name, color);

1 0

Henri Verbeet : d3d9/tests: Handle the Windows 8 testbot results in cnd_test().
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 7f9c0d45e7e399b3d4cb5615faa38e8e3b17cb91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9c0d45e7e399b3d4cb5615f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 1 09:50:46 2014 +0200 d3d9/tests: Handle the Windows 8 testbot results in cnd_test(). --- dlls/d3d9/tests/visual.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 74cbd9f..80e8be9 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6313,7 +6313,9 @@ static void cnd_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - /* Retest with the coissue flag on the alpha instruction instead. This works "as expected". */ + /* Retest with the coissue flag on the alpha instruction instead. This + * works "as expected". The Windows 8 testbot (WARP) seems to handle this + * the same as coissue on .rgb. */ hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ffff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); @@ -6357,13 +6359,13 @@ static void cnd_test(void) /* 1.1 shader */ color = getPixelColor(device, 238, 358); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 238, 358 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 242, 358); ok(color_match(color, 0x00000000, 1), "pixel 242, 358 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 238, 362); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 238, 362 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 242, 362); ok(color_match(color, 0x00000000, 1), @@ -6371,13 +6373,13 @@ static void cnd_test(void) /* 1.2 shader */ color = getPixelColor(device, 558, 358); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 558, 358 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 562, 358); ok(color_match(color, 0x00000000, 1), "pixel 562, 358 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 558, 362); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 558, 362 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 562, 362); ok(color_match(color, 0x00000000, 1), @@ -6385,13 +6387,13 @@ static void cnd_test(void) /* 1.3 shader */ color = getPixelColor(device, 558, 118); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 558, 118 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 562, 118); ok(color_match(color, 0x00000000, 1), "pixel 562, 118 has color %08x, expected 0x00000000\n", color); color = getPixelColor(device, 558, 122); - ok(color_match(color, 0x00ffffff, 1), + ok(color_match(color, 0x00ffffff, 1) || broken(color_match(color, 0x00000000, 1)), "pixel 558, 122 has color %08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 562, 122); ok(color_match(color, 0x00000000, 1),

1 0

Henri Verbeet : d3d9/tests: Use an easier to debug texture in generate_bumpmap_textures().
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 7641980a9efe98a1112e773699a75090d703dea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7641980a9efe98a1112e77369… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 1 09:50:47 2014 +0200 d3d9/tests: Use an easier to debug texture in generate_bumpmap_textures(). This makes it much easier to determine what went wrong if an implementation samples from the wrong location. --- dlls/d3d9/tests/visual.c | 103 +++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 51 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 80e8be9..c79e6f2 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2165,10 +2165,7 @@ static void generate_bumpmap_textures(IDirect3DDevice9 *device) { DWORD *ptr = (DWORD *)(((BYTE *)locked_rect.pBits) + (y * locked_rect.Pitch)); for (x = 0; x < 128; ++x) { - if(y>62 && y<66 && x>62 && x<66) - *ptr++ = 0xffffffff; - else - *ptr++ = 0xff000000; + *ptr++ = D3DCOLOR_ARGB(0xff, x * 2, y * 2, 0); } } else @@ -2254,17 +2251,17 @@ static void texbem_test(void) }; static const float quad[][7] = { - {-128.0f/640.0f, -128.0f/480.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f}, - {-128.0f/640.0f, 128.0f/480.0f, 0.1f, 0.0f, 1.0f, 0.0f, 1.0f}, - { 128.0f/640.0f, -128.0f/480.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f}, - { 128.0f/640.0f, 128.0f/480.0f, 0.1f, 1.0f, 1.0f, 1.0f, 1.0f}, + {-1.0f, -1.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f}, + {-1.0f, 1.0f, 0.1f, 0.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f}, + { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 1.0f}, }; static const float quad_proj[][9] = { - {-128.0f/640.0f, -128.0f/480.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 128.0f}, - {-128.0f/640.0f, 128.0f/480.0f, 0.1f, 0.0f, 1.0f, 0.0f, 128.0f, 0.0f, 128.0f}, - { 128.0f/640.0f, -128.0f/480.0f, 0.1f, 1.0f, 0.0f, 128.0f, 0.0f, 0.0f, 128.0f}, - { 128.0f/640.0f, 128.0f/480.0f, 0.1f, 1.0f, 1.0f, 128.0f, 128.0f, 0.0f, 128.0f}, + {-1.0f, -1.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 128.0f}, + {-1.0f, 1.0f, 0.1f, 0.0f, 1.0f, 0.0f, 128.0f, 0.0f, 128.0f}, + { 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, 128.0f, 0.0f, 0.0f, 128.0f}, + { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 128.0f, 128.0f, 0.0f, 128.0f}, }; static const float double_quad[] = { @@ -2319,11 +2316,11 @@ static void texbem_test(void) hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(SUCCEEDED(hr), "SetVertexShader failed (%08x)\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff00ff, 1.0f, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed (%08x)\n", hr); - for(i=0; i<2; i++) { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed (%08x)\n", hr); + if(i) { hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT4|D3DTTFF_PROJECTED); @@ -2352,14 +2349,20 @@ static void texbem_test(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); - color = getPixelColor(device, 320-32, 240); - ok(color_match(color, 0x00ffffff, 4), "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); - color = getPixelColor(device, 320+32, 240); - ok(color_match(color, 0x00ffffff, 4), "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); - color = getPixelColor(device, 320, 240-32); - ok(color_match(color, 0x00ffffff, 4), "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); - color = getPixelColor(device, 320, 240+32); - ok(color_match(color, 0x00ffffff, 4), "texbem failed: Got color 0x%08x, expected 0x00ffffff.\n", color); + /* The Window 8 testbot (WARP) seems to use the transposed + * D3DTSS_BUMPENVMAT matrix. */ + color = getPixelColor(device, 160, 240); + ok(color_match(color, 0x007e8000, 4) || broken(color_match(color, 0x00007e00, 4)), + "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 480, 240); + ok(color_match(color, 0x007e8000, 4) || broken(color_match(color, 0x00fe7e00, 4)), + "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 320, 120); + ok(color_match(color, 0x007e8000, 4) || broken(color_match(color, 0x0080fe00, 4)), + "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 320, 360); + ok(color_match(color, 0x007e8000, 4) || broken(color_match(color, 0x00800000, 4)), + "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); @@ -2501,8 +2504,11 @@ static void texbem_test(void) ok(SUCCEEDED(hr), "Failed to draw primitive, hr %#x.\n", hr); hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* The Window 8 testbot (WARP) seems to use the transposed + * D3DTSS_BUMPENVMAT matrix. */ color = getPixelColor(device, 320, 240); - ok(color == 0x00ffff00, "double texbem failed: Got color 0x%08x, expected 0x00ffff00.\n", color); + ok(color_match(color, 0x00ffff00, 1) || broken(color_match(color, 0x0000ffff, 1)), + "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); @@ -8783,11 +8789,12 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) IDirect3DTexture9 *tex1, *tex2; D3DLOCKED_RECT locked_rect; - static const float quad[][7] = { - {-128.0f/640.0f, -128.0f/480.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f}, - {-128.0f/640.0f, 128.0f/480.0f, 0.1f, 0.0f, 1.0f, 0.0f, 1.0f}, - { 128.0f/640.0f, -128.0f/480.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f}, - { 128.0f/640.0f, 128.0f/480.0f, 0.1f, 1.0f, 1.0f, 1.0f, 1.0f}, + static const float quad[][7] = + { + {-1.0f, -1.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f}, + {-1.0f, 1.0f, 0.1f, 0.0f, 1.0f, 0.0f, 1.0f}, + { 1.0f, -1.0f, 0.1f, 1.0f, 0.0f, 1.0f, 0.0f}, + { 1.0f, 1.0f, 0.1f, 1.0f, 1.0f, 1.0f, 1.0f}, }; static const D3DVERTEXELEMENT9 decl_elements[] = { @@ -8880,28 +8887,22 @@ static void fixed_function_bumpmap_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "EndScene failed (0x%08x)\n", hr); - /* on MacOS(10.5.4, radeon X1600), the white dots are have color 0x00fbfbfb rather than 0x00ffffff. This is - * kinda strange since no calculations are done on the sampled colors, only on the texture coordinates. - * But since testing the color match is not the purpose of the test don't be too picky - */ - color = getPixelColor(device, 320-32, 240); - ok(color_match(color, 0x00ffffff, 4), "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); - color = getPixelColor(device, 320+32, 240); - ok(color_match(color, 0x00ffffff, 4), "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); - color = getPixelColor(device, 320, 240-32); - ok(color_match(color, 0x00ffffff, 4), "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); - color = getPixelColor(device, 320, 240+32); - ok(color_match(color, 0x00ffffff, 4), "bumpmap failed: Got color 0x%08x, expected 0x00ffffff.\n", color); - color = getPixelColor(device, 320, 240); - ok(color_match(color, 0x00000000, 4), "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); - color = getPixelColor(device, 320+32, 240+32); - ok(color_match(color, 0x00000000, 4), "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); - color = getPixelColor(device, 320-32, 240+32); - ok(color_match(color, 0x00000000, 4), "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); - color = getPixelColor(device, 320+32, 240-32); - ok(color_match(color, 0x00000000, 4), "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); - color = getPixelColor(device, 320-32, 240-32); - ok(color_match(color, 0x00000000, 4), "bumpmap failed: Got color 0x%08x, expected 0x00000000.\n", color); + color = getPixelColor(device, 240, 60); + ok(color_match(color, 0x005ea000, 4), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 400, 60); + ok(color_match(color, 0x009ea000, 4), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 80, 180); + ok(color_match(color, 0x005ea000, 4), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 560, 180); + ok(color_match(color, 0x009ea000, 4), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 80, 300); + ok(color_match(color, 0x005e6000, 4), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 560, 300); + ok(color_match(color, 0x009e6000, 4), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 240, 420); + ok(color_match(color, 0x005e6000, 4), "Got unexpected color 0x%08x.\n", color); + color = getPixelColor(device, 400, 420); + ok(color_match(color, 0x009e6000, 4), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr);

1 0

Henri Verbeet : d3d9/tests: Handle the Windows 8 testbot results in test_vshader_input().
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: ef292a1a963a39374b615674db6ab8fb4fc6ef4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef292a1a963a39374b615674d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 1 09:50:48 2014 +0200 d3d9/tests: Handle the Windows 8 testbot results in test_vshader_input(). --- dlls/d3d9/tests/visual.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c79e6f2..d09fb61 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7122,6 +7122,9 @@ static void test_vshader_input(IDirect3DDevice9 *device) unsigned int i; float normalize[4] = {1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0}; float no_normalize[4] = {1.0, 1.0, 1.0, 1.0}; + D3DADAPTER_IDENTIFIER9 identifier; + IDirect3D9 *d3d; + BOOL warp; struct vertex quad1_color[] = { {-1.0, -1.0, 0.1, 0x00ff8040}, @@ -7148,6 +7151,13 @@ static void test_vshader_input(IDirect3DDevice9 *device) 1.0, 1.0, 0.1, 1.0, 1.0, 0.0, 1.0, }; + hr = IDirect3DDevice9_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get D3D object, hr %#x.\n", hr); + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = !strcmp(identifier.Description, "Microsoft Basic Render Driver"); + IDirect3D9_Release(d3d); + hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_twotexcrd, &decl_twotexcrd); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexDeclaration returned %08x\n", hr); hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements_onetexcrd, &decl_onetexcrd); @@ -7232,8 +7242,10 @@ static void test_vshader_input(IDirect3DDevice9 *device) /* The last value of the read but undefined stream is used, it is 0x00. The defined input is vec4(1, 0, 0, 0) */ color = getPixelColor(device, 480, 360); - ok(color == 0x00ffff00 || color ==0x00ff0000, - "Input test: Quad 2(1crd) returned color 0x%08x, expected 0x00ffff00\n", color); + /* On the Windows 8 testbot (WARP) the draw succeeds, but uses + * mostly random data as input. */ + ok(color == 0x00ffff00 || color == 0x00ff0000 || broken(warp), + "Got unexpected color 0x%08x for quad 2 (1crd).\n", color); color = getPixelColor(device, 160, 120); /* Same as above, accept both the last used value and 0.0 for the undefined streams */ ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x80), 1) || color == D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00), @@ -7246,8 +7258,11 @@ static void test_vshader_input(IDirect3DDevice9 *device) ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0xff, 0x80), 1), "Input test: Quad 1(2crd) returned color 0x%08x, expected 0x00ffff80\n", color); color = getPixelColor(device, 480, 360); - /* Accept the clear color as well in this case, since SW VP returns an error */ - ok(color == 0x00ffff00 || color == 0x00ff0000, "Input test: Quad 2(1crd) returned color 0x%08x, expected 0x00ffff00\n", color); + /* Accept the clear color as well in this case, since SW VP + * returns an error. On the Windows 8 testbot (WARP) the draw + * succeeds, but uses mostly random data as input. */ + ok(color == 0x00ffff00 || color == 0x00ff0000 || broken(warp), + "Got unexpected color 0x%08x for quad 2 (1crd).\n", color); color = getPixelColor(device, 160, 120); ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x80), 1) || color == D3DCOLOR_ARGB(0x00, 0xff, 0x00, 0x00), "Input test: Quad 3(2crd-wrongidx) returned color 0x%08x, expected 0x00ff0080\n", color); @@ -7314,8 +7329,9 @@ static void test_vshader_input(IDirect3DDevice9 *device) * * A test app for this behavior is Half Life 2 Episode 2 in dxlevel 95, and related games(Portal, TF2). */ - ok(color == 0x000000ff || color == 0x00808080 || color == 0x00000000, - "Input test: Quad 2(different colors) returned color 0x%08x, expected 0x000000ff, 0x00808080 or 0x00000000\n", color); + ok(color == 0x000000ff || color == 0x00808080 || color == 0x00000000 + || broken(color_match(color, D3DCOLOR_ARGB(0x00, 0x0b, 0x75, 0x80), 1)), + "Got unexpected color 0x%08x for quad 2 (different colors).\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr);

1 0

Alexandre Julliard : makedep: Add dependency for ttf font files when necessary.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 987f29173f7f281c8caabfc878b1910b7e53c8c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=987f29173f7f281c8caabfc87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 1 11:19:59 2014 +0200 makedep: Add dependency for ttf font files when necessary. --- tools/makedep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index b518756..d878869 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1692,6 +1692,8 @@ static struct strarray output_sources(void) strarray_add_uniq( &phony_targets, "uninstall" ); } } + else output( "all: %s\n", ttf_file ); + continue; /* no dependencies */ } else if (!strcmp( ext, "svg" )) /* svg file */

1 0

Hans Leidekker : fonts: Add Hungarian localization of Tahoma font names.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 5a2fc716312de5fc547e56762ed96c046e16b090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2fc716312de5fc547e56762… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Mar 31 19:43:49 2014 +0200 fonts: Add Hungarian localization of Tahoma font names. --- fonts/tahoma.sfd | 1 + fonts/tahoma.ttf | Bin 143628 -> 143652 bytes fonts/tahomabd.sfd | 1 + fonts/tahomabd.ttf | Bin 136708 -> 136780 bytes 4 files changed, 2 insertions(+) diff --git a/fonts/tahoma.sfd b/fonts/tahoma.sfd index 47a0651..3d6b44e 100644 --- a/fonts/tahoma.sfd +++ b/fonts/tahoma.sfd @@ -102,6 +102,7 @@ TtfTable: VDMX 1504 !<)rC!;6Els31Q<!<<)D!;HQps3(K=!<N5E!;Z]ts3(K?!<`AG!;lj#s3(KA!=&SJ!<*!'s3(KC !=/YK EndTtf +LangName: 1038 "" "" "Norm+AOEA-l" LangName: 1033 "" "" "" "Wine Tahoma Regular" "" "Version 0.001" "" "(C) 2004 Larry Snyder Based on Bitstream Vera Sans (C) Bitstream Inc." "" "" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" GaspTable: 3 8 0 16 1 65535 3 0 Encoding: UnicodeBmp diff --git a/fonts/tahoma.ttf b/fonts/tahoma.ttf index c535eae..4f68d1e 100644 Binary files a/fonts/tahoma.ttf and b/fonts/tahoma.ttf differ diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index ae0e946..b3f935b 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -102,6 +102,7 @@ TtfTable: VDMX 1504 !<)rC!;6Els31Q<!<<)D!;HQps3(K=!<N5E!;Z]ts3(K?!<`AG!;lj#s3(KA!=&SJ!<*!'s3(KC !=/YK EndTtf +LangName: 1038 "" "" "F+AOkA-lk+APYA-v+AOkA-r" "" "Tahoma F+AOkA-lk+APYA-v+AOkA-r" LangName: 1033 "" "" "" "Wine Tahoma Bold" "" "Version 0.001" "" "(C) 2004 Larry Snyder Based on Bitstream Vera Sans (C) Bitstream Inc." "" "" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoACgAA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoACgAA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html" GaspTable: 3 8 0 16 1 65535 3 0 Encoding: UnicodeBmp diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index b4b0b41..f7d9c46 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ

1 0

Hans Leidekker : wldap32/tests: Skip tests if the connection times out.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 165081e53cd1e31eab1719243d05d7e5dd5b6a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=165081e53cd1e31eab1719243… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 1 10:44:19 2014 +0200 wldap32/tests: Skip tests if the connection times out. --- dlls/wldap32/tests/parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c index 88a7e20..5c84929 100644 --- a/dlls/wldap32/tests/parse.c +++ b/dlls/wldap32/tests/parse.c @@ -48,7 +48,7 @@ static void test_ldap_parse_sort_control( LDAP *ld ) timeout.tv_sec = 20; timeout.tv_usec = 0; ret = ldap_search_ext_sA( ld, (char *)"", LDAP_SCOPE_ONELEVEL, (char *)"(ou=*)", NULL, 0, ctrls, NULL, &timeout, 10, &res ); - if (ret == LDAP_SERVER_DOWN) + if (ret == LDAP_SERVER_DOWN || ret == LDAP_TIMEOUT) { skip("test server can't be reached\n"); ldap_control_freeA( sort );

1 0

Eriks Dobelis : wintab: Fix incorrectly classifying cursor as stylus instead of eraser.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 2de64560fe3e36e56eccafa220836f73d1188687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de64560fe3e36e56eccafa22… Author: Eriks Dobelis <eriks.dobelis(a)biti.lv> Date: Mon Mar 31 16:54:10 2014 +0300 wintab: Fix incorrectly classifying cursor as stylus instead of eraser. --- dlls/winex11.drv/wintab.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 23a5423..ca0f35e 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -415,7 +415,7 @@ static BOOL is_tablet_cursor(const char *name, const char *type) return FALSE; } -static BOOL is_stylus(const char *name, const char *type) +static UINT get_cursor_type(const char *name, const char *type) { int i; static const char* tablet_stylus_whitelist[] = { @@ -426,23 +426,21 @@ static BOOL is_stylus(const char *name, const char *type) NULL }; + /* First check device type to avoid cases where name is "Pen and Eraser" and type is "ERASER" */ for (i=0; tablet_stylus_whitelist[i] != NULL; i++) { - if (name && match_token(name, tablet_stylus_whitelist[i])) - return TRUE; if (type && match_token(type, tablet_stylus_whitelist[i])) - return TRUE; + return CSR_TYPE_PEN; } - - return FALSE; -} - -static BOOL is_eraser(const char *name, const char *type) -{ - if (name && match_token(name, "eraser")) - return TRUE; if (type && match_token(type, "eraser")) - return TRUE; - return FALSE; + return CSR_TYPE_ERASER; + for (i=0; tablet_stylus_whitelist[i] != NULL; i++) { + if (name && match_token(name, tablet_stylus_whitelist[i])) + return CSR_TYPE_PEN; + } + if (name && match_token(name, "eraser")) + return CSR_TYPE_ERASER; + + return CSR_TYPE_OTHER; } /* cursors are placed in gSysCursor rows depending on their type @@ -635,13 +633,7 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) cursor.NPBTNMARKS[1] = 1 ; cursor.CAPABILITIES = CRC_MULTIMODE; - /* prefer finding TYPE_PEN(most capable) */ - if (is_stylus(target->name, device_type)) - cursor.TYPE = CSR_TYPE_PEN; - else if (is_eraser(target->name, device_type)) - cursor.TYPE = CSR_TYPE_ERASER; - else - cursor.TYPE = CSR_TYPE_OTHER; + cursor.TYPE = get_cursor_type(target->name, device_type); any = target->inputclassinfo;

1 0

Eriks Dobelis : wintab: Initialize lcOutExtX and Y values.
by Alexandre Julliard 01 Apr '14

01 Apr '14

Module: wine Branch: master Commit: 235100bb72882dcab5553716f172dda3877a709a URL: http://source.winehq.org/git/wine.git/?a=commit;h=235100bb72882dcab5553716f… Author: Eriks Dobelis <eriks.dobelis(a)biti.lv> Date: Thu Mar 20 16:18:17 2014 +0200 wintab: Initialize lcOutExtX and Y values. --- dlls/winex11.drv/wintab.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index ca0f35e..3642a47 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -536,6 +536,8 @@ BOOL CDECL X11DRV_LoadTabletInfo(HWND hwnddefault) gSysContext.lcSensZ = 65536; gSysContext.lcSysSensX= 65536; gSysContext.lcSysSensY= 65536; + gSysContext.lcOutExtX= GetSystemMetrics(SM_CXSCREEN); + gSysContext.lcOutExtY= GetSystemMetrics(SM_CYSCREEN); /* initialize cursors */ disable_system_cursors();

1 0