February 2017 - Wine-commits

Michael Stefaniuc : kernel32: Remove always true if conditions ( coccinellery).
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 1b3cbf52b2175426a55592f2891b85e55329a2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3cbf52b2175426a55592f28… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:51:31 2017 +0100 kernel32: Remove always true if conditions (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/time.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 09d06e8..fbe5811 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1308,11 +1308,8 @@ BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate, } unixtime = t; tm = gmtime( &unixtime ); - if (fattime) - *fattime = (tm->tm_hour << 11) + (tm->tm_min << 5) + (tm->tm_sec / 2); - if (fatdate) - *fatdate = ((tm->tm_year - 80) << 9) + ((tm->tm_mon + 1) << 5) - + tm->tm_mday; + *fattime = (tm->tm_hour << 11) + (tm->tm_min << 5) + (tm->tm_sec / 2); + *fatdate = ((tm->tm_year - 80) << 9) + ((tm->tm_mon + 1) << 5) + tm->tm_mday; return TRUE; }

1 0

Michael Stefaniuc : strmbase: Remove an always true if condition ( coccinellery).
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: 37d8f36de6c131729da114deed04f83b7cd09c26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d8f36de6c131729da114dee… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:52:26 2017 +0100 strmbase: Remove an always true if condition (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/video.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index 0f05d63..a03ba55 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -569,8 +569,7 @@ HRESULT WINAPI BaseControlVideoImpl_GetVideoPaletteEntries(IBasicVideo *iface, L if (!pRetrieved || !pPalette) return E_POINTER; - if (pRetrieved) - *pRetrieved = 0; + *pRetrieved = 0; return VFW_E_NO_PALETTE_AVAILABLE; }

1 0

Michael Stefaniuc : shell32/tests: Use the correct field for SW_SHOWNORMAL (coccinellery).
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: f20fa69c9bbffe182d23ead9408917f5e8c271da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20fa69c9bbffe182d23ead94… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:53:56 2017 +0100 shell32/tests: Use the correct field for SW_SHOWNORMAL (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellpath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index 3c757ec..3292c54 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -808,7 +808,7 @@ static void test_NonExistentPath(void) memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; - startup.dwFlags = SW_SHOWNORMAL; + startup.wShowWindow = SW_SHOWNORMAL; CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); winetest_wait_child_process( info.hProcess ); @@ -823,7 +823,7 @@ static void test_NonExistentPath(void) memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; - startup.dwFlags = SW_SHOWNORMAL; + startup.wShowWindow = SW_SHOWNORMAL; CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info); ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0,

1 0

Michael Stefaniuc : hid/tests: Remove duplicated for condition ( coccinellery).
by Alexandre Julliard 15 Feb '17

15 Feb '17

Module: wine Branch: master Commit: b89e3f80ae7a640ccd2d70aef67369273ec6abf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89e3f80ae7a640ccd2d70aef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 15 10:54:12 2017 +0100 hid/tests: Remove duplicated for condition (coccinellery). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index e72a500..a4c12ce 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -358,7 +358,7 @@ static void test_get_input_report(void) { ok(data[0] == 0, "Report ID (0) is not the first byte of the data\n"); report[0] = 0; - for (i = 0; i < Caps.InputReportByteLength && i < Caps.InputReportByteLength; i++) + for (i = 0; i < Caps.InputReportByteLength; i++) { char bytestr[5]; sprintf(bytestr, "%x ", (BYTE)data[i]);

1 0

Józef Kucia : wined3d: Implement SM5 atomic_* instructions.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 5043770acff11971315a1bc626f8b5149ef49dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5043770acff11971315a1bc62… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:12 2017 +0100 wined3d: Implement SM5 atomic_* instructions. 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/glsl_shader.c | 63 +++++++++++++++++++++++++++++++++------------- dlls/wined3d/shader.c | 8 +++--- 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9e752e3..7a7501e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4926,21 +4926,13 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) { const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - struct glsl_src_param image_coord_param, image_data_param; + struct glsl_src_param coord_param, data_param, data_param2; enum wined3d_shader_resource_type resource_type; enum wined3d_data_type data_type; unsigned int uav_idx; DWORD coord_mask; const char *op; - switch (ins->handler_idx) - { - case WINED3DSIH_ATOMIC_IADD: op = "imageAtomicAdd"; break; - default: - ERR("Unhandled opcode %#x.\n", ins->handler_idx); - return; - } - uav_idx = ins->dst[0].reg.idx[0].offset; resource_type = reg_maps->uav_resource_info[uav_idx].type; if (resource_type >= ARRAY_SIZE(resource_type_info)) @@ -4951,11 +4943,46 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) data_type = reg_maps->uav_resource_info[uav_idx].data_type; coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; - shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &image_coord_param); - shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_ALL, &image_data_param, data_type); - shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s, %s);\n", - op, shader_glsl_get_prefix(version->type), uav_idx, - image_coord_param.param_str, image_data_param.param_str); + switch (ins->handler_idx) + { + case WINED3DSIH_ATOMIC_AND: + op = "imageAtomicAnd"; + break; + case WINED3DSIH_ATOMIC_CMP_STORE: + op = "imageAtomicCompSwap"; + break; + case WINED3DSIH_ATOMIC_IADD: + op = "imageAtomicAdd"; + break; + case WINED3DSIH_ATOMIC_OR: + op = "imageAtomicOr"; + break; + case WINED3DSIH_ATOMIC_XOR: + op = "imageAtomicXor"; + break; + default: + ERR("Unhandled opcode %#x.\n", ins->handler_idx); + return; + } + + shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &coord_param); + + if (reg_maps->uav_resource_info[uav_idx].flags & WINED3D_VIEW_BUFFER_RAW) + shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s / 4, ", + op, shader_glsl_get_prefix(version->type), uav_idx, coord_param.param_str); + else + shader_addline(ins->ctx->buffer, "%s(%s_image%u, %s, ", + op, shader_glsl_get_prefix(version->type), uav_idx, coord_param.param_str); + + shader_glsl_add_src_param_ext(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &data_param, data_type); + shader_addline(ins->ctx->buffer, "%s", data_param.param_str); + if (ins->src_count >= 3) + { + shader_glsl_add_src_param_ext(ins, &ins->src[2], WINED3DSP_WRITEMASK_0, &data_param2, data_type); + shader_addline(ins->ctx->buffer, ", %s", data_param2.param_str); + } + + shader_addline(ins->ctx->buffer, ");\n"); } static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) @@ -9160,15 +9187,15 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ABS */ shader_glsl_map2gl, /* WINED3DSIH_ADD */ shader_glsl_binop, /* WINED3DSIH_AND */ shader_glsl_binop, - /* WINED3DSIH_ATOMIC_AND */ NULL, - /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, + /* WINED3DSIH_ATOMIC_AND */ shader_glsl_atomic, + /* WINED3DSIH_ATOMIC_CMP_STORE */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IMAX */ NULL, /* WINED3DSIH_ATOMIC_IMIN */ NULL, - /* WINED3DSIH_ATOMIC_OR */ NULL, + /* WINED3DSIH_ATOMIC_OR */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, - /* WINED3DSIH_ATOMIC_XOR */ NULL, + /* WINED3DSIH_ATOMIC_XOR */ shader_glsl_atomic, /* WINED3DSIH_BEM */ shader_glsl_bem, /* WINED3DSIH_BFI */ shader_glsl_bitwise_op, /* WINED3DSIH_BFREV */ shader_glsl_map2gl, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index dbf0430..82fa011 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1282,14 +1282,14 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } } - if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD + if ((WINED3DSIH_ATOMIC_AND <= ins.handler_idx && ins.handler_idx <= WINED3DSIH_ATOMIC_XOR) || ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) { unsigned int reg_idx; - if (ins.handler_idx == WINED3DSIH_ATOMIC_IADD) - reg_idx = ins.dst[0].reg.idx[0].offset; - else + if (ins.handler_idx == WINED3DSIH_LD_UAV_TYPED) reg_idx = ins.src[1].reg.idx[0].offset; + else + reg_idx = ins.dst[0].reg.idx[0].offset; if (reg_idx >= MAX_UNORDERED_ACCESS_VIEWS) { ERR("Invalid UAV index %u.\n", reg_idx);

1 0

Józef Kucia : d3d11/tests: Add test for atomic instructions.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 826b1e9c7852f4bceb28b1129063c263c49d3730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=826b1e9c7852f4bceb28b1129… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:13 2017 +0100 d3d11/tests: Add test for atomic instructions. 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 | 177 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 177 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ff983b2..3977f70 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -66,6 +66,11 @@ struct vec4 float x, y, z, w; }; +struct ivec4 +{ + int x, y, z, w; +}; + struct uvec4 { unsigned int x, y, z, w; @@ -12842,6 +12847,177 @@ static void test_ps_cs_uav_binding(void) release_test_context(&test_context); } +static void test_ps_uav_atomic_instructions(void) +{ + D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11UnorderedAccessView *uav; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + struct resource_readback rb; + ID3D11Buffer *cb, *raw_uav; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + D3D11_VIEWPORT vp; + unsigned int i, j; + HRESULT hr; + + static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; + static const DWORD ps_atomics_code[] = + { +#if 0 + RWByteAddressBuffer u; + + uint4 v; + int4 i; + + void main() + { + u.InterlockedAnd(0 * 4, v.x); + u.InterlockedCompareStore(1 * 4, v.y, v.x); + u.InterlockedAdd(2 * 4, v.x); + u.InterlockedOr(3 * 4, v.x); + u.InterlockedMax(4 * 4, i.x); + u.InterlockedMin(5 * 4, i.x); + u.InterlockedMax(6 * 4, v.x); + u.InterlockedMin(7 * 4, v.x); + u.InterlockedXor(8 * 4, v.x); + } +#endif + 0x43425844, 0x24c6a30c, 0x2ce4437d, 0xdee8a0df, 0xd18cb4bc, 0x00000001, 0x000001ac, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000158, 0x00000050, 0x00000056, 0x0100086a, + 0x04000059, 0x00208e46, 0x00000000, 0x00000002, 0x0300009d, 0x0011e000, 0x00000000, 0x080000a9, + 0x0011e000, 0x00000000, 0x00004001, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0b0000ac, + 0x0011e000, 0x00000000, 0x00004001, 0x00000004, 0x0020801a, 0x00000000, 0x00000000, 0x0020800a, + 0x00000000, 0x00000000, 0x080000ad, 0x0011e000, 0x00000000, 0x00004001, 0x00000008, 0x0020800a, + 0x00000000, 0x00000000, 0x080000aa, 0x0011e000, 0x00000000, 0x00004001, 0x0000000c, 0x0020800a, + 0x00000000, 0x00000000, 0x080000ae, 0x0011e000, 0x00000000, 0x00004001, 0x00000010, 0x0020800a, + 0x00000000, 0x00000001, 0x080000af, 0x0011e000, 0x00000000, 0x00004001, 0x00000014, 0x0020800a, + 0x00000000, 0x00000001, 0x080000b0, 0x0011e000, 0x00000000, 0x00004001, 0x00000018, 0x0020800a, + 0x00000000, 0x00000000, 0x080000b1, 0x0011e000, 0x00000000, 0x00004001, 0x0000001c, 0x0020800a, + 0x00000000, 0x00000000, 0x080000ab, 0x0011e000, 0x00000000, 0x00004001, 0x00000020, 0x0020800a, + 0x00000000, 0x00000000, 0x0100003e, + }; + + static const char * const instructions[] = + { + "atomic_and", "atomic_cmp_store", "atomic_iadd", "atomic_or", + "atomic_imax", "atomic_imin", "atomic_umax", "atomic_umin", "atomic_xor", + }; + static const struct test + { + struct uvec4 v; + struct ivec4 i; + unsigned int input[sizeof(instructions) / sizeof(*instructions)]; + unsigned int expected_result[sizeof(instructions) / sizeof(*instructions)]; + } + tests[] = + { + {{1, 0}, {-1}, {0xffff, 0, 1, 0, 0, 0, 0, 0, 0xff}, { 1, 1, 2, 1, 0, ~0u, 1, 0, 0xfe}}, + {{~0u, ~0u}, { 0}, {0xffff, 0xf, 1, 0, 0, 0, 0, 9, ~0u}, {0xffff, 0xf, 0, ~0u, 0, 0, ~0u, 9, 0}}, + }; + + if (!init_test_context(&test_context, &feature_level)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R32_FLOAT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(SUCCEEDED(hr), "Failed to create rendertarget view, hr %#x.\n", hr); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, 2 * sizeof(struct uvec4), NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + buffer_desc.ByteWidth = sizeof(tests->input); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = D3D11_RESOURCE_MISC_BUFFER_ALLOW_RAW_VIEWS; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &raw_uav); + ok(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + + uav_desc.Format = DXGI_FORMAT_R32_TYPELESS; + uav_desc.ViewDimension = D3D11_UAV_DIMENSION_BUFFER; + U(uav_desc).Buffer.FirstElement = 0; + U(uav_desc).Buffer.NumElements = buffer_desc.ByteWidth / sizeof(*tests->input); + U(uav_desc).Buffer.Flags = D3D11_BUFFER_UAV_FLAG_RAW; + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)raw_uav, &uav_desc, &uav); + ok(SUCCEEDED(hr), "Failed to create unordered access view, hr %#x.\n", hr); + + /* FIXME: Set the render targets to NULL when no attachment draw calls are supported in wined3d. */ + ID3D11DeviceContext_OMSetRenderTargetsAndUnorderedAccessViews(context, 1, &rtv, NULL, + 0, 1, &uav, NULL); + + vp.TopLeftX = 0.0f; + vp.TopLeftY = 0.0f; + vp.Width = texture_desc.Width; + vp.Height = texture_desc.Height; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + + hr = ID3D11Device_CreatePixelShader(device, ps_atomics_code, sizeof(ps_atomics_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + const struct test *test = &tests[i]; + + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, + NULL, &test->v, 0, 0); + + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)raw_uav, 0, + NULL, test->input, 0, 0); + + draw_quad(&test_context); + + get_buffer_readback(raw_uav, &rb); + for (j = 0; j < sizeof(instructions) / sizeof(*instructions); ++j) + { + unsigned int value = get_readback_color(&rb, j, 0); + unsigned int expected = test->expected_result[j]; + + todo_wine_if(expected != test->input[j] + && (!strcmp(instructions[j], "atomic_imax") + || !strcmp(instructions[j], "atomic_imin") + || !strcmp(instructions[j], "atomic_umax") + || !strcmp(instructions[j], "atomic_umin"))) + ok(value == expected, "Test %u: Got %#x (%d), expected %#x (%d) for '%s' " + "with inputs (%u, %u), (%d), %#x (%d).\n", + i, value, value, expected, expected, instructions[j], + test->v.x, test->v.y, test->i.x, test->input[j], test->input[j]); + } + release_resource_readback(&rb); + } + + ID3D11Buffer_Release(cb); + ID3D11Buffer_Release(raw_uav); + ID3D11PixelShader_Release(ps); + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + ID3D11UnorderedAccessView_Release(uav); + release_test_context(&test_context); +} + static void test_sm4_ret_instruction(void) { struct d3d11_test_context test_context; @@ -14075,6 +14251,7 @@ START_TEST(d3d11) test_uav_load(); test_cs_uav_store(); test_ps_cs_uav_binding(); + test_ps_uav_atomic_instructions(); test_sm4_ret_instruction(); test_primitive_restart(); test_resinfo_instruction();

1 0

Nikolay Sivov : d2d1: Added support for ID2D1GdiInteropRenderTarget interface.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 74ed5c7067188db0eff739ed1f36ff2142421d6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ed5c7067188db0eff739ed1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 14 18:19:00 2017 +0300 d2d1: Added support for ID2D1GdiInteropRenderTarget interface. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap_render_target.c | 8 +- dlls/d2d1/d2d1_private.h | 7 +- dlls/d2d1/dc_render_target.c | 8 +- dlls/d2d1/factory.c | 18 +--- dlls/d2d1/hwnd_render_target.c | 8 +- dlls/d2d1/render_target.c | 137 ++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 209 ++++++++++++++++++++++++++++++++++++++- dlls/d2d1/wic_render_target.c | 8 +- 8 files changed, 371 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74ed5c7067188db0eff73…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 9e779666faed703373958a1bd6ec3c67b0cb8ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e779666faed703373958a1bd… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Tue Feb 14 17:02:02 2017 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/po/fi.po b/po/fi.po index e98f148..16683a2 100644 --- a/po/fi.po +++ b/po/fi.po @@ -9325,10 +9325,8 @@ msgid "Confidentiality Required" msgstr "Vaaditaan luottamuksellisuutta" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Sulkeminen meneillään.\n" +msgstr "SASL-todennus on kesken" #: wldap32.rc:48 msgid "No Such Attribute" @@ -11923,17 +11921,11 @@ msgstr "Valitun rekisteriarvon uudelleennimeäminen ei onnistu." #: regedit.rc:220 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "Avaimet ja arvot tiedostosta %1 on nyt lisätty rekisteriin." #: regedit.rc:221 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." -msgstr "" -"Avaimen '%1' nimeäminen ei onnistu.\n" -"Annettu avaimen nimi on jo varattu." +msgstr "Tiedostoa %1 ei voi tuoda, koska se ei ole kelpo rekisteritiedosto." #: regedit.rc:373 msgid ""

1 0

Jacek Caban : mshtml/tests: Added body event setters tests.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 8fba2bc6df423104c1a75122126fcd95504c8cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fba2bc6df423104c1a751221… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:10:38 2017 +0100 mshtml/tests: Added body event setters tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 64e03f5..8d5fcc3 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -157,6 +157,18 @@ function test_string_event_handler() { ok(string_handler_called === false, "string handler called"); } +function test_body_events() { + var f = function() {} + + document.body.onload = f; + ok(document.body.onload === f, "body.onload != f"); + ok(window.onload === f, "window.onload != f"); + + document.body.onfocus = f; + ok(document.body.onfocus === f, "body.onfocus != f"); + ok(window.onfocus === f, "window.onfocus != f"); +} + window.onload = function() { try { ok(inlscr_complete_called, "onreadystatechange not fired"); @@ -178,6 +190,7 @@ window.onload = function() { test_handler_this(); test_insert_script(); test_string_event_handler(); + test_body_events(); }catch(e) { ok(false, "Got an exception: " + e.message); }

1 0

Jacek Caban : mshtml: Use inner window's event target for body element.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 74a759673d4aba26aa6312073c5cb3a7441143bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=74a759673d4aba26aa6312073… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:10:44 2017 +0100 mshtml: Use inner window's event target for body element. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 -- dlls/mshtml/htmlwindow.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 - 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 729ef82..fbd04aa 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -829,8 +829,8 @@ static event_target_t **HTMLBodyElement_get_event_target_ptr(HTMLDOMNode *iface) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - return This->textcont.element.node.doc - ? &This->textcont.element.node.doc->body_event_target + return This->textcont.element.node.doc && This->textcont.element.node.doc->window + ? &This->textcont.element.node.doc->window->event_target.ptr : &This->textcont.element.node.event_target.ptr; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b672c2d..5c15772 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4644,8 +4644,6 @@ static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) heap_free(This->elem_vars); detach_events(This); - if(This->body_event_target) - release_event_target(This->body_event_target); if(This->catmgr) ICatInformation_Release(This->catmgr); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b4ec425..b1efc0d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -253,6 +253,8 @@ static void release_inner_window(HTMLInnerWindow *This) htmldoc_release(&This->doc->basedoc); } + if(This->event_target.ptr) + release_event_target(This->event_target.ptr); release_dispex(&This->event_target.dispex); for(i=0; i < This->global_prop_cnt; i++) @@ -2943,7 +2945,7 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD static event_target_t **HTMLWindow_get_event_target_ptr(DispatchEx *dispex) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); - return &This->doc->body_event_target; + return &This->event_target.ptr; } static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f27b674..8bc0599 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -801,7 +801,6 @@ struct HTMLDocumentNode { nsIDOMHTMLDocument *nsdoc; BOOL content_ready; - event_target_t *body_event_target; IHTMLDOMImplementation *dom_implementation;

1 0