wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Nikolay Sivov : dwrite/tests: Fix indentation warnings on GCC 6.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 36cce60f8dffefd4e0e0b47245a2cc8309efc4ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=36cce60f8dffefd4e0e0b4724… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 9 15:59:46 2016 +0300 dwrite/tests: Fix indentation warnings on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 4 +-- dlls/dwrite/tests/font.c | 59 ++++++++++++++++++++++---------------------- dlls/dwrite/tests/layout.c | 28 ++++++++++----------- 3 files changed, 46 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36cce60f8dffefd4e0e0b…

1 0

Józef Kucia : wined3d: Introduce gl_blend_from_d3d() helper function.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: db5211d36fd4a8807ece523deb666e6bd2a0c2b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db5211d36fd4a8807ece523de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 8 16:52:28 2016 +0200 wined3d: Introduce gl_blend_from_d3d() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 83 +++++++++++++++++++++++----------------------------- 1 file changed, 37 insertions(+), 46 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 54ce2ee..630a745 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -412,12 +412,35 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo } } +static void gl_blend_from_d3d(GLenum *src_blend, GLenum *dst_blend, + enum wined3d_blend d3d_src_blend, enum wined3d_blend d3d_dst_blend, + const struct wined3d_format *rt_format) +{ + /* WINED3D_BLEND_BOTHSRCALPHA and WINED3D_BLEND_BOTHINVSRCALPHA are legacy + * source blending values which are still valid up to d3d9. They should + * not occur as dest blend values. */ + if (d3d_src_blend == WINED3D_BLEND_BOTHSRCALPHA) + { + *src_blend = GL_SRC_ALPHA; + *dst_blend = GL_ONE_MINUS_SRC_ALPHA; + } + else if (d3d_src_blend == WINED3D_BLEND_BOTHINVSRCALPHA) + { + *src_blend = GL_ONE_MINUS_SRC_ALPHA; + *dst_blend = GL_SRC_ALPHA; + } + else + { + *src_blend = gl_blend_factor(d3d_src_blend, rt_format); + *dst_blend = gl_blend_factor(d3d_dst_blend, rt_format); + } +} + static void state_blend(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *rt_format; - enum wined3d_blend d3d_blend; - GLenum srcBlend, dstBlend; + GLenum src_blend, dst_blend; unsigned int rt_fmt_flags; if (!state->fb->render_targets[0]) @@ -458,34 +481,18 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; }; - /* WINED3D_BLEND_BOTHSRCALPHA and WINED3D_BLEND_BOTHINVSRCALPHA are legacy - * source blending values which are still valid up to d3d9. They should - * not occur as dest blend values. */ - d3d_blend = state->render_states[WINED3D_RS_SRCBLEND]; - if (d3d_blend == WINED3D_BLEND_BOTHSRCALPHA) - { - srcBlend = GL_SRC_ALPHA; - dstBlend = GL_ONE_MINUS_SRC_ALPHA; - } - else if (d3d_blend == WINED3D_BLEND_BOTHINVSRCALPHA) - { - srcBlend = GL_ONE_MINUS_SRC_ALPHA; - dstBlend = GL_SRC_ALPHA; - } - else - { - srcBlend = gl_blend_factor(d3d_blend, rt_format); - dstBlend = gl_blend_factor(state->render_states[WINED3D_RS_DESTBLEND], rt_format); - } + gl_blend_from_d3d(&src_blend, &dst_blend, + state->render_states[WINED3D_RS_SRCBLEND], + state->render_states[WINED3D_RS_DESTBLEND], rt_format); if (state->render_states[WINED3D_RS_EDGEANTIALIAS] || state->render_states[WINED3D_RS_ANTIALIASEDLINEENABLE]) { gl_info->gl_ops.gl.p_glEnable(GL_LINE_SMOOTH); checkGLcall("glEnable(GL_LINE_SMOOTH)"); - if (srcBlend != GL_SRC_ALPHA) + if (src_blend != GL_SRC_ALPHA) WARN("WINED3D_RS_EDGEANTIALIAS enabled, but unexpected src blending param.\n"); - if (dstBlend != GL_ONE_MINUS_SRC_ALPHA && dstBlend != GL_ONE) + if (dst_blend != GL_ONE_MINUS_SRC_ALPHA && dst_blend != GL_ONE) WARN("WINED3D_RS_EDGEANTIALIAS enabled, but unexpected dst blending param.\n"); } else @@ -500,7 +507,7 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st if (state->render_states[WINED3D_RS_SEPARATEALPHABLENDENABLE]) { - GLenum srcBlendAlpha, dstBlendAlpha; + GLenum src_blend_alpha, dst_blend_alpha; /* Separate alpha blending requires GL_EXT_blend_function_separate, so make sure it is around */ if (!context->gl_info->supported[EXT_BLEND_FUNC_SEPARATE]) @@ -509,33 +516,17 @@ static void state_blend(struct wined3d_context *context, const struct wined3d_st return; } - /* WINED3D_BLEND_BOTHSRCALPHA and WINED3D_BLEND_BOTHINVSRCALPHA are legacy - * source blending values which are still valid up to d3d9. They should - * not occur as dest blend values. */ - d3d_blend = state->render_states[WINED3D_RS_SRCBLENDALPHA]; - if (d3d_blend == WINED3D_BLEND_BOTHSRCALPHA) - { - srcBlendAlpha = GL_SRC_ALPHA; - dstBlendAlpha = GL_ONE_MINUS_SRC_ALPHA; - } - else if (d3d_blend == WINED3D_BLEND_BOTHINVSRCALPHA) - { - srcBlendAlpha = GL_ONE_MINUS_SRC_ALPHA; - dstBlendAlpha = GL_SRC_ALPHA; - } - else - { - srcBlendAlpha = gl_blend_factor(d3d_blend, rt_format); - dstBlendAlpha = gl_blend_factor(state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format); - } + gl_blend_from_d3d(&src_blend_alpha, &dst_blend_alpha, + state->render_states[WINED3D_RS_SRCBLENDALPHA], + state->render_states[WINED3D_RS_DESTBLENDALPHA], rt_format); - GL_EXTCALL(glBlendFuncSeparate(srcBlend, dstBlend, srcBlendAlpha, dstBlendAlpha)); + GL_EXTCALL(glBlendFuncSeparate(src_blend, dst_blend, src_blend_alpha, dst_blend_alpha)); checkGLcall("glBlendFuncSeparate"); } else { - TRACE("glBlendFunc src=%x, dst=%x\n", srcBlend, dstBlend); - gl_info->gl_ops.gl.p_glBlendFunc(srcBlend, dstBlend); + TRACE("glBlendFunc src=%x, dst=%x.\n", src_blend, dst_blend); + gl_info->gl_ops.gl.p_glBlendFunc(src_blend, dst_blend); checkGLcall("glBlendFunc"); }

1 0

Józef Kucia : d3d8/tests: Add test for edge antialiasing blending.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: cf09d158fe74d444960dc7d98737be43174217a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf09d158fe74d444960dc7d98… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 8 16:52:26 2016 +0200 d3d8/tests: Add test for edge antialiasing blending. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index cd28e82..5075b01 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -9352,6 +9352,182 @@ static void test_color_clamping(void) DestroyWindow(window); } +static void test_edge_antialiasing_blending(void) +{ + IDirect3DDevice8 *device; + IDirect3D8 *d3d8; + ULONG refcount; + D3DCOLOR color; + D3DCAPS8 caps; + HWND window; + HRESULT hr; + + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + }; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + red_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xcc, 0xff, 0x00, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xcc, 0xff, 0x00, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xcc, 0xff, 0x00, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xcc, 0xff, 0x00, 0x00)}, + }; + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d8 = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d8, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + trace("Edge antialiasing support: %#x.\n", caps.RasterCaps & D3DPRASTERCAPS_ANTIALIASEDGES); + + hr = IDirect3DDevice8_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable blending, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_BLENDOP, D3DBLENDOP_ADD); + ok(SUCCEEDED(hr), "Failed to set blend op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); + ok(SUCCEEDED(hr), "Failed to set src blend, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_DESTBLEND, D3DBLEND_DESTALPHA); + ok(SUCCEEDED(hr), "Failed to set dest blend, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xccff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, green_quad, sizeof(*green_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, 320, 240); + ok(color_match(color, 0x00cc7f00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, red_quad, sizeof(*red_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, 320, 240); + ok(color_match(color, 0x00cc7f00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xccff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, green_quad, sizeof(*green_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, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, red_quad, sizeof(*red_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, 320, 240); + ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_EDGEANTIALIAS, TRUE); + ok(SUCCEEDED(hr), "Failed to enable edge antialiasing, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xccff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, green_quad, sizeof(*green_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, 320, 240); + todo_wine ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, red_quad, sizeof(*red_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, 320, 240); + todo_wine ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -9419,4 +9595,5 @@ START_TEST(visual) test_multisample_init(); test_texture_blending(); test_color_clamping(); + test_edge_antialiasing_blending(); }

1 0

Józef Kucia : d3d9/tests: Add test for line antialiasing blending.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 5a4d2185635daa54c4c74da71cc04fe738418597 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a4d2185635daa54c4c74da71… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 8 16:52:25 2016 +0200 d3d9/tests: Add test for line antialiasing blending. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 59c82e0..631f472 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -21725,6 +21725,182 @@ static void test_color_clamping(void) DestroyWindow(window); } +static void test_line_antialiasing_blending(void) +{ + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + ULONG refcount; + D3DCOLOR color; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + static const D3DMATRIX mat = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + green_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0x7f, 0x00, 0xff, 0x00)}, + }; + static const struct + { + struct vec3 position; + DWORD diffuse; + } + red_quad[] = + { + {{-1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xcc, 0xff, 0x00, 0x00)}, + {{-1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xcc, 0xff, 0x00, 0x00)}, + {{ 1.0f, -1.0f, 0.1f}, D3DCOLOR_ARGB(0xcc, 0xff, 0x00, 0x00)}, + {{ 1.0f, 1.0f, 0.1f}, D3DCOLOR_ARGB(0xcc, 0xff, 0x00, 0x00)}, + }; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d9, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + trace("Line antialiasing support: %#x.\n", caps.LineCaps & D3DLINECAPS_ANTIALIAS); + + hr = IDirect3DDevice9_SetTransform(device, D3DTS_WORLD, &mat); + ok(SUCCEEDED(hr), "Failed to set world transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_VIEW, &mat); + ok(SUCCEEDED(hr), "Failed to set view transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &mat); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable Z test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable fog, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_STENCILENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable stencil test, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CULLMODE, D3DCULL_NONE); + ok(SUCCEEDED(hr), "Failed to disable culling, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable blending, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_BLENDOP, D3DBLENDOP_ADD); + ok(SUCCEEDED(hr), "Failed to set blend op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); + ok(SUCCEEDED(hr), "Failed to set src blend, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_DESTBLEND, D3DBLEND_DESTALPHA); + ok(SUCCEEDED(hr), "Failed to set dest blend, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set alpha op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set alpha arg, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xccff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, green_quad, sizeof(*green_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, 320, 240); + ok(color_match(color, 0x00cc7f00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, red_quad, sizeof(*red_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, 320, 240); + ok(color_match(color, 0x00cc7f00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ALPHABLENDENABLE, FALSE); + ok(SUCCEEDED(hr), "Failed to disable blending, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xccff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, green_quad, sizeof(*green_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, 320, 240); + ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, red_quad, sizeof(*red_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, 320, 240); + ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ANTIALIASEDLINEENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to enable line antialiasing, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xccff0000, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, green_quad, sizeof(*green_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, 320, 240); + todo_wine ok(color_match(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f00ff00, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, red_quad, sizeof(*red_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, 320, 240); + todo_wine ok(color_match(color, 0x00ff0000, 1), "Got unexpected color 0x%08x.\n", color); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -21848,4 +22024,5 @@ START_TEST(visual) test_multisample_init(); test_texture_blending(); test_color_clamping(); + test_line_antialiasing_blending(); }

1 0

Józef Kucia : d3d10core/tests: Add test for line antialiasing blending.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: afff447a0ac91405ea73dc27e2c5a6f3871301d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afff447a0ac91405ea73dc27e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 8 16:52:24 2016 +0200 d3d10core/tests: Add test for line antialiasing blending. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 80 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index e574005..deed580 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9256,6 +9256,85 @@ static void test_face_culling(void) release_test_context(&test_context); } +static void test_line_antialiasing_blending(void) +{ + struct d3d10core_test_context test_context; + ID3D10RasterizerState *rasterizer_state; + D3D10_RASTERIZER_DESC rasterizer_desc; + ID3D10BlendState *blend_state; + D3D10_BLEND_DESC blend_desc; + ID3D10Device *device; + HRESULT hr; + + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 0.8f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 0.5f}; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.AlphaToCoverageEnable = FALSE; + blend_desc.BlendEnable[0] = TRUE; + blend_desc.SrcBlend = D3D10_BLEND_SRC_ALPHA; + blend_desc.DestBlend = D3D10_BLEND_DEST_ALPHA; + blend_desc.BlendOp = D3D10_BLEND_OP_ADD; + blend_desc.SrcBlendAlpha = D3D10_BLEND_SRC_ALPHA; + blend_desc.DestBlendAlpha = D3D10_BLEND_DEST_ALPHA; + blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; + blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_ALL; + + hr = ID3D10Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); + + ID3D10Device_OMSetBlendState(device, NULL, NULL, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10BlendState_Release(blend_state); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); + + rasterizer_desc.FillMode = D3D10_FILL_SOLID; + rasterizer_desc.CullMode = D3D10_CULL_BACK; + rasterizer_desc.FrontCounterClockwise = FALSE; + rasterizer_desc.DepthBias = 0; + rasterizer_desc.DepthBiasClamp = 0.0f; + rasterizer_desc.SlopeScaledDepthBias = 0.0f; + rasterizer_desc.DepthClipEnable = TRUE; + rasterizer_desc.ScissorEnable = FALSE; + rasterizer_desc.MultisampleEnable = FALSE; + rasterizer_desc.AntialiasedLineEnable = TRUE; + + hr = ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D10Device_RSSetState(device, rasterizer_state); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + todo_wine check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + todo_wine check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); + + ID3D10RasterizerState_Release(rasterizer_state); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -9306,4 +9385,5 @@ START_TEST(device) test_uint_shader_instructions(); test_index_buffer_offset(); test_face_culling(); + test_line_antialiasing_blending(); }

1 0

Józef Kucia : d3d11/tests: Add test for line antialiasing blending.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: f1214f222ece129abe0535cdfea9ee5467ef457a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1214f222ece129abe0535cdf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 8 16:52:23 2016 +0200 d3d11/tests: Add test for line antialiasing blending. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 276f58f..34baea7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10165,6 +10165,88 @@ static void test_face_culling(void) release_test_context(&test_context); } +static void test_line_antialiasing_blending(void) +{ + ID3D11RasterizerState *rasterizer_state; + struct d3d11_test_context test_context; + D3D11_RASTERIZER_DESC rasterizer_desc; + ID3D11BlendState *blend_state; + ID3D11DeviceContext *context; + D3D11_BLEND_DESC blend_desc; + ID3D11Device *device; + HRESULT hr; + + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 0.8f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 0.5f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + memset(&blend_desc, 0, sizeof(blend_desc)); + blend_desc.AlphaToCoverageEnable = FALSE; + blend_desc.IndependentBlendEnable = FALSE; + blend_desc.RenderTarget[0].BlendEnable = TRUE; + blend_desc.RenderTarget[0].SrcBlend = D3D11_BLEND_SRC_ALPHA; + blend_desc.RenderTarget[0].DestBlend = D3D11_BLEND_DEST_ALPHA; + blend_desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD; + blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_SRC_ALPHA; + blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_DEST_ALPHA; + blend_desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD; + blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; + + hr = ID3D11Device_CreateBlendState(device, &blend_desc, &blend_state); + ok(SUCCEEDED(hr), "Failed to create blend state, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetBlendState(context, blend_state, NULL, D3D11_DEFAULT_SAMPLE_MASK); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); + + ID3D11DeviceContext_OMSetBlendState(context, NULL, NULL, D3D11_DEFAULT_SAMPLE_MASK); + ID3D11BlendState_Release(blend_state); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); + + rasterizer_desc.FillMode = D3D11_FILL_SOLID; + rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.FrontCounterClockwise = FALSE; + rasterizer_desc.DepthBias = 0; + rasterizer_desc.DepthBiasClamp = 0.0f; + rasterizer_desc.SlopeScaledDepthBias = 0.0f; + rasterizer_desc.DepthClipEnable = TRUE; + rasterizer_desc.ScissorEnable = FALSE; + rasterizer_desc.MultisampleEnable = FALSE; + rasterizer_desc.AntialiasedLineEnable = TRUE; + + hr = ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D11DeviceContext_RSSetState(context, rasterizer_state); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &red.x); + draw_color_quad(&test_context, &green); + todo_wine check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, &green.x); + draw_color_quad(&test_context, &red); + todo_wine check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); + + ID3D11RasterizerState_Release(rasterizer_state); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -10220,4 +10302,5 @@ START_TEST(d3d11) test_uint_shader_instructions(); test_index_buffer_offset(); test_face_culling(); + test_line_antialiasing_blending(); }

1 0

Daniel Lehman : msvcp140: Don't redirect _Cnd/Mtx_t to msvcp110.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 57c60d9c431c65d6a1b4c3a5b04b7f58fa011231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57c60d9c431c65d6a1b4c3a5b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Aug 8 15:28:49 2016 -0700 msvcp140: Don't redirect _Cnd/Mtx_t to msvcp110. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 2a3e5a9..22c302e 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3621,17 +3621,17 @@ @ cdecl -arch=win64 ?xsputn@?$basic_streambuf@_WU?$char_traits@_W@std@@@std@@MEAA_JPEB_W_J@Z(ptr ptr long) basic_streambuf_wchar_xsputn @ stub _Chmod @ stub _Close_dir -@ cdecl _Cnd_broadcast(ptr) msvcp110._Cnd_broadcast -@ cdecl _Cnd_destroy(ptr) msvcp110._Cnd_destroy +@ cdecl _Cnd_broadcast(ptr) _Cnd_broadcast +@ cdecl _Cnd_destroy(ptr) _Cnd_destroy @ stub _Cnd_destroy_in_situ @ stub _Cnd_do_broadcast_at_thread_exit -@ cdecl _Cnd_init(ptr) msvcp110._Cnd_init +@ cdecl _Cnd_init(ptr) _Cnd_init @ stub _Cnd_init_in_situ @ stub _Cnd_register_at_thread_exit -@ cdecl _Cnd_signal(ptr) msvcp110._Cnd_signal -@ cdecl _Cnd_timedwait(ptr ptr ptr) msvcp110._Cnd_timedwait +@ cdecl _Cnd_signal(ptr) _Cnd_signal +@ cdecl _Cnd_timedwait(ptr ptr ptr) _Cnd_timedwait @ stub _Cnd_unregister_at_thread_exit -@ cdecl _Cnd_wait(ptr ptr) msvcp110._Cnd_wait +@ cdecl _Cnd_wait(ptr ptr) _Cnd_wait @ stub _Copy_file @ stub _Cosh @ stub _Current_get @@ -3673,7 +3673,7 @@ @ stub _Make_dir @ cdecl _Mbrtowc(ptr ptr long ptr ptr) _Mbrtowc @ stub _Mtx_clear_owner -@ cdecl _Mtx_current_owns(ptr) msvcp110._Mtx_current_owns +@ cdecl _Mtx_current_owns(ptr) _Mtx_current_owns @ cdecl _Mtx_destroy(ptr) _Mtx_destroy @ cdecl _Mtx_destroy_in_situ(ptr) _Mtx_destroy_in_situ @ cdecl _Mtx_getconcrtcs(ptr) _Mtx_getconcrtcs

1 0

Iván Matellanes : msvcirt/tests: Add some more tests of ostream constructors.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: b7c19e1e3ea965785a2b036abbb2db0ee1d6011e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7c19e1e3ea965785a2b036ab… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 8 19:58:30 2016 +0100 msvcirt/tests: Add some more tests of ostream constructors. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 98 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7c19e1e3ea965785a2b0…

1 0

Iván Matellanes : msvcirt: Initialize do_lock on ios copy constructor.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: a29ff2caca970ae53ff8454d2850ce3705734f42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a29ff2caca970ae53ff8454d2… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 8 19:58:29 2016 +0100 msvcirt: Initialize do_lock on ios copy constructor. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 1 + dlls/msvcirt/tests/msvcirt.c | 52 +++++++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 23fd668..576c612 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1745,6 +1745,7 @@ ios* __thiscall ios_copy_ctor(ios *this, const ios *copy) this->vtable = &MSVCP_ios_vtable; this->sb = NULL; this->delbuf = 0; + this->do_lock = -1; InitializeCriticalSection(&this->lock); return ios_assign(this, copy); } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 61de0b6..fa373d3 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -2646,22 +2646,38 @@ static void test_ios(void) call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); ok(*p_ios_fLockcInit == 4, "expected 4 got %d\n", *p_ios_fLockcInit); - ios_obj.state = 0x8; + memset(&ios_obj, 0xab, sizeof(ios)); call_func2(p_ios_sb_ctor, &ios_obj, psb); ok(ios_obj.sb == psb, "expected %p got %p\n", psb, ios_obj.sb); ok(ios_obj.state == IOSTATE_goodbit, "expected %x got %x\n", IOSTATE_goodbit, ios_obj.state); + ok(ios_obj.special[0] == 0, "expected 0 got %d\n", ios_obj.special[0]); + ok(ios_obj.special[1] == 0, "expected 0 got %d\n", ios_obj.special[1]); ok(ios_obj.delbuf == 0, "expected 0 got %d\n", ios_obj.delbuf); + ok(ios_obj.tie == NULL, "expected %p got %p\n", NULL, ios_obj.tie); + ok(ios_obj.flags == 0, "expected 0 got %x\n", ios_obj.flags); + ok(ios_obj.precision == 6, "expected 6 got %d\n", ios_obj.precision); + ok(ios_obj.fill == ' ', "expected ' ' got %d\n", ios_obj.fill); + ok(ios_obj.width == 0, "expected 0 got %d\n", ios_obj.width); + ok(ios_obj.do_lock == -1, "expected -1 got %d\n", ios_obj.do_lock); ok(*p_ios_fLockcInit == 5, "expected 5 got %d\n", *p_ios_fLockcInit); ios_obj.state = 0x8; call_func1(p_ios_dtor, &ios_obj); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); ok(*p_ios_fLockcInit == 4, "expected 4 got %d\n", *p_ios_fLockcInit); - ios_obj.sb = psb; - ios_obj.state = 0x8; + memset(&ios_obj, 0xab, sizeof(ios)); call_func1(p_ios_ctor, &ios_obj); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); ok(ios_obj.state == IOSTATE_badbit, "expected %x got %x\n", IOSTATE_badbit, ios_obj.state); + ok(ios_obj.special[0] == 0, "expected 0 got %d\n", ios_obj.special[0]); + ok(ios_obj.special[1] == 0, "expected 0 got %d\n", ios_obj.special[1]); + ok(ios_obj.delbuf == 0, "expected 0 got %d\n", ios_obj.delbuf); + ok(ios_obj.tie == NULL, "expected %p got %p\n", NULL, ios_obj.tie); + ok(ios_obj.flags == 0, "expected 0 got %x\n", ios_obj.flags); + ok(ios_obj.precision == 6, "expected 6 got %d\n", ios_obj.precision); + ok(ios_obj.fill == ' ', "expected ' ' got %d\n", ios_obj.fill); + ok(ios_obj.width == 0, "expected 0 got %d\n", ios_obj.width); + ok(ios_obj.do_lock == -1, "expected -1 got %d\n", ios_obj.do_lock); ok(*p_ios_fLockcInit == 5, "expected 5 got %d\n", *p_ios_fLockcInit); /* init */ @@ -2680,9 +2696,11 @@ static void test_ios(void) call_func1(p_ios_dtor, &ios_obj); /* copy constructor */ + memset(&ios_obj, 0xcd, sizeof(ios)); call_func2(p_ios_copy_ctor, &ios_obj, &ios_obj2); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); - ok(ios_obj.state == (ios_obj2.state|IOSTATE_badbit), "expected %x got %x\n", (ios_obj2.state|IOSTATE_badbit), ios_obj.state); + ok(ios_obj.state == (ios_obj2.state|IOSTATE_badbit), "expected %x got %x\n", + ios_obj2.state|IOSTATE_badbit, ios_obj.state); ok(ios_obj.delbuf == 0, "expected 0 got %d\n", ios_obj.delbuf); ok(ios_obj.tie == ios_obj2.tie, "expected %p got %p\n", ios_obj2.tie, ios_obj.tie); ok(ios_obj.flags == ios_obj2.flags, "expected %x got %x\n", ios_obj2.flags, ios_obj.flags); @@ -2693,24 +2711,25 @@ static void test_ios(void) ok(*p_ios_fLockcInit == 5, "expected 5 got %d\n", *p_ios_fLockcInit); /* assignment */ - ios_obj.state = 0x8; - ios_obj.delbuf = 2; - ios_obj.tie = NULL; - ios_obj.flags = 0; - ios_obj.precision = 6; - ios_obj.fill = ' '; - ios_obj.width = 0; - ios_obj.do_lock = 2; + ios_obj.state = 0xcdcdcdcd; + ios_obj.delbuf = 0xcdcdcdcd; + ios_obj.tie = (ostream*) 0xcdcdcdcd; + ios_obj.flags = 0xcdcdcdcd; + ios_obj.precision = 0xcdcdcdcd; + ios_obj.fill = 0xcd; + ios_obj.width = 0xcdcdcdcd; + ios_obj.do_lock = 0xcdcdcdcd; call_func2(p_ios_assign, &ios_obj, &ios_obj2); ok(ios_obj.sb == NULL, "expected %p got %p\n", NULL, ios_obj.sb); - ok(ios_obj.state == (ios_obj2.state|IOSTATE_badbit), "expected %x got %x\n", (ios_obj2.state|IOSTATE_badbit), ios_obj.state); - ok(ios_obj.delbuf == 2, "expected 2 got %d\n", ios_obj.delbuf); + ok(ios_obj.state == (ios_obj2.state|IOSTATE_badbit), "expected %x got %x\n", + ios_obj2.state|IOSTATE_badbit, ios_obj.state); + ok(ios_obj.delbuf == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios_obj.delbuf); ok(ios_obj.tie == ios_obj2.tie, "expected %p got %p\n", ios_obj2.tie, ios_obj.tie); ok(ios_obj.flags == ios_obj2.flags, "expected %x got %x\n", ios_obj2.flags, ios_obj.flags); ok(ios_obj.precision == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.precision); ok(ios_obj.fill == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.fill); ok(ios_obj.width == (char)0xab, "expected %d got %d\n", (char)0xab, ios_obj.width); - ok(ios_obj.do_lock == 2, "expected 2 got %d\n", ios_obj.do_lock); + ok(ios_obj.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, ios_obj.do_lock); /* locking */ ios_obj.sb = psb; @@ -3665,7 +3684,6 @@ static void test_ostream_withassign(void) ok(osa1.base_ios.precision == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.precision); ok(osa1.base_ios.fill == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.fill); ok(osa1.base_ios.width == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.width); -todo_wine ok(osa1.base_ios.do_lock == -1, "expected -1 got %d\n", osa1.base_ios.do_lock); call_func1(p_ostream_withassign_vbase_dtor, &osa1); osa1.unknown = 0xabababab; @@ -3699,7 +3717,6 @@ todo_wine ok(osa1.base_ios.precision == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.precision); ok(osa1.base_ios.fill == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.fill); ok(osa1.base_ios.width == (char) 0xcd, "expected -51 got %d\n", osa1.base_ios.width); -todo_wine ok(osa1.base_ios.do_lock == -1, "expected -1 got %d\n", osa1.base_ios.do_lock); call_func1(p_ostream_withassign_vbase_dtor, &osa1); osa1.unknown = 0xabababab; @@ -5579,7 +5596,6 @@ static void test_istream_withassign(void) ok(isa2.base_ios.precision == (char) 0xcd, "expected -51 got %d\n", isa2.base_ios.precision); ok(isa2.base_ios.fill == (char) 0xcd, "expected -51 got %d\n", isa2.base_ios.fill); ok(isa2.base_ios.width == (char) 0xcd, "expected -51 got %d\n", isa2.base_ios.width); -todo_wine ok(isa2.base_ios.do_lock == -1, "expected -1 got %d\n", isa2.base_ios.do_lock); call_func1(p_istream_withassign_vbase_dtor, &isa2); isa1.base_ios.sb = NULL;

1 0

Iván Matellanes : msvcirt/tests: Add tests of istream_withassign assignment operators.
by Alexandre Julliard 09 Aug '16

09 Aug '16

Module: wine Branch: master Commit: 281878ab1c1a5f4cb865b7284cb6d50053e3454c URL: http://source.winehq.org/git/wine.git/?a=commit;h=281878ab1c1a5f4cb865b7284… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Aug 8 19:58:28 2016 +0100 msvcirt/tests: Add tests of istream_withassign assignment operators. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index fafa03f..61de0b6 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -356,6 +356,9 @@ static istream* (*__thiscall p_istream_withassign_copy_ctor)(istream*, const ist static istream* (*__thiscall p_istream_withassign_ctor)(istream*, BOOL); static void (*__thiscall p_istream_withassign_dtor)(ios*); static void (*__thiscall p_istream_withassign_vbase_dtor)(istream*); +static istream* (*__thiscall p_istream_withassign_assign_sb)(istream*, streambuf*); +static istream* (*__thiscall p_istream_withassign_assign_is)(istream*, const istream*); +static istream* (*__thiscall p_istream_withassign_assign)(istream*, const istream*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -598,6 +601,9 @@ static BOOL init(void) SET(p_istream_withassign_ctor, "??0istream_withassign@@QEAA@XZ"); SET(p_istream_withassign_dtor, "??1ostream_withassign@@UEAA@XZ"); SET(p_istream_withassign_vbase_dtor, "??_Distream_withassign@@QEAAXXZ"); + SET(p_istream_withassign_assign_sb, "??4istream_withassign@@QEAAAEAVistream@@PEAVstreambuf@@@Z"); + SET(p_istream_withassign_assign_is, "??4istream_withassign@@QEAAAEAVistream@@AEBV1@@Z"); + SET(p_istream_withassign_assign, "??4istream_withassign@@QEAAAEAV0@AEBV0@@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3@YAXPAX@Z"); @@ -762,6 +768,9 @@ static BOOL init(void) SET(p_istream_withassign_ctor, "??0istream_withassign@@QAE@XZ"); SET(p_istream_withassign_dtor, "??1istream_withassign@@UAE@XZ"); SET(p_istream_withassign_vbase_dtor, "??_Distream_withassign@@QAEXXZ"); + SET(p_istream_withassign_assign_sb, "??4istream_withassign@@QAEAAVistream@@PAVstreambuf@@@Z"); + SET(p_istream_withassign_assign_is, "??4istream_withassign@@QAEAAVistream@@ABV1@@Z"); + SET(p_istream_withassign_assign, "??4istream_withassign@@QAEAAV0@ABV0@@Z"); } SET(p_ios_static_lock, "?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc@ios@@KAXXZ"); @@ -5594,6 +5603,72 @@ todo_wine ok(isa2.base_ios.width == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.width); ok(isa2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.do_lock); call_func1(p_istream_withassign_dtor, &isa2.base_ios); + + /* assignment */ + isa2.extract_delim = isa2.count = 0xabababab; + isa2.base_ios.delbuf = 0xabababab; + pisa = call_func2(p_istream_withassign_assign_sb, &isa2, &sb); + ok(pisa == &isa2, "wrong return, expected %p got %p\n", &isa2, pisa); + ok(isa2.extract_delim == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.extract_delim); + ok(isa2.count == 0, "expected 0 got %d\n", isa2.count); + ok(isa2.base_ios.sb == &sb, "expected %p got %p\n", &sb, isa2.base_ios.sb); + ok(isa2.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, isa2.base_ios.state); + ok(isa2.base_ios.delbuf == 0, "expected 0 got %d\n", isa2.base_ios.delbuf); + ok(isa2.base_ios.tie == NULL, "expected %p got %p\n", NULL, isa2.base_ios.tie); + ok(isa2.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, isa2.base_ios.flags); + ok(isa2.base_ios.precision == 6, "expected 6 got %d\n", isa2.base_ios.precision); + ok(isa2.base_ios.fill == ' ', "expected 32 got %d\n", isa2.base_ios.fill); + ok(isa2.base_ios.width == 0, "expected 0 got %d\n", isa2.base_ios.width); + ok(isa2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.do_lock); + isa2.count = 0xabababab; + memset(&isa2.base_ios, 0xab, sizeof(ios)); + isa2.base_ios.delbuf = 0; + pisa = call_func2(p_istream_withassign_assign_sb, &isa2, NULL); + ok(pisa == &isa2, "wrong return, expected %p got %p\n", &isa2, pisa); + ok(isa2.extract_delim == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.extract_delim); + ok(isa2.count == 0, "expected 0 got %d\n", isa2.count); + ok(isa2.base_ios.sb == NULL, "expected %p got %p\n", NULL, isa2.base_ios.sb); + ok(isa2.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, isa2.base_ios.state); + ok(isa2.base_ios.delbuf == 0, "expected 0 got %d\n", isa2.base_ios.delbuf); + ok(isa2.base_ios.tie == NULL, "expected %p got %p\n", NULL, isa2.base_ios.tie); + ok(isa2.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, isa2.base_ios.flags); + ok(isa2.base_ios.precision == 6, "expected 6 got %d\n", isa2.base_ios.precision); + ok(isa2.base_ios.fill == ' ', "expected 32 got %d\n", isa2.base_ios.fill); + ok(isa2.base_ios.width == 0, "expected 0 got %d\n", isa2.base_ios.width); + ok(isa2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.do_lock); + isa2.count = 0xabababab; + memset(&isa2.base_ios, 0xab, sizeof(ios)); + isa2.base_ios.delbuf = 0; + pisa = call_func2(p_istream_withassign_assign_is, &isa2, &isa1); + ok(pisa == &isa2, "wrong return, expected %p got %p\n", &isa2, pisa); + ok(isa2.extract_delim == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.extract_delim); + ok(isa2.count == 0, "expected 0 got %d\n", isa2.count); + ok(isa2.base_ios.sb == NULL, "expected %p got %p\n", NULL, isa2.base_ios.sb); + ok(isa2.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, isa2.base_ios.state); + ok(isa2.base_ios.delbuf == 0, "expected 0 got %d\n", isa2.base_ios.delbuf); + ok(isa2.base_ios.tie == NULL, "expected %p got %p\n", NULL, isa2.base_ios.tie); + ok(isa2.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, isa2.base_ios.flags); + ok(isa2.base_ios.precision == 6, "expected 6 got %d\n", isa2.base_ios.precision); + ok(isa2.base_ios.fill == ' ', "expected 32 got %d\n", isa2.base_ios.fill); + ok(isa2.base_ios.width == 0, "expected 0 got %d\n", isa2.base_ios.width); + ok(isa2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.do_lock); + isa1.base_ios.sb = &sb; + isa2.count = 0xabababab; + memset(&isa2.base_ios, 0xab, sizeof(ios)); + isa2.base_ios.delbuf = 0; + pisa = call_func2(p_istream_withassign_assign, &isa2, &isa1); + ok(pisa == &isa2, "wrong return, expected %p got %p\n", &isa2, pisa); + ok(isa2.extract_delim == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.extract_delim); + ok(isa2.count == 0, "expected 0 got %d\n", isa2.count); + ok(isa2.base_ios.sb == &sb, "expected %p got %p\n", &sb, isa2.base_ios.sb); + ok(isa2.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, isa2.base_ios.state); + ok(isa2.base_ios.delbuf == 0, "expected 0 got %d\n", isa2.base_ios.delbuf); + ok(isa2.base_ios.tie == NULL, "expected %p got %p\n", NULL, isa2.base_ios.tie); + ok(isa2.base_ios.flags == FLAGS_skipws, "expected %x got %x\n", FLAGS_skipws, isa2.base_ios.flags); + ok(isa2.base_ios.precision == 6, "expected 6 got %d\n", isa2.base_ios.precision); + ok(isa2.base_ios.fill == ' ', "expected 32 got %d\n", isa2.base_ios.fill); + ok(isa2.base_ios.width == 0, "expected 0 got %d\n", isa2.base_ios.width); + ok(isa2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, isa2.base_ios.do_lock); } START_TEST(msvcirt)

1 0

← Newer
1
...
51
52
53
54
55
56
57
...
78
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 August 2016