wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Stefan Dösinger : wined3d: Get rid of wined3d_texture_ops.texture_sub_resource_load().
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 7d23c8a4d822e8bcda4be074f915538bdfcf846b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d23c8a4d822e8bcda4be074f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 6 19:12:07 2016 +0200 wined3d: Get rid of wined3d_texture_ops.texture_sub_resource_load(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 21 --------------------- dlls/wined3d/texture.c | 18 +++--------------- dlls/wined3d/volume.c | 8 -------- dlls/wined3d/wined3d_private.h | 5 ----- 4 files changed, 3 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d898bc..9c015cc 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1422,27 +1422,6 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const checkGLcall("set_compatible_renderbuffer"); } -/* Context activation is done by the caller. */ -void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) -{ - DWORD location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - - TRACE("surface %p, srgb %#x.\n", surface, srgb); - - if (surface->container->resource.pool == WINED3D_POOL_SCRATCH) - ERR("Not supported on scratch surfaces.\n"); - - if (surface_get_sub_resource(surface)->locations & location) - { - TRACE("surface is already in texture\n"); - return; - } - TRACE("Reloading because surface is dirty.\n"); - - surface_load_location(surface, context, location); - surface_evict_sysmem(surface); -} - /* See also float_16_to_32() in wined3d_private.h */ static inline unsigned short float_32_to_16(const float *in) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3476b32..b31b0e1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -663,7 +663,9 @@ void wined3d_texture_load(struct wined3d_texture *texture, /* Reload the surfaces if the texture is marked dirty. */ for (i = 0; i < sub_count; ++i) { - texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i].resource, context, srgb); + if (!texture->texture_ops->texture_load_location(texture, i, context, + srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB)) + ERR("Failed to load location (srgb %#x).\n", srgb); } texture->flags |= flag; } @@ -1087,12 +1089,6 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, return WINED3D_OK; } -static void texture2d_sub_resource_load(struct wined3d_resource *sub_resource, - struct wined3d_context *context, BOOL srgb) -{ - surface_load(surface_from_resource(sub_resource), context, srgb); -} - static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_resource, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { @@ -1203,7 +1199,6 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture2d_ops = { - texture2d_sub_resource_load, texture2d_sub_resource_upload_data, texture2d_load_location, texture2d_prepare_location, @@ -1689,12 +1684,6 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3D_OK; } -static void texture3d_sub_resource_load(struct wined3d_resource *sub_resource, - struct wined3d_context *context, BOOL srgb) -{ - wined3d_volume_load(volume_from_resource(sub_resource), context, srgb); -} - static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_resource, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { @@ -1766,7 +1755,6 @@ static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture3d_ops = { - texture3d_sub_resource_load, texture3d_sub_resource_upload_data, texture3d_load_location, texture3d_prepare_location, diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 60bc2d7..02b5db6 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -355,14 +355,6 @@ done: return TRUE; } -/* Context activation is done by the caller. */ -void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) -{ - wined3d_texture_prepare_texture(volume->container, context, srgb_mode); - wined3d_volume_load_location(volume, context, - srgb_mode ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB); -} - void wined3d_volume_cleanup(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ca1065f..cb6d967 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2416,8 +2416,6 @@ struct gl_texture struct wined3d_texture_ops { - void (*texture_sub_resource_load)(struct wined3d_resource *sub_resource, - struct wined3d_context *context, BOOL srgb); void (*texture_sub_resource_upload_data)(struct wined3d_resource *sub_resource, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -2580,8 +2578,6 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc void wined3d_volume_cleanup(struct wined3d_volume *volume) DECLSPEC_HIDDEN; HRESULT wined3d_volume_init(struct wined3d_volume *volume, struct wined3d_texture *container, const struct wined3d_resource_desc *desc, UINT level) DECLSPEC_HIDDEN; -void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, - BOOL srgb_mode) DECLSPEC_HIDDEN; BOOL wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BOOL wined3d_volume_prepare_location(struct wined3d_volume *volume, @@ -2698,7 +2694,6 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_texture *container, const struct wined3d_resource_desc *desc, GLenum target, unsigned int level, unsigned int layer, DWORD flags) DECLSPEC_HIDDEN; -void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface,

1 0

Henri Verbeet : wined3d: Merge drawStridedFast() and drawStridedInstanced( ).
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: d85706381c9d85065dea262914d9c2a94705f610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d85706381c9d85065dea26291… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:06 2016 +0200 wined3d: Merge drawStridedFast() and drawStridedInstanced(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/drawprim.c | 211 +++++++++++++++++++++++------------------------- 2 files changed, 101 insertions(+), 112 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d85706381c9d85065dea2…

1 0

Henri Verbeet : wined3d: Merge drawStridedSlow() and drawStridedSlowVs().
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: f3c155cc56eb31fa9294d388e755208a2633c398 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3c155cc56eb31fa9294d388e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:05 2016 +0200 wined3d: Merge drawStridedSlow() and drawStridedSlowVs(). 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/context.c | 5 +- dlls/wined3d/directx.c | 6 +- dlls/wined3d/drawprim.c | 351 ++++++++++++++++++------------------------------ dlls/wined3d/state.c | 20 +-- dlls/wined3d/utils.c | 26 ++-- 6 files changed, 166 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3c155cc56eb31fa9294d…

1 0

Henri Verbeet : wined3d: Use struct wined3d_ffp_attrib_ops for generic attributes as well.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: eeac4013cda54d71d50c934a18521d4abc53a773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeac4013cda54d71d50c934a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:04 2016 +0200 wined3d: Use struct wined3d_ffp_attrib_ops for generic attributes as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 80 ++++++++++++++++++++++++++++ dlls/wined3d/drawprim.c | 117 ++--------------------------------------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 86 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eeac4013cda54d71d50c9…

1 0

Henri Verbeet : wined3d: Explicitly pass a wined3d_state structure to context_apply_clear_state().
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: e686b5a62ff938a285bc4e58f6669e28708fbc7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e686b5a62ff938a285bc4e58f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:03 2016 +0200 wined3d: Explicitly pass a wined3d_state structure to context_apply_clear_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 +++++----- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 670bf6f..48c82cf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2507,7 +2507,7 @@ static BOOL context_validate_rt_config(UINT rt_count, struct wined3d_rendertarge } /* Context activation is done by the caller. */ -BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, +BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) { struct wined3d_rendertarget_view **rts = fb->render_targets; @@ -2516,8 +2516,8 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win DWORD rt_mask = 0, *cur_mask; UINT i; - if (isStateDirty(context, STATE_FRAMEBUFFER) || fb != &device->fb - || rt_count != context->gl_info->limits.buffers) + if (isStateDirty(context, STATE_FRAMEBUFFER) || fb != state->fb + || rt_count != gl_info->limits.buffers) { if (!context_validate_rt_config(rt_count, rts, dsv)) return FALSE; @@ -2534,7 +2534,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win if (rts[i] && rts[i]->format->id != WINED3DFMT_NULL) rt_mask |= (1u << i); } - while (i < context->gl_info->limits.buffers) + while (i < gl_info->limits.buffers) { context->blit_targets[i] = NULL; ++i; @@ -2601,7 +2601,7 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win gl_info->gl_ops.gl.p_glEnable(GL_SCISSOR_TEST); if (rt_count && gl_info->supported[ARB_FRAMEBUFFER_SRGB]) { - if (needs_srgb_write(context, &device->state, fb)) + if (needs_srgb_write(context, state, fb)) gl_info->gl_ops.gl.p_glEnable(GL_FRAMEBUFFER_SRGB); else gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5231533..619ad1e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -294,6 +294,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c struct wined3d_surface *target = rt_count ? wined3d_rendertarget_view_get_surface(fb->render_targets[0]) : NULL; struct wined3d_surface *depth_stencil = fb->depth_stencil ? wined3d_rendertarget_view_get_surface(fb->depth_stencil) : NULL; + const struct wined3d_state *state = &device->state; const struct wined3d_gl_info *gl_info; UINT drawable_width, drawable_height; struct wined3d_color corrected_color; @@ -359,7 +360,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c draw_rect, rect_count, clear_rect, &ds_rect); } - if (!context_apply_clear_state(context, device, rt_count, fb)) + if (!context_apply_clear_state(context, state, rt_count, fb)) { context_release(context); WARN("Failed to apply clear state, skipping clear.\n"); @@ -415,7 +416,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c wined3d_texture_invalidate_location(texture, rtv->sub_resource_idx, ~rtv->resource->draw_binding); } - if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, &device->state, fb)) + if (!gl_info->supported[ARB_FRAMEBUFFER_SRGB] && needs_srgb_write(context, state, fb)) { if (rt_count > 1) WARN("Clearing multiple sRGB render targets with no GL_ARB_framebuffer_sRGB " diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7f384a0..6a105cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1575,7 +1575,7 @@ void context_alloc_event_query(struct wined3d_context *context, void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; -BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_device *device, +BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_device *device) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target,

1 0

Henri Verbeet : wined3d: Recognise Intel Ivybridge on MacOS.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 668fd0b1941dc85f8600aa2036ee145a75d825f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=668fd0b1941dc85f8600aa203… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:12:02 2016 +0200 wined3d: Recognise Intel Ivybridge on MacOS. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 749a328..3cb94ce 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1978,6 +1978,7 @@ cards_intel[] = {"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Mobile", CARD_INTEL_IVBM}, {"Ivybridge Desktop", CARD_INTEL_IVBD}, + {"HD Graphics 4000", CARD_INTEL_IVBD}, /* MacOS */ /* Sandybridge */ {"Sandybridge Server", CARD_INTEL_SNBS}, {"Sandybridge Mobile", CARD_INTEL_SNBM},

1 0

Caron Wills : wined3d: Add Nvidia GeForce 820M.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: wine Branch: master Commit: 9ecc547c6a91f3fdfe4cddf99690d4613865992b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ecc547c6a91f3fdfe4cddf99… Author: Caron Wills <caron(a)codeweavers.com> Date: Wed Apr 6 14:06:54 2016 +0000 wined3d: Add Nvidia GeForce 820M. Signed-off-by: Caron Wills <caron(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 02fb587..749a328 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1285,6 +1285,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTXTITAN, "NVIDIA GeForce GTX TITAN Black", DRIVER_NVIDIA_GEFORCE8, 6144}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_820M, "NVIDIA GeForce 820M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX860M, "NVIDIA GeForce GTX 860M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950, "NVIDIA GeForce GTX 950", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX950M, "NVIDIA GeForce GTX 950M", DRIVER_NVIDIA_GEFORCE8, 4096}, @@ -1749,6 +1750,7 @@ cards_nvidia_binary[] = {"GTX 950M", CARD_NVIDIA_GEFORCE_GTX950M}, /* GeForce 900 - midend mobile */ {"GTX 950", CARD_NVIDIA_GEFORCE_GTX950}, /* GeForce 900 - midend */ {"GTX 860M", CARD_NVIDIA_GEFORCE_GTX860M}, /* GeForce 800 - mobile */ + {"GeForce 820M", CARD_NVIDIA_GEFORCE_820M}, /* GeForce 800 - mobile */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX TITAN Black", CARD_NVIDIA_GEFORCE_GTXTITAN}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ @@ -2114,6 +2116,7 @@ cards_nvidia_mesa[] = {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, + {"NVD7", CARD_NVIDIA_GEFORCE_820M}, {"NVCF", CARD_NVIDIA_GEFORCE_GTX550}, {"NVCE", CARD_NVIDIA_GEFORCE_GTX560}, {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96bcf6b..7f384a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1788,6 +1788,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTXTITAN = 0x100c, + CARD_NVIDIA_GEFORCE_820M = 0x0fed, CARD_NVIDIA_GEFORCE_GTX860M = 0x1392, /* Other PCI ID 0x119a */ CARD_NVIDIA_GEFORCE_GTX950 = 0x1402, CARD_NVIDIA_GEFORCE_GTX950M = 0x139a,

1 0

Francois Gouget : testbot/TestAgent: Fix the --keepalive check.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: tools Branch: master Commit: d800172f550c5c310e17b823de78c42f2a835b25 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d800172f550c5c310e17b823… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 7 12:34:32 2016 +0200 testbot/TestAgent: Fix the --keepalive check. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/scripts/TestAgent | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index ced1165..33fc298 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -245,7 +245,7 @@ if (!defined $Usage) $Usage = 2; } elsif ($Cmd ne "run" and ($RunFlags or defined $RunIn or defined $RunOut or - defined $RunErr or defined $Keepalive)) + defined $RunErr)) { error("the --run-xxx options can only be used with the run command\n"); $Usage = 2; @@ -274,6 +274,11 @@ if (!defined $Usage) error("you must specify the server files to delete\n"); $Usage = 2; } + if (defined $Keepalive and $Cmd !~ /^(?:run|wait)$/) + { + error("--keepalive can only be used with the run or wait commands\n"); + $Usage = 2; + } $Keepalive = 60 if (!defined $Keepalive); $AgentPort = $Port if (defined $Port); if (!defined $AgentPort)

1 0

Francois Gouget : testbot/TestAgent: Harmonise the receive, skip and send code.
by Alexandre Julliard 07 Apr '16

07 Apr '16

Module: tools Branch: master Commit: 68452e3bfed226edda25d7b6341d732ad2054b1c URL: http://source.winehq.org/git/tools.git/?a=commit;h=68452e3bfed226edda25d7b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Apr 7 12:31:14 2016 +0200 testbot/TestAgent: Harmonise the receive, skip and send code. Avoid ifs at the end of long lines. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 81 +++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 33 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 55a1431..74e7395 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -2,7 +2,7 @@ # to run scripts. # # Copyright 2009 Ge van Geldorp -# Copyright 2012-2014 Francois Gouget +# Copyright 2012-2016 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -251,7 +251,7 @@ sub _RecvRawData($$$) return undef if (!defined $self->{fd}); my $Result; - my ($Received, $Remaining) = (0, $Size); + my ($Pos, $Remaining) = (0, $Size); eval { local $SIG{ALRM} = sub { die "timeout" }; @@ -265,17 +265,17 @@ sub _RecvRawData($$$) if (!defined $r) { alarm(0); - $self->_SetError($FATAL, "network read error ($self->{rpc}:$Name:$Received/$Size): $!"); + $self->_SetError($FATAL, "network read error ($self->{rpc}:$Name:$Pos/$Size): $!"); return; # out of eval } if ($r == 0) { alarm(0); - $self->_SetError($FATAL, "network read got a premature EOF ($self->{rpc}:$Name:$Received/$Size)"); + $self->_SetError($FATAL, "network read got a premature EOF ($self->{rpc}:$Name:$Pos/$Size)"); return; # out of eval } $Data .= $Buffer; - $Received += $r; + $Pos += $r; $Remaining -= $r; } alarm(0); @@ -283,7 +283,10 @@ sub _RecvRawData($$$) }; if ($@) { - $@ = "network read timed out ($self->{rpc}:$Name:$Received/$Size)" if ($@ =~ /^timeout /); + if ($@ =~ /^timeout /) + { + $@ = "network read timed out ($self->{rpc}:$Name:$Pos/$Size)"; + } $self->_SetError($FATAL, $@); } return $Result; @@ -295,7 +298,7 @@ sub _SkipRawData($$) return undef if (!defined $self->{fd}); my $Success; - my ($Received, $Remaining) = (0, $Size); + my ($Pos, $Remaining) = (0, $Size); eval { local $SIG{ALRM} = sub { die "timeout" }; @@ -309,16 +312,16 @@ sub _SkipRawData($$) if (!defined $n) { alarm(0); - $self->_SetError($FATAL, "network skip failed ($self->{rpc}:$Name:$Received/$Size): $!"); + $self->_SetError($FATAL, "network skip failed ($self->{rpc}:$Name:$Pos/$Size): $!"); return; # out of eval } if ($n == 0) { alarm(0); - $self->_SetError($FATAL, "network skip got a premature EOF ($self->{rpc}:$Name:$Received/$Size)"); + $self->_SetError($FATAL, "network skip got a premature EOF ($self->{rpc}:$Name:$Pos/$Size)"); return; # out of eval } - $Received += $n; + $Pos += $n; $Remaining -= $n; } alarm(0); @@ -326,7 +329,10 @@ sub _SkipRawData($$) }; if ($@) { - $@ = "network skip timed out ($self->{rpc}:$Name:$Received/$Size)" if ($@ =~ /^timeout /); + if ($@ =~ /^timeout /) + { + $@ = "network skip timed out ($self->{rpc}:$Name:$Pos/$Size)"; + } $self->_SetError($FATAL, $@); } return $Success; @@ -466,7 +472,7 @@ sub _RecvFile($$$$) return undef if (!defined $Size); my $Success; - my ($Start, $Received, $Remaining) = (now(), 0, $Size); + my ($Start, $Pos, $Remaining) = (now(), 0, $Size); eval { local $SIG{ALRM} = sub { die "timeout" }; @@ -480,22 +486,22 @@ sub _RecvFile($$$$) if (!defined $r) { alarm(0); - $self->_SetError($FATAL, "got a network error while receiving '$Filename' ($self->{rpc}:$Name:$Received/$Size): $!"); + $self->_SetError($FATAL, "got a network error while receiving '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!"); return; # out of eval } if ($r == 0) { alarm(0); - $self->_SetError($FATAL, "got a premature EOF while receiving '$Filename' ($self->{rpc}:$Name:$Received/$Size)"); + $self->_SetError($FATAL, "got a premature EOF while receiving '$Filename' ($self->{rpc}:$Name:$Pos/$Size)"); return; # out of eval } $Remaining -= $r; my $w = syswrite($Dst, $Buffer, $r, 0); - $Received += $w if (defined $w); + $Pos += $w if (defined $w); if (!defined $w or $w != $r) { alarm(0); - $self->_SetError($ERROR, "an error occurred while writing to '$Filename' ($self->{rpc}:$Name:$Received/$Size): $!"); + $self->_SetError($ERROR, "an error occurred while writing to '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!"); $self->_SkipRawData($Name, $Remaining); return; # out of eval } @@ -505,11 +511,14 @@ sub _RecvFile($$$$) }; if ($@) { - $@ = "timed out while receiving '$Filename' ($self->{rpc}:$Name:$Received/$Size)" if ($@ =~ /^timeout /); + if ($@ =~ /^timeout /) + { + $@ = "timed out while receiving '$Filename' ($self->{rpc}:$Name:$Pos/$Size)"; + } $self->_SetError($FATAL, $@); } - trace_speed($Received, now() - $Start); + trace_speed($Pos, now() - $Start); return $Success; } @@ -662,24 +671,24 @@ sub _Write($$$) return undef if (!defined $self->{fd}); my $Size = length($Data); - my ($Sent, $Remaining) = (0, $Size); + my ($Pos, $Remaining) = (0, $Size); while ($Remaining) { - my $w = syswrite($self->{fd}, $Data, $Remaining, $Sent); + my $w = syswrite($self->{fd}, $Data, $Remaining, $Pos); if (!defined $w) { - $self->_SetError($FATAL, "network write error ($self->{rpc}:$Name:$Sent/$Size): $!"); + $self->_SetError($FATAL, "network write error ($self->{rpc}:$Name:$Pos/$Size): $!"); return undef; } if ($w == 0) { - $self->_SetError($FATAL, "unable to send more data ($self->{rpc}:$Name:$Sent/$Size)"); - return $Sent; + $self->_SetError($FATAL, "unable to send more data ($self->{rpc}:$Name:$Pos/$Size)"); + return $Pos; } - $Sent += $w; + $Pos += $w; $Remaining -= $w; } - return $Sent; + return $Pos; } sub _SendRawData($$$) @@ -700,7 +709,10 @@ sub _SendRawData($$$) }; if ($@) { - $@ = "network write timed out ($self->{rpc}:$Name)" if ($@ =~ /^timeout /); + if ($@ =~ /^timeout /) + { + $@ = "network write timed out ($self->{rpc}:$Name)"; + } $self->_SetError($FATAL, $@); } return $Success; @@ -779,8 +791,8 @@ sub _SendFile($$$$) my $Size = -s $Filename; return undef if (!$self->_SendEntryHeader("$Name/Size", 'd', $Size)); - my ($Start, $Sent, $Remaining) = (now(), 0, $Size); my $Success; + my ($Start, $Pos, $Remaining) = (now(), 0, $Size); eval { local $SIG{ALRM} = sub { die "timeout" }; @@ -794,22 +806,22 @@ sub _SendFile($$$$) if (!defined $r) { alarm(0); - $self->_SetError($FATAL, "an error occurred while reading from '$Filename' ($self->{rpc}:$Name:$Sent/$Size): $!"); + $self->_SetError($FATAL, "an error occurred while reading from '$Filename' ($self->{rpc}:$Name:$Pos/$Size): $!"); return; # out of eval } if ($r == 0) { alarm(0); - $self->_SetError($FATAL, "got a premature EOF while reading from '$Filename' ($self->{rpc}:$Name:$Sent/$Size)"); + $self->_SetError($FATAL, "got a premature EOF while reading from '$Filename' ($self->{rpc}:$Name:$Pos/$Size)"); return; # out of eval } $Remaining -= $r; my $w = $self->_Write($Name, $Buffer); - $Sent += $w if (defined $w); + $Pos += $w if (defined $w); if (!defined $w or $w != $r) { alarm(0); - $self->_SetError($FATAL, "got a network error while sending '$Filename' ($self->{rpc}:$Name:$Sent+$s/$Size): $!"); + $self->_SetError($FATAL, "got a network error while sending '$Filename' ($self->{rpc}:$Name:$Pos+$s/$Size): $!"); return; # out of eval } } @@ -818,11 +830,14 @@ sub _SendFile($$$$) }; if ($@) { - $@ = "timed out while sending '$Filename' ($self->{rpc}:$Name:$Sent/$Size)" if ($@ =~ /^timeout /); + if ($@ =~ /^timeout /) + { + $@ = "timed out while sending '$Filename' ($self->{rpc}:$Name:$Pos/$Size)"; + } $self->_SetError($FATAL, $@); } - trace_speed($Sent, now() - $Start); + trace_speed($Pos, now() - $Start); return $Success; }

1 0

Hugh McMaster : reg: Exit with an error message if RegQueryInfoKeyW fails.
by Alexandre Julliard 06 Apr '16

06 Apr '16

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
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