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

Iván Matellanes : msvcirt: Add implementation of streambuf buffer getters.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 43b9cb71801186b23feac97ffc4f73e09d356e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b9cb71801186b23feac97ff… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 8 21:26:28 2015 +0200 msvcirt: Add implementation of streambuf buffer getters. --- dlls/msvcirt/msvcirt.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 36 ++++++++++---------- dlls/msvcrt20/msvcrt20.spec | 36 ++++++++++---------- dlls/msvcrt40/msvcrt40.spec | 36 ++++++++++---------- 4 files changed, 135 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43b9cb71801186b23feac…

1 0

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

09 Jun '15

Module: wine Branch: master Commit: 2e880feaab1d3868eb6779621e195f4153bb628d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e880feaab1d3868eb6779621… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 8 21:26:36 2015 +0200 msvcirt: Add implementation of streambuf::unbuffered. --- dlls/msvcirt/msvcirt.c | 18 ++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 8 ++++---- dlls/msvcrt20/msvcrt20.spec | 8 ++++---- dlls/msvcrt40/msvcrt40.spec | 8 ++++---- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7214699..a6d3749 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -385,6 +385,24 @@ int __thiscall streambuf_sync(streambuf *this) return EOF; } +/* ?unbuffered(a)streambuf@@IAEXH(a)Z */ +/* ?unbuffered(a)streambuf@@IEAAXH(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_unbuffered_set, 8) +void __thiscall streambuf_unbuffered_set(streambuf *this, int buf) +{ + TRACE("(%p %d)\n", this, buf); + this->unbuffered = buf; +} + +/* ?unbuffered(a)streambuf@@IBEHXZ */ +/* ?unbuffered(a)streambuf@@IEBAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_unbuffered_get, 4) +int __thiscall streambuf_unbuffered_get(const streambuf *this) +{ + TRACE("(%p)\n", this); + return this->unbuffered; +} + /* Unexported */ DEFINE_THISCALL_WRAPPER(streambuf_underflow, 4) int __thiscall streambuf_underflow(streambuf *this) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index 9ab9adf..8a57404 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -741,10 +741,10 @@ @ stub -arch=win64 ?tie(a)ios@@QEAAPEAVostream@@PEAV2@@Z @ stub -arch=win32 ?tie(a)ios@@QBEPAVostream@@XZ # class ostream * __thiscall ios::tie(void)const @ stub -arch=win64 ?tie(a)ios@@QEBAPEAVostream@@XZ -@ stub -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z # void __thiscall streambuf::unbuffered(int) -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z -@ stub -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ # int __thiscall streambuf::unbuffered(void)const -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z(ptr long) streambuf_unbuffered_set +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z(ptr long) streambuf_unbuffered_set +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ(ptr) streambuf_unbuffered_get +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ(ptr) streambuf_unbuffered_get @ stub -arch=win32 ?underflow(a)filebuf@@UAEHXZ # virtual int __thiscall filebuf::underflow(void) @ stub -arch=win64 ?underflow(a)filebuf@@UEAAHXZ @ stub -arch=win32 ?underflow(a)stdiobuf@@UAEHXZ # virtual int __thiscall stdiobuf::underflow(void) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 36dffbd..2c60964 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -730,10 +730,10 @@ @ stub -arch=win64 ?tie(a)ios@@QEAAPEAVostream@@PEAV2@@Z @ stub -arch=win32 ?tie(a)ios@@QBEPAVostream@@XZ @ stub -arch=win64 ?tie(a)ios@@QEBAPEAVostream@@XZ -@ stub -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z -@ stub -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z(ptr long) msvcirt.?unbuffered(a)streambuf@@IAEXH(a)Z +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z(ptr long) msvcirt.?unbuffered(a)streambuf@@IEAAXH(a)Z +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ(ptr) msvcirt.?unbuffered(a)streambuf@@IBEHXZ +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ(ptr) msvcirt.?unbuffered(a)streambuf@@IEBAHXZ @ stub -arch=win32 ?underflow(a)filebuf@@UAEHXZ @ stub -arch=win64 ?underflow(a)filebuf@@UEAAHXZ @ stub -arch=win32 ?underflow(a)stdiobuf@@UAEHXZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 4ae2ff4..a029b1b 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -802,10 +802,10 @@ @ stub -arch=win64 ?tie(a)ios@@QEAAPEAVostream@@PEAV2@@Z @ stub -arch=win32 ?tie(a)ios@@QBEPAVostream@@XZ @ stub -arch=win64 ?tie(a)ios@@QEBAPEAVostream@@XZ -@ stub -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z -@ stub -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ -@ stub -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IAEXH(a)Z(ptr long) msvcirt.?unbuffered(a)streambuf@@IAEXH(a)Z +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEAAXH(a)Z(ptr long) msvcirt.?unbuffered(a)streambuf@@IEAAXH(a)Z +@ thiscall -arch=win32 ?unbuffered(a)streambuf@@IBEHXZ(ptr) msvcirt.?unbuffered(a)streambuf@@IBEHXZ +@ cdecl -arch=win64 ?unbuffered(a)streambuf@@IEBAHXZ(ptr) msvcirt.?unbuffered(a)streambuf@@IEBAHXZ @ stub -arch=win32 ?underflow(a)filebuf@@UAEHXZ @ stub -arch=win64 ?underflow(a)filebuf@@UEAAHXZ @ stub -arch=win32 ?underflow(a)stdiobuf@@UAEHXZ

1 0

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

09 Jun '15

Module: wine Branch: master Commit: 70b447d078eb3fe9fc6f237026ee13cd54517a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=70b447d078eb3fe9fc6f23702… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 8 21:26:43 2015 +0200 msvcirt: Add implementation of streambuf locking. --- dlls/msvcirt/msvcirt.c | 52 +++++++++++++++++++- dlls/msvcirt/msvcirt.spec | 20 ++++---- dlls/msvcirt/tests/msvcirt.c | 111 ++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 20 ++++---- dlls/msvcrt40/msvcrt40.spec | 20 ++++---- 5 files changed, 189 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=70b447d078eb3fe9fc6f2…

1 0

Iván Matellanes : msvcirt: Add implementation of streambuf::gbump/pbump.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: a3150b95dffc9b06413e1941a33d44eba76b2364 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3150b95dffc9b06413e1941a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 8 21:26:51 2015 +0200 msvcirt: Add implementation of streambuf::gbump/pbump. --- dlls/msvcirt/msvcirt.c | 18 ++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 8 ++++---- dlls/msvcirt/tests/msvcirt.c | 23 +++++++++++++++++++++++ dlls/msvcrt20/msvcrt20.spec | 8 ++++---- dlls/msvcrt40/msvcrt40.spec | 8 ++++---- 5 files changed, 53 insertions(+), 12 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index afb673d..a5b7141 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -317,6 +317,24 @@ CRITICAL_SECTION* __thiscall streambuf_lockptr(streambuf *this) return &this->lock; } +/* ?gbump(a)streambuf@@IAEXH(a)Z */ +/* ?gbump(a)streambuf@@IEAAXH(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_gbump, 8) +void __thiscall streambuf_gbump(streambuf *this, int count) +{ + TRACE("(%p %d)\n", this, count); + this->gptr += count; +} + +/* ?pbump(a)streambuf@@IAEXH(a)Z */ +/* ?pbump(a)streambuf@@IEAAXH(a)Z */ +DEFINE_THISCALL_WRAPPER(streambuf_pbump, 8) +void __thiscall streambuf_pbump(streambuf *this, int count) +{ + TRACE("(%p %d)\n", this, count); + this->pptr += count; +} + /* Unexported */ DEFINE_THISCALL_WRAPPER(streambuf_overflow, 8) int __thiscall streambuf_overflow(streambuf *this, int c) diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index d40ea47..576b905 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -491,8 +491,8 @@ @ stub -arch=win64 ?flush(a)ostream@@QEAAAEAV1(a)XZ @ stub -arch=win32 ?freeze(a)strstreambuf@@QAEXH(a)Z # void __thiscall strstreambuf::freeze(int) @ stub -arch=win64 ?freeze(a)strstreambuf@@QEAAXH(a)Z -@ stub -arch=win32 ?gbump(a)streambuf@@IAEXH(a)Z # void __thiscall streambuf::gbump(int) -@ stub -arch=win64 ?gbump(a)streambuf@@IEAAXH(a)Z +@ thiscall -arch=win32 ?gbump(a)streambuf@@IAEXH(a)Z(ptr long) streambuf_gbump +@ cdecl -arch=win64 ?gbump(a)streambuf@@IEAAXH(a)Z(ptr long) streambuf_gbump @ stub -arch=win32 ?gcount(a)istream@@QBEHXZ # int __thiscall istream::gcount(void)const @ stub -arch=win64 ?gcount(a)istream@@QEBAHXZ @ stub -arch=win32 ?get(a)istream@@IAEAAV1(a)PADHH@Z # class istream & __thiscall istream::get(char *,int,int) @@ -589,8 +589,8 @@ @ cdecl -arch=win64 ?pbackfail(a)streambuf@@UEAAHH(a)Z(ptr long) streambuf_pbackfail @ thiscall -arch=win32 ?pbase(a)streambuf@@IBEPADXZ(ptr) streambuf_pbase @ cdecl -arch=win64 ?pbase(a)streambuf@@IEBAPEADXZ(ptr) streambuf_pbase -@ stub -arch=win32 ?pbump(a)streambuf@@IAEXH(a)Z # void __thiscall streambuf::pbump(int) -@ stub -arch=win64 ?pbump(a)streambuf@@IEAAXH(a)Z +@ thiscall -arch=win32 ?pbump(a)streambuf@@IAEXH(a)Z(ptr long) streambuf_pbump +@ cdecl -arch=win64 ?pbump(a)streambuf@@IEAAXH(a)Z(ptr long) streambuf_pbump @ stub -arch=win32 ?pcount(a)ostrstream@@QBEHXZ # int __thiscall ostrstream::pcount(void)const @ stub -arch=win64 ?pcount(a)ostrstream@@QEBAHXZ @ stub -arch=win32 ?pcount(a)strstream@@QBEHXZ # int __thiscall strstream::pcount(void)const diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 3c2c5ce..2a45b04 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -55,7 +55,9 @@ static void (*__thiscall p_streambuf_dtor)(streambuf*); static int (*__thiscall p_streambuf_allocate)(streambuf*); 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 void (*__thiscall p_streambuf_pbump)(streambuf*, int); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); static void (*__thiscall p_streambuf_setlock)(streambuf*); static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); @@ -136,7 +138,9 @@ static BOOL init(void) SET(p_streambuf_allocate, "?allocate(a)streambuf@@IEAAHXZ"); SET(p_streambuf_clrclock, "?clrlock(a)streambuf@@QEAAXXZ"); SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MEAAHXZ"); + SET(p_streambuf_gbump, "?gbump(a)streambuf@@IEAAXH(a)Z"); SET(p_streambuf_lock, "?lock(a)streambuf@@QEAAXXZ"); + SET(p_streambuf_pbump, "?pbump(a)streambuf@@IEAAXH(a)Z"); SET(p_streambuf_setb, "?setb(a)streambuf@@IEAAXPEAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UEAAPEAV1(a)PEADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QEAAXXZ"); @@ -148,7 +152,9 @@ static BOOL init(void) SET(p_streambuf_allocate, "?allocate(a)streambuf@@IAEHXZ"); SET(p_streambuf_clrclock, "?clrlock(a)streambuf@@QAEXXZ"); SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MAEHXZ"); + SET(p_streambuf_gbump, "?gbump(a)streambuf@@IAEXH(a)Z"); SET(p_streambuf_lock, "?lock(a)streambuf@@QAEXXZ"); + SET(p_streambuf_pbump, "?pbump(a)streambuf@@IAEXH(a)Z"); SET(p_streambuf_setb, "?setb(a)streambuf@@IAEXPAD0H(a)Z"); SET(p_streambuf_setbuf, "?setbuf(a)streambuf@@UAEPAV1(a)PADH@Z"); SET(p_streambuf_setlock, "?setlock(a)streambuf@@QAEXXZ"); @@ -318,6 +324,23 @@ static void test_streambuf(void) ok(sb2.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb2.allocated); ok(sb2.ebuf - sb2.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb2.ebuf, sb2.base); + /* gbump */ + sb.eback = sb.base + 100; + sb.gptr = sb.base + 104; + sb.egptr = sb.base + 110; + call_func2(p_streambuf_gbump, &sb, 10); + ok(sb.gptr == sb.eback + 14, "advance get pointer failed, expected %p got %p\n", sb.eback + 14, sb.gptr); + call_func2(p_streambuf_gbump, &sb, -15); + ok(sb.gptr == sb.eback - 1, "advance get pointer failed, expected %p got %p\n", sb.eback - 1, sb.gptr); + + /* pbump */ + sb.pbase = sb.pptr = sb.base + 200; + sb.epptr = sb.base + 210; + call_func2(p_streambuf_pbump, &sb, -2); + ok(sb.pptr == sb.pbase - 2, "advance put pointer failed, expected %p got %p\n", sb.pbase - 2, sb.pptr); + call_func2(p_streambuf_pbump, &sb, 20); + ok(sb.pptr == sb.pbase + 18, "advance put pointer failed, expected %p got %p\n", sb.pbase + 18, sb.pptr); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE); diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index aff7bdc..5f43568 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -479,8 +479,8 @@ @ stub -arch=win64 ?flush(a)ostream@@QEAAAEAV1(a)XZ @ stub -arch=win32 ?freeze(a)strstreambuf@@QAEXH(a)Z @ stub -arch=win64 ?freeze(a)strstreambuf@@QEAAXH(a)Z -@ stub -arch=win32 ?gbump(a)streambuf@@IAEXH(a)Z -@ stub -arch=win64 ?gbump(a)streambuf@@IEAAXH(a)Z +@ thiscall -arch=win32 ?gbump(a)streambuf@@IAEXH(a)Z(ptr long) msvcirt.?gbump(a)streambuf@@IAEXH(a)Z +@ cdecl -arch=win64 ?gbump(a)streambuf@@IEAAXH(a)Z(ptr long) msvcirt.?gbump(a)streambuf@@IEAAXH(a)Z @ stub -arch=win32 ?gcount(a)istream@@QBEHXZ @ stub -arch=win64 ?gcount(a)istream@@QEBAHXZ @ stub -arch=win32 ?get(a)istream@@QAEAAV1(a)AAC@Z @@ -575,8 +575,8 @@ @ cdecl -arch=win64 ?pbackfail(a)streambuf@@UEAAHH(a)Z(ptr long) msvcirt.?pbackfail(a)streambuf@@UEAAHH(a)Z @ thiscall -arch=win32 ?pbase(a)streambuf@@IBEPADXZ(ptr) msvcirt.?pbase(a)streambuf@@IBEPADXZ @ cdecl -arch=win64 ?pbase(a)streambuf@@IEBAPEADXZ(ptr) msvcirt.?pbase(a)streambuf@@IEBAPEADXZ -@ stub -arch=win32 ?pbump(a)streambuf@@IAEXH(a)Z -@ stub -arch=win64 ?pbump(a)streambuf@@IEAAXH(a)Z +@ thiscall -arch=win32 ?pbump(a)streambuf@@IAEXH(a)Z(ptr long) msvcirt.?pbump(a)streambuf@@IAEXH(a)Z +@ cdecl -arch=win64 ?pbump(a)streambuf@@IEAAXH(a)Z(ptr long) msvcirt.?pbump(a)streambuf@@IEAAXH(a)Z @ stub -arch=win32 ?pcount(a)ostrstream@@QBEHXZ @ stub -arch=win64 ?pcount(a)ostrstream@@QEBAHXZ @ stub -arch=win32 ?pcount(a)strstream@@QBEHXZ diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 4574502..81cdcf9 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -544,8 +544,8 @@ @ stub -arch=win64 ?flush(a)ostream@@QEAAAEAV1(a)XZ @ stub -arch=win32 ?freeze(a)strstreambuf@@QAEXH(a)Z @ stub -arch=win64 ?freeze(a)strstreambuf@@QEAAXH(a)Z -@ stub -arch=win32 ?gbump(a)streambuf@@IAEXH(a)Z -@ stub -arch=win64 ?gbump(a)streambuf@@IEAAXH(a)Z +@ thiscall -arch=win32 ?gbump(a)streambuf@@IAEXH(a)Z(ptr long) msvcirt.?gbump(a)streambuf@@IAEXH(a)Z +@ cdecl -arch=win64 ?gbump(a)streambuf@@IEAAXH(a)Z(ptr long) msvcirt.?gbump(a)streambuf@@IEAAXH(a)Z @ stub -arch=win32 ?gcount(a)istream@@QBEHXZ @ stub -arch=win64 ?gcount(a)istream@@QEBAHXZ @ stub -arch=win32 ?get(a)istream@@IAEAAV1(a)PADHH@Z @@ -644,8 +644,8 @@ @ cdecl -arch=win64 ?pbackfail(a)streambuf@@UEAAHH(a)Z(ptr long) msvcirt.?pbackfail(a)streambuf@@UEAAHH(a)Z @ thiscall -arch=win32 ?pbase(a)streambuf@@IBEPADXZ(ptr) msvcirt.?pbase(a)streambuf@@IBEPADXZ @ cdecl -arch=win64 ?pbase(a)streambuf@@IEBAPEADXZ(ptr) msvcirt.?pbase(a)streambuf@@IEBAPEADXZ -@ stub -arch=win32 ?pbump(a)streambuf@@IAEXH(a)Z -@ stub -arch=win64 ?pbump(a)streambuf@@IEAAXH(a)Z +@ thiscall -arch=win32 ?pbump(a)streambuf@@IAEXH(a)Z(ptr long) msvcirt.?pbump(a)streambuf@@IAEXH(a)Z +@ cdecl -arch=win64 ?pbump(a)streambuf@@IEAAXH(a)Z(ptr long) msvcirt.?pbump(a)streambuf@@IEAAXH(a)Z @ stub -arch=win32 ?pcount(a)ostrstream@@QBEHXZ @ stub -arch=win64 ?pcount(a)ostrstream@@QEBAHXZ @ stub -arch=win32 ?pcount(a)strstream@@QBEHXZ

1 0

Nikolay Sivov : dwrite/tests: A test for case-sensitivity of SetFontFamilyName.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 9d74a11efbb643a3bebea56159e4e9385c731a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d74a11efbb643a3bebea5615… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 08:52:59 2015 +0300 dwrite/tests: A test for case-sensitivity of SetFontFamilyName. --- dlls/dwrite/tests/layout.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a740c4f..3ac716e 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1900,6 +1900,7 @@ static void test_SetFontSize(void) static void test_SetFontFamilyName(void) { + static const WCHAR taHomaW[] = {'T','a','H','o','m','a',0}; static const WCHAR arialW[] = {'A','r','i','a','l',0}; static const WCHAR strW[] = {'a','b','c','d',0}; IDWriteTextFormat *format; @@ -1931,6 +1932,20 @@ static void test_SetFontFamilyName(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(r.startPosition == 0 && r.length == ~0u, "got %u, %u\n", r.startPosition, r.length); + /* set name only different in casing */ + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetFontFamilyName(layout, taHomaW, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + + r.startPosition = 0; + r.length = 0; + nameW[0] = 0; + hr = IDWriteTextLayout_GetFontFamilyName(layout, 1, nameW, sizeof(nameW)/sizeof(WCHAR), &r); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(nameW, taHomaW), "got %s\n", wine_dbgstr_w(nameW)); + ok(r.startPosition == 1 && r.length == 1, "got %u, %u\n", r.startPosition, r.length); + r.startPosition = 1; r.length = 1; hr = IDWriteTextLayout_SetFontFamilyName(layout, arialW, r);

1 0

Nikolay Sivov : dwrite: Use [0, ~0u) as initial range for strikethrough settings.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: ffeba2348a7f9e70eb3174c695cb88a1177940af URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffeba2348a7f9e70eb3174c69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 20:55:51 2015 +0300 dwrite: Use [0,~0u) as initial range for strikethrough settings. --- dlls/dwrite/layout.c | 9 +---- dlls/dwrite/tests/layout.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 150e34b..96d4959 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2175,9 +2175,6 @@ static HRESULT WINAPI dwritetextlayout_GetStrikethrough(IDWriteTextLayout2 *ifac TRACE("(%p)->(%u %p %p)\n", This, position, strikethrough, r); - if (position >= This->len) - return S_OK; - range = (struct layout_range_bool*)get_layout_range_header_by_pos(&This->strike_ranges, position); *strikethrough = range->value; @@ -3252,7 +3249,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, FLOAT maxwidth, FLOAT maxheight, struct dwrite_textlayout *layout) { struct layout_range_header *range, *strike; - DWRITE_TEXT_RANGE r; + DWRITE_TEXT_RANGE r = { 0, ~0u }; HRESULT hr; layout->IDWriteTextLayout2_iface.lpVtbl = &dwritetextlayoutvtbl; @@ -3296,11 +3293,7 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * if (FAILED(hr)) goto fail; - r.startPosition = 0; - r.length = ~0u; range = alloc_layout_range(layout, &r, LAYOUT_RANGE_REGULAR); - r.startPosition = 0; - r.length = len; strike = alloc_layout_range(layout, &r, LAYOUT_RANGE_STRIKETHROUGH); if (!range || !strike) { free_layout_range(range); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 3ac716e..4dd0ab1 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1174,6 +1174,10 @@ static const struct drawcall_entry draw_seq5[] = { { DRAW_LAST_KIND } }; +static const struct drawcall_entry draw_seq6[] = { + { DRAW_LAST_KIND } +}; + static void test_Draw(void) { static const WCHAR strW[] = {'s','t','r','i','n','g',0}; @@ -1274,6 +1278,16 @@ static void test_Draw(void) ok_sequence(sequences, RENDERER_ID, draw_seq5, "draw test 5", FALSE); IDWriteTextLayout_Release(layout); + /* empty string */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 0, format, 500.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + flush_sequence(sequences, RENDERER_ID); + hr = IDWriteTextLayout_Draw(layout, NULL, &testrenderer, 0.0, 0.0); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok_sequence(sequences, RENDERER_ID, draw_seq6, "draw test 6", FALSE); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); } @@ -1532,6 +1546,17 @@ todo_wine IDWriteTextLayout_Release(layout); + /* zero length string */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 0, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 1; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 3, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 0, "got %u\n", count); + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); @@ -2141,6 +2166,67 @@ static void test_SetFontStretch(void) IDWriteTextFormat_Release(format); } +static void test_SetStrikethrough(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + DWRITE_TEXT_RANGE r; + BOOL value; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + r.startPosition = 1; + r.length = 0; + value = TRUE; + hr = IDWriteTextLayout_GetStrikethrough(layout, 0, &value, &r); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(r.startPosition == 0 && r.length == ~0u, "got %u, %u\n", r.startPosition, r.length); + ok(value == FALSE, "got %d\n", value); + + r.startPosition = 1; + r.length = 1; + hr = IDWriteTextLayout_SetStrikethrough(layout, TRUE, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = FALSE; + hr = IDWriteTextLayout_GetStrikethrough(layout, 1, &value, &r); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(value == TRUE, "got %d\n", value); + ok(r.startPosition == 1 && r.length == 1, "got %u, %u\n", r.startPosition, r.length); + + value = TRUE; + r.startPosition = r.length = 0; + hr = IDWriteTextLayout_GetStrikethrough(layout, 20, &value, &r); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(r.startPosition == 2 && r.length == ~0u-2, "got %u, %u\n", r.startPosition, r.length); + ok(value == FALSE, "got %d\n", value); + + r.startPosition = 100; + r.length = 4; + hr = IDWriteTextLayout_SetStrikethrough(layout, TRUE, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + + value = FALSE; + r.startPosition = r.length = 0; + hr = IDWriteTextLayout_GetStrikethrough(layout, 100, &value, &r); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(r.startPosition == 100 && r.length == 4, "got %u, %u\n", r.startPosition, r.length); + ok(value == TRUE, "got %d\n", value); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -2176,6 +2262,7 @@ START_TEST(layout) test_SetFontFamilyName(); test_SetFontStyle(); test_SetFontStretch(); + test_SetStrikethrough(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Exit earlier when setting property for zero length range.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 1a2d520ee13cc126e303d797d56076c00128e871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a2d520ee13cc126e303d797d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 21:12:54 2015 +0300 dwrite: Exit earlier when setting property for zero length range. --- dlls/dwrite/layout.c | 4 ++++ dlls/dwrite/tests/layout.c | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 96d4959..903e53d 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1431,6 +1431,10 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo struct list *ranges; DWRITE_TEXT_RANGE r; + /* ignore zero length ranges */ + if (value->range.length == 0) + return S_OK; + /* select from ranges lists */ switch (attr) { diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 4dd0ab1..dd574b2 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1879,6 +1879,12 @@ static void test_SetFontSize(void) hr = IDWriteTextLayout_SetFontSize(layout, 15.0, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontSize(layout, 123.0, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + size = 0.0; hr = IDWriteTextLayout_GetFontSize(layout, 1, &size, &r); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1963,6 +1969,12 @@ static void test_SetFontFamilyName(void) hr = IDWriteTextLayout_SetFontFamilyName(layout, taHomaW, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontFamilyName(layout, arialW, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + r.startPosition = 0; r.length = 0; nameW[0] = 0; @@ -2034,6 +2046,12 @@ static void test_SetFontStyle(void) hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_ITALIC, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontStyle(layout, DWRITE_FONT_STYLE_NORMAL, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + style = DWRITE_FONT_STYLE_NORMAL; hr = IDWriteTextLayout_GetFontStyle(layout, 1, &style, &r); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2116,6 +2134,12 @@ static void test_SetFontStretch(void) hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_CONDENSED, r); ok(hr == S_OK, "got 0x%08x\n", hr); + /* zero length range */ + r.startPosition = 1; + r.length = 0; + hr = IDWriteTextLayout_SetFontStretch(layout, DWRITE_FONT_STRETCH_NORMAL, r); + ok(hr == S_OK, "got 0x%08x\n", hr); + stretch = DWRITE_FONT_STRETCH_UNDEFINED; hr = IDWriteTextLayout_GetFontStretch(layout, 1, &stretch, &r); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Stefan Dösinger : wined3d: Use renderbuffers if the resource type is RB.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: e8ec01ad5190cc77767cf132a341d329bbf451a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8ec01ad5190cc77767cf132a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:06 2015 +0200 wined3d: Use renderbuffers if the resource type is RB. --- dlls/wined3d/resource.c | 2 ++ dlls/wined3d/surface.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index e9e586f..7818deb 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -402,6 +402,8 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) resource->draw_binding = WINED3D_LOCATION_DRAWABLE; else if (resource->multisample_type) resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; + else if (resource->gl_type == WINED3D_GL_RES_TYPE_RB) + resource->draw_binding = WINED3D_LOCATION_RB_RESOLVED; else resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 552a079..4df6ca8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3716,6 +3716,9 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co case WINED3D_LOCATION_RB_MULTISAMPLE: surface_prepare_rb(surface, gl_info, TRUE); break; + case WINED3D_LOCATION_RB_RESOLVED: + surface_prepare_rb(surface, gl_info, FALSE); + break; case WINED3D_LOCATION_DRAWABLE: /* Nothing to do */ break;

1 0

Stefan Dösinger : wined3d: Set WINED3DFMT_FLAG_FBO_ATTACHABLE on depth stencil formats.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 04c3c970724cae9d16ddaa33732d594fb14a4542 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c3c970724cae9d16ddaa337… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:07 2015 +0200 wined3d: Set WINED3DFMT_FLAG_FBO_ATTACHABLE on depth stencil formats. --- dlls/wined3d/utils.c | 92 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 63 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=04c3c970724cae9d16dda…

1 0

Stefan Dösinger : wined3d: Require FBO attachability for render targets and depth stencils.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 28af7b407bb926953a73c373eb536449d1110e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28af7b407bb926953a73c373e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 09:28:08 2015 +0200 wined3d: Require FBO attachability for render targets and depth stencils. --- dlls/wined3d/resource.c | 7 +++++++ dlls/wined3d/utils.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 7818deb..1891165 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -114,6 +114,13 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * WARN("Format %s cannot be used for depth/stencil buffers.\n", debug_d3dformat(format->id)); continue; } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO + && usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL) + && !(format->flags[gl_type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)) + { + WARN("Render target or depth stencil is not FBO attachable.\n"); + continue; + } if ((usage & WINED3DUSAGE_TEXTURE) && !(format->flags[gl_type] & WINED3DFMT_FLAG_TEXTURE)) { WARN("Format %s cannot be used for texturing.\n", debug_d3dformat(format->id)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a3c3def..687d3d7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1282,7 +1282,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ARB_FRAMEBUFFER_OBJECT, NULL}, {WINED3DFMT_NULL, 0, 0, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, - WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FBO_ATTACHABLE, ARB_FRAMEBUFFER_OBJECT, NULL}, };

1 0