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

Sebastian Lackner : comctl32/syslink: Fix a blocks leak (Valgrind).
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: f4640b04925e0044f6e32bb7d48c85117052a599 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4640b04925e0044f6e32bb7d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri May 20 08:04:21 2016 +0300 comctl32/syslink: Fix a blocks leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/syslink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 7e0b49b..f7655b6 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -122,6 +122,8 @@ static VOID SYSLINK_FreeDocItem (PDOC_ITEM DocItem) Free(DocItem->u.Link.szUrl); } + Free(DocItem->Blocks); + /* we don't free Text because it's just a pointer to a character in the entire window text string */

1 0

Henri Verbeet : kernel32/nls: Fix LOCALE_IFIRSTDAYOFWEEK for LANG_PERSIAN.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 918089eedf1944a625742b033c3c312a5a4d1ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=918089eedf1944a625742b033… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 19 18:02:46 2016 +0200 kernel32/nls: Fix LOCALE_IFIRSTDAYOFWEEK for LANG_PERSIAN. The first day of the week is شنبه, not یک‌شنبه. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 114088b..cd1d0d8 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -39,7 +39,7 @@ STRINGTABLE LANGUAGE LANG_PERSIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTUNIXCODEPAGE "65001" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "0" - LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTDAYOFWEEK "5" LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IINTLCURRDIGITS "2" LOCALE_ILANGUAGE "0429"

1 0

Paul Gofman : d3dx9/tests: Extend effect preshader test.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: be4c5f5022e136690d1c3106dcf22e116af4bed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be4c5f5022e136690d1c3106d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue May 17 18:47:41 2016 +0300 d3dx9/tests: Extend effect preshader test. 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 | 884 ++++++++++++++++++++++++++----------------- 1 file changed, 535 insertions(+), 349 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be4c5f5022e136690d1c3…

1 0

Jacek Caban : d3d11.idl: Added CD3D11_QUERY_DESC declaration.
by Alexandre Julliard May 20, 2016

May 20, 2016

Module: wine Branch: master Commit: 808b00d6e003954cd83b40326b1cf94ddbb51ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=808b00d6e003954cd83b40326… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 19 13:16:08 2016 +0200 d3d11.idl: Added CD3D11_QUERY_DESC declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index b49d6f4..9d4d8fd 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -632,6 +632,21 @@ typedef struct D3D11_QUERY_DESC UINT MiscFlags; } D3D11_QUERY_DESC; +cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined(__cplusplus)") +cpp_quote("struct CD3D11_QUERY_DESC : public D3D11_QUERY_DESC {") +cpp_quote(" CD3D11_QUERY_DESC() {}") +cpp_quote(" ~CD3D11_QUERY_DESC() {}") +cpp_quote(" explicit CD3D11_QUERY_DESC(const D3D11_QUERY_DESC &other) : D3D11_QUERY_DESC(other) {}") +cpp_quote(" explicit CD3D11_QUERY_DESC(D3D11_QUERY query, UINT misc_flags = 0) {") +cpp_quote(" Query = query;") +cpp_quote(" MiscFlags = misc_flags;") +cpp_quote(" }") +cpp_quote(" operator const D3D11_QUERY_DESC&() const {") +cpp_quote(" return *this;") +cpp_quote(" }") +cpp_quote("};") +cpp_quote("#endif") + typedef struct D3D11_RASTERIZER_DESC { D3D11_FILL_MODE FillMode;

1 0

Andrew Eikum : winegstreamer: Fix IQualityControl::Notify.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 1517bfb1863667b39117762c448a3f43bc4852bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1517bfb1863667b39117762c4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:14:48 2016 -0500 winegstreamer: Fix IQualityControl::Notify. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index f0b30e2..97648bc 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1663,15 +1663,28 @@ static ULONG WINAPI GST_QualityControl_Release(IQualityControl *iface) static HRESULT WINAPI GST_QualityControl_Notify(IQualityControl *iface, IBaseFilter *sender, Quality qm) { GSTOutPin *pin = impl_from_IQualityControl(iface); - REFERENCE_TIME late = qm.Late; + GstEvent *evt; + TRACE("(%p)->(%p, { 0x%x %u %s %s })\n", pin, sender, qm.Type, qm.Proportion, wine_dbgstr_longlong(qm.Late), wine_dbgstr_longlong(qm.TimeStamp)); + mark_wine_thread(); - if (qm.Late < 0 && -qm.Late > qm.TimeStamp) - late = -qm.TimeStamp; - gst_pad_push_event(pin->my_sink, gst_event_new_qos(late <= 0 ? GST_QOS_TYPE_OVERFLOW : GST_QOS_TYPE_UNDERFLOW, 1000./qm.Proportion, late*100, qm.TimeStamp*100)); + + if (qm.Type == Flood) + qm.Late = 0; + + evt = gst_event_new_qos(qm.Type == Famine ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, + qm.Proportion / 1000., qm.Late * 100, qm.TimeStamp * 100); + + if (!evt) { + WARN("Failed to create QOS event\n"); + return E_INVALIDARG; + } + + gst_pad_push_event(pin->my_sink, evt); + return S_OK; }

1 0

Andrew Eikum : winegstreamer: Set offset on GstBuffer.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 29deae351b4a4460fe8d7a04af88325dac420a0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29deae351b4a4460fe8d7a04a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:14:51 2016 -0500 winegstreamer: Set offset on GstBuffer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 97648bc..d71225d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -712,6 +712,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 ERR("Returned %08x\n", hr); return GST_FLOW_ERROR; } + + GST_BUFFER_OFFSET(*buf) = ofs; return GST_FLOW_OK; }

1 0

Andrey Gusev : gdi32: Fix a typo in a pointer name in primitive_funcs.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 9a80284e1a886ff7e01d33f68715c9bfdb773459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a80284e1a886ff7e01d33f68… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 19 17:16:12 2016 +0300 gdi32: Fix a typo in a pointer name in primitive_funcs. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 4152f2e..c64058b 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -177,7 +177,7 @@ typedef struct primitive_funcs void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); void (* solid_line)(const dib_info *dib, const POINT *start, const struct line_params *params, DWORD and, DWORD xor); - void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *orign, + void (* pattern_rects)(const dib_info *dib, int num, const RECT *rc, const POINT *origin, const dib_info *brush, const rop_mask_bits *bits); void (* copy_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2, int overlap);

1 0

Henri Verbeet : kernel32/nls: Use ZWNJ where appropriate in far.nls.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: d5620dd54bdaa739f41ca6a7cb95da0ce7c1e88c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5620dd54bdaa739f41ca6a7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:21 2016 +0200 kernel32/nls: Use ZWNJ where appropriate in far.nls. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index 07e2a57..3fc430c 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -66,12 +66,12 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_S2359 "ب.ظ" LOCALE_SABBREVCTRYNAME "IRN" LOCALE_SABBREVDAYNAME1 "دوشنبه" - LOCALE_SABBREVDAYNAME2 "سه شنبه" + LOCALE_SABBREVDAYNAME2 "سه‌شنبه" LOCALE_SABBREVDAYNAME3 "چهارشنبه" - LOCALE_SABBREVDAYNAME4 "پنجشنبه" + LOCALE_SABBREVDAYNAME4 "پنج‌شنبه" LOCALE_SABBREVDAYNAME5 "جمعه" LOCALE_SABBREVDAYNAME6 "شنبه" - LOCALE_SABBREVDAYNAME7 "یکشنبه" + LOCALE_SABBREVDAYNAME7 "یک‌شنبه" LOCALE_SABBREVLANGNAME "FAR" LOCALE_SABBREVMONTHNAME1 "ژانویه" LOCALE_SABBREVMONTHNAME2 "فوریه" @@ -90,12 +90,12 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_SCURRENCY "ریال" LOCALE_SDATE "/" LOCALE_SDAYNAME1 "دوشنبه" - LOCALE_SDAYNAME2 "سه شنبه" + LOCALE_SDAYNAME2 "سه‌شنبه" LOCALE_SDAYNAME3 "چهارشنبه" - LOCALE_SDAYNAME4 "پنجشنبه" + LOCALE_SDAYNAME4 "پنج‌شنبه" LOCALE_SDAYNAME5 "جمعه" LOCALE_SDAYNAME6 "شنبه" - LOCALE_SDAYNAME7 "یکشنبه" + LOCALE_SDAYNAME7 "یک‌شنبه" LOCALE_SDECIMAL "." LOCALE_SENGCOUNTRY "Iran" LOCALE_SENGCURRNAME "Iranian Rial"

1 0

Henri Verbeet : usp10: Resolve BNs and explicit formatting characters to the preceding level in resolveResolved ().
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 71cabaa4b93f040e16519c6f8253673480995ac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71cabaa4b93f040e16519c6f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:18 2016 +0200 usp10: Resolve BNs and explicit formatting characters to the preceding level in resolveResolved(). As in section 5.2 of the Unicode Bidirectional Algorithm. 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/bidi.c | 5 +++++ dlls/usp10/tests/usp10.c | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index caa266b..5adce9d 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -969,6 +969,11 @@ static void resolveResolved(unsigned baselevel, const WORD * pcls, WORD *plevel, plevel[j--] = baselevel; plevel[i] = baselevel; } + else if (pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || pcls[i] == RLO || + pcls[i] == PDF || pcls[i] == BN) + { + plevel[i] = i ? plevel[i - 1] : baselevel; + } if (i == eos && (pcls[i] == WS || pcls[i] == FSI || pcls[i] == LRI || pcls[i] == RLI || pcls[i] == PDI || pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 7881667..d0c698f 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -563,6 +563,11 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, {{0,0,0,0,0,0},2,0,1,0,1,0,FALSE}, {{0,0,0,0,0,0},8,0,0,0,0,-1,FALSE}}; + /* ZWNJ */ + static const WCHAR test56[] = {0x0645, 0x06cc, 0x200c, 0x06a9, 0x0646, 0x0645}; /* می‌کنم */ + static const itemTest t561[] = {{{0,0,0,0,0,0},0,1,1,1,0,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + static const itemTest t562[] = {{{0,0,0,0,0,0},0,0,0,0,1,arab_tag,FALSE},{{0,0,0,0,0,0},6,0,0,0,0,-1,FALSE}}; + SCRIPT_ITEM items[15]; SCRIPT_CONTROL Control; SCRIPT_STATE State; @@ -643,6 +648,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test45,24,NULL,NULL,1,t451,FALSE,0); test_items_ok(test46,16,NULL,NULL,1,t461,FALSE,0); test_items_ok(test47,26,NULL,NULL,1,t471,FALSE,0); + test_items_ok(test56,6,NULL,NULL,1,t561,FALSE,0); State.uBidiLevel = 0; test_items_ok(test1,4,&Control,&State,1,t11,FALSE,0); @@ -705,6 +711,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test53,8,&Control,&State,4,t531,FALSE,0); test_items_ok(test54,7,&Control,&State,2,t541,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t551,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 1; test_items_ok(test1,4,&Control,&State,1,t12,FALSE,0); @@ -759,6 +766,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 1; Control.fMergeNeutralItems = TRUE; @@ -814,6 +822,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test45,24,&Control,&State,1,t452,FALSE,0); test_items_ok(test46,16,&Control,&State,1,t462,FALSE,0); test_items_ok(test47,26,&Control,&State,1,t472,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t561,FALSE,0); State.uBidiLevel = 0; Control.fMergeNeutralItems = FALSE; @@ -878,6 +887,7 @@ static const itemTest t74[4] = {{{0,0,0,0,0,0},0,0,0,0,1,latn_tag,FALSE}, test_items_ok(test53,8,&Control,&State,4,t532,FALSE,0); test_items_ok(test54,7,&Control,&State,2,t542,FALSE,0); test_items_ok(test55,8,&Control,&State,2,t552,FALSE,0); + test_items_ok(test56,6,&Control,&State,1,t562,FALSE,0); } static inline void _test_shape_ok(int valid, HDC hdc, LPCWSTR string,

1 0

Józef Kucia : wined3d: Forbid to create BC{1, 2, 3}_UNORM_SRGB 3D textures.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: f9705e3c6cb3592295e4ec4d3d7284f03c0b6055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9705e3c6cb3592295e4ec4d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 10:49:42 2016 +0200 wined3d: Forbid to create BC{1, 2, 3}_UNORM_SRGB 3D textures. 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/utils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index cbfd368..8769bd7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3072,10 +3072,16 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC1_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC1_UNORM_SRGB); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC2_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC2_UNORM_SRGB); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC3_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC3_UNORM_SRGB); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */ idx = get_format_idx(WINED3DFMT_ATI1N); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE;

1 0