February 2012 - Wine-commits

Alexandre Julliard : Wine release 1.4-rc5
by Alexandre Julliard 24 Feb '12

24 Feb '12

Module: website Branch: master Commit: 90be4b262a08a23bcf472a37e3dc868e51ceed83 URL: http://source.winehq.org/git/website.git/?a=commit;h=90be4b262a08a23bcf472a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 19:40:38 2012 +0100 Wine release 1.4-rc5 --- news/en/2012022401.xml | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/news/en/2012022401.xml b/news/en/2012022401.xml new file mode 100644 index 0000000..4a3eb14 --- /dev/null +++ b/news/en/2012022401.xml @@ -0,0 +1,12 @@ +<news> +<date>February 24, 2012</date> +<title>Wine 1.4-rc5 Released</title> +<body> + The Wine development release 1.4-rc5 is now available. + <a href="{$root}/announce/1.4-rc5">What's new</a> in this release: +<ul> + <li>Bug fixes only, we are in code freeze.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.4-rc5.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.4-rc5.
by Alexandre Julliard 24 Feb '12

24 Feb '12

Module: wine Branch: master Commit: b05be807583eca27dc0a4de896ba901bac54088c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05be807583eca27dc0a4de89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 19:30:11 2012 +0100 Release 1.4-rc5. --- ANNOUNCE | 364 ++++++++++++++++++++++++++++-------------------------------- VERSION | 2 +- configure | 18 ++-- 3 files changed, 180 insertions(+), 204 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b05be807583eca27dc0a4…

1 0

Tag wine-1.4-rc5 : Alexandre Julliard : Release 1.4-rc5
by Alexandre Julliard 24 Feb '12

24 Feb '12

Module: wine Branch: refs/tags/wine-1.4-rc5 Tag: 8b0b05cc58a99f77bbc1299c0d496d535d1906aa URL: http://source.winehq.org/git/wine.git/?a=tag;h=8b0b05cc58a99f77bbc1299c0d49… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 19:30:11 2012 +0100 Release 1.4-rc5

1 0

Henri Verbeet : wined3d: Disable z-clipping for transformed vertices when WINED3D_RS_ZENABLE is disabled .
by Alexandre Julliard 24 Feb '12

24 Feb '12

Module: wine Branch: master Commit: d17f037fb11b8a654a38040aaefbdce5f2358963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17f037fb11b8a654a38040aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 22:45:46 2012 +0100 wined3d: Disable z-clipping for transformed vertices when WINED3D_RS_ZENABLE is disabled. --- dlls/wined3d/state.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6c92e6e..6974321 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -93,16 +93,17 @@ static void state_lighting(struct wined3d_context *context, const struct wined3d static void state_zenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + enum wined3d_depth_buffer_type zenable = state->render_states[WINED3D_RS_ZENABLE]; + static UINT once; + /* No z test without depth stencil buffers */ if (!state->fb->depth_stencil) { TRACE("No Z buffer - disabling depth test\n"); - glDisable(GL_DEPTH_TEST); /* This also disables z writing in gl */ - checkGLcall("glDisable GL_DEPTH_TEST"); - return; + zenable = WINED3D_ZB_FALSE; } - switch (state->render_states[WINED3D_RS_ZENABLE]) + switch (zenable) { case WINED3D_ZB_FALSE: glDisable(GL_DEPTH_TEST); @@ -118,9 +119,25 @@ static void state_zenable(struct wined3d_context *context, const struct wined3d_ FIXME("W buffer is not well handled\n"); break; default: - FIXME("Unrecognized depth buffer type %#x.\n", - state->render_states[WINED3D_RS_ZENABLE]); + FIXME("Unrecognized depth buffer type %#x.\n", zenable); + break; + } + + if (context->gl_info->supported[ARB_DEPTH_CLAMP]) + { + if (!zenable && context->swapchain->device->strided_streams.position_transformed) + { + glEnable(GL_DEPTH_CLAMP); + checkGLcall("glEnable(GL_DEPTH_CLAMP)"); + } + else + { + glDisable(GL_DEPTH_CLAMP); + checkGLcall("glDisable(GL_DEPTH_CLAMP)"); + } } + else if (!zenable && !once++) + FIXME("Z buffer disabled, but ARB_depth_clamp isn't supported.\n"); } static void state_cullmode(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -4647,6 +4664,9 @@ static void vertexdeclaration(struct wined3d_context *context, const struct wine transform_texture(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS)); } } + + if (transformed != wasrhw && !isStateDirty(context, STATE_RENDER(WINED3D_RS_ZENABLE))) + state_zenable(context, state, STATE_RENDER(WINED3D_RS_ZENABLE)); } static void viewport_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Henri Verbeet : ddraw/tests: Add tests for z-clipping with D3DRENDERSTATE_ZENABLE disabled.
by Alexandre Julliard 24 Feb '12

24 Feb '12

Module: wine Branch: master Commit: 19199bc5244c4cc0d6fe6e82608fc8c7b7cc2e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=19199bc5244c4cc0d6fe6e826… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 22:45:47 2012 +0100 ddraw/tests: Add tests for z-clipping with D3DRENDERSTATE_ZENABLE disabled. --- dlls/ddraw/tests/ddraw1.c | 214 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 118 +++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 95 ++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 63 +++++++++++++ 4 files changed, 490 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19199bc5244c4cc0d6fe6…

1 0

Henri Verbeet : d3d8/tests: Add tests for z-clipping with D3DRS_ZENABLE disabled.
by Alexandre Julliard 24 Feb '12

24 Feb '12

Module: wine Branch: master Commit: 4e9cf00097d88f045743799f637645c242422d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e9cf00097d88f045743799f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 22:45:48 2012 +0100 d3d8/tests: Add tests for z-clipping with D3DRS_ZENABLE disabled. --- dlls/d3d8/tests/visual.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 145 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cafcd32..d8e1ed2 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -25,6 +25,16 @@ static HMODULE d3d8_handle = 0; +struct vec3 +{ + float x, y, z; +}; + +struct vec4 +{ + float x, y, z, w; +}; + static HWND create_window(void) { WNDCLASS wc = {0}; @@ -2766,6 +2776,140 @@ static void resz_test(IDirect3DDevice8 *device) IDirect3DSurface8_Release(original_rt); } +static void zenable_test(IDirect3DDevice8 *device) +{ + static const struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + tquad[] = + { + {{ 0.0f, 480.0f, -0.5f, 1.0f}, 0xff00ff00}, + {{ 0.0f, 0.0f, -0.5f, 1.0f}, 0xff00ff00}, + {{640.0f, 480.0f, 1.5f, 1.0f}, 0xff00ff00}, + {{640.0f, 0.0f, 1.5f, 1.0f}, 0xff00ff00}, + }; + D3DCOLOR color; + D3DCAPS8 caps; + HRESULT hr; + UINT x, y; + UINT i, j; + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, 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, tquad, sizeof(*tquad)); + 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); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, 0x0000ff00, 1), + "Expected color 0x0000ff00 at %u, %u, got 0x%08x.\n", x, y, color); + } + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1) + && caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + static const DWORD vs_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40000, /* mov oD0, v0 */ + 0x0000ffff + }; + static const DWORD ps_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff /* end */ + }; + static const struct vec3 quad[] = + { + {-1.0f, -1.0f, -0.5f}, + {-1.0f, 1.0f, -0.5f}, + { 1.0f, -1.0f, 1.5f}, + { 1.0f, 1.0f, 1.5f}, + }; + static const D3DCOLOR expected[] = + { + 0x00ff0000, 0x0060df60, 0x009fdf9f, 0x00ff0000, + 0x00ff0000, 0x00609f60, 0x009f9f9f, 0x00ff0000, + 0x00ff0000, 0x00606060, 0x009f609f, 0x00ff0000, + 0x00ff0000, 0x00602060, 0x009f209f, 0x00ff0000, + }; + static const DWORD decl[] = + { + D3DVSD_STREAM(0), + D3DVSD_REG(D3DVSDE_POSITION, D3DVSDT_FLOAT3), + D3DVSD_END() + }; + DWORD vs, ps; + + hr = IDirect3DDevice8_CreateVertexShader(device, decl, vs_code, &vs, 0); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreatePixelShader(device, ps_code, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, 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); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, expected[i * 4 + j], 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", expected[i * 4 + j], x, y, color); + } + } + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, 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); + hr = IDirect3DDevice8_DeletePixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to delete pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_DeleteVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to delete vertex shader, hr %#x.\n", hr); + } +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -2845,6 +2989,7 @@ START_TEST(visual) intz_test(device_ptr); shadow_test(device_ptr); multisample_copy_rects_test(device_ptr); + zenable_test(device_ptr); resz_test(device_ptr); cleanup:

1 0

Henri Verbeet : d3d9/tests: Add tests for z-clipping with D3DRS_ZENABLE disabled.
by Alexandre Julliard 24 Feb '12

24 Feb '12

Module: wine Branch: master Commit: 8f6ddf789e5fb46770926239ec92fab49f920ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6ddf789e5fb46770926239e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 22:45:49 2012 +0100 d3d9/tests: Add tests for z-clipping with D3DRS_ZENABLE disabled. --- dlls/d3d9/tests/visual.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4f0f204..72e4d21 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -34,6 +34,16 @@ static HMODULE d3d9_handle = 0; +struct vec3 +{ + float x, y, z; +}; + +struct vec4 +{ + float x, y, z, w; +}; + static HWND create_window(void) { WNDCLASS wc = {0}; @@ -13755,6 +13765,137 @@ static void resz_test(IDirect3D9 *d3d9) cleanup_device(device); } +static void zenable_test(IDirect3DDevice9 *device) +{ + static const struct + { + struct vec4 position; + D3DCOLOR diffuse; + } + tquad[] = + { + {{ 0.0f, 480.0f, -0.5f, 1.0f}, 0xff00ff00}, + {{ 0.0f, 0.0f, -0.5f, 1.0f}, 0xff00ff00}, + {{640.0f, 480.0f, 1.5f, 1.0f}, 0xff00ff00}, + {{640.0f, 0.0f, 1.5f, 1.0f}, 0xff00ff00}, + }; + D3DCOLOR color; + D3DCAPS9 caps; + HRESULT hr; + UINT x, y; + UINT i, j; + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to disable z-buffering, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZRHW | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, 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, tquad, sizeof(*tquad)); + 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); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, 0x0000ff00, 1), + "Expected color 0x0000ff00 at %u, %u, got 0x%08x.\n", x, y, color); + } + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present backbuffer, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1) + && caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) + { + static const DWORD vs_code[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40000, /* mov oD0, v0 */ + 0x0000ffff + }; + static const DWORD ps_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff /* end */ + }; + static const struct vec3 quad[] = + { + {-1.0f, -1.0f, -0.5f}, + {-1.0f, 1.0f, -0.5f}, + { 1.0f, -1.0f, 1.5f}, + { 1.0f, 1.0f, 1.5f}, + }; + static const D3DCOLOR expected[] = + { + 0x00ff0000, 0x0060df60, 0x009fdf9f, 0x00ff0000, + 0x00ff0000, 0x00609f60, 0x009f9f9f, 0x00ff0000, + 0x00ff0000, 0x00606060, 0x009f609f, 0x00ff0000, + 0x00ff0000, 0x00602060, 0x009f209f, 0x00ff0000, + }; + + IDirect3DVertexShader9 *vs; + IDirect3DPixelShader9 *ps; + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateVertexShader(device, vs_code, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, ps_code, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vs); + ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, 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); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + x = 80 * ((2 * j) + 1); + y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, expected[i * 4 + j], 1), + "Expected color 0x%08x at %u, %u, got 0x%08x.\n", expected[i * 4 + j], x, y, color); + } + } + + 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); + } +} + START_TEST(visual) { IDirect3D9 *d3d9; @@ -13931,6 +14072,7 @@ START_TEST(visual) clip_planes_test(device_ptr); update_surface_test(device_ptr); multisample_get_rtdata_test(device_ptr); + zenable_test(device_ptr); hr = IDirect3DDevice9_GetDirect3D(device_ptr, &d3d9); ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr);

1 0

Dmitry Timoshkov : kernel32: Add a test for LoadLibrary called on a not DLL image.
by Alexandre Julliard 24 Feb '12

24 Feb '12

Module: wine Branch: master Commit: 0e7314a2987a9a802b650a31252df984c5216a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7314a2987a9a802b650a312… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 24 16:33:14 2012 +0800 kernel32: Add a test for LoadLibrary called on a not DLL image. --- dlls/kernel32/tests/loader.c | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 9c969c2..e98ebc1 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -559,7 +559,7 @@ static void test_ImportDescriptors(void) } } -static void test_image_mapping(const char *dll_name, DWORD scn_page_access) +static void test_image_mapping(const char *dll_name, DWORD scn_page_access, BOOL is_dll) { HANDLE hfile, hmap; NTSTATUS status; @@ -617,7 +617,6 @@ static void test_image_mapping(const char *dll_name, DWORD scn_page_access) } ok(status == STATUS_IMAGE_NOT_AT_BASE, "expected STATUS_IMAGE_NOT_AT_BASE, got %x\n", status); ok(addr2 != 0, "mapped address should be valid\n"); - ok(addr2 != addr1, "mapped addresses should be different\n"); SetLastError(0xdeadbeef); @@ -635,6 +634,7 @@ static void test_image_mapping(const char *dll_name, DWORD scn_page_access) ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); addr2 = MapViewOfFile(hmap, 0, 0, 0, 0); + ok(addr2 != 0, "mapped address should be valid\n"); ok(addr2 != addr1, "mapped addresses should be different\n"); SetLastError(0xdeadbeef); @@ -650,6 +650,24 @@ static void test_image_mapping(const char *dll_name, DWORD scn_page_access) UnmapViewOfFile(addr2); + SetLastError(0xdeadbeef); + addr2 = LoadLibrary(dll_name); + if (is_dll) + { + ok(!addr2, "LoadLibrary should fail, is_dll %d\n", is_dll); + ok(GetLastError() == ERROR_INVALID_ADDRESS, "expected ERROR_INVALID_ADDRESS, got %d\n", GetLastError()); + } + else + { + BOOL ret; + ok(addr2 != 0, "LoadLibrary error %d, is_dll %d\n", GetLastError(), is_dll); + ok(addr2 != addr1, "mapped addresses should be different\n"); + + SetLastError(0xdeadbeef); + ret = FreeLibrary(addr2); + ok(ret, "FreeLibrary error %d\n", GetLastError()); + } + wine_is_broken: status = pNtUnmapViewOfSection(GetCurrentProcess(), addr1); ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection error %x\n", status); @@ -955,13 +973,21 @@ static void test_section_access(void) ret = FreeLibrary(hlib); ok(ret, "FreeLibrary error %d\n", GetLastError()); - test_image_mapping(dll_name, td[i].scn_page_access); + test_image_mapping(dll_name, td[i].scn_page_access, TRUE); /* reset IMAGE_FILE_DLL otherwise CreateProcess fails */ nt_header.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | IMAGE_FILE_RELOCS_STRIPPED; SetLastError(0xdeadbeef); hfile = CreateFile(dll_name, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); - ok (hfile != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError()); + /* LoadLibrary called on an already memory-mapped file in + * test_image_mapping() above leads to a file handle leak + * under nt4, and inability to overwrite and delete the file + * due to sharing violation error. Ignore it and skip the test, + * but leave a not deletable temporary file. + */ + ok(hfile != INVALID_HANDLE_VALUE || broken(hfile == INVALID_HANDLE_VALUE) /* nt4 */, + "CreateFile error %d\n", GetLastError()); + if (hfile == INVALID_HANDLE_VALUE) goto nt4_is_broken; SetFilePointer(hfile, sizeof(dos_header), NULL, FILE_BEGIN); SetLastError(0xdeadbeef); ret = WriteFile(hfile, &nt_header, sizeof(DWORD) + sizeof(IMAGE_FILE_HEADER), &dummy, NULL); @@ -1002,11 +1028,12 @@ static void test_section_access(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); - test_image_mapping(dll_name, td[i].scn_page_access); + test_image_mapping(dll_name, td[i].scn_page_access, FALSE); +nt4_is_broken: SetLastError(0xdeadbeef); ret = DeleteFile(dll_name); - ok(ret, "DeleteFile error %d\n", GetLastError()); + ok(ret || broken(!ret) /* nt4 */, "DeleteFile error %d\n", GetLastError()); } }

1 0

Alexandre Julliard : comdlg32: Avoid crash when driver name doesn' t contain a backslash.
by Alexandre Julliard 24 Feb '12

24 Feb '12

Module: wine Branch: master Commit: 67a0db3c38ead3178912d44604fd90440b57f5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a0db3c38ead3178912d4460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 12:48:00 2012 +0100 comdlg32: Avoid crash when driver name doesn't contain a backslash. --- dlls/comdlg32/printdlg.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index d074563..7ce9148 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -321,8 +321,10 @@ static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName, LPDEVNAMES lpDevNames; char buf[260]; DWORD dwBufLen = sizeof(buf); + const char *p; - DeviceDriverName = strrchr(DeviceDriverName, '\\') + 1; + p = strrchr( DeviceDriverName, '\\' ); + if (p) DeviceDriverName = p + 1; size = strlen(DeviceDriverName) + 1 + strlen(DeviceName) + 1 @@ -366,8 +368,10 @@ static BOOL PRINTDLG_CreateDevNamesW(HGLOBAL *hmem, LPCWSTR DeviceDriverName, LPDEVNAMES lpDevNames; WCHAR bufW[260]; DWORD dwBufLen = sizeof(bufW) / sizeof(WCHAR); + const WCHAR *p; - DeviceDriverName = strrchrW(DeviceDriverName, '\\') + 1; + p = strrchrW( DeviceDriverName, '\\' ); + if (p) DeviceDriverName = p + 1; size = sizeof(WCHAR)*lstrlenW(DeviceDriverName) + 2 + sizeof(WCHAR)*lstrlenW(DeviceName) + 2

1 0

Alexandre Julliard : gdi32: Use 64-bit values when computing ellipses to avoid overflows.
by Alexandre Julliard 24 Feb '12

24 Feb '12

Module: wine Branch: master Commit: c65de04789ee8c5bf1f6c9d869ac53087af0fcee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65de04789ee8c5bf1f6c9d86… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 24 15:55:00 2012 +0100 gdi32: Use 64-bit values when computing ellipses to avoid overflows. --- dlls/gdi32/dibdrv/graphics.c | 12 ++++++------ dlls/gdi32/region.c | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 3251f36..2f67efe 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -78,11 +78,11 @@ static int ellipse_first_quadrant( int width, int height, POINT *data ) { const int a = width - 1; const int b = height - 1; - const int asq = 8 * a * a; - const int bsq = 8 * b * b; - int dx = 4 * b * b * (1 - a); - int dy = 4 * a * a * (1 + (b % 2)); - int err = dx + dy + a * a * (b % 2); + const INT64 asq = (INT64)8 * a * a; + const INT64 bsq = (INT64)8 * b * b; + INT64 dx = (INT64)4 * b * b * (1 - a); + INT64 dy = (INT64)4 * a * a * (1 + (b % 2)); + INT64 err = dx + dy + a * a * (b % 2); int pos = 0; POINT pt; @@ -93,7 +93,7 @@ static int ellipse_first_quadrant( int width, int height, POINT *data ) while (pt.x >= width / 2) { - int e2 = 2 * err; + INT64 e2 = 2 * err; data[pos++] = pt; if (e2 >= dx) { diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 336e56e..231a7cf 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -754,7 +754,8 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top, { RGNOBJ * obj; HRGN hrgn = 0; - int a, b, i, x, y, asq, bsq, dx, dy, err; + int a, b, i, x, y; + INT64 asq, bsq, dx, dy, err; RECT *rects; /* Make the dimensions sensible */ @@ -788,10 +789,10 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top, a = ellipse_width - 1; b = ellipse_height - 1; - asq = 8 * a * a; - bsq = 8 * b * b; - dx = 4 * b * b * (1 - a); - dy = 4 * a * a * (1 + (b % 2)); + asq = (INT64)8 * a * a; + bsq = (INT64)8 * b * b; + dx = (INT64)4 * b * b * (1 - a); + dy = (INT64)4 * a * a * (1 + (b % 2)); err = dx + dy + a * a * (b % 2); x = 0; @@ -802,7 +803,7 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top, while (x <= ellipse_width / 2) { - int e2 = 2 * err; + INT64 e2 = 2 * err; if (e2 >= dx) { x++;

1 0