June 2017 - wine-commits

Józef Kucia : d3d11/tests: Add additional test for pipeline statistics query with no pixel shader.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 00dbc36f66e02711ebff106d01fcb95504f16ab4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00dbc36f66e02711ebff106d0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 5 00:47:39 2017 +0200 d3d11/tests: Add additional test for pipeline statistics query with no pixel shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a723e69..a3f2c98 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4927,8 +4927,25 @@ static void test_pipeline_statistics_query(void) todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); ok(data.IAVertices == ~(UINT64)0, "Data was modified.\n"); - draw_color_quad(&test_context, &red); + draw_quad(&test_context); + + ID3D11DeviceContext_End(context, query); + get_query_data(context, query, &data, sizeof(data)); + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + todo_wine + ok(!data.PSInvocations, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + ok(!data.HSInvocations, "Got unexpected HSInvocations count: %u.\n", (unsigned int)data.HSInvocations); + ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); + ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + ID3D11DeviceContext_Begin(context, query); + draw_color_quad(&test_context, &red); ID3D11DeviceContext_End(context, query); get_query_data(context, query, &data, sizeof(data)); ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices);

1 0

Józef Kucia : wined3d: Rearrange wined3d_query_type enum values.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 10748ab9d8d8103cd00da16453bcdda5e1983967 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10748ab9d8d8103cd00da1645… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 5 00:47:38 2017 +0200 wined3d: Rearrange wined3d_query_type enum values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 26 +++++++------------------- include/wine/wined3d.h | 12 ++++++------ 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 2af2048..8445922 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1066,6 +1066,12 @@ static HRESULT wined3d_so_statistics_query_create(struct wined3d_device *device, { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_so_statistics_query *object; + unsigned int stream_idx; + + if (WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0 <= type && type <= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) + stream_idx = type - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0; + else + return WINED3DERR_NOTAVAILABLE; TRACE("device %p, type %#x, parent %p, parent_ops %p, query %p.\n", device, type, parent, parent_ops, query); @@ -1084,27 +1090,9 @@ static HRESULT wined3d_so_statistics_query_create(struct wined3d_device *device, if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - switch (type) - { - case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: - object->stream_idx = 0; - break; - case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: - object->stream_idx = 1; - break; - case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: - object->stream_idx = 2; - break; - case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: - object->stream_idx = 3; - break; - default: - HeapFree(GetProcessHeap(), 0, object); - return WINED3DERR_NOTAVAILABLE; - } - wined3d_query_init(&object->query, device, type, &object->statistics, sizeof(object->statistics), &so_statistics_query_ops, parent, parent_ops); + object->stream_idx = stream_idx; TRACE("Created query %p.\n", object); *query = &object->query; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7a64608..d176ab1 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -705,12 +705,12 @@ enum wined3d_query_type WINED3D_QUERY_TYPE_SO_STATISTICS = 21, WINED3D_QUERY_TYPE_SO_OVERFLOW = 22, WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0 = 23, - WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM0 = 24, - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 = 25, - WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM1 = 26, - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2 = 27, - WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM2 = 28, - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3 = 29, + WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 = 24, + WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2 = 25, + WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3 = 26, + WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM0 = 27, + WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM1 = 28, + WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM2 = 29, WINED3D_QUERY_TYPE_SO_OVERFLOW_STREAM3 = 30, };

1 0

Józef Kucia : wined3d: Introduce get_query_result64() helper function.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 54a0ce36855f946914af7b8f76e95ed44d676e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a0ce36855f946914af7b8f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 5 00:47:37 2017 +0200 wined3d: Introduce get_query_result64() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 118 +++++++++++++++------------------------------------ 1 file changed, 34 insertions(+), 84 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index cf12c74..2af2048 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -25,6 +25,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +static UINT64 get_query_result64(GLuint id, const struct wined3d_gl_info *gl_info) +{ + if (gl_info->supported[ARB_TIMER_QUERY]) + { + GLuint64 result; + GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, &result)); + return result; + } + else + { + GLuint result; + GL_EXTCALL(glGetQueryObjectuiv(id, GL_QUERY_RESULT, &result)); + return result; + } +} + static void wined3d_query_init(struct wined3d_query *query, struct wined3d_device *device, enum wined3d_query_type type, const void *data, DWORD data_size, const struct wined3d_query_ops *query_ops, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -374,28 +390,15 @@ static BOOL wined3d_occlusion_query_ops_poll(struct wined3d_query *query, DWORD gl_info = context->gl_info; GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT_AVAILABLE, &available)); - checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT_AVAILABLE)"); - TRACE("available %#x.\n", available); + TRACE("Available %#x.\n", available); if (available) { - if (gl_info->supported[ARB_TIMER_QUERY]) - { - GLuint64 result; - GL_EXTCALL(glGetQueryObjectui64v(oq->id, GL_QUERY_RESULT, &result)); - checkGLcall("glGetQueryObjectui64v(GL_QUERY_RESULT)"); - oq->samples = result; - } - else - { - GLuint result; - GL_EXTCALL(glGetQueryObjectuiv(oq->id, GL_QUERY_RESULT, &result)); - checkGLcall("glGetQueryObjectuiv(GL_QUERY_RESULT)"); - oq->samples = result; - } + oq->samples = get_query_result64(oq->id, gl_info); TRACE("Returning 0x%s samples.\n", wine_dbgstr_longlong(oq->samples)); } + checkGLcall("poll occlusion query"); context_release(context); return available; @@ -640,22 +643,8 @@ static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DW if (written_available && generated_available) { - if (gl_info->supported[ARB_TIMER_QUERY]) - { - GLuint64 result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.written, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_written = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.generated, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_generated = result; - } - else - { - GLuint result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.written, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_written = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.generated, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_generated = result; - } + pq->statistics.primitives_written = get_query_result64(pq->u.query.written, gl_info); + pq->statistics.primitives_generated = get_query_result64(pq->u.query.generated, gl_info); TRACE("Returning %s, %s primitives.\n", wine_dbgstr_longlong(pq->statistics.primitives_written), wine_dbgstr_longlong(pq->statistics.primitives_generated)); @@ -758,63 +747,24 @@ static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD f { GL_EXTCALL(glGetQueryObjectuiv(pq->u.id[i], GL_QUERY_RESULT_AVAILABLE, &available)); if (!available) - goto done; + break; } - if (gl_info->supported[ARB_TIMER_QUERY]) - { - GLuint64 result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.vertices, GL_QUERY_RESULT, &result)); - pq->statistics.vertices_submitted = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.primitives, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_submitted = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.vertex_shader, GL_QUERY_RESULT, &result)); - pq->statistics.vs_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.tess_control_shader, GL_QUERY_RESULT, &result)); - pq->statistics.hs_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.tess_eval_shader, GL_QUERY_RESULT, &result)); - pq->statistics.ds_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.geometry_shader, GL_QUERY_RESULT, &result)); - pq->statistics.gs_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.geometry_primitives, GL_QUERY_RESULT, &result)); - pq->statistics.gs_primitives = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.fragment_shader, GL_QUERY_RESULT, &result)); - pq->statistics.ps_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.compute_shader, GL_QUERY_RESULT, &result)); - pq->statistics.cs_invocations = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.clipping_input, GL_QUERY_RESULT, &result)); - pq->statistics.clipping_input_primitives = result; - GL_EXTCALL(glGetQueryObjectui64v(pq->u.query.clipping_output, GL_QUERY_RESULT, &result)); - pq->statistics.clipping_output_primitives = result; - } - else + if (available) { - GLuint result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.vertices, GL_QUERY_RESULT, &result)); - pq->statistics.vertices_submitted = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.primitives, GL_QUERY_RESULT, &result)); - pq->statistics.primitives_submitted = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.vertex_shader, GL_QUERY_RESULT, &result)); - pq->statistics.vs_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.tess_control_shader, GL_QUERY_RESULT, &result)); - pq->statistics.hs_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.tess_eval_shader, GL_QUERY_RESULT, &result)); - pq->statistics.ds_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.geometry_shader, GL_QUERY_RESULT, &result)); - pq->statistics.gs_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.geometry_primitives, GL_QUERY_RESULT, &result)); - pq->statistics.gs_primitives = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.fragment_shader, GL_QUERY_RESULT, &result)); - pq->statistics.ps_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.compute_shader, GL_QUERY_RESULT, &result)); - pq->statistics.cs_invocations = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.clipping_input, GL_QUERY_RESULT, &result)); - pq->statistics.clipping_input_primitives = result; - GL_EXTCALL(glGetQueryObjectuiv(pq->u.query.clipping_output, GL_QUERY_RESULT, &result)); - pq->statistics.clipping_output_primitives = result; + pq->statistics.vertices_submitted = get_query_result64(pq->u.query.vertices, gl_info); + pq->statistics.primitives_submitted = get_query_result64(pq->u.query.primitives, gl_info); + pq->statistics.vs_invocations = get_query_result64(pq->u.query.vertex_shader, gl_info); + pq->statistics.hs_invocations = get_query_result64(pq->u.query.tess_control_shader, gl_info); + pq->statistics.ds_invocations = get_query_result64(pq->u.query.tess_eval_shader, gl_info); + pq->statistics.gs_invocations = get_query_result64(pq->u.query.geometry_shader, gl_info); + pq->statistics.gs_primitives = get_query_result64(pq->u.query.geometry_primitives, gl_info); + pq->statistics.ps_invocations = get_query_result64(pq->u.query.fragment_shader, gl_info); + pq->statistics.cs_invocations = get_query_result64(pq->u.query.compute_shader, gl_info); + pq->statistics.clipping_input_primitives = get_query_result64(pq->u.query.clipping_input, gl_info); + pq->statistics.clipping_output_primitives = get_query_result64(pq->u.query.clipping_output, gl_info); } -done: checkGLcall("poll pipeline statistics query"); context_release(context); return available;

1 0

Józef Kucia : d3d11/tests: Introduce get_query_data() helper function.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: eb329e9019c50fc476abb440fdb2941e9233772a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb329e9019c50fc476abb440f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 5 00:47:36 2017 +0200 d3d11/tests: Introduce get_query_data() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 152 ++++++++++++----------------------------------- 1 file changed, 37 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb329e9019c50fc476abb…

1 0

Michael Müller : d3d11/tests: Add basic test for D3D11_QUERY_PIPELINE_STATISTICS.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 7208e5deabcb90cbd93ab8542a3062a4b15ee1cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7208e5deabcb90cbd93ab8542… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jun 5 00:47:35 2017 +0200 d3d11/tests: Add basic test for D3D11_QUERY_PIPELINE_STATISTICS. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index addc3ee..d3f12e2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4902,6 +4902,81 @@ if (0) release_test_context(&test_context); } +static void test_pipeline_statistics_query(void) +{ + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + D3D11_QUERY_DATA_PIPELINE_STATISTICS data; + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + D3D11_QUERY_DESC query_desc; + ID3D11Asynchronous *query; + unsigned int data_size, i; + ID3D11Device *device; + HRESULT hr; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + + query_desc.Query = D3D11_QUERY_PIPELINE_STATISTICS; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + data_size = ID3D11Asynchronous_GetDataSize(query); + ok(data_size == sizeof(data), "Got unexpected data size %u.\n", data_size); + + hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_End(context, query); + ID3D11DeviceContext_Begin(context, query); + ID3D11DeviceContext_Begin(context, query); + + 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); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(data.IAVertices == ~(UINT64)0, "Data was modified.\n"); + + draw_color_quad(&test_context, &red); + + ID3D11DeviceContext_End(context, query); + for (i = 0; i < 500; ++i) + { + if ((hr = ID3D11DeviceContext_GetData(context, query, NULL, 0, 0)) != S_FALSE) + break; + Sleep(10); + } + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + memset(&data, 0xff, sizeof(data)); + hr = ID3D11DeviceContext_GetData(context, query, &data, sizeof(data), 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data.IAVertices == 4, "Got unexpected IAVertices count: %u.\n", (unsigned int)data.IAVertices); + ok(data.IAPrimitives == 2, "Got unexpected IAPrimitives count: %u.\n", (unsigned int)data.IAPrimitives); + ok(data.VSInvocations == 4, "Got unexpected VSInvocations count: %u.\n", (unsigned int)data.VSInvocations); + ok(!data.GSInvocations, "Got unexpected GSInvocations count: %u.\n", (unsigned int)data.GSInvocations); + ok(!data.GSPrimitives, "Got unexpected GSPrimitives count: %u.\n", (unsigned int)data.GSPrimitives); + ok(data.CInvocations == 2, "Got unexpected CInvocations count: %u.\n", (unsigned int)data.CInvocations); + ok(data.CPrimitives == 2, "Got unexpected CPrimitives count: %u.\n", (unsigned int)data.CPrimitives); + ok(data.PSInvocations >= 640 * 480, "Got unexpected PSInvocations count: %u.\n", (unsigned int)data.PSInvocations); + ok(!data.HSInvocations, "Got unexpected HSInvocations count: %u.\n", (unsigned int)data.HSInvocations); + ok(!data.DSInvocations, "Got unexpected DSInvocations count: %u.\n", (unsigned int)data.DSInvocations); + ok(!data.CSInvocations, "Got unexpected CSInvocations count: %u.\n", (unsigned int)data.CSInvocations); + + ID3D11Asynchronous_Release(query); + release_test_context(&test_context); +} + static void test_timestamp_query(void) { static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; @@ -20332,6 +20407,7 @@ START_TEST(d3d11) test_create_rasterizer_state(); test_create_query(); test_occlusion_query(); + test_pipeline_statistics_query(); test_timestamp_query(); test_device_removed_reason(); test_private_data();

1 0

Michael Müller : wined3d: Implement WINED3D_QUERY_TYPE_PIPELINE_STATISTICS.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: f52ead4b4d8ef30689df3e7da408f6dc5417e63f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f52ead4b4d8ef30689df3e7da… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jun 5 00:47:34 2017 +0200 wined3d: Implement WINED3D_QUERY_TYPE_PIPELINE_STATISTICS. 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 | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/context.c | 58 +++++++++++ dlls/wined3d/directx.c | 1 + dlls/wined3d/query.c | 227 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 39 +++++++ include/wine/wined3d.h | 15 +++ 8 files changed, 343 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f52ead4b4d8ef30689df3…

1 0

Sebastian Lackner : d3d11: Remove duplicate const in d3d11_device_CheckFormatSupport.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 1b4e62738dc39fef29922684ab2483cd0aab4a1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b4e62738dc39fef29922684a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jun 5 14:46:20 2017 +0200 d3d11: Remove duplicate const in d3d11_device_CheckFormatSupport. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index fcf5d10..e84c365 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3324,7 +3324,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device *i struct wined3d *wined3d; unsigned int i; - static const const struct + static const struct { enum wined3d_resource_type rtype; unsigned int usage;

1 0

Francois Gouget : wined3d: Add a trailing newline to an ERR() message.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 2dc2db772c9b89741d4941b4f7e4946682720671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dc2db772c9b89741d4941b4f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:41:08 2017 +0200 wined3d: Add a trailing newline to an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 9ff2c9c..54ddc23 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -291,7 +291,7 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (!get_config_key(hkey, appkey, "StrictDrawOrdering", buffer, size) && !strcmp(buffer,"enabled")) { - ERR_(winediag)("\"StrictDrawOrdering\" is deprecated, please use \"csmt\" instead."); + ERR_(winediag)("\"StrictDrawOrdering\" is deprecated, please use \"csmt\" instead.\n"); TRACE("Enforcing strict draw ordering.\n"); wined3d_settings.strict_draw_ordering = TRUE; }

1 0

Francois Gouget : wsdapi: Add a trailing '\n' to a TRACE() message.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: d65f7c79d8db7e4a9dbfd9847bc01f95de05ad7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d65f7c79d8db7e4a9dbfd9847… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:41:36 2017 +0200 wsdapi: 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/wsdapi/xml.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index a6d0b07..71e9661 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -601,7 +601,7 @@ HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext) { IWSDXMLContextImpl *obj; - TRACE("(%p)", ppContext); + TRACE("(%p)\n", ppContext); if (ppContext == NULL) {

1 0

Francois Gouget : oleaut32: Make VARIANT_GetLocalisedText() static.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 4be8d8392c1f80852695f022c88d4ea18a934fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4be8d8392c1f80852695f022c… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:39:20 2017 +0200 oleaut32: Make VARIANT_GetLocalisedText() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.h | 1 - dlls/oleaut32/vartype.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/oleaut32/variant.h b/dlls/oleaut32/variant.h index 9436cb3..76444cf 100644 --- a/dlls/oleaut32/variant.h +++ b/dlls/oleaut32/variant.h @@ -115,7 +115,6 @@ typedef struct tagVARIANT_NUMBER_CHARS } VARIANT_NUMBER_CHARS; unsigned int get_type_size(ULONG*, VARTYPE) DECLSPEC_HIDDEN; -BOOL VARIANT_GetLocalisedText(LANGID, DWORD, WCHAR *) DECLSPEC_HIDDEN; HRESULT VARIANT_ClearInd(VARIANTARG *) DECLSPEC_HIDDEN; BOOL get_date_format(LCID, DWORD, const SYSTEMTIME *, const WCHAR *, WCHAR *, int) DECLSPEC_HIDDEN; diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index aab4d33..881fe20 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -6061,7 +6061,7 @@ HRESULT WINAPI VarBoolFromCy(CY cyIn, VARIANT_BOOL *pBoolOut) * Get a localized string from the resources * */ -BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) +static BOOL VARIANT_GetLocalisedText(LANGID langId, DWORD dwId, WCHAR *lpszDest) { HRSRC hrsrc;

1 0

Francois Gouget : wmvcore/tests: Make test_profile_manager_interfaces() static.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: bc54489ba6d41b993bee6857deead74dd766f34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc54489ba6d41b993bee6857d… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:38:44 2017 +0200 wmvcore/tests: Make test_profile_manager_interfaces() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 51ff9dc..a190013 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -183,7 +183,7 @@ static void test_wmreader_interfaces(void) IWMReader_Release(reader); } -void test_profile_manager_interfaces(void) +static void test_profile_manager_interfaces(void) { HRESULT hr; IWMProfileManager *profile;

1 0

Francois Gouget : odbccp32/tests: Make test_SQLInstallTranslatorEx() static.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 522385f619f025fba360ca4e158640da7be2d3e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=522385f619f025fba360ca4e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Jun 4 11:39:05 2017 +0200 odbccp32/tests: Make test_SQLInstallTranslatorEx() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/tests/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 8e119e0..4a72ad0 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -530,7 +530,7 @@ if (0) /* Crashes on XP. */ ok(cnt == 0, "SQLRemoveDriver failed %d\n", cnt); } -void test_SQLInstallTranslatorEx(void) +static void test_SQLInstallTranslatorEx(void) { char path[MAX_PATH]; char syspath[MAX_PATH];

1 0

Alexandre Julliard : wineandroid: Forward native window setSwapInterval() calls to the desktop process.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: e441e85db94b2380e2e652c1c8332f64152b1b93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e441e85db94b2380e2e652c1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:26:59 2017 +0200 wineandroid: Forward native window setSwapInterval() calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 7b4e348..344e0c3 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -58,6 +58,7 @@ enum android_ioctl IOCTL_WINDOW_POS_CHANGED, IOCTL_QUERY, IOCTL_PERFORM, + IOCTL_SET_SWAP_INT, NB_IOCTLS }; @@ -68,6 +69,7 @@ struct native_win_data HWND hwnd; int api; int buffer_format; + int swap_interval; }; /* wrapper for a native window in the context of the client (non-Java) process */ @@ -120,6 +122,12 @@ struct ioctl_android_perform int args[4]; }; +struct ioctl_android_set_swap_interval +{ + struct ioctl_header hdr; + int interval; +}; + static inline DWORD current_client_id(void) { return HandleToUlong( PsGetCurrentProcessId() ); @@ -207,6 +215,7 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR wrap_java_call(); if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api ); win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); + win->setSwapInterval( win, data->swap_interval ); unwrap_java_call(); } TRACE( "%p -> %p win %p\n", hwnd, data, win ); @@ -474,6 +483,25 @@ static NTSTATUS perform_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_ return android_error_to_status( ret ); } +static NTSTATUS setSwapInterval_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_set_swap_interval *res = data; + struct ANativeWindow *parent; + struct native_win_data *win_data; + int ret; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + win_data->swap_interval = res->interval; + + if (!(parent = win_data->parent)) return STATUS_SUCCESS; + wrap_java_call(); + ret = parent->setSwapInterval( parent, res->interval ); + unwrap_java_call(); + return android_error_to_status( ret ); +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { @@ -482,6 +510,7 @@ static const ioctl_func ioctl_funcs[] = windowPosChanged_ioctl, /* IOCTL_WINDOW_POS_CHANGED */ query_ioctl, /* IOCTL_QUERY */ perform_ioctl, /* IOCTL_PERFORM */ + setSwapInterval_ioctl, /* IOCTL_SET_SWAP_INT */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -662,7 +691,13 @@ static int queueBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeW static int setSwapInterval( struct ANativeWindow *window, int interval ) { - return 0; + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + struct ioctl_android_set_swap_interval swap; + + TRACE( "hwnd %p interval %d\n", win->hwnd, interval ); + swap.hdr.hwnd = HandleToLong( win->hwnd ); + swap.interval = interval; + return android_ioctl( IOCTL_SET_SWAP_INT, &swap, sizeof(swap), NULL, NULL ); } static int query( const ANativeWindow *window, int what, int *value )

1 0

Alexandre Julliard : wineandroid: Forward native window perform() calls to the desktop process.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 4c1f541c13b38d9523753afb9e2ddb2f5431f7ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1f541c13b38d9523753afb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:26:40 2017 +0200 wineandroid: Forward native window perform() calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 182 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 48b595f..7b4e348 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -57,6 +57,7 @@ enum android_ioctl IOCTL_DESTROY_WINDOW, IOCTL_WINDOW_POS_CHANGED, IOCTL_QUERY, + IOCTL_PERFORM, NB_IOCTLS }; @@ -65,6 +66,8 @@ struct native_win_data { struct ANativeWindow *parent; HWND hwnd; + int api; + int buffer_format; }; /* wrapper for a native window in the context of the client (non-Java) process */ @@ -110,6 +113,13 @@ struct ioctl_android_query int value; }; +struct ioctl_android_perform +{ + struct ioctl_header hdr; + int operation; + int args[4]; +}; + static inline DWORD current_client_id(void) { return HandleToUlong( PsGetCurrentProcessId() ); @@ -171,6 +181,8 @@ static struct native_win_data *create_native_win_data( HWND hwnd ) } if (!(data = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data) ))) return NULL; data->hwnd = hwnd; + data->api = NATIVE_WINDOW_API_CPU; + data->buffer_format = PF_BGRA_8888; data_map[idx] = data; return data; } @@ -193,7 +205,8 @@ static void CALLBACK register_native_window_callback( ULONG_PTR arg1, ULONG_PTR if (win) { wrap_java_call(); - win->perform( win, NATIVE_WINDOW_API_CONNECT, NATIVE_WINDOW_API_CPU ); + if (data->api) win->perform( win, NATIVE_WINDOW_API_CONNECT, data->api ); + win->perform( win, NATIVE_WINDOW_SET_BUFFERS_FORMAT, data->buffer_format ); unwrap_java_call(); } TRACE( "%p -> %p win %p\n", hwnd, data, win ); @@ -374,6 +387,93 @@ static NTSTATUS query_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PT return android_error_to_status( ret ); } +static NTSTATUS perform_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_perform *res = data; + struct ANativeWindow *parent; + struct native_win_data *win_data; + int ret = -ENOENT; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + if (!(parent = win_data->parent)) return STATUS_DEVICE_NOT_READY; + + switch (res->operation) + { + case NATIVE_WINDOW_SET_BUFFERS_FORMAT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + if (!ret) win_data->buffer_format = res->args[0]; + break; + case NATIVE_WINDOW_API_CONNECT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + if (!ret) win_data->api = res->args[0]; + break; + case NATIVE_WINDOW_API_DISCONNECT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + if (!ret) win_data->api = 0; + break; + case NATIVE_WINDOW_SET_USAGE: + case NATIVE_WINDOW_SET_BUFFERS_TRANSFORM: + case NATIVE_WINDOW_SET_SCALING_MODE: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFER_COUNT: + wrap_java_call(); + ret = parent->perform( parent, res->operation, (size_t)res->args[0] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS: + case NATIVE_WINDOW_SET_BUFFERS_USER_DIMENSIONS: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0], res->args[1] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFERS_GEOMETRY: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0], res->args[1], res->args[2] ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP: + wrap_java_call(); + ret = parent->perform( parent, res->operation, res->args[0] | ((int64_t)res->args[1] << 32) ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_CONNECT: + case NATIVE_WINDOW_DISCONNECT: + case NATIVE_WINDOW_UNLOCK_AND_POST: + wrap_java_call(); + ret = parent->perform( parent, res->operation ); + unwrap_java_call(); + break; + case NATIVE_WINDOW_SET_CROP: + { + android_native_rect_t rect; + rect.left = res->args[0]; + rect.top = res->args[1]; + rect.right = res->args[2]; + rect.bottom = res->args[3]; + wrap_java_call(); + ret = parent->perform( parent, res->operation, &rect ); + unwrap_java_call(); + break; + } + case NATIVE_WINDOW_LOCK: + default: + FIXME( "unsupported perform op %d\n", res->operation ); + break; + } + return android_error_to_status( ret ); +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { @@ -381,6 +481,7 @@ static const ioctl_func ioctl_funcs[] = destroyWindow_ioctl, /* IOCTL_DESTROY_WINDOW */ windowPosChanged_ioctl, /* IOCTL_WINDOW_POS_CHANGED */ query_ioctl, /* IOCTL_QUERY */ + perform_ioctl, /* IOCTL_PERFORM */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -581,7 +682,84 @@ static int query( const ANativeWindow *window, int what, int *value ) static int perform( ANativeWindow *window, int operation, ... ) { - return 0; + static const char * const names[] = + { + "SET_USAGE", "CONNECT", "DISCONNECT", "SET_CROP", "SET_BUFFER_COUNT", "SET_BUFFERS_GEOMETRY", + "SET_BUFFERS_TRANSFORM", "SET_BUFFERS_TIMESTAMP", "SET_BUFFERS_DIMENSIONS", "SET_BUFFERS_FORMAT", + "SET_SCALING_MODE", "LOCK", "UNLOCK_AND_POST", "API_CONNECT", "API_DISCONNECT", + "SET_BUFFERS_USER_DIMENSIONS", "SET_POST_TRANSFORM_CROP" + }; + + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + struct ioctl_android_perform perf; + va_list args; + + perf.hdr.hwnd = HandleToLong( win->hwnd ); + perf.operation = operation; + memset( perf.args, 0, sizeof(perf.args) ); + + va_start( args, operation ); + switch (operation) + { + case NATIVE_WINDOW_SET_USAGE: + case NATIVE_WINDOW_SET_BUFFERS_TRANSFORM: + case NATIVE_WINDOW_SET_BUFFERS_FORMAT: + case NATIVE_WINDOW_SET_SCALING_MODE: + case NATIVE_WINDOW_API_CONNECT: + case NATIVE_WINDOW_API_DISCONNECT: + perf.args[0] = va_arg( args, int ); + TRACE( "hwnd %p %s arg %d\n", win->hwnd, names[operation], perf.args[0] ); + break; + case NATIVE_WINDOW_SET_BUFFER_COUNT: + perf.args[0] = va_arg( args, size_t ); + TRACE( "hwnd %p %s count %d\n", win->hwnd, names[operation], perf.args[0] ); + break; + case NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS: + case NATIVE_WINDOW_SET_BUFFERS_USER_DIMENSIONS: + perf.args[0] = va_arg( args, int ); + perf.args[1] = va_arg( args, int ); + TRACE( "hwnd %p %s arg %dx%d\n", win->hwnd, names[operation], perf.args[0], perf.args[1] ); + break; + case NATIVE_WINDOW_SET_BUFFERS_GEOMETRY: + perf.args[0] = va_arg( args, int ); + perf.args[1] = va_arg( args, int ); + perf.args[2] = va_arg( args, int ); + TRACE( "hwnd %p %s arg %dx%d %d\n", win->hwnd, names[operation], + perf.args[0], perf.args[1], perf.args[2] ); + break; + case NATIVE_WINDOW_SET_CROP: + { + android_native_rect_t *rect = va_arg( args, android_native_rect_t * ); + perf.args[0] = rect->left; + perf.args[1] = rect->top; + perf.args[2] = rect->right; + perf.args[3] = rect->bottom; + TRACE( "hwnd %p %s rect %d,%d-%d,%d\n", win->hwnd, names[operation], + perf.args[0], perf.args[1], perf.args[2], perf.args[3] ); + break; + } + case NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP: + { + int64_t timestamp = va_arg( args, int64_t ); + perf.args[0] = timestamp; + perf.args[1] = timestamp >> 32; + TRACE( "hwnd %p %s arg %08x%08x\n", win->hwnd, names[operation], perf.args[1], perf.args[0] ); + break; + } + case NATIVE_WINDOW_LOCK: + case NATIVE_WINDOW_UNLOCK_AND_POST: + case NATIVE_WINDOW_CONNECT: + case NATIVE_WINDOW_DISCONNECT: + TRACE( "hwnd %p %s\n", win->hwnd, names[operation] ); + break; + case NATIVE_WINDOW_SET_POST_TRANSFORM_CROP: + default: + FIXME( "unsupported perform hwnd %p op %d %s\n", win->hwnd, operation, + operation < sizeof(names)/sizeof(names[0]) ? names[operation] : "???" ); + break; + } + va_end( args ); + return android_ioctl( IOCTL_PERFORM, &perf, sizeof(perf), NULL, NULL ); } struct ANativeWindow *create_ioctl_window( HWND hwnd )

1 0

Alexandre Julliard : wineandroid: Forward native window query() calls to the desktop process.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: f69836eba907653b581a0ea7287ee4a74bef489a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69836eba907653b581a0ea72… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:26:27 2017 +0200 wineandroid: Forward native window query() calls to the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/device.c | 64 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index e6ddc50..48b595f 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -56,6 +56,7 @@ enum android_ioctl IOCTL_CREATE_WINDOW, IOCTL_DESTROY_WINDOW, IOCTL_WINDOW_POS_CHANGED, + IOCTL_QUERY, NB_IOCTLS }; @@ -102,6 +103,13 @@ struct ioctl_android_window_pos_changed int owner; }; +struct ioctl_android_query +{ + struct ioctl_header hdr; + int what; + int value; +}; + static inline DWORD current_client_id(void) { return HandleToUlong( PsGetCurrentProcessId() ); @@ -197,6 +205,29 @@ void register_native_window( HWND hwnd, struct ANativeWindow *win ) NtQueueApcThread( thread, register_native_window_callback, (ULONG_PTR)hwnd, (ULONG_PTR)win, 0 ); } +static NTSTATUS android_error_to_status( int err ) +{ + switch (err) + { + case 0: return STATUS_SUCCESS; + case -ENOMEM: return STATUS_NO_MEMORY; + case -ENOSYS: return STATUS_NOT_SUPPORTED; + case -EINVAL: return STATUS_INVALID_PARAMETER; + case -ENOENT: return STATUS_INVALID_HANDLE; + case -EPERM: return STATUS_ACCESS_DENIED; + case -ENODEV: return STATUS_NO_SUCH_DEVICE; + case -EEXIST: return STATUS_DUPLICATE_NAME; + case -EPIPE: return STATUS_PIPE_DISCONNECTED; + case -ENODATA: return STATUS_NO_MORE_FILES; + case -ETIMEDOUT: return STATUS_IO_TIMEOUT; + case -EBADMSG: return STATUS_INVALID_DEVICE_REQUEST; + case -EWOULDBLOCK: return STATUS_DEVICE_NOT_READY; + default: + FIXME( "unmapped error %d\n", err ); + return STATUS_UNSUCCESSFUL; + } +} + static int status_to_android_error( NTSTATUS status ) { switch (status) @@ -323,12 +354,33 @@ static NTSTATUS windowPosChanged_ioctl( void *data, DWORD in_size, DWORD out_siz return STATUS_SUCCESS; } +static NTSTATUS query_ioctl( void *data, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ) +{ + struct ioctl_android_query *res = data; + struct ANativeWindow *parent; + struct native_win_data *win_data; + int ret; + + if (in_size < sizeof(*res)) return STATUS_INVALID_PARAMETER; + if (out_size < sizeof(*res)) return STATUS_BUFFER_OVERFLOW; + + if (!(win_data = get_ioctl_native_win_data( &res->hdr ))) return STATUS_INVALID_HANDLE; + if (!(parent = win_data->parent)) return STATUS_DEVICE_NOT_READY; + + *ret_size = sizeof( *res ); + wrap_java_call(); + ret = parent->query( parent, res->what, &res->value ); + unwrap_java_call(); + return android_error_to_status( ret ); +} + typedef NTSTATUS (*ioctl_func)( void *in, DWORD in_size, DWORD out_size, ULONG_PTR *ret_size ); static const ioctl_func ioctl_funcs[] = { createWindow_ioctl, /* IOCTL_CREATE_WINDOW */ destroyWindow_ioctl, /* IOCTL_DESTROY_WINDOW */ windowPosChanged_ioctl, /* IOCTL_WINDOW_POS_CHANGED */ + query_ioctl, /* IOCTL_QUERY */ }; static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) @@ -514,7 +566,17 @@ static int setSwapInterval( struct ANativeWindow *window, int interval ) static int query( const ANativeWindow *window, int what, int *value ) { - return 0; + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + struct ioctl_android_query query; + DWORD size = sizeof( query ); + int ret; + + query.hdr.hwnd = HandleToLong( win->hwnd ); + query.what = what; + ret = android_ioctl( IOCTL_QUERY, &query, sizeof(query), &query, &size ); + TRACE( "hwnd %p what %d got %d -> %p\n", win->hwnd, what, query.value, value ); + if (!ret) *value = query.value; + return ret; } static int perform( ANativeWindow *window, int operation, ... )

1 0

Alexandre Julliard : wineandroid: Allocate a native window wrapper in the client process for every window.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: fbc482db1d011887468d11ef2fbac99e50af04a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc482db1d011887468d11ef2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:21:26 2017 +0200 wineandroid: Allocate a native window wrapper in the client process for every window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 4 +- dlls/wineandroid.drv/device.c | 114 ++++++++++++++++++++++++++++++++++++++++- dlls/wineandroid.drv/window.c | 5 +- 3 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index f03671a..3d9ac5a 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -53,7 +53,9 @@ DECL_FUNCPTR( ANativeWindow_release ); extern void start_android_device(void) DECLSPEC_HIDDEN; extern void register_native_window( HWND hwnd, struct ANativeWindow *win ) DECLSPEC_HIDDEN; -extern void create_ioctl_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern struct ANativeWindow *create_ioctl_window( HWND hwnd ) DECLSPEC_HIDDEN; +extern struct ANativeWindow *grab_ioctl_window( struct ANativeWindow *window ) DECLSPEC_HIDDEN; +extern void release_ioctl_window( struct ANativeWindow *window ) DECLSPEC_HIDDEN; extern void destroy_ioctl_window( HWND hwnd ) DECLSPEC_HIDDEN; extern int ioctl_window_pos_changed( HWND hwnd, const RECT *window_rect, const RECT *client_rect, const RECT *visible_rect, UINT style, UINT flags, diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 3dacd48..e6ddc50 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -66,6 +66,14 @@ struct native_win_data HWND hwnd; }; +/* wrapper for a native window in the context of the client (non-Java) process */ +struct native_win_wrapper +{ + struct ANativeWindow win; + HWND hwnd; + LONG ref; +}; + struct ioctl_header { int hwnd; @@ -452,14 +460,118 @@ static int android_ioctl( enum android_ioctl code, void *in, DWORD in_size, void return status_to_android_error( status ); } -void create_ioctl_window( HWND hwnd ) +static void win_incRef( struct android_native_base_t *base ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)base; + InterlockedIncrement( &win->ref ); +} + +static void win_decRef( struct android_native_base_t *base ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)base; + InterlockedDecrement( &win->ref ); +} + +static int dequeueBuffer( struct ANativeWindow *window, struct ANativeWindowBuffer **buffer, int *fence ) +{ + return 0; +} + +static int cancelBuffer( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fence ) +{ + return 0; +} + +static int queueBuffer( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fence ) +{ + return 0; +} + +static int dequeueBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer **buffer ) +{ + return 0; +} + +static int cancelBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer ) +{ + return 0; +} + +static int lockBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer ) +{ + return 0; /* nothing to do */ +} + +static int queueBuffer_DEPRECATED( struct ANativeWindow *window, struct ANativeWindowBuffer *buffer ) +{ + return 0; +} + +static int setSwapInterval( struct ANativeWindow *window, int interval ) +{ + return 0; +} + +static int query( const ANativeWindow *window, int what, int *value ) +{ + return 0; +} + +static int perform( ANativeWindow *window, int operation, ... ) +{ + return 0; +} + +struct ANativeWindow *create_ioctl_window( HWND hwnd ) { struct ioctl_android_create_window req; + struct native_win_wrapper *win = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*win) ); HWND parent = GetAncestor( hwnd, GA_PARENT ); + if (!win) return NULL; + + win->win.common.magic = ANDROID_NATIVE_WINDOW_MAGIC; + win->win.common.version = sizeof(ANativeWindow); + win->win.common.incRef = win_incRef; + win->win.common.decRef = win_decRef; + win->win.setSwapInterval = setSwapInterval; + win->win.dequeueBuffer_DEPRECATED = dequeueBuffer_DEPRECATED; + win->win.lockBuffer_DEPRECATED = lockBuffer_DEPRECATED; + win->win.queueBuffer_DEPRECATED = queueBuffer_DEPRECATED; + win->win.query = query; + win->win.perform = perform; + win->win.cancelBuffer_DEPRECATED = cancelBuffer_DEPRECATED; + win->win.dequeueBuffer = dequeueBuffer; + win->win.queueBuffer = queueBuffer; + win->win.cancelBuffer = cancelBuffer; + win->ref = 1; + win->hwnd = hwnd; + TRACE( "-> %p %p\n", win, win->hwnd ); + req.hdr.hwnd = HandleToLong( hwnd ); req.parent = parent == GetDesktopWindow() ? 0 : HandleToLong( parent ); android_ioctl( IOCTL_CREATE_WINDOW, &req, sizeof(req), NULL, NULL ); + + return &win->win; +} + +struct ANativeWindow *grab_ioctl_window( struct ANativeWindow *window ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + InterlockedIncrement( &win->ref ); + return window; +} + +void release_ioctl_window( struct ANativeWindow *window ) +{ + struct native_win_wrapper *win = (struct native_win_wrapper *)window; + + if (InterlockedDecrement( &win->ref ) > 0) return; + + TRACE( "%p %p\n", win, win->hwnd ); + + destroy_ioctl_window( win->hwnd ); + HeapFree( GetProcessHeap(), 0, win ); } void destroy_ioctl_window( HWND hwnd ) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 49520eb..65b37d8 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -57,6 +57,7 @@ struct android_win_data RECT window_rect; /* USER window rectangle relative to parent */ RECT whole_rect; /* X window rectangle for the whole window relative to parent */ RECT client_rect; /* client area relative to parent */ + ANativeWindow *window; /* native window wrapper that forwards calls to the desktop process */ }; #define SWP_AGG_NOPOSCHANGE (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) @@ -88,7 +89,7 @@ static struct android_win_data *alloc_win_data( HWND hwnd ) if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { data->hwnd = hwnd; - create_ioctl_window( hwnd ); + data->window = create_ioctl_window( hwnd ); EnterCriticalSection( &win_data_section ); win_data_context[context_idx(hwnd)] = data; } @@ -103,7 +104,7 @@ static void free_win_data( struct android_win_data *data ) { win_data_context[context_idx( data->hwnd )] = NULL; LeaveCriticalSection( &win_data_section ); - destroy_ioctl_window( data->hwnd ); + if (data->window) release_ioctl_window( data->window ); HeapFree( GetProcessHeap(), 0, data ); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetSockaddr.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 5b57a6a52fc5935f4c9b10b90383bc97d467f6bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b57a6a52fc5935f4c9b10b90… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:52 2017 +0100 wsdapi/tests: Add tests for Get/SetSockaddr. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index c3112f4..fefc253 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -22,6 +22,7 @@ #define COBJMACROS #include <winsock2.h> +#include <ws2tcpip.h> #include <windows.h> #include "wine/test.h" @@ -221,6 +222,135 @@ static void GetSetMessageType_udp_tests(void) ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); } +static void GetSetSockaddr_udp_tests(void) +{ + SOCKADDR_STORAGE storage1, storage2; + SOCKADDR_STORAGE returnedStorage; + struct sockaddr_in6 *sockAddr6Ptr; + struct sockaddr_in *sockAddrPtr; + IWSDUdpAddress *udpAddress = NULL; + LPCWSTR returnedAddress = NULL; + char addressBuffer[MAX_PATH]; + WSADATA wsaData; + WORD port = 0; + HRESULT rc; + int ret; + + const char *ipv4Address = "1.2.3.4"; + const short ipv4Port = 1234; + const WCHAR expectedIpv4TransportAddr[] = {'1','.','2','.','3','.','4',':','1','2','3','4',0}; + + const char *ipv6Address = "2a00:1234:5678:dead:beef::aaaa"; + const short ipv6Port = 2345; + const WCHAR expectedIpv6TransportAddr[] = {'[','2','a','0','0',':','1','2','3','4',':','5','6','7','8',':','d','e','a','d',':', + 'b','e','e','f',':',':','a','a','a','a',']',':','2','3','4','5',0}; + + ZeroMemory(&storage1, sizeof(SOCKADDR_STORAGE)); + ZeroMemory(&storage2, sizeof(SOCKADDR_STORAGE)); + ZeroMemory(&returnedStorage, sizeof(SOCKADDR_STORAGE)); + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, NULL); + todo_wine ok(rc == E_POINTER, "GetSockaddr returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == E_FAIL, "GetSockaddr returned unexpected result: %08x\n", rc); + + /* Try setting a transport address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, expectedIpv6TransportAddr); + todo_wine ok(rc == S_OK, "SetTransportAddress failed: %08x\n", rc); + + /* A socket address should be returned */ + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + todo_wine ok(returnedStorage.ss_family == AF_INET6, "returnedStorage.ss_family != AF_INET6 (%d)\n", returnedStorage.ss_family); + + sockAddr6Ptr = (struct sockaddr_in6 *) &returnedStorage; + + /* Windows however doesn't set the port number */ + ok(sockAddr6Ptr->sin6_port == 0, "returnedStorage.sin6_port != 0 (%d)\n", sockAddr6Ptr->sin6_port); + + todo_wine ok(inet_ntop(returnedStorage.ss_family, &sockAddr6Ptr->sin6_addr, addressBuffer, MAX_PATH) != NULL, "inet_ntop failed (%d)\n", WSAGetLastError()); + todo_wine ok(strcmp(addressBuffer, ipv6Address) == 0, "returnedStorage.sin6_addr != '%s' ('%s')\n", ipv6Address, addressBuffer); + + /* Release the object and create a new one */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + /* Try setting an IPv4 address */ + sockAddrPtr = (struct sockaddr_in *) &storage1; + sockAddrPtr->sin_family = AF_INET; + sockAddrPtr->sin_port = htons(ipv4Port); + + ret = inet_pton(AF_INET, ipv4Address, &sockAddrPtr->sin_addr); + ok(ret == 1, "inet_pton(ipv4) failed: %d\n", WSAGetLastError()); + + rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage1); + todo_wine ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + + todo_wine ok(returnedStorage.ss_family == storage1.ss_family, "returnedStorage.ss_family != storage1.ss_family (%d)\n", returnedStorage.ss_family); + todo_wine ok(memcmp(&returnedStorage, &storage1, sizeof(struct sockaddr_in)) == 0, "returnedStorage != storage1\n"); + + /* Check that GetTransportAddress returns the address set via the socket */ + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); + todo_wine ok(lstrcmpW(returnedAddress, expectedIpv4TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); + + /* Check that GetPort doesn't return the port set via the socket */ + rc = IWSDUdpAddress_GetPort(udpAddress, &port); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(port == 0, "GetPort returned unexpected port: %d\n", port); + + /* Try setting an IPv6 address */ + sockAddr6Ptr = (struct sockaddr_in6 *) &storage2; + sockAddr6Ptr->sin6_family = AF_INET6; + sockAddr6Ptr->sin6_port = htons(ipv6Port); + + ret = inet_pton(AF_INET6, ipv6Address, &sockAddr6Ptr->sin6_addr); + ok(ret == 1, "inet_pton(ipv6) failed: %d\n", WSAGetLastError()); + + rc = IWSDUdpAddress_SetSockaddr(udpAddress, &storage2); + todo_wine ok(rc == S_OK, "SetSockaddr returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetSockaddr(udpAddress, &returnedStorage); + todo_wine ok(rc == S_OK, "GetSockaddr returned unexpected result: %08x\n", rc); + + todo_wine ok(returnedStorage.ss_family == storage2.ss_family, "returnedStorage.ss_family != storage2.ss_family (%d)\n", returnedStorage.ss_family); + todo_wine ok(memcmp(&returnedStorage, &storage2, sizeof(struct sockaddr_in6)) == 0, "returnedStorage != storage2\n"); + + /* Check that GetTransportAddress returns the address set via the socket */ + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress failed: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: %p\n", returnedAddress); + todo_wine ok(lstrcmpW(returnedAddress, expectedIpv6TransportAddr) == 0, "GetTransportAddress returned unexpected address: %s\n", wine_dbgstr_w(returnedAddress)); + + /* Check that GetPort doesn't return the port set via the socket */ + rc = IWSDUdpAddress_GetPort(udpAddress, &port); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(port == 0, "GetPort returned unexpected port: %d\n", port); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(address) { CoInitialize(NULL); @@ -229,6 +359,7 @@ START_TEST(address) GetSetTransportAddress_udp_tests(); GetSetPort_udp_tests(); GetSetMessageType_udp_tests(); + GetSetSockaddr_udp_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetMessageType.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 529688312128647dd372f1cefe4645e6c9e819d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529688312128647dd372f1cef… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:49 2017 +0100 wsdapi/tests: Add tests for Get/SetMessageType. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 74a1c12..c3112f4 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -180,6 +180,47 @@ static void GetSetPort_udp_tests(void) ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); } +static void GetSetMessageType_udp_tests(void) +{ + WSDUdpMessageType expectedMessageType1 = TWO_WAY; + WSDUdpMessageType expectedMessageType2 = ONE_WAY; + WSDUdpMessageType actualMessageType = 0; + IWSDUdpAddress *udpAddress = NULL; + HRESULT rc; + int ret; + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, NULL); + todo_wine ok(rc == E_POINTER, "GetMessageType returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); + todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(actualMessageType == 0, "GetMessageType returned unexpected message type: %d\n", actualMessageType); + + /* Try setting a message type */ + rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType1); + todo_wine ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); + todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + todo_wine ok(actualMessageType == expectedMessageType1, "GetMessageType returned unexpected message type: %d\n", actualMessageType); + + /* Set another one */ + rc = IWSDUdpAddress_SetMessageType(udpAddress, expectedMessageType2); + todo_wine ok(rc == S_OK, "SetMessageType returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetMessageType(udpAddress, &actualMessageType); + todo_wine ok(rc == S_OK, "GetMessageType returned unexpected result: %08x\n", rc); + ok(actualMessageType == expectedMessageType2, "GetMessageType returned unexpected message type: %d\n", actualMessageType); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); +} + START_TEST(address) { CoInitialize(NULL); @@ -187,6 +228,7 @@ START_TEST(address) CreateUdpAddress_tests(); GetSetTransportAddress_udp_tests(); GetSetPort_udp_tests(); + GetSetMessageType_udp_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetPort.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: d0291c272692896def11e65ac73b849a10739268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0291c272692896def11e65ac… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:44 2017 +0100 wsdapi/tests: Add tests for Get/SetPort. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/address.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index c1bf3ba..74a1c12 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -132,12 +132,61 @@ static void GetSetTransportAddress_udp_tests(void) ok(ret == 0, "WSACleanup failed: %d\n", ret); } +static void GetSetPort_udp_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL; + WORD expectedPort1 = 12345; + WORD expectedPort2 = 8080; + WORD actualPort = 0; + HRESULT rc; + int ret; + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + /* No test for GetPort(NULL) as this causes an access violation exception on Windows */ + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); + + /* Try setting a zero port */ + rc = IWSDUdpAddress_SetPort(udpAddress, 0); + todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + ok(actualPort == 0, "GetPort returned unexpected port: %d\n", actualPort); + + /* Set a real port */ + rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort1); + todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + todo_wine ok(actualPort == expectedPort1, "GetPort returned unexpected port: %d\n", actualPort); + + /* Now set a different port */ + rc = IWSDUdpAddress_SetPort(udpAddress, expectedPort2); + todo_wine ok(rc == S_OK, "SetPort returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetPort(udpAddress, &actualPort); + todo_wine ok(rc == S_OK, "GetPort returned unexpected result: %08x\n", rc); + todo_wine ok(actualPort == expectedPort2, "GetPort returned unexpected port: %d\n", actualPort); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); +} + START_TEST(address) { CoInitialize(NULL); CreateUdpAddress_tests(); GetSetTransportAddress_udp_tests(); + GetSetPort_udp_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add tests for Get/SetTransportAddress.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: a4ee1b2675074b795054c6174b27a3ae11c2c42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ee1b2675074b795054c6174… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:40 2017 +0100 wsdapi/tests: Add tests for Get/SetTransportAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/address.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index a4a2821..e2f6642 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wsdapi.dll -IMPORTS = wsdapi ole32 user32 +IMPORTS = wsdapi ole32 user32 ws2_32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c index 8b16b06..c1bf3ba 100644 --- a/dlls/wsdapi/tests/address.c +++ b/dlls/wsdapi/tests/address.c @@ -21,6 +21,7 @@ #define COBJMACROS +#include <winsock2.h> #include <windows.h> #include "wine/test.h" @@ -72,11 +73,71 @@ static void CreateUdpAddress_tests(void) ok(ref == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ref); } +static void GetSetTransportAddress_udp_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL; + const WCHAR ipv4Address[] = {'1','0','.','2','0','.','3','0','.','4','0',0}; + const WCHAR ipv6Address[] = {'a','a','b','b',':','c','d',':',':','a','b','c',0}; + const WCHAR invalidAddress[] = {'n','o','t','/','v','a','l','i','d',0}; + LPCWSTR returnedAddress = NULL; + WSADATA wsaData; + HRESULT rc; + int ret; + + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); + ok(ret == 0, "WSAStartup failed: %d\n", ret); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUdpAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUdpAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + ok(returnedAddress == NULL, "GetTransportAddress returned unexpected address: %08x\n", rc); + + /* Try setting a null address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, NULL); + todo_wine ok(rc == E_INVALIDARG, "SetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + + /* Try setting an invalid address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, invalidAddress); + todo_wine ok(rc == HRESULT_FROM_WIN32(WSAHOST_NOT_FOUND), "SetTransportAddress(invalidAddress) returned unexpected result: %08x\n", rc); + + /* Try setting an IPv4 address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv4Address); + todo_wine ok(rc == S_OK, "SetTransportAddress(ipv4Address) failed: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, NULL); + todo_wine ok(rc == E_POINTER, "GetTransportAddress(NULL) returned unexpected result: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + todo_wine ok(lstrcmpW(returnedAddress, ipv4Address) == 0, "Returned address != ipv4Address (%s)\n", wine_dbgstr_w(returnedAddress)); + + /* Try setting an IPv6 address */ + rc = IWSDUdpAddress_SetTransportAddress(udpAddress, ipv6Address); + todo_wine ok(rc == S_OK, "SetTransportAddress(ipv6Address) failed: %08x\n", rc); + + rc = IWSDUdpAddress_GetTransportAddress(udpAddress, &returnedAddress); + todo_wine ok(rc == S_OK, "GetTransportAddress returned unexpected result: %08x\n", rc); + todo_wine ok(returnedAddress != NULL, "GetTransportAddress returned unexpected address: '%s'\n", wine_dbgstr_w(returnedAddress)); + todo_wine ok(lstrcmpW(returnedAddress, ipv6Address) == 0, "Returned address != ipv6Address (%s)\n", wine_dbgstr_w(returnedAddress)); + + /* Release the object */ + ret = IWSDUdpAddress_Release(udpAddress); + ok(ret == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ret); + + ret = WSACleanup(); + ok(ret == 0, "WSACleanup failed: %d\n", ret); +} + START_TEST(address) { CoInitialize(NULL); CreateUdpAddress_tests(); + GetSetTransportAddress_udp_tests(); CoUninitialize(); }

1 0

Owen Rudge : wsdapi/tests: Add WSDCreateUdpAddress tests.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 30b356337384ca38b00c4273d278a73054233bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b356337384ca38b00c4273d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Sat Jun 3 10:34:37 2017 +0100 wsdapi/tests: Add WSDCreateUdpAddress tests. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 1 + dlls/wsdapi/tests/address.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index 77434cf..a4a2821 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -2,6 +2,7 @@ TESTDLL = wsdapi.dll IMPORTS = wsdapi ole32 user32 C_SRCS = \ + address.c \ discovery.c \ memory.c \ xml.c diff --git a/dlls/wsdapi/tests/address.c b/dlls/wsdapi/tests/address.c new file mode 100644 index 0000000..8b16b06 --- /dev/null +++ b/dlls/wsdapi/tests/address.c @@ -0,0 +1,82 @@ +/* + * Web Services on Devices + * Address tests + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library 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 Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include <windows.h> + +#include "wine/test.h" +#include "objbase.h" +#include "wsdapi.h" + +static void CreateUdpAddress_tests(void) +{ + IWSDUdpAddress *udpAddress = NULL, *udpAddress2 = NULL; + IWSDTransportAddress *transportAddress = NULL; + IWSDAddress *address = NULL; + IUnknown *unknown; + HRESULT rc; + ULONG ref; + + rc = WSDCreateUdpAddress(NULL); + ok((rc == E_POINTER) || (rc == E_INVALIDARG), "WSDCreateUDPAddress(NULL) failed: %08x\n", rc); + + rc = WSDCreateUdpAddress(&udpAddress); + ok(rc == S_OK, "WSDCreateUDPAddress(NULL, &udpAddress) failed: %08x\n", rc); + ok(udpAddress != NULL, "WSDCreateUDPAddress(NULL, &udpAddress) failed: udpAddress == NULL\n"); + + /* Try to query for objects */ + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDUdpAddress, (LPVOID*)&udpAddress2); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDUdpAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDUdpAddress_Release(udpAddress2); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDTransportAddress, (LPVOID*)&transportAddress); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_WSDTransportAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDTransportAddress_Release(transportAddress); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IWSDAddress, (LPVOID*)&address); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IWSDAddress) failed: %08x\n", rc); + + if (rc == S_OK) + IWSDAddress_Release(address); + + rc = IWSDUdpAddress_QueryInterface(udpAddress, &IID_IUnknown, (LPVOID*)&unknown); + ok(rc == S_OK, "IWSDUdpAddress_QueryInterface(IID_IUnknown) failed: %08x\n", rc); + + if (rc == S_OK) + IUnknown_Release(unknown); + + ref = IWSDUdpAddress_Release(udpAddress); + ok(ref == 0, "IWSDUdpAddress_Release() has %d references, should have 0\n", ref); +} + +START_TEST(address) +{ + CoInitialize(NULL); + + CreateUdpAddress_tests(); + + CoUninitialize(); +}

1 0

Daniel Lehman : msvcrt: Translate SEH exception on each call to __CxxFrameHandler.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 4aa813867cbd6ead4e1a66cdd0b5c8f3b6372fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa813867cbd6ead4e1a66cdd… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri May 19 10:16:07 2017 -0700 msvcrt: Translate SEH exception on each call to __CxxFrameHandler. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 46 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index e891567..57fce93 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -108,6 +108,14 @@ typedef struct __cxx_function_descr UINT flags; } cxx_function_descr; +typedef struct +{ + ULONG64 dest_frame; + ULONG64 orig_frame; + DISPATCHER_CONTEXT *dispatch; + const cxx_function_descr *descr; +} se_translator_ctx; + static inline void* rva_to_ptr(UINT rva, ULONG64 base) { return rva ? (void*)(base+rva) : NULL; @@ -429,6 +437,26 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, TRACE("no matching catch block found\n"); } +static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c) +{ + se_translator_ctx *ctx = (se_translator_ctx *)c; + EXCEPTION_RECORD *rec = ep->ExceptionRecord; + cxx_exception_type *exc_type; + + if (rec->ExceptionCode != CXX_EXCEPTION) + { + TRACE("non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode); + MSVCRT_terminate(); + } + + exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; + find_catch_block(rec, ctx->dest_frame, ctx->dispatch, + ctx->descr, exc_type, ctx->orig_frame); + + __DestructExceptionObject(rec); + return ExceptionContinueSearch; +} + static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr) @@ -554,10 +582,22 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (data->se_translator) { EXCEPTION_POINTERS except_ptrs; + se_translator_ctx ctx; - except_ptrs.ExceptionRecord = rec; - except_ptrs.ContextRecord = context; - data->se_translator(rec->ExceptionCode, &except_ptrs); + ctx.dest_frame = frame; + ctx.orig_frame = orig_frame; + ctx.dispatch = dispatch; + ctx.descr = descr; + __TRY + { + except_ptrs.ExceptionRecord = rec; + except_ptrs.ContextRecord = context; + data->se_translator(rec->ExceptionCode, &except_ptrs); + } + __EXCEPT_CTX(se_translation_filter, &ctx) + { + } + __ENDTRY } }

1 0

Piotr Caban : include: Add __EXCEPT_CTX/__FINALLY_CTX macros.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 3eae4807dcee36341eeaf0a89a1ded7b51a0c4a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eae4807dcee36341eeaf0a89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 31 12:39:29 2017 +0200 include: Add __EXCEPT_CTX/__FINALLY_CTX macros. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exception.c | 38 ++++++++++++++++++++++++++++++++++++++ include/wine/exception.h | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index c81c821..0e00f73 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -99,6 +99,31 @@ DWORD __wine_exception_handler( EXCEPTION_RECORD *record, unwind_frame( record, frame ); } +DWORD __wine_exception_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + EXCEPTION_POINTERS ptrs; + + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + return ExceptionContinueSearch; + + ptrs.ExceptionRecord = record; + ptrs.ContextRecord = context; + switch(wine_frame->u.filter_ctx( &ptrs, wine_frame->ctx )) + { + case EXCEPTION_CONTINUE_SEARCH: + return ExceptionContinueSearch; + case EXCEPTION_CONTINUE_EXECUTION: + return ExceptionContinueExecution; + case EXCEPTION_EXECUTE_HANDLER: + break; + } + unwind_frame( record, frame ); +} + DWORD __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, @@ -133,3 +158,16 @@ DWORD __wine_finally_handler( EXCEPTION_RECORD *record, } return ExceptionContinueSearch; } + +DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) +{ + if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + { + __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; + wine_frame->u.finally_func_ctx( FALSE, wine_frame->ctx ); + } + return ExceptionContinueSearch; +} diff --git a/include/wine/exception.h b/include/wine/exception.h index f275568..5bc4d1c 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -81,7 +81,9 @@ extern "C" { #define __TRY __try #define __EXCEPT(func) __except((func)(GetExceptionInformation())) +#define __EXCEPT_CTX(func, ctx) __except((func)(GetExceptionInformation(), ctx)) #define __FINALLY(func) __finally { (func)(!AbnormalTermination()); } +#define __FINALLY_CTX(func, ctx) __finally { (func)(!AbnormalTermination(), ctx); } #define __ENDTRY /*nothing*/ #define __EXCEPT_PAGE_FAULT __except(GetExceptionCode() == EXCEPTION_ACCESS_VIOLATION) #define __EXCEPT_ALL __except(EXCEPTION_EXECUTE_HANDLER) @@ -100,6 +102,10 @@ extern DWORD __wine_exception_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; +extern DWORD __wine_exception_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; extern DWORD __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, @@ -112,6 +118,10 @@ extern DWORD __wine_finally_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; +extern DWORD __wine_finally_ctx_handler( EXCEPTION_RECORD *record, + EXCEPTION_REGISTRATION_RECORD *frame, + CONTEXT *context, + EXCEPTION_REGISTRATION_RECORD **pdispatcher ) DECLSPEC_HIDDEN; #define __TRY \ do { __WINE_FRAME __f; \ @@ -131,6 +141,18 @@ extern DWORD __wine_finally_handler( EXCEPTION_RECORD *record, const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { +#define __EXCEPT_CTX(func, context) \ + } while(0); \ + __wine_pop_frame( &__f.frame ); \ + break; \ + } else { \ + __f.frame.Handler = __wine_exception_ctx_handler; \ + __f.u.filter_ctx = (func); \ + __f.ctx = context; \ + if (sigsetjmp( __f.jmp, 0 )) { \ + const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ + do { + /* convenience handler for page fault exceptions */ #define __EXCEPT_PAGE_FAULT \ } while(0); \ @@ -175,9 +197,25 @@ extern DWORD __wine_finally_handler( EXCEPTION_RECORD *record, } \ } while (0); +#define __FINALLY_CTX(func, context) \ + } while(0); \ + __wine_pop_frame( &__f.frame ); \ + (func)(1, context); \ + break; \ + } else { \ + __f.frame.Handler = __wine_finally_ctx_handler; \ + __f.u.finally_func_ctx = (func); \ + __f.ctx = context; \ + __wine_push_frame( &__f.frame ); \ + __first = 0; \ + } \ + } while (0); + typedef LONG (CALLBACK *__WINE_FILTER)(PEXCEPTION_POINTERS); +typedef LONG (CALLBACK *__WINE_FILTER_CTX)(PEXCEPTION_POINTERS, void*); typedef void (CALLBACK *__WINE_FINALLY)(BOOL); +typedef void (CALLBACK *__WINE_FINALLY_CTX)(BOOL, void*); #define GetExceptionInformation() (__eptr) #define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode) @@ -190,9 +228,12 @@ typedef struct __tagWINE_FRAME { /* exception data */ __WINE_FILTER filter; + __WINE_FILTER_CTX filter_ctx; /* finally data */ __WINE_FINALLY finally_func; + __WINE_FINALLY_CTX finally_func_ctx; } u; + void *ctx; sigjmp_buf jmp; /* hack to make GetExceptionCode() work in handler */ DWORD ExceptionCode;

1 0

Hugh McMaster : regedit: Update handling of the 'Modify' menu items.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: f0949baafc4c63ab5796eff0e9c4fe30d1659d5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0949baafc4c63ab5796eff0e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:58:24 2017 +0000 regedit: Update handling of the 'Modify' menu items. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index d3dffdc..9853810 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -137,10 +137,11 @@ static void update_modify_items(HMENU hMenu, int index) { unsigned int state = MF_ENABLED; - if (!g_pChildWnd->nFocusPanel || index == -1) + if (index == -1) state = MF_GRAYED; EnableMenuItem(hMenu, ID_EDIT_MODIFY, state | MF_BYCOMMAND); + EnableMenuItem(hMenu, ID_EDIT_MODIFY_BIN, state | MF_BYCOMMAND); } static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName, int index)

1 0

Hugh McMaster : regedit: Only show the 'Modify' menu items when the listview has focus.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: adf298685f97e3d8faaee2f7440d5d417d360da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adf298685f97e3d8faaee2f74… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:58:14 2017 +0000 regedit: Only show the 'Modify' menu items when the listview has focus. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 164 ++++++++++++++++++++++---------------------- po/bg.po | 162 +++++++++++++++++++++---------------------- po/ca.po | 164 ++++++++++++++++++++++---------------------- po/cs.po | 164 ++++++++++++++++++++++---------------------- po/da.po | 164 ++++++++++++++++++++++---------------------- po/de.po | 164 ++++++++++++++++++++++---------------------- po/el.po | 162 +++++++++++++++++++++---------------------- po/en.po | 164 ++++++++++++++++++++++---------------------- po/en_US.po | 164 ++++++++++++++++++++++---------------------- po/eo.po | 164 ++++++++++++++++++++++---------------------- po/es.po | 164 ++++++++++++++++++++++---------------------- po/fa.po | 162 +++++++++++++++++++++---------------------- po/fi.po | 164 ++++++++++++++++++++++---------------------- po/fr.po | 164 ++++++++++++++++++++++---------------------- po/he.po | 164 ++++++++++++++++++++++---------------------- po/hi.po | 162 +++++++++++++++++++++---------------------- po/hr.po | 162 +++++++++++++++++++++---------------------- po/hu.po | 164 ++++++++++++++++++++++---------------------- po/it.po | 164 ++++++++++++++++++++++---------------------- po/ja.po | 164 ++++++++++++++++++++++---------------------- po/ko.po | 164 ++++++++++++++++++++++---------------------- po/lt.po | 164 ++++++++++++++++++++++---------------------- po/ml.po | 162 +++++++++++++++++++++---------------------- po/nb_NO.po | 164 ++++++++++++++++++++++---------------------- po/nl.po | 164 ++++++++++++++++++++++---------------------- po/or.po | 162 +++++++++++++++++++++---------------------- po/pa.po | 162 +++++++++++++++++++++---------------------- po/pl.po | 164 ++++++++++++++++++++++---------------------- po/pt_BR.po | 164 ++++++++++++++++++++++---------------------- po/pt_PT.po | 164 ++++++++++++++++++++++---------------------- po/rm.po | 162 +++++++++++++++++++++---------------------- po/ro.po | 164 ++++++++++++++++++++++---------------------- po/ru.po | 164 ++++++++++++++++++++++---------------------- po/sk.po | 162 +++++++++++++++++++++---------------------- po/sl.po | 164 ++++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 162 +++++++++++++++++++++---------------------- po/sr_RS(a)latin.po | 162 +++++++++++++++++++++---------------------- po/sv.po | 164 ++++++++++++++++++++++---------------------- po/te.po | 162 +++++++++++++++++++++---------------------- po/th.po | 162 +++++++++++++++++++++---------------------- po/tr.po | 164 ++++++++++++++++++++++---------------------- po/uk.po | 164 ++++++++++++++++++++++---------------------- po/wa.po | 162 +++++++++++++++++++++---------------------- po/wine.pot | 162 +++++++++++++++++++++---------------------- po/zh_CN.po | 164 ++++++++++++++++++++++---------------------- po/zh_TW.po | 164 ++++++++++++++++++++++---------------------- programs/regedit/framewnd.c | 22 +++++- programs/regedit/regedit.rc | 6 +- programs/regedit/resource.h | 2 + 49 files changed, 3810 insertions(+), 3732 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adf298685f97e3d8faaee…

1 0

Hugh McMaster : regedit: Use the treeview item label in the 'Favourites' menu instead of the key path.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 46bff016ab9b6f698a5934d044a7c981704bf72e URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bff016ab9b6f698a5934d04… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:58:04 2017 +0000 regedit: Use the treeview item label in the 'Favourites' menu instead of the key path. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index e654d48..7e48513 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -646,15 +646,21 @@ static INT_PTR CALLBACK addtofavorites_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w switch(uMsg) { case WM_INITDIALOG: { - HKEY hKeyRoot = NULL; - LPWSTR ItemPath = GetItemPath(g_pChildWnd->hTreeWnd, NULL, &hKeyRoot); + HTREEITEM selected; + TVITEMW item; + WCHAR buf[128]; + + selected = (HTREEITEM)SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETNEXTITEM, TVGN_CARET, 0); + + item.mask = TVIF_HANDLE | TVIF_TEXT; + item.hItem = selected; + item.pszText = buf; + item.cchTextMax = COUNT_OF(buf); + SendMessageW(g_pChildWnd->hTreeWnd, TVM_GETITEMW, 0, (LPARAM)&item); - if(!ItemPath || !*ItemPath) - ItemPath = GetItemFullPath(g_pChildWnd->hTreeWnd, NULL, FALSE); EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); - SetWindowTextW(hwndValue, ItemPath); + SetWindowTextW(hwndValue, buf); SendMessageW(hwndValue, EM_SETLIMITTEXT, 127, 0); - HeapFree(GetProcessHeap(), 0, ItemPath); return TRUE; } case WM_COMMAND:

1 0

Hugh McMaster : regedit: Re-implement favourite registry key handling.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 27b2519ca47192349fdcb5e09fe9eee10d00526f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27b2519ca47192349fdcb5e09… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 5 00:57:53 2017 +0000 regedit: Re-implement favourite registry key handling. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 77 +++++++++++++++++++++++++++------------------ programs/regedit/regproc.c | 13 -------- programs/regedit/regproc.h | 9 ++++++ 3 files changed, 56 insertions(+), 43 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index cd7dad0..e654d48 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -198,38 +198,55 @@ static void UpdateMenuItems(HMENU hMenu) { HeapFree(GetProcessHeap(), 0, keyName); } -static void OnInitMenuPopup(HWND hWnd, HMENU hMenu, short wItem) +static void add_favourite_key_menu_items(HMENU hMenu) { - if (wItem == 3) { - HKEY hKey; - while(GetMenuItemCount(hMenu)>2) + HKEY hkey; + LONG rc; + DWORD num_values, max_value_len, value_len, type, i; + WCHAR *value_name; + + rc = RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, 0, KEY_READ, &hkey); + if (rc != ERROR_SUCCESS) return; + + rc = RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, &num_values, + &max_value_len, NULL, NULL, NULL); + if (rc != ERROR_SUCCESS) + { + ERR("RegQueryInfoKey failed: %d\n", rc); + goto exit; + } + + if (!num_values) goto exit; + + max_value_len++; + value_name = HeapAlloc(GetProcessHeap(), 0, max_value_len * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(value_name); + + AppendMenuW(hMenu, MF_SEPARATOR, 0, 0); + + for (i = 0; i < num_values; i++) + { + value_len = max_value_len; + rc = RegEnumValueW(hkey, i, value_name, &value_len, NULL, &type, NULL, NULL); + if (rc == ERROR_SUCCESS && type == REG_SZ) + AppendMenuW(hMenu, MF_ENABLED | MF_STRING, ID_FAVORITE_FIRST + i, value_name); + } + + HeapFree(GetProcessHeap(), 0, value_name); +exit: + RegCloseKey(hkey); +} + +static void OnInitMenuPopup(HWND hWnd, HMENU hMenu) +{ + if (hMenu == GetSubMenu(hMenuFrame, ID_FAVORITES_MENU)) + { + while (GetMenuItemCount(hMenu) > 2) DeleteMenu(hMenu, 2, MF_BYPOSITION); - if (RegOpenKeyExW(HKEY_CURRENT_USER, favoritesKey, - 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - WCHAR namebuf[KEY_MAX_LEN]; - BYTE valuebuf[4096]; - int i = 0; - BOOL sep = FALSE; - DWORD ksize, vsize, type; - LONG error; - do { - ksize = KEY_MAX_LEN; - vsize = sizeof(valuebuf); - error = RegEnumValueW(hKey, i, namebuf, &ksize, NULL, &type, valuebuf, &vsize); - if (error != ERROR_SUCCESS) - break; - if (type == REG_SZ) { - if (!sep) { - AppendMenuW(hMenu, MF_SEPARATOR, -1, NULL); - sep = TRUE; - } - AppendMenuW(hMenu, MF_STRING, ID_FAVORITE_FIRST+i, namebuf); - } - i++; - } while(error == ERROR_SUCCESS); - RegCloseKey(hKey); - } + + add_favourite_key_menu_items(hMenu); } + UpdateMenuItems(hMenu); } @@ -1056,7 +1073,7 @@ LRESULT CALLBACK FrameWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa break; case WM_INITMENUPOPUP: if (!HIWORD(lParam)) - OnInitMenuPopup(hWnd, (HMENU)wParam, LOWORD(lParam)); + OnInitMenuPopup(hWnd, (HMENU)wParam); break; case WM_MENUSELECT: OnMenuSelect(hWnd, LOWORD(wParam), HIWORD(wParam), (HMENU)lParam); diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 10b4a38..d5be72f 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -50,19 +50,6 @@ static HKEY reg_class_keys[] = { #define ARRAY_SIZE(A) (sizeof(A)/sizeof(*A)) -/* return values */ -#define NOT_ENOUGH_MEMORY 1 - -/* processing macros */ - -/* common check of memory allocation results */ -#define CHECK_ENOUGH_MEMORY(p) \ -if (!(p)) \ -{ \ - output_message(STRING_OUT_OF_MEMORY, __FILE__, __LINE__); \ - exit(NOT_ENOUGH_MEMORY); \ -} - /****************************************************************************** * Allocates memory and converts input from multibyte to wide chars * Returned string must be freed by the caller diff --git a/programs/regedit/regproc.h b/programs/regedit/regproc.h index aff4bee..72e6b38 100644 --- a/programs/regedit/regproc.h +++ b/programs/regedit/regproc.h @@ -24,6 +24,15 @@ #define REG_FORMAT_5 1 #define REG_FORMAT_4 2 +#define NOT_ENOUGH_MEMORY 1 + +#define CHECK_ENOUGH_MEMORY(p) \ +if (!(p)) \ +{ \ + output_message(STRING_OUT_OF_MEMORY, __FILE__, __LINE__); \ + exit(NOT_ENOUGH_MEMORY); \ +} + void __cdecl output_message(unsigned int id, ...); BOOL export_registry_key(WCHAR *file_name, WCHAR *reg_key_name, DWORD format);

1 0

Nikolay Sivov : shell32: Avoid zero length allocations when converting path in ExtractIconA() ( Valgrind).
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 1a5561c0cf202805436dd58635f6f61b8254d3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a5561c0cf202805436dd5863… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:10:28 2017 +0300 shell32: Avoid zero length allocations when converting path in ExtractIconA() (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 15 +++++++-------- dlls/shell32/shell32_main.h | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 04924c0..34b906c 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -846,17 +846,16 @@ HICON WINAPI DuplicateIcon( HINSTANCE hInstance, HICON hIcon) /************************************************************************* * ExtractIconA [SHELL32.@] */ -HICON WINAPI ExtractIconA(HINSTANCE hInstance, LPCSTR lpszFile, UINT nIconIndex) -{ +HICON WINAPI ExtractIconA(HINSTANCE hInstance, const char *file, UINT nIconIndex) +{ + WCHAR *fileW; HICON ret; - INT len = MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, NULL, 0); - LPWSTR lpwstrFile = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - TRACE("%p %s %d\n", hInstance, lpszFile, nIconIndex); + TRACE("%p %s %d\n", hInstance, debugstr_a(file), nIconIndex); - MultiByteToWideChar(CP_ACP, 0, lpszFile, -1, lpwstrFile, len); - ret = ExtractIconW(hInstance, lpwstrFile, nIconIndex); - HeapFree(GetProcessHeap(), 0, lpwstrFile); + fileW = strdupAtoW(file); + ret = ExtractIconW(hInstance, fileW, nIconIndex); + HeapFree(GetProcessHeap(), 0, fileW); return ret; } diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 941ca74..fc2a5ba 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -236,4 +236,19 @@ static inline WCHAR *strdupW(const WCHAR *src) return dest; } +static inline WCHAR *strdupAtoW(const char *str) +{ + WCHAR *ret; + DWORD len; + + if (!str) return NULL; + + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + + return ret; +} + #endif

1 0

Nikolay Sivov : mf: Added IMFMediaSession stub.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 58adb553e4b7181628d2a7e5712fd30ab417ccae URL: http://source.winehq.org/git/wine.git/?a=commit;h=58adb553e4b7181628d2a7e57… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 5 02:09:48 2017 +0300 mf: Added IMFMediaSession stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 + dlls/mf/mf.spec | 2 +- dlls/mf/session.c | 264 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 267 insertions(+), 1 deletion(-) diff --git a/dlls/mf/Makefile.in b/dlls/mf/Makefile.in index 6725d5b..9c61d94 100644 --- a/dlls/mf/Makefile.in +++ b/dlls/mf/Makefile.in @@ -3,4 +3,5 @@ IMPORTLIB = mf C_SRCS = \ main.c \ + session.c \ topology.c diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index cd6d3dc..3b02bd2 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -39,7 +39,7 @@ @ stub MFCreateMP3MediaSink @ stub MFCreateMPEG4MediaSink @ stub MFCreateMediaProcessor -@ stub MFCreateMediaSession +@ stdcall MFCreateMediaSession(ptr ptr) @ stub MFCreateNSCByteStreamPlugin @ stub MFCreateNetSchemePlugin @ stub MFCreatePMPHost diff --git a/dlls/mf/session.c b/dlls/mf/session.c new file mode 100644 index 0000000..18c5f3b --- /dev/null +++ b/dlls/mf/session.c @@ -0,0 +1,264 @@ +/* + * Copyright 2017 Nikolay Sivov + * + * This library 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 Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "mfidl.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mfplat); + +typedef struct mfsession +{ + IMFMediaSession IMFMediaSession_iface; + LONG ref; +} mfsession; + +static inline mfsession *impl_from_IMFMediaSession(IMFMediaSession *iface) +{ + return CONTAINING_RECORD(iface, mfsession, IMFMediaSession_iface); +} + +static HRESULT WINAPI mfsession_QueryInterface(IMFMediaSession *iface, REFIID riid, void **out) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFMediaSession) || + IsEqualIID(riid, &IID_IMFMediaEventGenerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = &This->IMFMediaSession_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfsession_AddRef(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfsession_Release(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfsession_GetEvent(IMFMediaSession *iface, DWORD flags, IMFMediaEvent **event) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %p)\n", This, flags, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_BeginGetEvent(IMFMediaSession *iface, IMFAsyncCallback *callback, IUnknown *state) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p, %p)\n", This, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_EndGetEvent(IMFMediaSession *iface, IMFAsyncResult *result, IMFMediaEvent **event) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p, %p)\n", This, result, event); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_QueueEvent(IMFMediaSession *iface, MediaEventType event_type, REFGUID ext_type, + HRESULT hr, const PROPVARIANT *value) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%d, %s, %#x, %p)\n", This, event_type, debugstr_guid(ext_type), hr, value); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_SetTopology(IMFMediaSession *iface, DWORD flags, IMFTopology *topology) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %p)\n", This, flags, topology); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_ClearTopologies(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Start(IMFMediaSession *iface, const GUID *format, const PROPVARIANT *start) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%s, %p)\n", This, debugstr_guid(format), start); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Pause(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Stop(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetClock(IMFMediaSession *iface, IMFClock **clock) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p)\n", This, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetSessionCapabilities(IMFMediaSession *iface, DWORD *caps) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%p)\n", This, caps); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsession_GetFullTopology(IMFMediaSession *iface, DWORD flags, TOPOID id, IMFTopology **topology) +{ + mfsession *This = impl_from_IMFMediaSession(iface); + + FIXME("(%p)->(%#x, %s, %p)\n", This, flags, wine_dbgstr_longlong(id), topology); + + return E_NOTIMPL; +} + +static const IMFMediaSessionVtbl mfmediasessionvtbl = +{ + mfsession_QueryInterface, + mfsession_AddRef, + mfsession_Release, + mfsession_GetEvent, + mfsession_BeginGetEvent, + mfsession_EndGetEvent, + mfsession_QueueEvent, + mfsession_SetTopology, + mfsession_ClearTopologies, + mfsession_Start, + mfsession_Pause, + mfsession_Stop, + mfsession_Close, + mfsession_Shutdown, + mfsession_GetClock, + mfsession_GetSessionCapabilities, + mfsession_GetFullTopology, +}; + +/*********************************************************************** + * MFCreateTopology (mf.@) + */ +HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session) +{ + mfsession *object; + + TRACE("(%p, %p)\n", config, session); + + if (!session) + return E_POINTER; + + if (config) + FIXME("session configuration ignored\n"); + + object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaSession_iface.lpVtbl = &mfmediasessionvtbl; + object->ref = 1; + + *session = &object->IMFMediaSession_iface; + + return S_OK; +} diff --git a/include/mfidl.idl b/include/mfidl.idl index 767ff42..45b4957 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -163,5 +163,6 @@ interface IMFSourceResolver : IUnknown [local] HRESULT CanceObjectCreation([in] IUnknown *cancel_cookie); } +cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);")

1 0

André Hentschel : ntdll: Fix Cpsr value in CONTEXT_ARM64.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 99db4c697d0349f31879126adcb9d365383513c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99db4c697d0349f31879126ad… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jun 4 18:51:59 2017 +0200 ntdll: Fix Cpsr value in CONTEXT_ARM64. The CPU can be configured to not allow reading DAIF in EL0t (User Mode), and for debugging purpose NZCV might be more interesting. Reported by Stefan Dösinger Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 14c5260..ca169a1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -185,7 +185,7 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */ "str w1, [x0]\n\t" /* context->ContextFlags */ /* 32-bit, look at cpsr */ - "mrs x1, DAIF\n\t" + "mrs x1, NZCV\n\t" "str w1, [x0, #0x4]\n\t" /* context->Cpsr */ "ldp x0, x1, [sp], #32\n\t" "str x0, [x0, #0x8]\n\t" /* context->X0 */

1 0

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: 37d7c519053b0cf30334acf087db67f804892ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d7c519053b0cf30334acf08… Author: Marcin Mikołajczak <me(a)m4sk.in> Date: Sat Jun 3 20:42:16 2017 +0200 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <me(a)m4sk.in> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 53 ++++++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/po/pl.po b/po/pl.po index 50231bc..de2a989 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,20 +2,20 @@ # # Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014. # Adam "Saibamen" Stachowicz <saibamenppl(a)gmail.com>, 2015. -# Marcin Mikołajczak <marcin123407(a)vivaldi.net>, 2017. +# Marcin Mikołajczak <me(a)m4sk.in>, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-04-05 21:48+0200\n" -"Last-Translator: Marcin Mikołajczak <marcin123407(a)vivaldi.net>\n" +"PO-Revision-Date: 2017-06-03 20:40+0200\n" +"Last-Translator: Marcin Mikołajczak <me(a)m4sk.in>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.8.11\n" +"X-Generator: Poedit 2.0.1\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -11807,11 +11807,8 @@ msgid "&About Registry Editor" msgstr "Edytor rejestru - i&nformacje" #: regedit.rc:91 regedit.rc:98 regedit.rc:231 -#, fuzzy -#| msgctxt "object state" -#| msgid "expanded" msgid "Expand" -msgstr "rozwinięty" +msgstr "Rozwiń" #: regedit.rc:136 msgid "Modify Binary Data..." @@ -11914,13 +11911,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Zawiera polecenia dla dostępu do często używanych klawiszy" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" -msgstr "Zawiera polecenia wyświetlające informacje o programie" +msgstr "" +"Zawiera polecenia wyświetlające pomoc i informacje dotyczące edytora rejestru" #: regedit.rc:166 msgid "Contains commands for creating new keys or values" @@ -12161,14 +12155,10 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Nie udało się usunąć klasy rejestru '%1'.\n" #: regedit.rc:430 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Nie rozpoznano linii '%1'.\n" +msgstr "regedit: Wiersz zawiera nieprawidłową składnię.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Kończy działanie edytora rejestru" @@ -12185,10 +12175,8 @@ msgid "Shows or hides the status bar" msgstr "Pokazuje lub ukrywa pasek stanu" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Zmienia pozycję podziału pomiędzy dwoma okienkami" +msgstr "Zmienia pozycję podziału pomiędzy dwoma oknami" #: regedit.rc:194 msgid "Refreshes the window" @@ -12232,10 +12220,8 @@ msgid "Adds a new binary value" msgstr "Dodaje nową wartość binarną" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Dodaje nową wartość binarną" +msgstr "Dodaje nową wartość 32-bitową" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12250,10 +12236,8 @@ msgid "Prints all or part of the registry" msgstr "Drukuje całość lub część rejestru" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Edytor rejestru" +msgstr "Otwiera pomoc edytora rejestru" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12296,26 +12280,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Nie można odnaleźć klucza rejestru '%1'." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Umożliwia zmianę wartości danej" +msgstr "Modyfikuje wartość rejestru w formie binarnej" #: regedit.rc:177 msgid "Adds a new multi-string value" msgstr "Dodaje nową wartość ciągu rozwijalnego" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Eksportuje zaznaczoną gałąź rejestru do pliku tekstowego" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Dodaje nową wartość ciągu" +msgstr "Dodaje nową rozwiniętą wartość ciągu" #: regedit.rc:213 msgid "Confirm Key Delete" @@ -12328,11 +12306,8 @@ msgstr "" "Czy na pewno chcesz usunąć klucz rejestru '%1' i wszystkie jego pochodne?" #: regedit.rc:232 -#, fuzzy -#| msgctxt "object state" -#| msgid "collapsed" msgid "Collapse" -msgstr "zwinięty" +msgstr "Zwiń" #: regsvr32.rc:32 msgid ""

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: wine Branch: master Commit: e6f225fc5f36a22a709d2cb0dfe0a53a722309ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f225fc5f36a22a709d2cb0d… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Sat Jun 3 07:44:47 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/po/lt.po b/po/lt.po index 651dce7..33e1718 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-05-25 08:05+0300\n" +"PO-Revision-Date: 2017-06-03 07:42+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11027,7 +11027,7 @@ msgstr "&Sistemos konfigūracija" #: oleview.rc:36 msgid "&Run the Registry Editor" -msgstr "Paleisti &registro tvarkytuvę" +msgstr "Paleisti &Registro tvarkytuvę" #: oleview.rc:42 msgid "&CoCreateInstance Flag" @@ -11199,7 +11199,7 @@ msgstr "Keisti paskirstytojo COM kompiuterio nustatymus" #: oleview.rc:108 msgid "Run the Wine registry editor" -msgstr "Paleisti „Wine“ registro tvarkytuvę" +msgstr "Paleisti „Wine“ Registro tvarkytuvę" #: oleview.rc:109 msgid "Quit the application. Prompts to save changes" @@ -11871,14 +11871,10 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Pateikiamos komandos dažnai naudojamų raktų prieigai" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" -"Pateikiamos komandos žinyno ir informacijos apie registro tvarkytuvę rodymui" +"Pateikiamos komandos žinyno ir informacijos apie Registro tvarkytuvę rodymui" #: regedit.rc:166 msgid "Contains commands for creating new keys or values" @@ -12119,10 +12115,8 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: Eilutėje yra netinkama sintaksė.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" -msgstr "Išeina iš registro tvarkytuvės" +msgstr "Išeina iš Registro tvarkytuvės" #: regedit.rc:190 msgid "Adds keys to the favorites list" @@ -12137,8 +12131,6 @@ msgid "Shows or hides the status bar" msgstr "Parodo arba paslepia būsenos juostą" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" msgstr "Pakeičia polangių skirtuko poziciją tarp polangių" @@ -12183,10 +12175,8 @@ msgid "Adds a new binary value" msgstr "Prideda naują dvejetainę reikšmę" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Prideda naują dvejetainę reikšmę" +msgstr "Prideda naują 32-bitų reikšmę" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12201,10 +12191,8 @@ msgid "Prints all or part of the registry" msgstr "Atspausdina visą ar dalį registro" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Registro tvarkytuvė" +msgstr "Atveria Registro tvarkytuvės žinyną" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12247,26 +12235,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Nepavyko užklausti registro rakto „%1“." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Modifikuoja reikšmės duomenis" +msgstr "Modifikuoja reikšmės duomenis dvejetainiu formatu" #: regedit.rc:177 msgid "Adds a new multi-string value" msgstr "Prideda naują kelių eilučių reikšmę" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" msgstr "Eksportuoja pasirinktą registro šaką į tekstinį failą" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Prideda naują eilutės reikšmę" +msgstr "Prideda naują išplečiamos eilutės reikšmę" #: regedit.rc:213 msgid "Confirm Key Delete"

1 0

Jeremy Newman : changes went live
by Jeremy Newman 05 Jun '17

05 Jun '17

Module: appdb Branch: master Commit: 160b16a39334d26186f3d56875216c6a744ea43b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=160b16a39334d26186f3d568… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Jun 5 15:55:13 2017 -0500 changes went live --- tables/alter.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/tables/alter.sql b/tables/alter.sql index b8187cd..457f8d9 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,3 +1,2 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ -ALTER TABLE testResults ADD column staging tinyint(1) not null default '0' AFTER testedRelease;

1 0

Rosanne DiMesio : Identify wine-staging versions in test data
by Jeremy Newman 05 Jun '17

05 Jun '17

Module: appdb Branch: master Commit: b40e6593fa26587f1bf2b1929358c137287a0beb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b40e6593fa26587f1bf2b192… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Jun 5 15:49:51 2017 -0500 Identify wine-staging versions in test data Adds a "staging" field to the testResults table and a checkbox for wine-staging to the tested release section of the test submission form. Appends -staging to the version displayed in the test results table when it is checked. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 37 +++++++++++++++++++++++++++---------- tables/alter.sql | 1 + tables/testResults.sql | 1 + 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/include/testData.php b/include/testData.php index 07918bb..6a375ba 100644 --- a/include/testData.php +++ b/include/testData.php @@ -13,6 +13,7 @@ class testData{ var $shWhatDoesnt; var $shWhatNotTested; var $sTestedRelease; + var $iStaging; var $iDistributionId; var $sTestedDate; var $sInstalls; @@ -50,6 +51,7 @@ class testData{ $this->sTestedDate = $oRow->testedDate; $this->iDistributionId = $oRow->distributionId; $this->sTestedRelease = $oRow->testedRelease; + $this->iStaging = $oRow->staging; $this->sInstalls = $oRow->installs; $this->sRuns = $oRow->runs; $this->sTestedRating = $oRow->testedRating; @@ -71,16 +73,17 @@ class testData{ $hResult = query_parameters("INSERT INTO testResults (versionId, whatWorks, whatDoesnt,". "whatNotTested, testedDate, distributionId, testedRelease,". - "installs, runs, testedRating, comments,". + "staging, installs, runs, testedRating, comments,". "submitTime, submitterId, state)". "VALUES('?', '?', '?', '?', '?', '?', '?',". - "'?', '?', '?', '?',". + "'?', '?', '?', '?', '?',". "?, '?', '?')", $this->iVersionId, $this->shWhatWorks, $this->shWhatDoesnt, $this->shWhatNotTested, $this->sTestedDate, $this->iDistributionId, - $this->sTestedRelease, $this->sInstalls, + $this->sTestedRelease, $this->iStaging, + $this->sInstalls, $this->sRuns, $this->sTestedRating, $this->sComments, "NOW()", @@ -201,6 +204,7 @@ class testData{ testedDate = '?', distributionId = '?', testedRelease = '?', + staging = '?', installs = '?', runs = '?', testedRating = '?', @@ -214,6 +218,7 @@ class testData{ $this->sTestedDate, $this->iDistributionId, $this->sTestedRelease, + $this->iStaging, $this->sInstalls, $this->sRuns, $this->sTestedRating, @@ -588,7 +593,7 @@ class testData{ $oTableRow->AddCell($oTableCell); $oTableRow->AddTextCell($oDistribution->objectMakeLink()); $oTableRow->AddTextCell(date("M d Y", mysqldatetime_to_unixtimestamp($this->sTestedDate))); - $oTableRow->AddTextCell($this->sTestedRelease.' '); + $oTableRow->AddTextCell(($this->sTestedRelease).($this->iStaging != 0 ? '-staging':'')); $oTableRow->AddTextCell($this->sInstalls.' '); $oTableRow->AddTextCell($this->sRuns.' '); $oTableCell = new TableCell($this->sTestedRating); @@ -728,7 +733,7 @@ class testData{ The $sDate parameter can be used to calculate the rating at a given point in time */ public static function getRatingInfoForVersionId($iVersionId, $sDate = 'NOW()') { - $sQuery = "SELECT testedRating,testedDate,testedRelease,versions.id as versionId + $sQuery = "SELECT testedRating,testedDate,testedRelease,staging,versions.id as versionId FROM testResults, ?.versions WHERE versions.value = testResults.testedRelease AND @@ -885,7 +890,15 @@ class testData{ echo '<tr><td class=color1><b>Tested release</b></td><td class=color0>',"\n"; echo make_bugzilla_version_list("sTestedRelease", $this->sTestedRelease); // Give the user some information about our available versions - echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span>"; + echo "<span>Version not listed? Your Wine is too old, <a href=\"//winehq.org/download\">upgrade!</a></span><br>"; + // Checkbox for Wine-staging + echo '<label class="btn btn-secondary">'; + if($this->iStaging != 0) + echo '<input type="checkbox" name="iStaging" value="1" checked>'; + else + echo '<input type="checkbox" name="iStaging" value="1">'; + echo ' Wine-staging'; + echo '</label>'; echo '</td></tr>',"\n"; // Installs @@ -911,7 +924,8 @@ class testData{ // Display confirmation box for changing the Wine version $oOldTest = new testData($this->iTestingId); - if($this->iTestingId && $oOldTest->sTestedRelease != $this->sTestedRelease) + if($this->iTestingId && $oOldTest->sTestedRelease != $this->sTestedRelease + || $this-iTestingId && $oOldTest->iStaging != $this->iStaging) { if(getInput('bConfirmTestedVersionChange', $aClean) != 'true') { @@ -957,7 +971,9 @@ class testData{ // to submit new reports instead of updating existing ones when testing new Wines $oOldTest = new testData($this->iTestingId); if($this->iTestingId && $oOldTest->sTestedRelease != getInput('sTestedRelease', $aValues) && - getInput('bConfirmTestedVersionChange', $aValues) != 'true') + getInput('bConfirmTestedVersionChange', $aValues) != 'true' + || $this->iTestingId && $oOldTest->iStaging != getInput('iStaging', $aValues) && + getInput('bConfirmTestedVersionChange', $aValues) != 'true') { $errors .= '<li>Are you sure you want to change the Wine version of the report? Please submit a new '. 'test report for every Wine version you test; this is useful for tracking Wine\'s progress. '. @@ -1013,6 +1029,7 @@ class testData{ $this->sTestedDate = $aValues['sTestedDate']; $this->iDistributionId = $aValues['iDistributionId']; $this->sTestedRelease = $aValues['sTestedRelease']; + $this->iStaging = $aValues['iStaging']; $this->sInstalls = $aValues['sInstalls']; $this->sRuns = $aValues['sRuns']; $this->sTestedRating = $aValues['sTestedRating']; @@ -1079,7 +1096,7 @@ class testData{ /* List test data submitted by a given user. Ignore test results for queued applications/versions */ public static function listSubmittedBy($iUserId, $bQueued = true) { - $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); + $hResult = query_parameters("SELECT testResults.versionId, testResults.testedDate, testResults.testedRelease, testResults.testedRating, testResults.staging, testResults.submitTime, testResults.testingId, appFamily.appName, appVersion.versionName from testResults, appFamily, appVersion WHERE testResults.versionId = appVersion.versionId AND appVersion.appId = appFamily.appId AND testResults.submitterId = '?' AND testResults.state = '?' ORDER BY testResults.testingId", $iUserId, $bQueued ? 'queued' : 'accepted'); if(!$hResult || !query_num_rows($hResult)) return false; @@ -1371,7 +1388,7 @@ class testData{ $oTableRow->AddCell(new TableCell($oUser->objectMakeLink())); $oTableRow->AddCell(new TableCell($oApp->objectMakeLink())); $oTableRow->AddCell(new TableCell($oVersion->objectMakeLink())); - $oTableRow->AddCell(new TableCell($this->sTestedRelease)); + $oTableRow->AddCell(new TableCell(($this->sTestedRelease) . ($this->iStaging != 0 ? '-staging':''))); $oTableRow->AddCell(new TableCell($bHasMaintainer ? "YES" : "no")); $oTableRow->AddCell(new TableCell($this->sTestedRating)); diff --git a/tables/alter.sql b/tables/alter.sql index 457f8d9..b8187cd 100644 --- a/tables/alter.sql +++ b/tables/alter.sql @@ -1,2 +1,3 @@ /* append to this file when changes are required to the live db */ /* it will be cleared when the changes go live */ +ALTER TABLE testResults ADD column staging tinyint(1) not null default '0' AFTER testedRelease; diff --git a/tables/testResults.sql b/tables/testResults.sql index 7f88a54..44a52ae 100644 --- a/tables/testResults.sql +++ b/tables/testResults.sql @@ -14,6 +14,7 @@ create table testResults ( testedDate datetime not null, distributionId int not null, testedRelease tinytext, + staging tinyint(1) not null default '0', installs enum('Yes','No','No, but has workaround','N/A') NOT NULL default 'Yes', runs enum('Yes','No','Not Installable') NOT NULL default 'Yes', testedRating enum('Platinum','Gold','Silver','Bronze','Garbage') NOT NULL,

1 0

Francois Gouget : winetest/dissect: Provide more information when rejecting a report.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 3de458939d5bc9fdd2e03f55027ab4e7da42f342 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3de458939d5bc9fdd2e03f55… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:40:17 2017 +0200 winetest/dissect: Provide more information when rejecting a report. Log the test unit where the error occurred and the value of the limit that was exceeded. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/winetest/dissect b/winetest/dissect index 36ab635..99e50fb 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -334,7 +334,7 @@ while ($_ = <IN>) { elsif ($2 eq "skipped") { print SUM "- $module - skipped - - - - -\n"; - mydie "too many dlls skipped by user request" if ++$user_skips > $maxuserskips; + mydie "too many dlls skipped by user request (>$maxuserskips at $module)" if ++$user_skips > $maxuserskips; } } @@ -365,8 +365,8 @@ while (<IN>) { { $testbox->{data} .= "<div class=\"test result skipped\">Skipped by user request.</div>\n"; print SUM "- $dll $unit skipped - - - $source $rev\n"; + mydie "too many test units skipped by user request (>$maxuserskips at $dll:$unit)" if ++$user_skips > $maxuserskips; $dll = undef; - mydie "too many tests skipped by user request" if ++$user_skips > $maxuserskips; } } elsif (/^((?:[0-9a-f]+:)?$unit: (\d+) tests executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\.)\r?$/) { $lines++; @@ -388,11 +388,11 @@ while (<IN>) { if ($1 == 258) { $reason = "test failed: timed out"; } elsif ($1 < 0) { $reason = "test failed: crash"; } $testbox->{data} .= "<div class=\"test end\">$reason</div>\n"; - mydie "too many test failures" if ++$failed_tests > $maxfailedtests; + mydie "too many failed test units (>$maxfailedtests at $dll:$unit)" if ++$failed_tests > $maxfailedtests; } else { $result = "$total $todo $failed $skipped"; if ($failed && ++$failed_tests > $maxfailedtests) { - mydie "too many test failures"; + mydie "too many failed test units (>$maxfailedtests at $dll:$unit)"; } } print SUM "- $dll $unit $result $source $rev\n"; @@ -422,9 +422,9 @@ while (<IN>) { if (defined $dll) { # Either winetest crashed or the report file was cut off if ($filesize == $maxfilesize) { - mydie "report reached file limit (runaway test?)"; + mydie "report reached file size limit (>$maxfilesize bytes at $dll:$unit, runaway test?)"; } else { - mydie "report truncated (winetest crash?)"; + mydie "report truncated at $dll:$unit (winetest crash?)"; } } close SUM or mydie "error writing to '$tmpdir/summary.txt': $!";

1 0

Francois Gouget : winetest/dissect: Require the platform fields to be present.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 99a550fb03cc67fd9985bbfb3d329f18755e6c7f URL: http://source.winehq.org/git/tools.git/?a=commit;h=99a550fb03cc67fd9985bbfb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:40:05 2017 +0200 winetest/dissect: Require the platform fields to be present. Without them we were getting a lot of undefined value perl errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index ccfb15f..36ab635 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -236,6 +236,10 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) { } $box->{data} .= "</table>\n"; +if (!defined $plid or !defined $major or !defined $minor or !defined $product) { + mydie "missing a PlatformId, dwMajorVersion, dwMinorVersion or wProductType field"; +} + my @idmatch = ( # Describes how to match a platform's version information # with a dissect platform id: @@ -284,7 +288,7 @@ if ($wine) { "Darwin" => "mac", "FreeBSD" => "bsd", "SunOS" => "solaris" ); - $version = $host && defined($known_hosts{$host}) ? $known_hosts{$host} : "wine"; + $version = $known_hosts{$host || ""} || "wine"; } if ($wine_build) { my $wine_commit;

1 0

Francois Gouget : winetest: Improve error reporting.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 91e530aba800b9146b16e5e6c5b466932da2da34 URL: http://source.winehq.org/git/tools.git/?a=commit;h=91e530aba800b9146b16e5e6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:39:49 2017 +0200 winetest: Improve error reporting. Add a function to report errors. Always report renaming errors and the reason for the error. Standardize the file open error messages. die, and by extension mydie, does not need a trailing new-line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 14 ++++++++++++- winetest/build-index | 33 +++++++++++++++++++++++------ winetest/dissect | 57 +++++++++++++++++++++++++++++---------------------- winetest/gather | 45 ++++++++++++++++++++++++++++------------ 4 files changed, 104 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=91e530aba800b9146b16…

1 0

Francois Gouget : testbot/WineRunTask: Add consistency checks for todo and skip messages.
by Alexandre Julliard 05 Jun '17

05 Jun '17

Module: tools Branch: master Commit: 031792f30bc9cac6c3ed5cde070050fe997bc740 URL: http://source.winehq.org/git/tools.git/?a=commit;h=031792f30bc9cac6c3ed5cde… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jun 4 00:39:03 2017 +0200 testbot/WineRunTask: Add consistency checks for todo and skip messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 12b83f2..7122c57 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -467,9 +467,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) if (open(my $LogFile, "<", $FullLogFileName)) { # There is more than one test unit when running the full test suite so keep - # track of the current one. Also note that for the TestBot we don't really - # care about the todos and skips - my ($CurrentDll, $CurrentUnit, $LineFailures, $SummaryFailures) = ("", "", 0, 0); + # track of the current one. Note that for the TestBot we don't count or + # complain about misplaced skips. + my ($CurrentDll, $CurrentUnit) = ("", ""); + my ($LineFailures, $LineTodos, $LineSkips) = (0, 0, 0); + my ($SummaryFailures, $SummaryTodos, $SummarySkips) = (0, 0, 0); my ($CurrentIsBroken, %CurrentPids, $CurrentRc, $LogFailures); sub CheckUnit($$) @@ -513,6 +515,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) if (!$CurrentIsBroken) { CheckSummaryCounter($LineFailures, $SummaryFailures, "failure"); + CheckSummaryCounter($LineTodos, $SummaryTodos, "todo"); + CheckSummaryCounter($LineSkips, $SummarySkips, "skip"); } # Note that the summary lines may count some failures twice @@ -556,7 +560,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) $LogFailures += $LineFailures; $CurrentDll = $CurrentUnit = ""; - $LineFailures = $SummaryFailures = 0; + $LineFailures = $LineTodos = $LineSkips = 0; + $SummaryFailures = $SummaryTodos = $SummarySkips = 0; $CurrentIsBroken = 0; $CurrentRc = undef; %CurrentPids = (); @@ -583,6 +588,23 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) CheckUnit($1, "failure"); $LineFailures++; } + elsif ($Line =~ /^([_a-z0-9]+)\.c:\d+: Test marked todo: / or + ($CurrentUnit ne "" and + $Line =~ /($CurrentUnit)\.c:\d+: Test marked todo: /)) + { + CheckUnit($1, "todo"); + $LineTodos++; + } + # TestLauncher's skip message is quite broken + elsif ($Line =~ /^([_a-z0-9]+)(?:\.c)?:\d+:? Tests? skipped: / or + ($CurrentUnit ne "" and + $Line =~ /($CurrentUnit)(?:\.c)?:\d+:? Tests? skipped: /)) + { + # Don't complain and don't count misplaced skips. Only complain if they + # are misreported (see CloseTestUnit). Also TestLauncher uses the wrong + # name in its skip message when skipping tests. + $LineSkips++ if ($1 eq $CurrentUnit or $1 eq $CurrentDll); + } elsif ($Line =~ /^Fatal: test '([_a-z0-9]+)' does not exist/) { # This also replaces a test summary line. @@ -607,11 +629,11 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) CheckUnit($Unit, "unhandled exception"); $LineFailures++; } - elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, \d+ skipped\./ or + elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./ or ($CurrentUnit ne "" and - $Line =~ /(?:([0-9a-f]+):)?($CurrentUnit): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, \d+ skipped\./)) + $Line =~ /(?:([0-9a-f]+):)?($CurrentUnit): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, (\d+) skipped\./)) { - my ($Pid, $Unit, $Todos, $Failures) = ($1, $2, $3, $4); + my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); # Dlls that have only one test unit will run it even if there is # no argument. Also TestLauncher uses the wrong name in its test @@ -621,6 +643,8 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # There may be more than one summary line due to child processes $CurrentPids{$Pid || 0} = 1; $SummaryFailures += $Failures; + $SummaryTodos += $Todos; + $SummarySkips += $Skips; $IsWineTest = 1; } else

1 0

Henri Verbeet : d2d1: Implement d2d_rectangle_geometry_Simplify().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: e5733e7cd40b41bb4d8c0409e9ed5be8fe6d5618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5733e7cd40b41bb4d8c0409e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:35 2017 +0200 d2d1: Implement d2d_rectangle_geometry_Simplify(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 4 + dlls/d2d1/geometry.c | 27 +++- dlls/d2d1/tests/d2d1.c | 347 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 375 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5733e7cd40b41bb4d8c0…

1 0

Henri Verbeet : d2d1: Implement d2d_transformed_geometry_GetBounds().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 828e62c8e257e2741f3d6354a175e0ad87672d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=828e62c8e257e2741f3d6354a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:34 2017 +0200 d2d1: Implement d2d_transformed_geometry_GetBounds(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 11 +++++++++-- dlls/d2d1/tests/d2d1.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index d367f67..d07f68e 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -3066,9 +3066,16 @@ static void STDMETHODCALLTYPE d2d_transformed_geometry_GetFactory(ID2D1Transform static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetBounds(ID2D1TransformedGeometry *iface, const D2D1_MATRIX_3X2_F *transform, D2D1_RECT_F *bounds) { - FIXME("iface %p, transform %p, bounds %p stub!\n", iface, transform, bounds); + struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface); + D2D1_MATRIX_3X2_F g; - return E_NOTIMPL; + TRACE("iface %p, transform %p, bounds %p.\n", iface, transform, bounds); + + g = geometry->transform; + if (transform) + d2d_matrix_multiply(&g, transform); + + return ID2D1Geometry_GetBounds(geometry->u.transformed.src_geometry, &g, bounds); } static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_GetWidenedBounds(ID2D1TransformedGeometry *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f421b18..1387a05 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1838,6 +1838,7 @@ static void test_path_geometry(void) static void test_rectangle_geometry(void) { + ID2D1TransformedGeometry *transformed_geometry; ID2D1RectangleGeometry *geometry; D2D1_MATRIX_3X2_F matrix; D2D1_RECT_F rect, rect2; @@ -1964,8 +1965,46 @@ static void test_rectangle_geometry(void) ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", rect.left, rect.top, rect.right, rect.bottom); - ID2D1RectangleGeometry_Release(geometry); + set_matrix_identity(&matrix); + scale_matrix(&matrix, 4.0f, 5.0f); + rotate_matrix(&matrix, M_PI / 3.0f); + translate_matrix(&matrix, 30.0f, 20.0f); + hr = ID2D1Factory_CreateTransformedGeometry(factory, (ID2D1Geometry *)geometry, &matrix, &transformed_geometry); + ok(SUCCEEDED(hr), "Failed to create transformed geometry, hr %#x.\n", hr); + + ID2D1TransformedGeometry_GetBounds(transformed_geometry, NULL, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, -7.85640717e+01f, 1.79903809e+02f, 1.07179594e+01f, 2.73205078e+02f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + rotate_matrix(&matrix, M_PI / -3.0f); + scale_matrix(&matrix, 0.25f, 0.2f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, 30.0f, 20.0f, 40.0f, 40.0f, 2); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + set_matrix_identity(&matrix); + scale_matrix(&matrix, 2.0f, 0.0f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, -1.57128143e+02f, 0.00000000e+00f, 2.14359188e+01f, 0.00000000e+00f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.0f, 0.5f); + ID2D1TransformedGeometry_GetBounds(transformed_geometry, &matrix, &rect); + ok(SUCCEEDED(hr), "Failed to get bounds.\n"); + match = compare_rect(&rect, 0.00000000e+00f, 8.99519043e+01f, 0.00000000e+00, 1.36602539e+02f, 1); + ok(match, "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}.\n", + rect.left, rect.top, rect.right, rect.bottom); + + ID2D1TransformedGeometry_Release(transformed_geometry); + ID2D1RectangleGeometry_Release(geometry); ID2D1Factory_Release(factory); }

1 0

Henri Verbeet : d2d1: Implement d2d_rectangle_geometry_GetBounds().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 2485305b55a295662162d62f44ac947ae48a0b95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2485305b55a295662162d62f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:33 2017 +0200 d2d1: Implement d2d_rectangle_geometry_GetBounds(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 12 ++++++++++ dlls/d2d1/geometry.c | 45 ++++++++++++++++++++++++------------- dlls/d2d1/render_target.c | 12 ---------- dlls/d2d1/tests/d2d1.c | 57 +++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 94 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2485305b55a295662162d…

1 0

Henri Verbeet : d2d1: Implement d2d_layer_GetSize().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: bc47dc3f41bc0614a824439d77ba74963a7e2f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc47dc3f41bc0614a824439d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:32 2017 +0200 d2d1: Implement d2d_layer_GetSize(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 3 ++- dlls/d2d1/layer.c | 11 +++++++---- dlls/d2d1/render_target.c | 2 +- dlls/d2d1/tests/d2d1.c | 12 ++++++++++++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 12a230b..377adf6 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -242,9 +242,10 @@ struct d2d_layer LONG refcount; ID2D1Factory *factory; + D2D1_SIZE_F size; }; -HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) DECLSPEC_HIDDEN; +HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) DECLSPEC_HIDDEN; struct d2d_mesh { diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c index 0fcd185..25a331b 100644 --- a/dlls/d2d1/layer.c +++ b/dlls/d2d1/layer.c @@ -84,10 +84,11 @@ static void STDMETHODCALLTYPE d2d_layer_GetFactory(ID2D1Layer *iface, ID2D1Facto static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_layer_GetSize(ID2D1Layer *iface, D2D1_SIZE_F *size) { - FIXME("iface %p, size %p stub!\n", iface, size); + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + + TRACE("iface %p, size %p.\n", iface, size); - size->width = 0; - size->height = 0; + *size = layer->size; return size; } @@ -100,7 +101,7 @@ static const struct ID2D1LayerVtbl d2d_layer_vtbl = d2d_layer_GetSize, }; -HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) +HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) { if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) return E_OUTOFMEMORY; @@ -108,6 +109,8 @@ HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; (*layer)->refcount = 1; ID2D1Factory_AddRef((*layer)->factory = factory); + if (size) + (*layer)->size = *size; TRACE("Created layer %p.\n", *layer); diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index ecab51f..ec8e4d0 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -464,7 +464,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTa TRACE("iface %p, size %p, layer %p.\n", iface, size, layer); - if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, &object))) + if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, size, &object))) *layer = &object->ID2D1Layer_iface; return hr; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 72903ef..6993dc6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4536,6 +4536,7 @@ static void test_layer(void) ID3D10Device1 *device; IDXGISurface *surface; ID2D1Layer *layer; + D2D1_SIZE_F size; ULONG refcount; HWND window; HRESULT hr; @@ -4561,6 +4562,17 @@ static void test_layer(void) ID2D1Layer_GetFactory(layer, &layer_factory); ok(layer_factory == factory, "Got unexpected layer factory %p, expected %p.\n", layer_factory, factory); ID2D1Factory_Release(layer_factory); + size = ID2D1Layer_GetSize(layer); + ok(size.width == 0.0f, "Got unexpected width %.8e.\n", size.width); + ok(size.height == 0.0f, "Got unexpected height %.8e.\n", size.height); + ID2D1Layer_Release(layer); + + set_size_f(&size, 800.0f, 600.0f); + hr = ID2D1RenderTarget_CreateLayer(rt, &size, &layer); + ok(SUCCEEDED(hr), "Failed to create layer, hr %#x.\n", hr); + size = ID2D1Layer_GetSize(layer); + ok(size.width == 800.0f, "Got unexpected width %.8e.\n", size.width); + ok(size.height == 600.0f, "Got unexpected height %.8e.\n", size.height); ID2D1Layer_Release(layer); ID2D1RenderTarget_Release(rt);

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_CreateLayer().
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 6d638b9e287b3240bbfd37a08d1da0ac9d3e6bc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d638b9e287b3240bbfd37a08… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 2 17:56:31 2017 +0200 d2d1: Implement d2d_d3d_render_target_CreateLayer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 1 + dlls/d2d1/d2d1_private.h | 10 ++++ dlls/d2d1/layer.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/render_target.c | 11 ++++- dlls/d2d1/tests/d2d1.c | 45 ++++++++++++++++++ 5 files changed, 180 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 68e9268..51b9627 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ factory.c \ geometry.c \ hwnd_render_target.c \ + layer.c \ mesh.c \ render_target.c \ state_block.c \ diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 7d8027b..12a230b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -236,6 +236,16 @@ struct d2d_stroke_style HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count) DECLSPEC_HIDDEN; +struct d2d_layer +{ + ID2D1Layer ID2D1Layer_iface; + LONG refcount; + + ID2D1Factory *factory; +}; + +HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) DECLSPEC_HIDDEN; + struct d2d_mesh { ID2D1Mesh ID2D1Mesh_iface; diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c new file mode 100644 index 0000000..0fcd185 --- /dev/null +++ b/dlls/d2d1/layer.c @@ -0,0 +1,115 @@ +/* + * Copyright 2017 Henri Verbeet for CodeWeavers + * + * This library 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 Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include "d2d1_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d2d); + +static inline struct d2d_layer *impl_from_ID2D1Layer(ID2D1Layer *iface) +{ + return CONTAINING_RECORD(iface, struct d2d_layer, ID2D1Layer_iface); +} + +static HRESULT STDMETHODCALLTYPE d2d_layer_QueryInterface(ID2D1Layer *iface, REFIID iid, void **out) +{ + TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_ID2D1Layer) + || IsEqualGUID(iid, &IID_ID2D1Resource) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1Layer_AddRef(iface); + *out = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d2d_layer_AddRef(ID2D1Layer *iface) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + ULONG refcount = InterlockedIncrement(&layer->refcount); + + TRACE("%p increasing refcount to %u.\n", iface, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + ULONG refcount = InterlockedDecrement(&layer->refcount); + + TRACE("%p decreasing refcount to %u.\n", iface, refcount); + + if (!refcount) + { + ID2D1Factory_Release(layer->factory); + HeapFree(GetProcessHeap(), 0, layer); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d2d_layer_GetFactory(ID2D1Layer *iface, ID2D1Factory **factory) +{ + struct d2d_layer *layer = impl_from_ID2D1Layer(iface); + + TRACE("iface %p, factory %p.\n", iface, factory); + + ID2D1Factory_AddRef(*factory = layer->factory); +} + +static D2D1_SIZE_F * STDMETHODCALLTYPE d2d_layer_GetSize(ID2D1Layer *iface, D2D1_SIZE_F *size) +{ + FIXME("iface %p, size %p stub!\n", iface, size); + + size->width = 0; + size->height = 0; + return size; +} + +static const struct ID2D1LayerVtbl d2d_layer_vtbl = +{ + d2d_layer_QueryInterface, + d2d_layer_AddRef, + d2d_layer_Release, + d2d_layer_GetFactory, + d2d_layer_GetSize, +}; + +HRESULT d2d_layer_create(ID2D1Factory *factory, struct d2d_layer **layer) +{ + if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) + return E_OUTOFMEMORY; + + (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; + (*layer)->refcount = 1; + ID2D1Factory_AddRef((*layer)->factory = factory); + + TRACE("Created layer %p.\n", *layer); + + return S_OK; +} diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c55401a..ecab51f 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -458,9 +458,16 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTar static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateLayer(ID2D1RenderTarget *iface, const D2D1_SIZE_F *size, ID2D1Layer **layer) { - FIXME("iface %p, size %p, layer %p stub!\n", iface, size, layer); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + struct d2d_layer *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, size %p, layer %p.\n", iface, size, layer); + + if (SUCCEEDED(hr = d2d_layer_create(render_target->factory, &object))) + *layer = &object->ID2D1Layer_iface; + + return hr; } static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTarget *iface, ID2D1Mesh **mesh) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b26b7b1..72903ef 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4528,6 +4528,50 @@ todo_wine ID2D1Factory_Release(factory); } +static void test_layer(void) +{ + ID2D1Factory *factory, *layer_factory; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + ID2D1Layer *layer; + ULONG refcount; + HWND window; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = create_window(); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + ID2D1RenderTarget_GetFactory(rt, &factory); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + hr = ID2D1RenderTarget_CreateLayer(rt, NULL, &layer); + ok(SUCCEEDED(hr), "Failed to create layer, hr %#x.\n", hr); + ID2D1Layer_GetFactory(layer, &layer_factory); + ok(layer_factory == factory, "Got unexpected layer factory %p, expected %p.\n", layer_factory, factory); + ID2D1Factory_Release(layer_factory); + ID2D1Layer_Release(layer); + + ID2D1RenderTarget_Release(rt); + refcount = ID2D1Factory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); @@ -4552,4 +4596,5 @@ START_TEST(d2d1) test_gradient(); test_draw_geometry(); test_gdi_interop(); + test_layer(); }

1 0

Hugh McMaster : regedit: Update handling of the 'Modify' menu item.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: b332c1a6d59f4efa4a306b3aa1d9b6ef0e6de1b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b332c1a6d59f4efa4a306b3aa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 2 10:57:58 2017 +0000 regedit: Update handling of the 'Modify' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index c46dee3..cd7dad0 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -132,7 +132,17 @@ update: SetMenuItemInfoW(hMenu, ID_TREE_EXPAND_COLLAPSE, FALSE, &info); } -static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) +static void update_modify_items(HMENU hMenu, int index) +{ + unsigned int state = MF_ENABLED; + + if (!g_pChildWnd->nFocusPanel || index == -1) + state = MF_GRAYED; + + EnableMenuItem(hMenu, ID_EDIT_MODIFY, state | MF_BYCOMMAND); +} + +static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName, int index) { unsigned int state_d = MF_ENABLED, state_r = MF_ENABLED; @@ -141,13 +151,10 @@ static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) if (!keyName || !*keyName) state_d = state_r = MF_GRAYED; } - else + else if (index < 1) { - int index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, - MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); - + state_r = MF_GRAYED; if (index == -1) state_d = MF_GRAYED; - if (index < 1) state_r = MF_GRAYED; } EnableMenuItem(hMenu, ID_EDIT_DELETE, state_d | MF_BYCOMMAND); @@ -170,20 +177,19 @@ static void update_new_items_and_copy_keyname(HMENU hMenu, WCHAR *keyName) static void UpdateMenuItems(HMENU hMenu) { HWND hwndTV = g_pChildWnd->hTreeWnd; - BOOL bAllowEdit = FALSE; HKEY hRootKey = NULL; LPWSTR keyName; HTREEITEM selection; + int index; selection = (HTREEITEM)SendMessageW(hwndTV, TVM_GETNEXTITEM, TVGN_CARET, 0); keyName = GetItemPath(hwndTV, selection, &hRootKey); - if (GetFocus() != hwndTV || (keyName && *keyName)) { /* can't modify root keys, but allow for their values */ - bAllowEdit = TRUE; - } + index = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, -1, + MAKELPARAM(LVIS_FOCUSED | LVIS_SELECTED, 0)); update_expand_or_collapse_item(hwndTV, selection, hMenu); - EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); - update_delete_and_rename_items(hMenu, keyName); + update_modify_items(hMenu, index); + update_delete_and_rename_items(hMenu, keyName, index); update_new_items_and_copy_keyname(hMenu, keyName); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE,

1 0

Marcus Meissner : hid: Increase buffer size to allow 16bit value + space + NUL (GCC7).
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 0a2e48933d02131115f139765c6e9b0d2908719e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2e48933d02131115f139765… Author: Marcus Meissner <meissner(a)suse.de> Date: Fri Jun 2 10:47:03 2017 +0200 hid: Increase buffer size to allow 16bit value + space + NUL (GCC7). Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index a4c12ce..ef2f729 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -183,7 +183,7 @@ static void process_data(HIDP_CAPS Caps, PHIDP_PREPARSED_DATA ppd, CHAR *data, D { for (j=count; j < count+15 && j < usage_length; j++) { - CHAR btn[5]; + CHAR btn[7]; sprintf(btn, "%i ", button_pages[j]); strcat(report, btn); }

1 0

Alexandre Julliard : explorer: Don' t forward the system tray to the display driver in desktop mode.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 082e4981631189c5903f838a0bc23e137c1cce17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=082e4981631189c5903f838a0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 17:20:33 2017 +0200 explorer: Don't forward the system tray to the display driver in desktop mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/explorer/systray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index ddfd67d..9e58ad4 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -565,7 +565,7 @@ static BOOL handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) buffer, buffer + cbMaskBits); } - /* try forward to x11drv first */ + /* try forwarding to the display driver first */ if (cds->dwData == NIM_ADD || !(icon = get_icon( nid.hWnd, nid.uID ))) { if (wine_notify_icon && ((ret = wine_notify_icon( cds->dwData, &nid )) != -1)) @@ -901,7 +901,7 @@ void initialize_systray( HMODULE graphics_driver, BOOL using_root, BOOL arg_enab WNDCLASSEXW class; static const WCHAR classname[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; - wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); + if (using_root) wine_notify_icon = (void *)GetProcAddress( graphics_driver, "wine_notify_icon" ); icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2*ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2*ICON_BORDER;

1 0

Alistair Leslie-Hughes : wmvcore: Implement WMCreateWriterPriv.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 7381cecd55e7ba8b98a43ffae6410c1f653f47e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7381cecd55e7ba8b98a43ffae… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 31 01:22:25 2017 +0000 wmvcore: Implement WMCreateWriterPriv. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 18 ++++++++++++++++++ dlls/wmvcore/wmvcore.spec | 2 +- dlls/wmvcore/writer.c | 5 +++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 4ceef77..51ff9dc 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -22,6 +22,8 @@ #include "wine/test.h" +HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer); + static void test_wmwriter_interfaces(void) { HRESULT hr; @@ -197,6 +199,21 @@ void test_profile_manager_interfaces(void) IWMProfileManager_Release(profile); } +static void test_WMCreateWriterPriv(void) +{ + IWMWriter *writer, *writer2; + HRESULT hr; + + hr = WMCreateWriterPriv(&writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IWMWriter_QueryInterface(writer, &IID_IWMWriter, (void**)&writer2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IWMWriter_Release(writer); + IWMWriter_Release(writer2); +} + START_TEST(wmvcore) { HRESULT hr; @@ -209,6 +226,7 @@ START_TEST(wmvcore) test_wmreader_interfaces(); test_wmwriter_interfaces(); test_profile_manager_interfaces(); + test_WMCreateWriterPriv(); CoUninitialize(); } diff --git a/dlls/wmvcore/wmvcore.spec b/dlls/wmvcore/wmvcore.spec index bb17683..c8f582b 100644 --- a/dlls/wmvcore/wmvcore.spec +++ b/dlls/wmvcore/wmvcore.spec @@ -15,6 +15,6 @@ @ stdcall WMCreateWriter(ptr ptr) @ stub WMCreateWriterFileSink @ stub WMCreateWriterNetworkSink -@ stub WMCreateWriterPriv +@ stdcall WMCreateWriterPriv(ptr) @ stub WMCreateWriterPushSink @ stub WMIsContentProtected diff --git a/dlls/wmvcore/writer.c b/dlls/wmvcore/writer.c index f570148..c1c30be 100644 --- a/dlls/wmvcore/writer.c +++ b/dlls/wmvcore/writer.c @@ -369,3 +369,8 @@ HRESULT WINAPI WMCreateWriter(IUnknown *reserved, IWMWriter **writer) *writer = &ret->IWMWriter_iface; return S_OK; } + +HRESULT WINAPI WMCreateWriterPriv(IWMWriter **writer) +{ + return WMCreateWriter(NULL, writer); +}

1 0

Austin English : wmp: Add some ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 496677404953bf2b976e19508c8ab29b06ae5b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=496677404953bf2b976e19508… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:29 2017 -0500 wmp: Add some ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/wmp.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wmp/wmp.spec b/dlls/wmp/wmp.spec index b16365d..377bbcc 100644 --- a/dlls/wmp/wmp.spec +++ b/dlls/wmp/wmp.spec @@ -1,3 +1,8 @@ +3000 stub @ +3002 stub @ +3003 stub @ +3004 stub @ + @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer()

1 0

Austin English : msimg32: Label ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: f77bf35d11aee79d96c65ef3f6a012ebaf2edd3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f77bf35d11aee79d96c65ef3f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:28 2017 -0500 msimg32: Label ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msimg32/msimg32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msimg32/msimg32.spec b/dlls/msimg32/msimg32.spec index 76b5075..a4a67ac 100644 --- a/dlls/msimg32/msimg32.spec +++ b/dlls/msimg32/msimg32.spec @@ -1,5 +1,5 @@ +1 stdcall vSetDdrawflag() @ stdcall AlphaBlend(long long long long long long long long long long long) gdi32.GdiAlphaBlend @ stdcall -private DllInitialize(long long ptr) DllMain @ stdcall GradientFill(long ptr long ptr long long) gdi32.GdiGradientFill @ stdcall TransparentBlt(long long long long long long long long long long long) gdi32.GdiTransparentBlt -@ stdcall vSetDdrawflag()

1 0

Austin English : jsproxy: Label ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: a79c6a8ab82069572234e638ecbe50a62d226d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a79c6a8ab82069572234e638e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:26 2017 -0500 jsproxy: Label ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/jsproxy.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jsproxy/jsproxy.spec b/dlls/jsproxy/jsproxy.spec index 4a80c4d..51366e7 100644 --- a/dlls/jsproxy/jsproxy.spec +++ b/dlls/jsproxy/jsproxy.spec @@ -1,5 +1,6 @@ -@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll -@ stub InternetInitializeExAutoProxyDll -@ stdcall InternetDeInitializeAutoProxyDll(str long) -@ stub InternetDeInitializeExAutoProxyDll -@ stdcall InternetGetProxyInfo(str long str long ptr ptr) +101 stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll +102 stdcall InternetDeInitializeAutoProxyDll(str long) +103 stdcall InternetGetProxyInfo(str long str long ptr ptr) +104 stub InternetInitializeAutoProxyDllEx +105 stub InternetDeInitializeAutoProxyDllEx +106 stub InternetGetProxyInfoEx

1 0

Austin English : gameux: Label ordinals.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 1ebf6ca29ba114fd2485990c86f58848bea03a70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebf6ca29ba114fd2485990c8… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:25 2017 -0500 gameux: Label ordinals. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gameux/gameux.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/gameux.spec b/dlls/gameux/gameux.spec index 1a9f44f..06637b6 100644 --- a/dlls/gameux/gameux.spec +++ b/dlls/gameux/gameux.spec @@ -1,4 +1,4 @@ -@ stub GameUxShimW +1 stub GameUxShimW @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer()

1 0

Austin English : acledit: Fix ordinal ordering.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 4534261fcc9139e1464918524010d5d64185a1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4534261fcc9139e1464918524… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 25 17:48:22 2017 -0500 acledit: Fix ordinal ordering. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/acledit/acledit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/acledit/acledit.spec b/dlls/acledit/acledit.spec index 7343290..8a9b634 100644 --- a/dlls/acledit/acledit.spec +++ b/dlls/acledit/acledit.spec @@ -1,8 +1,8 @@ 1 stub EditAuditInfo 2 stub EditOwnerInfo 3 stub EditPermissionInfo -4 stdcall -private DllMain(long long ptr) -5 stdcall FMExtensionProcW(long long long) +4 stdcall FMExtensionProcW(long long long) +5 stdcall -private DllMain(long long ptr) 6 stub SedDiscretionaryAclEditor 7 stub SedSystemAclEditor 8 stub SedTakeOwnership

1 0

Alistair Leslie-Hughes : include/mfapi.h: Add standard GUID defines.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: b437c8e9390927748013bf2271e003572bd4b6c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b437c8e9390927748013bf227… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 31 04:37:57 2017 +0000 include/mfapi.h: Add standard GUID defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfapi.h | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/mfapi.h b/include/mfapi.h index 35641dd..1652531 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -23,10 +23,44 @@ #include <mmreg.h> #include <avrt.h> +#if !defined(MF_VERSION) +/* Default to Windows XP */ +#define MF_SDK_VERSION 0x0001 +#define MF_API_VERSION 0x0070 +#define MF_VERSION (MF_SDK_VERSION << 16 | MF_API_VERSION) +#endif + #define MFSTARTUP_NOSOCKET 0x1 #define MFSTARTUP_LITE (MFSTARTUP_NOSOCKET) #define MFSTARTUP_FULL 0 +#ifndef MAKEFOURCC +#define MAKEFOURCC(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24 )) +#endif + +#define DEFINE_MEDIATYPE_GUID(name, format) \ + DEFINE_GUID(name, format, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + +#ifndef DIRECT3D_VERSION +#define D3DFMT_X8R8G8B8 22 +#endif + +DEFINE_MEDIATYPE_GUID(MFVideoFormat_WMV3, MAKEFOURCC('W','M','V','3')); +DEFINE_MEDIATYPE_GUID(MFVideoFormat_RGB32, D3DFMT_X8R8G8B8); + + +DEFINE_GUID(MF_MT_AVG_BITRATE, 0x20332624, 0xfb0d, 0x4d9e, 0xbd, 0x0d, 0xcb, 0xf6, 0x78, 0x6c, 0x10, 0x2e); +DEFINE_GUID(MF_MT_FRAME_RATE, 0xc459a2e8, 0x3d2c, 0x4e44, 0xb1, 0x32, 0xfe, 0xe5, 0x15, 0x6c, 0x7b, 0xb0); +DEFINE_GUID(MF_MT_FRAME_SIZE, 0x1652c33d, 0xd6b2, 0x4012, 0xb8, 0x34, 0x72, 0x03, 0x08, 0x49, 0xa3, 0x7d); +DEFINE_GUID(MF_MT_INTERLACE_MODE, 0xe2724bb8, 0xe676, 0x4806, 0xb4, 0xb2, 0xa8, 0xd6, 0xef, 0xb4, 0x4c, 0xcd); +DEFINE_GUID(MF_MT_MAJOR_TYPE, 0x48eba18e, 0xf8c9, 0x4687, 0xbf, 0x11, 0x0a, 0x74, 0xc9, 0xf9, 0x6a, 0x8f); +DEFINE_GUID(MF_MT_PIXEL_ASPECT_RATIO, 0xc6376a1e, 0x8d0a, 0x4027, 0xbe, 0x45, 0x6d, 0x9a, 0x0a, 0xd3, 0x9b, 0xb6); +DEFINE_GUID(MF_MT_SUBTYPE, 0xf7e34c9a, 0x42e8, 0x4714, 0xb7, 0x4b, 0xcb, 0x29, 0xd7, 0x2c, 0x35, 0xe5); + +DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + typedef unsigned __int64 MFWORKITEM_KEY; HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key);

1 0

Owen Rudge : wsdapi: Add stub implementation of IWSDUdpAddress.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: ac38f7fd938eaddfaaeb44cf7d9e66e5e31447a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac38f7fd938eaddfaaeb44cf7… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:06:14 2017 +0100 wsdapi: Add stub implementation of IWSDUdpAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 1 + dlls/wsdapi/address.c | 252 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wsdapi/wsdapi.spec | 2 +- 3 files changed, 254 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/Makefile.in b/dlls/wsdapi/Makefile.in index 82d0ca1..30862cc 100644 --- a/dlls/wsdapi/Makefile.in +++ b/dlls/wsdapi/Makefile.in @@ -3,6 +3,7 @@ IMPORTLIB = wsdapi IMPORTS = user32 C_SRCS = \ + address.c \ discovery.c \ main.c \ memory.c \ diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c new file mode 100644 index 0000000..7efcac2 --- /dev/null +++ b/dlls/wsdapi/address.c @@ -0,0 +1,252 @@ +/* + * Web Services on Devices + * + * Copyright 2017 Owen Rudge for CodeWeavers + * + * This library 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 Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" +#include "wsdapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wsdapi); + +typedef struct IWSDUdpAddressImpl { + IWSDUdpAddress IWSDUdpAddress_iface; + LONG ref; +} IWSDUdpAddressImpl; + +static inline IWSDUdpAddressImpl *impl_from_IWSDUdpAddress(IWSDUdpAddress *iface) +{ + return CONTAINING_RECORD(iface, IWSDUdpAddressImpl, IWSDUdpAddress_iface); +} + +static HRESULT WINAPI IWSDUdpAddressImpl_QueryInterface(IWSDUdpAddress *iface, REFIID riid, void **ppv) +{ + IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + { + WARN("Invalid parameter\n"); + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IWSDUdpAddress) || + IsEqualIID(riid, &IID_IWSDTransportAddress) || + IsEqualIID(riid, &IID_IWSDAddress)) + { + *ppv = &This->IWSDUdpAddress_iface; + } + else + { + WARN("Unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IWSDUdpAddressImpl_AddRef(IWSDUdpAddress *iface) +{ + IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI IWSDUdpAddressImpl_Release(IWSDUdpAddress *iface) +{ + IWSDUdpAddressImpl *This = impl_from_IWSDUdpAddress(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_Serialize(IWSDUdpAddress *This, LPWSTR pszBuffer, DWORD cchLength, BOOL fSafe) +{ + FIXME("(%p, %p, %d, %d)\n", This, pszBuffer, cchLength, fSafe); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_Deserialize(IWSDUdpAddress *This, LPCWSTR pszBuffer) +{ + FIXME("(%p, %s)\n", This, debugstr_w(pszBuffer)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetPort(IWSDUdpAddress *This, WORD *pwPort) +{ + FIXME("(%p, %p)\n", This, pwPort); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetPort(IWSDUdpAddress *This, WORD wPort) +{ + FIXME("(%p, %d)\n", This, wPort); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddress(IWSDUdpAddress *This, LPCWSTR *ppszAddress) +{ + FIXME("(%p, %p)\n", This, ppszAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *This, BOOL fSafe, LPCWSTR *ppszAddress) +{ + FIXME("(%p, %d, %p)\n", This, fSafe, ppszAddress); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetTransportAddress(IWSDUdpAddress *This, LPCWSTR pszAddress) +{ + FIXME("(%p, %s)\n", This, debugstr_w(pszAddress)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetSockaddr(IWSDUdpAddress *This, const SOCKADDR_STORAGE *pSockAddr) +{ + FIXME("(%p, %p)\n", This, pSockAddr); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetSockaddr(IWSDUdpAddress *This, SOCKADDR_STORAGE *pSockAddr) +{ + FIXME("(%p, %p)\n", This, pSockAddr); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetExclusive(IWSDUdpAddress *This, BOOL fExclusive) +{ + FIXME("(%p, %d)\n", This, fExclusive); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetExclusive(IWSDUdpAddress *This) +{ + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetMessageType(IWSDUdpAddress *This, WSDUdpMessageType messageType) +{ + FIXME("(%p, %d)\n", This, messageType); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetMessageType(IWSDUdpAddress *This, WSDUdpMessageType *pMessageType) +{ + FIXME("(%p, %p)\n", This, pMessageType); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetTTL(IWSDUdpAddress *This, DWORD dwTTL) +{ + FIXME("(%p, %d)\n", This, dwTTL); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetTTL(IWSDUdpAddress *This, DWORD *pdwTTL) +{ + FIXME("(%p, %p)\n", This, pdwTTL); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_SetAlias(IWSDUdpAddress *This, const GUID *pAlias) +{ + FIXME("(%p, %s)\n", This, debugstr_guid(pAlias)); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDUdpAddressImpl_GetAlias(IWSDUdpAddress *This, GUID *pAlias) +{ + FIXME("(%p, %p)\n", This, pAlias); + return E_NOTIMPL; +} + +static const IWSDUdpAddressVtbl udpAddressVtbl = +{ + IWSDUdpAddressImpl_QueryInterface, + IWSDUdpAddressImpl_AddRef, + IWSDUdpAddressImpl_Release, + IWSDUdpAddressImpl_Serialize, + IWSDUdpAddressImpl_Deserialize, + IWSDUdpAddressImpl_GetPort, + IWSDUdpAddressImpl_SetPort, + IWSDUdpAddressImpl_GetTransportAddress, + IWSDUdpAddressImpl_GetTransportAddressEx, + IWSDUdpAddressImpl_SetTransportAddress, + IWSDUdpAddressImpl_SetSockaddr, + IWSDUdpAddressImpl_GetSockaddr, + IWSDUdpAddressImpl_SetExclusive, + IWSDUdpAddressImpl_GetExclusive, + IWSDUdpAddressImpl_SetMessageType, + IWSDUdpAddressImpl_GetMessageType, + IWSDUdpAddressImpl_SetTTL, + IWSDUdpAddressImpl_GetTTL, + IWSDUdpAddressImpl_SetAlias, + IWSDUdpAddressImpl_GetAlias +}; + +HRESULT WINAPI WSDCreateUdpAddress(IWSDUdpAddress **ppAddress) +{ + IWSDUdpAddressImpl *obj; + + TRACE("(%p)\n", ppAddress); + + if (ppAddress == NULL) + { + WARN("Invalid parameter: ppAddress == NULL\n"); + return E_POINTER; + } + + *ppAddress = NULL; + + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*obj)); + + if (!obj) + { + WARN("Out of memory\n"); + return E_OUTOFMEMORY; + } + + obj->IWSDUdpAddress_iface.lpVtbl = &udpAddressVtbl; + obj->ref = 1; + + *ppAddress = &obj->IWSDUdpAddress_iface; + TRACE("Returning iface %p\n", *ppAddress); + + return S_OK; +} diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 7954ede..a8f1aaa 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -23,7 +23,7 @@ @ stub WSDCreateHttpTransport @ stub WSDCreateMetadataAgent @ stub WSDCreateOutboundAttachment -@ stub WSDCreateUdpAddress +@ stdcall WSDCreateUdpAddress(ptr) @ stub WSDCreateUdpMessageParameters @ stub WSDCreateUdpTransport @ stdcall WSDDetachLinkedMemory(ptr)

1 0

Owen Rudge : include: Add definitions for IWSDUdpAddress, IWSDTransportAddress.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: bcbe4ae756f44109f858475e1e5dc1e465c515cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcbe4ae756f44109f858475e1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:06:06 2017 +0100 include: Add definitions for IWSDUdpAddress, IWSDTransportAddress. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wsdbase.idl | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/include/wsdbase.idl b/include/wsdbase.idl index c93262d..099dc87 100644 --- a/include/wsdbase.idl +++ b/include/wsdbase.idl @@ -22,8 +22,21 @@ cpp_quote("#define WSDAPI_ADDRESSFAMILY_IPV4 1") cpp_quote("#define WSDAPI_ADDRESSFAMILY_IPV6 2") interface IWSDAddress; +interface IWSDUdpAddress; interface IWSDMessageParameters; +cpp_quote("HRESULT WINAPI WSDCreateUdpAddress(IWSDUdpAddress **ppAddress);") + +#ifndef SOCKADDR_STORAGE +cpp_quote("#if 1") +cpp_quote("#ifndef __CSADDR_DEFINED__") +cpp_quote("typedef struct SOCKADDR_STORAGE SOCKADDR_STORAGE;") +cpp_quote("#endif") +cpp_quote("#else") +typedef void SOCKADDR_STORAGE; +cpp_quote("#endif") +#endif + [ uuid(b9574c6c-12a6-4f74-93a1-3318ff605759), object, @@ -36,6 +49,45 @@ interface IWSDAddress : IUnknown } [ +uuid(70d23498-4ee6-4340-a3df-d845d2235467), +object, +local +] +interface IWSDTransportAddress : IWSDAddress +{ + HRESULT GetPort([out] WORD *pwPort); + HRESULT SetPort([in] WORD wPort); + HRESULT GetTransportAddress([out] LPCWSTR *ppszAddress); + HRESULT GetTransportAddressEx([in] BOOL fSafe, [out] LPCWSTR *ppszAddress); + HRESULT SetTransportAddress([in] LPCWSTR pszAddress); +} + +typedef enum _WSDUdpMessageType +{ + ONE_WAY, + TWO_WAY +} WSDUdpMessageType; + +[ +uuid(74d6124a-a441-4f78-a1eb-97a8d1996893), +object, +local +] +interface IWSDUdpAddress : IWSDTransportAddress +{ + HRESULT SetSockaddr([in] const SOCKADDR_STORAGE *pSockAddr); + HRESULT GetSockaddr([out] SOCKADDR_STORAGE *pSockAddr); + HRESULT SetExclusive(BOOL fExclusive); + HRESULT GetExclusive(); + HRESULT SetMessageType([in] WSDUdpMessageType messageType); + HRESULT GetMessageType([out] WSDUdpMessageType* pMessageType); + HRESULT SetTTL([in] DWORD dwTTL); + HRESULT GetTTL([out] DWORD *pdwTTL); + HRESULT SetAlias([in] const GUID* pAlias); + HRESULT GetAlias([out] GUID *pAlias); +} + +[ uuid(1fafe8a2-e6fc-4b80-b6cf-b7d45c416d7c), object ]

1 0

Owen Rudge : wsdapi: Create default XML context in WSDCreateDiscoveryPublisher if required.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 9c9180f60677f05824e10f604952a95699dcf5cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9180f60677f05824e10f604… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:56 2017 +0100 wsdapi: Create default XML context in WSDCreateDiscoveryPublisher if required. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/discovery.c | 12 ++++++++-- dlls/wsdapi/tests/discovery.c | 51 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/discovery.c b/dlls/wsdapi/discovery.c index ea0f34b..c9ef9c2 100644 --- a/dlls/wsdapi/discovery.c +++ b/dlls/wsdapi/discovery.c @@ -360,10 +360,18 @@ HRESULT WINAPI WSDCreateDiscoveryPublisher(IWSDXMLContext *pContext, IWSDiscover obj->IWSDiscoveryPublisher_iface.lpVtbl = &publisher_vtbl; obj->ref = 1; - obj->xmlContext = pContext; - if (pContext != NULL) + if (pContext == NULL) { + if (FAILED(WSDXMLCreateContext(&obj->xmlContext))) + { + WARN("Unable to create XML context\n"); + return E_OUTOFMEMORY; + } + } + else + { + obj->xmlContext = pContext; IWSDXMLContext_AddRef(pContext); } diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index ffe64b0..db5947d 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -162,6 +162,56 @@ static void CreateDiscoveryPublisher_tests(void) ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); } +static void CreateDiscoveryPublisher_XMLContext_tests(void) +{ + IWSDiscoveryPublisher *publisher = NULL; + IWSDXMLContext *xmlContext, *returnedContext; + HRESULT rc; + int ref; + + /* Test creating an XML context and supplying it to WSDCreateDiscoveryPublisher */ + rc = WSDXMLCreateContext(&xmlContext); + ok(rc == S_OK, "WSDXMLCreateContext failed: %08x\n", rc); + + rc = WSDCreateDiscoveryPublisher(xmlContext, &publisher); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: %08x\n", rc); + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(xmlContext, &publisher) failed: publisher == NULL\n"); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, NULL); + ok(rc == E_INVALIDARG, "GetXMLContext returned unexpected value with NULL argument: %08x\n", rc); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); + ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + + ok(xmlContext == returnedContext, "GetXMLContext returned unexpected value: returnedContext == %p\n", returnedContext); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 2, "IWSDXMLContext_Release() has %d references, should have 2\n", ref); + + ref = IWSDiscoveryPublisher_Release(publisher); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 0, "IWSDXMLContext_Release() has %d references, should have 0\n", ref); + + /* Test using a default XML context */ + publisher = NULL; + returnedContext = NULL; + + rc = WSDCreateDiscoveryPublisher(NULL, &publisher); + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); + + rc = IWSDiscoveryPublisher_GetXMLContext(publisher, &returnedContext); + ok(rc == S_OK, "GetXMLContext failed: %08x\n", rc); + + ref = IWSDXMLContext_Release(returnedContext); + ok(ref == 1, "IWSDXMLContext_Release() has %d references, should have 1\n", ref); + + ref = IWSDiscoveryPublisher_Release(publisher); + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); +} + static void Publish_tests(void) { IWSDiscoveryPublisher *publisher = NULL; @@ -231,6 +281,7 @@ START_TEST(discovery) CoInitialize(NULL); CreateDiscoveryPublisher_tests(); + CreateDiscoveryPublisher_XMLContext_tests(); Publish_tests(); CoUninitialize();

1 0

Owen Rudge : wsdapi: Implement AddNameToNamespace.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 9bf2f6b2afccd5342e7cc105f8a960e8eedb719e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf2f6b2afccd5342e7cc105f… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:50 2017 +0100 wsdapi: Implement AddNameToNamespace. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 20 ++++----- dlls/wsdapi/xml.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 121 insertions(+), 12 deletions(-) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 68742fe..c83f07b 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -413,24 +413,24 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Test calling AddNameToNamespace with invalid arguments */ hr = IWSDXMLContext_AddNameToNamespace(context, NULL, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, NULL, name1Text, NULL); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); /* Test calling AddNameToNamespace without the ppName parameter */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, NULL); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Now retrieve the created name */ hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, &name1); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Check the returned structure */ - todo_wine ok(name1 != NULL, "name1 == NULL\n"); + ok(name1 != NULL, "name1 == NULL\n"); if (name1 != NULL) { @@ -447,10 +447,10 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Test calling AddNamespace with parameters that are too large */ hr = IWSDXMLContext_AddNameToNamespace(context, largeText, name1Text, &name2); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, largeText, &name2); - todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); /* Try creating a namespace explicitly */ hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); @@ -458,10 +458,10 @@ static void XMLContext_AddNameToNamespace_tests(void) /* Now add a name to it */ hr = IWSDXMLContext_AddNameToNamespace(context, ns2Uri, name2Text, &name2); - todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); /* Check the returned structure */ - todo_wine ok(name2 != NULL, "name2 == NULL\n"); + ok(name2 != NULL, "name2 == NULL\n"); if (name2 != NULL) { diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 9fba638..a6d0b07 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -270,6 +270,64 @@ static WSDXML_NAMESPACE *find_namespace(struct list *namespaces, LPCWSTR uri) return NULL; } +static WSDXML_NAME *find_name(WSDXML_NAMESPACE *ns, LPCWSTR name) +{ + int i; + + for (i = 0; i < ns->NamesCount; i++) + { + if (lstrcmpW(ns->Names[i].LocalName, name) == 0) + { + return &ns->Names[i]; + } + } + + return NULL; +} + +static WSDXML_NAME *add_name(WSDXML_NAMESPACE *ns, LPCWSTR name) +{ + WSDXML_NAME *names; + WSDXML_NAME *newName; + int i; + + names = WSDAllocateLinkedMemory(ns, sizeof(WSDXML_NAME) * (ns->NamesCount + 1)); + + if (names == NULL) + { + return NULL; + } + + if (ns->NamesCount > 0) + { + /* Copy the existing names array over to the new allocation */ + memcpy(names, ns->Names, sizeof(WSDXML_NAME) * ns->NamesCount); + + for (i = 0; i < ns->NamesCount; i++) + { + /* Attach the local name memory to the new names allocation */ + WSDAttachLinkedMemory(names, names[i].LocalName); + } + + WSDFreeLinkedMemory(ns->Names); + } + + ns->Names = names; + + newName = &names[ns->NamesCount]; + + newName->LocalName = duplicate_string(names, name); + newName->Space = ns; + + if (newName->LocalName == NULL) + { + return NULL; + } + + ns->NamesCount++; + return newName; +} + static BOOL is_prefix_unique(struct list *namespaces, LPCWSTR prefix) { struct xmlNamespace *ns; @@ -461,8 +519,59 @@ static HRESULT WINAPI IWSDXMLContextImpl_AddNamespace(IWSDXMLContext *iface, LPC static HRESULT WINAPI IWSDXMLContextImpl_AddNameToNamespace(IWSDXMLContext *iface, LPCWSTR pszUri, LPCWSTR pszName, WSDXML_NAME **ppName) { - FIXME("(%p, %s, %s, %p)\n", iface, debugstr_w(pszUri), debugstr_w(pszName), ppName); - return E_NOTIMPL; + IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); + WSDXML_NAMESPACE *ns; + WSDXML_NAME *name; + + TRACE("(%p, %s, %s, %p)\n", This, debugstr_w(pszUri), debugstr_w(pszName), ppName); + + if ((pszUri == NULL) || (pszName == NULL) || (lstrlenW(pszUri) > WSD_MAX_TEXT_LENGTH) || (lstrlenW(pszName) > WSD_MAX_TEXT_LENGTH)) + { + return E_INVALIDARG; + } + + ns = find_namespace(This->namespaces, pszUri); + + if (ns == NULL) + { + /* The namespace doesn't exist, add it */ + ns = add_namespace(This->namespaces, pszUri); + + if (ns == NULL) + { + return E_OUTOFMEMORY; + } + + ns->PreferredPrefix = generate_namespace_prefix(This, ns, pszUri); + if (ns->PreferredPrefix == NULL) + { + return E_FAIL; + } + } + + name = find_name(ns, pszName); + + if (name == NULL) + { + name = add_name(ns, pszName); + + if (name == NULL) + { + return E_OUTOFMEMORY; + } + } + + if (ppName != NULL) + { + *ppName = duplicate_name(NULL, name); + + if (*ppName == NULL) + { + return E_OUTOFMEMORY; + } + } + + return S_OK; } static HRESULT WINAPI IWSDXMLContextImpl_SetNamespaces(IWSDXMLContext *iface, const PCWSDXML_NAMESPACE *pNamespaces, WORD wNamespacesCount, BYTE bLayerNumber)

1 0

Owen Rudge : wsdapi: Implement AddNamespace.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: bf2095326093da5bc91603c88a688cd7b0f5c68b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf2095326093da5bc91603c88… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue May 30 23:05:45 2017 +0100 wsdapi: Implement AddNamespace. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/Makefile.in | 2 +- dlls/wsdapi/tests/xml.c | 44 +++++------ dlls/wsdapi/xml.c | 189 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 209 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf2095326093da5bc9160…

1 0

Alexandre Julliard : wineandroid: Add a JNI callback to store the native window we got from the TextureView.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 9a134711e6598081d5af55a3f02df625f669a036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a134711e6598081d5af55a3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 11:37:16 2017 +0200 wineandroid: Add a JNI callback to store the native window we got from the TextureView. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 2 + dlls/wineandroid.drv/android.h | 14 +++++ dlls/wineandroid.drv/device.c | 95 ++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/init.c | 12 ++++- dlls/wineandroid.drv/window.c | 45 +++++++++++++++- 5 files changed, 166 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a134711e6598081d5af5…

1 0

Alexandre Julliard : wineandroid: Add a header for some of the Android native APIs and data structures.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 7124a7d90c0dc123da5a86229a7f64303bd32481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7124a7d90c0dc123da5a86229… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 11:46:21 2017 +0200 wineandroid: Add a header for some of the Android native APIs and data structures. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 1 + dlls/wineandroid.drv/android_native.h | 233 ++++++++++++++++++++++++++++++++++ 2 files changed, 234 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 70a1e04..fb8b67d 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -32,6 +32,7 @@ #include "wingdi.h" #include "winuser.h" #include "wine/gdi_driver.h" +#include "android_native.h" /************************************************************************** diff --git a/dlls/wineandroid.drv/android_native.h b/dlls/wineandroid.drv/android_native.h new file mode 100644 index 0000000..5efd564 --- /dev/null +++ b/dlls/wineandroid.drv/android_native.h @@ -0,0 +1,233 @@ +/* + * Android native system definitions + * + * Copyright 2013 Alexandre Julliard + * + * This library 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 Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Copy of some Android native structures to avoid depending on the Android source */ +/* Hopefully these won't change too frequently... */ + +#ifndef __WINE_ANDROID_NATIVE_H +#define __WINE_ANDROID_NATIVE_H + +/* Native window definitions */ + +typedef struct native_handle +{ + int version; + int numFds; + int numInts; + int data[0]; +} native_handle_t; + +typedef const native_handle_t *buffer_handle_t; + +struct android_native_base_t +{ + int magic; + int version; + void *reserved[4]; + void (*incRef)(struct android_native_base_t *base); + void (*decRef)(struct android_native_base_t *base); +}; + +typedef struct android_native_rect_t +{ + int32_t left; + int32_t top; + int32_t right; + int32_t bottom; +} android_native_rect_t; + +struct ANativeWindowBuffer +{ + struct android_native_base_t common; + int width; + int height; + int stride; + int format; + int usage; + void *reserved[2]; + buffer_handle_t handle; + void *reserved_proc[8]; +}; + +struct ANativeWindow +{ + struct android_native_base_t common; + uint32_t flags; + int minSwapInterval; + int maxSwapInterval; + float xdpi; + float ydpi; + intptr_t oem[4]; + int (*setSwapInterval)(struct ANativeWindow *window, int interval); + int (*dequeueBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer **buffer); + int (*lockBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer); + int (*queueBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer); + int (*query)(const struct ANativeWindow *window, int what, int *value); + int (*perform)(struct ANativeWindow *window, int operation, ... ); + int (*cancelBuffer_DEPRECATED)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer); + int (*dequeueBuffer)(struct ANativeWindow *window, struct ANativeWindowBuffer **buffer, int *fenceFd); + int (*queueBuffer)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fenceFd); + int (*cancelBuffer)(struct ANativeWindow *window, struct ANativeWindowBuffer *buffer, int fenceFd); +}; + +enum native_window_query +{ + NATIVE_WINDOW_WIDTH = 0, + NATIVE_WINDOW_HEIGHT = 1, + NATIVE_WINDOW_FORMAT = 2, + NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS = 3, + NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER = 4, + NATIVE_WINDOW_CONCRETE_TYPE = 5, + NATIVE_WINDOW_DEFAULT_WIDTH = 6, + NATIVE_WINDOW_DEFAULT_HEIGHT = 7, + NATIVE_WINDOW_TRANSFORM_HINT = 8, + NATIVE_WINDOW_CONSUMER_RUNNING_BEHIND = 9 +}; + +enum native_window_perform +{ + NATIVE_WINDOW_SET_USAGE = 0, + NATIVE_WINDOW_CONNECT = 1, + NATIVE_WINDOW_DISCONNECT = 2, + NATIVE_WINDOW_SET_CROP = 3, + NATIVE_WINDOW_SET_BUFFER_COUNT = 4, + NATIVE_WINDOW_SET_BUFFERS_GEOMETRY = 5, + NATIVE_WINDOW_SET_BUFFERS_TRANSFORM = 6, + NATIVE_WINDOW_SET_BUFFERS_TIMESTAMP = 7, + NATIVE_WINDOW_SET_BUFFERS_DIMENSIONS = 8, + NATIVE_WINDOW_SET_BUFFERS_FORMAT = 9, + NATIVE_WINDOW_SET_SCALING_MODE = 10, + NATIVE_WINDOW_LOCK = 11, + NATIVE_WINDOW_UNLOCK_AND_POST = 12, + NATIVE_WINDOW_API_CONNECT = 13, + NATIVE_WINDOW_API_DISCONNECT = 14, + NATIVE_WINDOW_SET_BUFFERS_USER_DIMENSIONS = 15, + NATIVE_WINDOW_SET_POST_TRANSFORM_CROP = 16 +}; + +enum native_window_api +{ + NATIVE_WINDOW_API_EGL = 1, + NATIVE_WINDOW_API_CPU = 2, + NATIVE_WINDOW_API_MEDIA = 3, + NATIVE_WINDOW_API_CAMERA = 4 +}; + +enum android_pixel_format +{ + PF_RGBA_8888 = 1, + PF_RGBX_8888 = 2, + PF_RGB_888 = 3, + PF_RGB_565 = 4, + PF_BGRA_8888 = 5, + PF_RGBA_5551 = 6, + PF_RGBA_4444 = 7 +}; + + +/* Hardware module definitions */ + +struct hw_module_methods_t; +struct hw_device_t; +struct android_ycbcr; + +struct hw_module_t +{ + uint32_t tag; + uint16_t module_api_version; + uint16_t hal_api_version; + const char *id; + const char *name; + const char *author; + struct hw_module_methods_t *methods; + void *dso; + void *reserved[32-7]; +}; + +struct hw_module_methods_t +{ + int (*open)(const struct hw_module_t *module, const char *id, struct hw_device_t **device); +}; + +struct hw_device_t +{ + uint32_t tag; + uint32_t version; + struct hw_module_t *module; + void *reserved[12]; + int (*close)(struct hw_device_t *device); +}; + +struct gralloc_module_t +{ + struct hw_module_t common; + int (*registerBuffer)(struct gralloc_module_t const *module, buffer_handle_t handle); + int (*unregisterBuffer)(struct gralloc_module_t const *module, buffer_handle_t handle); + int (*lock)(struct gralloc_module_t const *module, buffer_handle_t handle, int usage, int l, int t, int w, int h, void **vaddr); + int (*unlock)(struct gralloc_module_t const *module, buffer_handle_t handle); + int (*perform)(struct gralloc_module_t const *module, int operation, ... ); + int (*lock_ycbcr)(struct gralloc_module_t const *module, buffer_handle_t handle, int usage, int l, int t, int w, int h, struct android_ycbcr *ycbcr); + void *reserved_proc[6]; +}; + +#define ANDROID_NATIVE_MAKE_CONSTANT(a,b,c,d) \ + (((unsigned)(a)<<24)|((unsigned)(b)<<16)|((unsigned)(c)<<8)|(unsigned)(d)) + +#define ANDROID_NATIVE_WINDOW_MAGIC \ + ANDROID_NATIVE_MAKE_CONSTANT('_','w','n','d') + +#define ANDROID_NATIVE_BUFFER_MAGIC \ + ANDROID_NATIVE_MAKE_CONSTANT('_','b','f','r') + +enum gralloc_usage +{ + GRALLOC_USAGE_SW_READ_NEVER = 0x00000000, + GRALLOC_USAGE_SW_READ_RARELY = 0x00000002, + GRALLOC_USAGE_SW_READ_OFTEN = 0x00000003, + GRALLOC_USAGE_SW_READ_MASK = 0x0000000F, + GRALLOC_USAGE_SW_WRITE_NEVER = 0x00000000, + GRALLOC_USAGE_SW_WRITE_RARELY = 0x00000020, + GRALLOC_USAGE_SW_WRITE_OFTEN = 0x00000030, + GRALLOC_USAGE_SW_WRITE_MASK = 0x000000F0, + GRALLOC_USAGE_HW_TEXTURE = 0x00000100, + GRALLOC_USAGE_HW_RENDER = 0x00000200, + GRALLOC_USAGE_HW_2D = 0x00000400, + GRALLOC_USAGE_HW_COMPOSER = 0x00000800, + GRALLOC_USAGE_HW_FB = 0x00001000, + GRALLOC_USAGE_HW_VIDEO_ENCODER = 0x00010000, + GRALLOC_USAGE_HW_CAMERA_WRITE = 0x00020000, + GRALLOC_USAGE_HW_CAMERA_READ = 0x00040000, + GRALLOC_USAGE_HW_CAMERA_ZSL = 0x00060000, + GRALLOC_USAGE_HW_CAMERA_MASK = 0x00060000, + GRALLOC_USAGE_HW_MASK = 0x00071F00, + GRALLOC_USAGE_EXTERNAL_DISP = 0x00002000, + GRALLOC_USAGE_PROTECTED = 0x00004000, + GRALLOC_USAGE_PRIVATE_0 = 0x10000000, + GRALLOC_USAGE_PRIVATE_1 = 0x20000000, + GRALLOC_USAGE_PRIVATE_2 = 0x40000000, + GRALLOC_USAGE_PRIVATE_3 = 0x80000000, + GRALLOC_USAGE_PRIVATE_MASK = 0xF0000000, +}; + +#define GRALLOC_HARDWARE_MODULE_ID "gralloc" + +extern int hw_get_module(const char *id, const struct hw_module_t **module); + +#endif /* __WINE_ANDROID_NATIVE_H */

1 0

Alexandre Julliard : wineandroid: Create a TextureView for every top-level window.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 2645cc2a7f65b962f47d25327ab0f96506c6b8d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2645cc2a7f65b962f47d25327… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 11:35:12 2017 +0200 wineandroid: Create a TextureView for every top-level window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 71 ++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 28523a1..2eca5fc 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -25,10 +25,13 @@ import android.app.ProgressDialog; import android.content.Context; import android.content.SharedPreferences; import android.graphics.Rect; +import android.graphics.SurfaceTexture; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.util.Log; +import android.view.Surface; +import android.view.TextureView; import android.view.View; import android.view.ViewGroup; import java.io.BufferedReader; @@ -286,6 +289,9 @@ public class WineActivity extends Activity protected boolean visible; protected Rect visible_rect; protected Rect client_rect; + protected WineWindow parent; + protected WineView window_view; + protected Surface window_surface; public WineWindow( int w, WineWindow parent ) { @@ -295,7 +301,13 @@ public class WineActivity extends Activity style = 0; visible = false; visible_rect = client_rect = new Rect( 0, 0, 0, 0 ); + this.parent = parent; win_map.put( w, this ); + if (parent == null) + { + window_view = new WineView( WineActivity.this, this ); + window_view.layout( 0, 0, 1, 1 ); // make sure the surface gets created + } } public void destroy() @@ -315,6 +327,12 @@ public class WineActivity extends Activity Log.i( LOGTAG, String.format( "pos changed hwnd %08x after %08x owner %08x style %08x win %s client %s visible %s flags %08x", hwnd, insert_after, owner, style, window_rect, client_rect, visible_rect, flags )); + if (parent == null) + { + window_view.layout( visible_rect.left, visible_rect.top, visible_rect.right, visible_rect.bottom ); + if (!visible && (style & WS_VISIBLE) != 0) top_view.addView( window_view ); + else if (visible && (style & WS_VISIBLE) == 0) top_view.removeView( window_view ); + } visible = (style & WS_VISIBLE) != 0; } @@ -322,6 +340,59 @@ public class WineActivity extends Activity { return hwnd; } + + public void set_surface( SurfaceTexture surftex ) + { + if (surftex == null) window_surface = null; + else if (window_surface == null) window_surface = new Surface( surftex ); + Log.i( LOGTAG, String.format( "set window surface hwnd %08x %s", hwnd, window_surface )); + } + } + + // View used for all Wine windows, backed by a TextureView + + protected class WineView extends TextureView implements TextureView.SurfaceTextureListener + { + private WineWindow window; + + public WineView( Context c, WineWindow win ) + { + super( c ); + window = win; + setSurfaceTextureListener( this ); + setVisibility( VISIBLE ); + setOpaque( false ); + } + + public WineWindow get_window() + { + return window; + } + + public void onSurfaceTextureAvailable( SurfaceTexture surftex, int width, int height ) + { + Log.i( LOGTAG, String.format( "onSurfaceTextureAvailable win %08x %dx%d", + window.hwnd, width, height )); + window.set_surface( surftex ); + } + + public void onSurfaceTextureSizeChanged( SurfaceTexture surftex, int width, int height ) + { + Log.i( LOGTAG, String.format( "onSurfaceTextureSizeChanged win %08x %dx%d", + window.hwnd, width, height )); + window.set_surface( surftex ); + } + + public boolean onSurfaceTextureDestroyed( SurfaceTexture surftex ) + { + Log.i( LOGTAG, String.format( "onSurfaceTextureDestroyed win %08x", window.hwnd )); + window.set_surface( null ); + return true; + } + + public void onSurfaceTextureUpdated(SurfaceTexture surftex) + { + } } // The top-level desktop view group

1 0

Alexandre Julliard : wineandroid: Add a Java callback for setting window position.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 97005de15123f6ef1980fec91e359d87055f10a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97005de15123f6ef1980fec91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 2 11:34:23 2017 +0200 wineandroid: Add a Java callback for setting window position. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 51 ++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/android.h | 3 ++ dlls/wineandroid.drv/device.c | 53 ++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 12 ++++++-- 4 files changed, 117 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97005de15123f6ef1980f…

1 0

Zebediah Figura : msacm32: Don' t write cbSize if the format is WAVE_FORMAT_PCM.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 4e0c3707c3af8019db2c41ed6287bdde6e0b6fd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0c3707c3af8019db2c41ed6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 1 14:16:43 2017 -0500 msacm32: Don't write cbSize if the format is WAVE_FORMAT_PCM. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msacm32/format.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index de07cba..3f3ee54 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -78,7 +78,8 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, afd.pwfx = HeapAlloc(MSACM_hHeap, 0, paftd->cbFormatSize); if (!afd.pwfx) return FALSE; afd.pwfx->wFormatTag = paftd->dwFormatTag; - afd.pwfx->cbSize = paftd->cbFormatSize; + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + afd.pwfx->cbSize = paftd->cbFormatSize - sizeof(WAVEFORMATEX); afd.cbwfx = paftd->cbFormatSize; for (i = 0; i < paftd->cStandardFormats; i++) {

1 0

Michael Müller : include: Fix definition of EXTERN_GUID.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 2aaeeb105e1fdb31fde859a5c6dc6ea103234067 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aaeeb105e1fdb31fde859a5c… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Jun 1 17:46:11 2017 +0300 include: Fix definition of EXTERN_GUID. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/rpcndr.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/rpcndr.h b/include/rpcndr.h index f795566..9029950 100644 --- a/include/rpcndr.h +++ b/include/rpcndr.h @@ -45,9 +45,7 @@ extern "C" { { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } #else #define EXTERN_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \ - const GUID DECLSPEC_SELECTANY name DECLSPEC_HIDDEN; \ - const GUID DECLSPEC_SELECTANY name = \ - { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } } + EXTERN_C const GUID name #endif #endif

1 0

Zebediah Figura : user32/tests: Add tests for minimizing MDI windows.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 84a2459d56b64c47f5753090e37e5163c8cbf807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a2459d56b64c47f5753090e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 31 13:44:16 2017 -0500 user32/tests: Add tests for minimizing MDI windows. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e146e96..460ae93 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1841,6 +1841,14 @@ static void test_MDI_child_stack(HWND mdi_client) "Broken MDI child stack:\nexpected: %p->%p->%p->%p, but got: %p->%p->%p->%p\n", child_4, child_2, child_1, child_3, stack[0], stack[1], stack[2], stack[3]); + trace("Minimize child %p\n", child_4); + ShowWindow(child_4, SW_MINIMIZE); + + stack[0] = (HWND)SendMessageA(mdi_client, WM_MDIGETACTIVE, 0, 0); + stack[1] = GetWindow(stack[0], GW_HWNDNEXT); + todo_wine ok(stack[0] == child_4, "Expected %p, got %p\n", child_4, stack[0]); + todo_wine ok(stack[1] == NULL, "Expected NULL, got %p\n", stack[1]); + DestroyWindow(child_1); DestroyWindow(child_2); DestroyWindow(child_3);

1 0

Ken Thomases : server: On macOS, don't use clock_gettime() even if it' s available.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 1984e86b44343c8f1cdb163b8481ab84ca9cd16a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1984e86b44343c8f1cdb163b8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 1 14:48:06 2017 -0500 server: On macOS, don't use clock_gettime() even if it's available. The problem is building against the 10.12 or later SDK but deploying to 10.11 or earlier. Support for clock_gettime() is new with 10.12 so configure finds it and the code uses it, but the symbol is weak linked and resolves to NULL when running on earlier versions. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/request.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/request.c b/server/request.c index 781889c..6120bc5 100644 --- a/server/request.c +++ b/server/request.c @@ -518,7 +518,12 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) /* get current tick count to return to client */ unsigned int get_tick_count(void) { -#ifdef HAVE_CLOCK_GETTIME +#ifdef __APPLE__ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; +#elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; #ifdef CLOCK_MONOTONIC_RAW if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) @@ -526,11 +531,6 @@ unsigned int get_tick_count(void) #endif if (!clock_gettime( CLOCK_MONOTONIC, &ts )) return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; -#elif defined(__APPLE__) - static mach_timebase_info_data_t timebase; - - if (!timebase.denom) mach_timebase_info( &timebase ); - return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; #endif return (current_time - server_start_time) / 10000; }

1 0

Ken Thomases : ntdll: On macOS, don't use clock_gettime() even if it' s available.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: 27c71e09ad51ba6aa672a46379efd10b5959863f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c71e09ad51ba6aa672a4637… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jun 1 14:48:05 2017 -0500 ntdll: On macOS, don't use clock_gettime() even if it's available. The problem is building against the 10.12 or later SDK but deploying to 10.11 or earlier. Support for clock_gettime() is new with 10.12 so configure finds it and the code uses it, but the symbol is weak linked and resolves to NULL when running on earlier versions. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 3ba3c68..12dbdc3 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -101,7 +101,12 @@ static ULONGLONG monotonic_counter(void) { struct timeval now; -#ifdef HAVE_CLOCK_GETTIME +#ifdef __APPLE__ + static mach_timebase_info_data_t timebase; + + if (!timebase.denom) mach_timebase_info( &timebase ); + return mach_absolute_time() * timebase.numer / timebase.denom / 100; +#elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; #ifdef CLOCK_MONOTONIC_RAW if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) @@ -109,11 +114,6 @@ static ULONGLONG monotonic_counter(void) #endif if (!clock_gettime( CLOCK_MONOTONIC, &ts )) return ts.tv_sec * (ULONGLONG)TICKSPERSEC + ts.tv_nsec / 100; -#elif defined(__APPLE__) - static mach_timebase_info_data_t timebase; - - if (!timebase.denom) mach_timebase_info( &timebase ); - return mach_absolute_time() * timebase.numer / timebase.denom / 100; #endif gettimeofday( &now, 0 );

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 02 Jun '17

02 Jun '17

Module: wine Branch: master Commit: ebeefff87f48ceb4c6467376d9b32c971de158ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebeefff87f48ceb4c6467376d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 2 09:07:59 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/po/ru.po b/po/ru.po index ed60d7a..03a2543 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-05-25 02:24+0300\n" +"PO-Revision-Date: 2017-06-02 09:06+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11868,10 +11868,6 @@ msgid "Contains commands for accessing frequently used keys" msgstr "Содержит команды для доступа к часто используемым разделам" #: regedit.rc:165 -#, fuzzy -#| msgid "" -#| "Contains commands for displaying help and information about registry " -#| "editor" msgid "" "Contains commands for displaying Help and information about Registry Editor" msgstr "" @@ -12113,8 +12109,6 @@ msgid "regedit: The line contains invalid syntax.\n" msgstr "regedit: некорректный формат строки.\n" #: regedit.rc:189 -#, fuzzy -#| msgid "Quits the registry editor" msgid "Quits the Registry Editor" msgstr "Выход из редактора реестра" @@ -12131,10 +12125,8 @@ msgid "Shows or hides the status bar" msgstr "Показывает/скрывает строку состояния" #: regedit.rc:193 -#, fuzzy -#| msgid "Change position of split between two panes" msgid "Changes the position of the split between two panes" -msgstr "Перемещает разделитель между двумя панелями" +msgstr "Перемещение разделителя панелей" #: regedit.rc:194 msgid "Refreshes the window" @@ -12166,21 +12158,19 @@ msgstr "Изменяет значение параметра" #: regedit.rc:173 msgid "Adds a new key" -msgstr "Добавляет новый раздел" +msgstr "Добавление нового раздела" #: regedit.rc:174 msgid "Adds a new string value" -msgstr "Добавляет новый строковый параметр" +msgstr "Добавление строкового параметра" #: regedit.rc:175 msgid "Adds a new binary value" -msgstr "Добавляет новый двоичный параметр" +msgstr "Добавление двоичного параметра" #: regedit.rc:176 -#, fuzzy -#| msgid "Adds a new binary value" msgid "Adds a new 32-bit value" -msgstr "Добавляет новый двоичный параметр" +msgstr "Добавление 32-битного параметра" #: regedit.rc:179 msgid "Imports a text file into the registry" @@ -12195,10 +12185,8 @@ msgid "Prints all or part of the registry" msgstr "Печатает весь реестр или его часть" #: regedit.rc:183 -#, fuzzy -#| msgid "Registry Editor" msgid "Opens Registry Editor Help" -msgstr "Редактор реестра" +msgstr "Отображение справки по редактору реестра" #: regedit.rc:184 msgid "Displays program information, version number and copyright" @@ -12241,26 +12229,20 @@ msgid "Unable to query the registry key '%1'." msgstr "Не удалось прочитать ключ реестра «%1»." #: regedit.rc:172 -#, fuzzy -#| msgid "Modifies the value's data" msgid "Modifies the value's data in binary form" -msgstr "Изменяет значение параметра" +msgstr "Изменение значения параметра в двоичном виде" #: regedit.rc:177 msgid "Adds a new multi-string value" -msgstr "Добавляет новое многостроковое значение" +msgstr "Добавление многострочного параметра" #: regedit.rc:200 -#, fuzzy -#| msgid "Exports selected branch of the registry to a text file" msgid "Exports the selected branch of the registry to a text file" -msgstr "Экспортирует выделенную ветку реестра в текстовый файл" +msgstr "Экспортирует выбранную ветку реестра в текстовый файл" #: regedit.rc:178 -#, fuzzy -#| msgid "Adds a new string value" msgid "Adds a new expandable string value" -msgstr "Добавляет новый строковый параметр" +msgstr "Добавление расширяемого строкового параметра" #: regedit.rc:213 msgid "Confirm Key Delete"

1 0

Hugh McMaster : regedit: Update handling of the new subkey and new value menu items.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 6c752aaf8da225365b2bdbbf3c43d41afd4d1344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c752aaf8da225365b2bdbbf3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 1 09:33:29 2017 +0000 regedit: Update handling of the new subkey and new value menu items. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 6930d7a..c46dee3 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -154,14 +154,18 @@ static void update_delete_and_rename_items(HMENU hMenu, WCHAR *keyName) EnableMenuItem(hMenu, ID_EDIT_RENAME, state_r | MF_BYCOMMAND); } -static void update_copy_keyname_item(HMENU hMenu, WCHAR *keyName) +static void update_new_items_and_copy_keyname(HMENU hMenu, WCHAR *keyName) { - unsigned int state = MF_ENABLED; + unsigned int state = MF_ENABLED, i; + unsigned int items[] = {ID_EDIT_NEW_KEY, ID_EDIT_NEW_STRINGVALUE, ID_EDIT_NEW_BINARYVALUE, + ID_EDIT_NEW_DWORDVALUE, ID_EDIT_NEW_MULTI_STRINGVALUE, + ID_EDIT_NEW_EXPANDVALUE, ID_EDIT_COPYKEYNAME}; if (!keyName) state = MF_GRAYED; - EnableMenuItem(hMenu, ID_EDIT_COPYKEYNAME, state | MF_BYCOMMAND); + for (i = 0; i < COUNT_OF(items); i++) + EnableMenuItem(hMenu, items[i], state | MF_BYCOMMAND); } static void UpdateMenuItems(HMENU hMenu) { @@ -180,7 +184,7 @@ static void UpdateMenuItems(HMENU hMenu) { update_expand_or_collapse_item(hwndTV, selection, hMenu); EnableMenuItem(hMenu, ID_EDIT_MODIFY, (bAllowEdit ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); update_delete_and_rename_items(hMenu, keyName); - update_copy_keyname_item(hMenu, keyName); + update_new_items_and_copy_keyname(hMenu, keyName); EnableMenuItem(hMenu, ID_FAVORITES_ADDTOFAVORITES, (hRootKey ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND); EnableMenuItem(hMenu, ID_FAVORITES_REMOVEFAVORITE, (GetMenuItemCount(hMenu)>2 ? MF_ENABLED : MF_GRAYED) | MF_BYCOMMAND);

1 0

Hugh McMaster : regedit: Update some resource strings.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 576d300e497ef19410110a2016bf08e58fec533e URL: http://source.winehq.org/git/wine.git/?a=commit;h=576d300e497ef19410110a201… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 1 09:33:19 2017 +0000 regedit: Update some resource strings. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 34 ++++++++++++++++++++++++++-------- po/bg.po | 32 ++++++++++++++++++++++++-------- po/ca.po | 34 ++++++++++++++++++++++++++-------- po/cs.po | 34 ++++++++++++++++++++++++++-------- po/da.po | 34 ++++++++++++++++++++++++++-------- po/de.po | 34 ++++++++++++++++++++++++++-------- po/el.po | 18 +++++++++++------- po/en.po | 28 ++++++++++++++++------------ po/en_US.po | 28 ++++++++++++++++------------ po/eo.po | 34 ++++++++++++++++++++++++++-------- po/es.po | 34 ++++++++++++++++++++++++++-------- po/fa.po | 18 +++++++++++------- po/fi.po | 34 ++++++++++++++++++++++++++-------- po/fr.po | 34 ++++++++++++++++++++++++++-------- po/he.po | 34 ++++++++++++++++++++++++++-------- po/hi.po | 18 +++++++++++------- po/hr.po | 22 ++++++++++++++-------- po/hu.po | 34 ++++++++++++++++++++++++++-------- po/it.po | 34 ++++++++++++++++++++++++++-------- po/ja.po | 34 ++++++++++++++++++++++++++-------- po/ko.po | 34 ++++++++++++++++++++++++++-------- po/lt.po | 34 ++++++++++++++++++++++++++-------- po/ml.po | 18 +++++++++++------- po/nb_NO.po | 34 ++++++++++++++++++++++++++-------- po/nl.po | 34 ++++++++++++++++++++++++++-------- po/or.po | 18 +++++++++++------- po/pa.po | 18 +++++++++++------- po/pl.po | 34 ++++++++++++++++++++++++++-------- po/pt_BR.po | 34 ++++++++++++++++++++++++++-------- po/pt_PT.po | 34 ++++++++++++++++++++++++++-------- po/rm.po | 18 +++++++++++------- po/ro.po | 34 ++++++++++++++++++++++++++-------- po/ru.po | 34 ++++++++++++++++++++++++++-------- po/sk.po | 30 +++++++++++++++++++++--------- po/sl.po | 34 ++++++++++++++++++++++++++-------- po/sr_RS(a)cyrillic.po | 18 +++++++++++------- po/sr_RS(a)latin.po | 18 +++++++++++------- po/sv.po | 34 ++++++++++++++++++++++++++-------- po/te.po | 18 +++++++++++------- po/th.po | 18 +++++++++++------- po/tr.po | 34 ++++++++++++++++++++++++++-------- po/uk.po | 34 ++++++++++++++++++++++++++-------- po/wa.po | 18 +++++++++++------- po/wine.pot | 18 +++++++++++------- po/zh_CN.po | 34 ++++++++++++++++++++++++++-------- po/zh_TW.po | 34 ++++++++++++++++++++++++++-------- programs/regedit/regedit.rc | 14 +++++++------- 47 files changed, 969 insertions(+), 371 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=576d300e497ef19410110…

1 0

Hugh McMaster : regedit: Add status bar text for the 'Modify Binary Data' menu item.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 63a2a07e86ae60b82a075e8be9cc94a43eee102a URL: http://source.winehq.org/git/wine.git/?a=commit;h=63a2a07e86ae60b82a075e8be… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 1 09:33:10 2017 +0000 regedit: Add status bar text for the 'Modify Binary Data' menu item. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 226 +++++++++++++++++++++++--------------------- po/bg.po | 226 +++++++++++++++++++++++--------------------- po/ca.po | 226 +++++++++++++++++++++++--------------------- po/cs.po | 226 +++++++++++++++++++++++--------------------- po/da.po | 226 +++++++++++++++++++++++--------------------- po/de.po | 226 +++++++++++++++++++++++--------------------- po/el.po | 224 ++++++++++++++++++++++--------------------- po/en.po | 224 ++++++++++++++++++++++--------------------- po/en_US.po | 224 ++++++++++++++++++++++--------------------- po/eo.po | 224 ++++++++++++++++++++++--------------------- po/es.po | 226 +++++++++++++++++++++++--------------------- po/fa.po | 224 ++++++++++++++++++++++--------------------- po/fi.po | 226 +++++++++++++++++++++++--------------------- po/fr.po | 226 +++++++++++++++++++++++--------------------- po/he.po | 226 +++++++++++++++++++++++--------------------- po/hi.po | 224 ++++++++++++++++++++++--------------------- po/hr.po | 224 ++++++++++++++++++++++--------------------- po/hu.po | 226 +++++++++++++++++++++++--------------------- po/it.po | 226 +++++++++++++++++++++++--------------------- po/ja.po | 226 +++++++++++++++++++++++--------------------- po/ko.po | 226 +++++++++++++++++++++++--------------------- po/lt.po | 226 +++++++++++++++++++++++--------------------- po/ml.po | 224 ++++++++++++++++++++++--------------------- po/nb_NO.po | 226 +++++++++++++++++++++++--------------------- po/nl.po | 226 +++++++++++++++++++++++--------------------- po/or.po | 224 ++++++++++++++++++++++--------------------- po/pa.po | 224 ++++++++++++++++++++++--------------------- po/pl.po | 226 +++++++++++++++++++++++--------------------- po/pt_BR.po | 226 +++++++++++++++++++++++--------------------- po/pt_PT.po | 226 +++++++++++++++++++++++--------------------- po/rm.po | 224 ++++++++++++++++++++++--------------------- po/ro.po | 226 +++++++++++++++++++++++--------------------- po/ru.po | 226 +++++++++++++++++++++++--------------------- po/sk.po | 224 ++++++++++++++++++++++--------------------- po/sl.po | 226 +++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 224 ++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 224 ++++++++++++++++++++++--------------------- po/sv.po | 226 +++++++++++++++++++++++--------------------- po/te.po | 224 ++++++++++++++++++++++--------------------- po/th.po | 224 ++++++++++++++++++++++--------------------- po/tr.po | 226 +++++++++++++++++++++++--------------------- po/uk.po | 226 +++++++++++++++++++++++--------------------- po/wa.po | 224 ++++++++++++++++++++++--------------------- po/wine.pot | 224 ++++++++++++++++++++++--------------------- po/zh_CN.po | 226 +++++++++++++++++++++++--------------------- po/zh_TW.po | 226 +++++++++++++++++++++++--------------------- programs/regedit/regedit.rc | 1 + 47 files changed, 5301 insertions(+), 5060 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63a2a07e86ae60b82a075…

1 0

Hugh McMaster : regedit: Add status bar text for adding a new expandable string value.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 6eef9a95540c25fddb426f0b1ba35a472eb0a21c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eef9a95540c25fddb426f0b1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 1 09:32:59 2017 +0000 regedit: Add status bar text for adding a new expandable string value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 214 +++++++++++++++++++++++--------------------- po/bg.po | 214 +++++++++++++++++++++++--------------------- po/ca.po | 214 +++++++++++++++++++++++--------------------- po/cs.po | 214 +++++++++++++++++++++++--------------------- po/da.po | 214 +++++++++++++++++++++++--------------------- po/de.po | 214 +++++++++++++++++++++++--------------------- po/el.po | 212 ++++++++++++++++++++++--------------------- po/en.po | 212 ++++++++++++++++++++++--------------------- po/en_US.po | 212 ++++++++++++++++++++++--------------------- po/eo.po | 214 +++++++++++++++++++++++--------------------- po/es.po | 214 +++++++++++++++++++++++--------------------- po/fa.po | 212 ++++++++++++++++++++++--------------------- po/fi.po | 214 +++++++++++++++++++++++--------------------- po/fr.po | 214 +++++++++++++++++++++++--------------------- po/he.po | 214 +++++++++++++++++++++++--------------------- po/hi.po | 212 ++++++++++++++++++++++--------------------- po/hr.po | 212 ++++++++++++++++++++++--------------------- po/hu.po | 214 +++++++++++++++++++++++--------------------- po/it.po | 214 +++++++++++++++++++++++--------------------- po/ja.po | 214 +++++++++++++++++++++++--------------------- po/ko.po | 214 +++++++++++++++++++++++--------------------- po/lt.po | 214 +++++++++++++++++++++++--------------------- po/ml.po | 212 ++++++++++++++++++++++--------------------- po/nb_NO.po | 214 +++++++++++++++++++++++--------------------- po/nl.po | 214 +++++++++++++++++++++++--------------------- po/or.po | 212 ++++++++++++++++++++++--------------------- po/pa.po | 212 ++++++++++++++++++++++--------------------- po/pl.po | 214 +++++++++++++++++++++++--------------------- po/pt_BR.po | 214 +++++++++++++++++++++++--------------------- po/pt_PT.po | 214 +++++++++++++++++++++++--------------------- po/rm.po | 212 ++++++++++++++++++++++--------------------- po/ro.po | 214 +++++++++++++++++++++++--------------------- po/ru.po | 214 +++++++++++++++++++++++--------------------- po/sk.po | 214 +++++++++++++++++++++++--------------------- po/sl.po | 214 +++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 212 ++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 212 ++++++++++++++++++++++--------------------- po/sv.po | 214 +++++++++++++++++++++++--------------------- po/te.po | 212 ++++++++++++++++++++++--------------------- po/th.po | 212 ++++++++++++++++++++++--------------------- po/tr.po | 214 +++++++++++++++++++++++--------------------- po/uk.po | 214 +++++++++++++++++++++++--------------------- po/wa.po | 212 ++++++++++++++++++++++--------------------- po/wine.pot | 212 ++++++++++++++++++++++--------------------- po/zh_CN.po | 214 +++++++++++++++++++++++--------------------- po/zh_TW.po | 214 +++++++++++++++++++++++--------------------- programs/regedit/regedit.rc | 1 + 47 files changed, 5029 insertions(+), 4784 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eef9a95540c25fddb426…

1 0

Hugh McMaster : regedit: Fix handling of 'Copy Key Name' menu items.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 898ee58aa03caad53dd24bdb4e3f6cb6e45d9d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=898ee58aa03caad53dd24bdb4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 1 09:32:48 2017 +0000 regedit: Fix handling of 'Copy Key Name' menu items. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0aec59a..6930d7a 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -158,7 +158,7 @@ static void update_copy_keyname_item(HMENU hMenu, WCHAR *keyName) { unsigned int state = MF_ENABLED; - if (!g_pChildWnd->nFocusPanel && !keyName) + if (!keyName) state = MF_GRAYED; EnableMenuItem(hMenu, ID_EDIT_COPYKEYNAME, state | MF_BYCOMMAND);

1 0

Jacek Caban : urlmon.idl: Added BINDINFO_OPTIONS declaration.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 53a95d4104b0aade465c8ce194889f288c9b058d URL: http://source.winehq.org/git/wine.git/?a=commit;h=53a95d4104b0aade465c8ce19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 1 15:12:04 2017 +0200 urlmon.idl: Added BINDINFO_OPTIONS declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/urlmon.idl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/urlmon.idl b/include/urlmon.idl index 1f7205d..d7e97ad 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -196,6 +196,25 @@ interface IBindStatusCallback : IUnknown typedef enum { + BINDINFO_OPTIONS_WININETFLAG = 0x00010000, + BINDINFO_OPTIONS_ENABLE_UTF8 = 0x00020000, + BINDINFO_OPTIONS_DISABLE_UTF8 = 0x00040000, + BINDINFO_OPTIONS_USE_IE_ENCODING = 0x00080000, + BINDINFO_OPTIONS_BINDTOOBJECT = 0x00100000, + BINDINFO_OPTIONS_SECURITYOPTOUT = 0x00200000, + BINDINFO_OPTIONS_IGNOREMIMETEXTPLAIN = 0x00400000, + BINDINFO_OPTIONS_USEBINDSTRINGCREDS = 0x00800000, + BINDINFO_OPTIONS_IGNOREHTTPHTTPSREDIRECTS = 0x01000000, + BINDINFO_OPTIONS_IGNORE_SSLERRORS_ONCE = 0x02000000, + BINDINFO_WPC_DOWNLOADBLOCKED = 0x08000000, + BINDINFO_WPC_LOGGING_ENABLED = 0x10000000, + BINDINFO_OPTIONS_ALLOWCONNECTDATA = 0x20000000, + BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS = 0x40000000, + BINDINFO_OPTIONS_SHDOCVW_NAVIGATE = (int)0x80000000 + } BINDINFO_OPTIONS; + + typedef enum + { BSCF_FIRSTDATANOTIFICATION = 0x01, BSCF_INTERMEDIATEDATANOTIFICATION = 0x02, BSCF_LASTDATANOTIFICATION = 0x04,

1 0

Jacek Caban : urlmon/tests: Get rid of debug leftovers.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 2e05a814ff27938fe919ce07657c0f825a922528 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e05a814ff27938fe919ce076… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 1 15:11:50 2017 +0200 urlmon/tests: Get rid of debug leftovers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/protocol.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 5981c25..1e6fa36 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1332,21 +1332,6 @@ static HRESULT WINAPI BindInfo_GetBindInfo(IInternetBindInfo *iface, DWORD *grfB memcpy(data, post_data, sizeof(post_data)); U(pbindinfo->stgmedData).hGlobal = data; }else { - IStream *post_stream; - HGLOBAL data; - HRESULT hres; - - if(0) { - /* Must be GMEM_FIXED, GMEM_MOVABLE does not work properly */ - data = GlobalAlloc(GPTR, sizeof(post_data)); - memcpy(data, post_data, sizeof(post_data)); - U(pbindinfo->stgmedData).hGlobal = data; - - hres = CreateStreamOnHGlobal(data, FALSE, &post_stream); - ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres); - - U(pbindinfo->stgmedData).pstm =post_stream;/* &Stream; */ - } U(pbindinfo->stgmedData).pstm = &Stream; } }

1 0

Nikolay Sivov : include: Added CreateSymbolicLink() flag.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: f6b8ce109c0e14baba5f1adb335b5c74041c8cfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b8ce109c0e14baba5f1adb3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 1 11:17:02 2017 +0300 include: Added CreateSymbolicLink() flag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index 67c29b5..1347f8c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1682,6 +1682,9 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM #define PROC_THREAD_ATTRIBUTE_ALL_APPLICATION_PACKAGES_POLICY (ProcThreadAttributeAllApplicationPackagesPolicy | PROC_THREAD_ATTRIBUTE_INPUT) #define PROC_THREAD_ATTRIBUTE_WIN32K_FILTER (ProcThreadAttributeWin32kFilter | PROC_THREAD_ATTRIBUTE_INPUT) +#define SYMBOLIC_LINK_FLAG_DIRECTORY (0x1) +#define VALID_SYMBOLIC_LINK_FLAGS SYMBOLIC_LINK_FLAG_DIRECTORY + WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID);

1 0

Alexandre Julliard : wineandroid: Notify Java also when a window is forcefully destroyed.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: d05f4f586753cfd59261adef6b668bd75d8c35b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05f4f586753cfd59261adef6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:44:26 2017 +0200 wineandroid: Notify Java also when a window is forcefully destroyed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index d889c8d..61f76bf 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -305,6 +305,20 @@ static int wait_events( int timeout ) } +static WNDPROC desktop_orig_wndproc; + +static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case WM_PARENTNOTIFY: + if (LOWORD(wp) == WM_DESTROY) destroy_ioctl_window( (HWND)lp ); + break; + } + return desktop_orig_wndproc( hwnd, msg, wp, lp ); +} + + /*********************************************************************** * ANDROID_MsgWaitForMultipleObjectsEx */ @@ -334,7 +348,8 @@ BOOL CDECL ANDROID_CreateWindow( HWND hwnd ) init_event_queue(); start_android_device(); - + desktop_orig_wndproc = (WNDPROC)SetWindowLongPtrW( hwnd, GWLP_WNDPROC, + (LONG_PTR)desktop_wndproc_wrapper ); if (!(data = alloc_win_data( hwnd ))) return FALSE; release_win_data( data ); }

1 0

Alexandre Julliard : wineandroid: Add Java callbacks for creating and destroying a window.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 347699d77392cc7c7a3b7e4db427692ec696a543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347699d77392cc7c7a3b7e4db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:42:42 2017 +0200 wineandroid: Add Java callbacks for creating and destroying a window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 56 +++++++++++ dlls/wineandroid.drv/android.h | 2 + dlls/wineandroid.drv/device.c | 171 ++++++++++++++++++++++++++++++++- dlls/wineandroid.drv/window.c | 7 ++ 4 files changed, 234 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=347699d77392cc7c7a3b7…

1 0

Alexandre Julliard : wineandroid: Wait until we receive the desktop size before proceeding with startup.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: bcd99f5c370a85998dfc7ac3650d96c298e79c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcd99f5c370a85998dfc7ac36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:41:05 2017 +0200 wineandroid: Wait until we receive the desktop size before proceeding with startup. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 3 ++- dlls/wineandroid.drv/window.c | 41 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 3 +++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 3696493..cc43bbe 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -70,7 +70,6 @@ public class WineActivity extends Activity Locale.getDefault().getCountry() + ".UTF-8"; copyAssetFiles(); - runOnUiThread( new Runnable() { public void run() { progress_dialog.dismiss(); }}); HashMap<String,String> env = new HashMap<String,String>(); env.put( "WINELOADER", loader.toString() ); @@ -96,6 +95,8 @@ public class WineActivity extends Activity log.delete(); } + createProgressDialog( 0, "Setting up the Windows environment..." ); + System.load( libdir.toString() + "/libwine.so" ); prefix.mkdirs(); diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 971fd56..ba9f3b4 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -282,6 +282,28 @@ static int process_events( DWORD mask ) /*********************************************************************** + * wait_events + */ +static int wait_events( int timeout ) +{ + assert( GetCurrentThreadId() == desktop_tid ); + + for (;;) + { + struct pollfd pollfd; + int ret; + + pollfd.fd = event_pipe[0]; + pollfd.events = POLLIN | POLLHUP; + ret = poll( &pollfd, 1, timeout ); + if (ret == -1 && errno == EINTR) continue; + if (ret && (pollfd.revents & (POLLHUP | POLLERR))) ret = -1; + return ret; + } +} + + +/*********************************************************************** * ANDROID_MsgWaitForMultipleObjectsEx */ DWORD CDECL ANDROID_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, @@ -411,3 +433,22 @@ void CDECL ANDROID_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag TRACE( "win %p window %s client %s style %08x flags %08x\n", hwnd, wine_dbgstr_rect(window_rect), wine_dbgstr_rect(client_rect), new_style, swp_flags ); } + + +/*********************************************************************** + * ANDROID_create_desktop + */ +BOOL CDECL ANDROID_create_desktop( UINT width, UINT height ) +{ + /* wait until we receive the surface changed event */ + while (!screen_width) + { + if (wait_events( 2000 ) != 1) + { + ERR( "wait timed out\n" ); + break; + } + process_events( QS_ALLINPUT ); + } + return TRUE; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 49402a8..84ed7fd 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -11,3 +11,6 @@ @ cdecl MsgWaitForMultipleObjectsEx(long ptr long long long) ANDROID_MsgWaitForMultipleObjectsEx @ cdecl WindowPosChanging(long long long ptr ptr ptr ptr) ANDROID_WindowPosChanging @ cdecl WindowPosChanged(long long long ptr ptr ptr ptr ptr) ANDROID_WindowPosChanged + +# Desktop +@ cdecl wine_create_desktop(long long) ANDROID_create_desktop

1 0

Alexandre Julliard : wineandroid: Create the top-level view on desktop window creation.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 4123bbdd84059ba69c6ef22757ccbc336a7ae47c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4123bbdd84059ba69c6ef2275… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:40:29 2017 +0200 wineandroid: Create the top-level view on desktop window creation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 47 ++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/device.c | 42 +++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index b0a8541..3696493 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -22,11 +22,14 @@ package org.winehq.wine; import android.app.Activity; import android.app.ProgressDialog; +import android.content.Context; import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.util.Log; +import android.view.View; +import android.view.ViewGroup; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -42,6 +45,7 @@ import java.util.Map; public class WineActivity extends Activity { private native String wine_init( String[] cmdline, String[] env ); + public native void wine_desktop_changed( int width, int height ); private final String LOGTAG = "wine"; private ProgressDialog progress_dialog; @@ -263,4 +267,47 @@ public class WineActivity extends Activity progress_dialog.incrementProgressBy( 1 ); }}); } } + + // The top-level desktop view group + + protected class TopView extends ViewGroup + { + private int desktop_hwnd; + + public TopView( Context context, int hwnd ) + { + super( context ); + desktop_hwnd = hwnd; + } + + @Override + protected void onSizeChanged( int width, int height, int old_width, int old_height ) + { + Log.i( LOGTAG, String.format( "desktop size %dx%d", width, height )); + wine_desktop_changed( width, height ); + } + + @Override + protected void onLayout( boolean changed, int left, int top, int right, int bottom ) + { + // nothing to do + } + } + + protected TopView top_view; + + // Entry points for the device driver + + public void create_desktop_window( int hwnd ) + { + Log.i( LOGTAG, String.format( "create desktop view %08x", hwnd )); + top_view = new TopView( this, hwnd ); + setContentView( top_view ); + progress_dialog.dismiss(); + } + + public void createDesktopWindow( final int hwnd ) + { + runOnUiThread( new Runnable() { public void run() { create_desktop_window( hwnd ); }} ); + } } diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c index 3180d69..f565534 100644 --- a/dlls/wineandroid.drv/device.c +++ b/dlls/wineandroid.drv/device.c @@ -48,10 +48,48 @@ static HANDLE stop_event; static HANDLE thread; static JNIEnv *jni_env; -#ifdef __i386__ +#ifdef __i386__ /* the Java VM uses %fs for its own purposes, so we need to wrap the calls */ static WORD orig_fs, java_fs; +static inline void wrap_java_call(void) { wine_set_fs( java_fs ); } +static inline void unwrap_java_call(void) { wine_set_fs( orig_fs ); } +#else +static inline void wrap_java_call(void) { } +static inline void unwrap_java_call(void) { } #endif /* __i386__ */ +static jobject load_java_method( jmethodID *method, const char *name, const char *args ) +{ + jobject object = wine_get_java_object(); + + if (!*method) + { + jclass class; + + wrap_java_call(); + class = (*jni_env)->GetObjectClass( jni_env, object ); + *method = (*jni_env)->GetMethodID( jni_env, class, name, args ); + unwrap_java_call(); + if (!*method) + { + FIXME( "method %s not found\n", name ); + return NULL; + } + } + return object; +} + +static void create_desktop_window( HWND hwnd ) +{ + static jmethodID method; + jobject object; + + if (!(object = load_java_method( &method, "createDesktopWindow", "(I)V" ))) return; + + wrap_java_call(); + (*jni_env)->CallVoidMethod( jni_env, object, method, HandleToLong( hwnd )); + unwrap_java_call(); +} + static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); @@ -105,6 +143,8 @@ static DWORD CALLBACK device_thread( void *arg ) (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); #endif + create_desktop_window( GetDesktopWindow() ); + RtlInitUnicodeString( &nameW, driver_nameW ); if ((status = IoCreateDriver( &nameW, init_android_driver ))) {

1 0

Alexandre Julliard : wineandroid: Create a pseudo-device to handle ioctl calls.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 481e9ff8ba7e20731f4597c5c08e1cbeed1baa98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481e9ff8ba7e20731f4597c5c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 1 09:39:20 2017 +0200 wineandroid: Create a pseudo-device to handle ioctl calls. This will allow using ioctls to perform operations in the context of the desktop process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/Makefile.in | 3 +- dlls/wineandroid.drv/android.h | 7 +++ dlls/wineandroid.drv/device.c | 132 +++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 1 + 4 files changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/wineandroid.drv/Makefile.in b/dlls/wineandroid.drv/Makefile.in index f83d494..f03f09a 100644 --- a/dlls/wineandroid.drv/Makefile.in +++ b/dlls/wineandroid.drv/Makefile.in @@ -1,7 +1,8 @@ MODULE = wineandroid.drv -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 ntoskrnl C_SRCS = \ + device.c \ init.c \ window.c diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index 9fefb11..9cafe26 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -44,6 +44,13 @@ DECL_FUNCPTR( __android_log_print ); /************************************************************************** + * Android pseudo-device + */ + +extern void start_android_device(void) DECLSPEC_HIDDEN; + + +/************************************************************************** * USER driver */ diff --git a/dlls/wineandroid.drv/device.c b/dlls/wineandroid.drv/device.c new file mode 100644 index 0000000..3180d69 --- /dev/null +++ b/dlls/wineandroid.drv/device.c @@ -0,0 +1,132 @@ +/* + * Android pseudo-device handling + * + * Copyright 2014-2017 Alexandre Julliard + * + * This library 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 Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <assert.h> +#include <errno.h> +#include <stdio.h> +#include <stdarg.h> +#include <sys/ioctl.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "winioctl.h" +#include "ddk/wdm.h" +#include "android.h" +#include "wine/library.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(android); + +extern NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ); +static HANDLE stop_event; +static HANDLE thread; +static JNIEnv *jni_env; + +#ifdef __i386__ +static WORD orig_fs, java_fs; +#endif /* __i386__ */ + +static NTSTATUS WINAPI ioctl_callback( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; + + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return STATUS_SUCCESS; +} + +static NTSTATUS CALLBACK init_android_driver( DRIVER_OBJECT *driver, UNICODE_STRING *name ) +{ + static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','W','i','n','e','A','n','d','r','o','i','d',0 }; + static const WCHAR device_linkW[] = {'\\','?','?','\\','W','i','n','e','A','n','d','r','o','i','d',0 }; + + UNICODE_STRING nameW, linkW; + DEVICE_OBJECT *device; + NTSTATUS status; + + driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ioctl_callback; + + RtlInitUnicodeString( &nameW, device_nameW ); + RtlInitUnicodeString( &linkW, device_linkW ); + + if ((status = IoCreateDevice( driver, 0, &nameW, 0, 0, FALSE, &device ))) return status; + return IoCreateSymbolicLink( &linkW, &nameW ); +} + +static DWORD CALLBACK device_thread( void *arg ) +{ + static const WCHAR driver_nameW[] = {'\\','D','r','i','v','e','r','\\','W','i','n','e','A','n','d','r','o','i','d',0 }; + + HANDLE start_event = arg; + UNICODE_STRING nameW; + NTSTATUS status; + JavaVM *java_vm; + DWORD ret; + + TRACE( "starting process %x\n", GetCurrentProcessId() ); + + if (!(java_vm = wine_get_java_vm())) return 0; /* not running under Java */ + +#ifdef __i386__ + orig_fs = wine_get_fs(); + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); + java_fs = wine_get_fs(); + wine_set_fs( orig_fs ); + if (java_fs != orig_fs) TRACE( "%%fs changed from %04x to %04x by Java VM\n", orig_fs, java_fs ); +#else + (*java_vm)->AttachCurrentThread( java_vm, &jni_env, 0 ); +#endif + + RtlInitUnicodeString( &nameW, driver_nameW ); + if ((status = IoCreateDriver( &nameW, init_android_driver ))) + { + FIXME( "failed to create driver error %x\n", status ); + return status; + } + + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + SetEvent( start_event ); + + ret = wine_ntoskrnl_main_loop( stop_event ); + + (*java_vm)->DetachCurrentThread( java_vm ); + return ret; +} + +void start_android_device(void) +{ + HANDLE handles[2]; + + handles[0] = CreateEventW( NULL, TRUE, FALSE, NULL ); + handles[1] = thread = CreateThread( NULL, 0, device_thread, handles[0], 0, NULL ); + WaitForMultipleObjects( 2, handles, FALSE, INFINITE ); + CloseHandle( handles[0] ); +} diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index cf35215..971fd56 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -307,6 +307,7 @@ BOOL CDECL ANDROID_CreateWindow( HWND hwnd ) if (hwnd == GetDesktopWindow()) { init_event_queue(); + start_android_device(); } return TRUE; }

1 0

Nikolay Sivov : mf: Added MFCreateTopology and stub IMFTopology implementation.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 8323871f55dcfe87dd987c666c6f2dd041fe213a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8323871f55dcfe87dd987c666… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 09:56:27 2017 +0300 mf: Added MFCreateTopology and stub IMFTopology implementation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/mf/Makefile.in | 4 +- dlls/mf/mf.spec | 2 +- dlls/mf/tests/Makefile.in | 5 + dlls/mf/tests/mf.c | 49 +++++ dlls/mf/topology.c | 523 ++++++++++++++++++++++++++++++++++++++++++++++ include/mfidl.idl | 1 + 8 files changed, 586 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8323871f55dcfe87dd987…

1 0

Nikolay Sivov : comctl32/taskdialog: Added TaskDialog() export.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 9e3ebed4a417cc32e58ca5ac255c066b0a00a115 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e3ebed4a417cc32e58ca5ac2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 1 09:38:14 2017 +0300 comctl32/taskdialog: Added TaskDialog() export. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/taskdialog.c | 25 +++++++++++++++++++++++++ dlls/comctl32/tests/taskdialog.c | 8 ++++++++ 3 files changed, 34 insertions(+) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 9287346..4e1aead 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -61,6 +61,7 @@ 340 stdcall -ordinal DPA_CreateEx(long long) 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) +344 stdcall -ordinal TaskDialog(long long wstr wstr wstr long wstr ptr) 345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr) 350 stdcall -noname -private StrChrA(str long) 351 stdcall -noname -private StrRChrA(str str long) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index fcc7db7..dc90160 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -22,6 +22,8 @@ #include <stdarg.h> #include <string.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -384,3 +386,26 @@ HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *butto return S_OK; } + +/*********************************************************************** + * TaskDialog [COMCTL32.@] + */ +HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const WCHAR *main_instruction, + const WCHAR *content, TASKDIALOG_COMMON_BUTTON_FLAGS common_buttons, const WCHAR *icon, int *button) +{ + TASKDIALOGCONFIG taskconfig; + + TRACE("%p, %p, %s, %s, %s, %#x, %s, %p\n", owner, hinst, debugstr_w(title), debugstr_w(main_instruction), + debugstr_w(content), common_buttons, debugstr_w(icon), button); + + memset(&taskconfig, 0, sizeof(taskconfig)); + taskconfig.cbSize = sizeof(taskconfig); + taskconfig.hwndParent = owner; + taskconfig.hInstance = hinst; + taskconfig.dwCommonButtons = common_buttons; + taskconfig.pszWindowTitle = title; + taskconfig.u.pszMainIcon = icon; + taskconfig.pszMainInstruction = main_instruction; + taskconfig.pszContent = content; + return TaskDialogIndirect(&taskconfig, button, NULL, NULL); +} diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c index 8a9d164..c937127 100644 --- a/dlls/comctl32/tests/taskdialog.c +++ b/dlls/comctl32/tests/taskdialog.c @@ -28,6 +28,8 @@ #include "v6util.h" static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *); +static HRESULT (WINAPI *pTaskDialog)(HWND, HINSTANCE, const WCHAR *, const WCHAR *, const WCHAR *, + TASKDIALOG_COMMON_BUTTON_FLAGS, const WCHAR *, int *); START_TEST(taskdialog) { @@ -50,6 +52,12 @@ START_TEST(taskdialog) return; } + pTaskDialog = (void *)GetProcAddress(hinst, "TaskDialog"); + + ptr_ordinal = GetProcAddress(hinst, (const char *)344); + ok(pTaskDialog == ptr_ordinal, "got wrong pointer for ordinal 344, %p expected %p\n", + ptr_ordinal, pTaskDialog); + ptr_ordinal = GetProcAddress(hinst, (const char *)345); ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", ptr_ordinal, pTaskDialogIndirect);

1 0

Nikolay Sivov : include: Add some missing Common Controls definitions.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 15c7e654a570899f08507e698998fb40715169b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c7e654a570899f08507e698… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 1 09:38:13 2017 +0300 include: Add some missing Common Controls definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index d176b4f..587caae 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -2165,6 +2165,7 @@ static const WCHAR TRACKBAR_CLASSW[] = { 'm','s','c','t','l','s','_', #define TBM_SETTIPSIDE (WM_USER+31) #define TBM_SETBUDDY (WM_USER+32) #define TBM_GETBUDDY (WM_USER+33) +#define TBM_SETPOSNOTIFY (WM_USER+34) #define TBM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT #define TBM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT @@ -3285,6 +3286,14 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVM_MAPINDEXTOID (LVM_FIRST + 180) #define LVM_MAPIDTOINDEX (LVM_FIRST + 181) #define LVM_ISITEMVISIBLE (LVM_FIRST + 182) +#define LVM_GETEMPTYTEXT (LVM_FIRST + 204) +#define LVM_GETFOOTERRECT (LVM_FIRST + 205) +#define LVM_GETFOOTERINFO (LVM_FIRST + 206) +#define LVM_GETFOOTERITEMRECT (LVM_FIRST + 207) +#define LVM_GETFOOTERITEM (LVM_FIRST + 208) +#define LVM_GETITEMINDEXRECT (LVM_FIRST + 209) +#define LVM_SETITEMINDEXSTATE (LVM_FIRST + 210) +#define LVM_GETNEXTITEMINDEX (LVM_FIRST + 211) #define LVN_FIRST (0U-100U) #define LVN_LAST (0U-199U) @@ -5211,6 +5220,59 @@ enum _TASKDIALOG_FLAGS }; typedef int TASKDIALOG_FLAGS; +typedef enum _TASKDIALOG_MESSAGES +{ + TDM_NAVIGATE_PAGE = WM_USER + 101, + TDM_CLICK_BUTTON = WM_USER + 102, + TDM_SET_MARQUEE_PROGRESS_BAR = WM_USER + 103, + TDM_SET_PROGRESS_BAR_STATE = WM_USER + 104, + TDM_SET_PROGRESS_BAR_RANGE = WM_USER + 105, + TDM_SET_PROGRESS_BAR_POS = WM_USER + 106, + TDM_SET_PROGRESS_BAR_MARQUEE = WM_USER + 107, + TDM_SET_ELEMENT_TEXT = WM_USER + 108, + TDM_CLICK_RADIO_BUTTON = WM_USER + 110, + TDM_ENABLE_BUTTON = WM_USER + 111, + TDM_ENABLE_RADIO_BUTTON = WM_USER + 112, + TDM_CLICK_VERIFICATION = WM_USER + 113, + TDM_UPDATE_ELEMENT_TEXT = WM_USER + 114, + TDM_SET_BUTTON_ELEVATION_REQUIRED_STATE = WM_USER + 115, + TDM_UPDATE_ICON = WM_USER + 116, +} TASKDIALOG_MESSAGES; + +typedef enum _TASKDIALOG_NOTIFICATIONS +{ + TDN_CREATED, + TDN_NAVIGATED, + TDN_BUTTON_CLICKED, + TDN_HYPERLINK_CLICKED, + TDN_TIMER, + TDN_DESTROYED, + TDN_RADIO_BUTTON_CLICKED, + TDN_DIALOG_CONSTRUCTED, + TDN_VERIFICATION_CLICKED, + TDN_HELP, + TDN_EXPANDO_BUTTON_CLICKED, +} TASKDIALOG_NOTIFICATIONS; + +typedef enum _TASKDIALOG_ELEMENTS +{ + TDE_CONTENT, + TDE_EXPANDED_INFORMATION, + TDE_FOOTER, + TDE_MAIN_INSTRUCTION, +} TASKDIALOG_ELEMENTS; + +typedef enum _TASKDIALOG_ICON_ELEMENTS +{ + TDIE_ICON_MAIN, + TDIE_ICON_FOOTER, +} TASKDIALOG_ICON_ELEMENTS; + +#define TD_WARNING_ICON MAKEINTRESOURCEW(-1) +#define TD_ERROR_ICON MAKEINTRESOURCEW(-2) +#define TD_INFORMATION_ICON MAKEINTRESOURCEW(-3) +#define TD_SHIELD_ICON MAKEINTRESOURCEW(-4) + enum _TASKDIALOG_COMMON_BUTTON_FLAGS { TDCBF_OK_BUTTON = 0x0001, @@ -5266,6 +5328,8 @@ typedef struct _TASKDIALOGCONFIG UINT cxWidth; } TASKDIALOGCONFIG; +HRESULT WINAPI TaskDialog(HWND owner, HINSTANCE hinst, const WCHAR *title, const WCHAR *main_instruction, + const WCHAR *content, TASKDIALOG_COMMON_BUTTON_FLAGS common_buttons, const WCHAR *icon, int *button); HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *, int *, int *, BOOL *); #include <poppack.h>

1 0

Paul Gofman : d3dx9: Merge constant setting for child parameters when possible.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 730832d2d87287b6891ca000bfe0763b768dfe98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730832d2d87287b6891ca000b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:32 2017 +0300 d3dx9: Merge constant setting for child parameters when possible. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 1 + dlls/d3dx9_36/preshader.c | 160 ++++++++++++++++++++++++++++++++---------- 2 files changed, 124 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=730832d2d87287b6891ca…

1 0

Paul Gofman : d3dx9: Don't add const setting entries with zero count.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 4c7653ef5d48670f40ee28d14df20e0631b99298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7653ef5d48670f40ee28d14… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 31 23:35:52 2017 +0200 d3dx9: Don't add const setting entries with zero count. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 5974329..7afbc03 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1226,6 +1226,11 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC const_set.register_count = desc.RegisterCount; table_type = table_info[const_set.table].type; get_const_upload_info(&const_set, &info); + if (!info.count) + { + TRACE("%s has zero count, skipping.\n", debugstr_a(param->name)); + return D3D_OK; + } if (table_type_from_param_type(param->type) == PRES_VT_COUNT) return D3DERR_INVALIDCALL;

1 0

Paul Gofman : d3dx9: Precompute and store a constant direct copy flag.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 1816d8a9fabc9aa0a8fd1379f1e6f6e17e8af7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1816d8a9fabc9aa0a8fd1379f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:30 2017 +0300 d3dx9: Precompute and store a constant direct copy flag. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 1 + dlls/d3dx9_36/preshader.c | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 62213ac..ccb8e8a 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -154,6 +154,7 @@ struct d3dx_const_param_eval_output enum D3DXPARAMETER_CLASS constant_class; unsigned int register_index; unsigned int register_count; + BOOL direct_copy; }; struct d3dx_const_tab diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index e2bd26b..5974329 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1050,17 +1050,14 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const if (!is_param_dirty(param, const_tab->update_version)) continue; - get_const_upload_info(const_set, &info); start_offset = get_offset_reg(table, const_set->register_index); - - if (table_type_from_param_type(param->type) == table_type - && !info.transpose && info.minor == info.major_stride - && info.count == get_offset_reg(table, const_set->register_count) - && info.count * sizeof(unsigned int) <= param->bytes) + if (const_set->direct_copy) { - regstore_set_values(rs, table, param->data, start_offset, info.count); + regstore_set_values(rs, table, param->data, start_offset, + get_offset_reg(table, const_set->register_count)); continue; } + get_const_upload_info(const_set, &info); for (i = 0; i < info.major_count; ++i) { @@ -1149,6 +1146,8 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC unsigned int const_count, param_count, i; BOOL get_element; struct d3dx_const_param_eval_output const_set; + struct const_upload_info info; + enum pres_value_type table_type; HRESULT hr; if (FAILED(get_ctab_constant_desc(ctab, hc, &desc))) @@ -1225,6 +1224,17 @@ static HRESULT init_set_constants_param(struct d3dx_const_tab *const_tab, ID3DXC return D3DERR_INVALIDCALL; } const_set.register_count = desc.RegisterCount; + table_type = table_info[const_set.table].type; + get_const_upload_info(&const_set, &info); + + if (table_type_from_param_type(param->type) == PRES_VT_COUNT) + return D3DERR_INVALIDCALL; + + const_set.direct_copy = table_type_from_param_type(param->type) == table_type + && !info.transpose && info.minor == info.major_stride + && info.count == get_offset_reg(const_set.table, const_set.register_count) + && info.count * sizeof(unsigned int) <= param->bytes; + if (FAILED(hr = append_const_set(const_tab, &const_set))) return hr;

1 0

Paul Gofman : d3dx9: Factor out table_type_from_param_type() function.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 6cefc5fa6c7c55050ee0daf43b654440086fb0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cefc5fa6c7c55050ee0daf43… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:29 2017 +0300 d3dx9: Factor out table_type_from_param_type() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 8bb2217..e2bd26b 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -193,7 +193,8 @@ enum pres_value_type PRES_VT_FLOAT, PRES_VT_DOUBLE, PRES_VT_INT, - PRES_VT_BOOL + PRES_VT_BOOL, + PRES_VT_COUNT }; static const struct @@ -269,6 +270,22 @@ struct const_upload_info unsigned int count; }; +static enum pres_value_type table_type_from_param_type(D3DXPARAMETER_TYPE type) +{ + switch (type) + { + case D3DXPT_FLOAT: + return PRES_VT_FLOAT; + case D3DXPT_INT: + return PRES_VT_INT; + case D3DXPT_BOOL: + return PRES_VT_BOOL; + default: + FIXME("Unsupported type %u.\n", type); + return PRES_VT_COUNT; + } +} + static unsigned int get_reg_offset(unsigned int table, unsigned int offset) { return table == PRES_REGTAB_OBCONST ? offset : offset >> 2; @@ -392,6 +409,9 @@ static void regstore_set_double(struct d3dx_regstore *rs, unsigned int table, un case PRES_VT_DOUBLE: *(double *)p = v; break; case PRES_VT_INT : *(int *)p = lrint(v); break; case PRES_VT_BOOL : *(BOOL *)p = !!v; break; + default: + FIXME("Bad type %u.\n", table_info[table].type); + break; } reg_idx = get_reg_offset(table, offset); rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] |= @@ -1033,9 +1053,7 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const get_const_upload_info(const_set, &info); start_offset = get_offset_reg(table, const_set->register_index); - if (((param->type == D3DXPT_FLOAT && table_type == PRES_VT_FLOAT) - || (param->type == D3DXPT_INT && table_type == PRES_VT_INT) - || (param->type == D3DXPT_BOOL && table_type == PRES_VT_BOOL)) + if (table_type_from_param_type(param->type) == table_type && !info.transpose && info.minor == info.major_stride && info.count == get_offset_reg(table, const_set->register_count) && info.count * sizeof(unsigned int) <= param->bytes)

1 0

Paul Gofman : d3dx9: Factor out get_const_upload_info() function.
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 09e089cc66c1303d43e8ae1c5c523c2621bd2c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e089cc66c1303d43e8ae1c5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 30 12:38:28 2017 +0300 d3dx9: Factor out get_const_upload_info() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 78 +++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 30 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 29a2346..8bb2217 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -260,6 +260,15 @@ struct d3dx_pres_ins struct d3dx_pres_operand output; }; +struct const_upload_info +{ + BOOL transpose; + unsigned int major, minor; + unsigned int major_stride; + unsigned int major_count; + unsigned int count; +}; + static unsigned int get_reg_offset(unsigned int table, unsigned int offset) { return table == PRES_REGTAB_OBCONST ? offset : offset >> 2; @@ -979,6 +988,30 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval) HeapFree(GetProcessHeap(), 0, peval); } +static void get_const_upload_info(struct d3dx_const_param_eval_output *const_set, + struct const_upload_info *info) +{ + struct d3dx_parameter *param = const_set->param; + unsigned int table = const_set->table; + + info->transpose = (const_set->constant_class == D3DXPC_MATRIX_COLUMNS && param->class == D3DXPC_MATRIX_ROWS) + || (param->class == D3DXPC_MATRIX_COLUMNS && const_set->constant_class == D3DXPC_MATRIX_ROWS); + if (const_set->constant_class == D3DXPC_MATRIX_COLUMNS) + { + info->major = param->columns; + info->minor = param->rows; + } + else + { + info->major = param->rows; + info->minor = param->columns; + } + info->major_stride = max(info->minor, get_offset_reg(table, 1)); + info->major_count = min(info->major * info->major_stride, + get_offset_reg(table, const_set->register_count) + info->major_stride - 1) / info->major_stride; + info->count = info->major_count * info->minor; +} + static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab, ULONG64 new_update_version) { @@ -990,51 +1023,36 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const unsigned int table = const_set->table; struct d3dx_parameter *param = const_set->param; enum pres_value_type table_type = table_info[table].type; - unsigned int i, j, n, start_offset; - unsigned int minor, major, major_stride, param_offset; - BOOL transpose; - unsigned int count; + unsigned int i, j, start_offset; + unsigned int param_offset; + struct const_upload_info info; if (!is_param_dirty(param, const_tab->update_version)) continue; - transpose = (const_set->constant_class == D3DXPC_MATRIX_COLUMNS && param->class == D3DXPC_MATRIX_ROWS) - || (param->class == D3DXPC_MATRIX_COLUMNS && const_set->constant_class == D3DXPC_MATRIX_ROWS); - if (const_set->constant_class == D3DXPC_MATRIX_COLUMNS) - { - major = param->columns; - minor = param->rows; - } - else - { - major = param->rows; - minor = param->columns; - } + get_const_upload_info(const_set, &info); start_offset = get_offset_reg(table, const_set->register_index); - major_stride = max(minor, get_offset_reg(table, 1)); - n = min(major * major_stride, - get_offset_reg(table, const_set->register_count) + major_stride - 1) / major_stride; - count = n * minor; + if (((param->type == D3DXPT_FLOAT && table_type == PRES_VT_FLOAT) || (param->type == D3DXPT_INT && table_type == PRES_VT_INT) || (param->type == D3DXPT_BOOL && table_type == PRES_VT_BOOL)) - && !transpose && minor == major_stride - && count == get_offset_reg(table, const_set->register_count) - && count * sizeof(unsigned int) <= param->bytes) + && !info.transpose && info.minor == info.major_stride + && info.count == get_offset_reg(table, const_set->register_count) + && info.count * sizeof(unsigned int) <= param->bytes) { - regstore_set_values(rs, table, param->data, start_offset, count); + regstore_set_values(rs, table, param->data, start_offset, info.count); continue; } - for (i = 0; i < n; ++i) + for (i = 0; i < info.major_count; ++i) { - for (j = 0; j < minor; ++j) + for (j = 0; j < info.minor; ++j) { unsigned int out; unsigned int *in; unsigned int offset; - offset = start_offset + i * major_stride + j; + offset = start_offset + i * info.major_stride + j; if (get_reg_offset(table, offset) >= rs->table_sizes[table]) { if (table != PRES_REGTAB_OBCONST) @@ -1042,10 +1060,10 @@ static void set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const debugstr_a(param->name), i); break; } - if (transpose) - param_offset = i + j * major; + if (info.transpose) + param_offset = i + j * info.major; else - param_offset = i * minor + j; + param_offset = i * info.minor + j; if (param_offset * sizeof(unsigned int) >= param->bytes) { WARN("Parameter data is too short, name %s, component %u.\n", debugstr_a(param->name), i);

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHScale().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: e56adf98847e0518b1f6f51e77a221c7d0ca52f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e56adf98847e0518b1f6f51e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:39 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHScale(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 15fb945..8882907 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3586,7 +3586,7 @@ static void test_D3DXSHScale(void) unsigned int i, order; BOOL equal; - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(a); ++i) { a[i] = i; b[i] = i; @@ -3597,7 +3597,7 @@ static void test_D3DXSHScale(void) received_array = D3DXSHScale(b, order, a, 5.0f); ok(received_array == b, "Expected %p, received %p\n", b, received_array); - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(b); ++i) { if (i < order * order) expected = 5.0f * a[i];

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHRotateZ().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: af7125e56b898c734458b9c4cdbdd9cebffd4952 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af7125e56b898c734458b9c4c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:38 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHRotateZ(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 6f81de4..15fb945 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3546,11 +3546,11 @@ static void test_D3DXSHRotateZ(void) else end = 48; - for (j = 0; j < 3; j++) + for (j = 0; j < ARRAY_SIZE(angle); ++j) { for (order = 0; order <= D3DXSH_MAXORDER + 1; order++) { - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(out); ++i) { out[i] = ( i + 1.0f ) * ( i + 1.0f ); in[i] = i + 1.01f;

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHRotate().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 141da778900aa4829dee8d0c13df11a0bfbcb7ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=141da778900aa4829dee8d0c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:37 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHRotate(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 22fd5d3..6f81de4 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3424,11 +3424,11 @@ static void test_D3DXSHRotate(void) else out_temp = in; - for (j = 0; j < 4; j++) + for (j = 0; j < ARRAY_SIZE(m); ++j) { for (order = 0; order <= D3DXSH_MAXORDER; order++) { - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(out); ++i) { out[i] = ( i + 1.0f ) * ( i + 1.0f ); in[i] = i + 1.01f; @@ -3438,7 +3438,7 @@ static void test_D3DXSHRotate(void) ok(received_ptr == out_temp, "Order %u, expected %p, received %p.\n", order, out, received_ptr); - for (i = 0; i < 49; i++) + for (i = 0; i < ARRAY_SIZE(out); ++i) { if ((i > 0) && ((i >= order * order) || (order > D3DXSH_MAXORDER))) {

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHMultiply4().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 1b83660c593fa02d370c904500a5721cafac4ce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b83660c593fa02d370c90450… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:36 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHMultiply4(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index b709321..22fd5d3 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -3323,7 +3323,7 @@ static void test_D3DXSHMultiply4(void) 1.80000007e+00f, 1.89999998e+00f, }; - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(a); ++i) { a[i] = 1.0f + i / 100.0f; b[i] = 3.0f - i / 100.0f; @@ -3331,30 +3331,30 @@ static void test_D3DXSHMultiply4(void) } D3DXSHMultiply4(c, a, b); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) { equal = compare_float(c[i], expected[i], 16); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[i], c[i]); } - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(b); ++i) { b[i] = 3.0f - i / 100.0f; c[i] = i; } D3DXSHMultiply4(c, c, b); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) { equal = compare_float(c[i], expected[20 + i], 32); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[20 + i], c[i]); } - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) c[i] = 0.1f * i; D3DXSHMultiply4(c, c, c); - for (i = 0; i < 20; i++) + for (i = 0; i < ARRAY_SIZE(c); ++i) { equal = compare_float(c[i], expected[40 + i], 8); ok(equal, "Expected[%u] = %.8e, received = %.8e.\n", i, expected[40 + i], c[i]);

1 0

Henri Verbeet : d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalDirectionalLight().
by Alexandre Julliard 01 Jun '17

01 Jun '17

Module: wine Branch: master Commit: 69f93748c1a212f08ea0565894e2c4ba33be0883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69f93748c1a212f08ea056589… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 22:01:35 2017 +0200 d3dx9/tests: Use ARRAY_SIZE in test_D3DXSHEvalDirectionalLight(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 3843abe..b709321 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2898,7 +2898,7 @@ static void test_D3DXSHEvalDirectionalLight(void) dir.x = 1.1f; dir.y= 1.2f; dir.z = 2.76f; - for (l = 0; l < sizeof( test ) / sizeof( test[0] ); l++) + for (l = 0; l < ARRAY_SIZE(test); ++l) { startindex = 0; @@ -2908,7 +2908,7 @@ static void test_D3DXSHEvalDirectionalLight(void) green_out = test[l].green_in; blue_out = test[l].blue_in; - for (j = 0; j < 49; j++) + for (j = 0; j < ARRAY_SIZE(rout); ++j) { red_out[j] = 1.01f + j; if ( green_out ) @@ -2920,7 +2920,7 @@ static void test_D3DXSHEvalDirectionalLight(void) hr = D3DXSHEvalDirectionalLight(order, &dir, 1.7f, 2.6f, 3.5f, red_out, green_out, blue_out); ok(hr == D3D_OK, "Expected %#x, got %#x\n", D3D_OK, hr); - for (j = 0; j < 49; j++) + for (j = 0; j < ARRAY_SIZE(rout); ++j) { if ( j >= order * order ) expected = j + test[l].roffset;

1 0

Rosanne DiMesio : adminScreenshots: avoid database error
by Jeremy Newman 01 Jun '17

01 Jun '17

Module: appdb Branch: master Commit: 49a78f65efc9629199427b9ce859d78b8c10b6bf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=49a78f65efc9629199427b9c… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Thu Jun 1 09:22:10 2017 -0500 adminScreenshots: avoid database error Allows the Screenshots Management page to load even if there are no screenshots in the database. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- admin/adminScreenshots.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/admin/adminScreenshots.php b/admin/adminScreenshots.php index 96e3759..d552ca8 100644 --- a/admin/adminScreenshots.php +++ b/admin/adminScreenshots.php @@ -59,7 +59,10 @@ $ItemsPerPage = isset($aClean['iItemsPerPage']) ? $aClean['iItemsPerPage'] : 6; $currentPage = isset($aClean['iPage']) ? $aClean['iPage'] : 1; $ItemsPerPage = min($ItemsPerPage,100); -$totalPages = ceil(screenshot::objectGetEntriesCount('accepted')/$ItemsPerPage); +$realTotalPages = screenshot::objectGetEntriesCount('accepted'); +$totalPages = 1; +if($realTotalPages >= $ItemsPerPage) + $totalPages = ceil($realTotalPages/$ItemsPerPage); $currentPage = min($currentPage,$totalPages); $offset = (($currentPage-1) * $ItemsPerPage);

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017