- wine-devel - winehq.org

[PATCH] comctl32: Fix checkbox wrong box alignment with BS_VCENTER.
by Zhiyi Zhang 26 Apr '18

26 Apr '18

BS_VCENTER shares bit field with BS_TOP and BS_BOTTOM. Thus the condition can't base on only logic AND. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 1feb07ae64..507820cf45 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1150,14 +1150,14 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) /* rbox must have the correct height */ delta = rbox.bottom - rbox.top - checkBoxHeight; - if (style & BS_TOP) { + if ((style & BS_VCENTER) == BS_TOP) { if (delta > 0) { rbox.bottom = rbox.top + checkBoxHeight; } else { rbox.top -= -delta/2 + 1; rbox.bottom = rbox.top + checkBoxHeight; } - } else if (style & BS_BOTTOM) { + } else if ((style & BS_VCENTER) == BS_BOTTOM) { if (delta > 0) { rbox.top = rbox.bottom - checkBoxHeight; } else { -- 2.17.0

2 1

[PATCH vkd3d] Update copyright info.
by Józef Kucia 26 Apr '18

26 Apr '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- COPYING | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/COPYING b/COPYING index 85faa25e1598..32417ceba701 100644 --- a/COPYING +++ b/COPYING @@ -1,5 +1,5 @@ -Copyright 2016-2017 Józef Kucia for CodeWeavers -Copyright 2016-2017 Henri Verbeet for CodeWeavers +Copyright 2016-2018 the Vkd3d project authors (see the file AUTHORS for a +complete list) Vkd3d is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the -- 2.16.1

2 1

[PATCH 1/6] wined3d: Parse SM5 precise instruction modifier.
by Józef Kucia 26 Apr '18

26 Apr '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/shader.c | 21 +++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 8 ++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c8939459d0eb..4986f3ca213b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1917,6 +1917,23 @@ static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD s shader_addline(buffer, "_unknown_flags(%#x)", sync_flags); } +static void shader_dump_precise_flags(struct wined3d_string_buffer *buffer, DWORD precise_flags) +{ + if (!precise_flags) + return; + + shader_addline(buffer, " [precise"); + if (precise_flags != WINED3DSI_PRECISE_XYZW) + { + shader_addline(buffer, "(%s%s%s%s)", + precise_flags & WINED3DSI_PRECISE_X ? "x" : "", + precise_flags & WINED3DSI_PRECISE_Y ? "y" : "", + precise_flags & WINED3DSI_PRECISE_Z ? "z" : "", + precise_flags & WINED3DSI_PRECISE_W ? "w" : ""); + } + shader_addline(buffer, "]"); +} + static void shader_dump_uav_flags(struct wined3d_string_buffer *buffer, DWORD uav_flags) { if (uav_flags & WINED3DSUF_GLOBALLY_COHERENT) @@ -3080,6 +3097,10 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe { shader_dump_sync_flags(&buffer, ins.flags); } + else + { + shader_dump_precise_flags(&buffer, ins.flags); + } if (wined3d_shader_instruction_has_texel_offset(&ins)) shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f11af7630253..b56f16a64e1d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -61,6 +61,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_GLOBAL_FLAGS_SHIFT 11 #define WINED3D_SM4_GLOBAL_FLAGS_MASK (0xffu << WINED3D_SM4_GLOBAL_FLAGS_SHIFT) +#define WINED3D_SM5_PRECISE_SHIFT 19 +#define WINED3D_SM5_PRECISE_MASK (0xfu << WINED3D_SM5_PRECISE_SHIFT) + #define WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 #define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) @@ -1643,6 +1646,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi unsigned int i, len; SIZE_T remaining; const DWORD *p; + DWORD precise; list_move_head(&priv->src_free, &priv->src); @@ -1717,12 +1721,13 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi shader_sm4_read_instruction_modifier(previous_token = *p++, ins); ins->flags = (opcode_token & WINED3D_SM4_INSTRUCTION_FLAGS_MASK) >> WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT; - if (ins->flags & WINED3D_SM4_INSTRUCTION_FLAG_SATURATE) { ins->flags &= ~WINED3D_SM4_INSTRUCTION_FLAG_SATURATE; instruction_dst_modifier = WINED3DSPDM_SATURATE; } + precise = (opcode_token & WINED3D_SM5_PRECISE_MASK) >> WINED3D_SM5_PRECISE_SHIFT; + ins->flags |= precise << WINED3DSI_PRECISE_SHIFT; for (i = 0; i < ins->dst_count; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 10bb607292fa..ab13a29530a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -618,6 +618,14 @@ enum wined3d_tessellator_partitioning #define WINED3DSI_SAMPLE_INFO_UINT 0x1 #define WINED3DSI_SAMPLER_COMPARISON_MODE 0x1 +#define WINED3DSI_PRECISE_X 0x100 +#define WINED3DSI_PRECISE_Y 0x200 +#define WINED3DSI_PRECISE_Z 0x400 +#define WINED3DSI_PRECISE_W 0x800 +#define WINED3DSI_PRECISE_XYZW (WINED3DSI_PRECISE_X | WINED3DSI_PRECISE_Y \ + | WINED3DSI_PRECISE_Z | WINED3DSI_PRECISE_W) +#define WINED3DSI_PRECISE_SHIFT 8 + enum wined3d_shader_rel_op { WINED3D_SHADER_REL_OP_GT = 1, -- 2.16.1

2 11

[v2 PATCH 1/3] d3d11: Add support for setting multiple scissor rectangles.
by Nikolay Sivov 26 Apr '18

26 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: remove a test that was reported to fail on AMD, I think it has to do with 0 rectangle count handling. It works fine on GTX 760 for me. dlls/d3d11/device.c | 14 +++------ dlls/d3d11/tests/d3d11.c | 64 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a8251aad27..c6a7218fb7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -991,14 +991,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); - if (rect_count > 1) - FIXME("Multiple scissor rects not implemented.\n"); - - if (!rect_count) + if (rect_count > WINED3D_MAX_VIEWPORTS) return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); wined3d_mutex_unlock(); } @@ -4185,14 +4182,11 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetScissorRects(ID3D10Device1 *ifac TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); - if (rect_count > 1) - FIXME("Multiple scissor rects not implemented.\n"); - - if (!rect_count) + if (rect_count > WINED3D_MAX_VIEWPORTS) return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); wined3d_mutex_unlock(); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8279e7b105..1a0634fd20 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10563,7 +10563,6 @@ static void test_clear_state(void) ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect); for (i = 0; i < D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - todo_wine_if(!i) ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); @@ -26130,10 +26129,14 @@ static void test_multiple_viewports(void) }; static const struct vec4 expected_values[] = { - {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, {0.0f, 4.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + {0.0f, 5.0f}, {0.5f, 0.5f}, {1.0f, 5.0f}, {0.5f, 0.5f}, }; static const float clear_color[] = {0.5f, 0.5f, 0.0f, 0.0f}; + ID3D11RasterizerState *rasterizer_state; + D3D11_RASTERIZER_DESC rasterizer_desc; unsigned int count, i; + D3D11_RECT rects[2]; RECT rect; int width; @@ -26222,6 +26225,63 @@ static void test_multiple_viewports(void) draw_quad(&test_context); check_texture_sub_resource_vec4(texture, 0, NULL, &expected_values[4], 1); + /* Two viewports, only first scissor rectangle set. */ + memset(&rasterizer_desc, 0, sizeof(rasterizer_desc)); + rasterizer_desc.FillMode = D3D11_FILL_SOLID; + rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.DepthClipEnable = TRUE; + rasterizer_desc.ScissorEnable = TRUE; + hr = ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rasterizer_state); + ID3D11RasterizerState_Release(rasterizer_state); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetViewports(context, 2, vp); + + rects[0].left = 0; + rects[0].top = 0; + rects[0].right = width; + rects[0].bottom = texture_desc.Height / 2; + memset(&rects[1], 0, sizeof(*rects)); + ID3D11DeviceContext_RSSetScissorRects(context, 1, rects); + constant.draw_id = 4; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[5], 1); + SetRect(&rect, 0, texture_desc.Height / 2, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[6], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[7], 1); + + /* Set both rectangles. */ + rects[0].left = 0; + rects[0].top = 0; + rects[0].right = width; + rects[0].bottom = texture_desc.Height / 2; + rects[1].left = width; + rects[1].top = 0; + rects[1].right = width * 2; + rects[1].bottom = texture_desc.Height / 2; + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetScissorRects(context, 2, rects); + constant.draw_id = 5; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[8], 1); + SetRect(&rect, 0, texture_desc.Height / 2, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[9], 1); + + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[10], 1); + SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + /* Viewport count exceeding maximum value. */ ID3D11DeviceContext_RSSetViewports(context, 1, vp); -- 2.17.0

2 5

[PATCH 1/3] msi: Make MsiEnumComponentCosts RPC-compatible.
by Zebediah Figura 26 Apr '18

26 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/msi.c | 20 ++++----- dlls/msi/package.c | 9 ++-- dlls/msi/tests/custom.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/winemsi.idl | 4 +- 4 files changed, 124 insertions(+), 20 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index c0af7f5..2ec94a1 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2005,25 +2005,21 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i if (!drive || !buflen || !cost || !temp) return ERROR_INVALID_PARAMETER; if (!(package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ))) { + WCHAR buffer[3]; MSIHANDLE remote; - HRESULT hr; - BSTR bname = NULL; if (!(remote = msi_get_remote(handle))) return ERROR_INVALID_HANDLE; - if (component && !(bname = SysAllocString( component ))) - return ERROR_OUTOFMEMORY; - - hr = remote_EnumComponentCosts(remote, bname, index, state, drive, buflen, cost, temp); - - SysFreeString( bname ); - if (FAILED(hr)) + r = remote_EnumComponentCosts(remote, component, index, state, buffer, cost, temp); + if (r == ERROR_SUCCESS) { - if (HRESULT_FACILITY(hr) == FACILITY_WIN32) return HRESULT_CODE(hr); - return ERROR_FUNCTION_FAILED; + lstrcpynW(drive, buffer, *buflen); + if (*buflen < 3) + r = ERROR_MORE_DATA; + *buflen = 2; } - return ERROR_SUCCESS; + return r; } if (!msi_get_property_int( package->db, szCostingComplete, 0 )) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b633250..067e571 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2589,12 +2589,11 @@ UINT __cdecl remote_GetFeatureCost(MSIHANDLE hinst, LPCWSTR feature, return MsiGetFeatureCostW(hinst, feature, cost_tree, state, cost); } -HRESULT __cdecl remote_EnumComponentCosts(MSIHANDLE hinst, BSTR component, - DWORD index, INSTALLSTATE state, BSTR drive, - DWORD *buflen, INT *cost, INT *temp) +UINT __cdecl remote_EnumComponentCosts(MSIHANDLE hinst, LPCWSTR component, + DWORD index, INSTALLSTATE state, LPWSTR drive, INT *cost, INT *temp) { - UINT r = MsiEnumComponentCostsW(hinst, component, index, state, drive, buflen, cost, temp); - return HRESULT_FROM_WIN32(r); + DWORD size = 3; + return MsiEnumComponentCostsW(hinst, component, index, state, drive, &size, cost, temp); } UINT msi_package_add_info(MSIPACKAGE *package, DWORD context, DWORD options, diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index ecd172a..35b3d71 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -857,7 +857,13 @@ static void test_format_record(MSIHANDLE hinst) static void test_costs(MSIHANDLE hinst) { - INT cost; + static const WCHAR oneW[] = {'O','n','e',0}; + static const WCHAR xyzW[] = {'C',':',0}; + static const WCHAR xyW[] = {'C',0}; + WCHAR bufferW[10]; + char buffer[10]; + int cost, temp; + DWORD sz; UINT r; cost = 0xdead; @@ -872,6 +878,109 @@ static void test_costs(MSIHANDLE hinst) r = MsiGetFeatureCostA(hinst, "One", MSICOSTTREE_CHILDREN, INSTALLSTATE_LOCAL, &cost); ok(hinst, !r, "got %u\n", r); todo_wine_ok(hinst, cost == 8, "got %d\n", cost); + + sz = cost = temp = 0xdead; + r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, NULL, &sz, &cost, &temp); + ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); + ok(hinst, sz == 0xdead, "got size %d\n", sz); + ok(hinst, cost == 0xdead, "got cost %d\n", cost); + ok(hinst, temp == 0xdead, "got temp %d\n", temp); + + cost = temp = 0xdead; + r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, NULL, &cost, &temp); + ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); + ok(hinst, cost == 0xdead, "got cost %d\n", cost); + ok(hinst, temp == 0xdead, "got temp %d\n", temp); + + sz = temp = 0xdead; + r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, NULL, &temp); + ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); + ok(hinst, sz == 0xdead, "got size %d\n", sz); + ok(hinst, temp == 0xdead, "got temp %d\n", temp); + + sz = cost = 0xdead; + r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, NULL); + ok(hinst, r == ERROR_INVALID_PARAMETER, "got %u\n", r); + ok(hinst, sz == 0xdead, "got size %d\n", sz); + ok(hinst, cost == 0xdead, "got cost %d\n", cost); + + cost = temp = 0xdead; + sz = sizeof(buffer); + r = MsiEnumComponentCostsA(hinst, NULL, 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); + ok(hinst, !r, "got %u\n", r); + ok(hinst, sz == 2, "got size %u\n", sz); + ok(hinst, !strcmp(buffer, "C:"), "got '%s'\n", buffer); + ok(hinst, !cost, "got cost %d\n", cost); + ok(hinst, temp && temp != 0xdead, "got temp %d\n", temp); + + cost = temp = 0xdead; + sz = sizeof(buffer); + r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); + ok(hinst, !r, "got %u\n", r); + ok(hinst, sz == 2, "got size %u\n", sz); + ok(hinst, !strcmp(buffer, "C:"), "got '%s'\n", buffer); + ok(hinst, cost == 8, "got cost %d\n", cost); + ok(hinst, !temp, "got temp %d\n", temp); + + /* same string behaviour */ + cost = temp = 0xdead; + sz = 0; + strcpy(buffer,"q"); + r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); + ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); + ok(hinst, !strcmp(buffer, "q"), "got \"%s\"\n", buffer); + todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + ok(hinst, cost == 8, "got cost %d\n", cost); + ok(hinst, !temp, "got temp %d\n", temp); + + sz = 1; + strcpy(buffer,"x"); + r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); + ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); + todo_wine_ok(hinst, !buffer[0], "got \"%s\"\n", buffer); + todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + + sz = 2; + strcpy(buffer,"x"); + r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); + ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); + todo_wine_ok(hinst, !strcmp(buffer, "C"), "got \"%s\"\n", buffer); + todo_wine_ok(hinst, sz == 4, "got size %u\n", sz); + + sz = 3; + strcpy(buffer,"x"); + r = MsiEnumComponentCostsA(hinst, "One", 0, INSTALLSTATE_LOCAL, buffer, &sz, &cost, &temp); + ok(hinst, !r, "got %u\n", r); + ok(hinst, !strcmp(buffer, "C:"), "got \"%s\"\n", buffer); + ok(hinst, sz == 2, "got size %u\n", sz); + + sz = 0; + bufferW[0] = 'q'; + r = MsiEnumComponentCostsW(hinst, oneW, 0, INSTALLSTATE_LOCAL, bufferW, &sz, &cost, &temp); + ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); + ok(hinst, bufferW[0] == 'q', "got %s\n", dbgstr_w(bufferW)); + ok(hinst, sz == 2, "got size %u\n", sz); + + sz = 1; + bufferW[0] = 'q'; + r = MsiEnumComponentCostsW(hinst, oneW, 0, INSTALLSTATE_LOCAL, bufferW, &sz, &cost, &temp); + ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); + ok(hinst, !bufferW[0], "got %s\n", dbgstr_w(bufferW)); + ok(hinst, sz == 2, "got size %u\n", sz); + + sz = 2; + bufferW[0] = 'q'; + r = MsiEnumComponentCostsW(hinst, oneW, 0, INSTALLSTATE_LOCAL, bufferW, &sz, &cost, &temp); + ok(hinst, r == ERROR_MORE_DATA, "got %u\n", r); + ok(hinst, !lstrcmpW(bufferW, xyW), "got %s\n", dbgstr_w(bufferW)); + ok(hinst, sz == 2, "got size %u\n", sz); + + sz = 3; + bufferW[0] = 'q'; + r = MsiEnumComponentCostsW(hinst, oneW, 0, INSTALLSTATE_LOCAL, bufferW, &sz, &cost, &temp); + ok(hinst, !r, "got %u\n", r); + ok(hinst, !lstrcmpW(bufferW, xyzW), "got %s\n", dbgstr_w(bufferW)); + ok(hinst, sz == 2, "got size %u\n", sz); } /* Main test. Anything that doesn't depend on a specific install configuration diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index fa98ac0..3884500 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -91,8 +91,8 @@ interface IWineMsiRemote UINT remote_FormatRecord( [in] MSIHANDLE hinst, [in] struct wire_record *record, [out, string] LPWSTR *value); MSICONDITION remote_EvaluateCondition( [in] MSIHANDLE hinst, [in, string] LPCWSTR condition ); UINT remote_GetFeatureCost( [in] MSIHANDLE hinst, [in, string] LPCWSTR feature, [in] MSICOSTTREE cost_tree, [in] INSTALLSTATE state, [out] INT *cost ); - HRESULT remote_EnumComponentCosts( [in] MSIHANDLE hinst, [in] BSTR component, [in] DWORD index, [in] INSTALLSTATE state, - [out, size_is(*buflen)] BSTR drive, [in, out] DWORD *buflen, [out] INT *cost, [out] INT *temp ); + UINT remote_EnumComponentCosts( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR component, [in] DWORD index, [in] INSTALLSTATE state, + [out, string, size_is(3)] LPWSTR drive, [out] INT *cost, [out] INT *temp ); HRESULT remote_GetActionInfo( [in] LPCGUID guid, [out] INT *type, [out] BSTR *dllname, [out] BSTR *function, [out] MSIHANDLE *package ); -- 2.7.4

3 7

[PATCH v4] shell32/tests: Add small test for SHGetSetFolderCustomSettings
by Louis Lenders 26 Apr '18

26 Apr '18

v4: -corrected calls to GetTempPath Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 57 ++++++++++++++++++++++++++++++++++++++++++ include/shlobj.h | 3 ++- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c976c85..850875b 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -65,6 +65,7 @@ static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); +static HRESULT (WINAPI *pSHGetSetFolderCustomSettings)(LPSHFOLDERCUSTOMSETTINGS,PCWSTR,DWORD); static WCHAR *make_wstr(const char *str) { @@ -118,6 +119,7 @@ static void init_function_pointers(void) MAKEFUNC(SHGetItemFromObject); MAKEFUNC(SHCreateDefaultContextMenu); MAKEFUNC(SHGetPathFromIDListEx); + MAKEFUNC(SHGetSetFolderCustomSettings); #undef MAKEFUNC /* test named exports */ @@ -5246,6 +5248,60 @@ todo_wine IShellFolder_Release(desktop); } +static void test_SHGetSetFolderCustomSettings(void) +{ + HRESULT hr; + SHFOLDERCUSTOMSETTINGS fcs; + static WCHAR pathW[MAX_PATH]; + static WCHAR iconpathW[MAX_PATH]; + static WCHAR Desktop_inipathW[MAX_PATH]; + static const WCHAR somedirW[] = {'s','o','m','e','_','d','i','r',0}; + static const WCHAR iconW[] = {'\\','s','o','m','e','_','i','c','o','n','.','i','c','o',0}; + static const WCHAR Desktop_iniW[] = {'\\','D','e','s','k','t','o','p','.','i','n','i',0}; + WCHAR bufferW[MAX_PATH] = {0}; + + if (!pSHGetSetFolderCustomSettings) + { + win_skip("SHGetSetFolderCustomSetting not exported by name (only by ordinal) for version XP/win2003\n"); + return; + } + + GetTempPathW(MAX_PATH, pathW); + lstrcatW(pathW, somedirW); + GetTempPathW(MAX_PATH, iconpathW); + lstrcatW(iconpathW, somedirW); + lstrcatW(iconpathW, iconW); + GetTempPathW(MAX_PATH, Desktop_inipathW); + lstrcatW(Desktop_inipathW, somedirW); + lstrcatW(Desktop_inipathW, Desktop_iniW); + + CreateDirectoryW(pathW, NULL); + + memset(&fcs, 0, sizeof(fcs)); + fcs.dwSize = sizeof(fcs); + fcs.dwMask = FCSM_ICONFILE; + fcs.pszIconFile = iconpathW; + + hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_FORCEWRITE); /*creates and writes to a Desktop.ini*/ + todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); + + memset(&fcs, 0, sizeof(fcs)); + fcs.dwSize = sizeof(fcs); + fcs.dwMask = FCSM_ICONFILE; + fcs.cchIconFile = MAX_PATH; + fcs.pszIconFile = bufferW; + + hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_READ); + todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); + todo_wine ok(!lstrcmpW(iconpathW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconpathW), wine_dbgstr_w(fcs.pszIconFile)); + + hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ); + todo_wine ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); + + DeleteFileW(Desktop_inipathW); + RemoveDirectoryW(pathW); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5288,6 +5344,7 @@ START_TEST(shlfolder) test_GetDefaultColumn(); test_GetDefaultSearchGUID(); test_SHLimitInputEdit(); + test_SHGetSetFolderCustomSettings(); OleUninitialize(); } diff --git a/include/shlobj.h b/include/shlobj.h index 9d6dcdd..7bf0d2e 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1489,7 +1489,7 @@ int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); #define FCSM_ICONFILE 0x00000010 #define FCSM_LOGO 0x00000020 #define FCSM_FLAGS 0x00000040 - +#include <pshpack8.h> typedef struct { DWORD dwSize; DWORD dwMask; @@ -1507,6 +1507,7 @@ typedef struct { LPWSTR pszLogo; DWORD cchLogo; } SHFOLDERCUSTOMSETTINGS, *LPSHFOLDERCUSTOMSETTINGS; +#include <poppack.h> HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, PCWSTR pszPath, DWORD dwReadWrite); -- 2.7.4

2 1

[PATCH] riched20: Return E_INVALIDARG from ITextServices::TxGetText on null output.
by Jactry Zeng 26 Apr '18

26 Apr '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/tests/txtsrv.c | 3 +++ dlls/riched20/txtsrv.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 73ca7cd753..5f261889f7 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -652,6 +652,9 @@ static void test_TxGetText(void) if (!init_texthost(&txtserv, &host)) return; + hres = ITextServices_TxGetText(txtserv, NULL); + ok(hres == E_INVALIDARG, "ITextServices_TxGetText should fail (result = %x)\n", hres); + hres = ITextServices_TxGetText(txtserv, &rettext); ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index eb61e4eff6..8e9737e4a1 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -261,6 +261,9 @@ DECLSPEC_HIDDEN HRESULT WINAPI fnTextSrv_TxGetText(ITextServices *iface, BSTR *p ITextServicesImpl *This = impl_from_ITextServices(iface); int length; + if (!pbstrText) + return E_INVALIDARG; + length = ME_GetTextLength(This->editor); if (length) { -- 2.17.0

3 3

[PATCH 3/3] mstask: Write correct trigger count to a job file.
by Dmitry Timoshkov 26 Apr '18

26 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index f93aff1ccb..986faa1654 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1133,9 +1133,6 @@ static HRESULT write_triggers(ITask *task, HANDLE hfile) hr = ITask_GetTriggerCount(task, &count); if (hr != S_OK) return hr; - if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) - return HRESULT_FROM_WIN32(GetLastError()); - /* Windows saves a .job with at least 1 trigger */ if (!count) { @@ -1146,6 +1143,9 @@ static HRESULT write_triggers(ITask *task, HANDLE hfile) count = 1; } + if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) + return HRESULT_FROM_WIN32(GetLastError()); + for (i = 0; i < count; i++) { TASK_TRIGGER task_trigger; -- 2.16.3

1 0

[PATCH 2/3] mstask: Correctly initialize trigger count when loading a task.
by Dmitry Timoshkov 26 Apr '18

26 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 8672104768..f93aff1ccb 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -968,17 +968,17 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) TRACE("trigger_offset %04x, triggers end at %04x\n", fixed->trigger_offset, (DWORD)(fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER))); - This->trigger_count = *(const USHORT *)data; - TRACE("trigger_count %u\n", trigger_count); task_trigger = (TASK_TRIGGER *)(data + sizeof(USHORT)); - if (This->trigger_count * sizeof(TASK_TRIGGER) > triggers_size) + if (trigger_count * sizeof(TASK_TRIGGER) > triggers_size) { TRACE("no space for triggers data\n"); return SCHED_E_INVALID_TASK; } - for (i = 0; i < This->trigger_count; i++) + This->trigger_count = 0; + + for (i = 0; i < trigger_count; i++) { ITaskTrigger *trigger; WORD idx; @@ -995,8 +995,8 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) } } - size -= sizeof(USHORT) + This->trigger_count * sizeof(TASK_TRIGGER); - data += sizeof(USHORT) + This->trigger_count * sizeof(TASK_TRIGGER); + size -= sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER); + data += sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER); if (size < 2 * sizeof(USHORT) + 64) { -- 2.16.3

1 0

[PATCH 1/3] mstask: Improve ITask::GetNextRunTime() stub.
by Dmitry Timoshkov 26 Apr '18

26 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 10 +++++----- dlls/mstask/tests/task_trigger.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 5f1dc1d30c..8672104768 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -240,12 +240,12 @@ static HRESULT WINAPI MSTASK_ITask_GetRunTimes( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetNextRunTime( - ITask* iface, - SYSTEMTIME *pstNextRun) +static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *st) { - FIXME("(%p, %p): stub\n", iface, pstNextRun); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, st); + + memset(st, 0, sizeof(*st)); + return SCHED_S_TASK_NO_VALID_TRIGGERS; } static HRESULT WINAPI MSTASK_ITask_SetIdleWait( diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index a1b5597fff..ab081a74ca 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -439,6 +439,44 @@ static void test_task_trigger(void) ok(ref == 0, "got %u\n", ref); } +static void test_GetNextRunTime(void) +{ + static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 }; + static const SYSTEMTIME st_empty; + HRESULT hr; + ITask *task; + ITaskTrigger *trigger; + WORD idx; + SYSTEMTIME st; + + hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + + if (0) /* crashes under Windows */ + hr = ITask_GetNextRunTime(task, NULL); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetNextRunTime(task, &st); + ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr); + ok(!memcmp(&st, &st_empty, sizeof(st)), "got %d/%d/%d wday %d %d:%d:%d.%03d\n", + st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, + st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); + + hr = ITask_CreateTrigger(task, &idx, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetNextRunTime(task, &st); + ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr); + ok(!memcmp(&st, &st_empty, sizeof(st)), "got %d/%d/%d wday %d %d:%d:%d.%03d\n", + st.wDay, st.wMonth, st.wYear, st.wDayOfWeek, + st.wHour, st.wMinute, st.wSecond, st.wMilliseconds); + + ITaskTrigger_Release(trigger); + ITask_Release(task); +} + START_TEST(task_trigger) { HRESULT hr; @@ -451,6 +489,7 @@ START_TEST(task_trigger) test_SetTrigger_GetTrigger(); test_task_trigger(); + test_GetNextRunTime(); ITaskScheduler_Release(test_task_scheduler); CoUninitialize(); -- 2.16.3

1 0

[PATCH v3] shell32/tests: Add small test for SHGetSetFolderCustomSettings
by Louis Lenders 26 Apr '18

26 Apr '18

v3: fixed a mistake in cleanup of files after test is done To: wine-devel <wine-devel(a)winehq.org> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 57 ++++++++++++++++++++++++++++++++++++++++++ include/shlobj.h | 3 ++- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index c976c85..1fea375 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -65,6 +65,7 @@ static HRESULT (WINAPI *pSHGetItemFromObject)(IUnknown*,REFIID,void**); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static HRESULT (WINAPI *pSHCreateDefaultContextMenu)(const DEFCONTEXTMENU*,REFIID,void**); static BOOL (WINAPI *pSHGetPathFromIDListEx)(PCIDLIST_ABSOLUTE,WCHAR*,DWORD,GPFIDL_FLAGS); +static HRESULT (WINAPI *pSHGetSetFolderCustomSettings)(LPSHFOLDERCUSTOMSETTINGS,PCWSTR,DWORD); static WCHAR *make_wstr(const char *str) { @@ -118,6 +119,7 @@ static void init_function_pointers(void) MAKEFUNC(SHGetItemFromObject); MAKEFUNC(SHCreateDefaultContextMenu); MAKEFUNC(SHGetPathFromIDListEx); + MAKEFUNC(SHGetSetFolderCustomSettings); #undef MAKEFUNC /* test named exports */ @@ -5246,6 +5248,60 @@ todo_wine IShellFolder_Release(desktop); } +static void test_SHGetSetFolderCustomSettings(void) +{ + HRESULT hr; + SHFOLDERCUSTOMSETTINGS fcs; + static WCHAR pathW[MAX_PATH]; + static WCHAR iconpathW[MAX_PATH]; + static WCHAR Desktop_inipathW[MAX_PATH]; + static const WCHAR somedirW[] = {'\\','s','o','m','e','_','d','i','r',0}; + static const WCHAR iconW[] = {'\\','s','o','m','e','_','i','c','o','n','.','i','c','o',0}; + static const WCHAR Desktop_iniW[] = {'\\','D','e','s','k','t','o','p','.','i','n','i',0}; + WCHAR bufferW[MAX_PATH] = {0}; + + if (!pSHGetSetFolderCustomSettings) + { + win_skip("SHGetSetFolderCustomSetting not exported by name (only by ordinal) for version XP/win2003\n"); + return; + } + + GetTempPathW(sizeof(pathW), pathW); + lstrcatW(pathW, somedirW); + GetTempPathW(sizeof(iconpathW), iconpathW); + lstrcatW(iconpathW, somedirW); + lstrcatW(iconpathW, iconW); + GetTempPathW(sizeof(Desktop_inipathW), Desktop_inipathW); + lstrcatW(Desktop_inipathW, somedirW); + lstrcatW(Desktop_inipathW, Desktop_iniW); + + CreateDirectoryW(pathW, NULL); + + memset(&fcs, 0, sizeof(fcs)); + fcs.dwSize = sizeof(fcs); + fcs.dwMask = FCSM_ICONFILE; + fcs.pszIconFile = iconpathW; + + hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_FORCEWRITE); /*creates and writes to a Desktop.ini*/ + todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); + + memset(&fcs, 0, sizeof(fcs)); + fcs.dwSize = sizeof(fcs); + fcs.dwMask = FCSM_ICONFILE; + fcs.cchIconFile = MAX_PATH; + fcs.pszIconFile = bufferW; + + hr = pSHGetSetFolderCustomSettings(&fcs, pathW, FCS_READ); + todo_wine ok(hr == S_OK, "Expected S_OK, got %#x\n", hr); + todo_wine ok(!lstrcmpW(iconpathW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconpathW), wine_dbgstr_w(fcs.pszIconFile)); + + hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ); + todo_wine ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); + + DeleteFileW(Desktop_inipathW); + RemoveDirectoryW(pathW); +} + START_TEST(shlfolder) { init_function_pointers(); @@ -5288,6 +5344,7 @@ START_TEST(shlfolder) test_GetDefaultColumn(); test_GetDefaultSearchGUID(); test_SHLimitInputEdit(); + test_SHGetSetFolderCustomSettings(); OleUninitialize(); } diff --git a/include/shlobj.h b/include/shlobj.h index 9d6dcdd..7bf0d2e 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1489,7 +1489,7 @@ int WINAPI SHCreateDirectoryExW(HWND, LPCWSTR, LPSECURITY_ATTRIBUTES); #define FCSM_ICONFILE 0x00000010 #define FCSM_LOGO 0x00000020 #define FCSM_FLAGS 0x00000040 - +#include <pshpack8.h> typedef struct { DWORD dwSize; DWORD dwMask; @@ -1507,6 +1507,7 @@ typedef struct { LPWSTR pszLogo; DWORD cchLogo; } SHFOLDERCUSTOMSETTINGS, *LPSHFOLDERCUSTOMSETTINGS; +#include <poppack.h> HRESULT WINAPI SHGetSetFolderCustomSettings(LPSHFOLDERCUSTOMSETTINGS pfcs, PCWSTR pszPath, DWORD dwReadWrite); -- 2.7.4

3 2

[PATCH 1/3] wsdapi: Add support for sending reference parameters in the Hello message.
by Owen Rudge 26 Apr '18

26 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 14 +++++++++++++- dlls/wsdapi/tests/discovery.c | 14 +++++++++++--- 2 files changed, 24 insertions(+), 4 deletions(-)

2 1

[PATCH 2/2] testbot: Remove uneeded WineTestBot::{Jobs, Patches, Users} prefixes.
by Francois Gouget 26 Apr '18

26 Apr '18

They are no longer needed now that the Jobs <-> Patches circular dependency is handled correctly. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 4 ++-- testbot/lib/WineTestBot/Patches.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index edfe91660..2dfadb00b 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -426,13 +426,13 @@ my @PropertyDescriptors = ( CreateBasicPropertyDescriptor("Id", "Job id", 1, 1, "S", 5), CreateBasicPropertyDescriptor("Archived", "Job is archived", !1, 1, "B", 1), CreateItemrefPropertyDescriptor("Branch", "Branch", !1, 1, \&CreateBranches, ["BranchName"]), - CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&WineTestBot::Users::CreateUsers, ["UserName"]), + CreateItemrefPropertyDescriptor("User", "Author", !1, 1, \&CreateUsers, ["UserName"]), CreateBasicPropertyDescriptor("Priority", "Priority", !1, 1, "N", 1), CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled']), CreateBasicPropertyDescriptor("Remarks", "Remarks", !1, !1, "A", 128), CreateBasicPropertyDescriptor("Submitted", "Submitted", !1, !1, "DT", 19), CreateBasicPropertyDescriptor("Ended", "Ended", !1, !1, "DT", 19), - CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&WineTestBot::Patches::CreatePatches, ["PatchId"]), + CreateItemrefPropertyDescriptor("Patch", "Submitted from patch", !1, !1, \&CreatePatches, ["PatchId"]), CreateDetailrefPropertyDescriptor("Steps", "Steps", !1, !1, \&CreateSteps), ); SetDetailrefKeyPrefix("Job", @PropertyDescriptors); diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 5431d9f68..955e33617 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -244,7 +244,7 @@ sub Submit($$$) my $First = 1; foreach my $Module (keys %Modules) { - my $Jobs = WineTestBot::Jobs::CreateJobs(); + my $Jobs = CreateJobs(); # Create a new job for this patch my $NewJob = $Jobs->Add(); @@ -343,7 +343,7 @@ sub Submit($$$) } $self->Disposition($Disposition); - WineTestBot::Jobs::ScheduleJobs(); + ScheduleJobs(); return undef; } -- 2.17.0

1 0

[PATCH 1/2] testbot: Fix the main WineTestBot modules circular dependencies.
by Francois Gouget 26 Apr '18

26 Apr '18

The main WineTestBot modules, those that implement access to the database, are prone to having circular dependencies. This is for instance the case between Jobs and Patches. Failure to handle these can force the use of fully qualified function names in hard to predict cases. So to avoid these issues, systematically declare the exports in a BEGIN block so they happen early enough. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Branches.pm | 7 +++++-- testbot/lib/WineTestBot/Jobs.pm | 7 +++++-- testbot/lib/WineTestBot/Patches.pm | 7 +++++-- testbot/lib/WineTestBot/PendingPatchSets.pm | 7 +++++-- testbot/lib/WineTestBot/PendingPatches.pm | 7 +++++-- testbot/lib/WineTestBot/RecordGroups.pm | 7 +++++-- testbot/lib/WineTestBot/Records.pm | 7 +++++-- testbot/lib/WineTestBot/Roles.pm | 7 +++++-- testbot/lib/WineTestBot/Steps.pm | 7 +++++-- testbot/lib/WineTestBot/StepsTasks.pm | 7 +++++-- testbot/lib/WineTestBot/Tasks.pm | 7 +++++-- testbot/lib/WineTestBot/UserRoles.pm | 7 +++++-- testbot/lib/WineTestBot/Users.pm | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 7 +++++-- 14 files changed, 70 insertions(+), 28 deletions(-) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index a18fafcbd..96cf26e82 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -51,8 +51,11 @@ WineTestBot::Branches - A collection of WineTestBot::Branch objects use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateBranches); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateBranches); +} use ObjectModel::BasicPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 0f80193f6..edfe91660 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -396,8 +396,11 @@ those that are yet to be run. use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateJobs ScheduleJobs CheckJobs); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateJobs ScheduleJobs CheckJobs); +} use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index e4b9b0089..5431d9f68 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -366,8 +366,11 @@ WineTestBot::Patches - A collection of WineTestBot::Patch objects use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreatePatches); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreatePatches); +} use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index 88dc73677..26a564216 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -153,8 +153,11 @@ WineTestBot::PendingPatchSets - A collection of WineTestBot::PendingPatchSet obj use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreatePendingPatchSets); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreatePendingPatchSets); +} use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 4de599dac..414ebd0ad 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -45,8 +45,11 @@ WineTestBot::PendingPatches - A collection of WineTestBot::PendingPatch objects use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreatePendingPatches); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreatePendingPatches); +} use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 9f0f52036..27cedfe32 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -54,8 +54,11 @@ WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateRecordGroups CompareRecordGroups SaveRecord); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateRecordGroups CompareRecordGroups SaveRecord); +} use ObjectModel::BasicPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index 990ae421e..a3302af96 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -62,8 +62,11 @@ WineTestBot::Records - A collection of WineTestBot::Record objects use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateRecords); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateRecords); +} use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index 45f370f1d..c37de63a9 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -43,8 +43,11 @@ WineTestBot::Roles - A collection of WineTestBot::Role objects use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateRoles); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateRoles); +} use ObjectModel::BasicPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 237347347..635092d1a 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -184,8 +184,11 @@ WineTestBot::Steps - A collection of Job Steps use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateSteps); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateSteps); +} use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 9dec8060a..232efe520 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -98,8 +98,11 @@ a specific database table. use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateStepsTasks); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateStepsTasks); +} use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 4473df217..0cb2e7b02 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -202,8 +202,11 @@ WineTestBot::Tasks - A collection of WineTestBot::Task objects use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateTasks); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateTasks); +} use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 585537ae8..e01cd9d28 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -39,8 +39,11 @@ WineTestBot::UserRoles - A collection of WineTestBot::UserRole objects use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateUserRoles); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateUserRoles); +} use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 4752006ab..f7ebd93da 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -296,8 +296,11 @@ WineTestBot::Users - A collection of WineTestBot::User objects use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateUsers GetBatchUser Authenticate); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateUsers GetBatchUser Authenticate); +} use Net::LDAP; use ObjectModel::BasicPropertyDescriptor; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index b6305e83e..c3a4a30cf 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -637,8 +637,11 @@ role or status. use Exporter 'import'; use WineTestBot::WineTestBotObjects; -our @ISA = qw(WineTestBot::WineTestBotCollection); -our @EXPORT = qw(CreateVMs); +BEGIN +{ + our @ISA = qw(WineTestBot::WineTestBotCollection); + our @EXPORT = qw(CreateVMs); +} use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; -- 2.17.0

1 0

GSoC
by Isira Seneviratne 26 Apr '18

26 Apr '18

Hi, My name is Isira Seneviratne, and I'll be working on the Winetest GUI implementation. I'm looking forward to working with the contributors to the Wine Project.

2 1

[PATCH 3/3] mstask: Add dirty flag management.
by Dmitry Timoshkov 26 Apr '18

26 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index bf8cbae039..5f1dc1d30c 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -64,6 +64,7 @@ typedef struct LPWSTR accountName; DWORD trigger_count; TASK_TRIGGER *trigger; + BOOL is_dirty; } TaskImpl; static inline TaskImpl *impl_from_ITask(ITask *iface) @@ -332,6 +333,7 @@ static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) { hr = IRegistrationInfo_put_Description(info, (BSTR)comment); IRegistrationInfo_Release(info); + This->is_dirty = TRUE; } return hr; } @@ -388,6 +390,7 @@ static HRESULT WINAPI MSTASK_ITask_SetCreator(ITask *iface, LPCWSTR creator) { hr = IRegistrationInfo_put_Author(info, (BSTR)creator); IRegistrationInfo_Release(info); + This->is_dirty = TRUE; } return hr; } @@ -511,6 +514,7 @@ static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( lstrcpyW(tmp_account_name, pwszAccountName); heap_free(This->accountName); This->accountName = tmp_account_name; + This->is_dirty = TRUE; return S_OK; } @@ -540,6 +544,7 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appn { TaskImpl *This = impl_from_ITask(iface); DWORD len; + HRESULT hr; TRACE("(%p, %s)\n", iface, debugstr_w(appname)); @@ -552,14 +557,16 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appn if (len) { LPWSTR tmp_name; - HRESULT hr; tmp_name = heap_alloc(len * sizeof(WCHAR)); if (!tmp_name) return E_OUTOFMEMORY; len = SearchPathW(NULL, appname, NULL, len, tmp_name, NULL); if (len) + { hr = IExecAction_put_Path(This->action, tmp_name); + if (hr == S_OK) This->is_dirty = TRUE; + } else hr = HRESULT_FROM_WIN32(GetLastError()); @@ -568,7 +575,9 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appn } /* If unable to path resolve name, simply set to appname */ - return IExecAction_put_Path(This->action, (BSTR)appname); + hr = IExecAction_put_Path(This->action, (BSTR)appname); + if (hr == S_OK) This->is_dirty = TRUE; + return hr; } static HRESULT WINAPI MSTASK_ITask_GetApplicationName(ITask *iface, LPWSTR *appname) @@ -603,6 +612,7 @@ static HRESULT WINAPI MSTASK_ITask_GetApplicationName(ITask *iface, LPWSTR *appn static HRESULT WINAPI MSTASK_ITask_SetParameters(ITask *iface, LPCWSTR params) { TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; TRACE("(%p, %s)\n", iface, debugstr_w(params)); @@ -610,7 +620,9 @@ static HRESULT WINAPI MSTASK_ITask_SetParameters(ITask *iface, LPCWSTR params) if (!params || !params[0]) params = NULL; - return IExecAction_put_Arguments(This->action, (BSTR)params); + hr = IExecAction_put_Arguments(This->action, (BSTR)params); + if (hr == S_OK) This->is_dirty = TRUE; + return hr; } static HRESULT WINAPI MSTASK_ITask_GetParameters(ITask *iface, LPWSTR *params) @@ -645,13 +657,16 @@ static HRESULT WINAPI MSTASK_ITask_GetParameters(ITask *iface, LPWSTR *params) static HRESULT WINAPI MSTASK_ITask_SetWorkingDirectory(ITask * iface, LPCWSTR workdir) { TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; TRACE("(%p, %s)\n", iface, debugstr_w(workdir)); if (!workdir || !workdir[0]) workdir = NULL; - return IExecAction_put_WorkingDirectory(This->action, (BSTR)workdir); + hr = IExecAction_put_WorkingDirectory(This->action, (BSTR)workdir); + if (hr == S_OK) This->is_dirty = TRUE; + return hr; } static HRESULT WINAPI MSTASK_ITask_GetWorkingDirectory(ITask *iface, LPWSTR *workdir) @@ -725,6 +740,7 @@ static HRESULT WINAPI MSTASK_ITask_SetMaxRunTime( TRACE("(%p, %d)\n", iface, dwMaxRunTime); This->maxRunTime = dwMaxRunTime; + This->is_dirty = TRUE; return S_OK; } @@ -772,11 +788,11 @@ static HRESULT WINAPI MSTASK_IPersistFile_GetClassID(IPersistFile *iface, CLSID return S_OK; } -static HRESULT WINAPI MSTASK_IPersistFile_IsDirty( - IPersistFile* iface) +static HRESULT WINAPI MSTASK_IPersistFile_IsDirty(IPersistFile *iface) { - FIXME("(%p): stub\n", iface); - return E_NOTIMPL; + TaskImpl *This = impl_from_IPersistFile(iface); + TRACE("(%p)\n", iface); + return This->is_dirty ? S_OK : S_FALSE; } static DWORD load_unicode_strings(ITask *task, BYTE *data, DWORD limit) @@ -1054,6 +1070,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR fi if (data) { hr = load_job_data(This, data, size); + if (hr == S_OK) This->is_dirty = FALSE; UnmapViewOfFile(data); } else @@ -1308,6 +1325,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta } hr = S_OK; + This->is_dirty = FALSE; failed: CoTaskMemFree(appname); @@ -1453,6 +1471,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->accountName = NULL; This->trigger_count = 0; This->trigger = NULL; + This->is_dirty = FALSE; /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; -- 2.16.3

1 0

[PATCH 2/3] mstask: Forward IPersistFile::AddRef()/Release() to parent object.
by Dmitry Timoshkov 26 Apr '18

26 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 99fcbc4f24..bf8cbae039 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -754,22 +754,14 @@ static ULONG WINAPI MSTASK_IPersistFile_AddRef( IPersistFile* iface) { TaskImpl *This = impl_from_IPersistFile(iface); - ULONG ref; - TRACE("\n"); - ref = InterlockedIncrement(&This->ref); - return ref; + return ITask_AddRef(&This->ITask_iface); } static ULONG WINAPI MSTASK_IPersistFile_Release( IPersistFile* iface) { TaskImpl *This = impl_from_IPersistFile(iface); - ULONG ref; - TRACE("\n"); - ref = InterlockedDecrement(&This->ref); - if (ref == 0) - TaskDestructor(This); - return ref; + return ITask_Release(&This->ITask_iface); } static HRESULT WINAPI MSTASK_IPersistFile_GetClassID(IPersistFile *iface, CLSID *clsid) -- 2.16.3

1 0

[PATCH 1/3] mstask: Switch to using heap wrappers.
by Dmitry Timoshkov 26 Apr '18

26 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 20 ++++++++++---------- dlls/mstask/task_scheduler.c | 8 ++++---- dlls/mstask/task_trigger.c | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index bfac8204b3..99fcbc4f24 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -82,10 +82,10 @@ static void TaskDestructor(TaskImpl *This) if (This->action) IExecAction_Release(This->action); ITaskDefinition_Release(This->task); - HeapFree(GetProcessHeap(), 0, This->task_name); - HeapFree(GetProcessHeap(), 0, This->accountName); - HeapFree(GetProcessHeap(), 0, This->trigger); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This->task_name); + heap_free(This->accountName); + heap_free(This->trigger); + heap_free(This); InterlockedDecrement(&dll_ref); } @@ -505,11 +505,11 @@ static HRESULT WINAPI MSTASK_ITask_SetAccountInformation( FIXME("Partial stub ignores passwords\n"); n = (lstrlenW(pwszAccountName) + 1); - tmp_account_name = HeapAlloc(GetProcessHeap(), 0, n * sizeof(WCHAR)); + tmp_account_name = heap_alloc(n * sizeof(WCHAR)); if (!tmp_account_name) return E_OUTOFMEMORY; lstrcpyW(tmp_account_name, pwszAccountName); - HeapFree(GetProcessHeap(), 0, This->accountName); + heap_free(This->accountName); This->accountName = tmp_account_name; return S_OK; } @@ -554,7 +554,7 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appn LPWSTR tmp_name; HRESULT hr; - tmp_name = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + tmp_name = heap_alloc(len * sizeof(WCHAR)); if (!tmp_name) return E_OUTOFMEMORY; len = SearchPathW(NULL, appname, NULL, len, tmp_name, NULL); @@ -563,7 +563,7 @@ static HRESULT WINAPI MSTASK_ITask_SetApplicationName(ITask *iface, LPCWSTR appn else hr = HRESULT_FROM_WIN32(GetLastError()); - HeapFree(GetProcessHeap(), 0, tmp_name); + heap_free(tmp_name); return hr; } @@ -1332,7 +1332,7 @@ failed: DeleteFileW(task_name); else if (remember) { - HeapFree(GetProcessHeap(), 0, This->task_name); + heap_free(This->task_name); This->task_name = heap_strdupW(task_name); } return hr; @@ -1442,7 +1442,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) hr = ITaskService_NewTask(service, 0, &taskdef); if (hr != S_OK) return hr; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) { ITaskDefinition_Release(taskdef); diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index c890cb6472..42e773849c 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -59,7 +59,7 @@ static void TaskSchedulerDestructor(TaskSchedulerImpl *This) { TRACE("%p\n", This); ITaskService_Release(This->service); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); InterlockedDecrement(&dll_ref); } @@ -97,7 +97,7 @@ static ULONG WINAPI EnumWorkItems_Release(IEnumWorkItems *iface) if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); InterlockedDecrement(&dll_ref); } @@ -148,7 +148,7 @@ static HRESULT create_task_enum(IEnumWorkItems **ret) *ret = NULL; - tasks = HeapAlloc(GetProcessHeap(), 0, sizeof(*tasks)); + tasks = heap_alloc(sizeof(*tasks)); if (!tasks) return E_OUTOFMEMORY; @@ -402,7 +402,7 @@ HRESULT TaskSchedulerConstructor(LPVOID *ppObj) return hr; } - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) { ITaskService_Release(service); diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c index 56bfbed54f..888fb66a4f 100644 --- a/dlls/mstask/task_trigger.c +++ b/dlls/mstask/task_trigger.c @@ -86,7 +86,7 @@ static ULONG WINAPI MSTASK_ITaskTrigger_Release( ref = InterlockedDecrement(&This->ref); if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); InterlockedDecrement(&dll_ref); } return ref; @@ -288,7 +288,7 @@ HRESULT TaskTriggerConstructor(LPVOID *ppObj) SYSTEMTIME time; TRACE("(%p)\n", ppObj); - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; -- 2.16.3

1 0

[PATCH 3/3] wsdapi/tests: Add tests for UnPublish.
by Owen Rudge 25 Apr '18

25 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 138 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+)

2 1

[PATCH 2/3] wsdapi: Implement UnPublish.
by Owen Rudge 25 Apr '18

25 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 14 +++++++-- dlls/wsdapi/soap.c | 72 +++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi_internal.h | 3 ++ 3 files changed, 86 insertions(+), 3 deletions(-)

1 0

gdiplus: how should GdipGraphicsClear work ?
by Rafał Mużyło 25 Apr '18

25 Apr '18

This isn't marked as a patch, cause it's most likely incorrect in some way. Yet, it also improves the results in some cases. Namely, it seems that - contrary to the current state - clears with a color with a = 0 shouldn't be no-ops. I'm not sure what color should be used in such case; I'm using opaque black, cause neither transparent black nor transparent white give proper results. Obviously, a proper testcase is required.

1 0

[PATCH 1/3] d3d11: Add support for setting multiple scissor rectangles.
by Nikolay Sivov 25 Apr '18

25 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d11/device.c | 14 +++----- dlls/d3d11/tests/d3d11.c | 73 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 75 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index a8251aad27..c6a7218fb7 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -991,14 +991,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetScissorRects(ID3D11De TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); - if (rect_count > 1) - FIXME("Multiple scissor rects not implemented.\n"); - - if (!rect_count) + if (rect_count > WINED3D_MAX_VIEWPORTS) return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); wined3d_mutex_unlock(); } @@ -4185,14 +4182,11 @@ static void STDMETHODCALLTYPE d3d10_device_RSSetScissorRects(ID3D10Device1 *ifac TRACE("iface %p, rect_count %u, rects %p.\n", iface, rect_count, rects); - if (rect_count > 1) - FIXME("Multiple scissor rects not implemented.\n"); - - if (!rect_count) + if (rect_count > WINED3D_MAX_VIEWPORTS) return; wined3d_mutex_lock(); - wined3d_device_set_scissor_rects(device->wined3d_device, 1, rects); + wined3d_device_set_scissor_rects(device->wined3d_device, rect_count, rects); wined3d_mutex_unlock(); } diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 82790932b1..2f4ce25638 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10566,7 +10566,6 @@ static void test_clear_state(void) ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect); for (i = 0; i < D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ++i) { - todo_wine_if(!i) ok(!tmp_rect[i].left && !tmp_rect[i].top && !tmp_rect[i].right && !tmp_rect[i].bottom, "Got unexpected scissor rect %s in slot %u.\n", wine_dbgstr_rect(&tmp_rect[i]), i); @@ -26188,10 +26187,14 @@ static void test_multiple_viewports(void) }; static const struct vec4 expected_values[] = { - {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + {0.0f, 1.0f}, {1.0f, 1.0f}, {0.0f, 2.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, {0.0f, 4.0f}, {0.5f, 0.5f}, {0.5f, 0.5f}, + {0.5f, 0.5f}, {0.0f, 6.0f}, {0.5f, 0.5f}, {1.0f, 6.0f}, {0.5f, 0.5f}, }; static const float clear_color[] = {0.5f, 0.5f, 0.0f, 0.0f}; + ID3D11RasterizerState *rasterizer_state; + D3D11_RASTERIZER_DESC rasterizer_desc; unsigned int count, i; + D3D11_RECT rects[2]; RECT rect; int width; @@ -26280,6 +26283,72 @@ static void test_multiple_viewports(void) draw_quad(&test_context); check_texture_sub_resource_vec4(texture, 0, NULL, &expected_values[4], 1); + /* Two viewports, only first scissor rectangle set. */ + memset(&rasterizer_desc, 0, sizeof(rasterizer_desc)); + rasterizer_desc.FillMode = D3D11_FILL_SOLID; + rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.DepthClipEnable = TRUE; + rasterizer_desc.ScissorEnable = TRUE; + hr = ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + ID3D11DeviceContext_RSSetState(context, rasterizer_state); + ID3D11RasterizerState_Release(rasterizer_state); + + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetViewports(context, 2, vp); + + rects[0].left = 0; + rects[0].top = 0; + rects[0].right = width; + rects[0].bottom = texture_desc.Height / 2; + memset(&rects[1], 0, sizeof(*rects)); + ID3D11DeviceContext_RSSetScissorRects(context, 1, rects); + constant.draw_id = 4; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[5], 1); + SetRect(&rect, 0, texture_desc.Height / 2, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[6], 1); + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[7], 1); + + /* Set scissor count to zero. */ + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetScissorRects(context, 0, rects); + constant.draw_id = 5; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + SetRect(&rect, 0, 0, texture_desc.Width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[8], 1); + + /* Set both rectangles. */ + rects[0].left = 0; + rects[0].top = 0; + rects[0].right = width; + rects[0].bottom = texture_desc.Height / 2; + rects[1].left = width; + rects[1].top = 0; + rects[1].right = width * 2; + rects[1].bottom = texture_desc.Height / 2; + ID3D11DeviceContext_ClearRenderTargetView(context, rtv, clear_color); + ID3D11DeviceContext_RSSetScissorRects(context, 2, rects); + constant.draw_id = 6; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &constant, 0, 0); + draw_quad(&test_context); + + SetRect(&rect, 0, 0, width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[9], 1); + SetRect(&rect, 0, texture_desc.Height / 2, width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[10], 1); + + SetRect(&rect, width, 0, 2 * width - 1, texture_desc.Height / 2 - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); + check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[12], 1); + /* Viewport count exceeding maximum value. */ ID3D11DeviceContext_RSSetViewports(context, 1, vp); -- 2.17.0

2 3

[PATCH 1/7] wined3d: Scan output signatures for pass-through geometry shaders.
by Józef Kucia 25 Apr '18

25 Apr '18

For shader_glsl_generate_sm4_output_setup(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/shader.c | 65 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b757d930da88..68d99543a3d0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -992,6 +992,40 @@ static void wined3d_insert_interpolation_mode(DWORD *packed_interpolation_mode, register_idx * WINED3D_PACKED_INTERPOLATION_BIT_COUNT, WINED3D_PACKED_INTERPOLATION_BIT_COUNT, mode); } +static HRESULT shader_scan_output_signature(struct wined3d_shader *shader) +{ + const struct wined3d_shader_signature *output_signature = &shader->output_signature; + struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + unsigned int i; + HRESULT hr; + + for (i = 0; i < output_signature->element_count; ++i) + { + const struct wined3d_shader_signature_element *e = &output_signature->elements[i]; + unsigned int mask; + + reg_maps->output_registers |= 1u << e->register_idx; + if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) + { + if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) + return hr; + reg_maps->clip_distance_mask |= mask; + } + else if (e->sysval_semantic == WINED3D_SV_CULL_DISTANCE) + { + if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) + return hr; + reg_maps->cull_distance_mask |= mask; + } + else if (e->sysval_semantic == WINED3D_SV_VIEWPORT_ARRAY_INDEX) + { + reg_maps->viewport_array = 1; + } + } + + return WINED3D_OK; +} + /* Note that this does not count the loop register as an address register. */ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const struct wined3d_shader_frontend *fe, struct wined3d_shader_reg_maps *reg_maps, struct wined3d_shader_signature *input_signature, @@ -1789,29 +1823,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st if (output_signature->elements) { - for (i = 0; i < output_signature->element_count; ++i) - { - const struct wined3d_shader_signature_element *e = &output_signature->elements[i]; - unsigned int mask; - - reg_maps->output_registers |= 1u << e->register_idx; - if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) - { - if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) - return hr; - reg_maps->clip_distance_mask |= mask; - } - else if (e->sysval_semantic == WINED3D_SV_CULL_DISTANCE) - { - if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) - return hr; - reg_maps->cull_distance_mask |= mask; - } - else if (e->sysval_semantic == WINED3D_SV_VIEWPORT_ARRAY_INDEX) - { - reg_maps->viewport_array = 1; - } - } + if (FAILED(hr = shader_scan_output_signature(shader))) + return hr; } else if (reg_maps->output_registers) { @@ -3701,6 +3714,12 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device shader->reg_maps.shader_version.major = 4; shader->reg_maps.shader_version.minor = 0; shader_set_limits(shader); + + if (FAILED(hr = shader_scan_output_signature(shader))) + { + shader_cleanup(shader); + return hr; + } } shader->load_local_constsF = shader->lconst_inf_or_nan; -- 2.16.1

3 14

[PATCH vkd3d 1/3] include: Remove stdbool.h include from vkd3d_utils.h.
by Józef Kucia 25 Apr '18

25 Apr '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- demos/demo_xcb.h | 1 + include/vkd3d_utils.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 38715565267e..40e25340b3f1 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -26,6 +26,7 @@ #include <limits.h> #include <unistd.h> #include <fcntl.h> +#include <stdbool.h> struct demo { diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 676d3330ed5e..49987d0343b0 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -19,8 +19,6 @@ #ifndef __VKD3D_UTILS_H #define __VKD3D_UTILS_H -#include <stdbool.h> - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -- 2.16.1

2 5

[PATCH] testbot/web: Standardize the packages inheritance.
by Francois Gouget 25 Apr '18

25 Apr '18

Use "our" instead of fully prefixing @ISA. Also defining the package inheritance does not depend on the rest of the package so move these statements first, even before all the other imports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 6 ++++-- testbot/web/Feedback.pl | 6 ++++-- testbot/web/ForgotPassword.pl | 6 ++++-- testbot/web/JobDetails.pl | 7 +++++-- testbot/web/Login.pl | 6 ++++-- testbot/web/Logout.pl | 6 ++++-- testbot/web/PatchesList.pl | 6 ++++-- testbot/web/Register.pl | 6 ++++-- testbot/web/ResetPassword.pl | 6 ++++-- testbot/web/Stats.pl | 4 +++- testbot/web/Submit.pl | 6 ++++-- testbot/web/admin/BranchDetails.pl | 5 +++-- testbot/web/admin/BranchesList.pl | 4 +++- testbot/web/admin/Log.pl | 5 +++-- testbot/web/admin/UserDetails.pl | 4 +++- testbot/web/admin/UsersList.pl | 3 ++- testbot/web/admin/VMDetails.pl | 4 +++- testbot/web/admin/VMsList.pl | 4 +++- 18 files changed, 64 insertions(+), 30 deletions(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 08e0291ae..8b1fd6dc5 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -21,17 +21,18 @@ use strict; package ActivityPage; +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + use POSIX qw(strftime); use URI::Escape; -use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; use WineTestBot::Activity; use WineTestBot::Log; use WineTestBot::Utils; use WineTestBot::VMs; -@ActivityPage::ISA = qw(ObjectModel::CGI::FreeFormPage); my $HOURS_DEFAULT = 12; @@ -297,6 +298,7 @@ sub GenerateFooter($) print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } + package main; my $Request = shift; diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index 2480243d4..2adc4cd40 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -21,11 +21,12 @@ use strict; package FeedbackPage; -use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; -@FeedbackPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { @@ -125,6 +126,7 @@ sub GenerateBody($) $self->SUPER::GenerateBody(); } + package main; my $Request = shift; diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 3c94c27e8..af79b65c7 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -21,13 +21,14 @@ use strict; package ForgotPasswordPage; -use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::CGI::Sessions; -@ForgotPasswordPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { @@ -131,6 +132,7 @@ sub GenerateBody($) $self->SUPER::GenerateBody(); } + package main; my $Request = shift; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 70fb0fe98..0213eb5e2 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -21,14 +21,16 @@ use strict; package JobDetailsPage; -use URI::Escape; use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); + +use URI::Escape; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::StepsTasks; use WineTestBot::Engine::Notify; -@JobDetailsPage::ISA = qw(ObjectModel::CGI::CollectionPage); sub _initialize($$$) { @@ -485,6 +487,7 @@ sub GenerateDataCell($$$$$) } } + package main; my $Request = shift; diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index b5b63651e..14cf4bda8 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -21,14 +21,15 @@ use strict; package LoginPage; -use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::CGI::Sessions; -@LoginPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { @@ -153,6 +154,7 @@ sub OnAction($$) return $self->SUPER::OnAction($Action); } + package main; my $Request = shift; diff --git a/testbot/web/Logout.pl b/testbot/web/Logout.pl index 417232d08..17e81d2b8 100644 --- a/testbot/web/Logout.pl +++ b/testbot/web/Logout.pl @@ -22,10 +22,11 @@ use strict; package LogoutPage; use ObjectModel::CGI::Page; -use WineTestBot::CGI::Sessions; +our @ISA = qw(ObjectModel::CGI::Page); + use CGI qw(:standard); +use WineTestBot::CGI::Sessions; -@LogoutPage::ISA = qw(ObjectModel::CGI::Page); sub _initialize($$$) { @@ -72,6 +73,7 @@ sub GeneratePage($) $self->SUPER::GeneratePage(); } + package main; my $Request = shift; diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index f0571b126..6728a285f 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -21,11 +21,12 @@ use strict; package PatchesListPage; -use URI::Escape; use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); + +use URI::Escape; use WineTestBot::Patches; -@PatchesListPage::ISA = qw(ObjectModel::CGI::CollectionPage); sub _initialize($$$) { @@ -91,6 +92,7 @@ sub GenerateDataCell($$$$$) } } + package main; my $Request = shift; diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index 4cbc8c953..207728e75 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -21,15 +21,16 @@ use strict; package RegisterPage; +use ObjectModel::CGI::ItemPage; +our @ISA = qw(ObjectModel::CGI::ItemPage); + use URI::Escape; use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::CGI::ItemPage; use WineTestBot::Config; use WineTestBot::Users; use WineTestBot::Utils; -@RegisterPage::ISA = qw(ObjectModel::CGI::ItemPage); sub _initialize($$$) { @@ -187,6 +188,7 @@ EOF $self->SUPER::GenerateBody(); } + package main; my $Request = shift; diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index db129dbf2..1e2b94d03 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -21,13 +21,14 @@ use strict; package ResetPasswordPage; -use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Users; use WineTestBot::Utils; use WineTestBot::CGI::Sessions; -@ResetPasswordPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { @@ -183,6 +184,7 @@ sub GenerateBody($) $self->SUPER::GenerateBody(); } + package main; my $Request = shift; diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index 90f546397..64f29bdcd 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -22,6 +22,8 @@ use strict; package StatsPage; use ObjectModel::CGI::Page; +our @ISA = qw(ObjectModel::CGI::Page); + use ObjectModel::Collection; use WineTestBot::Config; use WineTestBot::Activity; @@ -29,7 +31,6 @@ use WineTestBot::Log; use WineTestBot::Utils; use WineTestBot::VMs; -@StatsPage::ISA = qw(ObjectModel::CGI::Page); sub _initialize($$$) { @@ -336,6 +337,7 @@ sub GenerateBody($) print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; } + package main; my $Request = shift; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 9bf17814f..3b80841cc 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -21,6 +21,9 @@ use strict; package SubmitPage; +use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + use CGI qw(:standard); use Fcntl; # For O_XXX use IO::Handle; @@ -28,7 +31,6 @@ use POSIX qw(:fcntl_h); # For SEEK_XXX use File::Basename; use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::CGI::FreeFormPage; use WineTestBot::Branches; use WineTestBot::Config; use WineTestBot::Jobs; @@ -36,7 +38,6 @@ use WineTestBot::Engine::Notify; use WineTestBot::Utils; use WineTestBot::VMs; -@SubmitPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { @@ -1006,6 +1007,7 @@ sub OnAction($$) return $self->SUPER::OnAction($Action); } + package main; my $Request = shift; diff --git a/testbot/web/admin/BranchDetails.pl b/testbot/web/admin/BranchDetails.pl index 36d946482..fe3ebd118 100644 --- a/testbot/web/admin/BranchDetails.pl +++ b/testbot/web/admin/BranchDetails.pl @@ -22,10 +22,10 @@ use strict; package BranchDetailsPage; use ObjectModel::CGI::ItemPage; -use WineTestBot::Config; +our @ISA = qw(ObjectModel::CGI::ItemPage); + use WineTestBot::Branches; -@BranchDetailsPage::ISA = qw(ObjectModel::CGI::ItemPage); sub _initialize($$$) { @@ -34,6 +34,7 @@ sub _initialize($$$) $self->SUPER::_initialize($Request, $RequiredRole, CreateBranches()); } + package main; my $Request = shift; diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index 716fbd713..7a496cddb 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -22,10 +22,11 @@ use strict; package BranchesListPage; use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); + use WineTestBot::Config; use WineTestBot::Branches; -@BranchesListPage::ISA = qw(ObjectModel::CGI::CollectionPage); sub _initialize($$$) { @@ -42,6 +43,7 @@ sub SortKeys($$$) return \@SortedKeys; } + package main; my $Request = shift; diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl index 3ad35a476..8d6e52654 100644 --- a/testbot/web/admin/Log.pl +++ b/testbot/web/admin/Log.pl @@ -21,12 +21,13 @@ use strict; package LogPage; -use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; +our @ISA = qw(ObjectModel::CGI::FreeFormPage); + +use ObjectModel::BasicPropertyDescriptor; use WineTestBot::Config; use WineTestBot::Log; -@LogPage::ISA = qw(ObjectModel::CGI::FreeFormPage); sub _initialize($$$) { diff --git a/testbot/web/admin/UserDetails.pl b/testbot/web/admin/UserDetails.pl index 28eb4b5ca..2cf0f597f 100644 --- a/testbot/web/admin/UserDetails.pl +++ b/testbot/web/admin/UserDetails.pl @@ -23,11 +23,12 @@ use strict; package UserDetailsPage; use ObjectModel::CGI::ItemPage; +our @ISA = qw(ObjectModel::CGI::ItemPage); + use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; -@UserDetailsPage::ISA = qw(ObjectModel::CGI::ItemPage); sub _initialize($$$) { @@ -124,6 +125,7 @@ sub OnAction($$) return $self->SUPER::OnAction($Action); } + package main; my $Request = shift; diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index eb6c324c3..f46949d24 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -23,11 +23,12 @@ use strict; package UsersListPage; use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); + use WineTestBot::CGI::Sessions; use WineTestBot::Config; use WineTestBot::Users; -@UsersListPage::ISA = qw(ObjectModel::CGI::CollectionPage); sub _initialize($$$) { diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 11cec4cf1..f883884c7 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -23,9 +23,10 @@ use strict; package VMDetailsPage; use ObjectModel::CGI::ItemPage; +our @ISA = qw(ObjectModel::CGI::ItemPage); + use WineTestBot::VMs; -@VMDetailsPage::ISA = qw(ObjectModel::CGI::ItemPage); sub _initialize($$$) { @@ -62,6 +63,7 @@ sub Save($) return ! defined($self->{ErrMessage}); } + package main; my $Request = shift; diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 500442b5b..832c3bd4c 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -22,9 +22,10 @@ use strict; package VMsListPage; use ObjectModel::CGI::CollectionPage; +our @ISA = qw(ObjectModel::CGI::CollectionPage); + use WineTestBot::VMs; -@VMsListPage::ISA = qw(ObjectModel::CGI::CollectionPage); sub _initialize($$$) { @@ -65,6 +66,7 @@ sub OnItemAction($$$$) return $self->SUPER::OnItemAction($CollectionBlock, $Item, $Action); } + package main; my $Request = shift; -- 2.17.0

1 0

[PATCH] testbot: Take Step dependencies into account in Job::UpdateStatus().
by Francois Gouget 25 Apr '18

25 Apr '18

Job::UpdateStatus() used to assume that Step n would always depend on Step n-1. But now Step n may depend on Step 1 or any other previous step instead. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Jobs.pm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 29f7860cb..0f80193f6 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -179,21 +179,26 @@ sub UpdateStatus($) my $Status = $self->Status; return $Status if ($Status ne "queued" && $Status ne "running"); - my (%Has, $Skip); - my @SortedSteps = sort { $a->No <=> $b->No } @{$self->Steps->GetItems()}; + my %Has; + my $Steps = $self->Steps; + my @SortedSteps = sort { $a->No <=> $b->No } @{$Steps->GetItems()}; foreach my $Step (@SortedSteps) { - my $StepStatus = $Step->UpdateStatus($Skip); - $Has{$StepStatus} = 1; - - if ($StepStatus ne "queued" && $StepStatus ne "running" && - $StepStatus ne "completed" && - ($Step->Type eq "build" || $Step->Type eq "reconfig")) + my $Skip; + if ($Step->PreviousNo) { - # The following steps need binaries that this one was supposed to - # produce. So skip them. - $Skip = 1; + my $PrevStatus = $Steps->GetItem($Step->PreviousNo)->Status; + if ($PrevStatus ne "queued" && $PrevStatus ne "running" && + $PrevStatus ne "completed") + { + # The previous step was supposed to provide binaries but it failed + # or was canceled. So skip this one. + $Skip = 1; + } } + + my $StepStatus = $Step->UpdateStatus($Skip); + $Has{$StepStatus} = 1; } # Inherit the steps most significant status. -- 2.17.0

1 0

[PATCH 1/6] msi: Make MsiGetLanguage() RPC-compatible.
by Zebediah Figura 25 Apr '18

25 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/install.c | 9 +-------- dlls/msi/package.c | 5 ++--- dlls/msi/tests/custom.c | 8 ++++++-- dlls/msi/winemsi.idl | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 63ffbfe..0ec1f24 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1379,18 +1379,11 @@ LANGID WINAPI MsiGetLanguage(MSIHANDLE hInstall) if (!package) { MSIHANDLE remote; - HRESULT hr; - LANGID lang; if (!(remote = msi_get_remote(hInstall))) return ERROR_INVALID_HANDLE; - hr = remote_GetLanguage(remote, &lang); - - if (SUCCEEDED(hr)) - return lang; - - return 0; + return remote_GetLanguage(remote); } langid = msi_get_property_int( package->db, szProductLanguage, 0 ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b1b2cb4..869da8d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2545,10 +2545,9 @@ UINT __cdecl remote_SetComponentState(MSIHANDLE hinst, LPCWSTR component, INSTAL return MsiSetComponentStateW(hinst, component, state); } -HRESULT __cdecl remote_GetLanguage(MSIHANDLE hinst, LANGID *language) +LANGID __cdecl remote_GetLanguage(MSIHANDLE hinst) { - *language = MsiGetLanguage(hinst); - return S_OK; + return MsiGetLanguage(hinst); } HRESULT __cdecl remote_SetInstallLevel(MSIHANDLE hinst, int level) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 2f9ba5d..e9561d6 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -642,12 +642,16 @@ static void test_targetpath(MSIHANDLE hinst) ok(hinst, sz == srcsz, "got size %u\n", sz); } -static void test_mode(MSIHANDLE hinst) +static void test_misc(MSIHANDLE hinst) { + LANGID lang; UINT r; r = MsiSetMode(hinst, MSIRUNMODE_REBOOTATEND, FALSE); ok(hinst, !r, "got %u\n", r); + + lang = MsiGetLanguage(hinst); + ok(hinst, lang == 1033, "got %u\n", lang); } static void test_feature_states(MSIHANDLE hinst) @@ -767,7 +771,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) test_db(hinst); test_doaction(hinst); test_targetpath(hinst); - test_mode(hinst); + test_misc(hinst); test_feature_states(hinst); return ERROR_SUCCESS; diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 132f140..b75f32f 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -85,7 +85,7 @@ interface IWineMsiRemote UINT remote_SetFeatureState( [in] MSIHANDLE hinst, [in, string] LPCWSTR feature, [in] INSTALLSTATE state ); UINT remote_GetComponentState( [in] MSIHANDLE hinst, [in, string] LPCWSTR component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); UINT remote_SetComponentState( [in] MSIHANDLE hinst, [in, string] LPCWSTR component, [in] INSTALLSTATE state ); - HRESULT remote_GetLanguage( [in] MSIHANDLE hinst, [out] LANGID *language ); + LANGID remote_GetLanguage( [in] MSIHANDLE hinst ); HRESULT remote_SetInstallLevel( [in] MSIHANDLE hinst, [in] int level ); HRESULT remote_FormatRecord( [in] MSIHANDLE hinst, [in] MSIHANDLE record, [out] BSTR *value ); HRESULT remote_EvaluateCondition( [in] MSIHANDLE hinst, [in] BSTR condition ); -- 2.7.4

3 16

[PATCH resend2] shell32/tests: Mark a shell dispatch test as todo on x64 and ARM
by Alex Henrie 25 Apr '18

25 Apr '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/shelldispatch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index cc00757840..8186c0d0a2 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1010,6 +1010,9 @@ static void test_ShellWindows(void) hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, (void**)&shellwindows); +#ifndef __i386__ +todo_wine +#endif ok(hr == S_OK, "got 0x%08x\n", hr); /* TODO: remove when explorer startup with clean prefix is fixed */ if (hr != S_OK) -- 2.17.0

1 0

[PATCH 7/7] mstask/tests: Add more tests for ITaskScheduler::AddWorkItem().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_scheduler.c | 98 ++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 24 deletions(-) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 8482972e9b..8b93b56dce 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -273,7 +273,7 @@ static void test_save_task_curfile(ITask *task) IPersistFile_Release(pfile); } -static WCHAR *get_task_curfile(ITask *task) +static WCHAR *get_task_curfile(ITask *task, BOOL should_exist, BOOL is_dirty, int line) { HRESULT hr; IPersistFile *pfile; @@ -281,18 +281,28 @@ static WCHAR *get_task_curfile(ITask *task) CLSID clsid; hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); - ok(hr == S_OK, "QueryInterface error %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistFile_IsDirty(pfile); + ok_(__FILE__, line)(hr == is_dirty ? S_OK : S_FALSE, "got %#x\n", hr); + curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); - ok(hr == S_OK, "GetCurFile error %#x\n", hr); - ok(curfile && curfile[0] , "curfile should not be NULL\n"); + ok_(__FILE__, line)(hr == S_OK, "GetCurFile error %#x\n", hr); + ok_(__FILE__, line)(curfile && curfile[0] , "curfile should not be NULL\n"); + + hr = IPersistFile_Load(pfile, curfile, STGM_READ); + if (should_exist) + ok_(__FILE__, line)(hr == S_OK, "Load error %#x\n", hr); + else + ok_(__FILE__, line)(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); if (0) /* crashes under Windows */ hr = IPersistFile_GetClassID(pfile, NULL); hr = IPersistFile_GetClassID(pfile, &clsid); - ok(hr == S_OK, "GetClassID error %#x\n", hr); - ok(IsEqualCLSID(&clsid, &CLSID_CTask), "got %s\n", wine_dbgstr_guid(&clsid)); + ok_(__FILE__, line)(hr == S_OK, "GetClassID error %#x\n", hr); + ok_(__FILE__, line)(IsEqualCLSID(&clsid, &CLSID_CTask), "got %s\n", wine_dbgstr_guid(&clsid)); IPersistFile_Release(pfile); @@ -301,16 +311,30 @@ static WCHAR *get_task_curfile(ITask *task) static void test_task_storage(void) { - static const WCHAR Task1[] = { 'w','i','n','e','t','a','s','k',0 }; - static const WCHAR Task1_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','.','j','o','b',0 }; - WCHAR task_full_name[MAX_PATH]; + static const WCHAR Task1[] = { 'w','i','n','e','t','a','s','k','1',0 }; + static const WCHAR Task2[] = { 'w','i','n','e','t','a','s','k','2',0 }; + static const WCHAR Task3[] = { 'w','i','n','e','t','a','s','k','3',0 }; + static const WCHAR Task1_ext[] = { 'w','i','n','e','t','a','s','k','.','e','x','t',0 }; + static const WCHAR Task1_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','1','.','j','o','b',0 }; + static const WCHAR Task2_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','2','.','j','o','b',0 }; + static const WCHAR Task3_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','3','.','j','o','b',0 }; + WCHAR task1_full_name[MAX_PATH], task2_full_name[MAX_PATH], task3_full_name[MAX_PATH]; HRESULT hr; ITaskScheduler *scheduler; ITask *task, *task2; WCHAR *curfile, *curfile2; - GetWindowsDirectoryW(task_full_name, MAX_PATH); - lstrcatW(task_full_name, Task1_job); + GetWindowsDirectoryW(task1_full_name, MAX_PATH); + lstrcatW(task1_full_name, Task1_job); + GetWindowsDirectoryW(task2_full_name, MAX_PATH); + lstrcatW(task2_full_name, Task2_job); + GetWindowsDirectoryW(task3_full_name, MAX_PATH); + lstrcatW(task3_full_name, Task3_job); + + /* cleanup after previous runs */ + DeleteFileW(task1_full_name); + DeleteFileW(task2_full_name); + DeleteFileW(task3_full_name); hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); if (hr != S_OK) @@ -319,41 +343,66 @@ static void test_task_storage(void) return; } + hr = ITaskScheduler_NewWorkItem(scheduler, Task1_ext, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); + ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); ok(hr == S_OK, "NewWorkItem error %#x\n", hr); - curfile = get_task_curfile(task); + curfile = get_task_curfile(task, FALSE, FALSE, __LINE__); ok(!file_exists(curfile), "curfile should not exist\n"); - ok(!lstrcmpW(curfile, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + + hr = ITask_SetComment(task, Task1); + ok(hr == S_OK, "got %#x\n", hr); + + curfile2 = get_task_curfile(task, FALSE, TRUE, __LINE__); + ok(!file_exists(curfile2), "curfile should not exist\n"); + ok(!lstrcmpW(curfile2, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + CoTaskMemFree(curfile2); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task2); ok(hr == S_OK, "NewWorkItem error %#x\n", hr); ok(task2 != task, "tasks should not be equal\n"); - curfile2 = get_task_curfile(task); + curfile2 = get_task_curfile(task2, FALSE, FALSE, __LINE__); ok(!file_exists(curfile2), "curfile2 should not exist\n"); - ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + ok(!lstrcmpW(curfile2, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); CoTaskMemFree(curfile); CoTaskMemFree(curfile2); + ITask_Release(task2); task2 = (ITask *)0xdeadbeef; hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task2); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); ok(task2 == (ITask *)0xdeadbeef, "task should not be set to NULL\n"); - hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); + hr = ITaskScheduler_AddWorkItem(scheduler, Task2, (IScheduledWorkItem *)task); ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); + ok(file_exists(curfile), "curfile should exist\n"); + ok(!lstrcmpW(curfile, task2_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); - curfile = get_task_curfile(task); + hr = ITaskScheduler_AddWorkItem(scheduler, Task3, (IScheduledWorkItem *)task); + ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); + ok(!lstrcmpW(curfile, task3_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); + ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); + ok(file_exists(curfile), "curfile should exist\n"); + ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); - curfile = get_task_curfile(task); + curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); + CoTaskMemFree(curfile); ITask_Release(task); task = NULL; @@ -361,16 +410,17 @@ static void test_task_storage(void) ok(hr == S_OK, "Activate error %#x\n", hr); ok(task != NULL, "task should not be set to NULL\n"); - curfile2 = get_task_curfile(task); - ok(file_exists(curfile2), "curfile2 should exist\n"); - ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); + ok(file_exists(curfile), "curfile2 should exist\n"); + ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); - CoTaskMemFree(curfile2); + CoTaskMemFree(curfile); test_save_task_curfile(task); - DeleteFileW(curfile); - CoTaskMemFree(curfile); + DeleteFileW(task1_full_name); + DeleteFileW(task2_full_name); + DeleteFileW(task3_full_name); ITask_Release(task); ITaskScheduler_Release(scheduler); -- 2.16.3

1 0

[PATCH 6/7] mstask: Implement ITaskScheduler::AddWorkItem().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 29 +++++++++++++++++++++++------ dlls/mstask/tests/task_scheduler.c | 8 -------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index dd6eaf6b38..c890cb6472 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -331,13 +331,30 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( return TaskConstructor(This->service, task_name, (ITask **)task); } -static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem( - ITaskScheduler* iface, - LPCWSTR pwszTaskName, - IScheduledWorkItem *pWorkItem) +static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem(ITaskScheduler *iface, LPCWSTR name, IScheduledWorkItem *item) { - FIXME("%p, %s, %p: stub\n", iface, debugstr_w(pwszTaskName), pWorkItem); - return E_NOTIMPL; + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR jobW[] = { '.','j','o','b',0 }; + WCHAR task_name[MAX_PATH]; + IPersistFile *pfile; + HRESULT hr; + + TRACE("%p, %s, %p\n", iface, debugstr_w(name), item); + + if (strchrW(name, '.')) return E_INVALIDARG; + + GetWindowsDirectoryW(task_name, MAX_PATH); + lstrcatW(task_name, tasksW); + lstrcatW(task_name, name); + lstrcatW(task_name, jobW); + + hr = IScheduledWorkItem_QueryInterface(item, &IID_IPersistFile, (void **)&pfile); + if (hr == S_OK) + { + hr = IPersistFile_Save(pfile, task_name, TRUE); + IPersistFile_Release(pfile); + } + return hr; } static HRESULT WINAPI MSTASK_ITaskScheduler_IsOfType( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index fbee5ecb66..8482972e9b 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -343,30 +343,23 @@ static void test_task_storage(void) ok(task2 == (ITask *)0xdeadbeef, "task should not be set to NULL\n"); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); -todo_wine ok(hr == S_OK, "AddWorkItem error %#x\n", hr); curfile = get_task_curfile(task); -todo_wine ok(file_exists(curfile), "curfile should exist\n"); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); curfile = get_task_curfile(task); -todo_wine ok(file_exists(curfile), "curfile should exist\n"); ITask_Release(task); task = NULL; hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task); -todo_wine ok(hr == S_OK, "Activate error %#x\n", hr); -todo_wine ok(task != NULL, "task should not be set to NULL\n"); - if (task == NULL) goto fail; curfile2 = get_task_curfile(task); ok(file_exists(curfile2), "curfile2 should exist\n"); @@ -380,7 +373,6 @@ todo_wine CoTaskMemFree(curfile); ITask_Release(task); -fail: ITaskScheduler_Release(scheduler); } -- 2.16.3

1 0

[PATCH 5/7] mstask: Implement ITaskScheduler::Activate().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 6e17a57908..dd6eaf6b38 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -268,16 +268,38 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Enum( return create_task_enum(tasks); } -static HRESULT WINAPI MSTASK_ITaskScheduler_Activate( - ITaskScheduler* iface, - LPCWSTR pwszName, - REFIID riid, - IUnknown **ppunk) +static HRESULT WINAPI MSTASK_ITaskScheduler_Activate(ITaskScheduler *iface, + LPCWSTR task_name, REFIID riid, IUnknown **unknown) { - TRACE("%p, %s, %s, %p: stub\n", iface, debugstr_w(pwszName), - debugstr_guid(riid), ppunk); - FIXME("Partial stub always returning ERROR_FILE_NOT_FOUND\n"); - return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + ITask *task; + IPersistFile *pfile; + HRESULT hr; + + TRACE("%p, %s, %s, %p\n", iface, debugstr_w(task_name), debugstr_guid(riid), unknown); + + hr = ITaskScheduler_NewWorkItem(iface, task_name, &CLSID_CTask, riid, (IUnknown **)&task); + if (hr != S_OK) return hr; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + if (hr == S_OK) + { + WCHAR *curfile; + + hr = IPersistFile_GetCurFile(pfile, &curfile); + if (hr == S_OK) + { + hr = IPersistFile_Load(pfile, curfile, STGM_READ | STGM_SHARE_DENY_WRITE); + CoTaskMemFree(curfile); + } + + IPersistFile_Release(pfile); + } + + if (hr == S_OK) + *unknown = (IUnknown *)task; + else + ITask_Release(task); + return hr; } static HRESULT WINAPI MSTASK_ITaskScheduler_Delete( -- 2.16.3

1 0

[PATCH 4/7] mstask: Return S_OK from ITask::SetFlags().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 58e5c0e156..bfac8204b3 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -479,7 +479,7 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags( DWORD dwFlags) { FIXME("(%p, 0x%08x): stub\n", iface, dwFlags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetFlags(ITask *iface, DWORD *flags) -- 2.16.3

1 0

[PATCH 3/7] mstask: Implement IPersistFile::Load().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 283 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index a7fe199a3c..58e5c0e156 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -787,13 +787,290 @@ static HRESULT WINAPI MSTASK_IPersistFile_IsDirty( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_IPersistFile_Load( - IPersistFile* iface, - LPCOLESTR pszFileName, - DWORD dwMode) +static DWORD load_unicode_strings(ITask *task, BYTE *data, DWORD limit) { - FIXME("(%p, %p, 0x%08x): stub\n", iface, pszFileName, dwMode); - return E_NOTIMPL; + DWORD i, data_size = 0; + USHORT len; + + for (i = 0; i < 5; i++) + { + if (limit < sizeof(USHORT)) + { + TRACE("invalid string %u offset\n", i); + break; + } + + len = *(USHORT *)data; + data += sizeof(USHORT); + data_size += sizeof(USHORT); + limit -= sizeof(USHORT); + if (limit < len * sizeof(WCHAR)) + { + TRACE("invalid string %u size\n", i); + break; + } + + TRACE("string %u: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); + + switch (i) + { + case 0: + ITask_SetApplicationName(task, (const WCHAR *)data); + break; + case 1: + ITask_SetParameters(task, (const WCHAR *)data); + break; + case 2: + ITask_SetWorkingDirectory(task, (const WCHAR *)data); + break; + case 3: + ITask_SetCreator(task, (const WCHAR *)data); + break; + case 4: + ITask_SetComment(task, (const WCHAR *)data); + break; + default: + break; + } + + data += len * sizeof(WCHAR); + data_size += len * sizeof(WCHAR); + } + + return data_size; +} + +static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) +{ + ITask *task = &This->ITask_iface; + HRESULT hr; + const FIXDLEN_DATA *fixed; + const SYSTEMTIME *st; + DWORD unicode_strings_size, data_size, triggers_size; + USHORT instance_count, trigger_count, i; + const USHORT *signature; + TASK_TRIGGER *task_trigger; + + if (size < sizeof(*fixed)) + { + TRACE("no space for FIXDLEN_DATA\n"); + return SCHED_E_INVALID_TASK; + } + + fixed = (const FIXDLEN_DATA *)data; + + TRACE("product_version %04x\n", fixed->product_version); + TRACE("file_version %04x\n", fixed->file_version); + TRACE("uuid %s\n", wine_dbgstr_guid(&fixed->uuid)); + + if (fixed->file_version != 0x0001) + return SCHED_E_INVALID_TASK; + + TRACE("name_size_offset %04x\n", fixed->name_size_offset); + TRACE("trigger_offset %04x\n", fixed->trigger_offset); + TRACE("error_retry_count %u\n", fixed->error_retry_count); + TRACE("error_retry_interval %u\n", fixed->error_retry_interval); + TRACE("idle_deadline %u\n", fixed->idle_deadline); + This->deadline_minutes = fixed->idle_deadline; + TRACE("idle_wait %u\n", fixed->idle_wait); + This->idle_minutes = fixed->idle_wait; + TRACE("priority %08x\n", fixed->priority); + This->priority = fixed->priority; + TRACE("maximum_runtime %u\n", fixed->maximum_runtime); + This->maxRunTime = fixed->maximum_runtime; + TRACE("exit_code %#x\n", fixed->exit_code); + TRACE("status %08x\n", fixed->status); + TRACE("flags %08x\n", fixed->flags); + st = &fixed->last_runtime; + TRACE("last_runtime %d/%d/%d wday %d %d:%d:%d.%03d\n", + st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, + st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); + + /* Instance Count */ + if (size < sizeof(*fixed) + sizeof(USHORT)) + { + TRACE("no space for instance count\n"); + return SCHED_E_INVALID_TASK; + } + + instance_count = *(const USHORT *)(data + sizeof(*fixed)); + TRACE("instance count %u\n", instance_count); + + if (fixed->name_size_offset + sizeof(USHORT) < size) + unicode_strings_size = load_unicode_strings(task, data + fixed->name_size_offset, size - fixed->name_size_offset); + else + { + TRACE("invalid name_size_offset\n"); + return SCHED_E_INVALID_TASK; + } + TRACE("unicode strings end at %#x\n", fixed->name_size_offset + unicode_strings_size); + + if (size < fixed->trigger_offset + sizeof(USHORT)) + { + TRACE("no space for triggers count\n"); + return SCHED_E_INVALID_TASK; + } + trigger_count = *(const USHORT *)(data + fixed->trigger_offset); + TRACE("trigger_count %u\n", trigger_count); + triggers_size = size - fixed->trigger_offset - sizeof(USHORT); + TRACE("triggers_size %u\n", triggers_size); + task_trigger = (TASK_TRIGGER *)(data + fixed->trigger_offset + sizeof(USHORT)); + + data += fixed->name_size_offset + unicode_strings_size; + size -= fixed->name_size_offset + unicode_strings_size; + + /* User Data */ + if (size < sizeof(USHORT)) + { + TRACE("no space for user data size\n"); + return SCHED_E_INVALID_TASK; + } + + data_size = *(const USHORT *)data; + if (size < sizeof(USHORT) + data_size) + { + TRACE("no space for user data\n"); + return SCHED_E_INVALID_TASK; + } + TRACE("User Data size %#x\n", data_size); + ITask_SetWorkItemData(task, data_size, data + sizeof(USHORT)); + + size -= sizeof(USHORT) + data_size; + data += sizeof(USHORT) + data_size; + + /* Reserved Data */ + if (size < sizeof(USHORT)) + { + TRACE("no space for reserved data size\n"); + return SCHED_E_INVALID_TASK; + } + + data_size = *(const USHORT *)data; + if (size < sizeof(USHORT) + data_size) + { + TRACE("no space for reserved data\n"); + return SCHED_E_INVALID_TASK; + } + TRACE("Reserved Data size %#x\n", data_size); + + size -= sizeof(USHORT) + data_size; + data += sizeof(USHORT) + data_size; + + /* Trigger Data */ + TRACE("trigger_offset %04x, triggers end at %04x\n", fixed->trigger_offset, + (DWORD)(fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER))); + + This->trigger_count = *(const USHORT *)data; + TRACE("trigger_count %u\n", trigger_count); + task_trigger = (TASK_TRIGGER *)(data + sizeof(USHORT)); + + if (This->trigger_count * sizeof(TASK_TRIGGER) > triggers_size) + { + TRACE("no space for triggers data\n"); + return SCHED_E_INVALID_TASK; + } + + for (i = 0; i < This->trigger_count; i++) + { + ITaskTrigger *trigger; + WORD idx; + + hr = ITask_CreateTrigger(task, &idx, &trigger); + if (hr != S_OK) return hr; + + hr = ITaskTrigger_SetTrigger(trigger, &task_trigger[i]); + ITaskTrigger_Release(trigger); + if (hr != S_OK) + { + ITask_DeleteTrigger(task, idx); + return hr; + } + } + + size -= sizeof(USHORT) + This->trigger_count * sizeof(TASK_TRIGGER); + data += sizeof(USHORT) + This->trigger_count * sizeof(TASK_TRIGGER); + + if (size < 2 * sizeof(USHORT) + 64) + { + TRACE("no space for signature\n"); + return S_OK; /* signature is optional */ + } + + signature = (const USHORT *)data; + TRACE("signature version %04x, client version %04x\n", signature[0], signature[1]); + + return S_OK; +} + +static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR file_name, DWORD mode) +{ + TaskImpl *This = impl_from_IPersistFile(iface); + HRESULT hr; + HANDLE file, mapping; + DWORD access, sharing, size; + void *data; + + TRACE("(%p, %s, 0x%08x)\n", iface, debugstr_w(file_name), mode); + + switch (mode & 0x000f) + { + default: + case STGM_READ: + access = GENERIC_READ; + break; + case STGM_WRITE: + case STGM_READWRITE: + access = GENERIC_READ | GENERIC_WRITE; + break; + } + + switch (mode & 0x00f0) + { + default: + case STGM_SHARE_DENY_NONE: + sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; + break; + case STGM_SHARE_DENY_READ: + sharing = FILE_SHARE_WRITE; + break; + case STGM_SHARE_DENY_WRITE: + sharing = FILE_SHARE_READ; + break; + case STGM_SHARE_EXCLUSIVE: + sharing = 0; + break; + } + + file = CreateFileW(file_name, access, sharing, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + TRACE("Failed to open %s, error %u\n", debugstr_w(file_name), GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + + size = GetFileSize(file, NULL); + + mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, 0); + if (!mapping) + { + TRACE("Failed to create file mapping %s, error %u\n", debugstr_w(file_name), GetLastError()); + CloseHandle(file); + return HRESULT_FROM_WIN32(GetLastError()); + } + + data = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + if (data) + { + hr = load_job_data(This, data, size); + UnmapViewOfFile(data); + } + else + hr = HRESULT_FROM_WIN32(GetLastError()); + + CloseHandle(mapping); + CloseHandle(file); + + return hr; } static BOOL write_signature(HANDLE hfile) -- 2.16.3

1 0

[PATCH 2/7] mstask: Implement IPersistFile::GetCurFile().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 15 ++++++++++----- dlls/mstask/tests/task_scheduler.c | 4 ---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 8c9d479d55..a7fe199a3c 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1069,12 +1069,17 @@ static HRESULT WINAPI MSTASK_IPersistFile_SaveCompleted( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_IPersistFile_GetCurFile( - IPersistFile* iface, - LPOLESTR *ppszFileName) +static HRESULT WINAPI MSTASK_IPersistFile_GetCurFile(IPersistFile *iface, LPOLESTR *file_name) { - FIXME("(%p, %p): stub\n", iface, ppszFileName); - return E_NOTIMPL; + TaskImpl *This = impl_from_IPersistFile(iface); + + TRACE("(%p, %p)\n", iface, file_name); + + *file_name = CoTaskMemAlloc((strlenW(This->task_name) + 1) * sizeof(WCHAR)); + if (!*file_name) return E_OUTOFMEMORY; + + strcpyW(*file_name, This->task_name); + return S_OK; } static const ITaskVtbl MSTASK_ITaskVtbl = diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index ddbb66068f..fbee5ecb66 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -284,9 +284,7 @@ static WCHAR *get_task_curfile(ITask *task) ok(hr == S_OK, "QueryInterface error %#x\n", hr); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); -todo_wine ok(hr == S_OK, "GetCurFile error %#x\n", hr); -todo_wine ok(curfile && curfile[0] , "curfile should not be NULL\n"); if (0) /* crashes under Windows */ @@ -326,7 +324,6 @@ static void test_task_storage(void) curfile = get_task_curfile(task); ok(!file_exists(curfile), "curfile should not exist\n"); -todo_wine ok(!lstrcmpW(curfile, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task2); @@ -335,7 +332,6 @@ todo_wine curfile2 = get_task_curfile(task); ok(!file_exists(curfile2), "curfile2 should not exist\n"); -todo_wine ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); CoTaskMemFree(curfile); -- 2.16.3

1 0

[PATCH 1/7] mstask/tests: Also test the ITask::GetStatus() return value.
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6e3c997c10..6837782f2a 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -534,6 +534,7 @@ static void test_task_state(void) status = 0xdeadbeef; hr = ITask_GetStatus(test_task, &status); + ok(hr == S_OK, "GetStatus error %#x\n", hr); ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); if (0) /* crashes under Windows */ -- 2.16.3

1 0

[PATCH 2/2] schedsvc: Fix NetrJobDel return value in case of invalid job id.
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 4 ++-- dlls/schedsvc/tests/atsvcapi.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 2010245fc6..e7e59a4c0a 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -589,7 +589,7 @@ DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) { - DWORD jobid, ret = ERROR_FILE_NOT_FOUND; + DWORD jobid, ret = APE_AT_ID_NOT_FOUND; TRACE("%s,%u,%u\n", debugstr_w(server_name), min_jobid, max_jobid); @@ -602,7 +602,7 @@ DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jo if (!job) { TRACE("job %u not found\n", jobid); - ret = ERROR_FILE_NOT_FOUND; + ret = APE_AT_ID_NOT_FOUND; break; } diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index 367c6dabc1..66f237ecab 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -108,6 +108,9 @@ START_TEST(atsvcapi) ret = NetrJobGetInfo(server_name, 0xdeadbeef, &info2); ok(ret == APE_AT_ID_NOT_FOUND || broken(1) /* vista and w2008 return rubbish here */, "wrong error %u\n", ret); + ret = NetrJobDel(server_name, 0xdeadbeef, 0xdeadbeef); + ok(ret == APE_AT_ID_NOT_FOUND, "wrong error %u\n", ret); + try_count = 5; for (try = 1; try <= try_count; try++) -- 2.16.3

1 0

[PATCH 1/2] schedsvc: Fix NetrJobGetInfo return value in case of invalid job id.
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 3 ++- dlls/schedsvc/tests/atsvcapi.c | 8 +++++--- include/wine/atsvc.idl | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 83e7dcadbc..2010245fc6 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -686,7 +686,7 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **info) { struct job_t *job; - DWORD ret = ERROR_SUCCESS; + DWORD ret = APE_AT_ID_NOT_FOUND; TRACE("%s,%u,%p\n", debugstr_w(server_name), jobid, info); @@ -706,6 +706,7 @@ DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **in info_ret->Flags = job->info.Flags; info_ret->Command = heap_strdupW(job->info.Command); *info = info_ret; + ret = ERROR_SUCCESS; } } diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index 2226480a35..367c6dabc1 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -58,7 +58,7 @@ START_TEST(atsvcapi) WCHAR server_name[MAX_COMPUTERNAME_LENGTH + 1]; PTOP_LEVEL_EXCEPTION_FILTER old_exception_filter; AT_ENUM_CONTAINER container; - AT_INFO info; + AT_INFO info, *info2; DWORD ret, i, total, start_index, jobid, try, try_count; BOOL found; @@ -104,6 +104,10 @@ START_TEST(atsvcapi) test_failures = 1; test_skipped = 0; + info2 = NULL; + ret = NetrJobGetInfo(server_name, 0xdeadbeef, &info2); + ok(ret == APE_AT_ID_NOT_FOUND || broken(1) /* vista and w2008 return rubbish here */, "wrong error %u\n", ret); + try_count = 5; for (try = 1; try <= try_count; try++) @@ -127,8 +131,6 @@ START_TEST(atsvcapi) for (i = 0; i < container.EntriesRead; i++) { - AT_INFO *info2; - trace("%u: jobid %u, command %s\n", i, container.Buffer[i].JobId, wine_dbgstr_w(container.Buffer[i].Command)); if (container.Buffer[i].JobId == jobid || diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl index c1fce98074..5c723ed679 100644 --- a/include/wine/atsvc.idl +++ b/include/wine/atsvc.idl @@ -29,6 +29,8 @@ import "ocidl.idl"; ] interface atsvc { + const DWORD APE_AT_ID_NOT_FOUND = 0x00000ede; + typedef [handle] const WCHAR *ATSVC_HANDLE; typedef struct _AT_ENUM -- 2.16.3

1 0

[PATCH] sspicli: Add forwards to secur32.
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

In Windows this is another way around, but that requires moving a lot of code from secur32 to sspicli. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/sspicli/sspicli.spec | 98 +++++++++++++++++++++++------------------------ tools/make_specfiles | 4 ++ 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index e18d359a4b..38e166e9f0 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -1,61 +1,61 @@ -@ stub AcceptSecurityContext -@ stub AcquireCredentialsHandleA -@ stub AcquireCredentialsHandleW -@ stub AddCredentialsA -@ stub AddCredentialsW -@ stub AddSecurityPackageA -@ stub AddSecurityPackageW -@ stub ApplyControlToken +@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) secur32.AcceptSecurityContext +@ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleA +@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleW +@ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) secur32.AddCredentialsA +@ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) secur32.AddCredentialsW +@ stdcall AddSecurityPackageA(str ptr) secur32.AddSecurityPackageA +@ stdcall AddSecurityPackageW(wstr ptr) secur32.AddSecurityPackageW +@ stdcall ApplyControlToken(ptr ptr) secur32.ApplyControlToken @ stub ChangeAccountPasswordA @ stub ChangeAccountPasswordW -@ stub CompleteAuthToken +@ stdcall CompleteAuthToken(ptr ptr) secur32.CompleteAuthToken @ stub CredMarshalTargetInfo @ stub CredUnmarshalTargetInfo -@ stub DecryptMessage -@ stub DeleteSecurityContext +@ stdcall DecryptMessage(ptr ptr long ptr) secur32.DecryptMessage +@ stdcall DeleteSecurityContext(ptr) secur32.DeleteSecurityContext @ stub DeleteSecurityPackageA @ stub DeleteSecurityPackageW -@ stub EncryptMessage -@ stub EnumerateSecurityPackagesA -@ stub EnumerateSecurityPackagesW -@ stub ExportSecurityContext -@ stub FreeContextBuffer -@ stub FreeCredentialsHandle +@ stdcall EncryptMessage(ptr long ptr long) secur32.EncryptMessage +@ stdcall EnumerateSecurityPackagesA(ptr ptr) secur32.EnumerateSecurityPackagesA +@ stdcall EnumerateSecurityPackagesW(ptr ptr) secur32.EnumerateSecurityPackagesW +@ stdcall ExportSecurityContext(ptr long ptr ptr) secur32.ExportSecurityContext +@ stdcall FreeContextBuffer(ptr) secur32.FreeContextBuffer +@ stdcall FreeCredentialsHandle(ptr) secur32.FreeCredentialsHandle @ stub GetSecurityUserInfo -@ stub GetUserNameExA -@ stub GetUserNameExW -@ stub ImpersonateSecurityContext -@ stub ImportSecurityContextA -@ stub ImportSecurityContextW -@ stub InitializeSecurityContextA -@ stub InitializeSecurityContextW -@ stub InitSecurityInterfaceA -@ stub InitSecurityInterfaceW +@ stdcall GetUserNameExA(long ptr ptr) secur32.GetUserNameExA +@ stdcall GetUserNameExW(long ptr ptr) secur32.GetUserNameExW +@ stdcall ImpersonateSecurityContext(ptr) secur32.ImpersonateSecurityContext +@ stdcall ImportSecurityContextA(str ptr ptr ptr) secur32.ImportSecurityContextA +@ stdcall ImportSecurityContextW(wstr ptr ptr ptr) secur32.ImportSecurityContextW +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) secur32.InitializeSecurityContextA +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) secur32.InitializeSecurityContextW +@ stdcall InitSecurityInterfaceA() secur32.InitSecurityInterfaceA +@ stdcall InitSecurityInterfaceW() secur32.InitSecurityInterfaceW @ stub LogonUserExExW -@ stub LsaCallAuthenticationPackage -@ stub LsaConnectUntrusted -@ stub LsaDeregisterLogonProcess -@ stub LsaEnumerateLogonSessions -@ stub LsaFreeReturnBuffer -@ stub LsaGetLogonSessionData -@ stub LsaLogonUser -@ stub LsaLookupAuthenticationPackage -@ stub LsaRegisterLogonProcess +@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) secur32.LsaCallAuthenticationPackage +@ stdcall LsaConnectUntrusted(ptr) secur32.LsaConnectUntrusted +@ stdcall LsaDeregisterLogonProcess(long) secur32.LsaDeregisterLogonProcess +@ stdcall LsaEnumerateLogonSessions(ptr ptr) secur32.LsaEnumerateLogonSessions +@ stdcall LsaFreeReturnBuffer(ptr) secur32.LsaFreeReturnBuffer +@ stdcall LsaGetLogonSessionData(ptr ptr) secur32.LsaGetLogonSessionData +@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) secur32.LsaLogonUser +@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) secur32.LsaLookupAuthenticationPackage +@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) secur32.LsaRegisterLogonProcess @ stub LsaRegisterPolicyChangeNotification @ stub LsaUnregisterPolicyChangeNotification -@ stub MakeSignature -@ stub QueryContextAttributesA +@ stdcall MakeSignature(ptr long ptr long) secur32.MakeSignature +@ stdcall QueryContextAttributesA(ptr long ptr) secur32.QueryContextAttributesA @ stub QueryContextAttributesExA @ stub QueryContextAttributesExW -@ stub QueryContextAttributesW -@ stub QueryCredentialsAttributesA +@ stdcall QueryContextAttributesW(ptr long ptr) secur32.QueryContextAttributesW +@ stdcall QueryCredentialsAttributesA(ptr long ptr) secur32.QueryCredentialsAttributesA @ stub QueryCredentialsAttributesExA @ stub QueryCredentialsAttributesExW -@ stub QueryCredentialsAttributesW -@ stub QuerySecurityContextToken -@ stub QuerySecurityPackageInfoA -@ stub QuerySecurityPackageInfoW -@ stub RevertSecurityContext +@ stdcall QueryCredentialsAttributesW(ptr long ptr) secur32.QueryCredentialsAttributesW +@ stdcall QuerySecurityContextToken(ptr ptr) secur32.QuerySecurityContextToken +@ stdcall QuerySecurityPackageInfoA(str ptr) secur32.QuerySecurityPackageInfoA +@ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW +@ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext @ stub SaslAcceptSecurityContext @ stub SaslEnumerateProfilesA @ stub SaslEnumerateProfilesW @@ -67,7 +67,7 @@ @ stub SaslInitializeSecurityContextA @ stub SaslInitializeSecurityContextW @ stub SaslSetContextOption -@ stub SealMessage +@ stdcall SealMessage(ptr long ptr long) secur32.SealMessage @ stub SecCacheSspiPackages @ stub SecDeleteUserModeContext @ stub SeciAllocateAndSetCallFlags @@ -75,8 +75,8 @@ @ stub SeciFreeCallContext @ stub SeciIsProtectedUser @ stub SecInitUserModeContext -@ stub SetContextAttributesA -@ stub SetContextAttributesW +@ stdcall SetContextAttributesA(ptr long ptr long) secur32.SetContextAttributesA +@ stdcall SetContextAttributesW(ptr long ptr long) secur32.SetContextAttributesW @ stub SetCredentialsAttributesA @ stub SetCredentialsAttributesW @ stub SspiCompareAuthIdentities @@ -100,5 +100,5 @@ @ stub SspiUnmarshalAuthIdentityInternal @ stub SspiValidateAuthIdentity @ stdcall SspiZeroAuthIdentity(ptr) -@ stub UnsealMessage -@ stub VerifySignature +@ stdcall UnsealMessage(ptr ptr long ptr) secur32.UnsealMessage +@ stdcall VerifySignature(ptr ptr long ptr) secur32.VerifySignature diff --git a/tools/make_specfiles b/tools/make_specfiles index 44023aa98c..6fe79f6cb7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -329,6 +329,10 @@ my @dll_groups = "oleacc", "ext-ms-win-oleacc-l1-1-0", ], + [ + "secur32", + "sspicli", + ], [ "shell32", "api-ms-win-downlevel-shell32-l1-1-0", -- 2.16.3

1 0

[PATCH v2] wineandroid: Silence a noisy FIXME in ANDROID_GetKeyboardLayout.
by Josh DuBois 25 Apr '18

25 Apr '18

v2: Include signoff. Signed-off-by: Josh DuBois <duboisj(a)codeweavers.com> --- dlls/wineandroid.drv/keyboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 3d459cd..3167d54 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -974,6 +974,7 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) { ULONG_PTR layout = GetUserDefaultLCID(); LANGID langid; + static int once; langid = PRIMARYLANGID(LANGIDFROMLCID( layout )); if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) @@ -981,7 +982,7 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) else layout |= layout << 16; - FIXME( "returning %lx\n", layout ); + if (!once++) FIXME( "returning %lx\n", layout ); return (HKL)layout; } -- 2.7.4 (Apple Git-66)

1 0

[PATCH] wineandroid: Silence a noisy FIXME in ANDROID_GetKeyboardLayout.
by Josh DuBois 24 Apr '18

24 Apr '18

--- dlls/wineandroid.drv/keyboard.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 3d459cd..3167d54 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -974,6 +974,7 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) { ULONG_PTR layout = GetUserDefaultLCID(); LANGID langid; + static int once; langid = PRIMARYLANGID(LANGIDFROMLCID( layout )); if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) @@ -981,7 +982,7 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) else layout |= layout << 16; - FIXME( "returning %lx\n", layout ); + if (!once++) FIXME( "returning %lx\n", layout ); return (HKL)layout; } -- 2.7.4 (Apple Git-66)

1 0

Refining GSoC Proposal
by Kieran Duggan 24 Apr '18

24 Apr '18

Hello, So I recently received an email informing me that I have the option of refining or improving the list of D3DX functions that I came up with for my proposal. My current time line and list isn't a very good one to say the least. Basically, in the interest of time, I put together the proposal by grabbing a set of functions I saw in spec files marked with 'stub' without much thought. Clearly that wasn't optimal, so I'm pretty happy that I don't have to stick with that poorly put together list. It doesn't really represent my best work, and I'd like to do better, so I'm reaching out here in hopes that someone can point me in the right direction on how to start compiling a more meaningful list and time line to go with it. My idea right now is just to look at the stubs and cross reference that with MSDN to try and get a grasp of how they might be implemented and move on from there. maybe the MSDN documentation can help me find related functions that would make sense to work on together? Just so anyone reading this has something to work with, I'll attach a draft of my proposal[1]. It should be identical to the one I submitted. [1] https://docs.google.com/document/d/1kjWMNBX8xba_MlTOYgoh2DMBLdWZA3wDQPBvI5s… Thanks for the help, Kieran Duggan

4 5

[PATCH] d3dx9_36: Fix D3DCompile() call.
by Valentin Gabriel Mitrea 24 Apr '18

24 Apr '18

When using D3DCompile() with an fx profile, the entry point parameter is not used. So, it should be set to NULL. Signed-off-by: Valentin Gabriel Mitrea <mitrea.valentin(a)gmail.com> --- dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 94f7b07..33197de 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6590,7 +6590,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, { TRACE("HLSL ASCII effect, trying to compile it.\n"); hr = D3DCompile(data, data_size, NULL, defines, include, - "main", "fx_2_0", compile_flags, eflags, &bytecode, &temp_errors); + NULL, "fx_2_0", compile_flags, eflags, &bytecode, &temp_errors); if (FAILED(hr)) { WARN("Failed to compile ASCII effect.\n"); -- 2.7.4

2 1

[PATCH v2] d3d10: Implement D3D10CompileEffectFromMemory().
by Valentin Gabriel Mitrea 24 Apr '18

24 Apr '18

Implementation for the D3D10CompileEffectFromMemory() function. This could be a possible fix for this bug: https://bugs.winehq.org/show_bug.cgi?id=36538 Changes in v2: As Matteo Bruni suggested, I have added a period at the end of the TRACE message and I removed the comment. Signed-off-by: Valentin Gabriel Mitrea <mitrea.valentin(a)gmail.com> --- dlls/d3d10/d3d10_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index f2fbb41..7c8bee7 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -253,17 +253,13 @@ HRESULT WINAPI D3D10CompileEffectFromMemory(void *data, SIZE_T data_size, const const D3D10_SHADER_MACRO *defines, ID3D10Include *include, UINT hlsl_flags, UINT fx_flags, ID3D10Blob **effect, ID3D10Blob **errors) { - FIXME("data %p, data_size %lu, filename %s, defines %p, include %p," - " hlsl_flags %#x, fx_flags %#x, effect %p, errors %p stub!\n", + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, " + "hlsl_flags %#x, fx_flags %#x, effect %p, errors %p.\n", data, data_size, wine_dbgstr_a(filename), defines, include, hlsl_flags, fx_flags, effect, errors); - if (effect) - *effect = NULL; - if (errors) - *errors = NULL; - - return E_NOTIMPL; + return D3DCompile(data, data_size, filename, defines, include, + NULL, "fx_4_0", hlsl_flags, fx_flags, effect, errors); } HRESULT WINAPI D3D10CreateEffectPoolFromMemory(void *data, SIZE_T data_size, UINT fx_flags, -- 2.7.4

3 3

[PATCH v2] winmm: return error in waveInMessage if either dwParam1 or dwParam2 is null
by Louis Lenders 24 Apr '18

24 Apr '18

v2: -added test in capture.c Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/winmm/tests/capture.c | 10 ++++++++++ dlls/winmm/waveform.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 54c3793..aeedff1 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -661,6 +661,16 @@ static void wave_in_tests(void) ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)-1 , 0); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + + rc = waveInMessage((HWAVEIN)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + 0, (DWORD_PTR)&status); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + rc=waveInGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveInGetDevCapsA(%s): MMSYSERR_BADDEVICEID expected, got %s\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 7308519..dd6f630 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3660,17 +3660,17 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET: - if(dwParam1) { - if(g_inmmdevices_count > 0) - /* Device 0 is always the default device */ - *(DWORD *)dwParam1 = 0; - else - *(DWORD *)dwParam1 = -1; - } + if(!dwParam1 || !dwParam2) + return MMSYSERR_INVALPARAM; - if(dwParam2) - /* Status flags */ - *(DWORD *)dwParam2 = 0; + if(g_inmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + + /* Status flags */ + *(DWORD *)dwParam2 = 0; return MMSYSERR_NOERROR; } -- 2.7.4

1 0

[PATCH] winmm: return error in waveOutMessage if either dwParam1 or dwParam2 is null
by Louis Lenders 24 Apr '18

24 Apr '18

This is for bug https://bugs.winehq.org/show_bug.cgi?id=44953 (The first test shows what Premiere passes in to waveOutMessage) After this it runs into same issue with waveInMessage, i`ll send a seperate patch for that issue Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/winmm/tests/wave.c | 10 ++++++++++ dlls/winmm/waveform.c | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 2a12752..8d7dfd6 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1440,6 +1440,16 @@ static void wave_out_tests(void) ok((ndev == 0 && (preferred == -1 || broken(preferred != -1))) || preferred < ndev, "Got invalid preferred device: 0x%x\n", preferred); + rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + (DWORD_PTR)-1 , 0); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + + rc = waveOutMessage((HWAVEOUT)WAVE_MAPPER, DRVM_MAPPER_PREFERRED_GET, + 0, (DWORD_PTR)&status); + ok(rc == MMSYSERR_INVALPARAM || rc == MMSYSERR_BADDEVICEID, /* w2008+wvista */ + "waveOutMessage(DRVM_MAPPER_PREFERRED_GET) failed: %u\n", rc); + rc=waveOutGetDevCapsA(ndev+1,&capsA,sizeof(capsA)); ok(rc==MMSYSERR_BADDEVICEID, "waveOutGetDevCapsA(%s): MMSYSERR_BADDEVICEID expected, got %s\n", diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 7308519..26fed17 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3262,17 +3262,17 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET: - if(dwParam1) { - if(g_outmmdevices_count > 0) - /* Device 0 is always the default device */ - *(DWORD *)dwParam1 = 0; - else - *(DWORD *)dwParam1 = -1; - } + if(!dwParam1 || !dwParam2) + return MMSYSERR_INVALPARAM; - if(dwParam2) - /* Status flags */ - *(DWORD *)dwParam2 = 0; + if(g_outmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + + /* Status flags */ + *(DWORD *)dwParam2 = 0; return MMSYSERR_NOERROR; } -- 2.7.4

2 1

[PATCH] winmm: return error in waveInMessage if either dwParam1 or dwParam2 is null
by Louis Lenders 24 Apr '18

24 Apr '18

This fixes https://bugs.winehq.org/show_bug.cgi?id=44953 There was no test for waveInMessage, so I didn`t find it neat to put a test between the waveOutMessage tests, but the test for waveInMessage can be seen here: https://testbot.winehq.org/JobDetails.pl?Key=37990 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/winmm/waveform.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 26fed17..045bf4a 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -3660,17 +3660,17 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET: - if(dwParam1) { - if(g_inmmdevices_count > 0) - /* Device 0 is always the default device */ - *(DWORD *)dwParam1 = 0; - else - *(DWORD *)dwParam1 = -1; - } + if(!dwParam1 || !dwParam2) + return MMSYSERR_INVALPARAM; - if(dwParam2) - /* Status flags */ - *(DWORD *)dwParam2 = 0; + if(g_inmmdevices_count > 0) + /* Device 0 is always the default device */ + *(DWORD *)dwParam1 = 0; + else + *(DWORD *)dwParam1 = -1; + + /* Status flags */ + *(DWORD *)dwParam2 = 0; return MMSYSERR_NOERROR; } -- 2.7.4

2 1

[PATCH 1/6] msi: Make MsiGetMode() RPC-compatible.
by Zebediah Figura 24 Apr '18

24 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/install.c | 9 +-------- dlls/msi/package.c | 5 ++--- dlls/msi/winemsi.idl | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 88b3ff5..3ac151d 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -561,18 +561,11 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) if (!package) { MSIHANDLE remote; - BOOL ret; - HRESULT hr; if (!(remote = msi_get_remote(hInstall))) return FALSE; - hr = remote_GetMode(remote, iRunMode, &ret); - - if (hr == S_OK) - return ret; - - return FALSE; + return remote_GetMode(remote, iRunMode); } switch (iRunMode) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1790918..3ea5afc 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2513,10 +2513,9 @@ UINT __cdecl remote_GetSourcePath(MSIHANDLE hinst, LPCWSTR folder, LPWSTR *value return r; } -HRESULT __cdecl remote_GetMode(MSIHANDLE hinst, MSIRUNMODE mode, BOOL *ret) +BOOL __cdecl remote_GetMode(MSIHANDLE hinst, MSIRUNMODE mode) { - *ret = MsiGetMode(hinst, mode); - return S_OK; + return MsiGetMode(hinst, mode); } HRESULT __cdecl remote_SetMode(MSIHANDLE hinst, MSIRUNMODE mode, BOOL state) diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 06db52e..7282c77 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -79,7 +79,7 @@ interface IWineMsiRemote UINT remote_GetTargetPath( [in] MSIHANDLE hinst, [in, string] LPCWSTR folder, [out, string] LPWSTR *value ); UINT remote_SetTargetPath( [in] MSIHANDLE hinst, [in, string] LPCWSTR folder, [in, string] LPCWSTR value ); UINT remote_GetSourcePath( [in] MSIHANDLE hinst, [in, string] LPCWSTR folder, [out, string] LPWSTR *value ); - HRESULT remote_GetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode, [out] BOOL *ret ); + BOOL remote_GetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode ); HRESULT remote_SetMode( [in] MSIHANDLE hinst, [in] MSIRUNMODE mode, [in] BOOL state ); HRESULT remote_GetFeatureState( [in] MSIHANDLE hinst, [in] BSTR feature, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); HRESULT remote_SetFeatureState( [in] MSIHANDLE hinst, [in] BSTR feature, [in] INSTALLSTATE state ); -- 2.7.4

3 16

[PATCH] user32/menu: Don't use menu handles when looking for menu items.
by Nikolay Sivov 24 Apr '18

24 Apr '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/menu.c | 544 ++++++++++++++++++++++++++++++--------------- 1 file changed, 369 insertions(+), 175 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 537c2ebe1a..dcec42cdf2 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -592,52 +592,56 @@ static UINT MENU_GetStartOfPrevColumn( * Find a menu item. Return a pointer on the item, and modifies *hmenu * in case the item was in a sub-menu. */ -static MENUITEM *MENU_FindItem( HMENU *hmenu, UINT *nPos, UINT wFlags ) +static MENUITEM *MENU_FindItem(POPUPMENU **menu, UINT *nPos, UINT wFlags) { - POPUPMENU *menu; - MENUITEM *fallback = NULL; - UINT fallback_pos = 0; - UINT i; + UINT fallback_pos = ~0u; + + if (!*menu) + return NULL; - if ((*hmenu == (HMENU)0xffff) || (!(menu = MENU_GetMenu(*hmenu)))) return NULL; if (wFlags & MF_BYPOSITION) { - if (*nPos >= menu->nItems) return NULL; - return &menu->items[*nPos]; + if (*nPos >= (*menu)->nItems) return NULL; + return &(*menu)->items[*nPos]; } else { - MENUITEM *item = menu->items; - for (i = 0; i < menu->nItems; i++, item++) + MENUITEM *item = (*menu)->items; + UINT i; + + for (i = 0; i < (*menu)->nItems; i++, item++) { if (item->fType & MF_POPUP) { - HMENU hsubmenu = item->hSubMenu; - MENUITEM *subitem = MENU_FindItem( &hsubmenu, nPos, wFlags ); - if (subitem) - { - *hmenu = hsubmenu; - return subitem; - } + POPUPMENU *submenu = grab_menu_ptr(item->hSubMenu); + if (MENU_FindItem(&submenu, nPos, wFlags)) + { + release_menu_ptr(*menu); + *menu = submenu; + return &(*menu)->items[*nPos]; + } else if (item->wID == *nPos) { /* fallback to this item if nothing else found */ fallback_pos = i; - fallback = item; } + release_menu_ptr(submenu); } else if (item->wID == *nPos) { *nPos = i; - return item; + return &(*menu)->items[*nPos]; } } } - if (fallback) + if (fallback_pos != ~0u) + { *nPos = fallback_pos; + return &(*menu)->items[*nPos]; + } - return fallback; + return NULL; } /*********************************************************************** @@ -2135,13 +2139,9 @@ static void MENU_MoveSelection( HWND hwndOwner, HMENU hmenu, INT offset ) * * Insert (allocate) a new item into a menu. */ -static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) +static MENUITEM *MENU_InsertItem( POPUPMENU *menu, UINT pos, UINT flags ) { MENUITEM *newItems; - POPUPMENU *menu; - - if (!(menu = MENU_GetMenu(hMenu))) - return NULL; /* Find where to insert new item */ @@ -2149,12 +2149,8 @@ static MENUITEM *MENU_InsertItem( HMENU hMenu, UINT pos, UINT flags ) if (pos > menu->nItems) pos = menu->nItems; } else { - if (!MENU_FindItem( &hMenu, &pos, flags )) + if (!MENU_FindItem(&menu, &pos, flags)) pos = menu->nItems; - else { - if (!(menu = MENU_GetMenu( hMenu ))) - return NULL; - } } /* Make sure that MDI system buttons stay on the right side. @@ -3706,13 +3702,23 @@ BOOL WINAPI ChangeMenuW( HMENU hMenu, UINT pos, LPCWSTR data, */ DWORD WINAPI CheckMenuItem( HMENU hMenu, UINT id, UINT flags ) { - MENUITEM *item; - DWORD ret; + POPUPMENU *menu; + DWORD ret = -1; + + menu = grab_menu_ptr(hMenu); + if (menu) + { + MENUITEM *item; + + if ((item = MENU_FindItem(&menu, &id, flags))) + { + ret = item->fState & MF_CHECKED; + if (flags & MF_CHECKED) item->fState |= MF_CHECKED; + else item->fState &= ~MF_CHECKED; + } + release_menu_ptr(menu); + } - if (!(item = MENU_FindItem( &hMenu, &id, flags ))) return -1; - ret = item->fState & MF_CHECKED; - if (flags & MF_CHECKED) item->fState |= MF_CHECKED; - else item->fState &= ~MF_CHECKED; return ret; } @@ -3726,36 +3732,41 @@ BOOL WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags ) MENUITEM *item; POPUPMENU *menu; - TRACE("(%p, %04x, %04x) !\n", hMenu, wItemID, wFlags); + TRACE("(%p, %04x, %04x)\n", hMenu, wItemID, wFlags); /* Get the Popupmenu to access the owner menu */ - if (!(menu = MENU_GetMenu(hMenu))) - return (UINT)-1; - - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) - return (UINT)-1; + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, &wItemID, wFlags))) + { + release_menu_ptr(menu); + return (UINT)-1; + } oldflags = item->fState & (MF_GRAYED | MF_DISABLED); item->fState ^= (oldflags ^ wFlags) & (MF_GRAYED | MF_DISABLED); /* If the close item in the system menu change update the close button */ - if((item->wID == SC_CLOSE) && (oldflags != wFlags)) + if ((item->wID == SC_CLOSE) && (oldflags != wFlags) && menu->hSysMenuOwner) { - if (menu->hSysMenuOwner != 0) - { - RECT rc; - POPUPMENU* parentMenu; + POPUPMENU *parent_menu; + HWND hwnd; + RECT rc; - /* Get the parent menu to access*/ - if (!(parentMenu = MENU_GetMenu(menu->hSysMenuOwner))) - return (UINT)-1; + if (!(parent_menu = grab_menu_ptr(menu->hSysMenuOwner))) + { + release_menu_ptr(menu); + return (UINT)-1; + } - /* Refresh the frame to reflect the change */ - WIN_GetRectangles( parentMenu->hWnd, COORDS_CLIENT, &rc, NULL ); - rc.bottom = 0; - RedrawWindow(parentMenu->hWnd, &rc, 0, RDW_FRAME | RDW_INVALIDATE | RDW_NOCHILDREN); - } + hwnd = parent_menu->hWnd; + release_menu_ptr(parent_menu); + + /* Refresh the frame to reflect the change */ + WIN_GetRectangles(hwnd, COORDS_CLIENT, &rc, NULL); + rc.bottom = 0; + RedrawWindow(hwnd, &rc, 0, RDW_FRAME | RDW_INVALIDATE | RDW_NOCHILDREN); } + release_menu_ptr(menu); return oldflags; } @@ -3770,21 +3781,39 @@ INT WINAPI GetMenuStringA( LPSTR str, /* [out] outbuffer. If NULL, func returns entry length*/ INT nMaxSiz, /* [in] length of buffer. if 0, func returns entry len*/ UINT wFlags /* [in] MF_ flags */ -) { +) +{ + POPUPMENU *menu; MENUITEM *item; + INT ret; TRACE("menu=%p item=%04x ptr=%p len=%d flags=%04x\n", hMenu, wItemID, str, nMaxSiz, wFlags ); + if (str && nMaxSiz) str[0] = '\0'; - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) { + + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, &wItemID, wFlags))) + { + release_menu_ptr(menu); SetLastError( ERROR_MENU_ITEM_NOT_FOUND); return 0; } - if (!item->text) return 0; - if (!str || !nMaxSiz) return WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ); - if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) - str[nMaxSiz-1] = 0; + + if (!item->text) + ret = 0; + else if (!str || !nMaxSiz) + ret = WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ); + else + { + if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, str, nMaxSiz, NULL, NULL )) + str[nMaxSiz-1] = 0; + ret = strlen(str); + } + release_menu_ptr(menu); + TRACE("returning %s\n", debugstr_a(str)); - return strlen(str); + + return ret; } @@ -3794,22 +3823,38 @@ INT WINAPI GetMenuStringA( INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID, LPWSTR str, INT nMaxSiz, UINT wFlags ) { + POPUPMENU *menu; MENUITEM *item; + INT ret; TRACE("menu=%p item=%04x ptr=%p len=%d flags=%04x\n", hMenu, wItemID, str, nMaxSiz, wFlags ); + if (str && nMaxSiz) str[0] = '\0'; - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) { + + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, &wItemID, wFlags))) + { + release_menu_ptr(menu); SetLastError( ERROR_MENU_ITEM_NOT_FOUND); return 0; } - if (!str || !nMaxSiz) return item->text ? strlenW(item->text) : 0; - if( !(item->text)) { + + if (!str || !nMaxSiz) + ret = item->text ? strlenW(item->text) : 0; + else if (!(item->text)) + { str[0] = 0; - return 0; + ret = 0; } - lstrcpynW( str, item->text, nMaxSiz ); + else + { + lstrcpynW( str, item->text, nMaxSiz ); + ret = strlenW(str); + } + release_menu_ptr(menu); + TRACE("returning %s\n", debugstr_w(str)); - return strlenW(str); + return ret; } @@ -3819,13 +3864,27 @@ INT WINAPI GetMenuStringW( HMENU hMenu, UINT wItemID, BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, UINT wHilite ) { - LPPOPUPMENU menu; + POPUPMENU *menu; + BOOL changed; + TRACE("(%p, %p, %04x, %04x);\n", hWnd, hMenu, wItemID, wHilite); - if (!MENU_FindItem( &hMenu, &wItemID, wHilite )) return FALSE; - if (!(menu = MENU_GetMenu(hMenu))) return FALSE; - if (menu->FocusedItem == wItemID) return TRUE; - MENU_HideSubPopups( hWnd, hMenu, FALSE, 0 ); - MENU_SelectItem( hWnd, hMenu, wItemID, TRUE, 0 ); + + menu = grab_menu_ptr(hMenu); + if (!MENU_FindItem(&menu, &wItemID, wHilite)) + { + release_menu_ptr(menu); + return FALSE; + } + + changed = menu->FocusedItem != wItemID; + release_menu_ptr(menu); + + if (changed) + { + MENU_HideSubPopups( hWnd, hMenu, FALSE, 0 ); + MENU_SelectItem( hWnd, hMenu, wItemID, TRUE, 0 ); + } + return TRUE; } @@ -3835,23 +3894,35 @@ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID, */ UINT WINAPI GetMenuState( HMENU hMenu, UINT wItemID, UINT wFlags ) { + POPUPMENU *menu; MENUITEM *item; + UINT state; + TRACE("(menu=%p, id=%04x, flags=%04x);\n", hMenu, wItemID, wFlags); - if (!(item = MENU_FindItem( &hMenu, &wItemID, wFlags ))) return -1; + + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, &wItemID, wFlags))) + { + release_menu_ptr(menu); + return -1; + } debug_print_menuitem (" item: ", item, ""); if (item->fType & MF_POPUP) { - POPUPMENU *menu = MENU_GetMenu( item->hSubMenu ); - if (!menu) return -1; - else return (menu->nItems << 8) | ((item->fState|item->fType) & 0xff); + POPUPMENU *submenu = grab_menu_ptr(item->hSubMenu); + state = submenu ? (submenu->nItems << 8) | ((item->fState | item->fType) & 0xff) : -1; + release_menu_ptr(submenu); } else { /* We used to (from way back then) mask the result to 0xff. */ /* I don't know why and it seems wrong as the documented */ /* return flag MF_SEPARATOR is outside that mask. */ - return (item->fType | item->fState); + state = (item->fType | item->fState); } + release_menu_ptr(menu); + + return state; } @@ -3877,12 +3948,19 @@ INT WINAPI GetMenuItemCount( HMENU hMenu ) */ UINT WINAPI GetMenuItemID( HMENU hMenu, INT nPos ) { - MENUITEM * lpmi; - - if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return -1; - if (lpmi->fType & MF_POPUP) return -1; - return lpmi->wID; + POPUPMENU *menu; + MENUITEM *item; + UINT id; + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, (UINT *)&nPos, MF_BYPOSITION))) + { + release_menu_ptr(menu); + return -1; + } + id = item->fType & MF_POPUP ? -1 : item->wID; + release_menu_ptr(menu); + return id; } @@ -3937,6 +4015,8 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, { MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + BOOL ret; if (IS_STRING_ITEM(flags) && str) TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %s\n", @@ -3944,16 +4024,25 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags, else TRACE("hMenu %p, pos %d, flags %08x, id %04lx, str %p (not a string)\n", hMenu, pos, flags, id, str ); - if (!(item = MENU_InsertItem( hMenu, pos, flags ))) return FALSE; - MENU_mnu2mnuii( flags, id, str, &mii); - if (!(SetMenuItemInfo_common( item, &mii, TRUE))) + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_InsertItem( menu, pos, flags ))) { - RemoveMenu( hMenu, pos, flags ); + release_menu_ptr(menu); return FALSE; } - item->hCheckBit = item->hUnCheckBit = 0; - return TRUE; + MENU_mnu2mnuii( flags, id, str, &mii); + + ret = SetMenuItemInfo_common(item, &mii, TRUE); + + if (ret) + item->hCheckBit = item->hUnCheckBit = 0; + else + RemoveMenu( hMenu, pos, flags ); + + release_menu_ptr(menu); + + return ret; } @@ -4006,16 +4095,20 @@ BOOL WINAPI AppendMenuW( HMENU hMenu, UINT flags, */ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) { - LPPOPUPMENU menu; + POPUPMENU *menu; MENUITEM *item; TRACE("(menu=%p pos=%04x flags=%04x)\n",hMenu, nPos, wFlags); - if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE; - if (!(menu = MENU_GetMenu(hMenu))) return FALSE; - /* Remove item */ + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, &nPos, wFlags))) + { + release_menu_ptr(menu); + return FALSE; + } - MENU_FreeItemData( item ); + /* Remove item */ + MENU_FreeItemData(item); if (--menu->nItems == 0) { @@ -4035,6 +4128,8 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) menu->nItems * sizeof(MENUITEM) ); if (new_items) menu->items = new_items; } + release_menu_ptr(menu); + return TRUE; } @@ -4044,10 +4139,20 @@ BOOL WINAPI RemoveMenu( HMENU hMenu, UINT nPos, UINT wFlags ) */ BOOL WINAPI DeleteMenu( HMENU hMenu, UINT nPos, UINT wFlags ) { - MENUITEM *item = MENU_FindItem( &hMenu, &nPos, wFlags ); - if (!item) return FALSE; + POPUPMENU *menu; + MENUITEM *item; + + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, &nPos, wFlags))) + { + release_menu_ptr(menu); + return FALSE; + } + if (item->fType & MF_POPUP) DestroyMenu( item->hSubMenu ); - /* nPos is now the position of the item */ + release_menu_ptr(menu); + + /* nPos is now the position of the item */ RemoveMenu( hMenu, nPos, wFlags | MF_BYPOSITION ); return TRUE; } @@ -4059,23 +4164,28 @@ BOOL WINAPI DeleteMenu( HMENU hMenu, UINT nPos, UINT wFlags ) BOOL WINAPI ModifyMenuW( HMENU hMenu, UINT pos, UINT flags, UINT_PTR id, LPCWSTR str ) { - MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + MENUITEM *item; + BOOL ret; if (IS_STRING_ITEM(flags)) TRACE("%p %d %04x %04lx %s\n", hMenu, pos, flags, id, debugstr_w(str) ); else TRACE("%p %d %04x %04lx %p\n", hMenu, pos, flags, id, str ); - if (!(item = MENU_FindItem( &hMenu, &pos, flags ))) + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, &pos, flags))) { + release_menu_ptr(menu); /* workaround for Word 95: pretend that SC_TASKLIST item exists */ - if (pos == SC_TASKLIST && !(flags & MF_BYPOSITION)) return TRUE; - return FALSE; + return pos == SC_TASKLIST && !(flags & MF_BYPOSITION); } - MENU_GetMenu(hMenu)->Height = 0; /* force size recalculate */ + menu->Height = 0; /* force size recalculate */ MENU_mnu2mnuii( flags, id, str, &mii); - return SetMenuItemInfo_common( item, &mii, TRUE); + ret = SetMenuItemInfo_common(item, &mii, TRUE); + release_menu_ptr(menu); + return ret; } @@ -4134,9 +4244,15 @@ DWORD WINAPI GetMenuCheckMarkDimensions(void) BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags, HBITMAP hNewUnCheck, HBITMAP hNewCheck) { + POPUPMENU *menu; MENUITEM *item; - if (!(item = MENU_FindItem( &hMenu, &nPos, wFlags ))) return FALSE; + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, &nPos, wFlags))) + { + release_menu_ptr(menu); + return FALSE; + } if (!hNewCheck && !hNewUnCheck) { @@ -4148,6 +4264,7 @@ BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags, item->hUnCheckBit = hNewUnCheck; item->fState |= MF_USECHECKBITMAPS; } + release_menu_ptr(menu); return TRUE; } @@ -4418,11 +4535,22 @@ BOOL WINAPI SetMenu( HWND hWnd, HMENU hMenu ) */ HMENU WINAPI GetSubMenu( HMENU hMenu, INT nPos ) { - MENUITEM * lpmi; + HMENU submenu = 0; + POPUPMENU *menu; + MENUITEM *item; + + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, (UINT *)&nPos, MF_BYPOSITION))) + { + release_menu_ptr(menu); + return 0; + } - if (!(lpmi = MENU_FindItem(&hMenu,(UINT*)&nPos,MF_BYPOSITION))) return 0; - if (!(lpmi->fType & MF_POPUP)) return 0; - return lpmi->hSubMenu; + if (item->fType & MF_POPUP) + submenu = item->hSubMenu; + release_menu_ptr(menu); + + return submenu; } @@ -4631,31 +4759,39 @@ BOOL WINAPI IsMenu(HMENU hmenu) * GetMenuItemInfo_common */ -static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, +static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT id, BOOL bypos, LPMENUITEMINFOW lpmii, BOOL unicode) { - MENUITEM *menu = MENU_FindItem (&hmenu, &item, bypos ? MF_BYPOSITION : 0); - - debug_print_menuitem("GetMenuItemInfo_common: ", menu, ""); + POPUPMENU *menu; + MENUITEM *item; - if (!menu) { + menu = grab_menu_ptr(hmenu); + if (!(item = MENU_FindItem(&menu, &id, bypos ? MF_BYPOSITION : 0))) + { + release_menu_ptr(menu); SetLastError( ERROR_MENU_ITEM_NOT_FOUND); return FALSE; } - if( lpmii->fMask & MIIM_TYPE) { - if( lpmii->fMask & ( MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP)) { - WARN("invalid combination of fMask bits used\n"); - /* this does not happen on Win9x/ME */ - SetLastError( ERROR_INVALID_PARAMETER); - return FALSE; - } - lpmii->fType = menu->fType & MENUITEMINFO_TYPE_MASK; - if (menu->hbmpItem && !IS_MAGIC_BITMAP(menu->hbmpItem)) + debug_print_menuitem("GetMenuItemInfo_common: ", item, ""); + + if ((lpmii->fMask & MIIM_TYPE) && (lpmii->fMask & (MIIM_STRING | MIIM_FTYPE | MIIM_BITMAP))) + { + release_menu_ptr(menu); + WARN("invalid combination of fMask bits used\n"); + /* this does not happen on Win9x/ME */ + SetLastError( ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (lpmii->fMask & MIIM_TYPE) + { + lpmii->fType = item->fType & MENUITEMINFO_TYPE_MASK; + if (item->hbmpItem && !IS_MAGIC_BITMAP(item->hbmpItem)) lpmii->fType |= MFT_BITMAP; - lpmii->hbmpItem = menu->hbmpItem; /* not on Win9x/ME */ + lpmii->hbmpItem = item->hbmpItem; /* not on Win9x/ME */ if( lpmii->fType & MFT_BITMAP) { - lpmii->dwTypeData = (LPWSTR) menu->hbmpItem; + lpmii->dwTypeData = (LPWSTR)item->hbmpItem; lpmii->cch = 0; } else if( lpmii->fType & (MFT_OWNERDRAW | MFT_SEPARATOR)) { /* this does not happen on Win9x/ME */ @@ -4666,7 +4802,8 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, /* copy the text string */ if ((lpmii->fMask & (MIIM_TYPE|MIIM_STRING))) { - if( !menu->text ) { + if (!item->text) + { if(lpmii->dwTypeData && lpmii->cch) { if( unicode) *((WCHAR *)lpmii->dwTypeData) = 0; @@ -4678,16 +4815,16 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, int len; if (unicode) { - len = strlenW(menu->text); + len = strlenW(item->text); if(lpmii->dwTypeData && lpmii->cch) - lstrcpynW(lpmii->dwTypeData, menu->text, lpmii->cch); + lstrcpynW(lpmii->dwTypeData, item->text, lpmii->cch); } else { - len = WideCharToMultiByte( CP_ACP, 0, menu->text, -1, NULL, + len = WideCharToMultiByte( CP_ACP, 0, item->text, -1, NULL, 0, NULL, NULL ) - 1; if(lpmii->dwTypeData && lpmii->cch) - if (!WideCharToMultiByte( CP_ACP, 0, menu->text, -1, + if (!WideCharToMultiByte( CP_ACP, 0, item->text, -1, (LPSTR)lpmii->dwTypeData, lpmii->cch, NULL, NULL )) ((LPSTR)lpmii->dwTypeData)[lpmii->cch - 1] = 0; } @@ -4706,33 +4843,35 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu, UINT item, BOOL bypos, } if (lpmii->fMask & MIIM_FTYPE) - lpmii->fType = menu->fType & MENUITEMINFO_TYPE_MASK; + lpmii->fType = item->fType & MENUITEMINFO_TYPE_MASK; if (lpmii->fMask & MIIM_BITMAP) - lpmii->hbmpItem = menu->hbmpItem; + lpmii->hbmpItem = item->hbmpItem; if (lpmii->fMask & MIIM_STATE) - lpmii->fState = menu->fState & MENUITEMINFO_STATE_MASK; + lpmii->fState = item->fState & MENUITEMINFO_STATE_MASK; if (lpmii->fMask & MIIM_ID) - lpmii->wID = menu->wID; + lpmii->wID = item->wID; if (lpmii->fMask & MIIM_SUBMENU) - lpmii->hSubMenu = menu->hSubMenu; + lpmii->hSubMenu = item->hSubMenu; else { /* hSubMenu is always cleared * (not on Win9x/ME ) */ lpmii->hSubMenu = 0; } - if (lpmii->fMask & MIIM_CHECKMARKS) { - lpmii->hbmpChecked = menu->hCheckBit; - lpmii->hbmpUnchecked = menu->hUnCheckBit; + if (lpmii->fMask & MIIM_CHECKMARKS) + { + lpmii->hbmpChecked = item->hCheckBit; + lpmii->hbmpUnchecked = item->hUnCheckBit; } if (lpmii->fMask & MIIM_DATA) - lpmii->dwItemData = menu->dwItemData; + lpmii->dwItemData = item->dwItemData; - return TRUE; + release_menu_ptr(menu); + return TRUE; } /********************************************************************** @@ -4946,44 +5085,56 @@ static BOOL MENU_NormalizeMenuItemInfoStruct( const MENUITEMINFOW *pmii_in, /********************************************************************** * SetMenuItemInfoA (USER32.@) */ -BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, +BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT id, BOOL bypos, const MENUITEMINFOA *lpmii) { - MENUITEM *menuitem; MENUITEMINFOW mii; + POPUPMENU *menu; + MENUITEM *item; + BOOL ret; - TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); + TRACE("hmenu %p, id %u, by pos %d, info %p\n", hmenu, id, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; - if (!(menuitem = MENU_FindItem( &hmenu, &item, bypos? MF_BYPOSITION : 0 ))) + menu = grab_menu_ptr(hmenu); + if (!(item = MENU_FindItem(&menu, &id, bypos ? MF_BYPOSITION : 0))) { + release_menu_ptr(menu); /* workaround for Word 95: pretend that SC_TASKLIST item exists */ - if (item == SC_TASKLIST && !bypos) return TRUE; - return FALSE; + return id == SC_TASKLIST && !bypos; } - return SetMenuItemInfo_common( menuitem, &mii, FALSE ); + + ret = SetMenuItemInfo_common( item, &mii, FALSE ); + release_menu_ptr(menu); + return ret; } /********************************************************************** * SetMenuItemInfoW (USER32.@) */ -BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT item, BOOL bypos, +BOOL WINAPI SetMenuItemInfoW(HMENU hmenu, UINT id, BOOL bypos, const MENUITEMINFOW *lpmii) { - MENUITEM *menuitem; MENUITEMINFOW mii; + POPUPMENU *menu; + MENUITEM *item; + BOOL ret; - TRACE("hmenu %p, item %u, by pos %d, info %p\n", hmenu, item, bypos, lpmii); + TRACE("hmenu %p, id %u, by pos %d, info %p\n", hmenu, id, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE; - if (!(menuitem = MENU_FindItem( &hmenu, &item, bypos? MF_BYPOSITION : 0 ))) + + menu = grab_menu_ptr(hmenu); + if (!(item = MENU_FindItem(&menu, &id, bypos ? MF_BYPOSITION : 0))) { + release_menu_ptr(menu); /* workaround for Word 95: pretend that SC_TASKLIST item exists */ - if (item == SC_TASKLIST && !bypos) return TRUE; - return FALSE; + return id == SC_TASKLIST && !bypos; } - return SetMenuItemInfo_common( menuitem, &mii, TRUE ); + ret = SetMenuItemInfo_common( item, &mii, TRUE ); + release_menu_ptr(menu); + return ret; } static BOOL set_menu_default_item(POPUPMENU *menu, UINT uItem, UINT bypos) @@ -5092,13 +5243,18 @@ BOOL WINAPI InsertMenuItemA(HMENU hMenu, UINT uItem, BOOL bypos, { MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + BOOL ret; TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( (const MENUITEMINFOW *)lpmii, &mii )) return FALSE; - item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); - return SetMenuItemInfo_common(item, &mii, FALSE); + menu = grab_menu_ptr(hMenu); + item = MENU_InsertItem(menu, uItem, bypos ? MF_BYPOSITION : 0 ); + ret = SetMenuItemInfo_common(item, &mii, FALSE); + release_menu_ptr(menu); + return ret; } @@ -5110,13 +5266,18 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos, { MENUITEM *item; MENUITEMINFOW mii; + POPUPMENU *menu; + BOOL ret; TRACE("hmenu %p, item %04x, by pos %d, info %p\n", hMenu, uItem, bypos, lpmii); if (!MENU_NormalizeMenuItemInfoStruct( lpmii, &mii )) return FALSE; - item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 ); - return SetMenuItemInfo_common(item, &mii, TRUE); + menu = grab_menu_ptr(hMenu); + item = MENU_InsertItem(menu, uItem, bypos ? MF_BYPOSITION : 0 ); + ret = SetMenuItemInfo_common(item, &mii, TRUE); + release_menu_ptr(menu); + return ret; } /********************************************************************** @@ -5130,7 +5291,7 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, BOOL done = FALSE; UINT i; MENUITEM *mi_first = NULL, *mi_check; - HMENU m_first, m_check; + POPUPMENU *m_first = NULL, *m_check = NULL; for (i = first; i <= last; i++) { @@ -5138,17 +5299,26 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, if (!mi_first) { - m_first = hMenu; - mi_first = MENU_FindItem(&m_first, &pos, bypos); - if (!mi_first) continue; + m_first = grab_menu_ptr(hMenu); + if (!(mi_first = MENU_FindItem(&m_first, &pos, bypos))) + { + release_menu_ptr(m_first); + m_first = NULL; + continue; + } mi_check = mi_first; - m_check = m_first; + m_check = grab_menu_ptr(m_first->obj.handle); } else { - m_check = hMenu; - mi_check = MENU_FindItem(&m_check, &pos, bypos); - if (!mi_check) continue; + release_menu_ptr(m_check); + m_check = grab_menu_ptr(hMenu); + if (!(mi_check = MENU_FindItem(&m_check, &pos, bypos))) + { + release_menu_ptr(m_check); + m_check = NULL; + continue; + } } if (m_first != m_check) continue; @@ -5166,6 +5336,8 @@ BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, mi_check->fState &= ~MFS_CHECKED; } } + release_menu_ptr(m_first); + release_menu_ptr(m_check); return done; } @@ -5186,21 +5358,30 @@ BOOL WINAPI GetMenuItemRect(HWND hwnd, HMENU hMenu, UINT uItem, RECT *rect) TRACE("(%p,%p,%d,%p)\n", hwnd, hMenu, uItem, rect); - item = MENU_FindItem (&hMenu, &uItem, MF_BYPOSITION); - if ((rect == NULL) || (item == NULL)) + if (!rect) return FALSE; - menu = MENU_GetMenu(hMenu); - if (!menu) return FALSE; + menu = grab_menu_ptr(hMenu); + if (!(item = MENU_FindItem(&menu, &uItem, MF_BYPOSITION))) + { + release_menu_ptr(menu); + return FALSE; + } if (!hwnd) hwnd = menu->hWnd; - if (!hwnd) return FALSE; + + if (!hwnd) + { + release_menu_ptr(menu); + return FALSE; + } *rect = item->rect; OffsetRect(rect, menu->items_rect.left, menu->items_rect.top); - MapWindowPoints(hwnd, 0, (POINT *)rect, 2); + release_menu_ptr(menu); + MapWindowPoints(hwnd, 0, (POINT *)rect, 2); return TRUE; } @@ -5415,6 +5596,8 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA { HMENU hMenu, hSubMenu, hSysMenu; UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos; + POPUPMENU *submenu; + BOOL res; hMenu = (GetWindowLongW( hWnd, GWL_STYLE ) & WS_CHILD) ? 0 : GetMenu(hWnd); hSysMenu = get_win_sys_menu( hWnd ); @@ -5423,7 +5606,12 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA /* 1. in the system menu */ hSubMenu = hSysMenu; nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + submenu = grab_menu_ptr(hSubMenu); + res = MENU_FindItem(&submenu, &nPos, MF_BYCOMMAND) != NULL; + if (res) + hSubMenu = submenu->obj.handle; + release_menu_ptr(submenu); + if (res) { if (GetCapture()) mesg = 2; @@ -5445,7 +5633,13 @@ static BOOL translate_accelerator( HWND hWnd, UINT message, WPARAM wParam, LPARA { hSubMenu = hMenu; nPos = cmd; - if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND)) + + submenu = grab_menu_ptr(hSubMenu); + res = MENU_FindItem(&submenu, &nPos, MF_BYCOMMAND) != NULL; + if (res) + hSubMenu = submenu->obj.handle; + release_menu_ptr(submenu); + if (res) { if (GetCapture()) mesg = 2; -- 2.17.0

3 3

[PATCH 7/7] [v2] wsdapi: Add MetadataVersion to Hello message.
by Owen Rudge 24 Apr '18

24 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 7 +++++++ dlls/wsdapi/tests/discovery.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)

2 1

[PATCH 6/7] [v2] wsdapi/tests: Add tests for Scopes and XAddrs lists.
by Owen Rudge 24 Apr '18

24 Apr '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)

2 1

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-devel