wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

Frédéric Delanoy : loader: Remove copy-paste error in BUGS section of wine manpage.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 2d19782ec5eb279f1b2fe6e1d778c9db578344fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d19782ec5eb279f1b2fe6e1d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jun 19 14:21:09 2013 +0200 loader: Remove copy-paste error in BUGS section of wine manpage. --- loader/wine.man.in | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/loader/wine.man.in b/loader/wine.man.in index 6779b44..f6b2569 100644 --- a/loader/wine.man.in +++ b/loader/wine.man.in @@ -294,20 +294,17 @@ Please add entries to this list for applications you currently run, if there is no entry for this application. .PP Bug reports may be posted to Wine Bugzilla -.I http://bugs.winehq.org +.IR http://bugs.winehq.org . If you want to post a bug report, please see -.I http://wiki.winehq.org/Bugs -in the -.B wine -source to see what information is necessary +.IR http://wiki.winehq.org/Bugs . .PP -Problems and suggestions with this manpage please also report to -.I http://bugs.winehq.org +Problems and suggestions with this manpage can also be reported on +.IR http://bugs.winehq.org . .SH AVAILABILITY The most recent public version of .B wine can be downloaded from -.I http://www.winehq.org/download +.IR http://www.winehq.org/download . .PP The latest snapshot of the code may be obtained via GIT. For information on how to do this, please see @@ -326,7 +323,7 @@ For further information about development, you might want to subscribe to the .B wine mailing lists at -.I http://www.winehq.org/forums +.IR http://www.winehq.org/forums . .SH "SEE ALSO" .BR wineserver (1),

1 0

Stefan Dösinger : ddraw/tests: Add a test for fog_start == fog_end.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 21491c87481886f8df84f7ca6e0c18eec46467a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21491c87481886f8df84f7ca6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 17 22:53:25 2013 +0200 ddraw/tests: Add a test for fog_start == fog_end. --- dlls/ddraw/tests/ddraw7.c | 98 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c67ad84..6bf5fac 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3177,6 +3177,103 @@ done: DestroyWindow(window); } +static void test_fog_special(void) +{ + static struct + { + struct vec3 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ -1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 1.0f}, 0xff00ff00}, + {{ -1.0f, -1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, + }; + static const struct + { + DWORD vertexmode, tablemode; + D3DCOLOR color_left, color_right; + } + tests[] = + { + {D3DFOG_LINEAR, D3DFOG_NONE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, 0x0000ff00, 0x00ff0000}, + }; + union + { + float f; + DWORD d; + } conv; + D3DCOLOR color; + HRESULT hr; + unsigned int i; + HWND window; + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable fog, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGCOLOR, 0xffff0000); + ok(SUCCEEDED(hr), "Failed to set fog color, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + conv.f = 0.5f; + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGSTART, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog start, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGEND, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog end, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x000000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGVERTEXMODE, tests[i].vertexmode); + ok(SUCCEEDED(hr), "Failed to set fogvertexmode, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGTABLEMODE, tests[i].tablemode); + ok(SUCCEEDED(hr), "Failed to set fogtablemode, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DFVF_XYZ | D3DFVF_DIFFUSE, quad, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + color = get_surface_color(rt, 310, 240); + ok(compare_color(color, tests[i].color_left, 1), + "Expected left color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_left, color, i); + color = get_surface_color(rt, 330, 240); + ok(compare_color(color, tests[i].color_right, 1), + "Expected right color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_right, color, i); + } + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + + IDirectDrawSurface7_Release(rt); + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -3212,4 +3309,5 @@ START_TEST(ddraw7) test_draw_strided(); test_clear_rect_count(); test_coop_level_versions(); + test_fog_special(); }

1 0

Stefan Dösinger : d3d8/tests: Add a test for fog_start == fog_end.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 5f2f2ae9c8f2b1e6a6505ef6ad21f5bb8b7f94dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2f2ae9c8f2b1e6a6505ef6a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 17 22:53:24 2013 +0200 d3d8/tests: Add a test for fog_start == fog_end. --- dlls/d3d8/tests/visual.c | 170 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 169 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 764e9c1..cd830b6 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2005 Henri Verbeet - * Copyright (C) 2007 Stefan Dösinger(for CodeWeavers) + * Copyright (C) 2007, 2009, 2011-2013 Stefan Dösinger(for CodeWeavers) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3220,6 +3220,173 @@ static void zenable_test(IDirect3DDevice8 *device) } } +static void fog_special_test(IDirect3DDevice8 *device) +{ + static const struct + { + struct vec3 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ -1.0f, -1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, + {{ -1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 1.0f}, 0xff00ff00} + }; + static const struct + { + DWORD vertexmode, tablemode; + BOOL vs, ps; + D3DCOLOR color_left, color_right; + } + tests[] = + { + {D3DFOG_LINEAR, D3DFOG_NONE, FALSE, FALSE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, FALSE, TRUE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, TRUE, FALSE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, TRUE, TRUE, 0x00ff0000, 0x00ff0000}, + + {D3DFOG_NONE, D3DFOG_LINEAR, FALSE, FALSE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, FALSE, TRUE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, TRUE, FALSE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, TRUE, TRUE, 0x0000ff00, 0x00ff0000}, + }; + static const DWORD pixel_shader_code[] = + { + 0xffff0101, /* ps.1.1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff + }; + static const DWORD vertex_decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(0, D3DVSDT_FLOAT3), /* position, v0 */ + D3DVSD_REG(1, D3DVSDT_D3DCOLOR), /* diffuse color, v1 */ + D3DVSD_END() + }; + static const DWORD vertex_shader_code[] = + { + 0xfffe0101, /* vs.1.1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ + 0x0000ffff + }; + union + { + float f; + DWORD d; + } conv; + DWORD color; + HRESULT hr; + unsigned int i; + DWORD ps, vs; + D3DCAPS8 caps; + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + hr = IDirect3DDevice8_CreateVertexShader(device, vertex_decl, vertex_shader_code, &vs, 0); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + } + else + { + skip("Vertex Shaders not supported, skipping some fog tests.\n"); + vs = 0; + } + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) + { + hr = IDirect3DDevice8_CreatePixelShader(device, pixel_shader_code, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + } + else + { + skip("Pixel Shaders not supported, skipping some fog tests.\n"); + ps = 0; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable fog, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGCOLOR, 0xffff0000); + ok(SUCCEEDED(hr), "Failed to set fog color, hr %#x.\n", hr); + + conv.f = 0.5f; + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGSTART, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog start, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGEND, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog end, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + + if (!tests[i].vs) + { + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#x.\n", hr); + } + else if (vs) + { + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + } + else + { + continue; + } + + if (!tests[i].ps) + { + hr = IDirect3DDevice8_SetPixelShader(device, 0); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + } + else if (ps) + { + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + } + else + { + continue; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGVERTEXMODE, tests[i].vertexmode); + ok(SUCCEEDED(hr), "Failed to set fogvertexmode, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGTABLEMODE, tests[i].tablemode); + ok(SUCCEEDED(hr), "Failed to set fogtablemode, 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, sizeof(*quad)); + 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, 310, 240); + ok(color_match(color, tests[i].color_left, 1), + "Expected left color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_left, color, i); + color = getPixelColor(device, 330, 240); + ok(color_match(color, tests[i].color_right, 1), + "Expected right color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_right, color, i); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, 0); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, 0); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + if (vs) + IDirect3DDevice8_DeleteVertexShader(device, vs); + if (ps) + IDirect3DDevice8_DeletePixelShader(device, ps); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -3303,6 +3470,7 @@ START_TEST(visual) multisample_copy_rects_test(device_ptr); zenable_test(device_ptr); resz_test(device_ptr); + fog_special_test(device_ptr); cleanup: if(device_ptr) {

1 0

Stefan Dösinger : d3d9/tests: Add a test for fog_start == fog_end.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: e030ed3c2fdc93a80295024220e9e4923a47617b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e030ed3c2fdc93a8029502422… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jun 17 22:53:23 2013 +0200 d3d9/tests: Add a test for fog_start == fog_end. --- dlls/d3d9/tests/visual.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 166 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 32470f0..dc84559 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14038,6 +14038,171 @@ static void zenable_test(IDirect3DDevice9 *device) } } +static void fog_special_test(IDirect3DDevice9 *device) +{ + static const struct + { + struct vec3 position; + D3DCOLOR diffuse; + } + quad[] = + { + {{ -1.0f, -1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, -1.0f, 1.0f}, 0xff00ff00}, + {{ -1.0f, 1.0f, 0.0f}, 0xff00ff00}, + {{ 1.0f, 1.0f, 1.0f}, 0xff00ff00} + }; + static const struct + { + DWORD vertexmode, tablemode; + BOOL vs, ps; + D3DCOLOR color_left, color_right; + } + tests[] = + { + {D3DFOG_LINEAR, D3DFOG_NONE, FALSE, FALSE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, FALSE, TRUE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, TRUE, FALSE, 0x00ff0000, 0x00ff0000}, + {D3DFOG_LINEAR, D3DFOG_NONE, TRUE, TRUE, 0x00ff0000, 0x00ff0000}, + + {D3DFOG_NONE, D3DFOG_LINEAR, FALSE, FALSE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, FALSE, TRUE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, TRUE, FALSE, 0x0000ff00, 0x00ff0000}, + {D3DFOG_NONE, D3DFOG_LINEAR, TRUE, TRUE, 0x0000ff00, 0x00ff0000}, + }; + static const DWORD pixel_shader_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff + }; + static const DWORD vertex_shader_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0000001f, 0x8000000a, 0x900f0001, /* dcl_color0 v1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ + 0x0000ffff + }; + union + { + float f; + DWORD d; + } conv; + DWORD color; + HRESULT hr; + unsigned int i; + IDirect3DPixelShader9 *ps; + IDirect3DVertexShader9 *vs; + D3DCAPS9 caps; + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + } + else + { + skip("Vertex Shaders not supported, skipping some fog tests.\n"); + vs = NULL; + } + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) + { + hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + } + else + { + skip("Pixel Shaders not supported, skipping some fog tests.\n"); + ps = NULL; + } + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0xffff0000); + ok(SUCCEEDED(hr), "Failed to set fog color, hr %#x.\n", hr); + + conv.f = 0.5f; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog start, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, conv.d); + ok(SUCCEEDED(hr), "Failed to set fog end, hr %#x.\n", hr); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff0000ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + + if (!tests[i].vs) + { + hr = IDirect3DDevice9_SetVertexShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + } + else if (vs) + { + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + } + else + { + continue; + } + + if (!tests[i].ps) + { + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + } + else if (ps) + { + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + } + else + { + continue; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, tests[i].vertexmode); + ok(SUCCEEDED(hr), "Failed to set fogvertexmode, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, tests[i].tablemode); + ok(SUCCEEDED(hr), "Failed to set fogtablemode, 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, sizeof(*quad)); + 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, 310, 240); + ok(color_match(color, tests[i].color_left, 1), + "Expected left color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_left, color, i); + color = getPixelColor(device, 330, 240); + ok(color_match(color, tests[i].color_right, 1), + "Expected right color 0x%08x, got 0x%08x, case %u.\n", tests[i].color_right, color, i); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, 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); + if (vs) + IDirect3DVertexShader9_Release(vs); + if (ps) + IDirect3DPixelShader9_Release(ps); +} + START_TEST(visual) { IDirect3D9 *d3d9; @@ -14215,6 +14380,7 @@ START_TEST(visual) update_surface_test(device_ptr); multisample_get_rtdata_test(device_ptr); zenable_test(device_ptr); + fog_special_test(device_ptr); hr = IDirect3DDevice9_GetDirect3D(device_ptr, &d3d9); ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr);

1 0

Stefan Dösinger : wined3d: Work around broken FFP fog with ARB shaders.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 22319c7f9ede57d8f6a7ed7939b9b620ff2d4943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22319c7f9ede57d8f6a7ed793… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 18 16:17:19 2013 +0200 wined3d: Work around broken FFP fog with ARB shaders. --- dlls/wined3d/arb_program_shader.c | 49 +++++++++++++++--- dlls/wined3d/directx.c | 105 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 148 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22319c7f9ede57d8f6a7e…

1 0

Stefan Dösinger : wined3d: Pass fogstart== fogend to GL in fog table mode.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: b648b7419170836aaae7192fba5ef974d47fe46b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b648b7419170836aaae7192fb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 18 16:17:18 2013 +0200 wined3d: Pass fogstart==fogend to GL in fog table mode. --- dlls/wined3d/arb_program_shader.c | 4 +++- dlls/wined3d/glsl_shader.c | 4 +++- dlls/wined3d/state.c | 13 ++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fd2df68..3082ba4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6513,6 +6513,8 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi static void state_arbfp_fog(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { enum fogsource new_source; + DWORD fogstart = state->render_states[WINED3D_RS_FOGSTART]; + DWORD fogend = state->render_states[WINED3D_RS_FOGEND]; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); @@ -6541,7 +6543,7 @@ static void state_arbfp_fog(struct wined3d_context *context, const struct wined3 new_source = FOGSOURCE_FFP; } - if (new_source != context->fog_source) + if (new_source != context->fog_source || fogstart == fogend) { context->fog_source = new_source; state_fogstartend(context, state, STATE_RENDER(WINED3D_RS_FOGSTART)); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e14d7ab..ad9be6a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7086,6 +7086,8 @@ static void glsl_fragment_pipe_fog(struct wined3d_context *context, { BOOL use_vshader = use_vs(state); enum fogsource new_source; + DWORD fogstart = state->render_states[WINED3D_RS_FOGSTART]; + DWORD fogend = state->render_states[WINED3D_RS_FOGEND]; context->select_shader = 1; context->load_constants = 1; @@ -7107,7 +7109,7 @@ static void glsl_fragment_pipe_fog(struct wined3d_context *context, new_source = FOGSOURCE_FFP; } - if (new_source != context->fog_source) + if (new_source != context->fog_source || fogstart == fogend) { context->fog_source = new_source; state_fogstartend(context, state, STATE_RENDER(WINED3D_RS_FOGSTART)); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ffce803..5d6355b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1043,8 +1043,13 @@ void state_fogstartend(struct wined3d_context *context, const struct wined3d_sta fogstart = tmpvalue.f; tmpvalue.d = state->render_states[WINED3D_RS_FOGEND]; fogend = tmpvalue.f; - /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ - if(fogstart == fogend) { + /* Special handling for fogstart == fogend. In d3d with vertex + * fog, everything is fogged. With table fog, everything with + * fog_coord < fog_start is unfogged, and fog_coord > fog_start + * is fogged. Windows drivers disagree when fog_coord == fog_start. */ + if (state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE + && fogstart == fogend) + { fogstart = -INFINITY; fogend = 0.0f; } @@ -1072,6 +1077,8 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st { const struct wined3d_gl_info *gl_info = context->gl_info; enum fogsource new_source; + DWORD fogstart = state->render_states[WINED3D_RS_FOGSTART]; + DWORD fogend = state->render_states[WINED3D_RS_FOGEND]; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); @@ -1217,7 +1224,7 @@ void state_fog_fragpart(struct wined3d_context *context, const struct wined3d_st glEnableWINE(GL_FOG); checkGLcall("glEnable GL_FOG"); - if (new_source != context->fog_source) + if (new_source != context->fog_source || fogstart == fogend) { context->fog_source = new_source; state_fogstartend(context, state, STATE_RENDER(WINED3D_RS_FOGSTART));

1 0

Alistair Leslie-Hughes : oledb32: Add more database tests.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: ba16113dc50ad22b8a6ebf1dd0aefce6e25417bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba16113dc50ad22b8a6ebf1dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 19 08:20:38 2013 +1000 oledb32: Add more database tests. --- dlls/oledb32/tests/database.c | 66 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 216adc6..9a0ee20 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -28,9 +28,14 @@ #include "msdadc.h" #include "msdasc.h" #include "shlobj.h" +#include "initguid.h" #include "wine/test.h" +DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44,0x77,0x3d); + +static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; + static void test_GetDataSource(WCHAR *initstring) { IDataInitialize *datainit = NULL; @@ -96,7 +101,6 @@ static void test_database(void) 'J','e','t','.','O','L','E','D','B','.','4','.','0',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', 'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o','=','F','a','l','s','e',';',0}; - static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -115,11 +119,71 @@ static void test_database(void) test_GetDataSource(initstring_lower); } +static void test_errorinfo(void) +{ + HRESULT hr; + IUnknown *unk = NULL; + + hr = CoCreateInstance(&CSLID_MSDAER, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown,(void**)&unk); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + IErrorInfo *errorinfo; + + hr = IUnknown_QueryInterface(unk, &IID_IErrorInfo, (void**)&errorinfo); + ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + IErrorInfo_Release(errorinfo); + } + + IUnknown_Release(unk); + } +} + +static void test_initializationstring(void) +{ + static WCHAR initstring_msdasql[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; + static WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; + IDataInitialize *datainit = NULL; + IDBInitialize *dbinit = NULL; + HRESULT hr; + WCHAR *initstring = NULL; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + ok(hr == S_OK, "got %08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring_default, + &IID_IDBInitialize, (IUnknown**)&dbinit); + if(SUCCEEDED(hr)) + { + hr = IDataInitialize_GetInitializationString(datainit, (IUnknown*)dbinit, 0, &initstring); + ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + trace("Init String: %s\n", wine_dbgstr_w(initstring)); + todo_wine ok(!lstrcmpW(initstring_msdasql, initstring) || + !lstrcmpW(initstring_sqloledb, initstring), "got %s\n", wine_dbgstr_w(initstring)); + CoTaskMemFree(initstring); + } + + IDBInitialize_Release(dbinit); + } + + IDataInitialize_Release(datainit); + } +} + START_TEST(database) { OleInitialize(NULL); test_database(); + test_errorinfo(); + test_initializationstring(); OleUninitialize(); }

1 0

Alexandre Julliard : make_unicode: Cache files under their full path name to avoid conflicts.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 2c4e5ad1a9263ca8cbf69b5b3d33699d12b9ce7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c4e5ad1a9263ca8cbf69b5b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 16:05:18 2013 +0200 make_unicode: Cache files under their full path name to avoid conflicts. --- tools/make_unicode | 48 +++++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 9d2d8a7..59c75ab 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -24,12 +24,14 @@ use strict; # base URLs for www.unicode.org files my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS"; my $UNIDATA = "http://www.unicode.org/Public/6.0.0/ucd"; +my $REPORTS = "http://www.unicode.org/reports"; +my $RFCS = "http://www.rfc-editor.org/rfc"; # Sort keys file -my $SORTKEYS = "http://www.unicode.org/reports/tr10/allkeys.txt"; +my $SORTKEYS = "tr10/allkeys.txt"; # RFC3454 (stringprep data) -my $STRINGPREP = "http://www.rfc-editor.org/rfc/rfc3454.txt"; +my $STRINGPREP = "rfc3454.txt"; # Defaults mapping my $DEFAULTS = "tools/unicode-defaults"; @@ -319,16 +321,16 @@ my %joining_forms = ################################################################ # fetch a unicode.org file and open it -sub open_data_file($) +sub open_data_file($$) { - my $url = shift; - (my $name = $url) =~ s/^.*\///; + my ($base, $name) = @_; + (my $dir = "data/$name") =~ s/\/[^\/]+$//; local *FILE; unless (-f "data/$name") { - print "Fetching $url...\n"; - mkdir "data"; - !system "wget", "-q", "-O", "data/$name", $url or die "cannot fetch $url"; + print "Fetching $base/$name...\n"; + system "mkdir", "-p", $dir; + !system "wget", "-q", "-O", "data/$name", "$base/$name" or die "cannot fetch $base/$name"; } open FILE, "<data/$name" or die "cannot open data/$name"; return *FILE; @@ -370,7 +372,7 @@ sub READ_DEFAULTS($) # now build mappings from the decomposition field of the Unicode database - my $UNICODE_DATA = open_data_file "$UNIDATA/UnicodeData.txt"; + my $UNICODE_DATA = open_data_file( $UNIDATA, "UnicodeData.txt" ); while (<$UNICODE_DATA>) { # Decode the fields ... @@ -497,7 +499,7 @@ sub READ_DEFAULTS($) sub READ_FILE($) { my $name = shift; - my $INPUT = open_data_file $name; + my $INPUT = open_data_file( $MAPPINGS, $name ); while (<$INPUT>) { @@ -623,7 +625,7 @@ sub READ_JIS0208_FILE($) $cp2uni[0xa1c0] = 0xff3c; $uni2cp[0xff3c] = 0xa1c0; - my $INPUT = open_data_file $name; + my $INPUT = open_data_file( $MAPPINGS, $name ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -650,7 +652,7 @@ sub READ_SORTKEYS_FILE() my @sortkeys = (); for (my $i = 0; $i < 65536; $i++) { $sortkeys[$i] = [ -1, 0, 0, 0, 0 ] }; - my $INPUT = open_data_file $SORTKEYS; + my $INPUT = open_data_file( $REPORTS, $SORTKEYS ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -757,7 +759,7 @@ sub DUMP_SORTKEYS($@) open OUTPUT,">$filename.new" or die "Cannot create $filename"; printf "Building $filename\n"; printf OUTPUT "/* Unicode collation element table */\n"; - printf OUTPUT "/* generated from %s */\n", $SORTKEYS; + printf OUTPUT "/* generated from %s */\n", "$REPORTS/$SORTKEYS"; printf OUTPUT "/* DO NOT EDIT!! */\n\n"; printf OUTPUT "const unsigned int collation_table[%d] =\n{\n", $ranges*256; @@ -1062,7 +1064,7 @@ sub dump_indic($) my $filename = shift; my @indic_table = ($indic_types{'Other'}) x 65536;; - my $INPUT = open_data_file "$UNIDATA/IndicSyllabicCategory.txt"; + my $INPUT = open_data_file( $UNIDATA, "IndicSyllabicCategory.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1095,7 +1097,7 @@ sub dump_indic($) } close $INPUT; - $INPUT = open_data_file "$UNIDATA/IndicMatraCategory.txt"; + $INPUT = open_data_file( $UNIDATA, "IndicMatraCategory.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1144,7 +1146,7 @@ sub dump_linebreak($) my @break_table = ($break_types{'XX'}) x 65536;; my $next_group = 0; - my $INPUT = open_data_file "$UNIDATA/LineBreak.txt"; + my $INPUT = open_data_file( $UNIDATA, "LineBreak.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1192,7 +1194,7 @@ sub dump_mirroring($) my $filename = shift; my @mirror_table = (); - my $INPUT = open_data_file "$UNIDATA/BidiMirroring.txt"; + my $INPUT = open_data_file( $UNIDATA, "BidiMirroring.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1229,7 +1231,7 @@ sub dump_shaping($) $groups{"No_Joining_Group"} = $next_group++; - my $INPUT = open_data_file "$UNIDATA/ArabicShaping.txt"; + my $INPUT = open_data_file( $UNIDATA, "ArabicShaping.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1572,7 +1574,7 @@ sub dump_nameprep($) my @mapping_table = (); my @flags_table = (0) x 65536; - my $INPUT = open_data_file $STRINGPREP; + my $INPUT = open_data_file( $RFCS, $STRINGPREP ); while (<$INPUT>) { next unless /Start\sTable/; @@ -1598,7 +1600,7 @@ sub dump_nameprep($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; print OUTPUT "/* Nameprep algorithm related data */\n"; - print OUTPUT "/* generated from $STRINGPREP */\n"; + print OUTPUT "/* generated from $RFCS/$STRINGPREP */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; @@ -1857,7 +1859,7 @@ sub handle_bestfit_file($$$) my ($lb_cur, $lb_end); my @lb_ranges = (); - my $INPUT = open_data_file "$MAPPINGS/$filename" or die "Cannot open $filename"; + my $INPUT = open_data_file( $MAPPINGS, $filename ) or die "Cannot open $filename"; while (<$INPUT>) { @@ -1961,14 +1963,14 @@ sub HANDLE_FILE(@) @uni2cp = (); # symbol codepage file is special - if ($codepage == 20932) { READ_JIS0208_FILE "$MAPPINGS/$filename"; } + if ($codepage == 20932) { READ_JIS0208_FILE( $filename ); } elsif ($codepage == 20127) { fill_20127_codepage(); } elsif ($filename =~ /\/bestfit/) { handle_bestfit_file( $filename, $has_glyphs, $comment ); return; } - else { READ_FILE "$MAPPINGS/$filename"; } + else { READ_FILE( $filename ); } ADD_DEFAULT_MAPPINGS();

1 0

Alexandre Julliard : Use the official Microsoft definitions for Gaelic languages.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 28ece74fd8a72048191df5fcbde92d21ec7090f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ece74fd8a72048191df5fcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 12:55:17 2013 +0200 Use the official Microsoft definitions for Gaelic languages. --- dlls/kernel32/locale_rc.rc | 9 +++++---- dlls/kernel32/nls/cor.nls | 2 +- dlls/kernel32/nls/gae.nls | 6 +++--- dlls/kernel32/nls/gdh.nls | 6 +++--- dlls/kernel32/nls/gdv.nls | 4 ++-- dlls/kernel32/tests/locale.c | 4 ++-- dlls/oleaut32/hash.c | 4 ++-- include/winnt.rh | 10 +++++----- tools/widl/hash.c | 6 +++--- tools/wine.inf.in | 4 ++-- tools/wmc/po.c | 11 ++++++----- tools/wrc/po.c | 11 ++++++----- tools/wrc/translation.c | 3 ++- tools/wrc/utils.c | 7 ++++--- 14 files changed, 46 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28ece74fd8a72048191df…

1 0

Dmitry Timoshkov : gdiplus: get_font_hfont() should ask gdi32 to match font height against the character height instead of cell height .
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 84ef3d484ca52bd403e18248d98bd9343424fb9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ef3d484ca52bd403e18248d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 19 17:23:27 2013 +0900 gdiplus: get_font_hfont() should ask gdi32 to match font height against the character height instead of cell height. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/font.c | 43 ++++++++++++---------------------------- dlls/gdiplus/tests/graphics.c | 1 - 3 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 10a6402..dcdc29e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2099,7 +2099,7 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); get_log_fontW(font, graphics, &lfw); - lfw.lfHeight = gdip_round(font_height * rel_height); + lfw.lfHeight = -gdip_round(font_height * rel_height); unscaled_font = CreateFontIndirectW(&lfw); SelectObject(hdc, unscaled_font); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index de6d657..29d4ad5 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -877,26 +877,21 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 1.0); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.5); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.5); /* scale matrix */ status = GdipScaleMatrix(matrix, 2.0, 3.0, MatrixOrderAppend); @@ -926,17 +921,14 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.05); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.2); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); @@ -975,17 +967,14 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.05); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.2); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); @@ -1026,17 +1015,14 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.2); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine - expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(-100.0, bounds.Y, 0.2); + expectf_(height, bounds.Height, 0.2); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); @@ -1077,17 +1063,14 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.1); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine - expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(-100.0, bounds.Y, 0.2); + expectf_(height, bounds.Height, 0.2); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5de0602..6ed1463 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3901,7 +3901,6 @@ todo_wine match = fabs(1.0 - margin / rect.X) <= 0.05; ok(match, "Expected %f, got %f\n", margin, rect.X); match = fabs(1.0 - font_height / rect.Height) <= 0.1; -todo_wine ok(match, "Expected %f, got %f\n", font_height, rect.Height); match = fabs(1.0 - bounds.Width / (rect.Width + margin * 2.0)) <= 0.05; ok(match, "Expected %f, got %f\n", bounds.Width, rect.Width + margin * 2.0);

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2013