wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Henri Verbeet : wined3d: Pass a texture and sub-resource index to read_from_framebuffer().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 40d5908854e5468cf070e26555b6e7158e1ef11e URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d5908854e5468cf070e265… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 10:53:02 2018 +0330 wined3d: Pass a texture and sub-resource index to read_from_framebuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b7bb604..12023e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1346,18 +1346,16 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr return dst_texture; } -static void read_from_framebuffer(struct wined3d_surface *surface, - struct wined3d_context *old_ctx, DWORD src_location, DWORD dst_location) +static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, DWORD src_location, DWORD dst_location) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; struct wined3d_device *device = texture->resource.device; - struct wined3d_context *context = old_ctx; - struct wined3d_surface *restore_rt = NULL; + struct wined3d_texture *restore_texture; const struct wined3d_gl_info *gl_info; unsigned int row_pitch, slice_pitch; unsigned int width, height, level; struct wined3d_bo_address data; + unsigned int restore_idx; BYTE *row, *top, *bottom; BOOL src_is_upside_down; unsigned int i; @@ -1365,16 +1363,18 @@ static void read_from_framebuffer(struct wined3d_surface *surface, wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); - restore_rt = context_get_rt_surface(old_ctx); - if (restore_rt != surface) + restore_texture = context->current_rt.texture; + restore_idx = context->current_rt.sub_resource_idx; + if (restore_texture != texture || restore_idx != sub_resource_idx) context = context_acquire(device, texture, sub_resource_idx); else - restore_rt = NULL; + restore_texture = NULL; gl_info = context->gl_info; if (src_location != texture->resource.draw_binding) { - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, surface, NULL, src_location); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, + texture->sub_resources[sub_resource_idx].u.surface, NULL, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } @@ -1468,8 +1468,8 @@ error: checkGLcall("glBindBuffer"); } - if (restore_rt) - context_restore(context, restore_rt); + if (restore_texture) + context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); } /* Read the framebuffer contents into a texture. Note that this function @@ -2080,7 +2080,8 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res if (is_multisample_location(texture, WINED3D_LOCATION_TEXTURE_RGB)) { wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_RB_RESOLVED); - read_from_framebuffer(sub_resource->u.surface, context, WINED3D_LOCATION_RB_RESOLVED, dst_location); + texture2d_read_from_framebuffer(texture, sub_resource_idx, context, + WINED3D_LOCATION_RB_RESOLVED, dst_location); return TRUE; } else @@ -2103,7 +2104,8 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - read_from_framebuffer(sub_resource->u.surface, context, texture->resource.draw_binding, dst_location); + texture2d_read_from_framebuffer(texture, sub_resource_idx, context, + texture->resource.draw_binding, dst_location); return TRUE; }

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_upload_from_surface().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: c337a46354b4b0c91c53573e0d28c152dd07a5f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c337a46354b4b0c91c53573e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 10:53:01 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5091bb8..b7bb604 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -934,13 +934,10 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s } } -static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, - struct wined3d_surface *src_surface, const RECT *src_rect) +static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture, + unsigned int dst_sub_resource_idx, const POINT *dst_point, struct wined3d_texture *src_texture, + unsigned int src_sub_resource_idx, const RECT *src_rect) { - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; - struct wined3d_texture *dst_texture = dst_surface->container; unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_gl_info *gl_info; unsigned int src_level, dst_level; @@ -948,16 +945,17 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, struct wined3d_bo_address data; UINT update_w, update_h; - TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", - dst_surface, wine_dbgstr_point(dst_point), - src_surface, wine_dbgstr_rect(src_rect)); + TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_point %s, " + "src_texture %p, src_sub_resource_idx %u, src_rect %s.\n", + dst_texture, dst_sub_resource_idx, wine_dbgstr_point(dst_point), + src_texture, src_sub_resource_idx, wine_dbgstr_rect(src_rect)); context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info; - /* Only load the surface for partial updates. For newly allocated texture - * the texture wouldn't be the current location, and we'd upload zeroes - * just to overwrite them again. */ + /* Only load the sub-resource for partial updates. For newly allocated + * textures the texture wouldn't be the current location, and we'd upload + * zeroes just to overwrite them again. */ update_w = src_rect->right - src_rect->left; update_h = src_rect->bottom - src_rect->top; dst_level = dst_sub_resource_idx % dst_texture->level_count; @@ -3870,7 +3868,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wi { POINT dst_point = {dst_box->left, dst_box->top}; - if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, &src_rect))) + if (SUCCEEDED(texture2d_upload_from_surface(dst_texture, dst_sub_resource_idx, + &dst_point, src_texture, src_sub_resource_idx, &src_rect))) { if (!wined3d_resource_is_offscreen(&dst_texture->resource)) {

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_download_data().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 4c1b3978ddfbf12383f0d0f0c9aaf13fac2d6b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c1b3978ddfbf12383f0d0f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 10:53:00 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5387737..5091bb8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -560,11 +560,9 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win /* This call just downloads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - DWORD dst_location) +static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_gl_info *gl_info, DWORD dst_location) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; const struct wined3d_format *format = texture->resource.format; struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; @@ -575,10 +573,11 @@ static void surface_download_data(struct wined3d_surface *surface, const struct GLenum target; void *mem; - /* Only support read back of converted P8 surfaces. */ + /* Only support read back of converted P8 textures. */ if (texture->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT && !format->download) { - ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); + ERR("Trying to read back converted texture %p, %u with format %s.\n", + texture, sub_resource_idx, debug_d3dformat(format->id)); return; } @@ -598,7 +597,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) ERR("Array texture %p uses NP2 emulation.\n", texture); - WARN_(d3d_perf)("Downloading all miplevel layers to get the surface data for a single sub-resource.\n"); + WARN_(d3d_perf)("Downloading all miplevel layers to get the data for a single sub-resource.\n"); if (!(temporary_mem = heap_calloc(texture->layer_count, sub_resource->size))) { @@ -641,7 +640,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (data.buffer_object) ERR("Converted texture %p uses PBO unexpectedly.\n", texture); - WARN_(d3d_perf)("Downloading converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); + WARN_(d3d_perf)("Downloading converted texture %p, %u with format %s.\n", + texture, sub_resource_idx, debug_d3dformat(format->id)); f = *format; f.byte_count = format->conv_byte_count; @@ -675,16 +675,16 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { - TRACE("Downloading compressed surface %p, level %u, format %#x, type %#x, data %p.\n", - surface, level, format->glFormat, format->glType, mem); + TRACE("Downloading compressed texture %p, %u, level %u, format %#x, type %#x, data %p.\n", + texture, sub_resource_idx, level, format->glFormat, format->glType, mem); GL_EXTCALL(glGetCompressedTexImage(target, level, mem)); checkGLcall("glGetCompressedTexImage"); } else { - TRACE("Downloading surface %p, level %u, format %#x, type %#x, data %p.\n", - surface, level, format->glFormat, format->glType, mem); + TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n", + texture, sub_resource_idx, level, format->glFormat, format->glType, mem); gl_info->gl_ops.gl.p_glGetTexImage(target, level, format->glFormat, format->glType, mem); checkGLcall("glGetTexImage"); @@ -2095,7 +2095,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res { wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - surface_download_data(sub_resource->u.surface, gl_info, dst_location); + texture2d_download_data(texture, sub_resource_idx, gl_info, dst_location); ++texture->download_count; return TRUE;

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_blt_fbo().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: ca2aa71775c7ecf37ca186b5529049370fe2c912 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca2aa71775c7ecf37ca186b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 10:52:59 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 106 +++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca2aa71775c7ecf37ca1…

1 0

Henri Verbeet : usp10: Use heap_calloc() in ScriptStringAnalyse().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 15c47c16e0ff37ea8e2b566f932fe33b922d3c54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15c47c16e0ff37ea8e2b566f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 10:53:03 2018 +0330 usp10: Use heap_calloc() in ScriptStringAnalyse(). Note that this changes the allocation size of analysis->pItem. I believe that change to be correct. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 52c7044..cf42c93 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2012,8 +2012,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (cString < 1 || !pString) return E_INVALIDARG; if ((dwFlags & SSA_GLYPHS) && !hdc) return E_PENDING; - if (!(analysis = heap_alloc_zero(sizeof(StringAnalysis)))) return E_OUTOFMEMORY; - if (!(analysis->pItem = heap_alloc_zero(num_items * sizeof(SCRIPT_ITEM) + 1))) goto error; + if (!(analysis = heap_alloc_zero(sizeof(*analysis)))) + return E_OUTOFMEMORY; + if (!(analysis->pItem = heap_calloc(num_items + 1, sizeof(*analysis->pItem)))) + goto error; /* FIXME: handle clipping */ analysis->clip_len = cString; @@ -2032,8 +2034,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_PASSWORD) { - iString = heap_alloc(sizeof(WCHAR)*cString); - if (!iString) + if (!(iString = heap_calloc(cString, sizeof(*iString)))) { hr = E_OUTOFMEMORY; goto error; @@ -2058,18 +2059,16 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_BREAK) { - if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) - { - for (i = 0; i < analysis->numItems; i++) - ScriptBreak(&((WCHAR *)pString)[analysis->pItem[i].iCharPos], - analysis->pItem[i + 1].iCharPos - analysis->pItem[i].iCharPos, - &analysis->pItem[i].a, &analysis->logattrs[analysis->pItem[i].iCharPos]); - } - else + if (!(analysis->logattrs = heap_calloc(cString, sizeof(*analysis->logattrs)))) goto error; + + for (i = 0; i < analysis->numItems; ++i) + ScriptBreak(&((const WCHAR *)pString)[analysis->pItem[i].iCharPos], + analysis->pItem[i + 1].iCharPos - analysis->pItem[i].iCharPos, + &analysis->pItem[i].a, &analysis->logattrs[analysis->pItem[i].iCharPos]); } - if (!(analysis->logical2visual = heap_alloc_zero(sizeof(int) * analysis->numItems))) + if (!(analysis->logical2visual = heap_calloc(analysis->numItems, sizeof(*analysis->logical2visual)))) goto error; if (!(BidiLevel = heap_alloc_zero(analysis->numItems))) goto error; @@ -2077,7 +2076,8 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_GLYPHS) { int tab_x = 0; - if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) + + if (!(analysis->glyphs = heap_calloc(analysis->numItems, sizeof(*analysis->glyphs)))) { heap_free(BidiLevel); goto error; @@ -2088,11 +2088,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, SCRIPT_CACHE *sc = (SCRIPT_CACHE*)&analysis->glyphs[i].sc; int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; int numGlyphs = 1.5 * cChar + 16; - WORD *glyphs = heap_alloc_zero(sizeof(WORD) * numGlyphs); - WORD *pwLogClust = heap_alloc_zero(sizeof(WORD) * cChar); - int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs); - SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * numGlyphs); - GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs); + WORD *glyphs = heap_calloc(numGlyphs, sizeof(*glyphs)); + WORD *pwLogClust = heap_calloc(cChar, sizeof(*pwLogClust)); + int *piAdvance = heap_calloc(numGlyphs, sizeof(*piAdvance)); + SCRIPT_VISATTR *psva = heap_calloc(numGlyphs, sizeof(*psva)); + GOFFSET *pGoffset = heap_calloc(numGlyphs, sizeof(*pGoffset)); int numGlyphsReturned; HFONT originalFont = 0x0;

1 0

Henri Verbeet : usp10: Use heap_calloc() in ScriptShapeOpenType().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 8d08ff3745536da0fd6107f97325e0fd33528227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d08ff3745536da0fd6107f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 11:14:44 2018 +0330 usp10: Use heap_calloc() in ScriptShapeOpenType(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 983eb83..52c7044 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3188,8 +3188,9 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, WCHAR *rChars; if ((hr = SHAPE_CheckFontForRequiredFeatures(hdc, (ScriptCache *)*psc, psa)) != S_OK) return hr; - rChars = heap_alloc(sizeof(WCHAR) * cChars); - if (!rChars) return E_OUTOFMEMORY; + if (!(rChars = heap_calloc(cChars, sizeof(*rChars)))) + return E_OUTOFMEMORY; + for (i = 0, g = 0, cluster = 0; i < cChars; i++) { int idx = i;

1 0

Jeremy Newman : update RSVP form for 2018
by Jeremy Newman 08 Mar '18

08 Mar '18

Module: website Branch: master Commit: 4291f80f6e50a6d3b091d1f7e1609d97a1631ead URL: https://source.winehq.org/git/website.git/?a=commit;h=4291f80f6e50a6d3b091d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Mar 8 13:26:45 2018 -0600 update RSVP form for 2018 --- templates/en/wineconf/rsvp.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/wineconf/rsvp.template b/templates/en/wineconf/rsvp.template index 5891b75..59bbeb7 100644 --- a/templates/en/wineconf/rsvp.template +++ b/templates/en/wineconf/rsvp.template @@ -1,3 +1,3 @@ - + -<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSf5eAdYjHyQg13cndWcQFTIS4Wym5fyjV0…" width="90%" height="1200" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe> +<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSebJ5QBhB7SRn2e9qB7FdDrrqGZykdb4bU…" width="90%" height="1500" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe>

1 0

Francois Gouget : testbot: Simplify updating a Step's status.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: tools Branch: master Commit: 497bad412434293d907e96e73cfc4b7287d86e0e URL: https://source.winehq.org/git/tools.git/?a=commit;h=497bad412434293d907e96e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 8 17:48:56 2018 +0100 testbot: Simplify updating a Step's status. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Steps.pm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 23e02cb..b8dbaec 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -146,12 +146,7 @@ sub UpdateStatus($$) return $Status if ($Status ne "queued" && $Status ne "running"); my %Has; - my $Tasks = $self->Tasks; - foreach my $TaskKey (@{$Tasks->GetKeys()}) - { - my $Task = $Tasks->GetItem($TaskKey); - $Has{$Task->UpdateStatus($Skip)} = 1; - } + map { $Has{$_->UpdateStatus($Skip)} = 1 } (@{$self->Tasks->GetItems()}); # Inherit the tasks most significant status. # Note that one or more tasks may have been requeued during the cleanup phase

1 0

Francois Gouget : testbot: Remove unneeded ObjectModel:: PropertyDescriptor imports.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: tools Branch: master Commit: 8a665a3b1807e19d348d138657bb07b445d6a9ad URL: https://source.winehq.org/git/tools.git/?a=commit;h=8a665a3b1807e19d348d138… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 8 17:48:42 2018 +0100 testbot: Remove unneeded ObjectModel::PropertyDescriptor imports. ObjectModel::PropertyDescriptor is only used as a base class and should not be used directly. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 1 - testbot/lib/ObjectModel/Item.pm | 1 - testbot/lib/WineTestBot/Branches.pm | 1 - testbot/lib/WineTestBot/Jobs.pm | 1 - testbot/lib/WineTestBot/Patches.pm | 1 - testbot/lib/WineTestBot/PendingPatches.pm | 1 - testbot/lib/WineTestBot/RecordGroups.pm | 1 - testbot/lib/WineTestBot/Records.pm | 1 - testbot/lib/WineTestBot/Roles.pm | 1 - testbot/lib/WineTestBot/Steps.pm | 1 - testbot/lib/WineTestBot/StepsTasks.pm | 1 - testbot/lib/WineTestBot/Tasks.pm | 1 - testbot/lib/WineTestBot/UserRoles.pm | 1 - testbot/lib/WineTestBot/Users.pm | 1 - testbot/lib/WineTestBot/VMs.pm | 1 - testbot/web/JobDetails.pl | 1 - testbot/web/PatchesList.pl | 1 - testbot/web/admin/BranchesList.pl | 1 - testbot/web/admin/UsersList.pl | 1 - testbot/web/admin/VMsList.pl | 1 - 20 files changed, 20 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 7fa977c..a57a329 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -46,7 +46,6 @@ require Exporter; use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Item; -use ObjectModel::PropertyDescriptor; sub ComputeMasterKey($) diff --git a/testbot/lib/ObjectModel/Item.pm b/testbot/lib/ObjectModel/Item.pm index e1385b8..e90ebbe 100644 --- a/testbot/lib/ObjectModel/Item.pm +++ b/testbot/lib/ObjectModel/Item.pm @@ -29,7 +29,6 @@ ObjectModel::Item - Base class for items use Scalar::Util qw(weaken); use ObjectModel::BackEnd; use ObjectModel::Collection; -use ObjectModel::PropertyDescriptor; use vars qw(@ISA @EXPORT_OK); diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index bfd24dd..f5bd9d9 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -51,7 +51,6 @@ WineTestBot::Branches - A collection of WineTestBot::Branch objects =cut use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use vars qw (@ISA @EXPORT @PropertyDescriptors); diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b870d7b..1d0f8bb 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -395,7 +395,6 @@ use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use WineTestBot::Branches; use WineTestBot::Config; diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index d572ec4..a1d9635 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -366,7 +366,6 @@ WineTestBot::Patches - A collection of WineTestBot::Patch objects =cut use ObjectModel::BasicPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Config; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/PendingPatches.pm b/testbot/lib/WineTestBot/PendingPatches.pm index 67d19a7..d63ff7e 100644 --- a/testbot/lib/WineTestBot/PendingPatches.pm +++ b/testbot/lib/WineTestBot/PendingPatches.pm @@ -48,7 +48,6 @@ WineTestBot::PendingPatches - A collection of WineTestBot::PendingPatch objects use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Patches; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/RecordGroups.pm b/testbot/lib/WineTestBot/RecordGroups.pm index 707d0ac..cde1a8d 100644 --- a/testbot/lib/WineTestBot/RecordGroups.pm +++ b/testbot/lib/WineTestBot/RecordGroups.pm @@ -59,7 +59,6 @@ WineTestBot::RecordGroups - A collection of WineTestBot::RecordGroup objects use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use WineTestBot::Records; diff --git a/testbot/lib/WineTestBot/Records.pm b/testbot/lib/WineTestBot/Records.pm index ac1c0fa..46cf1fe 100644 --- a/testbot/lib/WineTestBot/Records.pm +++ b/testbot/lib/WineTestBot/Records.pm @@ -64,7 +64,6 @@ WineTestBot::Records - A collection of WineTestBot::Record objects use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use vars qw (@ISA @EXPORT @PropertyDescriptors @FlatPropertyDescriptors); diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index 7c59e6a..eed13c3 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -45,7 +45,6 @@ WineTestBot::Roles - A collection of WineTestBot::Role objects =cut -use ObjectModel::PropertyDescriptor; use ObjectModel::BasicPropertyDescriptor; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 45ec635..23e02cb 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -192,7 +192,6 @@ WineTestBot::Steps - A collection of Job Steps use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Tasks; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 33f99b0..79216d4 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -97,7 +97,6 @@ WineTestBot::StepsTasks - A collection of StepsTasks objects use ObjectModel::BasicPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Steps; use WineTestBot::Tasks; use WineTestBot::VMs; diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index e0b5192..373da53 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -206,7 +206,6 @@ WineTestBot::Tasks - A collection of WineTestBot::Task objects use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::ItemrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::VMs; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/UserRoles.pm b/testbot/lib/WineTestBot/UserRoles.pm index 2d1fab2..8f7899a 100644 --- a/testbot/lib/WineTestBot/UserRoles.pm +++ b/testbot/lib/WineTestBot/UserRoles.pm @@ -41,7 +41,6 @@ WineTestBot::UserRoles - A collection of WineTestBot::UserRole objects =cut use ObjectModel::ItemrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Roles; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 7b18df9..b9745d8 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -299,7 +299,6 @@ use Net::LDAP; use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; use ObjectModel::DetailrefPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::Config; use WineTestBot::UserRoles; use WineTestBot::WineTestBotObjects; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index afc7af9..7a35ba7 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -632,7 +632,6 @@ role or status. use ObjectModel::BasicPropertyDescriptor; use ObjectModel::EnumPropertyDescriptor; -use ObjectModel::PropertyDescriptor; use WineTestBot::WineTestBotObjects; use vars qw (@ISA @EXPORT @PropertyDescriptors); diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 10a0d7c..70fb0fe 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -22,7 +22,6 @@ use strict; package JobDetailsPage; use URI::Escape; -use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::Config; use WineTestBot::Jobs; diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 39e9dc1..f0571b1 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -22,7 +22,6 @@ use strict; package PatchesListPage; use URI::Escape; -use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::Patches; diff --git a/testbot/web/admin/BranchesList.pl b/testbot/web/admin/BranchesList.pl index 48916cf..716fbd7 100644 --- a/testbot/web/admin/BranchesList.pl +++ b/testbot/web/admin/BranchesList.pl @@ -21,7 +21,6 @@ use strict; package BranchesListPage; -use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::Config; use WineTestBot::Branches; diff --git a/testbot/web/admin/UsersList.pl b/testbot/web/admin/UsersList.pl index d6ac868..eb6c324 100644 --- a/testbot/web/admin/UsersList.pl +++ b/testbot/web/admin/UsersList.pl @@ -22,7 +22,6 @@ use strict; package UsersListPage; -use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::CGI::Sessions; use WineTestBot::Config; diff --git a/testbot/web/admin/VMsList.pl b/testbot/web/admin/VMsList.pl index 9984771..652fc8e 100644 --- a/testbot/web/admin/VMsList.pl +++ b/testbot/web/admin/VMsList.pl @@ -21,7 +21,6 @@ use strict; package VMsListPage; -use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::VMs;

1 0

Alexandre Julliard : Add WineConf 2018 news.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: website Branch: master Commit: ec191f09899f499b6e1dd35b6879dec4c8e9346a URL: https://source.winehq.org/git/website.git/?a=commit;h=ec191f09899f499b6e1dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 8 11:09:02 2018 -0600 Add WineConf 2018 news. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018030801.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2018030801.xml b/news/en/2018030801.xml new file mode 100644 index 0000000..9d278e3 --- /dev/null +++ b/news/en/2018030801.xml @@ -0,0 +1,15 @@ +<news> +<date>March 8, 2018</date> +<title>WineConf 2018 - 25th anniversary</title> +<body> +<p>The Wine Project is pleased to announce that WineConf 2018 will +take place on June 29 - July 1 2018 in The Hague, The +Netherlands. This will coincide with the 25th anniversary of Wine.</p> +<p>WineConf is the Wine Project's annual conference, where members of +the Wine community, the broader Free Software community and interested +users meet up over food and beverages. We traditionally also have a +number of talks by attendees, as well as some formal and informal +discussions about anything vaguely Wine related.</p> +<p>Please see the <a href="https://wiki.winehq.org/WineConf2018">WineConf2018 page</a> +for further details.</p> +</body></news>

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
79
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 March 2018