October 2021 - Wine-commits

Zebediah Figura : vkd3d-shader/hlsl: Pass the original name string to hlsl_new_type().
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: a1f938e8e41cca53148ad4fd9d2d198ec02f9092 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a1f938e8e41cca53148ad4f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 27 20:51:47 2021 -0500 vkd3d-shader/hlsl: Pass the original name string to hlsl_new_type(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index fc6d1e4..66ca389 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -207,7 +207,11 @@ static struct hlsl_type *hlsl_new_type(struct hlsl_ctx *ctx, const char *name, e if (!(type = hlsl_alloc(ctx, sizeof(*type)))) return NULL; - type->name = name; + if (!(type->name = hlsl_strdup(ctx, name))) + { + vkd3d_free(type); + return NULL; + } type->type = type_class; type->base_type = base_type; type->dimx = dimx; @@ -1656,21 +1660,21 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) for (x = 1; x <= 4; ++x) { sprintf(name, "%s%ux%u", names[bt], y, x); - type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_MATRIX, bt, x, y); + type = hlsl_new_type(ctx, name, HLSL_CLASS_MATRIX, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.matrix[bt][x - 1][y - 1] = type; if (y == 1) { sprintf(name, "%s%u", names[bt], x); - type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_VECTOR, bt, x, y); + type = hlsl_new_type(ctx, name, HLSL_CLASS_VECTOR, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.vector[bt][x - 1] = type; if (x == 1) { sprintf(name, "%s", names[bt]); - type = hlsl_new_type(ctx, hlsl_strdup(ctx, name), HLSL_CLASS_SCALAR, bt, x, y); + type = hlsl_new_type(ctx, name, HLSL_CLASS_SCALAR, bt, x, y); hlsl_scope_add_type(ctx->globals, type); ctx->builtin_types.scalar[bt] = type; } @@ -1681,16 +1685,16 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) for (bt = 0; bt <= HLSL_SAMPLER_DIM_MAX; ++bt) { - type = hlsl_new_type(ctx, hlsl_strdup(ctx, sampler_names[bt]), HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); + type = hlsl_new_type(ctx, sampler_names[bt], HLSL_CLASS_OBJECT, HLSL_TYPE_SAMPLER, 1, 1); type->sampler_dim = bt; ctx->builtin_types.sampler[bt] = type; } - ctx->builtin_types.Void = hlsl_new_type(ctx, hlsl_strdup(ctx, "void"), HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); + ctx->builtin_types.Void = hlsl_new_type(ctx, "void", HLSL_CLASS_OBJECT, HLSL_TYPE_VOID, 1, 1); for (i = 0; i < ARRAY_SIZE(effect_types); ++i) { - type = hlsl_new_type(ctx, hlsl_strdup(ctx, effect_types[i].name), effect_types[i].class, + type = hlsl_new_type(ctx, effect_types[i].name, effect_types[i].class, effect_types[i].base_type, effect_types[i].dimx, effect_types[i].dimy); hlsl_scope_add_type(ctx->globals, type); }

1 0

Matteo Bruni : vkd3d-shader: Don't resize the buffer when there is enough free space.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: c3f85314772d590312fc015135cd9d794b0e9ff2 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c3f85314772d590312fc015… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 30 21:36:16 2021 +0200 vkd3d-shader: Don't resize the buffer when there is enough free space. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++-------- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +-- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index e38261b..baf2561 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -41,20 +41,14 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = buffer->buffer_size * 2; - char *new_buffer; + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(buffer->buffer_size * 2, 32); - new_buffer_size = max(new_buffer_size, 32); - while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) - new_buffer_size *= 2; - if (!(new_buffer = vkd3d_realloc(buffer->buffer, new_buffer_size))) + if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { ERR("Failed to grow buffer.\n"); buffer->buffer[buffer->content_size] = '\0'; return false; } - buffer->buffer = new_buffer; - buffer->buffer_size = new_buffer_size; return true; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8b3e762..fa56ba1 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -912,8 +912,7 @@ void shader_sm4_reset(struct vkd3d_shader_parser *parser); struct vkd3d_string_buffer { char *buffer; - unsigned int buffer_size; - unsigned int content_size; + size_t buffer_size, content_size; }; struct vkd3d_string_buffer_cache

1 0

Matteo Bruni : vkd3d-shader: Allocate memory for a string buffer at init time.
by Alexandre Julliard 01 Oct '21

01 Oct '21

Module: vkd3d Branch: master Commit: 49eba718443ad2df238180377ae45e4234f3c8f3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=49eba718443ad2df2381803… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 30 21:36:17 2021 +0200 vkd3d-shader: Allocate memory for a string buffer at init time. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index baf2561..ef9eaef 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -25,7 +25,11 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) { - memset(buffer, 0, sizeof(*buffer)); + buffer->buffer_size = 16; + buffer->content_size = 0; + buffer->buffer = vkd3d_malloc(buffer->buffer_size); + assert(buffer->buffer); + memset(buffer->buffer, 0, buffer->buffer_size); } void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) @@ -41,7 +45,7 @@ static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(buffer->buffer_size * 2, 32); + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : buffer->buffer_size * 2; if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { @@ -58,9 +62,6 @@ int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char * va_list a; int rc; - if (!buffer->content_size && !vkd3d_string_buffer_resize(buffer, 32)) - return -1; - for (;;) { rem = buffer->buffer_size - buffer->content_size; @@ -144,11 +145,6 @@ struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_c if (!(buffer = vkd3d_malloc(sizeof(*buffer)))) return NULL; vkd3d_string_buffer_init(buffer); - if (!vkd3d_string_buffer_resize(buffer, 1)) - { - vkd3d_free(buffer); - return NULL; - } } else {

1 0

Jeremy Newman : ignore site redirect
by Jeremy Newman 01 Oct '21

01 Oct '21

Module: website Branch: master Commit: 5abcc2ab5e12ab7da9ca8ad519ac00ee5979be1a URL: https://source.winehq.org/git/website.git/?a=commit;h=5abcc2ab5e12ab7da9ca8… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 1 15:22:51 2021 -0500 ignore site redirect --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f72166c8..3e820fc4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +site /data /docs /hypermail

1 0

Jeremy Newman : wine patches list is closed, remove links to it
by Jeremy Newman 01 Oct '21

01 Oct '21

Module: website Branch: master Commit: f1043a52fc6d62e8c56bb2eafb01165cff338224 URL: https://source.winehq.org/git/website.git/?a=commit;h=f1043a52fc6d62e8c56bb… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Oct 1 14:59:51 2021 -0500 wine patches list is closed, remove links to it we will leave the archive up in the en version --- templates/en/forums.template | 5 ++--- templates/fr/forums.template | 9 --------- templates/ko/forums.template | 9 --------- templates/pl/forums.template | 8 -------- templates/pt/forums.template | 8 -------- templates/tr/forums.template | 9 --------- templates/zh-cn/forums.template | 8 -------- 7 files changed, 2 insertions(+), 54 deletions(-) diff --git a/templates/en/forums.template b/templates/en/forums.template index 9f467ecf..61b4531e 100644 --- a/templates/en/forums.template +++ b/templates/en/forums.template @@ -63,11 +63,10 @@ mailing list software. </li> <li> - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Un-)Subscribe</a>] + <a href="mailto:wine-devel(a)winehq.org">wine-patches(a)winehq.org</a> [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] - A deprecated list for submitting patches. Use <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> instead. + A deprecated list for submitting patches. Use <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> instead. </li> <li> diff --git a/templates/fr/forums.template b/templates/fr/forums.template index 6a70658c..a1ffa884 100644 --- a/templates/fr/forums.template +++ b/templates/fr/forums.template @@ -53,15 +53,6 @@ le mot de passe obtenu lors de l'inscription, ou employez simplement <a href="// Une liste moyen trafic (50 messages par jour) pour la discussion sur le développement de Wine, les patchs ou tout autre élément intéressant pour les développeurs Wine. </li> - <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Dés-)inscription</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archive 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archive 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via un lecteur de nouvelles</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Une liste moyen trafic (45 messages par jour) destinée uniquement à l'envoi de patchs. - </li> - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Dés-)inscription</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archive 1</a>] diff --git a/templates/ko/forums.template b/templates/ko/forums.template index 8c5619bc..e932580b 100644 --- a/templates/ko/forums.template +++ b/templates/ko/forums.template @@ -72,15 +72,6 @@ href="//www.winehq.org/mailman/listinfo">Mailman 웹 인터페이스</a>에서 메시지 전송 빈도: 1일에 50여통(중간) </li> - <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">구독/해지</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">메시지 기록 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">메시지 기록 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">뉴스 리더로 보기</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - 과거에 패치를 제출하는 데 사용했던 메일링 리스트입니다. <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> 리스트를 사용하십시오. - </li> - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">구독/해지</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">메시지 기록 1</a>] diff --git a/templates/pl/forums.template b/templates/pl/forums.template index e8b72926..142b90c7 100644 --- a/templates/pl/forums.template +++ b/templates/pl/forums.template @@ -59,14 +59,6 @@ oprogramowanie listy mailingowej. Średni ruch (50/dziennie) otwarta lista dla dyskusji nt. tworzenia Wine, WineHQ, łatek lub czegokolwiek innego leżącego w zakresie interesu programistów Wine. - <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Wy-/Za-)pisz</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Archiwum 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Archiwum 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">przez czytnik aktualności</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Średni ruch (45/dziennie) otwarta lista przeznaczona wyłącznie do wysyłania łatek. - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Wy-/Za-)pisz</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Archiwum 1</a>] diff --git a/templates/pt/forums.template b/templates/pt/forums.template index 72d86244..bd618868 100644 --- a/templates/pt/forums.template +++ b/templates/pt/forums.template @@ -61,14 +61,6 @@ do contrário o seu email será tratado como um possível spam pelo software da Uma lista aberta de tráfego médio (50/dia) para discutir desenvolvimento do Wine, WineHQ, patches e qualquer outra coisa de interesse a desenvolvedores do Wine. - <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">(Des-)Inscrever</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Arquivo 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arquivo 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">via newsreader</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Uma lista aberta de tráfego médio (45/dia) para submeter patches apenas. - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">(Des-)Inscrever</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arquivo 1</a>] diff --git a/templates/tr/forums.template b/templates/tr/forums.template index 07e80b17..ee8bf648 100644 --- a/templates/tr/forums.template +++ b/templates/tr/forums.template @@ -53,15 +53,6 @@ WWW</a> veya listeadı-request(a)winehq.org adresine konu satırı "subscri Wine geliştirmesi, WineHQ, yamalar ve Wine geliştiricileri ile alakalı diğer şeylerle ilgili orta trafikli (50/gün) bir açık liste </li> - <li> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">Abone ol/iptal et</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">Arşiv 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">Arşiv 2</a>] - [<a href="news://news.gmane.org/gmane.comp.emulators.wine.patches">haber okuyucu ile</a>] - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - Sadece yamaları göndermek için kullanılan orta trafikli (45/gün) bir liste - </li> - <li> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">Abone ol/iptal et</a>] [<a href="//www.winehq.org/pipermail/wine-cvs/">Arşiv 1</a>] diff --git a/templates/zh-cn/forums.template b/templates/zh-cn/forums.template index 8e283c21..66c56778 100644 --- a/templates/zh-cn/forums.template +++ b/templates/zh-cn/forums.template @@ -51,14 +51,6 @@ WWW</a>，或者发送一封标题为 <code>"subscribe"</code> 的邮件到 <cod 一个中等流量（50封/天）的开放性列表，用于讨论 Wine 开发、WineHQ、patches 或者其他 Wine 开发者感兴趣的事情。 </li> - <li> - <a href="mailto:wine-patches(a)winehq.org">wine-patches(a)winehq.org</a> - [<a href="//www.winehq.org/mailman/listinfo/wine-patches">（取消）订阅</a>] - [<a href="//www.winehq.org/pipermail/wine-patches/">存档 1</a>] - [<a href="http://news.gmane.org/gmane.comp.emulators.wine.patches">存档 2</a>] - 一个已经废弃的用于提交补丁的列表。请使用 <a href="mailto:wine-devel(a)winehq.org">wine-devel(a)winehq.org</a> 代替。 - </li> - <li> <a href="mailto:wine-cvs(a)winehq.org">wine-cvs(a)winehq.org</a> [<a href="//www.winehq.org/mailman/listinfo/wine-cvs">（取消）订阅</a>]

1 0