msvcirt: Implement stdiobuf::setrwbuf.

Signed-off-by: Iván Matellanes <matellanesivan@gmail.com>
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Iván Matellanes 2015-10-07 22:19:30 +01:00 committed by Alexandre Julliard
parent 10b95d0dc7
commit 66ff2e3bad
2 changed files with 58 additions and 2 deletions

View File

@ -1580,8 +1580,32 @@ streampos __thiscall stdiobuf_seekoff(stdiobuf *this, streamoff offset, ios_seek
DEFINE_THISCALL_WRAPPER(stdiobuf_setrwbuf, 12) DEFINE_THISCALL_WRAPPER(stdiobuf_setrwbuf, 12)
int __thiscall stdiobuf_setrwbuf(stdiobuf *this, int read_size, int write_size) int __thiscall stdiobuf_setrwbuf(stdiobuf *this, int read_size, int write_size)
{ {
FIXME("(%p %d %d) stub\n", this, read_size, write_size); char *reserve;
return EOF; int buffer_size = read_size + write_size;
TRACE("(%p %d %d)\n", this, read_size, write_size);
if (read_size < 0 || write_size < 0)
return 0;
if (!buffer_size) {
this->base.unbuffered = 1;
return 0;
}
/* get a new buffer */
reserve = MSVCRT_operator_new(buffer_size);
if (!reserve)
return 0;
streambuf_setb(&this->base, reserve, reserve + buffer_size, 1);
this->base.unbuffered = 0;
/* set the get/put areas */
if (read_size > 0)
streambuf_setg(&this->base, reserve, reserve + read_size, reserve + read_size);
else
streambuf_setg(&this->base, NULL, NULL, NULL);
if (write_size > 0)
streambuf_setp(&this->base, reserve + read_size, reserve + buffer_size);
else
streambuf_setp(&this->base, NULL, NULL);
return 1;
} }
/* ?stdiofile@stdiobuf@@QAEPAU_iobuf@@XZ */ /* ?stdiofile@stdiobuf@@QAEPAU_iobuf@@XZ */

View File

@ -210,6 +210,7 @@ static int (*__thiscall p_strstreambuf_underflow)(strstreambuf*);
static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*); static stdiobuf* (*__thiscall p_stdiobuf_file_ctor)(stdiobuf*, FILE*);
static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*); static void (*__thiscall p_stdiobuf_dtor)(stdiobuf*);
static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int); static int (*__thiscall p_stdiobuf_overflow)(stdiobuf*, int);
static int (*__thiscall p_stdiobuf_setrwbuf)(stdiobuf*, int, int);
static int (*__thiscall p_stdiobuf_sync)(stdiobuf*); static int (*__thiscall p_stdiobuf_sync)(stdiobuf*);
static int (*__thiscall p_stdiobuf_underflow)(stdiobuf*); static int (*__thiscall p_stdiobuf_underflow)(stdiobuf*);
@ -374,6 +375,7 @@ static BOOL init(void)
SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA@PEAU_iobuf@@@Z"); SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QEAA@PEAU_iobuf@@@Z");
SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA@XZ"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UEAA@XZ");
SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UEAAHH@Z"); SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UEAAHH@Z");
SET(p_stdiobuf_setrwbuf, "?setrwbuf@stdiobuf@@QEAAHHH@Z");
SET(p_stdiobuf_sync, "?sync@stdiobuf@@UEAAHXZ"); SET(p_stdiobuf_sync, "?sync@stdiobuf@@UEAAHXZ");
SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UEAAHXZ"); SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UEAAHXZ");
@ -458,6 +460,7 @@ static BOOL init(void)
SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE@PAU_iobuf@@@Z"); SET(p_stdiobuf_file_ctor, "??0stdiobuf@@QAE@PAU_iobuf@@@Z");
SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE@XZ"); SET(p_stdiobuf_dtor, "??1stdiobuf@@UAE@XZ");
SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UAEHH@Z"); SET(p_stdiobuf_overflow, "?overflow@stdiobuf@@UAEHH@Z");
SET(p_stdiobuf_setrwbuf, "?setrwbuf@stdiobuf@@QAEHHH@Z");
SET(p_stdiobuf_sync, "?sync@stdiobuf@@UAEHXZ"); SET(p_stdiobuf_sync, "?sync@stdiobuf@@UAEHXZ");
SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UAEHXZ"); SET(p_stdiobuf_underflow, "?underflow@stdiobuf@@UAEHXZ");
@ -2016,6 +2019,35 @@ static void test_stdiobuf(void)
ok(stb2.base.gptr == stb2.base.egptr, "wrong get pointer, expected %p got %p\n", stb2.base.egptr, stb2.base.gptr); ok(stb2.base.gptr == stb2.base.egptr, "wrong get pointer, expected %p got %p\n", stb2.base.egptr, stb2.base.gptr);
stb2.base.unbuffered = 1; stb2.base.unbuffered = 1;
/* setrwbuf */
ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 100, 60);
ok(ret == 1, "expected 1 got %d\n", ret);
ok(stb1.base.allocated == 1, "wrong allocate value, expected 1 got %d\n", stb1.base.allocated);
ok(stb1.base.unbuffered == 0, "wrong unbuffered value, expected 0 got %d\n", stb1.base.unbuffered);
ok(stb1.base.ebuf == stb1.base.base + 160, "expected %p got %p\n", stb1.base.base + 160, stb1.base.ebuf);
ok(stb1.base.eback == stb1.base.base, "wrong get base, expected %p got %p\n", stb1.base.base, stb1.base.eback);
ok(stb1.base.gptr == stb1.base.base + 100, "wrong get pointer, expected %p got %p\n", stb1.base.base + 100, stb1.base.gptr);
ok(stb1.base.egptr == stb1.base.base + 100, "wrong get end, expected %p got %p\n", stb1.base.base + 100, stb1.base.egptr);
ok(stb1.base.pbase == stb1.base.base + 100, "wrong put base, expected %p got %p\n", stb1.base.base + 100, stb1.base.pbase);
ok(stb1.base.pptr == stb1.base.base + 100, "wrong put pointer, expected %p got %p\n", stb1.base.base + 100, stb1.base.pptr);
ok(stb1.base.epptr == stb1.base.base + 160, "wrong put end, expected %p got %p\n", stb1.base.base + 160, stb1.base.epptr);
ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, -1, 64);
ok(ret == 0 || ret == 1, "expected 0 or 1, got %d\n", ret);
ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 32, -8);
ok(ret == 0 || ret == 1, "expected 0 or 1, got %d\n", ret);
ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 0, 64);
ok(ret == 1, "expected 1 got %d\n", ret);
ok(stb1.base.ebuf == stb1.base.base + 64, "expected %p got %p\n", stb1.base.base + 64, stb1.base.ebuf);
ok(stb1.base.eback == NULL, "wrong get base, expected %p got %p\n", NULL, stb1.base.eback);
ok(stb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, stb1.base.gptr);
ok(stb1.base.egptr == NULL, "wrong get end, expected %p got %p\n", NULL, stb1.base.egptr);
ok(stb1.base.pbase == stb1.base.base, "wrong put base, expected %p got %p\n", stb1.base.base, stb1.base.pbase);
ok(stb1.base.pptr == stb1.base.base, "wrong put pointer, expected %p got %p\n", stb1.base.base, stb1.base.pptr);
ok(stb1.base.epptr == stb1.base.base + 64, "wrong put end, expected %p got %p\n", stb1.base.base + 64, stb1.base.epptr);
ret = (int) call_func3(p_stdiobuf_setrwbuf, &stb1, 0, 0);
ok(ret == 0, "expected 0 got %d\n", ret);
ok(stb1.base.unbuffered == 1, "wrong unbuffered value, expected 1 got %d\n", stb1.base.unbuffered);
call_func1(p_stdiobuf_dtor, &stb1); call_func1(p_stdiobuf_dtor, &stb1);
call_func1(p_stdiobuf_dtor, &stb2); call_func1(p_stdiobuf_dtor, &stb2);
fclose(file1); fclose(file1);