[3/6] msvcirt: Implement istream::eatwhite
Iván Matellanes
matellanesivan at gmail.com
Fri Jul 15 04:26:53 CDT 2016
Signed-off-by: Iván Matellanes <matellanes.ivan at gmail.com>
---
dlls/msvcirt/msvcirt.c | 11 +++++++-
dlls/msvcirt/tests/msvcirt.c | 61 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c
index 33d1b14..cffd0da 100644
--- a/dlls/msvcirt/msvcirt.c
+++ b/dlls/msvcirt/msvcirt.c
@@ -3040,7 +3040,16 @@ istream* __thiscall istream_scalar_dtor(ios *base, unsigned int flags)
DEFINE_THISCALL_WRAPPER(istream_eatwhite, 4)
void __thiscall istream_eatwhite(istream *this)
{
- FIXME("(%p) stub\n", this);
+ ios *base = istream_get_ios(this);
+ int c;
+
+ TRACE("(%p)\n", this);
+
+ ios_lockbuf(base);
+ for (c = streambuf_sgetc(base->sb); isspace(c); c = streambuf_snextc(base->sb));
+ ios_unlockbuf(base);
+ if (c == EOF)
+ ios_clear(base, base->state | IOSTATE_eofbit);
}
/* ?gcount at istream@@QBEHXZ */
diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c
index bdbdbf0..fd32099 100644
--- a/dlls/msvcirt/tests/msvcirt.c
+++ b/dlls/msvcirt/tests/msvcirt.c
@@ -309,6 +309,7 @@ static void (*__thiscall p_istream_dtor)(ios*);
static istream* (*__thiscall p_istream_assign_sb)(istream*, streambuf*);
static istream* (*__thiscall p_istream_assign)(istream*, const istream*);
static void (*__thiscall p_istream_vbase_dtor)(istream*);
+static void (*__thiscall p_istream_eatwhite)(istream*);
/* Emulate a __thiscall */
#ifdef __i386__
@@ -506,6 +507,7 @@ static BOOL init(void)
SET(p_istream_assign_sb, "??4istream@@IEAAAEAV0 at PEAVstreambuf@@@Z");
SET(p_istream_assign, "??4istream@@IEAAAEAV0 at AEBV0@@Z");
SET(p_istream_vbase_dtor, "??_Distream@@QEAAXXZ");
+ SET(p_istream_eatwhite, "?eatwhite at istream@@QEAAXXZ");
} else {
p_operator_new = (void*)GetProcAddress(msvcrt, "??2 at YAPAXI@Z");
p_operator_delete = (void*)GetProcAddress(msvcrt, "??3 at YAXPAX@Z");
@@ -625,6 +627,7 @@ static BOOL init(void)
SET(p_istream_assign_sb, "??4istream@@IAEAAV0 at PAVstreambuf@@@Z");
SET(p_istream_assign, "??4istream@@IAEAAV0 at ABV0@@Z");
SET(p_istream_vbase_dtor, "??_Distream@@QAEXXZ");
+ SET(p_istream_eatwhite, "?eatwhite at istream@@QAEXXZ");
}
SET(p_ios_static_lock, "?x_lockc at ios@@0U_CRT_CRITICAL_SECTION@@A");
SET(p_ios_lockc, "?lockc at ios@@KAXXZ");
@@ -3410,6 +3413,7 @@ static void test_istream(void)
filebuf fb1, fb2, *pfb;
const char filename1[] = "test1";
const char filename2[] = "test2";
+ int ret;
memset(&is1, 0xab, sizeof(istream));
memset(&is2, 0xab, sizeof(istream));
@@ -3556,6 +3560,63 @@ if (0) /* crashes on native */
ok(is2.base_ios.sb == &fb2.base, "expected %p got %p\n", &fb2.base, is2.base_ios.sb);
ok(is2.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is2.base_ios.state);
+ /* eatwhite */
+ is1.extract_delim = is1.count = 0;
+if (0) /* crashes on native */
+ is1.base_ios.sb = NULL;
+ is1.base_ios.state = IOSTATE_badbit;
+ is1.base_ios.flags = 0;
+ call_func1(p_istream_eatwhite, &is1);
+ ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_eofbit), "expected %d got %d\n",
+ IOSTATE_badbit|IOSTATE_eofbit, is1.base_ios.state);
+ is1.base_ios.state = IOSTATE_failbit;
+ call_func1(p_istream_eatwhite, &is1);
+ ok(is1.base_ios.state == (IOSTATE_failbit|IOSTATE_eofbit), "expected %d got %d\n",
+ IOSTATE_failbit|IOSTATE_eofbit, is1.base_ios.state);
+ is1.base_ios.state = IOSTATE_goodbit;
+ ret = (int) call_func3(p_streambuf_xsputn, &fb1.base, "And if \tyou ask\n\v\f\r me", 23);
+ ok(ret == 23, "expected 23 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 + 23, "wrong put pointer, expected %p got %p\n", fb1.base.base + 23, fb1.base.pptr);
+ call_func1(p_istream_eatwhite, &is1);
+ ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.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);
+ ok(fb1.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb1.base.epptr);
+ is1.base_ios.state = IOSTATE_goodbit;
+ ret = (int) call_func4(p_filebuf_seekoff, &fb1, 0, SEEKDIR_beg, 0);
+ ok(ret == 0, "expected 0 got %d\n", ret);
+ call_func1(p_istream_eatwhite, &is1);
+ ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
+ ok(fb1.base.eback == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.eback);
+ ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr);
+ ok(fb1.base.egptr == fb1.base.base + 23, "wrong get end, expected %p got %p\n", fb1.base.base + 23, fb1.base.egptr);
+ ret = (int) call_func4(p_filebuf_seekoff, &fb1, 3, SEEKDIR_beg, 0);
+ ok(ret == 3, "expected 3 got %d\n", ret);
+ call_func1(p_istream_eatwhite, &is1);
+ ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
+ ok(fb1.base.eback == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.eback);
+ ok(fb1.base.gptr == fb1.base.base + 1, "wrong get pointer, expected %p got %p\n", fb1.base.base + 1, fb1.base.gptr);
+ ok(fb1.base.egptr == fb1.base.base + 20, "wrong get end, expected %p got %p\n", fb1.base.base + 20, fb1.base.egptr);
+ fb1.base.gptr += 2;
+ call_func1(p_istream_eatwhite, &is1);
+ ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
+ ok(fb1.base.eback == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.eback);
+ ok(fb1.base.gptr == fb1.base.base + 5, "wrong get pointer, expected %p got %p\n", fb1.base.base + 5, fb1.base.gptr);
+ ok(fb1.base.egptr == fb1.base.base + 20, "wrong get end, expected %p got %p\n", fb1.base.base + 20, fb1.base.egptr);
+ fb1.base.gptr += 7;
+ call_func1(p_istream_eatwhite, &is1);
+ ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
+ ok(fb1.base.eback == fb1.base.base, "wrong get base, expected %p got %p\n", fb1.base.base, fb1.base.eback);
+ ok(fb1.base.gptr == fb1.base.base + 18, "wrong get pointer, expected %p got %p\n", fb1.base.base + 18, fb1.base.gptr);
+ ok(fb1.base.egptr == fb1.base.base + 20, "wrong get end, expected %p got %p\n", fb1.base.base + 20, fb1.base.egptr);
+ fb1.base.gptr += 9;
+ call_func1(p_istream_eatwhite, &is1);
+ ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state);
+ ok(fb1.base.eback == NULL, "wrong get base, expected %p got %p\n", NULL, fb1.base.eback);
+ ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr);
+ ok(fb1.base.egptr == NULL, "wrong get end, expected %p got %p\n", NULL, fb1.base.egptr);
+
call_func1(p_istream_vbase_dtor, &is1);
call_func1(p_istream_vbase_dtor, &is2);
call_func1(p_filebuf_dtor, &fb1);
--
2.7.4
More information about the wine-patches
mailing list