wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

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

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@streambuf@@IAEXH@Z */ +/* ?gbump@streambuf@@IEAAXH@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@streambuf@@IAEXH@Z */ +/* ?pbump@streambuf@@IEAAXH@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@ostream@@QEAAAEAV1@XZ @ stub -arch=win32 ?freeze@strstreambuf@@QAEXH@Z # void __thiscall strstreambuf::freeze(int) @ stub -arch=win64 ?freeze@strstreambuf@@QEAAXH@Z -@ stub -arch=win32 ?gbump@streambuf@@IAEXH@Z # void __thiscall streambuf::gbump(int) -@ stub -arch=win64 ?gbump@streambuf@@IEAAXH@Z +@ thiscall -arch=win32 ?gbump@streambuf@@IAEXH@Z(ptr long) streambuf_gbump +@ cdecl -arch=win64 ?gbump@streambuf@@IEAAXH@Z(ptr long) streambuf_gbump @ stub -arch=win32 ?gcount@istream@@QBEHXZ # int __thiscall istream::gcount(void)const @ stub -arch=win64 ?gcount@istream@@QEBAHXZ @ stub -arch=win32 ?get@istream@@IAEAAV1@PADHH@Z # class istream & __thiscall istream::get(char *,int,int) @@ -589,8 +589,8 @@ @ cdecl -arch=win64 ?pbackfail@streambuf@@UEAAHH@Z(ptr long) streambuf_pbackfail @ thiscall -arch=win32 ?pbase@streambuf@@IBEPADXZ(ptr) streambuf_pbase @ cdecl -arch=win64 ?pbase@streambuf@@IEBAPEADXZ(ptr) streambuf_pbase -@ stub -arch=win32 ?pbump@streambuf@@IAEXH@Z # void __thiscall streambuf::pbump(int) -@ stub -arch=win64 ?pbump@streambuf@@IEAAXH@Z +@ thiscall -arch=win32 ?pbump@streambuf@@IAEXH@Z(ptr long) streambuf_pbump +@ cdecl -arch=win64 ?pbump@streambuf@@IEAAXH@Z(ptr long) streambuf_pbump @ stub -arch=win32 ?pcount@ostrstream@@QBEHXZ # int __thiscall ostrstream::pcount(void)const @ stub -arch=win64 ?pcount@ostrstream@@QEBAHXZ @ stub -arch=win32 ?pcount@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@streambuf@@IEAAHXZ"); SET(p_streambuf_clrclock, "?clrlock@streambuf@@QEAAXXZ"); 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_pbump, "?pbump@streambuf@@IEAAXH@Z"); SET(p_streambuf_setb, "?setb@streambuf@@IEAAXPEAD0H@Z"); SET(p_streambuf_setbuf, "?setbuf@streambuf@@UEAAPEAV1@PEADH@Z"); SET(p_streambuf_setlock, "?setlock@streambuf@@QEAAXXZ"); @@ -148,7 +152,9 @@ static BOOL init(void) SET(p_streambuf_allocate, "?allocate@streambuf@@IAEHXZ"); SET(p_streambuf_clrclock, "?clrlock@streambuf@@QAEXXZ"); 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_pbump, "?pbump@streambuf@@IAEXH@Z"); SET(p_streambuf_setb, "?setb@streambuf@@IAEXPAD0H@Z"); SET(p_streambuf_setbuf, "?setbuf@streambuf@@UAEPAV1@PADH@Z"); SET(p_streambuf_setlock, "?setlock@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@ostream@@QEAAAEAV1@XZ @ stub -arch=win32 ?freeze@strstreambuf@@QAEXH@Z @ stub -arch=win64 ?freeze@strstreambuf@@QEAAXH@Z -@ stub -arch=win32 ?gbump@streambuf@@IAEXH@Z -@ stub -arch=win64 ?gbump@streambuf@@IEAAXH@Z +@ thiscall -arch=win32 ?gbump@streambuf@@IAEXH@Z(ptr long) msvcirt.?gbump@streambuf@@IAEXH@Z +@ cdecl -arch=win64 ?gbump@streambuf@@IEAAXH@Z(ptr long) msvcirt.?gbump@streambuf@@IEAAXH@Z @ stub -arch=win32 ?gcount@istream@@QBEHXZ @ stub -arch=win64 ?gcount@istream@@QEBAHXZ @ stub -arch=win32 ?get@istream@@QAEAAV1@AAC@Z @@ -575,8 +575,8 @@ @ cdecl -arch=win64 ?pbackfail@streambuf@@UEAAHH@Z(ptr long) msvcirt.?pbackfail@streambuf@@UEAAHH@Z @ thiscall -arch=win32 ?pbase@streambuf@@IBEPADXZ(ptr) msvcirt.?pbase@streambuf@@IBEPADXZ @ cdecl -arch=win64 ?pbase@streambuf@@IEBAPEADXZ(ptr) msvcirt.?pbase@streambuf@@IEBAPEADXZ -@ stub -arch=win32 ?pbump@streambuf@@IAEXH@Z -@ stub -arch=win64 ?pbump@streambuf@@IEAAXH@Z +@ thiscall -arch=win32 ?pbump@streambuf@@IAEXH@Z(ptr long) msvcirt.?pbump@streambuf@@IAEXH@Z +@ cdecl -arch=win64 ?pbump@streambuf@@IEAAXH@Z(ptr long) msvcirt.?pbump@streambuf@@IEAAXH@Z @ stub -arch=win32 ?pcount@ostrstream@@QBEHXZ @ stub -arch=win64 ?pcount@ostrstream@@QEBAHXZ @ stub -arch=win32 ?pcount@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@ostream@@QEAAAEAV1@XZ @ stub -arch=win32 ?freeze@strstreambuf@@QAEXH@Z @ stub -arch=win64 ?freeze@strstreambuf@@QEAAXH@Z -@ stub -arch=win32 ?gbump@streambuf@@IAEXH@Z -@ stub -arch=win64 ?gbump@streambuf@@IEAAXH@Z +@ thiscall -arch=win32 ?gbump@streambuf@@IAEXH@Z(ptr long) msvcirt.?gbump@streambuf@@IAEXH@Z +@ cdecl -arch=win64 ?gbump@streambuf@@IEAAXH@Z(ptr long) msvcirt.?gbump@streambuf@@IEAAXH@Z @ stub -arch=win32 ?gcount@istream@@QBEHXZ @ stub -arch=win64 ?gcount@istream@@QEBAHXZ @ stub -arch=win32 ?get@istream@@IAEAAV1@PADHH@Z @@ -644,8 +644,8 @@ @ cdecl -arch=win64 ?pbackfail@streambuf@@UEAAHH@Z(ptr long) msvcirt.?pbackfail@streambuf@@UEAAHH@Z @ thiscall -arch=win32 ?pbase@streambuf@@IBEPADXZ(ptr) msvcirt.?pbase@streambuf@@IBEPADXZ @ cdecl -arch=win64 ?pbase@streambuf@@IEBAPEADXZ(ptr) msvcirt.?pbase@streambuf@@IEBAPEADXZ -@ stub -arch=win32 ?pbump@streambuf@@IAEXH@Z -@ stub -arch=win64 ?pbump@streambuf@@IEAAXH@Z +@ thiscall -arch=win32 ?pbump@streambuf@@IAEXH@Z(ptr long) msvcirt.?pbump@streambuf@@IAEXH@Z +@ cdecl -arch=win64 ?pbump@streambuf@@IEAAXH@Z(ptr long) msvcirt.?pbump@streambuf@@IEAAXH@Z @ stub -arch=win32 ?pcount@ostrstream@@QBEHXZ @ stub -arch=win64 ?pcount@ostrstream@@QEBAHXZ @ stub -arch=win32 ?pcount@strstream@@QBEHXZ

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::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@streambuf@@IAEXH@Z */ +/* ?unbuffered@streambuf@@IEAAXH@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@streambuf@@IBEHXZ */ +/* ?unbuffered@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@ios@@QEAAPEAVostream@@PEAV2@@Z @ stub -arch=win32 ?tie@ios@@QBEPAVostream@@XZ # class ostream * __thiscall ios::tie(void)const @ stub -arch=win64 ?tie@ios@@QEBAPEAVostream@@XZ -@ stub -arch=win32 ?unbuffered@streambuf@@IAEXH@Z # void __thiscall streambuf::unbuffered(int) -@ stub -arch=win64 ?unbuffered@streambuf@@IEAAXH@Z -@ stub -arch=win32 ?unbuffered@streambuf@@IBEHXZ # int __thiscall streambuf::unbuffered(void)const -@ stub -arch=win64 ?unbuffered@streambuf@@IEBAHXZ +@ thiscall -arch=win32 ?unbuffered@streambuf@@IAEXH@Z(ptr long) streambuf_unbuffered_set +@ cdecl -arch=win64 ?unbuffered@streambuf@@IEAAXH@Z(ptr long) streambuf_unbuffered_set +@ thiscall -arch=win32 ?unbuffered@streambuf@@IBEHXZ(ptr) streambuf_unbuffered_get +@ cdecl -arch=win64 ?unbuffered@streambuf@@IEBAHXZ(ptr) streambuf_unbuffered_get @ stub -arch=win32 ?underflow@filebuf@@UAEHXZ # virtual int __thiscall filebuf::underflow(void) @ stub -arch=win64 ?underflow@filebuf@@UEAAHXZ @ stub -arch=win32 ?underflow@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@ios@@QEAAPEAVostream@@PEAV2@@Z @ stub -arch=win32 ?tie@ios@@QBEPAVostream@@XZ @ stub -arch=win64 ?tie@ios@@QEBAPEAVostream@@XZ -@ stub -arch=win32 ?unbuffered@streambuf@@IAEXH@Z -@ stub -arch=win64 ?unbuffered@streambuf@@IEAAXH@Z -@ stub -arch=win32 ?unbuffered@streambuf@@IBEHXZ -@ stub -arch=win64 ?unbuffered@streambuf@@IEBAHXZ +@ thiscall -arch=win32 ?unbuffered@streambuf@@IAEXH@Z(ptr long) msvcirt.?unbuffered@streambuf@@IAEXH@Z +@ cdecl -arch=win64 ?unbuffered@streambuf@@IEAAXH@Z(ptr long) msvcirt.?unbuffered@streambuf@@IEAAXH@Z +@ thiscall -arch=win32 ?unbuffered@streambuf@@IBEHXZ(ptr) msvcirt.?unbuffered@streambuf@@IBEHXZ +@ cdecl -arch=win64 ?unbuffered@streambuf@@IEBAHXZ(ptr) msvcirt.?unbuffered@streambuf@@IEBAHXZ @ stub -arch=win32 ?underflow@filebuf@@UAEHXZ @ stub -arch=win64 ?underflow@filebuf@@UEAAHXZ @ stub -arch=win32 ?underflow@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@ios@@QEAAPEAVostream@@PEAV2@@Z @ stub -arch=win32 ?tie@ios@@QBEPAVostream@@XZ @ stub -arch=win64 ?tie@ios@@QEBAPEAVostream@@XZ -@ stub -arch=win32 ?unbuffered@streambuf@@IAEXH@Z -@ stub -arch=win64 ?unbuffered@streambuf@@IEAAXH@Z -@ stub -arch=win32 ?unbuffered@streambuf@@IBEHXZ -@ stub -arch=win64 ?unbuffered@streambuf@@IEBAHXZ +@ thiscall -arch=win32 ?unbuffered@streambuf@@IAEXH@Z(ptr long) msvcirt.?unbuffered@streambuf@@IAEXH@Z +@ cdecl -arch=win64 ?unbuffered@streambuf@@IEAAXH@Z(ptr long) msvcirt.?unbuffered@streambuf@@IEAAXH@Z +@ thiscall -arch=win32 ?unbuffered@streambuf@@IBEHXZ(ptr) msvcirt.?unbuffered@streambuf@@IBEHXZ +@ cdecl -arch=win64 ?unbuffered@streambuf@@IEBAHXZ(ptr) msvcirt.?unbuffered@streambuf@@IEBAHXZ @ stub -arch=win32 ?underflow@filebuf@@UAEHXZ @ stub -arch=win64 ?underflow@filebuf@@UEAAHXZ @ stub -arch=win32 ?underflow@stdiobuf@@UAEHXZ

1 0

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::allocate.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 77dbfc8979ef5ed940e89557820f6dd2792158c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77dbfc8979ef5ed940e895578… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Jun 8 21:26:21 2015 +0200 msvcirt: Add implementation of streambuf::allocate. --- dlls/msvcirt/msvcirt.c | 57 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msvcirt/msvcirt.h | 1 + dlls/msvcirt/msvcirt.spec | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 23 +++++++++++++++++- dlls/msvcrt20/msvcrt20.spec | 4 ++-- dlls/msvcrt40/msvcrt40.spec | 4 ++-- 6 files changed, 84 insertions(+), 9 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index e0781b9..507ed11 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcirt); +#define RESERVE_SIZE 512 + /* class streambuf */ typedef struct { const vtable_ptr *vtable; @@ -47,6 +49,7 @@ typedef struct { CRITICAL_SECTION lock; } streambuf; +void __thiscall streambuf_setb(streambuf*, char*, char*, int); streambuf* __thiscall streambuf_setbuf(streambuf*, char*, int); void __thiscall streambuf_setg(streambuf*, char*, char*, char*); void __thiscall streambuf_setp(streambuf*, char*, char*); @@ -179,10 +182,29 @@ streambuf* __thiscall streambuf_scalar_dtor(streambuf *this, unsigned int flags) /* ?doallocate@streambuf@@MAEHXZ */ /* ?doallocate@streambuf@@MEAAHXZ */ DEFINE_THISCALL_WRAPPER(streambuf_doallocate, 4) +#define call_streambuf_doallocate(this) CALL_VTBL_FUNC(this, 40, int, (streambuf*), (this)) int __thiscall streambuf_doallocate(streambuf *this) { - FIXME("(%p): stub\n", this); - return EOF; + char *reserve; + + TRACE("(%p)\n", this); + reserve = MSVCRT_operator_new(RESERVE_SIZE); + if (!reserve) + return EOF; + + streambuf_setb(this, reserve, reserve + RESERVE_SIZE, 1); + return 1; +} + +/* ?allocate@streambuf@@IAEHXZ */ +/* ?allocate@streambuf@@IEAAHXZ */ +DEFINE_THISCALL_WRAPPER(streambuf_allocate, 4) +int __thiscall streambuf_allocate(streambuf *this) +{ + TRACE("(%p)\n", this); + if (this->base != NULL || this->unbuffered) + return 0; + return call_streambuf_doallocate(this); } /* Unexported */ @@ -404,6 +426,35 @@ char * __thiscall MSVCIRT_str_sl_void(class_strstreambuf * _this) return 0; } +#ifdef __i386__ + +#define DEFINE_VTBL_WRAPPER(off) \ + __ASM_GLOBAL_FUNC(vtbl_wrapper_ ## off, \ + "popl %eax\n\t" \ + "popl %ecx\n\t" \ + "pushl %eax\n\t" \ + "movl 0(%ecx), %eax\n\t" \ + "jmp *" #off "(%eax)\n\t") + +DEFINE_VTBL_WRAPPER(0); +DEFINE_VTBL_WRAPPER(4); +DEFINE_VTBL_WRAPPER(8); +DEFINE_VTBL_WRAPPER(12); +DEFINE_VTBL_WRAPPER(16); +DEFINE_VTBL_WRAPPER(20); +DEFINE_VTBL_WRAPPER(24); +DEFINE_VTBL_WRAPPER(28); +DEFINE_VTBL_WRAPPER(32); +DEFINE_VTBL_WRAPPER(36); +DEFINE_VTBL_WRAPPER(40); +DEFINE_VTBL_WRAPPER(44); +DEFINE_VTBL_WRAPPER(48); +DEFINE_VTBL_WRAPPER(52); +DEFINE_VTBL_WRAPPER(56); + +#endif + +void* (__cdecl *MSVCRT_operator_new)(SIZE_T); void (__cdecl *MSVCRT_operator_delete)(void*); static void init_cxx_funcs(void) @@ -412,10 +463,12 @@ static void init_cxx_funcs(void) if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ { + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPEAX_K@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPEAX@Z"); } else { + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2@YAPAXI@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3@YAXPAX@Z"); } } diff --git a/dlls/msvcirt/msvcirt.h b/dlls/msvcirt/msvcirt.h index bdcd7d8..5cf15de 100644 --- a/dlls/msvcirt/msvcirt.h +++ b/dlls/msvcirt/msvcirt.h @@ -23,6 +23,7 @@ typedef LONG streamoff; typedef LONG streampos; +extern void* (__cdecl *MSVCRT_operator_new)(SIZE_T); extern void (__cdecl *MSVCRT_operator_delete)(void*); void init_exception(void*); diff --git a/dlls/msvcirt/msvcirt.spec b/dlls/msvcirt/msvcirt.spec index dfb2734..f987dfd 100644 --- a/dlls/msvcirt/msvcirt.spec +++ b/dlls/msvcirt/msvcirt.spec @@ -400,8 +400,8 @@ @ stub -arch=win32 ??_Gstrstream@@UAEPAXI@Z # virtual void * __thiscall strstream::`scalar deleting destructor'(unsigned int) @ stub -arch=win32 ??_Gstrstreambuf@@UAEPAXI@Z # virtual void * __thiscall strstreambuf::`scalar deleting destructor'(unsigned int) # @ extern ?adjustfield@ios@@2JB # static long const ios::adjustfield -@ stub -arch=win32 ?allocate@streambuf@@IAEHXZ # int __thiscall streambuf::allocate(void) -@ stub -arch=win64 ?allocate@streambuf@@IEAAHXZ +@ thiscall -arch=win32 ?allocate@streambuf@@IAEHXZ(ptr) streambuf_allocate +@ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) streambuf_allocate @ stub -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z # class filebuf * __thiscall filebuf::attach(int) @ stub -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z # void __thiscall fstream::attach(int) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 311fd97..51b75ee 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -52,6 +52,8 @@ typedef struct { static streambuf* (*__thiscall p_streambuf_reserve_ctor)(streambuf*, char*, int); static streambuf* (*__thiscall p_streambuf_ctor)(streambuf*); static void (*__thiscall p_streambuf_dtor)(streambuf*); +static int (*__thiscall p_streambuf_allocate)(streambuf*); +static int (*__thiscall p_streambuf_doallocate)(streambuf*); static void (*__thiscall p_streambuf_setb)(streambuf*, char*, char*, int); static streambuf* (*__thiscall p_streambuf_setbuf)(streambuf*, char*, int); @@ -127,12 +129,16 @@ static BOOL init(void) SET(p_streambuf_reserve_ctor, "??0streambuf@@IEAA@PEADH@Z"); SET(p_streambuf_ctor, "??0streambuf@@IEAA@XZ"); SET(p_streambuf_dtor, "??1streambuf@@UEAA@XZ"); + SET(p_streambuf_allocate, "?allocate@streambuf@@IEAAHXZ"); + SET(p_streambuf_doallocate, "?doallocate@streambuf@@MEAAHXZ"); SET(p_streambuf_setb, "?setb@streambuf@@IEAAXPEAD0H@Z"); SET(p_streambuf_setbuf, "?setbuf@streambuf@@UEAAPEAV1@PEADH@Z"); } else { SET(p_streambuf_reserve_ctor, "??0streambuf@@IAE@PADH@Z"); SET(p_streambuf_ctor, "??0streambuf@@IAE@XZ"); SET(p_streambuf_dtor, "??1streambuf@@UAE@XZ"); + SET(p_streambuf_allocate, "?allocate@streambuf@@IAEHXZ"); + SET(p_streambuf_doallocate, "?doallocate@streambuf@@MAEHXZ"); SET(p_streambuf_setb, "?setb@streambuf@@IAEXPAD0H@Z"); SET(p_streambuf_setbuf, "?setbuf@streambuf@@UAEPAV1@PADH@Z"); } @@ -145,6 +151,7 @@ static void test_streambuf(void) { streambuf sb, sb2, *psb; char reserve[16]; + int ret; memset(&sb, 0xab, sizeof(streambuf)); memset(&sb2, 0xab, sizeof(streambuf)); @@ -197,7 +204,21 @@ static void test_streambuf(void) ok(sb.base == reserve, "wrong base pointer, expected %p got %p\n", reserve, sb.base); ok(sb.ebuf == reserve+16, "wrong ebuf pointer, expected %p got %p\n", reserve+16, sb.ebuf); - sb.allocated = 0; + /* allocate */ + ret = (int) call_func1(p_streambuf_allocate, &sb); + ok(ret == 0, "wrong return value, expected 0 got %d\n", ret); + sb.base = NULL; + ret = (int) call_func1(p_streambuf_allocate, &sb); + ok(ret == 1, "wrong return value, expected 1 got %d\n", ret); + ok(sb.allocated == 1, "wrong allocate value, expected 1 got %d\n", sb.allocated); + ok(sb.ebuf - sb.base == 512 , "wrong reserve area size, expected 512 got %p-%p\n", sb.ebuf, sb.base); + + /* doallocate */ + ret = (int) call_func1(p_streambuf_doallocate, &sb2); + ok(ret == 1, "doallocate failed, got %d\n", ret); + 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); + call_func1(p_streambuf_dtor, &sb); call_func1(p_streambuf_dtor, &sb2); } diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 3cefd74..195cdf1 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -388,8 +388,8 @@ @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z # @ extern ?adjustfield@ios@@2JB -@ stub -arch=win32 ?allocate@streambuf@@IAEHXZ -@ stub -arch=win64 ?allocate@streambuf@@IEAAHXZ +@ thiscall -arch=win32 ?allocate@streambuf@@IAEHXZ(ptr) msvcirt.?allocate@streambuf@@IAEHXZ +@ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) msvcirt.?allocate@streambuf@@IEAAHXZ @ stub -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z @ stub -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 705521a..0042f17 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -451,8 +451,8 @@ @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z # @ extern ?adjustfield@ios@@2JB -@ stub -arch=win32 ?allocate@streambuf@@IAEHXZ -@ stub -arch=win64 ?allocate@streambuf@@IEAAHXZ +@ thiscall -arch=win32 ?allocate@streambuf@@IAEHXZ(ptr) msvcirt.?allocate@streambuf@@IAEHXZ +@ cdecl -arch=win64 ?allocate@streambuf@@IEAAHXZ(ptr) msvcirt.?allocate@streambuf@@IEAAHXZ @ stub -arch=win32 ?attach@filebuf@@QAEPAV1@H@Z @ stub -arch=win64 ?attach@filebuf@@QEAAPEAV1@H@Z @ stub -arch=win32 ?attach@fstream@@QAEXH@Z

1 0

Alexandre Julliard : server: Add a request to empty the clipboard.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 3d7aa246d5d812e93ba96f4ec78bf7c1b462102b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d7aa246d5d812e93ba96f4ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 16:53:30 2015 +0900 server: Add a request to empty the clipboard. --- dlls/user32/clipboard.c | 64 +++++++++--------------------------------- dlls/user32/tests/clipboard.c | 4 +-- include/wine/server_protocol.h | 18 ++++++++++-- server/clipboard.c | 36 +++++++++++++----------- server/protocol.def | 6 +++- server/request.h | 3 ++ server/trace.c | 7 +++++ 7 files changed, 65 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d7aa246d5d812e93ba96…

1 0

Alexandre Julliard : user32/tests: Add tests for calling EmptyClipboard from a different thread.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: 26bae6d61309419194a8553a3b1b3eaa9b7a64aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=26bae6d61309419194a8553a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 9 16:38:15 2015 +0900 user32/tests: Add tests for calling EmptyClipboard from a different thread. --- dlls/user32/tests/clipboard.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 25da45b..05deed6 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -34,6 +34,14 @@ static DWORD WINAPI open_clipboard_thread(LPVOID arg) return 0; } +static DWORD WINAPI empty_clipboard_thread(LPVOID arg) +{ + SetLastError( 0xdeadbeef ); + ok(!EmptyClipboard(), "EmptyClipboard succeeded\n" ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError()); + return 0; +} + static void test_ClipboardOwner(void) { HANDLE thread; @@ -73,6 +81,11 @@ static void test_ClipboardOwner(void) dwret = WaitForSingleObject(thread, 1000); ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); CloseHandle(thread); + thread = CreateThread(NULL, 0, empty_clipboard_thread, 0, 0, NULL); + ok(thread != NULL, "CreateThread failed with error %d\n", GetLastError()); + dwret = WaitForSingleObject(thread, 1000); + ok(dwret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", dwret); + CloseHandle(thread); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -303,6 +316,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA { static UINT wm_drawclipboard; static UINT wm_clipboardupdate; + static UINT wm_destroyclipboard; LRESULT ret; switch(msg) { @@ -317,6 +331,10 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA else if (next_wnd) SendMessageA(next_wnd, msg, wp, lp); break; + case WM_DESTROYCLIPBOARD: + wm_destroyclipboard++; + ok( GetClipboardOwner() == hwnd, "WM_DESTROYCLIPBOARD owner %p\n", GetClipboardOwner() ); + break; case WM_CLIPBOARDUPDATE: wm_clipboardupdate++; break; @@ -332,6 +350,10 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA ret = wm_clipboardupdate; wm_clipboardupdate = 0; return ret; + case WM_USER+3: + ret = wm_destroyclipboard; + wm_destroyclipboard = 0; + return ret; } return DefWindowProcA(hwnd, msg, wp, lp); @@ -393,6 +415,8 @@ static DWORD WINAPI clipboard_thread(void *param) ok( !count, "WM_DRAWCLIPBOARD received\n" ); count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( !count, "WM_DESTROYCLIPBOARD received\n" ); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); @@ -407,6 +431,8 @@ static DWORD WINAPI clipboard_thread(void *param) ok( !count, "WM_DRAWCLIPBOARD received\n" ); count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( count, "WM_DESTROYCLIPBOARD not received\n" ); handle = SetClipboardData( CF_TEXT, create_text() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); @@ -518,6 +544,13 @@ static DWORD WINAPI clipboard_thread(void *param) count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + r = OpenClipboard(0); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + r = EmptyClipboard(); + ok(r, "EmptyClipboard failed: %d\n", GetLastError()); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); return 0;

1 0

Michael Stefaniuc : dswave: Remove gratuitous IDirectMusicSegment8 from DirectSoundWave.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: da07fe99a5f2276aa727fa4c3f73d7ab92fbf57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=da07fe99a5f2276aa727fa4c3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 8 21:33:09 2015 +0200 dswave: Remove gratuitous IDirectMusicSegment8 from DirectSoundWave. --- dlls/dswave/dswave.c | 226 ------------------------------------------- dlls/dswave/dswave_private.h | 1 - dlls/dswave/tests/dswave.c | 6 +- 3 files changed, 3 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da07fe99a5f2276aa727f…

1 0

Nikolay Sivov : gdiplus: Added GdipImageSetAbort stub.
by Alexandre Julliard 09 Jun '15

09 Jun '15

Module: wine Branch: master Commit: a5ab896abd27fcd367948b4716523c607997ff87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5ab896abd27fcd367948b471… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 8 16:44:40 2015 +0300 gdiplus: Added GdipImageSetAbort stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 9 +++++++++ include/gdiplusflat.h | 1 + include/gdiplustypes.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index cee3ea6..9701ee0 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -621,7 +621,7 @@ 621 stub GdipBitmapGetHistogram 622 stub GdipBitmapGetHistogramSize 623 stub GdipBitmapConvertFormat -624 stub GdipImageSetAbort +624 stdcall GdipImageSetAbort(ptr ptr) 625 stub GdipGraphicsSetAbort 626 stub GdipDrawImageFX 627 stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 86802a5..351c5b3 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -5235,3 +5235,12 @@ GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage *image, RotateFlipType type) return stat; } + +/***************************************************************************** + * GdipImageSetAbort [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipImageSetAbort(GpImage *image, GdiplusAbort *pabort) +{ + FIXME("(%p, %p): stub\n", image, pabort); + return NotImplemented; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 0753585..29119b4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -421,6 +421,7 @@ GpStatus WINGDIPAPI GdipImageGetFrameDimensionsCount(GpImage*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameDimensionsList(GpImage*,GUID*,UINT); GpStatus WINGDIPAPI GdipImageRotateFlip(GpImage*,RotateFlipType); GpStatus WINGDIPAPI GdipImageSelectActiveFrame(GpImage*,GDIPCONST GUID*,UINT); +GpStatus WINGDIPAPI GdipImageSetAbort(GpImage*,GdiplusAbort*); GpStatus WINGDIPAPI GdipLoadImageFromFile(GDIPCONST WCHAR*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromFileICM(GDIPCONST WCHAR*,GpImage**); GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream*,GpImage**); diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 2e46bb4..80d5955 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -54,6 +54,7 @@ extern "C" { typedef BOOL (CALLBACK * ImageAbort)(VOID *); typedef ImageAbort DrawImageAbort; typedef ImageAbort GetThumbnailImageAbort; +typedef struct GdiplusAbort GdiplusAbort; typedef BOOL (CALLBACK * EnumerateMetafileProc)(EmfPlusRecordType,UINT,UINT,const BYTE*,VOID*);

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
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