wine-commits May 2020

wine-commits@winehq.org

1 participants
743 discussions

Nikolay Sivov : dwrite: Simplify single substitution helper.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: db3eb6fc0babee4b99b615732b7c05caaf59e14b URL: https://source.winehq.org/git/wine.git/?a=commit;h=db3eb6fc0babee4b99b61573… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:31 2020 +0300 dwrite: Simplify single substitution helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index bb62488330..abf9cba105 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4420,6 +4420,7 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator *iter, const struct ot_lookup *lookup) { struct scriptshaping_cache *cache = iter->context->cache; + const struct dwrite_fonttable *gsub = &cache->gsub.table; UINT16 format, coverage; unsigned int i; @@ -4436,10 +4437,9 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator if (format == 1) { - const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(&cache->gsub.table, subtable_offset, - sizeof(*format1)); + const struct ot_gsub_singlesubst_format1 *format1 = table_read_ensure(gsub, subtable_offset, sizeof(*format1)); - coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED) continue; @@ -4448,12 +4448,11 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct glyph_iterator } else if (format == 2) { - UINT16 count = table_read_be_word(&cache->gsub.table, subtable_offset + - FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); - const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(&cache->gsub.table, subtable_offset, + UINT16 count = table_read_be_word(gsub, subtable_offset + FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count)); + const struct ot_gsub_singlesubst_format2 *format2 = table_read_ensure(gsub, subtable_offset, FIELD_OFFSET(struct ot_gsub_singlesubst_format2, count) + count * sizeof(UINT16)); - coverage_index = opentype_layout_is_glyph_covered(&cache->gsub.table, subtable_offset + coverage, glyph); + coverage_index = opentype_layout_is_glyph_covered(gsub, subtable_offset + coverage, glyph); if (coverage_index == GLYPH_NOT_COVERED || coverage_index >= count) continue;

1 0

Nikolay Sivov : dwrite: Use prefetched glyph class to match with lookup mask.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 7f427f258d82d80fb903147dc16fbafe1eda90bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f427f258d82d80fb903147d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:30 2020 +0300 dwrite: Use prefetched glyph class to match with lookup mask. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 0b9c6067b5..bb62488330 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3425,21 +3425,21 @@ static void glyph_iterator_init(struct scriptshaping_context *context, unsigned iter->len = len; } -static BOOL glyph_iterator_match(const struct glyph_iterator *iter) +static BOOL lookup_is_glyph_match(unsigned int glyph_props, unsigned int lookup_flags) { - struct scriptshaping_cache *cache = iter->context->cache; + if (glyph_props & lookup_flags & LOOKUP_FLAG_IGNORE_MASK) + return FALSE; - if (cache->gdef.classdef) - { - unsigned int glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, - iter->context->u.pos.glyphs[iter->pos]); - if ((1 << glyph_class) & iter->flags & LOOKUP_FLAG_IGNORE_MASK) - return FALSE; - } + /* FIXME: match mark properties */ return TRUE; } +static BOOL glyph_iterator_match(const struct glyph_iterator *iter) +{ + return lookup_is_glyph_match(iter->context->glyph_infos[iter->pos].props, iter->flags); +} + static BOOL glyph_iterator_next(struct glyph_iterator *iter) { while (iter->pos + iter->len < iter->context->glyph_count)

1 0

Nikolay Sivov : dwrite: Set glyph class properties when applying GPOS.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: b1f215dd7840a2b7da9fd15de88b791522f8cb13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1f215dd7840a2b7da9fd15d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:29 2020 +0300 dwrite: Set glyph class properties when applying GPOS. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 68 +++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 814e65b6cc..0b9c6067b5 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3130,6 +3130,36 @@ static unsigned int opentype_layout_get_glyph_class(const struct dwrite_fonttabl return glyph_class; } +static unsigned int opentype_set_glyph_props(struct scriptshaping_context *context, unsigned int g, UINT16 glyph) +{ + struct scriptshaping_cache *cache = context->cache; + unsigned int glyph_class = 0, props; + + if (cache->gdef.classdef) + { + glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, context->u.subst.glyphs[g]); + } + + switch (glyph_class) + { + case GDEF_CLASS_BASE: + props = GLYPH_PROP_BASE; + break; + case GDEF_CLASS_LIGATURE: + props = GLYPH_PROP_LIGATURE; + break; + case GDEF_CLASS_MARK: + props = GLYPH_PROP_MARK; + break; + default: + props = 0; + } + + context->glyph_infos[g].props = props; + + return props; +} + struct coverage_compare_format1_context { UINT16 glyph; @@ -4377,6 +4407,8 @@ void opentype_layout_apply_gpos_features(struct scriptshaping_context *context, opentype_layout_collect_lookups(context, script_index, language_index, features, &context->cache->gpos, &lookups); + for (i = 0; i < context->glyph_count; ++i) + opentype_set_glyph_props(context, i, context->u.pos.glyphs[i]); opentype_layout_set_glyph_masks(context, features); for (i = 0; i < lookups.count; ++i) @@ -4691,36 +4723,6 @@ static unsigned int unicode_get_mirrored_char(unsigned int codepoint) return mirror ? mirror : codepoint; } -static void opentype_subst_set_glyph_props(struct scriptshaping_context *context, unsigned int g) -{ - struct scriptshaping_cache *cache = context->cache; - unsigned int glyph_class = 0, props; - - if (cache->gdef.classdef) - { - glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, context->u.subst.glyphs[g]); - } - - switch (glyph_class) - { - case GDEF_CLASS_BASE: - props = GLYPH_PROP_BASE; - break; - case GDEF_CLASS_LIGATURE: - props = GLYPH_PROP_LIGATURE; - break; - case GDEF_CLASS_MARK: - props = GLYPH_PROP_MARK; - context->u.subst.glyph_props[g].isDiacritic = 1; - context->u.subst.glyph_props[g].isZeroWidthSpace = 1; - break; - default: - props = 0; - } - - context->glyph_infos[g].props = props; -} - static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, const struct shaping_features *features) { unsigned int rtlm_mask = shaping_features_get_mask(features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','m'), NULL); @@ -4761,7 +4763,11 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.subst.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.subst.glyph_props[g].isClusterStart = 1; - opentype_subst_set_glyph_props(context, g); + if (opentype_set_glyph_props(context, g, context->u.subst.glyphs[g]) == GLYPH_PROP_MARK) + { + context->u.subst.glyph_props[g].isDiacritic = 1; + context->u.subst.glyph_props[g].isZeroWidthSpace = 1; + } context->glyph_count++; clustermap[i] = i;

1 0

Nikolay Sivov : dwrite: Set glyph class for all initial glyphs.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: a99e46654721da84e818b2bae9904cff8178d34e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a99e46654721da84e818b2ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:28 2020 +0300 dwrite: Set glyph class for all initial glyphs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/opentype.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4cf1523f47..dd25c619c1 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -465,6 +465,7 @@ struct scriptshaping_cache struct shaping_glyph_info { unsigned int mask; + unsigned int props; }; struct scriptshaping_context diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 77ae1e8447..814e65b6cc 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -494,6 +494,13 @@ enum gsub_gpos_lookup_flags LOOKUP_FLAG_IGNORE_MASK = 0xe, }; +enum glyph_prop_flags +{ + GLYPH_PROP_BASE = LOOKUP_FLAG_IGNORE_BASE, + GLYPH_PROP_LIGATURE = LOOKUP_FLAG_IGNORE_LIGATURES, + GLYPH_PROP_MARK = LOOKUP_FLAG_IGNORE_MARKS, +}; + enum gpos_lookup_type { GPOS_LOOKUP_SINGLE_ADJUSTMENT = 1, @@ -4684,6 +4691,36 @@ static unsigned int unicode_get_mirrored_char(unsigned int codepoint) return mirror ? mirror : codepoint; } +static void opentype_subst_set_glyph_props(struct scriptshaping_context *context, unsigned int g) +{ + struct scriptshaping_cache *cache = context->cache; + unsigned int glyph_class = 0, props; + + if (cache->gdef.classdef) + { + glyph_class = opentype_layout_get_glyph_class(&cache->gdef.table, cache->gdef.classdef, context->u.subst.glyphs[g]); + } + + switch (glyph_class) + { + case GDEF_CLASS_BASE: + props = GLYPH_PROP_BASE; + break; + case GDEF_CLASS_LIGATURE: + props = GLYPH_PROP_LIGATURE; + break; + case GDEF_CLASS_MARK: + props = GLYPH_PROP_MARK; + context->u.subst.glyph_props[g].isDiacritic = 1; + context->u.subst.glyph_props[g].isZeroWidthSpace = 1; + break; + default: + props = 0; + } + + context->glyph_infos[g].props = props; +} + static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, const struct shaping_features *features) { unsigned int rtlm_mask = shaping_features_get_mask(features, DWRITE_MAKE_OPENTYPE_TAG('r','t','l','m'), NULL); @@ -4724,6 +4761,7 @@ static void opentype_get_nominal_glyphs(struct scriptshaping_context *context, c context->u.subst.glyphs[g] = font->get_glyph(context->cache->context, codepoint); context->u.subst.glyph_props[g].justification = SCRIPT_JUSTIFY_CHARACTER; context->u.subst.glyph_props[g].isClusterStart = 1; + opentype_subst_set_glyph_props(context, g); context->glyph_count++; clustermap[i] = i;

1 0

Nikolay Sivov : dwrite: Fix array indexing when merging features.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 4490f8a2745ecf7d78425090b889a6af00e7e1a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4490f8a2745ecf7d78425090… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 25 14:54:27 2020 +0300 dwrite: Fix array indexing when merging features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/shape.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index 3d25898cf7..77c5ba1f8a 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -231,7 +231,7 @@ static int features_sorting_compare(const void *a, const void *b) static void shape_merge_features(struct scriptshaping_context *context, struct shaping_features *features) { const DWRITE_TYPOGRAPHIC_FEATURES **user_features = context->user_features.features; - unsigned int j = 0, i; + unsigned int i, j; /* For now only consider global, enabled user features. */ if (user_features && context->user_features.range_lengths) @@ -250,7 +250,7 @@ static void shape_merge_features(struct scriptshaping_context *context, struct s /* Sort and merge duplicates. */ qsort(features->features, features->count, sizeof(*features->features), features_sorting_compare); - for (i = 1; i < features->count; ++i) + for (i = 1, j = 0; i < features->count; ++i) { if (features->features[i].tag != features->features[j].tag) features->features[++j] = features->features[i];

1 0

Thomas Faber : ntdll/tests: Fix a test failure on Server 2003.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 2a2607e2a3ff5064ddd1bd9759b42b9c09187e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2607e2a3ff5064ddd1bd97… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat May 23 15:10:47 2020 +0200 ntdll/tests: Fix a test failure on Server 2003. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 72afb0a376..a5e6faa461 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -1640,8 +1640,8 @@ static void test_thread_context(void) ok( context.Esp == expect.Esp - 12 || context.Esp == expect.Esp - 16, "wrong Esp %08x/%08x\n", context.Esp, expect.Esp ); /* Eip is somewhere close to the NtGetContextThread implementation */ - ok( (char *)context.Eip >= (char *)pNtGetContextThread - 0x10000 && - (char *)context.Eip <= (char *)pNtGetContextThread + 0x10000, + ok( (char *)context.Eip >= (char *)pNtGetContextThread - 0x40000 && + (char *)context.Eip <= (char *)pNtGetContextThread + 0x40000, "wrong Eip %08x/%08x\n", context.Eip, (DWORD)pNtGetContextThread ); /* segment registers clear the high word */ ok( context.SegCs == LOWORD(expect.SegCs), "wrong SegCs %08x/%08x\n", context.SegCs, expect.SegCs );

1 0

Damjan Jovanovic : ntdll: Reserve the area whenever possible in reserve_area() on FreeBSD.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 8c3e6c378de0a05a097f3e7ff43edf951934d9a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c3e6c378de0a05a097f3e7f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat May 23 12:07:28 2020 +0200 ntdll: Reserve the area whenever possible in reserve_area() on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 88cd1eb1cf..8fa43a40e6 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -135,7 +135,11 @@ static void reserve_area( void *addr, void *end ) if (!size) return; +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + ptr = mmap( addr, size, PROT_NONE, flags | MAP_FIXED | MAP_EXCL, -1, 0 ); +#else ptr = mmap( addr, size, PROT_NONE, flags, -1, 0 ); +#endif if (ptr == addr) { mmap_add_reserved_area( addr, size );

1 0

Damjan Jovanovic : libwine: Fix a regression in the return value check for mmap() on FreeBSD.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: e0138c4a6a7a87f1d25badd43e05490e706bc666 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0138c4a6a7a87f1d25badd4… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sat May 23 11:01:49 2020 +0200 libwine: Fix a regression in the return value check for mmap() on FreeBSD. This fixes a regression from my previous patch in commit 55ba3648379d90642f174e74809b84130d6d1ddc, which was checking for mmap() returning NULL instead of MAP_FAILED. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49225 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index 0fbe2efea7..af91b3e352 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -215,7 +215,7 @@ void *wine_anon_mmap( void *start, size_t size, int prot, int flags ) /* If available, this will attempt a fixed mapping in-kernel */ flags |= MAP_TRYFIXED; #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) ) + if ( start && mmap( start, size, prot, flags | MAP_FIXED | MAP_EXCL, get_fdzero(), 0 ) != MAP_FAILED ) return start; #elif defined(__svr4__) || defined(__NetBSD__) || defined(__APPLE__) if ( try_mmap_fixed( start, size, prot, flags, get_fdzero(), 0 ) )

1 0

Zebediah Figura : amstream: Simplify flush_receive_queue() a bit.
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 410934a762a048fbff8d35927a70ce55f97a9d63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=410934a762a048fbff8d3592… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 22 16:25:51 2020 -0500 amstream: Simplify flush_receive_queue() a bit. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 68b8b84f50..4e82d76da0 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -95,13 +95,10 @@ static void remove_queued_update(IAudioStreamSampleImpl *sample) static void flush_receive_queue(struct audio_stream *stream) { - while (!list_empty(&stream->receive_queue)) - { - struct queued_receive *receive = - LIST_ENTRY(list_head(&stream->receive_queue), struct queued_receive, entry); + struct list *entry; - remove_queued_receive(receive); - } + while ((entry = list_head(&stream->receive_queue))) + remove_queued_receive(LIST_ENTRY(entry, struct queued_receive, entry)); } static void process_update(IAudioStreamSampleImpl *sample, struct queued_receive *receive)

1 0

Matteo Bruni : ntdll: Use memcpy() in set_float_reg().
by Alexandre Julliard 25 May '20

25 May '20

Module: wine Branch: master Commit: 2e5c2c7cdb11cae3a2b78bb0794368f431538efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e5c2c7cdb11cae3a2b78bb0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 22 20:39:59 2020 +0200 ntdll: Use memcpy() in set_float_reg(). The source address might not be aligned although the compiler can expect alignment when using a plain assignment. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 31af1e98d3..e92470e960 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3298,7 +3298,8 @@ static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_pt static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A *val ) { - *(&context->u.s.Xmm0 + reg) = *val; + /* Use a memcpy() to avoid issues if val is misaligned. */ + memcpy(&context->u.s.Xmm0 + reg, val, sizeof(*val)); if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = val; }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
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 May 2020