wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_swapchain_GetBackBuffer().
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: 1e6951cbfc029ce01068ed20bfda3955dcb65ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e6951cbfc029ce01068ed20b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:31 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_swapchain_GetBackBuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/swapchain.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 8efdd0a..70abae9 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -112,7 +112,6 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface8 **backbuffer) { struct d3d8_swapchain *swapchain = impl_from_IDirect3DSwapChain8(iface); - struct wined3d_resource *wined3d_resource; struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; HRESULT hr = D3D_OK; @@ -131,8 +130,7 @@ static HRESULT WINAPI d3d8_swapchain_GetBackBuffer(IDirect3DSwapChain8 *iface, wined3d_mutex_lock(); if ((wined3d_texture = wined3d_swapchain_get_back_buffer(swapchain->wined3d_swapchain, backbuffer_idx))) { - wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - surface_impl = wined3d_resource_get_parent(wined3d_resource); + surface_impl = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); *backbuffer = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*backbuffer); }

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture().
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: bdc31c99c48a7cef587895488a2e855338b53f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc31c99c48a7cef587895488… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 17 18:35:30 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in device_parent_create_swapchain_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5bc39a6..13de8ec 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3042,7 +3042,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic return hr; } - d3d_surface = wined3d_resource_get_parent(wined3d_texture_get_sub_resource(*texture, 0)); + d3d_surface = wined3d_texture_get_sub_resource_parent(*texture, 0); d3d_surface->parent_device = &device->IDirect3DDevice8_iface; return hr;

1 0

Charles Davis : mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}().
by Alexandre Julliard 18 Feb '16

18 Feb '16

Module: wine Branch: master Commit: fdeaf812e2d0d5bd26146325272892f1b3d8d1ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdeaf812e2d0d5bd261463252… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Feb 16 18:14:19 2016 -0700 mscoree: Implement ICorRuntimeHost::CreateDomain{, Ex}(). Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 238 +++++++++++++++++++++++++++++++++++++---- dlls/mscoree/metahost.c | 4 + dlls/mscoree/mscoree_private.h | 2 + dlls/mscoree/tests/mscoree.c | 98 ++++++++++++++++- 4 files changed, 317 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fdeaf812e2d0d5bd26146…

1 0

Charles Davis : gdi32: Declare our intent explicitly to the compiler.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: c94336f381f15a30905c0601c91df9b37934c683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94336f381f15a30905c0601c… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Wed Feb 17 02:27:04 2016 -0700 gdi32: Declare our intent explicitly to the compiler. Clang warns about this abs(3) call because the argument is of unsigned type. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/pen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 2ae2f2b..cf4b080 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -195,7 +195,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, if (logbrush.lbStyle == BS_DIBPATTERN) logbrush.lbStyle = BS_DIBPATTERNPT; penPtr->logpen.elpPenStyle = style; - penPtr->logpen.elpWidth = abs(width); + penPtr->logpen.elpWidth = abs((int)width); penPtr->logpen.elpBrushStyle = logbrush.lbStyle; penPtr->logpen.elpColor = logbrush.lbColor; penPtr->logpen.elpHatch = brush->lbHatch;

1 0

Alexandre Julliard : wininet/tests: Remove todo from a succeeding test.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 61d1c95ea40835b208d5f9c6b246230a189326b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d1c95ea40835b208d5f9c6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 02:03:22 2016 +0900 wininet/tests: Remove todo from a succeeding test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 36710b7..82fd10b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -216,8 +216,7 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL i size = sizeof(code); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); ok_(__FILE__,line)(res, "[2] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE|number index) failed: %u\n", GetLastError()); - todo_wine_if (is_todo) - ok_(__FILE__,line)(!index, "index = %d, expected 0\n", index); + ok_(__FILE__,line)(!index, "index = %d, expected 0\n", index); ok_(__FILE__,line)(size == sizeof(code), "size = %u\n", size); sprintf(exbuf, "%u", excode);

1 0

Matteo Bruni : wined3d: Add shader limits for SM5.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 14d3dbbb7b967ce5ec2eb8a1cc2d9f892d174ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d3dbbb7b967ce5ec2eb8a1c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 16 20:48:06 2016 +0100 wined3d: Add shader limits for SM5. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f577647..88c064c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -487,12 +487,14 @@ static void shader_set_limits(struct wined3d_shader *shader) * shaders to 256. */ {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), { 4, 16, 256, 16, 12, 0}}, {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 16, 0}}, + {WINED3D_SHADER_VERSION(5, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 0}}, {0} }, gs_limits[] = { /* min_version, max_version, sampler, constant_int, constant_float, constant_bool, packed_output, packed_input */ {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 32, 16}}, + {WINED3D_SHADER_VERSION(5, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 32}}, {0} }, ps_limits[] = @@ -503,7 +505,7 @@ static void shader_set_limits(struct wined3d_shader *shader) {WINED3D_SHADER_VERSION(2, 0), WINED3D_SHADER_VERSION(2, 0), {16, 0, 32, 0, 0, 0}}, {WINED3D_SHADER_VERSION(2, 1), WINED3D_SHADER_VERSION(2, 1), {16, 16, 32, 16, 0, 0}}, {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), {16, 16, 224, 16, 0, 12}}, - {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 0, 32}}, + {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 0, 32}}, {0} }; const struct limits_entry *limits_array;

1 0

Matteo Bruni : d3d10core/tests: Test relative addressing in constant buffers.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 5571158ed5e57a58b8e15df51e82f0d5f590b94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5571158ed5e57a58b8e15df51… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 16 20:48:04 2016 +0100 d3d10core/tests: Test relative addressing in constant buffers. Signed-off-by: Matteo Bruni <mbruni(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 | 234 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 234 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f1c2b8c..e2c1683 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5224,6 +5224,239 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_cb_relative_addressing(void) +{ + ID3D10Buffer *vb, *colors_cb, *index_cb; + ID3D10RenderTargetView *backbuffer_rtv; + D3D10_SUBRESOURCE_DATA resource_data; + ID3D10InputLayout *input_layout; + unsigned int i, index[4] = {0}; + D3D10_BUFFER_DESC buffer_desc; + ID3D10Texture2D *backbuffer; + unsigned int stride, offset; + IDXGISwapChain *swapchain; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10Device *device; + D3D10_VIEWPORT vp; + ULONG refcount; + DWORD color; + HWND window; + HRESULT hr; + + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 +int color_index; + +cbuffer colors +{ + float4 colors[8]; +}; + +struct vs_in +{ + float4 position : POSITION; +}; + +struct vs_out +{ + float4 position : SV_POSITION; + float4 color : COLOR; +}; + +vs_out main(const vs_in v) +{ + vs_out o; + + o.position = v.position; + o.color = colors[color_index]; + + return o; +} +#endif + 0x43425844, 0xcecf6d7c, 0xe418097c, 0x47902dd0, 0x9500abc2, 0x00000001, 0x00000160, 0x00000003, + 0x0000002c, 0x00000060, 0x000000b4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x000000a4, 0x00010040, + 0x00000029, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000859, 0x00208e46, 0x00000001, + 0x00000008, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000001, 0x02000068, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, + 0x00101e46, 0x00000000, 0x06000036, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, + 0x07000036, 0x001020f2, 0x00000001, 0x04208e46, 0x00000001, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 +struct ps_in +{ + float4 position : SV_POSITION; + float4 color : COLOR; +}; + +float4 main(const ps_in v) : SV_TARGET +{ + return v.color; +} +#endif + 0x43425844, 0xe2087fa6, 0xa35fbd95, 0x8e585b3f, 0x67890f54, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + static const struct + { + struct vec2 position; + } + quad[] = + { + {{-1.0f, -1.0f}}, + {{-1.0f, 1.0f}}, + {{ 1.0f, -1.0f}}, + {{ 1.0f, 1.0f}}, + }; + static const struct + { + float color[4]; + } + colors[10] = + { + {{0.0f, 0.0f, 0.0f, 1.0f}}, + {{0.0f, 0.0f, 1.0f, 0.0f}}, + {{0.0f, 0.0f, 1.0f, 1.0f}}, + {{0.0f, 1.0f, 0.0f, 0.0f}}, + {{0.0f, 1.0f, 0.0f, 1.0f}}, + {{0.0f, 1.0f, 1.0f, 0.0f}}, + {{0.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 0.0f, 0.0f, 0.0f}}, + {{1.0f, 0.0f, 0.0f, 1.0f}}, + {{1.0f, 0.0f, 1.0f, 0.0f}}, + }; + static const struct + { + int index; + DWORD expected; + } + test_data[] = + { + { 0, 0xff000000}, + { 1, 0x00ff0000}, + { 2, 0xffff0000}, + { 3, 0x0000ff00}, + { 4, 0xff00ff00}, + { 5, 0x00ffff00}, + { 6, 0xffffff00}, + { 7, 0x000000ff}, + + { 8, 0xff0000ff}, + { 9, 0x00ff00ff}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + window = CreateWindowA("static", "d3d10core_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&backbuffer); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(colors); + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + resource_data.pSysMem = &colors; + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &colors_cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(index); + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &index_cb); + ok(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)backbuffer, NULL, &backbuffer_rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &backbuffer_rtv, NULL); + ID3D10Device_IASetInputLayout(device, input_layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + ID3D10Device_VSSetShader(device, vs); + ID3D10Device_VSSetConstantBuffers(device, 0, 1, &index_cb); + ID3D10Device_VSSetConstantBuffers(device, 1, 1, &colors_cb); + ID3D10Device_PSSetShader(device, ps); + + vp.TopLeftX = 0.0f; + vp.TopLeftY = 0.0f; + vp.Width = 640.0f; + vp.Height = 480.0f; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D10Device_RSSetViewports(device, 1, &vp); + + for (i = 0; i < sizeof(test_data) / sizeof(*test_data); ++i) + { + ID3D10Device_ClearRenderTargetView(device, backbuffer_rtv, white); + + index[0] = test_data[i].index; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)index_cb, 0, NULL, index, 0, 0); + + ID3D10Device_Draw(device, 4, 0); + + color = get_texture_color(backbuffer, 319, 239); + ok(compare_color(color, test_data[i].expected, 1), + "Got unexpected color 0x%08x for index %d.\n", color, test_data[i].index); + } + + ID3D10Buffer_Release(index_cb); + ID3D10Buffer_Release(colors_cb); + + ID3D10PixelShader_Release(ps); + ID3D10VertexShader_Release(vs); + ID3D10Buffer_Release(vb); + ID3D10InputLayout_Release(input_layout); + ID3D10RenderTargetView_Release(backbuffer_rtv); + ID3D10Texture2D_Release(backbuffer); + IDXGISwapChain_Release(swapchain); + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(device) { test_feature_level(); @@ -5254,4 +5487,5 @@ START_TEST(device) test_copy_subresource_region(); test_multisample_init(); test_check_multisample_quality_levels(); + test_cb_relative_addressing(); }

1 0

Frédéric Delanoy : d3d8/tests: Use todo_wine_if( ) in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: cdf961a0f1b164bb5a1605dc3e3c6b6870d9fe24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf961a0f1b164bb5a1605dc3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 16 23:16:02 2016 +0100 d3d8/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 16 ++++------------ dlls/d3d8/tests/visual.c | 5 +---- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 5dba46c..32e2f09 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -2712,10 +2712,8 @@ static void test_wndproc(void) * But sometimes focus-follows-mouse WMs also temporarily drop window focus, which makes * mark the device lost, then not reset, causing the test to succeed for the wrong reason. */ hr = IDirect3DDevice8_TestCooperativeLevel(device); - if (hr == D3DERR_DEVICENOTRESET) + todo_wine_if (hr != D3DERR_DEVICENOTRESET) ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); - else - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); expect_messages = focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or @@ -2736,9 +2734,7 @@ static void test_wndproc(void) ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice8_TestCooperativeLevel(device); /* Focus-follows-mouse WMs prematurely reactivate our window. */ - if (hr == D3DERR_DEVICENOTRESET) - todo_wine ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); - else + todo_wine_if (hr == D3DERR_DEVICENOTRESET) ok(hr == D3DERR_DEVICELOST, "Got unexpected hr %#x.\n", hr); ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); @@ -6313,9 +6309,7 @@ static void test_update_volumetexture(void) ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x, case %u.\n", hr, i); hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)src, (IDirect3DBaseTexture8 *)dst); - if (FAILED(hr)) - todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); - else + todo_wine_if (FAILED(hr)) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture8_Release(src); @@ -7837,9 +7831,7 @@ static void test_swapchain_parameters(void) for (j = 0; j < bb_count; ++j) { hr = IDirect3DDevice8_GetBackBuffer(device, j, D3DBACKBUFFER_TYPE_MONO, &backbuffer); - if (j) - todo_wine ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); - else + todo_wine_if (j) ok(SUCCEEDED(hr), "Failed to get backbuffer %u, hr %#x, test %u.\n", j, hr, i); if (SUCCEEDED(hr)) IDirect3DSurface8_Release(backbuffer); diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index db2e0db..856df5d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5829,10 +5829,7 @@ static void test_fog_interpolation(void) color = getPixelColor(device, 0, 240); ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 320, 240); - if (tests[i].todo) - todo_wine ok(color_match(color, tests[i].middle_color, 2), - "Got unexpected color 0x%08x, case %u.\n", color, i); - else + todo_wine_if (tests[i].todo) ok(color_match(color, tests[i].middle_color, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 639, 240);

1 0

Frédéric Delanoy : d3d9/tests: Use todo_wine_if( ) in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 77c05ebc4efd2d44082d40cc8bc5d196edd4cd8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c05ebc4efd2d44082d40cc8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 16 23:16:01 2016 +0100 d3d9/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 10 ++-------- dlls/d3d9/tests/device.c | 24 +++++------------------- dlls/d3d9/tests/visual.c | 22 ++++------------------ 3 files changed, 11 insertions(+), 45 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 99ba823..b74ae47 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2869,12 +2869,9 @@ static void test_window_style(void) ok(SUCCEEDED(hr), "Failed to reset device, hr %#x.\n", hr); style = GetWindowLongA(device_window, GWL_STYLE); - if (tests[i].style_flags & WS_VISIBLE) + todo_wine_if (!(tests[i].style_flags & WS_VISIBLE)) ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", device_style, style, i); - else - todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", - device_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", device_exstyle, style, i); @@ -2890,12 +2887,9 @@ static void test_window_style(void) ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); style = GetWindowLongA(device_window, GWL_STYLE); - if (device_style & WS_VISIBLE) + todo_wine_if (!(device_style & WS_VISIBLE)) ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", device_style, style, i); - else - todo_wine ok(style == device_style, "Expected device window style %#x, got %#x, i=%u.\n", - device_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); todo_wine ok(style == device_exstyle, "Expected device window extended style %#x, got %#x, i=%u.\n", device_exstyle, style, i); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 5bf7121..f31a7cd 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -668,11 +668,7 @@ static void test_fvf_decl_conversion(void) hr = IDirect3DDevice9_GetFVF(device, &fvf); ok(SUCCEEDED(hr), "Test %u: Failed to get FVF, hr %#x.\n", i, hr); - if (decl_to_fvf_tests[i].todo) - todo_wine ok(fvf == decl_to_fvf_tests[i].fvf, - "Test %u: Got unexpected FVF %#x, expected %#x.\n", - i, fvf, decl_to_fvf_tests[i].fvf); - else + todo_wine_if (decl_to_fvf_tests[i].todo) ok(fvf == decl_to_fvf_tests[i].fvf, "Test %u: Got unexpected FVF %#x, expected %#x.\n", i, fvf, decl_to_fvf_tests[i].fvf); @@ -3681,10 +3677,8 @@ static void test_wndproc(void) * But sometimes focus-follows-mouse WMs also temporarily drop window focus, which makes * mark the device lost, then not reset, causing the test to succeed for the wrong reason. */ hr = IDirect3DDevice9_TestCooperativeLevel(device); - if (hr == D3DERR_DEVICENOTRESET) + todo_wine_if (hr != D3DERR_DEVICENOTRESET) ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); - else - todo_wine ok(hr == D3DERR_DEVICENOTRESET, "Got unexpected hr %#x.\n", hr); expect_messages = tests[i].focus_loss_messages; /* SetForegroundWindow is a poor replacement for the user pressing alt-tab or @@ -4483,18 +4477,12 @@ static void test_window_style(void) style = GetWindowLongA(device_window, GWL_STYLE); expected_style = device_style | tests[i].style; - if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) - todo_wine ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", - expected_style, style, i); - else + todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) ok(style == expected_style, "Expected device window style %#x, got %#x, i=%u.\n", expected_style, style, i); style = GetWindowLongA(device_window, GWL_EXSTYLE); expected_style = device_exstyle | tests[i].exstyle; - if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) - todo_wine ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", - expected_style, style, i); - else + todo_wine_if (tests[i].device_flags & CREATE_DEVICE_NOWINDOWCHANGES) ok(style == expected_style, "Expected device window extended style %#x, got %#x, i=%u.\n", expected_style, style, i); @@ -8873,9 +8861,7 @@ static void test_update_volumetexture(void) ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x, case %u.\n", hr, i); hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)src, (IDirect3DBaseTexture9 *)dst); - if (FAILED(hr)) - todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); - else + todo_wine_if (FAILED(hr)) ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u.\n", hr, i); IDirect3DVolumeTexture9_Release(src); diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 8b56dbe..274777b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1450,15 +1450,11 @@ static void color_fill_test(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, fmt=%s.\n", hr, formats[i].name); hr = IDirect3DDevice9_ColorFill(device, surface, NULL, 0xdeadbeef); - if (formats[i].flags & TODO_FILL_RETURN) - todo_wine ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); - else + todo_wine_if (formats[i].flags & TODO_FILL_RETURN) ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); hr = IDirect3DDevice9_ColorFill(device, surface, &rect, 0xdeadbeef); - if (formats[i].flags & TODO_FILL_RETURN) - todo_wine ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); - else + todo_wine_if (formats[i].flags & TODO_FILL_RETURN) ok(SUCCEEDED(hr), "Failed to color fill, hr %#x, fmt=%s.\n", hr, formats[i].name); if (SUCCEEDED(hr)) @@ -8472,14 +8468,7 @@ static void test_shademode(void) * functionality being available. */ /* PHONG should be the same as GOURAUD, since no hardware implements * this. */ - if (tests[i].todo) - { - todo_wine ok(color_match(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", - i, color0, tests[i].color0); - todo_wine ok(color_match(color1, tests[i].color1, 1), "Test %u shading has color1 %08x, expected %08x.\n", - i, color1, tests[i].color1); - } - else + todo_wine_if (tests[i].todo) { ok(color_match(color0, tests[i].color0, 1), "Test %u shading has color0 %08x, expected %08x.\n", i, color0, tests[i].color0); @@ -18123,10 +18112,7 @@ static void test_fog_interpolation(void) color = getPixelColor(device, 0, 240); ok(color_match(color, 0x000000ff, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 320, 240); - if (tests[i].todo) - todo_wine ok(color_match(color, tests[i].middle_color, 2), - "Got unexpected color 0x%08x, case %u.\n", color, i); - else + todo_wine_if (tests[i].todo) ok(color_match(color, tests[i].middle_color, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = getPixelColor(device, 639, 240);

1 0

Frédéric Delanoy : ddraw/tests: Use todo_wine_if () in tests.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 3e5321409258d0043b897e7552eb4cd3e96d44f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e5321409258d0043b897e755… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 16 15:34:31 2016 +0100 ddraw/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/d3d.c | 10 +--------- dlls/ddraw/tests/ddraw1.c | 10 ++-------- dlls/ddraw/tests/ddraw2.c | 10 ++-------- dlls/ddraw/tests/ddraw4.c | 16 +++------------- dlls/ddraw/tests/ddraw7.c | 26 +++++--------------------- 5 files changed, 13 insertions(+), 59 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ec4197a..06f16f3 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3312,17 +3312,9 @@ static void FindDevice(void) hr = IDirect3D_FindDevice(Direct3D1, &search, &result); - if (deviceGUIDs[i].todo) - { - todo_wine - ok(hr == D3D_OK, - "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); - } - else - { + todo_wine_if (deviceGUIDs[i].todo) ok(hr == D3D_OK, "[%d] Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", i, hr); - } } /* Curiously the color model criteria seem to be ignored. */ diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4090b26..1e1a2ff 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -7240,18 +7240,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5c0bb52..75bdc84 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8394,18 +8394,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 950d458..a092787 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -5201,11 +5201,7 @@ static void test_block_formats_creation(void) expect_hr = D3D_OK; hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); - if (todo) - todo_wine ok(hr == expect_hr, - "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", - hr, formats[i].name, types[j].name, w, h, expect_hr); - else + todo_wine_if (todo) ok(hr == expect_hr, "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", hr, formats[i].name, types[j].name, w, h, expect_hr); @@ -9348,18 +9344,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface4_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface4_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 216ce38..d7589a8 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4996,11 +4996,7 @@ static void test_block_formats_creation(void) expect_hr = D3D_OK; hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); - if (todo) - todo_wine ok(hr == expect_hr, - "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", - hr, formats[i].name, types[j].name, w, h, expect_hr); - else + todo_wine_if (todo) ok(hr == expect_hr, "Got unexpected hr %#x for format %s, resource type %s, size %ux%u, expected %#x.\n", hr, formats[i].name, types[j].name, w, h, expect_hr); @@ -8862,10 +8858,7 @@ static void test_fog_interpolation(void) color = get_surface_color(rt, 0, 240); ok(compare_color(color, 0x000000ff, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = get_surface_color(rt, 320, 240); - if (tests[i].todo) - todo_wine ok(compare_color(color, tests[i].middle_color, 2), - "Got unexpected color 0x%08x, case %u.\n", color, i); - else + todo_wine_if (tests[i].todo) ok(compare_color(color, tests[i].middle_color, 2), "Got unexpected color 0x%08x, case %u.\n", color, i); color = get_surface_color(rt, 639, 240); @@ -9618,18 +9611,12 @@ static void test_color_fill(void) ok(SUCCEEDED(hr), "Failed to create surface, hr %#x, surface %s.\n", hr, tests[i].name); hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); hr = IDirectDrawSurface7_Blt(surface, &rect, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); - if (tests[i].format.dwFourCC) - todo_wine ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", - hr, tests[i].colorfill_hr, tests[i].name); - else + todo_wine_if (tests[i].format.dwFourCC) ok(hr == tests[i].colorfill_hr, "Blt returned %#x, expected %#x, surface %s.\n", hr, tests[i].colorfill_hr, tests[i].name); @@ -10737,10 +10724,7 @@ static void test_lockrect_invalid(void) locked_desc.dwSize = sizeof(locked_desc); hr = IDirectDrawSurface7_Lock(surface, rect, &locked_desc, DDLOCK_WAIT, NULL); - if (SUCCEEDED(resources[r].hr)) - todo_wine ok(hr == resources[r].hr, "Lock returned %#x for rect [%d, %d]->[%d, %d], type %s.\n", - hr, rect->left, rect->top, rect->right, rect->bottom, resources[r].name); - else + todo_wine_if (SUCCEEDED(resources[r].hr)) ok(hr == resources[r].hr, "Lock returned %#x for rect [%d, %d]->[%d, %d], type %s.\n", hr, rect->left, rect->top, rect->right, rect->bottom, resources[r].name); if (SUCCEEDED(hr))

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
76
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 February 2016