wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 6649f1224fc92d694d0509ea6f1e1500c7df10cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6649f1224fc92d694d0509ea6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 14:37:52 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index 89b8d81..13aad05 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-20 15:18+0300\n" +"PO-Revision-Date: 2017-04-21 14:36+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -3708,7 +3708,7 @@ msgstr "Ожидается объект типа «Array»" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Библиотека ядра Wine" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine"

1 0

Nikolay Sivov : dwrite: Partially implement GetGlyphImageFormats().
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: b0f50e7e5bee10adaa0541a24a1d92ab493449be URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f50e7e5bee10adaa0541a24… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 14:28:24 2017 +0300 dwrite: Partially implement GetGlyphImageFormats(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 8 ++++++-- dlls/dwrite/opentype.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 1 - 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 886beb7..7dca5fb 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -229,6 +229,7 @@ extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_cpal_entries(const void*,UINT32,UINT32,UINT32,DWRITE_COLOR_F*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_signature(struct file_stream_desc*,FONTSIGNATURE*) DECLSPEC_HIDDEN; extern BOOL opentype_has_vertical_variants(IDWriteFontFace4*) DECLSPEC_HIDDEN; +extern UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4*) DECLSPEC_HIDDEN; struct dwrite_colorglyph { USHORT layer; /* [0, num_layers) index indicating current layer */ diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c74b2bb..ca2d69a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -242,6 +242,7 @@ struct dwrite_fontface { DWRITE_FONT_STRETCH stretch; DWRITE_FONT_WEIGHT weight; DWRITE_PANOSE panose; + UINT32 glyph_image_formats; LOGFONTW lf; }; @@ -1278,8 +1279,10 @@ static HRESULT WINAPI dwritefontface4_GetGlyphImageFormats_(IDWriteFontFace4 *if static DWRITE_GLYPH_IMAGE_FORMATS WINAPI dwritefontface4_GetGlyphImageFormats(IDWriteFontFace4 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace4(iface); - FIXME("(%p): stub\n", This); - return DWRITE_GLYPH_IMAGE_FORMATS_NONE; + + TRACE("(%p)\n", This); + + return This->glyph_image_formats; } static HRESULT WINAPI dwritefontface4_GetGlyphImageData(IDWriteFontFace4 *iface, UINT16 glyph, @@ -4345,6 +4348,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->flags |= FONTFACE_IS_MONOSPACED; if (opentype_has_vertical_variants(&fontface->IDWriteFontFace4_iface)) fontface->flags |= FONTFACE_HAS_VERTICAL_VARIANTS; + fontface->glyph_image_formats = opentype_get_glyph_image_formats(&fontface->IDWriteFontFace4_iface); /* Font properties are reused from font object when 'normal' face creation path is used: collection -> family -> matching font -> fontface. diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7a3e641..b7e9d87 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -34,6 +34,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_GPOS_TAG DWRITE_MAKE_OPENTYPE_TAG('G','P','O','S') #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') #define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') +#define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') +#define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') +#define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -2034,3 +2037,38 @@ BOOL opentype_has_vertical_variants(IDWriteFontFace4 *fontface) return ret; } + +static BOOL opentype_has_font_table(IDWriteFontFace4 *fontface, UINT32 tag) +{ + BOOL exists = FALSE; + const void *data; + void *context; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace4_TryGetFontTable(fontface, tag, &data, &size, &context, &exists); + if (FAILED(hr)) + return FALSE; + + if (exists) + IDWriteFontFace4_ReleaseFontTable(fontface, context); + + return exists; +} + +UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface) +{ + UINT32 ret = DWRITE_GLYPH_IMAGE_FORMATS_NONE; + + if (opentype_has_font_table(fontface, MS_GLYF_TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE; + + if (opentype_has_font_table(fontface, MS_CFF__TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_CFF; + + if (opentype_has_font_table(fontface, MS_COLR_TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_COLR; + + /* TODO: handle SVG and bitmap data */ + return ret; +} diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2c874df..4d5780c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7504,7 +7504,6 @@ static void test_GetGlyphImageFormats(void) /* Mask describes font as a whole. */ formats = IDWriteFontFace4_GetGlyphImageFormats(fontface4); expected_formats = get_face_glyph_image_formats(fontface4); - todo_wine ok(formats == expected_formats, "%s - %s, expected formats %#x, got formats %#x.\n", wine_dbgstr_w(familynameW), wine_dbgstr_w(facenameW), expected_formats, formats);

1 0

Nikolay Sivov : comctl32/tests: Trace test name only of failure.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 377d0e26b3f0c5700828361348fa1a256fb2f2d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=377d0e26b3f0c570082836134… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 14:03:57 2017 +0300 comctl32/tests: Trace test name only of failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 8cdef18..20be1ea 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -918,36 +918,34 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN char *data; HRESULT hr; - trace("%s\n", comment); - ret = ImageList_GetImageCount(himl); - ok(ret == cur, "expected image count %d got %d\n", cur, ret); + ok(ret == cur, "%s: expected image count %d got %d\n", comment, cur, ret); ret = ImageList_GetIconSize(himl, &cxx, &cyy); ok(ret, "ImageList_GetIconSize failed\n"); - ok(cxx == cx, "wrong cx %d (expected %d)\n", cxx, cx); - ok(cyy == cy, "wrong cy %d (expected %d)\n", cyy, cy); + ok(cxx == cx, "%s: wrong cx %d (expected %d)\n", comment, cxx, cx); + ok(cyy == cy, "%s: wrong cy %d (expected %d)\n", comment, cyy, cy); init_memstream(&stream); ret = ImageList_Write(himl, &stream.IStream_iface); - ok(ret, "ImageList_Write failed\n"); + ok(ret, "%s: ImageList_Write failed\n", comment); hr = GetHGlobalFromStream(stream.stream, &hglobal); - ok(hr == S_OK, "Failed to get hglobal, %#x\n", hr); + ok(hr == S_OK, "%s: Failed to get hglobal, %#x\n", comment, hr); IStream_Stat(stream.stream, &stat, STATFLAG_NONAME); data = GlobalLock(hglobal); - ok(data != 0, "ImageList_Write didn't write any data\n"); - ok(stat.cbSize.LowPart > sizeof(ILHEAD), "ImageList_Write wrote not enough data\n"); + ok(data != 0, "%s: ImageList_Write didn't write any data\n", comment); + ok(stat.cbSize.LowPart > sizeof(ILHEAD), "%s: ImageList_Write wrote not enough data\n", comment); check_ilhead_data(data, cx, cy, cur, max, grow, flags); size = check_bitmap_data(data + sizeof(ILHEAD), stat.cbSize.LowPart - sizeof(ILHEAD), width, height, flags & 0xfe, comment); if (size < stat.cbSize.LowPart - sizeof(ILHEAD)) /* mask is present */ { - ok( flags & ILC_MASK, "extra data %u/%u but mask not expected\n", stat.cbSize.LowPart, size ); + ok( flags & ILC_MASK, "%s: extra data %u/%u but mask not expected\n", comment, stat.cbSize.LowPart, size ); check_bitmap_data(data + sizeof(ILHEAD) + size, stat.cbSize.LowPart - sizeof(ILHEAD) - size, width, height, 1, comment); } @@ -956,7 +954,7 @@ static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, IN mv.QuadPart = 0; IStream_Seek(stream.stream, mv, STREAM_SEEK_SET, NULL); himl2 = ImageList_Read(&stream.IStream_iface); - ok(himl2 != NULL, "Failed to deserialize imagelist\n"); + ok(himl2 != NULL, "%s: Failed to deserialize imagelist\n", comment); ImageList_Destroy(himl2); GlobalUnlock(hglobal);

1 0

Nikolay Sivov : comctl32/pager: Prevent excessive PGN_CALCSIZE notifications during PGM_SETCHILD.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 48c4edd9ba91e8236597f709c189ed1d5d41efad URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c4edd9ba91e8236597f709c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 13:16:02 2017 +0300 comctl32/pager: Prevent excessive PGN_CALCSIZE notifications during PGM_SETCHILD. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 21 +++++++++++---------- dlls/comctl32/tests/pager.c | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index ae759fb..e9bcbe8 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -271,7 +271,7 @@ PAGER_PositionChildWnd(PAGER_INFO* infoPtr) } static INT -PAGER_GetScrollRange(PAGER_INFO* infoPtr) +PAGER_GetScrollRange(PAGER_INFO* infoPtr, BOOL calc_size) { INT scrollRange = 0; @@ -281,7 +281,8 @@ PAGER_GetScrollRange(PAGER_INFO* infoPtr) RECT wndRect; GetWindowRect(infoPtr->hwndSelf, &wndRect); - PAGER_CalcSize(infoPtr); + if (calc_size) + PAGER_CalcSize(infoPtr); if (infoPtr->dwStyle & PGS_HORZ) { wndSize = wndRect.right - wndRect.left; @@ -362,9 +363,9 @@ PAGER_UpdateBtns(PAGER_INFO *infoPtr, INT scrollRange, BOOL hideGrayBtns) } static LRESULT -PAGER_SetPos(PAGER_INFO* infoPtr, INT newPos, BOOL fromBtnPress) +PAGER_SetPos(PAGER_INFO* infoPtr, INT newPos, BOOL fromBtnPress, BOOL calc_size) { - INT scrollRange = PAGER_GetScrollRange(infoPtr); + INT scrollRange = PAGER_GetScrollRange(infoPtr, calc_size); INT oldPos = infoPtr->nPos; if ((scrollRange <= 0) || (newPos < 0)) @@ -405,12 +406,12 @@ PAGER_RecalcSize(PAGER_INFO *infoPtr) if (infoPtr->hwndChild) { - INT scrollRange = PAGER_GetScrollRange(infoPtr); + INT scrollRange = PAGER_GetScrollRange(infoPtr, TRUE); if (scrollRange <= 0) { infoPtr->nPos = -1; - PAGER_SetPos(infoPtr, 0, FALSE); + PAGER_SetPos(infoPtr, 0, FALSE, TRUE); } else PAGER_PositionChildWnd(infoPtr); @@ -480,7 +481,7 @@ PAGER_SetChild (PAGER_INFO* infoPtr, HWND hwndChild) SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE); infoPtr->nPos = -1; - PAGER_SetPos(infoPtr, 0, FALSE); + PAGER_SetPos(infoPtr, 0, FALSE, FALSE); } return 0; @@ -525,9 +526,9 @@ PAGER_Scroll(PAGER_INFO* infoPtr, INT dir) infoPtr->direction = dir; if (dir == PGF_SCROLLLEFT || dir == PGF_SCROLLUP) - PAGER_SetPos(infoPtr, infoPtr->nPos - nmpgScroll.iScroll, TRUE); + PAGER_SetPos(infoPtr, infoPtr->nPos - nmpgScroll.iScroll, TRUE, TRUE); else - PAGER_SetPos(infoPtr, infoPtr->nPos + nmpgScroll.iScroll, TRUE); + PAGER_SetPos(infoPtr, infoPtr->nPos + nmpgScroll.iScroll, TRUE, TRUE); } else infoPtr->direction = -1; @@ -1047,7 +1048,7 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return PAGER_SetChild (infoPtr, (HWND)lParam); case PGM_SETPOS: - return PAGER_SetPos(infoPtr, (INT)lParam, FALSE); + return PAGER_SetPos(infoPtr, (INT)lParam, FALSE, TRUE); case WM_CREATE: return PAGER_Create (hwnd, (LPCREATESTRUCTW)lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index afe6fc6..a9409ea 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -272,14 +272,14 @@ static void test_pager(void) flush_sequences( sequences, NUM_MSG_SEQUENCES ); SendMessageA( pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd ); - ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "set child", TRUE); + ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "set child", FALSE); GetWindowRect( pager, &rect ); ok( rect.right - rect.left == 100 && rect.bottom - rect.top == 100, "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top ); flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child2_wnd); - ok_sequence(sequences, PAGER_SEQ_INDEX, switch_child_seq, "switch to invisible child", TRUE); + ok_sequence(sequences, PAGER_SEQ_INDEX, switch_child_seq, "switch to invisible child", FALSE); GetWindowRect(pager, &rect); ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100, "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top); @@ -287,7 +287,7 @@ static void test_pager(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); SendMessageA(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); - ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "switch to visible child", TRUE); + ok_sequence(sequences, PAGER_SEQ_INDEX, set_child_seq, "switch to visible child", FALSE); GetWindowRect(pager, &rect); ok(rect.right - rect.left == 100 && rect.bottom - rect.top == 100, "pager resized %dx%d\n", rect.right - rect.left, rect.bottom - rect.top);

1 0

Nikolay Sivov : comctl32/tests: Fully initialize message tests data ( Coverity).
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 299ded609122bd57bc10abd980adda9327b17b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=299ded609122bd57bc10abd98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 13:16:01 2017 +0300 comctl32/tests: Fully initialize message tests data (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/pager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 7a9cdbb..afe6fc6 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -207,8 +207,8 @@ static HWND create_pager_control( DWORD style ) static LRESULT WINAPI child_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - struct message msg; static LONG defwndproc_counter; + struct message msg = { 0 }; LRESULT ret; msg.message = message;

1 0

Nikolay Sivov : scrrun: Added DateLastModified property for IFile.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: f6016609e1709acf8a843bc714bc7ff8e22f2908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6016609e1709acf8a843bc71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 21 12:26:49 2017 +0300 scrrun: Added DateLastModified property for IFile. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 27 ++++++++++++++++++++++++--- dlls/scrrun/tests/filesystem.c | 9 +++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 45040b3..2acef84 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -2712,6 +2712,21 @@ static HRESULT WINAPI file_put_Attributes(IFile *iface, FileAttribute pfa) return SetFileAttributesW(This->path, pfa) ? S_OK : create_error(GetLastError()); } +static HRESULT get_date_from_filetime(const FILETIME *ft, DATE *date) +{ + FILETIME ftlocal; + SYSTEMTIME st; + + if (!date) + return E_POINTER; + + FileTimeToLocalFileTime(ft, &ftlocal); + FileTimeToSystemTime(&ftlocal, &st); + SystemTimeToVariantTime(&st, date); + + return S_OK; +} + static HRESULT WINAPI file_get_DateCreated(IFile *iface, DATE *pdate) { struct file *This = impl_from_IFile(iface); @@ -2719,11 +2734,17 @@ static HRESULT WINAPI file_get_DateCreated(IFile *iface, DATE *pdate) return E_NOTIMPL; } -static HRESULT WINAPI file_get_DateLastModified(IFile *iface, DATE *pdate) +static HRESULT WINAPI file_get_DateLastModified(IFile *iface, DATE *date) { struct file *This = impl_from_IFile(iface); - FIXME("(%p)->(%p)\n", This, pdate); - return E_NOTIMPL; + WIN32_FILE_ATTRIBUTE_DATA attrs; + + TRACE("(%p)->(%p)\n", This, date); + + if (GetFileAttributesExW(This->path, GetFileExInfoStandard, &attrs)) + return get_date_from_filetime(&attrs.ftLastWriteTime, date); + + return E_FAIL; } static HRESULT WINAPI file_get_DateLastAccessed(IFile *iface, DATE *pdate) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index bb926c2..2e3406d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -624,6 +624,7 @@ static void test_GetFile(void) HRESULT hr; HANDLE hf; BOOL ret; + DATE date; get_temp_path(NULL, pathW); @@ -649,6 +650,14 @@ static void test_GetFile(void) hr = IFileSystem3_GetFile(fs3, path, &file); ok(hr == S_OK, "GetFile returned %x, expected S_OK\n", hr); + hr = IFile_get_DateLastModified(file, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + date = 0.0; + hr = IFile_get_DateLastModified(file, &date); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(date > 0.0, "got %f\n", date); + hr = IFile_get_Path(file, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr);

1 0

Huw Davies : riched20: Only write out non-default pattern colours.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: d4b1938cfbc6ae44536b14bb0fcecc8bf23188eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b1938cfbc6ae44536b14bb0… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 21 11:33:26 2017 +0100 riched20: Only write out non-default pattern colours. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 6b654ca..1cd293c 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -723,8 +723,10 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, sprintf(props + strlen(props), "\\shading%d", fmt->wShadingWeight); if (fmt->wShadingStyle & 0xF) strcat(props, style[fmt->wShadingStyle & 0xF]); - sprintf(props + strlen(props), "\\cfpat%d\\cbpat%d", - (fmt->wShadingStyle >> 4) & 0xF, (fmt->wShadingStyle >> 8) & 0xF); + if ((fmt->wShadingStyle >> 4) & 0xf) + sprintf(props + strlen(props), "\\cfpat%d", (fmt->wShadingStyle >> 4) & 0xf); + if ((fmt->wShadingStyle >> 8) & 0xf) + sprintf(props + strlen(props), "\\cbpat%d", (fmt->wShadingStyle >> 8) & 0xf); } if (*props) strcat(props, " ");

1 0

Henri Verbeet : usp10: Validate substition record sequence indices in GSUB_apply_ContextSubst().
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 30e8768d00fb3a93f2c4cb5ca5773f2ab78bb396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30e8768d00fb3a93f2c4cb5ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 21 00:57:14 2017 +0200 usp10: Validate substition record sequence indices in GSUB_apply_ContextSubst(). 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 | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 307b6a9..0351f4f 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1125,11 +1125,19 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) { - int lookupIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); - int SequenceIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex); - TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); - newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + 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(" SUBST: %u -> %u %u.\n", l, sequence_index, lookup_index); + newIndex = GSUB_apply_lookup(lookup, lookup_index, glyphs, g, write_dir, glyph_count); if (newIndex == GSUB_E_NOGLYPH) { ERR(" Chain failed to generate a glyph\n"); @@ -1204,11 +1212,19 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) { - int lookupIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); - int SequenceIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex); + + 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(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); - newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + TRACE(" SUBST: %u -> %u %u.\n", l, sequence_index, lookup_index); + newIndex = GSUB_apply_lookup(lookup, lookup_index, glyphs, g, write_dir, glyph_count); if (newIndex == GSUB_E_NOGLYPH) { ERR(" Chain failed to generate a glyph\n");

1 0

Henri Verbeet : usp10: Simplify the "sr_2" assignments in GSUB_apply_ContextSubst().
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: ebe75cb66ca910608cc58fbef4096cb9719f02d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebe75cb66ca910608cc58fbef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 21 00:57:13 2017 +0200 usp10: Simplify the "sr_2" assignments in GSUB_apply_ContextSubst(). 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, 2 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index f01839b..307b6a9 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1121,8 +1121,7 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT } TRACE(" Rule matches\n"); - sr_2 = (const GSUB_SubRule_2*)((const BYTE*)sr+ - FIELD_OFFSET(GSUB_SubRule_1, Input[g_count-1])); + sr_2 = (const GSUB_SubRule_2 *)&sr->Input[g_count - 1]; for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) { @@ -1201,8 +1200,7 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT } TRACE(" Rule matches\n"); - sr_2 = (const GSUB_SubClassRule_2*)((const BYTE*)sr+ - FIELD_OFFSET(GSUB_SubClassRule_1, Class[g_count-1])); + sr_2 = (const GSUB_SubClassRule_2 *)&sr->Class[g_count - 1]; for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) {

1 0

Henri Verbeet : usp10: Range check glyph counts in GSUB_apply_ContextSubst ().
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 6c13170b9512877a07cb6d7f7b6afcda021cb153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c13170b9512877a07cb6d7f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 21 00:57:12 2017 +0200 usp10: Range check glyph counts in GSUB_apply_ContextSubst(). 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 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index d2e0fc5..f01839b 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1098,6 +1098,7 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT { const GSUB_SubRule_1 *sr; const GSUB_SubRule_2 *sr_2; + unsigned int g; int g_count, l; int newIndex = glyph_index; @@ -1105,6 +1106,11 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT sr = (const GSUB_SubRule_1*)((const BYTE*)srs+offset); g_count = GET_BE_WORD(sr->GlyphCount); TRACE(" SubRule has %i glyphs\n",g_count); + + g = glyph_index + write_dir * (g_count - 1); + if (g >= *glyph_count) + continue; + for (l = 0; l < g_count-1; l++) if (glyphs[glyph_index + (write_dir * (l+1))] != GET_BE_WORD(sr->Input[l])) break; @@ -1169,6 +1175,7 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT { const GSUB_SubClassRule_1 *sr; const GSUB_SubClassRule_2 *sr_2; + unsigned int g; int g_count, l; int newIndex = glyph_index; @@ -1176,6 +1183,11 @@ static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupT sr = (const GSUB_SubClassRule_1*)((const BYTE*)scs+offset); g_count = GET_BE_WORD(sr->GlyphCount); TRACE(" SubClassRule 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

← Newer
1
...
21
22
23
24
25
26
27
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017