- Wine-Devel - list.winehq.org

[tools] testbot/web: Use .errors files to highlight errors in full logs.
by Francois Gouget March 2, 2021

March 2, 2021

Instead of relying on Get*LineCategory() to identify error lines and only using the .errors information to single out new errors; JobDetails now uses the .errors file for both and only uses Get*LineCategory() to highlight warnings, informational messages, etc. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7a4f4fc35..8d4270af1 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -368,20 +368,16 @@ sub GenerateFullLog($$$$) print "<pre class='log-note'>Some WineTest results could not be used to detect new errors: $LogInfo->{BadRef}</pre>\n"; } - my %NewLineNos; - if ($LogInfo->{ErrCount}) + my %ErrLineNos; + foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) { - foreach my $GroupName (@{$LogInfo->{ErrGroupNames}}) + my $Group = $LogInfo->{ErrGroups}->{$GroupName}; + my $ErrCount = @{$Group->{Errors}}; + next if (!$ErrCount); + for my $ErrIndex (0..$ErrCount-1) { - my $Group = $LogInfo->{ErrGroups}->{$GroupName}; - next if (!$Group->{NewCount}); - for my $ErrIndex (0..@{$Group->{Errors}} - 1) - { - if ($Group->{IsNew}->[$ErrIndex]) - { - $NewLineNos{$Group->{LineNos}->[$ErrIndex]} = 1; - } - } + $ErrLineNos{$Group->{LineNos}->[$ErrIndex]} = \ + $Group->{IsNew}->[$ErrIndex] ? "fullnew" : "error"; } } @@ -404,7 +400,7 @@ sub GenerateFullLog($$$$) } my $Html = $self->escapeHTML($Line); - my $Category = $NewLineNos{$LineNo} ? "fullnew" : $GetCategory->($Line); + my $Category = $ErrLineNos{$LineNo} || $GetCategory->($Line); if ($Category ne "none") { $Html =~ s~^(.*\S)\s*\r?$~<span class='log-$Category'>$1</span>~; -- 2.20.1

1 0

[PATCH 1/4] msvcr120: Add fegetexceptflag.
by Daniel Lehman March 2, 2021

March 2, 2021

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 37 ++++++++++++++++++- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 13 +++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/fenv.h | 3 ++ 7 files changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 74d682b33bf..59b0c567216 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -89,7 +89,7 @@ @ cdecl exit(long) ucrtbase.exit @ stub feclearexcept @ cdecl fegetenv(ptr) ucrtbase.fegetenv -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) ucrtbase.fegetexceptflag @ cdecl fegetround() ucrtbase.fegetround @ stub feholdexcept @ cdecl fesetenv(ptr) ucrtbase.fesetenv diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0e1c7705166..776d701e780 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2145,7 +2145,7 @@ @ cdecl fdiml(double double) fdim @ stub feclearexcept @ cdecl fegetenv(ptr) -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) @ cdecl fegetround() @ stub feholdexcept @ cdecl feof(ptr) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e8ef2be3520..d6e93b97629 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -182,6 +182,7 @@ static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p_fesetenv)(const fenv_t*); static int (CDECL *p_fegetround)(void); static int (CDECL *p_fesetround)(int); +static int (CDECL *p_fegetexceptflag)(fexcept_t*,int); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); @@ -257,6 +258,7 @@ static BOOL init(void) SET(p_fesetenv, "fesetenv"); SET(p_fegetround, "fegetround"); SET(p_fesetround, "fesetround"); + SET(p_fegetexceptflag, "fegetexceptflag"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); @@ -788,8 +790,25 @@ static void test_critical_section(void) static void test_feenv(void) { + static const struct { + unsigned long set; + unsigned long get; + fexcept_t expect; + } tests[] = { + { 0, 0, 0 }, + { FE_INEXACT, 0, 0 }, + { FE_INEXACT, FE_ALL_EXCEPT, FE_INEXACT }, + { FE_INEXACT, FE_INEXACT, FE_INEXACT }, + { FE_INEXACT, FE_OVERFLOW, 0 }, + { FE_ALL_EXCEPT, FE_ALL_EXCEPT, FE_ALL_EXCEPT }, + { FE_ALL_EXCEPT, FE_INEXACT, FE_INEXACT }, + { FE_ALL_EXCEPT, 0, 0 }, + { FE_ALL_EXCEPT, ~0, FE_ALL_EXCEPT }, + { FE_ALL_EXCEPT, ~FE_ALL_EXCEPT, 0 }, + }; fenv_t env, env2; - int ret; + fexcept_t except; + int i, ret; p__clearfp(); @@ -807,6 +826,22 @@ static void test_feenv(void) ok(!ret, "fesetenv returned %x\n", ret); ret = p_fegetround(); ok(ret == FE_TONEAREST, "Got unexpected round mode %#x.\n", ret); + + if(0) /* crashes on windows */ + p_fegetexceptflag(NULL, 0); + + for(i=0; i<ARRAY_SIZE(tests); i++) { + env._Fe_stat = tests[i].set; + ret = p_fesetenv(&env); + ok(!ret, "fesetenv returned %x\n", ret); + + except = ~0; + ret = p_fegetexceptflag(&except, tests[i].get); + ok(!ret, "fegetexceptflag returned %x.\n", ret); + ok(except == tests[i].expect, "expected %lx, got %lx\n", tests[i].expect, except); + } + + p__clearfp(); } static void test__wcreate_locale(void) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05b8a97a084..a3be94e4a6c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1811,7 +1811,7 @@ @ cdecl fdiml(double double) msvcr120.fdiml @ stub feclearexcept @ cdecl fegetenv(ptr) msvcr120.fegetenv -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) msvcr120.fegetexceptflag @ cdecl fegetround() msvcr120.fegetround @ stub feholdexcept @ cdecl feof(ptr) msvcr120.feof diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d6b0d9422e7..996059cc036 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2214,6 +2214,19 @@ int CDECL fegetenv(fenv_t *env) env->_Fe_stat = _statusfp(); return 0; } + +/********************************************************************* + * fegetexceptflag (MSVCR120.@) + */ +int CDECL fegetexceptflag(fexcept_t *status, int excepts) +{ + fenv_t env; + int rc; + + rc = fegetenv(&env); + *status = env._Fe_stat & excepts & FE_ALL_EXCEPT; + return rc; +} #endif #if _MSVCR_VER>=140 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0a8d74521f5..41b1b79896d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2288,7 +2288,7 @@ @ cdecl fdiml(double double) fdim @ stub feclearexcept @ cdecl fegetenv(ptr) -@ stub fegetexceptflag +@ cdecl fegetexceptflag(ptr long) @ cdecl fegetround() @ stub feholdexcept @ cdecl feof(ptr) diff --git a/include/msvcrt/fenv.h b/include/msvcrt/fenv.h index 92b341bd46b..56db8ea28b8 100644 --- a/include/msvcrt/fenv.h +++ b/include/msvcrt/fenv.h @@ -30,8 +30,11 @@ typedef struct __msvcrt_ulong _Fe_stat; } fenv_t; +typedef __msvcrt_ulong fexcept_t; + _ACRTIMP int __cdecl fegetenv(fenv_t*); _ACRTIMP int __cdecl fesetenv(const fenv_t*); +_ACRTIMP int __cdecl fegetexceptflag(fexcept_t*, int); _ACRTIMP int __cdecl fegetround(void); _ACRTIMP int __cdecl fesetround(int); -- 2.25.1

3 9

[PATCH vkd3d v3 1/6] vkd3d-shader: Return a vkd3d_string_buffer from hlsl_type_to_string().
by Zebediah Figura March 2, 2021

March 2, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 62 +++++++++++++----------- libs/vkd3d-shader/hlsl.h | 4 +- libs/vkd3d-shader/hlsl.y | 20 +++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 60 +++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 11 +++++ 5 files changed, 120 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 52b3dd10..e2a77707 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -648,10 +648,10 @@ static int compare_function_decl_rb(const void *key, const struct rb_entry *entr return 0; } -char *hlsl_type_to_string(const struct hlsl_type *type) +struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, + const struct hlsl_type *type) { - const char *name; - char *string; + struct vkd3d_string_buffer *string; static const char base_types[HLSL_TYPE_LAST_SCALAR + 1][7] = { @@ -663,66 +663,70 @@ char *hlsl_type_to_string(const struct hlsl_type *type) "bool", }; + if (!(string = vkd3d_string_buffer_get(string_buffers))) + return NULL; + if (type->name) - return vkd3d_strdup(type->name); + { + vkd3d_string_buffer_printf(string, "%s", type->name); + return string; + } switch (type->type) { case HLSL_CLASS_SCALAR: - return vkd3d_strdup(base_types[type->base_type]); + vkd3d_string_buffer_printf(string, "%s", base_types[type->base_type]); + return string; case HLSL_CLASS_VECTOR: - name = base_types[type->base_type]; - if ((string = malloc(strlen(name) + 2))) - sprintf(string, "%s%u", name, type->dimx); + vkd3d_string_buffer_printf(string, "%s%u", base_types[type->base_type], type->dimx); return string; case HLSL_CLASS_MATRIX: - name = base_types[type->base_type]; - if ((string = malloc(strlen(name) + 4))) - sprintf(string, "%s%ux%u", name, type->dimx, type->dimy); + vkd3d_string_buffer_printf(string, "%s%ux%u", base_types[type->base_type], type->dimx, type->dimy); return string; case HLSL_CLASS_ARRAY: { + struct vkd3d_string_buffer *inner_string; const struct hlsl_type *t; - char *inner_string; - size_t len = 1; for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) - len += 14; - if (!(inner_string = hlsl_type_to_string(t))) - return NULL; - len += strlen(inner_string); + ; - if ((string = malloc(len))) + if ((inner_string = hlsl_type_to_string(string_buffers, t))) { - strcpy(string, inner_string); - for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) - sprintf(string + strlen(string), "[%u]", t->e.array.elements_count); + vkd3d_string_buffer_printf(string, "%s", inner_string->buffer); + vkd3d_string_buffer_release(string_buffers, inner_string); } - vkd3d_free(inner_string); + for (t = type; t->type == HLSL_CLASS_ARRAY; t = t->e.array.type) + vkd3d_string_buffer_printf(string, "[%u]", t->e.array.elements_count); return string; } case HLSL_CLASS_STRUCT: - return vkd3d_strdup("<anonymous struct>"); + vkd3d_string_buffer_printf(string, "<anonymous struct>"); + return string; default: - return vkd3d_strdup("<unexpected type>"); + vkd3d_string_buffer_printf(string, "<unexpected type>"); + return string; } } const char *debug_hlsl_type(const struct hlsl_type *type) { + struct vkd3d_string_buffer_cache string_buffers; + struct vkd3d_string_buffer *string; const char *ret; - char *string; - if (!(string = hlsl_type_to_string(type))) + vkd3d_string_buffer_cache_init(&string_buffers); + if (!(string = hlsl_type_to_string(&string_buffers, type))) return NULL; - ret = vkd3d_dbg_sprintf("%s", string); - vkd3d_free(string); + ret = vkd3d_dbg_sprintf("%s", string->buffer); + vkd3d_string_buffer_release(&string_buffers, string); + vkd3d_string_buffer_cache_cleanup(&string_buffers); return ret; } @@ -1526,6 +1530,7 @@ static bool hlsl_ctx_init(struct hlsl_ctx *ctx, struct vkd3d_shader_message_cont ctx->source_files_count = 1; ctx->location.source_name = ctx->source_files[0]; ctx->location.line = ctx->location.column = 1; + vkd3d_string_buffer_cache_init(&ctx->string_buffers); ctx->matrix_majority = HLSL_COLUMN_MAJOR; @@ -1553,6 +1558,7 @@ static void hlsl_ctx_cleanup(struct hlsl_ctx *ctx) for (i = 0; i < ctx->source_files_count; ++i) vkd3d_free((void *)ctx->source_files[i]); vkd3d_free(ctx->source_files); + vkd3d_string_buffer_cache_cleanup(&ctx->string_buffers); rb_destroy(&ctx->functions, free_function_rb, NULL); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index a374f54a..5a0470b9 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -390,6 +390,7 @@ struct hlsl_ctx unsigned int source_files_count; struct vkd3d_shader_location location; struct vkd3d_shader_message_context *message_context; + struct vkd3d_string_buffer_cache string_buffers; bool failed; void *scanner; @@ -496,7 +497,8 @@ static inline void hlsl_src_remove(struct hlsl_src *src) const char *debug_hlsl_type(const struct hlsl_type *type) DECLSPEC_HIDDEN; -char *hlsl_type_to_string(const struct hlsl_type *type) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *hlsl_type_to_string(struct vkd3d_string_buffer_cache *string_buffers, + const struct hlsl_type *type) DECLSPEC_HIDDEN; char *hlsl_modifiers_to_string(unsigned int modifiers) DECLSPEC_HIDDEN; const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ea640b94..1fb1b7f3 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -255,13 +255,15 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct if (!implicit_compatible_data_types(src_type, dst_type)) { - char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); + struct vkd3d_string_buffer *src_string, *dst_string; + src_string = hlsl_type_to_string(&ctx->string_buffers, src_type); + dst_string = hlsl_type_to_string(&ctx->string_buffers, dst_type); if (src_string && dst_string) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Can't implicitly convert from %s to %s.", src_string, dst_string); - vkd3d_free(src_string); - vkd3d_free(dst_string); + "Can't implicitly convert from %s to %s.", src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, src_string); + vkd3d_string_buffer_release(&ctx->string_buffers, dst_string); return NULL; } @@ -2744,13 +2746,15 @@ unary_expr: if (!compatible_data_types(src_type, dst_type)) { - char *src_string = hlsl_type_to_string(src_type), *dst_string = hlsl_type_to_string(dst_type); + struct vkd3d_string_buffer *src_string, *dst_string; + src_string = hlsl_type_to_string(&ctx->string_buffers, src_type); + dst_string = hlsl_type_to_string(&ctx->string_buffers, dst_type); if (src_string && dst_string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Can't cast from %s to %s.", - src_string, dst_string); - vkd3d_free(src_string); - vkd3d_free(dst_string); + src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, src_string); + vkd3d_string_buffer_release(&ctx->string_buffers, dst_string); YYABORT; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index bae2852a..51136243 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -33,6 +33,12 @@ void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) vkd3d_free(buffer->buffer); } +static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) +{ + buffer->buffer[0] = '\0'; + buffer->content_size = 0; +} + static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { unsigned int new_buffer_size = buffer->buffer_size * 2; @@ -107,6 +113,60 @@ void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const } } +void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *cache) +{ + memset(cache, 0, sizeof(*cache)); +} + +void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *cache) +{ + unsigned int i; + + for (i = 0; i < cache->count; ++i) + { + vkd3d_string_buffer_cleanup(cache->buffers[i]); + vkd3d_free(cache->buffers[i]); + } + vkd3d_free(cache->buffers); + vkd3d_string_buffer_cache_init(cache); +} + +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *cache) +{ + struct vkd3d_string_buffer *buffer; + + if (!cache->count) + { + if (!vkd3d_array_reserve((void **)&cache->buffers, &cache->capacity, + cache->max_count + 1, sizeof(*cache->buffers))) + return NULL; + ++cache->max_count; + + 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 + { + buffer = cache->buffers[--cache->count]; + } + vkd3d_string_buffer_clear(buffer); + return buffer; +} + +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *cache, struct vkd3d_string_buffer *buffer) +{ + if (!buffer) + return; + assert(cache->count + 1 <= cache->max_count); + cache->buffers[cache->count++] = buffer; +} + void vkd3d_shader_message_context_init(struct vkd3d_shader_message_context *context, enum vkd3d_shader_log_level log_level) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e837dbcd..cf66c67a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -870,12 +870,23 @@ struct vkd3d_string_buffer unsigned int content_size; }; +struct vkd3d_string_buffer_cache +{ + struct vkd3d_string_buffer **buffers; + size_t count, max_count, capacity; +}; + enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list) DECLSPEC_HIDDEN; int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) VKD3D_PRINTF_FUNC(2, 3) DECLSPEC_HIDDEN; +void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *list, + struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; #define vkd3d_string_buffer_trace(buffer) \ vkd3d_string_buffer_trace_(buffer, __FUNCTION__) void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function) DECLSPEC_HIDDEN; -- 2.30.1

3 17

[PATCH 1/1] msvcrt: Null widechar pointer when wcsrtombs_l() is successful.
by Bernhard Kölbl March 2, 2021

March 2, 2021

Mimic how the function works on Windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50698 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/msvcrt/wcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9a30e0fe149..7c8f50891cc 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -610,6 +610,7 @@ static size_t wcsrtombs_l(char *mbstr, const wchar_t **wcstr, mbstr[i] = (*wcstr)[i]; if(!(*wcstr)[i]) break; } + *wcstr = NULL; return i; } @@ -645,8 +646,9 @@ static size_t wcsrtombs_l(char *mbstr, const wchar_t **wcstr, if(tmp < count) { mbstr[tmp] = '\0'; - *wcstr = NULL; } + + *wcstr = NULL; return tmp; } -- 2.30.1

3 2

[PATCH v2] msvcrt: Update source pointer in wcsrtombs in C locale.
by Piotr Caban March 2, 2021

March 2, 2021

From: Bernhard Kölbl <besentv(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50698 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 16 ++++++++++++++++ dlls/msvcrt/wcs.c | 3 +++ 2 files changed, 19 insertions(+)

1 0

[PATCH 1/5] wbemdisp: Iterate properties and methods once when collecting supported member names.
by Nikolay Sivov March 2, 2021

March 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wbemdisp/locator.c | 82 ++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index 867a19c1ab2..deef4d83fb8 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -1059,50 +1059,52 @@ static HRESULT WINAPI object_GetTypeInfo( return E_NOTIMPL; } +static BOOL object_reserve_member( struct object *object, unsigned int count, unsigned int *capacity ) +{ + unsigned int new_capacity, max_capacity; + struct member *new_members; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~0u / sizeof(*object->members); + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_members = heap_realloc( object->members, new_capacity * sizeof(*new_members) ))) + return FALSE; + + object->members = new_members; + *capacity = new_capacity; + + return TRUE; +} + static HRESULT init_members( struct object *object ) { IWbemClassObject *sig_in, *sig_out; - LONG i = 0, count = 0; - BSTR name; + unsigned int i, capacity = 0, count = 0; HRESULT hr; + BSTR name; if (object->members) return S_OK; - hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); - if (SUCCEEDED( hr )) - { - while (IWbemClassObject_Next( object->object, 0, NULL, NULL, NULL, NULL ) == S_OK) count++; - IWbemClassObject_EndEnumeration( object->object ); - } - - hr = IWbemClassObject_BeginMethodEnumeration( object->object, 0 ); - if (SUCCEEDED( hr )) - { - while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK) - { - count++; - SysFreeString( name ); - if (sig_in) IWbemClassObject_Release( sig_in ); - if (sig_out) IWbemClassObject_Release( sig_out ); - } - IWbemClassObject_EndMethodEnumeration( object->object ); - } - - if (!(object->members = heap_alloc( sizeof(struct member) * count ))) return E_OUTOFMEMORY; - hr = IWbemClassObject_BeginEnumeration( object->object, 0 ); if (SUCCEEDED( hr )) { while (IWbemClassObject_Next( object->object, 0, &name, NULL, NULL, NULL ) == S_OK) { - object->members[i].name = name; - object->members[i].is_method = FALSE; - object->members[i].dispid = 0; - if (++i > count) - { - IWbemClassObject_EndEnumeration( object->object ); - goto error; - } + if (!object_reserve_member( object, count + 1, &capacity )) goto error; + object->members[count].name = name; + object->members[count].is_method = FALSE; + object->members[count].dispid = 0; + count++; TRACE( "added property %s\n", debugstr_w(name) ); } IWbemClassObject_EndEnumeration( object->object ); @@ -1113,14 +1115,11 @@ static HRESULT init_members( struct object *object ) { while (IWbemClassObject_NextMethod( object->object, 0, &name, &sig_in, &sig_out ) == S_OK) { - object->members[i].name = name; - object->members[i].is_method = TRUE; - object->members[i].dispid = 0; - if (++i > count) - { - IWbemClassObject_EndMethodEnumeration( object->object ); - goto error; - } + if (!object_reserve_member( object, count + 1, &capacity )) goto error; + object->members[count].name = name; + object->members[count].is_method = TRUE; + object->members[count].dispid = 0; + count++; if (sig_in) IWbemClassObject_Release( sig_in ); if (sig_out) IWbemClassObject_Release( sig_out ); TRACE( "added method %s\n", debugstr_w(name) ); @@ -1133,7 +1132,8 @@ static HRESULT init_members( struct object *object ) return S_OK; error: - for (--i; i >= 0; i--) SysFreeString( object->members[i].name ); + for (i = 0; i < count; ++i) + SysFreeString( object->members[i].name ); heap_free( object->members ); object->members = NULL; object->nb_members = 0; -- 2.30.1

3 14

[PATCH] oleaut32: Fix Var*FromDec() prototypes.
by Nikolay Sivov March 2, 2021

March 2, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/vartype.c | 26 +++++++++++++------------- include/oleauto.h | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 90b3fcaa1a9..06bc70e0a89 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -517,7 +517,7 @@ HRESULT WINAPI VarI1FromUI4(ULONG ulIn, signed char* pcOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI1FromDec(DECIMAL *pdecIn, signed char* pcOut) +HRESULT WINAPI VarI1FromDec(const DECIMAL *pdecIn, signed char* pcOut) { LONG64 i64; HRESULT hRet; @@ -828,7 +828,7 @@ HRESULT WINAPI VarUI1FromUI4(ULONG ulIn, BYTE* pbOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI1FromDec(DECIMAL *pdecIn, BYTE* pbOut) +HRESULT WINAPI VarUI1FromDec(const DECIMAL *pdecIn, BYTE* pbOut) { LONG64 i64; HRESULT hRet; @@ -1125,7 +1125,7 @@ HRESULT WINAPI VarI2FromUI4(ULONG ulIn, SHORT* psOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI2FromDec(DECIMAL *pdecIn, SHORT* psOut) +HRESULT WINAPI VarI2FromDec(const DECIMAL *pdecIn, SHORT* psOut) { LONG64 i64; HRESULT hRet; @@ -1422,7 +1422,7 @@ HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT* pusOut) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI2FromDec(DECIMAL *pdecIn, USHORT* pusOut) +HRESULT WINAPI VarUI2FromDec(const DECIMAL *pdecIn, USHORT* pusOut) { LONG64 i64; HRESULT hRet; @@ -1714,7 +1714,7 @@ HRESULT WINAPI VarI4FromUI4(ULONG ulIn, LONG *piOut) * Failure: E_INVALIDARG, if pdecIn is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI4FromDec(DECIMAL *pdecIn, LONG *piOut) +HRESULT WINAPI VarI4FromDec(const DECIMAL *pdecIn, LONG *piOut) { LONG64 i64; HRESULT hRet; @@ -2006,7 +2006,7 @@ HRESULT WINAPI VarUI4FromUI2(USHORT usIn, ULONG *pulOut) * Failure: E_INVALIDARG, if pdecIn is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarUI4FromDec(DECIMAL *pdecIn, ULONG *pulOut) +HRESULT WINAPI VarUI4FromDec(const DECIMAL *pdecIn, ULONG *pulOut) { LONG64 i64; HRESULT hRet; @@ -2329,7 +2329,7 @@ HRESULT WINAPI VarI8FromUI4(ULONG ulIn, LONG64* pi64Out) * Failure: E_INVALIDARG, if the source value is invalid * DISP_E_OVERFLOW, if the value will not fit in the destination */ -HRESULT WINAPI VarI8FromDec(DECIMAL *pdecIn, LONG64* pi64Out) +HRESULT WINAPI VarI8FromDec(const DECIMAL *pdecIn, LONG64* pi64Out) { if (!DEC_SCALE(pdecIn)) { @@ -2664,7 +2664,7 @@ HRESULT WINAPI VarUI8FromUI4(ULONG ulIn, ULONG64* pui64Out) * with DISP_E_OVERFLOW. This bug has been fixed in Wine's implementation * (use VarAbs() on pDecIn first if you really want this behaviour). */ -HRESULT WINAPI VarUI8FromDec(DECIMAL *pdecIn, ULONG64* pui64Out) +HRESULT WINAPI VarUI8FromDec(const DECIMAL *pdecIn, ULONG64* pui64Out) { if (!DEC_SCALE(pdecIn)) { @@ -2940,7 +2940,7 @@ HRESULT WINAPI VarR4FromUI4(ULONG ulIn, float *pFltOut) * Success: S_OK. * Failure: E_INVALIDARG, if the source value is invalid. */ -HRESULT WINAPI VarR4FromDec(DECIMAL* pDecIn, float *pFltOut) +HRESULT WINAPI VarR4FromDec(const DECIMAL* pDecIn, float *pFltOut) { BYTE scale = DEC_SCALE(pDecIn); double divisor = 1.0; @@ -3698,7 +3698,7 @@ HRESULT WINAPI VarCyFromUI4(ULONG ulIn, CY* pCyOut) * DISP_E_OVERFLOW, if the value will not fit in the destination * DISP_E_TYPEMISMATCH, if the type cannot be converted */ -HRESULT WINAPI VarCyFromDec(DECIMAL* pdecIn, CY* pCyOut) +HRESULT WINAPI VarCyFromDec(const DECIMAL* pdecIn, CY* pCyOut) { DECIMAL rounded; HRESULT hRet; @@ -6269,7 +6269,7 @@ HRESULT WINAPI VarBoolFromUI4(ULONG ulIn, VARIANT_BOOL *pBoolOut) * Success: S_OK. * Failure: E_INVALIDARG, if pDecIn is invalid. */ -HRESULT WINAPI VarBoolFromDec(DECIMAL* pDecIn, VARIANT_BOOL *pBoolOut) +HRESULT WINAPI VarBoolFromDec(const DECIMAL* pDecIn, VARIANT_BOOL *pBoolOut) { if (DEC_SCALE(pDecIn) > DEC_MAX_SCALE || (DEC_SIGN(pDecIn) & ~DECIMAL_NEG)) return E_INVALIDARG; @@ -6984,7 +6984,7 @@ HRESULT WINAPI VarBstrFromUI4(ULONG ulIn, LCID lcid, ULONG dwFlags, BSTR* pbstrO * Failure: E_INVALIDARG, if pbstrOut is invalid. * E_OUTOFMEMORY, if memory allocation fails. */ -HRESULT WINAPI VarBstrFromDec(DECIMAL* pDecIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) +HRESULT WINAPI VarBstrFromDec(const DECIMAL* pDecIn, LCID lcid, ULONG dwFlags, BSTR* pbstrOut) { WCHAR buff[256]; VARIANT_DI temp; @@ -7998,7 +7998,7 @@ HRESULT WINAPI VarDateFromUI4(ULONG ulIn, DATE* pdateOut) * RETURNS * S_OK. */ -HRESULT WINAPI VarDateFromDec(DECIMAL *pdecIn, DATE* pdateOut) +HRESULT WINAPI VarDateFromDec(const DECIMAL *pdecIn, DATE* pdateOut) { return VarR8FromDec(pdecIn, pdateOut); } diff --git a/include/oleauto.h b/include/oleauto.h index 45edfbb84af..f00bfa0c7f8 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -239,7 +239,7 @@ HRESULT WINAPI VarUI1FromUI4(ULONG,BYTE*); HRESULT WINAPI VarUI1FromUI8(ULONG64,BYTE*); HRESULT WINAPI VarUI1FromStr(OLECHAR*,LCID,ULONG,BYTE*); HRESULT WINAPI VarUI1FromCy(CY,BYTE*); -HRESULT WINAPI VarUI1FromDec(DECIMAL*,BYTE*); +HRESULT WINAPI VarUI1FromDec(const DECIMAL*,BYTE*); HRESULT WINAPI VarUI1FromDisp(IDispatch*,LCID,BYTE*); HRESULT WINAPI VarI2FromUI1(BYTE,SHORT*); @@ -255,7 +255,7 @@ HRESULT WINAPI VarI2FromUI4(ULONG,SHORT*); HRESULT WINAPI VarI2FromUI8(ULONG64,SHORT*); HRESULT WINAPI VarI2FromStr(OLECHAR*,LCID,ULONG,SHORT*); HRESULT WINAPI VarI2FromCy(CY,SHORT*); -HRESULT WINAPI VarI2FromDec(DECIMAL*,SHORT*); +HRESULT WINAPI VarI2FromDec(const DECIMAL*,SHORT*); HRESULT WINAPI VarI2FromDisp(IDispatch*,LCID,SHORT*); HRESULT WINAPI VarI4FromUI1(BYTE,LONG*); @@ -271,7 +271,7 @@ HRESULT WINAPI VarI4FromUI4(ULONG,LONG*); HRESULT WINAPI VarI4FromUI8(ULONG64,LONG*); HRESULT WINAPI VarI4FromStr(OLECHAR*,LCID,ULONG,LONG*); HRESULT WINAPI VarI4FromCy(CY,LONG*); -HRESULT WINAPI VarI4FromDec(DECIMAL*,LONG*); +HRESULT WINAPI VarI4FromDec(const DECIMAL*,LONG*); HRESULT WINAPI VarI4FromDisp(IDispatch*,LCID,LONG*); HRESULT WINAPI VarI8FromUI1(BYTE,LONG64*); @@ -286,7 +286,7 @@ HRESULT WINAPI VarI8FromI1(signed char,LONG64*); HRESULT WINAPI VarI8FromUI2(USHORT,LONG64*); HRESULT WINAPI VarI8FromUI4(ULONG,LONG64*); HRESULT WINAPI VarI8FromUI8(ULONG64,LONG64*); -HRESULT WINAPI VarI8FromDec(DECIMAL *pdecIn,LONG64*); +HRESULT WINAPI VarI8FromDec(const DECIMAL *pdecIn,LONG64*); HRESULT WINAPI VarI8FromInt(INT intIn,LONG64*); HRESULT WINAPI VarI8FromCy(CY,LONG64*); HRESULT WINAPI VarI8FromDisp(IDispatch*,LCID,LONG64*); @@ -304,7 +304,7 @@ HRESULT WINAPI VarR4FromUI4(ULONG,FLOAT*); HRESULT WINAPI VarR4FromUI8(ULONG64,FLOAT*); HRESULT WINAPI VarR4FromStr(OLECHAR*,LCID,ULONG,FLOAT*); HRESULT WINAPI VarR4FromCy(CY,FLOAT*); -HRESULT WINAPI VarR4FromDec(DECIMAL*,FLOAT*); +HRESULT WINAPI VarR4FromDec(const DECIMAL*,FLOAT*); HRESULT WINAPI VarR4FromDisp(IDispatch*,LCID,FLOAT*); HRESULT WINAPI VarR8FromUI1(BYTE,double*); @@ -336,7 +336,7 @@ HRESULT WINAPI VarDateFromUI4(ULONG,DATE*); HRESULT WINAPI VarDateFromUI8(ULONG64,DATE*); HRESULT WINAPI VarDateFromBool(VARIANT_BOOL,DATE*); HRESULT WINAPI VarDateFromCy(CY,DATE*); -HRESULT WINAPI VarDateFromDec(DECIMAL*,DATE*); +HRESULT WINAPI VarDateFromDec(const DECIMAL*,DATE*); HRESULT WINAPI VarDateFromDisp(IDispatch*,LCID,DATE*); HRESULT WINAPI VarCyFromUI1(BYTE,CY*); @@ -352,7 +352,7 @@ HRESULT WINAPI VarCyFromI1(signed char,CY*); HRESULT WINAPI VarCyFromUI2(USHORT,CY*); HRESULT WINAPI VarCyFromUI4(ULONG,CY*); HRESULT WINAPI VarCyFromUI8(ULONG64,CY*); -HRESULT WINAPI VarCyFromDec(DECIMAL*,CY*); +HRESULT WINAPI VarCyFromDec(const DECIMAL*,CY*); HRESULT WINAPI VarCyFromDisp(IDispatch*,LCID,CY*); HRESULT WINAPI VarBstrFromUI1(BYTE,LCID,ULONG,BSTR*); @@ -368,7 +368,7 @@ HRESULT WINAPI VarBstrFromUI2(USHORT,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromUI8(ULONG64,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromUI4(ULONG,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromCy(CY,LCID,ULONG,BSTR*); -HRESULT WINAPI VarBstrFromDec(DECIMAL*,LCID,ULONG,BSTR*); +HRESULT WINAPI VarBstrFromDec(const DECIMAL*,LCID,ULONG,BSTR*); HRESULT WINAPI VarBstrFromDisp(IDispatch*,LCID,ULONG,BSTR*); HRESULT WINAPI VarBoolFromUI1(BYTE,VARIANT_BOOL*); @@ -384,7 +384,7 @@ HRESULT WINAPI VarBoolFromUI2(USHORT,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI4(ULONG,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromUI8(ULONG64,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromCy(CY,VARIANT_BOOL*); -HRESULT WINAPI VarBoolFromDec(DECIMAL*,VARIANT_BOOL*); +HRESULT WINAPI VarBoolFromDec(const DECIMAL*,VARIANT_BOOL*); HRESULT WINAPI VarBoolFromDisp(IDispatch*,LCID,VARIANT_BOOL*); HRESULT WINAPI VarI1FromUI1(BYTE,signed char*); @@ -400,7 +400,7 @@ HRESULT WINAPI VarI1FromUI2(USHORT,signed char*); HRESULT WINAPI VarI1FromUI4(ULONG,signed char*); HRESULT WINAPI VarI1FromUI8(ULONG64,signed char*); HRESULT WINAPI VarI1FromCy(CY,signed char*); -HRESULT WINAPI VarI1FromDec(DECIMAL*,signed char*); +HRESULT WINAPI VarI1FromDec(const DECIMAL*,signed char*); HRESULT WINAPI VarI1FromDisp(IDispatch*,LCID,signed char*); HRESULT WINAPI VarUI2FromUI1(BYTE,USHORT*); @@ -416,7 +416,7 @@ HRESULT WINAPI VarUI2FromI1(signed char,USHORT*); HRESULT WINAPI VarUI2FromUI4(ULONG,USHORT*); HRESULT WINAPI VarUI2FromUI8(ULONG64,USHORT*); HRESULT WINAPI VarUI2FromCy(CY,USHORT*); -HRESULT WINAPI VarUI2FromDec(DECIMAL*,USHORT*); +HRESULT WINAPI VarUI2FromDec(const DECIMAL*,USHORT*); HRESULT WINAPI VarUI2FromDisp(IDispatch*,LCID,USHORT*); HRESULT WINAPI VarUI4FromStr(OLECHAR*,LCID,ULONG,ULONG*); @@ -432,7 +432,7 @@ HRESULT WINAPI VarUI4FromI1(signed char,ULONG*); HRESULT WINAPI VarUI4FromUI2(USHORT,ULONG*); HRESULT WINAPI VarUI4FromUI8(ULONG64,ULONG*); HRESULT WINAPI VarUI4FromCy(CY,ULONG*); -HRESULT WINAPI VarUI4FromDec(DECIMAL*,ULONG*); +HRESULT WINAPI VarUI4FromDec(const DECIMAL*,ULONG*); HRESULT WINAPI VarUI4FromDisp(IDispatch*,LCID,ULONG*); HRESULT WINAPI VarUI8FromUI1(BYTE,ULONG64*); @@ -447,7 +447,7 @@ HRESULT WINAPI VarUI8FromBool(VARIANT_BOOL,ULONG64*); HRESULT WINAPI VarUI8FromI1(signed char,ULONG64*); HRESULT WINAPI VarUI8FromUI2(USHORT,ULONG64*); HRESULT WINAPI VarUI8FromUI4(ULONG,ULONG64*); -HRESULT WINAPI VarUI8FromDec(DECIMAL*,ULONG64*); +HRESULT WINAPI VarUI8FromDec(const DECIMAL*,ULONG64*); HRESULT WINAPI VarUI8FromInt(INT,ULONG64*); HRESULT WINAPI VarUI8FromCy(CY,ULONG64*); HRESULT WINAPI VarUI8FromDisp(IDispatch*,LCID,ULONG64*); -- 2.30.1

2 1

[PATCH 2/5] comctl32/button: Use themed painting when possible for handling WM_SETTEXT.
by Zhiyi Zhang March 2, 2021

March 2, 2021

Fix an issue that themed buttons are drawn unthemed after receiving a WM_SETTEXT message. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 2 ++ dlls/comctl32/tests/button.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 0dcbb38d202..b5a9ee7f7f6 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -743,6 +743,8 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam ); if (btn_type == BS_GROUPBOX) /* Yes, only for BS_GROUPBOX */ InvalidateRect( hWnd, NULL, TRUE ); + else if (GetWindowTheme( hWnd )) + RedrawWindow( hWnd, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW ); else paint_button( infoPtr, btn_type, ODA_DRAWENTIRE ); return 1; /* success. FIXME: check text length */ diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index b5e145077e7..f30e9f665e5 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -2359,8 +2359,7 @@ static void test_visual(void) SelectObject(mem_dc2, mem_bitmap2); BitBlt(mem_dc2, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); - todo_wine_if(type == BS_PUSHBOX || (is_theme_active && !(type == BS_OWNERDRAW - || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK))) + todo_wine_if(type == BS_PUSHBOX || (is_theme_active && type == BS_GROUPBOX)) ok(equal_dc(mem_dc1, mem_dc2, width, height), "Type %#x: Expected content unchanged.\n", type); DeleteObject(mem_bitmap2); -- 2.27.0

2 1

[PATCH 1/5] comctl32/tests: Test themed painting after a WM_SETTEXT message.
by Zhiyi Zhang March 2, 2021

March 2, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 82 ++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 93b6ddcec36..b5e145077e7 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -29,6 +29,8 @@ #define IS_WNDPROC_HANDLE(x) (((ULONG_PTR)(x) >> 16) == (~0u >> 16)) +static BOOL is_theme_active; + static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); @@ -118,6 +120,22 @@ static BOOL ignore_message( UINT message ) message == WM_GETTEXT); } +static BOOL equal_dc(HDC hdc1, HDC hdc2, int width, int height) +{ + int x, y; + + for (x = 0; x < width; ++x) + { + for (y = 0; y < height; ++y) + { + if (GetPixel(hdc1, x, y) != GetPixel(hdc2, x, y)) + return FALSE; + } + } + + return TRUE; +} + static LRESULT CALLBACK button_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, UINT_PTR id, DWORD_PTR ref_data) { static LONG defwndproc_counter = 0; @@ -2304,14 +2322,77 @@ static void test_style(void) } } +static void test_visual(void) +{ + HBITMAP mem_bitmap1, mem_bitmap2; + HDC mem_dc1, mem_dc2, button_dc; + HWND button, parent; + int width, height; + DWORD type; + RECT rect; + + parent = CreateWindowA("TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, + 100, 200, 200, 0, 0, 0, NULL); + ok(!!parent, "Failed to create the parent window.\n"); + for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; ++type) + { + /* Use WS_DISABLED to avoid glowing animations on Vista and Win7 */ + button = create_button(type | WS_VISIBLE | WS_DISABLED, parent); + flush_events(); + + button_dc = GetDC(button); + GetClientRect(button, &rect); + width = rect.right - rect.left; + height = rect.bottom - rect.top; + + mem_dc1 = CreateCompatibleDC(button_dc); + mem_bitmap1 = CreateCompatibleBitmap(button_dc, width, height); + SelectObject(mem_dc1, mem_bitmap1); + BitBlt(mem_dc1, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); + + /* Send WM_SETTEXT with the same window name */ + SendMessageA(button, WM_SETTEXT, 0, (LPARAM)"test"); + flush_events(); + + mem_dc2 = CreateCompatibleDC(button_dc); + mem_bitmap2 = CreateCompatibleBitmap(button_dc, width, height); + SelectObject(mem_dc2, mem_bitmap2); + BitBlt(mem_dc2, 0, 0, width, height, button_dc, 0, 0, SRCCOPY); + + todo_wine_if(type == BS_PUSHBOX || (is_theme_active && !(type == BS_OWNERDRAW + || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK))) + ok(equal_dc(mem_dc1, mem_dc2, width, height), "Type %#x: Expected content unchanged.\n", type); + + DeleteObject(mem_bitmap2); + DeleteObject(mem_bitmap1); + DeleteDC(mem_dc2); + DeleteDC(mem_dc1); + ReleaseDC(button, button_dc); + DestroyWindow(button); + } + + DestroyWindow(parent); +} + START_TEST(button) { + BOOL (WINAPI * pIsThemeActive)(VOID); ULONG_PTR ctx_cookie; + HMODULE uxtheme; HANDLE hCtx; if (!load_v6_module(&ctx_cookie, &hCtx)) return; + uxtheme = LoadLibraryA("uxtheme.dll"); + if (uxtheme) + { + pIsThemeActive = (void*)GetProcAddress(uxtheme, "IsThemeActive"); + if (pIsThemeActive) + is_theme_active = pIsThemeActive(); + FreeLibrary(uxtheme); + } + register_parent_class(); init_functions(); @@ -2327,6 +2408,7 @@ START_TEST(button) test_state(); test_bcm_get_ideal_size(); test_style(); + test_visual(); unload_v6_module(ctx_cookie, hCtx); } -- 2.27.0

2 1

[PATCH 5/5] comctl32/edit: Call GetWindowTheme() only when necessary.
by Zhiyi Zhang March 2, 2021

March 2, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/edit.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 05920893c93..639443bc338 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -4597,7 +4597,6 @@ static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es) static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW(hwnd, 0); - HTHEME theme = GetWindowTheme(hwnd); LRESULT result = 0; RECT *rect; @@ -4905,7 +4904,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_ENABLE: es->bEnableState = (BOOL) wParam; EDIT_UpdateText(es, NULL, TRUE); - if (theme) + if (GetWindowTheme(hwnd)) RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); break; @@ -4935,7 +4934,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_KILLFOCUS: - result = EDIT_WM_KillFocus(theme, es); + result = EDIT_WM_KillFocus(GetWindowTheme(hwnd), es); break; case WM_LBUTTONDBLCLK: @@ -4972,7 +4971,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_SETFOCUS: - EDIT_WM_SetFocus(theme, es); + EDIT_WM_SetFocus(GetWindowTheme(hwnd), es); break; case WM_SETFONT: @@ -5096,7 +5095,7 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_THEMECHANGED: - CloseThemeData (theme); + CloseThemeData(GetWindowTheme(hwnd)); OpenThemeData(hwnd, WC_EDITW); break; -- 2.27.0

2 1