December 2018 - Wine-commits

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

14 Dec '18

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 : usp10: Make sure metrics cache is used with glyph indices only.
by Alexandre Julliard 14 Dec '18

14 Dec '18

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: Remove extra parentheses.
by Alexandre Julliard 14 Dec '18

14 Dec '18

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

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

14 Dec '18

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

Zebediah Figura : devenum/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard 13 Dec '18

13 Dec '18

Module: wine Branch: master Commit: 532c986ac5cb93b1f34db3314ad02db7de4532fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=532c986ac5cb93b1f34db331… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 12 21:21:13 2018 -0600 devenum/tests: Fix some memory leaks (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 2a88b48..10ca27a 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -129,6 +129,7 @@ static void test_devenum(IBindCtx *bind_ctx) hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + VariantClear(&var); CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); @@ -137,6 +138,7 @@ static void test_devenum(IBindCtx *bind_ctx) } } + IEnumMoniker_Release(enum_cat); ICreateDevEnum_Release(create_devenum); } @@ -466,6 +468,7 @@ static void test_codec(void) * enumerating them will destroy the key */ ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); + VariantClear(&var); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); @@ -589,6 +592,7 @@ static void test_legacy_filter(void) ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); hr = IFilterMapper_UnregisterFilter(mapper, CLSID_TestFilter); @@ -999,6 +1003,7 @@ static void test_vfw(void) ok(!lstrcmpW(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); }

1 0

Zebediah Figura : mp3dmod: Fix a memory leak (Valgrind).
by Alexandre Julliard 13 Dec '18

13 Dec '18

Module: wine Branch: master Commit: 839a1762cbb5f6389d003d4fcea15c64197bc989 URL: https://source.winehq.org/git/wine.git/?a=commit;h=839a1762cbb5f6389d003d4f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 12 21:27:07 2018 -0600 mp3dmod: Fix a memory leak (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 90bcf66..c9da2b8 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -98,6 +98,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) if (!refcount) { + MoFreeMediaType(&This->outtype); mpg123_delete(This->mh); heap_free(This); }

1 0

Zebediah Figura : ntdll/tests: Fix a memory leak (Valgrind).
by Alexandre Julliard 13 Dec '18

13 Dec '18

Module: wine Branch: master Commit: 1344dcee39315f4f057d53276e5c3d97a5709655 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1344dcee39315f4f057d5327… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 12 21:32:43 2018 -0600 ntdll/tests: Fix a memory leak (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 722ca99..c8a5951 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -517,6 +517,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) if (pRtlDosPathNameToNtPathName_U_WithStatus) { + RtlFreeUnicodeString(&nameW); status = pRtlDosPathNameToNtPathName_U_WithStatus(path, &nameW, &file_part, NULL); ok(status == tests[i].status || status == tests[i].alt_status, "%s: Expected status %#x, got %#x.\n", tests[i].dos, tests[i].status, status);

1 0

Huw Davies : ole32: Don' t free handles that are just copied in the inproc case.
by Alexandre Julliard 13 Dec '18

13 Dec '18

Module: wine Branch: master Commit: 25b136d40080a80c006b89e02708d2e248504a42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25b136d40080a80c006b89e0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 13 09:39:18 2018 +0000 ole32: Don't free handles that are just copied in the inproc case. Based on a patch by Zebediah Figura. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46270 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/usrmarshal.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 772bff5..9f19b66 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2036,11 +2036,29 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char * which the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -void __RPC_USER STGMEDIUM_UserFree(ULONG *pFlags, STGMEDIUM *pStgMedium) +void __RPC_USER STGMEDIUM_UserFree(ULONG *flags, STGMEDIUM *med) { - TRACE("(%s, %p\n", debugstr_user_flags(pFlags), pStgMedium); + TRACE("(%s, %p)\n", debugstr_user_flags(flags), med); - ReleaseStgMedium(pStgMedium); + switch (med->tymed) + { + case TYMED_NULL: + case TYMED_FILE: + case TYMED_ISTREAM: + case TYMED_ISTORAGE: + ReleaseStgMedium(med); + break; + case TYMED_HGLOBAL: + case TYMED_GDI: + case TYMED_MFPICT: + case TYMED_ENHMF: + if (LOWORD(*flags) == MSHCTX_INPROC) + med->tymed = TYMED_NULL; + ReleaseStgMedium(med); + break; + default: + RaiseException(DV_E_TYMED, 0, 0, NULL); + } } ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium)

1 0

Alexandre Julliard : commdlg: Add support for 16-bit file dialog hooks.
by Alexandre Julliard 13 Dec '18

13 Dec '18

Module: wine Branch: master Commit: 59df6651b88456b38ac816de0a07a544aae346e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59df6651b88456b38ac816de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 13 13:39:39 2018 +0100 commdlg: Add support for 16-bit file dialog hooks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/commdlg.dll16/filedlg.c | 408 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 404 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59df6651b88456b38ac8…

1 0

Andrey Gusev : riched20: Remove redundant comparison.
by Alexandre Julliard 13 Dec '18

13 Dec '18

Module: wine Branch: master Commit: ec2c2f9fa0c964a00c97302523321b1d03550a62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2c2f9fa0c964a00c973025… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Dec 12 16:04:12 2018 +0200 riched20: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/para.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 7781ff2..6eec6b5 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -132,9 +132,7 @@ void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) } else if (di->member.para.nCharOfs >= iter->member.para.nCharOfs) { - if (!iter->member.para.next_marked || - (iter->member.para.next_marked && - di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs)) + if (!iter->member.para.next_marked || di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs) { if (iter->member.para.next_marked) {

1 0