April 2015 - Wine-commits - list.winehq.org

Henri Verbeet : d3d9/tests: Release "d3d9ex" after we' re done with it in test_wndproc() (Valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: ca00d72da3d959df1e6a6d619ee19da3f0a7be7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca00d72da3d959df1e6a6d619… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:49 2015 +0200 d3d9/tests: Release "d3d9ex" after we're done with it in test_wndproc() (Valgrind). --- dlls/d3d9/tests/d3d9ex.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 0a7fe90..8048bdc 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2160,10 +2160,11 @@ static void test_wndproc(void) } } + IDirect3D9Ex_Release(d3d9ex); + if (!d3d_width) { skip("Could not find adequate modes, skipping mode tests.\n"); - IDirect3D9Ex_Release(d3d9ex); return; }

1 0

Henri Verbeet : wined3d: Initialize "type.padding" in arbfp_blit_set() ( Valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 8063d4cfcc31bc72ae13e43abd0121a031e61fac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8063d4cfcc31bc72ae13e43ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:50 2015 +0200 wined3d: Initialize "type.padding" in arbfp_blit_set() (Valgrind). --- dlls/wined3d/arb_program_shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 797c204..1507182 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7715,6 +7715,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, } type.fixup = fixup; type.use_color_key = !!color_key; + type.padding = 0; entry = wine_rb_get(&priv->shaders, &type); if (entry)

1 0

Henri Verbeet : wined3d: Introduce a function to compile ARB vertex/ fragment programs.
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: c7780791ea8bfb8355e703563a0573ed87d15f30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7780791ea8bfb8355e703563… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:51 2015 +0200 wined3d: Introduce a function to compile ARB vertex/fragment programs. --- dlls/wined3d/arb_program_shader.c | 188 +++++++++----------------------------- 1 file changed, 41 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7780791ea8bfb8355e70…

1 0

Henri Verbeet : wined3d: Completely initialize "correction_params" in shader_glsl_load_constants() (Valgrind).
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: de1450788b99f8976b1c49b74d352f6a24bb2cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1450788b99f8976b1c49b74… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:52 2015 +0200 wined3d: Completely initialize "correction_params" in shader_glsl_load_constants() (Valgrind). Leaving the last two elements uninitialized is mostly harmless since the shader doesn't actually use them, but the driver might try to do some kind of analysis on them. --- dlls/wined3d/glsl_shader.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b1a0f85..84fc1a2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -944,17 +944,15 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context if (update_mask & WINED3D_SHADER_CONST_PS_Y_CORR) { - float correction_params[4]; - - if (context->render_offscreen) + float correction_params[] = { - correction_params[0] = 0.0f; - correction_params[1] = 1.0f; - } else { /* position is window relative, not viewport relative */ - correction_params[0] = (float) context->current_rt->resource.height; - correction_params[1] = -1.0f; - } + context->render_offscreen ? 0.0f : (float)context->current_rt->resource.height, + context->render_offscreen ? 1.0f : -1.0f, + 0.0f, + 0.0f, + }; + GL_EXTCALL(glUniform4fv(prog->ps.ycorrection_location, 1, correction_params)); }

1 0

Henri Verbeet : wined3d: Slightly simplify get_info_log_line().
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 6e4ad78ff4aa501adb38c5e0a880d4842b7d05a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4ad78ff4aa501adb38c5e0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 21 12:25:53 2015 +0200 wined3d: Slightly simplify get_info_log_line(). --- dlls/wined3d/glsl_shader.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 84fc1a2..655bb33 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -279,11 +279,9 @@ static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, co shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); } -/* Extract a line from the info log. - * Note that this modifies the source string. */ -static char *get_info_log_line(char **ptr) +static const char *get_info_log_line(const char **ptr) { - char *p, *q; + const char *p, *q; p = *ptr; if (!(q = strstr(p, "\n"))) @@ -292,7 +290,6 @@ static char *get_info_log_line(char **ptr) *ptr += strlen(p); return p; } - *q = '\0'; *ptr = q + 1; return p; @@ -316,7 +313,7 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id * that if there are errors. */ if (length > 1) { - char *ptr, *line; + const char *ptr, *line; log = HeapAlloc(GetProcessHeap(), 0, length); /* The info log is supposed to be zero-terminated, but at least some @@ -333,12 +330,12 @@ static void print_glsl_info_log(const struct wined3d_gl_info *gl_info, GLuint id if (gl_info->quirks & WINED3D_QUIRK_INFO_LOG_SPAM) { WARN("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) WARN(" %s\n", line); + while ((line = get_info_log_line(&ptr))) WARN(" %.*s", (int)(ptr - line), line); } else { FIXME("Info log received from GLSL shader #%u:\n", id); - while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); + while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); } HeapFree(GetProcessHeap(), 0, log); } @@ -373,7 +370,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf GL_EXTCALL(glGetAttachedShaders(program, shader_count, NULL, shaders)); for (i = 0; i < shader_count; ++i) { - char *ptr, *line; + const char *ptr, *line; GLint tmp; GL_EXTCALL(glGetShaderiv(shaders[i], GL_SHADER_SOURCE_LENGTH, &tmp)); @@ -401,7 +398,7 @@ static void shader_glsl_dump_program_source(const struct wined3d_gl_info *gl_inf ptr = source; GL_EXTCALL(glGetShaderSource(shaders[i], source_size, NULL, source)); - while ((line = get_info_log_line(&ptr))) FIXME(" %s\n", line); + while ((line = get_info_log_line(&ptr))) FIXME(" %.*s", (int)(ptr - line), line); FIXME("\n"); }

1 0

Nikolay Sivov : dwrite: Added a helper to get source text pointer.
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: e0403efc21dcc550fead30dd2110fe8af7f4e0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0403efc21dcc550fead30dd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 13:36:01 2015 +0300 dwrite: Added a helper to get source text pointer. --- dlls/dwrite/analyzer.c | 87 +++++++++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 32 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5985d2d..02d90db 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -676,19 +676,66 @@ static ULONG WINAPI dwritetextanalyzer_Release(IDWriteTextAnalyzer2 *iface) return 1; } +/* This helper tries to get 'length' chars from a source, allocating a buffer only if source failed to provide enough + data after a first request. */ +static HRESULT get_text_source_ptr(IDWriteTextAnalysisSource *source, UINT32 position, UINT32 length, const WCHAR **text, WCHAR **buff) +{ + HRESULT hr; + UINT32 len; + + *buff = NULL; + *text = NULL; + len = 0; + hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, text, &len); + if (FAILED(hr)) return hr; + + if (len < length) { + UINT32 read; + + *buff = heap_alloc(length*sizeof(WCHAR)); + if (!*buff) + return E_OUTOFMEMORY; + memcpy(*buff, *text, len*sizeof(WCHAR)); + read = len; + + while (read < length && *text) { + *text = NULL; + len = 0; + hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, read, text, &len); + if (FAILED(hr)) { + heap_free(*buff); + return hr; + } + memcpy(*buff + read, *text, min(len, length-read)*sizeof(WCHAR)); + read += len; + } + + *text = *buff; + } + + return hr; +} + static HRESULT WINAPI dwritetextanalyzer_AnalyzeScript(IDWriteTextAnalyzer2 *iface, IDWriteTextAnalysisSource* source, UINT32 position, UINT32 length, IDWriteTextAnalysisSink* sink) { + WCHAR *buff = NULL; const WCHAR *text; HRESULT hr; - UINT32 len; TRACE("(%p %u %u %p)\n", source, position, length, sink); - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, &text, &len); - if (FAILED(hr)) return hr; + if (length == 0) + return S_OK; + + hr = get_text_source_ptr(source, position, length, &text, &buff); + if (FAILED(hr)) + return hr; - return analyze_script(text, len, sink); + hr = analyze_script(text, length, sink); + heap_free(buff); + + return hr; } static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface, @@ -698,7 +745,7 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface UINT8 baselevel, level, explicit_level; WCHAR *buff = NULL; const WCHAR *text; - UINT32 len, pos, i; + UINT32 pos, i; HRESULT hr; TRACE("(%p %u %u %p)\n", source, position, length, sink); @@ -706,33 +753,9 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeBidi(IDWriteTextAnalyzer2 *iface if (length == 0) return S_OK; - /* get some, check for length */ - text = NULL; - len = 0; - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, position, &text, &len); - if (FAILED(hr)) return hr; - - if (len < length) { - UINT32 read; - - buff = heap_alloc(length*sizeof(WCHAR)); - if (!buff) - return E_OUTOFMEMORY; - memcpy(buff, text, len*sizeof(WCHAR)); - read = len; - - while (read < length && text) { - text = NULL; - len = 0; - hr = IDWriteTextAnalysisSource_GetTextAtPosition(source, read, &text, &len); - if (FAILED(hr)) - goto done; - memcpy(&buff[read], text, min(len, length-read)*sizeof(WCHAR)); - read += len; - } - - text = buff; - } + hr = get_text_source_ptr(source, position, length, &text, &buff); + if (FAILED(hr)) + return hr; levels = heap_alloc(length*sizeof(*levels)); explicit = heap_alloc(length*sizeof(*explicit));

1 0

Nikolay Sivov : dwrite: Fix script position reported with SetScriptAnalysis().
by Alexandre Julliard 21 Apr '15

21 Apr '15

Module: wine Branch: master Commit: 0c27e5cd66baa735421d3d34e70310715626f009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c27e5cd66baa735421d3d34e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 21 13:38:09 2015 +0300 dwrite: Fix script position reported with SetScriptAnalysis(). --- dlls/dwrite/analyzer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 02d90db..85681b2 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -204,7 +204,7 @@ static inline UINT16 get_char_script(WCHAR c) return script; } -static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysisSink *sink) +static HRESULT analyze_script(const WCHAR *text, UINT32 position, UINT32 len, IDWriteTextAnalysisSink *sink) { DWRITE_SCRIPT_ANALYSIS sa; UINT32 pos, i, length; @@ -213,7 +213,7 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysis sa.script = get_char_script(*text); - pos = 0; + pos = position; length = 1; for (i = 1; i < len; i++) @@ -233,7 +233,7 @@ static HRESULT analyze_script(const WCHAR *text, UINT32 len, IDWriteTextAnalysis sa.shapes = sa.script != Script_Common ? DWRITE_SCRIPT_SHAPES_DEFAULT : DWRITE_SCRIPT_SHAPES_NO_VISUAL; hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); if (FAILED(hr)) return hr; - pos = i; + pos = position + i; length = 1; sa.script = script; } @@ -732,7 +732,7 @@ static HRESULT WINAPI dwritetextanalyzer_AnalyzeScript(IDWriteTextAnalyzer2 *ifa if (FAILED(hr)) return hr; - hr = analyze_script(text, length, sink); + hr = analyze_script(text, position, length, sink); heap_free(buff); return hr;

1 0

Andrey Gusev : Ukrainian translation for release 1.7.41
by Jeremy Newman 20 Apr '15

20 Apr '15

Module: website Branch: master Commit: fa15d9870746621e9a3ee3bff46a07f34f39c77e URL: http://source.winehq.org/git/website.git/?a=commit;h=fa15d9870746621e9a3ee3… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Apr 17 18:11:21 2015 +0300 Ukrainian translation for release 1.7.41 --- news/uk/2015041701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/uk/2015041701.xml b/news/uk/2015041701.xml new file mode 100644 index 0000000..924f375 --- /dev/null +++ b/news/uk/2015041701.xml @@ -0,0 +1,16 @@ +<news> +<date>17 квітня 2015</date> +<title>Випущено Wine 1.7.41</title> +<body> + Розробницький реліз Wine 1.7.41 наразі доступний. + <a href="{$root}/announce/1.7.41">Що нового</a> в цьому релізі: +<ul> + <li>Більша підтримка Known Folders у Shell.</li> + <li>Більша підтримка для Kernel Job Objects.</li> + <li>Більше вдосконалень для підтримки патчів для MSI.</li> + <li>Деякі виправлення оформлення.</li> + <li>Виправлення різних помилок.</li> +</ul> +Вихідний код <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.41.tar.bz2">вже доступний</a>. +Готові пакунки в процесі створення і в найближчий час будуть доступні у відповідних <a href="{$root}/download">місцях</a>. +</body></news>

1 0

Huw Davies : comctl32: TBSTYLE_EX_MIXEDBUTTONS doesn' t mean buttons should be auto-sized.
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: 5b7b911f0691a866e8639e54a3646b826d9197bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7b911f0691a866e8639e54a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 13:24:17 2015 +0100 comctl32: TBSTYLE_EX_MIXEDBUTTONS doesn't mean buttons should be auto-sized. --- dlls/comctl32/tests/toolbar.c | 52 ++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/toolbar.c | 3 +-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index cdfe7dd..d3088f9 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -748,7 +748,7 @@ static void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right static tbsize_result_t *tbsize_results; -#define tbsize_results_num 24 +#define tbsize_results_num 28 static void init_tbsize_results(void) { int fontheight = system_font_height(); @@ -991,6 +991,18 @@ static void init_tbsize_results(void) { tbsize_results[23] = init_tbsize_result(2, 0, 0, 672, 42, 67, 41); tbsize_addbutton(&tbsize_results[23], 0, 2, 672, 25 + fontheight); tbsize_addbutton(&tbsize_results[23], 0, 25 + fontheight, 672, 48 + 2*fontheight); + + tbsize_results[24] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[24], 0, 2, 11 + string_width(STRING2), 24); + + tbsize_results[25] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[25], 0, 2, 40, 24); + + tbsize_results[26] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[26], 0, 2, 40, 24); + + tbsize_results[27] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[27], 0, 2, 40, 24); } static void free_tbsize_results(void) { @@ -1062,6 +1074,11 @@ static TBBUTTON buttons3[] = { {0, 32, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, 1}, {0, 33, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2} }; +static TBBUTTON buttons4[] = { + {0, 40, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2}, + {0, 41, TBSTATE_ENABLED, 0, {0, }, 0, (UINT_PTR)STRING2}, + {0, 41, TBSTATE_ENABLED, BTNS_SHOWTEXT, {0, }, 0, (UINT_PTR)STRING2} +}; static void test_sizes(void) { @@ -1300,8 +1317,41 @@ static void test_sizes(void) { tbinfo.dwMask = TBIF_SIZE; ok(SendMessageA(hToolbar, TB_SETBUTTONINFOA, 33, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFOA failed\n"); + tbsize_numtests++; } + /* Single BTNS_AUTOSIZE button with string. */ + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[0]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE button with string. */ + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ + rebuild_toolbar(&hToolbar); + SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE, BTNS_SHOWTEXT button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ + rebuild_toolbar(&hToolbar); + SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[2]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + free_tbsize_results(); DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a329c26..7727ee2 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1689,8 +1689,7 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) { if (btnPtr->cx) cx = btnPtr->cx; - else if ((infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || - (btnPtr->fsStyle & BTNS_AUTOSIZE)) + else if (btnPtr->fsStyle & BTNS_AUTOSIZE) { SIZE sz; HDC hdc;

1 0

Huw Davies : comctl32: Invalidate the toolbar if the button size is changed.
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: 60e305d983be66f923ffd793e7635d460e5d87fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e305d983be66f923ffd793e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 13:24:18 2015 +0100 comctl32: Invalidate the toolbar if the button size is changed. --- dlls/comctl32/toolbar.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 7727ee2..83cb674 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4364,6 +4364,7 @@ static LRESULT TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam) { INT cx = (short)LOWORD(lParam), cy = (short)HIWORD(lParam); + int top = default_top_margin(infoPtr); if ((cx < 0) || (cy < 0)) { @@ -4386,15 +4387,20 @@ TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam) */ if (cx == 0) cx = 24; if (cy == 0) cy = 22; - + cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth); cy = max(cy, infoPtr->szPadding.cy + infoPtr->nBitmapHeight); - infoPtr->nButtonWidth = cx; - infoPtr->nButtonHeight = cy; - - infoPtr->iTopMargin = default_top_margin(infoPtr); - TOOLBAR_LayoutToolbar(infoPtr); + if (cx != infoPtr->nButtonWidth || cy != infoPtr->nButtonHeight || + top != infoPtr->iTopMargin) + { + infoPtr->nButtonWidth = cx; + infoPtr->nButtonHeight = cy; + infoPtr->iTopMargin = top; + + TOOLBAR_LayoutToolbar( infoPtr ); + InvalidateRect( infoPtr->hwndSelf, NULL, TRUE ); + } return TRUE; }

1 0