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

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

April 19, 2017

Module: wine Branch: master Commit: d1ca880ec45cfccf929ea1545840537ce25eeebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ca880ec45cfccf929ea1545… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 17 20:26:57 2017 +0200 usp10: Validate substition record sequence indices in GSUB_apply_ChainContextSubst(). 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 | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index f0417f1..2cca0cb 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1346,12 +1346,19 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo substitute_count = GET_BE_WORD(substitute->SubstCount); for (k = 0; k < substitute_count; ++k) { - WORD lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); - WORD sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex); + unsigned int g = glyph_index + write_dir * sequence_index; + + if (g >= *glyph_count) + { + WARN("Skipping invalid sequence index %u (glyph index %u, write dir %d).\n", + sequence_index, glyph_index, write_dir); + continue; + } TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index); - new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, - glyph_index + sequence_index, write_dir, glyph_count); + new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, g, write_dir, glyph_count); if (new_index == GSUB_E_NOGLYPH) ERR("Chain failed to generate a glyph.\n"); } @@ -1426,12 +1433,19 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo substitution_count = GET_BE_WORD(substitute->SubstCount); for (k = 0; k < substitution_count; ++k) { - WORD lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); - WORD sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; + unsigned int lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); + unsigned int sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex); + unsigned int g = glyph_index + write_dir * sequence_index; + + if (g >= *glyph_count) + { + WARN("Skipping invalid sequence index %u (glyph index %u, write dir %d).\n", + sequence_index, glyph_index, write_dir); + continue; + } TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index); - new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, - glyph_index + sequence_index, write_dir, glyph_count); + new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, g, write_dir, glyph_count); if (new_index == GSUB_E_NOGLYPH) ERR("Chain failed to generate a glyph.\n"); }

1 0

Nikolay Sivov : dwrite/tests: Initial tests for GetGlyphImageFormats().
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: ef31887c402c36213969510a9a550a19b3e673fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef31887c402c36213969510a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:28 2017 +0300 dwrite/tests: Initial tests for GetGlyphImageFormats(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7488189..2e26bc7 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -42,6 +42,9 @@ #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') #define MS_KERN_TAG DWRITE_MAKE_OPENTYPE_TAG('k','e','r','n') +#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) @@ -7382,6 +7385,120 @@ static void test_inmemory_file_loader(void) ok(ref == 0, "factory not released, %u\n", ref); } +static BOOL face_has_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); + ok(hr == S_OK, "TryGetFontTable() failed, %#x\n", hr); + if (exists) + IDWriteFontFace4_ReleaseFontTable(fontface, context); + + return exists; +} + +static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface) +{ + DWORD ret = DWRITE_GLYPH_IMAGE_FORMATS_NONE; + + if (face_has_table(fontface, MS_GLYF_TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE; + + if (face_has_table(fontface, MS_CFF__TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_CFF; + + if (face_has_table(fontface, MS_COLR_TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_COLR; + + /* TODO: handle SVG and bitmap data */ + return ret; +} + +static void test_GetGlyphImageFormats(void) +{ + IDWriteFontCollection *syscollection; + IDWriteFactory *factory; + UINT32 i, count; + HRESULT hr; + ULONG ref; + IDWriteFontFace *fontface; + IDWriteFontFace4 *fontface4; + + factory = create_factory(); + + fontface = create_fontface(factory); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace4, (void **)&fontface4); + IDWriteFontFace_Release(fontface); + if (FAILED(hr)) { + win_skip("GetGlyphImageFormats() is not supported\n"); + IDWriteFactory_Release(factory); + return; + } + IDWriteFontFace4_Release(fontface4); + + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < count; i++) { + WCHAR familynameW[256], facenameW[128]; + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 j, fontcount; + IDWriteFont *font; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, familynameW, sizeof(familynameW)/sizeof(*familynameW)); + IDWriteLocalizedStrings_Release(names); + + fontcount = IDWriteFontFamily_GetFontCount(family); + for (j = 0; j < fontcount; j++) { + DWORD formats, expected_formats; + + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_GetFaceNames(font, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, facenameW, sizeof(facenameW)/sizeof(*facenameW)); + + IDWriteLocalizedStrings_Release(names); + + IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace4, (void **)&fontface4); + + /* 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); + + IDWriteFontFace4_Release(fontface4); + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + } + + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(syscollection); + ref = IDWriteFactory_Release(factory); + ok(ref == 0, "factory not released, %u\n", ref); +} + START_TEST(font) { IDWriteFactory *factory; @@ -7444,6 +7561,7 @@ START_TEST(font) test_HasKerningPairs(); test_ComputeGlyphOrigins(); test_inmemory_file_loader(); + test_GetGlyphImageFormats(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite/tests: Initial tests for IDWriteInMemoryFontFileLoader.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 74f6c99621147e8128e62badd925b2b2e595d3e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74f6c99621147e8128e62badd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:26 2017 +0300 dwrite/tests: Initial tests for IDWriteInMemoryFontFileLoader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 8b16d0e..7488189 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7263,6 +7263,125 @@ static void test_object_lifetime(void) ok(ref == 0, "factory not released, %u\n", ref); } +static void test_inmemory_file_loader(void) +{ + IDWriteFontFileLoader *loader, *loader2; + IDWriteInMemoryFontFileLoader *inmemory; + IDWriteFontFile *file, *file2; + IDWriteFontFileStream *stream; + IDWriteFontFace *fontface; + IDWriteFactory5 *factory5; + IDWriteFactory *factory; + const void *key, *data; + UINT32 count, key_size; + UINT64 file_size; + void *context; + HRESULT hr; + ULONG ref; + + factory = create_factory(); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory5, (void **)&factory5); + IDWriteFactory_Release(factory); + if (FAILED(hr)) { + skip("CreateInMemoryFontFileLoader is not supported\n"); + return; + } + + fontface = create_fontface((IDWriteFactory *)factory5); + hr = IDWriteFactory5_CreateInMemoryFontFileLoader(factory5, &loader); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFactory5_CreateInMemoryFontFileLoader(factory5, &loader2); + ok(hr == S_OK, "got %#x\n", hr); + ok(loader != loader2, "unexpected pointer\n"); + IDWriteFontFileLoader_Release(loader2); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteInMemoryFontFileLoader, (void **)&inmemory); + ok(hr == S_OK, "got %#x\n", hr); + IDWriteFontFileLoader_Release(loader); + + /* Use whole font blob to construct in-memory file. */ + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &file); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, key, key_size, &stream); + ok(hr == S_OK, "got %#x\n", hr); + IDWriteFontFileLoader_Release(loader); + IDWriteFontFile_Release(file); + + hr = IDWriteFontFileStream_GetFileSize(stream, &file_size); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteFontFileStream_ReadFileFragment(stream, &data, 0, file_size, &context); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, + file_size, NULL, &file); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + hr = IDWriteFactory5_RegisterFontFileLoader(factory5, (IDWriteFontFileLoader *)inmemory); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, + file_size, NULL, &file); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, + file_size, NULL, &file2); + ok(hr == S_OK, "got %#x\n", hr); + ok(file2 != file, "got unexpected file\n"); + + /* Check in-memory reference key format. */ + hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); + ok(hr == S_OK, "got %#x\n", hr); + + ok(key && *(DWORD*)key == 1, "got wrong ref key\n"); + ok(key_size == 4, "ref key size %u\n", key_size); + + hr = IDWriteFontFile_GetReferenceKey(file2, &key, &key_size); + ok(hr == S_OK, "got %#x\n", hr); + + ok(key && *(DWORD*)key == 2, "got wrong ref key\n"); + ok(key_size == 4, "ref key size %u\n", key_size); + + /* Release file and index 1, create new one to see if index is reused. */ + IDWriteFontFile_Release(file); + + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory5, data, + file_size, NULL, &file); + ok(hr == S_OK, "got %#x\n", hr); + ok(file2 != file, "got unexpected file\n"); + + hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); + ok(hr == S_OK, "got %#x\n", hr); + + ok(key && *(DWORD*)key == 3, "got wrong ref key\n"); + ok(key_size == 4, "ref key size %u\n", key_size); + + IDWriteFontFile_Release(file); + IDWriteFontFile_Release(file2); + + hr = IDWriteFactory5_UnregisterFontFileLoader(factory5, (IDWriteFontFileLoader *)inmemory); + ok(hr == S_OK, "got %#x\n", hr); + + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + IDWriteFontFileStream_Release(stream); + + IDWriteInMemoryFontFileLoader_Release(inmemory); + + IDWriteFontFace_Release(fontface); + ref = IDWriteFactory5_Release(factory5); + ok(ref == 0, "factory not released, %u\n", ref); +} + START_TEST(font) { IDWriteFactory *factory; @@ -7324,6 +7443,7 @@ START_TEST(font) test_HasVerticalGlyphVariants(); test_HasKerningPairs(); test_ComputeGlyphOrigins(); + test_inmemory_file_loader(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Consistently use common point and rect types.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 672ca3d3b8e4f60d84efccfcd24ea2aba87035a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=672ca3d3b8e4f60d84efccfcd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 19 15:15:24 2017 +0300 dwrite: Consistently use common point and rect types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 111 ++++++++++++++++++++++++--------------------------- 1 file changed, 52 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=672ca3d3b8e4f60d84efc…

1 0

Akihiro Sagawa : include: Add CALG_ECDH_EPHEM family.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 8d2c20575e4959860ea8d6dcecad18420787481b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d2c20575e4959860ea8d6dce… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Apr 17 23:26:03 2017 +0900 include: Add CALG_ECDH_EPHEM family. 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> --- include/wincrypt.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wincrypt.h b/include/wincrypt.h index d8b116e..2af6a57 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -1544,6 +1544,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define ALG_TYPE_STREAM (4 << 9) #define ALG_TYPE_DH (5 << 9) #define ALG_TYPE_SECURECHANNEL (6 << 9) +#define ALG_TYPE_ECDH (7 << 9) /* SIDs */ #define ALG_SID_ANY (0) @@ -1583,6 +1584,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define ALG_SID_AGREED_KEY_ANY 3 #define ALG_SID_KEA 4 #define ALG_SID_ECDH 5 +#define ALG_SID_ECDH_EPHEM 6 /* RC2 SIDs */ #define ALG_SID_RC4 1 #define ALG_SID_RC2 2 @@ -1639,6 +1641,7 @@ typedef const CERT_CRL_CONTEXT_PAIR *PCCERT_CRL_CONTEXT_PAIR; #define CALG_KEA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_KEA) #define CALG_HUGHES_MD5 (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_MD5) #define CALG_ECDH (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_DH | ALG_SID_ECDH) +#define CALG_ECDH_EPHEM (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ECDH | ALG_SID_ECDH_EPHEM) #define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) #define CALG_ECMQV (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_ANY | ALG_SID_ECMQV) #define CALG_DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DES)

1 0

Michael Stefaniuc : wineps.drv: Use SetRect/ SetRectEmpty instead of open coding them.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: e70eb5366950486a55fd0fe238190997afbb670f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70eb5366950486a55fd0fe23… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:04 2017 +0200 wineps.drv: Use SetRect/SetRectEmpty instead of open coding them. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/escape.c | 11 +++-------- dlls/wineps.drv/graphics.c | 28 ++++++++-------------------- dlls/wineps.drv/init.c | 23 +++++++---------------- 3 files changed, 18 insertions(+), 44 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 435376c..636ad2a 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -36,6 +36,7 @@ #include "winbase.h" #include "wingdi.h" #include "wine/wingdi16.h" +#include "winuser.h" #include "winreg.h" #include "psdrv.h" #include "wine/debug.h" @@ -139,17 +140,11 @@ INT PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, RECT *r = out_data; if(!physDev->job.banding) { physDev->job.banding = TRUE; - r->left = 0; - r->top = 0; - r->right = physDev->horzRes; - r->bottom = physDev->vertRes; + SetRect(r, 0, 0, physDev->horzRes, physDev->vertRes); TRACE("NEXTBAND returning %s\n", wine_dbgstr_rect(r)); return 1; } - r->left = 0; - r->top = 0; - r->right = 0; - r->bottom = 0; + SetRectEmpty(r); TRACE("NEXTBAND rect to 0,0 - 0,0\n" ); physDev->job.banding = FALSE; return EndPage( dev->hdc ); diff --git a/dlls/wineps.drv/graphics.c b/dlls/wineps.drv/graphics.c index 7fa0727..ab6fe45 100644 --- a/dlls/wineps.drv/graphics.c +++ b/dlls/wineps.drv/graphics.c @@ -29,6 +29,9 @@ #if !defined(PI) # define PI M_PI #endif +#include "windef.h" +#include "winbase.h" +#include "winuser.h" #include "psdrv.h" #include "wine/debug.h" @@ -103,10 +106,7 @@ BOOL PSDRV_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) TRACE("%d %d - %d %d\n", left, top, right, bottom); - rect.left = left; - rect.top = top; - rect.right = right; - rect.bottom = bottom; + SetRect(&rect, left, top, right, bottom); LPtoDP( dev->hdc, (POINT *)&rect, 2 ); /* Windows does something truly hacky here. If we're in passthrough mode @@ -140,14 +140,8 @@ BOOL PSDRV_RoundRect( PHYSDEV dev, INT left, INT top, INT right, { RECT rect[2]; - rect[0].left = left; - rect[0].top = top; - rect[0].right = right; - rect[0].bottom = bottom; - rect[1].left = 0; - rect[1].top = 0; - rect[1].right = ell_width; - rect[1].bottom = ell_height; + SetRect(&rect[0], left, top, right, bottom); + SetRect(&rect[1], 0, 0, ell_width, ell_height); LPtoDP( dev->hdc, (POINT *)rect, 4 ); left = rect[0].left; @@ -200,10 +194,7 @@ static BOOL PSDRV_DrawArc( PHYSDEV dev, INT left, INT top, RECT rect; POINT start, end; - rect.left = left; - rect.top = top; - rect.right = right; - rect.bottom = bottom; + SetRect(&rect, left, top, right, bottom); LPtoDP( dev->hdc, (POINT *)&rect, 2 ); start.x = xstart; start.y = ystart; @@ -290,10 +281,7 @@ BOOL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) TRACE("%d %d - %d %d\n", left, top, right, bottom); - rect.left = left; - rect.top = top; - rect.right = right; - rect.bottom = bottom; + SetRect(&rect, left, top, right, bottom); LPtoDP( dev->hdc, (POINT *)&rect, 2 ); x = (rect.left + rect.right) / 2; diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index e4e17b0..3b00343 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -33,6 +33,7 @@ #include "winerror.h" #include "winreg.h" #include "winnls.h" +#include "winuser.h" #include "psdrv.h" #include "winspool.h" #include "wine/library.h" @@ -284,22 +285,15 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) if(&page->entry == &physDev->pi->ppd->PageSizes) { FIXME("Can't find page\n"); - physDev->ImageableArea.left = 0; - physDev->ImageableArea.right = 0; - physDev->ImageableArea.bottom = 0; - physDev->ImageableArea.top = 0; + SetRectEmpty(&physDev->ImageableArea); physDev->PageSize.cx = 0; physDev->PageSize.cy = 0; } else if(page->ImageableArea) { /* physDev sizes in device units; ppd sizes in 1/72" */ - physDev->ImageableArea.left = page->ImageableArea->llx * - physDev->logPixelsX / 72; - physDev->ImageableArea.right = page->ImageableArea->urx * - physDev->logPixelsX / 72; - physDev->ImageableArea.bottom = page->ImageableArea->lly * - physDev->logPixelsY / 72; - physDev->ImageableArea.top = page->ImageableArea->ury * - physDev->logPixelsY / 72; + SetRect(&physDev->ImageableArea, page->ImageableArea->llx * physDev->logPixelsX / 72, + page->ImageableArea->ury * physDev->logPixelsY / 72, + page->ImageableArea->urx * physDev->logPixelsX / 72, + page->ImageableArea->lly * physDev->logPixelsY / 72); physDev->PageSize.cx = page->PaperDimension->x * physDev->logPixelsX / 72; physDev->PageSize.cy = page->PaperDimension->y * @@ -323,10 +317,7 @@ static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) physDev->logPixelsY / 254; } else { FIXME("Odd dmFields %x\n", physDev->Devmode->dmPublic.dmFields); - physDev->ImageableArea.left = 0; - physDev->ImageableArea.right = 0; - physDev->ImageableArea.bottom = 0; - physDev->ImageableArea.top = 0; + SetRectEmpty(&physDev->ImageableArea); physDev->PageSize.cx = 0; physDev->PageSize.cy = 0; }

1 0

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

April 19, 2017

Module: wine Branch: master Commit: 79147c8658a05cdcc0a1086937f42109a8d0c2ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=79147c8658a05cdcc0a108693… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Apr 17 21:42:02 2017 +0200 user32: Use SetRectEmpty() instead of memset(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 230f8da..6b47f05 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -417,7 +417,7 @@ static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect /* Index <= 0 is legal even on empty listboxes */ if (index && (index >= descr->nb_items)) { - memset(rect, 0, sizeof(*rect)); + SetRectEmpty(rect); SetLastError(ERROR_INVALID_INDEX); return LB_ERR; }

1 0

Alistair Leslie-Hughes : oleaut32: Remove redundant call to VariantClear() .
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: c082edb4bd37ba05648fe9741a395f7658dc9225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c082edb4bd37ba05648fe9741… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 18 12:07:02 2017 +0100 oleaut32: Remove redundant call to VariantClear(). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/vartype.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index fc5a025..ebb6183 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -134,10 +134,7 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, VariantClear(&srcVar); if (SUCCEEDED(hRet)) - { VARIANT_CopyData(&dstVar, vt, pOut); - VariantClear(&srcVar); - } } else hRet = DISP_E_TYPEMISMATCH;

1 0

Henri Verbeet : usp10: Simplify the "pr_2" assignment in GPOS_apply_ContextPos().
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: 82d36ba63fe2132e1cca73cf23b7f3a92207151a URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d36ba63fe2132e1cca73cf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 17 20:26:59 2017 +0200 usp10: Simplify the "pr_2" assignment 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index ec425a1..e190b92 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2191,8 +2191,7 @@ static unsigned int GPOS_apply_ContextPos(const ScriptCache *script_cache, const } TRACE("Rule matches\n"); - pr_2 = (const GPOS_PosClassRule_2*)((const BYTE*)pr+ - FIELD_OFFSET(GPOS_PosClassRule_1, Class[g_count-1])); + pr_2 = (const GPOS_PosClassRule_2 *)&pr->Class[g_count - 1]; for (l = 0; l < GET_BE_WORD(pr->PosCount); l++) {

1 0

Józef Kucia : wined3d: Invalidate all layers locations for render target views.
by Alexandre Julliard April 19, 2017

April 19, 2017

Module: wine Branch: master Commit: a912c95d96763c0bfc6b5372a65c487f87c04b47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a912c95d96763c0bfc6b5372a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 18 11:24:14 2017 +0200 wined3d: Invalidate all layers locations for render target views. 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/wined3d/drawprim.c | 10 +++------- dlls/wined3d/view.c | 42 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 0b5b5e6..1fde7ea 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -499,16 +499,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s for (i = 0; i < gl_info->limits.buffers; ++i) { - struct wined3d_texture *rt; - if (!(rtv = fb->render_targets[i]) || rtv->format->id == WINED3DFMT_NULL) continue; - rt = wined3d_texture_from_resource(rtv->resource); if (state->render_states[WINED3D_RS_COLORWRITEENABLE]) { wined3d_rendertarget_view_load_location(rtv, context, rtv->resource->draw_binding); - wined3d_texture_invalidate_location(rt, rtv->sub_resource_idx, ~rtv->resource->draw_binding); + wined3d_rendertarget_view_invalidate_location(rtv, ~rtv->resource->draw_binding); } else { @@ -540,11 +537,10 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (dsv && state->render_states[WINED3D_RS_ZWRITEENABLE]) { - struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(dsv); - DWORD location = context->render_offscreen ? ds->container->resource.draw_binding : WINED3D_LOCATION_DRAWABLE; + DWORD location = context->render_offscreen ? dsv->resource->draw_binding : WINED3D_LOCATION_DRAWABLE; wined3d_rendertarget_view_validate_location(dsv, location); - wined3d_texture_invalidate_location(ds->container, dsv->sub_resource_idx, ~location); + wined3d_rendertarget_view_invalidate_location(dsv, ~location); } stream_info = &context->stream_info; diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4e1ea6d..cb3578a 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -270,6 +270,26 @@ static void create_buffer_view(struct wined3d_gl_view *view, struct wined3d_cont create_buffer_texture(view, context, buffer, view_format, offset, size); } +static void wined3d_view_invalidate_location(struct wined3d_resource *resource, + const struct wined3d_view_desc *desc, DWORD location) +{ + unsigned int i, sub_resource_idx, layer_count; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + wined3d_buffer_invalidate_location(buffer_from_resource(resource), location); + return; + } + + texture = texture_from_resource(resource); + + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_invalidate_location(texture, sub_resource_idx, location); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -454,6 +474,11 @@ void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_vie wined3d_texture_validate_location(texture, sub_resource_idx, location); } +void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, DWORD location) +{ + wined3d_view_invalidate_location(view->resource, &view->desc, location); +} + static void wined3d_render_target_view_cs_init(void *object) { struct wined3d_rendertarget_view *view = object; @@ -819,22 +844,7 @@ void * CDECL wined3d_unordered_access_view_get_parent(const struct wined3d_unord void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view, DWORD location) { - struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx, layer_count; - struct wined3d_texture *texture; - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - wined3d_buffer_invalidate_location(buffer_from_resource(resource), location); - return; - } - - texture = texture_from_resource(resource); - - sub_resource_idx = view->desc.u.texture.layer_idx * texture->level_count + view->desc.u.texture.level_idx; - layer_count = (resource->type != WINED3D_RTYPE_TEXTURE_3D) ? view->desc.u.texture.layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) - wined3d_texture_invalidate_location(texture, sub_resource_idx, location); + wined3d_view_invalidate_location(view->resource, &view->desc, location); } static void wined3d_unordered_access_view_cs_init(void *object) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c49e010..cd90eb8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3458,6 +3458,8 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; +void wined3d_rendertarget_view_invalidate_location(struct wined3d_rendertarget_view *view, + DWORD location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view *view,

1 0