[2/5] msvcirt: Implement istream::get for single characters
Iván Matellanes
matellanesivan at gmail.com
Mon Jul 18 03:13:02 CDT 2016
Signed-off-by: Iván Matellanes <matellanes.ivan at gmail.com>
---
dlls/msvcirt/msvcirt.c | 29 ++++++++++--
dlls/msvcirt/tests/msvcirt.c | 105 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 129 insertions(+), 5 deletions(-)
diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c
index 208c731..6165e58 100644
--- a/dlls/msvcirt/msvcirt.c
+++ b/dlls/msvcirt/msvcirt.c
@@ -3162,6 +3162,28 @@ istream* __thiscall istream_get_unsigned_str(istream *this, unsigned char *str,
return istream_get_str(this, (char*) str, count, delim);
}
+static int istream_internal_get_char(istream *this, char *ch)
+{
+ ios *base = istream_get_ios(this);
+ int ret = EOF;
+
+ TRACE("(%p %p)\n", this, ch);
+
+ if (istream_ipfx(this, 1)) {
+ if ((ret = streambuf_sbumpc(base->sb)) != EOF) {
+ this->count = 1;
+ } else {
+ base->state |= IOSTATE_eofbit;
+ if (ch)
+ base->state |= IOSTATE_failbit;
+ }
+ if (ch)
+ *ch = ret;
+ istream_isfx(this);
+ }
+ return ret;
+}
+
/* ?get at istream@@QAEAAV1 at AAC@Z */
/* ?get at istream@@QEAAAEAV1 at AEAC@Z */
/* ?get at istream@@QAEAAV1 at AAD@Z */
@@ -3169,7 +3191,7 @@ istream* __thiscall istream_get_unsigned_str(istream *this, unsigned char *str,
DEFINE_THISCALL_WRAPPER(istream_get_char, 8)
istream* __thiscall istream_get_char(istream *this, char *ch)
{
- FIXME("(%p %p) stub\n", this, ch);
+ istream_internal_get_char(this, ch);
return this;
}
@@ -3178,7 +3200,7 @@ istream* __thiscall istream_get_char(istream *this, char *ch)
DEFINE_THISCALL_WRAPPER(istream_get_unsigned_char, 8)
istream* __thiscall istream_get_unsigned_char(istream *this, unsigned char *ch)
{
- FIXME("(%p %p) stub\n", this, ch);
+ istream_internal_get_char(this, (char*) ch);
return this;
}
@@ -3187,8 +3209,7 @@ istream* __thiscall istream_get_unsigned_char(istream *this, unsigned char *ch)
DEFINE_THISCALL_WRAPPER(istream_get, 4)
int __thiscall istream_get(istream *this)
{
- FIXME("(%p) stub\n", this);
- return 0;
+ return istream_internal_get_char(this, NULL);
}
/* ?get at istream@@QAEAAV1 at AAVstreambuf@@D at Z */
diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c
index ceb558b..0f72d22 100644
--- a/dlls/msvcirt/tests/msvcirt.c
+++ b/dlls/msvcirt/tests/msvcirt.c
@@ -313,6 +313,8 @@ static void (*__thiscall p_istream_eatwhite)(istream*);
static int (*__thiscall p_istream_ipfx)(istream*, int);
static istream* (*__thiscall p_istream_get_str_delim)(istream*, char*, int, int);
static istream* (*__thiscall p_istream_get_str)(istream*, char*, int, char);
+static int (*__thiscall p_istream_get)(istream*);
+static istream* (*__thiscall p_istream_get_char)(istream*, char*);
/* Emulate a __thiscall */
#ifdef __i386__
@@ -514,6 +516,8 @@ static BOOL init(void)
SET(p_istream_ipfx, "?ipfx at istream@@QEAAHH at Z");
SET(p_istream_get_str_delim, "?get at istream@@IEAAAEAV1 at PEADHH@Z");
SET(p_istream_get_str, "?get at istream@@QEAAAEAV1 at PEADHD@Z");
+ SET(p_istream_get, "?get at istream@@QEAAHXZ");
+ SET(p_istream_get_char, "?get at istream@@QEAAAEAV1 at AEAD@Z");
} else {
p_operator_new = (void*)GetProcAddress(msvcrt, "??2 at YAPAXI@Z");
p_operator_delete = (void*)GetProcAddress(msvcrt, "??3 at YAXPAX@Z");
@@ -637,6 +641,8 @@ static BOOL init(void)
SET(p_istream_ipfx, "?ipfx at istream@@QAEHH at Z");
SET(p_istream_get_str_delim, "?get at istream@@IAEAAV1 at PADHH@Z");
SET(p_istream_get_str, "?get at istream@@QAEAAV1 at PADHD@Z");
+ SET(p_istream_get, "?get at istream@@QAEHXZ");
+ SET(p_istream_get_char, "?get at istream@@QAEAAV1 at AAD@Z");
}
SET(p_ios_static_lock, "?x_lockc at ios@@0U_CRT_CRITICAL_SECTION@@A");
SET(p_ios_lockc, "?lockc at ios@@KAXXZ");
@@ -3424,7 +3430,7 @@ static void test_istream(void)
const char filename1[] = "test1";
const char filename2[] = "test2";
int fd, ret;
- char buffer[32];
+ char buffer[32], c;
memset(&is1, 0xab, sizeof(istream));
memset(&is2, 0xab, sizeof(istream));
@@ -3966,6 +3972,103 @@ if (0) /* crashes on native */
ok(buffer[1] == -40, "expected -40 got %d\n", buffer[1]);
ok(buffer[2] == 0, "expected 0 got %d\n", buffer[2]);
+ /* get */
+ is1.count = 0xabababab;
+ is1.base_ios.state = IOSTATE_eofbit;
+ ret = (int) call_func1(p_istream_get, &is1);
+ ok(ret == EOF, "expected -1 got %d\n", ret);
+ ok(is1.count == 0, "expected 0 got %d\n", is1.count);
+ ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n",
+ IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state);
+ is1.base_ios.state = IOSTATE_badbit;
+ ret = (int) call_func1(p_istream_get, &is1);
+ ok(ret == EOF, "expected -1 got %d\n", ret);
+ ok(is1.count == 0, "expected 0 got %d\n", is1.count);
+ ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n",
+ IOSTATE_badbit|IOSTATE_failbit, is1.base_ios.state);
+ is1.base_ios.state = IOSTATE_goodbit;
+ fb1.base.egptr = NULL;
+ ret = (int) call_func1(p_istream_get, &is1);
+ ok(ret == EOF, "expected -1 got %d\n", ret);
+ ok(is1.count == 0, "expected 0 got %d\n", is1.count);
+ ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state);
+ is1.base_ios.state = IOSTATE_goodbit;
+ fb1.base.eback = fb1.base.gptr = fb1.base.base;
+ fb1.base.egptr = fb1.base.base + 30;
+ ret = (int) call_func1(p_istream_get, &is1);
+ ok(ret == ' ', "expected %d got %d\n", ' ', ret);
+ ok(is1.count == 1, "expected 1 got %d\n", is1.count);
+ ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
+ ok(fb1.base.gptr == fb1.base.base + 1, "wrong get pointer, expected %p got %p\n", fb1.base.base + 1, fb1.base.gptr);
+ *fb1.base.gptr = '\n';
+ ret = (int) call_func1(p_istream_get, &is1);
+ ok(ret == '\n', "expected %d got %d\n", '\n', ret);
+ ok(is1.count == 1, "expected 1 got %d\n", is1.count);
+ ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
+ ok(fb1.base.gptr == fb1.base.base + 2, "wrong get pointer, expected %p got %p\n", fb1.base.base + 2, fb1.base.gptr);
+ *fb1.base.gptr = -50;
+ ret = (int) call_func1(p_istream_get, &is1);
+ ok(ret == 206, "expected 206 got %d\n", ret);
+ ok(is1.count == 1, "expected 1 got %d\n", is1.count);
+ ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
+ ok(fb1.base.gptr == fb1.base.base + 3, "wrong get pointer, expected %p got %p\n", fb1.base.base + 3, fb1.base.gptr);
+ fb1.base.gptr = fb1.base.base + 30;
+ ret = (int) call_func1(p_istream_get, &is1);
+ ok(ret == EOF, "expected -1 got %d\n", ret);
+ ok(is1.count == 0, "expected 0 got %d\n", is1.count);
+ ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state);
+ ok(fb1.base.gptr == (char*) NULL + 1, "wrong get pointer, expected %p got %p\n", (char*) NULL + 1, fb1.base.gptr);
+
+ /* get_char */
+ is1.count = 0xabababab;
+ is1.base_ios.state = IOSTATE_badbit;
+ c = 0xab;
+ pis = call_func2(p_istream_get_char, &is1, &c);
+ ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
+ ok(is1.count == 0, "expected 0 got %d\n", is1.count);
+ ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n",
+ IOSTATE_badbit|IOSTATE_failbit, is1.base_ios.state);
+ ok(c == (char) 0xab, "expected %d got %d\n", (char) 0xab, c);
+ is1.base_ios.state = IOSTATE_goodbit;
+ pis = call_func2(p_istream_get_char, &is1, &c);
+ ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
+ ok(is1.count == 0, "expected 0 got %d\n", is1.count);
+ ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n",
+ IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state);
+ ok(c == EOF, "expected -1 got %d\n", c);
+ is1.base_ios.state = IOSTATE_goodbit;
+ fb1.base.eback = fb1.base.gptr = fb1.base.base;
+ fb1.base.egptr = fb1.base.base + 30;
+ pis = call_func2(p_istream_get_char, &is1, &c);
+ ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
+ ok(is1.count == 1, "expected 1 got %d\n", is1.count);
+ ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
+ ok(fb1.base.gptr == fb1.base.base + 1, "wrong get pointer, expected %p got %p\n", fb1.base.base + 1, fb1.base.gptr);
+ ok(c == ' ', "expected %d got %d\n", ' ', c);
+ fb1.base.gptr = fb1.base.base + 2;
+ pis = call_func2(p_istream_get_char, &is1, &c);
+ ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
+ ok(is1.count == 1, "expected 1 got %d\n", is1.count);
+ ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
+ ok(fb1.base.gptr == fb1.base.base + 3, "wrong get pointer, expected %p got %p\n", fb1.base.base + 3, fb1.base.gptr);
+ ok(c == -50, "expected %d got %d\n", -50, c);
+if (0) /* crashes on native */
+ pis = call_func2(p_istream_get_char, &is1, NULL);
+ fb1.base.gptr = fb1.base.base + 30;
+ pis = call_func2(p_istream_get_char, &is1, &c);
+ ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
+ ok(is1.count == 0, "expected 0 got %d\n", is1.count);
+ ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n",
+ IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state);
+ ok(fb1.base.gptr == (char*) NULL + 1, "wrong get pointer, expected %p got %p\n", (char*) NULL + 1, fb1.base.gptr);
+ ok(c == EOF, "expected -1 got %d\n", c);
+ is1.base_ios.state = IOSTATE_failbit;
+ pis = call_func2(p_istream_get_char, &is1, NULL);
+ ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
+ ok(is1.count == 0, "expected 0 got %d\n", is1.count);
+ ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state);
+ ok(fb1.base.gptr == (char*) NULL + 1, "wrong get pointer, expected %p got %p\n", (char*) NULL + 1, fb1.base.gptr);
+
call_func1(p_istream_vbase_dtor, &is1);
call_func1(p_istream_vbase_dtor, &is2);
call_func1(p_ostream_vbase_dtor, &os);
--
2.7.4
More information about the wine-patches
mailing list