August 2016 - Wine-commits - list.winehq.org

Łukasz Wojniłowicz : Polish translation for release 1.9.16
by Jeremy Newman 08 Aug '16

08 Aug '16

Module: website Branch: master Commit: a5eb6afbb62844e151c89654f958e90cc852ef40 URL: http://source.winehq.org/git/website.git/?a=commit;h=a5eb6afbb62844e151c896… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Sat Aug 6 06:33:57 2016 +0200 Polish translation for release 1.9.16 Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/pl/2016080501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/pl/2016080501.xml b/news/pl/2016080501.xml new file mode 100644 index 0000000..e584d0b --- /dev/null +++ b/news/pl/2016080501.xml @@ -0,0 +1,17 @@ +<news> +<date>Sierpień 5, 2016</date> +<title>Wydano Wine 1.9.16</title> +<body> + Wydanie rozwojowe Wine 1.9.16 jest już dostępne. + <a href="{$root}/announce/1.9.16">Co nowego</a> w tym wydaniu: +<ul> + <li>Lepsza zgodność 64-bitowych plików binarnych na MacOS.</li> + <li>Zwiększenie wydajności w JavaScript.</li> + <li>Postęp w kierunku strumienia poleceń Direct3D.</li> + <li>Więcej instrukcji cieniowania w Direct3D.</li> + <li>Zwiększenie wydajności w GDI.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.16.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkrótce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexandre Julliard : Wine release 1.9.16
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: website Branch: master Commit: f249f1a6631f086538f692aed3fab961c829c86e URL: http://source.winehq.org/git/website.git/?a=commit;h=f249f1a6631f086538f692… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 16:20:31 2016 -0500 Wine release 1.9.16 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016080501.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2016080501.xml b/news/en/2016080501.xml new file mode 100644 index 0000000..81b98cc --- /dev/null +++ b/news/en/2016080501.xml @@ -0,0 +1,17 @@ +<news> +<date>August 5, 2016</date> +<title>Wine 1.9.16 Released</title> +<body> + The Wine development release 1.9.16 is now available. + <a href="{$root}/announce/1.9.16">What's new</a> in this release: +<ul> + <li>Better 64-bit binary compatibility on macOS.</li> + <li>Performance improvements in JavaScript.</li> + <li>More progress towards the Direct3D command stream.</li> + <li>More shader instructions in Direct3D.</li> + <li>Performance improvements in GDI.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.16.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Michael Stefaniuc : gdiplus/tests: Make use of todo_wine_if().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 5fce51236cd7b11f68937eb82f319b0476913c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fce51236cd7b11f68937eb82… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 4 23:44:31 2016 +0200 gdiplus/tests: Make use of todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 4 +--- dlls/gdiplus/tests/image.c | 7 +------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e82db16..56be8eb 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3763,10 +3763,8 @@ todo_wine expected_width = base_cx * pt.Y; expected_height = base_cy * pt.Y; - if (td[i].unit == UnitDisplay || td[i].unit == UnitPixel) + todo_wine_if(td[i].unit != UnitDisplay && td[i].unit != UnitPixel) ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width); - else - todo_wine ok(fabs(expected_width - bounds.Width) <= 0.001, "%u: expected %f, got %f\n", i, expected_width, bounds.Width); ok(fabs(expected_height - bounds.Height) <= 0.001, "%u: expected %f, got %f\n", i, expected_height, bounds.Height); GdipDeleteGraphics(graphics); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index be93a20..ad84feb 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3167,12 +3167,7 @@ static void test_image_properties(void) status = GdipGetPropertyCount(image, &prop_count); ok(status == Ok, "%u: GdipGetPropertyCount error %d\n", i, status); - if (td[i].image_data == pngimage || td[i].image_data == jpgimage) - todo_wine - ok(td[i].prop_count == prop_count || td[i].prop_count2 == prop_count, - " %u: expected property count %u or %u, got %u\n", - i, td[i].prop_count, td[i].prop_count2, prop_count); - else + todo_wine_if(td[i].image_data == pngimage || td[i].image_data == jpgimage) ok(td[i].prop_count == prop_count || td[i].prop_count2 == prop_count, " %u: expected property count %u or %u, got %u\n", i, td[i].prop_count, td[i].prop_count2, prop_count);

1 0

Alexandre Julliard : Release 1.9.16.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 3852d3357d087353d71d4d11359014a97dbf3e5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3852d3357d087353d71d4d113… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 16:05:46 2016 -0500 Release 1.9.16. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 764 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 434 insertions(+), 354 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3852d3357d087353d71d4…

1 0

Tag wine-1.9.16 : Alexandre Julliard : Release 1.9.16
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: refs/tags/wine-1.9.16 Tag: ab95fdd83e243d39e13d7f3d52802b16cc1b06ba URL: http://source.winehq.org/git/wine.git/?a=tag;h=ab95fdd83e243d39e13d7f3d5280… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 5 16:05:46 2016 -0500 Release 1.9.16

1 0

Nikolay Sivov : dsound: Fix its vs it's typos.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 9567813ec47d0601593a4ee367bad4c1c3256f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9567813ec47d0601593a4ee36… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 4 10:57:43 2016 +0300 dsound: Fix its vs it's typos. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/sound3d.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 840ab93..b416cdc 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -294,12 +294,12 @@ if(0) dsb->ds3db_ds3db.vVelocity.z == dsb->device->ds3dl.vVelocity.z)) { /* calculate length of ds3db_ds3db.vVelocity component which causes Doppler Effect - NOTE: if buffer moves TOWARDS the listener, it's velocity component is NEGATIVE - if buffer moves AWAY from listener, it's velocity component is POSITIVE */ + NOTE: if buffer moves TOWARDS the listener, its velocity component is NEGATIVE + if buffer moves AWAY from listener, its velocity component is POSITIVE */ flBufferVel = ProjectVector(&dsb->ds3db_ds3db.vVelocity, &vDistance); /* calculate length of ds3dl.vVelocity component which causes Doppler Effect - NOTE: if listener moves TOWARDS the buffer, it's velocity component is POSITIVE - if listener moves AWAY from buffer, it's velocity component is NEGATIVE */ + NOTE: if listener moves TOWARDS the buffer, its velocity component is POSITIVE + if listener moves AWAY from buffer, its velocity component is NEGATIVE */ flListenerVel = ProjectVector(&dsb->device->ds3dl.vVelocity, &vDistance); /* formula taken from Gianicoli D.: Physics, 4th edition: */ /* FIXME: replace dsb->freq with appropriate frequency ! */

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in wined3d_texture_get_dc().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 29d50a21b924db9885314f651d06745f227ab28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d50a21b924db9885314f651… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:38:58 2016 +0200 wined3d: Use wined3d_texture_load_location() in wined3d_texture_get_dc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 098b5d0..2dbb7f3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2881,7 +2881,7 @@ HRESULT CDECL wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned i if (device->d3d_initialized) context = context_acquire(device, NULL); - surface_load_location(surface, context, texture->resource.map_binding); + wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); if (!surface->dc)

1 0

Henri Verbeet : wined3d: Rename wined3d_sample_destroy_object() to wined3d_sampler_destroy_object().
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 005ed85689344a5884fc7351b15c88ad5294691d URL: http://source.winehq.org/git/wine.git/?a=commit;h=005ed85689344a5884fc7351b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:38:59 2016 +0200 wined3d: Rename wined3d_sample_destroy_object() to wined3d_sampler_destroy_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 1a2e2a1..5902feb 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -33,7 +33,7 @@ ULONG CDECL wined3d_sampler_incref(struct wined3d_sampler *sampler) return refcount; } -static void wined3d_sample_destroy_object(void *object) +static void wined3d_sampler_destroy_object(void *object) { struct wined3d_sampler *sampler = object; const struct wined3d_gl_info *gl_info; @@ -54,7 +54,7 @@ ULONG CDECL wined3d_sampler_decref(struct wined3d_sampler *sampler) TRACE("%p decreasing refcount to %u.\n", sampler, refcount); if (!refcount) - wined3d_cs_emit_destroy_object(sampler->device->cs, wined3d_sample_destroy_object, sampler); + wined3d_cs_emit_destroy_object(sampler->device->cs, wined3d_sampler_destroy_object, sampler); return refcount; }

1 0

Henri Verbeet : wined3d: Invalidate STATE_STREAMSRC in buffer_unload() if needed.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: 0072830804e844de3b06bb25e3c4b68b7db52c98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0072830804e844de3b06bb25e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:39:00 2016 +0200 wined3d: Invalidate STATE_STREAMSRC in buffer_unload() if needed. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 18 ++++++++---------- dlls/wined3d/device.c | 3 --- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9e0892e..d51d0e8 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -538,6 +538,14 @@ static void buffer_unload(struct wined3d_resource *resource) buffer->stride = 0; buffer->conversion_stride = 0; buffer->flags &= ~WINED3D_BUFFER_HASDESC; + + /* The stream source state handler might have read the memory of the + * vertex buffer already and got the memory in the vbo which is not + * valid any longer. Dirtify the stream source to force a reload. This + * happens only once per changed vertexbuffer and should occur rather + * rarely. */ + if (resource->bind_count) + device_invalidate_state(device, STATE_STREAMSRC); } resource_unload(resource); @@ -545,18 +553,8 @@ static void buffer_unload(struct wined3d_resource *resource) static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) { - struct wined3d_device *device = buffer->resource.device; - buffer->flags &= ~WINED3D_BUFFER_USE_BO; buffer_unload(&buffer->resource); - - /* The stream source state handler might have read the memory of - * the vertex buffer already and got the memory in the vbo which - * is not valid any longer. Dirtify the stream source to force a - * reload. This happens only once per changed vertexbuffer and - * should occur rather rarely. */ - if (buffer->resource.bind_count) - device_invalidate_state(device, STATE_STREAMSRC); } static void wined3d_buffer_destroy_object(void *object) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1bafd5e..a633a2d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4547,9 +4547,6 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) resource->resource_ops->resource_unload(resource); } } - - /* Invalidate stream sources, the buffer(s) may have been evicted. */ - device_invalidate_state(device, STATE_STREAMSRC); } static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d_swapchain *swapchain)

1 0

Henri Verbeet : wined3d: Evict managed resources through the command stream.
by Alexandre Julliard 05 Aug '16

05 Aug '16

Module: wine Branch: master Commit: cac28d32fc1c83c0a942786e84f95c31ea675add URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac28d32fc1c83c0a942786e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 5 12:39:01 2016 +0200 wined3d: Evict managed resources through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ff2fff5..0d5c151 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -55,6 +55,7 @@ enum wined3d_cs_op WINED3D_CS_OP_RESET_STATE, WINED3D_CS_OP_DESTROY_OBJECT, WINED3D_CS_OP_QUERY_ISSUE, + WINED3D_CS_OP_UNLOAD_RESOURCE, }; struct wined3d_cs_present @@ -275,6 +276,12 @@ struct wined3d_cs_query_issue DWORD flags; }; +struct wined3d_cs_unload_resource +{ + enum wined3d_cs_op opcode; + struct wined3d_resource *resource; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1243,6 +1250,25 @@ void wined3d_cs_emit_query_issue(struct wined3d_cs *cs, struct wined3d_query *qu cs->ops->submit(cs); } +static void wined3d_cs_exec_unload_resource(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_unload_resource *op = data; + struct wined3d_resource *resource = op->resource; + + resource->resource_ops->resource_unload(resource); +} + +void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) +{ + struct wined3d_cs_unload_resource *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_UNLOAD_RESOURCE; + op->resource = resource; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1274,6 +1300,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, /* WINED3D_CS_OP_DESTROY_OBJECT */ wined3d_cs_exec_destroy_object, /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, + /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a633a2d..74a07ec 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4544,7 +4544,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) if (resource->pool == WINED3D_POOL_MANAGED && !resource->map_count) { TRACE("Evicting %p.\n", resource); - resource->resource_ops->resource_unload(resource); + wined3d_cs_emit_unload_resource(device->cs, resource); } } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f300e4b..01af06f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3090,6 +3090,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; +void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants)

1 0