April 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Make CreateFontFaceFromHdc() properly fail on unsupported font format.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 0344c19692396dca80a98f02fa7f713cee12b344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0344c19692396dca80a98f02f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:29 2017 +0300 dwrite: Make CreateFontFaceFromHdc() properly fail on unsupported font format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 13 +++++++------ dlls/dwrite/tests/font.c | 24 +++++++++++++++++++++++- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index cf3b3fa..2b3f32d 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -761,14 +761,15 @@ static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop1 *iface is_supported = FALSE; hr = IDWriteFontFile_Analyze(file, &is_supported, &filetype, &facetype, &facenum); - if (FAILED(hr) || !is_supported) { - IDWriteFontFile_Release(file); - return hr; + if (SUCCEEDED(hr)) { + if (is_supported) + /* Simulations flags values match DWRITE_FONT_SIMULATIONS */ + hr = IDWriteFactory4_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, + info.simulations, fontface); + else + hr = DWRITE_E_FILEFORMAT; } - /* Simulations flags values match DWRITE_FONT_SIMULATIONS */ - hr = IDWriteFactory4_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, info.simulations, - fontface); IDWriteFontFile_Release(file); return hr; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2e26bc7..2c874df 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014-2016 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -3458,6 +3458,7 @@ static void test_CreateFontFaceFromHdc(void) IDWriteFactory *factory; HFONT hfont, oldhfont; LOGFONTW logfont; + LOGFONTA lf; HRESULT hr; ULONG ref; HDC hdc; @@ -3468,11 +3469,17 @@ static void test_CreateFontFaceFromHdc(void) hr = IDWriteFactory_GetGdiInterop(factory, &interop); ok(hr == S_OK, "got 0x%08x\n", hr); + /* Invalid HDC. */ fontface = (void*)0xdeadbeef; hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, NULL, &fontface); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(fontface == NULL, "got %p\n", fontface); + fontface = (void *)0xdeadbeef; + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, (HDC)0xdeadbeef, &fontface); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + ok(fontface == NULL, "got %p\n", fontface); + memset(&logfont, 0, sizeof(logfont)); logfont.lfHeight = 12; logfont.lfWidth = 12; @@ -3489,6 +3496,21 @@ static void test_CreateFontFaceFromHdc(void) ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontFace_Release(fontface); DeleteObject(SelectObject(hdc, oldhfont)); + + /* Select bitmap font MS Sans Serif, format that's not supported by DirectWrite. */ + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -12; + strcpy(lf.lfFaceName, "MS Sans Serif"); + + hfont = CreateFontIndirectA(&lf); + oldhfont = SelectObject(hdc, hfont); + + fontface = (void *)0xdeadbeef; + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); + ok(hr == DWRITE_E_FILEFORMAT || broken(hr == E_FAIL) /* Vista */, "got 0x%08x\n", hr); + ok(fontface == NULL, "got %p\n", fontface); + + DeleteObject(SelectObject(hdc, oldhfont)); DeleteDC(hdc); IDWriteGdiInterop_Release(interop);

1 0

Nikolay Sivov : dwrite: Trace QueryInterface fontface calls on failure ( Coverity).
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 533d3b904ef7fd36f40f9ce057952c93fcc7c3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533d3b904ef7fd36f40f9ce05… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:27 2017 +0300 dwrite: Trace QueryInterface fontface calls on failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 +++- dlls/dwrite/main.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index b665161..c1b2286 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5135,6 +5135,7 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit IDWriteFontFace1 *fontface1; D2D_POINT_2F origin; FLOAT rtl_factor; + HRESULT hr; UINT32 i; *ret = NULL; @@ -5196,7 +5197,8 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit memcpy(analysis->glyphs, desc->run->glyphIndices, desc->run->glyphCount*sizeof(*desc->run->glyphIndices)); IDWriteFontFace_GetMetrics(desc->run->fontFace, &metrics); - IDWriteFontFace_QueryInterface(desc->run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1); + if (FAILED(hr = IDWriteFontFace_QueryInterface(desc->run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1))) + WARN("Failed to get IDWriteFontFace1, %#x.\n", hr); origin.x = desc->origin_x * desc->ppdip; origin.y = desc->origin_y * desc->ppdip; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index c17bb5a..73fcb51 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1449,13 +1449,15 @@ static HRESULT compute_glyph_origins(DWRITE_GLYPH_RUN const *run, DWRITE_MEASURI IDWriteFontFace1 *fontface1 = NULL; DWRITE_FONT_METRICS metrics; FLOAT rtl_factor; + HRESULT hr; UINT32 i; rtl_factor = run->bidiLevel & 1 ? -1.0f : 1.0f; if (run->fontFace) { IDWriteFontFace_GetMetrics(run->fontFace, &metrics); - IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1); + if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1))) + WARN("Failed to get IDWriteFontFace1, %#x.\n", hr); } for (i = 0; i < run->glyphCount; i++) {

1 0

Akihiro Sagawa : secur32: 3DES has a different ALG_ID.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: d5bc3c7bce12cc426cc9865cea7625ac3f8c3397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5bc3c7bce12cc426cc9865ce… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 17 23:26:06 2017 +0900 secur32: 3DES has a different ALG_ID. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 44e88bd..33686bc 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -300,8 +300,8 @@ static ALG_ID schannel_get_cipher_algid(int cipher) case GNUTLS_CIPHER_NULL: return 0; case GNUTLS_CIPHER_ARCFOUR_40: case GNUTLS_CIPHER_ARCFOUR_128: return CALG_RC4; - case GNUTLS_CIPHER_DES_CBC: - case GNUTLS_CIPHER_3DES_CBC: return CALG_DES; + case GNUTLS_CIPHER_DES_CBC: return CALG_DES; + case GNUTLS_CIPHER_3DES_CBC: return CALG_3DES; case GNUTLS_CIPHER_AES_128_CBC: case GNUTLS_CIPHER_AES_128_GCM: return CALG_AES_128; case GNUTLS_CIPHER_AES_192_CBC: return CALG_AES_192;

1 0

Akihiro Sagawa : secur32: Return correct key exchange algorithm value.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 8981dac8597f6f853f99951051de2adaead35279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8981dac8597f6f853f9995105… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 17 23:26:04 2017 +0900 secur32: Return correct key exchange algorithm value. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index da83482..44e88bd 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -343,10 +343,9 @@ static ALG_ID schannel_get_kx_algid(int kx) case GNUTLS_KX_DHE_DSS: case GNUTLS_KX_DHE_RSA: return CALG_DH_EPHEM; case GNUTLS_KX_ANON_ECDH: return CALG_ECDH; - /* MSDN mentions CALG_ECDH_EPHEM, but doesn't appear in the Windows SDK. */ case GNUTLS_KX_ECDHE_RSA: - case GNUTLS_KX_ECDHE_PSK: return CALG_ECDH; - case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDSA; + case GNUTLS_KX_ECDHE_PSK: + case GNUTLS_KX_ECDHE_ECDSA: return CALG_ECDH_EPHEM; default: FIXME("unknown algorithm %d\n", kx); return 0;

1 0

Huw Davies : shell32: Use a MENUEX resource for the context menu.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: a33c958ee2dc83733b57f1e66b5e57d8b30469c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33c958ee2dc83733b57f1e66… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 19 13:13:41 2017 +0100 shell32: Use a MENUEX resource for the context menu. This ensures the submenus can be given ids below FCIDM_SHVIEWLAST and so don't get stripped out by SHELL_MergeMenus(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 82ad32a..6585416 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -35,11 +35,11 @@ END /* shellview background menu */ -MENU_002 MENU +MENU_002 MENUEX BEGIN POPUP "" BEGIN - POPUP "&View" + POPUP "&View", 0x40 /* Submenus need ids <= FCIDM_SHVIEWLAST so they don't get removed by MergeMenu */ BEGIN MENUITEM "Lar&ge Icons", FCIDM_SHVIEW_BIGICON MENUITEM "S&mall Icons", FCIDM_SHVIEW_SMALLICON @@ -47,7 +47,7 @@ BEGIN MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Arrange &Icons" + POPUP "Arrange &Icons", 0x41 BEGIN MENUITEM "By &Name", 0x30 /* column 0 */ MENUITEM "By &Type", 0x32 /* column 2 */ @@ -63,7 +63,7 @@ BEGIN MENUITEM "Paste", FCIDM_SHVIEW_INSERT MENUITEM "Paste as Link", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR - POPUP "New" + POPUP "New", 0x42 BEGIN MENUITEM "New &Folder", FCIDM_SHVIEW_NEWFOLDER MENUITEM "New &Link", FCIDM_SHVIEW_NEWLINK

1 0

Huw Davies : shell32: Avoid leaking icon handles.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 524e316a144c6d605908ddbe39487644065c4364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=524e316a144c6d605908ddbe3… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 19 13:13:39 2017 +0100 shell32: Avoid leaking icon handles. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/iconcache.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index c3284a2..7beb479 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -305,10 +305,12 @@ static INT SIC_IconAppend (LPCWSTR sSourceFile, INT dwSourceIndex, HICON hSmallI * gets small/big icon by number from a file */ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) -{ HICON hiconLarge=0; +{ + HICON hiconLarge=0; HICON hiconSmall=0; HICON hiconLargeShortcut; HICON hiconSmallShortcut; + int ret; PrivateExtractIconsW( sSourceFile, dwSourceIndex, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), &hiconLarge, 0, 1, 0 ); @@ -327,6 +329,8 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) hiconSmallShortcut = SIC_OverlayShortcutImage(hiconSmall, FALSE); if (NULL != hiconLargeShortcut && NULL != hiconSmallShortcut) { + DestroyIcon( hiconLarge ); + DestroyIcon( hiconSmall ); hiconLarge = hiconLargeShortcut; hiconSmall = hiconSmallShortcut; } @@ -339,8 +343,12 @@ static INT SIC_LoadIcon (LPCWSTR sSourceFile, INT dwSourceIndex, DWORD dwFlags) } } - return SIC_IconAppend (sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, dwFlags); + ret = SIC_IconAppend( sSourceFile, dwSourceIndex, hiconSmall, hiconLarge, dwFlags ); + DestroyIcon( hiconLarge ); + DestroyIcon( hiconSmall ); + return ret; } + /***************************************************************************** * SIC_Initialize [internal] */

1 0

Michael Stefaniuc : credui: Use SetRectEmpty() instead of memset().
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: dc0a49f3bb07b73fa63cc80f32c5717d8a455fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0a49f3bb07b73fa63cc80f3… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:01 2017 +0200 credui: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index 0da4643..a4df9fe 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -216,7 +216,7 @@ static void CredDialogCreateBalloonTip(HWND hwndDlg, struct cred_dialog_params * toolinfo.uFlags = TTF_TRACK; toolinfo.hwnd = hwndDlg; toolinfo.uId = TOOLID_INCORRECTPASSWORD; - memset(&toolinfo.rect, 0, sizeof(toolinfo.rect)); + SetRectEmpty(&toolinfo.rect); toolinfo.hinst = NULL; toolinfo.lpszText = wszText; toolinfo.lParam = 0;

1 0

Andrew Eikum : xaudio2: Try to increase OpenAL source limit.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 986a14f9500dd0abf598703a775e2e610594200c URL: http://source.winehq.org/git/wine.git/?a=commit;h=986a14f9500dd0abf598703a7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 17 13:14:58 2017 -0500 xaudio2: Try to increase OpenAL source limit. openal-soft recently added support for applications to request new source count limits. Older versions will silently ignore these attributes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index b2a5e3b..a091629 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1593,7 +1593,7 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, IMMDevice *dev; HRESULT hr; WAVEFORMATEX *fmt; - ALCint attrs[7]; + ALCint attrs[11]; REFERENCE_TIME period, bufdur; TRACE("(%p)->(%p, %u, %u, 0x%x, %s, %p, 0x%x)\n", This, @@ -1743,11 +1743,20 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, LeaveCriticalSection(&This->lock); return AUDCLNT_E_UNSUPPORTED_FORMAT; } + attrs[2] = ALC_FREQUENCY; attrs[3] = inputSampleRate; + attrs[4] = ALC_FORMAT_TYPE_SOFT; attrs[5] = al_get_loopback_format(&This->fmt); - attrs[6] = 0; + + /* some games create very many sources */ + attrs[6] = ALC_STEREO_SOURCES; + attrs[7] = 1024; + attrs[8] = ALC_MONO_SOURCES; + attrs[9] = 1024; + + attrs[10] = 0; if(!attrs[5]){ WARN("OpenAL can't output samples in this format\n");

1 0

Henri Verbeet : usp10: Validate positioning record sequence indices in GPOS_apply_ContextPos().
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: c5619beb773827928637864f81d6de0a236b77f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5619beb773827928637864f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 17 20:27:00 2017 +0200 usp10: Validate positioning record sequence indices in GPOS_apply_ContextPos(). 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/opentype.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e190b92..d2e0fc5 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2195,12 +2195,21 @@ static unsigned int GPOS_apply_ContextPos(const ScriptCache *script_cache, const for (l = 0; l < GET_BE_WORD(pr->PosCount); l++) { - int lookupIndex = GET_BE_WORD(pr_2->PosLookupRecord[l].LookupListIndex); - int SequenceIndex = GET_BE_WORD(pr_2->PosLookupRecord[l].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(pr_2->PosLookupRecord[l].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(pr_2->PosLookupRecord[l].SequenceIndex); - TRACE("Position: %i -> %i %i\n",l, SequenceIndex, lookupIndex); - GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, lookup, lookupIndex, - glyphs, glyph_index + SequenceIndex, glyph_count, goffset); + g = glyph_index + write_dir * sequence_index; + if (g >= glyph_count) + { + WARN("Invalid sequence index %u (glyph index %u, write dir %d).\n", + sequence_index, glyph_index, write_dir); + continue; + } + + TRACE("Position: %u -> %u %u.\n", l, sequence_index, lookup_index); + + GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, + lookup, lookup_index, glyphs, g, glyph_count, goffset); } return 1; }

1 0

Henri Verbeet : usp10: Range check glyph counts in GPOS_apply_ContextPos() .
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 1b02c1ac50141058edd77ea373468c7bf5f13d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b02c1ac50141058edd77ea37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 17 20:26:58 2017 +0200 usp10: Range check glyph counts in GPOS_apply_ContextPos(). 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/opentype.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 2cca0cb..ec425a1 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2166,12 +2166,18 @@ static unsigned int GPOS_apply_ContextPos(const ScriptCache *script_cache, const { const GPOS_PosClassRule_1 *pr; const GPOS_PosClassRule_2 *pr_2; + unsigned int g; int g_count, l; offset = GET_BE_WORD(pcs->PosClassRule[k]); pr = (const GPOS_PosClassRule_1*)((const BYTE*)pcs+offset); g_count = GET_BE_WORD(pr->GlyphCount); TRACE("PosClassRule has %i glyphs classes\n",g_count); + + g = glyph_index + write_dir * (g_count - 1); + if (g >= glyph_count) + continue; + for (l = 0; l < g_count-1; l++) { int g_class = OT_get_glyph_class(glyph_class_table, glyphs[glyph_index + (write_dir * (l+1))]);

1 0