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

Paul Gofman : d3dx9/tests: Add test for shared effect parameters.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: fcca13433365df6b15af12ff3b6d11dc47d6d75d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcca13433365df6b15af12ff3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 20 14:26:43 2017 +0300 d3dx9/tests: Add test for shared effect parameters. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 368 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 368 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcca13433365df6b15af1…

1 0

Gerald Pfeifer : wineps.drv: Add missing #include <stdarg.h>.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: cced5dfbde8b685022dd74e666f8ad4ea8473453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cced5dfbde8b685022dd74e66… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Apr 21 14:09:28 2017 +0200 wineps.drv: Add missing #include <stdarg.h>. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/graphics.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index ab6fe45..4887bd0 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -20,6 +20,7 @@ #include "config.h" +#include <stdarg.h> #include <stdio.h> #include <string.h> #include <math.h>

1 0

Józef Kucia : d3d11/tests: Add test for layered rendering.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 78c7204d5b2e8a85c0064bcc9166693ff4180aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=78c7204d5b2e8a85c0064bcc9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 21 10:59:56 2017 +0200 d3d11/tests: Add test for layered rendering. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 276 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 276 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78c7204d5b2e8a85c0064…

1 0

Józef Kucia : d3d10core/tests: Add test for layered rendering.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: f64b0431e75b626c908858d13e07840fc56f2389 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f64b0431e75b626c908858d13… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 21 10:59:57 2017 +0200 d3d10core/tests: Add test for layered rendering. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 209 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f64b0431e75b626c90885…

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

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: 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

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

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

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