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

Thomas Faber : netapi32: Avoid buffer overrun in NetBTNameEncode.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: f53b2588afcba6b435622bbf542be5fe80672d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f53b2588afcba6b435622bbf5… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jun 26 11:02:37 2016 +0200 netapi32: Avoid buffer overrun in NetBTNameEncode. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/nbt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 0f593d5..207bd66 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -171,7 +171,7 @@ static int NetBTNameEncode(const UCHAR *p, UCHAR *buffer) if (!buffer) return 0; buffer[len++] = NCBNAMSZ * 2; - for (i = 0; p[i] && i < NCBNAMSZ; i++) + for (i = 0; i < NCBNAMSZ && p[i]; i++) { buffer[len++] = ((p[i] & 0xf0) >> 4) + 'A'; buffer[len++] = (p[i] & 0x0f) + 'A';

1 0

Nikolay Sivov : dwrite: Fix recently added script properties.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: cedd95e2a8ed449222521fbf8b87f22b2a7a3375 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cedd95e2a8ed449222521fbf8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:56 2016 +0300 dwrite: Fix recently added script properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 62 +++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 5e53a54..81052f9 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -45,7 +45,7 @@ struct dwritescript_properties { static const struct dwritescript_properties dwritescripts_properties[Script_LastId+1] = { { /* Zzzz */ { 0x7a7a7a5a, 999, 15, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, { /* Zyyy */ { 0x7979795a, 998, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Zinh */ { 0x686e695a, 994, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Zinh */ { 0x686e695a, 994, 15, 0x0020, 1, 0, 0, 0, 0, 0, 0 } }, { /* Arab */ { 0x62617241, 160, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 }, _OT('a','r','a','b'), 0, TRUE }, { /* Armn */ { 0x6e6d7241, 230, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','r','m','n') }, { /* Avst */ { 0x74737641, 134, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','v','s','t') }, @@ -139,36 +139,36 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Ugar */ { 0x72616755, 40, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, _OT('u','g','a','r') }, { /* Vaii */ { 0x69696156, 470, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('v','a','i',' '), 0, TRUE }, { /* Yiii */ { 0x69696959, 460, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, _OT('y','i',' ',' '), 0, TRUE }, - { /* Cakm */ { 0x6d6b6143, 349, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('c','a','k','m') }, - { /* Merc */ { 0x6372654d, 101, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('m','e','r','c') }, - { /* Mero */ { 0x6f72654d, 100, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('m','e','r','o') }, - { /* Plrd */ { 0x64726c50, 282, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Shrd */ { 0x64726853, 319, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('s','h','r','d') }, - { /* Sora */ { 0x61726f53, 398, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('s','o','r','a') }, - { /* Takr */ { 0x726b6154, 321, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 }, _OT('t','a','k','r') }, - { /* Bass */ { 0x73736142, 259, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Aghb */ { 0x62686741, 239, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Dupl */ { 0x6c707544, 755, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Elba */ { 0x61626c45, 226, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Gran */ { 0x6e617247, 343, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Khoj */ { 0x6a6f684b, 322, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Sind */ { 0x646e6953, 318, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Lina */ { 0x616e694c, 400, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mahj */ { 0x6a68614d, 314, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mani */ { 0x696e614d, 139, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mend */ { 0x646e654d, 438, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Modi */ { 0x69646f4d, 324, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Mroo */ { 0x6f6f724d, 199, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Nbat */ { 0x7461624e, 159, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Narb */ { 0x6272614e, 106, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Perm */ { 0x6d726550, 227, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Hmng */ { 0x676e6d48, 450, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Palm */ { 0x6d6c6150, 126, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Pauc */ { 0x63756150, 263, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Phlp */ { 0x706c6850, 132, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Sidd */ { 0x64646953, 302, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Tirh */ { 0x68726954, 326, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, - { /* Wara */ { 0x61726157, 262, 1, 0x0020, 0, 0, 0, 0, 0, 0, 0 } }, + { /* Cakm */ { 0x6d6b6143, 349, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('c','a','k','m') }, + { /* Merc */ { 0x6372654d, 101, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','e','r','c') }, + { /* Mero */ { 0x6f72654d, 100, 1, 0x0020, 0, 1, 1, 1, 0, 0, 0 }, _OT('m','e','r','o') }, + { /* Plrd */ { 0x64726c50, 282, 8, 0x0020, 1, 0, 1, 0, 0, 0, 0 } }, + { /* Shrd */ { 0x64726853, 319, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('s','h','r','d') }, + { /* Sora */ { 0x61726f53, 398, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('s','o','r','a') }, + { /* Takr */ { 0x726b6154, 321, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('t','a','k','r') }, + { /* Bass */ { 0x73736142, 259, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Aghb */ { 0x62686741, 239, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Dupl */ { 0x6c707544, 755, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 } }, + { /* Elba */ { 0x61626c45, 226, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Gran */ { 0x6e617247, 343, 15, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Khoj */ { 0x6a6f684b, 322, 15, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Sind */ { 0x646e6953, 318, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Lina */ { 0x616e694c, 400, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 } }, + { /* Mahj */ { 0x6a68614d, 314, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Mani */ { 0x696e614d, 139, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 } }, + { /* Mend */ { 0x646e654d, 438, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Modi */ { 0x69646f4d, 324, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, + { /* Mroo */ { 0x6f6f724d, 199, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Nbat */ { 0x7461624e, 159, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Narb */ { 0x6272614e, 106, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Perm */ { 0x6d726550, 227, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Hmng */ { 0x676e6d48, 450, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Palm */ { 0x6d6c6150, 126, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, + { /* Pauc */ { 0x63756150, 263, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Phlp */ { 0x706c6850, 132, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 } }, + { /* Sidd */ { 0x64646953, 302, 8, 0x0020, 1, 0, 1, 1, 0, 0, 0 } }, + { /* Tirh */ { 0x68726954, 326, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, + { /* Wara */ { 0x61726157, 262, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, }; #undef _OT

1 0

Nikolay Sivov : dwrite: Implement another CreateFontFace() variant.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: bf211623fd39b8d15b97611637a53d61487b05e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf211623fd39b8d15b9761163… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:55 2016 +0300 dwrite: Implement another CreateFontFace() variant. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 24 ++++++++++++------------ dlls/dwrite/tests/font.c | 9 +++++---- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index d635c15..d477ac0 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1496,18 +1496,11 @@ static HRESULT WINAPI dwritefont_HasCharacter(IDWriteFont3 *iface, UINT32 value, return S_OK; } -static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace **face) +static HRESULT WINAPI dwritefont_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace **fontface) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - HRESULT hr; - - TRACE("(%p)->(%p)\n", This, face); - - hr = get_fontface_from_font(This, (IDWriteFontFace3**)face); - if (hr == S_OK) - IDWriteFontFace_AddRef(*face); - - return hr; + TRACE("(%p)->(%p)\n", This, fontface); + return IDWriteFont3_CreateFontFace(iface, (IDWriteFontFace3**)fontface); } static void WINAPI dwritefont1_GetMetrics(IDWriteFont3 *iface, DWRITE_FONT_METRICS1 *metrics) @@ -1572,8 +1565,15 @@ static BOOL WINAPI dwritefont2_IsColorFont(IDWriteFont3 *iface) static HRESULT WINAPI dwritefont3_CreateFontFace(IDWriteFont3 *iface, IDWriteFontFace3 **fontface) { struct dwrite_font *This = impl_from_IDWriteFont3(iface); - FIXME("(%p)->(%p): stub\n", This, fontface); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, fontface); + + hr = get_fontface_from_font(This, fontface); + if (hr == S_OK) + IDWriteFontFace3_AddRef(*fontface); + + return hr; } static BOOL WINAPI dwritefont3_Equals(IDWriteFont3 *iface, IDWriteFont *font) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4fe494a..a1ef3d4 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6177,17 +6177,19 @@ todo_wine /* references returned from IDWriteFontFace3 */ hr = IDWriteFont3_CreateFontFace(font3, &fontface); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (hr == S_OK) { hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace3_GetFontFaceReference(fontface, &ref1); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); +if (hr == S_OK) ok(ref == ref1, "got %p, %p\n", ref1, ref); +if (hr == S_OK) { hr = IDWriteFontFaceReference_CreateFontFace(ref, &fontface1); ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface1 == fontface, "got %p, %p\n", fontface1, fontface); @@ -6195,9 +6197,8 @@ if (hr == S_OK) { IDWriteFontFaceReference_Release(ref); IDWriteFontFaceReference_Release(ref1); - - IDWriteFontFace3_Release(fontface); } + IDWriteFontFace3_Release(fontface); IDWriteFont3_Release(font3); IDWriteFactory3_Release(factory3);

1 0

Hugh McMaster : reg: Free szValue after deleting all registry values ( Coverity).
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 2885170057aa2a1f5b65aa2d04497c3b1570f985 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2885170057aa2a1f5b65aa2d0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 28 11:35:01 2016 +0000 reg: Free szValue after deleting all registry values (Coverity). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 38861f8..0d6bec4 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -481,6 +481,7 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name } else break; } + HeapFree(GetProcessHeap(), 0, szValue); } else if (value_name || value_empty) {

1 0

Nikolay Sivov : dwrite: Return some of font properties from IDWriteFontFace3 methods.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 90bcff0eae717138bc7da6256c8ce61d0e1a13a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bcff0eae717138bc7da6256… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 5 12:55:53 2016 +0300 dwrite: Return some of font properties from IDWriteFontFace3 methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bidi.c | 1 - dlls/dwrite/dwrite_private.h | 17 ++++- dlls/dwrite/font.c | 144 +++++++++++++++++++++++++++++++------------ dlls/dwrite/layout.c | 1 - dlls/dwrite/main.c | 142 ++++++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 63 +++++++++++++++++-- 6 files changed, 264 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90bcff0eae717138bc7da…

1 0

Michael Stefaniuc : gdi32: Use wine_dbgstr_rect() to trace a RECT.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 8acdf5e7bf4cc567c69ed0354f1b3854a7c03aae URL: http://source.winehq.org/git/wine.git/?a=commit;h=8acdf5e7bf4cc567c69ed0354… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 10:03:52 2016 +0200 gdi32: Use wine_dbgstr_rect() to trace a RECT. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index cab30e9..cffac37 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2382,8 +2382,7 @@ BOOL WINAPI EnumEnhMetaFile( double xSrcPixSize, ySrcPixSize, xscale, yscale; XFORM xform; - TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", - lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, + TRACE("rect: %s. rclFrame: (%d,%d)-(%d,%d)\n", wine_dbgstr_rect(lpRect), emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, emh->rclFrame.bottom);

1 0

Piotr Caban : msvcrt: Remove unused call_dtor function.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 4facdec6863bcb46a7f4f73b59fb6bb9d9689855 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4facdec6863bcb46a7f4f73b5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jul 4 11:04:47 2016 +0200 msvcrt: Remove unused call_dtor function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index f7f486d..c939585 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -161,12 +161,6 @@ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vb : : "r" (func), "c" (this), "r" (src) : "eax", "edx", "memory" ); } -/* call the destructor of the exception object */ -static inline void call_dtor( void *func, void *object ) -{ - __asm__ __volatile__("call *%0" : : "r" (func), "c" (object) : "eax", "edx", "memory" ); -} - /* continue execution to the specified address after exception is caught */ static inline void DECLSPEC_NORETURN continue_after_catch( cxx_exception_frame* frame, void *addr ) {

1 0

Huw Davies : gdi32: Try to compact the region.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 6526ac1999f99a9e24ee2002219b39a9a7e2126e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6526ac1999f99a9e24ee20022… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 4 09:05:45 2016 +0100 gdi32: Try to compact the region. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 834e6be..646512f 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -1598,6 +1598,28 @@ static INT REGION_Coalesce ( return (curStart); } +/********************************************************************** + * REGION_compact + * + * To keep regions from growing without bound, shrink the array of rectangles + * to match the new number of rectangles in the region. + * + * Only do this if the number of rectangles allocated is more than + * twice the number of rectangles in the region. + */ +static void REGION_compact( WINEREGION *reg ) +{ + if ((reg->numRects < reg->size / 2) && (reg->numRects > 2)) + { + RECT *new_rects = HeapReAlloc( GetProcessHeap(), 0, reg->rects, reg->numRects * sizeof(RECT) ); + if (new_rects) + { + reg->rects = new_rects; + reg->size = reg->numRects; + } + } +} + /*********************************************************************** * REGION_RegionOp * @@ -1839,23 +1861,7 @@ static BOOL REGION_RegionOp( REGION_Coalesce (&newReg, prevBand, curBand); } - /* - * A bit of cleanup. To keep regions from growing without bound, - * we shrink the array of rectangles to match the new number of - * rectangles in the region. This never goes to 0, however... - * - * Only do this stuff if the number of rectangles allocated is more than - * twice the number of rectangles in the region (a simple optimization...). - */ - if ((newReg.numRects < (newReg.size >> 1)) && (newReg.numRects > 2)) - { - RECT *new_rects = HeapReAlloc( GetProcessHeap(), 0, newReg.rects, newReg.numRects * sizeof(RECT) ); - if (new_rects) - { - newReg.rects = new_rects; - newReg.size = newReg.numRects; - } - } + REGION_compact( &newReg ); HeapFree( GetProcessHeap(), 0, destReg->rects ); destReg->rects = newReg.rects; destReg->size = newReg.size; @@ -2633,8 +2639,9 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re extents->right = 0; extents->bottom = 0; } + REGION_compact( reg ); - return(TRUE); + return TRUE; } /***********************************************************************

1 0

Michael Stefaniuc : qedit: Avoid casting a COM object to an iface.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 9525b1e2cfc16152e6cf6d77d2af5858d573c57b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9525b1e2cfc16152e6cf6d77d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 5 09:54:00 2016 +0200 qedit: Avoid casting a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 151827e..7cbc0f8 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1300,7 +1300,8 @@ HRESULT SampleGrabber_create(IUnknown *pUnkOuter, LPVOID *ppv) else obj->outer_unk = &obj->IUnknown_inner; - hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown*)obj, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&obj->seekthru_unk); + hr = CoCreateInstance(&CLSID_SeekingPassThru, &obj->IUnknown_inner, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&obj->seekthru_unk); if(hr) return hr; IUnknown_QueryInterface(obj->seekthru_unk, &IID_ISeekingPassThru, (void**)&passthru);

1 0

Huw Davies : gdi32: Try to coalesce into wider bands.
by Alexandre Julliard July 5, 2016

July 5, 2016

Module: wine Branch: master Commit: 27375d847680ff68a1a5526a2ab6de042d3cef23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27375d847680ff68a1a5526a2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 4 09:05:44 2016 +0100 gdi32: Try to coalesce into wider bands. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 55bd04d..834e6be 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2589,10 +2589,9 @@ static void REGION_FreeStorage(ScanLineListBlock *pSLLBlock) */ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *reg ) { - RECT *rects; POINT *pts; struct point_block *pb; - int i, size; + int i, size, cur_band = 0, prev_band = 0; RECT *extents; extents = &reg->extents; @@ -2600,7 +2599,6 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re for (pb = FirstPtBlock, size = 0; pb; pb = pb->next) size += pb->count; if (!init_region( reg, size )) return FALSE; - rects = reg->rects - 1; extents->left = LARGE_COORDINATE, extents->right = SMALL_COORDINATE; for (pb = FirstPtBlock; pb; pb = pb->next) @@ -2610,15 +2608,14 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re for (pts = pb->pts; i--; pts += 2) { if (pts->x == pts[1].x) continue; - if (reg->numRects && pts->x == rects->left && pts->y == rects->bottom && - pts[1].x == rects->right && - (reg->numRects == 1 || rects[-1].top != rects->top) && - (i && pts[2].y > pts[1].y)) { - rects->bottom = pts[1].y + 1; - continue; - } + + if (reg->numRects && pts[0].y != reg->rects[cur_band].top) + { + prev_band = REGION_Coalesce( reg, prev_band, cur_band ); + cur_band = reg->numRects; + } + add_rect( reg, pts[0].x, pts[0].y, pts[1].x, pts[1].y + 1 ); - rects++; if (pts[0].x < extents->left) extents->left = pts[0].x; if (pts[1].x > extents->right) @@ -2627,6 +2624,7 @@ static BOOL REGION_PtsToRegion( struct point_block *FirstPtBlock, WINEREGION *re } if (reg->numRects) { + REGION_Coalesce( reg, prev_band, cur_band ); extents->top = reg->rects[0].top; extents->bottom = reg->rects[reg->numRects-1].bottom; } else {

1 0