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

Henri Verbeet : usp10: Replace zero-width glyphs with 0x20 when psa-> fNoGlyphIndex is set in ScriptShapeOpenType().
by Alexandre Julliard June 13, 2016

June 13, 2016

Module: wine Branch: master Commit: 5098bddf90033fdbfd82e9d3c55a9dd63505eba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5098bddf90033fdbfd82e9d3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 10 00:44:39 2016 +0200 usp10: Replace zero-width glyphs with 0x20 when psa->fNoGlyphIndex is set 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 | 21 ++++++++++++++++----- dlls/usp10/usp10.c | 14 +++++++++++++- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d68b515..bb044ce 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1696,7 +1696,8 @@ static void test_ScriptShape(HDC hdc) for (i = 0; i < 2; i++) { static const WCHAR space[] = {' ', 0}; - static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001c, 0x001d, 0x001e, 0x001f, 0x200e, 0x200f, /* LRM, RLM */ + static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001c, 0x001d, 0x001e, 0x001f, + 0x200b, 0x200c, 0x200d, 0x200e, 0x200f, /* ZWSP, ZWNJ, ZWJ, LRM, RLM */ 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0}; /* LRE, RLE, PDF, LRO, RLO */ HFONT font, oldfont = NULL; LOGFONTA lf; @@ -1740,10 +1741,20 @@ static void test_ScriptShape(HDC hdc) 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(glyphs2[0] == blanks[j], - "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, blanks[j], glyphs2[0]); - ok(!attrs[0].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", - lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); + if (blanks[j] == 0x200b || blanks[j] == 0x200c || blanks[j] == 0x200d) + { + ok(glyphs2[0] == 0x0020, + "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, blanks[j], glyphs2[0]); + ok(attrs[0].fZeroWidth, "%s: [%02x] got unexpected fZeroWidth %#x.\n", + lf.lfFaceName, blanks[j], attrs[0].fZeroWidth); + } + else + { + ok(glyphs2[0] == blanks[j], + "%s: [%02x] got unexpected %04x.\n", lf.lfFaceName, blanks[j], glyphs2[0]); + ok(!attrs[0].fZeroWidth, "%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 7038e8c..f5eba8d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1266,6 +1266,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, { #define Numeric_space 0x0020 +#define ZWSP 0x200B #define ZWNJ 0x200C #define ZWJ 0x200D @@ -3176,8 +3177,19 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, if (rtl) idx = cChars - 1 - i; pwOutGlyphs[i] = pwcChars[idx]; + if (!psa) + continue; + /* overwrite some basic control glyphs to blank */ - if (psa && !psa->fNoGlyphIndex && psa->eScript == Script_Control) + if (psa->fNoGlyphIndex) + { + if (pwcChars[idx] == ZWSP || pwcChars[idx] == ZWNJ || pwcChars[idx] == ZWJ) + { + pwOutGlyphs[i] = 0x20; + pOutGlyphProps[i].sva.fZeroWidth = 1; + } + } + else if (psa->eScript == Script_Control) { if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A || pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C)

1 0

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

June 13, 2016

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

Henri Verbeet : usp10: Set fZeroWidth when replacing control characters with blanks.
by Alexandre Julliard June 13, 2016

June 13, 2016

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

Akihiro Sagawa : winegstreamer: Fix a crash in Gstreamer_Mp3_SetMediaType( ).
by Alexandre Julliard June 13, 2016

June 13, 2016

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

Michael Stefaniuc : user32/tests: Use wine_dbgstr_rect() in the win tests.
by Alexandre Julliard June 13, 2016

June 13, 2016

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

Nikolay Sivov : msscript: Implement GetControlInfo().
by Alexandre Julliard June 13, 2016

June 13, 2016

Module: wine Branch: master Commit: 10f58a5e25eac9d8072de26e0f7c1f3d038eca2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f58a5e25eac9d8072de26e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 11 13:02:38 2016 +0300 msscript: Implement GetControlInfo(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 10 ++++++++-- dlls/msscript.ocx/tests/msscript.c | 23 +++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index b2f4e77..5a03f0c 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -808,9 +808,15 @@ static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO { ScriptControl *This = impl_from_IOleControl(iface); - FIXME("(%p)->(%p)\n", This, info); + TRACE("(%p)->(%p)\n", This, info); - return E_NOTIMPL; + if (!info) + return E_POINTER; + + info->hAccel = NULL; + info->cAccel = 0; + + return S_OK; } static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index f0245a6..12f7003 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -181,12 +181,35 @@ static void test_persiststreaminit(void) static void test_olecontrol(void) { IOleControl *olecontrol; + CONTROLINFO info; HRESULT hr; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IOleControl, (void**)&olecontrol); ok(hr == S_OK, "got 0x%08x\n", hr); + memset(&info, 0xab, sizeof(info)); + info.cb = sizeof(info); + hr = IOleControl_GetControlInfo(olecontrol, &info); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(info.hAccel == NULL, "got %p\n", info.hAccel); + ok(info.cAccel == 0, "got %d\n", info.cAccel); + ok(info.dwFlags == 0xabababab, "got %x\n", info.dwFlags); + + memset(&info, 0xab, sizeof(info)); + info.cb = sizeof(info) - 1; + hr = IOleControl_GetControlInfo(olecontrol, &info); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(info.hAccel == NULL, "got %p\n", info.hAccel); + ok(info.cAccel == 0, "got %d\n", info.cAccel); + ok(info.dwFlags == 0xabababab, "got %x\n", info.dwFlags); + + if (0) /* crashes on win2k3 */ + { + hr = IOleControl_GetControlInfo(olecontrol, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + } + IOleControl_Release(olecontrol); }

1 0

Nikolay Sivov : shlwapi: Fix a string leak (Valgrind).
by Alexandre Julliard June 13, 2016

June 13, 2016

Module: wine Branch: master Commit: 568b08047b71ba12f9e35f73a87ca3a53f0736b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568b08047b71ba12f9e35f73a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 11 21:42:05 2016 +0300 shlwapi: Fix a string leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/url.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 85fa3c1..ee93818 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -958,8 +958,10 @@ HRESULT WINAPI UrlEscapeA( if(!RtlCreateUnicodeStringFromAsciiz(&urlW, pszUrl)) return E_INVALIDARG; - if(dwFlags & URL_ESCAPE_AS_UTF8) + if(dwFlags & URL_ESCAPE_AS_UTF8) { + RtlFreeUnicodeString(&urlW); return E_NOTIMPL; + } if((ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags)) == E_POINTER) { escapedW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); ret = UrlEscapeW(urlW.Buffer, escapedW, &lenW, dwFlags);

1 0

Jacek Caban : secur32/tests: Don't load advapi32.dll function dynamically.
by Alexandre Julliard June 13, 2016

June 13, 2016

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

Francois Gouget : msctf: Spelling fix.
by Alexandre Julliard June 13, 2016

June 13, 2016

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

Piotr Caban : ucrtbase: Add __fpe_flt_rounds implementation.
by Alexandre Julliard June 13, 2016

June 13, 2016

Module: wine Branch: master Commit: 6b6f3406f4be92287f8f097803fd96811d785a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6f3406f4be92287f8f09780… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 13 11:34:49 2016 +0200 ucrtbase: Add __fpe_flt_rounds implementation. Based on a patch by Alex Henrie. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/math.c | 22 +++++++++++ dlls/ucrtbase/tests/misc.c | 45 +++++++++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 9864c6c..8d96f98 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -1,7 +1,7 @@ @ stub _Exit @ cdecl -arch=i386 __control87_2(long long ptr ptr) ucrtbase.__control87_2 @ cdecl __doserrno() ucrtbase.__doserrno -@ stub __fpe_flt_rounds +@ cdecl __fpe_flt_rounds() ucrtbase.__fpe_flt_rounds @ cdecl __fpecode() ucrtbase.__fpecode @ cdecl __p___argc() ucrtbase.__p___argc @ cdecl __p___argv() ucrtbase.__p___argv diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 402e8b2..3d2104b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1199,6 +1199,28 @@ int CDECL _controlfp_s(unsigned int *cur, unsigned int newval, unsigned int mask } /********************************************************************* + * __fpe_flt_rounds (UCRTBASE.@) + */ +int CDECL __fpe_flt_rounds(void) +{ + unsigned int fpc = _controlfp(0, 0) & MSVCRT__RC_CHOP; + + TRACE("()\n"); + + switch(fpc) { + case MSVCRT__RC_CHOP: return 0; + case MSVCRT__RC_NEAR: return 1; +#ifdef _WIN64 + case MSVCRT__RC_UP: return 3; + default: return 2; +#else + case MSVCRT__RC_UP: return 2; + default: return 3; +#endif + } +} + +/********************************************************************* * _copysign (MSVCRT.@) */ double CDECL MSVCRT__copysign(double num, double sign) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 63ea465..bfdf3c1 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <wchar.h> #include <stdio.h> +#include <float.h> #include <windef.h> #include <winbase.h> @@ -38,6 +39,8 @@ typedef struct MSVCRT__onexit_table_t static int (CDECL *p_initialize_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MSVCRT__onexit_t func); static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); +static int (CDECL *p___fpe_flt_rounds)(void); +static unsigned int (CDECL *p__controlfp)(unsigned int, unsigned int); static void test__initialize_onexit_table(void) { @@ -211,20 +214,58 @@ static void test__execute_onexit_table(void) ok(g_onexit_called == 2, "got %d\n", g_onexit_called); } -static void init(void) +static void test___fpe_flt_rounds(void) +{ + unsigned int cfp = p__controlfp(0, 0); + int ret; + + if(!cfp) { + skip("_controlfp not supported\n"); + return; + } + + ok((p__controlfp(_RC_NEAR, _RC_CHOP) & _RC_CHOP) == _RC_NEAR, "_controlfp(_RC_NEAR, _RC_CHOP) failed\n"); + ret = p___fpe_flt_rounds(); + ok(ret == 1, "__fpe_flt_rounds returned %d\n", ret); + + ok((p__controlfp(_RC_UP, _RC_CHOP) & _RC_CHOP) == _RC_UP, "_controlfp(_RC_UP, _RC_CHOP) failed\n"); + ret = p___fpe_flt_rounds(); + ok(ret == 2 + (sizeof(void*)>sizeof(int)), "__fpe_flt_rounds returned %d\n", ret); + + ok((p__controlfp(_RC_DOWN, _RC_CHOP) & _RC_CHOP) == _RC_DOWN, "_controlfp(_RC_DOWN, _RC_CHOP) failed\n"); + ret = p___fpe_flt_rounds(); + ok(ret == 3 - (sizeof(void*)>sizeof(int)), "__fpe_flt_rounds returned %d\n", ret); + + ok((p__controlfp(_RC_CHOP, _RC_CHOP) & _RC_CHOP) == _RC_CHOP, "_controlfp(_RC_CHOP, _RC_CHOP) failed\n"); + ret = p___fpe_flt_rounds(); + ok(ret == 0, "__fpe_flt_rounds returned %d\n", ret); +} + +static BOOL init(void) { HMODULE module = LoadLibraryA("ucrtbase.dll"); + if(!module) { + win_skip("ucrtbase.dll not available\n"); + return FALSE; + } + p_initialize_onexit_table = (void*)GetProcAddress(module, "_initialize_onexit_table"); p_register_onexit_function = (void*)GetProcAddress(module, "_register_onexit_function"); p_execute_onexit_table = (void*)GetProcAddress(module, "_execute_onexit_table"); + p___fpe_flt_rounds = (void*)GetProcAddress(module, "__fpe_flt_rounds"); + p__controlfp = (void*)GetProcAddress(module, "_controlfp"); + + return TRUE; } START_TEST(misc) { - init(); + if(!init()) + return; test__initialize_onexit_table(); test__register_onexit_function(); test__execute_onexit_table(); + test___fpe_flt_rounds(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 9d65d3c..14ffa63 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -89,7 +89,7 @@ @ stub __dcrt_initial_narrow_environment @ cdecl __doserrno() MSVCRT___doserrno @ cdecl __dstbias() MSVCRT___p__dstbias -@ stub __fpe_flt_rounds +@ cdecl __fpe_flt_rounds() @ cdecl __fpecode() @ stub __initialize_lconv_for_unsigned_char @ stub __intrinsic_abnormal_termination

1 0