July 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Clean up buffer_sync_apple().
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 11c902ebc76a4487ba2ad65f2bbd15cb274c0917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c902ebc76a4487ba2ad65f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:25:48 2017 +0200 wined3d: Clean up buffer_sync_apple(). 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/buffer.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9cd74fa..26f3dea 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -812,7 +812,7 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) } /* The caller provides a context and binds the buffer */ -static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const struct wined3d_gl_info *gl_info) +static void buffer_sync_apple(struct wined3d_buffer *buffer, DWORD flags, const struct wined3d_gl_info *gl_info) { enum wined3d_event_query_result ret; struct wined3d_query *query; @@ -825,16 +825,16 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st if (flags & WINED3D_MAP_DISCARD) { - GL_EXTCALL(glBufferData(This->buffer_type_hint, This->resource.size, NULL, This->buffer_object_usage)); + GL_EXTCALL(glBufferData(buffer->buffer_type_hint, buffer->resource.size, NULL, buffer->buffer_object_usage)); checkGLcall("glBufferData"); return; } - if (!This->query) + if (!buffer->query) { - TRACE("Creating event query for buffer %p.\n", This); + TRACE("Creating event query for buffer %p.\n", buffer); - hr = wined3d_query_create(This->resource.device, WINED3D_QUERY_TYPE_EVENT, + hr = wined3d_query_create(buffer->resource.device, WINED3D_QUERY_TYPE_EVENT, NULL, &wined3d_null_parent_ops, &query); if (hr == WINED3DERR_NOTAVAILABLE) { @@ -846,14 +846,15 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st ERR("Failed to create event query, hr %#x.\n", hr); goto drop_query; } - This->query = CONTAINING_RECORD(query, struct wined3d_event_query, query); + buffer->query = CONTAINING_RECORD(query, struct wined3d_event_query, query); /* Since we don't know about old draws a glFinish is needed once */ gl_info->gl_ops.gl.p_glFinish(); return; } - TRACE("Synchronizing buffer %p\n", This); - ret = wined3d_event_query_finish(This->query, This->resource.device); + + TRACE("Synchronizing buffer %p.\n", buffer); + ret = wined3d_event_query_finish(buffer->query, buffer->resource.device); switch (ret) { case WINED3D_EVENT_QUERY_NOT_STARTED: @@ -862,26 +863,26 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st return; case WINED3D_EVENT_QUERY_WRONG_THREAD: - WARN("Cannot synchronize buffer lock due to a thread conflict\n"); + WARN("Cannot synchronize buffer lock due to a thread conflict.\n"); goto drop_query; default: - ERR("wined3d_event_query_finish returned %u, dropping async buffer locks\n", ret); + ERR("wined3d_event_query_finish returned %u, dropping async buffer locks.\n", ret); goto drop_query; } drop_query: - if (This->query) + if (buffer->query) { - struct wined3d_query *query = &This->query->query; + struct wined3d_query *query = &buffer->query->query; query->query_ops->query_destroy(query); - This->query = NULL; + buffer->query = NULL; } gl_info->gl_ops.gl.p_glFinish(); - GL_EXTCALL(glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); - checkGLcall("glBufferParameteriAPPLE(This->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); - This->flags &= ~WINED3D_BUFFER_APPLESYNC; + GL_EXTCALL(glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); + checkGLcall("glBufferParameteriAPPLE(buffer->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); + buffer->flags &= ~WINED3D_BUFFER_APPLESYNC; } static void buffer_mark_used(struct wined3d_buffer *buffer)

1 0

Józef Kucia : wined3d: Avoid creating event queries manually.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 0edb71a35ffe00450b315a735b9853bd2d982e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0edb71a35ffe00450b315a735… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Jul 9 13:25:47 2017 +0200 wined3d: Avoid creating event queries manually. Fixes a regression introduced by commit be20ddc38b3f9e101460f5f8f04015b148d3e13d. 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/buffer.c | 15 +++++++++------ dlls/wined3d/query.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5740d65..9cd74fa 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -815,6 +815,8 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const struct wined3d_gl_info *gl_info) { enum wined3d_event_query_result ret; + struct wined3d_query *query; + HRESULT hr; /* No fencing needs to be done if the app promises not to overwrite * existing data. */ @@ -830,20 +832,21 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st if (!This->query) { - TRACE("Creating event query for buffer %p\n", This); + TRACE("Creating event query for buffer %p.\n", This); - if (!wined3d_event_query_supported(gl_info)) + hr = wined3d_query_create(This->resource.device, WINED3D_QUERY_TYPE_EVENT, + NULL, &wined3d_null_parent_ops, &query); + if (hr == WINED3DERR_NOTAVAILABLE) { FIXME("Event queries not supported, dropping async buffer locks.\n"); goto drop_query; } - - This->query = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->query)); - if (!This->query) + if (FAILED(hr)) { - ERR("Failed to allocate event query memory, dropping async buffer locks.\n"); + ERR("Failed to create event query, hr %#x.\n", hr); goto drop_query; } + This->query = CONTAINING_RECORD(query, struct wined3d_event_query, query); /* Since we don't know about old draws a glFinish is needed once */ gl_info->gl_ops.gl.p_glFinish(); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 8445922..e76011c 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -83,7 +83,7 @@ static struct wined3d_pipeline_statistics_query *wined3d_pipeline_statistics_que return CONTAINING_RECORD(query, struct wined3d_pipeline_statistics_query, query); } -BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) +static BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1025c98..d687e78 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1669,7 +1669,6 @@ enum wined3d_event_query_result enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, const struct wined3d_device *device) DECLSPEC_HIDDEN; -BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; struct wined3d_occlusion_query {

1 0

Hans Leidekker : webservices: Store byte records as WS_XML_BASE64_TEXT.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 95308f22d4773755afe5b1b03fc4384177e37d41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95308f22d4773755afe5b1b03… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:28 2017 +0200 webservices: Store byte records as WS_XML_BASE64_TEXT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 141 ++++++++++++++++++++-------------------- dlls/webservices/tests/reader.c | 107 ++++++++++++++++++++++++------ 2 files changed, 158 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95308f22d4773755afe5b…

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 2547cc5b96e604773f3e137860c978351d8f64ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2547cc5b96e604773f3e13786… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jul 10 22:21:30 2017 +0900 po: Update Japanese translation. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ja.po | 462 ++++++++++++++++++++++----------------------------------------- 1 file changed, 163 insertions(+), 299 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2547cc5b96e604773f3e1…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: d997c3315cb5f2ad9913fc3fa69e4c2c53370747 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d997c3315cb5f2ad9913fc3fa… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jul 7 23:09:12 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/lt.po b/po/lt.po index abe5e82..bf92adf 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-06-28 09:40+0300\n" +"PO-Revision-Date: 2017-07-07 23:08+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" @@ -6921,6 +6921,8 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Diegimo programa susidūrė su netikėta problema diegiant šį paketą. Tai gali " +"būti problema su paketu. Klaidos kodas [1]. {{Argumentai: [2], [3], [4]}}" #: msi.rc:88 msgid "Allocating registry space"

1 0

Hans Leidekker : webservices: Add support for appending byte records in the reader.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: ede77edb448810908b3a31887b936d7bd2318c77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede77edb448810908b3a31887… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:31 2017 +0200 webservices: Add support for appending byte records in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 428 +++++++++++++++++++++++++++------------- dlls/webservices/tests/reader.c | 75 ++++--- 2 files changed, 322 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ede77edb448810908b3a3…

1 0

Hans Leidekker : webservices: Add support for union types in the reader.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: c41e66fe01410ae9e9dff78be63926e8404c32ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=c41e66fe01410ae9e9dff78be… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:30 2017 +0200 webservices: Add support for union types in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 76 +++++++++++++++++++++--- dlls/webservices/tests/reader.c | 128 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 193 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c41e66fe01410ae9e9dff…

1 0

Hans Leidekker : webservices: Add support for union types in the writer.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: c51ab4cd14930ccefe4eb16bfdc36dc3bf319fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51ab4cd14930ccefe4eb16bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:29 2017 +0200 webservices: Add support for union types in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 15 +++-- dlls/webservices/tests/writer.c | 117 +++++++++++++++++++++++++++++++++ dlls/webservices/webservices_private.h | 2 +- dlls/webservices/writer.c | 56 ++++++++++++++-- include/webservices.h | 15 +++++ 5 files changed, 194 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c51ab4cd14930ccefe4eb…

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 1ff81aa7f1a8a0a60b6a28c2f2581600d9137d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ff81aa7f1a8a0a60b6a28c2f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:34 2017 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/reader.c | 362 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 333 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1ff81aa7f1a8a0a60b6a2…

1 0

Hans Leidekker : webservices: Store all text in native format in binary mode.
by Alexandre Julliard July 10, 2017

July 10, 2017

Module: wine Branch: master Commit: 387061881c31c8a8f382f19163cd22523d4a754b URL: http://source.winehq.org/git/wine.git/?a=commit;h=387061881c31c8a8f382f1916… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 10 11:02:33 2017 +0200 webservices: Store all text in native format in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 517 ++++++++++++++++++++++++--------- dlls/webservices/webservices_private.h | 24 +- dlls/webservices/writer.c | 245 ++++++++++++++-- 3 files changed, 614 insertions(+), 172 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=387061881c31c8a8f382f…

1 0