December 2013 - Wine-commits

刘涛 : website: Add Simplified Chinese translation for wine 1.7.6 released
by Jeremy Newman 06 Dec '13

06 Dec '13

Module: website Branch: master Commit: 0d039701cc88dac88cd2bdfe509912e911ac72f1 URL: http://source.winehq.org/git/website.git/?a=commit;h=0d039701cc88dac88cd2bd… Author: 刘涛 <wendaotao(a)163.com> Date: Fri Dec 6 15:33:34 2013 +0800 website: Add Simplified Chinese translation for wine 1.7.6 released --- news/zh-cn/2013110801.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/zh-cn/2013110801.xml b/news/zh-cn/2013110801.xml new file mode 100644 index 0000000..6ba5cc5 --- /dev/null +++ b/news/zh-cn/2013110801.xml @@ -0,0 +1,15 @@ +<news> +<date>十一月 8, 2013</date> +<title>Wine 1.7.6 发布</title> +<body> + Wine 开发版 1.7.6 现在可以使用了。 + 本次<a href="{$root}/announce/1.7.6">更新</a> : +<ul> + <li>重写了 BiDi 算法，以完整的支持 Unicode 6.3。</li> + <li>支持视频混合渲染器-版本7（VMR-7）。</li> + <li>更好地处理 Mac 驱动中窗口的调整。</li> + <li>各种 bug 的修复。</li> +</ul> +源代码可以从<a href="http://prdownloads.sourceforge.net/wine/wine-1.7.6.tar.bz2">这里</a>获取。 +二进制包正在构建中，稍后将出现在各自相应的<a href="{$root}/download">下载位置</a>。 +</body></news>

1 0

Andrey Gusev : website: Ukrainian translation for release 1.7.8
by Jeremy Newman 06 Dec '13

06 Dec '13

Module: website Branch: master Commit: 7c643a34e90985bd4aee3745968f7e96b51af4ab URL: http://source.winehq.org/git/website.git/?a=commit;h=7c643a34e90985bd4aee37… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 6 22:50:18 2013 +0200 website: Ukrainian translation for release 1.7.8 --- news/uk/2013120601.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/uk/2013120601.xml b/news/uk/2013120601.xml new file mode 100644 index 0000000..193257f --- /dev/null +++ b/news/uk/2013120601.xml @@ -0,0 +1,16 @@ +<news> +<date>6 грудня 2013</date> +<title>Випущено Wine 1.7.8</title> +<body> + Розробницький реліз Wine 1.7.8 наразі доступний. + <a href="{$root}/announce/1.7.8">Що нового</a> в цьому релізі: +<ul> + <li>Оновлена версія пакунка Mono.</li> + <li>Покращення в реалізації сервіса BITS.</li> + <li>Вдосконалені таблиці даних для підтримки вертикальних японських шрифтів.</li> + <li>Поліпшено зворотне трасування на останніх версіях Mac OS X.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.8.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/source /git/website
by Jeremy Newman 06 Dec '13

06 Dec '13

Module: website Branch: master Commit: cac5657fe36efc6c658f268ed587538f7e5de236 URL: http://source.winehq.org/git/website.git/?a=commit;h=cac5657fe36efc6c658f26… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Dec 6 15:04:23 2013 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Alexandre Julliard : Wine release 1.7.8
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: website Branch: master Commit: 6a909baab0a8609f84a2ac5a2d6e913e47302300 URL: http://source.winehq.org/git/website.git/?a=commit;h=6a909baab0a8609f84a2ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 20:44:08 2013 +0100 Wine release 1.7.8 --- news/en/2013120601.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/news/en/2013120601.xml b/news/en/2013120601.xml new file mode 100644 index 0000000..4ff4c05 --- /dev/null +++ b/news/en/2013120601.xml @@ -0,0 +1,16 @@ +<news> +<date>December 6, 2013</date> +<title>Wine 1.7.8 Released</title> +<body> + The Wine development release 1.7.8 is now available. + <a href="{$root}/announce/1.7.8">What's new</a> in this release: +<ul> + <li>Updated version of the Mono package.</li> + <li>Improvements in the BITS service implementation.</li> + <li>Better data tables for Japanese vertical fonts support.</li> + <li>Improved backtraces on recent Mac OS X versions.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.8.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

Alexandre Julliard : Release 1.7.8.
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: d15d9d0e746e2807e87a05d667f16b576d20a4ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d15d9d0e746e2807e87a05d66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 20:36:03 2013 +0100 Release 1.7.8. --- ANNOUNCE | 676 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 311 insertions(+), 385 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d15d9d0e746e2807e87a0…

1 0

Tag wine-1.7.8 : Alexandre Julliard : Release 1.7.8
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: refs/tags/wine-1.7.8 Tag: 37a3624c37438ea65db2a940ecc0b986398bd079 URL: http://source.winehq.org/git/wine.git/?a=tag;h=37a3624c37438ea65db2a940ecc0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 6 20:36:03 2013 +0100 Release 1.7.8

1 0

Henri Verbeet : wined3d: Get rid of the buffer_object_size field from struct wined3d_buffer.
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: da3549315f1287f63be4a73fb8efa743871a2d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da3549315f1287f63be4a73fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 11:09:52 2013 +0100 wined3d: Get rid of the buffer_object_size field from struct wined3d_buffer. --- dlls/wined3d/buffer.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index de06ae8..0883054 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -189,7 +189,6 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine goto fail; } - This->buffer_object_size = This->resource.size; This->buffer_object_usage = gl_usage; if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb685e2..53ef570 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2552,7 +2552,6 @@ struct wined3d_buffer GLuint buffer_object; GLenum buffer_object_usage; GLenum buffer_type_hint; - UINT buffer_object_size; DWORD flags; struct wined3d_map_range *maps;

1 0

Henri Verbeet : wined3d: Create volumes inside wined3d.
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: 15c1a26b55a30b7d33ad7d45b76c6ad7f691ab2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c1a26b55a30b7d33ad7d45b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 11:09:53 2013 +0100 wined3d: Create volumes inside wined3d. --- dlls/d3d10core/device.c | 39 ++++++++-------------- dlls/d3d8/d3d8_private.h | 5 +-- dlls/d3d8/device.c | 68 ++++++++++++++------------------------- dlls/d3d8/volume.c | 18 +++------- dlls/d3d9/d3d9_private.h | 5 +-- dlls/d3d9/device.c | 68 ++++++++++++++------------------------- dlls/d3d9/volume.c | 19 +++-------- dlls/ddraw/ddraw.c | 30 ++++++++--------- dlls/wined3d/texture.c | 6 +-- dlls/wined3d/volume.c | 42 +++++++++++++++--------- dlls/wined3d/wined3d.spec | 1 - dlls/wined3d/wined3d_private.h | 6 +++- include/wine/wined3d.h | 8 +--- 13 files changed, 127 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15c1a26b55a30b7d33ad7…

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to volume_init().
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: 5db26f7b457d076b340589e68a44c20c8576e455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db26f7b457d076b340589e68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 11:09:54 2013 +0100 wined3d: Pass a wined3d_resource_desc structure to volume_init(). --- dlls/wined3d/texture.c | 17 +++++++---------- dlls/wined3d/volume.c | 37 ++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a5117e5..e9d9b8b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1021,7 +1021,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct UINT levels, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - UINT tmp_w, tmp_h, tmp_d; + struct wined3d_resource_desc volume_desc; unsigned int i; HRESULT hr; @@ -1104,16 +1104,13 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture->target = GL_TEXTURE_3D; /* Generate all the surfaces. */ - tmp_w = desc->width; - tmp_h = desc->height; - tmp_d = desc->depth; - + volume_desc = *desc; + volume_desc.resource_type = WINED3D_RTYPE_VOLUME; for (i = 0; i < texture->level_count; ++i) { struct wined3d_volume *volume; - if (FAILED(hr = wined3d_volume_create(device, parent, tmp_w, tmp_h, tmp_d, i, - desc->format, desc->usage, desc->pool, &volume))) + if (FAILED(hr = wined3d_volume_create(device, parent, &volume_desc, i, &volume))) { ERR("Creating a volume for the volume texture failed, hr %#x.\n", hr); wined3d_texture_cleanup(texture); @@ -1125,9 +1122,9 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture->sub_resources[i] = &volume->resource; /* Calculate the next mipmap level. */ - tmp_w = max(1, tmp_w >> 1); - tmp_h = max(1, tmp_h >> 1); - tmp_d = max(1, tmp_d >> 1); + volume_desc.width = max(1, volume_desc.width >> 1); + volume_desc.height = max(1, volume_desc.height >> 1); + volume_desc.depth = max(1, volume_desc.depth >> 1); } return WINED3D_OK; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 512d1bd..b981374 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -812,11 +812,11 @@ static const struct wined3d_resource_ops volume_resource_ops = volume_unload, }; -static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device *device, UINT width, UINT height, - UINT depth, UINT level, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool) +static HRESULT volume_init(struct wined3d_volume *volume, const struct wined3d_resource_desc *desc, + struct wined3d_device *device, UINT level) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); + const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format); HRESULT hr; UINT size; @@ -827,17 +827,17 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device } /* TODO: Write tests for other resources and move this check * to resource_init, if applicable. */ - if (usage & WINED3DUSAGE_DYNAMIC - && (pool == WINED3D_POOL_MANAGED || pool == WINED3D_POOL_SCRATCH)) + if (desc->usage & WINED3DUSAGE_DYNAMIC + && (desc->pool == WINED3D_POOL_MANAGED || desc->pool == WINED3D_POOL_SCRATCH)) { - WARN("Attempted to create a DYNAMIC texture in pool %u.\n", pool); + WARN("Attempted to create a DYNAMIC texture in pool %s.\n", debug_d3dpool(desc->pool)); return WINED3DERR_INVALIDCALL; } - size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, depth); + size = wined3d_format_calculate_size(format, device->surface_alignment, desc->width, desc->height, desc->depth); if (FAILED(hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, format, - WINED3D_MULTISAMPLE_NONE, 0, usage, pool, width, height, depth, + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->pool, desc->width, desc->height, desc->depth, size, NULL, &wined3d_null_parent_ops, &volume_resource_ops))) { WARN("Failed to initialize resource, returning %#x.\n", hr); @@ -847,7 +847,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device volume->texture_level = level; volume->locations = WINED3D_LOCATION_DISCARDED; - if (pool == WINED3D_POOL_DEFAULT && usage & WINED3DUSAGE_DYNAMIC + if (desc->pool == WINED3D_POOL_DEFAULT && desc->usage & WINED3DUSAGE_DYNAMIC && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !format->convert) { @@ -858,9 +858,8 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device return WINED3D_OK; } -HRESULT CDECL wined3d_volume_create(struct wined3d_device *device, void *container_parent, - UINT width, UINT height, UINT depth, UINT level, enum wined3d_format_id format_id, - DWORD usage, enum wined3d_pool pool, struct wined3d_volume **volume) +HRESULT wined3d_volume_create(struct wined3d_device *device, void *container_parent, + const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) { const struct wined3d_parent_ops *parent_ops; struct wined3d_volume *object; @@ -869,17 +868,13 @@ HRESULT CDECL wined3d_volume_create(struct wined3d_device *device, void *contain TRACE("device %p, container_parent %p, width %u, height %u, depth %u, level %u, format %s, " "usage %#x, pool %s, volume %p.\n", - device, container_parent, width, height, depth, level, debug_d3dformat(format_id), - usage, debug_d3dpool(pool), volume); + device, container_parent, desc->width, desc->height, desc->depth, level, debug_d3dformat(desc->format), + desc->usage, debug_d3dpool(desc->pool), volume); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - *volume = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; - } + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; - if (FAILED(hr = volume_init(object, device, width, height, depth, level, usage, format_id, pool))) + if (FAILED(hr = volume_init(object, desc, device, level))) { WARN("Failed to initialize volume, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e13e301..b011a69 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2134,8 +2134,7 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc } HRESULT wined3d_volume_create(struct wined3d_device *device, void *container_parent, - UINT width, UINT height, UINT depth, UINT level, enum wined3d_format_id format_id, - DWORD usage, enum wined3d_pool pool, struct wined3d_volume **volume); + const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Set the volume container in volume_init().
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: 36dbac6cb83141a9db334ccf18f8d470ae3ea225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36dbac6cb83141a9db334ccf1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 11:09:55 2013 +0100 wined3d: Set the volume container in volume_init(). --- dlls/wined3d/texture.c | 4 +--- dlls/wined3d/volume.c | 23 ++++++++++++++--------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e9d9b8b..31eb2b0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1110,15 +1110,13 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct { struct wined3d_volume *volume; - if (FAILED(hr = wined3d_volume_create(device, parent, &volume_desc, i, &volume))) + if (FAILED(hr = wined3d_volume_create(texture, &volume_desc, i, &volume))) { ERR("Creating a volume for the volume texture failed, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - /* Set its container to this texture. */ - volume_set_container(volume, texture); texture->sub_resources[i] = &volume->resource; /* Calculate the next mipmap level. */ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index b981374..817fe7e 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -812,9 +812,10 @@ static const struct wined3d_resource_ops volume_resource_ops = volume_unload, }; -static HRESULT volume_init(struct wined3d_volume *volume, const struct wined3d_resource_desc *desc, - struct wined3d_device *device, UINT level) +static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture *container, + const struct wined3d_resource_desc *desc, UINT level) { + struct wined3d_device *device = container->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format); HRESULT hr; @@ -855,36 +856,40 @@ static HRESULT volume_init(struct wined3d_volume *volume, const struct wined3d_r volume->flags |= WINED3D_VFLAG_PBO; } + volume_set_container(volume, container); + return WINED3D_OK; } -HRESULT wined3d_volume_create(struct wined3d_device *device, void *container_parent, - const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) +HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, + unsigned int level, struct wined3d_volume **volume) { + struct wined3d_device_parent *device_parent = container->resource.device->device_parent; const struct wined3d_parent_ops *parent_ops; struct wined3d_volume *object; void *parent; HRESULT hr; - TRACE("device %p, container_parent %p, width %u, height %u, depth %u, level %u, format %s, " + TRACE("container %p, width %u, height %u, depth %u, level %u, format %s, " "usage %#x, pool %s, volume %p.\n", - device, container_parent, desc->width, desc->height, desc->depth, level, debug_d3dformat(desc->format), + container, desc->width, desc->height, desc->depth, level, debug_d3dformat(desc->format), desc->usage, debug_d3dpool(desc->pool), volume); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = volume_init(object, desc, device, level))) + if (FAILED(hr = volume_init(object, container, desc, level))) { WARN("Failed to initialize volume, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } - if (FAILED(hr = device->device_parent->ops->volume_created(device->device_parent, - container_parent, object, &parent, &parent_ops))) + if (FAILED(hr = device_parent->ops->volume_created(device_parent, + wined3d_texture_get_parent(container), object, &parent, &parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); + volume_set_container(object, NULL); wined3d_volume_decref(object); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b011a69..ad9b347 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2133,8 +2133,8 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_volume, resource); } -HRESULT wined3d_volume_create(struct wined3d_device *device, void *container_parent, - const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; +HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, + unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN;

1 0