February 2016 - Wine-Commits

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

Feb. 17, 2016

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

Matteo Bruni : wined3d: Add shader limits for SM5.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

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 Feb. 17, 2016

Feb. 17, 2016

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 : mscms/tests: Use todo_wine_if () in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 6ef5ae801d6e1f8f1a6492952d1fc82b9d1604ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ef5ae801d6e1f8f1a6492952… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 17 15:18:25 2016 +0100 mscms/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/tests/profile.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index f3ebe03..c4ea7f2 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -675,10 +675,8 @@ static void test_EnumColorProfilesA( char *standardprofile ) ok( !ret, "EnumColorProfilesA() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); size = 0; @@ -689,10 +687,8 @@ static void test_EnumColorProfilesA( char *standardprofile ) size = total; ret = pEnumColorProfilesA( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesA() failed (%d)\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); } @@ -729,10 +725,8 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) ok( !ret, "EnumColorProfilesW() succeeded (%d)\n", GetLastError() ); ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); size = 0; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); @@ -742,10 +736,8 @@ static void test_EnumColorProfilesW( WCHAR *standardprofileW ) size = total; ret = pEnumColorProfilesW( NULL, &record, buffer, &size, &number ); - if (have_color_profile) + todo_wine_if (!have_color_profile) ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); - else - todo_wine ok( ret, "EnumColorProfilesW() failed (%d)\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, buffer ); }

1 0

Frédéric Delanoy : kernel32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 5da69565b53e6897d58d86e8da69e2d62902d3f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da69565b53e6897d58d86e8d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Feb 17 12:04:20 2016 +0100 kernel32/tests: Use todo_wine_if() in tests. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 38c0675..a3ae5e6 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -3172,11 +3172,8 @@ static void test_CreateFileMapping_protection(void) ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, td[i].prot); ok(!ptr, "%d: VirtualAlloc(%02x) should fail\n", i, td[i].prot); /* FIXME: remove once Wine is fixed */ - if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) -todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); - else - ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + todo_wine_if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); SetLastError(0xdeadbeef); ret = VirtualProtect(base, si.dwPageSize, td[i].prot, &old_prot); @@ -3267,9 +3264,7 @@ todo_wine ok(info.BaseAddress == base, "%d: got %p != expected %p\n", i, info.BaseAddress, base); ok(info.RegionSize == si.dwPageSize, "%d: got %#lx != expected %#x\n", i, info.RegionSize, si.dwPageSize); /* FIXME: remove the condition below once Wine is fixed */ - if (td[i].prot == PAGE_EXECUTE_WRITECOPY) - todo_wine ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); - else + todo_wine_if (td[i].prot == PAGE_EXECUTE_WRITECOPY) ok(info.Protect == prot, "%d: got %#x != expected %#x\n", i, info.Protect, prot); ok(info.AllocationBase == base, "%d: %p != %p\n", i, info.AllocationBase, base); ok(info.AllocationProtect == alloc_prot, "%d: %#x != %#x\n", i, info.AllocationProtect, alloc_prot); @@ -3284,9 +3279,7 @@ todo_wine ret = VirtualQuery(base, &info, sizeof(info)); ok(ret, "VirtualQuery failed %d\n", GetLastError()); /* FIXME: remove the condition below once Wine is fixed */ - if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) - todo_wine ok(info.Protect == td[i].prot_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_after_write); - else + todo_wine_if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) ok(info.Protect == td[i].prot_after_write, "%d: got %#x != expected %#x\n", i, info.Protect, td[i].prot_after_write); } } @@ -3302,9 +3295,7 @@ todo_wine ret = VirtualProtect(base, si.dwPageSize, PAGE_NOACCESS, &old_prot); ok(ret, "%d: VirtualProtect error %d\n", i, GetLastError()); /* FIXME: remove the condition below once Wine is fixed */ - if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) - todo_wine ok(old_prot == td[i].prot_after_write, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_after_write); - else + todo_wine_if (td[i].prot == PAGE_WRITECOPY || td[i].prot == PAGE_EXECUTE_WRITECOPY) ok(old_prot == td[i].prot_after_write, "%d: got %#x != expected %#x\n", i, old_prot, td[i].prot_after_write); } @@ -3675,11 +3666,8 @@ static void test_mapping(void) ptr = VirtualAlloc(base, si.dwPageSize, MEM_COMMIT, page_prot[k]); ok(!ptr, "VirtualAlloc(%02x) should fail\n", page_prot[k]); /* FIXME: remove once Wine is fixed */ - if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) -todo_wine - ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); - else - ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); + todo_wine_if (page_prot[k] == PAGE_WRITECOPY || page_prot[k] == PAGE_EXECUTE_WRITECOPY) + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError()); } UnmapViewOfFile(base);

1 0

Charles Davis : dinput: Don't define a debug channel when it isn't used.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 4dba8a4e27db04c4edec973115bc1288a039156b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dba8a4e27db04c4edec97311… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Feb 16 13:51:19 2016 -0700 dinput: Don't define a debug channel when it isn't used. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 4 ++-- dlls/dinput/joystick_linuxinput.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 9921a28..261cee1 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -65,10 +65,10 @@ #include "device_private.h" #include "joystick_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dinput); - #ifdef HAVE_LINUX_22_JOYSTICK_API +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + #define JOYDEV_NEW "/dev/input/js" #define JOYDEV_OLD "/dev/js" #define JOYDEVDRIVER " (js)" diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 4b4d69c..86f12d0 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -63,10 +63,10 @@ #include "device_private.h" #include "joystick_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dinput); - #ifdef HAS_PROPER_HEADER +WINE_DEFAULT_DEBUG_CHANNEL(dinput); + #define EVDEVPREFIX "/dev/input/event" #define EVDEVDRIVER " (event)"

1 0

Nikolay Sivov : ws2_32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 944a0228f56f006bdc0ec50776c730db4972e7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=944a0228f56f006bdc0ec5077… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 02:11:01 2016 +0300 ws2_32/tests: Use todo_wine_if() in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 4f11cce..d5e01c8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1591,17 +1591,10 @@ todo_wine "SO_PROTOCOL_INFO[A/W] comparison failed\n"); /* Remove IF when WSAEnumProtocols support IPV6 data */ - if (prottest[i].family == AF_INET6) - { - todo_wine + todo_wine_if (prottest[i].family == AF_INET6) ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", prottest[i].family, infoA.iAddressFamily); - } - else - { - ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", - prottest[i].family, infoA.iAddressFamily); - } ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", + ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", prottest[i].type, infoA.iSocketType); ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n", prottest[i].proto, infoA.iProtocol); @@ -2798,27 +2791,15 @@ static void test_WSAEnumNetworkEvents(void) "Test[%d]: WSAEnumNetworkEvents failed\n", i); if (i >= 1 && j == 0) /* FD_WRITE is SET on first try for UDP and connected TCP */ { - if (i == 0) /* Remove when fixed */ - { - todo_wine + todo_wine_if (i == 0) /* Remove when fixed */ ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", i, net_events.lNetworkEvents); - } - else - ok (net_events.lNetworkEvents == FD_WRITE, "Test[%d]: expected 2, got %d\n", - i, net_events.lNetworkEvents); } else { - if (i != 0) /* Remove when fixed */ - { - todo_wine + todo_wine_if (i != 0) /* Remove when fixed */ ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", i, net_events.lNetworkEvents); - } - else - ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", - i, net_events.lNetworkEvents); } for (k = 0; k < FD_MAX_EVENTS; k++) {

1 0

Vincent Povirk : gdiplus: Fix GdipWidenPath transform for non-pixel pens.
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 6a6aa3134da847e7b91005ae2e6de5999d9e2574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a6aa3134da847e7b91005ae2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 16 16:10:22 2016 -0600 gdiplus: Fix GdipWidenPath transform for non-pixel pens. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 5 ++++- dlls/gdiplus/tests/graphicspath.c | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 49dbf6c..58e99a2 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2074,7 +2074,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, status = GdipClonePath(path, &flat_path); if (status == Ok) - status = GdipFlattenPath(flat_path, matrix, flatness); + status = GdipFlattenPath(flat_path, pen->unit == UnitPixel ? matrix : NULL, flatness); if (status == Ok && !init_path_list(&points, 314.0, 22.0)) status = OutOfMemory; @@ -2147,6 +2147,9 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, GdipDeletePath(flat_path); + if (status == Ok && pen->unit != UnitPixel) + status = GdipTransformPath(path, matrix); + return status; } diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 81670a4..24619e5 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1056,10 +1056,10 @@ static path_test_t widenline_path[] = { }; static path_test_t widenline_wide_path[] = { - {5.0, 0.0, PathPointTypeStart, 0, 1}, /*0*/ - {50.0, 0.0, PathPointTypeLine, 0, 1}, /*1*/ - {50.0, 20.0, PathPointTypeLine, 0, 1}, /*2*/ - {5.0, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 1} /*3*/ + {5.0, 0.0, PathPointTypeStart, 0, 0}, /*0*/ + {50.0, 0.0, PathPointTypeLine, 0, 0}, /*1*/ + {50.0, 20.0, PathPointTypeLine, 0, 0}, /*2*/ + {5.0, 20.0, PathPointTypeLine|PathPointTypeCloseSubpath, 0, 0} /*3*/ }; static void test_widen(void)

1 0

Nikolay Sivov : dwrite: Implement InvalidateLayout().
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: 5753e22d21aa2e322e74447a4146da99d83f6f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5753e22d21aa2e322e74447a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 17 00:19:39 2016 +0300 dwrite: Implement InvalidateLayout(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 7 +++++-- dlls/dwrite/tests/analyzer.c | 2 +- dlls/dwrite/tests/layout.c | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index aa77d91..a2e1308 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3586,8 +3586,11 @@ static HRESULT WINAPI dwritetextlayout2_GetFontFallback(IDWriteTextLayout3 *ifac static HRESULT WINAPI dwritetextlayout3_InvalidateLayout(IDWriteTextLayout3 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout3(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + + TRACE("(%p)\n", This); + + This->recompute = RECOMPUTE_EVERYTHING; + return S_OK; } static HRESULT WINAPI dwritetextlayout3_SetLineSpacing(IDWriteTextLayout3 *iface, DWRITE_LINE_SPACING const *spacing) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 07e00af..043d7a1 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -27,7 +27,7 @@ #include "initguid.h" #include "windows.h" -#include "dwrite_2.h" +#include "dwrite_3.h" #include "wine/test.h" diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 0fe9151..c8fe6d2 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -25,7 +25,7 @@ #include <limits.h> #include "windows.h" -#include "dwrite_2.h" +#include "dwrite_3.h" #include "wine/test.h" @@ -4853,6 +4853,38 @@ todo_wine IDWriteFactory_Release(factory); } +static void test_InvalidateLayout(void) +{ + static const WCHAR strW[] = {'a',0}; + IDWriteTextLayout3 *layout3; + IDWriteTextLayout *layout; + IDWriteTextFormat *format; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout3, (void**)&layout3); + if (hr == S_OK) { + hr = IDWriteTextLayout3_InvalidateLayout(layout3); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout3_Release(layout3); + } + else + win_skip("IDWriteTextLayout3::InvalidateLayout() is not supported.\n"); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -4900,6 +4932,7 @@ START_TEST(layout) test_SetLastLineWrapping(); test_SetOpticalAlignment(); test_SetUnderline(); + test_InvalidateLayout(); IDWriteFactory_Release(factory); }

1 0

Henri Verbeet : ddraw: Use wined3d_texture_get_sub_resource_parent() in ddraw_surface_create().
by Alexandre Julliard Feb. 17, 2016

Feb. 17, 2016

Module: wine Branch: master Commit: f984f56fd822cec2673edcacadbe39bd57959a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f984f56fd822cec2673edcaca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 17:17:28 2016 +0100 ddraw: Use wined3d_texture_get_sub_resource_parent() in ddraw_surface_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4652c7b..a5b18a2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6116,8 +6116,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return hr_ddraw_from_wined3d(hr); } - resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - root = wined3d_resource_get_parent(resource); + root = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); wined3d_texture_decref(wined3d_texture); root->is_complex_root = TRUE; texture->root = root; @@ -6141,12 +6140,12 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ for (j = 0; j < levels; ++j) { - resource = wined3d_texture_get_sub_resource(wined3d_texture, i * levels + j); - mip = wined3d_resource_get_parent(resource); + mip = wined3d_texture_get_sub_resource_parent(wined3d_texture, i * levels + j); mip_desc = &mip->surface_desc; if (j) { + resource = wined3d_texture_get_sub_resource(wined3d_texture, i * levels + j); wined3d_resource_get_desc(resource, &wined3d_mip_desc); mip_desc->dwWidth = wined3d_mip_desc.width; mip_desc->dwHeight = wined3d_mip_desc.height; @@ -6237,8 +6236,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ goto fail; } - resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - last = wined3d_resource_get_parent(resource); + last = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); wined3d_texture_decref(wined3d_texture); texture->root = last;

1 0