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

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

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 : 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 : 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 : 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

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

Dmitry Timoshkov : comctl32: Fix broken logic for retrieving default font properties.
by Alexandre Julliard 18 Jun '13

18 Jun '13

Module: wine Branch: master Commit: c14ff4bef0bd87000fea08eb69d29ddc6d874f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c14ff4bef0bd87000fea08eb6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 18 16:34:27 2013 +0900 comctl32: Fix broken logic for retrieving default font properties. --- dlls/comctl32/tab.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index bd75c88..85467ba 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -1899,7 +1899,7 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect if(infoPtr->dwStyle & TCS_VERTICAL) /* if we are vertical rotate the text and each character */ { LOGFONTW logfont; - HFONT hFont = 0; + HFONT hFont; INT nEscapement = 900; INT nOrientation = 900; @@ -1911,10 +1911,8 @@ TAB_DrawItemInterior(const TAB_INFO *infoPtr, HDC hdc, INT iItem, RECT *drawRect /* to get a font with the escapement and orientation we are looking for, we need to */ /* call CreateFontIndirect, which requires us to set the values of the logfont we pass in */ - if (!GetObjectW((infoPtr->hFont) ? - infoPtr->hFont : GetStockObject(DEFAULT_GUI_FONT), - sizeof(LOGFONTW),&logfont)) - GetStockObject(DEFAULT_GUI_FONT); + if (!GetObjectW(infoPtr->hFont, sizeof(logfont), &logfont)) + GetObjectW(GetStockObject(DEFAULT_GUI_FONT), sizeof(logfont), &logfont); logfont.lfEscapement = nEscapement; logfont.lfOrientation = nOrientation;

1 0

Ken Thomases : winemac: Don' t bring disabled or no-activate windows forward when clicked.
by Alexandre Julliard 18 Jun '13

18 Jun '13

Module: wine Branch: master Commit: 3faf1a92b04a930359a16aa3de731a0423c2f867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3faf1a92b04a930359a16aa3d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 17 23:35:56 2013 -0500 winemac: Don't bring disabled or no-activate windows forward when clicked. --- dlls/winemac.drv/cocoa_app.m | 1 + dlls/winemac.drv/cocoa_window.h | 2 ++ dlls/winemac.drv/cocoa_window.m | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index fd481e5..2441b5d 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1428,6 +1428,7 @@ int macdrv_err_on; NSEventType type = [theEvent type]; if ([window isKindOfClass:[WineWindow class]] && + !window.disabled && !window.noActivate && type == NSLeftMouseDown && (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) { diff --git a/dlls/winemac.drv/cocoa_window.h b/dlls/winemac.drv/cocoa_window.h index 362d9aa..c5a630f 100644 --- a/dlls/winemac.drv/cocoa_window.h +++ b/dlls/winemac.drv/cocoa_window.h @@ -60,6 +60,8 @@ } @property (retain, readonly, nonatomic) WineEventQueue* queue; +(a)property (readonly, nonatomic) BOOL disabled; +(a)property (readonly, nonatomic) BOOL noActivate; @property (readonly, nonatomic) BOOL floating; @property (readonly, getter=isFullscreen, nonatomic) BOOL fullscreen; diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 3750931..cf63b25 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -136,8 +136,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) @interface WineWindow () -(a)property (nonatomic) BOOL disabled; -(a)property (nonatomic) BOOL noActivate; +(a)property (readwrite, nonatomic) BOOL disabled; +(a)property (readwrite, nonatomic) BOOL noActivate; @property (readwrite, nonatomic) BOOL floating; @property (retain, nonatomic) NSWindow* latentParentWindow;

1 0

Ken Thomases : winemac: Don' t give windows focus on click if the click was sent to Wine.
by Alexandre Julliard 18 Jun '13

18 Jun '13

Module: wine Branch: master Commit: f035cc73d0ae3f192f19109c1ef16cc536fcc5dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f035cc73d0ae3f192f19109c1… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 17 23:36:01 2013 -0500 winemac: Don't give windows focus on click if the click was sent to Wine. Only clicks on the title bar (outside the close or minimize buttons) or the grow box give windows focus. --- dlls/winemac.drv/cocoa_app.m | 6 +++++- dlls/winemac.drv/cocoa_window.m | 16 ---------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2441b5d..20050bf 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1426,6 +1426,7 @@ int macdrv_err_on; { WineWindow* window = (WineWindow*)[theEvent window]; NSEventType type = [theEvent type]; + BOOL broughtWindowForward = FALSE; if ([window isKindOfClass:[WineWindow class]] && !window.disabled && !window.noActivate && @@ -1433,7 +1434,8 @@ int macdrv_err_on; (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) { NSWindowButton windowButton; - BOOL broughtWindowForward = TRUE; + + broughtWindowForward = TRUE; /* Any left-click on our window anyplace other than the close or minimize buttons will bring it forward. */ @@ -1538,6 +1540,8 @@ int macdrv_err_on; macdrv_release_event(event); } + else if (broughtWindowForward && ![window isKeyWindow]) + [self windowGotFocus:window]; } // Since mouse button events deliver absolute cursor position, the diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index cf63b25..d926635 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1181,8 +1181,6 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) - (void) sendEvent:(NSEvent*)event { - WineApplicationController* controller = [WineApplicationController sharedController]; - /* NSWindow consumes certain key-down events as part of Cocoa's keyboard interface control. For example, Control-Tab switches focus among views. We want to bypass that feature, so directly route key-down @@ -1190,21 +1188,7 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) if ([event type] == NSKeyDown) [[self firstResponder] keyDown:event]; else - { - if ([event type] == NSLeftMouseDown && - (([event modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) - { - /* Since our windows generally claim they can't be made key, clicks - in their title bars are swallowed by the theme frame stuff. So, - we hook directly into the event stream and assume that any click - in the window will activate it, if Wine and the Win32 program - accept. */ - if (![self isKeyWindow] && !self.disabled && !self.noActivate) - [controller windowGotFocus:self]; - } - [super sendEvent:event]; - } }

1 0

Alexandre Julliard : user32: Use the current DC layout in DrawState when drawing to an intermediate bitmap .
by Alexandre Julliard 18 Jun '13

18 Jun '13

Module: wine Branch: master Commit: 8dc7b0d9c293750398732a1d5626e330fc8777a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dc7b0d9c293750398732a1d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 11:32:08 2013 +0200 user32: Use the current DC layout in DrawState when drawing to an intermediate bitmap. --- dlls/user32/uitools.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 4921299..386801c 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1690,6 +1690,7 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp SetBkColor(memdc, RGB(255, 255, 255)); SetTextColor(memdc, RGB(0, 0, 0)); hfsave = SelectObject(memdc, GetCurrentObject(hdc, OBJ_FONT)); + SetLayout( memdc, GetLayout( hdc )); /* DST_COMPLEX may draw text as well, * so we must be sure that correct font is selected

1 0