wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

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

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@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@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@AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE@PADHH@Z # __thiscall ostrstream::ostrstream(char *,int,int) @ stub -arch=win64 ??0ostrstream@@QEAA@PEADHH@Z -@ thiscall -arch=win32 ??0ostrstream@@QAE@XZ(ptr) MSVCIRT_ostrstream_sl_void # __thiscall ostrstream::ostrstream(void) -@ cdecl -arch=win64 ??0ostrstream@@QEAA@XZ(ptr) MSVCIRT_ostrstream_sl_void +@ thiscall -arch=win32 ??0ostrstream@@QAE@XZ(ptr long) MSVCIRT_ostrstream_ctor +@ cdecl -arch=win64 ??0ostrstream@@QEAA@XZ(ptr long) MSVCIRT_ostrstream_ctor @ stub -arch=win32 ??0stdiobuf@@QAE@ABV0@@Z # __thiscall stdiobuf::stdiobuf(class stdiobuf const &) @ stub -arch=win64 ??0stdiobuf@@QEAA@AEBV0@@Z @ stub -arch=win32 ??0stdiobuf@@QAE@PAU_iobuf@@@Z # __thiscall stdiobuf::stdiobuf(struct _iobuf *) @@ -158,8 +158,8 @@ @ stub -arch=win64 ??1ostream@@UEAA@XZ @ stub -arch=win32 ??1ostream_withassign@@UAE@XZ # virtual __thiscall ostream_withassign::~ostream_withassign(void) @ stub -arch=win64 ??1ostream_withassign@@UEAA@XZ -@ thiscall -arch=win32 ??1ostrstream@@UAE@XZ(ptr) MSVCIRT_ostrstream_sl_void # virtual __thiscall ostrstream::~ostrstream(void) -@ cdecl -arch=win64 ??1ostrstream@@UEAA@XZ(ptr) MSVCIRT_ostrstream_sl_void +@ thiscall -arch=win32 ??1ostrstream@@UAE@XZ(ptr) MSVCIRT_ostrstream_dtor +@ cdecl -arch=win64 ??1ostrstream@@UEAA@XZ(ptr) MSVCIRT_ostrstream_dtor @ stub -arch=win32 ??1stdiobuf@@UAE@XZ # virtual __thiscall stdiobuf::~stdiobuf(void) @ stub -arch=win64 ??1stdiobuf@@UEAA@XZ @ stub -arch=win32 ??1stdiostream@@UAE@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@AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE@PADHH@Z @ stub -arch=win64 ??0ostrstream@@QEAA@PEADHH@Z -@ thiscall -arch=win32 ??0ostrstream@@QAE@XZ(ptr) msvcirt.??0ostrstream@@QAE@XZ -@ cdecl -arch=win64 ??0ostrstream@@QEAA@XZ(ptr) msvcirt.??0ostrstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ostrstream@@QAE@XZ(ptr long) msvcirt.??0ostrstream@@QAE@XZ +@ cdecl -arch=win64 ??0ostrstream@@QEAA@XZ(ptr long) msvcirt.??0ostrstream@@QEAA@XZ @ stub -arch=win32 ??0stdiobuf@@QAE@ABV0@@Z @ stub -arch=win64 ??0stdiobuf@@QEAA@AEBV0@@Z @ stub -arch=win32 ??0stdiobuf@@QAE@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@AEBV0@@Z @ stub -arch=win32 ??0ostrstream@@QAE@PADHH@Z @ stub -arch=win64 ??0ostrstream@@QEAA@PEADHH@Z -@ thiscall -arch=win32 ??0ostrstream@@QAE@XZ(ptr) msvcirt.??0ostrstream@@QAE@XZ -@ cdecl -arch=win64 ??0ostrstream@@QEAA@XZ(ptr) msvcirt.??0ostrstream@@QEAA@XZ +@ thiscall -arch=win32 ??0ostrstream@@QAE@XZ(ptr long) msvcirt.??0ostrstream@@QAE@XZ +@ cdecl -arch=win64 ??0ostrstream@@QEAA@XZ(ptr long) msvcirt.??0ostrstream@@QEAA@XZ @ stub -arch=win32 ??0stdiobuf@@QAE@ABV0@@Z @ stub -arch=win64 ??0stdiobuf@@QEAA@AEBV0@@Z @ stub -arch=win32 ??0stdiobuf@@QAE@PAU_iobuf@@@Z

1 0

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

Jacek Caban : mshtml: Initialize output paramter before test call.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 069599135ba7d4b1f160e76349d02e2d32b8aee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=069599135ba7d4b1f160e7634… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 29 10:05:30 2015 +0200 mshtml: Initialize output paramter before test call. --- dlls/mshtml/tests/xmlhttprequest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c index a1ca9a5..abfba57 100644 --- a/dlls/mshtml/tests/xmlhttprequest.c +++ b/dlls/mshtml/tests/xmlhttprequest.c @@ -485,6 +485,7 @@ static void test_async_xhr(IHTMLDocument2 *doc, const char *xml_url) todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); todo_wine ok(val == 0, "Expect 0, got %d\n", val); + text = (BSTR)0xdeadbeef; hres = IHTMLXMLHttpRequest_get_statusText(xhr, &text); todo_wine ok(hres == E_FAIL, "Expect E_FAIL, got: %08x\n", hres); todo_wine ok(text == NULL, "Expect NULL, got %p\n", text);

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::dbp.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 6096dfe6d9c6568a15e8f22c3b59ac8d6570bb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6096dfe6d9c6568a15e8f22c3… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 29 10:01:58 2015 +0200 msvcirt: Add implementation of streambuf::dbp. --- dlls/msvcirt/msvcirt.c | 16 ++++++++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a56fd61..0979673 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -667,6 +667,22 @@ int __thiscall streambuf_sputbackc(streambuf *this, char ch) return call_streambuf_pbackfail(this, ch); } +/* ?dbp@streambuf@@QAEXXZ */ +/* ?dbp@streambuf@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_dbp, 4) +void __thiscall streambuf_dbp(streambuf *this) +{ + printf("\nSTREAMBUF DEBUG INFO: this=%p, ", this); + if (this->unbuffered) { + printf("unbuffered\n"); + } else { + printf("_fAlloc=%d\n", this->allocated); + printf(" base()=%p, ebuf()=%p, blen()=%d\n", this->base, this->ebuf, streambuf_blen(this)); + printf("pbase()=%p, pptr()=%p, epptr()=%d\n", this->pbase, this->pptr, this->epptr); + printf("eback()=%p, gptr()=%p, egptr()=%d\n", this->eback, this->gptr, this->egptr); + } +} + /****************************************************************** * ??1ios@@UAE@XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index f14821e..0c9e520 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -437,8 +437,8 @@ @ thiscall -arch=win32 ?clrlock@streambuf@@QAEXXZ(ptr) streambuf_clrlock @ cdecl -arch=win64 ?clrlock@streambuf@@QEAAXXZ(ptr) streambuf_clrlock @ stub ?cout@@3Vostream_withassign@@A # class ostream_withassign cout -@ stub -arch=win32 ?dbp@streambuf@@QAEXXZ # void __thiscall streambuf::dbp(void) -@ stub -arch=win64 ?dbp@streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?dbp@streambuf@@QAEXXZ(ptr) streambuf_dbp +@ cdecl -arch=win64 ?dbp@streambuf@@QEAAXXZ(ptr) streambuf_dbp @ stub -arch=win32 ?dec@@YAAAVios@@AAV1@@Z # class ios & __cdecl dec(class ios &) @ stub -arch=win64 ?dec@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?delbuf@ios@@QAEXH@Z # void __thiscall ios::delbuf(int) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index c7dd035..c7b28bd 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -425,8 +425,8 @@ @ thiscall -arch=win32 ?clrlock@streambuf@@QAEXXZ(ptr) msvcirt.?clrlock@streambuf@@QAEXXZ @ cdecl -arch=win64 ?clrlock@streambuf@@QEAAXXZ(ptr) msvcirt.?clrlock@streambuf@@QEAAXXZ @ stub ?cout@@3Vostream_withassign@@A -@ stub -arch=win32 ?dbp@streambuf@@QAEXXZ -@ stub -arch=win64 ?dbp@streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?dbp@streambuf@@QAEXXZ(ptr) msvcirt.?dbp@streambuf@@QAEXXZ +@ cdecl -arch=win64 ?dbp@streambuf@@QEAAXXZ(ptr) msvcirt.?dbp@streambuf@@QEAAXXZ @ stub -arch=win32 ?dec@@YAAAVios@@AAV1@@Z @ stub -arch=win64 ?dec@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?delbuf@ios@@QAEXH@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index bda6e2c..49df71c 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -490,8 +490,8 @@ @ thiscall -arch=win32 ?clrlock@streambuf@@QAEXXZ(ptr) msvcirt.?clrlock@streambuf@@QAEXXZ @ cdecl -arch=win64 ?clrlock@streambuf@@QEAAXXZ(ptr) msvcirt.?clrlock@streambuf@@QEAAXXZ @ stub ?cout@@3Vostream_withassign@@A -@ stub -arch=win32 ?dbp@streambuf@@QAEXXZ -@ stub -arch=win64 ?dbp@streambuf@@QEAAXXZ +@ thiscall -arch=win32 ?dbp@streambuf@@QAEXXZ(ptr) msvcirt.?dbp@streambuf@@QAEXXZ +@ cdecl -arch=win64 ?dbp@streambuf@@QEAAXXZ(ptr) msvcirt.?dbp@streambuf@@QEAAXXZ @ stub -arch=win32 ?dec@@YAAAVios@@AAV1@@Z @ stub -arch=win64 ?dec@@YAAEAVios@@AEAV1@@Z @ stub -arch=win32 ?delbuf@ios@@QAEXH@Z

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::sputbackc.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 56f150b1c47c9781275b01543fd78fdffac273d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f150b1c47c9781275b01543… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 29 10:01:53 2015 +0200 msvcirt: Add implementation of streambuf::sputbackc. --- dlls/msvcirt/msvcirt.c | 10 ++++++++++ dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 70e92e7..a56fd61 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -365,6 +365,7 @@ int __thiscall streambuf_overflow(streambuf *this, int c) /* ?pbackfail@streambuf@@UAEHH@Z */ /* ?pbackfail@streambuf@@UEAAHH@Z */ DEFINE_THISCALL_WRAPPER(streambuf_pbackfail, 8) +#define call_streambuf_pbackfail(this, c) CALL_VTBL_FUNC(this, 36, int, (streambuf*, int), (this, c)) int __thiscall streambuf_pbackfail(streambuf *this, int c) { TRACE("(%p %d)\n", this, c); @@ -657,6 +658,15 @@ void __thiscall streambuf_stossc(streambuf *this) } } +/* ?sputbackc@streambuf@@QAEHD@Z */ +/* ?sputbackc@streambuf@@QEAAHD@Z */ +DEFINE_THISCALL_WRAPPER(streambuf_sputbackc, 8) +int __thiscall streambuf_sputbackc(streambuf *this, char ch) +{ + TRACE("(%p %d)\n", this, ch); + return call_streambuf_pbackfail(this, ch); +} + /****************************************************************** * ??1ios@@UAE@XZ (MSVCRTI.@) * class ios & __thiscall ios::-ios<<(void) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 913f186..f14821e 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -702,8 +702,8 @@ # @ extern ?sh_write@filebuf@@2HB # static int const filebuf::sh_write @ thiscall -arch=win32 ?snextc@streambuf@@QAEHXZ(ptr) streambuf_snextc @ cdecl -arch=win64 ?snextc@streambuf@@QEAAHXZ(ptr) streambuf_snextc -@ stub -arch=win32 ?sputbackc@streambuf@@QAEHD@Z # int __thiscall streambuf::sputbackc(char) -@ stub -arch=win64 ?sputbackc@streambuf@@QEAAHD@Z +@ thiscall -arch=win32 ?sputbackc@streambuf@@QAEHD@Z(ptr long) streambuf_sputbackc +@ cdecl -arch=win64 ?sputbackc@streambuf@@QEAAHD@Z(ptr long) streambuf_sputbackc @ thiscall -arch=win32 ?sputc@streambuf@@QAEHH@Z(ptr long) streambuf_sputc @ cdecl -arch=win64 ?sputc@streambuf@@QEAAHH@Z(ptr long) streambuf_sputc @ thiscall -arch=win32 ?sputn@streambuf@@QAEHPBDH@Z(ptr str long) streambuf_sputn diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index f37d876..c7dd035 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -690,8 +690,8 @@ # @ extern ?sh_write@filebuf@@2HB @ thiscall -arch=win32 ?snextc@streambuf@@QAEHXZ(ptr) msvcirt.?snextc@streambuf@@QAEHXZ @ cdecl -arch=win64 ?snextc@streambuf@@QEAAHXZ(ptr) msvcirt.?snextc@streambuf@@QEAAHXZ -@ stub -arch=win32 ?sputbackc@streambuf@@QAEHD@Z -@ stub -arch=win64 ?sputbackc@streambuf@@QEAAHD@Z +@ thiscall -arch=win32 ?sputbackc@streambuf@@QAEHD@Z(ptr long) msvcirt.?sputbackc@streambuf@@QAEHD@Z +@ cdecl -arch=win64 ?sputbackc@streambuf@@QEAAHD@Z(ptr long) msvcirt.?sputbackc@streambuf@@QEAAHD@Z @ thiscall -arch=win32 ?sputc@streambuf@@QAEHH@Z(ptr long) msvcirt.?sputc@streambuf@@QAEHH@Z @ cdecl -arch=win64 ?sputc@streambuf@@QEAAHH@Z(ptr long) msvcirt.?sputc@streambuf@@QEAAHH@Z @ thiscall -arch=win32 ?sputn@streambuf@@QAEHPBDH@Z(ptr str long) msvcirt.?sputn@streambuf@@QAEHPBDH@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 9173aef..bda6e2c 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -762,8 +762,8 @@ # @ extern ?sh_write@filebuf@@2HB @ thiscall -arch=win32 ?snextc@streambuf@@QAEHXZ(ptr) msvcirt.?snextc@streambuf@@QAEHXZ @ cdecl -arch=win64 ?snextc@streambuf@@QEAAHXZ(ptr) msvcirt.?snextc@streambuf@@QEAAHXZ -@ stub -arch=win32 ?sputbackc@streambuf@@QAEHD@Z -@ stub -arch=win64 ?sputbackc@streambuf@@QEAAHD@Z +@ thiscall -arch=win32 ?sputbackc@streambuf@@QAEHD@Z(ptr long) msvcirt.?sputbackc@streambuf@@QAEHD@Z +@ cdecl -arch=win64 ?sputbackc@streambuf@@QEAAHD@Z(ptr long) msvcirt.?sputbackc@streambuf@@QEAAHD@Z @ thiscall -arch=win32 ?sputc@streambuf@@QAEHH@Z(ptr long) msvcirt.?sputc@streambuf@@QAEHH@Z @ cdecl -arch=win64 ?sputc@streambuf@@QEAAHH@Z(ptr long) msvcirt.?sputc@streambuf@@QEAAHH@Z @ thiscall -arch=win32 ?sputn@streambuf@@QAEHPBDH@Z(ptr str long) msvcirt.?sputn@streambuf@@QAEHPBDH@Z

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::pbackfail.
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: 6cca77bf2a9b26fc0496876699b0f9b75d8e28bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cca77bf2a9b26fc049687669… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 29 10:01:48 2015 +0200 msvcirt: Add implementation of streambuf::pbackfail. --- dlls/msvcirt/msvcirt.c | 6 ++++-- dlls/msvcirt/tests/msvcirt.c | 27 +++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 66858de..70e92e7 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -367,8 +367,10 @@ int __thiscall streambuf_overflow(streambuf *this, int c) DEFINE_THISCALL_WRAPPER(streambuf_pbackfail, 8) int __thiscall streambuf_pbackfail(streambuf *this, int c) { - FIXME("(%p %d): stub\n", this, c); - return 0; + TRACE("(%p %d)\n", this, c); + if (this->gptr <= this->eback) + return EOF; + return *--this->gptr = c; } /* ?seekoff@streambuf@@UAEJJW4seek_dir@ios@@H@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 42c0e3a..eca0304 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -57,6 +57,7 @@ static void (*__thiscall p_streambuf_clrclock)(streambuf*); static int (*__thiscall p_streambuf_doallocate)(streambuf*); static void (*__thiscall p_streambuf_gbump)(streambuf*, int); static void (*__thiscall p_streambuf_lock)(streambuf*); +static int (*__thiscall p_streambuf_pbackfail)(streambuf*, int); static void (*__thiscall p_streambuf_pbump)(streambuf*, int); static int (*__thiscall p_streambuf_sbumpc)(streambuf*); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); @@ -148,6 +149,7 @@ static BOOL init(void) SET(p_streambuf_doallocate, "?doallocate@streambuf@@MEAAHXZ"); SET(p_streambuf_gbump, "?gbump@streambuf@@IEAAXH@Z"); SET(p_streambuf_lock, "?lock@streambuf@@QEAAXXZ"); + SET(p_streambuf_pbackfail, "?pbackfail@streambuf@@UEAAHH@Z"); SET(p_streambuf_pbump, "?pbump@streambuf@@IEAAXH@Z"); SET(p_streambuf_sbumpc, "?sbumpc@streambuf@@QEAAHXZ"); SET(p_streambuf_setb, "?setb@streambuf@@IEAAXPEAD0H@Z"); @@ -170,6 +172,7 @@ static BOOL init(void) SET(p_streambuf_doallocate, "?doallocate@streambuf@@MAEHXZ"); SET(p_streambuf_gbump, "?gbump@streambuf@@IAEXH@Z"); SET(p_streambuf_lock, "?lock@streambuf@@QAEXXZ"); + SET(p_streambuf_pbackfail, "?pbackfail@streambuf@@UAEHH@Z"); SET(p_streambuf_pbump, "?pbump@streambuf@@IAEXH@Z"); SET(p_streambuf_sbumpc, "?sbumpc@streambuf@@QAEHXZ"); SET(p_streambuf_setb, "?setb@streambuf@@IAEXPAD0H@Z"); @@ -689,6 +692,30 @@ static void test_streambuf(void) ok(sb3.stored_char == EOF, "wrong stored character, expected EOF got %c\n", sb3.stored_char); ok(underflow_count == 57, "no call to underflow expected\n"); + /* pbackfail */ + ret = (int) call_func2(p_streambuf_pbackfail, &sb, 'A'); + ok(ret == 'A', "expected 'A' got '%c'\n", ret); + ok(sb.gptr == sb.eback + 2, "wrong get pointer, expected %p got %p\n", sb.eback + 2, sb.gptr); + ok(*sb.gptr == 'A', "expected 'A' in the get area, got %c\n", *sb.gptr); + ret = (int) call_func2(p_streambuf_pbackfail, &sb, EOF); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb.gptr == sb.eback + 1, "wrong get pointer, expected %p got %p\n", sb.eback + 1, sb.gptr); + ok(*sb.gptr == EOF, "expected EOF in the get area, got %c\n", *sb.gptr); + sb.gptr = sb.eback; + ret = (int) call_func2(p_streambuf_pbackfail, &sb, 'Z'); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb.gptr == sb.eback, "wrong get pointer, expected %p got %p\n", sb.eback, sb.gptr); + ok(*sb.gptr == 'T', "expected 'T' in the get area, got %c\n", *sb.gptr); + ret = (int) call_func2(p_streambuf_pbackfail, &sb, EOF); + ok(ret == EOF, "expected EOF got '%c'\n", ret); + ok(sb.gptr == sb.eback, "wrong get pointer, expected %p got %p\n", sb.eback, sb.gptr); + ok(*sb.gptr == 'T', "expected 'T' in the get area, got %c\n", *sb.gptr); + sb2.gptr = sb2.egptr + 1; + ret = (int) call_func2(p_streambuf_pbackfail, &sb2, 'X'); + ok(ret == 'X', "expected 'X' got '%c'\n", ret); + ok(sb2.gptr == sb2.egptr, "wrong get pointer, expected %p got %p\n", sb2.egptr, sb2.gptr); + ok(*sb2.gptr == 'X', "expected 'X' in the get area, got %c\n", *sb2.gptr); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE);

1 0

Daniel Lehman : msvcp90: Copy name in _Getctype (Valgrind).
by Alexandre Julliard 29 Jun '15

29 Jun '15

Module: wine Branch: master Commit: ec6859f7e82f8148e465307358a43062e80a10e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec6859f7e82f8148e46530735… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Jun 22 17:44:44 2015 -0700 msvcp90: Copy name in _Getctype (Valgrind). --- dlls/msvcp90/locale.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9b85322..b3275c1 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -682,6 +682,10 @@ _Collvec* __thiscall _Locinfo__Getcoll(const _Locinfo *this, _Collvec *ret) _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) { short *table; +#if _MSVCP_VER >= 110 + wchar_t *name; + MSVCP_size_t size; +#endif TRACE("\n"); @@ -689,7 +693,14 @@ _Ctypevec* __cdecl _Getctype(_Ctypevec *ret) #if _MSVCP_VER < 110 ret->handle = ___lc_handle_func()[LC_COLLATE]; #else - ret->name = ___lc_locale_name_func()[LC_COLLATE]; + if((name = ___lc_locale_name_func()[LC_COLLATE])) { + size = wcslen(name)+1; + ret->name = malloc(size*sizeof(*name)); + if(!ret->name) throw_exception(EXCEPTION_BAD_ALLOC, NULL); + memcpy(ret->name, name, size*sizeof(*name)); + } else { + ret->name = NULL; + } #endif ret->delfl = TRUE; table = malloc(sizeof(short[256]));

1 0

← Newer
1
2
3
4
5
6
7
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015