wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Henri Verbeet : wined3d: Merge surface_unload() and volume_unload().
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 9cdcc3e120d5d76166f18ecc4b1bf9d9397885e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cdcc3e120d5d76166f18ecc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:28 2016 +0200 wined3d: Merge surface_unload() and volume_unload(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++-- dlls/wined3d/surface.c | 44 +------------------------------------------ dlls/wined3d/texture.c | 51 +++++++++++++++++++++++++++++++++++++++++--------- dlls/wined3d/volume.c | 27 +------------------------- 4 files changed, 50 insertions(+), 80 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 149234b..f3fb732 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1138,8 +1138,10 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) /* Unload resources */ LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { - TRACE("Unloading resource %p.\n", resource); + if (resource->type == WINED3D_RTYPE_SURFACE || resource->type == WINED3D_RTYPE_VOLUME) + continue; + TRACE("Unloading resource %p.\n", resource); resource->resource_ops->resource_unload(resource); } @@ -4532,8 +4534,10 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { - TRACE("Unloading resource %p.\n", resource); + if (resource->type == WINED3D_RTYPE_SURFACE || resource->type == WINED3D_RTYPE_VOLUME) + continue; + TRACE("Unloading resource %p.\n", resource); resource->resource_ops->resource_unload(resource); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9e8fddb..f43b186 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -845,49 +845,7 @@ static ULONG surface_resource_decref(struct wined3d_resource *resource) static void surface_unload(struct wined3d_resource *resource) { - struct wined3d_surface *surface = surface_from_resource(resource); - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; - struct wined3d_renderbuffer_entry *entry, *entry2; - struct wined3d_device *device = resource->device; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - TRACE("surface %p.\n", surface); - - context = context_acquire(device, NULL); - gl_info = context->gl_info; - - if (resource->pool == WINED3D_POOL_DEFAULT) - { - /* We should only get here on device reset/teardown for implicit - * resources. */ - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_DISCARDED); - } - else - { - surface_load_location(surface, context, texture->resource.map_binding); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); - } - - /* Destroy fbo render buffers. This is needed for implicit render targets, for - * all application-created targets the application has to release the surface - * before calling _Reset - */ - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) - { - context_gl_resource_released(device, entry->id, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); - list_remove(&entry->entry); - HeapFree(GetProcessHeap(), 0, entry); - } - list_init(&surface->renderbuffers); - surface->current_renderbuffer = NULL; - - context_release(context); - - resource_unload(resource); + ERR("Not supported on sub-resources.\n"); } static HRESULT surface_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f89b5c9..e4ff67c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1358,26 +1358,59 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; - struct wined3d_context *context = NULL; + struct wined3d_device *device = resource->device; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; UINT i; TRACE("texture %p.\n", texture); + context = context_acquire(device, NULL); + gl_info = context->gl_info; + for (i = 0; i < sub_count; ++i) { - struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; - - sub_resource->resource_ops->resource_unload(sub_resource); + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; - if (texture->sub_resources[i].buffer_object) + if (resource->pool != WINED3D_POOL_DEFAULT + && texture->texture_ops->texture_load_location(texture, i, context, resource->map_binding)) { - if (!context) - context = context_acquire(texture->resource.device, NULL); + wined3d_texture_invalidate_location(texture, i, ~resource->map_binding); + } + else + { + /* We should only get here on device reset/teardown for implicit + * resources. */ + if (resource->pool != WINED3D_POOL_DEFAULT || resource->type != WINED3D_RTYPE_TEXTURE_2D) + ERR("Discarding %s %p sub-resource %u in the %s pool.\n", debug_d3dresourcetype(resource->type), + resource, i, debug_d3dpool(resource->pool)); + wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_DISCARDED); + wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_DISCARDED); + } + + if (sub_resource->buffer_object) wined3d_texture_remove_buffer_object(texture, i, context->gl_info); + + if (resource->type == WINED3D_RTYPE_TEXTURE_2D) + { + struct wined3d_surface *surface = sub_resource->u.surface; + struct wined3d_renderbuffer_entry *entry, *entry2; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) + { + context_gl_resource_released(device, entry->id, TRUE); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); + list_remove(&entry->entry); + HeapFree(GetProcessHeap(), 0, entry); + } + list_init(&surface->renderbuffers); + surface->current_renderbuffer = NULL; } + + resource_unload(sub_resource->resource); } - if (context) - context_release(context); + + context_release(context); wined3d_texture_force_reload(texture); wined3d_texture_unload_gl_texture(texture); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 262bbac..89d5ead 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -366,32 +366,7 @@ void wined3d_volume_cleanup(struct wined3d_volume *volume) static void volume_unload(struct wined3d_resource *resource) { - struct wined3d_volume *volume = volume_from_resource(resource); - struct wined3d_texture *texture = volume->container; - struct wined3d_device *device = texture->resource.device; - struct wined3d_context *context; - - if (texture->resource.pool == WINED3D_POOL_DEFAULT) - ERR("Unloading DEFAULT pool volume.\n"); - - TRACE("texture %p.\n", resource); - - context = context_acquire(device, NULL); - if (wined3d_volume_load_location(volume, context, WINED3D_LOCATION_SYSMEM)) - { - wined3d_texture_invalidate_location(texture, volume->texture_level, ~WINED3D_LOCATION_SYSMEM); - } - else - { - ERR("Out of memory when unloading volume %p.\n", volume); - wined3d_texture_validate_location(texture, volume->texture_level, WINED3D_LOCATION_DISCARDED); - wined3d_texture_invalidate_location(texture, volume->texture_level, ~WINED3D_LOCATION_DISCARDED); - } - context_release(context); - - /* The texture name is managed by the container. */ - - resource_unload(resource); + ERR("Not supported on sub-resources.\n"); } static ULONG volume_resource_incref(struct wined3d_resource *resource)

1 0

Henri Verbeet : wined3d: Track the map binding per-texture.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 16ff4e7cf6c1879219b3daa61cf8dae682a35449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ff4e7cf6c1879219b3daa61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:27 2016 +0200 wined3d: Track the map binding per-texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 54 +++++++++++++----------- dlls/wined3d/texture.c | 95 +++++++++++++++++++++++++++++------------- dlls/wined3d/volume.c | 9 ++-- dlls/wined3d/wined3d_private.h | 6 +-- 4 files changed, 102 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16ff4e7cf6c1879219b3d…

1 0

Henri Verbeet : wined3d: Store renderbuffer IDs in struct wined3d_texture.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: feb86895b4f0b1a9b43a4e47f7169e27fd5e3e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb86895b4f0b1a9b43a4e47f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:26 2016 +0200 wined3d: Store renderbuffer IDs in struct wined3d_texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 +- dlls/wined3d/surface.c | 94 ++---------------------------------------- dlls/wined3d/swapchain.c | 12 ++---- dlls/wined3d/texture.c | 81 +++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 7 +++- 5 files changed, 94 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=feb86895b4f0b1a9b43a4…

1 0

Jacek Caban : secur32/tests: Added missing flags handling to testEnumerateSecurityPackages.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 599b19a83142f5ffad4e7ec62eccf68f022d8f9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=599b19a83142f5ffad4e7ec62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 18 18:53:35 2016 +0200 secur32/tests: Added missing flags handling to testEnumerateSecurityPackages. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/main.c | 53 ++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/secur32/tests/main.c b/dlls/secur32/tests/main.c index b5b21c3..122cc24 100644 --- a/dlls/secur32/tests/main.c +++ b/dlls/secur32/tests/main.c @@ -162,30 +162,35 @@ static void testEnumerateSecurityPackages(void) for(i = 0; i < num_packages; ++i){ trace("%d: Package \"%s\"\n", i, pkg_info[i].Name); trace("Supported flags:\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_INTEGRITY) - trace("\tSECPKG_FLAG_INTEGRITY\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_PRIVACY) - trace("\tSECPKG_FLAG_PRIVACY\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_TOKEN_ONLY) - trace("\tSECPKG_FLAG_TOKEN_ONLY\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_DATAGRAM) - trace("\tSECPKG_FLAG_DATAGRAM\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_CONNECTION) - trace("\tSECPKG_FLAG_CONNECTION\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_MULTI_REQUIRED) - trace("\tSECPKG_FLAG_MULTI_REQUIRED\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_CLIENT_ONLY) - trace("\tSECPKG_FLAG_CLIENT_ONLY\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_EXTENDED_ERROR) - trace("\tSECPKG_FLAG_EXTENDED_ERROR\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_IMPERSONATION) - trace("\tSECPKG_FLAG_IMPERSONATION\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_ACCEPT_WIN32_NAME) - trace("\tSECPKG_FLAG_ACCEPT_WIN32_NAME\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_STREAM) - trace("\tSECPKG_FLAG_STREAM\n"); - if(pkg_info[i].fCapabilities & SECPKG_FLAG_READONLY_WITH_CHECKSUM) - trace("\tSECPKG_FLAG_READONLY_WITH_CHECKSUM\n"); +#define X(flag) \ + if(pkg_info[i].fCapabilities & flag) \ + trace("\t" #flag "\n") + + X(SECPKG_FLAG_INTEGRITY); + X(SECPKG_FLAG_PRIVACY); + X(SECPKG_FLAG_TOKEN_ONLY); + X(SECPKG_FLAG_DATAGRAM); + X(SECPKG_FLAG_CONNECTION); + X(SECPKG_FLAG_MULTI_REQUIRED); + X(SECPKG_FLAG_CLIENT_ONLY); + X(SECPKG_FLAG_EXTENDED_ERROR); + X(SECPKG_FLAG_IMPERSONATION); + X(SECPKG_FLAG_ACCEPT_WIN32_NAME); + X(SECPKG_FLAG_STREAM); + X(SECPKG_FLAG_NEGOTIABLE); + X(SECPKG_FLAG_GSS_COMPATIBLE); + X(SECPKG_FLAG_LOGON); + X(SECPKG_FLAG_ASCII_BUFFERS); + X(SECPKG_FLAG_FRAGMENT); + X(SECPKG_FLAG_MUTUAL_AUTH); + X(SECPKG_FLAG_DELEGATION); + X(SECPKG_FLAG_READONLY_WITH_CHECKSUM); + X(SECPKG_FLAG_RESTRICTED_TOKENS); + X(SECPKG_FLAG_NEGO_EXTENDER); + X(SECPKG_FLAG_NEGOTIABLE2); + X(SECPKG_FLAG_APPCONTAINER_PASSTHROUGH); + X(SECPKG_FLAG_APPCONTAINER_CHECKS); +#undef X trace("Comment: %s\n", pkg_info[i].Comment); trace("\n"); }

1 0

Matteo Bruni : d3dx9: Free old object data when reusing effect object.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: 9d725b17784db32a045bbad3a474989b0fde121e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d725b17784db32a045bbad3a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Apr 18 18:12:31 2016 +0200 d3dx9: Free old object data when reusing effect object. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index aa939a1..1c836eb 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4774,10 +4774,13 @@ static HRESULT d3dx9_copy_data(struct d3dx9_base_effect *base, unsigned int obje FIXME("Overwriting object id %u!\n", object_id); else TRACE("Overwriting object id 0.\n"); + + HeapFree(GetProcessHeap(), 0, object->data); + object->data = NULL; } read_dword(ptr, &object->size); - TRACE("Data size: %#x\n", object->size); + TRACE("Data size: %#x.\n", object->size); if (!object->size) return D3D_OK;

1 0

Francois Gouget : windowscodecs/tests: A spelling fix for a converter ok() message.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: wine Branch: master Commit: ebaa5ac76728ae825d6e84070b96e569cad3c99f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebaa5ac76728ae825d6e84070… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 16 02:24:22 2016 +0200 windowscodecs/tests: A spelling fix for a converter ok() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/converter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/converter.c b/dlls/windowscodecs/tests/converter.c index 00ea483..8c7a10f 100644 --- a/dlls/windowscodecs/tests/converter.c +++ b/dlls/windowscodecs/tests/converter.c @@ -493,7 +493,7 @@ static void test_encoder_properties(const CLSID* clsid_encoder, IPropertyBag2 *o if (FAILED(hr)) return; - ok(cProperties == cProperties2, "Missmatch of property count (IPropertyBag2::CountProperties=%i, IPropertyBag2::GetPropertyInfo=%i)\n", + ok(cProperties == cProperties2, "Mismatch of property count (IPropertyBag2::CountProperties=%i, IPropertyBag2::GetPropertyInfo=%i)\n", (int)cProperties, (int)cProperties2); }

1 0

Frédéric Delanoy : French translation for release 1.9.8
by Jeremy Newman 19 Apr '16

19 Apr '16

Module: website Branch: master Commit: 68c99392889f3476bdb694dd3f839ce948deca08 URL: http://source.winehq.org/git/website.git/?a=commit;h=68c99392889f3476bdb694… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Apr 19 10:01:41 2016 +0200 French translation for release 1.9.8 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016041601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/fr/2016041601.xml b/news/fr/2016041601.xml new file mode 100644 index 0000000..a8b9d02 --- /dev/null +++ b/news/fr/2016041601.xml @@ -0,0 +1,17 @@ +<news> +<date>16 avril 2016</date> +<title>Sortie de Wine 1.9.8</title> +<body> +<p>La version de développement 1.9.8 de Wine est disponible.</p> +<p><a href="{$root}/announce/1.9.8">Nouveautés</a> de cette version : +<ul> + <li>Travail supplémentaire en vue du flux de commandes WineD3D.</li> + <li>Correctifs dans le moteur Mono.</li> + <li>Prise en charge améliorée du lecteur WebServices.</li> + <li>Amélioration de la prise en charge de Shader Model 5.</li> + <li>Prise en charge des gradients dans les metafiles.</li> + <li>Meilleure prise en charge du formatage de tables dans WinHelp.</li> + <li>Diverses corrections de bugs.</li> +</ul></p> +<p>Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.8.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Frédéric Delanoy : French translation for release 1.8.2
by Jeremy Newman 19 Apr '16

19 Apr '16

Module: website Branch: master Commit: 3183258399158ba4a8b181cd5f44bf292984480f URL: http://source.winehq.org/git/website.git/?a=commit;h=3183258399158ba4a8b181… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Apr 19 10:01:40 2016 +0200 French translation for release 1.8.2 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016041201.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/fr/2016041201.xml b/news/fr/2016041201.xml new file mode 100644 index 0000000..d5cb69a --- /dev/null +++ b/news/fr/2016041201.xml @@ -0,0 +1,12 @@ +<news> +<date>12 avril 2016</date> +<title>Sortie de Wine 1.8.2</title> +<body> +<p> La version de maintenance 1.8.2 est disponible.</p> +<p> <a href="{$root}/announce/1.8.2">Nouveautés</a> de cette version : +<ul> + <li>Diverses corrections de bugs.</li> + <li>Petites mises à jour de traductions.</li> +</ul> +<p>Le <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.2.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</p></body></news>

1 0

Francois Gouget : testbot/TestAgent: Better indicate the file transfer position/range in case of errors.
by Alexandre Julliard 19 Apr '16

19 Apr '16

Module: tools Branch: master Commit: 2630f459dd8db55664b0a6b38c5640ff37ec901d URL: http://source.winehq.org/git/tools.git/?a=commit;h=2630f459dd8db55664b0a6b3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 11 02:46:52 2016 +0200 testbot/TestAgent: Better indicate the file transfer position/range in case of errors. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 74e7395..82ca97f 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -486,7 +486,7 @@ sub _RecvFile($$$$) if (!defined $r) { alarm(0); - $self->_SetError($FATAL, "got a network error while receiving '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!"); + $self->_SetError($FATAL, "got a network error while receiving '$Filename' ($self->{rpc}:$Name:$Pos+$s/$Size): $!"); return; # out of eval } if ($r == 0) @@ -501,7 +501,7 @@ sub _RecvFile($$$$) if (!defined $w or $w != $r) { alarm(0); - $self->_SetError($ERROR, "an error occurred while writing to '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!"); + $self->_SetError($ERROR, "an error occurred while writing to '$Filename' ($self->{rpc}:$Name:$Pos+$r/$Size): $!"); $self->_SkipRawData($Name, $Remaining); return; # out of eval } @@ -806,7 +806,7 @@ sub _SendFile($$$$) if (!defined $r) { alarm(0); - $self->_SetError($FATAL, "an error occurred while reading from '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!"); + $self->_SetError($FATAL, "an error occurred while reading from '$Filename' ($self->{rpc}:$Name:$Pos+$s/$Size): $!"); return; # out of eval } if ($r == 0) @@ -821,7 +821,8 @@ sub _SendFile($$$$) if (!defined $w or $w != $r) { alarm(0); - $self->_SetError($FATAL, "got a network error while sending '$Filename' ($self->{rpc}:$Name:$Pos+$s/$Size): $!"); + # Overwrite _Write()'s error message with a more appropriate one + $self->_SetError($FATAL, "got a network error while sending '$Filename' ($self->{rpc}:$Name:$Pos+$r/$Size): $!"); return; # out of eval } }

1 0

Rosanne DiMesio : Update Development Links
by Jeremy Newman 18 Apr '16

18 Apr '16

Module: website Branch: master Commit: 26ddcdba4b73a71073c016b61d83f73bee9f8ee8 URL: http://source.winehq.org/git/website.git/?a=commit;h=26ddcdba4b73a71073c016… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Mon Apr 18 15:16:23 2016 -0500 Update Development Links Update current links and remove references to nonexistent pages. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/en/devel.template | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/templates/en/devel.template b/templates/en/devel.template index d6b479f..10cf5f2 100644 --- a/templates/en/devel.template +++ b/templates/en/devel.template @@ -35,7 +35,7 @@ various resources available for our developers.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/HelpingWine">Contributing to Wine</a> + <a href="https://wiki.winehq.org/Main_Page#Contribute">Contributing to Wine</a> </div> <div class="col-xs-9 col-md-10"> Information for 1st time contributors. @@ -44,7 +44,7 @@ various resources available for our developers.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="{$root}/docs/winedev-guide/index">Developers Guide</a> + <a href="https://wiki.winehq.org/Wine_Developer's_Guide">Developer's Guide</a> </div> <div class="col-xs-9 col-md-10"> Online resource for development with Wine. @@ -62,7 +62,7 @@ various resources available for our developers.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/GitWine">Git</a> + <a href="https://wiki.winehq.org/Git_Wine_Tutorial">Git</a> </div> <div class="col-xs-9 col-md-10"> We use the source management tool Git. More information on how to use it can be found on this page. @@ -71,7 +71,7 @@ various resources available for our developers.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/SubmittingPatches">Sending Patches</a> + <a href="https://wiki.winehq.org/Submitting_Patches">Sending Patches</a> </div> <div class="col-xs-9 col-md-10"> Guidelines on how to format and send your patches. @@ -80,7 +80,7 @@ various resources available for our developers.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/TodoList">To Do Lists</a> + <a href="https://wiki.winehq.org/Category:ToDo">To Do Lists</a> </div> <div class="col-xs-9 col-md-10"> What needs to be done. A good first place to look for projects to be completed. @@ -89,24 +89,6 @@ various resources available for our developers.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Fun_Projects">Fun Projects</a> - </div> - <div class="col-xs-9 col-md-10"> - Another area of to dos. There are lower priority and should be done as side projects. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/JanitorialProjects">Janitorial</a> - </div> - <div class="col-xs-9 col-md-10"> - Code clean-up and organisation projects. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> <a href="https://wiki.winehq.org/Winelib">Winelib</a> </div> <div class="col-xs-9 col-md-10"> @@ -116,7 +98,7 @@ various resources available for our developers.</p> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/WineStatus">Status</a> + <a href="https://wiki.winehq.org/Wine_Status">Status</a> </div> <div class="col-xs-9 col-md-10"> Status of the Wine project.<br>

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
75
Older →

Jump to page:

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 April 2016