December 2018 - Wine-Commits

Tag wine-4.0-rc2 : Alexandre Julliard : Release 4.0-rc2
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: refs/tags/wine-4.0-rc2 Tag: 6340db6f8508df95bffe5e2e7e37d73a7049b76b URL: https://source.winehq.org/git/wine.git/?a=tag;h=6340db6f8508df95bffe5e2e7e3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:55:31 2018 +0100 Release 4.0-rc2

1 0

Dmitry Timoshkov : comctl32/tests: Fix a test failure under Windows 7.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 685a4b5062bf6b8d6c2171aca999a0411ce4b82e URL: https://source.winehq.org/git/wine.git/?a=commit;h=685a4b5062bf6b8d6c2171ac… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 14 14:10:18 2018 +0300 comctl32/tests: Fix a test failure under Windows 7. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 85f339b..5e91a80 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -265,8 +265,7 @@ static void test_LoadIconWithScaleDown(void) /* non-existing filename */ hr = pLoadIconMetric(NULL, nonexisting_fileW, LIM_LARGE, &icon); - todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), + ok(hr == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND) || hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) /* Win7 */, "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); hr = pLoadIconWithScaleDown(NULL, nonexisting_fileW, 32, 32, &icon);

1 0

Alexandre Julliard : winedbg: Fix incorrect pointer casts.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 2a64e751e36d78fdd106c2bb4ddfe471546bf25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a64e751e36d78fdd106c2bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 14 18:20:23 2018 +0100 winedbg: Fix incorrect pointer casts. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_i386.c | 3 +-- programs/winedbg/db_disasm.c | 2 +- programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 3a2b91a..9656244 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -770,8 +770,7 @@ static BOOL be_i386_remove_Xpoint(HANDLE hProcess, const struct be_process_io* p if (size != 0) return FALSE; if (!pio->read(hProcess, addr, &ch, 1, &sz) || sz != 1) return FALSE; if (ch != (unsigned char)0xCC) - WINE_FIXME("Cannot get back %02x instead of 0xCC at %08lx\n", - ch, (unsigned long)addr); + WINE_FIXME("Cannot get back %02x instead of 0xCC at %p\n", ch, addr); ch = (unsigned char)val; if (!pio->write(hProcess, addr, &ch, 1, &sz) || sz != 1) return FALSE; break; diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index f57f009..41b1da2 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -1230,7 +1230,7 @@ static void db_print_address(const char *seg, int size, struct i_addr *addrp, in } else if (!dbg_read_memory(a1, &a2, sizeof(a2))) { dbg_printf("(invalid destination)"); } else { - db_task_printsym((unsigned long)a1, 0); + db_task_printsym((ULONG_PTR)a1, 0); } } else diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index c965759..72c57a2 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -984,7 +984,7 @@ void info_win32_exception(void) dbg_printf(" in 16-bit code (%04x:%04x)", addr.Segment, (unsigned) addr.Offset); break; case AddrMode1632: - dbg_printf(" in segmented 32-bit code (%04x:%08lx)", addr.Segment, (unsigned long) addr.Offset); + dbg_printf(" in segmented 32-bit code (%04x:%08x)", addr.Segment, (unsigned) addr.Offset); break; default: dbg_printf(" bad address"); } diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index f632ca0..5385d0e 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -301,7 +301,7 @@ static void fetch_module_name(void* name_addr, BOOL unicode, void* mod_addr, snprintfW(buffer, bufsz, pcspid, dbg_curr_pid); } else - snprintfW(buffer, bufsz, dlladdr, (unsigned long)mod_addr); + snprintfW(buffer, bufsz, dlladdr, (ULONG_PTR)mod_addr); } }

1 0

Alex Henrie : msvcp90: Turn two static variables into constants.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 551cf701aa350add29f0e6ebf4fefb303f0fb707 URL: https://source.winehq.org/git/wine.git/?a=commit;h=551cf701aa350add29f0e6eb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 3 21:42:55 2018 -0700 msvcp90: Turn two static variables into constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index aa29fb9..0e81b8d 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -112,7 +112,7 @@ static const char str_ETIMEDOUT[] = "connection timed out"; static const char str_ETXTBSY[] = "text file busy"; static const char str_EWOULDBLOCK[] = "operation would block"; -static struct { +static const struct { int err; const char *str; } syserror_map[] = @@ -199,7 +199,7 @@ static struct { #endif #if _MSVCP_VER >= 140 -static struct { +static const struct { int winerr; int doserr; } winerror_map[] =

1 0

Nikolay Sivov : usp10: Remove extra parentheses.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: eda3a3e37da79fcdf97c472f9bbe7406606b4668 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eda3a3e37da79fcdf97c472f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 02:55:39 2018 +0300 usp10: Remove extra parentheses. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index a05de98..abc2605 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3712,7 +3712,7 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB if (!get_cache_glyph_widths(psc, glyph, abc)) { if (!hdc) return E_PENDING; - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE)) + if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) { if (!GetCharABCWidthsI(hdc, 0, 1, &glyph, abc)) return S_FALSE; }

1 0

Dmitry Timoshkov : include: Add _Deref_ret_z_ stub definition.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: bb5dfce475498cdf0bfcff55ee6ee4eb1e3f4d09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb5dfce475498cdf0bfcff55… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Dec 14 08:56:11 2018 +0300 include: Add _Deref_ret_z_ stub definition. Yet another compatibility fix for Visual Studio 12.0. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sal.h b/include/sal.h index c69f7f9..29746c3 100644 --- a/include/sal.h +++ b/include/sal.h @@ -34,6 +34,7 @@ #define _Deref_post_valid_ #define _Deref_post_z_ #define _Deref_prepost_opt_z_ +#define _Deref_ret_z_ #define _Field_range_(min, max)

1 0

Nikolay Sivov : usp10: Make sure metrics cache is used with glyph indices only.
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 8d018d8d1dadf9d731690567b9c98d5a9eae37db URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d018d8d1dadf9d731690567… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 02:55:38 2018 +0300 usp10: Make sure metrics cache is used with glyph indices only. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44410 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index c42b57d..a05de98 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3416,35 +3416,41 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS if (pABC) memset(pABC, 0, sizeof(ABC)); for (i = 0; i < cGlyphs; i++) { + WORD glyph; ABC abc; + + /* FIXME: set to more reasonable values */ + pGoffset[i].du = pGoffset[i].dv = 0; + if (pGlyphProps[i].sva.fZeroWidth) { abc.abcA = abc.abcB = abc.abcC = 0; + if (piAdvance) piAdvance[i] = 0; + continue; + } + + if (psa->fNoGlyphIndex) + { + if (FAILED(hr = ScriptGetCMap(hdc, psc, &pwGlyphs[i], 1, 0, &glyph))) return hr; } - else if (!get_cache_glyph_widths(psc, pwGlyphs[i], &abc)) + else + glyph = pwGlyphs[i]; + + if (!get_cache_glyph_widths(psc, glyph, &abc)) { - BOOL ret; if (!hdc) return E_PENDING; if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) { - if (psa->fNoGlyphIndex) - ret = GetCharABCWidthsW(hdc, pwGlyphs[i], pwGlyphs[i], &abc); - else - ret = GetCharABCWidthsI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &abc); - if (!ret) return S_FALSE; + if (!GetCharABCWidthsI(hdc, glyph, 1, NULL, &abc)) return S_FALSE; } else { INT width; - if (psa->fNoGlyphIndex) - ret = GetCharWidth32W(hdc, pwGlyphs[i], pwGlyphs[i], &width); - else - ret = GetCharWidthI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &width); - if (!ret) return S_FALSE; + if (!GetCharWidthI(hdc, glyph, 1, NULL, &width)) return S_FALSE; abc.abcB = width; abc.abcA = abc.abcC = 0; } - set_cache_glyph_widths(psc, pwGlyphs[i], &abc); + set_cache_glyph_widths(psc, glyph, &abc); } if (pABC) { @@ -3452,8 +3458,6 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS pABC->abcB += abc.abcB; pABC->abcC += abc.abcC; } - /* FIXME: set to more reasonable values */ - pGoffset[i].du = pGoffset[i].dv = 0; if (piAdvance) piAdvance[i] = abc.abcA + abc.abcB + abc.abcC; }

1 0

Nikolay Sivov : usp10: Use glyph index consistently in ScriptGetGlyphABCWidth().
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: d1e618d31da81301e8c954f4c43794f4560db6e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1e618d31da81301e8c954f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 02:55:37 2018 +0300 usp10: Use glyph index consistently in ScriptGetGlyphABCWidth(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 032d074..c42b57d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3715,7 +3715,7 @@ HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, AB else { INT width; - if (!GetCharWidth32W(hdc, glyph, glyph, &width)) return S_FALSE; + if (!GetCharWidthI(hdc, glyph, 1, NULL, &width)) return S_FALSE; abc->abcB = width; abc->abcA = abc->abcC = 0; }

1 0

Nikolay Sivov : shcore: Fix path string leak for file streams (Valgrind).
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 0e966cbf5c72cd953cfe7588c66002da57a005a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e966cbf5c72cd953cfe7588… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:59:07 2018 +0300 shcore: Fix path string leak for file streams (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shcore/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index a544f27..ac625fb 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -839,6 +839,7 @@ static ULONG WINAPI filestream_Release(IStream *iface) if (!refcount) { CloseHandle(stream->u.file.handle); + heap_free(stream->u.file.path); heap_free(stream); }

1 0

Nikolay Sivov : dwrite/tests: Fix some leaks (Valgrind).
by Alexandre Julliard Dec. 14, 2018

Dec. 14, 2018

Module: wine Branch: master Commit: 75b02759b0528ecda05ff4865f6c06dda1ac6410 URL: https://source.winehq.org/git/wine.git/?a=commit;h=75b02759b0528ecda05ff486… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 14 03:05:26 2018 +0300 dwrite/tests: Fix some leaks (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index f752afd..aa1562e 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1778,6 +1778,7 @@ static void test_CreateFontFace(void) UINT32 count; WCHAR *path; HRESULT hr; + ULONG ref; factory = create_factory(); @@ -1864,6 +1865,8 @@ static void test_CreateFontFace(void) IDWriteFont_Release(font); IDWriteFontFamily_Release(family); IDWriteFontCollection_Release(collection); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u.\n", ref); /* IDWriteFactory::CreateFontFace() */ path = create_testfontfile(test_fontfile); @@ -1929,7 +1932,8 @@ todo_wine } IDWriteFontFile_Release(file); - IDWriteFactory_Release(factory); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u.\n", ref); DELETE_FONTFILE(path); } @@ -4873,6 +4877,7 @@ static void test_IsMonospacedFont(void) ULONG ref; factory = create_factory(); + hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -4920,7 +4925,8 @@ static void test_IsMonospacedFont(void) else skip("Courier New font not found.\n"); - ref = IDWriteFontCollection_Release(collection); + IDWriteFontCollection_Release(collection); + ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); }

1 0