June 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : user32/tests: Use wine_dbgstr_rect() in the win tests.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: ea50a4f8d85e961fabf61290d7623bd48c872774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea50a4f8d85e961fabf61290d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 13 11:07:13 2016 +0200 user32/tests: Use wine_dbgstr_rect() in the win tests. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 291 +++++++++++++++++++++--------------------------- 1 file changed, 125 insertions(+), 166 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea50a4f8d85e961fabf61…

1 0

Francois Gouget : msctf: Spelling fix.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 7fabedfadfcfb6fcc95c5dbbae79fc7b844e6b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fabedfadfcfb6fcc95c5dbba… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 13:53:21 2016 +0200 msctf: Spelling fix. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msctf/msctf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index a47f16c..1982e2c 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -388,7 +388,7 @@ static void deactivate_remove_conflicting_ts(REFCLSID catid) list_remove(&ats->entry); HeapFree(GetProcessHeap(),0,ats->ats); HeapFree(GetProcessHeap(),0,ats); - /* we are guarenteeing there is only 1 */ + /* we are guaranteeing there is only 1 */ break; } }

1 0

Jacek Caban : secur32/tests: Don't load advapi32.dll function dynamically.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 60324801241b6138248dc56093e285d35ef0f330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60324801241b6138248dc5609… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 10 18:53:17 2016 +0200 secur32/tests: Don't load advapi32.dll function dynamically. They are available since XP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index f5cfd50..4dc8717 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -47,11 +47,6 @@ static BOOL (WINAPI *pCertFreeCertificateContext)(PCCERT_CONTEXT); static BOOL (WINAPI *pCertSetCertificateContextProperty)(PCCERT_CONTEXT,DWORD,DWORD,const void*); static PCCERT_CONTEXT (WINAPI *pCertEnumCertificatesInStore)(HCERTSTORE,PCCERT_CONTEXT); -static BOOL (WINAPI *pCryptAcquireContextW)(HCRYPTPROV*, LPCWSTR, LPCWSTR, DWORD, DWORD); -static BOOL (WINAPI *pCryptDestroyKey)(HCRYPTKEY); -static BOOL (WINAPI *pCryptImportKey)(HCRYPTPROV,const BYTE*,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*); -static BOOL (WINAPI *pCryptReleaseContext)(HCRYPTPROV,ULONG_PTR); - static const BYTE bigCert[] = { 0x30, 0x7a, 0x02, 0x01, 0x01, 0x30, 0x02, 0x06, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, 0x22, @@ -119,13 +114,10 @@ static CHAR unisp_name_a[] = UNISP_NAME_A; static void InitFunctionPtrs(void) { - HMODULE advapi32dll; - crypt32dll = LoadLibraryA("crypt32.dll"); secdll = LoadLibraryA("secur32.dll"); if(!secdll) secdll = LoadLibraryA("security.dll"); - advapi32dll = LoadLibraryA("advapi32.dll"); #define GET_PROC(h, func) p ## func = (void*)GetProcAddress(h, #func) @@ -143,11 +135,6 @@ static void InitFunctionPtrs(void) GET_PROC(secdll, EncryptMessage); } - GET_PROC(advapi32dll, CryptAcquireContextW); - GET_PROC(advapi32dll, CryptDestroyKey); - GET_PROC(advapi32dll, CryptImportKey); - GET_PROC(advapi32dll, CryptReleaseContext); - GET_PROC(crypt32dll, CertFreeCertificateContext); GET_PROC(crypt32dll, CertSetCertificateContextProperty); GET_PROC(crypt32dll, CertCreateCertificateContext); @@ -338,7 +325,7 @@ static void testAcquireSecurityContext(void) if (!pAcquireCredentialsHandleA || !pCertCreateCertificateContext || !pEnumerateSecurityPackagesA || !pFreeContextBuffer || - !pFreeCredentialsHandle || !pCryptAcquireContextW) + !pFreeCredentialsHandle) { win_skip("Needed functions are not available\n"); return; @@ -378,7 +365,7 @@ static void testAcquireSecurityContext(void) sizeof(selfSignedCert)); SetLastError(0xdeadbeef); - ret = pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { @@ -513,15 +500,13 @@ static void testAcquireSecurityContext(void) "Expected SEC_E_UNKNOWN_CREDENTIALS or SEC_E_INTERNAL_ERROR, got %08x\n", st); } - ret = pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, + ret = CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET); ok(ret, "CryptAcquireContextW failed: %08x\n", GetLastError()); ret = 0; - if (pCryptImportKey) - { - ret = pCryptImportKey(csp, privKey, sizeof(privKey), 0, 0, &key); - ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); - } + + ret = CryptImportKey(csp, privKey, sizeof(privKey), 0, 0, &key); + ok(ret, "CryptImportKey failed: %08x\n", GetLastError()); if (ret) { PCCERT_CONTEXT tmp; @@ -610,14 +595,11 @@ static void testAcquireSecurityContext(void) "Expected SEC_E_UNKNOWN_CREDENTIALS, got %08x\n", st); /* FIXME: what about two valid certs? */ - if (pCryptDestroyKey) - pCryptDestroyKey(key); + CryptDestroyKey(key); } - if (pCryptReleaseContext) - pCryptReleaseContext(csp, 0); - pCryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, - CRYPT_DELETEKEYSET); + CryptReleaseContext(csp, 0); + CryptAcquireContextW(&csp, cspNameW, MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_DELETEKEYSET); if (pCertFreeCertificateContext) {

1 0

Akihiro Sagawa : winegstreamer: Fix a crash in Gstreamer_Mp3_SetMediaType( ).
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 6ea86fae5585e8d0d81d3157c908d752700c58c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ea86fae5585e8d0d81d3157c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jun 12 21:07:50 2016 +0900 winegstreamer: Fix a crash in Gstreamer_Mp3_SetMediaType(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gsttffilter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index cc544d0..401a92f 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -583,7 +583,7 @@ static HRESULT WINAPI Gstreamer_Mp3_SetMediaType(TransformFilter *tf, PIN_DIRECT "channels", G_TYPE_INT, wfx->nChannels, NULL); capsout = gst_caps_new_simple("audio/x-raw", - "format", G_TYPE_STRING, "S16LE" + "format", G_TYPE_STRING, "S16LE", "rate", G_TYPE_INT, wfx->nSamplesPerSec, "channels", G_TYPE_INT, wfx->nChannels, NULL);

1 0

Nikolay Sivov : dwrite: Fix invalid read when building zero length text layout (Valgrind).
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: f1079fe162379d86f5478a77f593e0ed13adfca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1079fe162379d86f5478a77f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 13 16:38:27 2016 +0300 dwrite: Fix invalid read when building zero length text layout (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b95023f..3fcf07a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -727,7 +727,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) free_layout_runs(layout); /* Cluster data arrays are allocated once, assuming one text position per cluster. */ - if (!layout->clustermetrics) { + if (!layout->clustermetrics && layout->len) { layout->clustermetrics = heap_alloc(layout->len*sizeof(*layout->clustermetrics)); layout->clusters = heap_alloc(layout->len*sizeof(*layout->clusters)); if (!layout->clustermetrics || !layout->clusters) { @@ -1694,12 +1694,13 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) layout->metrics.lineCount = 0; origin_x = is_rtl ? layout->metrics.layoutWidth : 0.0f; line = 0; - run = layout->clusters[0].run; memset(&metrics, 0, sizeof(metrics)); layout_splitting_params_from_pos(layout, 0, &params); prev_params = params; + if (layout->cluster_count) + run = layout->clusters[0].run; for (i = 0, start = 0, textpos = 0, width = 0.0f; i < layout->cluster_count; i++) { BOOL overflow;

1 0

Nikolay Sivov : dwrite/tests: Fix some leaks in tests (Valgrind).
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: 96cc50e1d0926857c015aa7b7197c85e794f961c URL: http://source.winehq.org/git/wine.git/?a=commit;h=96cc50e1d0926857c015aa7b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 13 16:38:28 2016 +0300 dwrite/tests: Fix some leaks in tests (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 9b9af6c..ddc63d6 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2090,6 +2090,8 @@ todo_wine ok(metrics[4].isWhitespace == 0, "got %d\n", metrics[4].isWhitespace); ok(metrics[5].isWhitespace == 1, "got %d\n", metrics[5].isWhitespace); + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); @@ -3298,6 +3300,7 @@ static void test_GetLineMetrics(void) ok(metrics[0].isTrimmed == FALSE, "got %d\n", metrics[0].isTrimmed); IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); /* Test line height and baseline calculation */ hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); @@ -3619,6 +3622,8 @@ static void test_SetTextAlignment(void) else win_skip("IDWriteTextFormat1 is not supported\n"); + IDWriteTextLayout_Release(layout); + for (i = 0; i < sizeof(stringsW)/sizeof(stringsW[0]); i++) { FLOAT text_width; @@ -4653,6 +4658,8 @@ static void test_SetLastLineWrapping(void) hr = IDWriteTextLayout2_SetLastLineWrapping(layout2, TRUE); ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout2_Release(layout2); + IDWriteTextFormat1_Release(format1); IDWriteFactory_Release(factory); }

1 0

Henri Verbeet : usp10: Set fZeroWidth when replacing control characters with blanks.
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: acf2d54fb3e35572d85ba5e68f3c262be0404c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf2d54fb3e35572d85ba5e68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 10 00:44:35 2016 +0200 usp10: Set fZeroWidth when replacing control characters with blanks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 2 ++ dlls/usp10/usp10.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0a0ac2d..0e1bd07 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1727,6 +1727,8 @@ static void test_ScriptShape(HDC hdc) ok(glyphs[0] == glyphs2[0] || broken(glyphs2[0] == blanks[j] && (blanks[j] < 0x10)), "%s: [%02x] expected %04x, got %04x\n", lf.lfFaceName, blanks[j], glyphs[0], glyphs2[0]); + ok(attrs[0].fZeroWidth || broken(!attrs[0].fZeroWidth && (blanks[j] < 0x10) /* Vista */), + "%s: [%02x] got unexpected fZeroWidth %#x.\n", lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); } if (oldfont) DeleteObject(SelectObject(hdc, oldfont)); diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 74250ea..52f93ab 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3186,7 +3186,10 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, { if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A || pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C) + { pwOutGlyphs[i] = ((ScriptCache *)*psc)->sfp.wgBlank; + pOutGlyphProps[i].sva.fZeroWidth = 1; + } } } }

1 0

Henri Verbeet : usp10: Don't modify psa-> fNoGlyphIndex in ScriptShapeOpenType().
by Alexandre Julliard 13 Jun '16

13 Jun '16

Module: wine Branch: master Commit: d73f2b02b014776bb61685a3c88f78f2f3add4eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73f2b02b014776bb61685a3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 10 00:44:36 2016 +0200 usp10: Don't modify psa->fNoGlyphIndex in ScriptShapeOpenType(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 4 ++++ dlls/usp10/usp10.c | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0e1bd07..2f5ae9e 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1720,9 +1720,13 @@ static void test_ScriptShape(HDC hdc) hr = ScriptItemize(&blanks[j], 1, 2, NULL, NULL, items, NULL); ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); + ok(!items[0].a.fNoGlyphIndex, "%s: [%02x] got unexpected fNoGlyphIndex %#x.\n", + lf.lfFaceName, blanks[j], items[0].a.fNoGlyphIndex); hr = ScriptShape(hdc, &sc, &blanks[j], 1, 1, &items[0].a, glyphs2, logclust, attrs, &nb); ok(hr == S_OK, "%s: [%02x] expected S_OK, got %08x\n", lf.lfFaceName, blanks[j], hr); ok(nb == 1, "%s: [%02x] expected 1, got %d\n", lf.lfFaceName, blanks[j], nb); + ok(!items[0].a.fNoGlyphIndex, "%s: [%02x] got unexpected fNoGlyphIndex %#x.\n", + lf.lfFaceName, blanks[j], items[0].a.fNoGlyphIndex); ok(glyphs[0] == glyphs2[0] || broken(glyphs2[0] == blanks[j] && (blanks[j] < 0x10)), diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 52f93ab..aaa0824 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3081,10 +3081,6 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, ((ScriptCache *)*psc)->userScript = tagScript; ((ScriptCache *)*psc)->userLang = tagLangSys; - /* set fNoGlyphIndex non truetype/opentype fonts */ - if (psa && !psa->fNoGlyphIndex && !((ScriptCache *)*psc)->sfnt) - psa->fNoGlyphIndex = TRUE; - /* Initialize a SCRIPT_VISATTR and LogClust for each char in this run */ for (i = 0; i < cChars; i++) { @@ -3104,7 +3100,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, pwLogClust[i] = idx; } - if (psa && !psa->fNoGlyphIndex) + if (psa && !psa->fNoGlyphIndex && ((ScriptCache *)*psc)->sfnt) { WCHAR *rChars; if ((hr = SHAPE_CheckFontForRequiredFeatures(hdc, (ScriptCache *)*psc, psa)) != S_OK) return hr;

1 0

Alexandre Julliard : Wine release 1.9.12
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: website Branch: master Commit: e0e59ed792808d49f6f6b6bdcdce5f6edc70970f URL: http://source.winehq.org/git/website.git/?a=commit;h=e0e59ed792808d49f6f6b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 23:05:55 2016 +0900 Wine release 1.9.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2016061001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2016061001.xml b/news/en/2016061001.xml new file mode 100644 index 0000000..24bc807 --- /dev/null +++ b/news/en/2016061001.xml @@ -0,0 +1,17 @@ +<news> +<date>June 10, 2016</date> +<title>Wine 1.9.12 Released</title> +<body> + The Wine development release 1.9.12 is now available. + <a href="{$root}/announce/1.9.12">What's new</a> in this release: +<ul> + <li>Bug fix update of the Mono engine.</li> + <li>Initial version of a taskbar in desktop mode.</li> + <li>Fixes for right-to-left languages in Uniscribe.</li> + <li>More Shader Model 4 support in Direct3D.</li> + <li>Better metafile support in RichEdit.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.12.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.9.12.
by Alexandre Julliard 10 Jun '16

10 Jun '16

Module: wine Branch: master Commit: 50917e283629cbe994f2d7f091ed46ac8b25cda6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50917e283629cbe994f2d7f09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 10 23:04:01 2016 +0900 Release 1.9.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 721 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 339 insertions(+), 405 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50917e283629cbe994f2d…

1 0