June 2015 - Wine-commits - list.winehq.org

Michael Stefaniuc : dmusic: Remove old and ugly COM macros.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: abb0a22d31974cd2f63603f7ad75c41dc8fc2983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abb0a22d31974cd2f63603f7a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 29 11:00:05 2015 +0200 dmusic: Remove old and ugly COM macros. --- dlls/dmusic/dmusic_private.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 9ac05d6..44d5d57 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -248,10 +248,6 @@ static inline void DMUSIC_UnlockModule(void) { InterlockedDecrement( &DMUSIC_ref /***************************************************************************** * Misc. */ -/* my custom ICOM stuff */ -#define ICOM_NAME_MULTI(impl,field,iface,name) impl* const name=(impl*)((char*)(iface) - offsetof(impl,field)) -#define ICOM_THIS_MULTI(impl,field,iface) ICOM_NAME_MULTI(impl,field,iface,This) - /* for simpler reading */ typedef struct _DMUS_PRIVATE_CHUNK { FOURCC fccID; /* FOURCC ID of the chunk */

1 0

Piotr Caban : msvcirt: Fix ostrstream::ostrstream() constructor stub.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 9249f393c25cb4dc18869483472e9d135dba351f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9249f393c25cb4dc188694834… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 29 10:22:07 2015 +0200 msvcirt: Fix ostrstream::ostrstream() constructor stub. --- dlls/msvcirt/msvcirt.c | 18 +++++++++++++----- dlls/msvcirt/msvcirt.spec | 8 ++++---- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 0979673..960cd90 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -696,13 +696,21 @@ void * __thiscall MSVCIRT_ios_sl_void(class_ios * _this) /****************************************************************** * ??0ostrstream@@QAE(a)XZ (MSVCRTI.@) - * class ostream & __thiscall ostrstream::ostrstream<<(void) */ -DEFINE_THISCALL_WRAPPER(MSVCIRT_ostrstream_sl_void,4) -void * __thiscall MSVCIRT_ostrstream_sl_void(class_ostream * _this) +DEFINE_THISCALL_WRAPPER(MSVCIRT_ostrstream_ctor,8) +void * __thiscall MSVCIRT_ostrstream_ctor(class_ostream *this, BOOL virt_init) { - FIXME("(%p) stub\n", _this); - return _this; + FIXME("(%p %x) stub\n", this, virt_init); + return this; +} + +/****************************************************************** + * ??1ostrstream@@UAE(a)XZ (MSVCRTI.@) + */ +DEFINE_THISCALL_WRAPPER(MSVCIRT_ostrstream_dtor,4) +void __thiscall MSVCIRT_ostrstream_dtor(class_ios *base) +{ + FIXME("(%p) stub\n", base); } /****************************************************************** diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 0c9e520..36d42ee 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -96,8 +96,8 @@ @ stub -arch=win64 ??0ostrstream@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE(a)PADHH@Z # __thiscall ostrstream::ostrstream(char *,int,int) @ stub -arch=win64 ??0ostrstream@@QEAA(a)PEADHH@Z -@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr) MSVCIRT_ostrstream_sl_void # __thiscall ostrstream::ostrstream(void) -@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr) MSVCIRT_ostrstream_sl_void +@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr long) MSVCIRT_ostrstream_ctor +@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr long) MSVCIRT_ostrstream_ctor @ stub -arch=win32 ??0stdiobuf@@QAE(a)ABV0@@Z # __thiscall stdiobuf::stdiobuf(class stdiobuf const &) @ stub -arch=win64 ??0stdiobuf@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0stdiobuf@@QAE(a)PAU_iobuf@@@Z # __thiscall stdiobuf::stdiobuf(struct _iobuf *) @@ -158,8 +158,8 @@ @ stub -arch=win64 ??1ostream@@UEAA(a)XZ @ stub -arch=win32 ??1ostream_withassign@@UAE(a)XZ # virtual __thiscall ostream_withassign::~ostream_withassign(void) @ stub -arch=win64 ??1ostream_withassign@@UEAA(a)XZ -@ thiscall -arch=win32 ??1ostrstream@@UAE(a)XZ(ptr) MSVCIRT_ostrstream_sl_void # virtual __thiscall ostrstream::~ostrstream(void) -@ cdecl -arch=win64 ??1ostrstream@@UEAA(a)XZ(ptr) MSVCIRT_ostrstream_sl_void +@ thiscall -arch=win32 ??1ostrstream@@UAE(a)XZ(ptr) MSVCIRT_ostrstream_dtor +@ cdecl -arch=win64 ??1ostrstream@@UEAA(a)XZ(ptr) MSVCIRT_ostrstream_dtor @ stub -arch=win32 ??1stdiobuf@@UAE(a)XZ # virtual __thiscall stdiobuf::~stdiobuf(void) @ stub -arch=win64 ??1stdiobuf@@UEAA(a)XZ @ stub -arch=win32 ??1stdiostream@@UAE(a)XZ # virtual __thiscall stdiostream::~stdiostream(void) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index c7b28bd..fe1d80c 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -86,8 +86,8 @@ @ stub -arch=win64 ??0ostrstream@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE(a)PADHH@Z @ stub -arch=win64 ??0ostrstream@@QEAA(a)PEADHH@Z -@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr) msvcirt.??0ostrstream@@QAE(a)XZ -@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr) msvcirt.??0ostrstream@@QEAA(a)XZ +@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr long) msvcirt.??0ostrstream@@QAE(a)XZ +@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr long) msvcirt.??0ostrstream@@QEAA(a)XZ @ stub -arch=win32 ??0stdiobuf@@QAE(a)ABV0@@Z @ stub -arch=win64 ??0stdiobuf@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0stdiobuf@@QAE(a)PAU_iobuf@@@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 49df71c..6fa3078 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -108,8 +108,8 @@ @ stub -arch=win64 ??0ostrstream@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE(a)PADHH@Z @ stub -arch=win64 ??0ostrstream@@QEAA(a)PEADHH@Z -@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr) msvcirt.??0ostrstream@@QAE(a)XZ -@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr) msvcirt.??0ostrstream@@QEAA(a)XZ +@ thiscall -arch=win32 ??0ostrstream@@QAE(a)XZ(ptr long) msvcirt.??0ostrstream@@QAE(a)XZ +@ cdecl -arch=win64 ??0ostrstream@@QEAA(a)XZ(ptr long) msvcirt.??0ostrstream@@QEAA(a)XZ @ stub -arch=win32 ??0stdiobuf@@QAE(a)ABV0@@Z @ stub -arch=win64 ??0stdiobuf@@QEAA(a)AEBV0@@Z @ stub -arch=win32 ??0stdiobuf@@QAE(a)PAU_iobuf@@@Z

1 0

Nikolay Sivov : dwrite: Update current line count when adding metrics for new line.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 3976cc459d84bb37d7f0addd35c655c41519055b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3976cc459d84bb37d7f0addd3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 12:51:14 2015 +0300 dwrite: Update current line count when adding metrics for new line. --- dlls/dwrite/layout.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 611a1e6..2fe1c41 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1033,6 +1033,7 @@ static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_ } layout->lines[*line] = *metrics; + layout->line_count += 1; *line += 1; return S_OK; } @@ -1198,8 +1199,6 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) textpos += layout->clustermetrics[i].length; } - layout->line_count = line; - /* Now all line info is here, update effective runs positions in flow direction */ erun = layout_get_next_erun(layout, NULL); inrun = layout_get_next_inline_run(layout, NULL);

1 0

Nikolay Sivov : dwrite: Fix number of clusters effective run is built on.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 9c54176f5c34c211cb26235789e471cfb515fd36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c54176f5c34c211cb2623578… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 12:51:43 2015 +0300 dwrite: Fix number of clusters effective run is built on. --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 2fe1c41..9f3b9c4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1131,7 +1131,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) last_cluster = i ? i - 1 : i; if (i >= start) { - hr = layout_add_effective_run(layout, run, start, i - start + 1, line, origin_x, s[0]); + hr = layout_add_effective_run(layout, run, start, last_cluster - start + 1, line, origin_x, s[0]); if (FAILED(hr)) return hr; /* we don't need to update origin for next run as we're going to wrap */

1 0

Nikolay Sivov : dwrite: Clip range length to text length when updating breakpoints.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 1002119a6082a8bce118bec4190d0b54c99778de URL: http://source.winehq.org/git/wine.git/?a=commit;h=1002119a6082a8bce118bec41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 12:52:04 2015 +0300 dwrite: Clip range length to text length when updating breakpoints. --- dlls/dwrite/layout.c | 25 +++++++++++++------------ dlls/dwrite/tests/layout.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 9f3b9c4..3863e5c 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -423,12 +423,21 @@ static inline DWRITE_BREAK_CONDITION override_break_condition(DWRITE_BREAK_CONDI return existingbreak; } +/* This helper should be used to get effective range length, in other words it returns number of text + positions from range starting point to the end of the range, limited by layout text length */ +static inline UINT32 get_clipped_range_length(const struct dwrite_textlayout *layout, const struct layout_range *range) +{ + if (range->h.range.startPosition + range->h.range.length <= layout->len) + return range->h.range.length; + return layout->len - range->h.range.startPosition; +} + /* Actual breakpoint data gets updated with break condition required by inline object set for range 'cur'. */ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, const struct layout_range *cur) { DWRITE_BREAK_CONDITION before, after; + UINT32 i, length; HRESULT hr; - UINT32 i; /* ignore returned conditions if failed */ hr = IDWriteInlineObject_GetBreakConditions(cur->object, &before, &after); @@ -442,7 +451,8 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, memcpy(layout->actual_breakpoints, layout->nominal_breakpoints, sizeof(DWRITE_LINE_BREAKPOINT)*layout->len); } - for (i = cur->h.range.startPosition; i < cur->h.range.length + cur->h.range.startPosition; i++) { + length = get_clipped_range_length(layout, cur); + for (i = cur->h.range.startPosition; i < length + cur->h.range.startPosition; i++) { /* for first codepoint check if there's anything before it and update accordingly */ if (i == cur->h.range.startPosition) { if (i > 0) @@ -453,7 +463,7 @@ static HRESULT layout_update_breakpoints_range(struct dwrite_textlayout *layout, layout->actual_breakpoints[i].breakConditionAfter = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; } /* similar check for last codepoint */ - else if (i == cur->h.range.startPosition + cur->h.range.length - 1) { + else if (i == cur->h.range.startPosition + length - 1) { if (i == layout->len - 1) layout->actual_breakpoints[i].breakConditionAfter = after; else @@ -568,15 +578,6 @@ static void layout_set_cluster_metrics(struct dwrite_textlayout *layout, const s } } -/* This helper should be used to get effective range length, in other words it returns number of text - positions from range starting point to the end of the range, limited by layout text length */ -static inline UINT32 get_clipped_range_length(const struct dwrite_textlayout *layout, const struct layout_range *range) -{ - if (range->h.range.startPosition + range->h.range.length <= layout->len) - return range->h.range.length; - return layout->len - range->h.range.startPosition; -} - static inline FLOAT get_scaled_font_metric(UINT32 metric, FLOAT emSize, const DWRITE_FONT_METRICS *metrics) { return (FLOAT)metric * emSize / (FLOAT)metrics->designUnitsPerEm; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ecf4183..c7ca5b7 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -591,6 +591,13 @@ static HRESULT WINAPI testinlineobj_GetBreakConditions(IDWriteInlineObject *ifac return 0x8feacafe; } +static HRESULT WINAPI testinlineobj2_GetBreakConditions(IDWriteInlineObject *iface, DWRITE_BREAK_CONDITION *before, + DWRITE_BREAK_CONDITION *after) +{ + *before = *after = DWRITE_BREAK_CONDITION_MAY_NOT_BREAK; + return S_OK; +} + static IDWriteInlineObjectVtbl testinlineobjvtbl = { testinlineobj_QI, testinlineobj_AddRef, @@ -601,8 +608,19 @@ static IDWriteInlineObjectVtbl testinlineobjvtbl = { testinlineobj_GetBreakConditions }; +static IDWriteInlineObjectVtbl testinlineobjvtbl2 = { + testinlineobj_QI, + testinlineobj_AddRef, + testinlineobj_Release, + testinlineobj_Draw, + testinlineobj_GetMetrics, + testinlineobj_GetOverhangMetrics, + testinlineobj2_GetBreakConditions +}; + static IDWriteInlineObject testinlineobj = { &testinlineobjvtbl }; static IDWriteInlineObject testinlineobj2 = { &testinlineobjvtbl }; +static IDWriteInlineObject testinlineobj3 = { &testinlineobjvtbl2 }; static HRESULT WINAPI testeffect_QI(IUnknown *iface, REFIID riid, void **obj) { @@ -1728,6 +1746,26 @@ todo_wine ok(count == 2, "got %u\n", count); ok(metrics[0].isWhitespace == 0, "got %d\n", metrics[0].isWhitespace); ok(metrics[1].isWhitespace == 1, "got %d\n", metrics[1].isWhitespace); + ok(metrics[1].canWrapLineAfter == 1, "got %d\n", metrics[1].canWrapLineAfter); + IDWriteTextLayout_Release(layout); + + /* layout is fully covered by inline object with after condition DWRITE_BREAK_CONDITION_MAY_NOT_BREAK */ + hr = IDWriteFactory_CreateTextLayout(factory, str4W, 2, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetInlineObject(layout, &testinlineobj3, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 2, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); +todo_wine + ok(metrics[0].canWrapLineAfter == 1, "got %d\n", metrics[0].canWrapLineAfter); + IDWriteTextLayout_Release(layout); IDWriteInlineObject_Release(trimm);

1 0

Nikolay Sivov : dwrite: Always set canWrapLineAfter for last cluster.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: e27a13e3a2b92f9d8103ea202c5f15f57c2ceefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27a13e3a2b92f9d8103ea202… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 29 12:52:38 2015 +0300 dwrite: Always set canWrapLineAfter for last cluster. --- dlls/dwrite/layout.c | 5 ++++- dlls/dwrite/tests/layout.c | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3863e5c..752bd50 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -825,8 +825,11 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) break; } - if (hr == S_OK) + if (hr == S_OK) { layout->cluster_count = cluster; + if (cluster) + layout->clustermetrics[cluster-1].canWrapLineAfter = TRUE; + } IDWriteTextAnalyzer_Release(analyzer); return hr; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c7ca5b7..43233f4 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1659,7 +1659,6 @@ todo_wine ok(metrics[2].width > 0.0, "got %.2f\n", metrics[2].width); ok(metrics[2].length == 1, "got %d\n", metrics[2].length); -todo_wine ok(metrics[2].canWrapLineAfter == 1, "got %d\n", metrics[2].canWrapLineAfter); ok(metrics[2].isWhitespace == 0, "got %d\n", metrics[2].isWhitespace); ok(metrics[2].isNewline == 0, "got %d\n", metrics[2].isNewline); @@ -1686,7 +1685,6 @@ todo_wine /* object sets a width to 123.0, but returns failure from GetMetrics() */ ok(metrics[0].width == 0.0, "got %.2f\n", metrics[0].width); ok(metrics[0].length == 4, "got %d\n", metrics[0].length); -todo_wine ok(metrics[0].canWrapLineAfter == 1, "got %d\n", metrics[0].canWrapLineAfter); ok(metrics[0].isWhitespace == 0, "got %d\n", metrics[0].isWhitespace); ok(metrics[0].isNewline == 0, "got %d\n", metrics[0].isNewline); @@ -1715,7 +1713,6 @@ todo_wine ok(metrics[1].width == 0.0, "got %.2f\n", metrics[1].width); ok(metrics[1].length == 2, "got %d\n", metrics[1].length); -todo_wine ok(metrics[1].canWrapLineAfter == 1, "got %d\n", metrics[1].canWrapLineAfter); ok(metrics[1].isWhitespace == 0, "got %d\n", metrics[1].isWhitespace); ok(metrics[1].isNewline == 0, "got %d\n", metrics[1].isNewline); @@ -1763,7 +1760,6 @@ todo_wine hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 2, &count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 1, "got %u\n", count); -todo_wine ok(metrics[0].canWrapLineAfter == 1, "got %d\n", metrics[0].canWrapLineAfter); IDWriteTextLayout_Release(layout);

1 0

Jacek Caban : vbscript: Treat empty regexp pattern the same way as NULL pattern.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 392736c5e8f7b5b23240cbe48879a168550c3d74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=392736c5e8f7b5b23240cbe48… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 29 11:55:56 2015 +0200 vbscript: Treat empty regexp pattern the same way as NULL pattern. --- dlls/vbscript/tests/regexp.vbs | 17 +++++++++++++++++ dlls/vbscript/vbregexp.c | 28 +++++++++++----------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/tests/regexp.vbs b/dlls/vbscript/tests/regexp.vbs index 0354fb7..834be21 100644 --- a/dlls/vbscript/tests/regexp.vbs +++ b/dlls/vbscript/tests/regexp.vbs @@ -174,4 +174,21 @@ Call ok(x.IgnoreCase = false, "RegExp.IgnoreCase = " & x.IgnoreCase) Call ok(x.Global = false, "RegExp.Global = " & x.Global) Call ok(x.Multiline = false, "RegExp.Multiline = " & x.Multiline) +set matches = x.execute("test") +Call ok(matches.Count = 1, "matches.Count = " & matches.Count) +x.pattern = "" +set matches = x.execute("test") +Call ok(matches.Count = 1, "matches.Count = " & matches.Count) +set match = matches.item(0) +Call ok(match.Value = "", "match.Value = " & match.Value) +x.global = true +set matches = x.execute("test") +Call ok(matches.Count = 5, "matches.Count = " & matches.Count) +set match = matches.item(0) +Call ok(match.Value = "", "match.Value = " & match.Value) +set match = matches.item(4) +Call ok(match.Value = "", "match.Value = " & match.Value) +matches = x.test("test") +Call ok(matches = true, "matches = " & matches) + Call reportSuccess() diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 0a399b9..800ea5e 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1189,29 +1189,23 @@ static HRESULT WINAPI RegExp2_get_Pattern(IRegExp2 *iface, BSTR *pPattern) static HRESULT WINAPI RegExp2_put_Pattern(IRegExp2 *iface, BSTR pattern) { RegExp2 *This = impl_from_IRegExp2(iface); - WCHAR *p; - DWORD size; + WCHAR *new_pattern; TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(pattern)); - if(!pattern) { - heap_free(This->pattern); - if(This->regexp) { - regexp_destroy(This->regexp); - This->regexp = NULL; - } - This->pattern = NULL; - return S_OK; + if(pattern && *pattern) { + SIZE_T size = (SysStringLen(pattern)+1) * sizeof(WCHAR); + new_pattern = heap_alloc(size); + if(!new_pattern) + return E_OUTOFMEMORY; + memcpy(new_pattern, pattern, size); + }else { + new_pattern = NULL; } - size = (SysStringLen(pattern)+1) * sizeof(WCHAR); - p = heap_alloc(size); - if(!p) - return E_OUTOFMEMORY; - heap_free(This->pattern); - This->pattern = p; - memcpy(p, pattern, size); + This->pattern = new_pattern; + if(This->regexp) { regexp_destroy(This->regexp); This->regexp = NULL;

1 0

Thomas Faber : shell32/tests: Do not leak shell folder references.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 9353a36d8fc8bb400bc2227914db0f2e60a19c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9353a36d8fc8bb400bc222791… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Fri Jun 26 20:43:22 2015 +0200 shell32/tests: Do not leak shell folder references. --- dlls/shell32/tests/shfldr_special.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index cfb31be..8f97347 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -77,6 +77,7 @@ static void test_parse_for_entire_network(void) attr = ~0; hr = IShellFolder_ParseDisplayName(psfDesktop, NULL, NULL, entire_network_path, &eaten, &pidl, &attr); + IShellFolder_Release(psfDesktop); if (hr == HRESULT_FROM_WIN32(ERROR_BAD_NET_NAME) || hr == HRESULT_FROM_WIN32(ERROR_NO_NET_OR_BAD_PATH) || hr == HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER)) @@ -125,6 +126,7 @@ static void test_parse_for_control_panel(void) "Unexpected attributes : %08x\n", attr); ILFree(pidl); + IShellFolder_Release(psfDesktop); } static void test_printers_folder(void)

1 0

Jacek Caban : user32: Limit number of hooks called recursively.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 4bcb4881ae9e7fc2cc4d32aa3ba7f36e46d6fc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bcb4881ae9e7fc2cc4d32aa3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 26 19:37:41 2015 +0200 user32: Limit number of hooks called recursively. --- dlls/user32/hook.c | 15 ++++++++++++- dlls/user32/tests/msg.c | 54 +++++++++++++++++++++++++++++++++++++++++++++- dlls/user32/user_private.h | 1 + 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 281b88e..090ec17 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -413,7 +413,19 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA } else if (info->proc) { + struct user_thread_info *thread_info = get_user_thread_info(); HMODULE free_module = 0; + + /* + * Windows protects from stack overflow in recursive hook calls. Different Windows + * allow different depths. + */ + if (thread_info->hook_call_depth >= 25) + { + WARN("Too many hooks called recursively, skipping call.\n"); + return 0; + } + TRACE( "calling hook %p %s code %x wp %lx lp %lx module %s\n", info->proc, hook_names[info->id-WH_MINHOOK], code, wparam, lparam, debugstr_w(info->module) ); @@ -421,16 +433,17 @@ static LRESULT call_hook( struct hook_info *info, INT code, WPARAM wparam, LPARA if (!info->module[0] || (info->proc = get_hook_proc( info->proc, info->module, &free_module )) != NULL) { - struct user_thread_info *thread_info = get_user_thread_info(); HHOOK prev = thread_info->hook; BOOL prev_unicode = thread_info->hook_unicode; thread_info->hook = info->handle; thread_info->hook_unicode = info->next_unicode; + thread_info->hook_call_depth++; ret = call_hook_proc( info->proc, info->id, code, wparam, lparam, info->prev_unicode, info->next_unicode ); thread_info->hook = prev; thread_info->hook_unicode = prev_unicode; + thread_info->hook_call_depth--; if (free_module) FreeLibrary(free_module); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a515550..831a56b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9182,6 +9182,54 @@ todo_wine { "unexpected error %d\n", GetLastError()); } +static HWND hook_hwnd; +static HHOOK recursive_hook; +static int hook_depth, max_hook_depth; + +static LRESULT WINAPI rec_get_message_hook(int code, WPARAM w, LPARAM l) +{ + LRESULT res; + MSG msg; + BOOL b; + + hook_depth++; + if(hook_depth > max_hook_depth) + max_hook_depth = hook_depth; + + b = PeekMessageW(&msg, hook_hwnd, 0, 0, PM_NOREMOVE); + ok(b, "PeekMessage failed\n"); + + res = CallNextHookEx(recursive_hook, code, w, l); + + hook_depth--; + return res; +} + +static void test_recursive_hook(void) +{ + MSG msg; + BOOL b; + + hook_hwnd = CreateWindowA("Static", NULL, WS_POPUP, 0, 0, 200, 60, NULL, NULL, NULL, NULL); + ok(hook_hwnd != NULL, "CreateWindow failed\n"); + + recursive_hook = SetWindowsHookExW(WH_GETMESSAGE, rec_get_message_hook, NULL, GetCurrentThreadId()); + ok(recursive_hook != NULL, "SetWindowsHookEx failed\n"); + + PostMessageW(hook_hwnd, WM_USER, 0, 0); + PostMessageW(hook_hwnd, WM_USER+1, 0, 0); + + hook_depth = 0; + GetMessageW(&msg, hook_hwnd, 0, 0); + ok(15 < max_hook_depth && max_hook_depth < 45, "max_hook_depth = %d\n", max_hook_depth); + trace("max_hook_depth = %d\n", max_hook_depth); + + b = UnhookWindowsHookEx(recursive_hook); + ok(b, "UnhokWindowsHookEx failed\n"); + + DestroyWindow(hook_hwnd); +} + static const struct message ScrollWindowPaint1[] = { { WM_PAINT, sent }, { WM_ERASEBKGND, sent|beginpaint }, @@ -14946,7 +14994,11 @@ START_TEST(msg) test_timers(); test_timers_no_wnd(); test_timers_exceptions(); - if (hCBT_hook) test_set_hook(); + if (hCBT_hook) + { + test_set_hook(); + test_recursive_hook(); + } test_DestroyWindow(); test_DispatchMessage(); test_SendMessageTimeout(); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 1fbecb9..d3affb0 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -175,6 +175,7 @@ struct user_thread_info DWORD changed_mask; /* Current queue changed mask */ WORD recursion_count; /* SendMessage recursion counter */ WORD message_count; /* Get/PeekMessage loop counter */ + WORD hook_call_depth; /* Number of recursively called hook procs */ BOOL hook_unicode; /* Is current hook unicode? */ HHOOK hook; /* Current hook */ struct received_message_info *receive_info; /* Message being currently received */

1 0

Nikolay Sivov : user32: Added stubs for ShutdownBlockReasonCreate/ ShutdownBlockReasonDestroy.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 48246a149ed1d4e97338421a376b8f791a2d1dbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=48246a149ed1d4e97338421a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 26 21:35:28 2015 +0300 user32: Added stubs for ShutdownBlockReasonCreate/ShutdownBlockReasonDestroy. --- dlls/user32/user32.spec | 2 ++ dlls/user32/user_main.c | 20 ++++++++++++++++++++ include/winuser.h | 2 ++ 3 files changed, 24 insertions(+) diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index a8bbe83..5cc0f55 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -697,6 +697,8 @@ @ stub ShowStartGlass @ stdcall ShowWindow(long long) @ stdcall ShowWindowAsync(long long) +@ stdcall ShutdownBlockReasonCreate(long wstr) +@ stdcall ShutdownBlockReasonDestroy(long) # @ stub SoftModalMessageBox @ stdcall SubtractRect(ptr ptr ptr) @ stdcall SwapMouseButton(long) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 12764e6..718abe0 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -409,3 +409,23 @@ int WINAPI RegisterServicesProcess(DWORD ServicesProcessId) FIXME("(0x%x): stub\n", ServicesProcessId); return 0; } + +/*********************************************************************** + * ShutdownBlockReasonCreate (USER32.@) + */ +BOOL WINAPI ShutdownBlockReasonCreate(HWND hwnd, LPCWSTR reason) +{ + FIXME("(%p, %s): stub\n", hwnd, debugstr_w(reason)); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + +/*********************************************************************** + * ShutdownBlockReasonDestroy (USER32.@) + */ +BOOL WINAPI ShutdownBlockReasonDestroy(HWND hwnd) +{ + FIXME("(%p): stub\n", hwnd); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} diff --git a/include/winuser.h b/include/winuser.h index e9804a9..118aa73 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3992,6 +3992,8 @@ WINUSERAPI BOOL WINAPI ShowScrollBar(HWND,INT,BOOL); WINUSERAPI BOOL WINAPI ShowOwnedPopups(HWND,BOOL); WINUSERAPI BOOL WINAPI ShowWindow(HWND,INT); WINUSERAPI BOOL WINAPI ShowWindowAsync(HWND,INT); +WINUSERAPI BOOL WINAPI ShutdownBlockReasonCreate(HWND,LPCWSTR); +WINUSERAPI BOOL WINAPI ShutdownBlockReasonDestroy(HWND); WINUSERAPI BOOL WINAPI SubtractRect(LPRECT,const RECT*,const RECT*); WINUSERAPI BOOL WINAPI SwapMouseButton(BOOL); WINUSERAPI BOOL WINAPI SwitchDesktop(HDESK);

1 0