February 2017 - Wine-Commits

Guillaume Charifi : wined3d: Add support for BC5_SNORM format.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: 82c25ce5b0fbf9b3786b0908c90c0e81a82c3c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c25ce5b0fbf9b3786b0908c… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Thu Feb 2 19:29:21 2017 +0100 wined3d: Add support for BC5_SNORM format. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ca9d310..c40a339 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -266,6 +266,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, + {WINED3DFMT_BC5_SNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_BC6H_UF16, WINED3DFMT_BC6H_TYPELESS, ""}, {WINED3DFMT_BC6H_SF16, WINED3DFMT_BC6H_TYPELESS, ""}, {WINED3DFMT_BC7_UNORM_SRGB, WINED3DFMT_BC7_TYPELESS, ""}, @@ -353,6 +354,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, + {WINED3DFMT_BC5_SNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC6H_UF16, 4, 4, 16, TRUE}, {WINED3DFMT_BC6H_SF16, 4, 4, 16, TRUE}, {WINED3DFMT_BC7_UNORM, 4, 4, 16, TRUE}, @@ -1153,6 +1155,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_BC5_SNORM, GL_COMPRESSED_SIGNED_RG_RGTC2, GL_COMPRESSED_SIGNED_RG_RGTC2, 0, + GL_RG, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_BC6H_UF16, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB, 0, GL_RGB, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -3356,6 +3363,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC5_SNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count)

1 0

Henri Verbeet : d2d1: Add an initial d2d_d3d_render_target_DrawGeometry() implementation.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: f3563f4e62dc8b22cbdb72c0e244b7ad7a95100e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3563f4e62dc8b22cbdb72c0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 3 13:37:09 2017 +0100 d2d1: Add an initial d2d_d3d_render_target_DrawGeometry() implementation. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 23 ++++++ dlls/d2d1/geometry.c | 119 ++++++++++++++++++++++++++++ dlls/d2d1/render_target.c | 191 +++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 197 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 529 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3563f4e62dc8b22cbdb7…

1 0

Józef Kucia : wined3d: Return WINED3DERR_INVALIDCALL for not started queries.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: 8d6af6d9326704130a91e19e6010cfac93238331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d6af6d9326704130a91e19e6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 3 14:08:46 2017 +0100 wined3d: Return WINED3DERR_INVALIDCALL for not started queries. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 14 +++++++------- dlls/d3d11/async.c | 2 ++ dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 24 ++++++++++++------------ dlls/d3d9/query.c | 2 ++ dlls/wined3d/query.c | 6 +++++- 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 173d59a..f9a93f2 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3732,9 +3732,9 @@ static void test_occlusion_query(void) ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); hr = ID3D10Asynchronous_GetData(query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D10Asynchronous_GetData(query, &data, sizeof(data), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); ID3D10Asynchronous_End(query); ID3D10Asynchronous_Begin(query); @@ -3891,9 +3891,9 @@ static void test_timestamp_query(void) ok(data_size == sizeof(disjoint), "Got unexpected data size %u.\n", data_size); hr = ID3D10Query_GetData(timestamp_disjoint_query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D10Query_GetData(timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); /* Test a TIMESTAMP_DISJOINT query. */ ID3D10Query_Begin(timestamp_disjoint_query); @@ -3941,15 +3941,15 @@ static void test_timestamp_query(void) ok(!memcmp(&disjoint, &prev_disjoint, sizeof(disjoint)), "Disjoint data mismatch.\n"); hr = ID3D10Query_GetData(timestamp_query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); /* Test a TIMESTAMP query inside a TIMESTAMP_DISJOINT query. */ ID3D10Query_Begin(timestamp_disjoint_query); hr = ID3D10Query_GetData(timestamp_query, &timestamp, sizeof(timestamp), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); draw_color_quad(&test_context, &red); diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index dadd210..2270023 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -307,6 +307,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_GetData(ID3D10Query *iface, void *d if (!data_size || wined3d_query_get_data_size(query->wined3d_query) == data_size) { hr = wined3d_query_get_data(query->wined3d_query, data, data_size, wined3d_flags); + if (hr == WINED3DERR_INVALIDCALL) + hr = DXGI_ERROR_INVALID_CALL; } else { diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 064d754..85f84fe 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -536,6 +536,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetData(ID3D11DeviceCon if (!data_size || wined3d_query_get_data_size(query->wined3d_query) == data_size) { hr = wined3d_query_get_data(query->wined3d_query, data, data_size, wined3d_flags); + if (hr == WINED3DERR_INVALIDCALL) + hr = DXGI_ERROR_INVALID_CALL; } else { diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c63a6d9..abd78c5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4735,10 +4735,10 @@ static void test_occlusion_query(void) memset(&data, 0xff, sizeof(data)); hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(data.dword[0] == 0xffffffff && data.dword[1] == 0xffffffff, "Data was modified 0x%08x%08x.\n", data.dword[1], data.dword[0]); ID3D11DeviceContext_End(context, query); @@ -4903,11 +4903,11 @@ static void test_timestamp_query(void) disjoint.Frequency = 0xdeadbeef; disjoint.Disjoint = 0xdeadbeef; hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, timestamp_disjoint_query, &disjoint, sizeof(disjoint), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(disjoint.Frequency == 0xdeadbeef, "Frequency data was modified.\n"); - todo_wine ok(disjoint.Disjoint == 0xdeadbeef, "Disjoint data was modified.\n"); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(disjoint.Frequency == 0xdeadbeef, "Frequency data was modified.\n"); + ok(disjoint.Disjoint == 0xdeadbeef, "Disjoint data was modified.\n"); /* Test a TIMESTAMP_DISJOINT query. */ ID3D11DeviceContext_Begin(context, timestamp_disjoint_query); @@ -4961,18 +4961,18 @@ static void test_timestamp_query(void) memset(&timestamp, 0xff, sizeof(timestamp)); hr = ID3D11DeviceContext_GetData(context, timestamp_query, NULL, 0, 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(timestamp == ~(UINT64)0, "Timestamp data was modified.\n"); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(timestamp == ~(UINT64)0, "Timestamp data was modified.\n"); /* Test a TIMESTAMP query inside a TIMESTAMP_DISJOINT query. */ ID3D11DeviceContext_Begin(context, timestamp_disjoint_query); memset(&timestamp, 0xff, sizeof(timestamp)); hr = ID3D11DeviceContext_GetData(context, timestamp_query, &timestamp, sizeof(timestamp), 0); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - todo_wine ok(timestamp == ~(UINT64)0, "Timestamp data was modified.\n"); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(timestamp == ~(UINT64)0, "Timestamp data was modified.\n"); draw_color_quad(&test_context, &red); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index d41783a..ba66058 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -167,6 +167,8 @@ static HRESULT WINAPI d3d9_query_GetData(IDirect3DQuery9 *iface, void *data, DWO } wined3d_mutex_unlock(); + if (hr == D3DERR_INVALIDCALL) + return S_OK; return hr; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 9f75a49..ef88f65 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -330,8 +330,12 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, } if (query->state == QUERY_CREATED) + { WARN("Query wasn't started yet.\n"); - else if (!query->query_ops->query_poll(query, flags)) + return WINED3DERR_INVALIDCALL; + } + + if (!query->query_ops->query_poll(query, flags)) return S_FALSE; if (data)

1 0

Henri Verbeet : d2d1: Avoid degenerate line segments.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: ac3824fe6369bc6ef8e8a024238b1fea3482260c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3824fe6369bc6ef8e8a0242… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 3 13:37:08 2017 +0100 d2d1: Avoid degenerate line segments. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 35b1aef..c1ec461 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -498,6 +498,12 @@ static BOOL d2d_figure_insert_vertex(struct d2d_figure *figure, size_t idx, D2D1 static BOOL d2d_figure_add_vertex(struct d2d_figure *figure, D2D1_POINT_2F vertex) { + size_t last = figure->vertex_count - 1; + + if (figure->vertex_count && figure->vertex_types[last] == D2D_VERTEX_TYPE_LINE + && !memcmp(&figure->vertices[last], &vertex, sizeof(vertex))) + return TRUE; + if (!d2d_array_reserve((void **)&figure->vertices, &figure->vertices_size, figure->vertex_count + 1, sizeof(*figure->vertices))) { @@ -1181,7 +1187,7 @@ static BOOL d2d_path_geometry_point_inside(const struct d2d_geometry *geometry, const D2D1_POINT_2F *p0, *p1; D2D1_POINT_2F v_p, v_probe; unsigned int score; - size_t i, j; + size_t i, j, last; for (i = 0, score = 0; i < geometry->u.path.figure_count; ++i) { @@ -1191,8 +1197,14 @@ static BOOL d2d_path_geometry_point_inside(const struct d2d_geometry *geometry, || probe->y < figure->bounds.top || probe->y > figure->bounds.bottom) continue; - p0 = &figure->vertices[figure->vertex_count - 1]; - for (j = 0; j < figure->vertex_count; ++j) + last = figure->vertex_count - 1; + if (!triangles_only) + { + while (last && figure->vertex_types[last] == D2D_VERTEX_TYPE_NONE) + --last; + } + p0 = &figure->vertices[last]; + for (j = 0; j <= last; ++j) { if (!triangles_only && figure->vertex_types[j] == D2D_VERTEX_TYPE_NONE) continue; @@ -1431,6 +1443,10 @@ static BOOL d2d_cdt_insert_segments(struct d2d_cdt *cdt, struct d2d_geometry *ge { figure = &geometry->u.path.figures[i]; + /* Degenerate figure. */ + if (figure->vertex_count < 2) + continue; + p = bsearch(&figure->vertices[figure->vertex_count - 1], cdt->vertices, geometry->fill.vertex_count, sizeof(*p), d2d_cdt_compare_vertices); start_vertex = p - cdt->vertices; @@ -1880,8 +1896,9 @@ static void STDMETHODCALLTYPE d2d_geometry_sink_EndFigure(ID2D1GeometrySink *ifa figure = &geometry->u.path.figures[geometry->u.path.figure_count - 1]; figure->vertex_types[figure->vertex_count - 1] = D2D_VERTEX_TYPE_LINE; - if (figure_end != D2D1_FIGURE_END_CLOSED) - FIXME("Ignoring figure_end %#x.\n", figure_end); + if (figure_end == D2D1_FIGURE_END_CLOSED && !memcmp(&figure->vertices[0], + &figure->vertices[figure->vertex_count - 1], sizeof(*figure->vertices))) + --figure->vertex_count; geometry->u.path.state = D2D_GEOMETRY_STATE_OPEN; }

1 0

Owen Rudge : advapi32/tests: Add test of LsaLookupSids buffer behaviour.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: bbe6233734d24c96d87aaf1f783f1eca794f0d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbe6233734d24c96d87aaf1f7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Feb 2 10:30:55 2017 +0000 advapi32/tests: Add test of LsaLookupSids buffer behaviour. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 1a0d211..4daf75f 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -42,8 +42,10 @@ static NTSTATUS (WINAPI *pLsaFreeMemory)(PVOID); static NTSTATUS (WINAPI *pLsaOpenPolicy)(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES,ACCESS_MASK,PLSA_HANDLE); static NTSTATUS (WINAPI *pLsaQueryInformationPolicy)(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID*); static BOOL (WINAPI *pConvertSidToStringSidA)(PSID,LPSTR*); +static BOOL (WINAPI *pConvertStringSidToSidA)(LPCSTR,PSID*); static NTSTATUS (WINAPI *pLsaLookupNames2)(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING,PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); static NTSTATUS (WINAPI *pLsaLookupSids)(LSA_HANDLE,ULONG,PSID*,LSA_REFERENCED_DOMAIN_LIST**,LSA_TRANSLATED_NAME**); +static PVOID (WINAPI *pFreeSid)(PSID); static BOOL init(void) { @@ -55,10 +57,12 @@ static BOOL init(void) pLsaOpenPolicy = (void*)GetProcAddress(hadvapi32, "LsaOpenPolicy"); pLsaQueryInformationPolicy = (void*)GetProcAddress(hadvapi32, "LsaQueryInformationPolicy"); pConvertSidToStringSidA = (void*)GetProcAddress(hadvapi32, "ConvertSidToStringSidA"); + pConvertStringSidToSidA = (void*)GetProcAddress(hadvapi32, "ConvertStringSidToSidA"); pLsaLookupNames2 = (void*)GetProcAddress(hadvapi32, "LsaLookupNames2"); pLsaLookupSids = (void*)GetProcAddress(hadvapi32, "LsaLookupSids"); + pFreeSid = (void*)GetProcAddress(hadvapi32, "FreeSid"); - if (pLsaClose && pLsaEnumerateAccountRights && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA) + if (pLsaClose && pLsaEnumerateAccountRights && pLsaFreeMemory && pLsaOpenPolicy && pLsaQueryInformationPolicy && pConvertSidToStringSidA && pConvertStringSidToSidA && pFreeSid) return TRUE; return FALSE; @@ -405,6 +409,48 @@ static void test_LsaLookupSids(void) ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); } +static void test_LsaLookupSids_NullBuffers(void) +{ + LSA_REFERENCED_DOMAIN_LIST *list; + LSA_OBJECT_ATTRIBUTES attrs; + LSA_TRANSLATED_NAME *names; + LSA_HANDLE policy; + NTSTATUS status; + BOOL ret; + PSID sid; + + memset(&attrs, 0, sizeof(attrs)); + attrs.Length = sizeof(attrs); + + status = pLsaOpenPolicy(NULL, &attrs, POLICY_LOOKUP_NAMES, &policy); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + ret = pConvertStringSidToSidA("S-1-1-0", &sid); + ok(ret == TRUE, "pConvertStringSidToSidA returned false\n"); + + status = pLsaLookupSids(policy, 1, &sid, &list, &names); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); + + ok(list->Entries > 0, "got %d\n", list->Entries); + + if (list->Entries) + { + ok((char*)list->Domains - (char*)list > 0, "%p, %p\n", list, list->Domains); + ok((char*)list->Domains[0].Sid - (char*)list->Domains > 0, "%p, %p\n", list->Domains, list->Domains[0].Sid); + ok(list->Domains[0].Name.MaximumLength > list->Domains[0].Name.Length, "got %d, %d\n", list->Domains[0].Name.MaximumLength, + list->Domains[0].Name.Length); + ok(list->Domains[0].Name.Buffer != NULL, "domain[0] name buffer is null\n"); + } + + pLsaFreeMemory(names); + pLsaFreeMemory(list); + + pFreeSid(sid); + + status = pLsaClose(policy); + ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); +} + START_TEST(lsa) { if (!init()) { @@ -415,4 +461,5 @@ START_TEST(lsa) test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); + test_LsaLookupSids_NullBuffers(); }

1 0

Andrew Wesie : ntdll: Prevent NULL dereference in NtSuspendThread.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: a39d67d8c914d9c34725e1265fdf933614c6726b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39d67d8c914d9c34725e1265… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Feb 3 04:20:39 2017 -0600 ntdll: Prevent NULL dereference in NtSuspendThread. Overwatch calls NtSuspendThread directly, and expects to be able to pass in a NULL pointer for the count argument. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 6127c8f..e3cc11a 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -632,7 +632,10 @@ NTSTATUS WINAPI NtSuspendThread( HANDLE handle, PULONG count ) SERVER_START_REQ( suspend_thread ) { req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) *count = reply->count; + if (!(ret = wine_server_call( req ))) + { + if (count) *count = reply->count; + } } SERVER_END_REQ; return ret; @@ -650,7 +653,10 @@ NTSTATUS WINAPI NtResumeThread( HANDLE handle, PULONG count ) SERVER_START_REQ( resume_thread ) { req->handle = wine_server_obj_handle( handle ); - if (!(ret = wine_server_call( req ))) *count = reply->count; + if (!(ret = wine_server_call( req ))) + { + if (count) *count = reply->count; + } } SERVER_END_REQ; return ret;

1 0

Francois Gouget : wlanapi: Add a trailing '\n' to a TRACE() message.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: 71f08b364fc829d99c3b02b5a4b2fc9a6059792d URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f08b364fc829d99c3b02b5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 3 11:22:05 2017 +0100 wlanapi: Add a trailing '\n' to a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wlanapi/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index 303d173..3fae765 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -119,7 +119,7 @@ void *WINAPI WlanAllocateMemory(DWORD size) { void *ret; - TRACE("(%d)", size); + TRACE("(%d)\n", size); if (!size) {

1 0

Francois Gouget : include: Add a couple more UI language APIs.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: 34784f0aa8ec451695ecc28fc9bab16c10c130a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34784f0aa8ec451695ecc28fc… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 3 11:21:50 2017 +0100 include: Add a couple more UI language APIs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/winnls.h b/include/winnls.h index d6fcf6e..470acf84 100644 --- a/include/winnls.h +++ b/include/winnls.h @@ -909,6 +909,7 @@ WINBASEAPI INT WINAPI GetNumberFormatA(LCID,DWORD,LPCSTR,const NUMBERFMT WINBASEAPI INT WINAPI GetNumberFormatW(LCID,DWORD,LPCWSTR,const NUMBERFMTW*,LPWSTR,INT); #define GetNumberFormat WINELIB_NAME_AW(GetNumberFormat) WINBASEAPI UINT WINAPI GetOEMCP(void); +WINBASEAPI BOOL WINAPI GetProcessPreferredUILanguages(DWORD,PULONG,PZZWSTR,PULONG); WINBASEAPI BOOL WINAPI GetStringTypeA(LCID,DWORD,LPCSTR,INT,LPWORD); WINBASEAPI BOOL WINAPI GetStringTypeW(DWORD,LPCWSTR,INT,LPWORD); WINBASEAPI BOOL WINAPI GetStringTypeExA(LCID,DWORD,LPCSTR,INT,LPWORD); @@ -956,6 +957,7 @@ WINBASEAPI BOOL WINAPI SetLocaleInfoA(LCID,LCTYPE,LPCSTR); WINBASEAPI BOOL WINAPI SetLocaleInfoW(LCID,LCTYPE,LPCWSTR); #define SetLocaleInfo WINELIB_NAME_AW(SetLocaleInfo) WINBASEAPI BOOL WINAPI SetThreadLocale(LCID); +WINBASEAPI LANGID WINAPI SetThreadUILanguage(LANGID); WINBASEAPI BOOL WINAPI SetUserGeoID(GEOID); WINBASEAPI INT WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL);

1 0

Francois Gouget : hid/tests: Remove a space before a '\n'.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: e829de27fd56cf1bb4654e2ed0db293834a5aa95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e829de27fd56cf1bb4654e2ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 3 11:22:19 2017 +0100 hid/tests: Remove a space before a '\n'. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index 91fade4..e72a500 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -204,7 +204,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D status = HidP_GetValueCaps(HidP_Input, values, &length, ppd); ok(status == HIDP_STATUS_SUCCESS, "Failed to get value caps (%x)\n",status); - trace("\tValues: \n"); + trace("\tValues:\n"); for (i = 0; i < length; i++) { status = HidP_GetUsageValue(HidP_Input, values[i].UsagePage, 0,

1 0

Nikolay Sivov : dwrite: Fix rendering mode enum conversion warnings.
by Alexandre Julliard Feb. 3, 2017

Feb. 3, 2017

Module: wine Branch: master Commit: e35e0f2b022c0f6fafe31dfb8af94dad2f17cada URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e0f2b022c0f6fafe31dfb8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 3 15:20:28 2017 +0300 dwrite: Fix rendering mode enum conversion warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index a493578..9b5de8a 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -141,16 +141,29 @@ static DWRITE_PIXEL_GEOMETRY WINAPI renderingparams_GetPixelGeometry(IDWriteRend return This->geometry; } +static DWRITE_RENDERING_MODE rendering_mode_from_mode1(DWRITE_RENDERING_MODE1 mode) +{ + static const DWRITE_RENDERING_MODE rendering_modes[] = { + DWRITE_RENDERING_MODE_DEFAULT, /* DWRITE_RENDERING_MODE1_DEFAULT */ + DWRITE_RENDERING_MODE_ALIASED, /* DWRITE_RENDERING_MODE1_ALIASED */ + DWRITE_RENDERING_MODE_GDI_CLASSIC, /* DWRITE_RENDERING_MODE1_GDI_CLASSIC */ + DWRITE_RENDERING_MODE_GDI_NATURAL, /* DWRITE_RENDERING_MODE1_GDI_NATURAL */ + DWRITE_RENDERING_MODE_NATURAL, /* DWRITE_RENDERING_MODE1_NATURAL */ + DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, /* DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC */ + DWRITE_RENDERING_MODE_OUTLINE, /* DWRITE_RENDERING_MODE1_OUTLINE */ + DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC, /* DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED */ + }; + + return rendering_modes[mode]; +} + static DWRITE_RENDERING_MODE WINAPI renderingparams_GetRenderingMode(IDWriteRenderingParams3 *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams3(iface); TRACE("(%p)\n", This); - if (This->mode == DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED) - return DWRITE_RENDERING_MODE_NATURAL_SYMMETRIC; - - return This->mode; + return rendering_mode_from_mode1(This->mode); } static FLOAT WINAPI renderingparams1_GetGrayscaleEnhancedContrast(IDWriteRenderingParams3 *iface) @@ -189,7 +202,7 @@ static const struct IDWriteRenderingParams3Vtbl renderingparamsvtbl = { }; static HRESULT create_renderingparams(FLOAT gamma, FLOAT contrast, FLOAT grayscalecontrast, FLOAT cleartype_level, - DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, DWRITE_GRID_FIT_MODE gridfit, IDWriteRenderingParams3 **params) + DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE1 mode, DWRITE_GRID_FIT_MODE gridfit, IDWriteRenderingParams3 **params) { struct renderingparams *This; @@ -966,8 +979,8 @@ static HRESULT WINAPI dwritefactory_CreateMonitorRenderingParams(IDWriteFactory4 if (!fixme_once++) FIXME("(%p): monitor setting ignored\n", monitor); - hr = IDWriteFactory4_CreateCustomRenderingParams(iface, 0.0f, 0.0f, 1.0f, 0.0f, DWRITE_PIXEL_GEOMETRY_FLAT, DWRITE_RENDERING_MODE_DEFAULT, - DWRITE_GRID_FIT_MODE_DEFAULT, &params3); + hr = IDWriteFactory4_CreateCustomRenderingParams(iface, 0.0f, 0.0f, 1.0f, 0.0f, DWRITE_PIXEL_GEOMETRY_FLAT, + DWRITE_RENDERING_MODE1_DEFAULT, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); *params = (IDWriteRenderingParams*)params3; return hr; } @@ -982,7 +995,7 @@ static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory4 TRACE("(%p)->(%f %f %f %d %d %p)\n", This, gamma, enhancedContrast, cleartype_level, geometry, mode, params); hr = IDWriteFactory4_CreateCustomRenderingParams(iface, gamma, enhancedContrast, 1.0f, cleartype_level, geometry, - mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); + (DWRITE_RENDERING_MODE1)mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); *params = (IDWriteRenderingParams*)params3; return hr; } @@ -1162,7 +1175,7 @@ static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory4 *ifac desc.run = run; desc.ppdip = ppdip; desc.transform = transform; - desc.rendering_mode = rendering_mode; + desc.rendering_mode = (DWRITE_RENDERING_MODE1)rendering_mode; desc.measuring_mode = measuring_mode; desc.gridfit_mode = DWRITE_GRID_FIT_MODE_DEFAULT; desc.aa_mode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; @@ -1204,7 +1217,7 @@ static HRESULT WINAPI dwritefactory1_CreateCustomRenderingParams(IDWriteFactory4 TRACE("(%p)->(%.2f %.2f %.2f %.2f %d %d %p)\n", This, gamma, enhcontrast, enhcontrast_grayscale, cleartype_level, geometry, mode, params); hr = IDWriteFactory4_CreateCustomRenderingParams(iface, gamma, enhcontrast, enhcontrast_grayscale, - cleartype_level, geometry, mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); + cleartype_level, geometry, (DWRITE_RENDERING_MODE1)mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); *params = (IDWriteRenderingParams1*)params3; return hr; } @@ -1257,7 +1270,7 @@ static HRESULT WINAPI dwritefactory2_CreateCustomRenderingParams(IDWriteFactory4 geometry, mode, gridfit, params); hr = IDWriteFactory4_CreateCustomRenderingParams(iface, gamma, contrast, grayscalecontrast, - cleartype_level, geometry, mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); + cleartype_level, geometry, (DWRITE_RENDERING_MODE1)mode, DWRITE_GRID_FIT_MODE_DEFAULT, &params3); *params = (IDWriteRenderingParams2*)params3; return hr; } @@ -1276,7 +1289,7 @@ static HRESULT WINAPI dwritefactory2_CreateGlyphRunAnalysis(IDWriteFactory4 *ifa desc.run = run; desc.ppdip = 1.0f; desc.transform = transform; - desc.rendering_mode = rendering_mode; + desc.rendering_mode = (DWRITE_RENDERING_MODE1)rendering_mode; desc.measuring_mode = measuring_mode; desc.gridfit_mode = gridfit_mode; desc.aa_mode = aa_mode;

1 0