March 2019 - Wine-Commits - list.winehq.org

Józef Kucia : vkd3d-shader: Check shader visibility for combined samplers.
by Alexandre Julliard March 19, 2019

March 19, 2019

Module: vkd3d Branch: master Commit: 27b4779930d05e308989cb12a5f48a62521e74f0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=27b4779930d05e308989cb1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 19 14:41:00 2019 +0100 vkd3d-shader: Check shader visibility for combined samplers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e13d730..0aa220f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2135,7 +2135,7 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_ return NULL; } -static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_compiler *compiler, +static bool vkd3d_dxbc_compiler_has_combined_sampler(const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; @@ -2152,6 +2152,9 @@ static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_co { combined_sampler = &shader_interface->combined_samplers[i]; + if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, combined_sampler->shader_visibility)) + continue; + if ((!resource || combined_sampler->resource_index == resource->idx[0].offset) && (!sampler || combined_sampler->sampler_index == sampler->idx[0].offset)) return true; @@ -4562,7 +4565,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com uint32_t type_id, ptr_type_id, var_id; struct vkd3d_symbol reg_symbol; - if (vkd3d_dxbc_compiler_have_combined_sampler(compiler, NULL, reg)) + if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, NULL, reg)) return; type_id = vkd3d_spirv_get_op_type_sampler(builder); @@ -4750,7 +4753,7 @@ static void vkd3d_dxbc_compiler_emit_resource_declaration(struct vkd3d_dxbc_comp sampled_type = vkd3d_component_type_from_data_type(resource_data_type); - if (vkd3d_dxbc_compiler_have_combined_sampler(compiler, reg, NULL)) + if (vkd3d_dxbc_compiler_has_combined_sampler(compiler, reg, NULL)) { vkd3d_dxbc_compiler_emit_combined_sampler_declarations(compiler, reg, resource_type, sampled_type, structure_stride, raw, resource_type_info);

1 0

Piotr Caban : kernel32: Restore C locale for LC_CTYPE category.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: c8e195e1797bd513c91927743b3ed38fdfa86c2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8e195e1797bd513c9192774… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 18 20:03:40 2019 +0100 kernel32: Restore C locale for LC_CTYPE category. In tr_TR.UTF-8 locale tolower('I') != 'i' (this is not a bug in glibc, tolower('I') is suppossed to return dotless i that is 2-byte long). Because of that strcasemp("i", "I") returns that the strings are different. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index eedb0be..ed7543e 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -4226,6 +4226,7 @@ void LOCALE_Init(void) mac_cptable->info.codepage, unix_cp ); setlocale(LC_NUMERIC, "C"); /* FIXME: oleaut32 depends on this */ + setlocale(LC_CTYPE, "C"); /* Fixes issues when tr_TR.UTF-8 locale is used */ } static HANDLE NLS_RegOpenKey(HANDLE hRootKey, LPCWSTR szKeyName)

1 0

Louis Lenders : explorerframe: Return S_OK in ITaskbarList3 ThumbBarUpdateButtons method.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: be6a113190edeedd1f95f99cd84851dd311f807e URL: https://source.winehq.org/git/wine.git/?a=commit;h=be6a113190edeedd1f95f99c… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Mar 18 17:42:27 2019 +0100 explorerframe: Return S_OK in ITaskbarList3 ThumbBarUpdateButtons method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45429 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index f029cb5..10ad84b 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -205,9 +205,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarUpdateButtons(ITaskbarList UINT cButtons, LPTHUMBBUTTON pButton) { - FIXME("iface %p, hwnd %p, cButtons %u, pButton %p stub!\n", iface, hwnd, cButtons, pButton); + FIXME("iface %p, hwnd %p, cButtons %u, pButton %p stub, faking success!\n", iface, hwnd, cButtons, pButton); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_ThumbBarSetImageList(ITaskbarList4 *iface,

1 0

Akihiro Sagawa : user32/tests: Skip margin tests if a font for the target charset isn't available.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: bde955f12b0bfeec767825737093a06b54a0a3aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=bde955f12b0bfeec76782573… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 23:55:19 2019 +0900 user32/tests: Skip margin tests if a font for the target charset isn't available. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 00c05fd..326d7ec 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1439,6 +1439,7 @@ static void test_margins_usefontinfo(UINT charset) { HWND hwnd; HDC hdc; + TEXTMETRICW tm; SIZE size; BOOL cjk = FALSE; LOGFONTA lf; @@ -1463,7 +1464,16 @@ static void test_margins_usefontinfo(UINT charset) hdc = GetDC(hwnd); hfont = SelectObject(hdc, hfont); - size.cx = GdiGetCharDimensions( hdc, NULL, &size.cy ); + size.cx = GdiGetCharDimensions( hdc, &tm, &size.cy ); + if ((charset != tm.tmCharSet && charset != DEFAULT_CHARSET) || + !(tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR))) { + skip("%s for charset %d isn't available\n", lf.lfFaceName, charset); + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); + return; + } expect = MAKELONG(size.cx / 2, size.cx / 2); small_expect = 0; empty_expect = size.cx >= 28 ? small_expect : expect;

1 0

Akihiro Sagawa : user32/tests: Tests default margin size with various font face.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 3e61c7127ed7eb764a8b308fd8897cbc26a93a4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e61c7127ed7eb764a8b308f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 23:55:28 2019 +0900 user32/tests: Tests default margin size with various font face. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 71 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 21bd833..b1223a9 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1549,7 +1549,7 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } -static void test_margins_default(UINT charset) +static void test_margins_default(const char* facename, UINT charset) { HWND hwnd; HDC hdc; @@ -1567,7 +1567,7 @@ static void test_margins_default(UINT charset) lf.lfHeight = -11; lf.lfWeight = FW_NORMAL; lf.lfCharSet = charset; - strcpy(lf.lfFaceName, "Tahoma"); + strcpy(lf.lfFaceName, facename); hfont = CreateFontIndirectA(&lf); ok(hfont != NULL, "got %p\n", hfont); @@ -1602,16 +1602,16 @@ static void test_margins_default(UINT charset) SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); else { - ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); } DestroyWindow(hwnd); @@ -1627,22 +1627,39 @@ static void test_margins_default(UINT charset) SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + ok(margins == expect, "%s:%d: got %d, %d\n", facename, charset, HIWORD(margins), LOWORD(margins)); else { - ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + ok(HIWORD(margins) <= HIWORD(expect), "%s:%d: got %d\n", facename, charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%s:%d: got %d\n", facename, charset, LOWORD(margins)); } DestroyWindow(hwnd); DeleteObject(hfont); } +static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) +{ + return 0; +} + +static BOOL is_font_installed(const char*name) +{ + HDC hdc = GetDC(NULL); + BOOL ret = FALSE; + + if (!EnumFontFamiliesA(hdc, name, find_font_proc, 0)) + ret = TRUE; + + ReleaseDC(NULL, hdc); + return ret; +} + static void test_margins(void) { HWND hwEdit; @@ -1718,17 +1735,26 @@ static void test_margins(void) test_margins_usefontinfo(DEFAULT_CHARSET); - test_margins_default(ANSI_CHARSET); - test_margins_default(EASTEUROPE_CHARSET); + test_margins_default("Tahoma", ANSI_CHARSET); + test_margins_default("Tahoma", EASTEUROPE_CHARSET); - test_margins_default(SHIFTJIS_CHARSET); - test_margins_default(HANGUL_CHARSET); - test_margins_default(CHINESEBIG5_CHARSET); -} + test_margins_default("Tahoma", HANGUL_CHARSET); + test_margins_default("Tahoma", CHINESEBIG5_CHARSET); -static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) -{ - return 0; + if (is_font_installed("MS PGothic")) + test_margins_default("MS PGothic", SHIFTJIS_CHARSET); + else + skip("MS PGothic is not available, skipping some margin tests\n"); + + if (is_font_installed("Ume P Gothic")) + test_margins_default("Ume P Gothic", SHIFTJIS_CHARSET); + else + skip("Ume P Gothic is not available, skipping some margin tests\n"); + + if (is_font_installed("SimSun")) + test_margins_default("SimSun", GB2312_CHARSET); + else + skip("SimSun is not available, skipping some margin tests\n"); } static void test_margins_font_change(void) @@ -1737,15 +1763,12 @@ static void test_margins_font_change(void) DWORD margins, font_margins; LOGFONTA lf; HFONT hfont, hfont2; - HDC hdc = GetDC(0); - if(EnumFontFamiliesA(hdc, "Arial", find_font_proc, 0)) + if (!is_font_installed("Arial")) { - trace("Arial not found - skipping font change margin tests\n"); - ReleaseDC(0, hdc); + skip("Arial not found - skipping font change margin tests\n"); return; } - ReleaseDC(0, hdc); hwEdit = create_child_editcontrol(0, 0);

1 0

Akihiro Sagawa : user32/tests: Move the default margin size tests into a separate function.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: c29f5803490db0e807d96e062e04f263ee593f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c29f5803490db0e807d96e06… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 23:55:24 2019 +0900 user32/tests: Move the default margin size tests into a separate function. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 93 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 41ed07a..107f190 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1451,7 +1451,6 @@ static void test_margins_usefontinfo(UINT charset) HDC hdc; TEXTMETRICW tm; SIZE size; - BOOL cjk_charset; LOGFONTA lf; HFONT hfont; RECT rect; @@ -1486,29 +1485,14 @@ static void test_margins_usefontinfo(UINT charset) return; } expect = MAKELONG(size.cx / 2, size.cx / 2); - cjk_charset = is_cjk_charset(hdc); - hfont = SelectObject(hdc, hfont); ReleaseDC(hwnd, hdc); margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); ok(margins == 0, "got %x\n", margins); - SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); - margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); - SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); - margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); - if (!cjk_charset) - ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); - else - { - ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); - ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); - expect = margins; - } + expect = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); DestroyWindow(hwnd); threshold = HIWORD(expect) + LOWORD(expect) + size.cx * 2; @@ -1565,6 +1549,74 @@ static void test_margins_usefontinfo(UINT charset) DeleteObject(hfont); } +static void test_margins_default(UINT charset) +{ + HWND hwnd; + HDC hdc; + TEXTMETRICW tm; + SIZE size; + BOOL cjk_charset; + LOGFONTA lf; + HFONT hfont; + RECT rect; + INT margins, expect; + const UINT small_margins = MAKELONG(1, 5); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -11; + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = charset; + strcpy(lf.lfFaceName, "Tahoma"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "got %p\n", hfont); + + /* Big window rectangle */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + hdc = GetDC(hwnd); + hfont = SelectObject(hdc, hfont); + size.cx = GdiGetCharDimensions( hdc, &tm, &size.cy ); + if ((charset != tm.tmCharSet && charset != DEFAULT_CHARSET) || + !(tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR))) { + skip("%s for charset %d isn't available\n", lf.lfFaceName, charset); + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + DeleteObject(hfont); + return; + } + expect = MAKELONG(size.cx / 2, size.cx / 2); + cjk_charset = is_cjk_charset(hdc); + + hfont = SelectObject(hdc, hfont); + ReleaseDC(hwnd, hdc); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + else + { + ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + } + DestroyWindow(hwnd); + + DeleteObject(hfont); +} + static void test_margins(void) { HWND hwEdit; @@ -1639,6 +1691,13 @@ static void test_margins(void) but not by < Win 8 and Win 10. */ test_margins_usefontinfo(DEFAULT_CHARSET); + + test_margins_default(ANSI_CHARSET); + test_margins_default(EASTEUROPE_CHARSET); + + test_margins_default(SHIFTJIS_CHARSET); + test_margins_default(HANGUL_CHARSET); + test_margins_default(CHINESEBIG5_CHARSET); } static INT CALLBACK find_font_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam)

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to add_param_to_tree( ).
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 62a26e1ad0e18b8de8ac8154cbce6c6f66f2249b URL: https://source.winehq.org/git/wine.git/?a=commit;h=62a26e1ad0e18b8de8ac8154… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:15 2019 +0100 d3dx9: Pass a struct d3dx_effect to add_param_to_tree(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e20c9c5..a45f289 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5072,7 +5072,7 @@ static int param_rb_compare(const void *key, const struct wine_rb_entry *entry) return strcmp(name, param->full_name); } -static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static void add_param_to_tree(struct d3dx_effect *effect, struct d3dx_parameter *param, struct d3dx_parameter *parent, char separator, unsigned int element) { const char *parent_name = parent ? parent->full_name : NULL; @@ -5127,18 +5127,18 @@ static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parame memcpy(param->full_name, param->name, len); } TRACE("Full name is %s.\n", param->full_name); - wine_rb_put(&base->param_tree, param->full_name, &param->rb_entry); + wine_rb_put(&effect->base_effect.param_tree, param->full_name, &param->rb_entry); if (is_top_level_parameter(param)) for (i = 0; i < param->top_level_param->annotation_count; ++i) - add_param_to_tree(base, &param->top_level_param->annotations[i], param, '@', 0); + add_param_to_tree(effect, &param->top_level_param->annotations[i], param, '@', 0); if (param->element_count) for (i = 0; i < param->element_count; ++i) - add_param_to_tree(base, &param->members[i], param, '[', i); + add_param_to_tree(effect, &param->members[i], param, '[', i); else for (i = 0; i < param->member_count; ++i) - add_param_to_tree(base, &param->members[i], param, '.', 0); + add_param_to_tree(effect, &param->members[i], param, '.', 0); } static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx_parameter *param, @@ -6013,7 +6013,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } walk_parameter_tree(&base->parameters[i].param, param_set_top_level_param, &base->parameters[i]); - add_param_to_tree(base, &base->parameters[i].param, NULL, 0, 0); + add_param_to_tree(effect, &base->parameters[i].param, NULL, 0, 0); } }

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to get_annotation_by_name().
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 7738fec56b8d55f006babf4d9fb7a1b79cf363af URL: https://source.winehq.org/git/wine.git/?a=commit;h=7738fec56b8d55f006babf4d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 15 22:39:16 2019 +0100 d3dx9: Pass a struct d3dx_effect to get_annotation_by_name(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a45f289..ae577d0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -854,9 +854,10 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_ef return NULL; } -static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, - unsigned int count, struct d3dx_parameter *annotations, const char *name) +static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, unsigned int count, + struct d3dx_parameter *annotations, const char *name) { + struct d3dx9_base_effect *base = &effect->base_effect; UINT i, length; struct d3dx_parameter *temp_parameter; const char *part; @@ -2251,7 +2252,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D annotation_count = get_annotation_from_object(effect, object, &annotations); - annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); + annotation = get_annotation_by_name(effect, annotation_count, annotations, name); if (annotation) { TRACE("Returning parameter %p\n", annotation);

1 0

Akihiro Sagawa : user32/tests: Add Unicode version tests for Edit control margins.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: 11f059707482e6d26dde3afe8a54f96cc8cc2cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=11f059707482e6d26dde3afe… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 23:55:26 2019 +0900 user32/tests: Add Unicode version tests for Edit control margins. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 107f190..21bd833 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1561,6 +1561,7 @@ static void test_margins_default(UINT charset) RECT rect; INT margins, expect; const UINT small_margins = MAKELONG(1, 5); + const WCHAR EditW[] = {'E','d','i','t',0}, strW[] = {'W',0}; memset(&lf, 0, sizeof(lf)); lf.lfHeight = -11; @@ -1571,8 +1572,8 @@ static void test_margins_default(UINT charset) hfont = CreateFontIndirectA(&lf); ok(hfont != NULL, "got %p\n", hfont); - /* Big window rectangle */ - hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + /* Unicode version */ + hwnd = CreateWindowExW(0, EditW, strW, WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "got %p\n", hwnd); GetClientRect(hwnd, &rect); ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); @@ -1614,6 +1615,31 @@ static void test_margins_default(UINT charset) } DestroyWindow(hwnd); + /* ANSI version */ + hwnd = CreateWindowExA(0, "Edit", "A", WS_POPUP, 0, 0, 5000, 1000, NULL, NULL, NULL, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + GetClientRect(hwnd, &rect); + ok(!IsRectEmpty(&rect), "got rect %s\n", wine_dbgstr_rect(&rect)); + + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + ok(margins == 0, "got %x\n", margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, MAKELPARAM(TRUE, 0)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, small_margins); + SendMessageA(hwnd, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(EC_USEFONTINFO, EC_USEFONTINFO)); + margins = SendMessageA(hwnd, EM_GETMARGINS, 0, 0); + if (!cjk_charset) + ok(margins == expect, "%d: got %d, %d\n", charset, HIWORD(margins), LOWORD(margins)); + else + { + ok(HIWORD(margins) <= HIWORD(expect), "%d: got %d\n", charset, HIWORD(margins)); + ok(LOWORD(margins) <= LOWORD(expect), "%d: got %d\n", charset, LOWORD(margins)); + } + DestroyWindow(hwnd); + DeleteObject(hfont); }

1 0

Matteo Bruni : d3dx9: Avoid double free on effect initialization failure.
by Alexandre Julliard March 18, 2019

March 18, 2019

Module: wine Branch: master Commit: cffe35488dc16414c6938e0f1a0169fb59730c97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cffe35488dc16414c6938e0f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 18 19:58:39 2019 +0100 d3dx9: Avoid double free on effect initialization failure. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 51c7a37..3a8e152 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6303,7 +6303,6 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - d3dx9_base_effect_cleanup(effect); return D3DERR_INVALIDCALL; } }

1 0