Module: wine Branch: master Commit: d77342ff96639d988b5f606f3882e7f34261be7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d77342ff96639d988b5f606f38...
Author: Iván Matellanes matellanesivan@gmail.com Date: Tue Jun 14 15:40:22 2016 +0100
msvcirt: Implement ostream::seekp.
Signed-off-by: Iván Matellanes matellanes.ivan@gmail.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcirt/msvcirt.c | 18 ++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 9cb7a5c..2464d4f 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2479,7 +2479,14 @@ ostream* __thiscall ostream_put_unsigned_char(ostream *this, unsigned char c) DEFINE_THISCALL_WRAPPER(ostream_seekp, 8) ostream* __thiscall ostream_seekp(ostream *this, streampos pos) { - FIXME("(%p %d) stub\n", this, pos); + ios *base = ostream_get_ios(this); + + TRACE("(%p %d)\n", this, pos); + + ios_lockbuf(base); + if (streambuf_seekpos(base->sb, pos, OPENMODE_out) == EOF) + ios_clear(base, base->state | IOSTATE_failbit); + ios_unlockbuf(base); return this; }
@@ -2488,7 +2495,14 @@ ostream* __thiscall ostream_seekp(ostream *this, streampos pos) DEFINE_THISCALL_WRAPPER(ostream_seekp_offset, 12) ostream* __thiscall ostream_seekp_offset(ostream *this, streamoff off, ios_seek_dir dir) { - FIXME("(%p %d %d) stub\n", this, off, dir); + ios *base = ostream_get_ios(this); + + TRACE("(%p %d %d)\n", this, off, dir); + + ios_lockbuf(base); + if (call_streambuf_seekoff(base->sb, off, dir, OPENMODE_out) == EOF) + ios_clear(base, base->state | IOSTATE_failbit); + ios_unlockbuf(base); return this; }
diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 0563046..3a6cb6e 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -266,6 +266,8 @@ static int (*__thiscall p_ostream_opfx)(ostream*); static void (*__thiscall p_ostream_osfx)(ostream*); static ostream* (*__thiscall p_ostream_put_char)(ostream*, char); static ostream* (*__thiscall p_ostream_write_char)(ostream*, const char*, int); +static ostream* (*__thiscall p_ostream_seekp_offset)(ostream*, streamoff, ios_seek_dir); +static ostream* (*__thiscall p_ostream_seekp)(ostream*, streampos);
/* Emulate a __thiscall */ #ifdef __i386__ @@ -436,6 +438,8 @@ static BOOL init(void) SET(p_ostream_osfx, "?osfx@ostream@@QEAAXXZ"); SET(p_ostream_put_char, "?put@ostream@@QEAAAEAV1@D@Z"); SET(p_ostream_write_char, "?write@ostream@@QEAAAEAV1@PEBDH@Z"); + SET(p_ostream_seekp_offset, "?seekp@ostream@@QEAAAEAV1@JW4seek_dir@ios@@@Z"); + SET(p_ostream_seekp, "?seekp@ostream@@QEAAAEAV1@J@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3@YAXPAX@Z"); @@ -536,6 +540,8 @@ static BOOL init(void) SET(p_ostream_osfx, "?osfx@ostream@@QAEXXZ"); SET(p_ostream_put_char, "?put@ostream@@QAEAAV1@D@Z"); SET(p_ostream_write_char, "?write@ostream@@QAEAAV1@PBDH@Z"); + SET(p_ostream_seekp_offset, "?seekp@ostream@@QAEAAV1@JW4seek_dir@ios@@@Z"); + SET(p_ostream_seekp, "?seekp@ostream@@QAEAAV1@J@Z"); } SET(p_ios_static_lock, "?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc@ios@@KAXXZ"); @@ -2816,6 +2822,40 @@ if (0) /* crashes on native */ ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); fb1.fd = fd;
+ /* seekp */ + os1.base_ios.state = IOSTATE_eofbit; + pos = (ostream*) call_func3(p_ostream_seekp_offset, &os1, 0, SEEKDIR_beg); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, os1.base_ios.state); + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "but", 3); + ok(ret == 3, "expected 3 got %d\n", ret); + ok(fb1.base.pbase == fb1.base.base, "wrong put base, expected %p got %p\n", fb1.base.base, fb1.base.pbase); + ok(fb1.base.pptr == fb1.base.base + 3, "wrong put pointer, expected %p got %p\n", fb1.base.base + 3, fb1.base.pptr); + pos = (ostream*) call_func3(p_ostream_seekp_offset, &os1, 0, SEEKDIR_end); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, os1.base_ios.state); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + pos = (ostream*) call_func3(p_ostream_seekp_offset, &os1, -1, SEEKDIR_beg); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, os1.base_ios.state); + ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "You're too shy", 14); + ok(ret == 14, "expected 14 got %d\n", ret); + ok(fb1.base.pbase == fb1.base.base, "wrong put base, expected %p got %p\n", fb1.base.base, fb1.base.pbase); + ok(fb1.base.pptr == fb1.base.base + 14, "wrong put pointer, expected %p got %p\n", fb1.base.base + 14, fb1.base.pptr); + pos = (ostream*) call_func2(p_ostream_seekp, &os1, 0); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_eofbit|IOSTATE_failbit, os1.base_ios.state); + ok(fb1.base.pbase == NULL, "wrong put base, expected %p got %p\n", NULL, fb1.base.pbase); + ok(fb1.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb1.base.pptr); + os1.base_ios.state = IOSTATE_badbit; + pos = (ostream*) call_func2(p_ostream_seekp, &os1, -1); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ok(os1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", + IOSTATE_badbit|IOSTATE_failbit, os1.base_ios.state); + call_func1(p_ostream_vbase_dtor, &os1); call_func1(p_ostream_vbase_dtor, &os2); call_func1(p_filebuf_dtor, &fb1);